From 01e14eec471cb65eb6aa8bb97851b69e52c490d5 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 24 Jan 2017 12:09:03 -0800 Subject: [PATCH] remove commented out cruft --- interface/src/avatar/AvatarManager.cpp | 17 ----------------- interface/src/avatar/AvatarManager.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 73f3fb0f38..fe0b49728b 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -467,23 +467,6 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents } } -/* -void AvatarManager::addAvatarToSimulation(Avatar* avatar) { - assert(!avatar->getMotionState()); - - ShapeInfo shapeInfo; - avatar->computeShapeInfo(shapeInfo); - btCollisionShape* shape = const_cast(ObjectMotionState::getShapeManager()->getShape(shapeInfo)); - if (shape) { - // we don't add to the simulation now, we put it on a list to be added later - AvatarMotionState* motionState = new AvatarMotionState(avatar, shape); - avatar->setMotionState(motionState); - _motionStatesToAddToPhysics.insert(motionState); - _motionStatesThatMightUpdate.insert(motionState); - } -} -*/ - void AvatarManager::updateAvatarRenderStatus(bool shouldRenderAvatars) { if (DependencyManager::get()->shouldRenderAvatars()) { for (auto avatarData : _avatarHash) { diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index efb01e071f..817a3e580f 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -69,8 +69,6 @@ public: void handleOutgoingChanges(const VectorOfMotionStates& motionStates); void handleCollisionEvents(const CollisionEvents& collisionEvents); - //void addAvatarToSimulation(Avatar* avatar); - Q_INVOKABLE RayToAvatarIntersectionResult findRayIntersection(const PickRay& ray, const QScriptValue& avatarIdsToInclude = QScriptValue(), const QScriptValue& avatarIdsToDiscard = QScriptValue());