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

assets/Models/Ship/Ship.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Ship.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd ShipTexture.png

include/Physics/CPhysics.h

@@ -39,20 +39,20 @@ enum Type
 
             bool Calculate = false;
             float GravityScale = 0.f;
+			float Density = 10.f;
 
 
             CollisionLayer::Type Category = CollisionLayer::Type::Other;
-	CollisionLayer::Type Mask =	static_cast<CollisionLayer::Type>(
-		CollisionLayer::Pad
-		| CollisionLayer::Ball
-		| CollisionLayer::Brick
-		| CollisionLayer::Water
-		| CollisionLayer::PowerUp
-		| CollisionLayer::Wall
-		| CollisionLayer::Other
-	);
-        };
-
+			CollisionLayer::Type Mask =	static_cast<CollisionLayer::Type>(
+				CollisionLayer::Pad
+				| CollisionLayer::Ball
+				| CollisionLayer::Brick
+				| CollisionLayer::Water
+				| CollisionLayer::PowerUp
+				| CollisionLayer::Wall
+				| CollisionLayer::Other
+		);
+   };
 }
 }
 

src/game/Game/BallSystem.cpp

@@ -241,15 +241,6 @@ bool dd::Systems::BallSystem::Contact(const Events::Contact &event)
         //TODO: Add support for power-up collisions
     }
 
-    auto brick = m_World->GetComponent<Components::Brick>(otherEntitiy);
-    if (brick != nullptr) {
-        auto transform = m_World->GetComponent<Components::Transform>(otherEntitiy);
-        auto physics = m_World->GetComponent<Components::Physics>(otherEntitiy);
-        auto rectangle = m_World->GetComponent<Components::RectangleShape>(otherEntitiy);
-        int hey = 5;
-    }
-
-    //if this is a brick thats dead do not collide :)
 
     auto ballTransform = m_World->GetComponent<Components::Transform>(ballEntity);
     glm::vec2 ballVelocity = glm::vec2(ballTransform->Velocity.x, ballTransform->Velocity.y);
@@ -287,8 +278,12 @@ bool dd::Systems::BallSystem::Contact(const Events::Contact &event)
             m_Contacts[ballEntity] = normalList;
         }
 
-        //glm::vec2 reflectedVelocity = glm::reflect(ballVelocity, event.Normal);
-        //ballTransform->Velocity = glm::vec3(reflectedVelocity, 0.f);
+		auto brick = m_World->GetComponent<Components::Brick>(otherEntitiy);
+		if (brick != nullptr) {
+			auto physicsComponent = m_World->GetComponent<Components::Physics>(otherEntitiy);
+			physicsComponent->CollisionType = CollisionType::Type::Dynamic;
+
+		}
     }
 
     return true;
@@ -316,6 +311,8 @@ void dd::Systems::BallSystem::ResolveContacts()
         auto transform = m_World->GetComponent<Components::Transform>(entity);
         glm::vec2 velocity = glm::vec2(transform->Velocity.x, transform->Velocity.y);
         glm::vec2 reflectedVelocity = glm::reflect(velocity, finalNormal);
+		auto ballComponent = m_World->GetComponent<Components::Ball>(entity);
+		reflectedVelocity = glm::normalize(reflectedVelocity) * ballComponent->Speed;
         transform->Velocity = glm::vec3(reflectedVelocity, 0.f);
 
     }

src/game/Game/LevelSystem.cpp

@@ -27,7 +27,7 @@ void dd::Systems::LevelSystem::Initialize()
     cRec->Dimensions = glm::vec2(0.9f, 0.35f);
     std::shared_ptr<Components::Physics> cPhys = m_World->AddComponent<Components::Physics>(m_BrickTemplate);
     std::shared_ptr<Components::Template> cTemplate = m_World->AddComponent<Components::Template>(m_BrickTemplate);
-    cPhys->CollisionType = CollisionType::Type::Dynamic;
+    cPhys->CollisionType = CollisionType::Type::Static;
     cPhys->GravityScale = 0.f;
     cPhys->Category = CollisionLayer::Type::Brick;
     cPhys->Mask = CollisionLayer::Type::Ball;

src/game/Game/PadSystem.cpp

@@ -34,9 +34,9 @@ void dd::Systems::PadSystem::Initialize()
         auto ent = m_World->CreateEntity();
         m_World->SetProperty(ent, "Name", "Pad");
         auto ctransform = m_World->AddComponent<Components::Transform>(ent);
-        ctransform->Position = glm::vec3(0.f, -3.5f, -10.f);
+        ctransform->Position = glm::vec3(0.f, -4.8f, -10.f);
         auto rectangleShape = m_World->AddComponent<Components::RectangleShape>(ent);
-        rectangleShape->Dimensions = glm::vec2(1.f, 0.5f);
+        rectangleShape->Dimensions = glm::vec2(1.f, 0.1f);
         auto physics = m_World->AddComponent<Components::Physics>(ent);
         physics->CollisionType = CollisionType::Type::Dynamic;
         physics->Category = CollisionLayer::Type::Pad;
@@ -44,7 +44,7 @@ void dd::Systems::PadSystem::Initialize()
         physics->Calculate = true;
         ctransform->Sticky = true;
         auto cModel = m_World->AddComponent<Components::Model>(ent);
-        cModel->ModelFile = "Models/Submarine2.obj";
+        cModel->ModelFile = "Models/Ship/Ship.obj";
 
         auto pad = m_World->AddComponent<Components::Pad>(ent);
         m_World->CommitEntity(ent);

src/game/Physics/PhysicsSystem.cpp

@@ -90,6 +90,16 @@ void dd::Systems::PhysicsSystem::SyncEntitiesWithBodies()
             filter.categoryBits = physicsComponent->Category;
             filter.maskBits = physicsComponent->Mask;
             body->GetFixtureList()->SetFilterData(filter);
+
+			if (physicsComponent->CollisionType == CollisionType::Type::Static) {
+				body->SetType(b2_staticBody);
+			}
+			else if (physicsComponent->CollisionType == CollisionType::Type::Dynamic) {
+				body->SetType(b2_dynamicBody);
+			}
+			else if (physicsComponent->CollisionType == CollisionType::Type::Kinematic) {
+				body->SetType(b2_dynamicBody);
+			}
         }
     }
 }
@@ -342,7 +352,7 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
 
 
     fixtureDef.shape = pShape;
-    fixtureDef.density = 10.f;
+    fixtureDef.density = physicsComponent->Density;
     fixtureDef.restitution = 1.0f;
     fixtureDef.friction = 0.0f;
     body->CreateFixture(&fixtureDef);
@@ -350,12 +360,6 @@ void dd::Systems::PhysicsSystem::CreateBody(EntityID entity)
 
     delete pShape;
 
-  /*  if(physicsComponent->Static) {
-        body->SetType(b2BodyType::b2_staticBody);
-    } else if (! physicsComponent->Static) {
-        body->SetType(b2BodyType::b2_dynamicBody);
-    }*/
-
     body->SetGravityScale(physicsComponent->GravityScale);
     m_EntitiesToBodies.insert(std::make_pair(entity, body));
     m_BodiesToEntities.insert(std::make_pair(body, entity));