Rename XAnimationSet2D to AnimationSet2D, Rename XAnimatedSprite2D to AnimatedSprite2D.

Bin/Data/LuaScripts/24_Urho2DSprite.lua

@@ -92,7 +92,7 @@ function CreateScene()
         end
     end
 
-    local animationSet = cache:GetResource("XAnimationSet2D", "Urho2D/GoldIcon.scml")
+    local animationSet = cache:GetResource("AnimationSet2D", "Urho2D/GoldIcon.scml")
     if animationSet == nil then
         return
     end
@@ -100,7 +100,7 @@ function CreateScene()
     local spriteNode = scene_:CreateChild("AnimatedSprite2D")
     spriteNode.position = Vector3(0.0, 0.0, -1.0)
 
-    local animatedSprite = spriteNode:CreateComponent("XAnimatedSprite2D")
+    local animatedSprite = spriteNode:CreateComponent("AnimatedSprite2D")
     -- Set animation
     animatedSprite:SetAnimation(animationSet, "idle")
 end

Bin/Data/LuaScripts/33_Urho2DSpriterAnimation.lua

@@ -54,7 +54,7 @@ function CreateScene()
     camera.orthographic = true
     camera.orthoSize = graphics.height * PIXEL_SIZE
 
-    local animationSet = cache:GetResource("XAnimationSet2D", "Urho2D/imp/imp.scml")
+    local animationSet = cache:GetResource("AnimationSet2D", "Urho2D/imp/imp.scml")
     if animationSet == nil then
         return
     end
@@ -62,7 +62,7 @@ function CreateScene()
     spriteNode = scene_:CreateChild("SpriterAnimation")
     spriteNode.position = Vector3(-1.4, 2.0, 0.0)
 
-    local animatedSprite = spriteNode:CreateComponent("XAnimatedSprite2D")
+    local animatedSprite = spriteNode:CreateComponent("AnimatedSprite2D")
     animatedSprite:SetAnimation(animationSet, animationNames[animationIndex + 1])
 end
 
@@ -138,7 +138,7 @@ function HandleUpdate(eventType, eventData)
 end
 
 function HandleMouseButtonDown(eventType, eventData)
-    local animatedSprite = spriteNode:GetComponent("XAnimatedSprite2D")
+    local animatedSprite = spriteNode:GetComponent("AnimatedSprite2D")
     animationIndex = (animationIndex + 1) % 7
     animatedSprite.animation = animationNames[animationIndex + 1]
 end

Bin/Data/Scripts/24_Urho2DSprite.as

@@ -78,13 +78,13 @@ void CreateScene()
         spriteNodes.Push(spriteNode);
     }
 
-    XAnimationSet2D@ animationSet = cache.GetResource("XAnimationSet2D", "Urho2D/GoldIcon.scml");
+    AnimationSet2D@ animationSet = cache.GetResource("AnimationSet2D", "Urho2D/GoldIcon.scml");
     if (animationSet is null)
         return;
     Node@ spriteNode = scene_.CreateChild("AnimatedSprite2D");
     spriteNode.position = Vector3(0.0f, 0.0f, -1.0f);
 
-    XAnimatedSprite2D@ animatedSprite = spriteNode.CreateComponent("XAnimatedSprite2D");
+    AnimatedSprite2D@ animatedSprite = spriteNode.CreateComponent("AnimatedSprite2D");
     // Set animation
     animatedSprite.SetAnimation(animationSet, "idle");
 }

Bin/Data/Scripts/33_Urho2DSpriterAnimation.as

@@ -58,14 +58,14 @@ void CreateScene()
     camera.orthographic = true;
     camera.orthoSize = graphics.height * PIXEL_SIZE;
 
-    XAnimationSet2D@ animationSet = cache.GetResource("XAnimationSet2D", "Urho2D/imp/imp.scml");
+    AnimationSet2D@ animationSet = cache.GetResource("AnimationSet2D", "Urho2D/imp/imp.scml");
     if (animationSet is null)
         return;
 
     spriteNode = scene_.CreateChild("SpriterAnimation");
     spriteNode.position = Vector3(-1.4f, 2.0f, 0.0f);
 
-    XAnimatedSprite2D@ animatedSprite = spriteNode.CreateComponent("XAnimatedSprite2D");
+    AnimatedSprite2D@ animatedSprite = spriteNode.CreateComponent("AnimatedSprite2D");
     animatedSprite.SetAnimation(animationSet, animationNames[animationIndex]);
 }
 
@@ -144,7 +144,7 @@ void HandleUpdate(StringHash eventType, VariantMap& eventData)
 
 void HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
 {
-    XAnimatedSprite2D@ animatedSprite = spriteNode.GetComponent("XAnimatedSprite2D");
+    AnimatedSprite2D@ animatedSprite = spriteNode.GetComponent("AnimatedSprite2D");
     animationIndex = (animationIndex + 1) % 7;
     animatedSprite.animation = animationNames[animationIndex];
 }

Bin/Data/Scripts/Editor/AttributeEditor.as

@@ -883,8 +883,8 @@ void InitResourcePicker()
     Array<String> soundFilters = {"*.wav","*.ogg"};
     Array<String> textureFilters = {"*.dds", "*.png", "*.jpg", "*.bmp", "*.tga", "*.ktx", "*.pvr"};
     Array<String> materialFilters = {"*.xml", "*.material"};
