From 300a2d856970157ad6d1bf9f58c576d635a2fa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Mon, 3 Jan 2022 22:51:36 +0100 Subject: [PATCH] Refactored Math::Vector to glm::vec3 in CrashSphere, CObjectFactory, old_object.h, old_object_interface.h --- src/object/crash_sphere.h | 3 +- src/object/object_factory.cpp | 818 ++++++++++++++-------------- src/object/object_factory.h | 2 - src/object/old_object.cpp | 164 +++--- src/object/old_object.h | 58 +- src/object/old_object_interface.cpp | 6 +- src/object/old_object_interface.h | 10 +- 7 files changed, 529 insertions(+), 532 deletions(-) diff --git a/src/object/crash_sphere.h b/src/object/crash_sphere.h index 2ff846b1..c98b15af 100644 --- a/src/object/crash_sphere.h +++ b/src/object/crash_sphere.h @@ -22,7 +22,6 @@ #include "common/logger.h" #include "math/sphere.h" -#include "math/vector.h" #include "sound/sound_type.h" @@ -32,7 +31,7 @@ */ struct CrashSphere { - CrashSphere(const Math::Vector& pos = Math::Vector(), + CrashSphere(const glm::vec3& pos = { 0, 0, 0 }, float radius = 0.0f, SoundType _sound = SOUND_NONE, float _hardness = 0.45f) diff --git a/src/object/object_factory.cpp b/src/object/object_factory.cpp index 06cd6b0a..9c82536b 100644 --- a/src/object/object_factory.cpp +++ b/src/object/object_factory.cpp @@ -330,7 +330,7 @@ CObjectUPtr CObjectFactory::CreateObject(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateResource(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; ObjectType type = params.type; float power = params.power; @@ -404,28 +404,28 @@ CObjectUPtr CObjectFactory::CreateResource(const ObjectCreateParams& params) } else if ( type == OBJECT_EGG ) { - obj->AddCrashSphere(CrashSphere(Math::Vector(-1.0f, 2.8f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-1.0f, 2.8f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 10.0f)); radius = 3.0f; } else if ( type == OBJECT_BOMB ) { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 3.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 3.0f)); radius = 3.0f; } else if ( type == OBJECT_BAG ) { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f)); obj->SetScale(1.5f); radius = 5.0f; height = -1.4f; } else { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 1.0f, 0.0f), 1.5f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 1.0f, 0.0f), 1.5f)); } obj->CreateShadowCircle(radius, 1.0f); @@ -446,7 +446,7 @@ CObjectUPtr CObjectFactory::CreateResource(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateFlag(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; ObjectType type = params.type; @@ -485,11 +485,11 @@ CObjectUPtr CObjectFactory::CreateFlag(const ObjectCreateParams& params) obj->SetObjectRank(1+i, rank); obj->SetObjectParent(1+i, i); m_oldModelManager->AddModelReference(name, false, rank, obj->GetTeam()); - if ( i == 0 ) obj->SetPartPosition(1+i, Math::Vector(0.15f, 5.0f, 0.0f)); - else obj->SetPartPosition(1+i, Math::Vector(0.79f, 0.0f, 0.0f)); + if ( i == 0 ) obj->SetPartPosition(1+i, glm::vec3(0.15f, 5.0f, 0.0f)); + else obj->SetPartPosition(1+i, glm::vec3(0.79f, 0.0f, 0.0f)); } - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 1.0f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 1.0f)); obj->CreateShadowCircle(2.0f, 0.3f); obj->SetFloorHeight(0.0f); @@ -507,7 +507,7 @@ CObjectUPtr CObjectFactory::CreateFlag(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -526,9 +526,9 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(6.0f, 0.5f, Gfx::ENG_SHADOW_WORM); } @@ -542,11 +542,11 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(12.0f, 0.5f, Gfx::ENG_SHADOW_WORM); } @@ -560,11 +560,11 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(12.0f, 0.8f, Gfx::ENG_SHADOW_WORM); } @@ -578,11 +578,11 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(10.0f, 0.5f, Gfx::ENG_SHADOW_WORM); } @@ -596,12 +596,12 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(6.0f, 0.5f, Gfx::ENG_SHADOW_WORM); } @@ -615,16 +615,16 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-8.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-8.5f, 3.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-8.5f, 6.0f, 0.0f), 0.7f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(12.0f, 0.5f, Gfx::ENG_SHADOW_WORM); } @@ -647,7 +647,7 @@ CObjectUPtr CObjectFactory::CreateBarrier(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -676,9 +676,9 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) height -= 2.0f; - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 3.0f, 0.0f), 6.0f)); - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 8.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 3.0f, 0.0f), 6.0f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 8.0f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -696,8 +696,8 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); -//? obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 3.0f, SOUND_BOUM, 0.10f)); - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f)); +//? obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 3.0f, SOUND_BOUM, 0.10f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f)); obj->CreateShadowCircle(5.0f, 0.3f); } @@ -713,8 +713,8 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 10.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 10.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(10.0f, 0.5f); } @@ -736,9 +736,9 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 12.0f, 0.0f), 5.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 6.0f)); - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 8.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 12.0f, 0.0f), 5.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 6.0f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 8.0f)); obj->CreateShadowCircle(8.0f, 0.3f); } @@ -762,10 +762,10 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) if ( type != OBJECT_PLANT19 ) { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 3.0f, 0.0f), 6.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 3.0f, 0.0f), 6.0f)); } - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 8.0f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 8.0f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -779,10 +779,10 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 2.0f), 3.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-1.0f, 10.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 17.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 1.0f, 27.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 2.0f), 3.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-1.0f, 10.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 17.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 1.0f, 27.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -796,11 +796,11 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 2.0f), 3.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 11.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 19.0f, 2.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.0f, 26.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.0f, 34.0f,-2.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 2.0f), 3.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 11.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 19.0f, 2.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.0f, 26.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.0f, 34.0f,-2.0f), 2.0f, SOUND_BOUMs, 0.20f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -814,11 +814,11 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 3.0f, 1.0f), 3.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 10.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 19.0f, 2.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.0f, 25.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 32.0f,-2.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 3.0f, 1.0f), 3.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 10.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 19.0f, 2.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.0f, 25.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 32.0f,-2.0f), 2.0f, SOUND_BOUMs, 0.20f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -832,10 +832,10 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 3.0f, 2.0f), 3.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.0f, 9.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 18.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 27.0f, 7.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 3.0f, 2.0f), 3.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.0f, 9.0f, 1.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 18.0f, 0.0f), 2.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 27.0f, 7.0f), 2.0f, SOUND_BOUMs, 0.20f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -849,9 +849,9 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 10.0f, 0.0f), 10.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 21.0f, 0.0f), 8.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 32.0f, 0.0f), 7.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 10.0f, 0.0f), 10.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 21.0f, 0.0f), 8.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 32.0f, 0.0f), 7.0f, SOUND_BOUMs, 0.20f)); obj->CreateShadowCircle(8.0f, 0.5f); } @@ -865,9 +865,9 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 5.0f,-10.0f), 25.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-65.0f, 5.0f, 65.0f), 20.0f, SOUND_BOUMs, 0.20f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 38.0f, 5.0f, 21.0f), 18.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 5.0f,-10.0f), 25.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-65.0f, 5.0f, 65.0f), 20.0f, SOUND_BOUMs, 0.20f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 38.0f, 5.0f, 21.0f), 18.0f, SOUND_BOUMs, 0.20f)); obj->CreateShadowCircle(50.0f, 0.5f); } @@ -889,7 +889,7 @@ CObjectUPtr CObjectFactory::CreatePlant(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateMushroom(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -908,9 +908,9 @@ CObjectUPtr CObjectFactory::CreateMushroom(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 4.0f, 0.0f), 3.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 3.0f, 0.0f), 5.5f)); - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 3.0f, 0.0f), 5.5f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 4.0f, 0.0f), 3.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 3.0f, 0.0f), 5.5f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 3.0f, 0.0f), 5.5f)); obj->CreateShadowCircle(6.0f, 0.5f); } @@ -924,9 +924,9 @@ CObjectUPtr CObjectFactory::CreateMushroom(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 5.0f, 0.0f), 3.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 5.5f)); - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 5.5f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 5.0f, 0.0f), 3.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 5.5f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 5.5f)); obj->CreateShadowCircle(5.0f, 0.5f); } @@ -948,7 +948,7 @@ CObjectUPtr CObjectFactory::CreateMushroom(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -971,11 +971,11 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 5.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.5f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.5f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 5.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.5f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.5f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(5.0f, 0.8f*fShadow, Gfx::ENG_SHADOW_WORM); } @@ -989,13 +989,13 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 6.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-4.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-6.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 6.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-4.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-6.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(6.0f, 0.8f*fShadow, Gfx::ENG_SHADOW_WORM); } @@ -1009,13 +1009,13 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 7.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.7f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.3f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.3f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-4.7f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-7.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 7.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.7f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.3f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.3f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-4.7f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-7.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(6.0f, 0.8f*fShadow, Gfx::ENG_SHADOW_WORM); } @@ -1030,8 +1030,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 4.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 4.0f)); obj->CreateShadowCircle(6.0f, 0.5f*fShadow); } @@ -1044,13 +1044,13 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-9.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-6.0f, 1.0f, 0.0f), 1.1f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.0f, 1.0f, 0.0f), 1.2f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 0.0f), 1.3f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 5.1f, 1.0f,-1.3f), 2.6f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.0f, 1.0f, 2.2f), 2.3f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 9.4f, 1.0f,-2.0f), 2.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-9.0f, 1.0f, 0.0f), 1.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-6.0f, 1.0f, 0.0f), 1.1f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.0f, 1.0f, 0.0f), 1.2f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 0.0f), 1.3f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 5.1f, 1.0f,-1.3f), 2.6f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.0f, 1.0f, 2.2f), 2.3f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 9.4f, 1.0f,-2.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(10.0f, 0.5f*fShadow, Gfx::ENG_SHADOW_WORM); } @@ -1079,12 +1079,12 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(20.0f, 0.2f*fShadow); } @@ -1098,12 +1098,12 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(20.0f, 0.2f*fShadow); } @@ -1117,14 +1117,14 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 12.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 12.0f)); obj->CreateShadowCircle(20.0f, 0.2f*fShadow); } @@ -1137,14 +1137,14 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.5f, 3.0f,-7.5f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 12.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 12.0f)); obj->CreateShadowCircle(20.0f, 0.2f*fShadow); } @@ -1157,18 +1157,18 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-26.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 3.0f,-4.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-15.0f, 3.0f, 5.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -4.0f, 3.0f,-4.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -4.0f, 3.0f, 5.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 6.0f, 3.0f,-4.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 6.0f, 3.0f, 4.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 14.0f, 3.0f,-3.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 14.0f, 3.0f, 2.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 24.0f, 3.0f, 5.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-26.0f, 3.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 3.0f,-4.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-15.0f, 3.0f, 5.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -4.0f, 3.0f,-4.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -4.0f, 3.0f, 5.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 6.0f, 3.0f,-4.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 6.0f, 3.0f, 4.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 14.0f, 3.0f,-3.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 14.0f, 3.0f, 2.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 24.0f, 3.0f, 5.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 20.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 20.0f)); obj->CreateShadowCircle(40.0f, 0.2f*fShadow); } @@ -1183,10 +1183,10 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetFloorHeight(0.0f); Math::Matrix* mat = obj->GetWorldMatrix(0); - pos = Math::Transform(*mat, Math::Vector(-56.0f, 22.0f, 0.0f)); - m_particle->CreateParticle(pos, Math::Vector(0.0f, 0.0f, 0.0f), { 20.0f, 20.0f }, Gfx::PARTISELY, 1.0f, 0.0f, 0.0f); + pos = Math::Transform(*mat, glm::vec3(-56.0f, 22.0f, 0.0f)); + m_particle->CreateParticle(pos, glm::vec3(0.0f, 0.0f, 0.0f), { 20.0f, 20.0f }, Gfx::PARTISELY, 1.0f, 0.0f, 0.0f); - pos = Math::Transform(*mat, Math::Vector(-65.0f, 40.0f, 0.0f)); + pos = Math::Transform(*mat, glm::vec3(-65.0f, 40.0f, 0.0f)); Gfx::Color color; color.r = 4.0f; color.g = 2.0f; @@ -1205,8 +1205,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 9.0f, 0.0f), 5.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 0.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 9.0f, 0.0f), 5.0f)); obj->CreateShadowCircle(4.5f, 1.0f*fShadow); } @@ -1219,17 +1219,17 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 15.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 15.0f)); obj->CreateShadowCircle(20.0f, 1.0f*fShadow); } @@ -1242,17 +1242,17 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 15.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 15.0f)); obj->CreateShadowCircle(20.0f, 1.0f*fShadow); } @@ -1265,17 +1265,17 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f,-7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 4.0f, 7.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 15.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 15.0f)); obj->CreateShadowCircle(20.0f, 1.0f*fShadow); } @@ -1288,10 +1288,10 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-8.0f, 4.0f, 0.0f), 12.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 8.0f, 4.0f, 0.0f), 12.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-8.0f, 4.0f, 0.0f), 12.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 8.0f, 4.0f, 0.0f), 12.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 13.0f, 0.0f), 20.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 13.0f, 0.0f), 20.0f)); obj->CreateShadowCircle(18.0f, 1.0f*fShadow); } @@ -1304,8 +1304,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 31.0f, 0.0f), 31.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 31.0f, 0.0f), 31.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 31.0f, 0.0f), 31.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 31.0f, 0.0f), 31.0f)); obj->CreateShadowCircle(24.0f, 0.5f*fShadow); } @@ -1318,8 +1318,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 31.0f, 0.0f), 31.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 31.0f, 0.0f), 31.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 31.0f, 0.0f), 31.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 31.0f, 0.0f), 31.0f)); obj->CreateShadowCircle(24.0f, 0.5f*fShadow); } @@ -1332,8 +1332,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 10.0f, 0.0f), 32.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 32.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 10.0f, 0.0f), 32.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 32.0f)); obj->CreateShadowCircle(33.0f, 1.0f*fShadow); } @@ -1346,14 +1346,14 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-175.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-175.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -55.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -55.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -37.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -37.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 83.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 83.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-175.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-175.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -55.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -55.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -37.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -37.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 83.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 83.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); } if ( type == OBJECT_TEEN21 ) // wall with window @@ -1375,10 +1375,10 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-135.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-135.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -15.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -15.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-135.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-135.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -15.0f, 0.0f, -5.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -15.0f, 0.0f, -35.0f), 4.0f, SOUND_BOUMm, 0.45f)); } if ( type == OBJECT_TEEN23 ) // skateboard on wheels @@ -1392,16 +1392,16 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) if ( option == 1 ) // passage under the prohibited skateboard? { - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 2.0f, 0.0f), 11.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 10.0f, 2.0f, 0.0f), 11.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 2.0f, 0.0f), 11.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 10.0f, 2.0f, 0.0f), 11.0f, SOUND_BOUMm, 0.45f)); } - obj->AddCrashSphere(CrashSphere(Math::Vector(-23.0f, 2.0f, 7.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-23.0f, 2.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-23.0f, 2.0f,-7.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 23.0f, 2.0f, 7.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 23.0f, 2.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 23.0f, 2.0f,-7.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-23.0f, 2.0f, 7.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-23.0f, 2.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-23.0f, 2.0f,-7.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 23.0f, 2.0f, 7.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 23.0f, 2.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 23.0f, 2.0f,-7.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(35.0f, 0.8f*fShadow, Gfx::ENG_SHADOW_WORM); } @@ -1415,8 +1415,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 0.0f, -3.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 0.0f, 3.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 0.0f, -3.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 0.0f, 3.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(20.0f, 0.2f*fShadow); } @@ -1429,8 +1429,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 0.0f, -3.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 0.0f, 3.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 0.0f, -3.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 0.0f, 3.0f), 3.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(20.0f, 0.2f*fShadow); } @@ -1445,10 +1445,10 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetFloorHeight(0.0f); Math::Matrix* mat = obj->GetWorldMatrix(0); - pos = Math::Transform(*mat, Math::Vector(0.0f, 50.0f, 0.0f)); - m_particle->CreateParticle(pos, Math::Vector(0.0f, 0.0f, 0.0f), { 100.0f, 100.0f }, Gfx::PARTISELY, 1.0f, 0.0f, 0.0f); + pos = Math::Transform(*mat, glm::vec3(0.0f, 50.0f, 0.0f)); + m_particle->CreateParticle(pos, glm::vec3(0.0f, 0.0f, 0.0f), { 100.0f, 100.0f }, Gfx::PARTISELY, 1.0f, 0.0f, 0.0f); - pos = Math::Transform(*mat, Math::Vector(0.0f, 50.0f, 0.0f)); + pos = Math::Transform(*mat, glm::vec3(0.0f, 50.0f, 0.0f)); Gfx::Color color; color.r = 4.0f; color.g = 2.0f; @@ -1466,7 +1466,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(40.0f, 0.5f); } @@ -1480,7 +1480,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 5.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 5.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(7.0f, 0.6f*fShadow); } @@ -1504,8 +1504,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 4.0f, 0.0f), 15.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 15.0f, 0.0f), 17.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 4.0f, 0.0f), 15.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 15.0f, 0.0f), 17.0f)); obj->CreateShadowCircle(20.0f, 1.0f*fShadow); } @@ -1518,11 +1518,11 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 2.0f, 0.0f), 5.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 2.0f, 0.0f), 6.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 9.0f, 4.0f, 1.0f), 6.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 2.0f, 0.0f), 5.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 2.0f, 0.0f), 6.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 9.0f, 4.0f, 1.0f), 6.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 10.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(16.0f, 0.6f*fShadow); } @@ -1535,11 +1535,11 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector( 17.5f, 1.0f, 17.5f), 3.5f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 17.5f, 1.0f, -17.5f), 3.5f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-17.5f, 1.0f, 17.5f), 3.5f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-17.5f, 1.0f, -17.5f), 3.5f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 26.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 17.5f, 1.0f, 17.5f), 3.5f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 17.5f, 1.0f, -17.5f), 3.5f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-17.5f, 1.0f, 17.5f), 3.5f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-17.5f, 1.0f, -17.5f), 3.5f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 26.0f)); obj->CreateShadowCircle(35.0f, 0.3f*fShadow); } @@ -1552,7 +1552,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(10.0f, 0.3f*fShadow); } @@ -1565,7 +1565,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 4.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(3.0f, 1.0f*fShadow); } @@ -1578,11 +1578,11 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(-40.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-20.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 20.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 40.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-40.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-20.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 20.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 40.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(40.0f, 0.8f*fShadow, Gfx::ENG_SHADOW_WORM); } @@ -1622,17 +1622,17 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetObjectRank(1, rank); obj->SetObjectParent(1, 0); m_oldModelManager->AddModelReference("teen38b.mod", false, rank); // engine - obj->SetPartPosition(1, Math::Vector(0.0f, 30.0f, 0.0f)); + 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 - obj->SetPartPosition(2, Math::Vector(0.0f, 0.0f, 0.0f)); + obj->SetPartPosition(2, glm::vec3(0.0f, 0.0f, 0.0f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 2.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 10.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 2.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(15.0f, 0.5f*fShadow); } @@ -1645,8 +1645,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 8.5f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 2.0f, 0.0f), 8.5f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 8.5f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 2.0f, 0.0f), 8.5f)); obj->CreateShadowCircle(10.0f, 1.0f*fShadow); } @@ -1659,8 +1659,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 5.0f, 0.0f), 11.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 14.0f, 0.0f), 15.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 5.0f, 0.0f), 11.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 14.0f, 0.0f), 15.0f)); obj->CreateShadowCircle(15.0f, 0.7f*fShadow); } @@ -1683,7 +1683,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 2.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 2.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(15.0f, 0.4f*fShadow); } @@ -1696,7 +1696,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 2.0f, SOUND_BOUM, 0.10f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 2.0f, SOUND_BOUM, 0.10f)); obj->CreateShadowCircle(15.0f, 0.4f*fShadow); } @@ -1709,8 +1709,8 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 10.0f, 0.0f), 55.0f, SOUND_BOUM, 0.10f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 55.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 10.0f, 0.0f), 55.0f, SOUND_BOUM, 0.10f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 55.0f)); obj->CreateShadowCircle(55.0f, 1.0f*fShadow); } @@ -1736,7 +1736,7 @@ CObjectUPtr CObjectFactory::CreateTeen(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -1755,8 +1755,8 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 3.5f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 2.0f, 0.0f), 3.5f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 3.5f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 2.0f, 0.0f), 3.5f)); obj->CreateShadowCircle(4.0f, 0.5f); } @@ -1769,8 +1769,8 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 5.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 4.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 5.0f)); obj->CreateShadowCircle(5.0f, 0.5f); } @@ -1783,8 +1783,8 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 6.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 6.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 6.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 6.0f)); obj->CreateShadowCircle(6.0f, 0.5f); } @@ -1797,8 +1797,8 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params) obj->SetPosition(pos); obj->SetRotationY(angle); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 10.0f, 0.0f), 10.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 10.0f, 0.0f), 10.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(10.0f, 0.5f); } @@ -1843,7 +1843,7 @@ CObjectUPtr CObjectFactory::CreateQuartz(const ObjectCreateParams& params) // Creates a root placed on the ground. CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -1862,14 +1862,14 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetScale(2.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector(-5.0f, 1.0f, 0.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.0f, 1.0f, 2.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.0f, 1.0f, -3.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.0f, 5.0f, -1.0f), 1.5f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-4.0f, 5.0f, -1.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 8.0f, -0.5f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 10.0f, -0.5f), 1.0f, SOUND_BOUMv, 0.15f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 11.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-5.0f, 1.0f, 0.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.0f, 1.0f, 2.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.0f, 1.0f, -3.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.0f, 5.0f, -1.0f), 1.5f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-4.0f, 5.0f, -1.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 8.0f, -0.5f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 10.0f, -0.5f), 1.0f, SOUND_BOUMv, 0.15f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 11.0f)); obj->CreateShadowCircle(16.0f, 0.5f); } @@ -1883,14 +1883,14 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetScale(2.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector(-4.0f, 1.0f, 1.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 1.0f, 2.0f), 1.5f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 1.0f, -2.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.0f, 5.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 2.0f, 5.0f, 0.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 8.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 12.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 12.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-4.0f, 1.0f, 1.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 1.0f, 2.0f), 1.5f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 1.0f, -2.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.0f, 5.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 2.0f, 5.0f, 0.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 8.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 12.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 12.0f)); obj->CreateShadowCircle(16.0f, 0.5f); } @@ -1904,13 +1904,13 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetScale(2.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector(-3.0f, 1.0f, 0.5f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 1.0f, -1.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-1.0f, 4.5f, 0.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 7.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 7.0f, -1.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.0f, 11.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-3.0f, 1.0f, 0.5f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 1.0f, -1.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-1.0f, 4.5f, 0.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 7.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 7.0f, -1.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.0f, 11.0f, 1.0f), 1.0f, SOUND_BOUMv, 0.15f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(16.0f, 0.5f); } @@ -1924,15 +1924,15 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetScale(2.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector(-4.0f, 1.0f, 1.0f), 3.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.0f, 1.0f, -3.0f), 3.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 6.0f, 1.0f, 4.0f), 3.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-2.5f, 7.0f, 2.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 4.0f, 7.0f, 2.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 6.0f, -1.0f), 1.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 12.0f, 0.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 1.0f, 16.0f, 0.0f), 1.0f, SOUND_BOUMv, 0.15f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 10.0f, 0.0f), 14.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-4.0f, 1.0f, 1.0f), 3.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.0f, 1.0f, -3.0f), 3.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 6.0f, 1.0f, 4.0f), 3.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-2.5f, 7.0f, 2.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 4.0f, 7.0f, 2.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 6.0f, -1.0f), 1.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 12.0f, 0.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 1.0f, 16.0f, 0.0f), 1.0f, SOUND_BOUMv, 0.15f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 10.0f, 0.0f), 14.0f)); obj->CreateShadowCircle(22.0f, 0.5f); } @@ -1946,17 +1946,17 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetScale(2.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector( -7.0f, 2.0f, 3.0f), 4.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 5.0f, 2.0f, -6.0f), 4.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 6.0f, 2.0f, 6.0f), 3.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 1.0f, -2.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 1.0f, 1.0f, -7.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -4.0f, 10.0f, 3.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 1.0f, 11.0f, 7.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 11.0f, -3.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 17.0f, 1.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 23.0f, -1.0f), 2.0f, SOUND_BOUMv, 0.15f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 12.0f, 0.0f), 20.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -7.0f, 2.0f, 3.0f), 4.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 5.0f, 2.0f, -6.0f), 4.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 6.0f, 2.0f, 6.0f), 3.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 1.0f, -2.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 1.0f, 1.0f, -7.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -4.0f, 10.0f, 3.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 1.0f, 11.0f, 7.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 11.0f, -3.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 17.0f, 1.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 23.0f, -1.0f), 2.0f, SOUND_BOUMv, 0.15f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 12.0f, 0.0f), 20.0f)); obj->CreateShadowCircle(30.0f, 0.5f); } @@ -1975,21 +1975,21 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) obj->SetObjectRank(1, rank); obj->SetObjectParent(1, 0); m_oldModelManager->AddModelReference("root5.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(1, Math::Vector(-5.0f, 28.0f, -4.0f)); + 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); - obj->AddCrashSphere(CrashSphere(Math::Vector( -7.0f, 2.0f, 3.0f), 4.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 5.0f, 2.0f, -6.0f), 4.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 6.0f, 2.0f, 6.0f), 3.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 1.0f, -2.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 1.0f, 1.0f, -7.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -4.0f, 10.0f, 3.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 1.0f, 11.0f, 7.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 3.0f, 11.0f, -3.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 17.0f, 1.0f), 2.0f, SOUND_BOUMv, 0.15f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -3.0f, 23.0f, -1.0f), 2.0f, SOUND_BOUMv, 0.15f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 12.0f, 0.0f), 20.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -7.0f, 2.0f, 3.0f), 4.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 5.0f, 2.0f, -6.0f), 4.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 6.0f, 2.0f, 6.0f), 3.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 1.0f, -2.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 1.0f, 1.0f, -7.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -4.0f, 10.0f, 3.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 1.0f, 11.0f, 7.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 3.0f, 11.0f, -3.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 17.0f, 1.0f), 2.0f, SOUND_BOUMv, 0.15f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -3.0f, 23.0f, -1.0f), 2.0f, SOUND_BOUMv, 0.15f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 12.0f, 0.0f), 20.0f)); obj->CreateShadowCircle(30.0f, 0.5f); } @@ -2010,7 +2010,7 @@ CObjectUPtr CObjectFactory::CreateRoot(const ObjectCreateParams& params) // Creates a small home. CObjectUPtr CObjectFactory::CreateHome(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -2030,8 +2030,8 @@ CObjectUPtr CObjectFactory::CreateHome(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetScale(1.3f); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUMs, 0.25f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 6.0f, 0.0f), 11.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 5.0f, 0.0f), 10.0f, SOUND_BOUMs, 0.25f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 6.0f, 0.0f), 11.0f)); obj->CreateShadowCircle(16.0f, 0.5f); } @@ -2051,7 +2051,7 @@ CObjectUPtr CObjectFactory::CreateHome(const ObjectCreateParams& params) // Creates ruin placed on the ground. CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; float height = params.height; ObjectType type = params.type; @@ -2095,7 +2095,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(6, Math::Vector(-3.0f, 1.8f, -4.0f)); + obj->SetPartPosition(6, glm::vec3(-3.0f, 1.8f, -4.0f)); obj->SetPartRotationX(6, -Math::PI/2.0f); // Creates the left-back wheel. @@ -2106,7 +2106,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(7, Math::Vector(-3.0f, 1.0f, 3.0f)); + obj->SetPartPosition(7, glm::vec3(-3.0f, 1.0f, 3.0f)); obj->SetPartRotationY(7, Math::PI-0.3f); obj->SetPartRotationX(7, -0.3f); @@ -2118,7 +2118,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(8, Math::Vector(2.0f, 1.6f, -3.0f)); + obj->SetPartPosition(8, glm::vec3(2.0f, 1.6f, -3.0f)); obj->SetPartRotationY(8, 0.3f); // Creates the left-front wheel. @@ -2129,12 +2129,12 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(9, Math::Vector(2.0f, 1.0f, 3.0f)); + obj->SetPartPosition(9, glm::vec3(2.0f, 1.0f, 3.0f)); obj->SetPartRotationY(9, Math::PI-0.2f); obj->SetPartRotationX(9, 0.2f); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.8f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.8f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(4.0f, 1.0f); } @@ -2149,7 +2149,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(7, Math::Vector(-3.0f, 1.0f, 3.0f)); + obj->SetPartPosition(7, glm::vec3(-3.0f, 1.0f, 3.0f)); obj->SetPartRotationY(7, Math::PI+0.3f); obj->SetPartRotationX(7, 0.4f); @@ -2161,12 +2161,12 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin1w.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(9, Math::Vector(2.0f, 1.0f, 3.0f)); + obj->SetPartPosition(9, glm::vec3(2.0f, 1.0f, 3.0f)); obj->SetPartRotationY(9, Math::PI+0.3f); obj->SetPartRotationX(9, -0.3f); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.8f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.8f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(4.0f, 1.0f); } @@ -2181,77 +2181,77 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) m_oldModelManager->AddModelReference("ruin2c.mod", false, rank, obj->GetTeam()); - obj->SetPartPosition(1, Math::Vector(3.0f, 5.0f, -2.5f)); + obj->SetPartPosition(1, glm::vec3(3.0f, 5.0f, -2.5f)); obj->SetPartRotationX(1, -Math::PI*0.85f); obj->SetPartRotationY(1, -0.4f); obj->SetPartRotationZ(1, -0.1f); - obj->AddCrashSphere(CrashSphere(Math::Vector(1.0f, 2.8f, -1.0f), 5.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(1.0f, 5.0f, -1.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(1.0f, 2.8f, -1.0f), 5.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(1.0f, 5.0f, -1.0f), 10.0f)); obj->CreateShadowCircle(5.0f, 1.0f); } if ( type == OBJECT_RUINmobilet2 ) // vehicle have caterpillars? { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.8f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.8f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(5.0f, 1.0f); } if ( type == OBJECT_RUINmobiler1 ) // vehicle skating? { - obj->AddCrashSphere(CrashSphere(Math::Vector(1.0f, 2.8f, -1.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(1.0f, 5.0f, -1.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(1.0f, 2.8f, -1.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(1.0f, 5.0f, -1.0f), 10.0f)); obj->CreateShadowCircle(5.0f, 1.0f); } if ( type == OBJECT_RUINmobiler2 ) // vehicle skating? { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 1.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 5.0f, 0.0f), 10.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 1.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 5.0f, 0.0f), 10.0f)); obj->CreateShadowCircle(6.0f, 1.0f); } if ( type == OBJECT_RUINfactory ) // factory ? { - obj->AddCrashSphere(CrashSphere(Math::Vector( 9.0f, 1.0f, -11.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 2.0f, -11.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, -10.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-12.0f, 11.0f, -4.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 4.0f, -2.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 8.0f, 3.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 2.0f, 4.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 2.0f, 10.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -4.0f, 0.0f, 10.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 18.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 9.0f, 1.0f, -11.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 2.0f, -11.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, -10.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-12.0f, 11.0f, -4.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 4.0f, -2.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 8.0f, 3.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 2.0f, 4.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 2.0f, 10.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -4.0f, 0.0f, 10.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 18.0f)); obj->CreateShadowCircle(20.0f, 0.7f); } if ( type == OBJECT_RUINdoor ) // converter holder? { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 6.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 6.0f)); obj->CreateShadowCircle(6.0f, 1.0f); } if ( type == OBJECT_RUINsupport ) // radar holder? { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 4.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 4.0f)); obj->CreateShadowCircle(3.0f, 1.0f); } if ( type == OBJECT_RUINradar ) // radar base? { - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 6.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 0.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 6.0f)); obj->CreateShadowCircle(6.0f, 1.0f); } @@ -2260,48 +2260,48 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) { m_terrain->AddBuildingLevel(pos, 7.0f, 9.0f, 1.0f, 0.5f); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 0.0f, 4.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-10.0f, 0.0f, -4.0f), 5.0f, SOUND_BOUMm, 0.45f)); -//? obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(-3.0f, 0.0f, 0.0f), 14.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 0.0f, 4.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-10.0f, 0.0f, -4.0f), 5.0f, SOUND_BOUMm, 0.45f)); +//? obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(-3.0f, 0.0f, 0.0f), 14.0f)); } if ( type == OBJECT_RUINbase ) // base? { - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 15.0f, 0.0f),28.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 17.0f, 6.0f, 42.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 17.0f, 17.0f, 42.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-17.0f, 6.0f, 42.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-17.0f, 17.0f, 42.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-42.0f, 6.0f, 17.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-42.0f, 17.0f, 17.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-42.0f, 6.0f, -17.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-42.0f, 17.0f, -17.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-17.0f, 6.0f, -42.0f), 6.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-17.0f, 10.0f, -42.0f), 4.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 15.0f, 13.0f, -34.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 31.0f, 15.0f, -13.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 21.0f, 8.0f, -39.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 26.0f, 8.0f, -33.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 48.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 15.0f, 0.0f),28.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 17.0f, 6.0f, 42.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 17.0f, 17.0f, 42.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-17.0f, 6.0f, 42.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-17.0f, 17.0f, 42.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-42.0f, 6.0f, 17.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-42.0f, 17.0f, 17.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-42.0f, 6.0f, -17.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-42.0f, 17.0f, -17.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-17.0f, 6.0f, -42.0f), 6.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-17.0f, 10.0f, -42.0f), 4.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 15.0f, 13.0f, -34.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 31.0f, 15.0f, -13.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 21.0f, 8.0f, -39.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 26.0f, 8.0f, -33.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 48.0f)); obj->CreateShadowCircle(40.0f, 1.0f); } if ( type == OBJECT_RUINhead ) // base cap? { - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 13.0f, 0.0f),20.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, -8.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f,-16.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f,-22.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-21.0f, 7.0f, 9.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -9.0f, 7.0f, 21.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 21.0f, 7.0f, 9.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 9.0f, 7.0f, 21.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-21.0f, 7.0f, -9.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( -9.0f, 7.0f, -21.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 21.0f, 7.0f, -9.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 9.0f, 7.0f, -21.0f), 8.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 0.0f, 0.0f), 35.0f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 13.0f, 0.0f),20.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, -8.0f, 0.0f), 5.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f,-16.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f,-22.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-21.0f, 7.0f, 9.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -9.0f, 7.0f, 21.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 21.0f, 7.0f, 9.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 9.0f, 7.0f, 21.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-21.0f, 7.0f, -9.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( -9.0f, 7.0f, -21.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 21.0f, 7.0f, -9.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 9.0f, 7.0f, -21.0f), 8.0f, SOUND_BOUMm, 0.45f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 0.0f, 0.0f), 35.0f)); obj->CreateShadowCircle(30.0f, 1.0f); } @@ -2468,7 +2468,7 @@ CObjectUPtr CObjectFactory::CreateRuin(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params) { - Math::Vector pos = params.pos; + glm::vec3 pos = params.pos; float angle = params.angle; ObjectType type = params.type; @@ -2506,13 +2506,13 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params) //? m_terrain->AddBuildingLevel(pos, 10.0f, 13.0f, 12.0f, 0.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 4.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 11.0f, 5.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector(-11.0f, 5.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 5.0f, -11.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->AddCrashSphere(CrashSphere(Math::Vector( 0.0f, 5.0f, 11.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 4.0f, 0.0f), 9.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 11.0f, 5.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(-11.0f, 5.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 5.0f, -11.0f), 3.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3( 0.0f, 5.0f, 11.0f), 3.0f, SOUND_BOUMm, 0.45f)); - obj->SetCameraCollisionSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 9.0f)); + obj->SetCameraCollisionSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 9.0f)); obj->CreateShadowCircle(16.0f, 0.5f); } @@ -2527,7 +2527,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetFloorHeight(0.0f); - obj->SetJostlingSphere(Math::Sphere(Math::Vector(0.0f, 4.0f, 0.0f), 1.0f)); + obj->SetJostlingSphere(Math::Sphere(glm::vec3(0.0f, 4.0f, 0.0f), 1.0f)); obj->CreateShadowCircle(2.0f, 0.3f); } @@ -2541,7 +2541,7 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params) obj->SetRotationY(angle); obj->SetFloorHeight(0.0f); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 2.0f, 0.0f), 2.0f, SOUND_BOUMm, 0.45f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 2.0f, 0.0f), 2.0f, SOUND_BOUMm, 0.45f)); obj->CreateShadowCircle(5.0f, 0.8f); obj->FloorAdjust(); @@ -2562,11 +2562,11 @@ CObjectUPtr CObjectFactory::CreateApollo(const ObjectCreateParams& params) obj->SetObjectRank(1, rank); obj->SetObjectParent(1, 0); m_oldModelManager->AddModelReference("apolloj2.mod", false, rank, obj->GetTeam()); // antenna - obj->SetPartPosition(1, Math::Vector(0.0f, 5.0f, 0.0f)); + 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); - obj->AddCrashSphere(CrashSphere(Math::Vector(0.0f, 4.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.35f)); + obj->AddCrashSphere(CrashSphere(glm::vec3(0.0f, 4.0f, 0.0f), 3.0f, SOUND_BOUMm, 0.35f)); obj->CreateShadowCircle(3.0f, 0.7f); } diff --git a/src/object/object_factory.h b/src/object/object_factory.h index 23f4f2d1..372f94c0 100644 --- a/src/object/object_factory.h +++ b/src/object/object_factory.h @@ -24,8 +24,6 @@ #pragma once -#include "math/vector.h" - #include "object/object_type.h" #include diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index e508e389..eb444a5b 100644 --- a/src/object/old_object.cpp +++ b/src/object/old_object.cpp @@ -114,9 +114,9 @@ COldObject::COldObject(int id) m_name = ""; m_shadowLight = -1; m_shadowHeight = 0.0f; - m_linVibration = Math::Vector(0.0f, 0.0f, 0.0f); - m_cirVibration = Math::Vector(0.0f, 0.0f, 0.0f); - m_tilt = Math::Vector(0.0f, 0.0f, 0.0f); + m_linVibration = glm::vec3(0.0f, 0.0f, 0.0f); + m_cirVibration = glm::vec3(0.0f, 0.0f, 0.0f); + m_tilt = glm::vec3(0.0f, 0.0f, 0.0f); m_power = nullptr; m_cargo = nullptr; @@ -625,11 +625,11 @@ void COldObject::InitPart(int part) m_objectPart[part].object = -1; m_objectPart[part].parentPart = -1; - m_objectPart[part].position = Math::Vector(0.0f, 0.0f, 0.0f); + m_objectPart[part].position = glm::vec3(0.0f, 0.0f, 0.0f); m_objectPart[part].angle.y = 0.0f; m_objectPart[part].angle.x = 0.0f; m_objectPart[part].angle.z = 0.0f; - m_objectPart[part].zoom = Math::Vector(1.0f, 1.0f, 1.0f); + m_objectPart[part].zoom = glm::vec3(1.0f, 1.0f, 1.0f); m_objectPart[part].bTranslate = true; m_objectPart[part].bRotate = true; @@ -1050,7 +1050,7 @@ int COldObject::GetOption() void COldObject::Write(CLevelParserLine* line) { - Math::Vector pos; + glm::vec3 pos; line->AddParam("camera", MakeUnique(GetCameraType())); @@ -1146,7 +1146,7 @@ void COldObject::Write(CLevelParserLine* line) void COldObject::Read(CLevelParserLine* line) { - Math::Vector zoom = line->GetParam("zoom")->AsPoint(Math::Vector(1.0f, 1.0f, 1.0f)); + glm::vec3 zoom = line->GetParam("zoom")->AsPoint(glm::vec3(1.0f, 1.0f, 1.0f)); if (zoom.x != 1.0f || zoom.y != 1.0f || zoom.z != 1.0f) SetScale(zoom); @@ -1348,7 +1348,7 @@ Math::Sphere COldObject::GetJostlingSphere() const void COldObject::SetFloorHeight(float height) { - Math::Vector pos; + glm::vec3 pos; pos = m_objectPart[0].position; m_terrain->AdjustToFloor(pos); @@ -1367,7 +1367,7 @@ void COldObject::SetFloorHeight(float height) void COldObject::FloorAdjust() { - Math::Vector pos, n; + glm::vec3 pos, n; glm::vec2 nn; float a; @@ -1384,7 +1384,7 @@ void COldObject::FloorAdjust() // Getes the linear vibration. -void COldObject::SetLinVibration(Math::Vector dir) +void COldObject::SetLinVibration(glm::vec3 dir) { if ( m_linVibration.x != dir.x || m_linVibration.y != dir.y || @@ -1395,14 +1395,14 @@ void COldObject::SetLinVibration(Math::Vector dir) } } -Math::Vector COldObject::GetLinVibration() +glm::vec3 COldObject::GetLinVibration() { return m_linVibration; } // Getes the circular vibration. -void COldObject::SetCirVibration(Math::Vector dir) +void COldObject::SetCirVibration(glm::vec3 dir) { if ( m_cirVibration.x != dir.x || m_cirVibration.y != dir.y || @@ -1413,14 +1413,14 @@ void COldObject::SetCirVibration(Math::Vector dir) } } -Math::Vector COldObject::GetCirVibration() +glm::vec3 COldObject::GetCirVibration() { return m_cirVibration; } // Getes the inclination. -void COldObject::SetTilt(Math::Vector dir) +void COldObject::SetTilt(glm::vec3 dir) { if ( m_tilt.x != dir.x || m_tilt.y != dir.y || @@ -1431,7 +1431,7 @@ void COldObject::SetTilt(Math::Vector dir) } } -Math::Vector COldObject::GetTilt() +glm::vec3 COldObject::GetTilt() { return m_tilt; } @@ -1439,7 +1439,7 @@ Math::Vector COldObject::GetTilt() // Getes the position of center of the object. -void COldObject::SetPartPosition(int part, const Math::Vector &pos) +void COldObject::SetPartPosition(int part, const glm::vec3 &pos) { m_objectPart[part].position = pos; m_objectPart[part].bTranslate = true; // it will recalculate the matrices @@ -1448,7 +1448,7 @@ void COldObject::SetPartPosition(int part, const Math::Vector &pos) { int rank = m_objectPart[0].object; - Math::Vector shPos = pos; + glm::vec3 shPos = pos; m_terrain->AdjustToFloor(shPos, true); m_engine->SetObjectShadowSpotPos(rank, shPos); @@ -1463,21 +1463,21 @@ void COldObject::SetPartPosition(int part, const Math::Vector &pos) if ( m_shadowLight != -1 ) { - Math::Vector lightPos = pos; + glm::vec3 lightPos = pos; lightPos.y += m_shadowHeight; m_lightMan->SetLightPos(m_shadowLight, lightPos); } } } -Math::Vector COldObject::GetPartPosition(int part) const +glm::vec3 COldObject::GetPartPosition(int part) const { return m_objectPart[part].position; } // Getes the rotation around three axis. -void COldObject::SetPartRotation(int part, const Math::Vector &angle) +void COldObject::SetPartRotation(int part, const glm::vec3 &angle) { m_objectPart[part].angle = angle; m_objectPart[part].bRotate = true; // it will recalculate the matrices @@ -1488,7 +1488,7 @@ void COldObject::SetPartRotation(int part, const Math::Vector &angle) } } -Math::Vector COldObject::GetPartRotation(int part) const +glm::vec3 COldObject::GetPartRotation(int part) const { return m_objectPart[part].angle; } @@ -1552,7 +1552,7 @@ void COldObject::SetPartScale(int part, float zoom) m_objectPart[part].zoom.z != 1.0f ); } -void COldObject::SetPartScale(int part, Math::Vector zoom) +void COldObject::SetPartScale(int part, glm::vec3 zoom) { m_objectPart[part].bTranslate = true; // it will recalculate the matrices m_objectPart[part].zoom = zoom; @@ -1562,7 +1562,7 @@ void COldObject::SetPartScale(int part, Math::Vector zoom) m_objectPart[part].zoom.z != 1.0f ); } -Math::Vector COldObject::GetPartScale(int part) const +glm::vec3 COldObject::GetPartScale(int part) const { return m_objectPart[part].zoom; } @@ -1672,12 +1672,12 @@ CObject* COldObject::GetPower() return m_power; } -void COldObject::SetPowerPosition(const Math::Vector& powerPosition) +void COldObject::SetPowerPosition(const glm::vec3& powerPosition) { m_powerPosition = powerPosition; } -Math::Vector COldObject::GetPowerPosition() +glm::vec3 COldObject::GetPowerPosition() { return m_powerPosition; } @@ -1758,15 +1758,15 @@ bool COldObject::CreateShadowLight(float height, Gfx::Color color) { if ( !m_engine->GetLightMode() ) return true; - Math::Vector pos = GetPosition(); + glm::vec3 pos = GetPosition(); m_shadowHeight = height; Gfx::Light light; light.type = Gfx::LIGHT_SPOT; light.diffuse = color; light.ambient = color * 0.1f; - light.position = Math::Vector(pos.x, pos.y+height, pos.z); - light.direction = Math::Vector(0.0f, -1.0f, 0.0f); // against the bottom + light.position = glm::vec3(pos.x, pos.y+height, pos.z); + light.direction = glm::vec3(0.0f, -1.0f, 0.0f); // against the bottom light.spotIntensity = 128; light.attenuation0 = 1.0f; light.attenuation1 = 0.0f; @@ -1819,7 +1819,7 @@ bool COldObject::CreateShadowCircle(float radius, float intensity, bool COldObject::UpdateTransformObject(int part, bool bForceUpdate) { - Math::Vector position, angle, eye; + glm::vec3 position, angle, eye; bool bModif = false; int parent; @@ -2297,10 +2297,10 @@ void COldObject::VirusFrame(float rTime) { m_lastVirusParticle = m_aTime; - Math::Vector pos = GetPosition(); + glm::vec3 pos = GetPosition(); pos.x += (Math::Rand()-0.5f)*10.0f; pos.z += (Math::Rand()-0.5f)*10.0f; - Math::Vector speed; + glm::vec3 speed; speed.x = (Math::Rand()-0.5f)*2.0f; speed.z = (Math::Rand()-0.5f)*2.0f; speed.y = Math::Rand()*4.0f+4.0f; @@ -2316,7 +2316,7 @@ void COldObject::VirusFrame(float rTime) void COldObject::PartiFrame(float rTime) { - Math::Vector pos, angle, factor; + glm::vec3 pos, angle, factor; int i, channel; for ( i=0 ; iGetLand() ) // on ground? @@ -2920,7 +2920,7 @@ float COldObject::GetShowLimitRadius() void COldObject::CreateSelectParticle() { - Math::Vector pos, speed; + glm::vec3 pos, speed; glm::vec2 dim; int i; @@ -2971,8 +2971,8 @@ void COldObject::CreateSelectParticle() m_type == OBJECT_MOBILEst || m_type == OBJECT_MOBILEdr ) // vehicle? { - pos = Math::Vector(0.0f, 0.0f, 0.0f); - speed = Math::Vector(0.0f, 0.0f, 0.0f); + pos = glm::vec3(0.0f, 0.0f, 0.0f); + speed = glm::vec3(0.0f, 0.0f, 0.0f); dim.x = 0.0f; dim.y = 0.0f; m_partiSel[0] = m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISELY, 1.0f, 0.0f, 0.0f); @@ -2988,7 +2988,7 @@ void COldObject::CreateSelectParticle() void COldObject::UpdateSelectParticle() { - Math::Vector pos[4]; + glm::vec3 pos[4]; glm::vec2 dim[4]; float zoom[4]; float angle; @@ -3008,26 +3008,26 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILErs || m_type == OBJECT_MOBILErp ) // large caterpillars? { - pos[0] = Math::Vector(4.2f, 2.8f, 1.5f); - pos[1] = Math::Vector(4.2f, 2.8f, -1.5f); + pos[0] = glm::vec3(4.2f, 2.8f, 1.5f); + pos[1] = glm::vec3(4.2f, 2.8f, -1.5f); dim[0].x = 1.5f; dim[1].x = 1.5f; } else if ( m_type == OBJECT_MOBILEsa || m_type == OBJECT_MOBILEst ) // submarine? { - pos[0] = Math::Vector(3.6f, 4.0f, 2.0f); - pos[1] = Math::Vector(3.6f, 4.0f, -2.0f); + pos[0] = glm::vec3(3.6f, 4.0f, 2.0f); + pos[1] = glm::vec3(3.6f, 4.0f, -2.0f); } else if ( m_type == OBJECT_MOBILEtg ) // target? { - pos[0] = Math::Vector(3.4f, 6.5f, 2.0f); - pos[1] = Math::Vector(3.4f, 6.5f, -2.0f); + pos[0] = glm::vec3(3.4f, 6.5f, 2.0f); + pos[1] = glm::vec3(3.4f, 6.5f, -2.0f); } else if ( m_type == OBJECT_MOBILEdr ) // designer? { - pos[0] = Math::Vector(4.9f, 3.5f, 2.5f); - pos[1] = Math::Vector(4.9f, 3.5f, -2.5f); + pos[0] = glm::vec3(4.9f, 3.5f, 2.5f); + pos[1] = glm::vec3(4.9f, 3.5f, -2.5f); } else if ( m_type == OBJECT_MOBILEwt || m_type == OBJECT_MOBILEtt || @@ -3035,15 +3035,15 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILEit || GetTrainer()) // trainer ? { - pos[0] = Math::Vector(4.2f, 2.5f, 1.2f); - pos[1] = Math::Vector(4.2f, 2.5f, -1.2f); + pos[0] = glm::vec3(4.2f, 2.5f, 1.2f); + pos[1] = glm::vec3(4.2f, 2.5f, -1.2f); dim[0].x = 1.5f; dim[1].x = 1.5f; } else { - pos[0] = Math::Vector(4.2f, 2.5f, 1.5f); - pos[1] = Math::Vector(4.2f, 2.5f, -1.5f); + pos[0] = glm::vec3(4.2f, 2.5f, 1.5f); + pos[1] = glm::vec3(4.2f, 2.5f, -1.5f); } // Red back lens @@ -3053,8 +3053,8 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILEit || GetTrainer()) // trainer? { - pos[2] = Math::Vector(-4.0f, 2.5f, 2.2f); - pos[3] = Math::Vector(-4.0f, 2.5f, -2.2f); + pos[2] = glm::vec3(-4.0f, 2.5f, 2.2f); + pos[3] = glm::vec3(-4.0f, 2.5f, -2.2f); } else if ( m_type == OBJECT_MOBILEfa || m_type == OBJECT_MOBILEfb || @@ -3062,8 +3062,8 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILEfi || m_type == OBJECT_MOBILEfs ) // flying? { - pos[2] = Math::Vector(-4.0f, 3.1f, 4.5f); - pos[3] = Math::Vector(-4.0f, 3.1f, -4.5f); + pos[2] = glm::vec3(-4.0f, 3.1f, 4.5f); + pos[3] = glm::vec3(-4.0f, 3.1f, -4.5f); dim[2].x = 0.6f; dim[3].x = 0.6f; } @@ -3073,8 +3073,8 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILEwi || m_type == OBJECT_MOBILEws ) // wheels? { - pos[2] = Math::Vector(-4.5f, 2.7f, 2.8f); - pos[3] = Math::Vector(-4.5f, 2.7f, -2.8f); + pos[2] = glm::vec3(-4.5f, 2.7f, 2.8f); + pos[3] = glm::vec3(-4.5f, 2.7f, -2.8f); } else if ( m_type == OBJECT_MOBILEia || m_type == OBJECT_MOBILEib || @@ -3082,8 +3082,8 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILEii || m_type == OBJECT_MOBILEis ) // legs? { - pos[2] = Math::Vector(-4.5f, 2.7f, 2.8f); - pos[3] = Math::Vector(-4.5f, 2.7f, -2.8f); + pos[2] = glm::vec3(-4.5f, 2.7f, 2.8f); + pos[3] = glm::vec3(-4.5f, 2.7f, -2.8f); } else if ( m_type == OBJECT_MOBILEta || m_type == OBJECT_MOBILEtb || @@ -3091,16 +3091,16 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILEti || m_type == OBJECT_MOBILEts ) // caterpillars? { - pos[2] = Math::Vector(-3.6f, 4.2f, 3.0f); - pos[3] = Math::Vector(-3.6f, 4.2f, -3.0f); + pos[2] = glm::vec3(-3.6f, 4.2f, 3.0f); + pos[3] = glm::vec3(-3.6f, 4.2f, -3.0f); } else if ( m_type == OBJECT_MOBILErt || m_type == OBJECT_MOBILErc || m_type == OBJECT_MOBILErr || m_type == OBJECT_MOBILErs ) // large caterpillars? { - pos[2] = Math::Vector(-5.0f, 5.2f, 2.5f); - pos[3] = Math::Vector(-5.0f, 5.2f, -2.5f); + pos[2] = glm::vec3(-5.0f, 5.2f, 2.5f); + pos[3] = glm::vec3(-5.0f, 5.2f, -2.5f); } if ( m_type == OBJECT_MOBILErp || ( GetTrainer() && ( m_type == OBJECT_MOBILErt || @@ -3108,24 +3108,24 @@ void COldObject::UpdateSelectParticle() m_type == OBJECT_MOBILErr || m_type == OBJECT_MOBILErs))) // large caterpillars (trainer)? { - pos[2] = Math::Vector(-4.6f, 5.2f, 2.6f); - pos[3] = Math::Vector(-4.6f, 5.2f, -2.6f); + pos[2] = glm::vec3(-4.6f, 5.2f, 2.6f); + pos[3] = glm::vec3(-4.6f, 5.2f, -2.6f); } if ( m_type == OBJECT_MOBILEsa || m_type == OBJECT_MOBILEst ) // submarine? { - pos[2] = Math::Vector(-3.6f, 4.0f, 2.0f); - pos[3] = Math::Vector(-3.6f, 4.0f, -2.0f); + pos[2] = glm::vec3(-3.6f, 4.0f, 2.0f); + pos[3] = glm::vec3(-3.6f, 4.0f, -2.0f); } if ( m_type == OBJECT_MOBILEtg ) // target? { - pos[2] = Math::Vector(-2.4f, 6.5f, 2.0f); - pos[3] = Math::Vector(-2.4f, 6.5f, -2.0f); + pos[2] = glm::vec3(-2.4f, 6.5f, 2.0f); + pos[3] = glm::vec3(-2.4f, 6.5f, -2.0f); } if ( m_type == OBJECT_MOBILEdr ) // designer? { - pos[2] = Math::Vector(-5.3f, 2.7f, 1.8f); - pos[3] = Math::Vector(-5.3f, 2.7f, -1.8f); + pos[2] = glm::vec3(-5.3f, 2.7f, 1.8f); + pos[3] = glm::vec3(-5.3f, 2.7f, -1.8f); } angle = GetRotationY()/Math::PI; @@ -3198,32 +3198,32 @@ void COldObject::SetAuto(std::unique_ptr automat) } -Math::Vector COldObject::GetPosition() const +glm::vec3 COldObject::GetPosition() const { return GetPartPosition(0); } -void COldObject::SetPosition(const Math::Vector& pos) +void COldObject::SetPosition(const glm::vec3& pos) { SetPartPosition(0, pos); } -Math::Vector COldObject::GetRotation() const +glm::vec3 COldObject::GetRotation() const { return GetPartRotation(0); } -void COldObject::SetRotation(const Math::Vector& rotation) +void COldObject::SetRotation(const glm::vec3& rotation) { SetPartRotation(0, rotation); } -Math::Vector COldObject::GetScale() const +glm::vec3 COldObject::GetScale() const { return GetPartScale(0); } -void COldObject::SetScale(const Math::Vector& scale) +void COldObject::SetScale(const glm::vec3& scale) { SetPartScale(0, scale); } diff --git a/src/object/old_object.h b/src/object/old_object.h index ebcab3a1..503ee67d 100644 --- a/src/object/old_object.h +++ b/src/object/old_object.h @@ -58,9 +58,9 @@ struct ObjectPart int object = -1; // number of the object in CEngine int parentPart = -1; // number of father part int masterParti = -1; // master canal of the particle - Math::Vector position; - Math::Vector angle; - Math::Vector zoom; + glm::vec3 position = { 0, 0, 0 }; + glm::vec3 angle = { 0, 0, 0 }; + glm::vec3 zoom = { 0, 0, 0 }; bool bTranslate = false; bool bRotate = false; bool bZoom = false; @@ -134,18 +134,18 @@ public: void SetFloorHeight(float height); void FloorAdjust() override; - void SetLinVibration(Math::Vector dir) override; - Math::Vector GetLinVibration(); - void SetCirVibration(Math::Vector dir) override; - Math::Vector GetCirVibration(); - void SetTilt(Math::Vector dir); - Math::Vector GetTilt() override; + void SetLinVibration(glm::vec3 dir) override; + glm::vec3 GetLinVibration(); + void SetCirVibration(glm::vec3 dir) override; + glm::vec3 GetCirVibration(); + void SetTilt(glm::vec3 dir); + glm::vec3 GetTilt() override; - void SetPartPosition(int part, const Math::Vector &pos); - Math::Vector GetPartPosition(int part) const; + void SetPartPosition(int part, const glm::vec3 &pos); + glm::vec3 GetPartPosition(int part) const; - void SetPartRotation(int part, const Math::Vector &angle); - Math::Vector GetPartRotation(int part) const; + void SetPartRotation(int part, const glm::vec3 &angle); + glm::vec3 GetPartRotation(int part) const; void SetPartRotationY(int part, float angle); void SetPartRotationX(int part, float angle); void SetPartRotationZ(int part, float angle); @@ -154,8 +154,8 @@ public: float GetPartRotationZ(int part); void SetPartScale(int part, float zoom); - void SetPartScale(int part, Math::Vector zoom); - Math::Vector GetPartScale(int part) const; + void SetPartScale(int part, glm::vec3 zoom); + glm::vec3 GetPartScale(int part) const; void SetPartScaleX(int part, float zoom); float GetPartScaleX(int part); void SetPartScaleY(int part, float zoom); @@ -177,8 +177,8 @@ public: void SetPower(CObject* power) override; CObject* GetPower() override; - Math::Vector GetPowerPosition() override; - void SetPowerPosition(const Math::Vector& powerPosition) override; + glm::vec3 GetPowerPosition() override; + void SetPowerPosition(const glm::vec3& powerPosition) override; void SetCargo(CObject* cargo) override; CObject* GetCargo() override; void SetTransporter(CObject* transporter) override; @@ -188,8 +188,8 @@ public: Math::Matrix* GetRotateMatrix(int part); Math::Matrix* GetWorldMatrix(int part) override; - void AdjustCamera(Math::Vector &eye, float &dirH, float &dirV, - Math::Vector &lookat, Math::Vector &upVec, + void AdjustCamera(glm::vec3 &eye, float &dirH, float &dirV, + glm::vec3 &lookat, glm::vec3 &upVec, Gfx::CameraType type) override; Character* GetCharacter() override; @@ -266,15 +266,15 @@ public: void FlatParent() override; - void SetPosition(const Math::Vector& pos) override; - Math::Vector GetPosition() const override; + void SetPosition(const glm::vec3& pos) override; + glm::vec3 GetPosition() const override; - void SetRotation(const Math::Vector& rotation) override; - Math::Vector GetRotation() const override; + void SetRotation(const glm::vec3& rotation) override; + glm::vec3 GetRotation() const override; using CObject::SetScale; // SetScale(float) version - void SetScale(const Math::Vector& scale) override; - Math::Vector GetScale() const override; + void SetScale(const glm::vec3& scale) override; + glm::vec3 GetScale() const override; void UpdateInterface() override; @@ -340,11 +340,11 @@ protected: int m_option; // option int m_shadowLight; // number of light from the shadows float m_shadowHeight; // height of light from the shadows - Math::Vector m_linVibration; // linear vibration - Math::Vector m_cirVibration; // circular vibration - Math::Vector m_tilt; // tilt + glm::vec3 m_linVibration; // linear vibration + glm::vec3 m_cirVibration; // circular vibration + glm::vec3 m_tilt; // tilt CObject* m_power; // battery used by the vehicle - Math::Vector m_powerPosition; + glm::vec3 m_powerPosition; CObject* m_cargo; // object transported CObject* m_transporter; // object with the latter int m_transporterLink; // part diff --git a/src/object/old_object_interface.cpp b/src/object/old_object_interface.cpp index 99a5ad93..fe59427f 100644 --- a/src/object/old_object_interface.cpp +++ b/src/object/old_object_interface.cpp @@ -58,17 +58,17 @@ void COldObjectInterface::FloorAdjust() } -void COldObjectInterface::SetLinVibration(Math::Vector dir) +void COldObjectInterface::SetLinVibration(glm::vec3 dir) { throw std::logic_error("SetLinVibration: not implemented!"); } -void COldObjectInterface::SetCirVibration(Math::Vector dir) +void COldObjectInterface::SetCirVibration(glm::vec3 dir) { throw std::logic_error("SetCirVibration: not implemented!"); } -Math::Vector COldObjectInterface::GetTilt() +glm::vec3 COldObjectInterface::GetTilt() { throw std::logic_error("GetTilt: not implemented!"); } diff --git a/src/object/old_object_interface.h b/src/object/old_object_interface.h index 10c2dbed..b18bc58b 100644 --- a/src/object/old_object_interface.h +++ b/src/object/old_object_interface.h @@ -24,10 +24,10 @@ #pragma once -#include "math/vector.h" - #include "object/object_type.h" +#include + namespace Math { struct Matrix; @@ -63,10 +63,10 @@ public: virtual void FloorAdjust(); - virtual void SetLinVibration(Math::Vector dir); - virtual void SetCirVibration(Math::Vector dir); + virtual void SetLinVibration(glm::vec3 dir); + virtual void SetCirVibration(glm::vec3 dir); - virtual Math::Vector GetTilt(); + virtual glm::vec3 GetTilt(); virtual void SetMasterParticle(int part, int parti);