فهرست منبع

Revert "Remove wrap mode default value."

This reverts commit 3f832eb5d0c776a9627809a06ba97d7d1f222c8b.
Aster Jian 11 سال پیش
والد
کامیت
b7917af4fd

+ 1 - 1
Bin/Data/LuaScripts/30_LightAnimation.lua

@@ -65,7 +65,7 @@ function CreateScene()
     colorAnimation:SetKeyFrame(3.0, variant)
     variant:SetColor(Color.WHITE)
     colorAnimation:SetKeyFrame(4.0, variant)
-    light:SetAttributeAnimation("Color", colorAnimation, WM_LOOP)
+    light:SetAttributeAnimation("Color", colorAnimation)
 
     -- Create more StaticModel objects to the scene, randomly positioned, rotated and scaled. For rotation, we construct a
     -- quaternion from Euler angles where the Y angle (rotation about the Y axis) is randomized. The mushroom model contains

+ 1 - 1
Bin/Data/Scripts/30_LightAnimation.as

@@ -61,7 +61,7 @@ void CreateScene()
     colorAnimation.SetKeyFrame(2.0f, Variant(YELLOW));
     colorAnimation.SetKeyFrame(3.0f, Variant(GREEN));
     colorAnimation.SetKeyFrame(4.0f, Variant(WHITE));
-    light.SetAttributeAnimation("Color", colorAnimation, WM_LOOP);
+    light.SetAttributeAnimation("Color", colorAnimation);
 
     // Create more StaticModel objects to the scene, randomly positioned, rotated and scaled. For rotation, we construct a
     // quaternion from Euler angles where the Y angle (rotation about the Y axis) is randomized. The mushroom model contains

+ 1 - 1
Source/Engine/LuaScript/pkgs/Scene/Animatable.pkg

@@ -6,7 +6,7 @@ class Animatable : Serializable
 {
     void SetAnimationEnabled(bool enable);
     void SetObjectAnimation(ObjectAnimation* objectAnimation);
-    void SetAttributeAnimation(const String& name, AttributeAnimation* attributeAnimation, WrapMode wrapMode, float speed = 1.0f);
+    void SetAttributeAnimation(const String& name, AttributeAnimation* attributeAnimation, WrapMode wrapMode = WM_LOOP, float speed = 1.0f);
     void SetAttributeAnimationWrapMode(const String& name, WrapMode wrapMode);
     void SetAttributeAnimationSpeed(const String& name, float speed);
 

+ 1 - 1
Source/Engine/LuaScript/pkgs/Scene/ObjectAnimation.pkg

@@ -12,7 +12,7 @@ class ObjectAnimation : Resource
     ObjectAnimation();
     virtual ~ObjectAnimation();
     
-    void AddAttributeAnimation(const String name, AttributeAnimation* attributeAnimation, WrapMode wrapMode, float speed = 1.0f);
+    void AddAttributeAnimation(const String name, AttributeAnimation* attributeAnimation, WrapMode wrapMode = WM_LOOP, float speed = 1.0f);
     void RemoveAttributeAnimation(const String name);
     void RemoveAttributeAnimation(AttributeAnimation* attributeAnimation);
     AttributeAnimation* GetAttributeAnimation(const String name) const;

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

@@ -56,7 +56,7 @@ public:
     /// Set object animation.
     void SetObjectAnimation(ObjectAnimation* objectAnimation);
     /// Set attribute animation.
-    void SetAttributeAnimation(const String& name, AttributeAnimation* attributeAnimation, WrapMode wrapMode, float speed = 1.0f);
+    void SetAttributeAnimation(const String& name, AttributeAnimation* attributeAnimation, WrapMode wrapMode = WM_LOOP, float speed = 1.0f);
     /// Set attribute animation wrap mode.
     void SetAttributeAnimationWrapMode(const String& name, WrapMode wrapMode);
     /// Set attribute animation speed.

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

@@ -64,7 +64,7 @@ public:
     bool SaveXML(XMLElement& dest) const;
 
     /// Add attribute animation.
-    void AddAttributeAnimation(const String& name, AttributeAnimation* attributeAnimation, WrapMode wrapMode, float speed = 1.0f);
+    void AddAttributeAnimation(const String& name, AttributeAnimation* attributeAnimation, WrapMode wrapMode = WM_LOOP, float speed = 1.0f);
     /// Remove attribute animation.
     void RemoveAttributeAnimation(const String& name);
     /// Remove attribute animation.

+ 1 - 1
Source/Engine/Script/APITemplates.h

@@ -457,7 +457,7 @@ template <class T> void RegisterAnimatable(asIScriptEngine* engine, const char*
     engine->RegisterObjectMethod(className, "bool get_animationEnabled() const", asMETHODPR(T, GetAnimationEnabled, () const, bool), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "void set_objectAnimation(ObjectAnimation@+)", asMETHODPR(T, SetObjectAnimation, (ObjectAnimation*), void), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "ObjectAnimation@+ get_objectAnimation() const", asMETHODPR(T, GetObjectAnimation, () const, ObjectAnimation*), asCALL_THISCALL);
-    engine->RegisterObjectMethod(className, "void SetAttributeAnimation(const String&in, AttributeAnimation@+, WrapMode wrapMode, float speed=1.0f)", asMETHODPR(T, SetAttributeAnimation, (const String&, AttributeAnimation*, WrapMode, float), void), asCALL_THISCALL);
+    engine->RegisterObjectMethod(className, "void SetAttributeAnimation(const String&in, AttributeAnimation@+, WrapMode wrapMode=WM_LOOP, float speed=1.0f)", asMETHODPR(T, SetAttributeAnimation, (const String&, AttributeAnimation*, WrapMode, float), void), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "AttributeAnimation@+ GetAttributeAnimation(const String&in) const", asMETHODPR(T, GetAttributeAnimation, (const String&) const, AttributeAnimation*), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "void SetAttributeAnimationWrapMode(const String&in, WrapMode)", asMETHODPR(T, SetAttributeAnimationWrapMode, (const String&, WrapMode), void), asCALL_THISCALL);
     engine->RegisterObjectMethod(className, "WrapMode GetAttributeAnimationWrapMode(const String&in) const", asMETHODPR(T, GetAttributeAnimationWrapMode, (const String&) const, WrapMode), asCALL_THISCALL);

+ 1 - 1
Source/Engine/Script/SceneAPI.cpp

@@ -52,7 +52,7 @@ static void RegisterObjectAnimation(asIScriptEngine* engine)
     engine->RegisterEnumValue("WrapMode", "WM_CLAMP", WM_CLAMP);
 
     RegisterResource<ObjectAnimation>(engine, "ObjectAnimation");
-    engine->RegisterObjectMethod("ObjectAnimation", "void AddAttributeAnimation(const String&, AttributeAnimation@+, WrapMode wrapMode, float speed=1.0f)", asMETHOD(ObjectAnimation, AddAttributeAnimation), asCALL_THISCALL);
+    engine->RegisterObjectMethod("ObjectAnimation", "void AddAttributeAnimation(const String&, AttributeAnimation@+, WrapMode wrapMode=WM_LOOP, float speed=1.0f)", asMETHOD(ObjectAnimation, AddAttributeAnimation), asCALL_THISCALL);
     engine->RegisterObjectMethod("ObjectAnimation", "void RemoveAttributeAnimation(const String&)", asMETHODPR(ObjectAnimation, RemoveAttributeAnimation, (const String&), void), asCALL_THISCALL);
     engine->RegisterObjectMethod("ObjectAnimation", "void RemoveAttributeAnimation(AttributeAnimation@+)", asMETHODPR(ObjectAnimation, RemoveAttributeAnimation, (AttributeAnimation*), void), asCALL_THISCALL);
     engine->RegisterObjectMethod("ObjectAnimation", "AttributeAnimation@+ GetAttributeAnimation(const String&in) const", asMETHODPR(ObjectAnimation, GetAttributeAnimation, (const String&) const, AttributeAnimation*), asCALL_THISCALL);

+ 1 - 1
Source/Samples/30_LightAnimation/LightAnimation.cpp

@@ -104,7 +104,7 @@ void LightAnimation::CreateScene()
     colorAnimation->SetKeyFrame(2.0f, Color::YELLOW);
     colorAnimation->SetKeyFrame(3.0f, Color::GREEN);
     colorAnimation->SetKeyFrame(4.0f, Color::WHITE);
-    light->SetAttributeAnimation("Color", colorAnimation, WM_LOOP);
+    light->SetAttributeAnimation("Color", colorAnimation);
 
     // Create more StaticModel objects to the scene, randomly positioned, rotated and scaled. For rotation, we construct a
     // quaternion from Euler angles where the Y angle (rotation about the Y axis) is randomized. The mushroom model contains