From e7c53e20a18573e05970beb93184fc32b88c98c9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Aug 2009 03:51:28 +0000 Subject: gameObject -> blenderObject mapping was being created but wasnt needed. Added utility func tag_main for (un)tagging every ID in a Main database with LIB_DOIT. --- source/gameengine/Converter/KX_BlenderSceneConverter.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.h') diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index cc93a953533..e8a958a310a 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -56,16 +56,12 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter // Should also have a list of collision shapes. // For the time being this is held in KX_Scene::m_shapes - GEN_Map m_map_gameobject_to_blender; - GEN_Map m_map_blender_to_gameobject; - - GEN_Map m_map_mesh_to_gamemesh; -// GEN_Map m_map_gamemesh_to_sumoshape; - - GEN_Map m_map_blender_to_gameactuator; - GEN_Map m_map_blender_to_gamecontroller; + GEN_Map m_map_blender_to_gameobject; /* cleared after conversion */ + GEN_Map m_map_mesh_to_gamemesh; /* cleared after conversion */ + GEN_Map m_map_blender_to_gameactuator; /* cleared after conversion */ + GEN_Mapm_map_blender_to_gamecontroller; /* cleared after conversion */ - GEN_Map m_map_blender_to_gameipolist; + GEN_Map m_map_blender_to_gameipolist; /* kept, should be freed, TODO */ Main* m_maggie; @@ -107,14 +103,10 @@ public: 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); void RegisterGameMesh(RAS_MeshObject *gamemesh, struct Mesh *for_blendermesh); RAS_MeshObject *FindGameMesh(struct Mesh *for_blendermesh/*, unsigned int onlayer*/); -// void RegisterSumoShape(DT_ShapeHandle shape, RAS_MeshObject *for_gamemesh); -// DT_ShapeHandle FindSumoShape(RAS_MeshObject *for_gamemesh); - void RegisterPolyMaterial(RAS_IPolyMaterial *polymat); void RegisterBlenderMaterial(BL_Material *mat); -- cgit v1.2.3