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

Refactored Math::Vector to glm::vec3 in object interface and object subclass classes

dev
Tomasz Kapuściński 2022-01-04 00:48:06 +01:00
parent 3707daf678
commit 2690d04f64
8 changed files with 217 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/interface/controllable_object.h
View File

@ -65,7 +65,7 @@ public:
//! Adjust camera parameters for the given object //! Adjust camera parameters for the given object
/** TODO: Seems to be for onboard camera only? Check and rename appropriately */ /** TODO: Seems to be for onboard camera only? Check and rename appropriately */
virtual void AdjustCamera(Math::Vector &eye, float &dirH, float &dirV, virtual void AdjustCamera(glm::vec3 &eye, float &dirH, float &dirV,
Math::Vector &lookat, Math::Vector &upVec, glm::vec3 &lookat, glm::vec3 &upVec,
Gfx::CameraType type) = 0; Gfx::CameraType type) = 0;
}; };

4
src/object/interface/powered_object.h
View File

@ -50,9 +50,9 @@ public:
virtual void SetPower(CObject* power) = 0; virtual void SetPower(CObject* power) = 0;
//! Returns the relative position of power cell //! Returns the relative position of power cell
virtual Math::Vector GetPowerPosition() = 0; virtual glm::vec3 GetPowerPosition() = 0;
//! Sets the relative position of power cell //! Sets the relative position of power cell
virtual void SetPowerPosition(const Math::Vector& powerPosition) = 0; virtual void SetPowerPosition(const glm::vec3& powerPosition) = 0;
}; };
inline float GetObjectEnergy(CObject* object) inline float GetObjectEnergy(CObject* object)

4
src/object/interface/task_executor_object.h
View File

@ -54,7 +54,7 @@ public:
virtual Error StartTaskTerraform() = 0; virtual Error StartTaskTerraform() = 0;
virtual Error StartTaskRecover() = 0; virtual Error StartTaskRecover() = 0;
virtual Error StartTaskFire(float delay) = 0; virtual Error StartTaskFire(float delay) = 0;
virtual Error StartTaskFireAnt(Math::Vector impact) = 0; virtual Error StartTaskFireAnt(glm::vec3 impact) = 0;
virtual Error StartTaskSpiderExplo() = 0; virtual Error StartTaskSpiderExplo() = 0;
virtual Error StartTaskPen(bool down, TraceColor color = TraceColor::Default) = 0; virtual Error StartTaskPen(bool down, TraceColor color = TraceColor::Default) = 0;
//@} //@}
@ -63,7 +63,7 @@ public:
virtual Error StartTaskWait(float time) = 0; virtual Error StartTaskWait(float time) = 0;
virtual Error StartTaskAdvance(float length) = 0; virtual Error StartTaskAdvance(float length) = 0;
virtual Error StartTaskTurn(float angle) = 0; virtual Error StartTaskTurn(float angle) = 0;
virtual Error StartTaskGoto(Math::Vector pos, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode) = 0; virtual Error StartTaskGoto(glm::vec3 pos, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode) = 0;
virtual Error StartTaskInfo(const char *name, float value, float power, bool bSend) = 0; virtual Error StartTaskInfo(const char *name, float value, float power, bool bSend) = 0;
//@} //@}
//! Starts a background task //! Starts a background task

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

