move TextureCache to library

interface/CMakeLists.txt

@@ -107,7 +107,7 @@ endif()
 add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
 
 # link required hifi libraries
-link_hifi_libraries(shared octree voxels gpu fbx metavoxels networking entities avatars audio animation script-engine physics)
+link_hifi_libraries(shared octree voxels gpu fbx metavoxels networking entities avatars audio animation script-engine physics render-utils)
 
 # find any optional and required libraries
 find_package(ZLIB REQUIRED)

interface/src/Application.h

@@ -15,6 +15,8 @@
 #include <map>
 #include <time.h>
 
+#include <gpu/GPUConfig.h>
+
 #include <QApplication>
 #include <QMainWindow>
 #include <QAction>
@@ -37,6 +39,7 @@
 #include <OctreeQuery.h>
 #include <PacketHeaders.h>
 #include <ScriptEngine.h>
+#include <TextureCache.h>
 #include <ViewFrustum.h>
 #include <VoxelEditPacketSender.h>
 
@@ -61,7 +64,6 @@
 #include "renderer/DeferredLightingEffect.h"
 #include "renderer/GeometryCache.h"
 #include "renderer/GlowEffect.h"
-#include "renderer/TextureCache.h"
 #include "scripting/ControllerScriptingInterface.h"
 #include "ui/BandwidthDialog.h"
 #include "ui/BandwidthMeter.h"

interface/src/MetavoxelSystem.h

@@ -20,9 +20,9 @@
 #include <glm/glm.hpp>
 
 #include <MetavoxelClientManager.h>
+#include <TextureCache.h>
 
 #include "renderer/ProgramObject.h"
-#include "renderer/TextureCache.h"
 
 class HeightfieldBaseLayerBatch;
 class HeightfieldSplatBatch;

interface/src/avatar/Avatar.cpp

@@ -11,6 +11,8 @@
 
 #include <vector>
 
+#include <gpu/GPUConfig.h>
+
 #include <QDesktopWidget>
 #include <QWindow>
 
@@ -25,6 +27,7 @@
 #include <PacketHeaders.h>
 #include <PerfStat.h>
 #include <SharedUtil.h>
+#include <TextureCache.h>
 
 #include "Application.h"
 #include "Avatar.h"
@@ -36,7 +39,6 @@
 #include "Recorder.h"
 #include "world.h"
 #include "devices/OculusManager.h"
-#include "renderer/TextureCache.h"
 #include "ui/TextRenderer.h"
 
 using namespace std;

interface/src/renderer/GeometryCache.cpp

@@ -19,9 +19,9 @@
 #include <QThreadPool>
 
 #include <SharedUtil.h>
+#include <TextureCache.h>
 
 #include "GeometryCache.h"
-#include "TextureCache.h"
 
 GeometryCache::GeometryCache() {
 }

interface/src/renderer/Model.h

@@ -22,13 +22,13 @@
 #include <DependencyManager.h>
 #include <GeometryUtil.h>
 #include <PhysicsEntity.h>
+#include <TextureCache.h>
 
 #include "AnimationHandle.h"
 #include "GeometryCache.h"
 #include "InterfaceConfig.h"
 #include "JointState.h"
 #include "ProgramObject.h"
-#include "TextureCache.h"
 
 class QScriptEngine;
 

interface/src/ui/UpdateDialog.cpp

@@ -8,10 +8,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"  // HACK ATTACK WARNING: for windows build to work, we need this ahead of QtGui
 #include <QtGui>
 #include "ui_updateDialog.h"
 
+#include "Application.h"
 #include "UpdateDialog.h"
 
 

interface/src/ui/overlays/BillboardOverlay.h

@@ -15,8 +15,9 @@
 #include <QScopedPointer>
 #include <QUrl>
 
+#include <TextureCache.h>
+
 #include "Base3DOverlay.h"
-#include "renderer/TextureCache.h"
 
 class BillboardOverlay : public Base3DOverlay {
     Q_OBJECT

libraries/render-utils/CMakeLists.txt

@@ -0,0 +1,46 @@
+set(TARGET_NAME render-utils)
+
+# use setup_hifi_library macro to setup our project and link appropriate Qt modules
+setup_hifi_library(Widgets OpenGL Network)
+
+include_glm()
+
+link_hifi_libraries(shared gpu)
+if (APPLE)
+  # link in required OS X frameworks and include the right GL headers
+  find_library(OpenGL OpenGL)
+
+  target_link_libraries(${TARGET_NAME} ${OpenGL})
+    
+else (APPLE)
+  find_package(OpenGL REQUIRED)
+  
+  if (${OPENGL_INCLUDE_DIR})
+    include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
+  endif ()
+  
+  #target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
+  
+  # link target to external libraries
+  if (WIN32)
+    find_package(GLEW REQUIRED)
+    include_directories(${GLEW_INCLUDE_DIRS})
+
+    # we're using static GLEW, so define GLEW_STATIC
+    add_definitions(-DGLEW_STATIC)
+
+    #target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARIES}" "${NSIGHT_LIBRARIES}" opengl32.lib)
+
+    # try to find the Nsight package and add it to the build if we find it
+    #find_package(NSIGHT)
+    #if (NSIGHT_FOUND)
+    #  include_directories(${NSIGHT_INCLUDE_DIRS})
+    #  add_definitions(-DNSIGHT_FOUND)
+    #  #target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
+    #endif ()
+
+  endif()
+endif (APPLE)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies()