From 16340c0fee7475f99aa1f641f5b081ff9e3762f4 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Sun, 17 May 2015 12:31:14 +0200
Subject: [PATCH] LightEntity debug render in batch

---
 .../src/RenderableLightEntityItem.cpp         | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp
index 838c9fd8c4..d7f1209be1 100644
--- a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp
@@ -12,6 +12,7 @@
 #include <glm/gtx/quaternion.hpp>
 
 #include <gpu/GPUConfig.h>
+#include <gpu/Batch.h>
 
 #include <DeferredLightingEffect.h>
 #include <GLMHelpers.h>
@@ -31,12 +32,7 @@ void RenderableLightEntityItem::render(RenderArgs* args) {
     glm::quat rotation = getRotation();
     float largestDiameter = glm::max(dimensions.x, dimensions.y, dimensions.z);
 
-    const float MAX_COLOR = 255.0f;
-    float colorR = getColor()[RED_INDEX] / MAX_COLOR;
-    float colorG = getColor()[GREEN_INDEX] / MAX_COLOR;
-    float colorB = getColor()[BLUE_INDEX] / MAX_COLOR;
-
-    glm::vec3 color = glm::vec3(colorR, colorG, colorB);
+    glm::vec3 color = toGlm(getXColor());
 
     float intensity = getIntensity();
     float exponent = getExponent();
@@ -49,21 +45,12 @@ void RenderableLightEntityItem::render(RenderArgs* args) {
         DependencyManager::get<DeferredLightingEffect>()->addPointLight(position, largestDiameter / 2.0f,
             color, intensity);
     }
-
+    
 #ifdef WANT_DEBUG
-    glm::vec4 color(diffuseR, diffuseG, diffuseB, 1.0f);
-    glPushMatrix();
-        glTranslatef(position.x, position.y, position.z);
-        glm::vec3 axis = glm::axis(rotation);
-        glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z);
-        glPushMatrix();
-            glm::vec3 positionToCenter = center - position;
-            glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z);
-
-            glScalef(dimensions.x, dimensions.y, dimensions.z);
-            DependencyManager::get<DeferredLightingEffect>()->renderWireSphere(0.5f, 15, 15, color);
-        glPopMatrix();
-    glPopMatrix();
+    Q_ASSERT(args->_batch);
+    gpu::Batch& batch = *args->_batch;
+    batch.setModelTransform(getTransformToCenter());
+    DependencyManager::get<DeferredLightingEffect>()->renderWireSphere(batch, 0.5f, 15, 15, glm::vec4(color, 1.0f));
 #endif
 };