From 89101872bbc94998a92bd41a8da543963450a11b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 16 Dec 2014 14:04:39 -0800 Subject: [PATCH] move Model and AnimationHandle to libraries --- interface/src/avatar/FaceModel.h | 2 +- interface/src/avatar/Hand.h | 5 +++-- interface/src/avatar/ModelReferential.cpp | 3 +-- interface/src/avatar/MyAvatar.cpp | 2 +- interface/src/avatar/SkeletonModel.h | 3 ++- interface/src/avatar/SkeletonRagdoll.cpp | 2 +- interface/src/entities/EntityTreeRenderer.h | 2 +- interface/src/ui/overlays/ModelOverlay.h | 4 ++-- .../render-utils/src}/AnimationHandle.cpp | 0 .../render-utils/src}/AnimationHandle.h | 0 .../render-utils/src}/Model.cpp | 4 ++-- .../render-utils/src}/Model.h | 14 +++++++------- 12 files changed, 21 insertions(+), 20 deletions(-) rename {interface/src/renderer => libraries/render-utils/src}/AnimationHandle.cpp (100%) rename {interface/src/renderer => libraries/render-utils/src}/AnimationHandle.h (100%) rename {interface/src/renderer => libraries/render-utils/src}/Model.cpp (99%) rename {interface/src/renderer => libraries/render-utils/src}/Model.h (99%) diff --git a/interface/src/avatar/FaceModel.h b/interface/src/avatar/FaceModel.h index eaaa07e635..6c14beb587 100644 --- a/interface/src/avatar/FaceModel.h +++ b/interface/src/avatar/FaceModel.h @@ -12,7 +12,7 @@ #ifndef hifi_FaceModel_h #define hifi_FaceModel_h -#include "renderer/Model.h" +#include class Head; diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h index ed2fa3e1ab..688af151b4 100644 --- a/interface/src/avatar/Hand.h +++ b/interface/src/avatar/Hand.h @@ -11,6 +11,8 @@ #ifndef hifi_Hand_h #define hifi_Hand_h +#include "InterfaceConfig.h" + #include #include @@ -22,9 +24,8 @@ #include #include #include +#include -#include "InterfaceConfig.h" -#include "renderer/Model.h" #include "world.h" diff --git a/interface/src/avatar/ModelReferential.cpp b/interface/src/avatar/ModelReferential.cpp index df6e272da7..5b72fddae7 100644 --- a/interface/src/avatar/ModelReferential.cpp +++ b/interface/src/avatar/ModelReferential.cpp @@ -10,9 +10,8 @@ // #include - #include -#include "../renderer/Model.h" +#include #include "ModelReferential.h" diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 057b1f1fc6..6976e26e86 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -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; diff --git a/interface/src/avatar/SkeletonModel.h b/interface/src/avatar/SkeletonModel.h index ea732acfd5..0956d27b3f 100644 --- a/interface/src/avatar/SkeletonModel.h +++ b/interface/src/avatar/SkeletonModel.h @@ -12,9 +12,10 @@ #ifndef hifi_SkeletonModel_h #define hifi_SkeletonModel_h -#include "renderer/Model.h" #include +#include + #include "SkeletonRagdoll.h" class Avatar; diff --git a/interface/src/avatar/SkeletonRagdoll.cpp b/interface/src/avatar/SkeletonRagdoll.cpp index 7c0e056826..c944e0bd45 100644 --- a/interface/src/avatar/SkeletonRagdoll.cpp +++ b/interface/src/avatar/SkeletonRagdoll.cpp @@ -11,10 +11,10 @@ #include #include +#include #include "SkeletonRagdoll.h" #include "MuscleConstraint.h" -#include "../renderer/Model.h" SkeletonRagdoll::SkeletonRagdoll(Model* model) : Ragdoll(), _model(model) { assert(_model); diff --git a/interface/src/entities/EntityTreeRenderer.h b/interface/src/entities/EntityTreeRenderer.h index a8695db36d..87f45d5f56 100644 --- a/interface/src/entities/EntityTreeRenderer.h +++ b/interface/src/entities/EntityTreeRenderer.h @@ -17,6 +17,7 @@ #include #include // for RayToEntityIntersectionResult +#include #include #include #include @@ -25,7 +26,6 @@ #include #include -#include "renderer/Model.h" class EntityScriptDetails { public: diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h index 567498feb5..8cd095f778 100644 --- a/interface/src/ui/overlays/ModelOverlay.h +++ b/interface/src/ui/overlays/ModelOverlay.h @@ -12,9 +12,9 @@ #ifndef hifi_ModelOverlay_h #define hifi_ModelOverlay_h -#include "Base3DOverlay.h" +#include -#include "../../renderer/Model.h" +#include "Base3DOverlay.h" class ModelOverlay : public Base3DOverlay { Q_OBJECT diff --git a/interface/src/renderer/AnimationHandle.cpp b/libraries/render-utils/src/AnimationHandle.cpp similarity index 100% rename from interface/src/renderer/AnimationHandle.cpp rename to libraries/render-utils/src/AnimationHandle.cpp diff --git a/interface/src/renderer/AnimationHandle.h b/libraries/render-utils/src/AnimationHandle.h similarity index 100% rename from interface/src/renderer/AnimationHandle.h rename to libraries/render-utils/src/AnimationHandle.h diff --git a/interface/src/renderer/Model.cpp b/libraries/render-utils/src/Model.cpp similarity index 99% rename from interface/src/renderer/Model.cpp rename to libraries/render-utils/src/Model.cpp index 5f160d2e8d..16e6b1bf02 100644 --- a/interface/src/renderer/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -19,9 +19,7 @@ #include #include -#include #include -#include #include #include #include @@ -31,6 +29,8 @@ #include #include "AnimationHandle.h" +#include "DeferredLightingEffect.h" +#include "GlowEffect.h" #include "Model.h" diff --git a/interface/src/renderer/Model.h b/libraries/render-utils/src/Model.h similarity index 99% rename from interface/src/renderer/Model.h rename to libraries/render-utils/src/Model.h index 2c6b0bd6ae..d24f349f81 100644 --- a/interface/src/renderer/Model.h +++ b/libraries/render-utils/src/Model.h @@ -21,16 +21,18 @@ #include #include #include -#include #include -#include +#include +#include #include -#include -#include #include -#include #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 {