Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename method to clarify where it is called

Browse source
This commit is contained in:
Andrew Meadows 2017-05-25 13:48:19 -07:00
parent 3bd0c111d7
commit c22e4ef883
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -130,7 +130,7 @@ void PhysicalEntitySimulation::clearEntitiesInternal() {
} }
// then remove the objects (aka MotionStates) from physics // then remove the objects (aka MotionStates) from physics
_physicsEngine->removeObjects(_physicalObjects); _physicsEngine->removeSetOfObjects(_physicalObjects);
// delete the MotionStates // delete the MotionStates
// TODO: after we invert the entities/physics lib dependencies we will let EntityItem delete // TODO: after we invert the entities/physics lib dependencies we will let EntityItem delete

2
libraries/physics/src/PhysicsEngine.cpp
View file

@ -207,7 +207,7 @@ void PhysicsEngine::removeObjects(const VectorOfMotionStates& objects) {
} }
// Same as above, but takes a Set instead of a Vector. Should only be called during teardown. // Same as above, but takes a Set instead of a Vector. Should only be called during teardown.
void PhysicsEngine::removeObjects(const SetOfMotionStates& objects) { void PhysicsEngine::removeSetOfObjects(const SetOfMotionStates& objects) {
_contactMap.clear(); _contactMap.clear();
for (auto object : objects) { for (auto object : objects) {
btRigidBody* body = object->getRigidBody(); btRigidBody* body = object->getRigidBody();

2
libraries/physics/src/PhysicsEngine.h
View file

@ -53,7 +53,7 @@ public:
uint32_t getNumSubsteps(); uint32_t getNumSubsteps();
void removeObjects(const VectorOfMotionStates& objects); void removeObjects(const VectorOfMotionStates& objects);
void removeObjects(const SetOfMotionStates& objects); // only called during teardown void removeSetOfObjects(const SetOfMotionStates& objects); // only called during teardown
void addObjects(const VectorOfMotionStates& objects); void addObjects(const VectorOfMotionStates& objects);
VectorOfMotionStates changeObjects(const VectorOfMotionStates& objects); VectorOfMotionStates changeObjects(const VectorOfMotionStates& objects);