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

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Lynix 2017-03-02 13:07:14 +01:00
parent 8eb58de486 04f7b40150
commit ad8857354f
2 changed files with 6 additions and 1 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 = nullptr);
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);

5
src/Nazara/Physics2D/RigidBody2D.cpp
View File

@ -61,6 +61,8 @@ namespace Nz
m_mass(object.m_mass) m_mass(object.m_mass)
{ {
cpBodySetUserData(m_handle, this); cpBodySetUserData(m_handle, this);
for (cpShape* shape : m_shapes)
cpShapeSetUserData(shape, this);
object.m_handle = nullptr; object.m_handle = nullptr;
@ -312,6 +314,8 @@ namespace Nz
m_world = object.m_world; m_world = object.m_world;
cpBodySetUserData(m_handle, this); cpBodySetUserData(m_handle, this);
for (cpShape* shape : m_shapes)
cpShapeSetUserData(shape, this);
object.m_handle = nullptr; object.m_handle = nullptr;
@ -324,6 +328,7 @@ namespace Nz
{ {
m_handle = cpBodyNew(mass, moment); m_handle = cpBodyNew(mass, moment);
cpBodySetUserData(m_handle, this); cpBodySetUserData(m_handle, this);
cpSpaceAddBody(m_world->GetHandle(), m_handle); cpSpaceAddBody(m_world->GetHandle(), m_handle);
} }