Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

src/game/CMakeLists.txt

@@ -56,6 +56,12 @@ file(GLOB SOURCE_FILES_Transform
 )
 source_group(Transform FILES ${SOURCE_FILES_Transform})
 
+file(GLOB SOURCE_FILES_Physics
+        "${INCLUDE_PATH}/Physics/*.h"
+        "Physics/*.cpp"
+)
+source_group(Physics FILES ${SOURCE_FILES_Physics})
+
 file(GLOB SOURCE_FILES_Game
     "${INCLUDE_PATH}/Game/*.h"
     "Game/*.cpp"
@@ -68,8 +74,9 @@ set(SOURCE_FILES
     ${SOURCE_FILES_Input}
     ${SOURCE_FILES_Rendering}
     ${SOURCE_FILES_Transform}
+    ${SOURCE_FILES_Physics}
     ${SOURCE_FILES_Game}
-        Physics/PhysicsSystem.cpp ../../include/Physics/PhysicsSystem.h ../../include/Core/CBoxShape.h ../../include/Physics/CPhysics.h ../../include/Physics/EContact.h)
+)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")

src/game/Physics/PhysicsSystem.cpp

@@ -5,7 +5,7 @@
 
 void dd::Systems::PhysicsSystem::RegisterComponents(ComponentFactory* cf)
 {
-
+    cf->Register<Components::CircleShape>();
 }
 
 void dd::Systems::PhysicsSystem::Initialize()
@@ -21,6 +21,25 @@ void dd::Systems::PhysicsSystem::Initialize()
 
 
     m_PhysicsWorld->SetContactListener(m_ContactListener);
+
+    EVENT_SUBSCRIBE_MEMBER(m_SetImpulse, PhysicsSystem::SetImpulse);
+}
+
+bool dd::Systems::PhysicsSystem::SetImpulse(const Events::SetImpulse &event)
+{
+    b2Body* body = m_EntitiesToBodies[event.Entity];
+
+    b2Vec2 impulse;
+    impulse.x = event.Impulse.x;
+    impulse.y = event.Impulse.y;
+
+    b2Vec2 point;
+    point.x = event.Point.x;
+    point.y = event.Point.y;
+
+    body->ApplyLinearImpulse(impulse, point, true);
+
+    return true;
 }
 
 void dd::Systems::PhysicsSystem::Update(double dt)
@@ -57,11 +76,10 @@ void dd::Systems::PhysicsSystem::UpdateEntity(double dt, EntityID entity, Entity
 
 void dd::Systems::PhysicsSystem::OnEntityCommit(EntityID entity)
 {
-
     auto physicsComponent = m_World->GetComponent<Components::Physics>(entity);
-    if(physicsComponent)
+    if(physicsComponent) {
         CreateBody(entity);
-
+    }
 }
 
 
@@ -94,28 +112,44 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
 
     bodyDef.angle = glm::degrees(-glm::eulerAngles(absoluteTransform.Orientation).z); //TODO: CHECK IF THIS IS CORRECT
 
-    if(physicsComponent->Static)
+    if (physicsComponent->Static) {
         bodyDef.type = b2_staticBody;
-    else
+    } else {
         bodyDef.type = b2_dynamicBody;
+    }
+
 
     b2Body* body = m_PhysicsWorld->CreateBody(&bodyDef);
 
-    b2PolygonShape pShape;
+    b2Shape* pShape;
 
     auto boxComponent = m_World->GetComponent<Components::RectangleShape>(entity);
-    if(boxComponent){
+    if (boxComponent) {
+        b2PolygonShape* bShape = new b2PolygonShape();
+        bShape->SetAsBox(absoluteTransform.Scale.x/4, absoluteTransform.Scale.y/4); //TODO: THIS SUCKS DUDE
+        pShape = bShape;
+    } else {
+        auto circleComponent = m_World->GetComponent<Components::CircleShape>(entity);
+        if (circleComponent) {
+            pShape = new b2CircleShape();
+            pShape->m_radius = absoluteTransform.Scale.x;
+
+
+            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;
 
-        pShape.SetAsBox(absoluteTransform.Scale.x/4, absoluteTransform.Scale.y/4); //TODO: THIS SUCKS DUDE
         }
-
-    if(physicsComponent->Static){
-        body->CreateFixture(&pShape, 0); //Density kanske ska vara 0 på statiska kroppar
     }
-    else{
+
+    if(physicsComponent->Static) {
+        body->CreateFixture(pShape, 0); //Density kanske ska vara 0 på statiska kroppar
+    }
+    else {
         //TODO: FIX THIS SHIT INTO COMPONENTS
         b2FixtureDef fixtureDef;
-        fixtureDef.shape = &pShape;
+        fixtureDef.shape = pShape;
         fixtureDef.density = 1.f;
         fixtureDef.restitution = 1.0f;
         fixtureDef.friction = 0.3f;
@@ -123,6 +157,8 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
 
     }
 
+    delete pShape;
+
     m_EntitiesToBodies.insert(std::make_pair(entity, body));
     m_BodiesToEntities.insert(std::make_pair(body, entity));
 }