diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 14:40:13 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 14:40:13 +0200 |
commit | fd09071c29452bdfea2c519f0defbffebee42f4c (patch) | |
tree | 44d2d9d59d4c98204cb1d60bf101414bfc45b708 /src/object/motion/motiontoto.cpp | |
parent | 37e7c73f439c0d8cbfd0f1c02b7ef5916fd748ae (diff) | |
download | colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.tar.gz colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.tar.bz2 colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.zip |
Data dir paths
- changed access to paths in data directory in CApplication
- models now load from data directory
Diffstat (limited to 'src/object/motion/motiontoto.cpp')
-rw-r--r-- | src/object/motion/motiontoto.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 7068564..274f171 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -14,20 +14,23 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// motiontoto.cpp - - -#include <stdio.h> #include "object/motion/motiontoto.h" +#include "app/app.h" + #include "math/geometry.h" + #include "graphics/engine/terrain.h" #include "graphics/engine/water.h" #include "graphics/engine/modelfile.h" + #include "object/robotmain.h" +#include <stdio.h> + + const float START_TIME = 1000.0f; // beginning of the relative time @@ -91,7 +94,7 @@ bool CMotionToto::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("data/models/toto1.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto1.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); m_object->SetAngleY(0, angle); @@ -101,7 +104,7 @@ bool CMotionToto::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/toto2.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto2.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(1.00f, 0.17f, 0.00f)); @@ -110,7 +113,7 @@ bool CMotionToto::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/toto3.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto3.mod")); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(0.85f, 1.04f, 0.25f)); @@ -121,7 +124,7 @@ bool CMotionToto::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("data/models/toto3.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto3.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(0.85f, 1.04f, -0.25f)); m_object->SetAngleY(3, 20.0f*Math::PI/180.0f); @@ -131,7 +134,7 @@ bool CMotionToto::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/toto4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(0.0f, 1.9f, 0.3f)); m_object->SetAngleX(4, 30.0f*Math::PI/180.0f); @@ -140,7 +143,7 @@ bool CMotionToto::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/toto4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.67f, 0.0f)); m_object->SetAngleX(5, 30.0f*Math::PI/180.0f); @@ -149,7 +152,7 @@ bool CMotionToto::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, 5); - pModFile->ReadModel("data/models/toto5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, 0.70f, 0.0f)); m_object->SetAngleX(6, 30.0f*Math::PI/180.0f); @@ -159,7 +162,7 @@ bool CMotionToto::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, 0); - pModFile->ReadModel("data/models/toto4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 1.9f, -0.3f)); m_object->SetAngleX(7, -30.0f*Math::PI/180.0f); @@ -168,7 +171,7 @@ bool CMotionToto::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("data/models/toto4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(0.0f, 0.67f, 0.0f)); m_object->SetAngleX(8, -30.0f*Math::PI/180.0f); @@ -177,7 +180,7 @@ bool CMotionToto::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/toto5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "toto5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(0.0f, 0.70f, 0.0f)); m_object->SetAngleX(9, -30.0f*Math::PI/180.0f); |