move ProgramObject to libraries

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"
 

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"

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;

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;
 

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;

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"

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...)

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()

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;
 

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"

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;

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
 

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"
 

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) {
 }