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

Physics3D/PhysWorld3D: Remove const from argument in BodyIterator

This commit is contained in:
Lynix 2018-03-26 20:21:50 +02:00
parent 554fcd6492
commit 7f1419b34e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Physics3D/PhysWorld3D.hpp
View File

@ -27,7 +27,7 @@ namespace Nz
class NAZARA_PHYSICS3D_API PhysWorld3D class NAZARA_PHYSICS3D_API PhysWorld3D
{ {
public: public:
using BodyIterator = std::function<bool(const RigidBody3D& body)>; using BodyIterator = std::function<bool(RigidBody3D& body)>;
using AABBOverlapCallback = std::function<bool(const RigidBody3D& firstBody, const RigidBody3D& secondBody)>; using AABBOverlapCallback = std::function<bool(const RigidBody3D& firstBody, const RigidBody3D& secondBody)>;
using CollisionCallback = std::function<bool(const RigidBody3D& firstBody, const RigidBody3D& secondBody)>; using CollisionCallback = std::function<bool(const RigidBody3D& firstBody, const RigidBody3D& secondBody)>;

3
src/Nazara/Physics3D/PhysWorld3D.cpp
View File

@ -42,8 +42,7 @@ namespace Nz
auto NewtonCallback = [](const NewtonBody* const body, void* const userdata) -> int auto NewtonCallback = [](const NewtonBody* const body, void* const userdata) -> int
{ {
const BodyIterator& bodyIterator = *static_cast<BodyIterator*>(userdata); const BodyIterator& bodyIterator = *static_cast<BodyIterator*>(userdata);
RigidBody3D* nzBody = static_cast<RigidBody3D*>(NewtonBodyGetUserData(body)); return bodyIterator(*static_cast<RigidBody3D*>(NewtonBodyGetUserData(body)));
return bodyIterator(*nzBody);
}; };
NewtonWorldForEachBodyInAABBDo(m_world, box.GetMinimum(), box.GetMaximum(), NewtonCallback, const_cast<void*>(static_cast<const void*>(&iterator))); NewtonWorldForEachBodyInAABBDo(m_world, box.GetMinimum(), box.GetMaximum(), NewtonCallback, const_cast<void*>(static_cast<const void*>(&iterator)));