From fd09071c29452bdfea2c519f0defbffebee42f4c Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 22 Sep 2012 14:40:13 +0200 Subject: Data dir paths - changed access to paths in data directory in CApplication - models now load from data directory --- src/object/motion/motionbee.cpp | 55 +++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'src/object/motion/motionbee.cpp') diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index 026be7a..a3421b8 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.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/. -// motionbee.cpp - - -#include #include "object/motion/motionbee.h" +#include "app/app.h" + #include "graphics/engine/modelfile.h" + #include "physics/physics.h" +#include + #define ADJUST_ANGLE false // true -> adjusts the angles of the members const float START_TIME = 1000.0f; // beginning of the relative time @@ -80,7 +81,7 @@ bool CMotionBee::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/bee1.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee1.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); @@ -96,7 +97,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("data/models/bee2.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee2.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(1.6f, 0.3f, 0.0f)); @@ -105,7 +106,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("data/models/bee3.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee3.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(-0.8f, 0.0f, 0.0f)); @@ -114,7 +115,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("data/models/ant4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(-0.3f, -0.1f, -0.2f)); @@ -123,7 +124,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("data/models/ant5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -132,7 +133,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("data/models/ant6.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -141,7 +142,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("data/models/ant4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.3f, -0.1f, -0.4f)); @@ -150,7 +151,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("data/models/ant5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -159,7 +160,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("data/models/ant6.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -168,7 +169,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("data/models/ant4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(1.0f, -0.1f, -0.7f)); @@ -177,7 +178,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("data/models/ant5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(10, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -186,7 +187,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("data/models/ant6.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -195,7 +196,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("data/models/ant4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(12, Math::Vector(-0.3f, -0.1f, 0.2f)); m_object->SetAngleY(12, Math::PI); @@ -205,7 +206,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("data/models/ant5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -214,7 +215,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("data/models/ant6.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(14, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -223,7 +224,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("data/models/ant4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(15, Math::Vector(0.3f, -0.1f, 0.4f)); m_object->SetAngleY(15, Math::PI); @@ -233,7 +234,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("data/models/ant5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(16, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -242,7 +243,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("data/models/ant6.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(17, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -251,7 +252,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("data/models/ant4.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant4.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(18, Math::Vector(1.0f, -0.1f, 0.7f)); m_object->SetAngleY(18, Math::PI); @@ -261,7 +262,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("data/models/ant5.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant5.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(19, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -270,7 +271,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("data/models/ant6.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "ant6.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(20, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -279,7 +280,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("data/models/bee7.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee7.mod")); pModFile->CreateEngineObject(rank); m_object->SetPosition(21, Math::Vector(0.8f, 0.4f, -0.5f)); @@ -288,7 +289,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("data/models/bee7.mod"); + pModFile->ReadModel(m_app->GetDataFilePath(DIR_MODEL, "bee7.mod")); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(22, Math::Vector(0.8f, 0.4f, 0.5f)); -- cgit v1.2.3-1-g7c22