diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
commit | 6ef77cf95accc3cb914e7efd964118ce6e9521cf (patch) | |
tree | 1d8dbf95355038c93f79f9053a0bf1d55b561ec3 /source/gameengine/Ketsji | |
parent | 3462ddf17f38eb61fc3bb2751d55de15a47455c3 (diff) | |
parent | 770119d16f7dbee99a60d19540818892c970c4e2 (diff) |
=bmesh= merge from trunk at r36529
Diffstat (limited to 'source/gameengine/Ketsji')
22 files changed, 36 insertions, 30 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index d5ea39f5b35..0bfe1fd0266 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -26,11 +26,12 @@ set(INC . - ../../../source/kernel/gen_system ../../../intern/string ../../../intern/guardedalloc + ../../../intern/container ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer ../../../source/gameengine/Converter + ../../../source/gameengine/BlenderRoutines ../../../source/blender/imbuf ../../../intern/moto/include ../../../source/gameengine/Ketsji diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt index 5f251c832ee..17a5929420d 100644 --- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt +++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt @@ -26,8 +26,8 @@ set(INC . - ../../../../source/kernel/gen_system ../../../../intern/string + ../../../../intern/container ../../../../intern/moto/include ../../../../source/gameengine/Ketsji ../../../../source/gameengine/GameLogic diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index 8ad1949bbc4..ac657e106b8 100644 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -3,7 +3,8 @@ Import ('env') sources = env.Glob('*.cpp') -incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Ketsji' +incs = '. #intern/string #intern/moto/include' +incs += ' #source/gameengine/Ketsji #intern/container' incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions' incs += ' #source/gameengine/Network #source/gameengine/SceneGraph' diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index 17dfe9474a8..d68cb453fe8 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -101,7 +101,7 @@ bool KX_CameraActuator::UnlinkObject(SCA_IObject* clientobj) } -void KX_CameraActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void KX_CameraActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { void **h_obj = (*obj_map)[m_ob]; if (h_obj) { diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h index 135a9cad9d8..d59fcff9370 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.h +++ b/source/gameengine/Ketsji/KX_CameraActuator.h @@ -116,7 +116,7 @@ private : virtual bool UnlinkObject(SCA_IObject* clientobj); /** Methods inherited from SCA_ILogicBrick */ - virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map); + virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map); #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index b7cc98bd539..7bd8c445849 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -42,13 +42,13 @@ #include "BL_DeformableGameObject.h" #include "RAS_MeshObject.h" #include "KX_Scene.h" -#include "SYS_System.h" +#include "BL_System.h" #include "PHY_Pro.h" //todo cleanup #include "KX_ClientObjectInfo.h" -#include "GEN_Map.h" -#include "GEN_HashedPtr.h" +#include "CTR_Map.h" +#include "CTR_HashedPtr.h" #include "KX_PhysicsEngineEnums.h" #include "PHY_Pro.h" diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 85d09d9f5d5..47d83c16659 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -156,7 +156,7 @@ KX_GameObject::~KX_GameObject() } #ifdef WITH_PYTHON if (m_attr_dict) { - PyDict_Clear(m_attr_dict); /* incase of circular refs or other weired cases */ + PyDict_Clear(m_attr_dict); /* incase of circular refs or other weird cases */ /* Py_CLEAR: Py_DECREF's and NULL's */ Py_CLEAR(m_attr_dict); } @@ -1224,7 +1224,7 @@ CListValue* KX_GameObject::GetChildrenRecursive() /* --------------------------------------------------------------------- * Some stuff taken from the header * --------------------------------------------------------------------- */ -void KX_GameObject::Relink(GEN_Map<GEN_HashedPtr, void*> *map_parameter) +void KX_GameObject::Relink(CTR_Map<CTR_HashedPtr, void*> *map_parameter) { // we will relink the sensors and actuators that use object references // if the object is part of the replicated hierarchy, use the new diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index b54fb6b068e..50fbebe1341 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -47,8 +47,8 @@ #include "SG_Node.h" #include "MT_Transform.h" #include "MT_CmMatrix4x4.h" -#include "GEN_Map.h" -#include "GEN_HashedPtr.h" +#include "CTR_Map.h" +#include "CTR_HashedPtr.h" #include "KX_Scene.h" #include "KX_KetsjiEngine.h" /* for m_anim_framerate */ #include "KX_IPhysicsController.h" /* for suspend/resume */ @@ -142,7 +142,7 @@ public: virtual void /* This function should be virtual - derived classed override it */ Relink( - GEN_Map<GEN_HashedPtr, void*> *map + CTR_Map<CTR_HashedPtr, void*> *map ); /** diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 8c3e25cf3e2..7289ffc6e29 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -299,7 +299,7 @@ bool KX_ObjectActuator::UnlinkObject(SCA_IObject* clientobj) return false; } -void KX_ObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void KX_ObjectActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { void **h_obj = (*obj_map)[m_reference]; if (h_obj) { diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h index e45ce899bfc..0737535b84c 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.h +++ b/source/gameengine/Ketsji/KX_ObjectActuator.h @@ -144,7 +144,7 @@ public: CValue* GetReplica(); void ProcessReplica(); bool UnlinkObject(SCA_IObject* clientobj); - void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map); + void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map); void SetForceLoc(const double force[3]) { /*m_force=force;*/ } void UpdateFuzzyFlags() diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp index 6ff1c05b994..a73f4c38627 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.cpp +++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp @@ -99,7 +99,7 @@ bool KX_ParentActuator::UnlinkObject(SCA_IObject* clientobj) return false; } -void KX_ParentActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void KX_ParentActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { void **h_obj = (*obj_map)[m_ob]; if (h_obj) { diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h index 8723f83920e..a850cc72eb9 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.h +++ b/source/gameengine/Ketsji/KX_ParentActuator.h @@ -76,7 +76,7 @@ class KX_ParentActuator : public SCA_IActuator virtual CValue* GetReplica(); virtual void ProcessReplica(); - virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map); + virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map); virtual bool UnlinkObject(SCA_IObject* clientobj); #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index ba698d79fdd..a3738995db3 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1758,6 +1758,7 @@ static struct _inittab bge_internal_modules[]= { /** * Python is not initialised. + * see bpy_interface.c's BPY_python_start() which shares the same functionality in blender. */ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level, Main *maggie, int argc, char** argv) { @@ -1779,6 +1780,9 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur /* must run before python initializes */ PyImport_ExtendInittab(bge_internal_modules); + /* find local python installation */ + PyC_SetHomePath(BLI_get_folder(BLENDER_PYTHON, NULL)); + Py_Initialize(); if(argv && first_time) { /* browser plugins dont currently set this */ diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp index 521c0038f27..62a51fb4efc 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp @@ -151,7 +151,7 @@ bool KX_SCA_AddObjectActuator::UnlinkObject(SCA_IObject* clientobj) return false; } -void KX_SCA_AddObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void KX_SCA_AddObjectActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { void **h_obj = (*obj_map)[m_OriginalObject]; if (h_obj) { diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index 11f210ad7b5..a8304667b66 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -108,7 +108,7 @@ public: UnlinkObject(SCA_IObject* clientobj); virtual void - Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map); + Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map); virtual bool Update(); diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 4a379f46440..28dc660037c 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -67,7 +67,7 @@ #include "SCA_IController.h" #include "SCA_IActuator.h" #include "SG_Node.h" -#include "SYS_System.h" +#include "BL_System.h" #include "SG_Controller.h" #include "SG_IObject.h" #include "SG_Tree.h" @@ -1514,7 +1514,7 @@ void KX_Scene::LogicUpdateFrame(double curtime, bool frame) void KX_Scene::LogicEndFrame() { m_logicmgr->EndFrame(); - int numobj = m_euthanasyobjects->GetCount(); + int numobj; KX_GameObject* obj; diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index af6a31e786c..367bf0b82da 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -41,8 +41,8 @@ #include <set> #include <list> -#include "GEN_Map.h" -#include "GEN_HashedPtr.h" +#include "CTR_Map.h" +#include "CTR_HashedPtr.h" #include "SG_IObject.h" #include "SCA_IScene.h" #include "MT_Transform.h" @@ -61,7 +61,7 @@ struct SM_MaterialProps; struct SM_ShapeProps; struct Scene; -class GEN_HashedPtr; +class CTR_HashedPtr; class CListValue; class CValue; class SCA_LogicManager; @@ -207,7 +207,7 @@ protected: * used in AddReplicaObject to map game objects to their * replicas so pointers can be updated. */ - GEN_Map <GEN_HashedPtr, void*> m_map_gameobject_to_replica; + CTR_Map <CTR_HashedPtr, void*> m_map_gameobject_to_replica; /** * Another temporary variable outstaying its welcome diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp index 8312a14ebfb..f572f8eb36d 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.cpp +++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp @@ -97,7 +97,7 @@ bool KX_SceneActuator::UnlinkObject(SCA_IObject* clientobj) return false; } -void KX_SceneActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void KX_SceneActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { void **h_obj = (*obj_map)[m_camera]; if (h_obj) { diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h index 563255d1560..288f4acc280 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.h +++ b/source/gameengine/Ketsji/KX_SceneActuator.h @@ -85,7 +85,7 @@ class KX_SceneActuator : public SCA_IActuator virtual CValue* GetReplica(); virtual void ProcessReplica(); virtual bool UnlinkObject(SCA_IObject* clientobj); - virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map); + virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map); virtual bool Update(); diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp index 5530fa286cf..edcba969811 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp +++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp @@ -219,7 +219,7 @@ bool KX_TrackToActuator::UnlinkObject(SCA_IObject* clientobj) return false; } -void KX_TrackToActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void KX_TrackToActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { void **h_obj = (*obj_map)[m_object]; if (h_obj) { diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h index 33780bf53e4..c5e96bd7454 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.h +++ b/source/gameengine/Ketsji/KX_TrackToActuator.h @@ -67,7 +67,7 @@ class KX_TrackToActuator : public SCA_IActuator virtual void ProcessReplica(); virtual bool UnlinkObject(SCA_IObject* clientobj); - virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map); + virtual void Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map); virtual bool Update(double curtime, bool frame); #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 980d42d5d1f..5fd77aa51d6 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -8,7 +8,7 @@ defs = [ 'GLEW_STATIC' ] incs = '. #source/blender/python/generic' # Only for Mathutils! and bpy_internal_import.h, be very careful -incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc' +incs += ' #intern/string #intern/guardedalloc #intern/container' incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #intern/audaspace/intern #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include' |