From eb912892dce9757c984b100bf4295277456454e1 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 5 Jun 2015 09:56:34 -0700 Subject: [PATCH] code review --- libraries/entities/src/EntityActionInterface.cpp | 2 +- libraries/entities/src/EntityActionInterface.h | 6 +++--- libraries/entities/src/EntityItem.cpp | 4 ++-- libraries/entities/src/EntityItem.h | 8 +++----- libraries/entities/src/EntityScriptingInterface.cpp | 9 ++++----- libraries/entities/src/EntityScriptingInterface.h | 2 +- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/libraries/entities/src/EntityActionInterface.cpp b/libraries/entities/src/EntityActionInterface.cpp index 8d848b356a..f26dd006ff 100644 --- a/libraries/entities/src/EntityActionInterface.cpp +++ b/libraries/entities/src/EntityActionInterface.cpp @@ -1,5 +1,5 @@ // -// EntityItem.h +// EntityActionInterface.cpp // libraries/entities/src // // Created by Seth Alves on 2015-6-4 diff --git a/libraries/entities/src/EntityActionInterface.h b/libraries/entities/src/EntityActionInterface.h index fff8d48fba..74efae3239 100644 --- a/libraries/entities/src/EntityActionInterface.h +++ b/libraries/entities/src/EntityActionInterface.h @@ -1,5 +1,5 @@ // -// EntityItem.h +// EntityActionInterface.h // libraries/entities/src // // Created by Seth Alves on 2015-6-2 @@ -24,7 +24,7 @@ enum EntityActionType { class EntityActionInterface { - public: +public: EntityActionInterface() { } virtual ~EntityActionInterface() { } virtual const QUuid& getID() const = 0; @@ -38,7 +38,7 @@ class EntityActionInterface { static EntityActionType actionTypeFromString(QString actionTypeString); static QString actionTypeToString(EntityActionType actionType); - protected: +protected: static glm::vec3 extractVec3Argument(QString objectName, QVariantMap arguments, QString argumentName, bool& ok); static float extractFloatArgument(QString objectName, QVariantMap arguments, QString argumentName, bool& ok); diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 247fbee76e..1b36952bdb 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1351,7 +1351,7 @@ bool EntityItem::addAction(EntitySimulation* simulation, EntityActionPointer act return false; } -bool EntityItem::updateAction(EntitySimulation* simulation, const QUuid actionID, QVariantMap arguments) { +bool EntityItem::updateAction(EntitySimulation* simulation, const QUuid& actionID, QVariantMap& arguments) { if (!_objectActions.contains(actionID)) { return false; } @@ -1359,7 +1359,7 @@ bool EntityItem::updateAction(EntitySimulation* simulation, const QUuid actionID return action->updateArguments(arguments); } -bool EntityItem::removeAction(EntitySimulation* simulation, const QUuid actionID) { +bool EntityItem::removeAction(EntitySimulation* simulation, const QUuid& actionID) { if (_objectActions.contains(actionID)) { EntityActionPointer action = _objectActions[actionID]; _objectActions.remove(actionID); diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 0a8e1c2196..7538f99d66 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -178,9 +178,7 @@ public: EntityTypes::EntityType getType() const { return _type; } const glm::vec3& getPosition() const { return _position; } /// get position in meters - void setPosition(const glm::vec3& value) { - _position = value; - } + void setPosition(const glm::vec3& value) { _position = value; } glm::vec3 getCenter() const; @@ -355,8 +353,8 @@ public: void getAllTerseUpdateProperties(EntityItemProperties& properties) const; bool addAction(EntitySimulation* simulation, EntityActionPointer action); - bool updateAction(EntitySimulation* simulation, const QUuid actionID, QVariantMap arguments); - bool removeAction(EntitySimulation* simulation, const QUuid actionID); + bool updateAction(EntitySimulation* simulation, const QUuid& actionID, QVariantMap& arguments); + bool removeAction(EntitySimulation* simulation, const QUuid& actionID); void clearActions(EntitySimulation* simulation); protected: diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index e04bd977a2..7ec95c167b 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -451,7 +451,7 @@ bool EntityScriptingInterface::setAllVoxels(QUuid entityID, int value) { } -bool EntityScriptingInterface::actionWorker(QUuid entityID, std::function actor) { +bool EntityScriptingInterface::actionWorker(QUuid& entityID, std::function actor) { if (!_entityTree) { return false; } @@ -478,10 +478,9 @@ bool EntityScriptingInterface::actionWorker(QUuid entityID, std::functionupdateAction(simulation, actionID, arguments); }); } bool EntityScriptingInterface::deleteAction(QUuid entityID, QUuid actionID) { - return actionWorker(entityID, [entityID, actionID](EntitySimulation* simulation, EntityItemPointer entity) { + return actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) { return entity->removeAction(simulation, actionID); }); } diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index 5c81ab15dd..4d1a49ae9f 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -155,7 +155,7 @@ signals: void clearingEntities(); private: - bool actionWorker(QUuid entityID, std::function actor); + bool actionWorker(QUuid& entityID, std::function actor); bool setVoxels(QUuid entityID, std::function actor); void queueEntityMessage(PacketType packetType, EntityItemID entityID, const EntityItemProperties& properties);