From 8e61a10bcf365c24924a635c8ad2c48d8f4ca30f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 3 Jun 2015 14:22:48 -0700 Subject: [PATCH] compute collision group for entity --- libraries/physics/src/EntityMotionState.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 9bac73c945..f2c86edd1f 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -521,5 +521,13 @@ QString EntityMotionState::getName() { // virtual int16_t EntityMotionState::computeCollisionGroup() { + switch (computeObjectMotionType()){ + case MOTION_TYPE_STATIC: + return COLLISION_GROUP_STATIC; + case MOTION_TYPE_KINEMATIC: + return COLLISION_GROUP_KINEMATIC; + default: + break; + } return COLLISION_GROUP_DEFAULT; }