From f79e032841bb01e65a1294318ca4a8ce7f24ecc7 Mon Sep 17 00:00:00 2001 From: trent Date: Tue, 2 May 2017 14:48:27 -0400 Subject: [PATCH] Silly online git merge tool. You are silly. Errors fixed. --- interface/src/avatar/Avatar.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index 1adc83a9f4..867ccde68c 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -234,6 +234,18 @@ public: bool hasNewJointData() const { return _hasNewJointData; } + float getBoundingRadius() const; + + void addToScene(AvatarSharedPointer self, const render::ScenePointer& scene); + void ensureInScene(AvatarSharedPointer self, const render::ScenePointer& scene); + bool isInScene() const { return render::Item::isValidID(_renderItemID); } + bool isMoving() const { return _moving; } + + //void setMotionState(AvatarMotionState* motionState); + void setPhysicsCallback(AvatarPhysicsCallback cb); + void addPhysicsFlags(uint32_t flags); + bool isInPhysicsSimulation() const { return _physicsCallback != nullptr; } + public slots: // FIXME - these should be migrated to use Pose data instead