-    Array<String> pexFilters = {"*.pex"};
     Array<String> anmSetFilters = {"*.scml"};
+    Array<String> pexFilters = {"*.pex"};
     resourcePickers.Push(ResourcePicker("Animation", "*.ani", ACTION_PICK | ACTION_TEST));
     resourcePickers.Push(ResourcePicker("Font", fontFilters));
     resourcePickers.Push(ResourcePicker("Image", imageFilters));
@@ -898,8 +898,8 @@ void InitResourcePicker()
     resourcePickers.Push(ResourcePicker("TextureCube", "*.xml"));
     resourcePickers.Push(ResourcePicker("XMLFile", "*.xml"));
     resourcePickers.Push(ResourcePicker("Sprite2D", textureFilters, ACTION_PICK | ACTION_OPEN));
+    resourcePickers.Push(ResourcePicker("AnimationSet2D", anmSetFilters, ACTION_PICK | ACTION_OPEN));
     resourcePickers.Push(ResourcePicker("ParticleEffect2D", pexFilters, ACTION_PICK | ACTION_OPEN));
-    resourcePickers.Push(ResourcePicker("XAnimationSet2D", anmSetFilters, ACTION_PICK | ACTION_OPEN));
 }
 
 ResourcePicker@ GetResourcePicker(ShortStringHash resourceType)

Bin/Data/UI/EditorIcons.xml

@@ -251,7 +251,7 @@
         <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 16 62 30" />
     </element>
-    <element type="XAnimatedSprite2D">
+    <element type="AnimatedSprite2D">
         <attribute name="Texture" value="Texture2D;Textures/Editor/EditorIcons.png" />
         <attribute name="Image Rect" value="48 16 62 30" />
     </element>

Source/Engine/LuaScript/pkgs/Urho2D/XAnimatedSprite2D.pkg → Source/Engine/LuaScript/pkgs/Urho2D/AnimatedSprite2D.pkg

@@ -1,26 +1,26 @@
-$#include "XAnimatedSprite2D.h"
+$#include "AnimatedSprite2D.h"
 
-class XAnimatedSprite2D : Drawable
+class AnimatedSprite2D : Drawable
 {
     void SetLayer(int layer);
     void SetOrderInLayer(int orderInLayer);
     void SetBlendMode(BlendMode mode);
     void SetSpeed(float speed);
     void SetAnimation(const String name);
-    void SetAnimation(XAnimationSet2D* animationSet, const String name);
-    void SetAnimationSet(XAnimationSet2D* animationSet);
+    void SetAnimation(AnimationSet2D* animationSet, const String name);
+    void SetAnimationSet(AnimationSet2D* animationSet);
 
     int GetLayer() const;
     int GetOrderInLayer() const;
     BlendMode GetBlendMode() const;
     float GetSpeed() const;
-    XAnimationSet2D* GetAnimationSet() const;
+    AnimationSet2D* GetAnimationSet() const;
     const String GetAnimation() const;
 
     tolua_property__get_set int layer;
     tolua_property__get_set int orderInLayer;
     tolua_property__get_set BlendMode blendMode;
     tolua_property__get_set float speed;
-    tolua_property__get_set XAnimationSet2D* animationSet;
+    tolua_property__get_set AnimationSet2D* animationSet;
     tolua_property__get_set String animation;
 };

Source/Engine/LuaScript/pkgs/Urho2D/XAnimationSet2D.pkg → Source/Engine/LuaScript/pkgs/Urho2D/AnimationSet2D.pkg

@@ -1,6 +1,6 @@
-$#include "XAnimationSet2D.h"
+$#include "AnimationSet2D.h"
 
-class XAnimationSet2D : Resource
+class AnimationSet2D : Resource
 {
     unsigned GetNumAnimations() const;
     Animation2D* GetAnimation(unsigned index) const;

Source/Engine/LuaScript/pkgs/Urho2DLuaAPI.pkg

@@ -1,12 +1,14 @@
 $pfile "Urho2D/Sprite2D.pkg"
 $pfile "Urho2D/SpriteSheet2D.pkg"
-$pfile "Urho2D/Animation2D.pkg"
 $pfile "Urho2D/Drawable2D.pkg"
 $pfile "Urho2D/StaticSprite2D.pkg"
+
+$pfile "Urho2D/Animation2D.pkg"
+$pfile "Urho2D/AnimationSet2D.pkg"
+$pfile "Urho2D/AnimatedSprite2D.pkg"
+
 $pfile "Urho2D/ParticleEffect2D.pkg"
 $pfile "Urho2D/ParticleEmitter2D.pkg"
-$pfile "Urho2D/XAnimationSet2D.pkg"
-$pfile "Urho2D/XAnimatedSprite2D.pkg"
 
 $pfile "Urho2D/RigidBody2D.pkg"
 $pfile "Urho2D/PhysicsWorld2D.pkg"

Source/Engine/Script/Urho2DAPI.cpp

@@ -22,6 +22,8 @@
 
 #include "Precompiled.h"
 #include "Animation2D.h"
+#include "AnimationSet2D.h"
+#include "AnimatedSprite2D.h"
 #include "APITemplates.h"
 #include "CollisionBox2D.h"
 #include "CollisionChain2D.h"
@@ -50,8 +52,6 @@
 #include "Sprite2D.h"
 #include "SpriteSheet2D.h"
 #include "StaticSprite2D.h"
-#include "XAnimationSet2D.h"
-#include "XAnimatedSprite2D.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4345)
@@ -123,6 +123,40 @@ static void RegisterStaticSprite2D(asIScriptEngine* engine)
     RegisterStaticSprite2D<StaticSprite2D>(engine, "StaticSprite2D");
 }
 
