kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE 2D Filters: slightly change dfelinto patch to use SCA_IScene instead of KX_Scene. It is rather anecdotic since KX_Scene is the only implementation of SCA_IScene but it's better to keep GameLogic and Ketsji separated.

Browse Source
This commit is contained in:
Benoit Bolsee 2010-03-06 21:22:09 +00:00
parent b1a05da291
commit 50b13f0a56
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/gameengine/GameLogic/CMakeLists.txt
View File

@ -32,7 +32,6 @@ SET(INC
../../../intern/string
../../../source/gameengine/Expressions
../../../source/gameengine/SceneGraph
../../../source/gameengine/Ketsji
../../../intern/moto/include
../../../source/gameengine/Rasterizer
)

1
source/gameengine/GameLogic/Makefile
View File

@ -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

2
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
View File

@ -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),

6
source/gameengine/GameLogic/SCA_2DFilterActuator.h
View File

@ -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();

4
source/gameengine/GameLogic/SCA_IScene.h
View File

@ -32,6 +32,7 @@
#include <vector>
#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<STR_String>& propNames, void* gameObj,
RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode,
int pass, STR_String& text) {}
#ifdef WITH_CXX_GUARDEDALLOC

1
source/gameengine/GameLogic/SConscript
View File

@ -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 = []