diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-03-10 00:42:03 +0300 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-03-10 00:42:03 +0300 |
commit | 822e51bd2d663f82d360d474192718660cc9a35c (patch) | |
tree | 524fb7a0d13fd702bce374a876a714f894ffcf68 /source/gameengine/Converter/KX_BlenderSceneConverter.h | |
parent | ce7a21047f50c0e26ce55134ba434543c247d894 (diff) |
BGE memleak fixed: mesh/material not deleted when switching scene
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.h')
-rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index a897922d51b..8ac5386d442 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -51,10 +51,13 @@ struct SpaceIpo; class KX_BlenderSceneConverter : public KX_ISceneConverter { - vector<KX_WorldInfo*> m_worldinfos; - vector<RAS_IPolyMaterial*> m_polymaterials; - vector<RAS_MeshObject*> m_meshobjects; - vector<BL_Material *> m_materials; + // Use vector of pairs to allow removal of entities between scene switch + vector<pair<KX_Scene*,KX_WorldInfo*> > m_worldinfos; + vector<pair<KX_Scene*,RAS_IPolyMaterial*> > m_polymaterials; + vector<pair<KX_Scene*,RAS_MeshObject*> > m_meshobjects; + vector<pair<KX_Scene*,BL_Material *> > m_materials; + // Should also have a list of collision shapes. + // For the time being this is held in KX_Scene::m_shapes GEN_Map<CHashedPtr,struct Object*> m_map_gameobject_to_blender; GEN_Map<CHashedPtr,KX_GameObject*> m_map_blender_to_gameobject; @@ -72,6 +75,7 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter STR_String m_newfilename; class KX_KetsjiEngine* m_ketsjiEngine; + class KX_Scene* m_currentScene; // Scene being converted bool m_alwaysUseExpandFraming; bool m_usemat; @@ -99,6 +103,7 @@ public: class RAS_IRenderTools* rendertools, class RAS_ICanvas* canvas ); + virtual void RemoveScene(class KX_Scene *scene); void SetNewFileName(const STR_String& filename); bool TryAndLoadNewFile(); @@ -106,6 +111,7 @@ public: 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); struct Object *FindBlenderObject(KX_GameObject *for_gameobject); |