From 3d0b557af6e866c8b3d02424ba9d236b2edd8cf0 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Tue, 22 Nov 2016 13:01:02 -0800
Subject: [PATCH] Fix the bad binding for polyline

---
 .../src/RenderablePolyLineEntityItem.cpp          | 15 +++++++++------
 .../src/RenderablePolyLineEntityItem.h            |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index dc2545b956..286efb5fb8 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -46,7 +46,8 @@ _numVertices(0)
 
 gpu::PipelinePointer RenderablePolyLineEntityItem::_pipeline;
 gpu::Stream::FormatPointer RenderablePolyLineEntityItem::_format;
-int32_t RenderablePolyLineEntityItem::PAINTSTROKE_GPU_SLOT;
+const int32_t RenderablePolyLineEntityItem::PAINTSTROKE_TEXTURE_SLOT;
+const int32_t RenderablePolyLineEntityItem::PAINTSTROKE_UNIFORM_SLOT;
 
 void RenderablePolyLineEntityItem::createPipeline() {
     static const int NORMAL_OFFSET = 12;
@@ -62,8 +63,8 @@ void RenderablePolyLineEntityItem::createPipeline() {
     gpu::ShaderPointer program = gpu::Shader::createProgram(VS, PS);
 
     gpu::Shader::BindingSet slotBindings;
-    PAINTSTROKE_GPU_SLOT = 0;
-    slotBindings.insert(gpu::Shader::Binding(std::string("paintStrokeTextureBinding"), PAINTSTROKE_GPU_SLOT));
+    slotBindings.insert(gpu::Shader::Binding(std::string("originalTexture"), PAINTSTROKE_TEXTURE_SLOT));
+    slotBindings.insert(gpu::Shader::Binding(std::string("polyLineBuffer"), PAINTSTROKE_UNIFORM_SLOT));
     gpu::Shader::makeProgram(*program, slotBindings);
 
     gpu::StatePointer state = gpu::StatePointer(new gpu::State());
@@ -193,14 +194,14 @@ void RenderablePolyLineEntityItem::render(RenderArgs* args) {
     Transform transform = Transform();
     transform.setTranslation(getPosition());
     transform.setRotation(getRotation());
-    batch.setUniformBuffer(0, _uniformBuffer);
+    batch.setUniformBuffer(PAINTSTROKE_UNIFORM_SLOT, _uniformBuffer);
     batch.setModelTransform(transform);
 
     batch.setPipeline(_pipeline);
     if (_texture->isLoaded()) {
-        batch.setResourceTexture(PAINTSTROKE_GPU_SLOT, _texture->getGPUTexture());
+        batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, _texture->getGPUTexture());
     } else {
-        batch.setResourceTexture(PAINTSTROKE_GPU_SLOT, args->_whiteTexture);
+        batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, args->_whiteTexture);
     }
    
     batch.setInputFormat(_format);
@@ -208,6 +209,8 @@ void RenderablePolyLineEntityItem::render(RenderArgs* args) {
 
     if (_isFading) {
         batch._glColor4f(1.0f, 1.0f, 1.0f, Interpolate::calculateFadeRatio(_fadeStartTime));
+    } else {
+        batch._glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
 
     batch.draw(gpu::TRIANGLE_STRIP, _numVertices, 0);
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index 75b2bcd58a..44b29bdec1 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -40,7 +40,9 @@ public:
 
     static gpu::PipelinePointer _pipeline;
     static gpu::Stream::FormatPointer _format;
-    static int32_t PAINTSTROKE_GPU_SLOT;
+
+    static const int32_t PAINTSTROKE_TEXTURE_SLOT { 0 };
+    static const int32_t PAINTSTROKE_UNIFORM_SLOT { 0 };
 
 protected:
     void updateGeometry();