From b2753507dc7d16bf886c1fb7bfcca883a96c19e6 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 3 Aug 2015 09:35:47 -0700 Subject: [PATCH] cleanup of comments and dead code --- interface/resources/images/paintStroke.png | Bin 0 -> 26029 bytes .../src/RenderablePolyLineEntityItem.cpp | 2 -- libraries/entities/src/PolyLineEntityItem.cpp | 14 ++------------ 3 files changed, 2 insertions(+), 14 deletions(-) create mode 100644 interface/resources/images/paintStroke.png diff --git a/interface/resources/images/paintStroke.png b/interface/resources/images/paintStroke.png new file mode 100644 index 0000000000000000000000000000000000000000..b9feb0d485ef5d7c8b3b0a1976b4b7d55652b07d GIT binary patch literal 26029 zcmV)HK)t_-P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 literal 0 HcmV?d00001 diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index 1cb5678bc1..a5eb11f4e1 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -108,7 +108,6 @@ void RenderablePolyLineEntityItem::updateGeometry() { _verticesBuffer->append(sizeof(glm::vec2), (gpu::Byte*)&uv); vertexIndex++; - uv.y = 1.0; _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex)); _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i)); @@ -178,7 +177,6 @@ void RenderablePolyLineEntityItem::render(RenderArgs* args) { batch.setPipeline(_pipeline); batch.setResourceTexture(PAINTSTROKE_GPU_SLOT, _texture); - batch.setInputFormat(_format); batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride); diff --git a/libraries/entities/src/PolyLineEntityItem.cpp b/libraries/entities/src/PolyLineEntityItem.cpp index e8d504091d..0c068e7789 100644 --- a/libraries/entities/src/PolyLineEntityItem.cpp +++ b/libraries/entities/src/PolyLineEntityItem.cpp @@ -53,13 +53,11 @@ EntityItemProperties PolyLineEntityItem::getProperties() const { properties._color = getXColor(); properties._colorChanged = false; - COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineWidth, getLineWidth); COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints); COPY_ENTITY_PROPERTY_TO_PROPERTIES(normals, getNormals); COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeWidths, getStrokeWidths); - properties._glowLevel = getGlowLevel(); properties._glowLevelChanged = false; return properties; @@ -75,8 +73,6 @@ bool PolyLineEntityItem::setProperties(const EntityItemProperties& properties) { SET_ENTITY_PROPERTY_FROM_PROPERTIES(linePoints, setLinePoints); SET_ENTITY_PROPERTY_FROM_PROPERTIES(normals, setNormals); SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeWidths, setStrokeWidths); - - if (somethingChanged) { bool wantDebug = false; @@ -89,7 +85,6 @@ bool PolyLineEntityItem::setProperties(const EntityItemProperties& properties) { setLastEdited(properties._lastEdited); } return somethingChanged; - } bool PolyLineEntityItem::appendPoint(const glm::vec3& point) { @@ -115,7 +110,6 @@ bool PolyLineEntityItem::setStrokeWidths(const QVector& strokeWidths ) { bool PolyLineEntityItem::setNormals(const QVector& normals) { _normals = normals; if (_points.size () < 2) { -// qDebug() << "points size is less than 2!"; return false; } @@ -126,8 +120,7 @@ bool PolyLineEntityItem::setNormals(const QVector& normals) { if (_strokeWidths.size() < minVectorSize) { minVectorSize = _strokeWidths.size(); } - -// int minArraySize = glm::min(_normals.size(), _points.size()) + _vertices.clear(); glm::vec3 v1, v2, tangent, binormal, point; @@ -139,6 +132,7 @@ bool PolyLineEntityItem::setNormals(const QVector& normals) { glm::vec3 normal = normals.at(i); binormal = glm::normalize(glm::cross(tangent, normal)) * width; + //This checks to make sure binormal is not a NAN assert(binormal.x == binormal.x); v1 = point + binormal; v2 = point - binormal; @@ -174,7 +168,6 @@ bool PolyLineEntityItem::setLinePoints(const QVector& points) { return false; } - for (int i = 0; i < points.size(); i++) { glm::vec3 point = points.at(i); glm::vec3 pos = getPosition(); @@ -183,11 +176,8 @@ bool PolyLineEntityItem::setLinePoints(const QVector& points) { qDebug() << "Point is outside entity's bounding box"; return false; } - } _points = points; - //All our points are valid and at least one point has changed, now create quads from points - return true; }