From 9d5e33d75d525a8e76e9d5a393dccfa66d126b15 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 3 Mar 2014 04:09:33 -0800
Subject: [PATCH] removed unused highlight voxel

---
 interface/src/Application.cpp | 20 --------------------
 interface/src/Application.h   |  8 --------
 2 files changed, 28 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 76295fe702..f33c7aea32 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -139,7 +139,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
         _touchAvgY(0.0f),
         _isTouchPressed(false),
         _mousePressed(false),
-        _isHighlightVoxel(false),
         _chatEntryOn(false),
         _audio(&_audioScope, STARTUP_JITTER_SAMPLES),
         _enableProcessVoxelsThread(true),
@@ -1611,20 +1610,6 @@ bool Application::isLookingAtMyAvatar(Avatar* avatar) {
     return false;
 }
 
-void Application::renderHighlightVoxel(VoxelDetail voxel) {
-    glDisable(GL_LIGHTING);
-    glPushMatrix();
-    glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE);
-    const float EDGE_EXPAND = 1.02f;
-    glColor3ub(voxel.red + 128, voxel.green + 128, voxel.blue + 128);
-    glTranslatef(voxel.x + voxel.s * 0.5f,
-                 voxel.y + voxel.s * 0.5f,
-                 voxel.z + voxel.s * 0.5f);
-    glLineWidth(2.0f);
-    glutWireCube(voxel.s * EDGE_EXPAND);
-    glPopMatrix();
-}
-
 void Application::updateMouseRay() {
 
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
@@ -2377,11 +2362,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
 
         // restore default, white specular
         glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
-
-        //  Render the highlighted voxel
-        if (_isHighlightVoxel) {
-            renderHighlightVoxel(_highlightVoxel);
-        }
     }
 
     bool forceRenderMyHead = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ee8c1148fc..78826b4fd0 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -215,10 +215,6 @@ public:
     NodeToJurisdictionMap& getParticleServerJurisdictions() { return _particleServerJurisdictions; }
     void pasteVoxelsToOctalCode(const unsigned char* octalCodeDestination);
 
-    /// set a voxel which is to be rendered with a highlight
-    void setHighlightVoxel(const VoxelDetail& highlightVoxel) { _highlightVoxel = highlightVoxel; }
-    void setIsHighlightVoxel(bool isHighlightVoxel) { _isHighlightVoxel = isHighlightVoxel; }
-    
     void skipVersion(QString latestVersion);
 
 signals:
@@ -307,7 +303,6 @@ private:
     bool isLookingAtMyAvatar(Avatar* avatar);
 
     void renderLookatIndicator(glm::vec3 pointOfInterest);
-    void renderHighlightVoxel(VoxelDetail voxel);
 
     void updateMyAvatar(float deltaTime);
     void queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions);
@@ -428,9 +423,6 @@ private:
 
     bool _mousePressed; //  true if mouse has been pressed (clear when finished)
 
-    VoxelDetail _highlightVoxel;
-    bool _isHighlightVoxel;
-
     ChatEntry _chatEntry; // chat entry field
     bool _chatEntryOn;    // Whether to show the chat entry