@ -85,14 +85,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("portico2.mod", false, rank, params.team); modelManager->AddModelReference("portico2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 67.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 67.0f, 0.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1); obj->SetObjectParent(2, 1);
modelManager->AddModelReference("portico3.mod", false, rank, params.team); modelManager->AddModelReference("portico3.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(0.0f, 0.0f, -33.0f)); obj->SetPartPosition(2, glm::vec3(0.0f, 0.0f, -33.0f));
obj->SetPartRotationY(2, 45.0f*Math::PI/180.0f); obj->SetPartRotationY(2, 45.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -100,7 +100,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(3, rank); obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 2); obj->SetObjectParent(3, 2);
modelManager->AddModelReference("portico4.mod", false, rank, params.team); modelManager->AddModelReference("portico4.mod", false, rank, params.team);
obj->SetPartPosition(3, Math::Vector(50.0f, 0.0f, 0.0f)); obj->SetPartPosition(3, glm::vec3(50.0f, 0.0f, 0.0f));
obj->SetPartRotationY(3, -60.0f*Math::PI/180.0f); obj->SetPartRotationY(3, -60.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -108,7 +108,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(4, rank); obj->SetObjectRank(4, rank);
obj->SetObjectParent(4, 3); obj->SetObjectParent(4, 3);
modelManager->AddModelReference("portico5.mod", false, rank, params.team); modelManager->AddModelReference("portico5.mod", false, rank, params.team);
obj->SetPartPosition(4, Math::Vector(35.0f, 0.0f, 0.0f)); obj->SetPartPosition(4, glm::vec3(35.0f, 0.0f, 0.0f));
obj->SetPartRotationY(4, -55.0f*Math::PI/180.0f); obj->SetPartRotationY(4, -55.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -116,7 +116,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(5, rank); obj->SetObjectRank(5, rank);
obj->SetObjectParent(5, 1); obj->SetObjectParent(5, 1);
modelManager->AddModelReference("portico3.mod", false, rank, params.team); modelManager->AddModelReference("portico3.mod", false, rank, params.team);
obj->SetPartPosition(5, Math::Vector(0.0f, 0.0f, 33.0f)); obj->SetPartPosition(5, glm::vec3(0.0f, 0.0f, 33.0f));
obj->SetPartRotationY(5, -45.0f*Math::PI/180.0f); obj->SetPartRotationY(5, -45.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -124,7 +124,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(6, rank); obj->SetObjectRank(6, rank);
obj->SetObjectParent(6, 5); obj->SetObjectParent(6, 5);
modelManager->AddModelReference("portico4.mod", false, rank, params.team); modelManager->AddModelReference("portico4.mod", false, rank, params.team);
obj->SetPartPosition(6, Math::Vector(50.0f, 0.0f, 0.0f)); obj->SetPartPosition(6, glm::vec3(50.0f, 0.0f, 0.0f));
obj->SetPartRotationY(6, 60.0f*Math::PI/180.0f); obj->SetPartRotationY(6, 60.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -132,7 +132,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(7, rank); obj->SetObjectRank(7, rank);
obj->SetObjectParent(7, 6); obj->SetObjectParent(7, 6);
modelManager->AddModelReference("portico5.mod", false, rank, params.team); modelManager->AddModelReference("portico5.mod", false, rank, params.team);
obj->SetPartPosition(7, Math::Vector(35.0f, 0.0f, 0.0f)); obj->SetPartPosition(7, glm::vec3(35.0f, 0.0f, 0.0f));
obj->SetPartRotationY(7, 55.0f*Math::PI/180.0f); obj->SetPartRotationY(7, 55.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -140,7 +140,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(8, rank); obj->SetObjectRank(8, rank);
obj->SetObjectParent(8, 0); obj->SetObjectParent(8, 0);
modelManager->AddModelReference("portico6.mod", false, rank, params.team); modelManager->AddModelReference("portico6.mod", false, rank, params.team);
obj->SetPartPosition(8, Math::Vector(-35.0f, 50.0f, -35.0f)); obj->SetPartPosition(8, glm::vec3(-35.0f, 50.0f, -35.0f));
obj->SetPartRotationY(8, -Math::PI/2.0f); obj->SetPartRotationY(8, -Math::PI/2.0f);
obj->SetPartScale(8, 2.0f); obj->SetPartScale(8, 2.0f);
@ -149,14 +149,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(9, rank); obj->SetObjectRank(9, rank);
obj->SetObjectParent(9, 8); obj->SetObjectParent(9, 8);
modelManager->AddModelReference("portico7.mod", false, rank, params.team); modelManager->AddModelReference("portico7.mod", false, rank, params.team);
obj->SetPartPosition(9, Math::Vector(0.0f, 4.5f, 1.9f)); obj->SetPartPosition(9, glm::vec3(0.0f, 4.5f, 1.9f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(10, rank); obj->SetObjectRank(10, rank);
obj->SetObjectParent(10, 0); obj->SetObjectParent(10, 0);
modelManager->AddModelReference("portico6.mod", false, rank, params.team); modelManager->AddModelReference("portico6.mod", false, rank, params.team);
obj->SetPartPosition(10, Math::Vector(-35.0f, 50.0f, 35.0f)); obj->SetPartPosition(10, glm::vec3(-35.0f, 50.0f, 35.0f));
obj->SetPartRotationY(10, -Math::PI/2.0f); obj->SetPartRotationY(10, -Math::PI/2.0f);
obj->SetPartScale(10, 2.0f); obj->SetPartScale(10, 2.0f);
@ -165,20 +165,20 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(11, rank); obj->SetObjectRank(11, rank);
obj->SetObjectParent(11, 10); obj->SetObjectParent(11, 10);
modelManager->AddModelReference("portico7.mod", false, rank, params.team); modelManager->AddModelReference("portico7.mod", false, rank, params.team);
obj->SetPartPosition(11, Math::Vector(0.0f, 4.5f, 1.9f)); obj->SetPartPosition(11, glm::vec3(0.0f, 4.5f, 1.9f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 28.0f, 0.0f), 45.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 28.0f, 0.0f), 45.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 27.0f, 10.0f, -42.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 27.0f, 10.0f, -42.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 10.0f, -42.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 10.0f, -42.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-27.0f, 10.0f, -42.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-27.0f, 10.0f, -42.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 27.0f, 10.0f, 42.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 27.0f, 10.0f, 42.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 10.0f, 42.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 10.0f, 42.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-27.0f, 10.0f, 42.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-27.0f, 10.0f, 42.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-32.0f, 45.0f, -32.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-32.0f, 45.0f, -32.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-32.0f, 45.0f, 32.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-32.0f, 45.0f, 32.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 32.0f, 45.0f, -32.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 32.0f, 45.0f, -32.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 32.0f, 45.0f, 32.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 32.0f, 45.0f, 32.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 35.0f, 0.0f), 50.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 35.0f, 0.0f), 50.0f));
obj->CreateShadowCircle(50.0f, 1.0f); obj->CreateShadowCircle(50.0f, 1.0f);
} }
@ -198,7 +198,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectParent(1+i, 0); obj->SetObjectParent(1+i, 0);
modelManager->AddModelReference("base2.mod", false, rank, params.team); modelManager->AddModelReference("base2.mod", false, rank, params.team);
glm::vec2 p = Math::RotatePoint(-Math::PI/4.0f*i, 27.8f); glm::vec2 p = Math::RotatePoint(-Math::PI/4.0f*i, 27.8f);
obj->SetPartPosition(1+i, Math::Vector(p.x, 30.0f, p.y)); obj->SetPartPosition(1+i, glm::vec3(p.x, 30.0f, p.y));
obj->SetPartRotationY(1+i, Math::PI/4.0f*i); obj->SetPartRotationY(1+i, Math::PI/4.0f*i);
obj->SetPartRotationZ(1+i, Math::PI/2.0f); obj->SetPartRotationZ(1+i, Math::PI/2.0f);
@ -207,14 +207,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(10+i, rank); obj->SetObjectRank(10+i, rank);
obj->SetObjectParent(10+i, 1+i); obj->SetObjectParent(10+i, 1+i);
modelManager->AddModelReference("base4.mod", false, rank, params.team); modelManager->AddModelReference("base4.mod", false, rank, params.team);
obj->SetPartPosition(10+i, Math::Vector(23.5f, 0.0f, 7.0f)); obj->SetPartPosition(10+i, glm::vec3(23.5f, 0.0f, 7.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(18+i, rank); obj->SetObjectRank(18+i, rank);
obj->SetObjectParent(18+i, 1+i); obj->SetObjectParent(18+i, 1+i);
modelManager->AddModelReference("base4.mod", true, rank, params.team); modelManager->AddModelReference("base4.mod", true, rank, params.team);
obj->SetPartPosition(18+i, Math::Vector(23.5f, 0.0f, -7.0f)); obj->SetPartPosition(18+i, glm::vec3(23.5f, 0.0f, -7.0f));
} }
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -223,25 +223,25 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectParent(9, 0); obj->SetObjectParent(9, 0);
modelManager->AddModelReference("base3.mod", false, rank, params.team); // central pillar modelManager->AddModelReference("base3.mod", false, rank, params.team); // central pillar
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 33.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 33.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 39.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));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 45.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 45.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 51.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 51.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 57.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 57.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 63.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 63.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 69.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 69.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 82.0f, 0.0f), 8.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 82.0f, 0.0f), 8.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 18.0f, 94.0f, 0.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 18.0f, 94.0f, 0.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-18.0f, 94.0f, 0.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-18.0f, 94.0f, 0.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 94.0f, 18.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 94.0f, 18.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 94.0f, -18.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 94.0f, -18.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 13.0f, 94.0f, 13.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 13.0f, 94.0f, 13.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-13.0f, 94.0f, 13.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-13.0f, 94.0f, 13.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 13.0f, 94.0f, -13.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 13.0f, 94.0f, -13.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-13.0f, 94.0f, -13.0f), 10.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-13.0f, 94.0f, -13.0f), 10.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f,104.0f, 0.0f), 14.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f,104.0f, 0.0f), 14.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 45.0f, 0.0f), 10.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 45.0f, 0.0f), 10.0f));
obj->CreateShadowCircle(60.0f, 1.0f); obj->CreateShadowCircle(60.0f, 1.0f);
@ -261,12 +261,12 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("derrick2.mod", false, rank, params.team); modelManager->AddModelReference("derrick2.mod", false, rank, params.team);
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 10.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 10.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 17.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 17.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 26.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 26.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(7.0f, 17.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(7.0f, 17.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 10.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 10.0f));
obj->CreateShadowCircle(10.0f, 0.4f); obj->CreateShadowCircle(10.0f, 0.4f);
} }
@ -283,22 +283,22 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("search2.mod", false, rank, params.team); modelManager->AddModelReference("search2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 13.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 13.0f, 0.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1); obj->SetObjectParent(2, 1);
modelManager->AddModelReference("search3.mod", false, rank, params.team); modelManager->AddModelReference("search3.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(0.0f, 4.0f, 0.0f)); obj->SetPartPosition(2, glm::vec3(0.0f, 4.0f, 0.0f));
obj->SetPartRotationZ(2, 35.0f*Math::PI/180.0f); obj->SetPartRotationZ(2, 35.0f*Math::PI/180.0f);
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 6.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 6.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 14.0f, 0.0f), 7.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 14.0f, 0.0f), 7.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 8.0f, 0.0f), 12.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 8.0f, 0.0f), 12.0f));
obj->SetPowerPosition(Math::Vector(7.5f, 3.0f, 0.0f)); obj->SetPowerPosition(glm::vec3(7.5f, 3.0f, 0.0f));
obj->CreateShadowCircle(12.0f, 1.0f); obj->CreateShadowCircle(12.0f, 1.0f);
} }
@ -315,14 +315,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("radar2.mod", false, rank, params.team); modelManager->AddModelReference("radar2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 5.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 5.0f, 0.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 0); obj->SetObjectParent(2, 0);
modelManager->AddModelReference("radar3.mod", false, rank, params.team); modelManager->AddModelReference("radar3.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(0.0f, 11.0f, 0.0f)); obj->SetPartPosition(2, glm::vec3(0.0f, 11.0f, 0.0f));
obj->SetPartRotationY(2, -Math::PI/2.0f); obj->SetPartRotationY(2, -Math::PI/2.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -330,11 +330,11 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(3, rank); obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 2); obj->SetObjectParent(3, 2);
modelManager->AddModelReference("radar4.mod", false, rank, params.team); modelManager->AddModelReference("radar4.mod", false, rank, params.team);
obj->SetPartPosition(3, Math::Vector(0.0f, 4.5f, 1.9f)); obj->SetPartPosition(3, glm::vec3(0.0f, 4.5f, 1.9f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 11.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 11.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 7.0f, 0.0f), 7.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 7.0f, 0.0f), 7.0f));
obj->CreateShadowCircle(8.0f, 1.0f); obj->CreateShadowCircle(8.0f, 1.0f);
} }
@ -346,12 +346,12 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetRotationY(params.angle); obj->SetRotationY(params.angle);
obj->SetFloorHeight(0.0f); obj->SetFloorHeight(0.0f);
obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 13.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 13.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-7.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-7.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(-7.0f, 5.0f, 0.0f), 5.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(-7.0f, 5.0f, 0.0f), 5.0f));
obj->SetPowerPosition(Math::Vector(0.0f, 3.0f, 0.0f)); obj->SetPowerPosition(glm::vec3(0.0f, 3.0f, 0.0f));
obj->SetEnergyLevel(params.power); // initializes the energy level obj->SetEnergyLevel(params.power); // initializes the energy level
obj->CreateShadowCircle(6.0f, 0.5f); obj->CreateShadowCircle(6.0f, 0.5f);
@ -369,7 +369,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("labo2.mod", false, rank, params.team); modelManager->AddModelReference("labo2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(-9.0f, 3.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(-9.0f, 3.0f, 0.0f));
obj->SetPartRotationZ(1, Math::PI/2.0f); obj->SetPartRotationZ(1, Math::PI/2.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -377,14 +377,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1); obj->SetObjectParent(2, 1);
modelManager->AddModelReference("labo3.mod", false, rank, params.team); modelManager->AddModelReference("labo3.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(9.0f, -1.0f, 0.0f)); obj->SetPartPosition(2, glm::vec3(9.0f, -1.0f, 0.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3, rank); obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 2); obj->SetObjectParent(3, 2);
modelManager->AddModelReference("labo4.mod", false, rank, params.team); modelManager->AddModelReference("labo4.mod", false, rank, params.team);
obj->SetPartPosition(3, Math::Vector(0.0f, 0.0f, 0.0f)); obj->SetPartPosition(3, glm::vec3(0.0f, 0.0f, 0.0f));
obj->SetPartRotationZ(3, 80.0f*Math::PI/180.0f); obj->SetPartRotationZ(3, 80.0f*Math::PI/180.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -392,7 +392,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(4, rank); obj->SetObjectRank(4, rank);
obj->SetObjectParent(4, 2); obj->SetObjectParent(4, 2);
modelManager->AddModelReference("labo4.mod", false, rank, params.team); modelManager->AddModelReference("labo4.mod", false, rank, params.team);
obj->SetPartPosition(4, Math::Vector(0.0f, 0.0f, 0.0f)); obj->SetPartPosition(4, glm::vec3(0.0f, 0.0f, 0.0f));
obj->SetPartRotationZ(4, 80.0f*Math::PI/180.0f); obj->SetPartRotationZ(4, 80.0f*Math::PI/180.0f);
obj->SetPartRotationY(4, Math::PI*2.0f/3.0f); obj->SetPartRotationY(4, Math::PI*2.0f/3.0f);
@ -401,18 +401,18 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(5, rank); obj->SetObjectRank(5, rank);
obj->SetObjectParent(5, 2); obj->SetObjectParent(5, 2);
modelManager->AddModelReference("labo4.mod", false, rank, params.team); modelManager->AddModelReference("labo4.mod", false, rank, params.team);
obj->SetPartPosition(5, Math::Vector(0.0f, 0.0f, 0.0f)); obj->SetPartPosition(5, glm::vec3(0.0f, 0.0f, 0.0f));
obj->SetPartRotationZ(5, 80.0f*Math::PI/180.0f); obj->SetPartRotationZ(5, 80.0f*Math::PI/180.0f);
obj->SetPartRotationY(5, -Math::PI*2.0f/3.0f); obj->SetPartRotationY(5, -Math::PI*2.0f/3.0f);
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 11.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 11.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 10.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 10.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 3.0f, 3.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 3.0f, 3.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 3.0f, -3.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 3.0f, -3.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(-10.0f, 5.0f, 0.0f), 7.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(-10.0f, 5.0f, 0.0f), 7.0f));
obj->SetPowerPosition(Math::Vector(0.0f, 3.0f, 0.0f)); obj->SetPowerPosition(glm::vec3(0.0f, 3.0f, 0.0f));
obj->CreateShadowCircle(7.0f, 0.5f); obj->CreateShadowCircle(7.0f, 0.5f);
} }
@ -431,7 +431,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1+i, rank); obj->SetObjectRank(1+i, rank);
obj->SetObjectParent(1+i, 0); obj->SetObjectParent(1+i, 0);
modelManager->AddModelReference("factory2.mod", false, rank, params.team); modelManager->AddModelReference("factory2.mod", false, rank, params.team);
obj->SetPartPosition(1+i, Math::Vector(10.0f, 2.0f*i, 10.0f)); obj->SetPartPosition(1+i, glm::vec3(10.0f, 2.0f*i, 10.0f));
obj->SetPartRotationZ(1+i, Math::PI/2.0f); obj->SetPartRotationZ(1+i, Math::PI/2.0f);
obj->SetPartScaleZ(1+i, 0.30f); obj->SetPartScaleZ(1+i, 0.30f);
@ -440,7 +440,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(10+i, rank); obj->SetObjectRank(10+i, rank);
obj->SetObjectParent(10+i, 0); obj->SetObjectParent(10+i, 0);
modelManager->AddModelReference("factory2.mod", false, rank, params.team); modelManager->AddModelReference("factory2.mod", false, rank, params.team);
obj->SetPartPosition(10+i, Math::Vector(10.0f, 2.0f*i, -10.0f)); obj->SetPartPosition(10+i, glm::vec3(10.0f, 2.0f*i, -10.0f));
obj->SetPartRotationZ(10+i, -Math::PI/2.0f); obj->SetPartRotationZ(10+i, -Math::PI/2.0f);
obj->SetPartRotationY(10+i, Math::PI); obj->SetPartRotationY(10+i, Math::PI);
obj->SetPartScaleZ(10+i, 0.30f); obj->SetPartScaleZ(10+i, 0.30f);
@ -449,27 +449,27 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
for (int i=0 ; i<2 ; i++ ) for (int i=0 ; i<2 ; i++ )
{ {
float s = static_cast<float>(i*2-1); float s = static_cast<float>(i*2-1);
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 2.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 9.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 16.0f, 11.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 16.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 2.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 2.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 9.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 9.0f, 4.0f*s), 4.0f, SOUND_BOUMm, 0.45f));
} }
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 21.0f, -4.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 21.0f, -4.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 18.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 18.0f));
obj->CreateShadowCircle(24.0f, 0.3f); obj->CreateShadowCircle(24.0f, 0.3f);
} }
@ -486,16 +486,16 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("repair2.mod", false, rank, params.team); modelManager->AddModelReference("repair2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(-11.0f, 13.5f, 0.0f)); obj->SetPartPosition(1, glm::vec3(-11.0f, 13.5f, 0.0f));
obj->SetPartRotationZ(1, Math::PI/2.0f); obj->SetPartRotationZ(1, Math::PI/2.0f);
engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f);
obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 0.0f, 4.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 0.0f, 4.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 0.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 0.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 0.0f, -4.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 0.0f, -4.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 10.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 10.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(-11.0f, 13.0f, 0.0f), 15.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(-11.0f, 13.0f, 0.0f), 15.0f));
} }
if ( params.type == OBJECT_DESTROYER ) if ( params.type == OBJECT_DESTROYER )
@ -510,14 +510,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("destroy2.mod", false, rank, params.team); modelManager->AddModelReference("destroy2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 0.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 0.0f, 0.0f));
engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f);
obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 0.0f, -13.5f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 0.0f, -13.5f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 0.0f, -13.5f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 0.0f, -13.5f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 0.0f, 13.5f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 0.0f, 13.5f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 0.0f, 13.5f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 0.0f, 13.5f), 4.0f, SOUND_BOUMm, 0.45f));
obj->CreateShadowCircle(19.0f, 1.0f); obj->CreateShadowCircle(19.0f, 1.0f);
} }
@ -531,9 +531,9 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f);
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 2.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 2.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 6.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 6.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(-15.0f, 5.0f, 0.0f), 6.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(-15.0f, 5.0f, 0.0f), 6.0f));
obj->SetEnergyLevel(params.power); obj->SetEnergyLevel(params.power);
} }
@ -550,14 +550,14 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("convert2.mod", false, rank, params.team); modelManager->AddModelReference("convert2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 14.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 14.0f, 0.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 0); obj->SetObjectParent(2, 0);
modelManager->AddModelReference("convert3.mod", false, rank, params.team); modelManager->AddModelReference("convert3.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(0.0f, 11.5f, 0.0f)); obj->SetPartPosition(2, glm::vec3(0.0f, 11.5f, 0.0f));
obj->SetPartRotationX(2, -Math::PI*0.35f); obj->SetPartRotationX(2, -Math::PI*0.35f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -565,17 +565,17 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(3, rank); obj->SetObjectRank(3, rank);
obj->SetObjectParent(3, 0); obj->SetObjectParent(3, 0);
modelManager->AddModelReference("convert3.mod", false, rank, params.team); modelManager->AddModelReference("convert3.mod", false, rank, params.team);
obj->SetPartPosition(3, Math::Vector(0.0f, 11.5f, 0.0f)); obj->SetPartPosition(3, glm::vec3(0.0f, 11.5f, 0.0f));
obj->SetPartRotationY(3, Math::PI); obj->SetPartRotationY(3, Math::PI);
obj->SetPartRotationX(3, -Math::PI*0.35f); obj->SetPartRotationX(3, -Math::PI*0.35f);
engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f);
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 2.0f, 4.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 2.0f, 4.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 2.0f, -4.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 2.0f, -4.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 9.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 9.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 14.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 14.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(-3.0f, 8.0f, 0.0f), 14.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(-3.0f, 8.0f, 0.0f), 14.0f));
} }
if ( params.type == OBJECT_TOWER ) if ( params.type == OBJECT_TOWER )
@ -590,7 +590,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("roller2c.mod", false, rank, params.team); modelManager->AddModelReference("roller2c.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 20.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 20.0f, 0.0f));
obj->SetPartRotationZ(1, Math::PI/2.0f); obj->SetPartRotationZ(1, Math::PI/2.0f);
rank = engine->CreateObject(); rank = engine->CreateObject();
@ -598,16 +598,16 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1); obj->SetObjectParent(2, 1);
modelManager->AddModelReference("roller3c.mod", false, rank, params.team); modelManager->AddModelReference("roller3c.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(4.5f, 0.0f, 0.0f)); obj->SetPartPosition(2, glm::vec3(4.5f, 0.0f, 0.0f));
obj->SetPartRotationZ(2, 0.0f); obj->SetPartRotationZ(2, 0.0f);
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 6.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 6.5f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 8.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 8.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 15.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 15.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 24.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 24.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 7.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 7.0f));
obj->SetPowerPosition(Math::Vector(5.0f, 3.0f, 0.0f)); obj->SetPowerPosition(glm::vec3(5.0f, 3.0f, 0.0f));
obj->CreateShadowCircle(6.0f, 1.0f); obj->CreateShadowCircle(6.0f, 1.0f);
} }
@ -624,15 +624,15 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("nuclear2.mod", false, rank, params.team); modelManager->AddModelReference("nuclear2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(20.0f, 10.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(20.0f, 10.0f, 0.0f));
obj->SetPartRotationZ(1, 135.0f*Math::PI/180.0f); obj->SetPartRotationZ(1, 135.0f*Math::PI/180.0f);
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 0.0f, 0.0f), 19.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 0.0f, 0.0f), 19.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 24.0f, 0.0f), 15.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 24.0f, 0.0f), 15.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(22.0f, 1.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(22.0f, 1.0f, 0.0f), 1.5f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 17.0f, 0.0f), 26.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 17.0f, 0.0f), 26.0f));
obj->SetPowerPosition(Math::Vector(22.0f, 3.0f, 0.0f)); obj->SetPowerPosition(glm::vec3(22.0f, 3.0f, 0.0f));
obj->CreateShadowCircle(21.0f, 1.0f); obj->CreateShadowCircle(21.0f, 1.0f);
} }
@ -646,17 +646,17 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->GetTerrain()->AddBuildingLevel(params.pos, 16.0f, 18.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 16.0f, 18.0f, 1.0f, 0.5f);
obj->AddCrashSphere(CrashSphere(Math::Vector( 13.0f, 3.0f, 13.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 13.0f, 3.0f, 13.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 11.0f, 15.0f, 11.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 11.0f, 15.0f, 11.0f), 2.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-13.0f, 3.0f, 13.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-13.0f, 3.0f, 13.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 15.0f, -11.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 15.0f, -11.0f), 2.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 13.0f, 3.0f, -13.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 13.0f, 3.0f, -13.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 11.0f, 15.0f, -11.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 11.0f, 15.0f, -11.0f), 2.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-13.0f, 3.0f, -13.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-13.0f, 3.0f, -13.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 15.0f, -11.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 15.0f, -11.0f), 2.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 26.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 26.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 54.0f, 0.0f), 14.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 54.0f, 0.0f), 14.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 20.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 20.0f));
obj->CreateShadowCircle(21.0f, 1.0f); obj->CreateShadowCircle(21.0f, 1.0f);
} }
@ -684,8 +684,8 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->GetTerrain()->AddBuildingLevel(params.pos, 18.0f, 20.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 18.0f, 20.0f, 1.0f, 0.5f);
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 1.0f, 0.0f), 13.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 1.0f, 0.0f), 13.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 1.0f, 0.0f), 13.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 1.0f, 0.0f), 13.0f));
obj->CreateShadowCircle(23.0f, 1.0f); obj->CreateShadowCircle(23.0f, 1.0f);
} }
@ -702,7 +702,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("huston2.mod", false, rank, params.team); modelManager->AddModelReference("huston2.mod", false, rank, params.team);
obj->SetPartPosition(1, Math::Vector(0.0f, 39.0f, 30.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 39.0f, 30.0f));
obj->SetPartRotationY(1, -Math::PI/2.0f); obj->SetPartRotationY(1, -Math::PI/2.0f);
obj->SetPartScale(1, 3.0f); obj->SetPartScale(1, 3.0f);
@ -711,24 +711,24 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetObjectRank(2, rank); obj->SetObjectRank(2, rank);
obj->SetObjectParent(2, 1); obj->SetObjectParent(2, 1);
modelManager->AddModelReference("huston3.mod", false, rank, params.team); modelManager->AddModelReference("huston3.mod", false, rank, params.team);
obj->SetPartPosition(2, Math::Vector(0.0f, 4.5f, 1.9f)); obj->SetPartPosition(2, glm::vec3(0.0f, 4.5f, 1.9f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 15.0f, 6.0f, -53.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 6.0f, -53.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 6.0f, -53.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 6.0f, -53.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 15.0f, 6.0f, -26.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 6.0f, -26.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 6.0f, -26.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 6.0f, -26.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 15.0f, 6.0f, 0.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 6.0f, 0.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 6.0f, 0.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 6.0f, 0.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 15.0f, 6.0f, 26.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 6.0f, 26.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 6.0f, 26.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 6.0f, 26.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 15.0f, 6.0f, 53.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 6.0f, 53.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 6.0f, 53.0f), 16.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 6.0f, 53.0f), 16.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 27.0f, 30.0f), 12.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 27.0f, 30.0f), 12.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 45.0f, 30.0f), 14.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 45.0f, 30.0f), 14.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 26.0f, 4.0f, -61.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 26.0f, 4.0f, -61.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-26.0f, 4.0f, -61.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-26.0f, 4.0f, -61.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 26.0f, 4.0f, 61.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 26.0f, 4.0f, 61.0f), 5.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-26.0f, 4.0f, 61.0f), 5.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-26.0f, 4.0f, 61.0f), 5.0f, SOUND_BOUMm, 0.45f));
} }
if ( params.type == OBJECT_TARGET1 ) if ( params.type == OBJECT_TARGET1 )
@ -739,23 +739,23 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
obj->SetScale(1.5f); obj->SetScale(1.5f);
obj->SetFloorHeight(0.0f); obj->SetFloorHeight(0.0f);
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 50.0f+14.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 50.0f+14.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( -7.0f, 50.0f+12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( -7.0f, 50.0f+12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 7.0f, 50.0f+12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 7.0f, 50.0f+12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 50.0f+ 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 50.0f+ 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 12.0f, 50.0f+ 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 12.0f, 50.0f+ 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-14.0f, 50.0f+ 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-14.0f, 50.0f+ 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 14.0f, 50.0f+ 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 14.0f, 50.0f+ 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 50.0f- 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 50.0f- 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 12.0f, 50.0f- 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 12.0f, 50.0f- 7.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( -7.0f, 50.0f-12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( -7.0f, 50.0f-12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 7.0f, 50.0f-12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 7.0f, 50.0f-12.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 50.0f-14.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 50.0f-14.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 30.0f, 0.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 30.0f, 0.0f), 2.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 24.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 24.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 16.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 16.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 4.0f, 0.0f), 8.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 4.0f, 0.0f), 8.0f, SOUND_BOUMm, 0.45f));
obj->CreateShadowCircle(15.0f, 1.0f); obj->CreateShadowCircle(15.0f, 1.0f);
} }
@ -802,7 +802,7 @@ std::unique_ptr<CBaseBuilding> CBaseBuilding::Create(
engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f); engine->GetTerrain()->AddBuildingLevel(params.pos, 7.0f, 9.0f, 1.0f, 0.5f);
} }
Math::Vector pos = obj->GetPosition(); glm::vec3 pos = obj->GetPosition();
pos.y += height; pos.y += height;
obj->SetPosition(pos); // to display the shadows immediately obj->SetPosition(pos); // to display the shadows immediately

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

