History

Merge pull request #9609 from sethalves/tablet-ui-fix-equipping

don't send AVATAR_SELF_ID over wire

Chris Collins committed 9 years ago

Commit 194fd922 parents 1c7c0f7 aaefc554 files · +48 −20Browse files

Showing the changes to libraries/physics/src/EntityMotionState.cpp (1 of 4 files). Show all

Unified · Split

libraries/physics/src/EntityMotionState.cpp+3−6
@@ -199,15 +199,12 @@ void EntityMotionState::getWorldTransform(btTransform& worldTrans) const { · 198 unmodified lines
199199 return;
200200 }
201201 assert(entityTreeIsLocked());
202− if (_motionType == MOTION_TYPE_KINEMATIC) {
202+ if (_motionType == MOTION_TYPE_KINEMATIC && !_entity->hasAncestorOfType(NestableType::Avatar)) {
203203 BT_PROFILE("kinematicIntegration");
204204 // This is physical kinematic motion which steps strictly by the subframe count
205205 // of the physics simulation and uses full gravity for acceleration.
206− if (_entity->hasAncestorOfType(NestableType::Avatar)) {
207− _entity->setAcceleration(glm::vec3(0.0f));
208− } else {
209− _entity->setAcceleration(_entity->getGravity());
210− }
206+ _entity->setAcceleration(_entity->getGravity());
207+
211208 uint32_t thisStep = ObjectMotionState::getWorldSimulationStep();
212209 float dt = (thisStep - _lastKinematicStep) * PHYSICS_ENGINE_FIXED_SUBSTEP;
213210 _entity->stepKinematicMotion(dt);