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

Physics2D/PhysWorld2D: Fix NearestBodyQuery

This commit is contained in:
Lynix 2017-03-02 11:22:59 +01:00
parent 834f65c0ae
commit a50a822fad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Physics2D/PhysWorld2D.hpp
View File

@ -41,7 +41,7 @@ namespace Nz
cpSpace* GetHandle() const; cpSpace* GetHandle() const;
float GetStepSize() const; float GetStepSize() const;
bool NearestBodyQuery(const Vector2f& from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, RigidBody2D* nearestBody); bool NearestBodyQuery(const Vector2f& from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, RigidBody2D** nearestBody);
bool NearestBodyQuery(const Vector2f& from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, NearestQueryResult* result); bool NearestBodyQuery(const Vector2f& from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, NearestQueryResult* result);
void RegisterCallbacks(unsigned int collisionId, const Callback& callbacks); void RegisterCallbacks(unsigned int collisionId, const Callback& callbacks);

4
src/Nazara/Physics2D/PhysWorld2D.cpp
View File

@ -37,14 +37,14 @@ namespace Nz
return m_stepSize; return m_stepSize;
} }
bool PhysWorld2D::NearestBodyQuery(const Vector2f & from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, RigidBody2D* nearestBody) bool PhysWorld2D::NearestBodyQuery(const Vector2f & from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, RigidBody2D** nearestBody)
{ {
cpShapeFilter filter = cpShapeFilterNew(collisionGroup, categoryMask, collisionMask); cpShapeFilter filter = cpShapeFilterNew(collisionGroup, categoryMask, collisionMask);
if (cpShape* shape = cpSpacePointQueryNearest(m_handle, {from.x, from.y}, maxDistance, filter, nullptr)) if (cpShape* shape = cpSpacePointQueryNearest(m_handle, {from.x, from.y}, maxDistance, filter, nullptr))
{ {
if (nearestBody) if (nearestBody)
nearestBody = static_cast<Nz::RigidBody2D*>(cpShapeGetUserData(shape)); *nearestBody = static_cast<Nz::RigidBody2D*>(cpShapeGetUserData(shape));
return true; return true;
} }