Ver código fonte

Move wrap mode out of ObjectAnimation.h.[ci skip]

aster2013 11 anos atrás
pai
commit
f8bce6a56e

+ 1 - 1
Source/Engine/Scene/Animatable.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
+#include "AttributeAnimationDefs.h"
 #include "HashSet.h"
 #include "Serializable.h"
-#include "ObjectAnimation.h"
 
 namespace Urho3D
 {

+ 40 - 0
Source/Engine/Scene/AttributeAnimationDefs.h

@@ -0,0 +1,40 @@
+//
+// Copyright (c) 2008-2014 the Urho3D project.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#pragma once
+
+namespace Urho3D
+{
+
+/// Animation wrap mode.
+enum WrapMode
+{
+    /// Loop mode.
+    WM_LOOP = 0,
+    /// Play once, when animation finished it will be removed.
+    WM_ONCE,
+    /// Clamp mode.
+    WM_CLAMP,
+};
+
+}
+

+ 1 - 1
Source/Engine/Scene/AttributeAnimationInfo.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
+#include "AttributeAnimationDefs.h"
 #include "RefCounted.h"
-#include "ObjectAnimation.h"
 
 namespace Urho3D
 {

+ 1 - 11
Source/Engine/Scene/ObjectAnimation.h

@@ -22,6 +22,7 @@
 
 #pragma once
 
+#include "AttributeAnimationDefs.h"
 #include "Resource.h"
 
 namespace Urho3D
@@ -30,17 +31,6 @@ namespace Urho3D
 class AttributeAnimation;
 class AttributeAnimationInfo;
 
-/// Animation wrap mode.
-enum WrapMode
-{
-    /// Loop mode.
-    WM_LOOP = 0,
-    /// Play once, when animation finished it will be removed.
-    WM_ONCE,
-    /// Clamp mode.
-    WM_CLAMP,
-};
-
 /// Object animation class, an object animation include one or more attribute animations and theirs wrap mode and speed for an Animatable object.
 class URHO3D_API ObjectAnimation : public Resource
 {