Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

some ObjectAction methods should be const

Browse source
This commit is contained in:
Andrew Meadows 2015-07-07 15:56:16 -07:00
parent 30dd9728eb
commit 77bd7b2821
11 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentAction.cpp
View file

@ -28,7 +28,7 @@ void AssignmentAction::removeFromSimulation(EntitySimulation* simulation) const
simulation->removeAction(_id); simulation->removeAction(_id);
} }
QByteArray AssignmentAction::serialize() { QByteArray AssignmentAction::serialize() const {
return _data; return _data;
} }

4
assignment-client/src/AssignmentAction.h
View file

@ -25,14 +25,14 @@ public:
virtual ~AssignmentAction(); virtual ~AssignmentAction();
const QUuid& getID() const { return _id; } const QUuid& getID() const { return _id; }
virtual EntityActionType getType() { return _type; } virtual EntityActionType getType() const { return _type; }
virtual void removeFromSimulation(EntitySimulation* simulation) const; virtual void removeFromSimulation(EntitySimulation* simulation) const;
virtual EntityItemWeakPointer getOwnerEntity() const { return _ownerEntity; } virtual EntityItemWeakPointer getOwnerEntity() const { return _ownerEntity; }
virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; } virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; }
virtual bool updateArguments(QVariantMap arguments); virtual bool updateArguments(QVariantMap arguments);
virtual QVariantMap getArguments(); virtual QVariantMap getArguments();
virtual QByteArray serialize(); virtual QByteArray serialize() const;
virtual void deserialize(QByteArray serializedArguments); virtual void deserialize(QByteArray serializedArguments);
private: private:

5
interface/src/avatar/AvatarActionHold.cpp
View file

@ -166,8 +166,7 @@ QVariantMap AvatarActionHold::getArguments() {
void AvatarActionHold::deserialize(QByteArray serializedArguments) { void AvatarActionHold::deserialize(QByteArray serializedArguments) {
if (_mine) { if (!_mine) {
return; ObjectActionSpring::deserialize(serializedArguments);
} }
ObjectActionSpring::deserialize(serializedArguments);
} }

2
interface/src/avatar/AvatarActionHold.h
View file

@ -22,7 +22,7 @@ public:
AvatarActionHold(EntityActionType type, QUuid id, EntityItemPointer ownerEntity); AvatarActionHold(EntityActionType type, QUuid id, EntityItemPointer ownerEntity);
virtual ~AvatarActionHold(); virtual ~AvatarActionHold();
virtual EntityActionType getType() { return ACTION_TYPE_HOLD; } virtual EntityActionType getType() const { return ACTION_TYPE_HOLD; }
virtual bool updateArguments(QVariantMap arguments); virtual bool updateArguments(QVariantMap arguments);
virtual QVariantMap getArguments(); virtual QVariantMap getArguments();

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

@ -32,7 +32,7 @@ public:
EntityActionInterface() { } EntityActionInterface() { }
virtual ~EntityActionInterface() { } virtual ~EntityActionInterface() { }
virtual const QUuid& getID() const = 0; 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 void removeFromSimulation(EntitySimulation* simulation) const = 0;
virtual EntityItemWeakPointer getOwnerEntity() const = 0; virtual EntityItemWeakPointer getOwnerEntity() const = 0;
@ -40,7 +40,7 @@ public:
virtual bool updateArguments(QVariantMap arguments) = 0; virtual bool updateArguments(QVariantMap arguments) = 0;
virtual QVariantMap getArguments() = 0; virtual QVariantMap getArguments() = 0;
virtual QByteArray serialize() = 0; virtual QByteArray serialize() const = 0;
virtual void deserialize(QByteArray serializedArguments) = 0; virtual void deserialize(QByteArray serializedArguments) = 0;
static EntityActionType actionTypeFromString(QString actionTypeString); static EntityActionType actionTypeFromString(QString actionTypeString);

8
libraries/physics/src/ObjectAction.cpp
View file

@ -24,15 +24,15 @@ ObjectAction::~ObjectAction() {
} }
void ObjectAction::updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) { void ObjectAction::updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) {
if (!_active) {
return;
}
if (_ownerEntity.expired()) { if (_ownerEntity.expired()) {
qDebug() << "warning -- action with no entity removing self from btCollisionWorld."; qDebug() << "warning -- action with no entity removing self from btCollisionWorld.";
btDynamicsWorld* dynamicsWorld = static_cast<btDynamicsWorld*>(collisionWorld); btDynamicsWorld* dynamicsWorld = static_cast<btDynamicsWorld*>(collisionWorld);
dynamicsWorld->removeAction(this); dynamicsWorld->removeAction(this);
return; return;
} }
if (!_active) {
return;
}
updateActionWorker(deltaTimeStep); updateActionWorker(deltaTimeStep);
} }
@ -129,7 +129,7 @@ void ObjectAction::setAngularVelocity(glm::vec3 angularVelocity) {
rigidBody->activate(); rigidBody->activate();
} }
QByteArray ObjectAction::serialize() { QByteArray ObjectAction::serialize() const {
assert(false); assert(false);
return QByteArray(); return QByteArray();
} }

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

