From 3de3540ebea88247d5b9d5a32a89ff42e68425ac Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 15 Dec 2014 08:37:33 -0800
Subject: [PATCH] move back into interface for now

---
 interface/CMakeLists.txt                                      | 2 +-
 interface/src/Application.h                                   | 4 ++--
 interface/src/MetavoxelSystem.h                               | 2 +-
 interface/src/avatar/Avatar.cpp                               | 2 +-
 .../src => interface/src/renderer}/GeometryCache.cpp          | 0
 .../src => interface/src/renderer}/GeometryCache.h            | 0
 interface/src/renderer/Model.h                                | 2 +-
 .../src => interface/src/renderer}/TextureCache.cpp           | 0
 .../src => interface/src/renderer}/TextureCache.h             | 0
 interface/src/ui/overlays/BillboardOverlay.h                  | 3 +--
 10 files changed, 7 insertions(+), 8 deletions(-)
 rename {libraries/render-utils/src => interface/src/renderer}/GeometryCache.cpp (100%)
 rename {libraries/render-utils/src => interface/src/renderer}/GeometryCache.h (100%)
 rename {libraries/render-utils/src => interface/src/renderer}/TextureCache.cpp (100%)
 rename {libraries/render-utils/src => interface/src/renderer}/TextureCache.h (100%)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index ffc401ba63..38dd02c655 100644
--- a/interface/CMakeLists.txt
+++ b/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 render-utils)
+link_hifi_libraries(shared octree voxels gpu fbx metavoxels networking entities avatars audio animation script-engine physics)
 
 # find any optional and required libraries
 find_package(ZLIB REQUIRED)
diff --git a/interface/src/Application.h b/interface/src/Application.h
index c3979086bc..afb476ce97 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -35,13 +35,11 @@
 
 #include <EntityCollisionSystem.h>
 #include <EntityEditPacketSender.h>
-#include <GeometryCache.h>
 #include <NetworkPacket.h>
 #include <NodeList.h>
 #include <OctreeQuery.h>
 #include <PacketHeaders.h>
 #include <ScriptEngine.h>
-#include <TextureCache.h>
 #include <ViewFrustum.h>
 #include <VoxelEditPacketSender.h>
 
@@ -64,7 +62,9 @@
 #include "entities/EntityTreeRenderer.h"
 #include "renderer/AmbientOcclusionEffect.h"
 #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"
diff --git a/interface/src/MetavoxelSystem.h b/interface/src/MetavoxelSystem.h
index 0c0f9b49b7..2ebf7e1146 100644
--- a/interface/src/MetavoxelSystem.h
+++ b/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;
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index d4ec5ddb1f..0edf59290f 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -25,7 +25,6 @@
 #include <PacketHeaders.h>
 #include <PerfStat.h>
 #include <SharedUtil.h>
-#include <TextureCache.h>
 
 #include "Application.h"
 #include "Avatar.h"
@@ -37,6 +36,7 @@
 #include "Recorder.h"
 #include "world.h"
 #include "devices/OculusManager.h"
+#include "renderer/TextureCache.h"
 #include "ui/TextRenderer.h"
 
 using namespace std;
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp
similarity index 100%
rename from libraries/render-utils/src/GeometryCache.cpp
rename to interface/src/renderer/GeometryCache.cpp
diff --git a/libraries/render-utils/src/GeometryCache.h b/interface/src/renderer/GeometryCache.h
similarity index 100%
rename from libraries/render-utils/src/GeometryCache.h
rename to interface/src/renderer/GeometryCache.h
diff --git a/interface/src/renderer/Model.h b/interface/src/renderer/Model.h
index d74f95095d..e95b2472ba 100644
--- a/interface/src/renderer/Model.h
+++ b/interface/src/renderer/Model.h
@@ -21,13 +21,13 @@
 #include <AnimationCache.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;
 
diff --git a/libraries/render-utils/src/TextureCache.cpp b/interface/src/renderer/TextureCache.cpp
similarity index 100%
rename from libraries/render-utils/src/TextureCache.cpp
rename to interface/src/renderer/TextureCache.cpp
diff --git a/libraries/render-utils/src/TextureCache.h b/interface/src/renderer/TextureCache.h
similarity index 100%
rename from libraries/render-utils/src/TextureCache.h
rename to interface/src/renderer/TextureCache.h
diff --git a/interface/src/ui/overlays/BillboardOverlay.h b/interface/src/ui/overlays/BillboardOverlay.h
index dcb8ab8b0c..c095a544b7 100644
--- a/interface/src/ui/overlays/BillboardOverlay.h
+++ b/interface/src/ui/overlays/BillboardOverlay.h
@@ -15,9 +15,8 @@
 #include <QScopedPointer>
 #include <QUrl>
 
-#include <TextureCache.h>
-
 #include "Base3DOverlay.h"
+#include "renderer/TextureCache.h"
 
 class BillboardOverlay : public Base3DOverlay {
     Q_OBJECT