forked from teamnwah/openmw-tes3coop
Fixing some errors
This commit is contained in:
parent
c7dadec840
commit
0b3bb2719f
6 changed files with 13 additions and 5 deletions
|
@ -36,7 +36,7 @@ namespace MWClass
|
||||||
const float g = ((color >> 8) & 0xFF) / 255.0f;
|
const float g = ((color >> 8) & 0xFF) / 255.0f;
|
||||||
const float b = ((color >> 16) & 0xFF) / 255.0f;
|
const float b = ((color >> 16) & 0xFF) / 255.0f;
|
||||||
const float radius = float (ref->base->data.radius);
|
const float radius = float (ref->base->data.radius);
|
||||||
objects.insertLight (r, g, b, radius);
|
objects.insertLight (ptr, r, g, b, radius);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include "../mwworld/actiontake.hpp"
|
#include "../mwworld/actiontake.hpp"
|
||||||
|
|
||||||
#include "../mwrender/cellimp.hpp"
|
#include "../mwrender/cellimp.hpp"
|
||||||
#include "../mwrender/renderinginterface.hpp"
|
|
||||||
#include "containerutil.hpp"
|
#include "containerutil.hpp"
|
||||||
|
|
||||||
namespace MWClass
|
namespace MWClass
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#include "objects.hpp"
|
#include "objects.hpp"
|
||||||
#include "npcs.hpp"
|
#include "npcs.hpp"
|
||||||
#include "creatures.hpp"
|
#include "creatures.hpp"
|
||||||
|
#include "player.hpp"
|
||||||
|
#define RENDERING_INTERFACE 1
|
||||||
namespace MWRender{
|
namespace MWRender{
|
||||||
class RenderingInterface{
|
class RenderingInterface{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include "../mwworld/ptr.hpp"
|
#include "../mwworld/ptr.hpp"
|
||||||
#include <components/esm/loadstat.hpp>
|
#include <components/esm/loadstat.hpp>
|
||||||
|
|
||||||
#include "player.hpp"
|
|
||||||
|
|
||||||
|
|
||||||
using namespace MWRender;
|
using namespace MWRender;
|
||||||
|
|
|
@ -4,7 +4,9 @@
|
||||||
|
|
||||||
#include "sky.hpp"
|
#include "sky.hpp"
|
||||||
#include "debugging.hpp"
|
#include "debugging.hpp"
|
||||||
#include "renderinginterface.hpp"
|
//Commented out for now, possibly do an ifdef if necessary, cla
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <openengine/ogre/renderer.hpp>
|
#include <openengine/ogre/renderer.hpp>
|
||||||
|
@ -17,6 +19,9 @@
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
|
||||||
|
#ifndef RENDERING_INTERFACE
|
||||||
|
#include "renderinginterface.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace Ogre
|
namespace Ogre
|
||||||
|
|
|
@ -9,8 +9,11 @@
|
||||||
#include "action.hpp"
|
#include "action.hpp"
|
||||||
#include "containerstore.hpp"
|
#include "containerstore.hpp"
|
||||||
#include "refdata.hpp"
|
#include "refdata.hpp"
|
||||||
#include "../mwrender/renderinginterface.hpp"
|
|
||||||
#include "physicssystem.hpp"
|
#include "physicssystem.hpp"
|
||||||
|
#ifndef RENDERING_INTERFACE
|
||||||
|
#include "../mwrender/renderinginterface.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Ogre
|
namespace Ogre
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue