From 195a289451c8d997d8523a60c45682badbf693ae Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 18 Dec 2012 10:56:05 -0500 Subject: [PATCH] move animationsequence.h --- src/animationsequence.h | 15 +++++++++++++++ src/assets/animationsequence.h | 15 --------------- src/chunks/animations.h | 2 +- src/chunks/chunks.cpp | 2 +- src/meshfile.cpp | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/animationsequence.h delete mode 100644 src/assets/animationsequence.h diff --git a/src/animationsequence.h b/src/animationsequence.h new file mode 100644 index 0000000..0fcfee4 --- /dev/null +++ b/src/animationsequence.h @@ -0,0 +1,15 @@ +#ifndef __ANIMATIONSEQUENCE_H_INCLUDED__ +#define __ANIMATIONSEQUENCE_H_INCLUDED__ + +#include "common.h" +#include + +class AnimationSequence +{ +public: + std::string name; + uint32_t start; + uint32_t end; +}; + +#endif diff --git a/src/assets/animationsequence.h b/src/assets/animationsequence.h deleted file mode 100644 index c1ba765..0000000 --- a/src/assets/animationsequence.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __ASSETS_ANIMATIONSEQUENCE_H_INCLUDED__ -#define __ASSETS_ANIMATIONSEQUENCE_H_INCLUDED__ - -#include "../common.h" -#include - -class AnimationSequence -{ -public: - std::string name; - uint32_t start; - uint32_t end; -}; - -#endif diff --git a/src/chunks/animations.h b/src/chunks/animations.h index 4f1a8c3..a6d6710 100644 --- a/src/chunks/animations.h +++ b/src/chunks/animations.h @@ -2,7 +2,7 @@ #define __CHUNKS_ANIMATIONS_H_INCLUDED__ #include "../common.h" -#include "../assets/animationsequence.h" +#include "../animationsequence.h" #include struct AnimationsChunk diff --git a/src/chunks/chunks.cpp b/src/chunks/chunks.cpp index e610822..e53800a 100644 --- a/src/chunks/chunks.cpp +++ b/src/chunks/chunks.cpp @@ -9,7 +9,7 @@ #include "jointtovertices.h" #include "keyframes.h" #include "animations.h" -#include "../assets/animationsequence.h" +#include "../animationsequence.h" #include "../geometry/group.h" #include "../geometry/joint.h" #include "../geometry/jointvertexinfo.h" diff --git a/src/meshfile.cpp b/src/meshfile.cpp index 62ab6ff..643b3f1 100644 --- a/src/meshfile.cpp +++ b/src/meshfile.cpp @@ -1,6 +1,6 @@ #include "meshfile.h" -#include "assets/animationsequence.h" +#include "animationsequence.h" #include "ms3d/ms3d.h" #include "chunks/animations.h" #include "chunks/chunks.h"