sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ndk/Physics: Improved code 

Former-commit-id: 8774d0ce7cf55a0a1793e69eda6c97ececc1b44a
This commit is contained in:
Lynix 2015-05-02 21:05:33 +02:00
parent 3f423239f5
commit 31227ca567
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SDK/src/NDK/Components/CollisionComponent.cpp
View File

@ -4,6 +4,7 @@
#include <NDK/Components/CollisionComponent.hpp> #include <NDK/Components/CollisionComponent.hpp>
#include <Nazara/Physics/PhysObject.hpp> #include <Nazara/Physics/PhysObject.hpp>
#include <NDK/Algorithm.hpp>
#include <NDK/World.hpp> #include <NDK/World.hpp>
#include <NDK/Components/PhysicsComponent.hpp> #include <NDK/Components/PhysicsComponent.hpp>
#include <NDK/Systems/PhysicsSystem.hpp> #include <NDK/Systems/PhysicsSystem.hpp>
@ -48,13 +49,13 @@ namespace Ndk
void CollisionComponent::OnComponentAttached(BaseComponent& component) void CollisionComponent::OnComponentAttached(BaseComponent& component)
{ {
if (component.GetIndex() == GetComponentIndex<PhysicsComponent>()) if (IsComponent<PhysicsComponent>(component))
m_staticBody.reset(); m_staticBody.reset();
} }
void CollisionComponent::OnComponentDetached(BaseComponent& component) void CollisionComponent::OnComponentDetached(BaseComponent& component)
{ {
if (component.GetIndex() == GetComponentIndex<PhysicsComponent>()) if (IsComponent<PhysicsComponent>(component))
InitializeStaticBody(); InitializeStaticBody();
} }

5
SDK/src/NDK/Components/PhysicsComponent.cpp
View File

@ -4,6 +4,7 @@
#include <NDK/Components/PhysicsComponent.hpp> #include <NDK/Components/PhysicsComponent.hpp>
#include <Nazara/Physics/PhysObject.hpp> #include <Nazara/Physics/PhysObject.hpp>
#include <NDK/Algorithm.hpp>
#include <NDK/World.hpp> #include <NDK/World.hpp>
#include <NDK/Components/CollisionComponent.hpp> #include <NDK/Components/CollisionComponent.hpp>
#include <NDK/Components/NodeComponent.hpp> #include <NDK/Components/NodeComponent.hpp>
@ -34,7 +35,7 @@ namespace Ndk
void PhysicsComponent::OnComponentAttached(BaseComponent& component) void PhysicsComponent::OnComponentAttached(BaseComponent& component)
{ {
if (component.GetIndex() == GetComponentIndex<CollisionComponent>()) if (IsComponent<CollisionComponent>(component))
{ {
NazaraAssert(m_object, "Invalid object"); NazaraAssert(m_object, "Invalid object");
m_object->SetGeom(static_cast<CollisionComponent&>(component).GetGeom()); m_object->SetGeom(static_cast<CollisionComponent&>(component).GetGeom());
@ -43,7 +44,7 @@ namespace Ndk
void PhysicsComponent::OnComponentDetached(BaseComponent& component) void PhysicsComponent::OnComponentDetached(BaseComponent& component)
{ {
if (component.GetIndex() == GetComponentIndex<CollisionComponent>()) if (IsComponent<CollisionComponent>(component))
{ {
NazaraAssert(m_object, "Invalid object"); NazaraAssert(m_object, "Invalid object");
m_object->SetGeom(NzNullGeom::New()); m_object->SetGeom(NzNullGeom::New());