+static void RegisterAnimation2D(asIScriptEngine* engine)
+{
+    RegisterRefCounted<Animation2D>(engine, "Animation2D");
+    engine->RegisterObjectMethod("Animation2D", "const String& get_name() const", asMETHOD(Animation2D, GetName), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Animation2D", "float get_length() const", asMETHOD(Animation2D, GetLength), asCALL_THISCALL);
+    engine->RegisterObjectMethod("Animation2D", "bool get_looped() const", asMETHOD(Animation2D, IsLooped), asCALL_THISCALL);
+}
+
+static void RegisterAnimationSet2D(asIScriptEngine* engine)
+{
+    RegisterResource<AnimationSet2D>(engine, "AnimationSet2D");
+    engine->RegisterObjectMethod("AnimationSet2D", "uint get_numAnimations() const", asMETHOD(AnimationSet2D, GetNumAnimations), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimationSet2D", "Animation2D@+ GetAnimation(uint) const", asMETHODPR(AnimationSet2D, GetAnimation, (unsigned) const, Animation2D*), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimationSet2D", "Animation2D@+ GetAnimation(const String&) const", asMETHODPR(AnimationSet2D, GetAnimation, (const String&) const, Animation2D*), asCALL_THISCALL);
+}
+
+static void RegisterAnimatedSprite2D(asIScriptEngine* engine)
+{
+    RegisterDrawable<AnimatedSprite2D>(engine, "AnimatedSprite2D");
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void set_layer(int)", asMETHOD(AnimatedSprite2D, SetLayer), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "int get_layer() const", asMETHOD(AnimatedSprite2D, GetLayer), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void set_orderInLayer(int)", asMETHOD(AnimatedSprite2D, SetOrderInLayer), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "int get_orderInLayer() const", asMETHOD(AnimatedSprite2D, GetOrderInLayer), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void set_blendMode(BlendMode)", asMETHOD(AnimatedSprite2D, SetBlendMode), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "BlendMode get_blendMode() const", asMETHOD(AnimatedSprite2D, GetBlendMode), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void set_speed(float)", asMETHOD(AnimatedSprite2D, SetSpeed), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "float get_speed() const", asMETHOD(AnimatedSprite2D, GetSpeed), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void SetAnimation(AnimationSet2D@+, const String&)", asMETHODPR(AnimatedSprite2D, SetAnimation, (AnimationSet2D*, const String&), void), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void set_animationSet(AnimationSet2D@+)", asMETHOD(AnimatedSprite2D, SetAnimationSet), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "AnimationSet2D@+ get_animationSet() const", asMETHOD(AnimatedSprite2D, GetAnimationSet), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "void set_animation(const String&)", asMETHODPR(AnimatedSprite2D, SetAnimation, (const String&), void), asCALL_THISCALL);
+    engine->RegisterObjectMethod("AnimatedSprite2D", "const String& get_animation() const", asMETHOD(AnimatedSprite2D, GetAnimation), asCALL_THISCALL);
+}
+
 static void RegisterParticleEffect2D(asIScriptEngine* engine)
 {
     engine->RegisterEnum("EmitterType2D");
@@ -139,40 +173,6 @@ static void RegisterParticleEmitter2D(asIScriptEngine* engine)
     engine->RegisterObjectMethod("ParticleEmitter2D", "ParticleEffect2D@+ get_effect() const", asMETHOD(ParticleEmitter2D, GetEffect), asCALL_THISCALL);
 }
 
