diff --git a/include/Nazara/Physics2D/RigidBody2D.hpp b/include/Nazara/Physics2D/RigidBody2D.hpp index 436127f6b..7d521fbe6 100644 --- a/include/Nazara/Physics2D/RigidBody2D.hpp +++ b/include/Nazara/Physics2D/RigidBody2D.hpp @@ -39,7 +39,6 @@ namespace Nz float GetAngularVelocity() const; Vector2f GetCenterOfGravity(CoordSys coordSys = CoordSys_Local) const; const Collider2DRef& GetGeom() const; - float GetGravityFactor() const; cpBody* GetHandle() const; float GetMass() const; Vector2f GetPosition() const; @@ -50,7 +49,6 @@ namespace Nz bool IsSleeping() const; void SetAngularVelocity(float angularVelocity); - void SetGravityFactor(float gravityFactor); void SetMass(float mass); void SetMassCenter(const Vector2f& center); void SetPosition(const Vector2f& position); diff --git a/src/Nazara/Physics2D/RigidBody2D.cpp b/src/Nazara/Physics2D/RigidBody2D.cpp index d47f396e4..faa6223d1 100644 --- a/src/Nazara/Physics2D/RigidBody2D.cpp +++ b/src/Nazara/Physics2D/RigidBody2D.cpp @@ -97,12 +97,12 @@ namespace Nz for (cpShape* shape : m_shapes) bb = cpBBMerge(bb, cpShapeGetBB(shape)); - return Rectf(bb.l, bb.t, bb.r - bb.l, bb.b - bb.t); + return Rectf(Rect(bb.l, bb.t, bb.r - bb.l, bb.b - bb.t)); } float RigidBody2D::GetAngularVelocity() const { - return cpBodyGetAngularVelocity(m_handle); + return static_cast(cpBodyGetAngularVelocity(m_handle)); } const Collider2DRef& RigidBody2D::GetGeom() const @@ -110,11 +110,6 @@ namespace Nz return m_geom; } - float RigidBody2D::GetGravityFactor() const - { - return m_gravityFactor; - } - cpBody* RigidBody2D::GetHandle() const { return m_handle; @@ -139,24 +134,24 @@ namespace Nz break; // Nothing to do } - return Vector2f(cog.x, cog.y); + return Vector2f(static_cast(cog.x), static_cast(cog.y)); } Vector2f RigidBody2D::GetPosition() const { cpVect pos = cpBodyGetPosition(m_handle); - return Vector2f(pos.x, pos.y); + return Vector2f(static_cast(pos.x), static_cast(pos.y)); } float RigidBody2D::GetRotation() const { - return cpBodyGetAngle(m_handle); + return static_cast(cpBodyGetAngle(m_handle)); } Vector2f RigidBody2D::GetVelocity() const { cpVect vel = cpBodyGetVelocity(m_handle); - return Vector2f(vel.x, vel.y); + return Vector2f(static_cast(vel.x), static_cast(vel.y)); } bool RigidBody2D::IsMoveable() const @@ -174,11 +169,6 @@ namespace Nz cpBodySetAngularVelocity(m_handle, angularVelocity); } - void RigidBody2D::SetGravityFactor(float gravityFactor) - { - m_gravityFactor = gravityFactor; - } - void RigidBody2D::SetMass(float mass) { if (m_mass > 0.f)