@ -30,7 +30,7 @@ public:
virtual ~ObjectAction(); virtual ~ObjectAction();
const QUuid& getID() const { return _id; } 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 void removeFromSimulation(EntitySimulation* simulation) const;
virtual EntityItemWeakPointer getOwnerEntity() const { return _ownerEntity; } virtual EntityItemWeakPointer getOwnerEntity() const { return _ownerEntity; }
virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; } virtual void setOwnerEntity(const EntityItemPointer ownerEntity) { _ownerEntity = ownerEntity; }
@ -45,7 +45,7 @@ public:
virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep); virtual void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep);
virtual void debugDraw(btIDebugDraw* debugDrawer); virtual void debugDraw(btIDebugDraw* debugDrawer);
virtual QByteArray serialize(); virtual QByteArray serialize() const;
virtual void deserialize(QByteArray serializedArguments); virtual void deserialize(QByteArray serializedArguments);
private: private:

2
libraries/physics/src/ObjectActionOffset.cpp
View file

@ -127,7 +127,7 @@ QVariantMap ObjectActionOffset::getArguments() {
return arguments; return arguments;
} }
QByteArray ObjectActionOffset::serialize() { QByteArray ObjectActionOffset::serialize() const {
QByteArray ba; QByteArray ba;
QDataStream dataStream(&ba, QIODevice::WriteOnly); QDataStream dataStream(&ba, QIODevice::WriteOnly);
dataStream << getType(); dataStream << getType();

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

@ -22,14 +22,14 @@ public:
ObjectActionOffset(EntityActionType type, QUuid id, EntityItemPointer ownerEntity); ObjectActionOffset(EntityActionType type, QUuid id, EntityItemPointer ownerEntity);
virtual ~ObjectActionOffset(); virtual ~ObjectActionOffset();
virtual EntityActionType getType() { return ACTION_TYPE_OFFSET; } virtual EntityActionType getType() const { return ACTION_TYPE_OFFSET; }
virtual bool updateArguments(QVariantMap arguments); virtual bool updateArguments(QVariantMap arguments);
virtual QVariantMap getArguments(); virtual QVariantMap getArguments();
virtual void updateActionWorker(float deltaTimeStep); virtual void updateActionWorker(float deltaTimeStep);
virtual QByteArray serialize(); virtual QByteArray serialize() const;
virtual void deserialize(QByteArray serializedArguments); virtual void deserialize(QByteArray serializedArguments);
private: private:

2
libraries/physics/src/ObjectActionSpring.cpp
View file

@ -206,7 +206,7 @@ QVariantMap ObjectActionSpring::getArguments() {
return arguments; return arguments;
} }
QByteArray ObjectActionSpring::serialize() { QByteArray ObjectActionSpring::serialize() const {
QByteArray serializedActionArguments; QByteArray serializedActionArguments;
QDataStream dataStream(&serializedActionArguments, QIODevice::WriteOnly); QDataStream dataStream(&serializedActionArguments, QIODevice::WriteOnly);

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

@ -22,14 +22,14 @@ public:
ObjectActionSpring(EntityActionType type, QUuid id, EntityItemPointer ownerEntity); ObjectActionSpring(EntityActionType type, QUuid id, EntityItemPointer ownerEntity);
virtual ~ObjectActionSpring(); virtual ~ObjectActionSpring();
virtual EntityActionType getType() { return ACTION_TYPE_SPRING; } virtual EntityActionType getType() const { return ACTION_TYPE_SPRING; }
virtual bool updateArguments(QVariantMap arguments); virtual bool updateArguments(QVariantMap arguments);
virtual QVariantMap getArguments(); virtual QVariantMap getArguments();
virtual void updateActionWorker(float deltaTimeStep); virtual void updateActionWorker(float deltaTimeStep);
virtual QByteArray serialize(); virtual QByteArray serialize() const;
virtual void deserialize(QByteArray serializedArguments); virtual void deserialize(QByteArray serializedArguments);
protected: protected: