diff --git a/include/Physics/CPhysics.h b/include/Physics/CPhysics.h index fc58a71..6a20a1e 100644 --- a/include/Physics/CPhysics.h +++ b/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::Pad - | CollisionLayer::Ball - | CollisionLayer::Brick - | CollisionLayer::Water - | CollisionLayer::PowerUp - | CollisionLayer::Wall - | CollisionLayer::Other - ); - }; - + CollisionLayer::Type Mask = static_cast( + CollisionLayer::Pad + | CollisionLayer::Ball + | CollisionLayer::Brick + | CollisionLayer::Water + | CollisionLayer::PowerUp + | CollisionLayer::Wall + | CollisionLayer::Other + ); + }; } } diff --git a/src/game/Physics/PhysicsSystem.cpp b/src/game/Physics/PhysicsSystem.cpp index 468167e..55e49dc 100755 --- a/src/game/Physics/PhysicsSystem.cpp +++ b/src/game/Physics/PhysicsSystem.cpp @@ -326,7 +326,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); @@ -334,12 +334,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));