Breakout Standard Screen

Meaning bricks, ball, pad, walls bounces, things.
May or may not work as intended.

src/game/Game/PadSystem.cpp

@@ -6,6 +6,7 @@
 #include "Game/PadSystem.h"
 #include "Core/World.h"
 #include <iostream>
+#include <Game/CPad.h>
 
 
 void dd::Systems::PadSystem::Initialize()
@@ -22,6 +23,7 @@ void dd::Systems::PadSystem::Initialize()
 
     EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, PadSystem::OnKeyDown);
     EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, PadSystem::OnKeyUp);
+    EVENT_SUBSCRIBE_MEMBER(m_EContact, PadSystem::OnContact);
 
     return;
 }
@@ -114,9 +116,50 @@ bool dd::Systems::PadSystem::OnKeyUp(const dd::Events::KeyUp &event)
     return true;
 }
 
-bool dd::Systems::PadSystem::OnContact(/*const dd::Events::Contact &event,*/)
+bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
 {
+    EntityID entityBall = event.Entity2;
+    auto ball = m_World->GetComponent<Components::Ball>(entityBall);
+    if (ball == NULL)
+    {
+        return false;
+    }
+    EntityID entityPad = event.Entity1;
+    auto pad = m_World->GetComponent<Components::Pad>(entityPad);
+    if (pad == NULL)
+    {
+        return false;
+    }
+    auto transformBall = m_World->GetComponent<Components::Transform>(entityBall);
+    auto transformPad = m_World->GetComponent<Components::Transform>(entityPad);
 
+    float movementMultiplier = 2.f;
+
+    float movementX = (event.ContactPoint.x - transformPad->Position.x) * movementMultiplier;
+    float movementY = glm::cos((abs(movementX) / (3.2f * movementMultiplier)) * 3.14159265359f / 2) * 2.f;
+
+    std::cout << movementX << " " << movementY << std::endl;
+
+    //Temporary solution. Add a new ball and delete the old one.
+    auto ent = m_World->CreateEntity();
+    std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
+    transform->Position = glm::vec3(transformBall->Position.x, transformBall->Position.y + 0.1f, -10.f);
+    transform->Scale = glm::vec3(1.f, 1.f, 1.f);
+    std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(ent);
+    sprite->SpriteFile = "Textures/Ball.png";
+    std::shared_ptr<Components::CircleShape> circleShape = m_World->AddComponent<Components::CircleShape>(ent);
+    std::shared_ptr<Components::Ball> cball = m_World->AddComponent<Components::Ball>(ent);
+    std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);
+    physics->Static = false;
+
+    m_World->RemoveEntity(entityBall);
+    m_World->CommitEntity(ent);
+
+    Events::SetImpulse e;
+    e.Entity = ent;
+    e.Impulse = glm::vec2(movementX, movementY);
+    e.Point = glm::vec2(event.ContactPoint);
+    EventBroker->Publish(e);
 }
 
 bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)

src/game/Physics/PhysicsSystem.cpp

@@ -16,8 +16,8 @@ void dd::Systems::PhysicsSystem::Initialize()
     m_PhysicsWorld = new b2World(m_Gravity);
 
     m_TimeStep = 1.f/60.f;
-    m_VelocityIterations = 6;
-    m_PositionIterations = 2;
+    m_VelocityIterations = 8;
+    m_PositionIterations = 6;
 
 
     m_PhysicsWorld->SetContactListener(m_ContactListener);
@@ -147,7 +147,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
     auto boxComponent = m_World->GetComponent<Components::RectangleShape>(entity);
     if (boxComponent) {
         b2PolygonShape* bShape = new b2PolygonShape();
-        bShape->SetAsBox(absoluteTransform.Scale.x/4, absoluteTransform.Scale.y/4); //TODO: THIS SUCKS DUDE 4?!?!?!?
+        bShape->SetAsBox(absoluteTransform.Scale.x/2, absoluteTransform.Scale.y/2); //TODO: THIS SUCKS DUDE 4?!?!?!?
         pShape = bShape;
     } else {
         auto circleComponent = m_World->GetComponent<Components::CircleShape>(entity);
@@ -159,7 +159,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
             if (absoluteTransform.Scale.x != absoluteTransform.Scale.y &&  absoluteTransform.Scale.y != absoluteTransform.Scale.z) {
                 LOG_WARNING("Circles has to be of uniform scale.");
             }
-            pShape->m_radius = absoluteTransform.Scale.x/4; //TODO: THIS ALSO SUCKS 4 WTH
+            pShape->m_radius = absoluteTransform.Scale.x/2; //TODO: THIS ALSO SUCKS 4 WTH
 
         }
     }
@@ -172,7 +172,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
         b2FixtureDef fixtureDef;
         fixtureDef.shape = pShape;
         fixtureDef.density = 1.f;
-        fixtureDef.restitution = 0.0f;
+        fixtureDef.restitution = 1.0f;
         fixtureDef.friction = 0.3f;
         body->CreateFixture(&fixtureDef);