@ -67,7 +67,7 @@ std::unique_ptr<CExchangePost> CExchangePost::Create(
obj->SetObjectRank(1, rank); obj->SetObjectRank(1, rank);
obj->SetObjectParent(1, 0); obj->SetObjectParent(1, 0);
modelManager->AddModelReference("info2.mod", false, rank); modelManager->AddModelReference("info2.mod", false, rank);
obj->SetPartPosition(1, Math::Vector(0.0f, 5.0f, 0.0f)); obj->SetPartPosition(1, glm::vec3(0.0f, 5.0f, 0.0f));
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
{ {
@ -76,25 +76,25 @@ std::unique_ptr<CExchangePost> CExchangePost::Create(
obj->SetObjectRank(2+i*2, rank); obj->SetObjectRank(2+i*2, rank);
obj->SetObjectParent(2+i*2, 1); obj->SetObjectParent(2+i*2, 1);
modelManager->AddModelReference("info3.mod", false, rank); modelManager->AddModelReference("info3.mod", false, rank);
obj->SetPartPosition(2+i*2, Math::Vector(0.0f, 4.5f, 0.0f)); obj->SetPartPosition(2+i*2, glm::vec3(0.0f, 4.5f, 0.0f));
rank = engine->CreateObject(); rank = engine->CreateObject();
engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT);
obj->SetObjectRank(3+i*2, rank); obj->SetObjectRank(3+i*2, rank);
obj->SetObjectParent(3+i*2, 2+i*2); obj->SetObjectParent(3+i*2, 2+i*2);
modelManager->AddModelReference("radar4.mod", false, rank); modelManager->AddModelReference("radar4.mod", false, rank);
obj->SetPartPosition(3+i*2, Math::Vector(0.0f, 0.0f, -4.0f)); 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); obj->SetPartRotationY(2+i*2, 2.0f*Math::PI/3.0f*i);
} }
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 11.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 11.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f));
obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 6.0f)); obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 6.0f));
obj->CreateShadowCircle(8.0f, 1.0f); obj->CreateShadowCircle(8.0f, 1.0f);
Math::Vector pos = obj->GetPosition(); glm::vec3 pos = obj->GetPosition();
pos.y += params.height; pos.y += params.height;
obj->SetPosition(pos); // to display the shadows immediately obj->SetPosition(pos); // to display the shadows immediately
@ -312,14 +312,14 @@ void CAutoInfo::Start(int param)
m_lastParticle = 0; m_lastParticle = 0;
m_goal = m_object->GetPosition(); m_goal = m_object->GetPosition();
Math::Vector pos, speed; glm::vec3 pos, speed;
glm::vec2 dim; glm::vec2 dim;
if (m_phase == Phase::Send) if (m_phase == Phase::Send)
{ {
pos = m_goal; pos = m_goal;
pos.y += 9.5f; pos.y += 9.5f;
speed = Math::Vector(0.0f, 0.0f, 0.0f); speed = glm::vec3(0.0f, 0.0f, 0.0f);
dim.x = 30.0f; dim.x = 30.0f;
dim.y = dim.x; dim.y = dim.x;
m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISPHERE4, 1.5f, 0.0f, 0.0f); m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISPHERE4, 1.5f, 0.0f, 0.0f);
@ -330,7 +330,7 @@ void CAutoInfo::Start(int param)
{ {
pos = m_goal; pos = m_goal;
pos.y += 9.5f; pos.y += 9.5f;
speed = Math::Vector(0.0f, 0.0f, 0.0f); speed = glm::vec3(0.0f, 0.0f, 0.0f);
dim.x = 50.0f; dim.x = 50.0f;
dim.y = dim.x; dim.y = dim.x;
m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISPHERE6, 1.5f, 0.0f, 0.0f); m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISPHERE6, 1.5f, 0.0f, 0.0f);
@ -404,9 +404,9 @@ bool CAutoInfo::EventProcess(const Event &event)
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
Math::Vector pos = m_goal; glm::vec3 pos = m_goal;
pos.y += 9.5f; pos.y += 9.5f;
Math::Vector speed; glm::vec3 speed;
speed.x = (Math::Rand()-0.5f)*50.0f; speed.x = (Math::Rand()-0.5f)*50.0f;
speed.z = (Math::Rand()-0.5f)*50.0f; speed.z = (Math::Rand()-0.5f)*50.0f;
speed.y = (Math::Rand()-0.5f)*50.0f; speed.y = (Math::Rand()-0.5f)*50.0f;
@ -450,9 +450,9 @@ bool CAutoInfo::EventProcess(const Event &event)
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
Math::Vector pos = m_goal; glm::vec3 pos = m_goal;
pos.y += 9.5f; pos.y += 9.5f;
Math::Vector speed = pos; glm::vec3 speed = pos;
pos.x += (Math::Rand()-0.5f)*40.0f; pos.x += (Math::Rand()-0.5f)*40.0f;
pos.y += (Math::Rand()-0.5f)*40.0f; pos.y += (Math::Rand()-0.5f)*40.0f;
pos.z += (Math::Rand()-0.5f)*40.0f; pos.z += (Math::Rand()-0.5f)*40.0f;
@ -495,8 +495,8 @@ bool CAutoInfo::EventProcess(const Event &event)
{ {
m_lastParticle = m_time; m_lastParticle = m_time;
Math::Vector pos = m_goal; glm::vec3 pos = m_goal;
Math::Vector speed; glm::vec3 speed;
speed.x = (Math::Rand()-0.5f)*5.0f; speed.x = (Math::Rand()-0.5f)*5.0f;
speed.z = (Math::Rand()-0.5f)*5.0f; speed.z = (Math::Rand()-0.5f)*5.0f;
speed.y = 5.0f+Math::Rand()*5.0f; speed.y = 5.0f+Math::Rand()*5.0f;

2
src/object/subclass/exchange_post.h
View File

@ -106,6 +106,6 @@ protected:
float m_speed; float m_speed;
float m_timeVirus; float m_timeVirus;
float m_lastParticle; float m_lastParticle;
Math::Vector m_goal; glm::vec3 m_goal;
bool m_lastVirus; bool m_lastVirus;
}; };

