From 77bd7b2821162fa9c5602c7eb6bbdbbf7cb6e816 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 7 Jul 2015 15:56:16 -0700 Subject: [PATCH] some ObjectAction methods should be const --- assignment-client/src/AssignmentAction.cpp | 2 +- assignment-client/src/AssignmentAction.h | 4 ++-- interface/src/avatar/AvatarActionHold.cpp | 5 ++--- interface/src/avatar/AvatarActionHold.h | 2 +- libraries/entities/src/EntityActionInterface.h | 4 ++-- libraries/physics/src/ObjectAction.cpp | 8 ++++---- libraries/physics/src/ObjectAction.h | 4 ++-- libraries/physics/src/ObjectActionOffset.cpp | 2 +- libraries/physics/src/ObjectActionOffset.h | 4 ++-- libraries/physics/src/ObjectActionSpring.cpp | 2 +- libraries/physics/src/ObjectActionSpring.h | 4 ++-- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/assignment-client/src/AssignmentAction.cpp b/assignment-client/src/AssignmentAction.cpp index 6cb3c06312..8be00f53bd 100644 --- a/assignment-client/src/AssignmentAction.cpp +++ b/assignment-client/src/AssignmentAction.cpp @@ -28,7 +28,7 @@ void AssignmentAction::removeFromSimulation(EntitySimulation* simulation) const simulation->removeAction(_id); } -QByteArray AssignmentAction::serialize() { +QByteArray AssignmentAction::serialize() const { return _data; } diff --git a/assignment-client/src/AssignmentAction.h b/assignment-client/src/AssignmentAction.h index cd72c1f277..cccecd5da5 100644 --- a/assignment-client/src/AssignmentAction.h +++ b/assignment-client/src/AssignmentAction.h @@ -25,14 +25,14 @@ public: virtual ~AssignmentAction(); const QUuid& getID() const { return _id; } - virtual EntityActionType getType() { return _type; } + virtual EntityActionType getType() const { return _type; } virtual void removeFromSimulation(EntitySimulation* simulation) const; virtual EntityItemWeakPointer getOwnerEntity() const { return _ownerEntity; } virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; } virtual bool updateArguments(QVariantMap arguments); virtual QVariantMap getArguments(); - virtual QByteArray serialize(); + virtual QByteArray serialize() const; virtual void deserialize(QByteArray serializedArguments); private: diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp index 918521c0da..85e7067611 100644 --- a/interface/src/avatar/AvatarActionHold.cpp +++ b/interface/src/avatar/AvatarActionHold.cpp @@ -166,8 +166,7 @@ QVariantMap AvatarActionHold::getArguments() { void AvatarActionHold::deserialize(QByteArray serializedArguments) { - if (_mine) { - return; + if (!_mine) { + ObjectActionSpring::deserialize(serializedArguments); } - ObjectActionSpring::deserialize(serializedArguments); } diff --git a/interface/src/avatar/AvatarActionHold.h b/interface/src/avatar/AvatarActionHold.h index a47f1ce05d..e5aa0f1ccf 100644 --- a/interface/src/avatar/AvatarActionHold.h +++ b/interface/src/avatar/AvatarActionHold.h @@ -22,7 +22,7 @@ public: AvatarActionHold(EntityActionType type, QUuid id, EntityItemPointer ownerEntity); virtual ~AvatarActionHold(); - virtual EntityActionType getType() { return ACTION_TYPE_HOLD; } + virtual EntityActionType getType() const { return ACTION_TYPE_HOLD; } virtual bool updateArguments(QVariantMap arguments); virtual QVariantMap getArguments(); diff --git a/libraries/entities/src/EntityActionInterface.h b/libraries/entities/src/EntityActionInterface.h index 5693e1fb6f..a543b65f40 100644 --- a/libraries/entities/src/EntityActionInterface.h +++ b/libraries/entities/src/EntityActionInterface.h @@ -32,7 +32,7 @@ public: EntityActionInterface() { } virtual ~EntityActionInterface() { } virtual const QUuid& getID() const = 0; - virtual EntityActionType getType() { assert(false); return ACTION_TYPE_NONE; } + virtual EntityActionType getType() const { assert(false); return ACTION_TYPE_NONE; } virtual void removeFromSimulation(EntitySimulation* simulation) const = 0; virtual EntityItemWeakPointer getOwnerEntity() const = 0; @@ -40,7 +40,7 @@ public: virtual bool updateArguments(QVariantMap arguments) = 0; virtual QVariantMap getArguments() = 0; - virtual QByteArray serialize() = 0; + virtual QByteArray serialize() const = 0; virtual void deserialize(QByteArray serializedArguments) = 0; static EntityActionType actionTypeFromString(QString actionTypeString); diff --git a/libraries/physics/src/ObjectAction.cpp b/libraries/physics/src/ObjectAction.cpp index ae29fe79d3..2dbfba0413 100644 --- a/libraries/physics/src/ObjectAction.cpp +++ b/libraries/physics/src/ObjectAction.cpp @@ -24,15 +24,15 @@ ObjectAction::~ObjectAction() { } void ObjectAction::updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) { - if (!_active) { - return; - } if (_ownerEntity.expired()) { qDebug() << "warning -- action with no entity removing self from btCollisionWorld."; btDynamicsWorld* dynamicsWorld = static_cast(collisionWorld); dynamicsWorld->removeAction(this); return; } + if (!_active) { + return; + } updateActionWorker(deltaTimeStep); } @@ -129,7 +129,7 @@ void ObjectAction::setAngularVelocity(glm::vec3 angularVelocity) { rigidBody->activate(); } -QByteArray ObjectAction::serialize() { +QByteArray ObjectAction::serialize() const { assert(false); return QByteArray(); } diff --git a/libraries/physics/src/ObjectAction.h b/libraries/physics/src/ObjectAction.h index 0e982aaacf..928eb6d3a4 100644 --- a/libraries/physics/src/ObjectAction.h +++ b/libraries/physics/src/ObjectAction.h @@ -30,7 +30,7 @@ public: virtual ~ObjectAction(); const QUuid& getID() const { return _id; } - virtual EntityActionType getType() { assert(false); return ACTION_TYPE_NONE; } + virtual EntityActionType getType() const { assert(false); return ACTION_TYPE_NONE; } virtual void removeFromSimulation(EntitySimulation* simulation) const; virtual EntityItemWeakPointer getOwnerEntity() const { return _ownerEntity; } virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; } @@ -45,7 +45,7 @@ public: virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep); virtual void debugDraw(btIDebugDraw* debugDrawer); - virtual QByteArray serialize(); + virtual QByteArray serialize() const; virtual void deserialize(QByteArray serializedArguments); private: diff --git a/libraries/physics/src/ObjectActionOffset.cpp b/libraries/physics/src/ObjectActionOffset.cpp index 22c6b7e0d3..b03cd43876 100644 --- a/libraries/physics/src/ObjectActionOffset.cpp +++ b/libraries/physics/src/ObjectActionOffset.cpp @@ -127,7 +127,7 @@ QVariantMap ObjectActionOffset::getArguments() { return arguments; } -QByteArray ObjectActionOffset::serialize() { +QByteArray ObjectActionOffset::serialize() const { QByteArray ba; QDataStream dataStream(&ba, QIODevice::WriteOnly); dataStream << getType(); diff --git a/libraries/physics/src/ObjectActionOffset.h b/libraries/physics/src/ObjectActionOffset.h index 28a08c2efe..b58d943b2d 100644 --- a/libraries/physics/src/ObjectActionOffset.h +++ b/libraries/physics/src/ObjectActionOffset.h @@ -22,14 +22,14 @@ public: ObjectActionOffset(EntityActionType type, QUuid id, EntityItemPointer ownerEntity); virtual ~ObjectActionOffset(); - virtual EntityActionType getType() { return ACTION_TYPE_OFFSET; } + virtual EntityActionType getType() const { return ACTION_TYPE_OFFSET; } virtual bool updateArguments(QVariantMap arguments); virtual QVariantMap getArguments(); virtual void updateActionWorker(float deltaTimeStep); - virtual QByteArray serialize(); + virtual QByteArray serialize() const; virtual void deserialize(QByteArray serializedArguments); private: diff --git a/libraries/physics/src/ObjectActionSpring.cpp b/libraries/physics/src/ObjectActionSpring.cpp index fae593f3eb..e7d841664d 100644 --- a/libraries/physics/src/ObjectActionSpring.cpp +++ b/libraries/physics/src/ObjectActionSpring.cpp @@ -206,7 +206,7 @@ QVariantMap ObjectActionSpring::getArguments() { return arguments; } -QByteArray ObjectActionSpring::serialize() { +QByteArray ObjectActionSpring::serialize() const { QByteArray serializedActionArguments; QDataStream dataStream(&serializedActionArguments, QIODevice::WriteOnly); diff --git a/libraries/physics/src/ObjectActionSpring.h b/libraries/physics/src/ObjectActionSpring.h index c887a046bb..d45bc78f10 100644 --- a/libraries/physics/src/ObjectActionSpring.h +++ b/libraries/physics/src/ObjectActionSpring.h @@ -22,14 +22,14 @@ public: ObjectActionSpring(EntityActionType type, QUuid id, EntityItemPointer ownerEntity); virtual ~ObjectActionSpring(); - virtual EntityActionType getType() { return ACTION_TYPE_SPRING; } + virtual EntityActionType getType() const { return ACTION_TYPE_SPRING; } virtual bool updateArguments(QVariantMap arguments); virtual QVariantMap getArguments(); virtual void updateActionWorker(float deltaTimeStep); - virtual QByteArray serialize(); + virtual QByteArray serialize() const; virtual void deserialize(QByteArray serializedArguments); protected: