diff options
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.h')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index 40c71a4d74b..3379f00c38a 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -76,16 +76,16 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter // Saved KX_LibLoadStatus objects map<char *, class KX_LibLoadStatus*> m_status_map; - // Should also have a list of collision shapes. + // Should also have a list of collision shapes. // For the time being this is held in KX_Scene::m_shapes CTR_Map<CHashedPtr,KX_GameObject*> m_map_blender_to_gameobject; /* cleared after conversion */ CTR_Map<CHashedPtr,RAS_MeshObject*> m_map_mesh_to_gamemesh; /* cleared after conversion */ CTR_Map<CHashedPtr,SCA_IActuator*> m_map_blender_to_gameactuator; /* cleared after conversion */ CTR_Map<CHashedPtr,SCA_IController*>m_map_blender_to_gamecontroller; /* cleared after conversion */ - + CTR_Map<CHashedPtr,BL_InterpolatorList*> m_map_blender_to_gameAdtList; - + Main* m_maggie; vector<struct Main*> m_DynamicMaggie; @@ -121,7 +121,7 @@ public: bool TryAndLoadNewFile(); void SetAlwaysUseExpandFraming(bool to_what); - + void RegisterGameObject(KX_GameObject *gameobject, struct Object *for_blenderobject); void UnregisterGameObject(KX_GameObject *gameobject); KX_GameObject *FindGameObject(struct Object *for_blenderobject); @@ -136,7 +136,7 @@ public: void RegisterBlenderMaterial(BL_Material *mat); void CacheBlenderMaterial(KX_Scene *scene, Material *mat, BL_Material *blmat); BL_Material *FindCachedBlenderMaterial(KX_Scene *scene, Material *mat); - + void RegisterInterpolatorList(BL_InterpolatorList *actList, struct bAction *for_act); BL_InterpolatorList *FindInterpolatorList(struct bAction *for_act); @@ -152,7 +152,7 @@ public: ///this is for reseting the position,rotation and scale of the gameobjet that is not dynamic virtual void resetNoneDynamicObjectToIpo(); - + ///this generates ipo curves for position, rotation, allowing to use game physics in animation virtual void WritePhysicsObjectToAnimationIpo(int frameNumber); virtual void TestHandlesPhysicsObjectToAnimationIpo(); @@ -174,7 +174,7 @@ public: // struct Main* GetMain() { return m_maggie; } struct Main* GetMainDynamicPath(const char *path); vector<struct Main*> &GetMainDynamic(); - + class KX_LibLoadStatus *LinkBlendFileMemory(void *data, int length, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options); class KX_LibLoadStatus *LinkBlendFilePath(const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options); class KX_LibLoadStatus *LinkBlendFile(struct BlendHandle *bpy_openlib, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options); @@ -186,7 +186,7 @@ public: virtual void MergeAsyncLoads(); virtual void FinalizeAsyncLoads(); void AddScenesToMergeQueue(class KX_LibLoadStatus *status); - + void PrintStats() { printf("BGE STATS!\n"); @@ -208,9 +208,9 @@ public: #endif // /printf("\t m_ketsjiEngine->m_scenes: %d\n", m_ketsjiEngine->CurrentScenes()->size()); } - + /* LibLoad Options */ - enum + enum { LIB_LOAD_LOAD_ACTIONS = 1, LIB_LOAD_VERBOSE = 2, @@ -223,7 +223,7 @@ public: #ifdef WITH_PYTHON PyObject *GetPyNamespace(); #endif - + #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderSceneConverter") #endif |