10
src/object/subclass/static_object.cpp
View File

@ -44,7 +44,7 @@ const std::unordered_map<ObjectType, std::string, ObjectTypeHash> CStaticObject:
CStaticObject::CStaticObject(int id, CStaticObject::CStaticObject(int id,
ObjectType type, ObjectType type,
const std::string& key, const std::string& key,
const Math::Vector& position, const glm::vec3& position,
float angleY, float angleY,
const Gfx::CModel& model, const Gfx::CModel& model,
Gfx::CEngine* engine) Gfx::CEngine* engine)
@ -74,13 +74,13 @@ CStaticObject::~CStaticObject()
m_engine->DeleteStaticMesh(m_meshHandle); m_engine->DeleteStaticMesh(m_meshHandle);
} }
Math::Matrix CStaticObject::ComputeWorldMatrix(const Math::Vector& position, float angleY) Math::Matrix CStaticObject::ComputeWorldMatrix(const glm::vec3& position, float angleY)
{ {
Math::Matrix translationMatrix; Math::Matrix translationMatrix;
Math::LoadTranslationMatrix(translationMatrix, position); Math::LoadTranslationMatrix(translationMatrix, position);
Math::Matrix rotationMatrix; Math::Matrix rotationMatrix;
Math::LoadRotationZXYMatrix(rotationMatrix, Math::Vector(0.0f, angleY, 0.0f)); Math::LoadRotationZXYMatrix(rotationMatrix, glm::vec3(0.0f, angleY, 0.0f));
return Math::MultiplyMatrices(translationMatrix, rotationMatrix); return Math::MultiplyMatrices(translationMatrix, rotationMatrix);
} }
@ -117,7 +117,7 @@ bool CStaticObject::IsStaticObject(ObjectType type)
CStaticObjectUPtr CStaticObject::Create(int id, CStaticObjectUPtr CStaticObject::Create(int id,
ObjectType type, ObjectType type,
const Math::Vector& position, const glm::vec3& position,
float angleY, float angleY,
float height, float height,
Gfx::CEngine* engine, Gfx::CEngine* engine,
@ -130,7 +130,7 @@ CStaticObjectUPtr CStaticObject::Create(int id,
std::string modelFile = it->second; std::string modelFile = it->second;
Math::Vector adjustedPosition = position; glm::vec3 adjustedPosition = position;
terrain->AdjustToFloor(adjustedPosition); terrain->AdjustToFloor(adjustedPosition);
adjustedPosition.y += height; adjustedPosition.y += height;

6
src/object/subclass/static_object.h
View File

@ -41,7 +41,7 @@ public:
CStaticObject(int id, CStaticObject(int id,
ObjectType type, ObjectType type,
const std::string& key, const std::string& key,
const Math::Vector& position, const glm::vec3& position,
float angleY, float angleY,
const Gfx::CModel& model, const Gfx::CModel& model,
Gfx::CEngine* engine); Gfx::CEngine* engine);
@ -58,7 +58,7 @@ public:
static CStaticObjectUPtr Create(int id, static CStaticObjectUPtr Create(int id,
ObjectType type, ObjectType type,
const Math::Vector& position, const glm::vec3& position,
float angleY, float angleY,
float height, float height,
Gfx::CEngine* engine, Gfx::CEngine* engine,
@ -70,7 +70,7 @@ protected:
void TransformCameraCollisionSphere(Math::Sphere& collisionSphere) override; void TransformCameraCollisionSphere(Math::Sphere& collisionSphere) override;
private: private:
static Math::Matrix ComputeWorldMatrix(const Math::Vector& position, static Math::Matrix ComputeWorldMatrix(const glm::vec3& position,
float angleY); float angleY);
private: private: