From 5574eccebd16ae38a2a21ed202d1f9d1ba8f67a4 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Wed, 26 Dec 2012 20:58:02 +0100
Subject: Engine optimization - rewritten model management

 - new class CModelManager
 - rewritten engine object structure in CEngine
 - created shared model data instead of separate objects per each
   model instance
 - minor refactoring
---
 src/object/motion/motionbee.cpp | 83 +++++++++++++----------------------------
 1 file changed, 26 insertions(+), 57 deletions(-)

(limited to 'src/object/motion/motionbee.cpp')

diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp
index a3421b8..111339d 100644
--- a/src/object/motion/motionbee.cpp
+++ b/src/object/motion/motionbee.cpp
@@ -19,7 +19,7 @@
 
 #include "app/app.h"
 
-#include "graphics/engine/modelfile.h"
+#include "graphics/engine/modelmanager.h"
 
 #include "physics/physics.h"
 
@@ -67,12 +67,8 @@ void CMotionBee::DeleteObject(bool bAll)
 bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
                         float power)
 {
-    Gfx::CModelFile*   pModFile;
-    int         rank;
-
-//    if ( m_engine->GetRestCreate() < 3+18+2 )  return false;
-
-    pModFile = new Gfx::CModelFile(m_iMan);
+    Gfx::CModelManager* modelManager = Gfx::CModelManager::GetInstancePointer();
+    int rank;
 
     m_object->SetType(type);
 
@@ -80,10 +76,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     rank = m_engine->CreateObject();
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE);  // this is a moving object
     m_object->SetObjectRank(0, rank);
-
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee1.mod"));
-    pModFile->CreateEngineObject(rank);
-
+    modelManager->AddModelReference("bee1.mod", false, rank);
     m_object->SetPosition(0, pos);
     m_object->SetAngleY(0, angle);
 
@@ -97,8 +90,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(1, rank);
     m_object->SetObjectParent(1, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee2.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("bee2.mod", false, rank);
     m_object->SetPosition(1, Math::Vector(1.6f, 0.3f, 0.0f));
 
     // Creates the tail.
@@ -106,8 +98,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(2, rank);
     m_object->SetObjectParent(2, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee3.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("bee3.mod", false, rank);
     m_object->SetPosition(2, Math::Vector(-0.8f, 0.0f, 0.0f));
 
     // Creates a right-back thigh.
@@ -115,8 +106,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(3, rank);
     m_object->SetObjectParent(3, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant4.mod", false, rank);
     m_object->SetPosition(3, Math::Vector(-0.3f, -0.1f, -0.2f));
 
     // Creates a right-back leg.
@@ -124,8 +114,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(4, rank);
     m_object->SetObjectParent(4, 3);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant5.mod", false, rank);
     m_object->SetPosition(4, Math::Vector(0.0f, 0.0f, -1.0f));
 
     // Creates a right-back foot.
@@ -133,8 +122,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(5, rank);
     m_object->SetObjectParent(5, 4);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant6.mod", false, rank);
     m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -2.0f));
 
     // Creates two middle-right thighs.
@@ -142,8 +130,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(6, rank);
     m_object->SetObjectParent(6, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant4.mod", false, rank);
     m_object->SetPosition(6, Math::Vector(0.3f, -0.1f, -0.4f));
 
     // Creates two middle-right legs.
@@ -151,8 +138,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(7, rank);
     m_object->SetObjectParent(7, 6);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant5.mod", false, rank);
     m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -1.0f));
 
     // Creates two middle-right feet.
@@ -160,8 +146,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(8, rank);
     m_object->SetObjectParent(8, 7);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant6.mod", false, rank);
     m_object->SetPosition(8, Math::Vector(0.0f, 0.0f, -2.0f));
 
     // Creates the right front thigh.
@@ -169,8 +154,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(9, rank);
     m_object->SetObjectParent(9, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant4.mod", false, rank);
     m_object->SetPosition(9, Math::Vector(1.0f, -0.1f, -0.7f));
 
     // Creates the right front leg.
@@ -178,8 +162,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(10, rank);
     m_object->SetObjectParent(10, 9);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant5.mod", false, rank);
     m_object->SetPosition(10, Math::Vector(0.0f, 0.0f, -1.0f));
 
     // Creates the right front foot.
@@ -187,8 +170,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(11, rank);
     m_object->SetObjectParent(11, 10);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant6.mod", false, rank);
     m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -2.0f));
 
     // Creates a left-back thigh.
