From 55ffb7f1c0e33745059f29998387f3dacd686e92 Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Tue, 2 Jun 2015 12:51:45 -0700 Subject: [PATCH] code style changes --- .../entities-renderer/src/RenderableLineEntityItem.cpp | 2 +- libraries/entities/src/EntityItemProperties.cpp | 6 +++--- libraries/entities/src/EntityItemPropertiesMacros.h | 2 +- libraries/entities/src/LineEntityItem.cpp | 4 ++-- libraries/octree/src/OctreePacketData.cpp | 9 ++------- libraries/shared/src/RegisteredMetaTypes.cpp | 6 +++--- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index 480fbe5bb9..16d54feda0 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -41,7 +41,7 @@ void RenderableLineEntityItem::render(RenderArgs* args) { glm::vec3 axis = glm::axis(rotation); glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); QVector points; - if(_pointsChanged) { + if (_pointsChanged) { geometryCache->updateVertices(_lineVerticesID, getLinePoints(), lineColor); _pointsChanged = false; } diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 40970fc3f1..407791a65d 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -96,7 +96,7 @@ CONSTRUCT_PROPERTY(name, ENTITY_ITEM_DEFAULT_NAME), CONSTRUCT_PROPERTY(backgroundMode, BACKGROUND_MODE_INHERIT), CONSTRUCT_PROPERTY(sourceUrl, ""), CONSTRUCT_PROPERTY(lineWidth, LineEntityItem::DEFAULT_LINE_WIDTH), -CONSTRUCT_PROPERTY(linePoints, 0), +CONSTRUCT_PROPERTY(linePoints, QVector()), _id(UNKNOWN_ENTITY_ID), @@ -769,7 +769,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem APPEND_ENTITY_PROPERTY(PROP_VOXEL_SURFACE_STYLE, properties.getVoxelSurfaceStyle()); } - if(properties.getType() == EntityTypes::Line){ + if (properties.getType() == EntityTypes::Line) { APPEND_ENTITY_PROPERTY(PROP_LINE_WIDTH, properties.getLineWidth()); APPEND_ENTITY_PROPERTY(PROP_LINE_POINTS, properties.getLinePoints()); } @@ -1014,7 +1014,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VOXEL_SURFACE_STYLE, uint16_t, setVoxelSurfaceStyle); } - if(properties.getType() == EntityTypes::Line) { + if (properties.getType() == EntityTypes::Line) { READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_WIDTH, float, setLineWidth); READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_POINTS, QVector, setLinePoints); } diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h index 753a53479b..268107990b 100644 --- a/libraries/entities/src/EntityItemPropertiesMacros.h +++ b/libraries/entities/src/EntityItemPropertiesMacros.h @@ -169,7 +169,7 @@ inline glmVec3 glmVec3_convertFromScriptValue(const QScriptValue& v, bool& isVal return glm::vec3(0); } -inline qVectorVec3 qVectorVec3_convertFromScriptValue(const QScriptValue& v, bool& isValid){ +inline qVectorVec3 qVectorVec3_convertFromScriptValue(const QScriptValue& v, bool& isValid) { isValid = true; return qVectorVec3FromScriptValue(v); } diff --git a/libraries/entities/src/LineEntityItem.cpp b/libraries/entities/src/LineEntityItem.cpp index 49adbf97fc..c43de8d076 100644 --- a/libraries/entities/src/LineEntityItem.cpp +++ b/libraries/entities/src/LineEntityItem.cpp @@ -50,8 +50,8 @@ EntityItemProperties LineEntityItem::getProperties() const { properties._color = getXColor(); properties._colorChanged = false; - properties._lineWidth = getLineWidth(); - properties._lineWidthChanged = false; + + COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineWidth, getLineWidth); COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints); diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp index 9d0d98686a..7c977210fc 100644 --- a/libraries/octree/src/OctreePacketData.cpp +++ b/libraries/octree/src/OctreePacketData.cpp @@ -383,14 +383,9 @@ bool OctreePacketData::appendValue(const glm::vec3& value) { bool OctreePacketData::appendValue(const QVector& value) { uint16_t qVecSize = value.size(); - uint16_t sizeLength = sizeof(qVecSize); - bool success = append((const unsigned char*)&qVecSize, sizeLength); - if(success){ - _bytesOfValues += sizeLength; - _totalBytesOfValues += sizeLength; - } + bool success = appendValue(qVecSize); success = append((const unsigned char*)value.constData(), qVecSize * sizeof(glm::vec3)); - if(success){ + if (success) { _bytesOfValues += qVecSize * sizeof(glm::vec3); _totalBytesOfValues += qVecSize * sizeof(glm::vec3); } diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp index 4f57eea411..241f835a46 100644 --- a/libraries/shared/src/RegisteredMetaTypes.cpp +++ b/libraries/shared/src/RegisteredMetaTypes.cpp @@ -75,17 +75,17 @@ void vec3FromScriptValue(const QScriptValue &object, glm::vec3 &vec3) { QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector& vector){ QScriptValue array = engine->newArray(); - for(int i = 0; i < vector.size(); i++){ + for (int i = 0; i < vector.size(); i++) { array.setProperty(i, vec3toScriptValue(engine, vector.at(i))); } return array; } QVector qVectorVec3FromScriptValue(const QScriptValue& array){ - QVector newVector(0); + QVector newVector; int length = array.property("length").toInteger(); - for(int i = 0; i < length; i++) { + for (int i = 0; i < length; i++) { glm::vec3 newVec3 = glm::vec3(); vec3FromScriptValue(array.property(i), newVec3); newVector << newVec3;