From 21ca767b7c605fb908258f59b071635f97ebcf71 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 18 Apr 2017 11:59:16 -0700 Subject: [PATCH] remove setPosition and setRotation for actions because they were never finished and never used. --- assignment-client/src/AssignmentDynamic.cpp | 8 ------- assignment-client/src/AssignmentDynamic.h | 2 -- .../entities/src/EntityDynamicInterface.h | 4 ++-- .../physics/src/ObjectConstraintHinge.cpp | 1 - libraries/physics/src/ObjectConstraintHinge.h | 4 ++-- libraries/physics/src/ObjectDynamic.cpp | 22 ------------------- libraries/physics/src/ObjectDynamic.h | 2 -- 7 files changed, 4 insertions(+), 39 deletions(-) diff --git a/assignment-client/src/AssignmentDynamic.cpp b/assignment-client/src/AssignmentDynamic.cpp index c9b8d3d8c4..026bc120bb 100644 --- a/assignment-client/src/AssignmentDynamic.cpp +++ b/assignment-client/src/AssignmentDynamic.cpp @@ -59,19 +59,11 @@ glm::vec3 AssignmentDynamic::getPosition() { return glm::vec3(0.0f); } -void AssignmentDynamic::setPosition(glm::vec3 position) { - qDebug() << "UNEXPECTED -- AssignmentDynamic::setPosition called in assignment-client."; -} - glm::quat AssignmentDynamic::getRotation() { qDebug() << "UNEXPECTED -- AssignmentDynamic::getRotation called in assignment-client."; return glm::quat(); } -void AssignmentDynamic::setRotation(glm::quat rotation) { - qDebug() << "UNEXPECTED -- AssignmentDynamic::setRotation called in assignment-client."; -} - glm::vec3 AssignmentDynamic::getLinearVelocity() { qDebug() << "UNEXPECTED -- AssignmentDynamic::getLinearVelocity called in assignment-client."; return glm::vec3(0.0f); diff --git a/assignment-client/src/AssignmentDynamic.h b/assignment-client/src/AssignmentDynamic.h index 91a1e15ebc..35db8b1524 100644 --- a/assignment-client/src/AssignmentDynamic.h +++ b/assignment-client/src/AssignmentDynamic.h @@ -38,9 +38,7 @@ private: protected: virtual glm::vec3 getPosition() override; - virtual void setPosition(glm::vec3 position) override; virtual glm::quat getRotation() override; - virtual void setRotation(glm::quat rotation) override; virtual glm::vec3 getLinearVelocity() override; virtual void setLinearVelocity(glm::vec3 linearVelocity) override; virtual glm::vec3 getAngularVelocity() override; diff --git a/libraries/entities/src/EntityDynamicInterface.h b/libraries/entities/src/EntityDynamicInterface.h index 900c5554a4..93d9ffa43e 100644 --- a/libraries/entities/src/EntityDynamicInterface.h +++ b/libraries/entities/src/EntityDynamicInterface.h @@ -87,9 +87,9 @@ public: protected: virtual glm::vec3 getPosition() = 0; - virtual void setPosition(glm::vec3 position) = 0; + // virtual void setPosition(glm::vec3 position) = 0; virtual glm::quat getRotation() = 0; - virtual void setRotation(glm::quat rotation) = 0; + // virtual void setRotation(glm::quat rotation) = 0; virtual glm::vec3 getLinearVelocity() = 0; virtual void setLinearVelocity(glm::vec3 linearVelocity) = 0; virtual glm::vec3 getAngularVelocity() = 0; diff --git a/libraries/physics/src/ObjectConstraintHinge.cpp b/libraries/physics/src/ObjectConstraintHinge.cpp index 6d609493d5..6c55d9c5dd 100644 --- a/libraries/physics/src/ObjectConstraintHinge.cpp +++ b/libraries/physics/src/ObjectConstraintHinge.cpp @@ -73,7 +73,6 @@ void ObjectConstraintHinge::updateHinge() { constraint->setLimit(low, high, softness, biasFactor, relaxationFactor); if (motorVelocity != 0.0f) { - qDebug() << "setting motor velocity on" << _tag << "to" << motorVelocity; constraint->setMotorTargetVelocity(motorVelocity); constraint->enableMotor(true); } else { diff --git a/libraries/physics/src/ObjectConstraintHinge.h b/libraries/physics/src/ObjectConstraintHinge.h index 28665dffe7..7d2cac7511 100644 --- a/libraries/physics/src/ObjectConstraintHinge.h +++ b/libraries/physics/src/ObjectConstraintHinge.h @@ -42,8 +42,8 @@ protected: glm::vec3 _pivotInB; glm::vec3 _axisInB; - float _low { -2 * PI }; - float _high { 2 * PI }; + float _low { -2.0f * PI }; + float _high { 2.0f * PI }; float _softness { 0.9f }; float _biasFactor { 0.3f }; float _relaxationFactor { 1.0f }; diff --git a/libraries/physics/src/ObjectDynamic.cpp b/libraries/physics/src/ObjectDynamic.cpp index 3e5c9f3f9b..3cb9f5b405 100644 --- a/libraries/physics/src/ObjectDynamic.cpp +++ b/libraries/physics/src/ObjectDynamic.cpp @@ -147,17 +147,6 @@ glm::vec3 ObjectDynamic::getPosition() { return bulletToGLM(rigidBody->getCenterOfMassPosition()); } -void ObjectDynamic::setPosition(glm::vec3 position) { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return; - } - // XXX - // void setWorldTransform (const btTransform &worldTrans) - assert(false); - rigidBody->activate(); -} - glm::quat ObjectDynamic::getRotation() { auto rigidBody = getRigidBody(); if (!rigidBody) { @@ -166,17 +155,6 @@ glm::quat ObjectDynamic::getRotation() { return bulletToGLM(rigidBody->getOrientation()); } -void ObjectDynamic::setRotation(glm::quat rotation) { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return; - } - // XXX - // void setWorldTransform (const btTransform &worldTrans) - assert(false); - rigidBody->activate(); -} - glm::vec3 ObjectDynamic::getLinearVelocity() { auto rigidBody = getRigidBody(); if (!rigidBody) { diff --git a/libraries/physics/src/ObjectDynamic.h b/libraries/physics/src/ObjectDynamic.h index 6ea90bdba0..dcd0103a55 100644 --- a/libraries/physics/src/ObjectDynamic.h +++ b/libraries/physics/src/ObjectDynamic.h @@ -55,9 +55,7 @@ protected: EntityItemPointer getEntityByID(EntityItemID entityID) const; virtual btRigidBody* getRigidBody(); virtual glm::vec3 getPosition() override; - virtual void setPosition(glm::vec3 position) override; virtual glm::quat getRotation() override; - virtual void setRotation(glm::quat rotation) override; virtual glm::vec3 getLinearVelocity() override; virtual void setLinearVelocity(glm::vec3 linearVelocity) override; virtual glm::vec3 getAngularVelocity() override;