From 6b5fdceb6e2c8dd656123d16dff49752d000e503 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 4 Dec 2014 16:48:04 -0800
Subject: [PATCH] more work on improved model picking

---
 .../src/entities/RenderableModelEntityItem.h   |  3 ---
 interface/src/renderer/Model.cpp               | 18 ------------------
 interface/src/renderer/Model.h                 |  6 +-----
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/interface/src/entities/RenderableModelEntityItem.h b/interface/src/entities/RenderableModelEntityItem.h
index 4c6bb5a046..9ed85beeaa 100644
--- a/interface/src/entities/RenderableModelEntityItem.h
+++ b/interface/src/entities/RenderableModelEntityItem.h
@@ -28,9 +28,6 @@
 #include <ModelEntityItem.h>
 #include <BoxEntityItem.h>
 
-#include <QOpenGLFramebufferObject>
-#include <QRgb>
-
 class RenderableModelEntityItem : public ModelEntityItem  {
 public:
     static EntityItem* factory(const EntityItemID& entityID, const EntityItemProperties& properties);
diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index 9941be566a..19176c4833 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -103,9 +103,6 @@ Model::SkinLocations Model::_skinNormalSpecularMapLocations;
 Model::SkinLocations Model::_skinShadowLocations;
 Model::SkinLocations Model::_skinTranslucentLocations;
 
-ProgramObject Model::_selectProgram;
-Model::Locations Model::_selectLocations;
-
 void Model::setScale(const glm::vec3& scale) {
     setScaleInternal(scale);
     // if anyone sets scale manually, then we are no longer scaled to fit
@@ -390,14 +387,6 @@ void Model::init() {
         _skinTranslucentProgram.link();
         
         initSkinProgram(_skinTranslucentProgram, _skinTranslucentLocations);
-        
-        
-        // select/ray picking program
-        _selectProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + "shaders/select.vert");
-        _selectProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + "shaders/select.frag");
-        _selectProgram.link();
-        initProgram(_selectProgram, _selectLocations);
-
     }
 }
 
@@ -2166,13 +2155,6 @@ void Model::pickPrograms(gpu::Batch& batch, RenderMode mode, bool translucent, f
     ProgramObject* activeProgram = program;
     Locations* activeLocations = locations;
 
-    // XXXBHG - hack to render yellow
-    if (mode == SELECT_RENDER_MODE) {
-        //activeProgram = &_selectProgram;
-        //activeLocations = &_selectLocations;
-        // need skin version
-    }
-
     if (isSkinned) {
         activeProgram = skinProgram;
         activeLocations = skinLocations;
diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h
index 9fdec3f25b..b16cf11b09 100644
--- a/interface/src/renderer/Model.h
+++ b/interface/src/renderer/Model.h
@@ -86,7 +86,7 @@ public:
     void reset();
     virtual void simulate(float deltaTime, bool fullUpdate = true);
     
-    enum RenderMode { DEFAULT_RENDER_MODE, SHADOW_RENDER_MODE, DIFFUSE_RENDER_MODE, NORMAL_RENDER_MODE, SELECT_RENDER_MODE };
+    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);
     
@@ -319,8 +319,6 @@ private:
 
     static ProgramObject _skinShadowProgram;
 
-    static ProgramObject _selectProgram;
-    
     static int _normalMapTangentLocation;
     static int _normalSpecularMapTangentLocation;
     
@@ -345,8 +343,6 @@ private:
     static Locations _lightmapSpecularMapLocations;
     static Locations _lightmapNormalSpecularMapLocations;
     
-    static Locations _selectLocations;
-
     static void initProgram(ProgramObject& program, Locations& locations, int specularTextureUnit = 1);
         
     class SkinLocations : public Locations {