From 3d531e8304b99aa9923088268b8e67e10b427b1e Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 10 Mar 2015 14:24:49 -0700 Subject: [PATCH 1/2] add f at end of float literal --- libraries/physics/src/PhysicsEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 66f8afb226..634c3707a8 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -616,7 +616,7 @@ void PhysicsEngine::setAvatarData(AvatarData *avatarData) { glmToBullet(_avatarData->getPosition()))); // XXX these values should be computed from the character model. - btScalar characterRadius = 0.3; + btScalar characterRadius = 0.3f; btScalar characterHeight = 1.75 - 2.0f * characterRadius; btScalar stepHeight = btScalar(0.35); From 503afc8c7324c971e45db608fa1ef3f5b1e25be0 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 10 Mar 2015 14:26:19 -0700 Subject: [PATCH 2/2] erase deleted entities from pending sort list --- libraries/entities/src/EntitySimulation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp index 758cd6771a..b093dbe4f4 100644 --- a/libraries/entities/src/EntitySimulation.cpp +++ b/libraries/entities/src/EntitySimulation.cpp @@ -99,10 +99,11 @@ void EntitySimulation::sortEntitiesThatMoved() { _mortalEntities.remove(entity); _updateableEntities.remove(entity); removeEntityInternal(entity); + itemItr = _entitiesToBeSorted.erase(itemItr); } else { moveOperator.addEntityToMoveList(entity, newCube); + ++itemItr; } - ++itemItr; } if (moveOperator.hasMovingEntities()) { PerformanceTimer perfTimer("recurseTreeWithOperator");