From 43b1751db3b3a165c6a68e37c27fe08e42d89070 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1@gmail.com>
Date: Wed, 1 Jul 2015 18:33:42 -0700
Subject: [PATCH] fixed network bug for polylines

---
 .../src/RenderablePolyLineEntityItem.cpp         | 16 +++-------------
 libraries/octree/src/OctreePacketData.cpp        |  1 +
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index a447d69d70..17c97a5e9e 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -20,11 +20,6 @@
 #include "RenderablePolyLineEntityItem.h"
 
 
-
-
-
-
-
 EntityItemPointer RenderablePolyLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     return EntityItemPointer(new RenderablePolyLineEntityItem(entityID, properties));
 }
@@ -65,9 +60,9 @@ int generateColor() {
     float c1 = static_cast <float> (rand()) / static_cast <float> (RAND_MAX);
     float c2 = static_cast <float> (rand()) / static_cast <float> (RAND_MAX);
     float c3 = static_cast <float> (rand()) / static_cast <float> (RAND_MAX);
-    return ((int(c1 * 255.0f) & 0xFF)) |
-    ((int(c2 * 255.0f) & 0xFF) << 8) |
-    ((int(c3 * 255.0f) & 0xFF) << 16) |
+    return ((int(0.7 * 255.0f) & 0xFF)) |
+    ((int(0.3 * 255.0f) & 0xFF) << 8) |
+    ((int(0.6 * 255.0f) & 0xFF) << 16) |
     ((int(255.0f) & 0xFF) << 24);
 }
 
@@ -78,7 +73,6 @@ void RenderablePolyLineEntityItem::updateGeometry() {
     _verticesBuffer.reset(new gpu::Buffer());
     int vertexIndex = 0;
     for (int i = 0; i < _normals.size(); i++) {
-        compactColor = generateColor();
         _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex));
          vertexIndex++;
         _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i));
@@ -92,12 +86,8 @@ void RenderablePolyLineEntityItem::updateGeometry() {
     }
     _pointsChanged = false;
     
-
-    
 }
 
-
-
 void RenderablePolyLineEntityItem::render(RenderArgs* args) {
     if (_points.size() < 2  || _vertices.size() != _normals.size() * 2) {
         return;
diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp
index 5c0a872a71..d8c3a88eb0 100644
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@@ -629,6 +629,7 @@ int OctreePacketData::unpackDataFromBytes(const unsigned char *dataBytes, QVecto
     dataBytes += sizeof(length);
     result.resize(length);
     memcpy(result.data(), dataBytes, length * sizeof(float));
+    return sizeof(uint16_t) + length * sizeof(float);
 }
 
 int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QByteArray& result) {