From df7e115556357717cf449fa37a91c97df54fb059 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 15 Dec 2014 14:21:22 -0800
Subject: [PATCH] move ProgramObject to libraries

---
 interface/src/Application.cpp                                 | 2 +-
 interface/src/Environment.cpp                                 | 2 +-
 interface/src/MetavoxelSystem.h                               | 3 +--
 interface/src/avatar/Hand.cpp                                 | 2 +-
 interface/src/devices/OculusManager.h                         | 3 ++-
 interface/src/renderer/AmbientOcclusionEffect.cpp             | 2 +-
 interface/src/renderer/DeferredLightingEffect.h               | 3 +--
 interface/src/renderer/GlowEffect.cpp                         | 2 +-
 interface/src/renderer/Model.h                                | 2 +-
 interface/src/starfield/Config.h                              | 3 ++-
 interface/src/ui/MetavoxelEditor.h                            | 3 ++-
 interface/src/ui/overlays/Grid3DOverlay.h                     | 4 ++--
 interface/src/voxels/VoxelSystem.cpp                          | 2 +-
 .../renderer => libraries/render-utils/src}/ProgramObject.cpp | 3 ++-
 .../renderer => libraries/render-utils/src}/ProgramObject.h   | 0
 15 files changed, 19 insertions(+), 17 deletions(-)
 rename {interface/src/renderer => libraries/render-utils/src}/ProgramObject.cpp (99%)
 rename {interface/src/renderer => libraries/render-utils/src}/ProgramObject.h (100%)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 766424ef4b..990f05d0de 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -66,6 +66,7 @@
 #include <OctreeSceneStats.h>
 #include <PacketHeaders.h>
 #include <PerfStat.h>
+#include <ProgramObject.h>
 #include <ResourceCache.h>
 #include <SoundCache.h>
 #include <UserActivityLogger.h>
@@ -85,7 +86,6 @@
 #include "devices/TV3DManager.h"
 #include "devices/Visage.h"
 
-#include "renderer/ProgramObject.h"
 #include "gpu/Batch.h"
 #include "gpu/GLBackend.h"
 
diff --git a/interface/src/Environment.cpp b/interface/src/Environment.cpp
index fa8f18ac3f..c482095494 100644
--- a/interface/src/Environment.cpp
+++ b/interface/src/Environment.cpp
@@ -17,11 +17,11 @@
 
 #include <GeometryUtil.h>
 #include <PacketHeaders.h>
+#include <ProgramObject.h>
 #include <SharedUtil.h>
 
 #include "Application.h"
 #include "Camera.h"
-#include "renderer/ProgramObject.h"
 #include "world.h"
 
 #include "Environment.h"
diff --git a/interface/src/MetavoxelSystem.h b/interface/src/MetavoxelSystem.h
index 0c0f9b49b7..a21cd2c1a4 100644
--- a/interface/src/MetavoxelSystem.h
+++ b/interface/src/MetavoxelSystem.h
@@ -20,10 +20,9 @@
 #include <glm/glm.hpp>
 
 #include <MetavoxelClientManager.h>
+#include <ProgramObject.h>
 #include <TextureCache.h>
 
-#include "renderer/ProgramObject.h"
-
 class HeightfieldBaseLayerBatch;
 class HeightfieldSplatBatch;
 class HermiteBatch;
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 9d1ee52fde..9d7626266d 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -13,13 +13,13 @@
 #include <NodeList.h>
 
 #include <GeometryUtil.h>
+#include <ProgramObject.h>
 
 #include "Application.h"
 #include "Avatar.h"
 #include "Hand.h"
 #include "Menu.h"
 #include "Util.h"
-#include "renderer/ProgramObject.h"
 
 using namespace std;
 
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index 2e0354f61a..d9700d9530 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -17,7 +17,8 @@
 #include <OVR.h>
 #endif
 
-#include "renderer/ProgramObject.h"
+#include <ProgramObject.h>
+
 #include "ui/overlays/Text3DOverlay.h"
 
 const float DEFAULT_OCULUS_UI_ANGULAR_SIZE = 72.0f;
diff --git a/interface/src/renderer/AmbientOcclusionEffect.cpp b/interface/src/renderer/AmbientOcclusionEffect.cpp
index 3354f715cb..415b850abd 100644
--- a/interface/src/renderer/AmbientOcclusionEffect.cpp
+++ b/interface/src/renderer/AmbientOcclusionEffect.cpp
@@ -16,10 +16,10 @@
 
 #include <glm/gtc/random.hpp>
 
+#include <ProgramObject.h>
 #include <SharedUtil.h>
 
 #include "Application.h"
-#include "ProgramObject.h"
 #include "RenderUtil.h"
 
 #include "AmbientOcclusionEffect.h"
diff --git a/interface/src/renderer/DeferredLightingEffect.h b/interface/src/renderer/DeferredLightingEffect.h
index ce8b2b9759..effcea27d2 100644
--- a/interface/src/renderer/DeferredLightingEffect.h
+++ b/interface/src/renderer/DeferredLightingEffect.h
@@ -14,10 +14,9 @@
 
 #include <QVector>
 
+#include <ProgramObject.h>
 #include <SharedUtil.h>
 
-#include "ProgramObject.h"
-
 class PostLightingRenderable;
 
 /// Handles deferred lighting for the bits that require it (voxels, metavoxels...)
diff --git a/interface/src/renderer/GlowEffect.cpp b/interface/src/renderer/GlowEffect.cpp
index b6896eeaad..77d002dc89 100644
--- a/interface/src/renderer/GlowEffect.cpp
+++ b/interface/src/renderer/GlowEffect.cpp
@@ -15,10 +15,10 @@
 #include <QOpenGLFramebufferObject>
 
 #include <PerfStat.h>
+#include <ProgramObject.h>
 
 #include "Application.h"
 #include "GlowEffect.h"
-#include "ProgramObject.h"
 #include "RenderUtil.h"
 
 GlowEffect::GlowEffect()
diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h
index c061bd85ac..1f0a571872 100644
--- a/interface/src/renderer/Model.h
+++ b/interface/src/renderer/Model.h
@@ -22,13 +22,13 @@
 #include <GeometryCache.h>
 #include <GeometryUtil.h>
 #include <PhysicsEntity.h>
+#include <ProgramObject.h>
 #include <TextureCache.h>
 #include <Transform.h>
 
 #include "AnimationHandle.h"
 #include "InterfaceConfig.h"
 #include "JointState.h"
-#include "ProgramObject.h"
 
 class QScriptEngine;
 
diff --git a/interface/src/starfield/Config.h b/interface/src/starfield/Config.h
index 7777c5207b..00f827dad7 100644
--- a/interface/src/starfield/Config.h
+++ b/interface/src/starfield/Config.h
@@ -13,7 +13,6 @@
 #define hifi_Config_h
 
 #include "InterfaceConfig.h"
-#include "renderer/ProgramObject.h"
 
 #include <cstddef>
 #include <cfloat>
@@ -35,6 +34,8 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/matrix_access.hpp>
 
+#include <ProgramObject.h>
+
 #include "AngleUtil.h"
 #include "Radix2InplaceSort.h"
 #include "Radix2IntegerScanner.h"
diff --git a/interface/src/ui/MetavoxelEditor.h b/interface/src/ui/MetavoxelEditor.h
index c154d7bc59..391b01270a 100644
--- a/interface/src/ui/MetavoxelEditor.h
+++ b/interface/src/ui/MetavoxelEditor.h
@@ -15,8 +15,9 @@
 #include <QList>
 #include <QWidget>
 
+#include <ProgramObject.h>
+
 #include "MetavoxelSystem.h"
-#include "renderer/ProgramObject.h"
 
 class QColorEditor;
 class QComboBox;
diff --git a/interface/src/ui/overlays/Grid3DOverlay.h b/interface/src/ui/overlays/Grid3DOverlay.h
index b162ff3d74..d6c85a10ee 100644
--- a/interface/src/ui/overlays/Grid3DOverlay.h
+++ b/interface/src/ui/overlays/Grid3DOverlay.h
@@ -18,12 +18,12 @@
 #include <glm/glm.hpp>
 
 #include <QGLWidget>
+
+#include <ProgramObject.h>
 #include <SharedUtil.h>
 
 #include "Base3DOverlay.h"
 
-#include "renderer/ProgramObject.h"
-
 class Grid3DOverlay : public Base3DOverlay {
     Q_OBJECT
 
diff --git a/interface/src/voxels/VoxelSystem.cpp b/interface/src/voxels/VoxelSystem.cpp
index 61ec4d6e6c..064cead160 100644
--- a/interface/src/voxels/VoxelSystem.cpp
+++ b/interface/src/voxels/VoxelSystem.cpp
@@ -19,6 +19,7 @@
 #include <OctalCode.h>
 #include <PacketHeaders.h>
 #include <PerfStat.h>
+#include <ProgramObject.h>
 #include <SharedUtil.h>
 #include <NodeList.h>
 
@@ -26,7 +27,6 @@
 
 #include "Application.h"
 #include "Menu.h"
-#include "renderer/ProgramObject.h"
 #include "VoxelConstants.h"
 #include "VoxelSystem.h"
 
diff --git a/interface/src/renderer/ProgramObject.cpp b/libraries/render-utils/src/ProgramObject.cpp
similarity index 99%
rename from interface/src/renderer/ProgramObject.cpp
rename to libraries/render-utils/src/ProgramObject.cpp
index ff2b1cc11e..56fd48bff7 100644
--- a/interface/src/renderer/ProgramObject.cpp
+++ b/libraries/render-utils/src/ProgramObject.cpp
@@ -9,9 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ProgramObject.h"
 #include <glm/gtc/type_ptr.hpp>
 
+#include "ProgramObject.h"
+
 ProgramObject::ProgramObject(QObject* parent) : QGLShaderProgram(parent) {
 }
 
diff --git a/interface/src/renderer/ProgramObject.h b/libraries/render-utils/src/ProgramObject.h
similarity index 100%
rename from interface/src/renderer/ProgramObject.h
rename to libraries/render-utils/src/ProgramObject.h