From 4e679c7e3afcae0f5b89bc6dfab694974babf9b6 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 12 May 2015 15:08:26 -0700 Subject: [PATCH] use toGlm for color. remove some commented-out code --- .../src/RenderableLineEntityItem.cpp | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index 6f8aed930c..aaed52c20c 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -26,31 +26,19 @@ void RenderableLineEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("RenderableLineEntityItem::render"); assert(getType() == EntityTypes::Line); glm::vec3 position = getPosition(); - // glm::vec3 center = getCenter(); glm::vec3 dimensions = getDimensions(); glm::quat rotation = getRotation(); const float MAX_COLOR = 255.0f; - glm::vec4 lineColor(getColor()[RED_INDEX] / MAX_COLOR, getColor()[GREEN_INDEX] / MAX_COLOR, - getColor()[BLUE_INDEX] / MAX_COLOR, getLocalRenderAlpha()); - + glm::vec4 lineColor(toGlm(getColor()), getLocalRenderAlpha()); 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); - - glm::vec3 p1 = {0.0f, 0.0f, 0.0f}; - glm::vec3& p2 = dimensions; - - DependencyManager::get()->renderLine(p1, p2, lineColor, lineColor); - - // glPopMatrix(); + 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); + glm::vec3 p1 = {0.0f, 0.0f, 0.0f}; + glm::vec3& p2 = dimensions; + DependencyManager::get()->renderLine(p1, p2, lineColor, lineColor); glPopMatrix(); - RenderableDebugableEntityItem::render(this, args); };