move Model and AnimationHandle to libraries

interface/src/avatar/FaceModel.h

@@ -12,7 +12,7 @@
 #ifndef hifi_FaceModel_h
 #define hifi_FaceModel_h
 
-#include "renderer/Model.h"
+#include <Model.h>
 
 class Head;
 

interface/src/avatar/Hand.h

@@ -11,6 +11,8 @@
 #ifndef hifi_Hand_h
 #define hifi_Hand_h
 
+#include "InterfaceConfig.h"
+
 #include <vector>
 
 #include <QAction>
@@ -22,9 +24,8 @@
 #include <AvatarData.h>
 #include <AudioScriptingInterface.h>
 #include <HandData.h>
+#include <Model.h>
 
-#include "InterfaceConfig.h"
-#include "renderer/Model.h"
 #include "world.h"
 
 

interface/src/avatar/ModelReferential.cpp

@@ -10,9 +10,8 @@
 //
 
 #include <AvatarData.h>
-
 #include <EntityTree.h>
-#include "../renderer/Model.h"
+#include <Model.h>
 
 #include "ModelReferential.h"
 

interface/src/avatar/MyAvatar.cpp

@@ -22,6 +22,7 @@
 
 #include <AccountManager.h>
 #include <AddressManager.h>
+#include <AnimationHandle.h>
 #include <DependencyManager.h>
 #include <GeometryUtil.h>
 #include <NodeList.h>
@@ -40,7 +41,6 @@
 #include "Recorder.h"
 #include "devices/Faceshift.h"
 #include "devices/OculusManager.h"
-#include "renderer/AnimationHandle.h"
 #include "ui/TextRenderer.h"
 
 using namespace std;

interface/src/avatar/SkeletonModel.h

@@ -12,9 +12,10 @@
 #ifndef hifi_SkeletonModel_h
 #define hifi_SkeletonModel_h
 
-#include "renderer/Model.h"
 
 #include <CapsuleShape.h>
+#include <Model.h>
+
 #include "SkeletonRagdoll.h"
 
 class Avatar;

interface/src/avatar/SkeletonRagdoll.cpp

@@ -11,10 +11,10 @@
 
 #include <DistanceConstraint.h>
 #include <FixedConstraint.h>
+#include <Model.h>
 
 #include "SkeletonRagdoll.h"
 #include "MuscleConstraint.h"
-#include "../renderer/Model.h"
 
 SkeletonRagdoll::SkeletonRagdoll(Model* model) : Ragdoll(), _model(model) {
     assert(_model);

interface/src/entities/EntityTreeRenderer.h

@@ -17,6 +17,7 @@
 
 #include <EntityTree.h>
 #include <EntityScriptingInterface.h> // for RayToEntityIntersectionResult
+#include <Model.h>
 #include <Octree.h>
 #include <OctreePacketData.h>
 #include <OctreeRenderer.h>
@@ -25,7 +26,6 @@
 #include <SharedUtil.h>
 #include <ViewFrustum.h>
 
-#include "renderer/Model.h"
 
 class EntityScriptDetails {
 public:

interface/src/ui/overlays/ModelOverlay.h

@@ -12,9 +12,9 @@
 #ifndef hifi_ModelOverlay_h
 #define hifi_ModelOverlay_h
 
-#include "Base3DOverlay.h"
+#include <Model.h>
 
-#include "../../renderer/Model.h"
+#include "Base3DOverlay.h"
 
 class ModelOverlay : public Base3DOverlay {
     Q_OBJECT

libraries/render-utils/src/Model.cpp

@@ -19,9 +19,7 @@
 #include <glm/gtx/norm.hpp>
 
 #include <CapsuleShape.h>
-#include <DeferredLightingEffect.h>
 #include <GeometryUtil.h>
-#include <GlowEffect.h>
 #include <gpu/Batch.h>
 #include <gpu/GLBackend.h>
 #include <PathUtils.h>
@@ -31,6 +29,8 @@
 #include <SphereShape.h>
 
 #include "AnimationHandle.h"
+#include "DeferredLightingEffect.h"
+#include "GlowEffect.h"
 #include "Model.h"
 
 

libraries/render-utils/src/Model.h

@@ -21,16 +21,18 @@
 #include <AABox.h>
 #include <AnimationCache.h>
 #include <DependencyManager.h>
-#include <GeometryCache.h>
 #include <GeometryUtil.h>
-#include <JointState.h>
+#include <gpu/Stream.h>
+#include <gpu/Batch.h>
 #include <PhysicsEntity.h>
-#include <ProgramObject.h>
-#include <TextureCache.h>
 #include <Transform.h>
-#include <ViewStateInterface.h>
 
 #include "AnimationHandle.h"
+#include "GeometryCache.h"
+#include "JointState.h"
+#include "ProgramObject.h"
+#include "TextureCache.h"
+#include "ViewStateInterface.h"
 
 class QScriptEngine;
 
@@ -38,8 +40,6 @@ class Shape;
 #include "RenderArgs.h"
 class ViewFrustum;
 
-#include "gpu/Stream.h"
-#include "gpu/Batch.h"
 
 /// A generic 3D model displaying geometry loaded from a URL.
 class Model : public QObject, public PhysicsEntity {