BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixade hitboxes

Browse Source
This commit is contained in:
ViktorLjung
2014-03-14 01:54:07 +01:00
parent 143cb48a1f
commit 03e7117d4c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/GameWorld.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ void GameWorld::Initialize()
collision->Interested = true; collision->Interested = true;
bounds = AddComponent<Components::Bounds>(m_Player, "Bounds"); bounds = AddComponent<Components::Bounds>(m_Player, "Bounds");
bounds->Origin = glm::vec3(0, 0, 2.f); bounds->Origin = glm::vec3(0, 0, 2.f);
bounds->VolumeVector = glm::vec3(4.f, 0.7f, 1); bounds->VolumeVector = glm::vec3(3.4f, 0.7f, 1);
// Player light // Player light
auto playerLight = CreateEntity(m_Player); auto playerLight = CreateEntity(m_Player);
transform = AddComponent<Components::Transform>(playerLight, "Transform"); transform = AddComponent<Components::Transform>(playerLight, "Transform");
Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
+6 -6
View File
@@ -35,16 +35,16 @@ void Systems::LevelGenerationSystem::SpawnObstacle()
sound->ReferenceDistance = 15.f; sound->ReferenceDistance = 15.f;
m_World->GetSystem<Systems::SoundSystem>("SoundSystem")->PlaySound(sound, "Sounds/hum.wav"); m_World->GetSystem<Systems::SoundSystem>("SoundSystem")->PlaySound(sound, "Sounds/hum.wav");
if(typeRandom >= 0 && typeRandom < 2) // Mountain stuff :D if(typeRandom >= 0 && typeRandom < 1) // Mountain stuff :D
{ {
m_World->SetProperty(ent, "Name", std::string("Obstacle")); m_World->SetProperty(ent, "Name", std::string("Obstacle"));
float scale = 1.0f + (float)(rand() % 1000) / 250; float scale = 1.0f + (float)(rand() % 1000) / 250;
transform->Scale = glm::vec3(scale); transform->Scale = glm::vec3(scale);
bounds->VolumeVector = glm::vec3(9, 12, 7); bounds->VolumeVector = glm::vec3(8.5f, 12, 5);
bounds->Origin = glm::vec3(1,11,-1); bounds->Origin = glm::vec3(1,11,-1);
model->ModelFile = "Models/obstacle_mountain_1.obj"; model->ModelFile = "Models/obstacle_mountain_1.obj";
} }
else if(typeRandom >= 2 && typeRandom < 5) // Single Mountain :D else if(typeRandom >= 1 && typeRandom < 5) // Single Mountain :D
{ {
m_World->SetProperty(ent, "Name", std::string("Obstacle")); m_World->SetProperty(ent, "Name", std::string("Obstacle"));
float scale = 1.0f + (float)(rand() % 1000) / 200; float scale = 1.0f + (float)(rand() % 1000) / 200;
@@ -53,16 +53,16 @@ void Systems::LevelGenerationSystem::SpawnObstacle()
bounds->Origin = glm::vec3(0,7.5f,0); bounds->Origin = glm::vec3(0,7.5f,0);
model->ModelFile = "Models/obstacle_mountain_2.obj"; model->ModelFile = "Models/obstacle_mountain_2.obj";
} }
else if(typeRandom >= 5 && typeRandom < 8) else if(typeRandom >= 5 && typeRandom < 9)
{ {
m_World->SetProperty(ent, "Name", std::string("Obstacle")); m_World->SetProperty(ent, "Name", std::string("Obstacle"));
float scale = 1.f + (float)(rand() % 1000) / 100; float scale = 2.f + (float)(rand() % 1000) / 100;
transform->Scale = glm::vec3(scale); transform->Scale = glm::vec3(scale);
bounds->VolumeVector = glm::vec3(1, 1, 1); bounds->VolumeVector = glm::vec3(1, 1, 1);
bounds->Origin = glm::vec3(0,1,0); bounds->Origin = glm::vec3(0,1,0);
model->ModelFile = "Models/obstacle_cube_1.obj"; model->ModelFile = "Models/obstacle_cube_1.obj";
} }
if(typeRandom >= 8 && typeRandom < 10) if(typeRandom >= 9 && typeRandom < 10)
{ {
m_World->SetProperty(ent, "Name", std::string("PowerUp")); m_World->SetProperty(ent, "Name", std::string("PowerUp"));
bounds->VolumeVector = glm::vec3(4, 4, 4); bounds->VolumeVector = glm::vec3(4, 4, 4);