-static void RegisterAnimation2D(asIScriptEngine* engine)
-{
-    RegisterRefCounted<Animation2D>(engine, "AnimationX2D");
-    engine->RegisterObjectMethod("AnimationX2D", "const String& get_name() const", asMETHOD(Animation2D, GetName), asCALL_THISCALL);
-    engine->RegisterObjectMethod("AnimationX2D", "float get_length() const", asMETHOD(Animation2D, GetLength), asCALL_THISCALL);
-    engine->RegisterObjectMethod("AnimationX2D", "bool get_looped() const", asMETHOD(Animation2D, IsLooped), asCALL_THISCALL);
-
-}
-static void RegisterXAnimationSet2D(asIScriptEngine* engine)
-{
-    RegisterResource<XAnimationSet2D>(engine, "XAnimationSet2D");
-    engine->RegisterObjectMethod("XAnimationSet2D", "uint get_numAnimations() const", asMETHOD(XAnimationSet2D, GetNumAnimations), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimationSet2D", "AnimationX2D@+ GetAnimation(uint) const", asMETHODPR(XAnimationSet2D, GetAnimation, (unsigned) const, Animation2D*), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimationSet2D", "AnimationX2D@+ GetAnimation(const String&) const", asMETHODPR(XAnimationSet2D, GetAnimation, (const String&) const, Animation2D*), asCALL_THISCALL);
-}
-
-static void RegisterXAnimatedSprite2D(asIScriptEngine* engine)
-{
-    RegisterDrawable<XAnimatedSprite2D>(engine, "XAnimatedSprite2D");
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void set_layer(int)", asMETHOD(XAnimatedSprite2D, SetLayer), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "int get_layer() const", asMETHOD(XAnimatedSprite2D, GetLayer), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void set_orderInLayer(int)", asMETHOD(XAnimatedSprite2D, SetOrderInLayer), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "int get_orderInLayer() const", asMETHOD(XAnimatedSprite2D, GetOrderInLayer), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void set_blendMode(BlendMode)", asMETHOD(XAnimatedSprite2D, SetBlendMode), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "BlendMode get_blendMode() const", asMETHOD(XAnimatedSprite2D, GetBlendMode), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void set_speed(float)", asMETHOD(XAnimatedSprite2D, SetSpeed), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "float get_speed() const", asMETHOD(XAnimatedSprite2D, GetSpeed), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void SetAnimation(XAnimationSet2D@+, const String&)", asMETHODPR(XAnimatedSprite2D, SetAnimation, (XAnimationSet2D*, const String&), void), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void set_animationSet(XAnimationSet2D@+)", asMETHOD(XAnimatedSprite2D, SetAnimationSet), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "XAnimationSet2D@+ get_animationSet() const", asMETHOD(XAnimatedSprite2D, GetAnimationSet), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "void set_animation(const String&)", asMETHODPR(XAnimatedSprite2D, SetAnimation, (const String&), void), asCALL_THISCALL);
-    engine->RegisterObjectMethod("XAnimatedSprite2D", "const String& get_animation() const", asMETHOD(XAnimatedSprite2D, GetAnimation), asCALL_THISCALL);
-}
-
 static void RegisterRigidBody2D(asIScriptEngine* engine)
 {
     engine->RegisterEnum("BodyType2D");
@@ -602,11 +602,13 @@ void RegisterUrho2DAPI(asIScriptEngine* engine)
     RegisterSpriteSheet2D(engine);
     RegisterDrawable2D(engine);
     RegisterStaticSprite2D(engine);
+
+    RegisterAnimation2D(engine);
+    RegisterAnimationSet2D(engine);
+    RegisterAnimatedSprite2D(engine);
+
     RegisterParticleEffect2D(engine);
     RegisterParticleEmitter2D(engine);
-    RegisterAnimation2D(engine);
-    RegisterXAnimationSet2D(engine);
-    RegisterXAnimatedSprite2D(engine);
 
     RegisterRigidBody2D(engine);
     RegisterPhysicsWorld2D(engine);

Source/Engine/Urho2D/XAnimatedSprite2D.cpp → Source/Engine/Urho2D/AnimatedSprite2D.cpp

@@ -21,15 +21,15 @@
 //
 
 #include "Precompiled.h"
+#include "AnimatedSprite2D.h"
 #include "Animation2D.h"
+#include "AnimationSet2D.h"
 #include "Context.h"
 #include "ResourceCache.h"
 #include "Scene.h"
 #include "SceneEvents.h"
 #include "Sprite2D.h"
 #include "StaticSprite2D.h"
-#include "XAnimatedSprite2D.h"
-#include "XAnimationSet2D.h"
 
 #include "DebugNew.h"
 
@@ -39,7 +39,7 @@ namespace Urho3D
 extern const char* URHO2D_CATEGORY;
 extern const char* blendModeNames[];
 
-XAnimatedSprite2D::XAnimatedSprite2D(Context* context) :
+AnimatedSprite2D::AnimatedSprite2D(Context* context) :
     Drawable(context, DRAWABLE_GEOMETRY),
     layer_(0),
     orderInLayer_(0),
@@ -49,23 +49,23 @@ XAnimatedSprite2D::XAnimatedSprite2D(Context* context) :
 {
 }
 
-XAnimatedSprite2D::~XAnimatedSprite2D()
+AnimatedSprite2D::~AnimatedSprite2D()
 {
 }
 
-void XAnimatedSprite2D::RegisterObject(Context* context)
+void AnimatedSprite2D::RegisterObject(Context* context)
 {
-    context->RegisterFactory<XAnimatedSprite2D>(URHO2D_CATEGORY);
-    ACCESSOR_ATTRIBUTE(XAnimatedSprite2D, VAR_INT, "Layer", GetLayer, SetLayer, int, 0, AM_DEFAULT);
-    ACCESSOR_ATTRIBUTE(XAnimatedSprite2D, VAR_INT, "Order in Layer", GetOrderInLayer, SetOrderInLayer, int, 0, AM_DEFAULT);
-    ENUM_ACCESSOR_ATTRIBUTE(XAnimatedSprite2D, "Blend Mode", GetBlendMode, SetBlendMode, BlendMode, blendModeNames, BLEND_ALPHA, AM_DEFAULT);
-    ACCESSOR_ATTRIBUTE(XAnimatedSprite2D, VAR_FLOAT, "Speed", GetSpeed, SetSpeed, float, 1.0f, AM_DEFAULT);
-    ACCESSOR_ATTRIBUTE(XAnimatedSprite2D, VAR_RESOURCEREF, "Animation Set", GetAnimationSetAttr, SetAnimationSetAttr, ResourceRef, ResourceRef(XAnimatedSprite2D::GetTypeStatic()), AM_DEFAULT);
-    REF_ACCESSOR_ATTRIBUTE(XAnimatedSprite2D, VAR_STRING, "Animation", GetAnimation, SetAnimation, String, String::EMPTY, AM_DEFAULT);
+    context->RegisterFactory<AnimatedSprite2D>(URHO2D_CATEGORY);
+    ACCESSOR_ATTRIBUTE(AnimatedSprite2D, VAR_INT, "Layer", GetLayer, SetLayer, int, 0, AM_DEFAULT);
+    ACCESSOR_ATTRIBUTE(AnimatedSprite2D, VAR_INT, "Order in Layer", GetOrderInLayer, SetOrderInLayer, int, 0, AM_DEFAULT);
+    ENUM_ACCESSOR_ATTRIBUTE(AnimatedSprite2D, "Blend Mode", GetBlendMode, SetBlendMode, BlendMode, blendModeNames, BLEND_ALPHA, AM_DEFAULT);
+    ACCESSOR_ATTRIBUTE(AnimatedSprite2D, VAR_FLOAT, "Speed", GetSpeed, SetSpeed, float, 1.0f, AM_DEFAULT);
+    ACCESSOR_ATTRIBUTE(AnimatedSprite2D, VAR_RESOURCEREF, "Animation Set", GetAnimationSetAttr, SetAnimationSetAttr, ResourceRef, ResourceRef(AnimatedSprite2D::GetTypeStatic()), AM_DEFAULT);
+    REF_ACCESSOR_ATTRIBUTE(AnimatedSprite2D, VAR_STRING, "Animation", GetAnimation, SetAnimation, String, String::EMPTY, AM_DEFAULT);
     COPY_BASE_ATTRIBUTES(Drawable2D, Drawable);
 }
 
-void XAnimatedSprite2D::OnSetEnabled()
+void AnimatedSprite2D::OnSetEnabled()
 {
     Drawable::OnSetEnabled();
 
@@ -73,13 +73,13 @@ void XAnimatedSprite2D::OnSetEnabled()
     if (scene)
     {
         if (IsEnabledEffective())
-            SubscribeToEvent(scene, E_SCENEPOSTUPDATE, HANDLER(XAnimatedSprite2D, HandleScenePostUpdate));
+            SubscribeToEvent(scene, E_SCENEPOSTUPDATE, HANDLER(AnimatedSprite2D, HandleScenePostUpdate));
         else
             UnsubscribeFromEvent(scene, E_SCENEPOSTUPDATE);
     }
 }
 
-void XAnimatedSprite2D::SetLayer(int layer)
+void AnimatedSprite2D::SetLayer(int layer)
 {
     if (layer == layer_)
         return;
@@ -93,12 +93,12 @@ void XAnimatedSprite2D::SetLayer(int layer)
     }
 }
 
-void XAnimatedSprite2D::SetOrderInLayer(int orderInLayer)
+void AnimatedSprite2D::SetOrderInLayer(int orderInLayer)
 {
     orderInLayer_ = orderInLayer;
 }
 
-void XAnimatedSprite2D::SetBlendMode(BlendMode blendMode)
+void AnimatedSprite2D::SetBlendMode(BlendMode blendMode)
 {
     if (blendMode == blendMode_)
         return;
@@ -112,13 +112,13 @@ void XAnimatedSprite2D::SetBlendMode(BlendMode blendMode)
     }
 }
 
-void XAnimatedSprite2D::SetSpeed(float speed)
+void AnimatedSprite2D::SetSpeed(float speed)
 {
     speed_ = speed;
     MarkNetworkUpdate();
 }
 
-void XAnimatedSprite2D::SetAnimation(XAnimationSet2D* animationSet, const String& name)
+void AnimatedSprite2D::SetAnimation(AnimationSet2D* animationSet, const String& name)
 {
     animationSet_ = animationSet;
     animationName_ = name;
@@ -129,7 +129,7 @@ void XAnimatedSprite2D::SetAnimation(XAnimationSet2D* animationSet, const String
         SetAnimation(0);
 }
 
-void XAnimatedSprite2D::SetAnimationSet(XAnimationSet2D* animationSet)
+void AnimatedSprite2D::SetAnimationSet(AnimationSet2D* animationSet)
 {
     if (animationSet == animationSet_)
         return;
@@ -142,7 +142,7 @@ void XAnimatedSprite2D::SetAnimationSet(XAnimationSet2D* animationSet)
         SetAnimation(0);
 
 }
-void XAnimatedSprite2D::SetAnimation(const String& name)
+void AnimatedSprite2D::SetAnimation(const String& name)
 {
     animationName_ = name;
 
@@ -150,24 +150,24 @@ void XAnimatedSprite2D::SetAnimation(const String& name)
         SetAnimation(animationSet_->GetAnimation(animationName_));
 }
 
-XAnimationSet2D* XAnimatedSprite2D::GetAnimationSet() const
+AnimationSet2D* AnimatedSprite2D::GetAnimationSet() const
 {
     return animationSet_;
 }
 
 
-void XAnimatedSprite2D::SetAnimationSetAttr(ResourceRef value)
+void AnimatedSprite2D::SetAnimationSetAttr(ResourceRef value)
 {
-    ResourceCache* cache = GetSubsystem<ResourceCache>();
-    SetAnimationSet(cache->GetResource<XAnimationSet2D>(value.name_));
+    ResourceCache* cache = GetSubsystem<ResourceCache>();
+    SetAnimationSet(cache->GetResource<AnimationSet2D>(value.name_));
 }
 
-Urho3D::ResourceRef XAnimatedSprite2D::GetAnimationSetAttr() const
+Urho3D::ResourceRef AnimatedSprite2D::GetAnimationSetAttr() const
 {
-    return GetResourceRef(animationSet_, XAnimationSet2D::GetTypeStatic());
+    return GetResourceRef(animationSet_, AnimationSet2D::GetTypeStatic());
 }
 
-void XAnimatedSprite2D::OnNodeSet(Node* node)
+void AnimatedSprite2D::OnNodeSet(Node* node)
 {
     Drawable::OnNodeSet(node);
 
@@ -175,11 +175,11 @@ void XAnimatedSprite2D::OnNodeSet(Node* node)
     {
         Scene* scene = GetScene();
         if (scene && IsEnabledEffective())
-            SubscribeToEvent(scene, E_SCENEPOSTUPDATE, HANDLER(XAnimatedSprite2D, HandleScenePostUpdate));
+            SubscribeToEvent(scene, E_SCENEPOSTUPDATE, HANDLER(AnimatedSprite2D, HandleScenePostUpdate));
     }
 }
 
-void XAnimatedSprite2D::OnWorldBoundingBoxUpdate()
+void AnimatedSprite2D::OnWorldBoundingBoxUpdate()
 {
     boundingBox_.Clear();
     worldBoundingBox_.Clear();
@@ -195,7 +195,7 @@ void XAnimatedSprite2D::OnWorldBoundingBoxUpdate()
 
 
 
-void XAnimatedSprite2D::SetAnimation(Animation2D* animation)
+void AnimatedSprite2D::SetAnimation(Animation2D* animation)
 {
     if (animation == animation_)
     {
@@ -236,7 +236,7 @@ void XAnimatedSprite2D::SetAnimation(Animation2D* animation)
     MarkNetworkUpdate();
 }
 
-void XAnimatedSprite2D::UpdateAnimation(float timeStep)
+void AnimatedSprite2D::UpdateAnimation(float timeStep)
 {
     if (!animation_)
         return;
@@ -324,7 +324,7 @@ void XAnimatedSprite2D::UpdateAnimation(float timeStep)
     MarkForUpdate();
 }
 
-void XAnimatedSprite2D::HandleScenePostUpdate(StringHash eventType, VariantMap& eventData)
+void AnimatedSprite2D::HandleScenePostUpdate(StringHash eventType, VariantMap& eventData)
 {
     using namespace ScenePostUpdate;
     float timeStep = eventData[P_TIMESTEP].GetFloat();

Source/Engine/Urho2D/XAnimatedSprite2D.h → Source/Engine/Urho2D/AnimatedSprite2D.h

@@ -27,19 +27,19 @@
 namespace Urho3D
 {
 
-class XAnimationSet2D;
+class AnimationSet2D;
 class Animation2D;
 
 /// Spriter animation component.
-class URHO3D_API XAnimatedSprite2D : public Drawable
+class URHO3D_API AnimatedSprite2D : public Drawable
 {
-    OBJECT(XAnimatedSprite2D);
+    OBJECT(AnimatedSprite2D);
 
 public:
     /// Construct.
-    XAnimatedSprite2D(Context* context);
+    AnimatedSprite2D(Context* context);
     /// Destruct.
-    ~XAnimatedSprite2D();
+    ~AnimatedSprite2D();
     /// Register object factory.
     static void RegisterObject(Context* context);
 
@@ -55,9 +55,9 @@ public:
     /// Set speed.
     void SetSpeed(float speed);
     /// Set animation by animation set and name.
-    void SetAnimation(XAnimationSet2D* animationSet, const String& name);
+    void SetAnimation(AnimationSet2D* animationSet, const String& name);
     /// Set animation set.
-    void SetAnimationSet(XAnimationSet2D* animationSet);
+    void SetAnimationSet(AnimationSet2D* animationSet);
     /// Set animation by name.
     void SetAnimation(const String& name);
 
@@ -70,7 +70,7 @@ public:
     /// Return speed.
     float GetSpeed() const { return speed_; }
     /// Return animation.
-    XAnimationSet2D* GetAnimationSet() const;
+    AnimationSet2D* GetAnimationSet() const;
     /// Return animation name.
     const String& GetAnimation() const { return animationName_; }
 
@@ -100,7 +100,7 @@ protected:
     /// Speed.
     float speed_;
     /// Animation set.
-    SharedPtr<XAnimationSet2D> animationSet_;
+    SharedPtr<AnimationSet2D> animationSet_;
     /// Animation name.
     String animationName_;
     /// Animation.

Source/Engine/Urho2D/Animation2D.cpp

@@ -22,8 +22,8 @@
 
 #include "Precompiled.h"
 #include "Animation2D.h"
+#include "AnimationSet2D.h"
 #include "Sprite2D.h"
-#include "XAnimationSet2D.h"
 
 #include "DebugNew.h"
 
@@ -65,7 +65,7 @@ Timeline::Timeline()
 {
 }
 
-Animation2D::Animation2D(XAnimationSet2D* animationSet) : 
+Animation2D::Animation2D(AnimationSet2D* animationSet) : 
     animationSet_(animationSet),
     length_(0.0f), 
     looped_(true)
@@ -101,7 +101,7 @@ void Animation2D::AddTimeline(const Timeline& timeline)
     timelines_.Push(timeline);
 }
 
-XAnimationSet2D* Animation2D::GetAnimationSet() const
+AnimationSet2D* Animation2D::GetAnimationSet() const
 {
     return animationSet_;
 }

Source/Engine/Urho2D/Animation2D.h

@@ -30,7 +30,7 @@ namespace Urho3D
 {
 
 class Sprite2D;
-class XAnimationSet2D;
+class AnimationSet2D;
 
 /// Object reference.
 struct ObjectRef
@@ -103,7 +103,7 @@ class URHO3D_API Animation2D : public RefCounted
 {
 public:
     /// Construct.
-    Animation2D(XAnimationSet2D* animationSet);
+    Animation2D(AnimationSet2D* animationSet);
     /// Destruct
     virtual ~Animation2D();
 
@@ -119,7 +119,7 @@ public:
     void AddTimeline(const Timeline& timeline);
 
     /// Return animation set.
-    XAnimationSet2D* GetAnimationSet() const;
+    AnimationSet2D* GetAnimationSet() const;
     /// Return name.
     const String& GetName() const { return name_; }
     /// Return length.
@@ -133,7 +133,7 @@ public:
 
 private:
     /// Animation set.
-    WeakPtr<XAnimationSet2D> animationSet_;
+    WeakPtr<AnimationSet2D> animationSet_;
     /// Name.
     String name_;
     /// Length.

Source/Engine/Urho2D/XAnimationSet2D.cpp → Source/Engine/Urho2D/AnimationSet2D.cpp

@@ -22,13 +22,13 @@
 
 #include "Precompiled.h"
 #include "Animation2D.h"
+#include "AnimationSet2D.h"
 #include "Context.h"
 #include "Drawable2D.h"
 #include "FileSystem.h"
 #include "Log.h"
 #include "ResourceCache.h"
 #include "Sprite2D.h"
-#include "XAnimationSet2D.h"
 #include "XMLFile.h"
 
 #include "DebugNew.h"
@@ -36,21 +36,21 @@
 namespace Urho3D
 {
 
-XAnimationSet2D::XAnimationSet2D(Context* context) :
+AnimationSet2D::AnimationSet2D(Context* context) :
     Resource(context)
 {
 }
 
-XAnimationSet2D::~XAnimationSet2D()
+AnimationSet2D::~AnimationSet2D()
 {
 }
 
-void XAnimationSet2D::RegisterObject(Context* context)
+void AnimationSet2D::RegisterObject(Context* context)
 {
-    context->RegisterFactory<XAnimationSet2D>();
+    context->RegisterFactory<AnimationSet2D>();
 }
 
-bool XAnimationSet2D::Load(Deserializer& source)
+bool AnimationSet2D::Load(Deserializer& source)
 {
     XMLFile xmlFile(context_);
     if (!xmlFile.Load(source))
@@ -85,19 +85,19 @@ bool XAnimationSet2D::Load(Deserializer& source)
     return true;
 }
 
-unsigned XAnimationSet2D::GetNumAnimations() const
+unsigned AnimationSet2D::GetNumAnimations() const
 {
     return animations_.Size();
 }
 
-Animation2D* XAnimationSet2D::GetAnimation(unsigned index) const
+Animation2D* AnimationSet2D::GetAnimation(unsigned index) const
 {
     if (index < animations_.Size())
         return animations_[index];
     return 0;
 }
 
-Animation2D* XAnimationSet2D::GetAnimation(const String& name) const
+Animation2D* AnimationSet2D::GetAnimation(const String& name) const
 {
     for (unsigned i = 0; i < animations_.Size(); ++i)
     {
@@ -107,7 +107,7 @@ Animation2D* XAnimationSet2D::GetAnimation(const String& name) const
     return 0;
 }
 
-Sprite2D* XAnimationSet2D::GetSprite(unsigned folderId, unsigned fileId) const
+Sprite2D* AnimationSet2D::GetSprite(unsigned folderId, unsigned fileId) const
 {
     unsigned key = (folderId << 16) + fileId;
     HashMap<unsigned, SharedPtr<Sprite2D> >::ConstIterator i = sprites_.Find(key);
@@ -116,7 +116,7 @@ Sprite2D* XAnimationSet2D::GetSprite(unsigned folderId, unsigned fileId) const
     return 0;
 }
 
-bool XAnimationSet2D::LoadFolders(const XMLElement& rootElem)
+bool AnimationSet2D::LoadFolders(const XMLElement& rootElem)
 {
     ResourceCache* cache = GetSubsystem<ResourceCache>();
     String parentPath = GetParentPath(GetName());
@@ -152,7 +152,7 @@ bool XAnimationSet2D::LoadFolders(const XMLElement& rootElem)
 }
 
 
-bool XAnimationSet2D::LoadAnimation(const XMLElement& animationElem)
+bool AnimationSet2D::LoadAnimation(const XMLElement& animationElem)
 {
     SharedPtr<Animation2D> animation(new Animation2D(this));
     

Source/Engine/Urho2D/XAnimationSet2D.h → Source/Engine/Urho2D/AnimationSet2D.h

@@ -32,15 +32,15 @@ class Sprite2D;
 class Animation2D;
 
 /// Spriter animation set, it includes one or more animations, for more information please refer to http://www.brashmonkey.com/spriter.htm.
-class URHO3D_API XAnimationSet2D : public Resource
+class URHO3D_API AnimationSet2D : public Resource
 {
-    OBJECT(XAnimationSet2D);
+    OBJECT(AnimationSet2D);
 
 public:
     /// Construct.
-    XAnimationSet2D(Context* context);
+    AnimationSet2D(Context* context);
     /// Destruct.
-    virtual ~XAnimationSet2D();
+    virtual ~AnimationSet2D();
     /// Register object factory. 
     static void RegisterObject(Context* context);
 

Source/Engine/Urho2D/Urho2D.cpp

@@ -21,6 +21,8 @@
 //
 
 #include "Precompiled.h"
+#include "AnimatedSprite2D.h"
+#include "AnimationSet2D.h"
 #include "CollisionBox2D.h"
 #include "CollisionChain2D.h"
 #include "CollisionCircle2D.h"
@@ -50,8 +52,6 @@
 #include "Sprite2D.h"
 #include "SpriteSheet2D.h"
 #include "StaticSprite2D.h"
-#include "XAnimatedSprite2D.h"
-#include "XAnimationSet2D.h"
 
 #include "DebugNew.h"
 
@@ -65,16 +65,18 @@ void RegisterUrho2DLibrary(Context* context)
     MaterialCache2D::RegisterObject(context);
     DrawableProxy2D::RegisterObject(context);
 
+    Sprite2D::RegisterObject(context);
+    SpriteSheet2D::RegisterObject(context);
+    
     // Must register objects from base to derived order
     Drawable2D::RegisterObject(context);
     StaticSprite2D::RegisterObject(context);
+
+    AnimationSet2D::RegisterObject(context);
+    AnimatedSprite2D::RegisterObject(context);
+
     ParticleEffect2D::RegisterObject(context);
     ParticleEmitter2D::RegisterObject(context);
-    XAnimationSet2D::RegisterObject(context);
-    XAnimatedSprite2D::RegisterObject(context);
-
-    Sprite2D::RegisterObject(context);
-    SpriteSheet2D::RegisterObject(context);
 
     PhysicsWorld2D::RegisterObject(context);
     RigidBody2D::RegisterObject(context);

Source/Samples/24_Urho2DSprite/Urho2DSprite.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include "AnimatedSprite2D.h"
+#include "AnimationSet2D.h"
 #include "Camera.h"
 #include "CoreEvents.h"
 #include "Engine.h"
@@ -35,8 +37,6 @@
 #include "Text.h"
 #include "Urho2DSprite.h"
 #include "Zone.h"
-#include "XAnimationSet2D.h"
-#include "XAnimatedSprite2D.h"
 
 #include "DebugNew.h"
 
@@ -118,14 +118,14 @@ void Urho2DSprite::CreateScene()
     }
 
     // Get animation set
-    XAnimationSet2D* animationSet = cache->GetResource<XAnimationSet2D>("Urho2D/GoldIcon.scml");
+    AnimationSet2D* animationSet = cache->GetResource<AnimationSet2D>("Urho2D/GoldIcon.scml");
     if (!animationSet)
         return;
 
     SharedPtr<Node> spriteNode(scene_->CreateChild("AnimatedSprite2D"));
     spriteNode->SetPosition(Vector3(0.0f, 0.0f, -1.0f));
 
-    XAnimatedSprite2D* animatedSprite = spriteNode->CreateComponent<XAnimatedSprite2D>();
+    AnimatedSprite2D* animatedSprite = spriteNode->CreateComponent<AnimatedSprite2D>();
     // Set animation
     animatedSprite->SetAnimation(animationSet, "idle");
 }

Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.cpp

@@ -20,7 +20,8 @@
 // THE SOFTWARE.
 //
 
-#include "Animation2D.h"
+#include "AnimatedSprite2D.h"
+#include "AnimationSet2D.h"
 #include "Camera.h"
 #include "CoreEvents.h"
 #include "Drawable2D.h"
@@ -34,8 +35,6 @@
 #include "Scene.h"
 #include "Text.h"
 #include "Urho2DSpriterAnimation.h"
-#include "XAnimatedSprite2D.h"
-#include "XAnimationSet2D.h"
 #include "Zone.h"
 
 #include "DebugNew.h"
@@ -94,14 +93,14 @@ void Urho2DSpriterAnimation::CreateScene()
     camera->SetOrthoSize((float)graphics->GetHeight() * PIXEL_SIZE);
 
     ResourceCache* cache = GetSubsystem<ResourceCache>();  
-    XAnimationSet2D* animationSet = cache->GetResource<XAnimationSet2D>("Urho2D/imp/imp.scml");
+    AnimationSet2D* animationSet = cache->GetResource<AnimationSet2D>("Urho2D/imp/imp.scml");
     if (!animationSet)
         return;
 
     spriteNode_ = scene_->CreateChild("SpriterAnimation");
     spriteNode_->SetPosition(Vector3(-1.4f, 2.0f, 0.0f));
 
-    XAnimatedSprite2D* animatedSprite = spriteNode_->CreateComponent<XAnimatedSprite2D>();
+    AnimatedSprite2D* animatedSprite = spriteNode_->CreateComponent<AnimatedSprite2D>();
     animatedSprite->SetAnimation(animationSet, animationNames[animationIndex_]);
 }
 
@@ -188,7 +187,7 @@ void Urho2DSpriterAnimation::HandleUpdate(StringHash eventType, VariantMap& even
 
 void Urho2DSpriterAnimation::HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
 {
-    XAnimatedSprite2D* animatedSprite = spriteNode_->GetComponent<XAnimatedSprite2D>();
+    AnimatedSprite2D* animatedSprite = spriteNode_->GetComponent<AnimatedSprite2D>();
     animationIndex_ = (animationIndex_ + 1) % 7;
     animatedSprite->SetAnimation(animationNames[animationIndex_]);
 }