From cb37b884d2a7806001940beb3da15d3ee9d6b808 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Sun, 3 May 2015 09:26:49 -0700 Subject: [PATCH] add ObjectMotionState::getObjectID() --- libraries/physics/src/EntityMotionState.h | 2 ++ libraries/physics/src/ObjectMotionState.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h index 43e1f64c82..d407fd8ae8 100644 --- a/libraries/physics/src/EntityMotionState.h +++ b/libraries/physics/src/EntityMotionState.h @@ -67,6 +67,8 @@ public: virtual const glm::vec3& getObjectAngularVelocity() const { return _entity->getAngularVelocity(); } virtual const glm::vec3& getObjectGravity() const { return _entity->getGravity(); } + virtual const QUuid& getObjectID() const { return _entity->getID(); } + virtual void bump(); EntityItem* getEntity() const { return _entity; } diff --git a/libraries/physics/src/ObjectMotionState.h b/libraries/physics/src/ObjectMotionState.h index e885d46046..d0dc9afc88 100644 --- a/libraries/physics/src/ObjectMotionState.h +++ b/libraries/physics/src/ObjectMotionState.h @@ -114,6 +114,8 @@ public: virtual const glm::vec3& getObjectAngularVelocity() const = 0; virtual const glm::vec3& getObjectGravity() const = 0; + virtual const QUuid& getObjectID() const = 0; + virtual void bump() = 0; friend class PhysicsEngine;