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

code review

Browse source
This commit is contained in:
Seth Alves 2015-06-05 09:56:34 -07:00
parent 2086a25f93
commit eb912892dc
6 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityActionInterface.cpp
View file

@ -1,5 +1,5 @@
// //
// EntityItem.h // EntityActionInterface.cpp
// libraries/entities/src // libraries/entities/src
// //
// Created by Seth Alves on 2015-6-4 // Created by Seth Alves on 2015-6-4

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

@ -1,5 +1,5 @@
// //
// EntityItem.h // EntityActionInterface.h
// libraries/entities/src // libraries/entities/src
// //
// Created by Seth Alves on 2015-6-2 // Created by Seth Alves on 2015-6-2
@ -24,7 +24,7 @@ enum EntityActionType {
class EntityActionInterface { class EntityActionInterface {
public: public:
EntityActionInterface() { } EntityActionInterface() { }
virtual ~EntityActionInterface() { } virtual ~EntityActionInterface() { }
virtual const QUuid& getID() const = 0; virtual const QUuid& getID() const = 0;
@ -38,7 +38,7 @@ class EntityActionInterface {
static EntityActionType actionTypeFromString(QString actionTypeString); static EntityActionType actionTypeFromString(QString actionTypeString);
static QString actionTypeToString(EntityActionType actionType); static QString actionTypeToString(EntityActionType actionType);
protected: protected:
static glm::vec3 extractVec3Argument(QString objectName, QVariantMap arguments, QString argumentName, bool& ok); static glm::vec3 extractVec3Argument(QString objectName, QVariantMap arguments, QString argumentName, bool& ok);
static float extractFloatArgument(QString objectName, QVariantMap arguments, QString argumentName, bool& ok); static float extractFloatArgument(QString objectName, QVariantMap arguments, QString argumentName, bool& ok);

4
libraries/entities/src/EntityItem.cpp
View file

@ -1351,7 +1351,7 @@ bool EntityItem::addAction(EntitySimulation* simulation, EntityActionPointer act
return false; 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)) { if (!_objectActions.contains(actionID)) {
return false; return false;
} }
@ -1359,7 +1359,7 @@ bool EntityItem::updateAction(EntitySimulation* simulation, const QUuid actionID
return action->updateArguments(arguments); return action->updateArguments(arguments);
} }
bool EntityItem::removeAction(EntitySimulation* simulation, const QUuid actionID) { bool EntityItem::removeAction(EntitySimulation* simulation, const QUuid& actionID) {
if (_objectActions.contains(actionID)) { if (_objectActions.contains(actionID)) {
EntityActionPointer action = _objectActions[actionID]; EntityActionPointer action = _objectActions[actionID];
_objectActions.remove(actionID); _objectActions.remove(actionID);

8
libraries/entities/src/EntityItem.h
View file

@ -178,9 +178,7 @@ public:
EntityTypes::EntityType getType() const { return _type; } EntityTypes::EntityType getType() const { return _type; }
const glm::vec3& getPosition() const { return _position; } /// get position in meters const glm::vec3& getPosition() const { return _position; } /// get position in meters
void setPosition(const glm::vec3& value) { void setPosition(const glm::vec3& value) { _position = value; }
_position = value;
}
glm::vec3 getCenter() const; glm::vec3 getCenter() const;
@ -355,8 +353,8 @@ public:
void getAllTerseUpdateProperties(EntityItemProperties& properties) const; void getAllTerseUpdateProperties(EntityItemProperties& properties) const;
bool addAction(EntitySimulation* simulation, EntityActionPointer action); bool addAction(EntitySimulation* simulation, EntityActionPointer action);
bool updateAction(EntitySimulation* simulation, const QUuid actionID, QVariantMap arguments); bool updateAction(EntitySimulation* simulation, const QUuid& actionID, QVariantMap& arguments);
bool removeAction(EntitySimulation* simulation, const QUuid actionID); bool removeAction(EntitySimulation* simulation, const QUuid& actionID);
void clearActions(EntitySimulation* simulation); void clearActions(EntitySimulation* simulation);
protected: protected:

9
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -451,7 +451,7 @@ bool EntityScriptingInterface::setAllVoxels(QUuid entityID, int value) {
} }
bool EntityScriptingInterface::actionWorker(QUuid entityID, std::function<bool(EntitySimulation*, EntityItemPointer)> actor) { bool EntityScriptingInterface::actionWorker(QUuid& entityID, std::function<bool(EntitySimulation*, EntityItemPointer)> actor) {
if (!_entityTree) { if (!_entityTree) {
return false; return false;
} }
@ -478,10 +478,9 @@ bool EntityScriptingInterface::actionWorker(QUuid entityID, std::function<bool(E
} }
QUuid EntityScriptingInterface::addAction(QString actionTypeString, QUuid entityID, QVariantMap arguments) { QUuid EntityScriptingInterface::addAction(QString actionTypeString, QUuid entityID, QVariantMap arguments) {
QUuid actionID = QUuid::createUuid(); QUuid actionID = QUuid::createUuid();
bool success = actionWorker(entityID, [actionID, actionTypeString, entityID, arguments](EntitySimulation* simulation, bool success = actionWorker(entityID, [&](EntitySimulation* simulation,
EntityItemPointer entity) { EntityItemPointer entity) {
EntityActionType actionType = EntityActionInterface::actionTypeFromString(actionTypeString); EntityActionType actionType = EntityActionInterface::actionTypeFromString(actionTypeString);
if (actionType == ACTION_TYPE_NONE) { if (actionType == ACTION_TYPE_NONE) {
@ -500,14 +499,14 @@ QUuid EntityScriptingInterface::addAction(QString actionTypeString, QUuid entity
bool EntityScriptingInterface::updateAction(QUuid entityID, QUuid actionID, QVariantMap arguments) { bool EntityScriptingInterface::updateAction(QUuid entityID, QUuid actionID, QVariantMap arguments) {
return actionWorker(entityID, [entityID, actionID,arguments](EntitySimulation* simulation, EntityItemPointer entity) { return actionWorker(entityID, [&](EntitySimulation* simulation, EntityItemPointer entity) {
return entity->updateAction(simulation, actionID, arguments); return entity->updateAction(simulation, actionID, arguments);
}); });
} }
bool EntityScriptingInterface::deleteAction(QUuid entityID, QUuid actionID) { 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); return entity->removeAction(simulation, actionID);
}); });
} }

2
libraries/entities/src/EntityScriptingInterface.h
View file

@ -155,7 +155,7 @@ signals:
void clearingEntities(); void clearingEntities();
private: private:
bool actionWorker(QUuid entityID, std::function<bool(EntitySimulation*, EntityItemPointer)> actor); bool actionWorker(QUuid& entityID, std::function<bool(EntitySimulation*, EntityItemPointer)> actor);
bool setVoxels(QUuid entityID, std::function<void(PolyVoxEntityItem&)> actor); bool setVoxels(QUuid entityID, std::function<void(PolyVoxEntityItem&)> actor);
void queueEntityMessage(PacketType packetType, EntityItemID entityID, const EntityItemProperties& properties); void queueEntityMessage(PacketType packetType, EntityItemID entityID, const EntityItemProperties& properties);