diff --git a/include/Core/Engine.h b/include/Core/Engine.h index 4e2a7c1..4d98e45 100644 --- a/include/Core/Engine.h +++ b/include/Core/Engine.h @@ -62,8 +62,9 @@ public: m_Renderer = std::make_shared(); m_Renderer->SetFullscreen(false); - m_Renderer->SetResolution(Rectangle(0, 0, 1920, 1080)); - m_Renderer->Initialize(); + //m_Renderer->SetResolution(Rectangle(0, 0, 1920, 1080)); + m_Renderer->SetResolution(Rectangle(0, 0, 675, 1080)); + m_Renderer->Initialize(); m_InputManager = std::make_shared(m_Renderer->Window(), m_EventBroker); @@ -119,7 +120,7 @@ public: auto ent = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(ent); transform->Position = glm::vec3(0.5f, 0.f, -9.9f); - transform->Scale = glm::vec3(1.f, 1.f, 1.f); + transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f); auto model = m_World->AddComponent(ent); model->ModelFile = "Models/Test/Ball/Ballopus.obj"; @@ -137,7 +138,7 @@ public: Events::SetImpulse e; e.Entity = ent; - e.Impulse = glm::vec2(0.f, -7.f); + e.Impulse = glm::vec2(0.f, -2.f); e.Point = glm::vec2(0.5f, 0.f); m_EventBroker->Publish(e); } @@ -155,27 +156,27 @@ public: { auto t_halfPipe = m_World->CreateEntity(); auto transform = m_World->AddComponent(t_halfPipe); - transform->Position = glm::vec3(0.f, 0.f, -15.f); - transform->Scale = glm::vec3(15.f); + transform->Position = glm::vec3(0.f, 0.f, -13.f); + transform->Scale = glm::vec3(5.f); auto model = m_World->AddComponent(t_halfPipe); model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj"; } //Brick test model { - auto t_Brick = m_World->CreateEntity(); + /*auto t_Brick = m_World->CreateEntity(); auto transform = m_World->AddComponent(t_Brick); transform->Position = glm::vec3(0.f, 0.f, -12.f); transform->Orientation = glm::rotate(glm::quat(), 0.5f, glm::vec3(0,-1,-1)); auto model = m_World->AddComponent(t_Brick); - model->ModelFile = "Models/Test/Brick/Brick.obj"; + model->ModelFile = "Models/Test/Brick/Brick.obj";*/ } { auto topWall = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(topWall); - transform->Position = glm::vec3(0.f, 6.f, -10.f); + transform->Position = glm::vec3(0.f, 5.5f, -10.f); transform->Scale = glm::vec3(18.f, 0.5f, 1.f); std::shared_ptr sprite = m_World->AddComponent(topWall); @@ -191,7 +192,7 @@ public: { auto leftWall = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(leftWall); - transform->Position = glm::vec3(-9.f, 1.f, -10.f); + transform->Position = glm::vec3(-4.f, 1.f, -10.f); transform->Scale = glm::vec3(0.5f, 10.f, 1.f); std::shared_ptr sprite = m_World->AddComponent(leftWall); @@ -207,7 +208,7 @@ public: { auto rightWall = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(rightWall); - transform->Position = glm::vec3(9.f, 1.f, -10.f); + transform->Position = glm::vec3(4.f, 1.f, -10.f); transform->Scale = glm::vec3(0.5f, 10.f, 1.f); std::shared_ptr sprite = m_World->AddComponent(rightWall); @@ -226,7 +227,7 @@ public: m_World->SetProperty(ent, "Name", "Pad"); auto ctransform = m_World->AddComponent(ent); ctransform->Position = glm::vec3(0.f, -5.f, -10.f); - ctransform->Scale = glm::vec3(3.2, 0.8, 0.); + ctransform->Scale = glm::vec3(1.6, 0.4, 0.); auto rectangle = m_World->AddComponent(ent); auto physics = m_World->AddComponent(ent); auto csprite = m_World->AddComponent(ent); diff --git a/include/Game/LevelSystem.h b/include/Game/LevelSystem.h index 7eefcce..f18bd01 100755 --- a/include/Game/LevelSystem.h +++ b/include/Game/LevelSystem.h @@ -106,10 +106,10 @@ private: int m_PowerUps = 0; int m_Score = 0; int m_NumberOfBricks; - int m_Rows = 7; - int m_Lines = 8; + int m_Rows = 6; + int m_Lines = 7; int m_SpaceToEdge = 0; - glm::vec2 m_SpaceBetweenBricks = glm::vec2(2, 0.5); + glm::vec2 m_SpaceBetweenBricks = glm::vec2(1, 0.25); dd::EventRelay m_EContact; dd::EventRelay m_ELifeLost; diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index 1627e8f..57f276c 100755 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -26,8 +26,8 @@ void dd::Systems::LevelSystem::CreateLife(int number) { auto life = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(life); - transform->Position = glm::vec3(-4.f + number * 0.5f, -2.f, -5.f); - transform->Scale = glm::vec3(0.25f, 0.25f, 0.25f); + transform->Position = glm::vec3(-1.5f + number * 0.5f, -2.f, -5.f); + transform->Scale = glm::vec3(0.1f, 0.1f, 0.1f); std::shared_ptr lifeNr = m_World->AddComponent(life); lifeNr->Number = number; @@ -62,7 +62,7 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID if (ball != NULL) { auto transformBall = m_World->GetComponent(entity); - if (transformBall->Position.y < -10 || glm::abs(transformBall->Position.x) > 10) { + if (transformBall->Position.y < -10 || glm::abs(transformBall->Position.x) > 5) { if (MultiBalls() != 0) { SetMultiBalls(MultiBalls() - 1); m_World->RemoveEntity(entity); @@ -144,8 +144,8 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe } float x = spaceToEdge + line * spacesBetweenBricks.x; float y = spaceToEdge + row * spacesBetweenBricks.y; - transform->Scale = glm::vec3(1.6, 0.35, 0.5); - transform->Position = glm::vec3(x - 7, y + 1, -10.f); + transform->Scale = glm::vec3(0.8, 0.2, 0.2); + transform->Position = glm::vec3(x - 3, y + 3, -10.f); cBrick->Score = 10 * num; //sound @@ -259,7 +259,7 @@ bool dd::Systems::LevelSystem::OnCreatePowerUp(const dd::Events::CreatePowerUp & cPhys->Static = false; transform->Position = event.Position; - transform->Scale = glm::vec3(0.25, 0.25, 0.25); + transform->Scale = glm::vec3(0.2, 0.2, 0.2); model->ModelFile = "Models/Test/Ball/Ballopus.obj"; @@ -267,7 +267,7 @@ bool dd::Systems::LevelSystem::OnCreatePowerUp(const dd::Events::CreatePowerUp & Events::SetImpulse e; e.Entity = powerUp; - e.Impulse = glm::vec2(0, -0.25); + e.Impulse = glm::vec2(0, -0.05); e.Point = glm::vec2(transform->Position.x, transform->Position.y); EventBroker->Publish(e); return true; diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index c044131..7663ea2 100755 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -47,7 +47,7 @@ void dd::Systems::PadSystem::UpdateEntity(double dt, EntityID entity, EntityID p Events::SetImpulse e; e.Entity = ent; - e.Impulse = glm::vec2(0.f, -7.f); + e.Impulse = glm::vec2(0.f, -1.f); e.Point = glm::vec2(transform->Position.x, transform->Position.y); EventBroker->Publish(e); } @@ -109,7 +109,7 @@ EntityID dd::Systems::PadSystem::CreateBall() auto ent = m_World->CreateEntity(); std::shared_ptr transform = m_World->AddComponent(ent); transform->Position = glm::vec3(0.5f, 0.f, -10.f); - transform->Scale = glm::vec3(1.f, 1.f, 1.f); + transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f); auto model = m_World->AddComponent(ent); model->ModelFile = "Models/Test/Ball/Ballopus.obj"; //auto pointlight = m_World->AddComponent(ent); @@ -176,7 +176,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) auto transformBall = m_World->GetComponent(entityBall); auto transformPad = m_World->GetComponent(entityPad); - float movementMultiplier = 4.f; + float movementMultiplier = 0.5f; float whatX = transformBall->Position.x - transformPad->Position.x; float movementX; @@ -191,7 +191,7 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event) //float movementY = 1; //float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier; - float movementY = glm::cos((abs(movementX) / ((1.6f) * movementMultiplier)) * 3.14159265359f / 2) + 1; + float movementY = glm::cos((abs(movementX) / ((1.6f) * movementMultiplier)) * 3.14159265359f / 2)+ 0.2; //std::cout << movementX << " " << movementY << std::endl; @@ -263,25 +263,25 @@ bool dd::Systems::PadSystem::OnMultiBall(const dd::Events::MultiBall &event) auto transform1 = m_World->GetComponent(ent1); auto transform2 = m_World->GetComponent(ent2); auto padTransform = event.padTransform; - float x1 = padTransform->Position.x - 6, x2 = padTransform->Position.x + 6; - if (x1 < -7) { - x1 = 7; + float x1 = padTransform->Position.x - 3, x2 = padTransform->Position.x + 3; + if (x1 < -3.5) { + x1 = 3.5; } - if (x2 > 7) { - x2 = -7; + if (x2 > 3.5) { + x2 = -3.5; } transform1->Position = glm::vec3(x1, -5, -10); transform2->Position = glm::vec3(x2, -5, -10); Events::SetImpulse e1; e1.Entity = ent1; - e1.Impulse = glm::vec2(6, 6); + e1.Impulse = glm::vec2(2, 2); e1.Point = glm::vec2(transform1->Position.x, transform1->Position.y); EventBroker->Publish(e1); Events::SetImpulse e2; e2.Entity = ent2; - e2.Impulse = glm::vec2(-6, 6); + e2.Impulse = glm::vec2(-2, 2); e2.Point = glm::vec2(transform2->Position.x, transform2->Position.y); EventBroker->Publish(e2);