Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:01:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui

Browse source
This commit is contained in:
howard-stearns 2016-06-21 16:52:22 -07:00
commit d6095d1f11
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/physics/src/EntityMotionState.cpp
View file

@ -135,7 +135,14 @@ void EntityMotionState::handleEasyChanges(uint32_t& flags) {
_nextOwnershipBid = 0; _nextOwnershipBid = 0;
} }
if ((flags & Simulation::DIRTY_PHYSICS_ACTIVATION) && !_body->isActive()) { if ((flags & Simulation::DIRTY_PHYSICS_ACTIVATION) && !_body->isActive()) {
_body->activate(); if (_body->isKinematicObject()) {
// only force activate kinematic bodies (dynamic shouldn't need force and
// active static bodies are special (see PhysicsEngine::_activeStaticBodies))
_body->activate(true);
_lastKinematicStep = ObjectMotionState::getWorldSimulationStep();
} else {
_body->activate();
}
} }
} }

1
plugins/hifiSpacemouse/src/SpacemouseManager.cpp
View file

@ -18,7 +18,6 @@
#include <UserActivityLogger.h> #include <UserActivityLogger.h>
#include <PathUtils.h> #include <PathUtils.h>
#include <plugins/PluginContainer.h>
#include <controllers/UserInputMapper.h> #include <controllers/UserInputMapper.h>
const QString SpacemouseManager::NAME { "Spacemouse" }; const QString SpacemouseManager::NAME { "Spacemouse" };