Revision: 23564
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23564
Author: campbellbarton
Date: 2009-09-30 00:49:33 +0200 (Wed, 30 Sep 2009)
Log Message:
-----------
- rather then passing the python namespace dictionary to the controller
function get the namespace from the converter.
- renamed SetPythonDictionary() to SetPyNamespace()
- remove IsLight(), GetGameObjectType() existed before this but wasnt used for
lights.
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertControllers.h
trunk/blender/source/gameengine/GameLogic/SCA_IObject.h
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.h
trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_ISceneConverter.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_Light.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
Modified:
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -375,7 +375,7 @@
#ifndef DISABLE_PYTHON
// some python things
PyObject* dictionaryobject =
initGamePythonScripting("Ketsji", psl_Lowest, blenderdata);
- ketsjiengine->SetPythonDictionary(dictionaryobject);
+ ketsjiengine->SetPyNamespace(dictionaryobject);
initRasterizer(rasterizer, canvas);
PyObject *gameLogic = initGameLogic(ketsjiengine,
startscene);
PyDict_SetItemString(PyModule_GetDict(gameLogic),
"globalDict", pyGlobalDict); // Same as importing the module.
@@ -406,9 +406,6 @@
// convert and add scene
sceneconverter->ConvertScene(
startscene,
-#ifndef DISABLE_PYTHON
- dictionaryobject,
-#endif
rendertools,
canvas);
ketsjiengine->AddScene(startscene);
@@ -702,7 +699,7 @@
#ifndef DISABLE_PYTHON
// some python things
PyObject* dictionaryobject =
initGamePythonScripting("Ketsji", psl_Lowest, blenderdata);
- ketsjiengine->SetPythonDictionary(dictionaryobject);
+ ketsjiengine->SetPyNamespace(dictionaryobject);
initRasterizer(rasterizer, canvas);
PyObject *gameLogic = initGameLogic(ketsjiengine,
startscene);
PyDict_SetItemString(dictionaryobject, "GameLogic",
gameLogic); // Same as importing the module
@@ -721,9 +718,6 @@
// convert and add scene
sceneconverter->ConvertScene(
startscene,
-#ifndef DISABLE_PYTHON
- dictionaryobject,
-#endif
rendertools,
canvas);
ketsjiengine->AddScene(startscene);
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -1897,9 +1897,6 @@
KX_Scene* kxscene,
KX_KetsjiEngine*
ketsjiEngine,
e_PhysicsEngine
physics_engine,
-#ifndef DISABLE_PYTHON
- PyObject*
pythondictionary,
-#endif
RAS_IRenderTools*
rendertools,
RAS_ICanvas* canvas,
KX_BlenderSceneConverter* converter,
@@ -2655,11 +2652,7 @@
struct Object* blenderobj = gameobj->GetBlenderObject();
int layerMask = (groupobj.find(blenderobj) == groupobj.end()) ?
activeLayerBitInfo : 0;
bool isInActiveLayer = (blenderobj->lay & layerMask)!=0;
- BL_ConvertControllers(blenderobj,gameobj,logicmgr,
-#ifndef DISABLE_PYTHON
- pythondictionary,
-#endif
- layerMask,isInActiveLayer,converter);
+ BL_ConvertControllers(blenderobj,gameobj,logicmgr,
layerMask,isInActiveLayer,converter);
}
for ( i=0;i<logicbrick_conversionlist->GetCount();i++)
{
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
2009-09-29 22:49:33 UTC (rev 23564)
@@ -40,9 +40,6 @@
class KX_Scene*
kxscene,
class
KX_KetsjiEngine* ketsjiEngine,
e_PhysicsEngine
physics_engine,
-#ifndef DISABLE_PYTHON
- PyObject*
pythondictionary,
-#endif
class
RAS_IRenderTools* rendertools,
class RAS_ICanvas*
canvas,
class
KX_BlenderSceneConverter* sceneconverter,
Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -243,9 +243,6 @@
#endif
void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
-#ifndef DISABLE_PYTHON
-
PyObject* dictobj,
-#endif
class RAS_IRenderTools* rendertools,
class RAS_ICanvas* canvas)
{
@@ -330,9 +327,6 @@
destinationscene,
m_ketsjiEngine,
physics_engine,
-#ifndef DISABLE_PYTHON
- dictobj,
-#endif
rendertools,
canvas,
this,
@@ -924,3 +918,10 @@
}
+
+#ifndef DISABLE_PYTHON
+PyObject *KX_BlenderSceneConverter::GetPyNamespace()
+{
+ return m_ketsjiEngine->GetPyNamespace();
+}
+#endif
Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2009-09-29 22:49:33 UTC (rev 23564)
@@ -89,9 +89,6 @@
*/
virtual void ConvertScene(
class KX_Scene*
destinationscene,
-#ifndef DISABLE_PYTHON
- PyObject* dictobj,
-#endif
class RAS_IRenderTools*
rendertools,
class RAS_ICanvas* canvas
);
@@ -145,6 +142,9 @@
struct Main* GetMain() { return m_maggie; };
+#ifndef DISABLE_PYTHON
+ PyObject *GetPyNamespace();
+#endif
#ifdef WITH_CXX_GUARDEDALLOC
public:
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -92,9 +92,6 @@
struct Object* blenderobject,
class KX_GameObject* gameobj,
SCA_LogicManager* logicmgr,
-#ifndef DISABLE_PYTHON
- PyObject* pythondictionary,
-#endif
int activeLayerBitInfo,
bool isInActiveLayer,
KX_BlenderSceneConverter* converter
@@ -160,10 +157,9 @@
bPythonCont* pycont = (bPythonCont*)
bcontr->data;
SCA_PythonController* pyctrl = new
SCA_PythonController(gameobj, pycont->mode);
gamecontroller = pyctrl;
-
#ifndef DISABLE_PYTHON
- pyctrl->SetDictionary(pythondictionary);
+
pyctrl->SetNamespace(converter->GetPyNamespace());
if(pycont->mode==SCA_PythonController::SCA_PYEXEC_SCRIPT) {
if (pycont->text)
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertControllers.h
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertControllers.h
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertControllers.h
2009-09-29 22:49:33 UTC (rev 23564)
@@ -35,9 +35,6 @@
struct Object* blenderobject,
class KX_GameObject* gameobj,
class SCA_LogicManager* logicmgr,
-#ifndef DISABLE_PYTHON
- PyObject* pythondictionary,
-#endif
int activeLayerBitInfo,
bool isInActiveLayer,
class KX_BlenderSceneConverter* converter
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IObject.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IObject.h 2009-09-29
22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IObject.h 2009-09-29
22:49:33 UTC (rev 23564)
@@ -219,6 +219,7 @@
typedef enum ObjectTypes {
OBJ_ARMATURE=0,
OBJ_CAMERA=1,
+ OBJ_LIGHT=2,
}ObjectTypes;
};
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -151,7 +151,7 @@
#ifndef DISABLE_PYTHON
-void SCA_PythonController::SetDictionary(PyObject* pythondictionary)
+void SCA_PythonController::SetNamespace(PyObject* pythondictionary)
{
if (m_pythondictionary)
{
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PythonController.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PythonController.h
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PythonController.h
2009-09-29 22:49:33 UTC (rev 23564)
@@ -84,7 +84,7 @@
void SetScriptText(const STR_String& text);
void SetScriptName(const STR_String& name);
#ifndef DISABLE_PYTHON
- void SetDictionary(PyObject* pythondictionary);
+ void SetNamespace(PyObject* pythondictionary);
#endif
void SetDebug(bool debug) { m_debug = debug; }
void AddTriggeredSensor(class SCA_ISensor* sensor)
Modified:
trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -672,7 +672,7 @@
m_gamedata->curscene);
PyObject* m_dictionaryobject =
initGamePlayerPythonScripting("Ketsji", psl_Highest, m_gamedata->main, 0, NULL);
- m_ketsjiengine->SetPythonDictionary(m_dictionaryobject);
+ m_ketsjiengine->SetPyNamespace(m_dictionaryobject);
initRasterizer(m_rasterizer, m_canvas);
PyDict_SetItemString(m_dictionaryobject, "GameLogic",
initGameLogic(m_ketsjiengine, startscene)); // Same as importing the module
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
2009-09-29 22:01:32 UTC (rev 23563)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
2009-09-29 22:49:33 UTC (rev 23564)
@@ -679,7 +679,7 @@
// some python things
PyObject* dictionaryobject =
initGamePlayerPythonScripting("Ketsji", psl_Lowest, m_maggie, m_argc, m_argv);
- m_ketsjiengine->SetPythonDictionary(dictionaryobject);
+ m_ketsjiengine->SetPyNamespace(dictionaryobject);
initRasterizer(m_rasterizer, m_canvas);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
