Data dir paths

- changed access to paths in data directory in CApplication
- models now load from data directory

1 files changed, 25 insertions, 24 deletions

diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp
index 9f02e31..8ea77a5 100644
--- a/src/object/motion/motionmother.cpp
+++ b/src/object/motion/motionmother.cpp
@@ -14,17 +14,18 @@
 // * You should have received a copy of the GNU General Public License
 // * along with this program. If not, see  http://www.gnu.org/licenses/.
 
-// motionmother.cpp
-
-
-#include <stdio.h>
 
 #include "object/motion/motionmother.h"
 
+#include "app/app.h"
+
 #include "graphics/engine/modelfile.h"
+
 #include "physics/physics.h"
 
 
+#include <stdio.h>
+
 
 #define ADJUST_ANGLE        false       // true -> adjusts the angles of the members
 const float START_TIME = 1000.0f;       // beginning of the relative time
@@ -81,7 +82,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type,
     m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE);  // this is a moving object
     m_object->SetObjectRank(0, rank);
 
-    pModFile->ReadModel("data/models/mother1.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother1.mod"));
     pModFile->CreateEngineObject(rank);
 
     m_object->SetPosition(0, pos);
@@ -97,7 +98,7 @@ bool CMotionMother::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("data/models/mother2.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother2.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(1, Math::Vector(16.0f, 3.0f, 0.0f));
 
@@ -106,7 +107,7 @@ bool CMotionMother::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("data/models/mother3.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother3.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(2, Math::Vector(-5.0f, -1.0f, -12.0f));
 
@@ -115,7 +116,7 @@ bool CMotionMother::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, 2);
-    pModFile->ReadModel("data/models/mother4.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother4.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(3, Math::Vector(0.0f, 0.0f, -8.5f));
 
@@ -124,7 +125,7 @@ bool CMotionMother::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, 0);
-    pModFile->ReadModel("data/models/mother3.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother3.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(4, Math::Vector(3.5f, -1.0f, -12.0f));
 
@@ -133,7 +134,7 @@ bool CMotionMother::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("data/models/mother4.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother4.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -8.5f));
 
@@ -142,7 +143,7 @@ bool CMotionMother::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("data/models/mother3.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother3.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(6, Math::Vector(10.0f, -1.0f, -10.0f));
 
@@ -151,7 +152,7 @@ bool CMotionMother::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("data/models/mother4.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother4.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -8.5f));
 
@@ -160,7 +161,7 @@ bool CMotionMother::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, 0);
-    pModFile->ReadModel("data/models/mother3.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother3.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(8, Math::Vector(-5.0f, -1.0f, 12.0f));
     m_object->SetAngleY(8, Math::PI);
@@ -170,7 +171,7 @@ bool CMotionMother::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, 8);
-    pModFile->ReadModel("data/models/mother4.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother4.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(9, Math::Vector(0.0f, 0.0f, -8.5f));
 
@@ -179,7 +180,7 @@ bool CMotionMother::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, 0);
-    pModFile->ReadModel("data/models/mother3.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother3.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(10, Math::Vector(3.5f, -1.0f, 12.0f));
     m_object->SetAngleY(10, Math::PI);
@@ -189,7 +190,7 @@ bool CMotionMother::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("data/models/mother4.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother4.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -8.5f));
 
@@ -198,7 +199,7 @@ bool CMotionMother::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("data/models/mother3.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother3.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(12, Math::Vector(10.0f, -1.0f, 10.0f));
     m_object->SetAngleY(12, Math::PI);
@@ -208,7 +209,7 @@ bool CMotionMother::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("data/models/mother4.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother4.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -8.5f));
 
@@ -217,7 +218,7 @@ bool CMotionMother::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, 1);
-    pModFile->ReadModel("data/models/mother5.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother5.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(14, Math::Vector(6.0f, 1.0f, -2.5f));
 
@@ -225,7 +226,7 @@ bool CMotionMother::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, 14);
-    pModFile->ReadModel("data/models/mother6.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother6.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(15, Math::Vector(8.0f, 0.0f, 0.0f));
 
@@ -234,7 +235,7 @@ bool CMotionMother::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, 1);
-    pModFile->ReadModel("data/models/mother5.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother5.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(16, Math::Vector(6.0f, 1.0f, 2.5f));
 
@@ -242,7 +243,7 @@ bool CMotionMother::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("data/models/mother6.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother6.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(17, Math::Vector(8.0f, 0.0f, 0.0f));
 
@@ -251,7 +252,7 @@ bool CMotionMother::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, 1);
-    pModFile->ReadModel("data/models/mother7.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother7.mod"));
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(18, Math::Vector(-4.0f, -3.5f, -8.0f));
     m_object->SetZoomX(18, 1.2f);
@@ -261,7 +262,7 @@ bool CMotionMother::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, 1);
-    pModFile->ReadModel("data/models/mother7.mod");
+    pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "mother7.mod"));
     pModFile->Mirror();
     pModFile->CreateEngineObject(rank);
     m_object->SetPosition(19, Math::Vector(-4.0f, -3.5f, 8.0f));