move back into interface for now

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)

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"

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

@@ -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;

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;
 

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