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

Fix compilation and PR

This commit is contained in:
Lynix 2018-01-13 11:57:30 +01:00
parent b52c76dd54
commit 0183f60b80
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SDK/include/NDK/Components/ConstraintComponent2D.inl
View File

@ -5,23 +5,25 @@
namespace Ndk namespace Ndk
{ {
template<typename T, typename ...Args> template<typename T, typename ...Args>
inline Nz::ObjectRef<T> ConstraintComponent2D::CreateConstraint(const Ndk::EntityHandle first, const Ndk::EntityHandle second, Args && ...args) inline Nz::ObjectRef<T> ConstraintComponent2D::CreateConstraint(const Ndk::EntityHandle& first, const Ndk::EntityHandle& second, Args && ...args)
{ {
auto QueryBody = [](const Ndk::EntityHandle& entity) -> Nz::RigidBody2D* auto FetchBody = [](const Ndk::EntityHandle& entity) -> Nz::RigidBody2D*
{ {
if (entity->HasComponent<Ndk::PhysicsComponent2D>()) if (entity->HasComponent<Ndk::PhysicsComponent2D>())
return entity->GetComponent<Ndk::PhysicsComponent2D>().GetRigidBody(); return entity->GetComponent<Ndk::PhysicsComponent2D>().GetRigidBody();
else if (entity->HasComponent<Ndk::CollisionComponent2D>()) else if (entity->HasComponent<Ndk::CollisionComponent2D>())
return entity->GetComponent<Ndk::CollisionComponent2D>().GetStaticBody(); return entity->GetComponent<Ndk::CollisionComponent2D>().GetStaticBody();
return nullptr; return nullptr;
}; };
Nz::RigidBody2D* body_first{ QueryBody(first) }, body_second{ QueryBody(second) }; Nz::RigidBody2D* firstBody = FetchBody(first);
NazaraAssert(firstBody, "First entity has no CollisionComponent2D nor PhysicsComponent2D component");
NazaraAssert(body_first && body_second, "RigidBodies of CollisionComponent2D or PhysicsComponent2D must be valid"); Nz::RigidBody2D* secondBody = FetchBody(second);
NazaraAssert(secondBody, "Second entity has no CollisionComponent2D nor PhysicsComponent2D component");
Nz::ObjectRef<T> constraint = T::New(*body_first, *body_second, std::forward<Args>(args)...);
Nz::ObjectRef<T> constraint = T::New(*firstBody, *secondBody, std::forward<Args>(args)...);
m_constraints.push_back(constraint); m_constraints.push_back(constraint);
return constraint; return constraint;