diff --git a/Escape-the-Dawn/Systems/LevelGenerationSystem.cpp b/Escape-the-Dawn/Systems/LevelGenerationSystem.cpp index 52ff072..f9bfa00 100644 --- a/Escape-the-Dawn/Systems/LevelGenerationSystem.cpp +++ b/Escape-the-Dawn/Systems/LevelGenerationSystem.cpp @@ -29,20 +29,20 @@ void Systems::LevelGenerationSystem::SpawnObstacle() switch (typeRandom) { - case 0: + case 0: // Mountain stuff :D { transform->Position = glm::vec3( positionRandom, startyz); // fix position - float scale = (float)(rand() % 1000) / 100; + float scale = (float)(rand() % 1000) / 200; transform->Scale = glm::vec3(scale); bounds->VolumeVector = glm::vec3(9, 12, 7); bounds->Origin = glm::vec3(1,11,-1); model->ModelFile = "Models/obstacle_mountain_1.obj"; } break; - case 1: + case 1: // Single Mountain :D { transform->Position = glm::vec3( positionRandom, startyz); // fix position - float scale = (float)(rand() % 1000) / 100; + float scale = (float)(rand() % 1000) / 200; transform->Scale = glm::vec3(scale); bounds->VolumeVector = glm::vec3(3.5f, 7.5f, 3.5f); bounds->Origin = glm::vec3(0,7.5f,0); @@ -51,10 +51,8 @@ void Systems::LevelGenerationSystem::SpawnObstacle() break; case 2: { - - transform->Position = glm::vec3( positionRandom, startyz); // fix position - float scale = (float)(rand() % 1000) / 100; + float scale = (float)(rand() % 1000) / 200; transform->Scale = glm::vec3(scale); bounds->VolumeVector = glm::vec3(1, 1, 1); diff --git a/Escape-the-Dawn/Systems/LevelGenerationSystem.h b/Escape-the-Dawn/Systems/LevelGenerationSystem.h index 5bf91d6..9a89a04 100644 --- a/Escape-the-Dawn/Systems/LevelGenerationSystem.h +++ b/Escape-the-Dawn/Systems/LevelGenerationSystem.h @@ -7,7 +7,7 @@ #include "Components/Bounds.h" #include "Components/Collision.h" #include "Components/Model.h" - +#include "Components/PointLight.h" namespace Systems { diff --git a/Escape-the-Dawn/Systems/RenderSystem.cpp b/Escape-the-Dawn/Systems/RenderSystem.cpp index bed895a..f477373 100644 --- a/Escape-the-Dawn/Systems/RenderSystem.cpp +++ b/Escape-the-Dawn/Systems/RenderSystem.cpp @@ -32,7 +32,7 @@ void Systems::RenderSystem::UpdateEntity( double dt, EntityID entity, EntityID p #ifdef DEBUG auto bounds = m_World->GetComponent(entity, "Bounds"); if (bounds != nullptr) { - glm::vec3 origin = transformComponent->Scale * (transformComponent->Position + bounds->Origin); + glm::vec3 origin = transformComponent->Position + (transformComponent->Scale * bounds->Origin); glm::vec3 volumeVector = transformComponent->Scale * bounds->VolumeVector; m_Renderer->AddAABBToDraw(origin, volumeVector); }