immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed extensions from model filenames to let the game load alternatives when available

dev
Tomasz Kapuściński 2022-03-12 23:34:46 +01:00
parent 829c5fb42f
commit 4b1b1763df
11 changed files with 411 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/object/motion/motionant.cpp
View File

@ -82,7 +82,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICLE); // this is a moving object
m_object->SetObjectRank(0, rank);
modelManager->AddModelReference("ant1.mod", false, rank);
modelManager->AddModelReference("ant1", false, rank);
m_object->SetPosition(pos);
m_object->SetRotationY(angle);
@ -96,7 +96,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("ant2.mod", false, rank);
modelManager->AddModelReference("ant2", false, rank);
m_object->SetPartPosition(1, glm::vec3(2.0f, 0.0f, 0.0f));
// Creates the tail.
@ -104,7 +104,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("ant3.mod", false, rank);
modelManager->AddModelReference("ant3", false, rank);
m_object->SetPartPosition(2, glm::vec3(-1.0f, 0.0f, 0.0f));
// Creates a right-back thigh.
@ -112,7 +112,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(3, glm::vec3(-0.4f, -0.1f, -0.3f));
// Creates a right-back leg.
@ -120,7 +120,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 3);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(4, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates a right-back foot.
@ -128,7 +128,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 4);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(5, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates two middle-right thighs.
@ -136,7 +136,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(6, glm::vec3(0.1f, -0.1f, -0.4f));
// Creates two middle-right legs.
@ -144,7 +144,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 6);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(7, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates two middle-right foots.
@ -152,7 +152,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 7);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(8, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates the right front thigh.
@ -160,7 +160,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(9, glm::vec3(1.4f, -0.1f, -0.6f));
// Creates the right front leg.
@ -168,7 +168,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(10, rank);
m_object->SetObjectParent(10, 9);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(10, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates the right front foot.
@ -176,7 +176,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(11, rank);
m_object->SetObjectParent(11, 10);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(11, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates a left-back thigh.
@ -184,7 +184,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(12, rank);
m_object->SetObjectParent(12, 0);
modelManager->AddModelReference("ant4.mod", true, rank);
modelManager->AddModelReference("ant4", true, rank);
m_object->SetPartPosition(12, glm::vec3(-0.4f, -0.1f, 0.3f));
// Creates a left-back leg.
@ -192,7 +192,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(13, rank);
m_object->SetObjectParent(13, 12);
modelManager->AddModelReference("ant5.mod", true, rank);
modelManager->AddModelReference("ant5", true, rank);
m_object->SetPartPosition(13, glm::vec3(0.0f, 0.0f, 1.0f));
// Creates a left-back foot.
@ -200,7 +200,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(14, rank);
m_object->SetObjectParent(14, 13);
modelManager->AddModelReference("ant6.mod", true, rank);
modelManager->AddModelReference("ant6", true, rank);
m_object->SetPartPosition(14, glm::vec3(0.0f, 0.0f, 2.0f));
// Creates two middle-left thighs.
@ -208,7 +208,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(15, rank);
m_object->SetObjectParent(15, 0);
modelManager->AddModelReference("ant4.mod", true, rank);
modelManager->AddModelReference("ant4", true, rank);
m_object->SetPartPosition(15, glm::vec3(0.1f, -0.1f, 0.4f));
// Creates two middle-left legs.
@ -216,7 +216,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(16, rank);
m_object->SetObjectParent(16, 15);
modelManager->AddModelReference("ant5.mod", true, rank);
modelManager->AddModelReference("ant5", true, rank);
m_object->SetPartPosition(16, glm::vec3(0.0f, 0.0f, 1.0f));
// Creates two middle-left foot.
@ -224,7 +224,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(17, rank);
m_object->SetObjectParent(17, 16);
modelManager->AddModelReference("ant6.mod", true, rank);
modelManager->AddModelReference("ant6", true, rank);
m_object->SetPartPosition(17, glm::vec3(0.0f, 0.0f, 2.0f));
// Creates the left front thigh.
@ -232,7 +232,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(18, rank);
m_object->SetObjectParent(18, 0);
modelManager->AddModelReference("ant4.mod", true, rank);
modelManager->AddModelReference("ant4", true, rank);
m_object->SetPartPosition(18, glm::vec3(1.4f, -0.1f, 0.6f));
// Creates the left front leg.
@ -240,7 +240,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(19, rank);
m_object->SetObjectParent(19, 18);
modelManager->AddModelReference("ant5.mod", true, rank);
modelManager->AddModelReference("ant5", true, rank);
m_object->SetPartPosition(19, glm::vec3(0.0f, 0.0f, 1.0f));
// Creates the left front foot.
@ -248,7 +248,7 @@ void CMotionAnt::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(20, rank);
m_object->SetObjectParent(20, 19);
modelManager->AddModelReference("ant6.mod", true, rank);
modelManager->AddModelReference("ant6", true, rank);
m_object->SetPartPosition(20, glm::vec3(0.0f, 0.0f, 2.0f));
m_object->CreateShadowCircle(4.0f, 0.5f);

46
src/object/motion/motionbee.cpp
View File

@ -77,7 +77,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICLE); // this is a moving object
m_object->SetObjectRank(0, rank);
modelManager->AddModelReference("bee1.mod", false, rank);
modelManager->AddModelReference("bee1", false, rank);
m_object->SetPosition(pos);
m_object->SetRotationY(angle);
@ -91,7 +91,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("bee2.mod", false, rank);
modelManager->AddModelReference("bee2", false, rank);
m_object->SetPartPosition(1, glm::vec3(1.6f, 0.3f, 0.0f));
// Creates the tail.
@ -99,7 +99,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("bee3.mod", false, rank);
modelManager->AddModelReference("bee3", false, rank);
m_object->SetPartPosition(2, glm::vec3(-0.8f, 0.0f, 0.0f));
// Creates a right-back thigh.
@ -107,7 +107,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(3, glm::vec3(-0.3f, -0.1f, -0.2f));
// Creates a right-back leg.
@ -115,7 +115,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 3);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(4, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates a right-back foot.
@ -123,7 +123,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 4);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(5, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates two middle-right thighs.
@ -131,7 +131,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(6, glm::vec3(0.3f, -0.1f, -0.4f));
// Creates two middle-right legs.
@ -139,7 +139,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 6);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(7, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates two middle-right feet.
@ -147,7 +147,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 7);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(8, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates the right front thigh.
@ -155,7 +155,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(9, glm::vec3(1.0f, -0.1f, -0.7f));
// Creates the right front leg.
@ -163,7 +163,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(10, rank);
m_object->SetObjectParent(10, 9);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(10, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates the right front foot.
@ -171,7 +171,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(11, rank);
m_object->SetObjectParent(11, 10);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(11, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates a left-back thigh.
@ -179,7 +179,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(12, rank);
m_object->SetObjectParent(12, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(12, glm::vec3(-0.3f, -0.1f, 0.2f));
m_object->SetPartRotationY(12, Math::PI);
@ -188,7 +188,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(13, rank);
m_object->SetObjectParent(13, 12);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(13, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates a left-back foot.
@ -196,7 +196,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(14, rank);
m_object->SetObjectParent(14, 13);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(14, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates two middle-left thigh.
@ -204,7 +204,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(15, rank);
m_object->SetObjectParent(15, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(15, glm::vec3(0.3f, -0.1f, 0.4f));
m_object->SetPartRotationY(15, Math::PI);
@ -213,7 +213,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(16, rank);
m_object->SetObjectParent(16, 15);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(16, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates two middle-left feet.
@ -221,7 +221,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(17, rank);
m_object->SetObjectParent(17, 16);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(17, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates front-left thigh.
@ -229,7 +229,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(18, rank);
m_object->SetObjectParent(18, 0);
modelManager->AddModelReference("ant4.mod", false, rank);
modelManager->AddModelReference("ant4", false, rank);
m_object->SetPartPosition(18, glm::vec3(1.0f, -0.1f, 0.7f));
m_object->SetPartRotationY(18, Math::PI);
@ -238,7 +238,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(19, rank);
m_object->SetObjectParent(19, 18);
modelManager->AddModelReference("ant5.mod", false, rank);
modelManager->AddModelReference("ant5", false, rank);
m_object->SetPartPosition(19, glm::vec3(0.0f, 0.0f, -1.0f));
// Creates front-left foot.
@ -246,7 +246,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(20, rank);
m_object->SetObjectParent(20, 19);
modelManager->AddModelReference("ant6.mod", false, rank);
modelManager->AddModelReference("ant6", false, rank);
m_object->SetPartPosition(20, glm::vec3(0.0f, 0.0f, -2.0f));
// Creates the right wing.
@ -254,7 +254,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(21, rank);
m_object->SetObjectParent(21, 0);
modelManager->AddModelReference("bee7.mod", false, rank);
modelManager->AddModelReference("bee7", false, rank);
m_object->SetPartPosition(21, glm::vec3(0.8f, 0.4f, -0.5f));
// Creates the left wing.
@ -262,7 +262,7 @@ void CMotionBee::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(22, rank);
m_object->SetObjectParent(22, 0);
modelManager->AddModelReference("bee7.mod", true, rank);
modelManager->AddModelReference("bee7", true, rank);
m_object->SetPartPosition(22, glm::vec3(0.8f, 0.4f, 0.5f));
m_object->CreateShadowCircle(6.0f, 0.5f);

44
src/object/motion/motionhuman.cpp
View File

@ -119,7 +119,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICLE); // this is a moving object
m_object->SetObjectRank(0, rank);
face = m_main->GetGamerFace();
sprintf(filename, "human2h%d.mod", face+1);
sprintf(filename, "human2h%d", face+1);
modelManager->AddModelReference(filename, false, rank);
glasses = m_main->GetGamerGlasses();
@ -129,7 +129,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
sprintf(filename, "human2g%d.mod", glasses);
sprintf(filename, "human2g%d", glasses);
modelManager->AddModelReference(filename, false, rank);
}
@ -147,11 +147,11 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_object->SetObjectRank(0, rank);
if (option == 0) // head in helmet?
modelManager->AddModelReference("human1c.mod", false, rank);
modelManager->AddModelReference("human1c", false, rank);
else if (option == 1) // head without helmet?
modelManager->AddModelReference("human1h.mod", false, rank);
modelManager->AddModelReference("human1h", false, rank);
else if (option == 2) // without a backpack?
modelManager->AddModelReference("human1v.mod", false, rank);
modelManager->AddModelReference("human1v", false, rank);
m_object->SetPosition(pos);
m_object->SetRotationY(angle);
@ -171,20 +171,20 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
if (option == 0) // head in helmet?
{
face = m_main->GetGamerFace();
sprintf(filename, "human2c%d.mod", face+1);
sprintf(filename, "human2c%d", face+1);
modelManager->AddModelReference(filename, false, rank);
}
else if (option == 1 || // head without helmet?
option == 2) // without a backpack?
{
face = m_main->GetGamerFace();
sprintf(filename, "human2h%d.mod", face+1);
sprintf(filename, "human2h%d", face+1);
modelManager->AddModelReference(filename, false, rank);
}
}
else if (type == OBJECT_TECH)
{
modelManager->AddModelReference("human2t.mod", false, rank);
modelManager->AddModelReference("human2t", false, rank);
}
m_object->SetPartPosition(1, glm::vec3(0.0f, 2.7f, 0.0f));
@ -202,7 +202,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(m_glassesRank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(15, m_glassesRank);
m_object->SetObjectParent(15, 1);
sprintf(filename, "human2g%d.mod", glasses);
sprintf(filename, "human2g%d", glasses);
modelManager->AddModelReference(filename, false, m_glassesRank);
}
@ -211,7 +211,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("human3.mod", false, rank);
modelManager->AddModelReference("human3", false, rank);
m_object->SetPartPosition(2, glm::vec3(0.0f, 2.3f, -1.2f));
m_object->SetPartRotation(2, glm::vec3(90.0f*Math::PI/180.0f, 90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f));
@ -220,7 +220,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 2);
modelManager->AddModelReference("human4r.mod", false, rank);
modelManager->AddModelReference("human4r", false, rank);
m_object->SetPartPosition(3, glm::vec3(1.3f, 0.0f, 0.0f));
m_object->SetPartRotation(3, glm::vec3(0.0f*Math::PI/180.0f, -20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f));
@ -229,7 +229,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 3);
modelManager->AddModelReference("human5.mod", false, rank);
modelManager->AddModelReference("human5", false, rank);
m_object->SetPartPosition(4, glm::vec3(1.2f, 0.0f, 0.0f));
// Creates the right thigh.
@ -237,7 +237,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 0);
modelManager->AddModelReference("human6.mod", false, rank);
modelManager->AddModelReference("human6", false, rank);
m_object->SetPartPosition(5, glm::vec3(0.0f, 0.0f, -0.7f));
m_object->SetPartRotation(5, glm::vec3(10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));
@ -246,7 +246,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 5);
modelManager->AddModelReference("human7.mod", false, rank);
modelManager->AddModelReference("human7", false, rank);
m_object->SetPartPosition(6, glm::vec3(0.0f, -1.5f, 0.0f));
m_object->SetPartRotation(6, glm::vec3(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f));
@ -255,7 +255,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 6);
modelManager->AddModelReference("human8.mod", false, rank);
modelManager->AddModelReference("human8", false, rank);
m_object->SetPartPosition(7, glm::vec3(0.0f, -1.5f, 0.0f));
m_object->SetPartRotation(7, glm::vec3(-10.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));
@ -264,7 +264,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 0);
modelManager->AddModelReference("human3.mod", true, rank);
modelManager->AddModelReference("human3", true, rank);
m_object->SetPartPosition(8, glm::vec3(0.0f, 2.3f, 1.2f));
m_object->SetPartRotation(8, glm::vec3(-90.0f*Math::PI/180.0f, -90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f));
@ -273,7 +273,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 8);
modelManager->AddModelReference("human4l.mod", true, rank);
modelManager->AddModelReference("human4l", true, rank);
m_object->SetPartPosition(9, glm::vec3(1.3f, 0.0f, 0.0f));
m_object->SetPartRotation(9, glm::vec3(0.0f*Math::PI/180.0f, 20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f));
@ -282,7 +282,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(10, rank);
m_object->SetObjectParent(10, 9);
modelManager->AddModelReference("human5.mod", true, rank);
modelManager->AddModelReference("human5", true, rank);
m_object->SetPartPosition(10, glm::vec3(1.2f, 0.0f, 0.0f));
// Creates the left thigh.
@ -290,7 +290,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(11, rank);
m_object->SetObjectParent(11, 0);
modelManager->AddModelReference("human6.mod", true, rank);
modelManager->AddModelReference("human6", true, rank);
m_object->SetPartPosition(11, glm::vec3(0.0f, 0.0f, 0.7f));
m_object->SetPartRotation(11, glm::vec3(-10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));
@ -299,7 +299,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(12, rank);
m_object->SetObjectParent(12, 11);
modelManager->AddModelReference("human7.mod", true, rank);
modelManager->AddModelReference("human7", true, rank);
m_object->SetPartPosition(12, glm::vec3(0.0f, -1.5f, 0.0f));
m_object->SetPartRotation(12, glm::vec3(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f));
@ -308,7 +308,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(13, rank);
m_object->SetObjectParent(13, 12);
modelManager->AddModelReference("human8.mod", true, rank);
modelManager->AddModelReference("human8", true, rank);
m_object->SetPartPosition(13, glm::vec3(0.0f, -1.5f, 0.0f));
m_object->SetPartRotation(13, glm::vec3(10.0f*Math::PI/180.0f, -5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f));
@ -319,7 +319,7 @@ void CMotionHuman::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(14, rank);
m_object->SetObjectParent(14, 0);
modelManager->AddModelReference("human9.mod", false, rank);
modelManager->AddModelReference("human9", false, rank);
m_object->SetPartPosition(14, glm::vec3(-1.5f, 0.3f, -1.35f));
m_object->SetPartRotationZ(14, Math::PI);
}

