diff --git a/assignment-client/src/AssignmentDynamic.cpp b/assignment-client/src/AssignmentDynamic.cpp index 026bc120bb..7adbd55c39 100644 --- a/assignment-client/src/AssignmentDynamic.cpp +++ b/assignment-client/src/AssignmentDynamic.cpp @@ -53,31 +53,3 @@ QVariantMap AssignmentDynamic::getArguments() { qDebug() << "UNEXPECTED -- AssignmentDynamic::getArguments called in assignment-client."; return QVariantMap(); } - -glm::vec3 AssignmentDynamic::getPosition() { - qDebug() << "UNEXPECTED -- AssignmentDynamic::getPosition called in assignment-client."; - return glm::vec3(0.0f); -} - -glm::quat AssignmentDynamic::getRotation() { - qDebug() << "UNEXPECTED -- AssignmentDynamic::getRotation called in assignment-client."; - return glm::quat(); -} - -glm::vec3 AssignmentDynamic::getLinearVelocity() { - qDebug() << "UNEXPECTED -- AssignmentDynamic::getLinearVelocity called in assignment-client."; - return glm::vec3(0.0f); -} - -void AssignmentDynamic::setLinearVelocity(glm::vec3 linearVelocity) { - qDebug() << "UNEXPECTED -- AssignmentDynamic::setLinearVelocity called in assignment-client."; -} - -glm::vec3 AssignmentDynamic::getAngularVelocity() { - qDebug() << "UNEXPECTED -- AssignmentDynamic::getAngularVelocity called in assignment-client."; - return glm::vec3(0.0f); -} - -void AssignmentDynamic::setAngularVelocity(glm::vec3 angularVelocity) { - qDebug() << "UNEXPECTED -- AssignmentDynamic::setAngularVelocity called in assignment-client."; -} diff --git a/assignment-client/src/AssignmentDynamic.h b/assignment-client/src/AssignmentDynamic.h index 604c418c13..d0fd72533f 100644 --- a/assignment-client/src/AssignmentDynamic.h +++ b/assignment-client/src/AssignmentDynamic.h @@ -39,13 +39,6 @@ private: QByteArray _data; protected: - virtual glm::vec3 getPosition() override; - virtual glm::quat getRotation() override; - virtual glm::vec3 getLinearVelocity() override; - virtual void setLinearVelocity(glm::vec3 linearVelocity) override; - virtual glm::vec3 getAngularVelocity() override; - virtual void setAngularVelocity(glm::vec3 angularVelocity) override; - bool _active; EntityItemWeakPointer _ownerEntity; }; diff --git a/libraries/physics/src/ObjectDynamic.cpp b/libraries/physics/src/ObjectDynamic.cpp index 253739375a..3deadd6468 100644 --- a/libraries/physics/src/ObjectDynamic.cpp +++ b/libraries/physics/src/ObjectDynamic.cpp @@ -160,56 +160,6 @@ btRigidBody* ObjectDynamic::getRigidBody() { return nullptr; } -glm::vec3 ObjectDynamic::getPosition() { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return glm::vec3(0.0f); - } - return bulletToGLM(rigidBody->getCenterOfMassPosition()); -} - -glm::quat ObjectDynamic::getRotation() { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return glm::quat(0.0f, 0.0f, 0.0f, 1.0f); - } - return bulletToGLM(rigidBody->getOrientation()); -} - -glm::vec3 ObjectDynamic::getLinearVelocity() { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return glm::vec3(0.0f); - } - return bulletToGLM(rigidBody->getLinearVelocity()); -} - -void ObjectDynamic::setLinearVelocity(glm::vec3 linearVelocity) { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return; - } - rigidBody->setLinearVelocity(glmToBullet(glm::vec3(0.0f))); - rigidBody->activate(); -} - -glm::vec3 ObjectDynamic::getAngularVelocity() { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return glm::vec3(0.0f); - } - return bulletToGLM(rigidBody->getAngularVelocity()); -} - -void ObjectDynamic::setAngularVelocity(glm::vec3 angularVelocity) { - auto rigidBody = getRigidBody(); - if (!rigidBody) { - return; - } - rigidBody->setAngularVelocity(glmToBullet(angularVelocity)); - rigidBody->activate(); -} - void ObjectDynamic::activateBody(bool forceActivation) { auto rigidBody = getRigidBody(); if (rigidBody) { diff --git a/libraries/physics/src/ObjectDynamic.h b/libraries/physics/src/ObjectDynamic.h index 582f47db77..7fdf2e323a 100644 --- a/libraries/physics/src/ObjectDynamic.h +++ b/libraries/physics/src/ObjectDynamic.h @@ -56,12 +56,6 @@ protected: btRigidBody* getOtherRigidBody(EntityItemID otherEntityID); EntityItemPointer getEntityByID(EntityItemID entityID) const; virtual btRigidBody* getRigidBody(); - virtual glm::vec3 getPosition() override; - virtual glm::quat getRotation() override; - virtual glm::vec3 getLinearVelocity() override; - virtual void setLinearVelocity(glm::vec3 linearVelocity) override; - virtual glm::vec3 getAngularVelocity() override; - virtual void setAngularVelocity(glm::vec3 angularVelocity) override; virtual void activateBody(bool forceActivation = false); virtual void forceBodyNonStatic();