diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index 958e697aa39..3ffba14ec95 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -32,7 +32,6 @@ SET(INC ../../../intern/string ../../../source/gameengine/Expressions ../../../source/gameengine/SceneGraph - ../../../source/gameengine/Ketsji ../../../intern/moto/include ../../../source/gameengine/Rasterizer ) diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile index 0d4d50b32a0..a1794a60452 100644 --- a/source/gameengine/GameLogic/Makefile +++ b/source/gameengine/GameLogic/Makefile @@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I../Expressions CPPFLAGS += -I../SceneGraph CPPFLAGS += -I../Rasterizer -CPPFLAGS += -I../Ketsji CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../blender/makesdna diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp index 43cf36b7db8..24f919b7364 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp @@ -42,7 +42,7 @@ SCA_2DFilterActuator::SCA_2DFilterActuator( float float_arg, int int_arg, RAS_IRasterizer* rasterizer, - KX_Scene* scene) + SCA_IScene* scene) : SCA_IActuator(gameobj, KX_ACT_2DFILTER), m_type(type), m_disableMotionBlur(flag), diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h index beb4cb88608..034b10763ce 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h @@ -30,7 +30,7 @@ #include "RAS_IRasterizer.h" #include "SCA_IActuator.h" -#include "KX_Scene.h" +#include "SCA_IScene.h" class SCA_2DFilterActuator : public SCA_IActuator { @@ -45,7 +45,7 @@ private: int m_int_arg; STR_String m_shaderText; RAS_IRasterizer* m_rasterizer; - KX_Scene* m_scene; + SCA_IScene* m_scene; public: @@ -56,7 +56,7 @@ public: float float_arg, int int_arg, RAS_IRasterizer* rasterizer, - KX_Scene* scene); + SCA_IScene* scene); void SetShaderText(const char *text); virtual ~SCA_2DFilterActuator(); diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h index 6658aa961ac..7fd04e9d27f 100644 --- a/source/gameengine/GameLogic/SCA_IScene.h +++ b/source/gameengine/GameLogic/SCA_IScene.h @@ -32,6 +32,7 @@ #include #include "STR_String.h" +#include "RAS_2DFilterManager.h" #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" @@ -64,6 +65,9 @@ public: void AddDebugProperty(class CValue* debugprop, const STR_String &name); void RemoveAllDebugProperties(); + virtual void Update2DFilter(vector& propNames, void* gameObj, + RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, + int pass, STR_String& text) {} #ifdef WITH_CXX_GUARDEDALLOC diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index 57325d99d04..3840754ed06 100644 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -6,7 +6,6 @@ sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp') incs = '. #/source/kernel/gen_system #/intern/string' incs += ' #/source/gameengine/Expressions #/intern/moto/include' incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph' -incs += ' #/source/gameengine/Ketsji' defs = []