@@ -196,8 +178,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(12, rank);
     m_object->SetObjectParent(12, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant4.mod", false, rank);
     m_object->SetPosition(12, Math::Vector(-0.3f, -0.1f, 0.2f));
     m_object->SetAngleY(12, Math::PI);
 
@@ -206,8 +187,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(13, rank);
     m_object->SetObjectParent(13, 12);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant5.mod", false, rank);
     m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -1.0f));
 
     // Creates a left-back foot.
@@ -215,8 +195,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(14, rank);
     m_object->SetObjectParent(14, 13);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant6.mod", false, rank);
     m_object->SetPosition(14, Math::Vector(0.0f, 0.0f, -2.0f));
 
     // Creates two middle-left thigh.
@@ -224,8 +203,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(15, rank);
     m_object->SetObjectParent(15, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant4.mod", false, rank);
     m_object->SetPosition(15, Math::Vector(0.3f, -0.1f, 0.4f));
     m_object->SetAngleY(15, Math::PI);
 
@@ -234,8 +212,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(16, rank);
     m_object->SetObjectParent(16, 15);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant5.mod", false, rank);
     m_object->SetPosition(16, Math::Vector(0.0f, 0.0f, -1.0f));
 
     // Creates two middle-left feet.
@@ -243,8 +220,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(17, rank);
     m_object->SetObjectParent(17, 16);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant6.mod", false, rank);
     m_object->SetPosition(17, Math::Vector(0.0f, 0.0f, -2.0f));
 
     // Creates front-left thigh.
@@ -252,8 +228,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(18, rank);
     m_object->SetObjectParent(18, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant4.mod", false, rank);
     m_object->SetPosition(18, Math::Vector(1.0f, -0.1f, 0.7f));
     m_object->SetAngleY(18, Math::PI);
 
@@ -262,8 +237,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(19, rank);
     m_object->SetObjectParent(19, 18);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant5.mod", false, rank);
     m_object->SetPosition(19, Math::Vector(0.0f, 0.0f, -1.0f));
 
     // Creates front-left foot.
@@ -271,8 +245,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(20, rank);
     m_object->SetObjectParent(20, 19);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("ant6.mod", false, rank);
     m_object->SetPosition(20, Math::Vector(0.0f, 0.0f, -2.0f));
 
     // Creates the right wing.
@@ -280,8 +253,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(21, rank);
     m_object->SetObjectParent(21, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee7.mod"));
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("bee7.mod", false, rank);
     m_object->SetPosition(21, Math::Vector(0.8f, 0.4f, -0.5f));
 
     // Creates the left wing.
@@ -289,9 +261,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
     m_object->SetObjectRank(22, rank);
     m_object->SetObjectParent(22, 0);
-    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee7.mod"));
-    pModFile->Mirror();
-    pModFile->CreateEngineObject(rank);
+    modelManager->AddModelReference("bee7.mod", true, rank);
     m_object->SetPosition(22, Math::Vector(0.8f, 0.4f, 0.5f));
 
     m_object->CreateShadowCircle(6.0f, 0.5f);
@@ -304,7 +274,6 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type,
 
     m_engine->LoadAllTextures();
 
-    delete pModFile;
     return true;
 }
 
-- 
cgit v1.2.3-1-g7c22


From 001d37b257b126dd6ef1dced70f94ff3d2806d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dziwi=C5=84ski?= <piotr.dziwinski@nsn.com>
Date: Sat, 16 Feb 2013 22:37:43 +0100
Subject: CInstanceManager refactoring

 * removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
---
 src/object/motion/motionbee.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/object/motion/motionbee.cpp')

diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp
index 111339d..8f69945 100644
--- a/src/object/motion/motionbee.cpp
+++ b/src/object/motion/motionbee.cpp
@@ -34,8 +34,7 @@ const float START_TIME = 1000.0f;       // beginning of the relative time
 
 // Object's constructor.
 
-CMotionBee::CMotionBee(CInstanceManager* iMan, CObject* object)
-                      : CMotion(iMan, object)
+CMotionBee::CMotionBee(CObject* object) : CMotion(object)
 {
     m_armMember      = START_TIME;
     m_armTimeAbs     = START_TIME;
-- 
cgit v1.2.3-1-g7c22