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

Merge branch 'quiet-es-sim-spam' of github.com:sethalves/hifi into quiet-es-sim-spam

Browse source
This commit is contained in:
Seth Alves 2016-06-13 11:14:17 -07:00
commit fbd765ab41
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -613,6 +613,8 @@ uint32_t EntityMotionState::getIncomingDirtyFlags() {
// we add DIRTY_MOTION_TYPE if the body's motion type disagrees with entity velocity settings // we add DIRTY_MOTION_TYPE if the body's motion type disagrees with entity velocity settings
int bodyFlags = _body->getCollisionFlags(); int bodyFlags = _body->getCollisionFlags();
bool isMoving = _entity->isMovingRelativeToParent(); bool isMoving = _entity->isMovingRelativeToParent();
// XXX what's right, here?
if (((bodyFlags & btCollisionObject::CF_STATIC_OBJECT) && isMoving) // || if (((bodyFlags & btCollisionObject::CF_STATIC_OBJECT) && isMoving) // ||
// (bodyFlags & btCollisionObject::CF_KINEMATIC_OBJECT && !isMoving) // (bodyFlags & btCollisionObject::CF_KINEMATIC_OBJECT && !isMoving)
) { ) {

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

@ -75,7 +75,6 @@ void PhysicsEngine::addObjectToDynamicsWorld(ObjectMotionState* motionState) {
motionState->setMotionType(motionType); motionState->setMotionType(motionType);
switch(motionType) { switch(motionType) {
case MOTION_TYPE_KINEMATIC: { case MOTION_TYPE_KINEMATIC: {
qDebug() << " --> KINEMATIC";
if (!body) { if (!body) {
btCollisionShape* shape = motionState->getShape(); btCollisionShape* shape = motionState->getShape();
assert(shape); assert(shape);
@ -92,8 +91,6 @@ void PhysicsEngine::addObjectToDynamicsWorld(ObjectMotionState* motionState) {
break; break;
} }
case MOTION_TYPE_DYNAMIC: { case MOTION_TYPE_DYNAMIC: {
qDebug() << " --> DYNAMIC";
mass = motionState->getMass(); mass = motionState->getMass();
btCollisionShape* shape = motionState->getShape(); btCollisionShape* shape = motionState->getShape();
assert(shape); assert(shape);
@ -120,8 +117,6 @@ void PhysicsEngine::addObjectToDynamicsWorld(ObjectMotionState* motionState) {
} }
case MOTION_TYPE_STATIC: case MOTION_TYPE_STATIC:
default: { default: {
qDebug() << " --> STATIC";
if (!body) { if (!body) {
assert(motionState->getShape()); assert(motionState->getShape());
body = new btRigidBody(mass, motionState, motionState->getShape(), inertia); body = new btRigidBody(mass, motionState, motionState->getShape(), inertia);