From 1bc91e7d299f3ca300d501f4cd522e21326096ad Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 6 Jan 2015 16:01:06 -0800 Subject: [PATCH] removed renderTriangleProxies --- libraries/render-utils/src/Model.cpp | 53 ---------------------------- libraries/render-utils/src/Model.h | 1 - 2 files changed, 54 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 3d26db2c4f..46fc6a6e4d 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -447,59 +447,6 @@ void Model::setJointStates(QVector states) { _boundingRadius = radius; } -bool Model::renderTriangleProxies() { - if (!isActive()) { - return false; - } - if (_calculatedMeshTrianglesValid) { - int color = 0; - foreach (const QVector& meshTriangles, _calculatedMeshTriangles) { - switch(color) { - case 0: glColor3ub( 0, 0, 255); break; - case 1: glColor3ub( 0, 255, 0); break; - case 2: glColor3ub( 0, 255, 255); break; - case 3: glColor3ub(255, 0, 0); break; - case 4: glColor3ub(255, 0, 255); break; - case 5: glColor3ub(255, 255, 0); break; - case 6: glColor3ub( 0, 0, 128); break; - case 7: glColor3ub( 0, 128, 0); break; - case 8: glColor3ub( 0, 128, 128); break; - case 9: glColor3ub(128, 0, 0); break; - case 10: glColor3ub(128, 0, 128); break; - case 11: glColor3ub(128, 128, 0); break; - case 12: glColor3ub(128, 128, 255); break; - case 13: glColor3ub(128, 255, 128); break; - case 14: glColor3ub(128, 255, 255); break; - case 15: glColor3ub(255, 128, 128); break; - case 16: glColor3ub(255, 128, 255); break; - case 17: glColor3ub(255, 255, 128); break; - default: glColor3ub(255,255, 255); break; - } - - if (_calculatedMeshBoxes.size() > color) { - const AABox& box = _calculatedMeshBoxes[color]; - glm::vec3 center = box.calcCenter(); - glm::vec3 dimensions = box.getDimensions(); - glPushMatrix(); - glTranslatef(center.x, center.y, center.z); - glScalef(dimensions.x, dimensions.y, dimensions.z); - DependencyManager::get()->renderWireCube(1.0f); - glPopMatrix(); - } - - glBegin(GL_TRIANGLES); - foreach (const Triangle& triangle, meshTriangles) { - glVertex3f( triangle.v0.x, triangle.v0.y, triangle.v0.z); - glVertex3f( triangle.v1.x, triangle.v1.y, triangle.v1.z); - glVertex3f( triangle.v2.x, triangle.v2.y, triangle.v2.z); - } - glEnd(); - color++; - } - } - return _calculatedMeshTrianglesValid; -} - bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const glm::vec3& direction, float& distance, BoxFace& face, QString& extraInfo, bool pickAgainstTriangles) { diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 52b0a42211..83ceab109f 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -94,7 +94,6 @@ public: enum RenderMode { DEFAULT_RENDER_MODE, SHADOW_RENDER_MODE, DIFFUSE_RENDER_MODE, NORMAL_RENDER_MODE }; bool render(float alpha = 1.0f, RenderMode mode = DEFAULT_RENDER_MODE, RenderArgs* args = NULL); - bool renderTriangleProxies(); // Scene rendering support static void startScene(RenderArgs::RenderSide renderSide);