Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-27 23:49:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove setPosition and setRotation for actions because they were never finished and never used.

Browse source
This commit is contained in:
Seth Alves 2017-04-18 11:59:16 -07:00
parent d077c9f1de
commit 21ca767b7c
7 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/AssignmentDynamic.cpp
View file

@ -59,19 +59,11 @@ glm::vec3 AssignmentDynamic::getPosition() {
return glm::vec3(0.0f); return glm::vec3(0.0f);
} }
void AssignmentDynamic::setPosition(glm::vec3 position) {
qDebug() << "UNEXPECTED -- AssignmentDynamic::setPosition called in assignment-client.";
}
glm::quat AssignmentDynamic::getRotation() { glm::quat AssignmentDynamic::getRotation() {
qDebug() << "UNEXPECTED -- AssignmentDynamic::getRotation called in assignment-client."; qDebug() << "UNEXPECTED -- AssignmentDynamic::getRotation called in assignment-client.";
return glm::quat(); return glm::quat();
} }
void AssignmentDynamic::setRotation(glm::quat rotation) {
qDebug() << "UNEXPECTED -- AssignmentDynamic::setRotation called in assignment-client.";
}
glm::vec3 AssignmentDynamic::getLinearVelocity() { glm::vec3 AssignmentDynamic::getLinearVelocity() {
qDebug() << "UNEXPECTED -- AssignmentDynamic::getLinearVelocity called in assignment-client."; qDebug() << "UNEXPECTED -- AssignmentDynamic::getLinearVelocity called in assignment-client.";
return glm::vec3(0.0f); return glm::vec3(0.0f);

2
assignment-client/src/AssignmentDynamic.h
View file

@ -38,9 +38,7 @@ private:
protected: protected:
virtual glm::vec3 getPosition() override; virtual glm::vec3 getPosition() override;
virtual void setPosition(glm::vec3 position) override;
virtual glm::quat getRotation() override; virtual glm::quat getRotation() override;
virtual void setRotation(glm::quat rotation) override;
virtual glm::vec3 getLinearVelocity() override; virtual glm::vec3 getLinearVelocity() override;
virtual void setLinearVelocity(glm::vec3 linearVelocity) override; virtual void setLinearVelocity(glm::vec3 linearVelocity) override;
virtual glm::vec3 getAngularVelocity() override; virtual glm::vec3 getAngularVelocity() override;

4
libraries/entities/src/EntityDynamicInterface.h
View file

@ -87,9 +87,9 @@ public:
protected: protected:
virtual glm::vec3 getPosition() = 0; 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 glm::quat getRotation() = 0;
virtual void setRotation(glm::quat rotation) = 0; // virtual void setRotation(glm::quat rotation) = 0;
virtual glm::vec3 getLinearVelocity() = 0; virtual glm::vec3 getLinearVelocity() = 0;
virtual void setLinearVelocity(glm::vec3 linearVelocity) = 0; virtual void setLinearVelocity(glm::vec3 linearVelocity) = 0;
virtual glm::vec3 getAngularVelocity() = 0; virtual glm::vec3 getAngularVelocity() = 0;

1
libraries/physics/src/ObjectConstraintHinge.cpp
View file

@ -73,7 +73,6 @@ void ObjectConstraintHinge::updateHinge() {
constraint->setLimit(low, high, softness, biasFactor, relaxationFactor); constraint->setLimit(low, high, softness, biasFactor, relaxationFactor);
if (motorVelocity != 0.0f) { if (motorVelocity != 0.0f) {
qDebug() << "setting motor velocity on" << _tag << "to" << motorVelocity;
constraint->setMotorTargetVelocity(motorVelocity); constraint->setMotorTargetVelocity(motorVelocity);
constraint->enableMotor(true); constraint->enableMotor(true);
} else { } else {

4
libraries/physics/src/ObjectConstraintHinge.h
View file

@ -42,8 +42,8 @@ protected:
glm::vec3 _pivotInB; glm::vec3 _pivotInB;
glm::vec3 _axisInB; glm::vec3 _axisInB;
float _low { -2 * PI }; float _low { -2.0f * PI };
float _high { 2 * PI }; float _high { 2.0f * PI };
float _softness { 0.9f }; float _softness { 0.9f };
float _biasFactor { 0.3f }; float _biasFactor { 0.3f };
float _relaxationFactor { 1.0f }; float _relaxationFactor { 1.0f };

22
libraries/physics/src/ObjectDynamic.cpp
View file

@ -147,17 +147,6 @@ glm::vec3 ObjectDynamic::getPosition() {
return bulletToGLM(rigidBody->getCenterOfMassPosition()); 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() { glm::quat ObjectDynamic::getRotation() {
auto rigidBody = getRigidBody(); auto rigidBody = getRigidBody();
if (!rigidBody) { if (!rigidBody) {
@ -166,17 +155,6 @@ glm::quat ObjectDynamic::getRotation() {
return bulletToGLM(rigidBody->getOrientation()); 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() { glm::vec3 ObjectDynamic::getLinearVelocity() {
auto rigidBody = getRigidBody(); auto rigidBody = getRigidBody();
if (!rigidBody) { if (!rigidBody) {

2
libraries/physics/src/ObjectDynamic.h
View file

@ -55,9 +55,7 @@ protected:
EntityItemPointer getEntityByID(EntityItemID entityID) const; EntityItemPointer getEntityByID(EntityItemID entityID) const;
virtual btRigidBody* getRigidBody(); virtual btRigidBody* getRigidBody();
virtual glm::vec3 getPosition() override; virtual glm::vec3 getPosition() override;
virtual void setPosition(glm::vec3 position) override;
virtual glm::quat getRotation() override; virtual glm::quat getRotation() override;
virtual void setRotation(glm::quat rotation) override;
virtual glm::vec3 getLinearVelocity() override; virtual glm::vec3 getLinearVelocity() override;
virtual void setLinearVelocity(glm::vec3 linearVelocity) override; virtual void setLinearVelocity(glm::vec3 linearVelocity) override;
virtual glm::vec3 getAngularVelocity() override; virtual glm::vec3 getAngularVelocity() override;