40
src/object/motion/motionqueen.cpp
View File

@ -77,7 +77,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICLE); // this is a moving object
m_object->SetObjectRank(0, rank);
modelManager->AddModelReference("mother1.mod", false, rank);
modelManager->AddModelReference("mother1", false, rank);
m_object->SetPosition(pos);
m_object->SetRotationY(angle);
@ -91,7 +91,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("mother2.mod", false, rank);
modelManager->AddModelReference("mother2", false, rank);
m_object->SetPartPosition(1, glm::vec3(16.0f, 3.0f, 0.0f));
// Creates a right-back leg.
@ -99,7 +99,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("mother3.mod", false, rank);
modelManager->AddModelReference("mother3", false, rank);
m_object->SetPartPosition(2, glm::vec3(-5.0f, -1.0f, -12.0f));
// Creates a right-back foot.
@ -107,7 +107,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 2);
modelManager->AddModelReference("mother4.mod", false, rank);
modelManager->AddModelReference("mother4", false, rank);
m_object->SetPartPosition(3, glm::vec3(0.0f, 0.0f, -8.5f));
// Creates a middle-right leg.
@ -115,7 +115,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 0);
modelManager->AddModelReference("mother3.mod", false, rank);
modelManager->AddModelReference("mother3", false, rank);
m_object->SetPartPosition(4, glm::vec3(3.5f, -1.0f, -12.0f));
// Creates a middle-right foot.
@ -123,7 +123,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 4);
modelManager->AddModelReference("mother4.mod", false, rank);
modelManager->AddModelReference("mother4", false, rank);
m_object->SetPartPosition(5, glm::vec3(0.0f, 0.0f, -8.5f));
// Creates a right-front leg.
@ -131,7 +131,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("mother3.mod", false, rank);
modelManager->AddModelReference("mother3", false, rank);
m_object->SetPartPosition(6, glm::vec3(10.0f, -1.0f, -10.0f));
// Creates a right-front foot.
@ -139,7 +139,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 6);
modelManager->AddModelReference("mother4.mod", false, rank);
modelManager->AddModelReference("mother4", false, rank);
m_object->SetPartPosition(7, glm::vec3(0.0f, 0.0f, -8.5f));
// Creates a left-back leg.
@ -147,7 +147,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 0);
modelManager->AddModelReference("mother3.mod", false, rank);
modelManager->AddModelReference("mother3", false, rank);
m_object->SetPartPosition(8, glm::vec3(-5.0f, -1.0f, 12.0f));
m_object->SetPartRotationY(8, Math::PI);
@ -156,7 +156,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 8);
modelManager->AddModelReference("mother4.mod", false, rank);
modelManager->AddModelReference("mother4", false, rank);
m_object->SetPartPosition(9, glm::vec3(0.0f, 0.0f, -8.5f));
// Creates a middle-left leg.
@ -164,7 +164,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(10, rank);
m_object->SetObjectParent(10, 0);
modelManager->AddModelReference("mother3.mod", false, rank);
modelManager->AddModelReference("mother3", false, rank);
m_object->SetPartPosition(10, glm::vec3(3.5f, -1.0f, 12.0f));
m_object->SetPartRotationY(10, Math::PI);
@ -173,7 +173,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(11, rank);
m_object->SetObjectParent(11, 10);
modelManager->AddModelReference("mother4.mod", false, rank);
modelManager->AddModelReference("mother4", false, rank);
m_object->SetPartPosition(11, glm::vec3(0.0f, 0.0f, -8.5f));
// Creates a left-front leg.
@ -181,7 +181,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(12, rank);
m_object->SetObjectParent(12, 0);
modelManager->AddModelReference("mother3.mod", false, rank);
modelManager->AddModelReference("mother3", false, rank);
m_object->SetPartPosition(12, glm::vec3(10.0f, -1.0f, 10.0f));
m_object->SetPartRotationY(12, Math::PI);
@ -190,7 +190,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(13, rank);
m_object->SetObjectParent(13, 12);
modelManager->AddModelReference("mother4.mod", false, rank);
modelManager->AddModelReference("mother4", false, rank);
m_object->SetPartPosition(13, glm::vec3(0.0f, 0.0f, -8.5f));
// Creates the right antenna.
@ -198,14 +198,14 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(14, rank);
m_object->SetObjectParent(14, 1);
modelManager->AddModelReference("mother5.mod", false, rank);
modelManager->AddModelReference("mother5", false, rank);
m_object->SetPartPosition(14, glm::vec3(6.0f, 1.0f, -2.5f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(15, rank);
m_object->SetObjectParent(15, 14);
modelManager->AddModelReference("mother6.mod", false, rank);
modelManager->AddModelReference("mother6", false, rank);
m_object->SetPartPosition(15, glm::vec3(8.0f, 0.0f, 0.0f));
// Creates the left antenna.
@ -213,14 +213,14 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(16, rank);
m_object->SetObjectParent(16, 1);
modelManager->AddModelReference("mother5.mod", false, rank);
modelManager->AddModelReference("mother5", false, rank);
m_object->SetPartPosition(16, glm::vec3(6.0f, 1.0f, 2.5f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(17, rank);
m_object->SetObjectParent(17, 16);
modelManager->AddModelReference("mother6.mod", false, rank);
modelManager->AddModelReference("mother6", false, rank);
m_object->SetPartPosition(17, glm::vec3(8.0f, 0.0f, 0.0f));
// Creates the right claw.
@ -228,7 +228,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(18, rank);
m_object->SetObjectParent(18, 1);
modelManager->AddModelReference("mother7.mod", false, rank);
modelManager->AddModelReference("mother7", false, rank);
m_object->SetPartPosition(18, glm::vec3(-4.0f, -3.5f, -8.0f));
m_object->SetPartScaleX(18, 1.2f);
@ -237,7 +237,7 @@ void CMotionQueen::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(19, rank);
m_object->SetObjectParent(19, 1);
modelManager->AddModelReference("mother7.mod", true, rank);
modelManager->AddModelReference("mother7", true, rank);
m_object->SetPartPosition(19, glm::vec3(-4.0f, -3.5f, 8.0f));
m_object->SetPartScaleX(19, 1.2f);

10
src/object/motion/motionspider.cpp
View File

@ -120,7 +120,7 @@ void CMotionSpider::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("spider1.mod", false, rank);
modelManager->AddModelReference("spider1", false, rank);
m_object->SetPartPosition(1, glm::vec3(1.0f, 0.0f, 0.0f));
// Creates the head.
@ -128,7 +128,7 @@ void CMotionSpider::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("spider2.mod", false, rank);
modelManager->AddModelReference("spider2", false, rank);
m_object->SetPartPosition(2, glm::vec3(1.0f, 0.0f, 0.0f));
// Creates legs.
@ -136,7 +136,7 @@ void CMotionSpider::Create(glm::vec3 pos, float angle, ObjectType type,
{
for ( j=0 ; j<4 ; j++ )
{
sprintf(name, "spider%d.mod", j+3); // 3..6
sprintf(name, "spider%d", j+3); // 3..6
// Creates the right leg.
rank = m_engine->CreateObject();
@ -171,7 +171,7 @@ void CMotionSpider::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(35, rank);
m_object->SetObjectParent(35, 1);
modelManager->AddModelReference("spider7.mod", false, rank);
modelManager->AddModelReference("spider7", false, rank);
m_object->SetPartPosition(35, glm::vec3(0.0f, 0.0f, -0.3f));
// Creates the left mandible.
@ -179,7 +179,7 @@ void CMotionSpider::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(36, rank);
m_object->SetObjectParent(36, 1);
modelManager->AddModelReference("spider7.mod", true, rank);
modelManager->AddModelReference("spider7", true, rank);
m_object->SetPartPosition(36, glm::vec3(0.0f, 0.0f, 0.3f));
m_object->CreateShadowCircle(4.0f, 0.5f);

20
src/object/motion/motiontoto.cpp
View File

@ -94,7 +94,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICLE); // this is a moving object
m_object->SetObjectRank(0, rank);
modelManager->AddModelReference("toto1.mod", false, rank);
modelManager->AddModelReference("toto1", false, rank);
m_object->SetPosition(pos);
m_object->SetRotationY(angle);
@ -103,7 +103,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("toto2.mod", false, rank);
modelManager->AddModelReference("toto2", false, rank);
m_object->SetPartPosition(1, glm::vec3(1.00f, 0.17f, 0.00f));
// Creates the left eye.
@ -111,7 +111,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("toto3.mod", true, rank);
modelManager->AddModelReference("toto3", true, rank);
m_object->SetPartPosition(2, glm::vec3(0.85f, 1.04f, 0.25f));
m_object->SetPartRotationY(2, -20.0f*Math::PI/180.0f);
@ -120,7 +120,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 0);
modelManager->AddModelReference("toto3.mod", false, rank);
modelManager->AddModelReference("toto3", false, rank);
m_object->SetPartPosition(3, glm::vec3(0.85f, 1.04f, -0.25f));
m_object->SetPartRotationY(3, 20.0f*Math::PI/180.0f);
@ -129,7 +129,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 0);
modelManager->AddModelReference("toto4.mod", false, rank);
modelManager->AddModelReference("toto4", false, rank);
m_object->SetPartPosition(4, glm::vec3(0.0f, 1.9f, 0.3f));
m_object->SetPartRotationX(4, 30.0f*Math::PI/180.0f);
@ -137,7 +137,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 4);
modelManager->AddModelReference("toto4.mod", false, rank);
modelManager->AddModelReference("toto4", false, rank);
m_object->SetPartPosition(5, glm::vec3(0.0f, 0.67f, 0.0f));
m_object->SetPartRotationX(5, 30.0f*Math::PI/180.0f);
@ -145,7 +145,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 5);
modelManager->AddModelReference("toto5.mod", false, rank);
modelManager->AddModelReference("toto5", false, rank);
m_object->SetPartPosition(6, glm::vec3(0.0f, 0.70f, 0.0f));
m_object->SetPartRotationX(6, 30.0f*Math::PI/180.0f);
@ -154,7 +154,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelReference("toto4.mod", false, rank);
modelManager->AddModelReference("toto4", false, rank);
m_object->SetPartPosition(7, glm::vec3(0.0f, 1.9f, -0.3f));
m_object->SetPartRotationX(7, -30.0f*Math::PI/180.0f);
@ -162,7 +162,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 7);
modelManager->AddModelReference("toto4.mod", false, rank);
modelManager->AddModelReference("toto4", false, rank);
m_object->SetPartPosition(8, glm::vec3(0.0f, 0.67f, 0.0f));
m_object->SetPartRotationX(8, -30.0f*Math::PI/180.0f);
@ -170,7 +170,7 @@ void CMotionToto::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 8);
modelManager->AddModelReference("toto5.mod", false, rank);
modelManager->AddModelReference("toto5", false, rank);
m_object->SetPartPosition(9, glm::vec3(0.0f, 0.70f, 0.0f));
m_object->SetPartRotationX(9, -30.0f*Math::PI/180.0f);

