[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27296] trunk/blender/source/gameengine/ GameLogic: BGE 2D Filters: slightly change dfelinto patch to use SCA_IScene instead of KX_Scene.

[Benoit Bolsee]

Revision: 27296
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27296
Author:   ben2610
Date:     2010-03-06 22:22:09 +0100 (Sat, 06 Mar 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
    trunk/blender/source/gameengine/GameLogic/Makefile
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
    trunk/blender/source/gameengine/GameLogic/SConscript

Modified: trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GameLogic/CMakeLists.txt	2010-03-06 19:46:21 UTC (rev 27295)
+++ trunk/blender/source/gameengine/GameLogic/CMakeLists.txt	2010-03-06 21:22:09 UTC (rev 27296)
@@ -32,7 +32,6 @@
 	../../../intern/string
 	../../../source/gameengine/Expressions 
 	../../../source/gameengine/SceneGraph
-	../../../source/gameengine/Ketsji
 	../../../intern/moto/include
 	../../../source/gameengine/Rasterizer
 )

Modified: trunk/blender/source/gameengine/GameLogic/Makefile
===================================================================
--- trunk/blender/source/gameengine/GameLogic/Makefile	2010-03-06 19:46:21 UTC (rev 27295)
+++ trunk/blender/source/gameengine/GameLogic/Makefile	2010-03-06 21:22:09 UTC (rev 27296)
@@ -41,7 +41,6 @@
 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

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2010-03-06 19:46:21 UTC (rev 27295)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2010-03-06 21:22:09 UTC (rev 27296)
@@ -42,7 +42,7 @@
 		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),

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2010-03-06 19:46:21 UTC (rev 27295)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2010-03-06 21:22:09 UTC (rev 27296)
@@ -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 @@
 	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 @@
 		float float_arg,
 		int int_arg,
 		RAS_IRasterizer* rasterizer,
-		KX_Scene* scene);
+		SCA_IScene* scene);
 
 	void	SetShaderText(const char *text);
     virtual ~SCA_2DFilterActuator();

Modified: trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IScene.h	2010-03-06 19:46:21 UTC (rev 27295)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IScene.h	2010-03-06 21:22:09 UTC (rev 27296)
@@ -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 @@
 	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

Modified: trunk/blender/source/gameengine/GameLogic/SConscript
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SConscript	2010-03-06 19:46:21 UTC (rev 27295)
+++ trunk/blender/source/gameengine/GameLogic/SConscript	2010-03-06 21:22:09 UTC (rev 27296)
@@ -6,7 +6,6 @@
 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 = []