Falling bricks and collision filters

include/Physics/CPhysics.h

@@ -4,18 +4,40 @@
 
 namespace dd
 {
+
+namespace CollisionLayer
+{
+enum Type
+{
+    Pad = 1 << 0,
+    Ball = 1 << 1,
+    Brick = 1 << 2,
+    Water = 1 << 3,
+    PowerUp = 1 << 4,
+    Other = 1 << 5,
+    Wall = 1 << 6
+};
+}
 namespace Components
 {
 
 struct Physics: public Component
 {
-    //idk if anything should be here :)
     bool Static = true;
+    bool Calculate = false;
     float GravityScale = 0.f;
+    CollisionLayer::Type Category = CollisionLayer::Type::Other;
+    CollisionLayer::Type Mask =
+            CollisionLayer::Type::Pad |
+            CollisionLayer::Type::Ball |
+            CollisionLayer::Type::Brick |
+            CollisionLayer::Type::Water |
+            CollisionLayer::Type::PowerUp |
+            CollisionLayer::Type::Wall |
+            CollisionLayer::Type::Other;
 };
 
 }
-
 }
 
 #endif //DAYDREAM_CPHYSICS_H

include/Physics/PhysicsSystem.h

@@ -15,6 +15,7 @@
 #include "Physics/CCircleShape.h"
 #include "Core/EventBroker.h"
 #include "Game/CPad.h"
+#include "Game/CBall.h"
 
 
 namespace dd
@@ -102,16 +103,19 @@ private:
         void PreSolve(b2Contact* contact, const b2Manifold* oldManifold)
         {
             EntityID entityA = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
-            EntityID entityB = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
+            EntityID entityB = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()];
 
             auto physicsComponentA = m_PhysicsSystem->m_World->GetComponent<Components::Physics>(entityA);
             auto physicsComponentB = m_PhysicsSystem->m_World->GetComponent<Components::Physics>(entityB);
 
-            if (physicsComponentA != nullptr || physicsComponentB != nullptr) {
-                // Turn of collisions
-                contact->SetEnabled(false);
+            if (physicsComponentA != nullptr && physicsComponentB != nullptr) {
+                if (physicsComponentA->Calculate || physicsComponentB->Calculate) {
+                    // Turn of collisions
+                    contact->SetEnabled(false);
+                }
             }
 
+
         }
         void PostSolve(b2Contact* contact, const b2ContactImpulse* impulse)
         {