172
src/object/motion/motionvehicle.cpp
View File

@ -103,7 +103,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
if ((m_object->GetTrainer() && type == OBJECT_MOBILEsa) || type == OBJECT_MOBILEst)
{
modelManager->AddModelReference("trainers.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainers", false, rank, m_object->GetTeam());
}
else if ((m_object->GetTrainer() &&
( type == OBJECT_MOBILErt ||
@ -111,7 +111,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILErr ||
type == OBJECT_MOBILErs)) || type == OBJECT_MOBILErp)
{
modelManager->AddModelReference("trainerr.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainerr", false, rank, m_object->GetTeam());
}
else if (m_object->GetTrainer() ||
type == OBJECT_MOBILEwt ||
@ -119,7 +119,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILEft ||
type == OBJECT_MOBILEit)
{
modelManager->AddModelReference("trainer.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainer", false, rank, m_object->GetTeam());
}
if (type == OBJECT_MOBILEfa ||
@ -129,20 +129,20 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILEfs)
{
if (!m_object->GetTrainer())
modelManager->AddModelReference("lem1f.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem1f", false, rank, m_object->GetTeam());
else
{
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("trainerf.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainerf", false, rank, m_object->GetTeam());
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(29, rank);
m_object->SetObjectParent(29, 0);
modelManager->AddModelReference("trainera.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainera", false, rank, m_object->GetTeam());
}
}
else if (type == OBJECT_MOBILEta ||
@ -152,20 +152,20 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILEts)
{
if (!m_object->GetTrainer())
modelManager->AddModelReference("lem1t.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem1t", false, rank, m_object->GetTeam());
else
{
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("trainert.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainert", false, rank, m_object->GetTeam());
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(29, rank);
m_object->SetObjectParent(29, 0);
modelManager->AddModelReference("trainera.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainera", false, rank, m_object->GetTeam());
}
}
else if (type == OBJECT_MOBILEwa ||
@ -175,20 +175,20 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILEws)
{
if (!m_object->GetTrainer())
modelManager->AddModelReference("lem1w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem1w", false, rank, m_object->GetTeam());
else
{
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("trainerw.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainerw", false, rank, m_object->GetTeam());
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(29, rank);
m_object->SetObjectParent(29, 0);
modelManager->AddModelReference("trainera.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainera", false, rank, m_object->GetTeam());
}
}
else if (type == OBJECT_MOBILEia ||
@ -198,20 +198,20 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILEis)
{
if (!m_object->GetTrainer())
modelManager->AddModelReference("lem1i.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem1i", false, rank, m_object->GetTeam());
else
{
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("traineri.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("traineri", false, rank, m_object->GetTeam());
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(29, rank);
m_object->SetObjectParent(29, 0);
modelManager->AddModelReference("trainera.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainera", false, rank, m_object->GetTeam());
}
}
else if (!m_object->GetTrainer() &&
@ -220,15 +220,15 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
type == OBJECT_MOBILErr ||
type == OBJECT_MOBILErs))
{
modelManager->AddModelReference("roller1.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller1", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEsa && !m_object->GetTrainer())
{
modelManager->AddModelReference("subm1.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("subm1", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEtg)
{
modelManager->AddModelReference("target.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("target", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEwt)
{
@ -236,7 +236,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("trainerw.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainerw", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEft)
{
@ -244,7 +244,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("trainerf.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainerf", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEtt)
{
@ -252,7 +252,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("trainert.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("trainert", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEit)
{
@ -260,15 +260,15 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(28, rank);
m_object->SetObjectParent(28, 0);
modelManager->AddModelReference("traineri.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("traineri", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_MOBILEdr)
{
modelManager->AddModelReference("drawer1.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("drawer1", false, rank, m_object->GetTeam());
}
else if (type == OBJECT_APOLLO2)
{
modelManager->AddModelReference("apolloj1.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("apolloj1", false, rank, m_object->GetTeam());
}
m_object->SetPosition(pos);
@ -316,7 +316,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("lem2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartRotationZ(1, ARM_NEUTRAL_ANGLE1);
@ -325,7 +325,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 1);
modelManager->AddModelReference("lem3.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem3", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(5.0f, 0.0f, 0.0f));
m_object->SetPartRotationZ(2, ARM_NEUTRAL_ANGLE2);
@ -334,7 +334,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 2);
modelManager->AddModelReference("lem4.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem4", false, rank, m_object->GetTeam());
m_object->SetPartPosition(3, glm::vec3(3.5f, 0.0f, 0.0f));
m_object->SetPartRotationZ(3, ARM_NEUTRAL_ANGLE3);
m_object->SetPartRotationX(3, Math::PI/2.0f);
@ -344,7 +344,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 3);
modelManager->AddModelReference("lem5.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem5", false, rank, m_object->GetTeam());
m_object->SetPartPosition(4, glm::vec3(1.5f, 0.0f, 0.0f));
m_object->SetPartRotationZ(4, -Math::PI*0.10f);
@ -353,7 +353,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 3);
modelManager->AddModelReference("lem6.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem6", false, rank, m_object->GetTeam());
m_object->SetPartPosition(5, glm::vec3(1.5f, 0.0f, 0.0f));
m_object->SetPartRotationZ(5, Math::PI*0.10f);
}
@ -368,7 +368,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("lem2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartRotationZ(1, 110.0f*Math::PI/180.0f);
@ -377,7 +377,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 1);
modelManager->AddModelReference("lem3.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem3", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(5.0f, 0.0f, 0.0f));
m_object->SetPartRotationZ(2, -110.0f*Math::PI/180.0f);
@ -386,7 +386,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 2);
modelManager->AddModelReference("lem4s.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem4s", false, rank, m_object->GetTeam());
m_object->SetPartPosition(3, glm::vec3(3.5f, 0.0f, 0.0f));
m_object->SetPartRotationZ(3, -65.0f*Math::PI/180.0f);
}
@ -401,7 +401,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("canon.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("canon", false, rank, m_object->GetTeam());
//? m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartRotationZ(1, 0.0f);
@ -417,7 +417,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("canoni1.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("canoni1", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartRotationZ(1, 0.0f);
@ -425,7 +425,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 1);
modelManager->AddModelReference("canoni2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("canoni2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(0.0f, 2.5f, 0.0f));
m_object->SetPartRotationZ(2, 0.0f);
}
@ -440,7 +440,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("neutron.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("neutron", false, rank, m_object->GetTeam());
//? m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartPosition(1, glm::vec3(0.0f, 5.3f, 0.0f));
m_object->SetPartRotationZ(1, 0.0f);
@ -458,7 +458,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(6, glm::vec3(-3.0f, 1.0f, -3.0f));
// Creates the left-back wheel.
@ -466,7 +466,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(7, glm::vec3(-3.0f, 1.0f, 3.0f));
m_object->SetPartRotationY(7, Math::PI);
@ -475,7 +475,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(8, glm::vec3(2.0f, 1.0f, -3.0f));
// Creates the left-front wheel.
@ -483,7 +483,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(9, glm::vec3(2.0f, 1.0f, 3.0f));
m_object->SetPartRotationY(9, Math::PI);
}
@ -495,7 +495,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(6, glm::vec3(-2.0f, 1.0f, -3.0f));
// Creates the left-back wheel.
@ -503,7 +503,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(7, glm::vec3(-2.0f, 1.0f, 3.0f));
m_object->SetPartRotationY(7, Math::PI);
@ -512,7 +512,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(8, glm::vec3(3.0f, 1.0f, -3.0f));
// Creates the left-front wheel.
@ -520,7 +520,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 0);
modelManager->AddModelReference("lem2w.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2w", false, rank, m_object->GetTeam());
m_object->SetPartPosition(9, glm::vec3(3.0f, 1.0f, 3.0f));
m_object->SetPartRotationY(9, Math::PI);
}
@ -537,7 +537,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelCopy("lem2t.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("lem2t", false, rank, m_object->GetTeam());
if (m_object->GetTrainer() || type == OBJECT_MOBILEtt)
{
m_object->SetPartPosition(6, glm::vec3(0.0f, 2.0f, -3.55f));
@ -551,7 +551,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelCopy("lem3t.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("lem3t", false, rank, m_object->GetTeam());
if (m_object->GetTrainer() || type == OBJECT_MOBILEtt)
{
m_object->SetPartPosition(7, glm::vec3(0.0f, 2.0f, 3.55f));
@ -572,7 +572,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelCopy("roller2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("roller2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(6, glm::vec3(0.0f, 2.0f, -3.0f));
// Creates the left caterpillar.
@ -580,7 +580,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelCopy("roller3.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("roller3", false, rank, m_object->GetTeam());
m_object->SetPartPosition(7, glm::vec3(0.0f, 2.0f, 3.0f));
}
@ -592,7 +592,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelCopy("subm4.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("subm4", false, rank, m_object->GetTeam());
m_object->SetPartPosition(6, glm::vec3(0.0f, 1.0f, -3.0f));
// Creates the left caterpillar.
@ -600,7 +600,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelCopy("subm5.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("subm5", false, rank, m_object->GetTeam());
m_object->SetPartPosition(7, glm::vec3(0.0f, 1.0f, 3.0f));
}
@ -611,7 +611,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelCopy("drawer2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("drawer2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(6, glm::vec3(0.0f, 1.0f, -3.0f));
// Creates the left caterpillar.
@ -619,7 +619,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelCopy("drawer3.mod", false, rank, m_object->GetTeam());
modelManager->AddModelCopy("drawer3", false, rank, m_object->GetTeam());
m_object->SetPartPosition(7, glm::vec3(0.0f, 1.0f, 3.0f));
}
@ -635,7 +635,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("lem2f.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2f", false, rank, m_object->GetTeam());
m_object->SetPartPosition(6, glm::vec3(1.7f, 3.0f, 0.0f));
// Creates the right-back foot.
@ -643,7 +643,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelReference("lem2f.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2f", false, rank, m_object->GetTeam());
m_object->SetPartPosition(7, glm::vec3(-1.8f, 3.0f, -1.5f));
m_object->SetPartRotationY(7, 120.0f*Math::PI/180.0f);
@ -652,7 +652,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 0);
modelManager->AddModelReference("lem2f.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("lem2f", false, rank, m_object->GetTeam());
m_object->SetPartPosition(8, glm::vec3(-1.8f, 3.0f, 1.5f));
m_object->SetPartRotationY(8, -120.0f*Math::PI/180.0f);
}
@ -684,7 +684,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
{
for ( j=0 ; j<3 ; j++ )
{
sprintf(name, "ant%d.mod", j+4); // 4..6
sprintf(name, "ant%d", j+4); // 4..6
// Creates the right leg.
rank = m_engine->CreateObject();
@ -722,7 +722,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("roller2t.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller2t", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(0.0f, 0.0f, 0.0f));
m_object->SetPartRotationZ(1, 0.0f);
@ -731,7 +731,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("roller3t.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller3t", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(9.0f, 4.0f, 0.0f));
m_object->SetPartRotationZ(2, 0.0f);
}
@ -743,7 +743,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("roller2c.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller2c", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(3.0f, 4.6f, 0.0f));
m_object->SetPartRotationZ(1, Math::PI/8.0f);
@ -752,7 +752,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("roller3p.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller3p", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(7.0f, 6.5f, 0.0f));
m_object->SetPartRotationZ(2, 0.0f);
}
@ -764,7 +764,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("recover1.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("recover1", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(2.0f, 5.0f, 0.0f));
// Creates the right arm.
@ -772,7 +772,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 1);
modelManager->AddModelReference("recover2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("recover2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(0.1f, 0.0f, -5.0f));
m_object->SetPartRotationZ(2, 126.0f*Math::PI/180.0f);
@ -781,7 +781,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 2);
modelManager->AddModelReference("recover3.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("recover3", false, rank, m_object->GetTeam());
m_object->SetPartPosition(3, glm::vec3(5.0f, 0.0f, -0.5f));
m_object->SetPartRotationZ(3, -144.0f*Math::PI/180.0f);
@ -790,7 +790,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 1);
modelManager->AddModelReference("recover2.mod", true, rank, m_object->GetTeam());
modelManager->AddModelReference("recover2", true, rank, m_object->GetTeam());
m_object->SetPartPosition(4, glm::vec3(0.1f, 0.0f, 5.0f));
m_object->SetPartRotationZ(4, 126.0f*Math::PI/180.0f);
@ -799,7 +799,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(5, rank);
m_object->SetObjectParent(5, 4);
modelManager->AddModelReference("recover3.mod", true, rank, m_object->GetTeam());
modelManager->AddModelReference("recover3", true, rank, m_object->GetTeam());
m_object->SetPartPosition(5, glm::vec3(5.0f, 0.0f, 0.5f));
m_object->SetPartRotationZ(5, -144.0f*Math::PI/180.0f);
}
@ -811,7 +811,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("roller2s.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller2s", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(0.0f, 0.0f, 0.0f));
m_object->SetPartRotationZ(1, 0.0f);
@ -820,7 +820,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 1);
modelManager->AddModelReference("roller3s.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller3s", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(7.0f, 4.5f, 0.0f));
m_object->SetPartRotationZ(2, 0.0f);
@ -829,7 +829,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 2);
modelManager->AddModelReference("roller4s.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("roller4s", false, rank, m_object->GetTeam());
m_object->SetPartPosition(3, glm::vec3(0.0f, 1.0f, 0.0f));
m_object->SetPartRotationZ(3, 0.0f);
}
@ -841,7 +841,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("subm2.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("subm2", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(4.2f, 3.0f, 0.0f));
// Creates the right tong.
@ -849,7 +849,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 1);
modelManager->AddModelReference("subm3.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("subm3", false, rank, m_object->GetTeam());
m_object->SetPartPosition(2, glm::vec3(0.5f, 0.0f, -1.5f));
// Creates the left tong.
@ -857,7 +857,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(3, rank);
m_object->SetObjectParent(3, 1);
modelManager->AddModelReference("subm3.mod", true, rank, m_object->GetTeam());
modelManager->AddModelReference("subm3", true, rank, m_object->GetTeam());
m_object->SetPartPosition(3, glm::vec3(0.5f, 0.0f, 1.5f));
if (m_object->GetTrainer())
@ -866,7 +866,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(4, rank);
m_object->SetObjectParent(4, 0);
modelManager->AddModelReference("trainerg.mod", true, rank, m_object->GetTeam());
modelManager->AddModelReference("trainerg", true, rank, m_object->GetTeam());
}
}
@ -877,7 +877,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("drawer4.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("drawer4", false, rank, m_object->GetTeam());
m_object->SetPartPosition(1, glm::vec3(-3.0f, 3.0f, 0.0f));
// Creates the key.
@ -887,7 +887,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("drawer5.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("drawer5", false, rank, m_object->GetTeam());
m_posKey = glm::vec3(3.0f, 5.7f, 0.0f);
m_object->SetPartPosition(2, m_posKey);
m_object->SetPartRotationY(2, 90.0f*Math::PI/180.0f);
@ -900,7 +900,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(10+i, rank);
m_object->SetObjectParent(10+i, 1);
sprintf(name, "drawer%d.mod", 10+i);
sprintf(name, "drawer%d", 10+i);
modelManager->AddModelReference(name, false, rank, m_object->GetTeam());
m_object->SetPartPosition(10+i, glm::vec3(0.0f, 0.0f, 0.0f));
m_object->SetPartRotationY(10+i, 45.0f*Math::PI/180.0f*i);
@ -916,7 +916,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("drawer5.mod", false, rank, m_object->GetTeam());
modelManager->AddModelReference("drawer5", false, rank, m_object->GetTeam());
m_posKey = glm::vec3(0.2f, 4.1f, 0.0f);
m_object->SetPartPosition(2, m_posKey);
m_object->SetPartRotationY(2, 90.0f*Math::PI/180.0f);
@ -930,7 +930,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("apolloj2.mod", false, rank, m_object->GetTeam()); // antenna
modelManager->AddModelReference("apolloj2", false, rank, m_object->GetTeam()); // antenna
m_object->SetPartPosition(1, glm::vec3(5.5f, 8.8f, 2.0f));
m_object->SetPartRotationY(1, -120.0f*Math::PI/180.0f);
m_object->SetPartRotationZ(1, 45.0f*Math::PI/180.0f);
@ -939,7 +939,7 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2, rank);
m_object->SetObjectParent(2, 0);
modelManager->AddModelReference("apolloj3.mod", false, rank, m_object->GetTeam()); // camera
modelManager->AddModelReference("apolloj3", false, rank, m_object->GetTeam()); // camera
m_object->SetPartPosition(2, glm::vec3(5.5f, 2.8f, -2.0f));
m_object->SetPartRotationY(2, 30.0f*Math::PI/180.0f);
@ -948,28 +948,28 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(6, rank);
m_object->SetObjectParent(6, 0);
modelManager->AddModelReference("apolloj4.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj4", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(6, glm::vec3(-5.75f, 1.65f, -5.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(7, rank);
m_object->SetObjectParent(7, 0);
modelManager->AddModelReference("apolloj4.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj4", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(7, glm::vec3(-5.75f, 1.65f, 5.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(8, rank);
m_object->SetObjectParent(8, 0);
modelManager->AddModelReference("apolloj4.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj4", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(8, glm::vec3(5.75f, 1.65f, -5.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(9, rank);
m_object->SetObjectParent(9, 0);
modelManager->AddModelReference("apolloj4.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj4", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(9, glm::vec3(5.75f, 1.65f, 5.00f));
// Creates mud guards.
@ -977,28 +977,28 @@ void CMotionVehicle::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(10, rank);
m_object->SetObjectParent(10, 0);
modelManager->AddModelReference("apolloj6.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj6", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(10, glm::vec3(-5.75f, 1.65f, -5.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(11, rank);
m_object->SetObjectParent(11, 0);
modelManager->AddModelReference("apolloj6.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj6", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(11, glm::vec3(-5.75f, 1.65f, 5.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(12, rank);
m_object->SetObjectParent(12, 0);
modelManager->AddModelReference("apolloj5.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj5", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(12, glm::vec3(5.75f, 1.65f, -5.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(13, rank);
m_object->SetObjectParent(13, 0);
modelManager->AddModelReference("apolloj5.mod", false, rank, m_object->GetTeam()); // wheel
modelManager->AddModelReference("apolloj5", false, rank, m_object->GetTeam()); // wheel
m_object->SetPartPosition(13, glm::vec3(5.75f, 1.65f, 5.00f));
}

6
src/object/motion/motionworm.cpp
View File

@ -113,7 +113,7 @@ void CMotionWorm::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(1, rank);
m_object->SetObjectParent(1, 0);
modelManager->AddModelReference("worm1.mod", false, rank);
modelManager->AddModelReference("worm1", false, rank);
m_object->SetPartPosition(1, glm::vec3(px, 0.0f, 0.0f));
px -= 1.0f;
@ -124,7 +124,7 @@ void CMotionWorm::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2+i, rank);
m_object->SetObjectParent(2+i, 0);
modelManager->AddModelReference("worm2.mod", false, rank);
modelManager->AddModelReference("worm2", false, rank);
m_object->SetPartPosition(2+i, glm::vec3(px, 0.0f, 0.0f));
px -= 1.0f;
}
@ -134,7 +134,7 @@ void CMotionWorm::Create(glm::vec3 pos, float angle, ObjectType type,
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(2+WORM_PART, rank);
m_object->SetObjectParent(2+WORM_PART, 0);
modelManager->AddModelReference("worm3.mod", false, rank);
modelManager->AddModelReference("worm3", false, rank);
m_object->SetPartPosition(2+WORM_PART, glm::vec3(px, 0.0f, 0.0f));
m_object->CreateShadowCircle(0.0f, 1.0f, Gfx::EngineShadowType::WORM);

310
src/object/object_factory.cpp
View File

@ -344,31 +344,31 @@ CObjectUPtr CObjectFactory::CreateResource(const ObjectCreateParams& params)
obj->SetEnergyLevel(power);
std::string name;
if ( type == OBJECT_STONE ) name = "stone.mod";
if ( type == OBJECT_URANIUM ) name = "uranium.mod";
if ( type == OBJECT_METAL ) name = "metal.mod";
if ( type == OBJECT_POWER ) name = "power.mod";
if ( type == OBJECT_ATOMIC ) name = "atomic.mod";
if ( type == OBJECT_BULLET ) name = "bullet.mod";
if ( type == OBJECT_BBOX ) name = "bbox.mod";
if ( type == OBJECT_KEYa ) name = "keya.mod";
if ( type == OBJECT_KEYb ) name = "keyb.mod";
if ( type == OBJECT_KEYc ) name = "keyc.mod";
if ( type == OBJECT_KEYd ) name = "keyd.mod";
if ( type == OBJECT_TNT ) name = "tnt.mod";
if ( type == OBJECT_BOMB ) name = "bomb.mod";
if ( type == OBJECT_WAYPOINT ) name = "waypoint.mod";
if ( type == OBJECT_SHOW ) name = "show.mod";
if ( type == OBJECT_WINFIRE ) name = "winfire.mod";
if ( type == OBJECT_BAG ) name = "bag.mod";
if ( type == OBJECT_MARKSTONE ) name = "cross1.mod";
if ( type == OBJECT_MARKURANIUM ) name = "cross3.mod";
if ( type == OBJECT_MARKPOWER ) name = "cross2.mod";
if ( type == OBJECT_MARKKEYa ) name = "crossa.mod";
if ( type == OBJECT_MARKKEYb ) name = "crossb.mod";
if ( type == OBJECT_MARKKEYc ) name = "crossc.mod";
if ( type == OBJECT_MARKKEYd ) name = "crossd.mod";
if ( type == OBJECT_EGG ) name = "egg.mod";
if ( type == OBJECT_STONE ) name = "stone";
if ( type == OBJECT_URANIUM ) name = "uranium";
if ( type == OBJECT_METAL ) name = "metal";
if ( type == OBJECT_POWER ) name = "power";
if ( type == OBJECT_ATOMIC ) name = "atomic";
if ( type == OBJECT_BULLET ) name = "bullet";
if ( type == OBJECT_BBOX ) name = "bbox";
if ( type == OBJECT_KEYa ) name = "keya";
if ( type == OBJECT_KEYb ) name = "keyb";
if ( type == OBJECT_KEYc ) name = "keyc";
if ( type == OBJECT_KEYd ) name = "keyd";
if ( type == OBJECT_TNT ) name = "tnt";
if ( type == OBJECT_BOMB ) name = "bomb";
if ( type == OBJECT_WAYPOINT ) name = "waypoint";
if ( type == OBJECT_SHOW ) name = "show";
if ( type == OBJECT_WINFIRE ) name = "winfire";
if ( type == OBJECT_BAG ) name = "bag";
if ( type == OBJECT_MARKSTONE ) name = "cross1";
if ( type == OBJECT_MARKURANIUM ) name = "cross3";
if ( type == OBJECT_MARKPOWER ) name = "cross2";
if ( type == OBJECT_MARKKEYa ) name = "crossa";
if ( type == OBJECT_MARKKEYb ) name = "crossb";
if ( type == OBJECT_MARKKEYc ) name = "crossc";
if ( type == OBJECT_MARKKEYd ) name = "crossd";
if ( type == OBJECT_EGG ) name = "egg";
if (type == OBJECT_POWER || type == OBJECT_ATOMIC)
{
@ -456,11 +456,11 @@ CObjectUPtr CObjectFactory::CreateFlag(const ObjectCreateParams& params)
std::string name;
name = "";
if ( type == OBJECT_FLAGb ) name = "flag1b.mod";
if ( type == OBJECT_FLAGr ) name = "flag1r.mod";
if ( type == OBJECT_FLAGg ) name = "flag1g.mod";
if ( type == OBJECT_FLAGy ) name = "flag1y.mod";
if ( type == OBJECT_FLAGv ) name = "flag1v.mod";
if ( type == OBJECT_FLAGb ) name = "flag1b";
if ( type == OBJECT_FLAGr ) name = "flag1r";
if ( type == OBJECT_FLAGg ) name = "flag1g";
if ( type == OBJECT_FLAGy ) name = "flag1y";
if ( type == OBJECT_FLAGv ) name = "flag1v";
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object
@ -470,11 +470,11 @@ CObjectUPtr CObjectFactory::CreateFlag(const ObjectCreateParams& params)
obj->SetRotationY(angle);
name = "";
if ( type == OBJECT_FLAGb ) name = "flag2b.mod";
if ( type == OBJECT_FLAGr ) name = "flag2r.mod";
if ( type == OBJECT_FLAGg ) name = "flag2g.mod";
if ( type == OBJECT_FLAGy ) name = "flag2y.mod";
if ( type == OBJECT_FLAGv ) name = "flag2v.mod";
if ( type == OBJECT_FLAGb ) name = "flag2b";
if ( type == OBJECT_FLAGr ) name = "flag2r";
if ( type == OBJECT_FLAGg ) name = "flag2g";
if ( type == OBJECT_FLAGy ) name = "flag2y";
if ( type == OBJECT_FLAGv ) name = "flag2v";
for (int i=0 ; i<4 ; i++ )
{
@ -520,7 +520,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("barrier0.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("barrier0", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -536,7 +536,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("barrier1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("barrier1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -554,7 +554,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("barrier2.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("barrier2", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -572,7 +572,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("barrier3.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("barrier3", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -590,7 +590,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("barricade0.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("barricade0", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -609,7 +609,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("barricade1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("barricade1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -664,11 +664,11 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
if ( type == OBJECT_PLANT0 ) m_oldModelManager->AddModelReference("plant0.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT1 ) m_oldModelManager->AddModelReference("plant1.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT2 ) m_oldModelManager->AddModelReference("plant2.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT3 ) m_oldModelManager->AddModelReference("plant3.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT4 ) m_oldModelManager->AddModelReference("plant4.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT0 ) m_oldModelManager->AddModelReference("plant0", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT1 ) m_oldModelManager->AddModelReference("plant1", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT2 ) m_oldModelManager->AddModelReference("plant2", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT3 ) m_oldModelManager->AddModelReference("plant3", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT4 ) m_oldModelManager->AddModelReference("plant4", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -688,9 +688,9 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
if ( type == OBJECT_PLANT5 ) m_oldModelManager->AddModelReference("plant5.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT6 ) m_oldModelManager->AddModelReference("plant6.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT7 ) m_oldModelManager->AddModelReference("plant7.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT5 ) m_oldModelManager->AddModelReference("plant5", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT6 ) m_oldModelManager->AddModelReference("plant6", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT7 ) m_oldModelManager->AddModelReference("plant7", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -706,8 +706,8 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
if ( type == OBJECT_PLANT8 ) m_oldModelManager->AddModelReference("plant8.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT9 ) m_oldModelManager->AddModelReference("plant9.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT8 ) m_oldModelManager->AddModelReference("plant8", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT9 ) m_oldModelManager->AddModelReference("plant9", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -726,11 +726,11 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
if ( type == OBJECT_PLANT10 ) m_oldModelManager->AddModelReference("plant10.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT11 ) m_oldModelManager->AddModelReference("plant11.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT12 ) m_oldModelManager->AddModelReference("plant12.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT13 ) m_oldModelManager->AddModelReference("plant13.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT14 ) m_oldModelManager->AddModelReference("plant14.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT10 ) m_oldModelManager->AddModelReference("plant10", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT11 ) m_oldModelManager->AddModelReference("plant11", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT12 ) m_oldModelManager->AddModelReference("plant12", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT13 ) m_oldModelManager->AddModelReference("plant13", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT14 ) m_oldModelManager->AddModelReference("plant14", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -750,11 +750,11 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
if ( type == OBJECT_PLANT15 ) m_oldModelManager->AddModelReference("plant15.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT16 ) m_oldModelManager->AddModelReference("plant16.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT17 ) m_oldModelManager->AddModelReference("plant17.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT18 ) m_oldModelManager->AddModelReference("plant18.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT19 ) m_oldModelManager->AddModelReference("plant19.mod", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT15 ) m_oldModelManager->AddModelReference("plant15", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT16 ) m_oldModelManager->AddModelReference("plant16", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT17 ) m_oldModelManager->AddModelReference("plant17", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT18 ) m_oldModelManager->AddModelReference("plant18", false, rank, obj->GetTeam());
if ( type == OBJECT_PLANT19 ) m_oldModelManager->AddModelReference("plant19", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -773,7 +773,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("tree0.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("tree0", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -790,7 +790,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("tree1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("tree1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -808,7 +808,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("tree2.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("tree2", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -826,7 +826,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("tree3.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("tree3", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -843,7 +843,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("tree4.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("tree4", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -859,7 +859,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("tree5.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("tree5", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -902,7 +902,7 @@ CObjectUPtr CObjectFactory::CreateMushroom(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("mush1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("mush1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -918,7 +918,7 @@ CObjectUPtr CObjectFactory::CreateMushroom(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("mush2.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("mush2", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -965,7 +965,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen0.mod", false, rank);
m_oldModelManager->AddModelReference("teen0", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -983,7 +983,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen1.mod", false, rank);
m_oldModelManager->AddModelReference("teen1", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1003,7 +1003,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen2.mod", false, rank);
m_oldModelManager->AddModelReference("teen2", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1024,7 +1024,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
//? m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_METAL);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen3.mod", false, rank);
m_oldModelManager->AddModelReference("teen3", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1038,7 +1038,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen4.mod", false, rank);
m_oldModelManager->AddModelReference("teen4", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1058,7 +1058,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen5.mod", false, rank);
m_oldModelManager->AddModelReference("teen5", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetFloorHeight(0.0f);
@ -1073,7 +1073,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen6.mod", false, rank);
m_oldModelManager->AddModelReference("teen6", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1092,7 +1092,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen7.mod", false, rank);
m_oldModelManager->AddModelReference("teen7", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1111,7 +1111,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen8.mod", false, rank);
m_oldModelManager->AddModelReference("teen8", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1131,7 +1131,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen9.mod", false, rank);
m_oldModelManager->AddModelReference("teen9", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1151,7 +1151,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen10.mod", false, rank);
m_oldModelManager->AddModelReference("teen10", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1175,7 +1175,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen11.mod", false, rank);
m_oldModelManager->AddModelReference("teen11", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetFloorHeight(0.0f);
@ -1199,7 +1199,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
//? m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_METAL);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen12.mod", false, rank);
m_oldModelManager->AddModelReference("teen12", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1213,7 +1213,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen13.mod", false, rank);
m_oldModelManager->AddModelReference("teen13", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1236,7 +1236,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen14.mod", false, rank);
m_oldModelManager->AddModelReference("teen14", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1259,7 +1259,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen15.mod", false, rank);
m_oldModelManager->AddModelReference("teen15", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1282,7 +1282,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen16.mod", false, rank);
m_oldModelManager->AddModelReference("teen16", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1298,7 +1298,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen17.mod", false, rank);
m_oldModelManager->AddModelReference("teen17", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1312,7 +1312,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen18.mod", false, rank);
m_oldModelManager->AddModelReference("teen18", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1326,7 +1326,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen19.mod", false, rank);
m_oldModelManager->AddModelReference("teen19", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1340,7 +1340,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen20.mod", false, rank);
m_oldModelManager->AddModelReference("teen20", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1359,7 +1359,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen21.mod", false, rank);
m_oldModelManager->AddModelReference("teen21", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
}
@ -1369,7 +1369,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen22.mod", false, rank);
m_oldModelManager->AddModelReference("teen22", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1384,7 +1384,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen23.mod", false, rank);
m_oldModelManager->AddModelReference("teen23", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1409,7 +1409,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen24.mod", false, rank);
m_oldModelManager->AddModelReference("teen24", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1423,7 +1423,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen25.mod", false, rank);
m_oldModelManager->AddModelReference("teen25", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1437,7 +1437,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen26.mod", false, rank);
m_oldModelManager->AddModelReference("teen26", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetFloorHeight(0.0f);
@ -1460,7 +1460,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen27.mod", false, rank);
m_oldModelManager->AddModelReference("teen27", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1474,7 +1474,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
//? m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_METAL);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen28.mod", false, rank);
m_oldModelManager->AddModelReference("teen28", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1487,7 +1487,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen29.mod", false, rank);
m_oldModelManager->AddModelReference("teen29", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
floorAdjust = false;
@ -1498,7 +1498,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen30.mod", false, rank);
m_oldModelManager->AddModelReference("teen30", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1512,7 +1512,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen31.mod", false, rank);
m_oldModelManager->AddModelReference("teen31", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1529,7 +1529,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen32.mod", false, rank);
m_oldModelManager->AddModelReference("teen32", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1546,7 +1546,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen33.mod", false, rank);
m_oldModelManager->AddModelReference("teen33", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1559,7 +1559,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen34.mod", false, rank);
m_oldModelManager->AddModelReference("teen34", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1572,7 +1572,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen35.mod", false, rank);
m_oldModelManager->AddModelReference("teen35", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1589,7 +1589,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen36.mod", false, rank);
m_oldModelManager->AddModelReference("teen36", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
floorAdjust = false;
@ -1600,7 +1600,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen37.mod", false, rank);
m_oldModelManager->AddModelReference("teen37", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
floorAdjust = false;
@ -1611,7 +1611,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen38a.mod", false, rank);
m_oldModelManager->AddModelReference("teen38a", false, rank);
obj->SetPartPosition(0, pos);
obj->SetPartRotationY(0, angle);
@ -1619,14 +1619,14 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
m_oldModelManager->AddModelReference("teen38b.mod", false, rank); // engine
m_oldModelManager->AddModelReference("teen38b", false, rank); // engine
obj->SetPartPosition(1, glm::vec3(0.0f, 30.0f, 0.0f));
rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1);
m_oldModelManager->AddModelReference("teen38c.mod", false, rank); // propeller
m_oldModelManager->AddModelReference("teen38c", false, rank); // propeller
obj->SetPartPosition(2, glm::vec3(0.0f, 0.0f, 0.0f));
obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f));
@ -1639,7 +1639,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen39.mod", false, rank);
m_oldModelManager->AddModelReference("teen39", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1653,7 +1653,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen40.mod", false, rank);
m_oldModelManager->AddModelReference("teen40", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1667,7 +1667,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen41.mod", false, rank);
m_oldModelManager->AddModelReference("teen41", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
}
@ -1677,7 +1677,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen42.mod", false, rank);
m_oldModelManager->AddModelReference("teen42", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1690,7 +1690,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen43.mod", false, rank);
m_oldModelManager->AddModelReference("teen43", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1703,7 +1703,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("teen44.mod", false, rank);
m_oldModelManager->AddModelReference("teen44", false, rank);
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1749,7 +1749,7 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("quartz0.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("quartz0", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1763,7 +1763,7 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("quartz1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("quartz1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1777,7 +1777,7 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("quartz2.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("quartz2", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1791,7 +1791,7 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("quartz3.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("quartz3", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
@ -1855,7 +1855,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("root0.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root0", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(2.0f);
@ -1876,7 +1876,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("root1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(2.0f);
@ -1897,7 +1897,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("root2.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root2", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(2.0f);
@ -1917,7 +1917,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("root3.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root3", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(2.0f);
@ -1939,7 +1939,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("root4.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root4", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(2.0f);
@ -1963,7 +1963,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("root4.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root4", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(2.0f);
@ -1972,7 +1972,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params)
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
m_oldModelManager->AddModelReference("root5.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("root5", false, rank, obj->GetTeam());
obj->SetPartPosition(1, glm::vec3(-5.0f, 28.0f, -4.0f));
obj->SetPartRotationX(1, -30.0f*Math::PI/180.0f);
obj->SetPartRotationZ(1, 20.0f*Math::PI/180.0f);
@ -2023,7 +2023,7 @@ CObjectUPtr CObjectFactory::CreateHome(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX);
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("home1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("home1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(1.3f);
@ -2064,19 +2064,19 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(0, rank);
std::string name;
if ( type == OBJECT_RUINmobilew1 ) name = "ruin1.mod";
if ( type == OBJECT_RUINmobilew2 ) name = "ruin1.mod";
if ( type == OBJECT_RUINmobilet1 ) name = "ruin2.mod";
if ( type == OBJECT_RUINmobilet2 ) name = "ruin2.mod";
if ( type == OBJECT_RUINmobiler1 ) name = "ruin3.mod";
if ( type == OBJECT_RUINmobiler2 ) name = "ruin3.mod";
if ( type == OBJECT_RUINfactory ) name = "ruin4.mod";
if ( type == OBJECT_RUINdoor ) name = "ruin5.mod";
if ( type == OBJECT_RUINsupport ) name = "ruin6.mod";
if ( type == OBJECT_RUINradar ) name = "ruin7.mod";
if ( type == OBJECT_RUINconvert ) name = "ruin8.mod";
if ( type == OBJECT_RUINbase ) name = "ruin9.mod";
if ( type == OBJECT_RUINhead ) name = "ruin10.mod";
if ( type == OBJECT_RUINmobilew1 ) name = "ruin1";
if ( type == OBJECT_RUINmobilew2 ) name = "ruin1";
if ( type == OBJECT_RUINmobilet1 ) name = "ruin2";
if ( type == OBJECT_RUINmobilet2 ) name = "ruin2";
if ( type == OBJECT_RUINmobiler1 ) name = "ruin3";
if ( type == OBJECT_RUINmobiler2 ) name = "ruin3";
if ( type == OBJECT_RUINfactory ) name = "ruin4";
if ( type == OBJECT_RUINdoor ) name = "ruin5";
if ( type == OBJECT_RUINsupport ) name = "ruin6";
if ( type == OBJECT_RUINradar ) name = "ruin7";
if ( type == OBJECT_RUINconvert ) name = "ruin8";
if ( type == OBJECT_RUINbase ) name = "ruin9";
if ( type == OBJECT_RUINhead ) name = "ruin10";
m_oldModelManager->AddModelReference(name, false, rank, obj->GetTeam());
@ -2091,7 +2091,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(6, rank);
obj->SetObjectParent(6, 0);
m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin1w", false, rank, obj->GetTeam());
obj->SetPartPosition(6, glm::vec3(-3.0f, 1.8f, -4.0f));
obj->SetPartRotationX(6, -Math::PI/2.0f);
@ -2102,7 +2102,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(7, rank);
obj->SetObjectParent(7, 0);
m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin1w", false, rank, obj->GetTeam());
obj->SetPartPosition(7, glm::vec3(-3.0f, 1.0f, 3.0f));
obj->SetPartRotationY(7, Math::PI-0.3f);
@ -2114,7 +2114,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(8, rank);
obj->SetObjectParent(8, 0);
m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin1w", false, rank, obj->GetTeam());
obj->SetPartPosition(8, glm::vec3(2.0f, 1.6f, -3.0f));
obj->SetPartRotationY(8, 0.3f);
@ -2125,7 +2125,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(9, rank);
obj->SetObjectParent(9, 0);
m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin1w", false, rank, obj->GetTeam());
obj->SetPartPosition(9, glm::vec3(2.0f, 1.0f, 3.0f));
obj->SetPartRotationY(9, Math::PI-0.2f);
@ -2145,7 +2145,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(7, rank);
obj->SetObjectParent(7, 0);
m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin1w", false, rank, obj->GetTeam());
obj->SetPartPosition(7, glm::vec3(-3.0f, 1.0f, 3.0f));
obj->SetPartRotationY(7, Math::PI+0.3f);
@ -2157,7 +2157,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(9, rank);
obj->SetObjectParent(9, 0);
m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin1w", false, rank, obj->GetTeam());
obj->SetPartPosition(9, glm::vec3(2.0f, 1.0f, 3.0f));
obj->SetPartRotationY(9, Math::PI+0.3f);
@ -2177,7 +2177,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params)
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
m_oldModelManager->AddModelReference("ruin2c.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("ruin2c", false, rank, obj->GetTeam());
obj->SetPartPosition(1, glm::vec3(3.0f, 5.0f, -2.5f));
obj->SetPartRotationX(1, -Math::PI*0.85f);
@ -2480,7 +2480,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("apollol1.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("apollol1", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetScale(1.2f);
@ -2492,7 +2492,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(i+1, rank);
obj->SetObjectParent(i+1, 0);
m_oldModelManager->AddModelReference("apollol2.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("apollol2", false, rank, obj->GetTeam());
obj->SetPartRotationY(i+1, Math::PI/2.0f*i);
}
@ -2500,7 +2500,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(5, rank);
obj->SetObjectParent(5, 0);
m_oldModelManager->AddModelReference("apollol3.mod", false, rank, obj->GetTeam()); // ladder
m_oldModelManager->AddModelReference("apollol3", false, rank, obj->GetTeam()); // ladder
//? m_terrain->AddBuildingLevel(pos, 10.0f, 13.0f, 12.0f, 0.0f);
@ -2520,7 +2520,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("apollof.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("apollof", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetFloorHeight(0.0f);
@ -2534,7 +2534,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("apollom.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("apollom", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetFloorHeight(0.0f);
@ -2550,7 +2550,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object
obj->SetObjectRank(0, rank);
m_oldModelManager->AddModelReference("apolloa.mod", false, rank, obj->GetTeam());
m_oldModelManager->AddModelReference("apolloa", false, rank, obj->GetTeam());
obj->SetPosition(pos);
obj->SetRotationY(angle);
obj->SetFloorHeight(0.0f);
@ -2559,7 +2559,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params)
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
m_oldModelManager->AddModelReference("apolloj2.mod", false, rank, obj->GetTeam()); // antenna
m_oldModelManager->AddModelReference("apolloj2", false, rank, obj->GetTeam()); // antenna
obj->SetPartPosition(1, glm::vec3(0.0f, 5.0f, 0.0f));
obj->SetPartRotationY(1, -120.0f*Math::PI/180.0f);
obj->SetPartRotationZ(1, 45.0f*Math::PI/180.0f);

124
src/object/subclass/base_building.cpp
View File

@ -74,7 +74,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_PORTICO )
{
modelManager->AddModelReference("portico1.mod", false, rank, params.team);
modelManager->AddModelReference("portico1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -83,14 +83,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("portico2.mod", false, rank, params.team);
modelManager->AddModelReference("portico2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 67.0f, 0.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1);
modelManager->AddModelReference("portico3.mod", false, rank, params.team);
modelManager->AddModelReference("portico3", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(0.0f, 0.0f, -33.0f));
obj->SetPartRotationY(2, 45.0f*Math::PI/180.0f);
@ -98,7 +98,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 2);
modelManager->AddModelReference("portico4.mod", false, rank, params.team);
modelManager->AddModelReference("portico4", false, rank, params.team);
obj->SetPartPosition(3, glm::vec3(50.0f, 0.0f, 0.0f));
obj->SetPartRotationY(3, -60.0f*Math::PI/180.0f);
@ -106,7 +106,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(4, rank);
obj->SetObjectParent(4, 3);
modelManager->AddModelReference("portico5.mod", false, rank, params.team);
modelManager->AddModelReference("portico5", false, rank, params.team);
obj->SetPartPosition(4, glm::vec3(35.0f, 0.0f, 0.0f));
obj->SetPartRotationY(4, -55.0f*Math::PI/180.0f);
@ -114,7 +114,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(5, rank);
obj->SetObjectParent(5, 1);
modelManager->AddModelReference("portico3.mod", false, rank, params.team);
modelManager->AddModelReference("portico3", false, rank, params.team);
obj->SetPartPosition(5, glm::vec3(0.0f, 0.0f, 33.0f));
obj->SetPartRotationY(5, -45.0f*Math::PI/180.0f);
@ -122,7 +122,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(6, rank);
obj->SetObjectParent(6, 5);
modelManager->AddModelReference("portico4.mod", false, rank, params.team);
modelManager->AddModelReference("portico4", false, rank, params.team);
obj->SetPartPosition(6, glm::vec3(50.0f, 0.0f, 0.0f));
obj->SetPartRotationY(6, 60.0f*Math::PI/180.0f);
@ -130,7 +130,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(7, rank);
obj->SetObjectParent(7, 6);
modelManager->AddModelReference("portico5.mod", false, rank, params.team);
modelManager->AddModelReference("portico5", false, rank, params.team);
obj->SetPartPosition(7, glm::vec3(35.0f, 0.0f, 0.0f));
obj->SetPartRotationY(7, 55.0f*Math::PI/180.0f);
@ -138,7 +138,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(8, rank);
obj->SetObjectParent(8, 0);
modelManager->AddModelReference("portico6.mod", false, rank, params.team);
modelManager->AddModelReference("portico6", false, rank, params.team);
obj->SetPartPosition(8, glm::vec3(-35.0f, 50.0f, -35.0f));
obj->SetPartRotationY(8, -Math::PI/2.0f);
obj->SetPartScale(8, 2.0f);
@ -147,14 +147,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(9, rank);
obj->SetObjectParent(9, 8);
modelManager->AddModelReference("portico7.mod", false, rank, params.team);
modelManager->AddModelReference("portico7", false, rank, params.team);
obj->SetPartPosition(9, glm::vec3(0.0f, 4.5f, 1.9f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(10, rank);
obj->SetObjectParent(10, 0);
modelManager->AddModelReference("portico6.mod", false, rank, params.team);
modelManager->AddModelReference("portico6", false, rank, params.team);
obj->SetPartPosition(10, glm::vec3(-35.0f, 50.0f, 35.0f));
obj->SetPartRotationY(10, -Math::PI/2.0f);
obj->SetPartScale(10, 2.0f);
@ -163,7 +163,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(11, rank);
obj->SetObjectParent(11, 10);
modelManager->AddModelReference("portico7.mod", false, rank, params.team);
modelManager->AddModelReference("portico7", false, rank, params.team);
obj->SetPartPosition(11, glm::vec3(0.0f, 4.5f, 1.9f));
obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 28.0f, 0.0f), 45.5f, SOUND_BOUMm, 0.45f));
@ -184,7 +184,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_BASE )
{
modelManager->AddModelReference("base1.mod", false, rank, params.team);
modelManager->AddModelReference("base1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -195,7 +195,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1+i, rank);
obj->SetObjectParent(1+i, 0);
modelManager->AddModelReference("base2.mod", false, rank, params.team);
modelManager->AddModelReference("base2", false, rank, params.team);
glm::vec2 p = Math::RotatePoint(-Math::PI/4.0f*i, 27.8f);
obj->SetPartPosition(1+i, glm::vec3(p.x, 30.0f, p.y));
obj->SetPartRotationY(1+i, Math::PI/4.0f*i);
@ -205,14 +205,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(10+i, rank);
obj->SetObjectParent(10+i, 1+i);
modelManager->AddModelReference("base4.mod", false, rank, params.team);
modelManager->AddModelReference("base4", false, rank, params.team);
obj->SetPartPosition(10+i, glm::vec3(23.5f, 0.0f, 7.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(18+i, rank);
obj->SetObjectParent(18+i, 1+i);
modelManager->AddModelReference("base4.mod", true, rank, params.team);
modelManager->AddModelReference("base4", true, rank, params.team);
obj->SetPartPosition(18+i, glm::vec3(23.5f, 0.0f, -7.0f));
}
@ -220,7 +220,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(9, rank);
obj->SetObjectParent(9, 0);
modelManager->AddModelReference("base3.mod", false, rank, params.team); // central pillar
modelManager->AddModelReference("base3", false, rank, params.team); // central pillar
obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 33.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 39.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
@ -249,7 +249,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_DERRICK )
{
modelManager->AddModelReference("derrick1.mod", false, rank, params.team);
modelManager->AddModelReference("derrick1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -258,7 +258,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("derrick2.mod", false, rank, params.team);
modelManager->AddModelReference("derrick2", false, rank, params.team);
obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 10.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
@ -272,7 +272,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_RESEARCH )
{
modelManager->AddModelReference("search1.mod", false, rank, params.team);
modelManager->AddModelReference("search1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -281,14 +281,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("search2.mod", false, rank, params.team);
modelManager->AddModelReference("search2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 13.0f, 0.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1);
modelManager->AddModelReference("search3.mod", false, rank, params.team);
modelManager->AddModelReference("search3", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(0.0f, 4.0f, 0.0f));
obj->SetPartRotationZ(2, 35.0f*Math::PI/180.0f);
@ -304,7 +304,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_RADAR )
{
modelManager->AddModelReference("radar1.mod", false, rank, params.team);
modelManager->AddModelReference("radar1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -313,14 +313,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("radar2.mod", false, rank, params.team);
modelManager->AddModelReference("radar2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 5.0f, 0.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 0);
modelManager->AddModelReference("radar3.mod", false, rank, params.team);
modelManager->AddModelReference("radar3", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(0.0f, 11.0f, 0.0f));
obj->SetPartRotationY(2, -Math::PI/2.0f);
@ -328,7 +328,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 2);
modelManager->AddModelReference("radar4.mod", false, rank, params.team);
modelManager->AddModelReference("radar4", false, rank, params.team);
obj->SetPartPosition(3, glm::vec3(0.0f, 4.5f, 1.9f));
obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
@ -340,7 +340,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_ENERGY )
{
modelManager->AddModelCopy("energy.mod", false, rank, params.team);
modelManager->AddModelCopy("energy", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -358,7 +358,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_LABO )
{
modelManager->AddModelReference("labo1.mod", false, rank, params.team);
modelManager->AddModelReference("labo1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -367,7 +367,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("labo2.mod", false, rank, params.team);
modelManager->AddModelReference("labo2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(-9.0f, 3.0f, 0.0f));
obj->SetPartRotationZ(1, Math::PI/2.0f);
@ -375,14 +375,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1);
modelManager->AddModelReference("labo3.mod", false, rank, params.team);
modelManager->AddModelReference("labo3", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(9.0f, -1.0f, 0.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 2);
modelManager->AddModelReference("labo4.mod", false, rank, params.team);
modelManager->AddModelReference("labo4", false, rank, params.team);
obj->SetPartPosition(3, glm::vec3(0.0f, 0.0f, 0.0f));
obj->SetPartRotationZ(3, 80.0f*Math::PI/180.0f);
@ -390,7 +390,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(4, rank);
obj->SetObjectParent(4, 2);
modelManager->AddModelReference("labo4.mod", false, rank, params.team);
modelManager->AddModelReference("labo4", false, rank, params.team);
obj->SetPartPosition(4, glm::vec3(0.0f, 0.0f, 0.0f));
obj->SetPartRotationZ(4, 80.0f*Math::PI/180.0f);
obj->SetPartRotationY(4, Math::PI*2.0f/3.0f);
@ -399,7 +399,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(5, rank);
obj->SetObjectParent(5, 2);
modelManager->AddModelReference("labo4.mod", false, rank, params.team);
modelManager->AddModelReference("labo4", false, rank, params.team);
obj->SetPartPosition(5, glm::vec3(0.0f, 0.0f, 0.0f));
obj->SetPartRotationZ(5, 80.0f*Math::PI/180.0f);
obj->SetPartRotationY(5, -Math::PI*2.0f/3.0f);
@ -418,7 +418,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_FACTORY )
{
modelManager->AddModelReference("factory1.mod", false, rank, params.team);
modelManager->AddModelReference("factory1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -429,7 +429,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1+i, rank);
obj->SetObjectParent(1+i, 0);
modelManager->AddModelReference("factory2.mod", false, rank, params.team);
modelManager->AddModelReference("factory2", false, rank, params.team);
obj->SetPartPosition(1+i, glm::vec3(10.0f, 2.0f*i, 10.0f));
obj->SetPartRotationZ(1+i, Math::PI/2.0f);
obj->SetPartScaleZ(1+i, 0.30f);
@ -438,7 +438,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(10+i, rank);
obj->SetObjectParent(10+i, 0);
modelManager->AddModelReference("factory2.mod", false, rank, params.team);
modelManager->AddModelReference("factory2", false, rank, params.team);
obj->SetPartPosition(10+i, glm::vec3(10.0f, 2.0f*i, -10.0f));
obj->SetPartRotationZ(10+i, -Math::PI/2.0f);
obj->SetPartRotationY(10+i, Math::PI);
@ -475,7 +475,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_REPAIR )
{
modelManager->AddModelReference("repair1.mod", false, rank, params.team);
modelManager->AddModelReference("repair1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -484,7 +484,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("repair2.mod", false, rank, params.team);
modelManager->AddModelReference("repair2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(-11.0f, 13.5f, 0.0f));
obj->SetPartRotationZ(1, Math::PI/2.0f);
@ -499,7 +499,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_DESTROYER )
{
modelManager->AddModelReference("destroy1.mod", false, rank, params.team);
modelManager->AddModelReference("destroy1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -508,7 +508,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("destroy2.mod", false, rank, params.team);
modelManager->AddModelReference("destroy2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 0.0f, 0.0f));
engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f);
@ -523,7 +523,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_STATION )
{
modelManager->AddModelCopy("station.mod", false, rank, params.team);
modelManager->AddModelCopy("station", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -539,7 +539,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_CONVERT )
{
modelManager->AddModelReference("convert1.mod", false, rank, params.team);
modelManager->AddModelReference("convert1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -548,14 +548,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("convert2.mod", false, rank, params.team);
modelManager->AddModelReference("convert2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 14.0f, 0.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 0);
modelManager->AddModelReference("convert3.mod", false, rank, params.team);
modelManager->AddModelReference("convert3", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(0.0f, 11.5f, 0.0f));
obj->SetPartRotationX(2, -Math::PI*0.35f);
@ -563,7 +563,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 0);
modelManager->AddModelReference("convert3.mod", false, rank, params.team);
modelManager->AddModelReference("convert3", false, rank, params.team);
obj->SetPartPosition(3, glm::vec3(0.0f, 11.5f, 0.0f));
obj->SetPartRotationY(3, Math::PI);
obj->SetPartRotationX(3, -Math::PI*0.35f);
@ -579,7 +579,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_TOWER )
{
modelManager->AddModelReference("tower.mod", false, rank, params.team);
modelManager->AddModelReference("tower", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -588,7 +588,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("roller2c.mod", false, rank, params.team);
modelManager->AddModelReference("roller2c", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 20.0f, 0.0f));
obj->SetPartRotationZ(1, Math::PI/2.0f);
@ -596,7 +596,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1);
modelManager->AddModelReference("roller3c.mod", false, rank, params.team);
modelManager->AddModelReference("roller3c", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(4.5f, 0.0f, 0.0f));
obj->SetPartRotationZ(2, 0.0f);
@ -613,7 +613,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_NUCLEAR )
{
modelManager->AddModelReference("nuclear1.mod", false, rank, params.team);
modelManager->AddModelReference("nuclear1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -622,7 +622,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("nuclear2.mod", false, rank, params.team);
modelManager->AddModelReference("nuclear2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(20.0f, 10.0f, 0.0f));
obj->SetPartRotationZ(1, 135.0f*Math::PI/180.0f);
@ -638,7 +638,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_PARA )
{
modelManager->AddModelReference("para.mod", false, rank, params.team);
modelManager->AddModelReference("para", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -662,7 +662,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_SAFE )
{
modelManager->AddModelReference("safe1.mod", false, rank, params.team);
modelManager->AddModelReference("safe1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -671,14 +671,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("safe2.mod", false, rank, params.team);
modelManager->AddModelReference("safe2", false, rank, params.team);
obj->SetPartScale(1, 1.05f);
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 0);
modelManager->AddModelReference("safe3.mod", false, rank, params.team);
modelManager->AddModelReference("safe3", false, rank, params.team);
obj->SetPartScale(2, 1.05f);
engine->GetTerrain()->AddBuildingLevel(params.pos, 18.0f, 20.0f, 1.0f, 0.5f);
@ -691,7 +691,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_HUSTON )
{
modelManager->AddModelReference("huston1.mod", false, rank, params.team);
modelManager->AddModelReference("huston1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -700,7 +700,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("huston2.mod", false, rank, params.team);
modelManager->AddModelReference("huston2", false, rank, params.team);
obj->SetPartPosition(1, glm::vec3(0.0f, 39.0f, 30.0f));
obj->SetPartRotationY(1, -Math::PI/2.0f);
obj->SetPartScale(1, 3.0f);
@ -709,7 +709,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1);
modelManager->AddModelReference("huston3.mod", false, rank, params.team);
modelManager->AddModelReference("huston3", false, rank, params.team);
obj->SetPartPosition(2, glm::vec3(0.0f, 4.5f, 1.9f));
obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 6.0f, -53.0f), 16.0f, SOUND_BOUMm, 0.45f));
@ -732,7 +732,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_TARGET1 )
{
modelManager->AddModelReference("target1.mod", false, rank, params.team);
modelManager->AddModelReference("target1", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetScale(1.5f);
@ -761,7 +761,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_TARGET2 )
{
modelManager->AddModelReference("target2.mod", false, rank, params.team);
modelManager->AddModelReference("target2", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -771,7 +771,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_NEST )
{
modelManager->AddModelReference("nest.mod", false, rank, params.team);
modelManager->AddModelReference("nest", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -783,7 +783,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_START )
{
modelManager->AddModelReference("start.mod", false, rank, params.team);
modelManager->AddModelReference("start", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -793,7 +793,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
if ( params.type == OBJECT_END )
{
modelManager->AddModelReference("end.mod", false, rank, params.team);
modelManager->AddModelReference("end", false, rank, params.team);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);

8
src/object/subclass/exchange_post.cpp
View File

@ -59,7 +59,7 @@ std::unique_ptr<CExchangePost> CExchangePost::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object
obj->SetObjectRank(0, rank);
modelManager->AddModelReference("info1.mod", false, rank);
modelManager->AddModelReference("info1", false, rank);
obj->SetPosition(params.pos);
obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f);
@ -68,7 +68,7 @@ std::unique_ptr<CExchangePost> CExchangePost::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0);
modelManager->AddModelReference("info2.mod", false, rank);
modelManager->AddModelReference("info2", false, rank);
obj->SetPartPosition(1, glm::vec3(0.0f, 5.0f, 0.0f));
for (int i = 0; i < 3; ++i)
@ -77,14 +77,14 @@ std::unique_ptr<CExchangePost> CExchangePost::Create(
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2+i*2, rank);
obj->SetObjectParent(2+i*2, 1);
modelManager->AddModelReference("info3.mod", false, rank);
modelManager->AddModelReference("info3", false, rank);
obj->SetPartPosition(2+i*2, glm::vec3(0.0f, 4.5f, 0.0f));
rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3+i*2, rank);
obj->SetObjectParent(3+i*2, 2+i*2);
modelManager->AddModelReference("radar4.mod", false, rank);
modelManager->AddModelReference("radar4", false, rank);
obj->SetPartPosition(3+i*2, glm::vec3(0.0f, 0.0f, -4.0f));
obj->SetPartRotationY(2+i*2, 2.0f*Math::PI/3.0f*i);