diff --git a/Easy2D/examples/push_box/src/core/audio_context.cpp b/Easy2D/examples/push_box/src/core/audio_context.cpp
deleted file mode 100644
index 583fe6c..0000000
--- a/Easy2D/examples/push_box/src/core/audio_context.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "audio_context.h"
-
-namespace pushbox {
-
-static easy2d::WeakPtr<AudioController> g_audioController;
-
-void setAudioController(const easy2d::Ptr<AudioController>& controller) {
-  g_audioController = controller;
-}
-
-easy2d::Ptr<AudioController> getAudioController() { return g_audioController.lock(); }
-
-} // namespace pushbox
-
diff --git a/Easy2D/examples/push_box/src/core/audio_context.h b/Easy2D/examples/push_box/src/core/audio_context.h
deleted file mode 100644
index f842cfc..0000000
--- a/Easy2D/examples/push_box/src/core/audio_context.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <easy2d/easy2d.h>
-
-namespace pushbox {
-
-class AudioController;
-
-void setAudioController(const easy2d::Ptr<AudioController>& controller);
-easy2d::Ptr<AudioController> getAudioController();
-
-} // namespace pushbox
-
diff --git a/Easy2D/examples/push_box/src/scenes/play_scene.h b/Easy2D/examples/push_box/src/scenes/play_scene.h
deleted file mode 100644
index bcea8b2..0000000
--- a/Easy2D/examples/push_box/src/scenes/play_scene.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-#include "../core/data.h"
-#include <easy2d/easy2d.h>
-
-namespace pushbox {
-
-class PlayScene : public easy2d::Scene {
-public:
-  explicit PlayScene(int level);
-
-  void onEnter() override;
-  void onUpdate(float dt) override;
-
-private:
-  void flush();
-  void setLevel(int level);
-  void setStep(int step);
-  void move(int dx, int dy, int direct);
-  void gameOver();
-
-  int step_ = 0;
-  Map map_{};
-
-  easy2d::Ptr<easy2d::FontAtlas> font28_;
-  easy2d::Ptr<easy2d::FontAtlas> font20_;
-
-  easy2d::Ptr<easy2d::Text> levelText_;
-  easy2d::Ptr<easy2d::Text> stepText_;
-  easy2d::Ptr<easy2d::Text> bestText_;
-  easy2d::Ptr<easy2d::Node> mapLayer_;
-
-  easy2d::Ptr<easy2d::ToggleImageButton> soundBtn_;
-
-  easy2d::Ptr<easy2d::Texture> texWall_;
-  easy2d::Ptr<easy2d::Texture> texPoint_;
-  easy2d::Ptr<easy2d::Texture> texFloor_;
-  easy2d::Ptr<easy2d::Texture> texBox_;
-  easy2d::Ptr<easy2d::Texture> texBoxInPoint_;
-
-  easy2d::Ptr<easy2d::Texture> texMan_[5];
-  easy2d::Ptr<easy2d::Texture> texManPush_[5];
-};
-
-} // namespace pushbox
diff --git a/Easy2D/examples/push_box/src/scenes/success_scene.cpp b/Easy2D/examples/push_box/src/scenes/success_scene.cpp
deleted file mode 100644
index 5250e66..0000000
--- a/Easy2D/examples/push_box/src/scenes/success_scene.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "success_scene.h"
-
-#include "../ui/menu_button.h"
-#include <easy2d/app/application.h>
-#include <easy2d/resource/resource_manager.h>
-#include <easy2d/scene/scene_manager.h>
-#include <easy2d/scene/sprite.h>
-
-namespace pushbox {
-
-SuccessScene::SuccessScene() {
-  // 设置视口大小为窗口尺寸
-  auto& app = easy2d::Application::instance();
-  auto& config = app.getConfig();
-  setViewportSize(static_cast<float>(config.width), static_cast<float>(config.height));
-}
-
-static easy2d::Ptr<easy2d::FontAtlas> loadMenuFont() {
-  auto& resources = easy2d::Application::instance().resources();
-  return resources.loadFont("assets/font.ttf", 28);
-}
-
-void SuccessScene::onEnter() {
-  Scene::onEnter();
-
-  auto& app = easy2d::Application::instance();
-  auto& resources = app.resources();
-  setBackgroundColor(easy2d::Colors::Black);
-
-  if (getChildren().empty()) {
-    auto bgTex = resources.loadTexture("assets/images/success.jpg");
-    if (bgTex) {
-      auto background = easy2d::Sprite::create(bgTex);
-      background->setAnchor(0.0f, 0.0f);
-      background->setPosition(0.0f, 0.0f);
-      float sx = static_cast<float>(app.getConfig().width) / static_cast<float>(bgTex->getWidth());
-      float sy =
-          static_cast<float>(app.getConfig().height) / static_cast<float>(bgTex->getHeight());
-      background->setScale(sx, sy);
-      addChild(background);
-    }
-
-    auto font = loadMenuFont();
-    if (font) {
-      auto backBtn = MenuButton::create(font, "回主菜单", []() {
-        auto& scenes = easy2d::Application::instance().scenes();
-        scenes.popScene(easy2d::TransitionType::Fade, 0.2f);
-        scenes.popScene(easy2d::TransitionType::Fade, 0.2f);
-      });
-      backBtn->setPosition(app.getConfig().width / 2.0f, 350.0f);
-      addChild(backBtn);
-    }
-  }
-}
-
-} // namespace pushbox
diff --git a/Easy2D/examples/push_box/src/ui/menu_button.cpp b/Easy2D/examples/push_box/src/ui/menu_button.cpp
deleted file mode 100644
index b68742d..0000000
--- a/Easy2D/examples/push_box/src/ui/menu_button.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "menu_button.h"
-
-#include <easy2d/core/color.h>
-#include <easy2d/event/event.h>
-
-namespace pushbox {
-
-easy2d::Ptr<MenuButton> MenuButton::create(easy2d::Ptr<easy2d::FontAtlas> font,
-                                          const easy2d::String& text,
-                                          easy2d::Function<void()> onClick) {
-  auto btn = easy2d::makePtr<MenuButton>();
-  btn->setFont(font);
-  btn->setText(text);
-  btn->setPadding(easy2d::Vec2(0.0f, 0.0f));
-  btn->setBackgroundColor(easy2d::Colors::Transparent, easy2d::Colors::Transparent,
-                          easy2d::Colors::Transparent);
-  btn->setBorder(easy2d::Colors::Transparent, 0.0f);
-  btn->setTextColor(easy2d::Colors::Black);
-
-  btn->onClick_ = std::move(onClick);
-  btn->setOnClick([wbtn = easy2d::WeakPtr<MenuButton>(btn)]() {
-    if (auto self = wbtn.lock()) {
-      if (self->enabled_ && self->onClick_) {
-        self->onClick_();
-      }
-    }
-  });
-
-  btn->getEventDispatcher().addListener(
-      easy2d::EventType::UIHoverEnter,
-      [wbtn = easy2d::WeakPtr<MenuButton>(btn)](easy2d::Event&) {
-        if (auto self = wbtn.lock()) {
-          if (self->enabled_) {
-            self->setTextColor(easy2d::Colors::Blue);
-          }
-        }
-      });
-
-  btn->getEventDispatcher().addListener(
-      easy2d::EventType::UIHoverExit,
-      [wbtn = easy2d::WeakPtr<MenuButton>(btn)](easy2d::Event&) {
-        if (auto self = wbtn.lock()) {
-          if (self->enabled_) {
-            self->setTextColor(easy2d::Colors::Black);
-          }
-        }
-      });
-
-  return btn;
-}
-
-void MenuButton::setEnabled(bool enabled) {
-  enabled_ = enabled;
-  setTextColor(enabled ? easy2d::Colors::Black : easy2d::Colors::LightGray);
-}
-
-} // namespace pushbox
-
diff --git a/Easy2D/examples/push_box/src/ui/menu_button.h b/Easy2D/examples/push_box/src/ui/menu_button.h
deleted file mode 100644
index da2b8cd..0000000
--- a/Easy2D/examples/push_box/src/ui/menu_button.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <easy2d/easy2d.h>
-
-namespace pushbox {
-
-class MenuButton : public easy2d::Button {
-public:
-  static easy2d::Ptr<MenuButton> create(easy2d::Ptr<easy2d::FontAtlas> font,
-                                        const easy2d::String& text,
-                                        easy2d::Function<void()> onClick);
-
-  void setEnabled(bool enabled);
-  bool isEnabled() const { return enabled_; }
-
-private:
-  bool enabled_ = true;
-  easy2d::Function<void()> onClick_;
-};
-
-} // namespace pushbox
diff --git a/Easy2D/include/easy2d/action/action.h b/Easy2D/include/easy2d/action/action.h
deleted file mode 100644
index b81a69f..0000000
--- a/Easy2D/include/easy2d/action/action.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <memory>
-
-namespace easy2d {
-    class Node;
-
-    enum class ActionState
-    {
-        Idle,
-        Running,
-        Paused,
-        Completed
-    };
-
-    class Action
-    {
-    public:
-        using ProgressCallback = std::function<void(float)>;
-        using CompletionCallback = std::function<void()>;
-
-        Action();
-        virtual ~Action() = default;
-
-        Action(const Action&) = delete;
-        Action& operator=(const Action&) = delete;
-        Action(Action&&) = default;
-        Action& operator=(Action&&) = default;
-
-        virtual void start(Node* target);
-        virtual void stop();
-        virtual void update(float dt);
-        virtual void step(float dt);
-
-        virtual bool isDone() const = 0;
-        virtual Action* clone() const = 0;
-        virtual Action* reverse() const = 0;
-
-        void pause();
-        void resume();
-        void restart();
-
-        ActionState getState() const { return state_; }
-        float getElapsed() const { return elapsed_; }
-        float getDuration() const { return duration_; }
-        Node* getTarget() const { return target_; }
-        Node* getOriginalTarget() const { return originalTarget_; }
-
-        void setDuration(float duration) { duration_ = duration; }
-        void setSpeed(float speed) { speed_ = speed; }
-        float getSpeed() const { return speed_; }
-
-        void setProgressCallback(ProgressCallback callback) { progressCallback_ = std::move(callback); }
-        void setCompletionCallback(CompletionCallback callback) { completionCallback_ = std::move(callback); }
-
-        void setTag(int tag) { tag_ = tag; }
-        int getTag() const { return tag_; }
-
-    protected:
-        virtual void onStart() {}
-        virtual void onUpdate(float progress) = 0;
-        virtual void onComplete() {}
-
-        void setDone() { state_ = ActionState::Completed; }
-
-        Node* target_ = nullptr;
-        Node* originalTarget_ = nullptr;
-        ActionState state_ = ActionState::Idle;
-        float elapsed_ = 0.0f;
-        float duration_ = 0.0f;
-        float speed_ = 1.0f;
-        int tag_ = -1;
-        ProgressCallback progressCallback_;
-        CompletionCallback completionCallback_;
-    };
-
-    using ActionPtr = std::unique_ptr<Action>;
-}
diff --git a/Easy2D/include/easy2d/action/actions.h b/Easy2D/include/easy2d/action/actions.h
deleted file mode 100644
index d2e46be..0000000
--- a/Easy2D/include/easy2d/action/actions.h
+++ /dev/null
@@ -1,286 +0,0 @@
-#pragma once
-
-#include "easy2d/action/action.h"
-#include "easy2d/core/math_types.h"
-#include <vector>
-#include <functional>
-
-namespace easy2d {
-    // Interval Action Base
-    class IntervalAction : public Action
-    {
-    public:
-        explicit IntervalAction(float duration);
-        bool isDone() const override;
-    };
-
-    // Instant Action Base
-    class InstantAction : public Action
-    {
-    public:
-        InstantAction();
-        bool isDone() const override;
-    };
-
-    // Move Actions
-    class MoveBy : public IntervalAction
-    {
-    public:
-        MoveBy(float duration, const Vec2& delta);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        Vec2 delta_;
-        Vec2 startPosition_;
-    };
-
-    class MoveTo : public IntervalAction
-    {
-    public:
-        MoveTo(float duration, const Vec2& position);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        Vec2 endPosition_;
-        Vec2 startPosition_;
-        Vec2 delta_;
-    };
-
-    // Scale Actions
-    class ScaleBy : public IntervalAction
-    {
-    public:
-        ScaleBy(float duration, float scale);
-        ScaleBy(float duration, float scaleX, float scaleY);
-        ScaleBy(float duration, const Vec2& scale);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        Vec2 deltaScale_;
-        Vec2 startScale_;
-    };
-
-    class ScaleTo : public IntervalAction
-    {
-    public:
-        ScaleTo(float duration, float scale);
-        ScaleTo(float duration, float scaleX, float scaleY);
-        ScaleTo(float duration, const Vec2& scale);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        Vec2 endScale_;
-        Vec2 startScale_;
-        Vec2 delta_;
-    };
-
-    // Rotate Actions
-    class RotateBy : public IntervalAction
-    {
-    public:
-        RotateBy(float duration, float deltaAngle);
-        RotateBy(float duration, float deltaAngleX, float deltaAngleY);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        float deltaAngle_ = 0.0f;
-        float startAngle_ = 0.0f;
-    };
-
-    class RotateTo : public IntervalAction
-    {
-    public:
-        RotateTo(float duration, float angle);
-        RotateTo(float duration, float angleX, float angleY);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        float endAngle_ = 0.0f;
-        float startAngle_ = 0.0f;
-        float deltaAngle_ = 0.0f;
-    };
-
-    // Fade Actions
-    class FadeIn : public IntervalAction
-    {
-    public:
-        explicit FadeIn(float duration);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        float startOpacity_ = 0.0f;
-    };
-
-    class FadeOut : public IntervalAction
-    {
-    public:
-        explicit FadeOut(float duration);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        float startOpacity_ = 0.0f;
-    };
-
-    class FadeTo : public IntervalAction
-    {
-    public:
-        FadeTo(float duration, float opacity);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        float endOpacity_ = 0.0f;
-        float startOpacity_ = 0.0f;
-        float deltaOpacity_ = 0.0f;
-    };
-
-    // Composite Actions
-    class Sequence : public IntervalAction
-    {
-    public:
-        Sequence(const std::vector<Action*>& actions);
-        ~Sequence();
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        std::vector<Action*> actions_;
-        int currentIndex_ = 0;
-        float split_ = 0.0f;
-        float last_ = 0.0f;
-    };
-
-    class Spawn : public IntervalAction
-    {
-    public:
-        Spawn(const std::vector<Action*>& actions);
-        ~Spawn();
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        std::vector<Action*> actions_;
-    };
-
-    // Loop Action
-    class Loop : public Action
-    {
-    public:
-        Loop(Action* action, int times = -1);
-        ~Loop();
-        
-        bool isDone() const override;
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onStart() override;
-        void onUpdate(float progress) override;
-
-    private:
-        Action* action_ = nullptr;
-        int times_ = 1;
-        int currentTimes_ = 0;
-    };
-
-    // Delay Action
-    class Delay : public IntervalAction
-    {
-    public:
-        explicit Delay(float duration);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onUpdate(float progress) override;
-    };
-
-    // CallFunc Action
-    class CallFunc : public InstantAction
-    {
-    public:
-        using Callback = std::function<void()>;
-        
-        explicit CallFunc(Callback callback);
-        
-        Action* clone() const override;
-        Action* reverse() const override;
-
-    protected:
-        void onUpdate(float progress) override;
-
-    private:
-        Callback callback_;
-    };
-
-    // Helper functions
-    inline Sequence* sequence(const std::vector<Action*>& actions) { return new Sequence(actions); }
-    inline Spawn* spawn(const std::vector<Action*>& actions) { return new Spawn(actions); }
-    inline Loop* loop(Action* action, int times = -1) { return new Loop(action, times); }
-    inline Delay* delay(float duration) { return new Delay(duration); }
-    inline CallFunc* callFunc(CallFunc::Callback callback) { return new CallFunc(std::move(callback)); }
-}
diff --git a/Easy2D/include/easy2d/action/ease.h b/Easy2D/include/easy2d/action/ease.h
deleted file mode 100644
index b56cb8f..0000000
--- a/Easy2D/include/easy2d/action/ease.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-namespace easy2d {
-    // Easing function type
-    using EaseFunction = float (*)(float);
-
-    // Linear (no easing)
-    float easeLinear(float t);
-
-    // Quadratic
-    float easeInQuad(float t);
-    float easeOutQuad(float t);
-    float easeInOutQuad(float t);
-
-    // Cubic
-    float easeInCubic(float t);
-    float easeOutCubic(float t);
-    float easeInOutCubic(float t);
-
-    // Quartic
-    float easeInQuart(float t);
-    float easeOutQuart(float t);
-    float easeInOutQuart(float t);
-
-    // Quintic
-    float easeInQuint(float t);
-    float easeOutQuint(float t);
-    float easeInOutQuint(float t);
-
-    // Sine
-    float easeInSine(float t);
-    float easeOutSine(float t);
-    float easeInOutSine(float t);
-
-    // Exponential
-    float easeInExpo(float t);
-    float easeOutExpo(float t);
-    float easeInOutExpo(float t);
-
-    // Circular
-    float easeInCirc(float t);
-    float easeOutCirc(float t);
-    float easeInOutCirc(float t);
-
-    // Back
-    float easeInBack(float t);
-    float easeOutBack(float t);
-    float easeInOutBack(float t);
-
-    // Elastic
-    float easeInElastic(float t);
-    float easeOutElastic(float t);
-    float easeInOutElastic(float t);
-
-    // Bounce
-    float easeInBounce(float t);
-    float easeOutBounce(float t);
-    float easeInOutBounce(float t);
-
-    // Ease Action wrapper
-    class Action;
-    
-    class EaseAction
-    {
-    public:
-        static Action* create(Action* action, EaseFunction easeFunc);
-    };
-}
diff --git a/Easy2D/include/easy2d/animation/als_parser.h b/Easy2D/include/easy2d/animation/als_parser.h
deleted file mode 100644
index c0e3ed0..0000000
--- a/Easy2D/include/easy2d/animation/als_parser.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <string>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// ALS 图层信息
-// ============================================================================
-struct AlsLayerInfo {
-    std::string aniPath;    // 子动画的 ANI 文件路径
-    int         zOrder = 0; // 层级顺序
-    Vec2        offset;     // 层偏移
-};
-
-// ============================================================================
-// ALS 解析结果
-// ============================================================================
-struct AlsParseResult {
-    bool success = false;
-    std::string errorMessage;
-    std::vector<AlsLayerInfo> layers;
-};
-
-// ============================================================================
-// AlsParser - ALS 复合动画文件解析器
-// 解析 .als 文件获取多层动画的图层信息
-// ============================================================================
-class AlsParser {
-public:
-    AlsParser() = default;
-
-    /// 从文件解析
-    AlsParseResult parse(const std::string& filePath);
-
-    /// 从内存内容解析
-    AlsParseResult parseFromMemory(const std::string& content,
-                                    const std::string& basePath = "");
-
-    /// 设置基础路径
-    void setBasePath(const std::string& basePath) {
-        basePath_ = basePath;
-    }
-
-private:
-    std::string basePath_;
-
-    std::string resolvePath(const std::string& relativePath) const;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/ani_binary_parser.h b/Easy2D/include/easy2d/animation/ani_binary_parser.h
deleted file mode 100644
index e6599f7..0000000
--- a/Easy2D/include/easy2d/animation/ani_binary_parser.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/animation/ani_parser.h>
-#include <easy2d/animation/animation_cache.h>
-#include <string>
-#include <functional>
-#include <cstdint>
-
-namespace easy2d {
-
-// ============================================================================
-// DNF ANI 二进制格式中的节点类型枚举
-// ============================================================================
-enum class AniNodeType : uint16_t {
-    Loop            = 0,
-    Shadow          = 1,
-    Coord           = 3,
-    ImageRate       = 7,
-    ImageRotate     = 8,
-    RGBA            = 9,
-    Interpolation   = 10,
-    GraphicEffect   = 11,
-    Delay           = 12,
-    DamageType      = 13,
-    DamageBox       = 14,
-    AttackBox       = 15,
-    PlaySound       = 16,
-    Preload         = 17,
-    Spectrum        = 18,
-    SetFlag         = 23,
-    FlipType        = 24,
-    LoopStart       = 25,
-    LoopEnd         = 26,
-    Clip            = 27,
-    Operation       = 28,
-};
-
-// ============================================================================
-// AniBinaryParser - ANI 二进制格式解析器
-// 参考 DNF-Porting 的 PvfAnimation 实现
-// ============================================================================
-class AniBinaryParser {
-public:
-    AniBinaryParser() = default;
-
-    /// 从二进制数据解析
-    AniParseResult parse(const uint8_t* data, size_t length);
-
-    /// 从文件解析
-    AniParseResult parseFromFile(const std::string& filePath);
-
-    /// 设置路径替换回调
-    void setPathResolver(PathResolveCallback callback) {
-        pathResolver_ = std::move(callback);
-    }
-
-    /// 设置基础路径
-    void setBasePath(const std::string& basePath) {
-        basePath_ = basePath;
-    }
-
-private:
-    PathResolveCallback pathResolver_;
-    std::string basePath_;
-
-    std::string resolvePath(const std::string& relativePath) const;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/ani_parser.h b/Easy2D/include/easy2d/animation/ani_parser.h
deleted file mode 100644
index d7c2b27..0000000
--- a/Easy2D/include/easy2d/animation/ani_parser.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/animation/animation_clip.h>
-#include <easy2d/animation/animation_cache.h>
-#include <string>
-#include <functional>
-
-namespace easy2d {
-
-// ============================================================================
-// ANI 文件解析结果
-// ============================================================================
-struct AniParseResult {
-    bool success = false;
-    std::string errorMessage;
-    Ptr<AnimationClip> clip;
-};
-
-// ============================================================================
-// AniParser - ANI 脚本文件解析器
-// 将原始 ANI 文件格式解析为 AnimationClip 数据
-// ============================================================================
-class AniParser {
-public:
-    AniParser() = default;
-
-    /// 从文件解析
-    AniParseResult parse(const std::string& filePath);
-
-    /// 从内存内容解析
-    AniParseResult parseFromMemory(const std::string& content,
-                                    const std::string& basePath = "");
-
-    /// 设置路径替换回调（对应原始 AdditionalOptions）
-    void setPathResolver(PathResolveCallback callback) {
-        pathResolver_ = std::move(callback);
-    }
-
-    /// 设置基础路径（用于解析相对路径）
-    void setBasePath(const std::string& basePath) {
-        basePath_ = basePath;
-    }
-
-private:
-    PathResolveCallback pathResolver_;
-    std::string basePath_;
-
-    std::string resolvePath(const std::string& relativePath) const;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/animated_sprite.h b/Easy2D/include/easy2d/animation/animated_sprite.h
deleted file mode 100644
index 2cbea96..0000000
--- a/Easy2D/include/easy2d/animation/animated_sprite.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/sprite.h>
-#include <easy2d/animation/animation_controller.h>
-#include <easy2d/animation/animation_cache.h>
-#include <string>
-#include <array>
-#include <vector>
-#include <unordered_map>
-#include <cstdint>
-
-namespace easy2d {
-
-// ============================================================================
-// AnimatedSprite - 动画精灵节点
-// 将 AnimationController 与 Sprite 渲染桥接，接入场景图
-// ============================================================================
-class AnimatedSprite : public Sprite {
-public:
-    AnimatedSprite();
-    ~AnimatedSprite() override = default;
-
-    // ------ 静态工厂 ------
-    static Ptr<AnimatedSprite> create();
-    static Ptr<AnimatedSprite> create(Ptr<AnimationClip> clip);
-    static Ptr<AnimatedSprite> create(const std::string& aniFilePath);
-
-    // ------ 动画绑定 ------
-    void setAnimationClip(Ptr<AnimationClip> clip);
-    void loadAnimation(const std::string& aniFilePath);
-    Ptr<AnimationClip> getAnimationClip() const;
-
-    // ------ 动画字典 ------
-    void addAnimation(const std::string& name, Ptr<AnimationClip> clip);
-    void play(const std::string& name, bool loop = true);
-    bool hasAnimation(const std::string& name) const;
-    Ptr<AnimationClip> getAnimation(const std::string& name) const;
-    const std::string& getCurrentAnimationName() const;
-
-    // ------ 播放控制（委托 controller_）------
-    void play();
-    void pause();
-    void resume();
-    void stop();
-    void reset();
-    bool isPlaying() const;
-    bool isPaused() const;
-    bool isStopped() const;
-
-    // ------ 属性控制 ------
-    void setLooping(bool loop);
-    bool isLooping() const;
-    void setPlaybackSpeed(float speed);
-    float getPlaybackSpeed() const;
-
-    // ------ 帧控制 ------
-    void setFrameIndex(size_t index);
-    size_t getCurrentFrameIndex() const;
-    size_t getTotalFrames() const;
-    void nextFrame();
-    void prevFrame();
-
-    // ------ 帧范围限制 ------
-    /// 设置帧播放范围（用于精灵图动画，限制在指定范围内循环）
-    /// @param start 起始帧索引（包含）
-    /// @param end 结束帧索引（包含），-1表示不限制
-    void setFrameRange(int start, int end = -1);
-    
-    /// 获取当前帧范围
-    /// @return pair<起始帧, 结束帧>，结束帧为-1表示不限制
-    std::pair<int, int> getFrameRange() const;
-    
-    /// 清除帧范围限制（恢复播放所有帧）
-    void clearFrameRange();
-    
-    /// 检查是否设置了帧范围限制
-    bool hasFrameRange() const;
-
-    // ------ 回调 ------
-    void setCompletionCallback(AnimationController::CompletionCallback cb);
-    void setKeyframeCallback(AnimationController::KeyframeCallback cb);
-    void setSoundTriggerCallback(AnimationController::SoundTriggerCallback cb);
-
-    // ------ 碰撞盒访问（当前帧）------
-    const std::vector<std::array<int32_t, 6>>& getCurrentDamageBoxes() const;
-    const std::vector<std::array<int32_t, 6>>& getCurrentAttackBoxes() const;
-
-    // ------ 帧变换控制 ------
-    /// 设置是否由动画帧数据覆盖节点的 position/scale/rotation
-    /// ANI 动画需要开启（默认），精灵图动画应关闭
-    void setApplyFrameTransform(bool apply) { applyFrameTransform_ = apply; }
-    bool isApplyFrameTransform() const { return applyFrameTransform_; }
-
-    // ------ 自动播放 ------
-    void setAutoPlay(bool autoPlay) { autoPlay_ = autoPlay; }
-    bool isAutoPlay() const { return autoPlay_; }
-
-    // ------ 直接控制器访问 ------
-    AnimationController& getController() { return controller_; }
-    const AnimationController& getController() const { return controller_; }
-
-protected:
-    void onUpdate(float dt) override;
-    void onEnter() override;
-
-private:
-    AnimationController controller_;
-    bool autoPlay_ = false;
-    bool applyFrameTransform_ = true;
-
-    // 动画字典
-    std::unordered_map<std::string, Ptr<AnimationClip>> animations_;
-    std::string currentAnimationName_;
-    static const std::string emptyString_;
-
-    // 帧范围限制（用于精灵图动画）
-    int frameRangeStart_ = 0;   // 起始帧索引
-    int frameRangeEnd_ = -1;    // 结束帧索引，-1表示不限制
-
-    // 空碰撞盒列表（用于无帧时返回引用）
-    static const std::vector<std::array<int32_t, 6>> emptyBoxes_;
-
-    void applyFrame(const AnimationFrame& frame);
-    void onFrameChanged(size_t oldIdx, size_t newIdx, const AnimationFrame& frame);
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/animation_cache.h b/Easy2D/include/easy2d/animation/animation_cache.h
deleted file mode 100644
index ce8609b..0000000
--- a/Easy2D/include/easy2d/animation/animation_cache.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-
-#include <easy2d/animation/animation_clip.h>
-#include <unordered_map>
-#include <mutex>
-#include <string>
-#include <functional>
-
-namespace easy2d {
-
-// 路径替换回调（对应原始 AdditionalOptions）
-using PathResolveCallback = std::function<std::string(const std::string&)>;
-
-// ============================================================================
-// AnimationCache - 动画片段全局缓存（借鉴 Cocos AnimationCache）
-// 同一 ANI 文件只解析一次，后续直接复用数据
-// ============================================================================
-class AnimationCache {
-public:
-    static AnimationCache& getInstance() {
-        static AnimationCache instance;
-        return instance;
-    }
-
-    // ------ 加载与获取 ------
-
-    /// 从文件加载（自动缓存），已缓存则直接返回
-    /// 注意：实际的 ANI 解析逻辑在 AniParser 中实现
-    /// 此方法在 animation_cache.cpp 中实现，依赖 AniParser
-    Ptr<AnimationClip> loadClip(const std::string& aniFilePath);
-
-    /// 从缓存获取（不触发加载）
-    Ptr<AnimationClip> getClip(const std::string& name) const {
-        std::lock_guard<std::mutex> lock(mutex_);
-        auto it = clips_.find(name);
-        if (it != clips_.end()) return it->second;
-        return nullptr;
-    }
-
-    /// 手动添加到缓存
-    void addClip(Ptr<AnimationClip> clip, const std::string& name) {
-        std::lock_guard<std::mutex> lock(mutex_);
-        clips_[name] = std::move(clip);
-    }
-
-    // ------ 缓存管理 ------
-
-    bool has(const std::string& name) const {
-        std::lock_guard<std::mutex> lock(mutex_);
-        return clips_.find(name) != clips_.end();
-    }
-
-    void removeClip(const std::string& name) {
-        std::lock_guard<std::mutex> lock(mutex_);
-        clips_.erase(name);
-    }
-
-    /// 移除未被外部引用的动画片段
-    void removeUnusedClips() {
-        std::lock_guard<std::mutex> lock(mutex_);
-        for (auto it = clips_.begin(); it != clips_.end(); ) {
-            if (it->second.use_count() == 1) {
-                it = clips_.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-
-    void clear() {
-        std::lock_guard<std::mutex> lock(mutex_);
-        clips_.clear();
-    }
-
-    size_t count() const {
-        std::lock_guard<std::mutex> lock(mutex_);
-        return clips_.size();
-    }
-
-    // ------ 路径配置 ------
-    void setPathResolver(PathResolveCallback resolver) {
-        pathResolver_ = std::move(resolver);
-    }
-
-    PathResolveCallback getPathResolver() const {
-        return pathResolver_;
-    }
-
-private:
-    AnimationCache() = default;
-    ~AnimationCache() = default;
-    AnimationCache(const AnimationCache&) = delete;
-    AnimationCache& operator=(const AnimationCache&) = delete;
-
-    mutable std::mutex mutex_;
-    std::unordered_map<std::string, Ptr<AnimationClip>> clips_;
-    PathResolveCallback pathResolver_;
-};
-
-// 便捷宏
-#define E2D_ANIMATION_CACHE() ::easy2d::AnimationCache::getInstance()
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/animation_clip.h b/Easy2D/include/easy2d/animation/animation_clip.h
deleted file mode 100644
index 631c967..0000000
--- a/Easy2D/include/easy2d/animation/animation_clip.h
+++ /dev/null
@@ -1,195 +0,0 @@
-#pragma once
-
-#include <easy2d/animation/animation_frame.h>
-#include <easy2d/animation/sprite_frame_cache.h>
-#include <vector>
-#include <string>
-#include <cassert>
-
-namespace easy2d {
-
-// ============================================================================
-// AnimationClip - 动画片段（纯数据，可复用）
-// 借鉴 Cocos：一份 AnimationClip 可被多个 AnimationNode 同时使用
-// ============================================================================
-class AnimationClip {
-public:
-    AnimationClip() = default;
-
-    explicit AnimationClip(const std::string& name)
-        : name_(name) {}
-
-    // ------ 帧管理 ------
-    void addFrame(const AnimationFrame& frame) {
-        frames_.push_back(frame);
-    }
-
-    void addFrame(AnimationFrame&& frame) {
-        frames_.push_back(std::move(frame));
-    }
-
-    void insertFrame(size_t index, const AnimationFrame& frame) {
-        assert(index <= frames_.size());
-        frames_.insert(frames_.begin() + static_cast<ptrdiff_t>(index), frame);
-    }
-
-    void removeFrame(size_t index) {
-        assert(index < frames_.size());
-        frames_.erase(frames_.begin() + static_cast<ptrdiff_t>(index));
-    }
-
-    void clearFrames() {
-        frames_.clear();
-    }
-
-    const AnimationFrame& getFrame(size_t index) const {
-        assert(index < frames_.size());
-        return frames_[index];
-    }
-
-    AnimationFrame& getFrame(size_t index) {
-        assert(index < frames_.size());
-        return frames_[index];
-    }
-
-    size_t getFrameCount() const { return frames_.size(); }
-    bool empty() const { return frames_.empty(); }
-
-    // ------ 全局属性（对应原始 AnimationFlag）------
-    FramePropertySet& globalProperties() { return globalProperties_; }
-    const FramePropertySet& globalProperties() const { return globalProperties_; }
-
-    bool isLooping() const {
-        return globalProperties_.getOr<bool>(FramePropertyKey::Loop, false);
-    }
-
-    void setLooping(bool loop) {
-        globalProperties_.withLoop(loop);
-    }
-
-    // ------ 时间信息 ------
-    float getTotalDuration() const {
-        float total = 0.0f;
-        for (const auto& frame : frames_) {
-            total += frame.delay;
-        }
-        return total;
-    }
-
-    // ------ 预计算最大帧尺寸 ------
-    Size getMaxFrameSize() const {
-        Size maxSize;
-        for (const auto& frame : frames_) {
-            if (frame.spriteFrame && frame.spriteFrame->isValid()) {
-                const auto& rect = frame.spriteFrame->getRect();
-                if (rect.size.width > maxSize.width)
-                    maxSize.width = rect.size.width;
-                if (rect.size.height > maxSize.height)
-                    maxSize.height = rect.size.height;
-            }
-        }
-        return maxSize;
-    }
-
-    // ------ 元数据 ------
-    void setName(const std::string& name) { name_ = name; }
-    const std::string& getName() const { return name_; }
-
-    void setSourcePath(const std::string& path) { sourcePath_ = path; }
-    const std::string& getSourcePath() const { return sourcePath_; }
-
-    // ------ 静态工厂 ------
-    static Ptr<AnimationClip> create(const std::string& name = "") {
-        return makePtr<AnimationClip>(name);
-    }
-
-    /// 从精灵图网格创建（所有帧按顺序）
-    static Ptr<AnimationClip> createFromGrid(
-        Ptr<Texture> texture, int frameWidth, int frameHeight,
-        float frameDurationMs = 100.0f, int frameCount = -1,
-        int spacing = 0, int margin = 0)
-    {
-        if (!texture) return nullptr;
-
-        int texW = texture->getWidth();
-        int texH = texture->getHeight();
-        int usableW = texW - 2 * margin;
-        int usableH = texH - 2 * margin;
-        int cols = (usableW + spacing) / (frameWidth + spacing);
-        int rows = (usableH + spacing) / (frameHeight + spacing);
-        int total = (frameCount > 0) ? frameCount : cols * rows;
-
-        auto clip = makePtr<AnimationClip>();
-        for (int i = 0; i < total; ++i) {
-            int col = i % cols;
-            int row = i / cols;
-            if (row >= rows) break;
-
-            // 翻转行顺序：精灵图第0行在顶部，但OpenGL纹理V坐标从底部开始
-            // 所以将行索引翻转，使第0行对应纹理底部（V=1.0），第3行对应纹理顶部（V=0.0）
-            int flippedRow = (rows - 1) - row;
-
-            Rect rect(
-                static_cast<float>(margin + col * (frameWidth + spacing)),
-                static_cast<float>(margin + flippedRow * (frameHeight + spacing)),
-                static_cast<float>(frameWidth),
-                static_cast<float>(frameHeight)
-            );
-
-            auto sf = SpriteFrame::create(texture, rect);
-            AnimationFrame frame;
-            frame.spriteFrame = std::move(sf);
-            frame.delay = frameDurationMs;
-            clip->addFrame(std::move(frame));
-        }
-        return clip;
-    }
-
-    /// 从精灵图网格创建（指定帧索引列表）
-    static Ptr<AnimationClip> createFromGridIndices(
-        Ptr<Texture> texture, int frameWidth, int frameHeight,
-        const std::vector<int>& frameIndices,
-        float frameDurationMs = 100.0f,
-        int spacing = 0, int margin = 0)
-    {
-        if (!texture) return nullptr;
-
-        int texW = texture->getWidth();
-        int texH = texture->getHeight();
-        int usableW = texW - 2 * margin;
-        int usableH = texH - 2 * margin;
-        int cols = (usableW + spacing) / (frameWidth + spacing);
-        int rows = (usableH + spacing) / (frameHeight + spacing);
-
-        auto clip = makePtr<AnimationClip>();
-        for (int idx : frameIndices) {
-            int col = idx % cols;
-            int row = idx / cols;
-
-            // 翻转行顺序：精灵图第0行在顶部，但OpenGL纹理V坐标从底部开始
-            int flippedRow = (rows - 1) - row;
-
-            Rect rect(
-                static_cast<float>(margin + col * (frameWidth + spacing)),
-                static_cast<float>(margin + flippedRow * (frameHeight + spacing)),
-                static_cast<float>(frameWidth),
-                static_cast<float>(frameHeight)
-            );
-
-            auto sf = SpriteFrame::create(texture, rect);
-            AnimationFrame frame;
-            frame.spriteFrame = std::move(sf);
-            frame.delay = frameDurationMs;
-            clip->addFrame(std::move(frame));
-        }
-        return clip;
-    }
-
-private:
-    std::string name_;
-    std::string sourcePath_;
-    std::vector<AnimationFrame> frames_;
-    FramePropertySet globalProperties_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/animation_controller.h b/Easy2D/include/easy2d/animation/animation_controller.h
deleted file mode 100644
index d23a026..0000000
--- a/Easy2D/include/easy2d/animation/animation_controller.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/animation/animation_clip.h>
-#include <easy2d/animation/interpolation_engine.h>
-#include <functional>
-#include <string>
-
-namespace easy2d {
-
-// ============================================================================
-// 动画播放状态
-// ============================================================================
-enum class AnimPlayState : uint8 {
-    Stopped,
-    Playing,
-    Paused
-};
-
-// ============================================================================
-// AnimationController - 动画播放控制器
-// 借鉴 Cocos Creator 的 AnimationState：纯播放逻辑，不持有渲染资源
-// ============================================================================
-class AnimationController {
-public:
-    // 回调类型定义
-    using FrameChangeCallback  = std::function<void(size_t oldIdx, size_t newIdx,
-                                                     const AnimationFrame& frame)>;
-    using KeyframeCallback     = std::function<void(int flagIndex)>;
-    using SoundTriggerCallback = std::function<void(const std::string& path)>;
-    using CompletionCallback   = std::function<void()>;
-
-    AnimationController() = default;
-
-    // ------ 绑定动画数据 ------
-    void setClip(Ptr<AnimationClip> clip);
-    Ptr<AnimationClip> getClip() const { return clip_; }
-
-    // ------ 播放控制 ------
-    void play();
-    void pause();
-    void resume();
-    void stop();
-    void reset();
-
-    // ------ 帧控制 ------
-    void setFrameIndex(size_t index);
-    void nextFrame();
-    void prevFrame();
-
-    // ------ 核心更新（每帧调用）------
-    void update(float dt);
-
-    // ------ 状态查询 ------
-    AnimPlayState getState() const { return state_; }
-    bool isPlaying() const { return state_ == AnimPlayState::Playing; }
-    bool isPaused()  const { return state_ == AnimPlayState::Paused; }
-    bool isStopped() const { return state_ == AnimPlayState::Stopped; }
-
-    size_t getCurrentFrameIndex() const { return currentFrameIndex_; }
-    size_t getTotalFrames() const;
-    const AnimationFrame& getCurrentFrame() const;
-
-    float getPlaybackSpeed() const { return playbackSpeed_; }
-    void  setPlaybackSpeed(float speed) { playbackSpeed_ = speed; }
-
-    bool isLooping() const;
-    void setLooping(bool loop);
-
-    // ------ 插值状态 ------
-    float getInterpolationFactor() const { return interpolationFactor_; }
-    bool  isInterpolating() const { return interpolating_; }
-
-    // ------ 回调注册 ------
-    void setFrameChangeCallback(FrameChangeCallback cb) { onFrameChange_ = std::move(cb); }
-    void setKeyframeCallback(KeyframeCallback cb) { onKeyframe_ = std::move(cb); }
-    void setSoundTriggerCallback(SoundTriggerCallback cb) { onSoundTrigger_ = std::move(cb); }
-    void setCompletionCallback(CompletionCallback cb) { onComplete_ = std::move(cb); }
-
-private:
-    Ptr<AnimationClip> clip_;
-    AnimPlayState state_ = AnimPlayState::Stopped;
-
-    size_t currentFrameIndex_ = 0;
-    float  accumulatedTime_   = 0.0f;   // 当前帧已累积时间 (ms)
-    float  playbackSpeed_     = 1.0f;
-    bool   loopOverride_      = false;  // 外部循环覆盖值
-    bool   hasLoopOverride_   = false;  // 是否使用外部循环覆盖
-
-    // 插值状态
-    bool  interpolating_       = false;
-    float interpolationFactor_ = 0.0f;
-
-    // 回调
-    FrameChangeCallback  onFrameChange_;
-    KeyframeCallback     onKeyframe_;
-    SoundTriggerCallback onSoundTrigger_;
-    CompletionCallback   onComplete_;
-
-    // 内部方法
-    void advanceFrame(size_t newIndex);
-    void processFrameProperties(const AnimationFrame& frame);
-    void updateInterpolation();
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/animation_frame.h b/Easy2D/include/easy2d/animation/animation_frame.h
deleted file mode 100644
index 19cba10..0000000
--- a/Easy2D/include/easy2d/animation/animation_frame.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include <easy2d/animation/sprite_frame.h>
-#include <easy2d/animation/frame_property.h>
-#include <string>
-#include <vector>
-#include <array>
-#include <cstdint>
-
-namespace easy2d {
-
-// ============================================================================
-// AnimationFrame - 单帧数据
-// 引用 SpriteFrame 而非直接持有纹理（借鉴 Cocos 模式）
-// 通过 FramePropertySet 支持不固定数据（ANI Flag 系统增强版）
-// ============================================================================
-struct AnimationFrame {
-    // ------ 核心数据（固定部分）------
-    Ptr<SpriteFrame> spriteFrame;       // 精灵帧引用（Cocos 模式）
-    std::string      texturePath;       // 原始图片路径（用于解析时定位资源）
-    int              textureIndex = 0;  // 精灵图集索引
-    Vec2             offset;            // 位置偏移
-    float            delay = 100.0f;    // 帧延迟（毫秒）
-
-    // ------ 碰撞盒数据（DNF ANI 格式）------
-    std::vector<std::array<int32_t, 6>> damageBoxes;  // 伤害碰撞盒
-    std::vector<std::array<int32_t, 6>> attackBoxes;   // 攻击碰撞盒
-
-    // ------ 不固定数据（属性集合）------
-    FramePropertySet properties;        // 类型安全的 Flag 系统
-
-    // ------ 便捷方法 ------
-    bool hasTexture() const {
-        return spriteFrame != nullptr && spriteFrame->isValid();
-    }
-
-    bool hasInterpolation() const {
-        return properties.getOr<bool>(FramePropertyKey::Interpolation, false);
-    }
-
-    bool hasKeyframeCallback() const {
-        return properties.has(FramePropertyKey::SetFlag);
-    }
-
-    int getKeyframeIndex() const {
-        return properties.getOr<int>(FramePropertyKey::SetFlag, -1);
-    }
-
-    Vec2 getEffectiveScale() const {
-        return properties.getOr<Vec2>(FramePropertyKey::ImageRate, Vec2::One());
-    }
-
-    float getEffectiveRotation() const {
-        return properties.getOr<float>(FramePropertyKey::ImageRotate, 0.0f);
-    }
-
-    Color getEffectiveColor() const {
-        return properties.getOr<Color>(FramePropertyKey::ColorTint, Colors::White);
-    }
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/animation_node.h b/Easy2D/include/easy2d/animation/animation_node.h
deleted file mode 100644
index 8919dd5..0000000
--- a/Easy2D/include/easy2d/animation/animation_node.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/animation/animation_clip.h>
-#include <easy2d/animation/animation_controller.h>
-#include <easy2d/animation/animation_cache.h>
-#include <easy2d/animation/frame_renderer.h>
-#include <easy2d/animation/animation_event.h>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// AnimationNode - 动画节点（继承 Node）
-// 使用 FrameRenderer 单渲染器策略，不依赖 Sprite 基类
-// 适用于需要独立渲染控制的动画（如特效、复合动画图层）
-// ============================================================================
-class AnimationNode : public Node {
-public:
-    AnimationNode();
-    ~AnimationNode() override = default;
-
-    // ------ 静态工厂（Cocos 风格）------
-    static Ptr<AnimationNode> create();
-    static Ptr<AnimationNode> create(Ptr<AnimationClip> clip);
-    static Ptr<AnimationNode> create(const std::string& aniFilePath);
-
-    // ------ 动画数据 ------
-    void setClip(Ptr<AnimationClip> clip);
-    Ptr<AnimationClip> getClip() const;
-    bool loadFromFile(const std::string& aniFilePath);
-
-    // ------ 播放控制 ------
-    void play();
-    void pause();
-    void resume();
-    void stop();
-    void reset();
-
-    bool isPlaying() const;
-    bool isPaused() const;
-    bool isStopped() const;
-
-    void setPlaybackSpeed(float speed);
-    float getPlaybackSpeed() const;
-    void setLooping(bool loop);
-    bool isLooping() const;
-
-    // ------ 帧控制 ------
-    void setFrameIndex(size_t index);
-    size_t getCurrentFrameIndex() const;
-    size_t getTotalFrames() const;
-
-    // ------ 事件回调 ------
-    void setKeyframeCallback(KeyframeHitCallback callback);
-    void setCompletionCallback(AnimationCompleteCallback callback);
-    void setFrameChangeCallback(AnimationController::FrameChangeCallback callback);
-    void addEventListener(AnimationEventCallback callback);
-
-    // ------ 视觉属性 ------
-    void setTintColor(const Color& color);
-    Color getTintColor() const { return tintColor_; }
-    void setFlipX(bool flip) { flipX_ = flip; }
-    void setFlipY(bool flip) { flipY_ = flip; }
-    bool isFlipX() const { return flipX_; }
-    bool isFlipY() const { return flipY_; }
-
-    // ------ 自动播放 ------
-    void setAutoPlay(bool autoPlay) { autoPlay_ = autoPlay; }
-    bool isAutoPlay() const { return autoPlay_; }
-
-    // ------ 碰撞盒访问 ------
-    const std::vector<std::array<int32_t, 6>>& getCurrentDamageBoxes() const;
-    const std::vector<std::array<int32_t, 6>>& getCurrentAttackBoxes() const;
-
-    // ------ 查询 ------
-    Size getMaxFrameSize() const;
-    Rect getBoundingBox() const override;
-
-    // ------ 直接访问 ------
-    AnimationController& getController() { return controller_; }
-    const AnimationController& getController() const { return controller_; }
-    FrameRenderer& getFrameRenderer() { return frameRenderer_; }
-    const FrameRenderer& getFrameRenderer() const { return frameRenderer_; }
-
-protected:
-    void onUpdate(float dt) override;
-    void onDraw(RenderBackend& renderer) override;
-    void onEnter() override;
-    void onExit() override;
-
-private:
-    AnimationController controller_;
-    FrameRenderer       frameRenderer_;
-    Color tintColor_ = Colors::White;
-    bool  flipX_ = false;
-    bool  flipY_ = false;
-    bool  autoPlay_ = false;
-    std::vector<AnimationEventCallback> eventListeners_;
-
-    static const std::vector<std::array<int32_t, 6>> emptyBoxes_;
-
-    void setupControllerCallbacks();
-    void dispatchEvent(const AnimationEvent& event);
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/composite_animation.h b/Easy2D/include/easy2d/animation/composite_animation.h
deleted file mode 100644
index 728bc19..0000000
--- a/Easy2D/include/easy2d/animation/composite_animation.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/animation/animation_node.h>
-#include <easy2d/animation/als_parser.h>
-#include <easy2d/animation/animation_event.h>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// CompositeAnimation - ALS 多层复合动画节点
-// 管理多个 AnimationNode 图层，统一控制播放
-// 对应 DNF 的 ALS 格式（多层动画叠加）
-// ============================================================================
-class CompositeAnimation : public Node {
-public:
-    CompositeAnimation() = default;
-    ~CompositeAnimation() override = default;
-
-    // ------ 静态工厂 ------
-    static Ptr<CompositeAnimation> create();
-    static Ptr<CompositeAnimation> create(const std::string& alsFilePath);
-
-    // ------ 加载 ------
-    bool loadFromFile(const std::string& alsFilePath);
-
-    // ------ 图层管理 ------
-    void addLayer(Ptr<AnimationNode> node, int zOrder = 0);
-    void removeLayer(size_t index);
-    Ptr<AnimationNode> getLayer(size_t index) const;
-    Ptr<AnimationNode> getMainLayer() const;
-    size_t getLayerCount() const;
-
-    // ------ 统一播放控制 ------
-    void play();
-    void pause();
-    void resume();
-    void stop();
-    void reset();
-    void setPlaybackSpeed(float speed);
-    void setLooping(bool loop);
-
-    bool isPlaying() const;
-    bool isStopped() const;
-
-    // ------ 事件回调（绑定到主图层）------
-    void setKeyframeCallback(KeyframeHitCallback callback);
-    void setCompletionCallback(AnimationCompleteCallback callback);
-    void addEventListener(AnimationEventCallback callback);
-
-    // ------ 视觉属性（应用到所有图层）------
-    void setTintColor(const Color& color);
-    void setFlipX(bool flip);
-    void setFlipY(bool flip);
-
-private:
-    struct LayerEntry {
-        Ptr<AnimationNode> node;
-        int zOrder = 0;
-    };
-    std::vector<LayerEntry> layers_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/frame_property.h b/Easy2D/include/easy2d/animation/frame_property.h
deleted file mode 100644
index 26c9911..0000000
--- a/Easy2D/include/easy2d/animation/frame_property.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/color.h>
-#include <variant>
-#include <unordered_map>
-#include <optional>
-#include <any>
-#include <string>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// 帧属性键 - 强类型枚举替代原始 ANI 的字符串键
-// ============================================================================
-enum class FramePropertyKey : uint32 {
-    // 事件触发
-    SetFlag             = 0x0001,   // int: 关键帧回调索引
-    PlaySound           = 0x0002,   // string: 音效路径
-
-    // 变换属性
-    ImageRate           = 0x0010,   // Vec2: 缩放比例
-    ImageRotate         = 0x0011,   // float: 旋转角度（度）
-    ImageOffset         = 0x0012,   // Vec2: 额外位置偏移
-
-    // 视觉效果
-    BlendLinearDodge    = 0x0020,   // bool: 线性减淡
-    BlendAdditive       = 0x0021,   // bool: 加法混合
-    ColorTint           = 0x0022,   // Color: RGBA 颜色
-
-    // 控制标记
-    Interpolation       = 0x0030,   // bool: 启用到下一帧的插值
-    Loop                = 0x0031,   // bool: 全局循环标记
-
-    // DNF ANI 扩展属性
-    DamageType          = 0x0040,   // int: 伤害类型 (0=Normal, 1=SuperArmor, 2=Unbreakable)
-    Shadow              = 0x0041,   // bool: 阴影
-    FlipType            = 0x0042,   // int: 翻转类型 (1=Horizon, 2=Vertical, 3=All)
-    Coord               = 0x0043,   // int: 坐标系
-    LoopStart           = 0x0044,   // bool: 循环起始标记
-    LoopEnd             = 0x0045,   // int: 循环结束帧数
-    GraphicEffect       = 0x0046,   // int: 图形特效类型
-    ClipRegion          = 0x0047,   // vector<int>: 裁剪区域 [4个int16]
-
-    // 用户自定义扩展区间 (0x1000+)
-    UserDefined         = 0x1000,
-};
-
-// ============================================================================
-// 帧属性值 - variant 多态值
-// ============================================================================
-using FramePropertyValue = std::variant<
-    bool,
-    int,
-    float,
-    std::string,
-    Vec2,
-    Color,
-    std::vector<int>
->;
-
-// ============================================================================
-// FramePropertyKey 的 hash 支持
-// ============================================================================
-struct FramePropertyKeyHash {
-    size_t operator()(FramePropertyKey key) const noexcept {
-        return std::hash<uint32>{}(static_cast<uint32>(key));
-    }
-};
-
-// ============================================================================
-// FramePropertySet - 单帧属性集合
-// 同时支持强类型属性和自定义扩展（不固定数据）
-// ============================================================================
-class FramePropertySet {
-public:
-    FramePropertySet() = default;
-
-    // ------ 设置属性 ------
-    void set(FramePropertyKey key, FramePropertyValue value) {
-        properties_[key] = std::move(value);
-    }
-
-    void setCustom(const std::string& key, std::any value) {
-        customProperties_[key] = std::move(value);
-    }
-
-    // ------ 类型安全获取 ------
-    template<typename T>
-    std::optional<T> get(FramePropertyKey key) const {
-        auto it = properties_.find(key);
-        if (it == properties_.end()) return std::nullopt;
-        if (auto* val = std::get_if<T>(&it->second)) {
-            return *val;
-        }
-        return std::nullopt;
-    }
-
-    template<typename T>
-    T getOr(FramePropertyKey key, const T& defaultValue) const {
-        auto result = get<T>(key);
-        return result.value_or(defaultValue);
-    }
-
-    std::optional<std::any> getCustom(const std::string& key) const {
-        auto it = customProperties_.find(key);
-        if (it == customProperties_.end()) return std::nullopt;
-        return it->second;
-    }
-
-    // ------ 查询 ------
-    bool has(FramePropertyKey key) const {
-        return properties_.find(key) != properties_.end();
-    }
-
-    bool hasCustom(const std::string& key) const {
-        return customProperties_.find(key) != customProperties_.end();
-    }
-
-    bool empty() const {
-        return properties_.empty() && customProperties_.empty();
-    }
-
-    size_t count() const {
-        return properties_.size() + customProperties_.size();
-    }
-
-    // ------ 移除 ------
-    void remove(FramePropertyKey key) {
-        properties_.erase(key);
-    }
-
-    void removeCustom(const std::string& key) {
-        customProperties_.erase(key);
-    }
-
-    void clear() {
-        properties_.clear();
-        customProperties_.clear();
-    }
-
-    // ------ 迭代 ------
-    using PropertyMap = std::unordered_map<FramePropertyKey, FramePropertyValue, FramePropertyKeyHash>;
-    const PropertyMap& properties() const { return properties_; }
-
-    // ------ 链式 API ------
-    FramePropertySet& withSetFlag(int index) {
-        set(FramePropertyKey::SetFlag, index);
-        return *this;
-    }
-
-    FramePropertySet& withPlaySound(const std::string& path) {
-        set(FramePropertyKey::PlaySound, path);
-        return *this;
-    }
-
-    FramePropertySet& withImageRate(const Vec2& scale) {
-        set(FramePropertyKey::ImageRate, scale);
-        return *this;
-    }
-
-    FramePropertySet& withImageRotate(float degrees) {
-        set(FramePropertyKey::ImageRotate, degrees);
-        return *this;
-    }
-
-    FramePropertySet& withColorTint(const Color& color) {
-        set(FramePropertyKey::ColorTint, color);
-        return *this;
-    }
-
-    FramePropertySet& withInterpolation(bool enabled = true) {
-        set(FramePropertyKey::Interpolation, enabled);
-        return *this;
-    }
-
-    FramePropertySet& withBlendLinearDodge(bool enabled = true) {
-        set(FramePropertyKey::BlendLinearDodge, enabled);
-        return *this;
-    }
-
-    FramePropertySet& withLoop(bool enabled = true) {
-        set(FramePropertyKey::Loop, enabled);
-        return *this;
-    }
-
-private:
-    PropertyMap properties_;
-    std::unordered_map<std::string, std::any> customProperties_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/frame_renderer.h b/Easy2D/include/easy2d/animation/frame_renderer.h
deleted file mode 100644
index feaa187..0000000
--- a/Easy2D/include/easy2d/animation/frame_renderer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-#include <easy2d/animation/animation_frame.h>
-#include <easy2d/animation/sprite_frame.h>
-#include <easy2d/animation/sprite_frame_cache.h>
-#include <easy2d/animation/interpolation_engine.h>
-#include <easy2d/graphics/render_backend.h>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// FrameRenderer - 帧渲染器
-// 单渲染器 + SpriteFrame 引用策略，替代 N帧=N个Sprite 的旧设计
-// 负责预加载帧的 SpriteFrame、渲染当前帧、处理混合模式
-// ============================================================================
-class FrameRenderer {
-public:
-    FrameRenderer() = default;
-
-    // ------ 预加载 ------
-    // 解析所有帧的 SpriteFrame（通过 SpriteFrameCache）
-    bool preloadFrames(const std::vector<AnimationFrame>& frames);
-    void releaseFrames();
-
-    // ------ 渲染当前帧 ------
-    void renderFrame(RenderBackend& renderer,
-                     const AnimationFrame& frame,
-                     size_t frameIndex,
-                     const Vec2& position,
-                     float nodeOpacity,
-                     const Color& tintColor,
-                     bool flipX, bool flipY);
-
-    // ------ 渲染插值帧 ------
-    void renderInterpolated(RenderBackend& renderer,
-                            const AnimationFrame& fromFrame,
-                            size_t fromIndex,
-                            const InterpolatedProperties& props,
-                            const Vec2& position,
-                            float nodeOpacity,
-                            const Color& tintColor,
-                            bool flipX, bool flipY);
-
-    // ------ 混合模式映射 ------
-    static BlendMode mapBlendMode(const FramePropertySet& props);
-
-    // ------ 查询 ------
-    Ptr<SpriteFrame> getSpriteFrame(size_t frameIndex) const;
-    Size getMaxFrameSize() const { return maxFrameSize_; }
-    bool isLoaded() const { return !spriteFrames_.empty(); }
-
-private:
-    std::vector<Ptr<SpriteFrame>> spriteFrames_;
-    Size maxFrameSize_;
-
-    void drawSpriteFrame(RenderBackend& renderer,
-                         Ptr<SpriteFrame> sf,
-                         const Vec2& position,
-                         const Vec2& offset,
-                         const Vec2& scale,
-                         float rotation,
-                         float opacity,
-                         const Color& tint,
-                         bool flipX, bool flipY,
-                         BlendMode blend);
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/interpolation_engine.h b/Easy2D/include/easy2d/animation/interpolation_engine.h
deleted file mode 100644
index a9cf01e..0000000
--- a/Easy2D/include/easy2d/animation/interpolation_engine.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/animation/animation_frame.h>
-#include <cmath>
-
-namespace easy2d {
-
-// ============================================================================
-// 插值结果 - 两帧之间的插值后属性
-// ============================================================================
-struct InterpolatedProperties {
-    Vec2  position;
-    Vec2  scale = Vec2::One();
-    float rotation = 0.0f;
-    Color color = Colors::White;
-};
-
-// ============================================================================
-// 插值曲线类型
-// ============================================================================
-enum class InterpolationCurve : uint8 {
-    Linear,     // 线性（原始系统的 uniform velocity）
-    EaseIn,     // 缓入
-    EaseOut,    // 缓出
-    EaseInOut,  // 缓入缓出
-};
-
-// ============================================================================
-// InterpolationEngine - 帧间属性插值计算（静态方法，无状态）
-// 独立于 AnimationController，可复用于其他系统
-// ============================================================================
-class InterpolationEngine {
-public:
-    /// 核心插值计算：根据 t 因子 (0~1) 计算两帧之间的插值属性
-    static InterpolatedProperties interpolate(
-        const AnimationFrame& from,
-        const AnimationFrame& to,
-        float t,
-        InterpolationCurve curve = InterpolationCurve::Linear)
-    {
-        float curvedT = applyCurve(t, curve);
-
-        InterpolatedProperties result;
-        result.position = lerpPosition(from, to, curvedT);
-        result.scale    = lerpScale(from, to, curvedT);
-        result.rotation = lerpRotation(from, to, curvedT);
-        result.color    = lerpColor(from, to, curvedT);
-        return result;
-    }
-
-    /// 位置插值
-    static Vec2 lerpPosition(const AnimationFrame& from, const AnimationFrame& to, float t) {
-        return Vec2::lerp(from.offset, to.offset, t);
-    }
-
-    /// 缩放插值
-    static Vec2 lerpScale(const AnimationFrame& from, const AnimationFrame& to, float t) {
-        Vec2 fromScale = from.getEffectiveScale();
-        Vec2 toScale   = to.getEffectiveScale();
-        return Vec2::lerp(fromScale, toScale, t);
-    }
-
-    /// 旋转插值
-    static float lerpRotation(const AnimationFrame& from, const AnimationFrame& to, float t) {
-        float fromRot = from.getEffectiveRotation();
-        float toRot   = to.getEffectiveRotation();
-        return math::lerp(fromRot, toRot, t);
-    }
-
-    /// 颜色插值
-    static Color lerpColor(const AnimationFrame& from, const AnimationFrame& to, float t) {
-        Color fromColor = from.getEffectiveColor();
-        Color toColor   = to.getEffectiveColor();
-        return Color::lerp(fromColor, toColor, t);
-    }
-
-    /// 应用曲线函数
-    static float applyCurve(float t, InterpolationCurve curve) {
-        t = math::clamp(t, 0.0f, 1.0f);
-
-        switch (curve) {
-        case InterpolationCurve::Linear:
-            return t;
-
-        case InterpolationCurve::EaseIn:
-            return t * t;
-
-        case InterpolationCurve::EaseOut:
-            return t * (2.0f - t);
-
-        case InterpolationCurve::EaseInOut:
-            if (t < 0.5f)
-                return 2.0f * t * t;
-            else
-                return -1.0f + (4.0f - 2.0f * t) * t;
-        }
-
-        return t;
-    }
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/sprite_frame.h b/Easy2D/include/easy2d/animation/sprite_frame.h
deleted file mode 100644
index 8dde7a8..0000000
--- a/Easy2D/include/easy2d/animation/sprite_frame.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/graphics/texture.h>
-#include <string>
-
-namespace easy2d {
-
-// ============================================================================
-// SpriteFrame - 精灵帧（纹理 + 区域 + 偏移的中间抽象）
-// 借鉴 Cocos2d-x SpriteFrame：解耦纹理物理存储与逻辑帧
-// 一个纹理图集可包含多个 SpriteFrame，减少纹理切换提升渲染性能
-// ============================================================================
-class SpriteFrame {
-public:
-    SpriteFrame() = default;
-
-    SpriteFrame(Ptr<Texture> texture, const Rect& rect)
-        : texture_(std::move(texture))
-        , rect_(rect)
-        , originalSize_(rect.size) {}
-
-    SpriteFrame(Ptr<Texture> texture, const Rect& rect,
-                const Vec2& offset, const Size& originalSize)
-        : texture_(std::move(texture))
-        , rect_(rect)
-        , offset_(offset)
-        , originalSize_(originalSize) {}
-
-    // ------ 静态创建 ------
-    static Ptr<SpriteFrame> create(Ptr<Texture> texture, const Rect& rect) {
-        return makePtr<SpriteFrame>(std::move(texture), rect);
-    }
-
-    static Ptr<SpriteFrame> create(Ptr<Texture> texture, const Rect& rect,
-                                    const Vec2& offset, const Size& originalSize) {
-        return makePtr<SpriteFrame>(std::move(texture), rect, offset, originalSize);
-    }
-
-    // ------ 纹理信息 ------
-    void setTexture(Ptr<Texture> texture) { texture_ = std::move(texture); }
-    Ptr<Texture> getTexture() const { return texture_; }
-
-    // ------ 矩形区域（在纹理图集中的位置）------
-    void setRect(const Rect& rect) { rect_ = rect; }
-    const Rect& getRect() const { return rect_; }
-
-    // ------ 偏移（图集打包时的裁剪偏移）------
-    void setOffset(const Vec2& offset) { offset_ = offset; }
-    const Vec2& getOffset() const { return offset_; }
-
-    // ------ 原始尺寸（裁剪前的完整尺寸）------
-    void setOriginalSize(const Size& size) { originalSize_ = size; }
-    const Size& getOriginalSize() const { return originalSize_; }
-
-    // ------ 旋转标志（图集工具可能旋转90度）------
-    void setRotated(bool rotated) { rotated_ = rotated; }
-    bool isRotated() const { return rotated_; }
-
-    // ------ 名称（用于缓存索引）------
-    void setName(const std::string& name) { name_ = name; }
-    const std::string& getName() const { return name_; }
-
-    // ------ 有效性检查 ------
-    bool isValid() const { return texture_ != nullptr; }
-
-private:
-    Ptr<Texture> texture_;
-    Rect rect_;
-    Vec2 offset_;
-    Size originalSize_;
-    bool rotated_ = false;
-    std::string name_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/animation/sprite_frame_cache.h b/Easy2D/include/easy2d/animation/sprite_frame_cache.h
deleted file mode 100644
index 27964d2..0000000
--- a/Easy2D/include/easy2d/animation/sprite_frame_cache.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#pragma once
-
-#include <easy2d/animation/sprite_frame.h>
-#include <easy2d/graphics/texture_pool.h>
-#include <unordered_map>
-#include <mutex>
-#include <string>
-
-namespace easy2d {
-
-// ============================================================================
-// SpriteFrameCache - 精灵帧全局缓存（借鉴 Cocos SpriteFrameCache）
-// 全局单例管理所有精灵帧，避免重复创建，支持图集自动切割
-// ============================================================================
-class SpriteFrameCache {
-public:
-    static SpriteFrameCache& getInstance() {
-        static SpriteFrameCache instance;
-        return instance;
-    }
-
-    // ------ 添加帧 ------
-
-    /// 添加单个精灵帧
-    void addSpriteFrame(Ptr<SpriteFrame> frame, const std::string& name) {
-        std::lock_guard<std::mutex> lock(mutex_);
-        frames_[name] = std::move(frame);
-    }
-
-    /// 从纹理和矩形区域创建并添加帧
-    void addSpriteFrameFromTexture(Ptr<Texture> texture, const Rect& rect,
-                                    const std::string& name) {
-        auto frame = SpriteFrame::create(std::move(texture), rect);
-        frame->setName(name);
-        addSpriteFrame(std::move(frame), name);
-    }
-
-    /// 从纹理图集批量切割添加（等宽等高网格）
-    void addSpriteFramesFromGrid(const std::string& texturePath,
-                                  int frameWidth, int frameHeight,
-                                  int frameCount = -1,
-                                  int spacing = 0, int margin = 0) {
-        auto texture = TexturePool::getInstance().get(texturePath);
-        if (!texture) return;
-        addSpriteFramesFromGrid(texture, texturePath, frameWidth, frameHeight,
-                                frameCount, spacing, margin);
-    }
-
-    /// 从纹理对象批量切割添加（等宽等高网格，无需走 TexturePool）
-    void addSpriteFramesFromGrid(Ptr<Texture> texture, const std::string& keyPrefix,
-                                  int frameWidth, int frameHeight,
-                                  int frameCount = -1,
-                                  int spacing = 0, int margin = 0) {
-        if (!texture) return;
-
-        int texW = texture->getWidth();
-        int texH = texture->getHeight();
-        int usableW = texW - 2 * margin;
-        int usableH = texH - 2 * margin;
-        int cols = (usableW + spacing) / (frameWidth + spacing);
-        int rows = (usableH + spacing) / (frameHeight + spacing);
-        int total = (frameCount > 0) ? frameCount : cols * rows;
-
-        std::lock_guard<std::mutex> lock(mutex_);
-        for (int i = 0; i < total; ++i) {
-            int col = i % cols;
-            int row = i / cols;
-            if (row >= rows) break;
-
-            Rect rect(
-                static_cast<float>(margin + col * (frameWidth + spacing)),
-                static_cast<float>(margin + row * (frameHeight + spacing)),
-                static_cast<float>(frameWidth),
-                static_cast<float>(frameHeight)
-            );
-
-            std::string name = keyPrefix + "#" + std::to_string(i);
-            auto frame = SpriteFrame::create(texture, rect);
-            frame->setName(name);
-            frames_[name] = std::move(frame);
-        }
-    }
-
-    // ------ 获取帧 ------
-
-    /// 按名称获取
-    Ptr<SpriteFrame> getSpriteFrame(const std::string& name) const {
-        std::lock_guard<std::mutex> lock(mutex_);
-        auto it = frames_.find(name);
-        if (it != frames_.end()) return it->second;
-        return nullptr;
-    }
-
-    /// 通过路径+索引获取或创建（ANI 格式的定位方式）
-    Ptr<SpriteFrame> getOrCreateFromFile(const std::string& texturePath,
-                                          int index = 0) {
-        std::string key = texturePath + "#" + std::to_string(index);
-
-        {
-            std::lock_guard<std::mutex> lock(mutex_);
-            auto it = frames_.find(key);
-            if (it != frames_.end()) return it->second;
-        }
-
-        // 缓存未命中，从 TexturePool 加载纹理并创建 SpriteFrame
-        auto texture = TexturePool::getInstance().get(texturePath);
-        if (!texture) return nullptr;
-
-        // 默认整张纹理作为一帧（index=0），或用整张纹理
-        Rect rect(0.0f, 0.0f,
-                  static_cast<float>(texture->getWidth()),
-                  static_cast<float>(texture->getHeight()));
-
-        auto frame = SpriteFrame::create(texture, rect);
-        frame->setName(key);
-
-        std::lock_guard<std::mutex> lock(mutex_);
-        frames_[key] = frame;
-        return frame;
-    }
-
-    // ------ 缓存管理 ------
-
-    bool has(const std::string& name) const {
-        std::lock_guard<std::mutex> lock(mutex_);
-        return frames_.find(name) != frames_.end();
-    }
-
-    void removeSpriteFrame(const std::string& name) {
-        std::lock_guard<std::mutex> lock(mutex_);
-        frames_.erase(name);
-    }
-
-    /// 移除未被外部引用的精灵帧（use_count == 1 表示仅缓存自身持有）
-    void removeUnusedSpriteFrames() {
-        std::lock_guard<std::mutex> lock(mutex_);
-        for (auto it = frames_.begin(); it != frames_.end(); ) {
-            if (it->second.use_count() == 1) {
-                it = frames_.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-
-    void clear() {
-        std::lock_guard<std::mutex> lock(mutex_);
-        frames_.clear();
-    }
-
-    size_t count() const {
-        std::lock_guard<std::mutex> lock(mutex_);
-        return frames_.size();
-    }
-
-private:
-    SpriteFrameCache() = default;
-    ~SpriteFrameCache() = default;
-    SpriteFrameCache(const SpriteFrameCache&) = delete;
-    SpriteFrameCache& operator=(const SpriteFrameCache&) = delete;
-
-    mutable std::mutex mutex_;
-    std::unordered_map<std::string, Ptr<SpriteFrame>> frames_;
-};
-
-// 便捷宏
-#define E2D_SPRITE_FRAME_CACHE() ::easy2d::SpriteFrameCache::getInstance()
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/app/application.h b/Easy2D/include/easy2d/app/application.h
deleted file mode 100644
index 27788d5..0000000
--- a/Easy2D/include/easy2d/app/application.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/string.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/platform/window.h>
-#include <memory>
-
-namespace easy2d {
-
-// 前向声明
-class Input;
-class AudioEngine;
-class SceneManager;
-class ResourceManager;
-class TimerManager;
-class EventQueue;
-class EventDispatcher;
-class Camera;
-
-// ============================================================================
-// Application 配置
-// ============================================================================
-struct AppConfig {
-    String title = "Easy2D Application";
-    int width = 800;
-    int height = 600;
-    bool fullscreen = false;
-    bool resizable = true;  // 窗口是否可调整大小
-    bool vsync = true;
-    int fpsLimit = 0;  // 0 = 不限制
-    BackendType renderBackend = BackendType::OpenGL;
-    int msaaSamples = 0;
-};
-
-// ============================================================================
-// Application 单例 - 应用主控
-// ============================================================================
-class Application {
-public:
-    // Meyer's 单例
-    static Application& instance();
-
-    // 禁止拷贝
-    Application(const Application&) = delete;
-    Application& operator=(const Application&) = delete;
-
-    // ------------------------------------------------------------------------
-    // 生命周期
-    // ------------------------------------------------------------------------
-    bool init(const AppConfig& config);
-    void shutdown();
-    void run();
-    void quit();
-
-    // ------------------------------------------------------------------------
-    // 状态控制
-    // ------------------------------------------------------------------------
-    void pause();
-    void resume();
-    bool isPaused() const { return paused_; }
-    bool isRunning() const { return running_; }
-
-    // ------------------------------------------------------------------------
-    // 子系统访问
-    // ------------------------------------------------------------------------
-    Window& window() { return *window_; }
-    RenderBackend& renderer() { return *renderer_; }
-    Input& input();
-    AudioEngine& audio();
-    SceneManager& scenes();
-    ResourceManager& resources();
-    TimerManager& timers();
-    EventQueue& eventQueue();
-    EventDispatcher& eventDispatcher();
-    Camera& camera();
-
-    // ------------------------------------------------------------------------
-    // 便捷方法
-    // ------------------------------------------------------------------------
-    void enterScene(Ptr<class Scene> scene);
-    void enterScene(Ptr<class Scene> scene, Ptr<class Transition> transition);
-    
-    float deltaTime() const { return deltaTime_; }
-    float totalTime() const { return totalTime_; }
-    int fps() const { return currentFps_; }
-
-    // 获取配置
-    const AppConfig& getConfig() const { return config_; }
-
-private:
-    Application() = default;
-    ~Application();
-
-    void mainLoop();
-    void update();
-    void render();
-
-    // 配置
-    AppConfig config_;
-
-    // 子系统
-    UniquePtr<Window> window_;
-    UniquePtr<RenderBackend> renderer_;
-    UniquePtr<SceneManager> sceneManager_;
-    UniquePtr<ResourceManager> resourceManager_;
-    UniquePtr<TimerManager> timerManager_;
-    UniquePtr<EventQueue> eventQueue_;
-    UniquePtr<EventDispatcher> eventDispatcher_;
-    UniquePtr<Camera> camera_;
-
-    // 状态
-    bool initialized_ = false;
-    bool running_ = false;
-    bool paused_ = false;
-    bool shouldQuit_ = false;
-
-    // 时间
-    float deltaTime_ = 0.0f;
-    float totalTime_ = 0.0f;
-    double lastFrameTime_ = 0.0;
-    int frameCount_ = 0;
-    float fpsTimer_ = 0.0f;
-    int currentFps_ = 0;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/core/color.h b/Easy2D/include/easy2d/core/color.h
deleted file mode 100644
index ff941db..0000000
--- a/Easy2D/include/easy2d/core/color.h
+++ /dev/null
@@ -1,131 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <glm/vec4.hpp>
-#include <algorithm>
-
-namespace easy2d {
-
-/// RGBA 颜色（浮点数，每通道 0.0 - 1.0）
-struct Color {
-    float r = 0.0f;
-    float g = 0.0f;
-    float b = 0.0f;
-    float a = 1.0f;
-
-    constexpr Color() = default;
-
-    constexpr Color(float r, float g, float b, float a = 1.0f)
-        : r(r), g(g), b(b), a(a) {}
-
-    /// 从 0xRRGGBB 整数构造
-    constexpr explicit Color(uint32_t rgb, float a = 1.0f)
-        : r(static_cast<float>((rgb >> 16) & 0xFF) / 255.0f)
-        , g(static_cast<float>((rgb >> 8)  & 0xFF) / 255.0f)
-        , b(static_cast<float>((rgb)       & 0xFF) / 255.0f)
-        , a(a) {}
-
-    /// 从 0-255 整数构造
-    static constexpr Color fromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255) {
-        return Color(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f);
-    }
-
-    /// 转换为 glm::vec4
-    glm::vec4 toVec4() const { return {r, g, b, a}; }
-
-    /// 线性插值
-    static Color lerp(const Color& a, const Color& b, float t) {
-        t = std::clamp(t, 0.0f, 1.0f);
-        return Color(
-            a.r + (b.r - a.r) * t,
-            a.g + (b.g - a.g) * t,
-            a.b + (b.b - a.b) * t,
-            a.a + (b.a - a.a) * t
-        );
-    }
-
-    bool operator==(const Color& other) const {
-        return r == other.r && g == other.g && b == other.b && a == other.a;
-    }
-
-    bool operator!=(const Color& other) const {
-        return !(*this == other);
-    }
-
-    // 算术运算符
-    Color operator+(const Color& other) const {
-        return Color(r + other.r, g + other.g, b + other.b, a + other.a);
-    }
-
-    Color operator-(const Color& other) const {
-        return Color(r - other.r, g - other.g, b - other.b, a - other.a);
-    }
-
-    Color operator*(float scalar) const {
-        return Color(r * scalar, g * scalar, b * scalar, a * scalar);
-    }
-
-    Color operator/(float scalar) const {
-        return Color(r / scalar, g / scalar, b / scalar, a / scalar);
-    }
-
-    Color& operator+=(const Color& other) {
-        r += other.r; g += other.g; b += other.b; a += other.a;
-        return *this;
-    }
-
-    Color& operator-=(const Color& other) {
-        r -= other.r; g -= other.g; b -= other.b; a -= other.a;
-        return *this;
-    }
-
-    Color& operator*=(float scalar) {
-        r *= scalar; g *= scalar; b *= scalar; a *= scalar;
-        return *this;
-    }
-
-    Color& operator/=(float scalar) {
-        r /= scalar; g /= scalar; b /= scalar; a /= scalar;
-        return *this;
-    }
-};
-
-// 命名颜色常量
-namespace Colors {
-    inline constexpr Color White       {1.0f, 1.0f, 1.0f, 1.0f};
-    inline constexpr Color Black       {0.0f, 0.0f, 0.0f, 1.0f};
-    inline constexpr Color Red         {1.0f, 0.0f, 0.0f, 1.0f};
-    inline constexpr Color Green       {0.0f, 1.0f, 0.0f, 1.0f};
-    inline constexpr Color Blue        {0.0f, 0.0f, 1.0f, 1.0f};
-    inline constexpr Color Yellow      {1.0f, 1.0f, 0.0f, 1.0f};
-    inline constexpr Color Cyan        {0.0f, 1.0f, 1.0f, 1.0f};
-    inline constexpr Color Magenta     {1.0f, 0.0f, 1.0f, 1.0f};
-    inline constexpr Color Orange      {1.0f, 0.647f, 0.0f, 1.0f};
-    inline constexpr Color Purple      {0.502f, 0.0f, 0.502f, 1.0f};
-    inline constexpr Color Pink        {1.0f, 0.753f, 0.796f, 1.0f};
-    inline constexpr Color Gray        {0.502f, 0.502f, 0.502f, 1.0f};
-    inline constexpr Color LightGray   {0.827f, 0.827f, 0.827f, 1.0f};
-    inline constexpr Color DarkGray    {0.412f, 0.412f, 0.412f, 1.0f};
-    inline constexpr Color Brown       {0.647f, 0.165f, 0.165f, 1.0f};
-    inline constexpr Color Gold        {1.0f, 0.843f, 0.0f, 1.0f};
-    inline constexpr Color Silver      {0.753f, 0.753f, 0.753f, 1.0f};
-    inline constexpr Color SkyBlue     {0.529f, 0.808f, 0.922f, 1.0f};
-    inline constexpr Color LimeGreen   {0.196f, 0.804f, 0.196f, 1.0f};
-    inline constexpr Color Coral       {1.0f, 0.498f, 0.314f, 1.0f};
-    inline constexpr Color Transparent {0.0f, 0.0f, 0.0f, 0.0f};
-}
-
-// 为了向后兼容，在 Color 结构体内提供静态引用
-struct ColorConstants {
-    static const Color& White;
-    static const Color& Black;
-    static const Color& Red;
-    static const Color& Green;
-    static const Color& Blue;
-    static const Color& Yellow;
-    static const Color& Cyan;
-    static const Color& Magenta;
-    static const Color& Transparent;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/core/math_types.h b/Easy2D/include/easy2d/core/math_types.h
deleted file mode 100644
index fdd4823..0000000
--- a/Easy2D/include/easy2d/core/math_types.h
+++ /dev/null
@@ -1,295 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <glm/vec2.hpp>
-#include <glm/mat4x4.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <cmath>
-#include <algorithm>
-
-namespace easy2d {
-
-// ---------------------------------------------------------------------------
-// 常量
-// ---------------------------------------------------------------------------
-constexpr float PI_F       = 3.14159265358979323846f;
-constexpr float DEG_TO_RAD = PI_F / 180.0f;
-constexpr float RAD_TO_DEG = 180.0f / PI_F;
-
-// ---------------------------------------------------------------------------
-// 2D 向量
-// ---------------------------------------------------------------------------
-struct Vec2 {
-    float x = 0.0f;
-    float y = 0.0f;
-
-    constexpr Vec2() = default;
-    constexpr Vec2(float x, float y) : x(x), y(y) {}
-    explicit Vec2(const glm::vec2& v) : x(v.x), y(v.y) {}
-
-    glm::vec2 toGlm() const { return {x, y}; }
-    static Vec2 fromGlm(const glm::vec2& v) { return {v.x, v.y}; }
-
-    // 基础运算
-    Vec2 operator+(const Vec2& v) const { return {x + v.x, y + v.y}; }
-    Vec2 operator-(const Vec2& v) const { return {x - v.x, y - v.y}; }
-    Vec2 operator*(float s) const { return {x * s, y * s}; }
-    Vec2 operator/(float s) const { return {x / s, y / s}; }
-    Vec2 operator-() const { return {-x, -y}; }
-
-    Vec2& operator+=(const Vec2& v) { x += v.x; y += v.y; return *this; }
-    Vec2& operator-=(const Vec2& v) { x -= v.x; y -= v.y; return *this; }
-    Vec2& operator*=(float s) { x *= s; y *= s; return *this; }
-    Vec2& operator/=(float s) { x /= s; y /= s; return *this; }
-
-    bool operator==(const Vec2& v) const { return x == v.x && y == v.y; }
-    bool operator!=(const Vec2& v) const { return !(*this == v); }
-
-    // 向量运算
-    float length() const { return std::sqrt(x * x + y * y); }
-    float lengthSquared() const { return x * x + y * y; }
-
-    Vec2 normalized() const {
-        float len = length();
-        if (len > 0.0f) return {x / len, y / len};
-        return {0.0f, 0.0f};
-    }
-
-    float dot(const Vec2& v) const { return x * v.x + y * v.y; }
-    float cross(const Vec2& v) const { return x * v.y - y * v.x; }
-
-    float distance(const Vec2& v) const { return (*this - v).length(); }
-    float angle() const { return std::atan2(y, x) * RAD_TO_DEG; }
-
-    static Vec2 lerp(const Vec2& a, const Vec2& b, float t) {
-        return a + (b - a) * t;
-    }
-
-    static constexpr Vec2 Zero()  { return {0.0f, 0.0f}; }
-    static constexpr Vec2 One()   { return {1.0f, 1.0f}; }
-    static constexpr Vec2 UnitX() { return {1.0f, 0.0f}; }
-    static constexpr Vec2 UnitY() { return {0.0f, 1.0f}; }
-};
-
-inline Vec2 operator*(float s, const Vec2& v) { return v * s; }
-
-using Point = Vec2;
-
-// ---------------------------------------------------------------------------
-// 3D 向量 (用于3D动作)
-// ---------------------------------------------------------------------------
-struct Vec3 {
-    float x = 0.0f;
-    float y = 0.0f;
-    float z = 0.0f;
-
-    constexpr Vec3() = default;
-    constexpr Vec3(float x, float y, float z) : x(x), y(y), z(z) {}
-    explicit Vec3(const glm::vec3& v) : x(v.x), y(v.y), z(v.z) {}
-
-    glm::vec3 toGlm() const { return {x, y, z}; }
-    static Vec3 fromGlm(const glm::vec3& v) { return {v.x, v.y, v.z}; }
-
-    Vec3 operator+(const Vec3& v) const { return {x + v.x, y + v.y, z + v.z}; }
-    Vec3 operator-(const Vec3& v) const { return {x - v.x, y - v.y, z - v.z}; }
-    Vec3 operator*(float s) const { return {x * s, y * s, z * s}; }
-    Vec3 operator/(float s) const { return {x / s, y / s, z / s}; }
-    Vec3 operator-() const { return {-x, -y, -z}; }
-
-    Vec3& operator+=(const Vec3& v) { x += v.x; y += v.y; z += v.z; return *this; }
-    Vec3& operator-=(const Vec3& v) { x -= v.x; y -= v.y; z -= v.z; return *this; }
-    Vec3& operator*=(float s) { x *= s; y *= s; z *= s; return *this; }
-    Vec3& operator/=(float s) { x /= s; y /= s; z /= s; return *this; }
-
-    bool operator==(const Vec3& v) const { return x == v.x && y == v.y && z == v.z; }
-    bool operator!=(const Vec3& v) const { return !(*this == v); }
-
-    float length() const { return std::sqrt(x * x + y * y + z * z); }
-    float lengthSquared() const { return x * x + y * y + z * z; }
-
-    Vec3 normalized() const {
-        float len = length();
-        if (len > 0.0f) return {x / len, y / len, z / len};
-        return {0.0f, 0.0f, 0.0f};
-    }
-
-    float dot(const Vec3& v) const { return x * v.x + y * v.y + z * v.z; }
-
-    static Vec3 lerp(const Vec3& a, const Vec3& b, float t) {
-        return a + (b - a) * t;
-    }
-
-    static constexpr Vec3 Zero()  { return {0.0f, 0.0f, 0.0f}; }
-    static constexpr Vec3 One()   { return {1.0f, 1.0f, 1.0f}; }
-};
-
-inline Vec3 operator*(float s, const Vec3& v) { return v * s; }
-
-// ---------------------------------------------------------------------------
-// 2D 尺寸
-// ---------------------------------------------------------------------------
-struct Size {
-    float width  = 0.0f;
-    float height = 0.0f;
-
-    constexpr Size() = default;
-    constexpr Size(float w, float h) : width(w), height(h) {}
-
-    bool operator==(const Size& s) const { return width == s.width && height == s.height; }
-    bool operator!=(const Size& s) const { return !(*this == s); }
-
-    float area() const { return width * height; }
-    bool empty() const { return width <= 0.0f || height <= 0.0f; }
-
-    static constexpr Size Zero() { return {0.0f, 0.0f}; }
-};
-
-// ---------------------------------------------------------------------------
-// 2D 矩形
-// ---------------------------------------------------------------------------
-struct Rect {
-    Point origin;
-    Size  size;
-
-    constexpr Rect() = default;
-    constexpr Rect(float x, float y, float w, float h) : origin(x, y), size(w, h) {}
-    constexpr Rect(const Point& o, const Size& s) : origin(o), size(s) {}
-
-    float left()   const { return origin.x; }
-    float top()    const { return origin.y; }
-    float right()  const { return origin.x + size.width; }
-    float bottom() const { return origin.y + size.height; }
-    float width()  const { return size.width; }
-    float height() const { return size.height; }
-    Point center() const { return {origin.x + size.width * 0.5f, origin.y + size.height * 0.5f}; }
-
-    bool empty() const { return size.empty(); }
-
-    bool containsPoint(const Point& p) const {
-        return p.x >= left() && p.x <= right() &&
-               p.y >= top()  && p.y <= bottom();
-    }
-
-    bool contains(const Rect& r) const {
-        return r.left() >= left() && r.right() <= right() &&
-               r.top() >= top() && r.bottom() <= bottom();
-    }
-
-    bool intersects(const Rect& r) const {
-        return !(left() > r.right() || right() < r.left() ||
-                 top() > r.bottom() || bottom() < r.top());
-    }
-
-    Rect intersection(const Rect& r) const {
-        float l = std::max(left(), r.left());
-        float t = std::max(top(), r.top());
-        float ri = std::min(right(), r.right());
-        float b = std::min(bottom(), r.bottom());
-        if (l < ri && t < b) return {l, t, ri - l, b - t};
-        return {};
-    }
-
-    Rect unionWith(const Rect& r) const {
-        if (empty()) return r;
-        if (r.empty()) return *this;
-        float l = std::min(left(), r.left());
-        float t = std::min(top(), r.top());
-        float ri = std::max(right(), r.right());
-        float b = std::max(bottom(), r.bottom());
-        return {l, t, ri - l, b - t};
-    }
-
-    bool operator==(const Rect& r) const { return origin == r.origin && size == r.size; }
-    bool operator!=(const Rect& r) const { return !(*this == r); }
-
-    static constexpr Rect Zero() { return {0, 0, 0, 0}; }
-};
-
-// ---------------------------------------------------------------------------
-// 2D 变换矩阵（基于 glm::mat4，兼容 OpenGL）
-// ---------------------------------------------------------------------------
-struct Transform2D {
-    glm::mat4 matrix{1.0f}; // 单位矩阵
-
-    Transform2D() = default;
-    explicit Transform2D(const glm::mat4& m) : matrix(m) {}
-
-    static Transform2D identity() { return Transform2D{}; }
-
-    static Transform2D translation(float x, float y) {
-        Transform2D t;
-        t.matrix = glm::translate(glm::mat4(1.0f), glm::vec3(x, y, 0.0f));
-        return t;
-    }
-
-    static Transform2D translation(const Vec2& v) {
-        return translation(v.x, v.y);
-    }
-
-    static Transform2D rotation(float degrees) {
-        Transform2D t;
-        t.matrix = glm::rotate(glm::mat4(1.0f), degrees * DEG_TO_RAD, glm::vec3(0.0f, 0.0f, 1.0f));
-        return t;
-    }
-
-    static Transform2D scaling(float sx, float sy) {
-        Transform2D t;
-        t.matrix = glm::scale(glm::mat4(1.0f), glm::vec3(sx, sy, 1.0f));
-        return t;
-    }
-
-    static Transform2D scaling(float s) {
-        return scaling(s, s);
-    }
-
-    static Transform2D skewing(float skewX, float skewY) {
-        Transform2D t;
-        t.matrix = glm::mat4(1.0f);
-        t.matrix[1][0] = std::tan(skewX * DEG_TO_RAD);
-        t.matrix[0][1] = std::tan(skewY * DEG_TO_RAD);
-        return t;
-    }
-
-    Transform2D operator*(const Transform2D& other) const {
-        return Transform2D(matrix * other.matrix);
-    }
-
-    Transform2D& operator*=(const Transform2D& other) {
-        matrix *= other.matrix;
-        return *this;
-    }
-
-    Vec2 transformPoint(const Vec2& p) const {
-        glm::vec4 result = matrix * glm::vec4(p.x, p.y, 0.0f, 1.0f);
-        return {result.x, result.y};
-    }
-
-    Transform2D inverse() const {
-        return Transform2D(glm::inverse(matrix));
-    }
-};
-
-// ---------------------------------------------------------------------------
-// 数学工具函数
-// ---------------------------------------------------------------------------
-namespace math {
-
-inline float clamp(float value, float minVal, float maxVal) {
-    return std::clamp(value, minVal, maxVal);
-}
-
-inline float lerp(float a, float b, float t) {
-    return a + (b - a) * t;
-}
-
-inline float degrees(float radians) {
-    return radians * RAD_TO_DEG;
-}
-
-inline float radians(float degrees) {
-    return degrees * DEG_TO_RAD;
-}
-
-} // namespace math
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/easy2d.h b/Easy2D/include/easy2d/easy2d.h
deleted file mode 100644
index ae9ecf0..0000000
--- a/Easy2D/include/easy2d/easy2d.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma once
-
-// Easy2D v3.0 - 统一入口头文件
-// 包含所有公共 API
-
-// Core
-#include <easy2d/core/types.h>
-#include <easy2d/core/string.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/math_types.h>
-
-// Platform
-#include <easy2d/platform/window.h>
-#include <easy2d/platform/input.h>
-
-// Graphics
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/font.h>
-#include <easy2d/graphics/camera.h>
-#include <easy2d/graphics/shader_system.h>
-#include <easy2d/graphics/texture_pool.h>
-#include <easy2d/graphics/render_target.h>
-#include <easy2d/graphics/vram_manager.h>
-
-// Scene
-#include <easy2d/scene/node.h>
-#include <easy2d/scene/scene.h>
-#include <easy2d/scene/sprite.h>
-#include <easy2d/scene/text.h>
-#include <easy2d/scene/shape_node.h>
-#include <easy2d/scene/scene_manager.h>
-#include <easy2d/scene/transition.h>
-
-// Animation
-#include <easy2d/animation/sprite_frame.h>
-#include <easy2d/animation/sprite_frame_cache.h>
-#include <easy2d/animation/frame_property.h>
-#include <easy2d/animation/animation_frame.h>
-#include <easy2d/animation/animation_clip.h>
-#include <easy2d/animation/animation_controller.h>
-#include <easy2d/animation/animation_cache.h>
-#include <easy2d/animation/interpolation_engine.h>
-#include <easy2d/animation/animated_sprite.h>
-#include <easy2d/animation/frame_renderer.h>
-#include <easy2d/animation/animation_event.h>
-#include <easy2d/animation/animation_node.h>
-#include <easy2d/animation/composite_animation.h>
-#include <easy2d/animation/ani_parser.h>
-#include <easy2d/animation/ani_binary_parser.h>
-#include <easy2d/animation/als_parser.h>
-
-// UI
-#include <easy2d/ui/widget.h>
-#include <easy2d/ui/button.h>
-
-// Action
-#include <easy2d/action/action.h>
-#include <easy2d/action/actions.h>
-#include <easy2d/action/ease.h>
-
-// Event
-#include <easy2d/event/event.h>
-#include <easy2d/event/event_queue.h>
-#include <easy2d/event/event_dispatcher.h>
-#include <easy2d/event/input_codes.h>
-
-// Audio
-#include <easy2d/audio/audio_engine.h>
-#include <easy2d/audio/sound.h>
-
-// Resource
-#include <easy2d/resource/resource_manager.h>
-
-// Utils
-#include <easy2d/utils/logger.h>
-#include <easy2d/utils/timer.h>
-#include <easy2d/utils/data.h>
-#include <easy2d/utils/random.h>
-
-// Spatial
-#include <easy2d/spatial/spatial_index.h>
-#include <easy2d/spatial/quadtree.h>
-#include <easy2d/spatial/spatial_hash.h>
-#include <easy2d/spatial/spatial_manager.h>
-
-// Effects
-#include <easy2d/effects/post_process.h>
-#include <easy2d/effects/particle_system.h>
-#include <easy2d/effects/custom_effect_manager.h>
-
-// Application
-#include <easy2d/app/application.h>
-
-// Script
-#include <easy2d/script/script_engine.h>
-#include <easy2d/script/script_node.h>
diff --git a/Easy2D/include/easy2d/effects/custom_effect_manager.h b/Easy2D/include/easy2d/effects/custom_effect_manager.h
deleted file mode 100644
index 1d48069..0000000
--- a/Easy2D/include/easy2d/effects/custom_effect_manager.h
+++ /dev/null
@@ -1,318 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/effects/particle_system.h>
-#include <easy2d/effects/post_process.h>
-#include <easy2d/graphics/shader_system.h>
-#include <string>
-#include <unordered_map>
-#include <functional>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// 自定义特效类型
-// ============================================================================
-enum class CustomEffectType {
-    Particle,       // 粒子特效
-    PostProcess,    // 后处理特效
-    Shader,         // Shader特效
-    Combined        // 组合特效
-};
-
-// ============================================================================
-// 自定义特效配置
-// ============================================================================
-struct CustomEffectConfig {
-    std::string name;                           // 特效名称
-    CustomEffectType type;                      // 特效类型
-    std::string description;                    // 描述
-    
-    // 粒子特效配置
-    EmitterConfig emitterConfig;
-    
-    // 后处理特效配置
-    std::string shaderVertPath;                 // 顶点着色器路径
-    std::string shaderFragPath;                 // 片段着色器路径
-    std::unordered_map<std::string, float> shaderParams;  // Shader参数
-    
-    // 通用配置
-    float duration;                             // 持续时间(-1表示无限)
-    bool loop;                                  // 是否循环
-    float delay;                                // 延迟启动时间
-};
-
-// ============================================================================
-// 自定义特效基类
-// ============================================================================
-class CustomEffect {
-public:
-    explicit CustomEffect(const CustomEffectConfig& config);
-    virtual ~CustomEffect() = default;
-
-    // ------------------------------------------------------------------------
-    // 生命周期
-    // ------------------------------------------------------------------------
-    virtual bool init();
-    virtual void update(float dt);
-    virtual void render(RenderBackend& renderer);
-    virtual void shutdown();
-
-    // ------------------------------------------------------------------------
-    // 控制
-    // ------------------------------------------------------------------------
-    void play();
-    void pause();
-    void stop();
-    void reset();
-    
-    bool isPlaying() const { return playing_; }
-    bool isFinished() const { return finished_; }
-    float getElapsedTime() const { return elapsedTime_; }
-
-    // ------------------------------------------------------------------------
-    // 配置
-    // ------------------------------------------------------------------------
-    const std::string& getName() const { return config_.name; }
-    const CustomEffectConfig& getConfig() const { return config_; }
-    
-    void setPosition(const Vec2& pos) { position_ = pos; }
-    void setRotation(float rot) { rotation_ = rot; }
-    void setScale(float scale) { scale_ = scale; }
-    
-    Vec2 getPosition() const { return position_; }
-    float getRotation() const { return rotation_; }
-    float getScale() const { return scale_; }
-
-protected:
-    CustomEffectConfig config_;
-    Vec2 position_ = Vec2::Zero();
-    float rotation_ = 0.0f;
-    float scale_ = 1.0f;
-    
-    bool playing_ = false;
-    bool paused_ = false;
-    bool finished_ = false;
-    float elapsedTime_ = 0.0f;
-    float delayTimer_ = 0.0f;
-};
-
-// ============================================================================
-// 自定义粒子特效
-// ============================================================================
-class CustomParticleEffect : public CustomEffect {
-public:
-    explicit CustomParticleEffect(const CustomEffectConfig& config);
-    
-    bool init() override;
-    void update(float dt) override;
-    void render(RenderBackend& renderer) override;
-    void shutdown() override;
-    
-    void play();
-    void stop();
-    
-    Ptr<ParticleEmitter> getEmitter() { return emitter_; }
-
-private:
-    Ptr<ParticleSystem> particleSystem_;
-    Ptr<ParticleEmitter> emitter_;
-};
-
-// ============================================================================
-// 自定义后处理特效
-// ============================================================================
-class CustomPostProcessEffect : public CustomEffect, public PostProcessEffect {
-public:
-    explicit CustomPostProcessEffect(const CustomEffectConfig& config);
-    
-    bool init() override;
-    void update(float dt) override;
-    void shutdown() override;
-    
-    void onShaderBind(GLShader& shader) override;
-    
-    void setParam(const std::string& name, float value);
-    float getParam(const std::string& name) const;
-
-private:
-    std::unordered_map<std::string, float> runtimeParams_;
-};
-
-// ============================================================================
-// 自定义特效工厂
-// ============================================================================
-class CustomEffectFactory {
-public:
-    using EffectCreator = std::function<Ptr<CustomEffect>(const CustomEffectConfig&)>;
-    
-    static CustomEffectFactory& getInstance();
-    
-    // 注册自定义特效创建器
-    void registerEffect(const std::string& typeName, EffectCreator creator);
-    
-    // 创建特效
-    Ptr<CustomEffect> create(const std::string& typeName, const CustomEffectConfig& config);
-    
-    // 检查是否已注册
-    bool isRegistered(const std::string& typeName) const;
-    
-    // 获取所有已注册的类型
-    std::vector<std::string> getRegisteredTypes() const;
-
-private:
-    CustomEffectFactory() = default;
-    ~CustomEffectFactory() = default;
-    CustomEffectFactory(const CustomEffectFactory&) = delete;
-    CustomEffectFactory& operator=(const CustomEffectFactory&) = delete;
-    
-    std::unordered_map<std::string, EffectCreator> creators_;
-};
-
-// ============================================================================
-// 自定义特效管理器
-// ============================================================================
-class CustomEffectManager {
-public:
-    static CustomEffectManager& getInstance();
-    
-    // ------------------------------------------------------------------------
-    // 初始化和关闭
-    // ------------------------------------------------------------------------
-    bool init();
-    void shutdown();
-    
-    // ------------------------------------------------------------------------
-    // 特效管理
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 从文件加载特效配置（支持JSON和文本格式）
-     * 自动检测格式：JSON格式优先，失败则回退到文本格式
-     */
-    bool loadFromFile(const std::string& filepath);
-    
-    /**
-     * @brief 从文本文件加载特效配置（简化格式）
-     * 格式：每行一个参数，如 EMISSION 100
-     */
-    bool loadFromTextFile(const std::string& filepath);
-    
-    /**
-     * @brief 保存特效配置到文件
-     * @param useJson true=JSON格式, false=文本格式
-     */
-    bool saveToFile(const std::string& name, const std::string& filepath, bool useJson = true);
-    
-    /**
-     * @brief 保存所有特效配置到一个JSON文件
-     */
-    bool saveAllToFile(const std::string& filepath);
-    
-    /**
-     * @brief 注册特效配置
-     */
-    void registerConfig(const std::string& name, const CustomEffectConfig& config);
-    
-    /**
-     * @brief 获取特效配置
-     */
-    CustomEffectConfig* getConfig(const std::string& name);
-    
-    /**
-     * @brief 移除特效配置
-     */
-    void removeConfig(const std::string& name);
-    
-    /**
-     * @brief 获取所有配置名称
-     */
-    std::vector<std::string> getConfigNames() const;
-
-    // ------------------------------------------------------------------------
-    // 特效实例管理
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 创建特效实例
-     */
-    Ptr<CustomEffect> createEffect(const std::string& name);
-    
-    /**
-     * @brief 从配置直接创建特效
-     */
-    Ptr<CustomEffect> createEffectFromConfig(const CustomEffectConfig& config);
-    
-    /**
-     * @brief 销毁特效实例
-     */
-    void destroyEffect(Ptr<CustomEffect> effect);
-    
-    /**
-     * @brief 更新所有特效
-     */
-    void update(float dt);
-    
-    /**
-     * @brief 渲染所有特效
-     */
-    void render(RenderBackend& renderer);
-    
-    /**
-     * @brief 停止所有特效
-     */
-    void stopAll();
-
-    // ------------------------------------------------------------------------
-    // 便捷方法
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 播放特效（简写）
-     */
-    Ptr<CustomEffect> play(const std::string& name, const Vec2& position);
-    
-    /**
-     * @brief 播放特效并自动销毁
-     */
-    void playOneShot(const std::string& name, const Vec2& position);
-
-private:
-    CustomEffectManager() = default;
-    ~CustomEffectManager() = default;
-    CustomEffectManager(const CustomEffectManager&) = delete;
-    CustomEffectManager& operator=(const CustomEffectManager&) = delete;
-    
-    std::unordered_map<std::string, CustomEffectConfig> configs_;
-    std::vector<Ptr<CustomEffect>> activeEffects_;
-};
-
-// ============================================================================
-// 便捷宏
-// ============================================================================
-#define E2D_CUSTOM_EFFECT_MANAGER() ::easy2d::CustomEffectManager::getInstance()
-#define E2D_CUSTOM_EFFECT_FACTORY() ::easy2d::CustomEffectFactory::getInstance()
-
-// ============================================================================
-// 预设特效快速创建
-// ============================================================================
-class EffectBuilder {
-public:
-    // 粒子特效
-    static CustomEffectConfig Particle(const std::string& name);
-    static CustomEffectConfig Fire(const std::string& name);
-    static CustomEffectConfig Smoke(const std::string& name);
-    static CustomEffectConfig Explosion(const std::string& name);
-    static CustomEffectConfig Magic(const std::string& name);
-    static CustomEffectConfig Sparkle(const std::string& name);
-    
-    // 后处理特效
-    static CustomEffectConfig Bloom(const std::string& name);
-    static CustomEffectConfig Blur(const std::string& name);
-    static CustomEffectConfig Vignette(const std::string& name);
-    static CustomEffectConfig ColorGrading(const std::string& name);
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/effects/particle_system.h b/Easy2D/include/easy2d/effects/particle_system.h
deleted file mode 100644
index 3db7ceb..0000000
--- a/Easy2D/include/easy2d/effects/particle_system.h
+++ /dev/null
@@ -1,244 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/scene/node.h>
-#include <easy2d/graphics/texture.h>
-#include <vector>
-#include <functional>
-#include <random>
-
-namespace easy2d {
-
-// ============================================================================
-// 粒子数据
-// ============================================================================
-struct Particle {
-    Vec2 position;
-    Vec2 velocity;
-    Vec2 acceleration;
-    float rotation;
-    float angularVelocity;
-    float size;
-    float sizeDelta;
-    Color color;
-    Color colorDelta;
-    float life;
-    float maxLife;
-    bool active;
-    
-    Particle() : position(Vec2::Zero()), velocity(Vec2::Zero()), 
-                 acceleration(Vec2::Zero()), rotation(0.0f), 
-                 angularVelocity(0.0f), size(1.0f), sizeDelta(0.0f),
-                 color(Colors::White), colorDelta(Colors::Transparent),
-                 life(0.0f), maxLife(1.0f), active(false) {}
-};
-
-// ============================================================================
-// 发射器配置
-// ============================================================================
-struct EmitterConfig {
-    // 发射速率
-    float emissionRate = 100.0f;        // 每秒发射粒子数
-    float emissionDuration = -1.0f;     // 发射持续时间（-1表示无限）
-    
-    // 粒子生命周期
-    float minLife = 1.0f;
-    float maxLife = 2.0f;
-    
-    // 粒子大小
-    float minStartSize = 10.0f;
-    float maxStartSize = 20.0f;
-    float minEndSize = 0.0f;
-    float maxEndSize = 5.0f;
-    
-    // 粒子速度
-    Vec2 minVelocity = Vec2(-50.0f, -50.0f);
-    Vec2 maxVelocity = Vec2(50.0f, 50.0f);
-    
-    // 粒子加速度
-    Vec2 acceleration = Vec2(0.0f, -100.0f); // 重力
-    
-    // 粒子旋转
-    float minRotation = 0.0f;
-    float maxRotation = 360.0f;
-    float minAngularVelocity = -90.0f;
-    float maxAngularVelocity = 90.0f;
-    
-    // 颜色
-    Color startColor = Colors::White;
-    Color endColor = Colors::Transparent;
-    
-    // 发射形状
-    enum class Shape {
-        Point,      // 点发射
-        Circle,     // 圆形区域
-        Rectangle,  // 矩形区域
-        Cone        // 锥形
-    };
-    Shape shape = Shape::Point;
-    float shapeRadius = 50.0f;          // 圆形/锥形半径
-    Vec2 shapeSize = Vec2(100.0f, 100.0f); // 矩形大小
-    float coneAngle = 45.0f;            // 锥形角度
-    
-    // 纹理
-    Ptr<Texture> texture = nullptr;
-    
-    // 混合模式
-    BlendMode blendMode = BlendMode::Additive;
-};
-
-// ============================================================================
-// 粒子发射器
-// ============================================================================
-class ParticleEmitter {
-public:
-    ParticleEmitter();
-    ~ParticleEmitter() = default;
-
-    // ------------------------------------------------------------------------
-    // 初始化和关闭
-    // ------------------------------------------------------------------------
-    bool init(size_t maxParticles);
-    void shutdown();
-
-    // ------------------------------------------------------------------------
-    // 配置
-    // ------------------------------------------------------------------------
-    void setConfig(const EmitterConfig& config) { config_ = config; }
-    const EmitterConfig& getConfig() const { return config_; }
-    
-    // 链式配置API
-    ParticleEmitter& withEmissionRate(float rate) { config_.emissionRate = rate; return *this; }
-    ParticleEmitter& withLife(float minLife, float maxLife) { 
-        config_.minLife = minLife; config_.maxLife = maxLife; return *this; 
-    }
-    ParticleEmitter& withSize(float minStart, float maxStart, float minEnd = 0.0f, float maxEnd = 0.0f) {
-        config_.minStartSize = minStart; config_.maxStartSize = maxStart;
-        config_.minEndSize = minEnd; config_.maxEndSize = maxEnd;
-        return *this;
-    }
-    ParticleEmitter& withVelocity(const Vec2& minVel, const Vec2& maxVel) {
-        config_.minVelocity = minVel; config_.maxVelocity = maxVel; return *this;
-    }
-    ParticleEmitter& withAcceleration(const Vec2& accel) { config_.acceleration = accel; return *this; }
-    ParticleEmitter& withColor(const Color& start, const Color& end) {
-        config_.startColor = start; config_.endColor = end; return *this;
-    }
-    ParticleEmitter& withTexture(Ptr<Texture> texture) { config_.texture = texture; return *this; }
-    ParticleEmitter& withBlendMode(BlendMode mode) { config_.blendMode = mode; return *this; }
-
-    // ------------------------------------------------------------------------
-    // 发射控制
-    // ------------------------------------------------------------------------
-    void start();
-    void stop();
-    void burst(int count);              // 爆发发射
-    void reset();
-    bool isEmitting() const { return emitting_; }
-
-    // ------------------------------------------------------------------------
-    // 更新和渲染
-    // ------------------------------------------------------------------------
-    void update(float dt);
-    void render(RenderBackend& renderer);
-
-    // ------------------------------------------------------------------------
-    // 状态查询
-    // ------------------------------------------------------------------------
-    size_t getActiveParticleCount() const { return activeCount_; }
-    size_t getMaxParticles() const { return particles_.size(); }
-    bool isActive() const { return activeCount_ > 0 || emitting_; }
-
-    // ------------------------------------------------------------------------
-    // 变换
-    // ------------------------------------------------------------------------
-    void setPosition(const Vec2& pos) { position_ = pos; }
-    void setRotation(float rot) { rotation_ = rot; }
-    Vec2 getPosition() const { return position_; }
-    float getRotation() const { return rotation_; }
-
-private:
-    EmitterConfig config_;
-    std::vector<Particle> particles_;
-    size_t activeCount_ = 0;
-    
-    Vec2 position_ = Vec2::Zero();
-    float rotation_ = 0.0f;
-    
-    bool emitting_ = false;
-    float emissionTimer_ = 0.0f;
-    float emissionTime_ = 0.0f;
-    
-    std::mt19937 rng_;
-    
-    void emitParticle();
-    float randomFloat(float min, float max);
-    Vec2 randomPointInShape();
-    Vec2 randomVelocity();
-};
-
-// ============================================================================
-// 粒子系统 - 管理多个发射器
-// ============================================================================
-class ParticleSystem : public Node {
-public:
-    ParticleSystem();
-    ~ParticleSystem() override = default;
-
-    // ------------------------------------------------------------------------
-    // 静态创建方法
-    // ------------------------------------------------------------------------
-    static Ptr<ParticleSystem> create();
-
-    // ------------------------------------------------------------------------
-    // 发射器管理
-    // ------------------------------------------------------------------------
-    Ptr<ParticleEmitter> addEmitter(const EmitterConfig& config = {});
-    void removeEmitter(Ptr<ParticleEmitter> emitter);
-    void removeAllEmitters();
-    size_t getEmitterCount() const { return emitters_.size(); }
-
-    // ------------------------------------------------------------------------
-    // 全局控制
-    // ------------------------------------------------------------------------
-    void startAll();
-    void stopAll();
-    void resetAll();
-
-    // ------------------------------------------------------------------------
-    // 预设
-    // ------------------------------------------------------------------------
-    static EmitterConfig PresetFire();
-    static EmitterConfig PresetSmoke();
-    static EmitterConfig PresetExplosion();
-    static EmitterConfig PresetSparkle();
-    static EmitterConfig PresetRain();
-    static EmitterConfig PresetSnow();
-
-    // ------------------------------------------------------------------------
-    // 重写Node方法
-    // ------------------------------------------------------------------------
-    void onUpdate(float dt) override;
-    void onDraw(RenderBackend& renderer) override;
-
-private:
-    std::vector<Ptr<ParticleEmitter>> emitters_;
-};
-
-// ============================================================================
-// 粒子预设（便捷类）
-// ============================================================================
-class ParticlePreset {
-public:
-    static EmitterConfig Fire();
-    static EmitterConfig Smoke();
-    static EmitterConfig Explosion();
-    static EmitterConfig Sparkle();
-    static EmitterConfig Rain();
-    static EmitterConfig Snow();
-    static EmitterConfig Magic();
-    static EmitterConfig Bubbles();
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/effects/post_process.h b/Easy2D/include/easy2d/effects/post_process.h
deleted file mode 100644
index c0b8c8f..0000000
--- a/Easy2D/include/easy2d/effects/post_process.h
+++ /dev/null
@@ -1,225 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/opengl/gl_shader.h>
-#include <string>
-#include <functional>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// 前向声明
-// ============================================================================
-class RenderTarget;
-class RenderBackend;
-
-// ============================================================================
-// 后处理效果基类
-// ============================================================================
-class PostProcessEffect {
-public:
-    PostProcessEffect(const std::string& name);
-    virtual ~PostProcessEffect() = default;
-
-    // ------------------------------------------------------------------------
-    // 生命周期
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 初始化效果
-     */
-    virtual bool init();
-    
-    /**
-     * @brief 关闭效果
-     */
-    virtual void shutdown();
-
-    // ------------------------------------------------------------------------
-    // 渲染
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 应用效果
-     * @param source 输入纹理
-     * @param target 输出渲染目标
-     * @param renderer 渲染后端
-     */
-    virtual void apply(const Texture& source, RenderTarget& target, RenderBackend& renderer);
-    
-    /**
-     * @brief 设置Shader参数（子类重写）
-     */
-    virtual void onShaderBind(GLShader& shader) {}
-
-    // ------------------------------------------------------------------------
-    // 状态
-    // ------------------------------------------------------------------------
-    const std::string& getName() const { return name_; }
-    bool isEnabled() const { return enabled_; }
-    void setEnabled(bool enabled) { enabled_ = enabled; }
-    bool isValid() const { return valid_; }
-
-    // ------------------------------------------------------------------------
-    // 链式API
-    // ------------------------------------------------------------------------
-    PostProcessEffect& withEnabled(bool enabled) {
-        enabled_ = enabled;
-        return *this;
-    }
-
-protected:
-    std::string name_;
-    bool enabled_ = true;
-    bool valid_ = false;
-    Ptr<GLShader> shader_;
-
-    /**
-     * @brief 加载自定义Shader
-     */
-    bool loadShader(const std::string& vertSource, const std::string& fragSource);
-    bool loadShaderFromFile(const std::string& vertPath, const std::string& fragPath);
-    
-    /**
-     * @brief 渲染全屏四边形
-     */
-    void renderFullscreenQuad();
-
-private:
-    static GLuint quadVao_;
-    static GLuint quadVbo_;
-    static bool quadInitialized_;
-    
-    void initQuad();
-    void destroyQuad();
-};
-
-// ============================================================================
-// 后处理栈 - 管理多个后处理效果
-// ============================================================================
-class PostProcessStack {
-public:
-    PostProcessStack();
-    ~PostProcessStack();
-
-    // ------------------------------------------------------------------------
-    // 初始化和关闭
-    // ------------------------------------------------------------------------
-    bool init(int width, int height);
-    void shutdown();
-
-    // ------------------------------------------------------------------------
-    // 效果管理
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 添加效果到栈
-     */
-    void addEffect(Ptr<PostProcessEffect> effect);
-    
-    /**
-     * @brief 插入效果到指定位置
-     */
-    void insertEffect(size_t index, Ptr<PostProcessEffect> effect);
-    
-    /**
-     * @brief 移除效果
-     */
-    void removeEffect(const std::string& name);
-    void removeEffect(size_t index);
-    
-    /**
-     * @brief 获取效果
-     */
-    Ptr<PostProcessEffect> getEffect(const std::string& name);
-    Ptr<PostProcessEffect> getEffect(size_t index);
-    
-    /**
-     * @brief 清空所有效果
-     */
-    void clearEffects();
-    
-    /**
-     * @brief 获取效果数量
-     */
-    size_t getEffectCount() const { return effects_.size(); }
-
-    // ------------------------------------------------------------------------
-    // 渲染
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 开始捕获场景
-     */
-    void beginCapture();
-    
-    /**
-     * @brief 结束捕获并应用所有效果
-     */
-    void endCapture(RenderBackend& renderer);
-    
-    /**
-     * @brief 直接应用效果到纹理
-     */
-    void process(const Texture& source, RenderTarget& target, RenderBackend& renderer);
-
-    // ------------------------------------------------------------------------
-    // 配置
-    // ------------------------------------------------------------------------
-    void resize(int width, int height);
-    bool isValid() const { return valid_; }
-
-    // ------------------------------------------------------------------------
-    // 便捷方法 - 添加内置效果
-    // ------------------------------------------------------------------------
-    PostProcessStack& addBloom(float intensity = 1.0f, float threshold = 0.8f);
-    PostProcessStack& addBlur(float radius = 2.0f);
-    PostProcessStack& addColorGrading(const Color& tint);
-    PostProcessStack& addVignette(float intensity = 0.5f);
-    PostProcessStack& addChromaticAberration(float amount = 1.0f);
-
-private:
-    std::vector<Ptr<PostProcessEffect>> effects_;
-    Ptr<RenderTarget> renderTargetA_;
-    Ptr<RenderTarget> renderTargetB_;
-    int width_ = 0;
-    int height_ = 0;
-    bool valid_ = false;
-    bool capturing_ = false;
-};
-
-// ============================================================================
-// 全局后处理管理
-// ============================================================================
-class PostProcessManager {
-public:
-    static PostProcessManager& getInstance();
-    
-    void init(int width, int height);
-    void shutdown();
-    
-    PostProcessStack& getMainStack() { return mainStack_; }
-    
-    void resize(int width, int height);
-    void beginFrame();
-    void endFrame(RenderBackend& renderer);
-
-private:
-    PostProcessManager() = default;
-    ~PostProcessManager() = default;
-    PostProcessManager(const PostProcessManager&) = delete;
-    PostProcessManager& operator=(const PostProcessManager&) = delete;
-
-    PostProcessStack mainStack_;
-    bool initialized_ = false;
-};
-
-// ============================================================================
-// 便捷宏
-// ============================================================================
-#define E2D_POST_PROCESS() ::easy2d::PostProcessManager::getInstance()
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/event/event.h b/Easy2D/include/easy2d/event/event.h
deleted file mode 100644
index 7ea8ad8..0000000
--- a/Easy2D/include/easy2d/event/event.h
+++ /dev/null
@@ -1,185 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <cstdint>
-#include <variant>
-
-namespace easy2d {
-
-// ============================================================================
-// 事件类型枚举
-// ============================================================================
-enum class EventType {
-    None = 0,
-    
-    // 窗口事件
-    WindowClose,
-    WindowResize,
-    WindowFocus,
-    WindowLostFocus,
-    WindowMoved,
-    
-    // 键盘事件
-    KeyPressed,
-    KeyReleased,
-    KeyRepeat,
-    
-    // 鼠标事件
-    MouseButtonPressed,
-    MouseButtonReleased,
-    MouseMoved,
-    MouseScrolled,
-
-    // UI 事件
-    UIHoverEnter,
-    UIHoverExit,
-    UIPressed,
-    UIReleased,
-    UIClicked,
-    
-    // 游戏手柄事件
-    GamepadConnected,
-    GamepadDisconnected,
-    GamepadButtonPressed,
-    GamepadButtonReleased,
-    GamepadAxisMoved,
-    
-    // 触摸事件 (移动端)
-    TouchBegan,
-    TouchMoved,
-    TouchEnded,
-    TouchCancelled,
-    
-    // 自定义事件
-    Custom
-};
-
-// ============================================================================
-// 键盘事件数据
-// ============================================================================
-struct KeyEvent {
-    int keyCode;
-    int scancode;
-    int mods;  // 修饰键 (Shift, Ctrl, Alt, etc.)
-};
-
-// ============================================================================
-// 鼠标事件数据
-// ============================================================================
-struct MouseButtonEvent {
-    int button;
-    int mods;
-    Vec2 position;
-};
-
-struct MouseMoveEvent {
-    Vec2 position;
-    Vec2 delta;
-};
-
-struct MouseScrollEvent {
-    Vec2 offset;
-    Vec2 position;
-};
-
-// ============================================================================
-// 窗口事件数据
-// ============================================================================
-struct WindowResizeEvent {
-    int width;
-    int height;
-};
-
-struct WindowMoveEvent {
-    int x;
-    int y;
-};
-
-// ============================================================================
-// 游戏手柄事件数据
-// ============================================================================
-struct GamepadButtonEvent {
-    int gamepadId;
-    int button;
-};
-
-struct GamepadAxisEvent {
-    int gamepadId;
-    int axis;
-    float value;
-};
-
-// ============================================================================
-// 触摸事件数据
-// ============================================================================
-struct TouchEvent {
-    int touchId;
-    Vec2 position;
-};
-
-// ============================================================================
-// 自定义事件数据
-// ============================================================================
-struct CustomEvent {
-    uint32_t id;
-    void* data;
-};
-
-// ============================================================================
-// 事件结构
-// ============================================================================
-struct Event {
-    EventType type = EventType::None;
-    double timestamp = 0.0;
-    bool handled = false;
-    
-    // 事件数据联合体
-    std::variant<
-        std::monostate,
-        KeyEvent,
-        MouseButtonEvent,
-        MouseMoveEvent,
-        MouseScrollEvent,
-        WindowResizeEvent,
-        WindowMoveEvent,
-        GamepadButtonEvent,
-        GamepadAxisEvent,
-        TouchEvent,
-        CustomEvent
-    > data;
-    
-    // 便捷访问方法
-    bool isWindowEvent() const {
-        return type == EventType::WindowClose || 
-               type == EventType::WindowResize ||
-               type == EventType::WindowFocus ||
-               type == EventType::WindowLostFocus ||
-               type == EventType::WindowMoved;
-    }
-    
-    bool isKeyboardEvent() const {
-        return type == EventType::KeyPressed || 
-               type == EventType::KeyReleased ||
-               type == EventType::KeyRepeat;
-    }
-    
-    bool isMouseEvent() const {
-        return type == EventType::MouseButtonPressed || 
-               type == EventType::MouseButtonReleased ||
-               type == EventType::MouseMoved ||
-               type == EventType::MouseScrolled;
-    }
-    
-    // 静态工厂方法
-    static Event createWindowResize(int width, int height);
-    static Event createWindowClose();
-    static Event createKeyPress(int keyCode, int scancode, int mods);
-    static Event createKeyRelease(int keyCode, int scancode, int mods);
-    static Event createMouseButtonPress(int button, int mods, const Vec2& pos);
-    static Event createMouseButtonRelease(int button, int mods, const Vec2& pos);
-    static Event createMouseMove(const Vec2& pos, const Vec2& delta);
-    static Event createMouseScroll(const Vec2& offset, const Vec2& pos);
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/event/event_dispatcher.h b/Easy2D/include/easy2d/event/event_dispatcher.h
deleted file mode 100644
index 3c5ef1a..0000000
--- a/Easy2D/include/easy2d/event/event_dispatcher.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/event/event.h>
-#include <functional>
-#include <unordered_map>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// 事件监听器 ID
-// ============================================================================
-using ListenerId = uint64_t;
-
-// ============================================================================
-// 事件分发器
-// ============================================================================
-class EventDispatcher {
-public:
-    using EventCallback = std::function<void(Event&)>;
-
-    EventDispatcher();
-    ~EventDispatcher() = default;
-
-    // 添加监听器
-    ListenerId addListener(EventType type, EventCallback callback);
-    
-    // 移除监听器
-    void removeListener(ListenerId id);
-    void removeAllListeners(EventType type);
-    void removeAllListeners();
-
-    // 分发事件
-    void dispatch(Event& event);
-    void dispatch(const Event& event);
-
-    // 处理事件队列
-    void processQueue(class EventQueue& queue);
-
-    // 统计
-    size_t getListenerCount(EventType type) const;
-    size_t getTotalListenerCount() const;
-
-private:
-    struct Listener {
-        ListenerId id;
-        EventType type;
-        EventCallback callback;
-    };
-
-    std::unordered_map<EventType, std::vector<Listener>> listeners_;
-    ListenerId nextId_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/event/event_queue.h b/Easy2D/include/easy2d/event/event_queue.h
deleted file mode 100644
index 3f7ba4b..0000000
--- a/Easy2D/include/easy2d/event/event_queue.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/event/event.h>
-#include <queue>
-#include <mutex>
-
-namespace easy2d {
-
-// ============================================================================
-// 事件队列 - 线程安全的事件队列
-// ============================================================================
-class EventQueue {
-public:
-    EventQueue();
-    ~EventQueue() = default;
-
-    // 添加事件到队列
-    void push(const Event& event);
-    void push(Event&& event);
-    
-    // 从队列取出事件
-    bool poll(Event& event);
-    
-    // 查看队列头部事件（不移除）
-    bool peek(Event& event) const;
-    
-    // 清空队列
-    void clear();
-    
-    // 队列状态
-    bool empty() const;
-    size_t size() const;
-
-private:
-    std::queue<Event> queue_;
-    mutable std::mutex mutex_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/event/input_codes.h b/Easy2D/include/easy2d/event/input_codes.h
deleted file mode 100644
index 96467f3..0000000
--- a/Easy2D/include/easy2d/event/input_codes.h
+++ /dev/null
@@ -1,155 +0,0 @@
-#pragma once
-
-
-namespace easy2d {
-
-// ============================================================================
-// 键盘按键码 (基于 GLFW)
-// ============================================================================
-namespace Key {
-    enum : int {
-        Unknown = -1,
-        Space = 32,
-        Apostrophe = 39,
-        Comma = 44,
-        Minus = 45,
-        Period = 46,
-        Slash = 47,
-        Num0 = 48, Num1 = 49, Num2 = 50, Num3 = 51, Num4 = 52,
-        Num5 = 53, Num6 = 54, Num7 = 55, Num8 = 56, Num9 = 57,
-        Semicolon = 59,
-        Equal = 61,
-        A = 65, B = 66, C = 67, D = 68, E = 69, F = 70, G = 71, H = 72,
-        I = 73, J = 74, K = 75, L = 76, M = 77, N = 78, O = 79, P = 80,
-        Q = 81, R = 82, S = 83, T = 84, U = 85, V = 86, W = 87, X = 88,
-        Y = 89, Z = 90,
-        LeftBracket = 91,
-        Backslash = 92,
-        RightBracket = 93,
-        GraveAccent = 96,
-        World1 = 161,
-        World2 = 162,
-        Escape = 256,
-        Enter = 257,
-        Tab = 258,
-        Backspace = 259,
-        Insert = 260,
-        Delete = 261,
-        Right = 262,
-        Left = 263,
-        Down = 264,
-        Up = 265,
-        PageUp = 266,
-        PageDown = 267,
-        Home = 268,
-        End = 269,
-        CapsLock = 280,
-        ScrollLock = 281,
-        NumLock = 282,
-        PrintScreen = 283,
-        Pause = 284,
-        F1 = 290, F2 = 291, F3 = 292, F4 = 293, F5 = 294, F6 = 295,
-        F7 = 296, F8 = 297, F9 = 298, F10 = 299, F11 = 300, F12 = 301,
-        F13 = 302, F14 = 303, F15 = 304, F16 = 305, F17 = 306, F18 = 307,
-        F19 = 308, F20 = 309, F21 = 310, F22 = 311, F23 = 312, F24 = 313,
-        F25 = 314,
-        KP0 = 320, KP1 = 321, KP2 = 322, KP3 = 323, KP4 = 324,
-        KP5 = 325, KP6 = 326, KP7 = 327, KP8 = 328, KP9 = 329,
-        KPDecimal = 330,
-        KPDivide = 331,
-        KPMultiply = 332,
-        KPSubtract = 333,
-        KPAdd = 334,
-        KPEnter = 335,
-        KPEqual = 336,
-        LeftShift = 340,
-        LeftControl = 341,
-        LeftAlt = 342,
-        LeftSuper = 343,
-        RightShift = 344,
-        RightControl = 345,
-        RightAlt = 346,
-        RightSuper = 347,
-        Menu = 348,
-        Last = Menu
-    };
-}
-
-// ============================================================================
-// 修饰键
-// ============================================================================
-namespace Mod {
-    enum : int {
-        Shift = 0x0001,
-        Control = 0x0002,
-        Alt = 0x0004,
-        Super = 0x0008,
-        CapsLock = 0x0010,
-        NumLock = 0x0020
-    };
-}
-
-// ============================================================================
-// 鼠标按键码
-// ============================================================================
-namespace Mouse {
-    enum : int {
-        Button1 = 0,
-        Button2 = 1,
-        Button3 = 2,
-        Button4 = 3,
-        Button5 = 4,
-        Button6 = 5,
-        Button7 = 6,
-        Button8 = 7,
-        ButtonLast = Button8,
-        ButtonLeft = Button1,
-        ButtonRight = Button2,
-        ButtonMiddle = Button3
-    };
-}
-
-// ============================================================================
-// 游戏手柄按键
-// ============================================================================
-namespace GamepadButton {
-    enum : int {
-        A = 0,
-        B = 1,
-        X = 2,
-        Y = 3,
-        LeftBumper = 4,
-        RightBumper = 5,
-        Back = 6,
-        Start = 7,
-        Guide = 8,
-        LeftThumb = 9,
-        RightThumb = 10,
-        DPadUp = 11,
-        DPadRight = 12,
-        DPadDown = 13,
-        DPadLeft = 14,
-        Last = DPadLeft,
-        Cross = A,
-        Circle = B,
-        Square = X,
-        Triangle = Y
-    };
-}
-
-// ============================================================================
-// 游戏手柄轴
-// ============================================================================
-namespace GamepadAxis {
-    enum : int {
-        LeftX = 0,
-        LeftY = 1,
-        RightX = 2,
-        RightY = 3,
-        LeftTrigger = 4,
-        RightTrigger = 5,
-        Last = RightTrigger
-    };
-}
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/alpha_mask.h b/Easy2D/include/easy2d/graphics/alpha_mask.h
deleted file mode 100644
index a299b38..0000000
--- a/Easy2D/include/easy2d/graphics/alpha_mask.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// Alpha 遮罩 - 存储图片的非透明区域信息
-// ============================================================================
-class AlphaMask {
-public:
-    AlphaMask() = default;
-    AlphaMask(int width, int height);
-    
-    /// 从像素数据创建遮罩
-    static AlphaMask createFromPixels(const uint8_t* pixels, int width, int height, int channels);
-    
-    /// 获取指定位置的透明度（0-255）
-    uint8_t getAlpha(int x, int y) const;
-    
-    /// 检查指定位置是否不透明
-    bool isOpaque(int x, int y, uint8_t threshold = 128) const;
-    
-    /// 检查指定位置是否在遮罩范围内
-    bool isValid(int x, int y) const;
-    
-    /// 获取遮罩尺寸
-    int getWidth() const { return width_; }
-    int getHeight() const { return height_; }
-    Size getSize() const { return Size(static_cast<float>(width_), static_cast<float>(height_)); }
-    
-    /// 获取原始数据
-    const std::vector<uint8_t>& getData() const { return data_; }
-    
-    /// 检查遮罩是否有效
-    bool isValid() const { return !data_.empty() && width_ > 0 && height_ > 0; }
-
-private:
-    int width_ = 0;
-    int height_ = 0;
-    std::vector<uint8_t> data_;  // Alpha值数组
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/camera.h b/Easy2D/include/easy2d/graphics/camera.h
deleted file mode 100644
index 2dcc330..0000000
--- a/Easy2D/include/easy2d/graphics/camera.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/color.h>
-#include <glm/mat4x4.hpp>
-
-namespace easy2d {
-
-// ============================================================================
-// 2D 正交相机
-// ============================================================================
-class Camera {
-public:
-    Camera();
-    Camera(float left, float right, float bottom, float top);
-    Camera(const Size& viewport);
-    ~Camera() = default;
-
-    // ------------------------------------------------------------------------
-    // 位置和变换
-    // ------------------------------------------------------------------------
-    void setPosition(const Vec2& position);
-    void setPosition(float x, float y);
-    Vec2 getPosition() const { return position_; }
-
-    void setRotation(float degrees);
-    float getRotation() const { return rotation_; }
-
-    void setZoom(float zoom);
-    float getZoom() const { return zoom_; }
-
-    // ------------------------------------------------------------------------
-    // 视口设置
-    // ------------------------------------------------------------------------
-    void setViewport(float left, float right, float bottom, float top);
-    void setViewport(const Rect& rect);
-    Rect getViewport() const;
-
-    // ------------------------------------------------------------------------
-    // 矩阵获取
-    // ------------------------------------------------------------------------
-    glm::mat4 getViewMatrix() const;
-    glm::mat4 getProjectionMatrix() const;
-    glm::mat4 getViewProjectionMatrix() const;
-
-    // ------------------------------------------------------------------------
-    // 坐标转换
-    // ------------------------------------------------------------------------
-    Vec2 screenToWorld(const Vec2& screenPos) const;
-    Vec2 worldToScreen(const Vec2& worldPos) const;
-    Vec2 screenToWorld(float x, float y) const;
-    Vec2 worldToScreen(float x, float y) const;
-
-    // ------------------------------------------------------------------------
-    // 移动相机
-    // ------------------------------------------------------------------------
-    void move(const Vec2& offset);
-    void move(float x, float y);
-
-    // ------------------------------------------------------------------------
-    // 边界限制
-    // ------------------------------------------------------------------------
-    void setBounds(const Rect& bounds);
-    void clearBounds();
-    void clampToBounds();
-
-    // ------------------------------------------------------------------------
-    // 快捷方法：看向某点
-    // ------------------------------------------------------------------------
-    void lookAt(const Vec2& target);
-
-private:
-    Vec2 position_ = Vec2::Zero();
-    float rotation_ = 0.0f;
-    float zoom_ = 1.0f;
-
-    float left_ = -1.0f;
-    float right_ = 1.0f;
-    float bottom_ = -1.0f;
-    float top_ = 1.0f;
-
-    Rect bounds_;
-    bool hasBounds_ = false;
-
-    mutable glm::mat4 viewMatrix_;
-    mutable glm::mat4 projMatrix_;
-    mutable glm::mat4 vpMatrix_;
-    mutable bool viewDirty_ = true;
-    mutable bool projDirty_ = true;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/font.h b/Easy2D/include/easy2d/graphics/font.h
deleted file mode 100644
index 4fba319..0000000
--- a/Easy2D/include/easy2d/graphics/font.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/string.h>
-#include <easy2d/core/math_types.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 字形信息
-// ============================================================================
-struct Glyph {
-    float u0, v0;       // 纹理坐标左下角
-    float u1, v1;       // 纹理坐标右上角
-    float width;        // 字形宽度（像素）
-    float height;       // 字形高度（像素）
-    float bearingX;     // 水平偏移
-    float bearingY;     // 垂直偏移
-    float advance;      // 前进距离
-};
-
-// ============================================================================
-// 字体图集接口
-// ============================================================================
-class FontAtlas {
-public:
-    virtual ~FontAtlas() = default;
-
-    // 获取字形信息
-    virtual const Glyph* getGlyph(char32_t codepoint) const = 0;
-    
-    // 获取纹理
-    virtual class Texture* getTexture() const = 0;
-    
-    // 获取字体大小
-    virtual int getFontSize() const = 0;
-
-    virtual float getAscent() const = 0;
-    virtual float getDescent() const = 0;
-    virtual float getLineGap() const = 0;
-    virtual float getLineHeight() const = 0;
-    
-    // 计算文字尺寸
-    virtual Vec2 measureText(const String& text) = 0;
-    
-    // 是否支持 SDF 渲染
-    virtual bool isSDF() const = 0;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/opengl/gl_font_atlas.h b/Easy2D/include/easy2d/graphics/opengl/gl_font_atlas.h
deleted file mode 100644
index be3195d..0000000
--- a/Easy2D/include/easy2d/graphics/opengl/gl_font_atlas.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/graphics/font.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <stb/stb_truetype.h>
-#include <stb/stb_rect_pack.h>
-#include <unordered_map>
-#include <vector>
-#include <memory>
-
-namespace easy2d {
-
-// ============================================================================
-// OpenGL 字体图集实现 - 使用 stb_rect_pack 进行矩形打包
-// ============================================================================
-class GLFontAtlas : public FontAtlas {
-public:
-    GLFontAtlas(const std::string& filepath, int fontSize, bool useSDF = false);
-    ~GLFontAtlas();
-
-    // FontAtlas 接口实现
-    const Glyph* getGlyph(char32_t codepoint) const override;
-    Texture* getTexture() const override { return texture_.get(); }
-    int getFontSize() const override { return fontSize_; }
-    float getAscent() const override { return ascent_; }
-    float getDescent() const override { return descent_; }
-    float getLineGap() const override { return lineGap_; }
-    float getLineHeight() const override { return ascent_ - descent_ + lineGap_; }
-    Vec2 measureText(const String& text) override;
-    bool isSDF() const override { return useSDF_; }
-
-private:
-    // 图集配置
-    static constexpr int ATLAS_WIDTH = 512;
-    static constexpr int ATLAS_HEIGHT = 512;
-    static constexpr int PADDING = 2;  // 字形之间的间距
-
-    int fontSize_;
-    bool useSDF_;
-    mutable std::unique_ptr<GLTexture> texture_;
-    mutable std::unordered_map<char32_t, Glyph> glyphs_;
-    
-    // stb_rect_pack 上下文
-    mutable stbrp_context packContext_;
-    mutable std::vector<stbrp_node> packNodes_;
-    mutable int currentY_;
-    
-    std::vector<unsigned char> fontData_;
-    stbtt_fontinfo fontInfo_;
-    float scale_;
-    float ascent_;
-    float descent_;
-    float lineGap_;
-
-    void createAtlas();
-    void cacheGlyph(char32_t codepoint) const;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/opengl/gl_sprite_batch.h b/Easy2D/include/easy2d/graphics/opengl/gl_sprite_batch.h
deleted file mode 100644
index d023a67..0000000
--- a/Easy2D/include/easy2d/graphics/opengl/gl_sprite_batch.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/opengl/gl_shader.h>
-#include <glm/mat4x4.hpp>
-#include <vector>
-
-// 使用标准 GLES3.2
-#include <GLES3/gl32.h>
-
-namespace easy2d {
-
-// ============================================================================
-// OpenGL 精灵批渲染器
-// ============================================================================
-class GLSpriteBatch {
-public:
-    static constexpr size_t MAX_SPRITES = 10000;
-    static constexpr size_t VERTICES_PER_SPRITE = 4;
-    static constexpr size_t INDICES_PER_SPRITE = 6;
-
-    struct Vertex {
-        glm::vec2 position;
-        glm::vec2 texCoord;
-        glm::vec4 color;
-    };
-
-    struct SpriteData {
-        glm::vec2 position;
-        glm::vec2 size;
-        glm::vec2 texCoordMin;
-        glm::vec2 texCoordMax;
-        glm::vec4 color;
-        float rotation;
-        glm::vec2 anchor;
-        bool isSDF = false;
-    };
-
-    GLSpriteBatch();
-    ~GLSpriteBatch();
-
-    bool init();
-    void shutdown();
-
-    void begin(const glm::mat4& viewProjection);
-    void draw(const Texture& texture, const SpriteData& data);
-    void end();
-
-    // 统计
-    uint32_t getDrawCallCount() const { return drawCallCount_; }
-    uint32_t getSpriteCount() const { return spriteCount_; }
-
-private:
-    GLuint vao_;
-    GLuint vbo_;
-    GLuint ibo_;
-    GLShader shader_;
-    
-    std::vector<Vertex> vertices_;
-    std::vector<GLuint> indices_;
-    
-    const Texture* currentTexture_;
-    bool currentIsSDF_;
-    glm::mat4 viewProjection_;
-    
-    uint32_t drawCallCount_;
-    uint32_t spriteCount_;
-
-    void flush();
-    void setupShader();
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/render_backend.h b/Easy2D/include/easy2d/graphics/render_backend.h
deleted file mode 100644
index 0fd5104..0000000
--- a/Easy2D/include/easy2d/graphics/render_backend.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/string.h>
-#include <glm/mat4x4.hpp>
-
-namespace easy2d {
-
-// 前向声明
-class Window;
-class Texture;
-class FontAtlas;
-class Shader;
-
-// ============================================================================
-// 渲染后端类型
-// ============================================================================
-enum class BackendType {
-    OpenGL,
-    // Vulkan,
-    // Metal,
-    // D3D11,
-    // D3D12
-};
-
-// ============================================================================
-// 混合模式
-// ============================================================================
-enum class BlendMode {
-    None,       // 不混合
-    Alpha,      // 标准 Alpha 混合
-    Additive,   // 加法混合
-    Multiply    // 乘法混合
-};
-
-// ============================================================================
-// 渲染后端抽象接口
-// ============================================================================
-class RenderBackend {
-public:
-    virtual ~RenderBackend() = default;
-
-    // ------------------------------------------------------------------------
-    // 生命周期
-    // ------------------------------------------------------------------------
-    virtual bool init(Window* window) = 0;
-    virtual void shutdown() = 0;
-
-    // ------------------------------------------------------------------------
-    // 帧管理
-    // ------------------------------------------------------------------------
-    virtual void beginFrame(const Color& clearColor) = 0;
-    virtual void endFrame() = 0;
-    virtual void setViewport(int x, int y, int width, int height) = 0;
-    virtual void setVSync(bool enabled) = 0;
-
-    // ------------------------------------------------------------------------
-    // 状态设置
-    // ------------------------------------------------------------------------
-    virtual void setBlendMode(BlendMode mode) = 0;
-    virtual void setViewProjection(const glm::mat4& matrix) = 0;
-
-    // ------------------------------------------------------------------------
-    // 纹理
-    // ------------------------------------------------------------------------
-    virtual Ptr<Texture> createTexture(int width, int height, const uint8_t* pixels, int channels) = 0;
-    virtual Ptr<Texture> loadTexture(const std::string& filepath) = 0;
-
-    // ------------------------------------------------------------------------
-    // 精灵批渲染
-    // ------------------------------------------------------------------------
-    virtual void beginSpriteBatch() = 0;
-    virtual void drawSprite(const Texture& texture, 
-                           const Rect& destRect,
-                           const Rect& srcRect,
-                           const Color& tint,
-                           float rotation,
-                           const Vec2& anchor) = 0;
-    virtual void drawSprite(const Texture& texture,
-                           const Vec2& position,
-                           const Color& tint) = 0;
-    virtual void endSpriteBatch() = 0;
-
-    // ------------------------------------------------------------------------
-    // 形状渲染
-    // ------------------------------------------------------------------------
-    virtual void drawLine(const Vec2& start, const Vec2& end, const Color& color, float width = 1.0f) = 0;
-    virtual void drawRect(const Rect& rect, const Color& color, float width = 1.0f) = 0;
-    virtual void fillRect(const Rect& rect, const Color& color) = 0;
-    virtual void drawCircle(const Vec2& center, float radius, const Color& color, int segments = 32, float width = 1.0f) = 0;
-    virtual void fillCircle(const Vec2& center, float radius, const Color& color, int segments = 32) = 0;
-    virtual void drawTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3, const Color& color, float width = 1.0f) = 0;
-    virtual void fillTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3, const Color& color) = 0;
-    virtual void drawPolygon(const std::vector<Vec2>& points, const Color& color, float width = 1.0f) = 0;
-    virtual void fillPolygon(const std::vector<Vec2>& points, const Color& color) = 0;
-
-    // ------------------------------------------------------------------------
-    // 文字渲染
-    // ------------------------------------------------------------------------
-    virtual Ptr<FontAtlas> createFontAtlas(const std::string& filepath, int fontSize, bool useSDF = false) = 0;
-    virtual void drawText(const FontAtlas& font, const String& text, const Vec2& position, const Color& color) = 0;
-    virtual void drawText(const FontAtlas& font, const String& text, float x, float y, const Color& color) = 0;
-
-    // ------------------------------------------------------------------------
-    // 统计信息
-    // ------------------------------------------------------------------------
-    struct Stats {
-        uint32_t drawCalls = 0;
-        uint32_t triangleCount = 0;
-        uint32_t textureBinds = 0;
-        uint32_t shaderBinds = 0;
-    };
-    virtual Stats getStats() const = 0;
-    virtual void resetStats() = 0;
-
-    // ------------------------------------------------------------------------
-    // 工厂方法
-    // ------------------------------------------------------------------------
-    static UniquePtr<RenderBackend> create(BackendType type);
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/render_target.h b/Easy2D/include/easy2d/graphics/render_target.h
deleted file mode 100644
index 6eb555a..0000000
--- a/Easy2D/include/easy2d/graphics/render_target.h
+++ /dev/null
@@ -1,328 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <mutex>
-
-namespace easy2d {
-
-// ============================================================================
-// 渲染目标配置
-// ============================================================================
-struct RenderTargetConfig {
-    int width = 800;                    // 宽度
-    int height = 600;                   // 高度
-    PixelFormat colorFormat = PixelFormat::RGBA8;  // 颜色格式
-    bool hasDepth = true;               // 是否包含深度缓冲
-    bool hasDepthBuffer = true;         // 兼容旧API的别名 (同hasDepth)
-    bool hasStencil = false;            // 是否包含模板缓冲
-    int samples = 1;                    // 多重采样数 (1 = 无MSAA)
-    bool autoResize = true;             // 是否自动调整大小
-};
-
-// ============================================================================
-// 渲染目标 - 基于FBO的离屏渲染
-// ============================================================================
-class RenderTarget {
-public:
-    RenderTarget();
-    ~RenderTarget();
-
-    // 禁止拷贝
-    RenderTarget(const RenderTarget&) = delete;
-    RenderTarget& operator=(const RenderTarget&) = delete;
-
-    // 允许移动
-    RenderTarget(RenderTarget&& other) noexcept;
-    RenderTarget& operator=(RenderTarget&& other) noexcept;
-
-    // ------------------------------------------------------------------------
-    // 创建和销毁
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 创建渲染目标
-     */
-    bool create(const RenderTargetConfig& config);
-    
-    /**
-     * @brief 初始化渲染目标（create的别名，兼容旧API）
-     */
-    bool init(const RenderTargetConfig& config) { return create(config); }
-    
-    /**
-     * @brief 从现有纹理创建渲染目标
-     */
-    bool createFromTexture(Ptr<Texture> texture, bool hasDepth = false);
-    
-    /**
-     * @brief 销毁渲染目标
-     */
-    void destroy();
-    
-    /**
-     * @brief 关闭渲染目标（destroy的别名，兼容旧API）
-     */
-    void shutdown() { destroy(); }
-    
-    /**
-     * @brief 检查是否有效
-     */
-    bool isValid() const { return fbo_ != 0; }
-
-    // ------------------------------------------------------------------------
-    // 尺寸和格式
-    // ------------------------------------------------------------------------
-    
-    int getWidth() const { return width_; }
-    int getHeight() const { return height_; }
-    Vec2 getSize() const { return Vec2(static_cast<float>(width_), static_cast<float>(height_)); }
-    PixelFormat getColorFormat() const { return colorFormat_; }
-
-    // ------------------------------------------------------------------------
-    // 绑定和解绑
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 绑定为当前渲染目标
-     */
-    void bind();
-    
-    /**
-     * @brief 解绑（恢复默认渲染目标）
-     */
-    void unbind();
-    
-    /**
-     * @brief 清除渲染目标
-     */
-    void clear(const Color& color = Colors::Transparent);
-
-    // ------------------------------------------------------------------------
-    // 纹理访问
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 获取颜色纹理
-     */
-    Ptr<Texture> getColorTexture() const { return colorTexture_; }
-    
-    /**
-     * @brief 获取深度纹理（如果有）
-     */
-    Ptr<Texture> getDepthTexture() const { return depthTexture_; }
-
-    // ------------------------------------------------------------------------
-    // 视口和裁剪
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 设置视口（相对于渲染目标）
-     */
-    void setViewport(int x, int y, int width, int height);
-    
-    /**
-     * @brief 获取完整视口
-     */
-    void getFullViewport(int& x, int& y, int& width, int& height) const;
-
-    // ------------------------------------------------------------------------
-    // 工具方法
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 调整大小（会销毁并重新创建）
-     */
-    bool resize(int width, int height);
-    
-    /**
-     * @brief 复制到另一个渲染目标
-     */
-    void copyTo(RenderTarget& target);
-    
-    /**
-     * @brief 复制到另一个渲染目标（blitTo的别名，兼容旧API）
-     * @param target 目标渲染目标
-     * @param color 是否复制颜色缓冲
-     * @param depth 是否复制深度缓冲
-     */
-    void blitTo(RenderTarget& target, bool color = true, bool depth = false);
-    
-    /**
-     * @brief 复制到屏幕
-     */
-    void copyToScreen(int screenWidth, int screenHeight);
-    
-    /**
-     * @brief 保存为图像文件
-     */
-    bool saveToFile(const std::string& filepath);
-
-    // ------------------------------------------------------------------------
-    // 静态方法
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 创建渲染目标的静态工厂方法
-     */
-    static Ptr<RenderTarget> createFromConfig(const RenderTargetConfig& config);
-    
-    /**
-     * @brief 获取当前绑定的渲染目标ID
-     */
-    static GLuint getCurrentFBO();
-    
-    /**
-     * @brief 绑定默认渲染目标（屏幕）
-     */
-    static void bindDefault();
-
-    /**
-     * @brief 获取FBO ID（供内部使用）
-     */
-    GLuint getFBO() const { return fbo_; }
-
-protected:
-    GLuint fbo_ = 0;                    // 帧缓冲对象
-    GLuint rbo_ = 0;                    // 渲染缓冲对象（深度/模板）
-    
-    Ptr<Texture> colorTexture_;         // 颜色纹理
-    Ptr<Texture> depthTexture_;         // 深度纹理（可选）
-    
-    int width_ = 0;
-    int height_ = 0;
-    PixelFormat colorFormat_ = PixelFormat::RGBA8;
-    bool hasDepth_ = false;
-    bool hasStencil_ = false;
-    int samples_ = 1;
-    
-    bool createFBO();
-    void deleteFBO();
-};
-
-// ============================================================================
-// 多重采样渲染目标（用于MSAA）
-// ============================================================================
-class MultisampleRenderTarget : public RenderTarget {
-public:
-    /**
-     * @brief 创建多重采样渲染目标
-     */
-    bool create(int width, int height, int samples = 4);
-    
-    /**
-     * @brief 解析到普通渲染目标（用于显示）
-     */
-    void resolveTo(RenderTarget& target);
-    
-    /**
-     * @brief 销毁渲染目标
-     */
-    void destroy();
-
-private:
-    GLuint colorRBO_ = 0;  // 多重采样颜色渲染缓冲
-};
-
-// ============================================================================
-// 渲染目标栈（用于嵌套渲染）
-// ============================================================================
-class RenderTargetStack {
-public:
-    static RenderTargetStack& getInstance();
-    
-    /**
-     * @brief 压入渲染目标
-     */
-    void push(RenderTarget* target);
-    
-    /**
-     * @brief 弹出渲染目标
-     */
-    void pop();
-    
-    /**
-     * @brief 获取当前渲染目标
-     */
-    RenderTarget* getCurrent() const;
-    
-    /**
-     * @brief 获取栈大小
-     */
-    size_t size() const;
-    
-    /**
-     * @brief 清空栈
-     */
-    void clear();
-
-private:
-    RenderTargetStack() = default;
-    ~RenderTargetStack() = default;
-    
-    std::vector<RenderTarget*> stack_;
-    mutable std::mutex mutex_;
-};
-
-// ============================================================================
-// 渲染目标管理器 - 全局渲染目标管理
-// ============================================================================
-class RenderTargetManager {
-public:
-    /**
-     * @brief 获取单例实例
-     */
-    static RenderTargetManager& getInstance();
-
-    /**
-     * @brief 初始化渲染目标管理器
-     * @param width 默认宽度
-     * @param height 默认高度
-     */
-    bool init(int width, int height);
-
-    /**
-     * @brief 关闭渲染目标管理器
-     */
-    void shutdown();
-
-    /**
-     * @brief 创建新的渲染目标
-     */
-    Ptr<RenderTarget> createRenderTarget(const RenderTargetConfig& config);
-
-    /**
-     * @brief 获取默认渲染目标
-     */
-    RenderTarget* getDefaultRenderTarget() const { return defaultRenderTarget_.get(); }
-
-    /**
-     * @brief 调整所有受管渲染目标的大小
-     */
-    void resize(int width, int height);
-
-    /**
-     * @brief 检查是否已初始化
-     */
-    bool isInitialized() const { return initialized_; }
-
-private:
-    RenderTargetManager() = default;
-    ~RenderTargetManager() = default;
-    RenderTargetManager(const RenderTargetManager&) = delete;
-    RenderTargetManager& operator=(const RenderTargetManager&) = delete;
-
-    Ptr<RenderTarget> defaultRenderTarget_;
-    std::vector<Ptr<RenderTarget>> renderTargets_;
-    bool initialized_ = false;
-};
-
-// ============================================================================
-// 便捷宏
-// ============================================================================
-#define E2D_RENDER_TARGET_STACK() ::easy2d::RenderTargetStack::getInstance()
-#define E2D_RENDER_TARGET_MANAGER() ::easy2d::RenderTargetManager::getInstance()
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/shader_system.h b/Easy2D/include/easy2d/graphics/shader_system.h
deleted file mode 100644
index e39c30e..0000000
--- a/Easy2D/include/easy2d/graphics/shader_system.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/graphics/opengl/gl_shader.h>
-#include <string>
-#include <unordered_map>
-#include <functional>
-
-namespace easy2d {
-
-// ============================================================================
-// Shader参数绑定回调
-// ============================================================================
-using ShaderBindCallback = std::function<void(GLShader&)>;
-
-// ============================================================================
-// Shader系统 - 管理所有Shader的加载、缓存和热重载
-// ============================================================================
-class ShaderSystem {
-public:
-    // ------------------------------------------------------------------------
-    // 单例访问
-    // ------------------------------------------------------------------------
-    static ShaderSystem& getInstance();
-
-    // ------------------------------------------------------------------------
-    // 初始化和关闭
-    // ------------------------------------------------------------------------
-    bool init();
-    void shutdown();
-
-    // ------------------------------------------------------------------------
-    // Shader加载
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 从文件加载Shader
-     * @param name Shader名称（用于缓存）
-     * @param vertPath 顶点着色器文件路径
-     * @param fragPath 片段着色器文件路径
-     * @return 加载的Shader，失败返回nullptr
-     */
-    Ptr<GLShader> loadFromFile(const std::string& name, 
-                               const std::string& vertPath, 
-                               const std::string& fragPath);
-    
-    /**
-     * @brief 从源码字符串加载Shader
-     * @param name Shader名称（用于缓存）
-     * @param vertSource 顶点着色器源码
-     * @param fragSource 片段着色器源码
-     * @return 加载的Shader，失败返回nullptr
-     */
-    Ptr<GLShader> loadFromSource(const std::string& name,
-                                 const std::string& vertSource,
-                                 const std::string& fragSource);
-    
-    /**
-     * @brief 从已编译的程序获取Shader
-     * @param name Shader名称
-     * @return 缓存的Shader，不存在返回nullptr
-     */
-    Ptr<GLShader> get(const std::string& name);
-    
-    /**
-     * @brief 检查Shader是否存在
-     */
-    bool has(const std::string& name) const;
-
-    // ------------------------------------------------------------------------
-    // Shader移除
-    // ------------------------------------------------------------------------
-    void remove(const std::string& name);
-    void clear();
-
-    // ------------------------------------------------------------------------
-    // 热重载支持
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 启用/禁用文件监视
-     */
-    void setFileWatching(bool enable);
-    bool isFileWatching() const { return fileWatching_; }
-    
-    /**
-     * @brief 更新文件监视（在主循环中调用）
-     */
-    void updateFileWatching();
-    
-    /**
-     * @brief 重载指定Shader
-     */
-    bool reload(const std::string& name);
-    
-    /**
-     * @brief 重载所有Shader
-     */
-    void reloadAll();
-
-    // ------------------------------------------------------------------------
-    // 内置Shader获取
-    // ------------------------------------------------------------------------
-    Ptr<GLShader> getBuiltinSpriteShader();
-    Ptr<GLShader> getBuiltinParticleShader();
-    Ptr<GLShader> getBuiltinPostProcessShader();
-    Ptr<GLShader> getBuiltinShapeShader();
-
-    // ------------------------------------------------------------------------
-    // 工具方法
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 从文件读取文本内容
-     */
-    static std::string readFile(const std::string& filepath);
-    
-    /**
-     * @brief 获取Shader文件的最后修改时间
-     */
-    static uint64_t getFileModifiedTime(const std::string& filepath);
-
-private:
-    ShaderSystem() = default;
-    ~ShaderSystem() = default;
-    ShaderSystem(const ShaderSystem&) = delete;
-    ShaderSystem& operator=(const ShaderSystem&) = delete;
-
-    struct ShaderInfo {
-        Ptr<GLShader> shader;
-        std::string vertPath;
-        std::string fragPath;
-        uint64_t vertModifiedTime;
-        uint64_t fragModifiedTime;
-        bool isBuiltin;
-    };
-
-    std::unordered_map<std::string, ShaderInfo> shaders_;
-    bool fileWatching_ = false;
-    float watchTimer_ = 0.0f;
-    static constexpr float WATCH_INTERVAL = 1.0f; // 检查间隔（秒）
-
-    // 内置Shader缓存
-    Ptr<GLShader> builtinSpriteShader_;
-    Ptr<GLShader> builtinParticleShader_;
-    Ptr<GLShader> builtinPostProcessShader_;
-    Ptr<GLShader> builtinShapeShader_;
-
-    bool loadBuiltinShaders();
-    void checkAndReload();
-};
-
-// ============================================================================
-// Shader参数包装器 - 简化Uniform设置
-// ============================================================================
-class ShaderParams {
-public:
-    explicit ShaderParams(GLShader& shader);
-
-    ShaderParams& setBool(const std::string& name, bool value);
-    ShaderParams& setInt(const std::string& name, int value);
-    ShaderParams& setFloat(const std::string& name, float value);
-    ShaderParams& setVec2(const std::string& name, const glm::vec2& value);
-    ShaderParams& setVec3(const std::string& name, const glm::vec3& value);
-    ShaderParams& setVec4(const std::string& name, const glm::vec4& value);
-    ShaderParams& setMat4(const std::string& name, const glm::mat4& value);
-    ShaderParams& setColor(const std::string& name, const Color& color);
-
-private:
-    GLShader& shader_;
-};
-
-// ============================================================================
-// 便捷宏
-// ============================================================================
-#define E2D_SHADER_SYSTEM() ::easy2d::ShaderSystem::getInstance()
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/graphics/texture_pool.h b/Easy2D/include/easy2d/graphics/texture_pool.h
deleted file mode 100644
index 04fa370..0000000
--- a/Easy2D/include/easy2d/graphics/texture_pool.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/graphics/texture.h>
-#include <string>
-#include <unordered_map>
-#include <list>
-#include <functional>
-#include <mutex>
-
-namespace easy2d {
-
-// ============================================================================
-// 纹理池配置
-// ============================================================================
-struct TexturePoolConfig {
-    size_t maxCacheSize = 64 * 1024 * 1024;  // 最大缓存大小 (64MB)
-    size_t maxTextureCount = 256;             // 最大纹理数量
-    float unloadInterval = 30.0f;             // 自动清理间隔 (秒)
-    bool enableAsyncLoad = true;              // 启用异步加载
-};
-
-// ============================================================================
-// 纹理池 - 使用LRU缓存策略管理纹理复用
-// ============================================================================
-class TexturePool {
-public:
-    // ------------------------------------------------------------------------
-    // 单例访问
-    // ------------------------------------------------------------------------
-    static TexturePool& getInstance();
-
-    // ------------------------------------------------------------------------
-    // 初始化和关闭
-    // ------------------------------------------------------------------------
-    bool init(const TexturePoolConfig& config = TexturePoolConfig{});
-    void shutdown();
-
-    // ------------------------------------------------------------------------
-    // 纹理获取
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 从文件获取纹理（带缓存）
-     * @param filepath 纹理文件路径
-     * @return 纹理对象，失败返回nullptr
-     */
-    Ptr<Texture> get(const std::string& filepath);
-    
-    /**
-     * @brief 异步加载纹理
-     * @param filepath 纹理文件路径
-     * @param callback 加载完成回调
-     */
-    void getAsync(const std::string& filepath, 
-                  std::function<void(Ptr<Texture>)> callback);
-    
-    /**
-     * @brief 从内存数据创建纹理（自动缓存）
-     * @param name 纹理名称（用于缓存键）
-     * @param data 图像数据
-     * @param width 宽度
-     * @param height 高度
-     * @param format 像素格式
-     * @return 纹理对象
-     */
-    Ptr<Texture> createFromData(const std::string& name,
-                                const uint8_t* data,
-                                int width,
-                                int height,
-                                PixelFormat format = PixelFormat::RGBA8);
-
-    // ------------------------------------------------------------------------
-    // 缓存管理
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 手动添加纹理到缓存
-     */
-    void add(const std::string& key, Ptr<Texture> texture);
-    
-    /**
-     * @brief 从缓存移除纹理
-     */
-    void remove(const std::string& key);
-    
-    /**
-     * @brief 检查纹理是否在缓存中
-     */
-    bool has(const std::string& key) const;
-    
-    /**
-     * @brief 清空所有缓存
-     */
-    void clear();
-    
-    /**
-     * @brief 清理未使用的纹理（LRU策略）
-     * @param targetSize 目标缓存大小
-     */
-    void trim(size_t targetSize);
-
-    // ------------------------------------------------------------------------
-    // 统计信息
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 获取当前缓存的纹理数量
-     */
-    size_t getTextureCount() const;
-    
-    /**
-     * @brief 获取当前缓存的总大小（字节）
-     */
-    size_t getCacheSize() const;
-    
-    /**
-     * @brief 获取缓存命中率
-     */
-    float getHitRate() const;
-    
-    /**
-     * @brief 打印统计信息
-     */
-    void printStats() const;
-
-    // ------------------------------------------------------------------------
-    // 自动清理
-    // ------------------------------------------------------------------------
-    
-    /**
-     * @brief 更新（在主循环中调用，用于自动清理）
-     */
-    void update(float dt);
-    
-    /**
-     * @brief 设置自动清理间隔
-     */
-    void setAutoUnloadInterval(float interval);
-
-private:
-    TexturePool() = default;
-    ~TexturePool() = default;
-    TexturePool(const TexturePool&) = delete;
-    TexturePool& operator=(const TexturePool&) = delete;
-
-    // 缓存项
-    struct CacheEntry {
-        Ptr<Texture> texture;
-        size_t size;           // 纹理大小（字节）
-        float lastAccessTime;  // 最后访问时间
-        uint32_t accessCount;  // 访问次数
-    };
-
-    // LRU列表（最近使用的在前面）
-    using LRUList = std::list<std::string>;
-    using LRUIterator = LRUList::iterator;
-
-    mutable std::mutex mutex_;
-    TexturePoolConfig config_;
-    
-    // 缓存存储
-    std::unordered_map<std::string, CacheEntry> cache_;
-    std::unordered_map<std::string, LRUIterator> lruMap_;
-    LRUList lruList_;
-    
-    // 统计
-    size_t totalSize_ = 0;
-    uint64_t hitCount_ = 0;
-    uint64_t missCount_ = 0;
-    float autoUnloadTimer_ = 0.0f;
-    bool initialized_ = false;
-
-    // 异步加载队列
-    struct AsyncLoadTask {
-        std::string filepath;
-        std::function<void(Ptr<Texture>)> callback;
-    };
-    std::vector<AsyncLoadTask> asyncTasks_;
-
-    // 内部方法
-    void touch(const std::string& key);
-    void evict();
-    Ptr<Texture> loadTexture(const std::string& filepath);
-    size_t calculateTextureSize(int width, int height, PixelFormat format);
-    void processAsyncTasks();
-};
-
-// ============================================================================
-// 便捷宏
-// ============================================================================
-#define E2D_TEXTURE_POOL() ::easy2d::TexturePool::getInstance()
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/platform/input.h b/Easy2D/include/easy2d/platform/input.h
deleted file mode 100644
index ae7e87c..0000000
--- a/Easy2D/include/easy2d/platform/input.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <array>
-
-#include <SDL.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 鼠标按钮枚举 (保留接口兼容性)
-// ============================================================================
-enum class MouseButton {
-    Left = 0,
-    Right = 1,
-    Middle = 2,
-    Button4 = 3,
-    Button5 = 4,
-    Button6 = 5,
-    Button7 = 6,
-    Button8 = 7,
-    Count = 8
-};
-
-// ============================================================================
-// Input 类 - SDL2 GameController + Touch 输入管理
-// ============================================================================
-class Input {
-public:
-    Input();
-    ~Input();
-
-    // 初始化 (使用 SDL2 GameController API)
-    void init();
-    void shutdown();
-
-    // 每帧更新
-    void update();
-
-    // ------------------------------------------------------------------------
-    // 键盘输入 (映射到手柄按钮)
-    // ------------------------------------------------------------------------
-    bool isKeyDown(int keyCode) const;
-    bool isKeyPressed(int keyCode) const;
-    bool isKeyReleased(int keyCode) const;
-
-    // ------------------------------------------------------------------------
-    // 手柄按钮 (通过 SDL_GameController)
-    // ------------------------------------------------------------------------
-    bool isButtonDown(int button) const;
-    bool isButtonPressed(int button) const;
-    bool isButtonReleased(int button) const;
-
-    // 摇杆
-    Vec2 getLeftStick() const;
-    Vec2 getRightStick() const;
-
-    // ------------------------------------------------------------------------
-    // 鼠标输入 (映射到触摸屏)
-    // ------------------------------------------------------------------------
-    bool isMouseDown(MouseButton button) const;
-    bool isMousePressed(MouseButton button) const;
-    bool isMouseReleased(MouseButton button) const;
-
-    Vec2 getMousePosition() const;
-    Vec2 getMouseDelta() const;
-    float getMouseScroll() const { return 0.0f; }
-    float getMouseScrollDelta() const { return 0.0f; }
-
-    void setMousePosition(const Vec2& position);
-    void setMouseVisible(bool visible);
-    void setMouseLocked(bool locked);
-
-    // ------------------------------------------------------------------------
-    // 触摸屏
-    // ------------------------------------------------------------------------
-    bool isTouching() const { return touching_; }
-    Vec2 getTouchPosition() const { return touchPosition_; }
-    int getTouchCount() const { return touchCount_; }
-
-    // ------------------------------------------------------------------------
-    // 便捷方法
-    // ------------------------------------------------------------------------
-    bool isAnyKeyDown() const;
-    bool isAnyMouseDown() const;
-
-private:
-    static constexpr int MAX_BUTTONS = SDL_CONTROLLER_BUTTON_MAX;
-
-    SDL_GameController* controller_;
-
-    // 手柄按钮状态
-    std::array<bool, MAX_BUTTONS> buttonsDown_;
-    std::array<bool, MAX_BUTTONS> prevButtonsDown_;
-
-    // 摇杆状态
-    float leftStickX_;
-    float leftStickY_;
-    float rightStickX_;
-    float rightStickY_;
-
-    // 触摸屏状态
-    bool touching_;
-    bool prevTouching_;
-    Vec2 touchPosition_;
-    Vec2 prevTouchPosition_;
-    int touchCount_;
-
-    // 映射键盘 keyCode 到 SDL GameController 按钮
-    SDL_GameControllerButton mapKeyToButton(int keyCode) const;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/resource/resource_manager.h b/Easy2D/include/easy2d/resource/resource_manager.h
deleted file mode 100644
index b89ba7a..0000000
--- a/Easy2D/include/easy2d/resource/resource_manager.h
+++ /dev/null
@@ -1,151 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/alpha_mask.h>
-#include <easy2d/graphics/font.h>
-#include <easy2d/audio/sound.h>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <mutex>
-
-namespace easy2d {
-
-// ============================================================================
-// 资源管理器 - 统一管理纹理、字体、音效等资源
-// ============================================================================
-class ResourceManager {
-public:
-    // ------------------------------------------------------------------------
-    // 单例访问
-    // ------------------------------------------------------------------------
-    static ResourceManager& getInstance();
-
-    // ------------------------------------------------------------------------
-    // 搜索路径管理
-    // ------------------------------------------------------------------------
-    
-    /// 添加资源搜索路径
-    void addSearchPath(const std::string& path);
-    
-    /// 移除资源搜索路径
-    void removeSearchPath(const std::string& path);
-    
-    /// 清空所有搜索路径
-    void clearSearchPaths();
-    
-    /// 获取搜索路径列表
-    const std::vector<std::string>& getSearchPaths() const { return searchPaths_; }
-    
-    /// 查找资源文件完整路径
-    std::string findResourcePath(const std::string& filename) const;
-
-    // ------------------------------------------------------------------------
-    // 纹理资源
-    // ------------------------------------------------------------------------
-    
-    /// 加载纹理（带缓存）
-    Ptr<Texture> loadTexture(const std::string& filepath);
-    
-    /// 加载纹理并生成Alpha遮罩（用于不规则形状图片）
-    Ptr<Texture> loadTextureWithAlphaMask(const std::string& filepath);
-    
-    /// 通过key获取已缓存的纹理
-    Ptr<Texture> getTexture(const std::string& key) const;
-    
-    /// 检查纹理是否已缓存
-    bool hasTexture(const std::string& key) const;
-    
-    /// 卸载指定纹理
-    void unloadTexture(const std::string& key);
-    
-    // ------------------------------------------------------------------------
-    // Alpha遮罩资源
-    // ------------------------------------------------------------------------
-    
-    /// 获取纹理的Alpha遮罩（如果已生成）
-    const AlphaMask* getAlphaMask(const std::string& textureKey) const;
-    
-    /// 为已加载的纹理生成Alpha遮罩
-    bool generateAlphaMask(const std::string& textureKey);
-    
-    /// 检查纹理是否有Alpha遮罩
-    bool hasAlphaMask(const std::string& textureKey) const;
-
-    // ------------------------------------------------------------------------
-    // 字体图集资源
-    // ------------------------------------------------------------------------
-    
-    /// 加载字体图集（带缓存）
-    Ptr<FontAtlas> loadFont(const std::string& filepath, int fontSize, bool useSDF = false);
-    
-    /// 通过key获取已缓存的字体图集
-    Ptr<FontAtlas> getFont(const std::string& key) const;
-    
-    /// 检查字体是否已缓存
-    bool hasFont(const std::string& key) const;
-    
-    /// 卸载指定字体
-    void unloadFont(const std::string& key);
-
-    // ------------------------------------------------------------------------
-    // 音效资源
-    // ------------------------------------------------------------------------
-    
-    /// 加载音效（带缓存）
-    Ptr<Sound> loadSound(const std::string& filepath);
-    Ptr<Sound> loadSound(const std::string& name, const std::string& filepath);
-    
-    /// 通过key获取已缓存的音效
-    Ptr<Sound> getSound(const std::string& key) const;
-    
-    /// 检查音效是否已缓存
-    bool hasSound(const std::string& key) const;
-    
-    /// 卸载指定音效
-    void unloadSound(const std::string& key);
-
-    // ------------------------------------------------------------------------
-    // 缓存清理
-    // ------------------------------------------------------------------------
-    
-    /// 清理所有失效的弱引用（自动清理已释放的资源）
-    void purgeUnused();
-    
-    /// 清理指定类型的所有缓存
-    void clearTextureCache();
-    void clearFontCache();
-    void clearSoundCache();
-    
-    /// 清理所有资源缓存
-    void clearAllCaches();
-    
-    /// 获取各类资源的缓存数量
-    size_t getTextureCacheSize() const;
-    size_t getFontCacheSize() const;
-    size_t getSoundCacheSize() const;
-
-    ResourceManager();
-    ~ResourceManager();
-    ResourceManager(const ResourceManager&) = delete;
-    ResourceManager& operator=(const ResourceManager&) = delete;
-
-    // 生成字体缓存key
-    std::string makeFontKey(const std::string& filepath, int fontSize, bool useSDF) const;
-    
-    // 互斥锁保护缓存
-    mutable std::mutex textureMutex_;
-    mutable std::mutex fontMutex_;
-    mutable std::mutex soundMutex_;
-    
-    // 搜索路径
-    std::vector<std::string> searchPaths_;
-    
-    // 资源缓存 - 使用弱指针实现自动清理
-    std::unordered_map<std::string, WeakPtr<Texture>> textureCache_;
-    std::unordered_map<std::string, WeakPtr<FontAtlas>> fontCache_;
-    std::unordered_map<std::string, WeakPtr<Sound>> soundCache_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/node.h b/Easy2D/include/easy2d/scene/node.h
deleted file mode 100644
index 1982399..0000000
--- a/Easy2D/include/easy2d/scene/node.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/event/event_dispatcher.h>
-#include <vector>
-#include <string>
-#include <functional>
-#include <algorithm>
-
-namespace easy2d {
-
-// 前向声明
-class Scene;
-class Action;
-class RenderBackend;
-struct RenderCommand;
-
-// ============================================================================
-// 节点基类 - 场景图的基础
-// ============================================================================
-class Node : public std::enable_shared_from_this<Node> {
-public:
-    Node();
-    virtual ~Node();
-
-    // ------------------------------------------------------------------------
-    // 层级管理
-    // ------------------------------------------------------------------------
-    void addChild(Ptr<Node> child);
-    void removeChild(Ptr<Node> child);
-    void removeChildByName(const std::string& name);
-    void removeFromParent();
-    void removeAllChildren();
-    
-    Ptr<Node> getParent() const { return parent_.lock(); }
-    const std::vector<Ptr<Node>>& getChildren() const { return children_; }
-    Ptr<Node> getChildByName(const std::string& name) const;
-    Ptr<Node> getChildByTag(int tag) const;
-
-    // ------------------------------------------------------------------------
-    // 变换属性
-    // ------------------------------------------------------------------------
-    void setPosition(const Vec2& pos);
-    void setPosition(float x, float y);
-    Vec2 getPosition() const { return position_; }
-
-    void setRotation(float degrees);
-    float getRotation() const { return rotation_; }
-
-    void setScale(const Vec2& scale);
-    void setScale(float scale);
-    void setScale(float x, float y);
-    Vec2 getScale() const { return scale_; }
-
-    void setAnchor(const Vec2& anchor);
-    void setAnchor(float x, float y);
-    Vec2 getAnchor() const { return anchor_; }
-
-    void setSkew(const Vec2& skew);
-    void setSkew(float x, float y);
-    Vec2 getSkew() const { return skew_; }
-
-    void setOpacity(float opacity);
-    float getOpacity() const { return opacity_; }
-
-    void setVisible(bool visible);
-    bool isVisible() const { return visible_; }
-
-    void setZOrder(int zOrder);
-    int getZOrder() const { return zOrder_; }
-
-    // ------------------------------------------------------------------------
-    // 世界变换
-    // ------------------------------------------------------------------------
-    Vec2 convertToWorldSpace(const Vec2& localPos) const;
-    Vec2 convertToNodeSpace(const Vec2& worldPos) const;
-    
-    glm::mat4 getLocalTransform() const;
-    glm::mat4 getWorldTransform() const;
-
-    // ------------------------------------------------------------------------
-    // 名称和标签
-    // ------------------------------------------------------------------------
-    void setName(const std::string& name) { name_ = name; }
-    const std::string& getName() const { return name_; }
-    
-    void setTag(int tag) { tag_ = tag; }
-    int getTag() const { return tag_; }
-
-    // ------------------------------------------------------------------------
-    // 生命周期回调
-    // ------------------------------------------------------------------------
-    virtual void onEnter();
-    virtual void onExit();
-    virtual void onUpdate(float dt);
-    virtual void onRender(RenderBackend& renderer);
-    virtual void onAttachToScene(Scene* scene);
-    virtual void onDetachFromScene();
-
-    // ------------------------------------------------------------------------
-    // 边界框（用于空间索引）
-    // ------------------------------------------------------------------------
-    virtual Rect getBoundingBox() const;
-    
-    // 是否需要参与空间索引（默认 true）
-    void setSpatialIndexed(bool indexed) { spatialIndexed_ = indexed; }
-    bool isSpatialIndexed() const { return spatialIndexed_; }
-    
-    // 更新空间索引（手动调用，通常在边界框变化后）
-    void updateSpatialIndex();
-
-    // ------------------------------------------------------------------------
-    // 动作系统
-    // ------------------------------------------------------------------------
-    void runAction(Ptr<Action> action);
-    void stopAllActions();
-    void stopAction(Ptr<Action> action);
-    void stopActionByTag(int tag);
-    Ptr<Action> getActionByTag(int tag) const;
-    size_t getActionCount() const { return actions_.size(); }
-
-    // ------------------------------------------------------------------------
-    // 事件系统
-    // ------------------------------------------------------------------------
-    EventDispatcher& getEventDispatcher() { return eventDispatcher_; }
-
-    // ------------------------------------------------------------------------
-    // 内部方法
-    // ------------------------------------------------------------------------
-    void update(float dt);
-    void render(RenderBackend& renderer);
-    void sortChildren();
-    
-    bool isRunning() const { return running_; }
-    Scene* getScene() const { return scene_; }
-
-    // 多线程渲染命令收集
-    virtual void collectRenderCommands(std::vector<RenderCommand>& commands, int parentZOrder = 0);
-
-protected:
-    // 子类重写
-    virtual void onDraw(RenderBackend& renderer) {}
-    virtual void onUpdateNode(float dt) {}
-    virtual void generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) {};
-
-    // 供子类访问的内部状态
-    Vec2& getPositionRef() { return position_; }
-    Vec2& getScaleRef() { return scale_; }
-    Vec2& getAnchorRef() { return anchor_; }
-    float getRotationRef() { return rotation_; }
-    float getOpacityRef() { return opacity_; }
-
-private:
-    // 层级
-    WeakPtr<Node> parent_;
-    std::vector<Ptr<Node>> children_;
-    bool childrenOrderDirty_ = false;
-
-    // 变换
-    Vec2 position_ = Vec2::Zero();
-    float rotation_ = 0.0f;
-    Vec2 scale_ = Vec2(1.0f, 1.0f);
-    Vec2 anchor_ = Vec2(0.5f, 0.5f);
-    Vec2 skew_ = Vec2::Zero();
-    float opacity_ = 1.0f;
-    bool visible_ = true;
-    int zOrder_ = 0;
-
-    // 缓存
-    mutable bool transformDirty_ = true;
-    mutable glm::mat4 localTransform_;
-    mutable glm::mat4 worldTransform_;
-
-    // 元数据
-    std::string name_;
-    int tag_ = -1;
-
-    // 状态
-    bool running_ = false;
-    Scene* scene_ = nullptr;
-    bool spatialIndexed_ = true;  // 是否参与空间索引
-    Rect lastSpatialBounds_;      // 上一次的空间索引边界（用于检测变化）
-
-    // 动作
-    std::vector<Ptr<Action>> actions_;
-
-    // 事件
-    EventDispatcher eventDispatcher_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/scene.h b/Easy2D/include/easy2d/scene/scene.h
deleted file mode 100644
index 3ec233d..0000000
--- a/Easy2D/include/easy2d/scene/scene.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/core/color.h>
-#include <easy2d/graphics/camera.h>
-#include <easy2d/spatial/spatial_manager.h>
-#include <vector>
-
-namespace easy2d {
-
-// 前向声明
-struct RenderCommand;
-
-// ============================================================================
-// 场景类 - 节点容器，管理整个场景图
-// ============================================================================
-class Scene : public Node {
-public:
-    Scene();
-    ~Scene() override = default;
-
-    // ------------------------------------------------------------------------
-    // 场景属性
-    // ------------------------------------------------------------------------
-    void setBackgroundColor(const Color& color) { backgroundColor_ = color; }
-    Color getBackgroundColor() const { return backgroundColor_; }
-    
-    // ------------------------------------------------------------------------
-    // 摄像机
-    // ------------------------------------------------------------------------
-    void setCamera(Ptr<Camera> camera);
-    Ptr<Camera> getCamera() const { return camera_; }
-    
-    Camera* getActiveCamera() const { 
-        return camera_ ? camera_.get() : defaultCamera_.get(); 
-    }
-
-    // ------------------------------------------------------------------------
-    // 视口和尺寸
-    // ------------------------------------------------------------------------
-    void setViewportSize(float width, float height);
-    void setViewportSize(const Size& size);
-    Size getViewportSize() const { return viewportSize_; }
-    
-    float getWidth() const { return viewportSize_.width; }
-    float getHeight() const { return viewportSize_.height; }
-
-    // ------------------------------------------------------------------------
-    // 场景状态
-    // ------------------------------------------------------------------------
-    bool isPaused() const { return paused_; }
-    void pause() { paused_ = true; }
-    void resume() { paused_ = false; }
-
-    // ------------------------------------------------------------------------
-    // 渲染和更新
-    // ------------------------------------------------------------------------
-    void renderScene(RenderBackend& renderer);
-    void renderContent(RenderBackend& renderer);
-    void updateScene(float dt);
-    void collectRenderCommands(std::vector<RenderCommand>& commands);
-
-    // ------------------------------------------------------------------------
-    // 空间索引系统
-    // ------------------------------------------------------------------------
-    SpatialManager& getSpatialManager() { return spatialManager_; }
-    const SpatialManager& getSpatialManager() const { return spatialManager_; }
-    
-    // 启用/禁用空间索引
-    void setSpatialIndexingEnabled(bool enabled) { spatialIndexingEnabled_ = enabled; }
-    bool isSpatialIndexingEnabled() const { return spatialIndexingEnabled_; }
-    
-    // 节点空间索引管理（内部使用）
-    void updateNodeInSpatialIndex(Node* node, const Rect& oldBounds, const Rect& newBounds);
-    void removeNodeFromSpatialIndex(Node* node);
-    
-    // 碰撞检测查询
-    std::vector<Node*> queryNodesInArea(const Rect& area) const;
-    std::vector<Node*> queryNodesAtPoint(const Vec2& point) const;
-    std::vector<std::pair<Node*, Node*>> queryCollisions() const;
-
-    // ------------------------------------------------------------------------
-    // 静态创建方法
-    // ------------------------------------------------------------------------
-    static Ptr<Scene> create();
-
-protected:
-    void onEnter() override;
-    void onExit() override;
-
-    friend class SceneManager;
-
-private:
-    Color backgroundColor_ = Colors::Black;
-    Size viewportSize_ = Size::Zero();
-    
-    Ptr<Camera> camera_;
-    Ptr<Camera> defaultCamera_;
-    
-    bool paused_ = false;
-    
-    // 空间索引系统
-    SpatialManager spatialManager_;
-    bool spatialIndexingEnabled_ = true;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/scene_manager.h b/Easy2D/include/easy2d/scene/scene_manager.h
deleted file mode 100644
index 29b3b41..0000000
--- a/Easy2D/include/easy2d/scene/scene_manager.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/scene/scene.h>
-#include <string>
-#include <unordered_map>
-#include <functional>
-#include <stack>
-#include <vector>
-
-namespace easy2d {
-
-// 前向声明
-struct RenderCommand;
-class Transition;
-
-// ============================================================================
-// 场景切换特效类型
-// ============================================================================
-enum class TransitionType {
-    None,
-    Fade,
-    SlideLeft,
-    SlideRight,
-    SlideUp,
-    SlideDown,
-    Scale,
-    Flip
-};
-
-// ============================================================================
-// 场景管理器 - 管理场景的生命周期和切换
-// ============================================================================
-class SceneManager {
-public:
-    using TransitionCallback = std::function<void()>;
-
-    // ------------------------------------------------------------------------
-    // 单例访问
-    // ------------------------------------------------------------------------
-    static SceneManager& getInstance();
-
-    // ------------------------------------------------------------------------
-    // 场景栈操作
-    // ------------------------------------------------------------------------
-    
-    // 运行第一个场景
-    void runWithScene(Ptr<Scene> scene);
-    
-    // 替换当前场景
-    void replaceScene(Ptr<Scene> scene);
-    void replaceScene(Ptr<Scene> scene, TransitionType transition, float duration = 0.5f);
-    
-    // 压入新场景（当前场景暂停）
-    void pushScene(Ptr<Scene> scene);
-    void pushScene(Ptr<Scene> scene, TransitionType transition, float duration = 0.5f);
-    
-    // 弹出当前场景（恢复上一个场景）
-    void popScene();
-    void popScene(TransitionType transition, float duration = 0.5f);
-    
-    // 弹出到根场景
-    void popToRootScene();
-    void popToRootScene(TransitionType transition, float duration = 0.5f);
-    
-    // 弹出到指定场景
-    void popToScene(const std::string& name);
-    void popToScene(const std::string& name, TransitionType transition, float duration = 0.5f);
-
-    // ------------------------------------------------------------------------
-    // 获取场景
-    // ------------------------------------------------------------------------
-    Ptr<Scene> getCurrentScene() const;
-    Ptr<Scene> getPreviousScene() const;
-    Ptr<Scene> getRootScene() const;
-    
-    // 通过名称获取场景
-    Ptr<Scene> getSceneByName(const std::string& name) const;
-
-    // ------------------------------------------------------------------------
-    // 查询
-    // ------------------------------------------------------------------------
-    size_t getSceneCount() const { return sceneStack_.size(); }
-    bool isEmpty() const { return sceneStack_.empty(); }
-    bool hasScene(const std::string& name) const;
-
-    // ------------------------------------------------------------------------
-    // 更新和渲染
-    // ------------------------------------------------------------------------
-    void update(float dt);
-    void render(RenderBackend& renderer);
-    void collectRenderCommands(std::vector<RenderCommand>& commands);
-
-    // ------------------------------------------------------------------------
-    // 过渡控制
-    // ------------------------------------------------------------------------
-    bool isTransitioning() const { return isTransitioning_; }
-    void setTransitionCallback(TransitionCallback callback) { transitionCallback_ = callback; }
-
-    // ------------------------------------------------------------------------
-    // 清理
-    // ------------------------------------------------------------------------
-    void end();
-    void purgeCachedScenes();
-
-public:
-    SceneManager() = default;
-    ~SceneManager() = default;
-    SceneManager(const SceneManager&) = delete;
-    SceneManager& operator=(const SceneManager&) = delete;
-
-    // 场景切换（供 Application 使用）
-    void enterScene(Ptr<Scene> scene);
-    void enterScene(Ptr<Scene> scene, Ptr<class Transition> transition);
-
-private:
-    void doSceneSwitch();
-    void startTransition(Ptr<Scene> from, Ptr<Scene> to, TransitionType type, float duration, Function<void()> stackAction);
-    void updateTransition(float dt);
-    void finishTransition();
-    void dispatchPointerEvents(Scene& scene);
-
-    std::stack<Ptr<Scene>> sceneStack_;
-    std::unordered_map<std::string, Ptr<Scene>> namedScenes_;
-    
-    // Transition state
-    bool isTransitioning_ = false;
-    TransitionType currentTransition_ = TransitionType::None;
-    float transitionDuration_ = 0.0f;
-    float transitionElapsed_ = 0.0f;
-    Ptr<Scene> outgoingScene_;
-    Ptr<Scene> incomingScene_;
-    Ptr<Transition> activeTransition_;
-    Function<void()> transitionStackAction_;
-    TransitionCallback transitionCallback_;
-    
-    // Next scene to switch to (queued during transition)
-    Ptr<Scene> nextScene_;
-    bool sendCleanupToScene_ = false;
-
-    Node* hoverTarget_ = nullptr;
-    Node* captureTarget_ = nullptr;
-    Vec2 lastPointerWorld_ = Vec2::Zero();
-    bool hasLastPointerWorld_ = false;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/shape_node.h b/Easy2D/include/easy2d/scene/shape_node.h
deleted file mode 100644
index 8159dbf..0000000
--- a/Easy2D/include/easy2d/scene/shape_node.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/math_types.h>
-#include <vector>
-
-namespace easy2d {
-
-// ============================================================================
-// 形状类型
-// ============================================================================
-enum class ShapeType {
-    Point,
-    Line,
-    Rect,
-    Circle,
-    Triangle,
-    Polygon
-};
-
-// ============================================================================
-// 形状节点 - 用于绘制几何形状
-// ============================================================================
-class ShapeNode : public Node {
-public:
-    ShapeNode();
-    ~ShapeNode() override = default;
-
-    // ------------------------------------------------------------------------
-    // 静态创建方法
-    // ------------------------------------------------------------------------
-    static Ptr<ShapeNode> create();
-    
-    // 点
-    static Ptr<ShapeNode> createPoint(const Vec2& pos, const Color& color);
-    
-    // 线
-    static Ptr<ShapeNode> createLine(const Vec2& start, const Vec2& end, 
-                                     const Color& color, float width = 1.0f);
-    
-    // 矩形
-    static Ptr<ShapeNode> createRect(const Rect& rect, const Color& color, 
-                                     float width = 1.0f);
-    static Ptr<ShapeNode> createFilledRect(const Rect& rect, const Color& color);
-    
-    // 圆形
-    static Ptr<ShapeNode> createCircle(const Vec2& center, float radius, 
-                                       const Color& color, int segments = 32, 
-                                       float width = 1.0f);
-    static Ptr<ShapeNode> createFilledCircle(const Vec2& center, float radius, 
-                                             const Color& color, int segments = 32);
-    
-    // 三角形
-    static Ptr<ShapeNode> createTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3,
-                                         const Color& color, float width = 1.0f);
-    static Ptr<ShapeNode> createFilledTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3,
-                                               const Color& color);
-    
-    // 多边形
-    static Ptr<ShapeNode> createPolygon(const std::vector<Vec2>& points,
-                                        const Color& color, float width = 1.0f);
-    static Ptr<ShapeNode> createFilledPolygon(const std::vector<Vec2>& points,
-                                              const Color& color);
-
-    // ------------------------------------------------------------------------
-    // 属性设置
-    // ------------------------------------------------------------------------
-    void setShapeType(ShapeType type) { shapeType_ = type; }
-    ShapeType getShapeType() const { return shapeType_; }
-    
-    void setColor(const Color& color) { color_ = color; }
-    Color getColor() const { return color_; }
-    
-    void setFilled(bool filled) { filled_ = filled; }
-    bool isFilled() const { return filled_; }
-    
-    void setLineWidth(float width) { lineWidth_ = width; }
-    float getLineWidth() const { return lineWidth_; }
-    
-    void setSegments(int segments) { segments_ = segments; }
-    int getSegments() const { return segments_; }
-
-    // ------------------------------------------------------------------------
-    // 点设置
-    // ------------------------------------------------------------------------
-    void setPoints(const std::vector<Vec2>& points);
-    const std::vector<Vec2>& getPoints() const { return points_; }
-    void addPoint(const Vec2& point);
-    void clearPoints();
-
-    Rect getBoundingBox() const override;
-
-protected:
-    void onDraw(RenderBackend& renderer) override;
-    void generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) override;
-
-private:
-    ShapeType shapeType_ = ShapeType::Rect;
-    Color color_ = Colors::White;
-    bool filled_ = false;
-    float lineWidth_ = 1.0f;
-    int segments_ = 32;
-    std::vector<Vec2> points_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/sprite.h b/Easy2D/include/easy2d/scene/sprite.h
deleted file mode 100644
index b8bd22d..0000000
--- a/Easy2D/include/easy2d/scene/sprite.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/graphics/texture.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 精灵节点
-// ============================================================================
-class Sprite : public Node {
-public:
-    Sprite();
-    explicit Sprite(Ptr<Texture> texture);
-    ~Sprite() override = default;
-
-    // 纹理
-    void setTexture(Ptr<Texture> texture);
-    Ptr<Texture> getTexture() const { return texture_; }
-
-    // 纹理矩形 (用于图集)
-    void setTextureRect(const Rect& rect);
-    Rect getTextureRect() const { return textureRect_; }
-
-    // 颜色混合
-    void setColor(const Color& color);
-    Color getColor() const { return color_; }
-
-    // 翻转
-    void setFlipX(bool flip);
-    void setFlipY(bool flip);
-    bool isFlipX() const { return flipX_; }
-    bool isFlipY() const { return flipY_; }
-
-    // 静态创建方法
-    static Ptr<Sprite> create();
-    static Ptr<Sprite> create(Ptr<Texture> texture);
-    static Ptr<Sprite> create(Ptr<Texture> texture, const Rect& rect);
-
-    Rect getBoundingBox() const override;
-
-protected:
-    void onDraw(RenderBackend& renderer) override;
-    void generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) override;
-
-private:
-    Ptr<Texture> texture_;
-    Rect textureRect_;
-    Color color_ = Colors::White;
-    bool flipX_ = false;
-    bool flipY_ = false;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/text.h b/Easy2D/include/easy2d/scene/text.h
deleted file mode 100644
index cecbf60..0000000
--- a/Easy2D/include/easy2d/scene/text.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/string.h>
-#include <easy2d/graphics/font.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 文字节点
-// ============================================================================
-class Text : public Node {
-public:
-    Text();
-    explicit Text(const String& text);
-    ~Text() override = default;
-
-    // ------------------------------------------------------------------------
-    // 文字内容
-    // ------------------------------------------------------------------------
-    void setText(const String& text);
-    const String& getText() const { return text_; }
-
-    // ------------------------------------------------------------------------
-    // 字体
-    // ------------------------------------------------------------------------
-    void setFont(Ptr<FontAtlas> font);
-    Ptr<FontAtlas> getFont() const { return font_; }
-
-    // ------------------------------------------------------------------------
-    // 文字属性
-    // ------------------------------------------------------------------------
-    void setTextColor(const Color& color);
-    Color getTextColor() const { return color_; }
-
-    void setFontSize(int size);
-    int getFontSize() const { return fontSize_; }
-
-    // ------------------------------------------------------------------------
-    // 对齐方式
-    // ------------------------------------------------------------------------
-    enum class Alignment {
-        Left,
-        Center,
-        Right
-    };
-    
-    void setAlignment(Alignment align);
-    Alignment getAlignment() const { return alignment_; }
-
-    // ------------------------------------------------------------------------
-    // 尺寸计算
-    // ------------------------------------------------------------------------
-    Vec2 getTextSize() const;
-    float getLineHeight() const;
-
-    // ------------------------------------------------------------------------
-    // 静态创建方法
-    // ------------------------------------------------------------------------
-    static Ptr<Text> create();
-    static Ptr<Text> create(const String& text);
-    static Ptr<Text> create(const String& text, Ptr<FontAtlas> font);
-
-    Rect getBoundingBox() const override;
-
-protected:
-    void onDraw(RenderBackend& renderer) override;
-    void generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) override;
-
-private:
-    String text_;
-    Ptr<FontAtlas> font_;
-    Color color_ = Colors::White;
-    int fontSize_ = 16;
-    Alignment alignment_ = Alignment::Left;
-    
-    mutable Vec2 cachedSize_ = Vec2::Zero();
-    mutable bool sizeDirty_ = true;
-    
-    void updateCache() const;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/scene/transition.h b/Easy2D/include/easy2d/scene/transition.h
deleted file mode 100644
index 2352955..0000000
--- a/Easy2D/include/easy2d/scene/transition.h
+++ /dev/null
@@ -1,140 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/scene/scene.h>
-#include <functional>
-
-namespace easy2d {
-
-// ============================================================================
-// 过渡方向
-// ============================================================================
-enum class TransitionDirection {
-    Left,
-    Right,
-    Up,
-    Down
-};
-
-// ============================================================================
-// 过渡效果基类
-// ============================================================================
-class Transition : public std::enable_shared_from_this<Transition> {
-public:
-    using FinishCallback = std::function<void()>;
-
-    Transition(float duration);
-    virtual ~Transition() = default;
-
-    // 开始过渡
-    void start(Ptr<Scene> from, Ptr<Scene> to);
-    
-    // 更新过渡进度
-    void update(float dt);
-    
-    // 渲染过渡效果
-    virtual void render(RenderBackend& renderer);
-
-    // 是否完成
-    bool isFinished() const { return isFinished_; }
-    
-    // 获取进度 [0, 1]
-    float getProgress() const { return progress_; }
-    
-    // 获取淡入淡出进度 (0->1 for fade in, 1->0 for fade out)
-    float getFadeInAlpha() const;
-    float getFadeOutAlpha() const;
-
-    // 设置完成回调
-    void setFinishCallback(FinishCallback callback) { finishCallback_ = callback; }
-
-    // 获取源场景和目标场景
-    Ptr<Scene> getOutgoingScene() const { return outgoingScene_; }
-    Ptr<Scene> getIncomingScene() const { return incomingScene_; }
-
-protected:
-    // 子类实现具体的渲染效果
-    virtual void onRenderTransition(RenderBackend& renderer, float progress) = 0;
-    
-    // 过渡完成时调用
-    virtual void onFinish();
-
-    float duration_;
-    float elapsed_;
-    float progress_;
-    bool isFinished_;
-    bool isStarted_;
-    
-    Ptr<Scene> outgoingScene_;
-    Ptr<Scene> incomingScene_;
-    FinishCallback finishCallback_;
-};
-
-// ============================================================================
-// 淡入淡出过渡
-// ============================================================================
-class FadeTransition : public Transition {
-public:
-    FadeTransition(float duration);
-    
-protected:
-    void onRenderTransition(RenderBackend& renderer, float progress) override;
-};
-
-// ============================================================================
-// 滑动过渡
-// ============================================================================
-class SlideTransition : public Transition {
-public:
-    SlideTransition(float duration, TransitionDirection direction);
-    
-protected:
-    void onRenderTransition(RenderBackend& renderer, float progress) override;
-
-private:
-    TransitionDirection direction_;
-};
-
-// ============================================================================
-// 缩放过渡
-// ============================================================================
-class ScaleTransition : public Transition {
-public:
-    ScaleTransition(float duration);
-    
-protected:
-    void onRenderTransition(RenderBackend& renderer, float progress) override;
-};
-
-// ============================================================================
-// 翻页过渡
-// ============================================================================
-class FlipTransition : public Transition {
-public:
-    enum class Axis { Horizontal, Vertical };
-    
-    FlipTransition(float duration, Axis axis = Axis::Horizontal);
-    
-protected:
-    void onRenderTransition(RenderBackend& renderer, float progress) override;
-
-private:
-    Axis axis_;
-};
-
-// ============================================================================
-// 马赛克/方块过渡
-// ============================================================================
-class BoxTransition : public Transition {
-public:
-    BoxTransition(float duration, int divisions = 8);
-    
-protected:
-    void onRenderTransition(RenderBackend& renderer, float progress) override;
-
-private:
-    int divisions_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/script/script_engine.h b/Easy2D/include/easy2d/script/script_engine.h
deleted file mode 100644
index 55ff2de..0000000
--- a/Easy2D/include/easy2d/script/script_engine.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <string>
-#include <squirrel.h>
-
-namespace easy2d {
-
-class ScriptEngine {
-public:
-    static ScriptEngine& getInstance();
-
-    ScriptEngine(const ScriptEngine&) = delete;
-    ScriptEngine& operator=(const ScriptEngine&) = delete;
-
-    bool initialize();
-    void shutdown();
-
-    bool executeString(const std::string& code);
-    bool executeFile(const std::string& filepath);
-
-    HSQUIRRELVM getVM() const { return vm_; }
-    bool isInitialized() const { return vm_ != nullptr; }
-
-private:
-    ScriptEngine() = default;
-    ~ScriptEngine();
-
-    bool compileAndRun(const std::string& source, const std::string& sourceName);
-
-    static void printFunc(HSQUIRRELVM vm, const SQChar* fmt, ...);
-    static void errorFunc(HSQUIRRELVM vm, const SQChar* fmt, ...);
-    static SQInteger errorHandler(HSQUIRRELVM vm);
-    static void compilerError(HSQUIRRELVM vm, const SQChar* desc,
-                              const SQChar* source, SQInteger line, SQInteger column);
-
-    HSQUIRRELVM vm_ = nullptr;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/script/script_node.h b/Easy2D/include/easy2d/script/script_node.h
deleted file mode 100644
index fe94c75..0000000
--- a/Easy2D/include/easy2d/script/script_node.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-#include <easy2d/script/script_engine.h>
-#include <string>
-
-namespace easy2d {
-
-class ScriptNode : public Node {
-public:
-    ScriptNode();
-    ~ScriptNode() override;
-
-    static Ptr<ScriptNode> create(const std::string& scriptPath);
-
-    bool loadScript(const std::string& scriptPath);
-    const std::string& getScriptPath() const { return scriptPath_; }
-
-    void onEnter() override;
-    void onExit() override;
-    void onUpdate(float dt) override;
-
-private:
-    bool callMethod(const char* name);
-    bool callMethodWithFloat(const char* name, float arg);
-    void pushSelf();
-
-    std::string scriptPath_;
-    HSQOBJECT scriptTable_;
-    bool tableValid_ = false;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/script/sq_binding.h b/Easy2D/include/easy2d/script/sq_binding.h
deleted file mode 100644
index db12b04..0000000
--- a/Easy2D/include/easy2d/script/sq_binding.h
+++ /dev/null
@@ -1,252 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <squirrel.h>
-#include <string>
-
-namespace easy2d {
-namespace sq {
-
-// ============================================================================
-// Type tag helpers — unique address per type
-// ============================================================================
-template<typename T>
-inline SQUserPointer typeTag() {
-    static int tag;
-    return &tag;
-}
-
-// ============================================================================
-// SqClassName trait — maps C++ types to Squirrel class names
-// ============================================================================
-template<typename T>
-struct SqClassName {
-    static const char* name();
-};
-
-// ============================================================================
-// push / get primitives
-// ============================================================================
-inline void push(HSQUIRRELVM vm, int v) { sq_pushinteger(vm, static_cast<SQInteger>(v)); }
-inline void push(HSQUIRRELVM vm, float v) { sq_pushfloat(vm, static_cast<SQFloat>(v)); }
-inline void push(HSQUIRRELVM vm, double v) { sq_pushfloat(vm, static_cast<SQFloat>(v)); }
-inline void push(HSQUIRRELVM vm, bool v) { sq_pushbool(vm, v ? SQTrue : SQFalse); }
-inline void push(HSQUIRRELVM vm, const char* v) { sq_pushstring(vm, v, -1); }
-inline void push(HSQUIRRELVM vm, const std::string& v) { sq_pushstring(vm, v.c_str(), static_cast<SQInteger>(v.size())); }
-inline void pushNull(HSQUIRRELVM vm) { sq_pushnull(vm); }
-
-inline SQInteger getInt(HSQUIRRELVM vm, SQInteger idx) {
-    SQInteger val = 0;
-    sq_getinteger(vm, idx, &val);
-    return val;
-}
-
-inline SQFloat getFloat(HSQUIRRELVM vm, SQInteger idx) {
-    SQFloat val = 0;
-    if (SQ_FAILED(sq_getfloat(vm, idx, &val))) {
-        SQInteger ival = 0;
-        if (SQ_SUCCEEDED(sq_getinteger(vm, idx, &ival)))
-            val = static_cast<SQFloat>(ival);
-    }
-    return val;
-}
-
-inline bool getBool(HSQUIRRELVM vm, SQInteger idx) {
-    SQBool val = SQFalse;
-    sq_getbool(vm, idx, &val);
-    return val != SQFalse;
-}
-
-inline std::string getString(HSQUIRRELVM vm, SQInteger idx) {
-    const SQChar* str = nullptr;
-    sq_getstring(vm, idx, &str);
-    return str ? std::string(str) : std::string();
-}
-
-// ============================================================================
-// Value type userdata helpers
-// ============================================================================
-template<typename T>
-T* pushValueInstance(HSQUIRRELVM vm, const T& val) {
-    sq_pushroottable(vm);
-    sq_pushstring(vm, SqClassName<T>::name(), -1);
-    if (SQ_FAILED(sq_get(vm, -2))) {
-        sq_pop(vm, 1);
-        return nullptr;
-    }
-    if (SQ_FAILED(sq_createinstance(vm, -1))) {
-        sq_pop(vm, 2);
-        return nullptr;
-    }
-
-    T* ud = nullptr;
-    sq_getinstanceup(vm, -1, reinterpret_cast<SQUserPointer*>(&ud), nullptr, SQFalse);
-    if (ud) *ud = val;
-
-    sq_remove(vm, -2); // class
-    sq_remove(vm, -2); // roottable
-    return ud;
-}
-
-template<typename T>
-T* getValueInstance(HSQUIRRELVM vm, SQInteger idx) {
-    T* ud = nullptr;
-    sq_getinstanceup(vm, idx, reinterpret_cast<SQUserPointer*>(&ud), typeTag<T>(), SQFalse);
-    return ud;
-}
-
-// ============================================================================
-// Shared pointer bridge for reference types
-// ============================================================================
-template<typename T>
-void pushPtr(HSQUIRRELVM vm, Ptr<T> ptr) {
-    if (!ptr) { sq_pushnull(vm); return; }
-
-    sq_pushroottable(vm);
-    sq_pushstring(vm, SqClassName<T>::name(), -1);
-    if (SQ_FAILED(sq_get(vm, -2))) {
-        sq_pop(vm, 1);
-        sq_pushnull(vm);
-        return;
-    }
-    if (SQ_FAILED(sq_createinstance(vm, -1))) {
-        sq_pop(vm, 2);
-        sq_pushnull(vm);
-        return;
-    }
-
-    auto* storage = new Ptr<T>(std::move(ptr));
-    sq_setinstanceup(vm, -1, storage);
-    sq_setreleasehook(vm, -1, [](SQUserPointer p, SQInteger) -> SQInteger {
-        delete static_cast<Ptr<T>*>(p);
-        return 0;
-    });
-
-    sq_remove(vm, -2); // class
-    sq_remove(vm, -2); // roottable
-}
-
-template<typename T>
-Ptr<T> getPtr(HSQUIRRELVM vm, SQInteger idx) {
-    SQUserPointer up = nullptr;
-    sq_getinstanceup(vm, idx, &up, typeTag<T>(), SQFalse);
-    if (!up) return nullptr;
-    return *static_cast<Ptr<T>*>(up);
-}
-
-template<typename T>
-T* getRawPtr(HSQUIRRELVM vm, SQInteger idx) {
-    auto p = getPtr<T>(vm, idx);
-    return p ? p.get() : nullptr;
-}
-
-// ============================================================================
-// Singleton pointer (no release hook)
-// ============================================================================
-template<typename T>
-void pushSingleton(HSQUIRRELVM vm, T* ptr, const char* className) {
-    sq_pushroottable(vm);
-    sq_pushstring(vm, className, -1);
-    if (SQ_FAILED(sq_get(vm, -2))) {
-        sq_pop(vm, 1);
-        sq_pushnull(vm);
-        return;
-    }
-    if (SQ_FAILED(sq_createinstance(vm, -1))) {
-        sq_pop(vm, 2);
-        sq_pushnull(vm);
-        return;
-    }
-    sq_setinstanceup(vm, -1, ptr);
-    sq_remove(vm, -2); // class
-    sq_remove(vm, -2); // roottable
-}
-
-template<typename T>
-T* getSingleton(HSQUIRRELVM vm, SQInteger idx) {
-    SQUserPointer up = nullptr;
-    sq_getinstanceup(vm, idx, &up, nullptr, SQFalse);
-    return static_cast<T*>(up);
-}
-
-// ============================================================================
-// ClassDef — fluent API for registering a class
-// ============================================================================
-struct ClassDef {
-    HSQUIRRELVM vm;
-
-    ClassDef(HSQUIRRELVM v, const char* name, const char* base = nullptr)
-        : vm(v) {
-        sq_pushroottable(vm);
-        sq_pushstring(vm, name, -1);
-
-        if (base) {
-            sq_pushstring(vm, base, -1);
-            if (SQ_FAILED(sq_get(vm, -3))) {
-                sq_newclass(vm, SQFalse);
-            } else {
-                sq_newclass(vm, SQTrue);
-            }
-        } else {
-            sq_newclass(vm, SQFalse);
-        }
-    }
-
-    ClassDef& setTypeTag(SQUserPointer tag) {
-        sq_settypetag(vm, -1, tag);
-        return *this;
-    }
-
-    ClassDef& method(const char* name, SQFUNCTION fn, SQInteger nparams = 0, const char* typemask = nullptr) {
-        sq_pushstring(vm, name, -1);
-        sq_newclosure(vm, fn, 0);
-        if (nparams > 0 && typemask)
-            sq_setparamscheck(vm, nparams, typemask);
-        sq_newslot(vm, -3, SQFalse);
-        return *this;
-    }
-
-    ClassDef& staticMethod(const char* name, SQFUNCTION fn, SQInteger nparams = 0, const char* typemask = nullptr) {
-        sq_pushstring(vm, name, -1);
-        sq_newclosure(vm, fn, 0);
-        if (nparams > 0 && typemask)
-            sq_setparamscheck(vm, nparams, typemask);
-        sq_newslot(vm, -3, SQTrue);
-        return *this;
-    }
-
-    template<typename T>
-    ClassDef& setValueType(SQFUNCTION constructor) {
-        sq_settypetag(vm, -1, typeTag<T>());
-        sq_setclassudsize(vm, -1, sizeof(T));
-        sq_pushstring(vm, "constructor", -1);
-        sq_newclosure(vm, constructor, 0);
-        sq_newslot(vm, -3, SQFalse);
-        return *this;
-    }
-
-    void commit() {
-        sq_newslot(vm, -3, SQFalse);
-        sq_pop(vm, 1);
-    }
-};
-
-// ============================================================================
-// Register a table of integer constants
-// ============================================================================
-inline void registerConstTable(HSQUIRRELVM vm, const char* tableName,
-                               const char* const* names, const SQInteger* values, int count) {
-    sq_pushroottable(vm);
-    sq_pushstring(vm, tableName, -1);
-    sq_newtable(vm);
-    for (int i = 0; i < count; ++i) {
-        sq_pushstring(vm, names[i], -1);
-        sq_pushinteger(vm, values[i]);
-        sq_newslot(vm, -3, SQFalse);
-    }
-    sq_newslot(vm, -3, SQFalse);
-    sq_pop(vm, 1);
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/script/sq_binding_types.h b/Easy2D/include/easy2d/script/sq_binding_types.h
deleted file mode 100644
index 0dd3b47..0000000
--- a/Easy2D/include/easy2d/script/sq_binding_types.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <easy2d/script/sq_binding.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/color.h>
-
-namespace easy2d {
-namespace sq {
-
-// SqClassName specializations for value types
-template<> struct SqClassName<Vec2>  { static const char* name() { return "Vec2"; } };
-template<> struct SqClassName<Size>  { static const char* name() { return "Size"; } };
-template<> struct SqClassName<Rect>  { static const char* name() { return "Rect"; } };
-template<> struct SqClassName<Color> { static const char* name() { return "Color"; } };
-
-void registerVec2(HSQUIRRELVM vm);
-void registerSize(HSQUIRRELVM vm);
-void registerRect(HSQUIRRELVM vm);
-void registerColor(HSQUIRRELVM vm);
-void registerValueTypes(HSQUIRRELVM vm);
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/spatial/quadtree.h b/Easy2D/include/easy2d/spatial/quadtree.h
deleted file mode 100644
index 4d93a44..0000000
--- a/Easy2D/include/easy2d/spatial/quadtree.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <easy2d/spatial/spatial_index.h>
-#include <array>
-
-namespace easy2d {
-
-class QuadTree : public ISpatialIndex {
-public:
-    static constexpr int MAX_OBJECTS = 10;
-    static constexpr int MAX_LEVELS = 5;
-
-    struct QuadTreeNode {
-        Rect bounds;
-        int level;
-        std::vector<std::pair<Node*, Rect>> objects;
-        std::array<std::unique_ptr<QuadTreeNode>, 4> children;
-
-        QuadTreeNode(const Rect& bounds, int level);
-        bool contains(const Rect& rect) const;
-        bool intersects(const Rect& rect) const;
-    };
-
-    explicit QuadTree(const Rect& worldBounds);
-    ~QuadTree() override = default;
-
-    void insert(Node* node, const Rect& bounds) override;
-    void remove(Node* node) override;
-    void update(Node* node, const Rect& newBounds) override;
-
-    std::vector<Node*> query(const Rect& area) const override;
-    std::vector<Node*> query(const Vec2& point) const override;
-    std::vector<std::pair<Node*, Node*>> queryCollisions() const override;
-
-    void clear() override;
-    size_t size() const override;
-    bool empty() const override;
-
-    void rebuild() override;
-
-private:
-    void split(QuadTreeNode* node);
-    void insertIntoNode(QuadTreeNode* node, Node* object, const Rect& bounds);
-    void queryNode(const QuadTreeNode* node, const Rect& area, std::vector<Node*>& results) const;
-    void queryNode(const QuadTreeNode* node, const Vec2& point, std::vector<Node*>& results) const;
-    void collectCollisions(const QuadTreeNode* node, std::vector<std::pair<Node*, Node*>>& collisions) const;
-    bool removeFromNode(QuadTreeNode* node, Node* object);
-
-    std::unique_ptr<QuadTreeNode> root_;
-    Rect worldBounds_;
-    size_t objectCount_ = 0;
-};
-
-}
diff --git a/Easy2D/include/easy2d/spatial/spatial_hash.h b/Easy2D/include/easy2d/spatial/spatial_hash.h
deleted file mode 100644
index 667756a..0000000
--- a/Easy2D/include/easy2d/spatial/spatial_hash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <easy2d/spatial/spatial_index.h>
-#include <unordered_map>
-#include <unordered_set>
-
-namespace easy2d {
-
-class SpatialHash : public ISpatialIndex {
-public:
-    using CellKey = std::pair<int64_t, int64_t>;
-    
-    struct CellKeyHash {
-        size_t operator()(const CellKey& key) const {
-            return std::hash<int64_t>()(key.first) ^ (std::hash<int64_t>()(key.second) << 1);
-        }
-    };
-
-    explicit SpatialHash(float cellSize = 64.0f);
-    ~SpatialHash() override = default;
-
-    void insert(Node* node, const Rect& bounds) override;
-    void remove(Node* node) override;
-    void update(Node* node, const Rect& newBounds) override;
-
-    std::vector<Node*> query(const Rect& area) const override;
-    std::vector<Node*> query(const Vec2& point) const override;
-    std::vector<std::pair<Node*, Node*>> queryCollisions() const override;
-
-    void clear() override;
-    size_t size() const override;
-    bool empty() const override;
-
-    void rebuild() override;
-
-    void setCellSize(float cellSize);
-    float getCellSize() const { return cellSize_; }
-
-private:
-    CellKey getCellKey(float x, float y) const;
-    void getCellsForRect(const Rect& rect, std::vector<CellKey>& cells) const;
-    void insertIntoCells(Node* node, const Rect& bounds);
-    void removeFromCells(Node* node, const Rect& bounds);
-
-    float cellSize_;
-    std::unordered_map<CellKey, std::unordered_set<Node*>, CellKeyHash> grid_;
-    std::unordered_map<Node*, Rect> objectBounds_;
-    size_t objectCount_ = 0;
-};
-
-}
diff --git a/Easy2D/include/easy2d/spatial/spatial_index.h b/Easy2D/include/easy2d/spatial/spatial_index.h
deleted file mode 100644
index b78e32d..0000000
--- a/Easy2D/include/easy2d/spatial/spatial_index.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <vector>
-#include <memory>
-
-namespace easy2d {
-
-class Node;
-
-enum class SpatialStrategy {
-    Auto,
-    QuadTree,
-    SpatialHash
-};
-
-struct SpatialQueryResult {
-    Node* node;
-    Rect bounds;
-};
-
-class ISpatialIndex {
-public:
-    virtual ~ISpatialIndex() = default;
-
-    virtual void insert(Node* node, const Rect& bounds) = 0;
-    virtual void remove(Node* node) = 0;
-    virtual void update(Node* node, const Rect& newBounds) = 0;
-
-    virtual std::vector<Node*> query(const Rect& area) const = 0;
-    virtual std::vector<Node*> query(const Vec2& point) const = 0;
-    virtual std::vector<std::pair<Node*, Node*>> queryCollisions() const = 0;
-
-    virtual void clear() = 0;
-    virtual size_t size() const = 0;
-    virtual bool empty() const = 0;
-
-    virtual void rebuild() = 0;
-};
-
-using SpatialIndexPtr = std::unique_ptr<ISpatialIndex>;
-
-}
diff --git a/Easy2D/include/easy2d/spatial/spatial_manager.h b/Easy2D/include/easy2d/spatial/spatial_manager.h
deleted file mode 100644
index 95589f3..0000000
--- a/Easy2D/include/easy2d/spatial/spatial_manager.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-
-#include <easy2d/spatial/spatial_index.h>
-#include <memory>
-#include <functional>
-
-namespace easy2d {
-
-class SpatialManager {
-public:
-    using QueryCallback = std::function<bool(Node*)>;
-
-    SpatialManager();
-    explicit SpatialManager(const Rect& worldBounds);
-    ~SpatialManager() = default;
-
-    void setStrategy(SpatialStrategy strategy);
-    void setAutoThresholds(size_t quadTreeThreshold, size_t hashThreshold);
-    
-    void setWorldBounds(const Rect& bounds);
-    Rect getWorldBounds() const { return worldBounds_; }
-
-    void insert(Node* node, const Rect& bounds);
-    void remove(Node* node);
-    void update(Node* node, const Rect& newBounds);
-
-    std::vector<Node*> query(const Rect& area) const;
-    std::vector<Node*> query(const Vec2& point) const;
-    std::vector<std::pair<Node*, Node*>> queryCollisions() const;
-
-    void query(const Rect& area, const QueryCallback& callback) const;
-    void query(const Vec2& point, const QueryCallback& callback) const;
-
-    void clear();
-    size_t size() const;
-    bool empty() const;
-
-    void rebuild();
-    void optimize();
-
-    SpatialStrategy getCurrentStrategy() const;
-    const char* getStrategyName() const;
-
-    static std::unique_ptr<ISpatialIndex> createIndex(SpatialStrategy strategy, const Rect& bounds);
-
-private:
-    void selectOptimalStrategy();
-
-    SpatialStrategy currentStrategy_ = SpatialStrategy::Auto;
-    SpatialStrategy activeStrategy_ = SpatialStrategy::QuadTree;
-    std::unique_ptr<ISpatialIndex> index_;
-    Rect worldBounds_;
-    
-    size_t quadTreeThreshold_ = 1000;
-    size_t hashThreshold_ = 5000;
-    
-    mutable size_t queryCount_ = 0;
-    mutable size_t totalQueryTime_ = 0;
-};
-
-}
diff --git a/Easy2D/include/easy2d/ui/button.h b/Easy2D/include/easy2d/ui/button.h
deleted file mode 100644
index b290776..0000000
--- a/Easy2D/include/easy2d/ui/button.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#pragma once
-
-#include <easy2d/ui/widget.h>
-#include <easy2d/graphics/font.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/platform/window.h>
-
-namespace easy2d {
-
-// 图片缩放模式
-enum class ImageScaleMode {
-    Original,       // 使用原图大小
-    Stretch,        // 拉伸填充
-    ScaleFit,       // 等比缩放，保持完整显示
-    ScaleFill       // 等比缩放，填充整个区域（可能裁剪）
-};
-
-// ============================================================================
-// 基础按钮类
-// ============================================================================
-class Button : public Widget {
-public:
-    Button();
-    ~Button() override = default;
-
-    static Ptr<Button> create();
-
-    void setText(const String& text);
-    const String& getText() const { return text_; }
-
-    void setFont(Ptr<FontAtlas> font);
-    Ptr<FontAtlas> getFont() const { return font_; }
-
-    void setPadding(const Vec2& padding);
-    Vec2 getPadding() const { return padding_; }
-
-    void setTextColor(const Color& color);
-    Color getTextColor() const { return textColor_; }
-
-    // 纯色背景设置
-    void setBackgroundColor(const Color& normal, const Color& hover, const Color& pressed);
-    void setBorder(const Color& color, float width);
-
-    // 图片背景设置
-    void setBackgroundImage(Ptr<Texture> normal, Ptr<Texture> hover = nullptr, Ptr<Texture> pressed = nullptr);
-    void setBackgroundImageScaleMode(ImageScaleMode mode);
-    void setCustomSize(const Vec2& size);
-    void setCustomSize(float width, float height);
-
-    // 圆角矩形设置
-    void setCornerRadius(float radius);
-    float getCornerRadius() const { return cornerRadius_; }
-    void setRoundedCornersEnabled(bool enabled);
-    bool isRoundedCornersEnabled() const { return roundedCornersEnabled_; }
-
-    // 鼠标光标设置（悬停时显示的光标形状）
-    void setHoverCursor(CursorShape cursor);
-    CursorShape getHoverCursor() const { return hoverCursor_; }
-    
-    // Alpha遮罩点击检测（用于不规则形状按钮）
-    void setUseAlphaMaskForHitTest(bool enabled);
-    bool isUseAlphaMaskForHitTest() const { return useAlphaMaskForHitTest_; }
-
-    void setOnClick(Function<void()> callback);
-
-protected:
-    void onDraw(RenderBackend& renderer) override;
-    void drawBackgroundImage(RenderBackend& renderer, const Rect& rect);
-    void drawRoundedRect(RenderBackend& renderer, const Rect& rect, const Color& color, float radius);
-    void fillRoundedRect(RenderBackend& renderer, const Rect& rect, const Color& color, float radius);
-    Vec2 calculateImageSize(const Vec2& buttonSize, const Vec2& imageSize);
-
-    // 状态访问（供子类使用）
-    bool isHovered() const { return hovered_; }
-    bool isPressed() const { return pressed_; }
-
-private:
-    String text_;
-    Ptr<FontAtlas> font_;
-    Vec2 padding_ = Vec2(10.0f, 6.0f);
-
-    // 文字颜色
-    Color textColor_ = Colors::White;
-
-    // 纯色背景
-    Color bgNormal_ = Color(0.2f, 0.2f, 0.2f, 1.0f);
-    Color bgHover_ = Color(0.28f, 0.28f, 0.28f, 1.0f);
-    Color bgPressed_ = Color(0.15f, 0.15f, 0.15f, 1.0f);
-
-    // 图片背景
-    Ptr<Texture> imgNormal_;
-    Ptr<Texture> imgHover_;
-    Ptr<Texture> imgPressed_;
-    ImageScaleMode scaleMode_ = ImageScaleMode::Original;
-    bool useImageBackground_ = false;
-
-    // 边框
-    Color borderColor_ = Color(0.6f, 0.6f, 0.6f, 1.0f);
-    float borderWidth_ = 1.0f;
-
-    // 圆角矩形
-    float cornerRadius_ = 8.0f;           // 圆角半径
-    bool roundedCornersEnabled_ = false;  // 默认关闭
-
-    // 鼠标光标
-    CursorShape hoverCursor_ = CursorShape::Hand;  // 悬停时默认显示手型光标
-    bool cursorChanged_ = false;           // 标记是否已改变光标
-    
-    // Alpha遮罩点击检测（用于不规则形状按钮）
-    bool useAlphaMaskForHitTest_ = false;  // 默认关闭
-
-    bool hovered_ = false;
-    bool pressed_ = false;
-
-    Function<void()> onClick_;
-};
-
-// ============================================================================
-// 切换按钮 - 点击切换两种状态（支持图片和文字）
-// ============================================================================
-class ToggleImageButton : public Button {
-public:
-    ToggleImageButton();
-    ~ToggleImageButton() override = default;
-
-    static Ptr<ToggleImageButton> create();
-
-    // 设置两种状态的图片
-    void setStateImages(Ptr<Texture> stateOffNormal, Ptr<Texture> stateOnNormal,
-                        Ptr<Texture> stateOffHover = nullptr, Ptr<Texture> stateOnHover = nullptr,
-                        Ptr<Texture> stateOffPressed = nullptr, Ptr<Texture> stateOnPressed = nullptr);
-
-    // 设置两种状态的文字
-    void setStateText(const String& textOff, const String& textOn);
-
-    // 设置两种状态的文字颜色
-    void setStateTextColor(const Color& colorOff, const Color& colorOn);
-
-    // 获取/设置当前状态
-    bool isOn() const { return isOn_; }
-    void setOn(bool on);
-    void toggle();
-
-    // 设置状态改变回调
-    void setOnStateChange(Function<void(bool)> callback);
-
-protected:
-    void onDraw(RenderBackend& renderer) override;
-
-private:
-    // 状态图片
-    Ptr<Texture> imgOffNormal_, imgOnNormal_;
-    Ptr<Texture> imgOffHover_, imgOnHover_;
-    Ptr<Texture> imgOffPressed_, imgOnPressed_;
-
-    // 状态文字
-    String textOff_, textOn_;
-    bool useStateText_ = false;
-
-    // 状态文字颜色
-    Color textColorOff_ = Colors::White;
-    Color textColorOn_ = Colors::White;
-    bool useStateTextColor_ = false;
-
-    bool isOn_ = false;
-    Function<void(bool)> onStateChange_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/ui/widget.h b/Easy2D/include/easy2d/ui/widget.h
deleted file mode 100644
index 198d96f..0000000
--- a/Easy2D/include/easy2d/ui/widget.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <easy2d/scene/node.h>
-
-namespace easy2d {
-
-class Widget : public Node {
-public:
-    Widget();
-    ~Widget() override = default;
-
-    void setSize(const Size& size);
-    void setSize(float width, float height);
-    Size getSize() const { return size_; }
-
-    Rect getBoundingBox() const override;
-
-private:
-    Size size_ = Size::Zero();
-};
-
-} // namespace easy2d
-
diff --git a/Easy2D/include/easy2d/utils/data.h b/Easy2D/include/easy2d/utils/data.h
deleted file mode 100644
index 05f1a63..0000000
--- a/Easy2D/include/easy2d/utils/data.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <string>
-
-namespace easy2d {
-
-// ============================================================================
-// DataStore 类 - INI 文件数据持久化
-// ============================================================================
-class DataStore {
-public:
-    DataStore();
-    ~DataStore();
-    
-    /// 加载 INI 文件
-    bool load(const std::string& filename);
-    
-    /// 保存到 INI 文件
-    bool save(const std::string& filename);
-    
-    /// 获取字符串值
-    std::string getString(const std::string& section, const std::string& key, const std::string& defaultValue = "");
-    
-    /// 获取整数值
-    int getInt(const std::string& section, const std::string& key, int defaultValue = 0);
-    
-    /// 获取浮点数值
-    float getFloat(const std::string& section, const std::string& key, float defaultValue = 0.0f);
-    
-    /// 获取布尔值
-    bool getBool(const std::string& section, const std::string& key, bool defaultValue = false);
-    
-    /// 设置字符串值
-    void setString(const std::string& section, const std::string& key, const std::string& value);
-    
-    /// 设置整数值
-    void setInt(const std::string& section, const std::string& key, int value);
-    
-    /// 设置浮点数值
-    void setFloat(const std::string& section, const std::string& key, float value);
-    
-    /// 设置布尔值
-    void setBool(const std::string& section, const std::string& key, bool value);
-    
-    /// 删除键
-    void removeKey(const std::string& section, const std::string& key);
-    
-    /// 删除整个 section
-    void removeSection(const std::string& section);
-    
-    /// 检查键是否存在
-    bool hasKey(const std::string& section, const std::string& key);
-    
-    /// 检查 section 是否存在
-    bool hasSection(const std::string& section);
-    
-    /// 清除所有数据
-    void clear();
-    
-    /// 获取当前文件名
-    const std::string& getFilename() const { return filename_; }
-
-private:
-    class Impl;
-    UniquePtr<Impl> impl_;
-    std::string filename_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/utils/logger.h b/Easy2D/include/easy2d/utils/logger.h
deleted file mode 100644
index 930fe9c..0000000
--- a/Easy2D/include/easy2d/utils/logger.h
+++ /dev/null
@@ -1,225 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <cstdio>
-#include <cstdarg>
-#include <string>
-#include <sstream>
-#include <type_traits>
-
-namespace easy2d {
-
-// ============================================================================
-// 日志级别枚举
-// ============================================================================
-enum class LogLevel {
-    Trace = 0,
-    Debug = 1,
-    Info = 2,
-    Warn = 3,
-    Error = 4,
-    Fatal = 5,
-    Off = 6
-};
-
-// ============================================================================
-// 简单的 fmt-style {} 格式化器
-// ============================================================================
-namespace detail {
-
-// 将单个参数转为字符串
-template<typename T>
-inline std::string to_string_arg(const T& value) {
-    if constexpr (std::is_same_v<T, std::string>) {
-        return value;
-    } else if constexpr (std::is_same_v<T, const char*> || std::is_same_v<T, char*>) {
-        return value ? std::string(value) : std::string("(null)");
-    } else if constexpr (std::is_same_v<T, bool>) {
-        return value ? "true" : "false";
-    } else if constexpr (std::is_arithmetic_v<T>) {
-        // 对浮点数使用特殊格式
-        if constexpr (std::is_floating_point_v<T>) {
-            char buf[64];
-            snprintf(buf, sizeof(buf), "%.2f", static_cast<double>(value));
-            return buf;
-        } else {
-            return std::to_string(value);
-        }
-    } else {
-        std::ostringstream oss;
-        oss << value;
-        return oss.str();
-    }
-}
-
-// 格式化基础情况：没有更多参数
-inline std::string format_impl(const char* fmt) {
-    std::string result;
-    while (*fmt) {
-        if (*fmt == '{' && *(fmt + 1) == '}') {
-            result += "{}"; // 无参数可替换，保留原样
-            fmt += 2;
-        } else {
-            result += *fmt;
-            ++fmt;
-        }
-    }
-    return result;
-}
-
-// 格式化递归：替换第一个 {} 并递归处理剩余
-template<typename T, typename... Args>
-inline std::string format_impl(const char* fmt, const T& first, const Args&... rest) {
-    std::string result;
-    while (*fmt) {
-        if (*fmt == '{') {
-            // 检查 {:#x} 等格式说明符
-            if (*(fmt + 1) == '}') {
-                result += to_string_arg(first);
-                fmt += 2;
-                result += format_impl(fmt, rest...);
-                return result;
-            } else if (*(fmt + 1) == ':') {
-                // 跳过格式说明符直到 }
-                const char* end = fmt + 2;
-                while (*end && *end != '}') ++end;
-                if (*end == '}') {
-                    // 检查是否是十六进制格式
-                    std::string spec(fmt + 2, end);
-                    if (spec.find('x') != std::string::npos || spec.find('X') != std::string::npos) {
-                        if constexpr (std::is_integral_v<T>) {
-                            char buf[32];
-                            snprintf(buf, sizeof(buf), "0x%x", static_cast<unsigned int>(first));
-                            result += buf;
-                        } else {
-                            result += to_string_arg(first);
-                        }
-                    } else if (spec.find('f') != std::string::npos || spec.find('.') != std::string::npos) {
-                        if constexpr (std::is_arithmetic_v<T>) {
-                            // 解析精度
-                            int precision = 2;
-                            auto dot = spec.find('.');
-                            if (dot != std::string::npos) {
-                                precision = 0;
-                                for (size_t i = dot + 1; i < spec.size() && spec[i] >= '0' && spec[i] <= '9'; ++i) {
-                                    precision = precision * 10 + (spec[i] - '0');
-                                }
-                            }
-                            char fmtbuf[16];
-                            snprintf(fmtbuf, sizeof(fmtbuf), "%%.%df", precision);
-                            char buf[64];
-                            snprintf(buf, sizeof(buf), fmtbuf, static_cast<double>(first));
-                            result += buf;
-                        } else {
-                            result += to_string_arg(first);
-                        }
-                    } else {
-                        result += to_string_arg(first);
-                    }
-                    fmt = end + 1;
-                    result += format_impl(fmt, rest...);
-                    return result;
-                }
-            }
-        }
-        result += *fmt;
-        ++fmt;
-    }
-    return result;
-}
-
-} // namespace detail
-
-// 顶层格式化函数
-template<typename... Args>
-inline std::string e2d_format(const char* fmt, const Args&... args) {
-    return detail::format_impl(fmt, args...);
-}
-
-// 无参数版本
-inline std::string e2d_format(const char* fmt) {
-    return std::string(fmt);
-}
-
-// ============================================================================
-// Logger 类 - 简单 printf 日志
-// ============================================================================
-class Logger {
-public:
-    static void init();
-    static void shutdown();
-    static void setLevel(LogLevel level);
-    static void setConsoleOutput(bool enable);
-    static void setFileOutput(const std::string& filename);
-
-    static LogLevel getLevel() { return level_; }
-
-    template<typename... Args>
-    static void log(LogLevel level, const char* fmt, const Args&... args) {
-        if (level < level_) return;
-        std::string msg = e2d_format(fmt, args...);
-        const char* levelStr = "";
-        switch (level) {
-            case LogLevel::Trace: levelStr = "TRACE"; break;
-            case LogLevel::Debug: levelStr = "DEBUG"; break;
-            case LogLevel::Info:  levelStr = "INFO "; break;
-            case LogLevel::Warn:  levelStr = "WARN "; break;
-            case LogLevel::Error: levelStr = "ERROR"; break;
-            case LogLevel::Fatal: levelStr = "FATAL"; break;
-            default: break;
-        }
-        printf("[%s] %s\n", levelStr, msg.c_str());
-    }
-
-    // 无参数版本
-    static void log(LogLevel level, const char* msg) {
-        if (level < level_) return;
-        const char* levelStr = "";
-        switch (level) {
-            case LogLevel::Trace: levelStr = "TRACE"; break;
-            case LogLevel::Debug: levelStr = "DEBUG"; break;
-            case LogLevel::Info:  levelStr = "INFO "; break;
-            case LogLevel::Warn:  levelStr = "WARN "; break;
-            case LogLevel::Error: levelStr = "ERROR"; break;
-            case LogLevel::Fatal: levelStr = "FATAL"; break;
-            default: break;
-        }
-        printf("[%s] %s\n", levelStr, msg);
-    }
-
-private:
-    static LogLevel level_;
-    static bool initialized_;
-};
-
-// ============================================================================
-// 日志宏
-// ============================================================================
-
-#ifdef E2D_DEBUG
-    #define E2D_LOG_TRACE(...) ::easy2d::Logger::log(::easy2d::LogLevel::Trace, __VA_ARGS__)
-    #define E2D_LOG_DEBUG(...) ::easy2d::Logger::log(::easy2d::LogLevel::Debug, __VA_ARGS__)
-#else
-    #define E2D_LOG_TRACE(...)
-    #define E2D_LOG_DEBUG(...)
-#endif
-
-#define E2D_LOG_INFO(...)  ::easy2d::Logger::log(::easy2d::LogLevel::Info, __VA_ARGS__)
-#define E2D_LOG_WARN(...)  ::easy2d::Logger::log(::easy2d::LogLevel::Warn, __VA_ARGS__)
-#define E2D_LOG_ERROR(...) ::easy2d::Logger::log(::easy2d::LogLevel::Error, __VA_ARGS__)
-#define E2D_LOG_FATAL(...) ::easy2d::Logger::log(::easy2d::LogLevel::Fatal, __VA_ARGS__)
-
-// 简化的日志宏
-#define E2D_INFO(...)  E2D_LOG_INFO(__VA_ARGS__)
-#define E2D_WARN(...)  E2D_LOG_WARN(__VA_ARGS__)
-#define E2D_ERROR(...) E2D_LOG_ERROR(__VA_ARGS__)
-#define E2D_FATAL(...) E2D_LOG_FATAL(__VA_ARGS__)
-#ifdef E2D_DEBUG
-    #define E2D_DEBUG_LOG(...) E2D_LOG_DEBUG(__VA_ARGS__)
-    #define E2D_TRACE(...)     E2D_LOG_TRACE(__VA_ARGS__)
-#else
-    #define E2D_DEBUG_LOG(...)
-    #define E2D_TRACE(...)
-#endif
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/utils/random.h b/Easy2D/include/easy2d/utils/random.h
deleted file mode 100644
index 9e740ef..0000000
--- a/Easy2D/include/easy2d/utils/random.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <random>
-
-namespace easy2d {
-
-// ============================================================================
-// Random 类 - 随机数生成器
-// ============================================================================
-class Random {
-public:
-    /// 获取单例实例
-    static Random& getInstance();
-    
-    /// 设置随机种子
-    void setSeed(uint32 seed);
-    
-    /// 使用当前时间作为种子
-    void randomize();
-    
-    /// 获取 [0, 1) 范围内的随机浮点数
-    float getFloat();
-    
-    /// 获取 [min, max] 范围内的随机浮点数
-    float getFloat(float min, float max);
-    
-    /// 获取 [0, max] 范围内的随机整数
-    int getInt(int max);
-    
-    /// 获取 [min, max] 范围内的随机整数
-    int getInt(int min, int max);
-    
-    /// 获取随机布尔值
-    bool getBool();
-    
-    /// 获取随机布尔值（带概率）
-    bool getBool(float probability);
-    
-    /// 获取指定范围内的随机角度（弧度）
-    float getAngle();
-    
-    /// 获取 [-1, 1] 范围内的随机数（用于方向）
-    float getSigned();
-
-private:
-    Random();
-    ~Random() = default;
-    
-    Random(const Random&) = delete;
-    Random& operator=(const Random&) = delete;
-    
-    std::mt19937 generator_;
-    std::uniform_real_distribution<float> floatDist_;
-};
-
-// ============================================================================
-// 便捷函数
-// ============================================================================
-
-/// 获取 [0, 1) 范围内的随机浮点数
-inline float randomFloat() {
-    return Random::getInstance().getFloat();
-}
-
-/// 获取 [min, max] 范围内的随机浮点数
-inline float randomFloat(float min, float max) {
-    return Random::getInstance().getFloat(min, max);
-}
-
-/// 获取 [0, max] 范围内的随机整数
-inline int randomInt(int max) {
-    return Random::getInstance().getInt(max);
-}
-
-/// 获取 [min, max] 范围内的随机整数
-inline int randomInt(int min, int max) {
-    return Random::getInstance().getInt(min, max);
-}
-
-/// 获取随机布尔值
-inline bool randomBool() {
-    return Random::getInstance().getBool();
-}
-
-/// 获取随机布尔值（带概率）
-inline bool randomBool(float probability) {
-    return Random::getInstance().getBool(probability);
-}
-
-} // namespace easy2d
diff --git a/Easy2D/include/easy2d/utils/timer.h b/Easy2D/include/easy2d/utils/timer.h
deleted file mode 100644
index 9de3260..0000000
--- a/Easy2D/include/easy2d/utils/timer.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#pragma once
-
-#include <easy2d/core/types.h>
-#include <chrono>
-#include <map>
-#include <vector>
-#include <memory>
-
-namespace easy2d {
-
-// ============================================================================
-// Timer 类 - 单次/重复计时器
-// ============================================================================
-class Timer {
-public:
-    using Clock = std::chrono::steady_clock;
-    using TimePoint = Clock::time_point;
-    using Duration = Clock::duration;
-    using Callback = Function<void()>;
-
-    Timer(float interval, bool repeat, Callback callback);
-    
-    /// 更新计时器，返回 true 如果触发了回调
-    bool update(float deltaTime);
-    
-    /// 重置计时器
-    void reset();
-    
-    /// 暂停计时器
-    void pause();
-    
-    /// 恢复计时器
-    void resume();
-    
-    /// 取消计时器（标记为无效）
-    void cancel();
-    
-    /// 是否有效
-    bool isValid() const { return valid_; }
-    
-    /// 是否暂停
-    bool isPaused() const { return paused_; }
-    
-    /// 获取剩余时间（秒）
-    float getRemaining() const;
-    
-    /// 获取唯一ID
-    uint32 getId() const { return id_; }
-
-private:
-    uint32 id_;
-    float interval_;
-    float elapsed_;
-    bool repeat_;
-    bool paused_;
-    bool valid_;
-    Callback callback_;
-    
-    static uint32 nextId_;
-};
-
-// ============================================================================
-// TimerManager 类 - 管理所有计时器
-// ============================================================================
-class TimerManager {
-public:
-    TimerManager() = default;
-    ~TimerManager() = default;
-    
-    /// 创建单次计时器，返回计时器ID
-    uint32 addTimer(float delay, Timer::Callback callback);
-    
-    /// 创建重复计时器，返回计时器ID
-    uint32 addRepeatingTimer(float interval, Timer::Callback callback);
-    
-    /// 取消指定ID的计时器
-    void cancelTimer(uint32 timerId);
-    
-    /// 暂停指定ID的计时器
-    void pauseTimer(uint32 timerId);
-    
-    /// 恢复指定ID的计时器
-    void resumeTimer(uint32 timerId);
-    
-    /// 更新所有计时器（每帧调用）
-    void update(float deltaTime);
-    
-    /// 清除所有计时器
-    void clear();
-    
-    /// 获取计时器数量
-    size_t getTimerCount() const { return timers_.size(); }
-
-private:
-    std::map<uint32, std::unique_ptr<Timer>> timers_;
-    std::vector<uint32> timersToRemove_;
-};
-
-} // namespace easy2d
diff --git a/Easy2D/src/action/action.cpp b/Easy2D/src/action/action.cpp
deleted file mode 100644
index 3f7821c..0000000
--- a/Easy2D/src/action/action.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "easy2d/action/action.h"
-#include "easy2d/scene/node.h"
-
-namespace easy2d {
-    Action::Action()
-        : elapsed_(0.0f)
-        , duration_(0.0f)
-        , speed_(1.0f)
-        , tag_(-1)
-    {
-    }
-
-    void Action::start(Node* target)
-    {
-        target_ = target;
-        originalTarget_ = target;
-        elapsed_ = 0.0f;
-        state_ = ActionState::Running;
-        onStart();
-    }
-
-    void Action::stop()
-    {
-        target_ = nullptr;
-        state_ = ActionState::Completed;
-    }
-
-    void Action::update(float dt)
-    {
-        if (state_ != ActionState::Running)
-            return;
-
-        step(dt);
-
-        if (isDone())
-        {
-            state_ = ActionState::Completed;
-            onComplete();
-            if (completionCallback_)
-                completionCallback_();
-        }
-    }
-
-    void Action::step(float dt)
-    {
-        if (state_ != ActionState::Running)
-            return;
-
-        elapsed_ += dt * speed_;
-
-        float progress = 0.0f;
-        if (duration_ > 0.0f)
-        {
-            progress = std::min(1.0f, elapsed_ / duration_);
-        }
-        else
-        {
-            progress = 1.0f;
-        }
-
-        if (progressCallback_)
-            progressCallback_(progress);
-
-        onUpdate(progress);
-    }
-
-    void Action::pause()
-    {
-        if (state_ == ActionState::Running)
-            state_ = ActionState::Paused;
-    }
-
-    void Action::resume()
-    {
-        if (state_ == ActionState::Paused)
-            state_ = ActionState::Running;
-    }
-
-    void Action::restart()
-    {
-        elapsed_ = 0.0f;
-        state_ = ActionState::Running;
-        onStart();
-    }
-}
diff --git a/Easy2D/src/action/actions.cpp b/Easy2D/src/action/actions.cpp
deleted file mode 100644
index 4d489f4..0000000
--- a/Easy2D/src/action/actions.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-#include "easy2d/action/actions.h"
-#include "easy2d/scene/node.h"
-#include <algorithm>
-
-namespace easy2d {
-    // IntervalAction
-    IntervalAction::IntervalAction(float duration)
-    {
-        duration_ = duration;
-    }
-
-    bool IntervalAction::isDone() const
-    {
-        return elapsed_ >= duration_;
-    }
-
-    // InstantAction
-    InstantAction::InstantAction()
-    {
-        duration_ = 0.0f;
-    }
-
-    bool InstantAction::isDone() const
-    {
-        return true;
-    }
-
-    // MoveBy
-    MoveBy::MoveBy(float duration, const Vec2& delta)
-        : IntervalAction(duration)
-        , delta_(delta)
-    {
-    }
-
-    void MoveBy::onStart()
-    {
-        startPosition_ = target_->getPosition();
-    }
-
-    void MoveBy::onUpdate(float progress)
-    {
-        Vec2 newPos = startPosition_ + delta_ * progress;
-        target_->setPosition(newPos);
-    }
-
-    Action* MoveBy::clone() const
-    {
-        return new MoveBy(duration_, delta_);
-    }
-
-    Action* MoveBy::reverse() const
-    {
-        return new MoveBy(duration_, -delta_);
-    }
-
-    // MoveTo
-    MoveTo::MoveTo(float duration, const Vec2& position)
-        : IntervalAction(duration)
-        , endPosition_(position)
-    {
-    }
-
-    void MoveTo::onStart()
-    {
-        startPosition_ = target_->getPosition();
-        delta_ = endPosition_ - startPosition_;
-    }
-
-    void MoveTo::onUpdate(float progress)
-    {
-        Vec2 newPos = startPosition_ + delta_ * progress;
-        target_->setPosition(newPos);
-    }
-
-    Action* MoveTo::clone() const
-    {
-        return new MoveTo(duration_, endPosition_);
-    }
-
-    Action* MoveTo::reverse() const
-    {
-        return new MoveTo(duration_, startPosition_);
-    }
-
-    // ScaleBy
-    ScaleBy::ScaleBy(float duration, float scale)
-        : IntervalAction(duration)
-        , deltaScale_(scale - 1.0f, scale - 1.0f)
-    {
-    }
-
-    ScaleBy::ScaleBy(float duration, float scaleX, float scaleY)
-        : IntervalAction(duration)
-        , deltaScale_(scaleX - 1.0f, scaleY - 1.0f)
-    {
-    }
-
-    ScaleBy::ScaleBy(float duration, const Vec2& scale)
-        : IntervalAction(duration)
-        , deltaScale_(scale.x - 1.0f, scale.y - 1.0f)
-    {
-    }
-
-    void ScaleBy::onStart()
-    {
-        startScale_ = target_->getScale();
-    }
-
-    void ScaleBy::onUpdate(float progress)
-    {
-        Vec2 newScale = startScale_ + deltaScale_ * progress;
-        target_->setScale(newScale);
-    }
-
-    Action* ScaleBy::clone() const
-    {
-        return new ScaleBy(duration_, Vec2(startScale_.x + deltaScale_.x, startScale_.y + deltaScale_.y));
-    }
-
-    Action* ScaleBy::reverse() const
-    {
-        return new ScaleBy(duration_, Vec2(startScale_.x - deltaScale_.x, startScale_.y - deltaScale_.y));
-    }
-
-    // ScaleTo
-    ScaleTo::ScaleTo(float duration, float scale)
-        : IntervalAction(duration)
-        , endScale_(scale, scale)
-    {
-    }
-
-    ScaleTo::ScaleTo(float duration, float scaleX, float scaleY)
-        : IntervalAction(duration)
-        , endScale_(scaleX, scaleY)
-    {
-    }
-
-    ScaleTo::ScaleTo(float duration, const Vec2& scale)
-        : IntervalAction(duration)
-        , endScale_(scale)
-    {
-    }
-
-    void ScaleTo::onStart()
-    {
-        startScale_ = target_->getScale();
-        delta_ = endScale_ - startScale_;
-    }
-
-    void ScaleTo::onUpdate(float progress)
-    {
-        Vec2 newScale = startScale_ + delta_ * progress;
-        target_->setScale(newScale);
-    }
-
-    Action* ScaleTo::clone() const
-    {
-        return new ScaleTo(duration_, endScale_);
-    }
-
-    Action* ScaleTo::reverse() const
-    {
-        return new ScaleTo(duration_, startScale_);
-    }
-
-    // RotateBy
-    RotateBy::RotateBy(float duration, float deltaAngle)
-        : IntervalAction(duration)
-        , deltaAngle_(deltaAngle)
-    {
-    }
-
-    RotateBy::RotateBy(float duration, float deltaAngleX, float deltaAngleY)
-        : IntervalAction(duration)
-        , deltaAngle_(deltaAngleX)
-    {
-        (void)deltaAngleY;
-    }
-
-    void RotateBy::onStart()
-    {
-        startAngle_ = target_->getRotation();
-    }
-
-    void RotateBy::onUpdate(float progress)
-    {
-        float newAngle = startAngle_ + deltaAngle_ * progress;
-        target_->setRotation(newAngle);
-    }
-
-    Action* RotateBy::clone() const
-    {
-        return new RotateBy(duration_, deltaAngle_);
-    }
-
-    Action* RotateBy::reverse() const
-    {
-        return new RotateBy(duration_, -deltaAngle_);
-    }
-
-    // RotateTo
-    RotateTo::RotateTo(float duration, float angle)
-        : IntervalAction(duration)
-        , endAngle_(angle)
-    {
-    }
-
-    RotateTo::RotateTo(float duration, float angleX, float angleY)
-        : IntervalAction(duration)
-        , endAngle_(angleX)
-    {
-        (void)angleY;
-    }
-
-    void RotateTo::onStart()
-    {
-        startAngle_ = target_->getRotation();
-        deltaAngle_ = endAngle_ - startAngle_;
-        
-        // Shortest path
-        if (deltaAngle_ > 180.0f)
-            deltaAngle_ -= 360.0f;
-        if (deltaAngle_ < -180.0f)
-            deltaAngle_ += 360.0f;
-    }
-
-    void RotateTo::onUpdate(float progress)
-    {
-        float newAngle = startAngle_ + deltaAngle_ * progress;
-        target_->setRotation(newAngle);
-    }
-
-    Action* RotateTo::clone() const
-    {
-        return new RotateTo(duration_, endAngle_);
-    }
-
-    Action* RotateTo::reverse() const
-    {
-        return new RotateTo(duration_, startAngle_);
-    }
-
-    // FadeIn
-    FadeIn::FadeIn(float duration)
-        : IntervalAction(duration)
-    {
-    }
-
-    void FadeIn::onStart()
-    {
-        startOpacity_ = target_->getOpacity();
-        target_->setOpacity(0.0f);
-    }
-
-    void FadeIn::onUpdate(float progress)
-    {
-        target_->setOpacity(progress);
-    }
-
-    Action* FadeIn::clone() const
-    {
-        return new FadeIn(duration_);
-    }
-
-    Action* FadeIn::reverse() const
-    {
-        return new FadeOut(duration_);
-    }
-
-    // FadeOut
-    FadeOut::FadeOut(float duration)
-        : IntervalAction(duration)
-    {
-    }
-
-    void FadeOut::onStart()
-    {
-        startOpacity_ = target_->getOpacity();
-        target_->setOpacity(1.0f);
-    }
-
-    void FadeOut::onUpdate(float progress)
-    {
-        target_->setOpacity(1.0f - progress);
-    }
-
-    Action* FadeOut::clone() const
-    {
-        return new FadeOut(duration_);
-    }
-
-    Action* FadeOut::reverse() const
-    {
-        return new FadeIn(duration_);
-    }
-
-    // FadeTo
-    FadeTo::FadeTo(float duration, float opacity)
-        : IntervalAction(duration)
-        , endOpacity_(opacity)
-    {
-    }
-
-    void FadeTo::onStart()
-    {
-        startOpacity_ = target_->getOpacity();
-        deltaOpacity_ = endOpacity_ - startOpacity_;
-    }
-
-    void FadeTo::onUpdate(float progress)
-    {
-        target_->setOpacity(startOpacity_ + deltaOpacity_ * progress);
-    }
-
-    Action* FadeTo::clone() const
-    {
-        return new FadeTo(duration_, endOpacity_);
-    }
-
-    Action* FadeTo::reverse() const
-    {
-        return new FadeTo(duration_, startOpacity_);
-    }
-
-    // Sequence
-    Sequence::Sequence(const std::vector<Action*>& actions)
-        : IntervalAction(0.0f)
-    {
-        for (auto* action : actions)
-        {
-            if (action)
-            {
-                actions_.push_back(action->clone());
-                duration_ += action->getDuration();
-            }
-        }
-    }
-
-    Sequence::~Sequence()
-    {
-        for (auto* action : actions_)
-            delete action;
-    }
-
-    void Sequence::onStart()
-    {
-        currentIndex_ = 0;
-        split_ = 0.0f;
-        last_ = -1.0f;
-        
-        if (!actions_.empty())
-        {
-            actions_[0]->start(target_);
-        }
-    }
-
-    void Sequence::onUpdate(float progress)
-    {
-        int found = 0;
-        float newTime = progress * duration_;
-        
-        if (newTime < last_)
-        {
-            // Rewind
-            for (auto* action : actions_)
-            {
-                action->stop();
-            }
-        }
-        
-        last_ = newTime;
-        
-        for (size_t i = 0; i < actions_.size(); ++i)
-        {
-            split_ += actions_[i]->getDuration();
-            
-            if (split_ > newTime)
-            {
-                found = static_cast<int>(i);
-                break;
-            }
-            else if (split_ == newTime)
-            {
-                found = static_cast<int>(i) + 1;
-                break;
-            }
-        }
-        
-        if (found != currentIndex_)
-        {
-            if (currentIndex_ >= 0 && currentIndex_ < static_cast<int>(actions_.size()))
-            {
-                actions_[currentIndex_]->update(actions_[currentIndex_]->getDuration());
-            }
-            
-            if (found >= 0 && found < static_cast<int>(actions_.size()))
-            {
-                actions_[found]->start(target_);
-            }
-            
-            currentIndex_ = found;
-        }
-        
-        if (currentIndex_ >= 0 && currentIndex_ < static_cast<int>(actions_.size()))
-        {
-            float localProgress = 0.0f;
-            if (actions_[currentIndex_]->getDuration() > 0.0f)
-            {
-                localProgress = (newTime - (split_ - actions_[currentIndex_]->getDuration())) / actions_[currentIndex_]->getDuration();
-            }
-            actions_[currentIndex_]->step(actions_[currentIndex_]->getDuration() * localProgress);
-        }
-    }
-
-    Action* Sequence::clone() const
-    {
-        return new Sequence(actions_);
-    }
-
-    Action* Sequence::reverse() const
-    {
-        std::vector<Action*> rev;
-        for (auto it = actions_.rbegin(); it != actions_.rend(); ++it)
-        {
-            rev.push_back((*it)->reverse());
-        }
-        return new Sequence(rev);
-    }
-
-    // Spawn
-    Spawn::Spawn(const std::vector<Action*>& actions)
-        : IntervalAction(0.0f)
-    {
-        for (auto* action : actions)
-        {
-            if (action)
-            {
-                actions_.push_back(action->clone());
-                duration_ = std::max(duration_, action->getDuration());
-            }
-        }
-    }
-
-    Spawn::~Spawn()
-    {
-        for (auto* action : actions_)
-            delete action;
-    }
-
-    void Spawn::onStart()
-    {
-        for (auto* action : actions_)
-        {
-            action->start(target_);
-        }
-    }
-
-    void Spawn::onUpdate(float progress)
-    {
-        for (auto* action : actions_)
-        {
-            float localProgress = 0.0f;
-            if (action->getDuration() > 0.0f)
-            {
-                localProgress = std::min(1.0f, (progress * duration_) / action->getDuration());
-            }
-            else
-            {
-                localProgress = 1.0f;
-            }
-            action->step(action->getDuration() * localProgress);
-        }
-    }
-
-    Action* Spawn::clone() const
-    {
-        return new Spawn(actions_);
-    }
-
-    Action* Spawn::reverse() const
-    {
-        std::vector<Action*> rev;
-        for (auto* action : actions_)
-        {
-            rev.push_back(action->reverse());
-        }
-        return new Spawn(rev);
-    }
-
-    // Loop
-    Loop::Loop(Action* action, int times)
-        : action_(action ? action->clone() : nullptr)
-        , times_(times)
-        , currentTimes_(0)
-    {
-        if (action_)
-        {
-            duration_ = times < 0 ? -1.0f : action_->getDuration() * times;
-        }
-    }
-
-    Loop::~Loop()
-    {
-        delete action_;
-    }
-
-    bool Loop::isDone() const
-    {
-        if (times_ < 0)
-            return false;
-        return currentTimes_ >= times_;
-    }
-
-    void Loop::onStart()
-    {
-        currentTimes_ = 0;
-        if (action_)
-        {
-            action_->start(target_);
-        }
-    }
-
-    void Loop::onUpdate(float progress)
-    {
-        if (!action_)
-            return;
-
-        float actionDuration = action_->getDuration();
-        float dt = progress * duration_ - elapsed_;
-        
-        while (dt > 0.0f)
-        {
-            float localProgress = std::min(1.0f, dt / actionDuration);
-            action_->step(actionDuration * localProgress);
-            
-            if (action_->isDone())
-            {
-                currentTimes_++;
-                if (times_ > 0 && currentTimes_ >= times_)
-                    break;
-                action_->restart();
-            }
-            
-            dt -= actionDuration;
-        }
-    }
-
-    Action* Loop::clone() const
-    {
-        return new Loop(action_, times_);
-    }
-
-    Action* Loop::reverse() const
-    {
-        return new Loop(action_ ? action_->reverse() : nullptr, times_);
-    }
-
-    // Delay
-    Delay::Delay(float duration)
-        : IntervalAction(duration)
-    {
-    }
-
-    void Delay::onUpdate(float progress)
-    {
-        // No update needed, just wait
-    }
-
-    Action* Delay::clone() const
-    {
-        return new Delay(duration_);
-    }
-
-    Action* Delay::reverse() const
-    {
-        return new Delay(duration_);
-    }
-
-    // CallFunc
-    CallFunc::CallFunc(Callback callback)
-        : callback_(std::move(callback))
-    {
-    }
-
-    void CallFunc::onUpdate(float progress)
-    {
-        (void)progress;
-        if (callback_)
-            callback_();
-    }
-
-    Action* CallFunc::clone() const
-    {
-        return new CallFunc(callback_);
-    }
-
-    Action* CallFunc::reverse() const
-    {
-        return new CallFunc(callback_);
-    }
-}
diff --git a/Easy2D/src/action/ease.cpp b/Easy2D/src/action/ease.cpp
deleted file mode 100644
index 77b041b..0000000
--- a/Easy2D/src/action/ease.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-#include <easy2d/action/ease.h>
-#include <cmath>
-
-namespace easy2d {
-    // Linear
-    float easeLinear(float t)
-    {
-        return t;
-    }
-
-    // Quadratic
-    float easeInQuad(float t)
-    {
-        return t * t;
-    }
-
-    float easeOutQuad(float t)
-    {
-        return 1.0f - (1.0f - t) * (1.0f - t);
-    }
-
-    float easeInOutQuad(float t)
-    {
-        return t < 0.5f ? 2.0f * t * t : 1.0f - std::pow(-2.0f * t + 2.0f, 2.0f) / 2.0f;
-    }
-
-    // Cubic
-    float easeInCubic(float t)
-    {
-        return t * t * t;
-    }
-
-    float easeOutCubic(float t)
-    {
-        return 1.0f - std::pow(1.0f - t, 3.0f);
-    }
-
-    float easeInOutCubic(float t)
-    {
-        return t < 0.5f ? 4.0f * t * t * t : 1.0f - std::pow(-2.0f * t + 2.0f, 3.0f) / 2.0f;
-    }
-
-    // Quartic
-    float easeInQuart(float t)
-    {
-        return t * t * t * t;
-    }
-
-    float easeOutQuart(float t)
-    {
-        return 1.0f - std::pow(1.0f - t, 4.0f);
-    }
-
-    float easeInOutQuart(float t)
-    {
-        return t < 0.5f ? 8.0f * t * t * t * t : 1.0f - std::pow(-2.0f * t + 2.0f, 4.0f) / 2.0f;
-    }
-
-    // Quintic
-    float easeInQuint(float t)
-    {
-        return t * t * t * t * t;
-    }
-
-    float easeOutQuint(float t)
-    {
-        return 1.0f - std::pow(1.0f - t, 5.0f);
-    }
-
-    float easeInOutQuint(float t)
-    {
-        return t < 0.5f ? 16.0f * t * t * t * t * t : 1.0f - std::pow(-2.0f * t + 2.0f, 5.0f) / 2.0f;
-    }
-
-    // Sine
-    float easeInSine(float t)
-    {
-        return 1.0f - std::cos((t * 3.14159265359f) / 2.0f);
-    }
-
-    float easeOutSine(float t)
-    {
-        return std::sin((t * 3.14159265359f) / 2.0f);
-    }
-
-    float easeInOutSine(float t)
-    {
-        return -(std::cos(3.14159265359f * t) - 1.0f) / 2.0f;
-    }
-
-    // Exponential
-    float easeInExpo(float t)
-    {
-        return t == 0.0f ? 0.0f : std::pow(2.0f, 10.0f * (t - 1.0f));
-    }
-
-    float easeOutExpo(float t)
-    {
-        return t == 1.0f ? 1.0f : 1.0f - std::pow(2.0f, -10.0f * t);
-    }
-
-    float easeInOutExpo(float t)
-    {
-        if (t == 0.0f) return 0.0f;
-        if (t == 1.0f) return 1.0f;
-        return t < 0.5f ? std::pow(2.0f, 20.0f * t - 10.0f) / 2.0f : (2.0f - std::pow(2.0f, -20.0f * t + 10.0f)) / 2.0f;
-    }
-
-    // Circular
-    float easeInCirc(float t)
-    {
-        return 1.0f - std::sqrt(1.0f - std::pow(t, 2.0f));
-    }
-
-    float easeOutCirc(float t)
-    {
-        return std::sqrt(1.0f - std::pow(t - 1.0f, 2.0f));
-    }
-
-    float easeInOutCirc(float t)
-    {
-        return t < 0.5f
-            ? (1.0f - std::sqrt(1.0f - std::pow(2.0f * t, 2.0f))) / 2.0f
-            : (std::sqrt(1.0f - std::pow(-2.0f * t + 2.0f, 2.0f)) + 1.0f) / 2.0f;
-    }
-
-    // Back
-    float easeInBack(float t)
-    {
-        const float c1 = 1.70158f;
-        const float c3 = c1 + 1.0f;
-        return c3 * t * t * t - c1 * t * t;
-    }
-
-    float easeOutBack(float t)
-    {
-        const float c1 = 1.70158f;
-        const float c3 = c1 + 1.0f;
-        return 1.0f + c3 * std::pow(t - 1.0f, 3.0f) + c1 * std::pow(t - 1.0f, 2.0f);
-    }
-
-    float easeInOutBack(float t)
-    {
-        const float c1 = 1.70158f;
-        const float c2 = c1 * 1.525f;
-        return t < 0.5f
-            ? (std::pow(2.0f * t, 2.0f) * ((c2 + 1.0f) * 2.0f * t - c2)) / 2.0f
-            : (std::pow(2.0f * t - 2.0f, 2.0f) * ((c2 + 1.0f) * (t * 2.0f - 2.0f) + c2) + 2.0f) / 2.0f;
-    }
-
-    // Elastic
-    float easeInElastic(float t)
-    {
-        const float c4 = (2.0f * 3.14159265359f) / 3.0f;
-        if (t == 0.0f) return 0.0f;
-        if (t == 1.0f) return 1.0f;
-        return -std::pow(2.0f, 10.0f * t - 10.0f) * std::sin((t * 10.0f - 10.75f) * c4);
-    }
-
-    float easeOutElastic(float t)
-    {
-        const float c4 = (2.0f * 3.14159265359f) / 3.0f;
-        if (t == 0.0f) return 0.0f;
-        if (t == 1.0f) return 1.0f;
-        return std::pow(2.0f, -10.0f * t) * std::sin((t * 10.0f - 0.75f) * c4) + 1.0f;
-    }
-
-    float easeInOutElastic(float t)
-    {
-        const float c5 = (2.0f * 3.14159265359f) / 4.5f;
-        if (t == 0.0f) return 0.0f;
-        if (t == 1.0f) return 1.0f;
-        return t < 0.5f
-            ? -(std::pow(2.0f, 20.0f * t - 10.0f) * std::sin((20.0f * t - 11.125f) * c5)) / 2.0f
-            : (std::pow(2.0f, -20.0f * t + 10.0f) * std::sin((20.0f * t - 11.125f) * c5)) / 2.0f + 1.0f;
-    }
-
-    // Bounce
-    namespace
-    {
-        float easeOutBounceInternal(float t)
-        {
-            const float n1 = 7.5625f;
-            const float d1 = 2.75f;
-            
-            if (t < 1.0f / d1)
-            {
-                return n1 * t * t;
-            }
-            else if (t < 2.0f / d1)
-            {
-                t -= 1.5f / d1;
-                return n1 * t * t + 0.75f;
-            }
-            else if (t < 2.5f / d1)
-            {
-                t -= 2.25f / d1;
-                return n1 * t * t + 0.9375f;
-            }
-            else
-            {
-                t -= 2.625f / d1;
-                return n1 * t * t + 0.984375f;
-            }
-        }
-    }
-
-    float easeInBounce(float t)
-    {
-        return 1.0f - easeOutBounceInternal(1.0f - t);
-    }
-
-    float easeOutBounce(float t)
-    {
-        return easeOutBounceInternal(t);
-    }
-
-    float easeInOutBounce(float t)
-    {
-        return t < 0.5f
-            ? (1.0f - easeOutBounceInternal(1.0f - 2.0f * t)) / 2.0f
-            : (1.0f + easeOutBounceInternal(2.0f * t - 1.0f)) / 2.0f;
-    }
-}
diff --git a/Easy2D/src/animation/als_parser.cpp b/Easy2D/src/animation/als_parser.cpp
deleted file mode 100644
index 98f371a..0000000
--- a/Easy2D/src/animation/als_parser.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <easy2d/animation/als_parser.h>
-#include <easy2d/utils/logger.h>
-
-namespace easy2d {
-
-AlsParseResult AlsParser::parse(const std::string& filePath) {
-    AlsParseResult result;
-
-    // TODO: 实现实际的 ALS 文件格式解析
-    // 当前为框架实现，需要根据实际 ALS 文件格式补充解析逻辑
-    //
-    // 解析流程：
-    // 1. 读取 ALS 文件内容
-    // 2. 解析子动画列表：
-    //    - 子动画 ANI 文件路径
-    //    - 层级 zOrder
-    //    - 偏移量
-    // 3. 组装 AlsLayerInfo 数组
-
-    result.success = true;
-    result.errorMessage = "ALS parser framework ready - actual format parsing to be implemented";
-
-    return result;
-}
-
-AlsParseResult AlsParser::parseFromMemory(const std::string& content,
-                                            const std::string& basePath) {
-    AlsParseResult result;
-
-    // TODO: 从内存内容解析
-    result.success = true;
-
-    return result;
-}
-
-std::string AlsParser::resolvePath(const std::string& relativePath) const {
-    if (!basePath_.empty() && !relativePath.empty() && relativePath[0] != '/') {
-        return basePath_ + "/" + relativePath;
-    }
-    return relativePath;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/ani_binary_parser.cpp b/Easy2D/src/animation/ani_binary_parser.cpp
deleted file mode 100644
index a42ac57..0000000
--- a/Easy2D/src/animation/ani_binary_parser.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-#include <easy2d/animation/ani_binary_parser.h>
-#include <easy2d/animation/sprite_frame_cache.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-#include <cstring>
-#include <cassert>
-
-namespace easy2d {
-
-namespace {
-
-// 简易二进制缓冲区读取器
-class BufferReader {
-public:
-    BufferReader(const uint8_t* data, size_t length)
-        : data_(data), length_(length), pos_(0) {}
-
-    template<typename T>
-    T read() {
-        if (pos_ + sizeof(T) > length_) {
-            return T{};
-        }
-        T value;
-        std::memcpy(&value, data_ + pos_, sizeof(T));
-        pos_ += sizeof(T);
-        return value;
-    }
-
-    std::string readAsciiString(int32_t len) {
-        if (len <= 0 || pos_ + static_cast<size_t>(len) > length_) {
-            return "";
-        }
-        std::string result(reinterpret_cast<const char*>(data_ + pos_), len);
-        pos_ += len;
-        return result;
-    }
-
-    bool hasRemaining() const { return pos_ < length_; }
-    size_t remaining() const { return length_ - pos_; }
-
-private:
-    const uint8_t* data_;
-    size_t length_;
-    size_t pos_;
-};
-
-// 字符串转小写
-void toLower(std::string& s) {
-    for (auto& c : s) {
-        c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
-    }
-}
-
-} // anonymous namespace
-
-AniParseResult AniBinaryParser::parse(const uint8_t* data, size_t length) {
-    AniParseResult result;
-    result.clip = AnimationClip::create();
-
-    if (!data || length < 4) {
-        result.success = false;
-        result.errorMessage = "Invalid binary ANI data";
-        return result;
-    }
-
-    BufferReader reader(data, length);
-
-    // 读取帧数和资源数
-    uint16_t frameCount = reader.read<uint16_t>();
-    uint16_t resourceCount = reader.read<uint16_t>();
-
-    // 读取精灵路径列表
-    std::vector<std::string> sprites;
-    sprites.reserve(resourceCount);
-    for (uint16_t i = 0; i < resourceCount; ++i) {
-        int32_t len = reader.read<int32_t>();
-        std::string path = reader.readAsciiString(len);
-        toLower(path);
-        sprites.push_back(std::move(path));
-    }
-
-    // 读取全局参数
-    uint16_t globalParamCount = reader.read<uint16_t>();
-    for (uint16_t j = 0; j < globalParamCount; ++j) {
-        uint16_t type = reader.read<uint16_t>();
-        switch (type) {
-        case static_cast<uint16_t>(AniNodeType::Loop):
-            if (reader.read<int8_t>()) {
-                result.clip->setLooping(true);
-            }
-            break;
-        case static_cast<uint16_t>(AniNodeType::Shadow):
-            if (reader.read<int8_t>()) {
-                result.clip->globalProperties().set(FramePropertyKey::Shadow, true);
-            }
-            break;
-        default:
-            break;
-        }
-    }
-
-    // 逐帧解析
-    for (uint16_t i = 0; i < frameCount; ++i) {
-        AnimationFrame frame;
-
-        // 碰撞盒
-        uint16_t boxCount = reader.read<uint16_t>();
-        for (uint16_t j = 0; j < boxCount; ++j) {
-            uint16_t boxType = reader.read<uint16_t>();
-            std::array<int32_t, 6> box;
-            for (int m = 0; m < 6; ++m) {
-                box[m] = reader.read<int32_t>();
-            }
-            if (boxType == static_cast<uint16_t>(AniNodeType::DamageBox)) {
-                frame.damageBoxes.push_back(box);
-            } else if (boxType == static_cast<uint16_t>(AniNodeType::AttackBox)) {
-                frame.attackBoxes.push_back(box);
-            }
-        }
-
-        // 图片 ID 和参数
-        uint16_t imgId = reader.read<uint16_t>();
-        uint16_t imgParam = reader.read<uint16_t>();
-        (void)imgParam;
-
-        if (imgId < sprites.size()) {
-            frame.texturePath = sprites[imgId];
-            frame.textureIndex = imgId;
-
-            std::string resolvedPath = resolvePath(frame.texturePath);
-            auto spriteFrame = SpriteFrameCache::getInstance()
-                .getOrCreateFromFile(resolvedPath, frame.textureIndex);
-            frame.spriteFrame = spriteFrame;
-        }
-
-        // 位置
-        frame.offset = Vec2(
-            static_cast<float>(reader.read<int32_t>()),
-            static_cast<float>(reader.read<int32_t>())
-        );
-
-        // 帧属性
-        uint16_t propertyCount = reader.read<uint16_t>();
-        for (uint16_t m = 0; m < propertyCount; ++m) {
-            uint16_t propType = reader.read<uint16_t>();
-            AniNodeType nodeType = static_cast<AniNodeType>(propType);
-
-            switch (nodeType) {
-            case AniNodeType::Loop:
-                frame.properties.set(FramePropertyKey::Loop,
-                    static_cast<bool>(reader.read<int8_t>()));
-                break;
-
-            case AniNodeType::Shadow:
-                frame.properties.set(FramePropertyKey::Shadow,
-                    static_cast<bool>(reader.read<int8_t>()));
-                break;
-
-            case AniNodeType::Interpolation:
-                frame.properties.withInterpolation(
-                    static_cast<bool>(reader.read<int8_t>()));
-                break;
-
-            case AniNodeType::Coord:
-                frame.properties.set(FramePropertyKey::Coord,
-                    static_cast<int>(reader.read<uint16_t>()));
-                break;
-
-            case AniNodeType::ImageRate: {
-                float rateX = reader.read<float>();
-                float rateY = reader.read<float>();
-                frame.properties.withImageRate(Vec2(rateX, rateY));
-                break;
-            }
-
-            case AniNodeType::ImageRotate:
-                frame.properties.withImageRotate(
-                    static_cast<float>(reader.read<int32_t>()));
-                break;
-
-            case AniNodeType::RGBA: {
-                uint32_t rgba = reader.read<uint32_t>();
-                uint8_t a = static_cast<uint8_t>((rgba >> 24) & 0xFF);
-                uint8_t r = static_cast<uint8_t>((rgba >> 16) & 0xFF);
-                uint8_t g = static_cast<uint8_t>((rgba >> 8)  & 0xFF);
-                uint8_t b = static_cast<uint8_t>((rgba)       & 0xFF);
-                frame.properties.withColorTint(Color::fromRGBA(r, g, b, a));
-                break;
-            }
-
-            case AniNodeType::GraphicEffect: {
-                uint16_t effectType = reader.read<uint16_t>();
-                frame.properties.set(FramePropertyKey::GraphicEffect,
-                    static_cast<int>(effectType));
-                // MONOCHROME 额外读取 rgb
-                if (effectType == 5) {
-                    reader.read<uint8_t>(); // r
-                    reader.read<uint8_t>(); // g
-                    reader.read<uint8_t>(); // b
-                }
-                // SPACEDISTORT 额外读取 pos
-                else if (effectType == 6) {
-                    reader.read<uint16_t>(); // x
-                    reader.read<uint16_t>(); // y
-                }
-                break;
-            }
-
-            case AniNodeType::Delay:
-                frame.delay = static_cast<float>(reader.read<int32_t>());
-                break;
-
-            case AniNodeType::DamageType:
-                frame.properties.set(FramePropertyKey::DamageType,
-                    static_cast<int>(reader.read<uint16_t>()));
-                break;
-
-            case AniNodeType::PlaySound: {
-                int32_t len = reader.read<int32_t>();
-                std::string soundPath = reader.readAsciiString(len);
-                frame.properties.withPlaySound(resolvePath(soundPath));
-                break;
-            }
-
-            case AniNodeType::SetFlag:
-                frame.properties.withSetFlag(reader.read<int32_t>());
-                break;
-
-            case AniNodeType::FlipType:
-                frame.properties.set(FramePropertyKey::FlipType,
-                    static_cast<int>(reader.read<uint16_t>()));
-                break;
-
-            case AniNodeType::LoopStart:
-                frame.properties.set(FramePropertyKey::LoopStart, true);
-                break;
-
-            case AniNodeType::LoopEnd:
-                frame.properties.set(FramePropertyKey::LoopEnd,
-                    reader.read<int32_t>());
-                break;
-
-            case AniNodeType::Clip: {
-                std::vector<int> clipRegion = {
-                    static_cast<int>(reader.read<int16_t>()),
-                    static_cast<int>(reader.read<int16_t>()),
-                    static_cast<int>(reader.read<int16_t>()),
-                    static_cast<int>(reader.read<int16_t>())
-                };
-                frame.properties.set(FramePropertyKey::ClipRegion, clipRegion);
-                break;
-            }
-
-            default:
-                // 未知类型 - 跳过
-                break;
-            }
-        }
-
-        result.clip->addFrame(std::move(frame));
-    }
-
-    result.success = true;
-    return result;
-}
-
-AniParseResult AniBinaryParser::parseFromFile(const std::string& filePath) {
-    std::ifstream file(filePath, std::ios::binary | std::ios::ate);
-    if (!file.is_open()) {
-        AniParseResult result;
-        result.success = false;
-        result.errorMessage = "Cannot open binary ANI file: " + filePath;
-        return result;
-    }
-
-    auto size = file.tellg();
-    file.seekg(0, std::ios::beg);
-
-    std::vector<uint8_t> buffer(static_cast<size_t>(size));
-    file.read(reinterpret_cast<char*>(buffer.data()), size);
-    file.close();
-
-    // 提取基础路径
-    auto lastSlash = filePath.find_last_of("/\\");
-    if (lastSlash != std::string::npos && basePath_.empty()) {
-        basePath_ = filePath.substr(0, lastSlash);
-    }
-
-    auto result = parse(buffer.data(), buffer.size());
-
-    if (result.clip) {
-        result.clip->setSourcePath(filePath);
-        std::string name = (lastSlash != std::string::npos)
-            ? filePath.substr(lastSlash + 1)
-            : filePath;
-        result.clip->setName(name);
-    }
-
-    return result;
-}
-
-std::string AniBinaryParser::resolvePath(const std::string& relativePath) const {
-    std::string resolved = relativePath;
-    if (pathResolver_) {
-        resolved = pathResolver_(relativePath);
-    }
-
-    if (!basePath_.empty() && !resolved.empty() && resolved[0] != '/') {
-        if (resolved.size() < 2 || resolved[1] != ':') {
-            resolved = basePath_ + "/" + resolved;
-        }
-    }
-
-    return resolved;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/ani_parser.cpp b/Easy2D/src/animation/ani_parser.cpp
deleted file mode 100644
index 39d6a13..0000000
--- a/Easy2D/src/animation/ani_parser.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-#include <easy2d/animation/ani_parser.h>
-#include <easy2d/animation/sprite_frame_cache.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-#include <sstream>
-#include <algorithm>
-#include <cctype>
-
-namespace easy2d {
-
-namespace {
-
-std::string trim(const std::string& s) {
-    auto start = s.find_first_not_of(" \t\r\n");
-    if (start == std::string::npos) return "";
-    auto end = s.find_last_not_of(" \t\r\n");
-    return s.substr(start, end - start + 1);
-}
-
-std::string stripBackticks(const std::string& s) {
-    std::string t = trim(s);
-    if (t.size() >= 2 && t.front() == '`' && t.back() == '`') {
-        return t.substr(1, t.size() - 2);
-    }
-    return t;
-}
-
-std::vector<std::string> splitWhitespace(const std::string& s) {
-    std::vector<std::string> tokens;
-    std::istringstream iss(s);
-    std::string token;
-    while (iss >> token) {
-        tokens.push_back(token);
-    }
-    return tokens;
-}
-
-bool lineStartsWith(const std::string& trimmed, const std::string& tag) {
-    return trimmed.find(tag) == 0;
-}
-
-std::string valueAfterTag(const std::string& trimmed, const std::string& tag) {
-    auto pos = trimmed.find(tag);
-    if (pos == std::string::npos) return "";
-    return trim(trimmed.substr(pos + tag.size()));
-}
-
-// 读取标签后的值，如果同行没有则从流中读取下一行
-std::string readValue(const std::string& trimmed, const std::string& tag,
-                      std::istringstream& stream) {
-    std::string val = valueAfterTag(trimmed, tag);
-    if (val.empty()) {
-        std::string nextLine;
-        if (std::getline(stream, nextLine)) {
-            val = trim(nextLine);
-        }
-    }
-    return val;
-}
-
-} // anonymous namespace
-
-AniParseResult AniParser::parse(const std::string& filePath) {
-    AniParseResult result;
-
-    std::ifstream file(filePath);
-    if (!file.is_open()) {
-        result.success = false;
-        result.errorMessage = "Cannot open ANI file: " + filePath;
-        return result;
-    }
-
-    std::string content((std::istreambuf_iterator<char>(file)),
-                         std::istreambuf_iterator<char>());
-    file.close();
-
-    // 提取基础路径
-    auto lastSlash = filePath.find_last_of("/\\");
-    std::string basePath;
-    if (lastSlash != std::string::npos) {
-        basePath = filePath.substr(0, lastSlash);
-    }
-
-    if (basePath_.empty() && !basePath.empty()) {
-        basePath_ = basePath;
-    }
-
-    result = parseFromMemory(content, basePath_.empty() ? basePath : basePath_);
-
-    if (result.clip) {
-        result.clip->setSourcePath(filePath);
-        std::string name = (lastSlash != std::string::npos)
-            ? filePath.substr(lastSlash + 1)
-            : filePath;
-        result.clip->setName(name);
-    }
-
-    return result;
-}
-
-AniParseResult AniParser::parseFromMemory(const std::string& content,
-                                            const std::string& basePath) {
-    AniParseResult result;
-    result.clip = AnimationClip::create();
-
-    if (!basePath.empty() && basePath_.empty()) {
-        basePath_ = basePath;
-    }
-
-    std::istringstream stream(content);
-    std::string line;
-
-    AnimationFrame currentFrame;
-    bool inFrame = false;
-    bool hasCurrentFrame = false;
-
-    // [IMAGE] 标签的多行读取状态
-    bool pendingImage = false;
-    std::string imagePath;
-
-    auto finalizeFrame = [&]() {
-        if (!hasCurrentFrame) return;
-        if (!currentFrame.texturePath.empty()) {
-            std::string resolvedPath = resolvePath(currentFrame.texturePath);
-            auto spriteFrame = SpriteFrameCache::getInstance()
-                .getOrCreateFromFile(resolvedPath, currentFrame.textureIndex);
-            currentFrame.spriteFrame = spriteFrame;
-        }
-        result.clip->addFrame(std::move(currentFrame));
-        currentFrame = AnimationFrame();
-        hasCurrentFrame = false;
-    };
-
-    while (std::getline(stream, line)) {
-        std::string trimmed = trim(line);
-
-        if (trimmed.empty()) continue;
-        if (trimmed[0] == '#') continue;
-
-        // [FRAME MAX]
-        if (lineStartsWith(trimmed, "[FRAME MAX]")) {
-            readValue(trimmed, "[FRAME MAX]", stream);
-            continue;
-        }
-
-        // [FRAMEXXX] - 新帧开始
-        if (trimmed.size() >= 7 && trimmed.substr(0, 6) == "[FRAME" &&
-            trimmed.back() == ']' && !lineStartsWith(trimmed, "[FRAME MAX]")) {
-            finalizeFrame();
-            currentFrame = AnimationFrame();
-            inFrame = true;
-            hasCurrentFrame = true;
-            pendingImage = false;
-            continue;
-        }
-
-        if (!inFrame) {
-            // 全局属性
-            if (lineStartsWith(trimmed, "[LOOP]")) {
-                result.clip->setLooping(true);
-            } else if (lineStartsWith(trimmed, "[SHADOW]")) {
-                result.clip->globalProperties().set(FramePropertyKey::Shadow, true);
-            }
-            continue;
-        }
-
-        // === 帧内属性解析 ===
-
-        // [IMAGE] - 图片路径和索引（跨行）
-        if (lineStartsWith(trimmed, "[IMAGE]")) {
-            std::string val = valueAfterTag(trimmed, "[IMAGE]");
-            if (!val.empty()) {
-                auto tokens = splitWhitespace(val);
-                imagePath = stripBackticks(tokens[0]);
-                if (tokens.size() >= 2) {
-                    currentFrame.texturePath = imagePath;
-                    currentFrame.textureIndex = std::stoi(tokens[1]);
-                    pendingImage = false;
-                } else {
-                    pendingImage = true;
-                }
-            } else {
-                pendingImage = true;
-                imagePath.clear();
-            }
-            continue;
-        }
-
-        // [IMAGE] 后续行
-        if (pendingImage) {
-            if (imagePath.empty()) {
-                imagePath = stripBackticks(trimmed);
-            } else {
-                currentFrame.texturePath = imagePath;
-                currentFrame.textureIndex = std::stoi(trimmed);
-                pendingImage = false;
-            }
-            continue;
-        }
-
-        // [IMAGE POS]
-        if (lineStartsWith(trimmed, "[IMAGE POS]")) {
-            std::string val = readValue(trimmed, "[IMAGE POS]", stream);
-            auto tokens = splitWhitespace(val);
-            if (tokens.size() >= 2) {
-                currentFrame.offset = Vec2(
-                    static_cast<float>(std::stoi(tokens[0])),
-                    static_cast<float>(std::stoi(tokens[1]))
-                );
-            }
-            continue;
-        }
-
-        // [DELAY]
-        if (lineStartsWith(trimmed, "[DELAY]")) {
-            std::string val = readValue(trimmed, "[DELAY]", stream);
-            currentFrame.delay = static_cast<float>(std::stoi(trim(val)));
-            continue;
-        }
-
-        // [DAMAGE TYPE]
-        if (lineStartsWith(trimmed, "[DAMAGE TYPE]")) {
-            std::string val = readValue(trimmed, "[DAMAGE TYPE]", stream);
-            val = stripBackticks(val);
-            int damageType = 0;
-            if (val == "SUPERARMOR") damageType = 1;
-            else if (val == "UNBREAKABLE") damageType = 2;
-            currentFrame.properties.set(FramePropertyKey::DamageType, damageType);
-            continue;
-        }
-
-        // [DAMAGE BOX]
-        if (lineStartsWith(trimmed, "[DAMAGE BOX]")) {
-            std::string val = readValue(trimmed, "[DAMAGE BOX]", stream);
-            auto tokens = splitWhitespace(val);
-            if (tokens.size() >= 6) {
-                std::array<int32_t, 6> box;
-                for (int i = 0; i < 6; ++i) {
-                    box[i] = std::stoi(tokens[i]);
-                }
-                currentFrame.damageBoxes.push_back(box);
-            }
-            continue;
-        }
-
-        // [ATTACK BOX]
-        if (lineStartsWith(trimmed, "[ATTACK BOX]")) {
-            std::string val = readValue(trimmed, "[ATTACK BOX]", stream);
-            auto tokens = splitWhitespace(val);
-            if (tokens.size() >= 6) {
-                std::array<int32_t, 6> box;
-                for (int i = 0; i < 6; ++i) {
-                    box[i] = std::stoi(tokens[i]);
-                }
-                currentFrame.attackBoxes.push_back(box);
-            }
-            continue;
-        }
-
-        // [SET FLAG]
-        if (lineStartsWith(trimmed, "[SET FLAG]")) {
-            std::string val = readValue(trimmed, "[SET FLAG]", stream);
-            currentFrame.properties.withSetFlag(std::stoi(trim(val)));
-            continue;
-        }
-
-        // [PLAY SOUND]
-        if (lineStartsWith(trimmed, "[PLAY SOUND]")) {
-            std::string val = readValue(trimmed, "[PLAY SOUND]", stream);
-            currentFrame.properties.withPlaySound(resolvePath(stripBackticks(val)));
-            continue;
-        }
-
-        // [IMAGE RATE]
-        if (lineStartsWith(trimmed, "[IMAGE RATE]")) {
-            std::string val = readValue(trimmed, "[IMAGE RATE]", stream);
-            auto tokens = splitWhitespace(val);
-            if (tokens.size() >= 2) {
-                currentFrame.properties.withImageRate(Vec2(
-                    std::stof(tokens[0]), std::stof(tokens[1])
-                ));
-            }
-            continue;
-        }
-
-        // [IMAGE ROTATE]
-        if (lineStartsWith(trimmed, "[IMAGE ROTATE]")) {
-            std::string val = readValue(trimmed, "[IMAGE ROTATE]", stream);
-            currentFrame.properties.withImageRotate(std::stof(trim(val)));
-            continue;
-        }
-
-        // [RGBA]
-        if (lineStartsWith(trimmed, "[RGBA]")) {
-            std::string val = readValue(trimmed, "[RGBA]", stream);
-            auto tokens = splitWhitespace(val);
-            if (tokens.size() >= 4) {
-                Color color = Color::fromRGBA(
-                    static_cast<uint8_t>(std::stoi(tokens[0])),
-                    static_cast<uint8_t>(std::stoi(tokens[1])),
-                    static_cast<uint8_t>(std::stoi(tokens[2])),
-                    static_cast<uint8_t>(std::stoi(tokens[3]))
-                );
-                currentFrame.properties.withColorTint(color);
-            }
-            continue;
-        }
-
-        // [INTERPOLATION]
-        if (lineStartsWith(trimmed, "[INTERPOLATION]")) {
-            currentFrame.properties.withInterpolation(true);
-            continue;
-        }
-
-        // [LOOP]
-        if (lineStartsWith(trimmed, "[LOOP]")) {
-            currentFrame.properties.set(FramePropertyKey::Loop, true);
-            continue;
-        }
-
-        // [SHADOW]
-        if (lineStartsWith(trimmed, "[SHADOW]")) {
-            currentFrame.properties.set(FramePropertyKey::Shadow, true);
-            continue;
-        }
-
-        // [FLIP TYPE]
-        if (lineStartsWith(trimmed, "[FLIP TYPE]")) {
-            std::string val = readValue(trimmed, "[FLIP TYPE]", stream);
-            val = stripBackticks(val);
-            int flipType = 0;
-            if (val == "HORIZON") flipType = 1;
-            else if (val == "VERTICAL") flipType = 2;
-            else if (val == "ALL") flipType = 3;
-            else flipType = std::stoi(val);
-            currentFrame.properties.set(FramePropertyKey::FlipType, flipType);
-            continue;
-        }
-
-        // [COORD]
-        if (lineStartsWith(trimmed, "[COORD]")) {
-            std::string val = readValue(trimmed, "[COORD]", stream);
-            currentFrame.properties.set(FramePropertyKey::Coord, std::stoi(trim(val)));
-            continue;
-        }
-
-        // [GRAPHIC EFFECT]
-        if (lineStartsWith(trimmed, "[GRAPHIC EFFECT]")) {
-            std::string val = readValue(trimmed, "[GRAPHIC EFFECT]", stream);
-            val = stripBackticks(val);
-            int effectType = 0;
-            if (val == "DODGE") effectType = 1;
-            else if (val == "LINEARDODGE") effectType = 2;
-            else if (val == "DARK") effectType = 3;
-            else if (val == "XOR") effectType = 4;
-            else if (val == "MONOCHROME") effectType = 5;
-            else if (val == "SPACEDISTORT") effectType = 6;
-            else effectType = std::stoi(val);
-            currentFrame.properties.set(FramePropertyKey::GraphicEffect, effectType);
-            continue;
-        }
-
-        // [CLIP]
-        if (lineStartsWith(trimmed, "[CLIP]")) {
-            std::string val = readValue(trimmed, "[CLIP]", stream);
-            auto tokens = splitWhitespace(val);
-            if (tokens.size() >= 4) {
-                std::vector<int> clipRegion = {
-                    std::stoi(tokens[0]), std::stoi(tokens[1]),
-                    std::stoi(tokens[2]), std::stoi(tokens[3])
-                };
-                currentFrame.properties.set(FramePropertyKey::ClipRegion, clipRegion);
-            }
-            continue;
-        }
-
-        // [LOOP START]
-        if (lineStartsWith(trimmed, "[LOOP START]")) {
-            currentFrame.properties.set(FramePropertyKey::LoopStart, true);
-            continue;
-        }
-
-        // [LOOP END]
-        if (lineStartsWith(trimmed, "[LOOP END]")) {
-            std::string val = readValue(trimmed, "[LOOP END]", stream);
-            currentFrame.properties.set(FramePropertyKey::LoopEnd, std::stoi(trim(val)));
-            continue;
-        }
-
-        // 未识别标签 - 静默忽略
-    }
-
-    // 保存最后一帧
-    finalizeFrame();
-
-    result.success = true;
-    return result;
-}
-
-std::string AniParser::resolvePath(const std::string& relativePath) const {
-    std::string resolved = relativePath;
-    if (pathResolver_) {
-        resolved = pathResolver_(relativePath);
-    }
-
-    if (!basePath_.empty() && !resolved.empty() && resolved[0] != '/') {
-        if (resolved.size() < 2 || resolved[1] != ':') {
-            resolved = basePath_ + "/" + resolved;
-        }
-    }
-
-    return resolved;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/animated_sprite.cpp b/Easy2D/src/animation/animated_sprite.cpp
deleted file mode 100644
index 59ffa09..0000000
--- a/Easy2D/src/animation/animated_sprite.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-#include <easy2d/animation/animated_sprite.h>
-#include <easy2d/animation/interpolation_engine.h>
-
-namespace easy2d {
-
-const std::vector<std::array<int32_t, 6>> AnimatedSprite::emptyBoxes_;
-const std::string AnimatedSprite::emptyString_;
-
-AnimatedSprite::AnimatedSprite() {
-    controller_.setFrameChangeCallback(
-        [this](size_t oldIdx, size_t newIdx, const AnimationFrame& frame) {
-            onFrameChanged(oldIdx, newIdx, frame);
-        });
-}
-
-// ------ 静态工厂 ------
-
-Ptr<AnimatedSprite> AnimatedSprite::create() {
-    return makePtr<AnimatedSprite>();
-}
-
-Ptr<AnimatedSprite> AnimatedSprite::create(Ptr<AnimationClip> clip) {
-    auto sprite = makePtr<AnimatedSprite>();
-    sprite->setAnimationClip(std::move(clip));
-    return sprite;
-}
-
-Ptr<AnimatedSprite> AnimatedSprite::create(const std::string& aniFilePath) {
-    auto sprite = makePtr<AnimatedSprite>();
-    sprite->loadAnimation(aniFilePath);
-    return sprite;
-}
-
-// ------ 动画绑定 ------
-
-void AnimatedSprite::setAnimationClip(Ptr<AnimationClip> clip) {
-    controller_.setClip(clip);
-    if (clip && !clip->empty()) {
-        applyFrame(clip->getFrame(0));
-    }
-}
-
-void AnimatedSprite::loadAnimation(const std::string& aniFilePath) {
-    auto clip = AnimationCache::getInstance().loadClip(aniFilePath);
-    if (clip) {
-        setAnimationClip(clip);
-    }
-}
-
-Ptr<AnimationClip> AnimatedSprite::getAnimationClip() const {
-    return controller_.getClip();
-}
-
-// ------ 动画字典 ------
-
-void AnimatedSprite::addAnimation(const std::string& name, Ptr<AnimationClip> clip) {
-    if (clip) {
-        animations_[name] = std::move(clip);
-    }
-}
-
-void AnimatedSprite::play(const std::string& name, bool loop) {
-    auto it = animations_.find(name);
-    if (it == animations_.end()) return;
-
-    currentAnimationName_ = name;
-    // 精灵图动画不应覆盖节点的 position/scale/rotation
-    applyFrameTransform_ = false;
-    setAnimationClip(it->second);
-    setLooping(loop);
-    play();
-}
-
-bool AnimatedSprite::hasAnimation(const std::string& name) const {
-    return animations_.find(name) != animations_.end();
-}
-
-Ptr<AnimationClip> AnimatedSprite::getAnimation(const std::string& name) const {
-    auto it = animations_.find(name);
-    if (it != animations_.end()) return it->second;
-    return nullptr;
-}
-
-const std::string& AnimatedSprite::getCurrentAnimationName() const {
-    return currentAnimationName_;
-}
-
-// ------ 播放控制 ------
-
-void AnimatedSprite::play() { controller_.play(); }
-void AnimatedSprite::pause() { controller_.pause(); }
-void AnimatedSprite::resume() { controller_.resume(); }
-void AnimatedSprite::stop() { controller_.stop(); }
-void AnimatedSprite::reset() { controller_.reset(); }
-bool AnimatedSprite::isPlaying() const { return controller_.isPlaying(); }
-bool AnimatedSprite::isPaused() const { return controller_.isPaused(); }
-bool AnimatedSprite::isStopped() const { return controller_.isStopped(); }
-
-// ------ 属性控制 ------
-
-void AnimatedSprite::setLooping(bool loop) { controller_.setLooping(loop); }
-bool AnimatedSprite::isLooping() const { return controller_.isLooping(); }
-void AnimatedSprite::setPlaybackSpeed(float speed) { controller_.setPlaybackSpeed(speed); }
-float AnimatedSprite::getPlaybackSpeed() const { return controller_.getPlaybackSpeed(); }
-
-// ------ 帧控制 ------
-
-void AnimatedSprite::setFrameIndex(size_t index) { controller_.setFrameIndex(index); }
-size_t AnimatedSprite::getCurrentFrameIndex() const { return controller_.getCurrentFrameIndex(); }
-size_t AnimatedSprite::getTotalFrames() const { return controller_.getTotalFrames(); }
-void AnimatedSprite::nextFrame() { controller_.nextFrame(); }
-void AnimatedSprite::prevFrame() { controller_.prevFrame(); }
-
-// ------ 帧范围限制 ------
-
-void AnimatedSprite::setFrameRange(int start, int end) {
-    frameRangeStart_ = start;
-    frameRangeEnd_ = end;
-    
-    // 确保当前帧在新的范围内
-    auto clip = controller_.getClip();
-    if (clip && !clip->empty()) {
-        size_t currentFrame = controller_.getCurrentFrameIndex();
-        size_t minFrame = static_cast<size_t>(start);
-        size_t maxFrame = (end < 0) ? clip->getFrameCount() - 1 : static_cast<size_t>(end);
-        
-        if (currentFrame < minFrame || currentFrame > maxFrame) {
-            controller_.setFrameIndex(minFrame);
-        }
-    }
-}
-
-std::pair<int, int> AnimatedSprite::getFrameRange() const {
-    return {frameRangeStart_, frameRangeEnd_};
-}
-
-void AnimatedSprite::clearFrameRange() {
-    frameRangeStart_ = 0;
-    frameRangeEnd_ = -1;
-}
-
-bool AnimatedSprite::hasFrameRange() const {
-    return frameRangeEnd_ >= 0;
-}
-
-// ------ 回调 ------
-
-void AnimatedSprite::setCompletionCallback(AnimationController::CompletionCallback cb) {
-    controller_.setCompletionCallback(std::move(cb));
-}
-
-void AnimatedSprite::setKeyframeCallback(AnimationController::KeyframeCallback cb) {
-    controller_.setKeyframeCallback(std::move(cb));
-}
-
-void AnimatedSprite::setSoundTriggerCallback(AnimationController::SoundTriggerCallback cb) {
-    controller_.setSoundTriggerCallback(std::move(cb));
-}
-
-// ------ 碰撞盒访问 ------
-
-const std::vector<std::array<int32_t, 6>>& AnimatedSprite::getCurrentDamageBoxes() const {
-    auto clip = controller_.getClip();
-    if (!clip || clip->empty()) return emptyBoxes_;
-    return clip->getFrame(controller_.getCurrentFrameIndex()).damageBoxes;
-}
-
-const std::vector<std::array<int32_t, 6>>& AnimatedSprite::getCurrentAttackBoxes() const {
-    auto clip = controller_.getClip();
-    if (!clip || clip->empty()) return emptyBoxes_;
-    return clip->getFrame(controller_.getCurrentFrameIndex()).attackBoxes;
-}
-
-// ------ 生命周期 ------
-
-void AnimatedSprite::onEnter() {
-    Sprite::onEnter();
-    if (autoPlay_ && controller_.getClip() && !controller_.getClip()->empty()) {
-        play();
-    }
-}
-
-void AnimatedSprite::onUpdate(float dt) {
-    Sprite::onUpdate(dt);
-    
-    // 保存更新前的帧索引
-    size_t prevFrameIdx = controller_.getCurrentFrameIndex();
-    
-    controller_.update(dt);
-    
-    // 应用帧范围限制
-    if (hasFrameRange() && controller_.isPlaying()) {
-        size_t currentFrame = controller_.getCurrentFrameIndex();
-        size_t minFrame = static_cast<size_t>(frameRangeStart_);
-        size_t maxFrame = static_cast<size_t>(frameRangeEnd_);
-        
-        auto clip = controller_.getClip();
-        if (clip && !clip->empty()) {
-            // 确保范围有效
-            if (maxFrame >= clip->getFrameCount()) {
-                maxFrame = clip->getFrameCount() - 1;
-            }
-            
-            // 如果超出范围，回到起始帧
-            if (currentFrame < minFrame || currentFrame > maxFrame) {
-                controller_.setFrameIndex(minFrame);
-            }
-        }
-    }
-
-    // 插值处理
-    if (controller_.isInterpolating()) {
-        auto clip = controller_.getClip();
-        if (clip) {
-            size_t idx = controller_.getCurrentFrameIndex();
-            if (idx + 1 < clip->getFrameCount()) {
-                auto props = InterpolationEngine::interpolate(
-                    clip->getFrame(idx),
-                    clip->getFrame(idx + 1),
-                    controller_.getInterpolationFactor());
-                // 仅更新插值属性，不覆盖帧纹理
-                Sprite::setColor(props.color);
-            }
-        }
-    }
-}
-
-// ------ 内部方法 ------
-
-void AnimatedSprite::onFrameChanged(size_t /*oldIdx*/, size_t /*newIdx*/,
-                                     const AnimationFrame& frame) {
-    applyFrame(frame);
-}
-
-void AnimatedSprite::applyFrame(const AnimationFrame& frame) {
-    // 更新纹理
-    if (frame.spriteFrame && frame.spriteFrame->isValid()) {
-        Sprite::setTexture(frame.spriteFrame->getTexture());
-        Sprite::setTextureRect(frame.spriteFrame->getRect());
-    }
-
-    // 帧变换仅在 ANI 动画模式下应用；精灵图模式跳过，避免覆盖节点世界坐标
-    if (applyFrameTransform_) {
-        // 应用帧偏移（作为精灵位置）
-        Node::setPosition(frame.offset);
-
-        // 应用缩放
-        Vec2 scale = frame.getEffectiveScale();
-        Node::setScale(scale);
-
-        // 应用旋转
-        float rotation = frame.getEffectiveRotation();
-        Node::setRotation(rotation);
-
-        // 应用翻转
-        auto flipType = frame.properties.get<int>(FramePropertyKey::FlipType);
-        if (flipType.has_value()) {
-            int flip = flipType.value();
-            Sprite::setFlipX(flip == 1 || flip == 3);
-            Sprite::setFlipY(flip == 2 || flip == 3);
-        } else {
-            Sprite::setFlipX(false);
-            Sprite::setFlipY(false);
-        }
-    }
-
-    // 颜色始终应用
-    Color color = frame.getEffectiveColor();
-    Sprite::setColor(color);
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/animation_cache.cpp b/Easy2D/src/animation/animation_cache.cpp
deleted file mode 100644
index ab0a1b0..0000000
--- a/Easy2D/src/animation/animation_cache.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include <easy2d/animation/animation_cache.h>
-#include <easy2d/animation/ani_parser.h>
-#include <easy2d/animation/ani_binary_parser.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-
-namespace easy2d {
-
-namespace {
-
-// 检测文件是否为文本格式 ANI
-// 文本格式以 '#' 或 '[' 开头（跳过空白后）
-bool isTextFormat(const std::string& filePath) {
-    std::ifstream file(filePath, std::ios::binary);
-    if (!file.is_open()) return false;
-
-    // 读取前几个字节判断
-    char buf[16] = {};
-    file.read(buf, sizeof(buf));
-    auto bytesRead = file.gcount();
-    file.close();
-
-    // 跳过 BOM 和空白
-    size_t pos = 0;
-    // UTF-8 BOM
-    if (bytesRead >= 3 &&
-        static_cast<uint8_t>(buf[0]) == 0xEF &&
-        static_cast<uint8_t>(buf[1]) == 0xBB &&
-        static_cast<uint8_t>(buf[2]) == 0xBF) {
-        pos = 3;
-    }
-
-    // 跳过空白
-    while (pos < static_cast<size_t>(bytesRead) &&
-           (buf[pos] == ' ' || buf[pos] == '\t' ||
-            buf[pos] == '\r' || buf[pos] == '\n')) {
-        ++pos;
-    }
-
-    if (pos >= static_cast<size_t>(bytesRead)) return false;
-
-    // 文本 ANI 文件以 '#' (注释/PVF_File) 或 '[' (标签) 开头
-    return buf[pos] == '#' || buf[pos] == '[';
-}
-
-} // anonymous namespace
-
-Ptr<AnimationClip> AnimationCache::loadClip(const std::string& aniFilePath) {
-    // 先检查缓存
-    {
-        std::lock_guard<std::mutex> lock(mutex_);
-        auto it = clips_.find(aniFilePath);
-        if (it != clips_.end()) {
-            return it->second;
-        }
-    }
-
-    // 提取基础路径
-    std::string basePath;
-    auto lastSlash = aniFilePath.find_last_of("/\\");
-    if (lastSlash != std::string::npos) {
-        basePath = aniFilePath.substr(0, lastSlash);
-    }
-
-    AniParseResult result;
-
-    if (isTextFormat(aniFilePath)) {
-        // 文本格式
-        AniParser parser;
-        if (pathResolver_) {
-            parser.setPathResolver(pathResolver_);
-        }
-        if (!basePath.empty()) {
-            parser.setBasePath(basePath);
-        }
-        result = parser.parse(aniFilePath);
-    } else {
-        // 二进制格式
-        AniBinaryParser parser;
-        if (pathResolver_) {
-            parser.setPathResolver(pathResolver_);
-        }
-        if (!basePath.empty()) {
-            parser.setBasePath(basePath);
-        }
-        result = parser.parseFromFile(aniFilePath);
-    }
-
-    if (!result.success || !result.clip) {
-        return nullptr;
-    }
-
-    // 添加到缓存
-    {
-        std::lock_guard<std::mutex> lock(mutex_);
-        clips_[aniFilePath] = result.clip;
-    }
-
-    return result.clip;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/animation_controller.cpp b/Easy2D/src/animation/animation_controller.cpp
deleted file mode 100644
index 4bacd22..0000000
--- a/Easy2D/src/animation/animation_controller.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-#include <easy2d/animation/animation_controller.h>
-#include <cassert>
-
-namespace easy2d {
-
-void AnimationController::setClip(Ptr<AnimationClip> clip) {
-    clip_ = std::move(clip);
-    currentFrameIndex_ = 0;
-    accumulatedTime_ = 0.0f;
-    interpolating_ = false;
-    interpolationFactor_ = 0.0f;
-    state_ = AnimPlayState::Stopped;
-}
-
-void AnimationController::play() {
-    if (!clip_ || clip_->empty()) return;
-    state_ = AnimPlayState::Playing;
-}
-
-void AnimationController::pause() {
-    if (state_ == AnimPlayState::Playing) {
-        state_ = AnimPlayState::Paused;
-    }
-}
-
-void AnimationController::resume() {
-    if (state_ == AnimPlayState::Paused) {
-        state_ = AnimPlayState::Playing;
-    }
-}
-
-void AnimationController::stop() {
-    state_ = AnimPlayState::Stopped;
-    accumulatedTime_ = 0.0f;
-    interpolating_ = false;
-    interpolationFactor_ = 0.0f;
-}
-
-void AnimationController::reset() {
-    stop();
-    if (clip_ && !clip_->empty()) {
-        advanceFrame(0);
-    }
-}
-
-void AnimationController::setFrameIndex(size_t index) {
-    if (!clip_ || index >= clip_->getFrameCount()) return;
-    accumulatedTime_ = 0.0f;
-    advanceFrame(index);
-}
-
-void AnimationController::nextFrame() {
-    if (!clip_ || clip_->empty()) return;
-    size_t next = currentFrameIndex_ + 1;
-    if (next >= clip_->getFrameCount()) {
-        if (isLooping()) {
-            next = 0;
-        } else {
-            return;
-        }
-    }
-    accumulatedTime_ = 0.0f;
-    advanceFrame(next);
-}
-
-void AnimationController::prevFrame() {
-    if (!clip_ || clip_->empty()) return;
-    if (currentFrameIndex_ > 0) {
-        accumulatedTime_ = 0.0f;
-        advanceFrame(currentFrameIndex_ - 1);
-    } else if (isLooping()) {
-        accumulatedTime_ = 0.0f;
-        advanceFrame(clip_->getFrameCount() - 1);
-    }
-}
-
-void AnimationController::update(float dt) {
-    if (state_ != AnimPlayState::Playing) return;
-    if (!clip_ || clip_->empty()) return;
-
-    // 累加时间（转换为毫秒）
-    float dt_ms = dt * 1000.0f * playbackSpeed_;
-    accumulatedTime_ += dt_ms;
-
-    const AnimationFrame& currentFrame = clip_->getFrame(currentFrameIndex_);
-    float frameDelay = currentFrame.delay;
-
-    // 更新插值状态
-    updateInterpolation();
-
-    // 循环处理：支持一次跳过多帧（与原始 ANI 系统行为一致）
-    while (accumulatedTime_ >= frameDelay) {
-        accumulatedTime_ -= frameDelay;
-
-        size_t totalFrames = clip_->getFrameCount();
-
-        if (currentFrameIndex_ < totalFrames - 1) {
-            // 推进到下一帧
-            advanceFrame(currentFrameIndex_ + 1);
-        } else {
-            // 最后一帧播放完毕
-            if (isLooping()) {
-                advanceFrame(0);
-            } else {
-                // 动画结束
-                state_ = AnimPlayState::Stopped;
-                if (onComplete_) {
-                    onComplete_();
-                }
-                return;
-            }
-        }
-
-        // 更新下一帧的延迟
-        frameDelay = clip_->getFrame(currentFrameIndex_).delay;
-    }
-
-    // 更新插值因子
-    updateInterpolation();
-}
-
-size_t AnimationController::getTotalFrames() const {
-    return clip_ ? clip_->getFrameCount() : 0;
-}
-
-const AnimationFrame& AnimationController::getCurrentFrame() const {
-    assert(clip_ && currentFrameIndex_ < clip_->getFrameCount());
-    return clip_->getFrame(currentFrameIndex_);
-}
-
-bool AnimationController::isLooping() const {
-    if (hasLoopOverride_) return loopOverride_;
-    return clip_ ? clip_->isLooping() : false;
-}
-
-void AnimationController::setLooping(bool loop) {
-    hasLoopOverride_ = true;
-    loopOverride_ = loop;
-}
-
-void AnimationController::advanceFrame(size_t newIndex) {
-    if (!clip_ || newIndex >= clip_->getFrameCount()) return;
-
-    size_t oldIndex = currentFrameIndex_;
-    currentFrameIndex_ = newIndex;
-
-    const AnimationFrame& frame = clip_->getFrame(newIndex);
-
-    // 触发帧变更回调
-    if (onFrameChange_) {
-        onFrameChange_(oldIndex, newIndex, frame);
-    }
-
-    // 处理帧属性（关键帧、音效等）
-    processFrameProperties(frame);
-}
-
-void AnimationController::processFrameProperties(const AnimationFrame& frame) {
-    const auto& props = frame.properties;
-
-    // 关键帧回调
-    if (props.has(FramePropertyKey::SetFlag)) {
-        auto flagIndex = props.get<int>(FramePropertyKey::SetFlag);
-        if (flagIndex.has_value() && onKeyframe_) {
-            onKeyframe_(flagIndex.value());
-        }
-    }
-
-    // 音效触发
-    if (props.has(FramePropertyKey::PlaySound)) {
-        auto soundPath = props.get<std::string>(FramePropertyKey::PlaySound);
-        if (soundPath.has_value() && onSoundTrigger_) {
-            onSoundTrigger_(soundPath.value());
-        }
-    }
-}
-
-void AnimationController::updateInterpolation() {
-    if (!clip_ || clip_->empty()) {
-        interpolating_ = false;
-        interpolationFactor_ = 0.0f;
-        return;
-    }
-
-    const AnimationFrame& currentFrame = clip_->getFrame(currentFrameIndex_);
-
-    if (currentFrame.hasInterpolation() &&
-        currentFrameIndex_ + 1 < clip_->getFrameCount()) {
-        interpolating_ = true;
-        float frameDelay = currentFrame.delay;
-        interpolationFactor_ = (frameDelay > 0.0f)
-            ? math::clamp(accumulatedTime_ / frameDelay, 0.0f, 1.0f)
-            : 0.0f;
-    } else {
-        interpolating_ = false;
-        interpolationFactor_ = 0.0f;
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/animation_node.cpp b/Easy2D/src/animation/animation_node.cpp
deleted file mode 100644
index 72761d0..0000000
--- a/Easy2D/src/animation/animation_node.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-#include <easy2d/animation/animation_node.h>
-#include <easy2d/animation/interpolation_engine.h>
-
-namespace easy2d {
-
-const std::vector<std::array<int32_t, 6>> AnimationNode::emptyBoxes_;
-
-// ============================================================================
-// 构造
-// ============================================================================
-
-AnimationNode::AnimationNode() {
-    setupControllerCallbacks();
-}
-
-// ============================================================================
-// 静态工厂
-// ============================================================================
-
-Ptr<AnimationNode> AnimationNode::create() {
-    return makePtr<AnimationNode>();
-}
-
-Ptr<AnimationNode> AnimationNode::create(Ptr<AnimationClip> clip) {
-    auto node = makePtr<AnimationNode>();
-    node->setClip(std::move(clip));
-    return node;
-}
-
-Ptr<AnimationNode> AnimationNode::create(const std::string& aniFilePath) {
-    auto node = makePtr<AnimationNode>();
-    node->loadFromFile(aniFilePath);
-    return node;
-}
-
-// ============================================================================
-// 动画数据
-// ============================================================================
-
-void AnimationNode::setClip(Ptr<AnimationClip> clip) {
-    controller_.setClip(clip);
-    if (clip && !clip->empty()) {
-        // 预加载所有帧的 SpriteFrame
-        std::vector<AnimationFrame> frames;
-        frames.reserve(clip->getFrameCount());
-        for (size_t i = 0; i < clip->getFrameCount(); ++i) {
-            frames.push_back(clip->getFrame(i));
-        }
-        frameRenderer_.preloadFrames(frames);
-    } else {
-        frameRenderer_.releaseFrames();
-    }
-}
-
-Ptr<AnimationClip> AnimationNode::getClip() const {
-    return controller_.getClip();
-}
-
-bool AnimationNode::loadFromFile(const std::string& aniFilePath) {
-    auto clip = AnimationCache::getInstance().loadClip(aniFilePath);
-    if (clip) {
-        setClip(clip);
-        return true;
-    }
-    return false;
-}
-
-// ============================================================================
-// 播放控制
-// ============================================================================
-
-void AnimationNode::play()   { controller_.play(); }
-void AnimationNode::pause()  { controller_.pause(); }
-void AnimationNode::resume() { controller_.resume(); }
-void AnimationNode::stop()   { controller_.stop(); }
-void AnimationNode::reset()  { controller_.reset(); }
-
-bool AnimationNode::isPlaying() const { return controller_.isPlaying(); }
-bool AnimationNode::isPaused()  const { return controller_.isPaused(); }
-bool AnimationNode::isStopped() const { return controller_.isStopped(); }
-
-void AnimationNode::setPlaybackSpeed(float speed) { controller_.setPlaybackSpeed(speed); }
-float AnimationNode::getPlaybackSpeed() const { return controller_.getPlaybackSpeed(); }
-void AnimationNode::setLooping(bool loop) { controller_.setLooping(loop); }
-bool AnimationNode::isLooping() const { return controller_.isLooping(); }
-
-// ============================================================================
-// 帧控制
-// ============================================================================
-
-void AnimationNode::setFrameIndex(size_t index) { controller_.setFrameIndex(index); }
-size_t AnimationNode::getCurrentFrameIndex() const { return controller_.getCurrentFrameIndex(); }
-size_t AnimationNode::getTotalFrames() const { return controller_.getTotalFrames(); }
-
-// ============================================================================
-// 事件回调
-// ============================================================================
-
-void AnimationNode::setKeyframeCallback(KeyframeHitCallback callback) {
-    controller_.setKeyframeCallback([this, cb = std::move(callback)](int flagIndex) {
-        if (cb) cb(flagIndex);
-        AnimationEvent evt;
-        evt.type = AnimationEventType::KeyframeHit;
-        evt.frameIndex = controller_.getCurrentFrameIndex();
-        evt.keyframeFlag = flagIndex;
-        evt.source = this;
-        dispatchEvent(evt);
-    });
-}
-
-void AnimationNode::setCompletionCallback(AnimationCompleteCallback callback) {
-    controller_.setCompletionCallback([this, cb = std::move(callback)]() {
-        if (cb) cb();
-        AnimationEvent evt;
-        evt.type = AnimationEventType::AnimationEnd;
-        evt.frameIndex = controller_.getCurrentFrameIndex();
-        evt.source = this;
-        dispatchEvent(evt);
-    });
-}
-
-void AnimationNode::setFrameChangeCallback(AnimationController::FrameChangeCallback callback) {
-    // 保存外部回调，在 setupControllerCallbacks 中已设置内部回调
-    // 需要重新绑定，将两者合并
-    controller_.setFrameChangeCallback(
-        [this, cb = std::move(callback)](size_t oldIdx, size_t newIdx, const AnimationFrame& frame) {
-            if (cb) cb(oldIdx, newIdx, frame);
-            AnimationEvent evt;
-            evt.type = AnimationEventType::FrameChanged;
-            evt.frameIndex = newIdx;
-            evt.previousFrameIndex = oldIdx;
-            evt.source = this;
-            dispatchEvent(evt);
-        });
-}
-
-void AnimationNode::addEventListener(AnimationEventCallback callback) {
-    eventListeners_.push_back(std::move(callback));
-}
-
-// ============================================================================
-// 视觉属性
-// ============================================================================
-
-void AnimationNode::setTintColor(const Color& color) {
-    tintColor_ = color;
-}
-
-// ============================================================================
-// 碰撞盒
-// ============================================================================
-
-const std::vector<std::array<int32_t, 6>>& AnimationNode::getCurrentDamageBoxes() const {
-    auto clip = controller_.getClip();
-    if (!clip || clip->empty()) return emptyBoxes_;
-    return clip->getFrame(controller_.getCurrentFrameIndex()).damageBoxes;
-}
-
-const std::vector<std::array<int32_t, 6>>& AnimationNode::getCurrentAttackBoxes() const {
-    auto clip = controller_.getClip();
-    if (!clip || clip->empty()) return emptyBoxes_;
-    return clip->getFrame(controller_.getCurrentFrameIndex()).attackBoxes;
-}
-
-// ============================================================================
-// 查询
-// ============================================================================
-
-Size AnimationNode::getMaxFrameSize() const {
-    return frameRenderer_.getMaxFrameSize();
-}
-
-Rect AnimationNode::getBoundingBox() const {
-    Size size = frameRenderer_.getMaxFrameSize();
-    Vec2 pos = getPosition();
-    Vec2 anchor = getAnchor();
-    return Rect{
-        {pos.x - size.width * anchor.x, pos.y - size.height * anchor.y},
-        size
-    };
-}
-
-// ============================================================================
-// 生命周期
-// ============================================================================
-
-void AnimationNode::onEnter() {
-    Node::onEnter();
-    if (autoPlay_ && controller_.getClip() && !controller_.getClip()->empty()) {
-        play();
-    }
-}
-
-void AnimationNode::onExit() {
-    Node::onExit();
-}
-
-void AnimationNode::onUpdate(float dt) {
-    Node::onUpdate(dt);
-    controller_.update(dt);
-}
-
-void AnimationNode::onDraw(RenderBackend& renderer) {
-    auto clip = controller_.getClip();
-    if (!clip || clip->empty()) return;
-
-    size_t idx = controller_.getCurrentFrameIndex();
-    const auto& frame = clip->getFrame(idx);
-    Vec2 pos = getPosition();
-
-    if (controller_.isInterpolating() && idx + 1 < clip->getFrameCount()) {
-        auto props = InterpolationEngine::interpolate(
-            frame,
-            clip->getFrame(idx + 1),
-            controller_.getInterpolationFactor());
-
-        frameRenderer_.renderInterpolated(renderer, frame, idx, props,
-                                           pos, getOpacity(), tintColor_,
-                                           flipX_, flipY_);
-    } else {
-        frameRenderer_.renderFrame(renderer, frame, idx,
-                                    pos, getOpacity(), tintColor_,
-                                    flipX_, flipY_);
-    }
-}
-
-// ============================================================================
-// 内部方法
-// ============================================================================
-
-void AnimationNode::setupControllerCallbacks() {
-    controller_.setFrameChangeCallback(
-        [this](size_t oldIdx, size_t newIdx, const AnimationFrame& frame) {
-            AnimationEvent evt;
-            evt.type = AnimationEventType::FrameChanged;
-            evt.frameIndex = newIdx;
-            evt.previousFrameIndex = oldIdx;
-            evt.source = this;
-            dispatchEvent(evt);
-        });
-
-    controller_.setSoundTriggerCallback(
-        [this](const std::string& path) {
-            AnimationEvent evt;
-            evt.type = AnimationEventType::SoundTrigger;
-            evt.frameIndex = controller_.getCurrentFrameIndex();
-            evt.soundPath = path;
-            evt.source = this;
-            dispatchEvent(evt);
-        });
-}
-
-void AnimationNode::dispatchEvent(const AnimationEvent& event) {
-    for (auto& listener : eventListeners_) {
-        if (listener) listener(event);
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/composite_animation.cpp b/Easy2D/src/animation/composite_animation.cpp
deleted file mode 100644
index 59dc08c..0000000
--- a/Easy2D/src/animation/composite_animation.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <easy2d/animation/composite_animation.h>
-#include <easy2d/animation/animation_cache.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 静态工厂
-// ============================================================================
-
-Ptr<CompositeAnimation> CompositeAnimation::create() {
-    return makePtr<CompositeAnimation>();
-}
-
-Ptr<CompositeAnimation> CompositeAnimation::create(const std::string& alsFilePath) {
-    auto comp = makePtr<CompositeAnimation>();
-    comp->loadFromFile(alsFilePath);
-    return comp;
-}
-
-// ============================================================================
-// 加载 ALS 文件
-// ============================================================================
-
-bool CompositeAnimation::loadFromFile(const std::string& alsFilePath) {
-    AlsParser parser;
-    auto result = parser.parse(alsFilePath);
-    if (!result.success) return false;
-
-    // 清除现有图层
-    for (auto& entry : layers_) {
-        if (entry.node) {
-            removeChild(entry.node);
-        }
-    }
-    layers_.clear();
-
-    // 创建每个图层
-    for (const auto& layer : result.layers) {
-        auto node = AnimationNode::create();
-        if (node->loadFromFile(layer.aniPath)) {
-            node->setPosition(layer.offset);
-            addLayer(node, layer.zOrder);
-        }
-    }
-
-    return !layers_.empty();
-}
-
-// ============================================================================
-// 图层管理
-// ============================================================================
-
-void CompositeAnimation::addLayer(Ptr<AnimationNode> node, int zOrder) {
-    if (!node) return;
-
-    node->setZOrder(zOrder);
-    addChild(node);
-    layers_.push_back({node, zOrder});
-}
-
-void CompositeAnimation::removeLayer(size_t index) {
-    if (index >= layers_.size()) return;
-
-    auto& entry = layers_[index];
-    if (entry.node) {
-        removeChild(entry.node);
-    }
-    layers_.erase(layers_.begin() + static_cast<ptrdiff_t>(index));
-}
-
-Ptr<AnimationNode> CompositeAnimation::getLayer(size_t index) const {
-    if (index >= layers_.size()) return nullptr;
-    return layers_[index].node;
-}
-
-Ptr<AnimationNode> CompositeAnimation::getMainLayer() const {
-    if (layers_.empty()) return nullptr;
-    return layers_[0].node;
-}
-
-size_t CompositeAnimation::getLayerCount() const {
-    return layers_.size();
-}
-
-// ============================================================================
-// 统一播放控制
-// ============================================================================
-
-void CompositeAnimation::play() {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->play();
-    }
-}
-
-void CompositeAnimation::pause() {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->pause();
-    }
-}
-
-void CompositeAnimation::resume() {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->resume();
-    }
-}
-
-void CompositeAnimation::stop() {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->stop();
-    }
-}
-
-void CompositeAnimation::reset() {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->reset();
-    }
-}
-
-void CompositeAnimation::setPlaybackSpeed(float speed) {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->setPlaybackSpeed(speed);
-    }
-}
-
-void CompositeAnimation::setLooping(bool loop) {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->setLooping(loop);
-    }
-}
-
-bool CompositeAnimation::isPlaying() const {
-    auto main = getMainLayer();
-    return main ? main->isPlaying() : false;
-}
-
-bool CompositeAnimation::isStopped() const {
-    auto main = getMainLayer();
-    return main ? main->isStopped() : true;
-}
-
-// ============================================================================
-// 事件回调（绑定到主图层）
-// ============================================================================
-
-void CompositeAnimation::setKeyframeCallback(KeyframeHitCallback callback) {
-    auto main = getMainLayer();
-    if (main) main->setKeyframeCallback(std::move(callback));
-}
-
-void CompositeAnimation::setCompletionCallback(AnimationCompleteCallback callback) {
-    auto main = getMainLayer();
-    if (main) main->setCompletionCallback(std::move(callback));
-}
-
-void CompositeAnimation::addEventListener(AnimationEventCallback callback) {
-    auto main = getMainLayer();
-    if (main) main->addEventListener(std::move(callback));
-}
-
-// ============================================================================
-// 视觉属性（应用到所有图层）
-// ============================================================================
-
-void CompositeAnimation::setTintColor(const Color& color) {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->setTintColor(color);
-    }
-}
-
-void CompositeAnimation::setFlipX(bool flip) {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->setFlipX(flip);
-    }
-}
-
-void CompositeAnimation::setFlipY(bool flip) {
-    for (auto& entry : layers_) {
-        if (entry.node) entry.node->setFlipY(flip);
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/animation/frame_renderer.cpp b/Easy2D/src/animation/frame_renderer.cpp
deleted file mode 100644
index 5f13c70..0000000
--- a/Easy2D/src/animation/frame_renderer.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-#include <easy2d/animation/frame_renderer.h>
-#include <easy2d/graphics/texture.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 预加载
-// ============================================================================
-
-bool FrameRenderer::preloadFrames(const std::vector<AnimationFrame>& frames) {
-    releaseFrames();
-    spriteFrames_.reserve(frames.size());
-    maxFrameSize_ = Size{0.0f, 0.0f};
-
-    for (const auto& frame : frames) {
-        Ptr<SpriteFrame> sf = frame.spriteFrame;
-
-        // 如果帧自身没有 SpriteFrame，尝试通过缓存获取
-        if (!sf && !frame.texturePath.empty()) {
-            sf = SpriteFrameCache::getInstance().getOrCreateFromFile(
-                frame.texturePath, frame.textureIndex);
-        }
-
-        spriteFrames_.push_back(sf);
-
-        // 更新最大帧尺寸
-        if (sf && sf->isValid()) {
-            const auto& rect = sf->getRect();
-            if (rect.size.width > maxFrameSize_.width)
-                maxFrameSize_.width = rect.size.width;
-            if (rect.size.height > maxFrameSize_.height)
-                maxFrameSize_.height = rect.size.height;
-        }
-    }
-
-    return true;
-}
-
-void FrameRenderer::releaseFrames() {
-    spriteFrames_.clear();
-    maxFrameSize_ = Size{0.0f, 0.0f};
-}
-
-// ============================================================================
-// 渲染当前帧
-// ============================================================================
-
-void FrameRenderer::renderFrame(RenderBackend& renderer,
-                                 const AnimationFrame& frame,
-                                 size_t frameIndex,
-                                 const Vec2& position,
-                                 float nodeOpacity,
-                                 const Color& tintColor,
-                                 bool flipX, bool flipY) {
-    if (frameIndex >= spriteFrames_.size()) return;
-
-    auto sf = spriteFrames_[frameIndex];
-    if (!sf || !sf->isValid()) return;
-
-    BlendMode blend = mapBlendMode(frame.properties);
-    Vec2 scale = frame.getEffectiveScale();
-    float rotation = frame.getEffectiveRotation();
-    Color frameColor = frame.getEffectiveColor();
-
-    // 合并帧颜色和节点染色
-    Color finalTint{
-        tintColor.r * frameColor.r,
-        tintColor.g * frameColor.g,
-        tintColor.b * frameColor.b,
-        tintColor.a * frameColor.a * nodeOpacity
-    };
-
-    drawSpriteFrame(renderer, sf, position, frame.offset,
-                    scale, rotation, 1.0f, finalTint,
-                    flipX, flipY, blend);
-}
-
-// ============================================================================
-// 渲染插值帧
-// ============================================================================
-
-void FrameRenderer::renderInterpolated(RenderBackend& renderer,
-                                        const AnimationFrame& fromFrame,
-                                        size_t fromIndex,
-                                        const InterpolatedProperties& props,
-                                        const Vec2& position,
-                                        float nodeOpacity,
-                                        const Color& tintColor,
-                                        bool flipX, bool flipY) {
-    if (fromIndex >= spriteFrames_.size()) return;
-
-    auto sf = spriteFrames_[fromIndex];
-    if (!sf || !sf->isValid()) return;
-
-    BlendMode blend = mapBlendMode(fromFrame.properties);
-
-    Color finalTint{
-        tintColor.r * props.color.r,
-        tintColor.g * props.color.g,
-        tintColor.b * props.color.b,
-        tintColor.a * props.color.a * nodeOpacity
-    };
-
-    drawSpriteFrame(renderer, sf, position, props.position,
-                    props.scale, props.rotation, 1.0f, finalTint,
-                    flipX, flipY, blend);
-}
-
-// ============================================================================
-// 混合模式映射
-// ============================================================================
-
-BlendMode FrameRenderer::mapBlendMode(const FramePropertySet& props) {
-    if (props.has(FramePropertyKey::BlendAdditive)) {
-        auto val = props.get<bool>(FramePropertyKey::BlendAdditive);
-        if (val.has_value() && val.value())
-            return BlendMode::Additive;
-    }
-    if (props.has(FramePropertyKey::BlendLinearDodge)) {
-        auto val = props.get<bool>(FramePropertyKey::BlendLinearDodge);
-        if (val.has_value() && val.value())
-            return BlendMode::Additive;  // 线性减淡 ≈ 加法混合
-    }
-    return BlendMode::Alpha;
-}
-
-// ============================================================================
-// 查询
-// ============================================================================
-
-Ptr<SpriteFrame> FrameRenderer::getSpriteFrame(size_t frameIndex) const {
-    if (frameIndex >= spriteFrames_.size()) return nullptr;
-    return spriteFrames_[frameIndex];
-}
-
-// ============================================================================
-// 内部绘制
-// ============================================================================
-
-void FrameRenderer::drawSpriteFrame(RenderBackend& renderer,
-                                     Ptr<SpriteFrame> sf,
-                                     const Vec2& position,
-                                     const Vec2& offset,
-                                     const Vec2& scale,
-                                     float rotation,
-                                     float opacity,
-                                     const Color& tint,
-                                     bool flipX, bool flipY,
-                                     BlendMode blend) {
-    if (!sf || !sf->isValid()) return;
-
-    auto texture = sf->getTexture();
-    if (!texture) return;
-
-    renderer.setBlendMode(blend);
-
-    const Rect& srcRect = sf->getRect();
-
-    // 计算目标矩形
-    float w = srcRect.size.width * std::abs(scale.x);
-    float h = srcRect.size.height * std::abs(scale.y);
-
-    Vec2 finalPos{
-        position.x + offset.x,
-        position.y + offset.y
-    };
-
-    // 处理翻转（通过缩放符号）
-    float flipScaleX = flipX ? -1.0f : 1.0f;
-    float flipScaleY = flipY ? -1.0f : 1.0f;
-
-    Rect destRect{
-        {finalPos.x - w * 0.5f * flipScaleX, finalPos.y - h * 0.5f * flipScaleY},
-        {w, h}
-    };
-
-    Color finalColor{tint.r, tint.g, tint.b, tint.a * opacity};
-
-    renderer.drawSprite(*texture, destRect, srcRect, finalColor,
-                        rotation, Vec2{0.5f, 0.5f});
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/app/application.cpp b/Easy2D/src/app/application.cpp
deleted file mode 100644
index 09bd0bb..0000000
--- a/Easy2D/src/app/application.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-#include <easy2d/app/application.h>
-#include <easy2d/platform/window.h>
-#include <easy2d/platform/input.h>
-#include <easy2d/audio/audio_engine.h>
-#include <easy2d/scene/scene_manager.h>
-#include <easy2d/resource/resource_manager.h>
-#include <easy2d/utils/timer.h>
-#include <easy2d/event/event_queue.h>
-#include <easy2d/event/event_dispatcher.h>
-#include <easy2d/graphics/camera.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/vram_manager.h>
-#include <easy2d/utils/logger.h>
-
-#include <switch.h>
-#include <chrono>
-#include <thread>
-#include <time.h>
-
-namespace easy2d {
-
-// 获取当前时间（秒）
-static double getTimeSeconds() {
-    struct timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    return static_cast<double>(ts.tv_sec) + static_cast<double>(ts.tv_nsec) / 1000000000.0;
-}
-
-Application& Application::instance() {
-    static Application instance;
-    return instance;
-}
-
-Application::~Application() {
-    shutdown();
-}
-
-bool Application::init(const AppConfig& config) {
-    if (initialized_) {
-        E2D_LOG_WARN("Application already initialized");
-        return true;
-    }
-
-    config_ = config;
-
-    // ========================================
-    // 1. 初始化 RomFS 文件系统（必须在 SDL_Init 之前）
-    // ========================================
-    Result rc;
-    rc = romfsInit();
-    if (R_SUCCEEDED(rc)) {
-        E2D_LOG_INFO("RomFS initialized successfully");
-    } else {
-        E2D_LOG_WARN("romfsInit failed: {:#08X}, will use regular filesystem", rc);
-    }
-
-    // ========================================
-    // 2. 初始化 nxlink 调试输出（可选）
-    // ========================================
-    rc = socketInitializeDefault();
-    if (R_FAILED(rc)) {
-        E2D_LOG_WARN("socketInitializeDefault failed, nxlink will not be available");
-    }
-
-    // ========================================
-    // 3. 创建窗口（包含 SDL_Init + GLES 3.2 上下文创建）
-    // ========================================
-    window_ = makeUnique<Window>();
-    WindowConfig winConfig;
-    winConfig.title = config.title;
-    winConfig.width = 1280;
-    winConfig.height = 720;
-    winConfig.fullscreen = true;
-    winConfig.resizable = false;
-    winConfig.vsync = config.vsync;
-    winConfig.msaaSamples = config.msaaSamples;
-
-    if (!window_->create(winConfig)) {
-        E2D_LOG_ERROR("Failed to create window");
-        return false;
-    }
-
-    // ========================================
-    // 4. 初始化渲染器
-    // ========================================
-    renderer_ = RenderBackend::create(config.renderBackend);
-    if (!renderer_ || !renderer_->init(window_.get())) {
-        E2D_LOG_ERROR("Failed to initialize renderer");
-        window_->destroy();
-        return false;
-    }
-
-    // ========================================
-    // 5. 初始化其他子系统
-    // ========================================
-    sceneManager_ = makeUnique<SceneManager>();
-    resourceManager_ = makeUnique<ResourceManager>();
-    timerManager_ = makeUnique<TimerManager>();
-    eventQueue_ = makeUnique<EventQueue>();
-    eventDispatcher_ = makeUnique<EventDispatcher>();
-    camera_ = makeUnique<Camera>(0, static_cast<float>(window_->getWidth()),
-                                  static_cast<float>(window_->getHeight()), 0);
-
-    // 窗口大小回调（Switch 上不会触发，但保留接口）
-    window_->setResizeCallback([this](int width, int height) {
-        if (camera_) {
-            camera_->setViewport(0, static_cast<float>(width),
-                                 static_cast<float>(height), 0);
-        }
-        if (sceneManager_) {
-            auto currentScene = sceneManager_->getCurrentScene();
-            if (currentScene) {
-                currentScene->setViewportSize(static_cast<float>(width),
-                                              static_cast<float>(height));
-            }
-        }
-    });
-
-    // 初始化音频引擎
-    AudioEngine::getInstance().initialize();
-
-    // 添加 romfs:/ 到资源搜索路径
-    resourceManager_->addSearchPath("romfs:/");
-
-    initialized_ = true;
-    running_ = true;
-
-    E2D_LOG_INFO("Application initialized successfully");
-    return true;
-}
-
-void Application::shutdown() {
-    if (!initialized_) return;
-
-    E2D_LOG_INFO("Shutting down application...");
-
-    // 打印 VRAM 统计
-    VRAMManager::getInstance().printStats();
-
-    // 清理子系统
-    sceneManager_.reset();
-    resourceManager_.reset();
-    timerManager_.reset();
-    eventQueue_.reset();
-    eventDispatcher_.reset();
-    camera_.reset();
-
-    // 关闭音频
-    AudioEngine::getInstance().shutdown();
-
-    // 关闭渲染器
-    if (renderer_) {
-        renderer_->shutdown();
-        renderer_.reset();
-    }
-
-    // 销毁窗口（包含 SDL_Quit）
-    if (window_) {
-        window_->destroy();
-        window_.reset();
-    }
-
-    // Switch 清理
-    romfsExit();
-    socketExit();
-
-    initialized_ = false;
-    running_ = false;
-
-    E2D_LOG_INFO("Application shutdown complete");
-}
-
-void Application::run() {
-    if (!initialized_) {
-        E2D_LOG_ERROR("Application not initialized");
-        return;
-    }
-
-    lastFrameTime_ = getTimeSeconds();
-
-    // SDL2 on Switch 内部已处理 appletMainLoop
-    while (running_ && !window_->shouldClose()) {
-        mainLoop();
-    }
-}
-
-void Application::quit() {
-    shouldQuit_ = true;
-    running_ = false;
-}
-
-void Application::pause() {
-    if (!paused_) {
-        paused_ = true;
-        E2D_LOG_INFO("Application paused");
-    }
-}
-
-void Application::resume() {
-    if (paused_) {
-        paused_ = false;
-        lastFrameTime_ = getTimeSeconds();
-        E2D_LOG_INFO("Application resumed");
-    }
-}
-
-void Application::mainLoop() {
-    // 计算 delta time
-    double currentTime = getTimeSeconds();
-    deltaTime_ = static_cast<float>(currentTime - lastFrameTime_);
-    lastFrameTime_ = currentTime;
-
-    totalTime_ += deltaTime_;
-
-    // 计算 FPS
-    frameCount_++;
-    fpsTimer_ += deltaTime_;
-    if (fpsTimer_ >= 1.0f) {
-        currentFps_ = frameCount_;
-        frameCount_ = 0;
-        fpsTimer_ -= 1.0f;
-    }
-
-    // 处理窗口事件（SDL_PollEvent + 输入更新）
-    window_->pollEvents();
-
-    // 处理事件队列
-    if (eventDispatcher_ && eventQueue_) {
-        eventDispatcher_->processQueue(*eventQueue_);
-    }
-
-    // 更新
-    if (!paused_) {
-        update();
-    }
-
-    // 渲染
-    render();
-
-    if (!config_.vsync && config_.fpsLimit > 0) {
-        double frameEndTime = getTimeSeconds();
-        double frameTime = frameEndTime - currentTime;
-        double target = 1.0 / static_cast<double>(config_.fpsLimit);
-        if (frameTime < target) {
-            auto sleepSeconds = target - frameTime;
-            std::this_thread::sleep_for(std::chrono::duration<double>(sleepSeconds));
-        }
-    }
-}
-
-void Application::update() {
-    if (timerManager_) {
-        timerManager_->update(deltaTime_);
-    }
-
-    if (sceneManager_) {
-        sceneManager_->update(deltaTime_);
-    }
-}
-
-void Application::render() {
-    if (!renderer_) {
-        E2D_LOG_ERROR("Render failed: renderer is null");
-        return;
-    }
-
-    renderer_->setViewport(0, 0, window_->getWidth(), window_->getHeight());
-
-    if (sceneManager_) {
-        sceneManager_->render(*renderer_);
-    } else {
-        E2D_LOG_WARN("Render: sceneManager is null");
-    }
-
-    window_->swapBuffers();
-}
-
-Input& Application::input() {
-    return *window_->getInput();
-}
-
-AudioEngine& Application::audio() {
-    return AudioEngine::getInstance();
-}
-
-SceneManager& Application::scenes() {
-    return *sceneManager_;
-}
-
-ResourceManager& Application::resources() {
-    return *resourceManager_;
-}
-
-TimerManager& Application::timers() {
-    return *timerManager_;
-}
-
-EventQueue& Application::eventQueue() {
-    return *eventQueue_;
-}
-
-EventDispatcher& Application::eventDispatcher() {
-    return *eventDispatcher_;
-}
-
-Camera& Application::camera() {
-    return *camera_;
-}
-
-void Application::enterScene(Ptr<Scene> scene) {
-    enterScene(scene, nullptr);
-}
-
-void Application::enterScene(Ptr<Scene> scene, Ptr<class Transition> transition) {
-    if (sceneManager_ && scene) {
-        scene->setViewportSize(static_cast<float>(window_->getWidth()),
-                               static_cast<float>(window_->getHeight()));
-        sceneManager_->enterScene(scene, transition);
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/audio/audio_engine.cpp b/Easy2D/src/audio/audio_engine.cpp
deleted file mode 100644
index 1cbba1a..0000000
--- a/Easy2D/src/audio/audio_engine.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "easy2d/audio/audio_engine.h"
-#include "easy2d/audio/sound.h"
-#include "easy2d/utils/logger.h"
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_mixer.h>
-
-namespace easy2d {
-
-AudioEngine& AudioEngine::getInstance() {
-    static AudioEngine instance;
-    return instance;
-}
-
-AudioEngine::~AudioEngine() {
-    shutdown();
-}
-
-bool AudioEngine::initialize() {
-    if (initialized_) {
-        return true;
-    }
-
-    // 初始化 SDL 音频子系统
-    if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
-        E2D_LOG_ERROR("Failed to initialize SDL audio: {}", SDL_GetError());
-        return false;
-    }
-
-    // 打开音频设备
-    if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 4096) < 0) {
-        E2D_LOG_ERROR("Failed to open audio: {}", Mix_GetError());
-        SDL_QuitSubSystem(SDL_INIT_AUDIO);
-        return false;
-    }
-
-    // 分配混音通道
-    Mix_AllocateChannels(32);
-
-    initialized_ = true;
-    E2D_LOG_INFO("AudioEngine initialized successfully (SDL2_mixer)");
-    return true;
-}
-
-void AudioEngine::shutdown() {
-    if (!initialized_) {
-        return;
-    }
-
-    unloadAllSounds();
-
-    Mix_CloseAudio();
-    SDL_QuitSubSystem(SDL_INIT_AUDIO);
-
-    initialized_ = false;
-    E2D_LOG_INFO("AudioEngine shutdown");
-}
-
-std::shared_ptr<Sound> AudioEngine::loadSound(const std::string& filePath) {
-    return loadSound(filePath, filePath);
-}
-
-std::shared_ptr<Sound> AudioEngine::loadSound(const std::string& name, const std::string& filePath) {
-    if (!initialized_) {
-        E2D_LOG_ERROR("AudioEngine not initialized");
-        return nullptr;
-    }
-
-    // 检查是否已存在
-    auto it = sounds_.find(name);
-    if (it != sounds_.end()) {
-        return it->second;
-    }
-
-    Mix_Chunk* chunk = Mix_LoadWAV(filePath.c_str());
-    if (!chunk) {
-        E2D_LOG_ERROR("Failed to load sound: {} ({})", filePath, Mix_GetError());
-        return nullptr;
-    }
-
-    auto sound = std::shared_ptr<Sound>(new Sound(name, filePath, chunk));
-    sounds_[name] = sound;
-
-    E2D_LOG_DEBUG("Loaded sound: {}", filePath);
-    return sound;
-}
-
-std::shared_ptr<Sound> AudioEngine::getSound(const std::string& name) {
-    auto it = sounds_.find(name);
-    if (it != sounds_.end()) {
-        return it->second;
-    }
-    return nullptr;
-}
-
-void AudioEngine::unloadSound(const std::string& name) {
-    auto it = sounds_.find(name);
-    if (it != sounds_.end()) {
-        sounds_.erase(it);
-        E2D_LOG_DEBUG("Unloaded sound: {}", name);
-    }
-}
-
-void AudioEngine::unloadAllSounds() {
-    stopAll();
-    sounds_.clear();
-    E2D_LOG_DEBUG("Unloaded all sounds");
-}
-
-void AudioEngine::setMasterVolume(float volume) {
-    masterVolume_ = volume;
-    int mixVol = static_cast<int>(volume * MIX_MAX_VOLUME);
-    Mix_Volume(-1, mixVol);        // 所有通道
-    Mix_VolumeMusic(mixVol);       // 音乐
-}
-
-float AudioEngine::getMasterVolume() const {
-    return masterVolume_;
-}
-
-void AudioEngine::pauseAll() {
-    Mix_Pause(-1);  // 暂停所有通道
-}
-
-void AudioEngine::resumeAll() {
-    Mix_Resume(-1); // 恢复所有通道
-}
-
-void AudioEngine::stopAll() {
-    for (auto& pair : sounds_) {
-        if (pair.second) {
-            pair.second->stop();
-        }
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/audio/sound.cpp b/Easy2D/src/audio/sound.cpp
deleted file mode 100644
index 6afb3c6..0000000
--- a/Easy2D/src/audio/sound.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <easy2d/audio/sound.h>
-#include <SDL2/SDL_mixer.h>
-
-namespace easy2d {
-
-Sound::Sound(const std::string& name, const std::string& filePath, Mix_Chunk* chunk)
-    : name_(name), filePath_(filePath), chunk_(chunk) {
-}
-
-Sound::~Sound() {
-    if (channel_ >= 0) {
-        Mix_HaltChannel(channel_);
-        channel_ = -1;
-    }
-    if (chunk_) {
-        Mix_FreeChunk(chunk_);
-        chunk_ = nullptr;
-    }
-}
-
-bool Sound::play() {
-    if (!chunk_) {
-        return false;
-    }
-
-    // 如果已在播放，先停止
-    if (channel_ >= 0 && Mix_Playing(channel_)) {
-        Mix_HaltChannel(channel_);
-    }
-
-    int loops = looping_ ? -1 : 0;
-    channel_ = Mix_PlayChannel(-1, chunk_, loops);  // -1 = 自动分配通道
-
-    if (channel_ < 0) {
-        return false;
-    }
-
-    // 设置音量
-    int mixVol = static_cast<int>(volume_ * MIX_MAX_VOLUME);
-    Mix_Volume(channel_, mixVol);
-
-    return true;
-}
-
-void Sound::pause() {
-    if (channel_ >= 0) {
-        Mix_Pause(channel_);
-    }
-}
-
-void Sound::resume() {
-    if (channel_ >= 0) {
-        Mix_Resume(channel_);
-    }
-}
-
-void Sound::stop() {
-    if (channel_ >= 0) {
-        Mix_HaltChannel(channel_);
-        channel_ = -1;
-    }
-}
-
-bool Sound::isPlaying() const {
-    if (channel_ < 0) {
-        return false;
-    }
-    return Mix_Playing(channel_) && !Mix_Paused(channel_);
-}
-
-bool Sound::isPaused() const {
-    if (channel_ < 0) {
-        return false;
-    }
-    return Mix_Paused(channel_) != 0;
-}
-
-void Sound::setVolume(float volume) {
-    volume_ = volume;
-    if (channel_ >= 0) {
-        int mixVol = static_cast<int>(volume * MIX_MAX_VOLUME);
-        Mix_Volume(channel_, mixVol);
-    }
-}
-
-void Sound::setLooping(bool looping) {
-    looping_ = looping;
-    // SDL_mixer 的循环在播放时设置，运行中无法更改
-    // 如果需要即时生效，需要重新播放
-}
-
-void Sound::setPitch(float pitch) {
-    pitch_ = pitch;
-    // SDL2_mixer 不直接支持变速播放
-    // 需要更高级的音频处理才能实现
-}
-
-float Sound::getDuration() const {
-    // SDL2_mixer 没有直接获取时长的 API
-    // 返回 0 表示不支持
-    return 0.0f;
-}
-
-float Sound::getCursor() const {
-    // SDL2_mixer 没有直接获取播放位置的 API
-    return 0.0f;
-}
-
-void Sound::setCursor(float /*seconds*/) {
-    // SDL2_mixer 不支持 seek 到特定位置 (对 chunks)
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/core/string.cpp b/Easy2D/src/core/string.cpp
deleted file mode 100644
index 83b9584..0000000
--- a/Easy2D/src/core/string.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-#include <easy2d/core/string.h>
-#include <cstring>
-#include <cstdint>
-
-namespace easy2d {
-
-// ============================================================================
-// GBK/GB2312 到 UTF-8 转换表
-// 使用简化的转换表，覆盖常用中文字符
-// ============================================================================
-
-// GBK 编码范围：
-// - 单字节：0x00-0x7F (ASCII)
-// - 双字节：0x81-0xFE 0x40-0xFE
-
-// 将 GBK 双字节解码为 Unicode 码点
-// 这是简化的实现，使用 GBK 到 Unicode 的映射公式
-static uint32_t gbkToUnicode(uint16_t gbkCode) {
-    // GBK 编码转 Unicode 的简化算法
-    // 对于常见汉字，使用近似转换
-    
-    uint8_t high = (gbkCode >> 8) & 0xFF;
-    uint8_t low = gbkCode & 0xFF;
-    
-    // ASCII 范围
-    if (high < 0x80) {
-        return high;
-    }
-    
-    // GBK 双字节范围
-    if (high >= 0x81 && high <= 0xFE && low >= 0x40 && low <= 0xFE) {
-        // GBK 到 Unicode 的偏移计算（近似）
-        // GB2312 区域：0xB0A1-0xF7FE -> Unicode 0x4E00-0x9FA5
-        if (high >= 0xB0 && high <= 0xF7 && low >= 0xA1 && low <= 0xFE) {
-            uint32_t area = high - 0xB0;
-            uint32_t pos = low - 0xA1;
-            return 0x4E00 + area * 94 + pos;
-        }
-        
-        // 其他 GBK 区域使用线性映射
-        uint32_t gbkOffset = (high - 0x81) * 190 + (low - 0x40);
-        if (low > 0x7F) {
-            gbkOffset--;
-        }
-        
-        // 映射到扩展 Unicode 区域
-        return 0x4E00 + (gbkOffset % 0x51A5);
-    }
-    
-    // 无效字符返回替换字符
-    return 0xFFFD;
-}
-
-// 将 Unicode 码点编码为 UTF-8
-static std::string unicodeToUtf8(uint32_t codepoint) {
-    std::string result;
-    
-    if (codepoint <= 0x7F) {
-        // 1-byte
-        result.push_back(static_cast<char>(codepoint));
-    } else if (codepoint <= 0x7FF) {
-        // 2-byte
-        result.push_back(static_cast<char>(0xC0 | ((codepoint >> 6) & 0x1F)));
-        result.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
-    } else if (codepoint <= 0xFFFF) {
-        // 3-byte
-        result.push_back(static_cast<char>(0xE0 | ((codepoint >> 12) & 0x0F)));
-        result.push_back(static_cast<char>(0x80 | ((codepoint >> 6) & 0x3F)));
-        result.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
-    } else if (codepoint <= 0x10FFFF) {
-        // 4-byte
-        result.push_back(static_cast<char>(0xF0 | ((codepoint >> 18) & 0x07)));
-        result.push_back(static_cast<char>(0x80 | ((codepoint >> 12) & 0x3F)));
-        result.push_back(static_cast<char>(0x80 | ((codepoint >> 6) & 0x3F)));
-        result.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
-    }
-    
-    return result;
-}
-
-// 将 UTF-8 解码为 Unicode 码点
-// 返回解码后的码点和消耗的 UTF-8 字节数
-static std::pair<uint32_t, size_t> utf8ToUnicode(const char* utf8) {
-    unsigned char byte = static_cast<unsigned char>(*utf8);
-    
-    if ((byte & 0x80) == 0) {
-        // 1-byte
-        return {byte, 1};
-    } else if ((byte & 0xE0) == 0xC0) {
-        // 2-byte
-        uint32_t ch = (byte & 0x1F) << 6;
-        ch |= (static_cast<unsigned char>(utf8[1]) & 0x3F);
-        return {ch, 2};
-    } else if ((byte & 0xF0) == 0xE0) {
-        // 3-byte
-        uint32_t ch = (byte & 0x0F) << 12;
-        ch |= (static_cast<unsigned char>(utf8[1]) & 0x3F) << 6;
-        ch |= (static_cast<unsigned char>(utf8[2]) & 0x3F);
-        return {ch, 3};
-    } else if ((byte & 0xF8) == 0xF0) {
-        // 4-byte
-        uint32_t ch = (byte & 0x07) << 18;
-        ch |= (static_cast<unsigned char>(utf8[1]) & 0x3F) << 12;
-        ch |= (static_cast<unsigned char>(utf8[2]) & 0x3F) << 6;
-        ch |= (static_cast<unsigned char>(utf8[3]) & 0x3F);
-        return {ch, 4};
-    }
-    
-    // Invalid UTF-8
-    return {0xFFFD, 1};
-}
-
-// 将 Unicode 码点编码为 GBK 双字节
-static uint16_t unicodeToGbk(uint32_t unicode) {
-    // ASCII 范围
-    if (unicode <= 0x7F) {
-        return static_cast<uint16_t>(unicode);
-    }
-    
-    // CJK Unified Ideographs (U+4E00 - U+9FA5) -> GB2312
-    if (unicode >= 0x4E00 && unicode <= 0x9FA5) {
-        uint32_t offset = unicode - 0x4E00;
-        uint32_t area = offset / 94;
-        uint32_t pos = offset % 94;
-        
-        uint8_t high = static_cast<uint8_t>(0xB0 + area);
-        uint8_t low = static_cast<uint8_t>(0xA1 + pos);
-        
-        return (static_cast<uint16_t>(high) << 8) | low;
-    }
-    
-    // 其他字符无法转换，返回 '?'
-    return 0x3F;
-}
-
-// ============================================================================
-// String 类 GBK 转换实现
-// ============================================================================
-
-String String::fromGBK(const char* gbk) {
-    if (!gbk || std::strlen(gbk) == 0) {
-        return String();
-    }
-    
-    return fromGBK(std::string(gbk));
-}
-
-String String::fromGBK(const std::string& gbk) {
-    if (gbk.empty()) {
-        return String();
-    }
-    
-    std::string utf8Result;
-    utf8Result.reserve(gbk.size() * 2); // 预估 UTF-8 可能比 GBK 大
-    
-    size_t i = 0;
-    while (i < gbk.size()) {
-        unsigned char byte = static_cast<unsigned char>(gbk[i]);
-        
-        if (byte < 0x80) {
-            // ASCII 字符，直接复制
-            utf8Result.push_back(static_cast<char>(byte));
-            i++;
-        } else if (i + 1 < gbk.size()) {
-            // GBK 双字节字符
-            uint8_t high = byte;
-            uint8_t low = static_cast<unsigned char>(gbk[i + 1]);
-            uint16_t gbkCode = (static_cast<uint16_t>(high) << 8) | low;
-            
-            uint32_t unicode = gbkToUnicode(gbkCode);
-            utf8Result += unicodeToUtf8(unicode);
-            
-            i += 2;
-        } else {
-            // 不完整的 GBK 字符，跳过
-            i++;
-        }
-    }
-    
-    return String(utf8Result);
-}
-
-std::string String::toGBK() const {
-    if (data_.empty()) {
-        return std::string();
-    }
-    
-    std::string gbkResult;
-    gbkResult.reserve(data_.size()); // 预估 GBK 可能更小或与 UTF-8 相当
-    
-    size_t i = 0;
-    while (i < data_.size()) {
-        auto [unicode, bytes] = utf8ToUnicode(data_.c_str() + i);
-        
-        if (unicode <= 0x7F) {
-            // ASCII 字符
-            gbkResult.push_back(static_cast<char>(unicode));
-        } else {
-            // 转换为 GBK 双字节
-            uint16_t gbkCode = unicodeToGbk(unicode);
-            
-            if (gbkCode > 0xFF) {
-                // 双字节 GBK
-                gbkResult.push_back(static_cast<char>((gbkCode >> 8) & 0xFF));
-                gbkResult.push_back(static_cast<char>(gbkCode & 0xFF));
-            } else {
-                // 单字节（ASCII）
-                gbkResult.push_back(static_cast<char>(gbkCode));
-            }
-        }
-        
-        i += bytes;
-    }
-    
-    return gbkResult;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/effects/custom_effect_manager.cpp b/Easy2D/src/effects/custom_effect_manager.cpp
deleted file mode 100644
index 3b773bd..0000000
--- a/Easy2D/src/effects/custom_effect_manager.cpp
+++ /dev/null
@@ -1,909 +0,0 @@
-#include <easy2d/effects/custom_effect_manager.h>
-#include <easy2d/utils/logger.h>
-#include <json/json.hpp>
-#include <fstream>
-#include <sstream>
-
-namespace easy2d {
-
-using json = nlohmann::json;
-
-// ============================================================================
-// JSON序列化辅助函数
-// ============================================================================
-
-/**
- * @brief 将Vec2转换为JSON数组
- */
-static json vec2ToJson(const Vec2& v) {
-    return json::array({v.x, v.y});
-}
-
-/**
- * @brief 从JSON数组解析Vec2
- */
-static Vec2 jsonToVec2(const json& j) {
-    if (j.is_array() && j.size() >= 2) {
-        return Vec2(j[0].get<float>(), j[1].get<float>());
-    }
-    return Vec2();
-}
-
-/**
- * @brief 将Color转换为JSON数组
- */
-static json colorToJson(const Color& c) {
-    return json::array({c.r, c.g, c.b, c.a});
-}
-
-/**
- * @brief 从JSON数组解析Color
- */
-static Color jsonToColor(const json& j) {
-    if (j.is_array() && j.size() >= 4) {
-        return Color(j[0].get<float>(), j[1].get<float>(), 
-                     j[2].get<float>(), j[3].get<float>());
-    }
-    return Colors::White;
-}
-
-/**
- * @brief 将EmitterConfig转换为JSON
- */
-static json emitterConfigToJson(const EmitterConfig& config) {
-    json j;
-    j["emissionRate"] = config.emissionRate;
-    j["life"] = json::array({config.minLife, config.maxLife});
-    j["startSize"] = json::array({config.minStartSize, config.maxStartSize});
-    j["endSize"] = json::array({config.minEndSize, config.maxEndSize});
-    j["velocity"] = json::object({
-        {"min", vec2ToJson(config.minVelocity)},
-        {"max", vec2ToJson(config.maxVelocity)}
-    });
-    j["acceleration"] = vec2ToJson(config.acceleration);
-    j["startColor"] = colorToJson(config.startColor);
-    j["endColor"] = colorToJson(config.endColor);
-    j["blendMode"] = static_cast<int>(config.blendMode);
-    j["shape"] = static_cast<int>(config.shape);
-    j["shapeRadius"] = config.shapeRadius;
-    return j;
-}
-
-/**
- * @brief 从JSON解析EmitterConfig
- */
-static EmitterConfig jsonToEmitterConfig(const json& j) {
-    EmitterConfig config;
-    
-    if (j.contains("emissionRate")) {
-        config.emissionRate = j["emissionRate"].get<float>();
-    }
-    if (j.contains("life") && j["life"].is_array() && j["life"].size() >= 2) {
-        config.minLife = j["life"][0].get<float>();
-        config.maxLife = j["life"][1].get<float>();
-    }
-    if (j.contains("startSize") && j["startSize"].is_array() && j["startSize"].size() >= 2) {
-        config.minStartSize = j["startSize"][0].get<float>();
-        config.maxStartSize = j["startSize"][1].get<float>();
-    }
-    if (j.contains("endSize") && j["endSize"].is_array() && j["endSize"].size() >= 2) {
-        config.minEndSize = j["endSize"][0].get<float>();
-        config.maxEndSize = j["endSize"][1].get<float>();
-    }
-    if (j.contains("velocity")) {
-        const auto& vel = j["velocity"];
-        if (vel.contains("min")) {
-            config.minVelocity = jsonToVec2(vel["min"]);
-        }
-        if (vel.contains("max")) {
-            config.maxVelocity = jsonToVec2(vel["max"]);
-        }
-    }
-    if (j.contains("acceleration")) {
-        config.acceleration = jsonToVec2(j["acceleration"]);
-    }
-    if (j.contains("startColor")) {
-        config.startColor = jsonToColor(j["startColor"]);
-    }
-    if (j.contains("endColor")) {
-        config.endColor = jsonToColor(j["endColor"]);
-    }
-    if (j.contains("blendMode")) {
-        config.blendMode = static_cast<BlendMode>(j["blendMode"].get<int>());
-    }
-    if (j.contains("shape")) {
-        config.shape = static_cast<EmitterConfig::Shape>(j["shape"].get<int>());
-    }
-    if (j.contains("shapeRadius")) {
-        config.shapeRadius = j["shapeRadius"].get<float>();
-    }
-    
-    return config;
-}
-
-/**
- * @brief 将CustomEffectConfig转换为JSON
- */
-static json effectConfigToJson(const CustomEffectConfig& config) {
-    json j;
-    j["name"] = config.name;
-    j["type"] = static_cast<int>(config.type);
-    j["description"] = config.description;
-    j["duration"] = config.duration;
-    j["loop"] = config.loop;
-    j["delay"] = config.delay;
-    
-    if (config.type == CustomEffectType::Particle) {
-        j["emitter"] = emitterConfigToJson(config.emitterConfig);
-    } else if (config.type == CustomEffectType::PostProcess) {
-        j["shaderVert"] = config.shaderVertPath;
-        j["shaderFrag"] = config.shaderFragPath;
-        j["params"] = config.shaderParams;
-    }
-    
-    return j;
-}
-
-/**
- * @brief 从JSON解析CustomEffectConfig
- */
-static CustomEffectConfig jsonToEffectConfig(const json& j) {
-    CustomEffectConfig config;
-    
-    if (j.contains("name")) {
-        config.name = j["name"].get<std::string>();
-    }
-    if (j.contains("type")) {
-        config.type = static_cast<CustomEffectType>(j["type"].get<int>());
-    }
-    if (j.contains("description")) {
-        config.description = j["description"].get<std::string>();
-    }
-    if (j.contains("duration")) {
-        config.duration = j["duration"].get<float>();
-    }
-    if (j.contains("loop")) {
-        config.loop = j["loop"].get<bool>();
-    }
-    if (j.contains("delay")) {
-        config.delay = j["delay"].get<float>();
-    }
-    if (j.contains("emitter")) {
-        config.emitterConfig = jsonToEmitterConfig(j["emitter"]);
-    }
-    if (j.contains("shaderVert")) {
-        config.shaderVertPath = j["shaderVert"].get<std::string>();
-    }
-    if (j.contains("shaderFrag")) {
-        config.shaderFragPath = j["shaderFrag"].get<std::string>();
-    }
-    if (j.contains("params")) {
-        for (auto& [key, value] : j["params"].items()) {
-            config.shaderParams[key] = value.get<float>();
-        }
-    }
-    
-    return config;
-}
-
-// ============================================================================
-// CustomEffect实现
-// ============================================================================
-
-CustomEffect::CustomEffect(const CustomEffectConfig& config) : config_(config) {}
-
-bool CustomEffect::init() {
-    return true;
-}
-
-void CustomEffect::update(float dt) {
-    if (!playing_ || paused_ || finished_) return;
-    
-    // 处理延迟
-    if (delayTimer_ < config_.delay) {
-        delayTimer_ += dt;
-        return;
-    }
-    
-    elapsedTime_ += dt;
-    
-    // 检查是否结束
-    if (config_.duration > 0 && elapsedTime_ >= config_.duration) {
-        if (config_.loop) {
-            elapsedTime_ = 0.0f;
-        } else {
-            finished_ = true;
-            playing_ = false;
-        }
-    }
-}
-
-void CustomEffect::render(RenderBackend& renderer) {
-    // 基类不渲染任何内容
-}
-
-void CustomEffect::shutdown() {
-    playing_ = false;
-    paused_ = false;
-    finished_ = true;
-}
-
-void CustomEffect::play() {
-    if (finished_) {
-        reset();
-    }
-    playing_ = true;
-    paused_ = false;
-}
-
-void CustomEffect::pause() {
-    paused_ = true;
-}
-
-void CustomEffect::stop() {
-    playing_ = false;
-    paused_ = false;
-}
-
-void CustomEffect::reset() {
-    elapsedTime_ = 0.0f;
-    delayTimer_ = 0.0f;
-    finished_ = false;
-    playing_ = false;
-    paused_ = false;
-}
-
-// ============================================================================
-// CustomParticleEffect实现
-// ============================================================================
-
-CustomParticleEffect::CustomParticleEffect(const CustomEffectConfig& config)
-    : CustomEffect(config) {}
-
-bool CustomParticleEffect::init() {
-    particleSystem_ = ParticleSystem::create();
-    if (!particleSystem_) {
-        E2D_ERROR("创建粒子系统失败");
-        return false;
-    }
-    
-    emitter_ = particleSystem_->addEmitter(config_.emitterConfig);
-    if (!emitter_) {
-        E2D_ERROR("创建粒子发射器失败");
-        return false;
-    }
-    
-    // 初始化时启动发射器
-    emitter_->start();
-    
-    return true;
-}
-
-void CustomParticleEffect::play() {
-    CustomEffect::play();
-    if (emitter_) {
-        emitter_->start();
-    }
-}
-
-void CustomParticleEffect::stop() {
-    CustomEffect::stop();
-    if (emitter_) {
-        emitter_->stop();
-    }
-}
-
-void CustomParticleEffect::update(float dt) {
-    CustomEffect::update(dt);
-    
-    if (particleSystem_) {
-        particleSystem_->setPosition(position_);
-        particleSystem_->onUpdate(dt);
-    }
-
-}
-
-void CustomParticleEffect::render(RenderBackend& renderer) {
-    if (particleSystem_) {
-        particleSystem_->onDraw(renderer);
-    }
-}
-
-void CustomParticleEffect::shutdown() {
-    if (emitter_) {
-        emitter_->stop();
-        emitter_.reset();
-    }
-    if (particleSystem_) {
-        particleSystem_->removeAllEmitters();
-        particleSystem_.reset();
-    }
-    CustomEffect::shutdown();
-}
-
-// ============================================================================
-// CustomPostProcessEffect实现
-// ============================================================================
-
-CustomPostProcessEffect::CustomPostProcessEffect(const CustomEffectConfig& config)
-    : CustomEffect(config), PostProcessEffect(config.name) {}
-
-bool CustomPostProcessEffect::init() {
-    if (!config_.shaderVertPath.empty() && !config_.shaderFragPath.empty()) {
-        if (!loadShaderFromFile(config_.shaderVertPath, config_.shaderFragPath)) {
-            E2D_ERROR("加载后处理Shader失败");
-            return false;
-        }
-    }
-    
-    runtimeParams_ = config_.shaderParams;
-    return true;
-}
-
-void CustomPostProcessEffect::update(float dt) {
-    CustomEffect::update(dt);
-}
-
-void CustomPostProcessEffect::shutdown() {
-    PostProcessEffect::shutdown();
-    CustomEffect::shutdown();
-}
-
-void CustomPostProcessEffect::onShaderBind(GLShader& shader) {
-    for (const auto& [name, value] : runtimeParams_) {
-        shader.setFloat(name, value);
-    }
-}
-
-void CustomPostProcessEffect::setParam(const std::string& name, float value) {
-    runtimeParams_[name] = value;
-}
-
-float CustomPostProcessEffect::getParam(const std::string& name) const {
-    auto it = runtimeParams_.find(name);
-    if (it != runtimeParams_.end()) {
-        return it->second;
-    }
-    return 0.0f;
-}
-
-// ============================================================================
-// CustomEffectFactory实现
-// ============================================================================
-
-CustomEffectFactory& CustomEffectFactory::getInstance() {
-    static CustomEffectFactory instance;
-    return instance;
-}
-
-void CustomEffectFactory::registerEffect(const std::string& typeName, EffectCreator creator) {
-    creators_[typeName] = creator;
-    E2D_INFO("注册自定义特效类型: {}", typeName);
-}
-
-Ptr<CustomEffect> CustomEffectFactory::create(const std::string& typeName, const CustomEffectConfig& config) {
-    auto it = creators_.find(typeName);
-    if (it != creators_.end()) {
-        return it->second(config);
-    }
-    
-    // 默认创建器
-    if (typeName == "Particle") {
-        return std::make_shared<CustomParticleEffect>(config);
-    } else if (typeName == "PostProcess") {
-        return std::make_shared<CustomPostProcessEffect>(config);
-    }
-    
-    E2D_ERROR("未知的特效类型: {}", typeName);
-    return nullptr;
-}
-
-bool CustomEffectFactory::isRegistered(const std::string& typeName) const {
-    return creators_.find(typeName) != creators_.end();
-}
-
-std::vector<std::string> CustomEffectFactory::getRegisteredTypes() const {
-    std::vector<std::string> types;
-    for (const auto& [name, _] : creators_) {
-        types.push_back(name);
-    }
-    return types;
-}
-
-// ============================================================================
-// CustomEffectManager实现
-// ============================================================================
-
-CustomEffectManager& CustomEffectManager::getInstance() {
-    static CustomEffectManager instance;
-    return instance;
-}
-
-bool CustomEffectManager::init() {
-    E2D_INFO("初始化自定义特效管理器...");
-    
-    // 注册默认特效类型
-    auto& factory = E2D_CUSTOM_EFFECT_FACTORY();
-    factory.registerEffect("Particle", [](const CustomEffectConfig& config) {
-        return std::make_shared<CustomParticleEffect>(config);
-    });
-    factory.registerEffect("PostProcess", [](const CustomEffectConfig& config) {
-        return std::make_shared<CustomPostProcessEffect>(config);
-    });
-    
-    E2D_INFO("自定义特效管理器初始化完成");
-    return true;
-}
-
-void CustomEffectManager::shutdown() {
-    E2D_INFO("关闭自定义特效管理器...");
-    stopAll();
-    activeEffects_.clear();
-    configs_.clear();
-}
-
-bool CustomEffectManager::loadFromFile(const std::string& filepath) {
-    std::ifstream file(filepath);
-    if (!file.is_open()) {
-        E2D_ERROR("无法打开特效配置文件: {}", filepath);
-        return false;
-    }
-    
-    try {
-        // 尝试解析为JSON
-        json j;
-        file >> j;
-        file.close();
-        
-        if (j.is_array()) {
-            // 多个特效配置数组
-            for (const auto& effectJson : j) {
-                auto config = jsonToEffectConfig(effectJson);
-                if (!config.name.empty()) {
-                    registerConfig(config.name, config);
-                }
-            }
-        } else if (j.is_object()) {
-            // 单个特效配置
-            auto config = jsonToEffectConfig(j);
-            if (!config.name.empty()) {
-                registerConfig(config.name, config);
-            }
-        }
-        
-        E2D_INFO("从JSON文件加载特效配置: {}", filepath);
-        return true;
-        
-    } catch (const json::exception& e) {
-        // JSON解析失败，回退到文本格式
-        file.close();
-        return loadFromTextFile(filepath);
-    }
-}
-
-bool CustomEffectManager::loadFromTextFile(const std::string& filepath) {
-    std::ifstream file(filepath);
-    if (!file.is_open()) {
-        E2D_ERROR("无法打开特效配置文件: {}", filepath);
-        return false;
-    }
-    
-    // 简化格式：每行一个特效配置
-    // 格式: EFFECT name type
-    //       PARAM key value
-    //       END
-    
-    std::string line;
-    CustomEffectConfig currentConfig;
-    bool inEffect = false;
-    
-    while (std::getline(file, line)) {
-        // 跳过空行和注释
-        if (line.empty() || line[0] == '#') continue;
-        
-        std::istringstream iss(line);
-        std::string cmd;
-        iss >> cmd;
-        
-        if (cmd == "EFFECT") {
-            // 开始新特效
-            if (inEffect) {
-                // 保存上一个特效
-                registerConfig(currentConfig.name, currentConfig);
-            }
-            inEffect = true;
-            currentConfig = CustomEffectConfig();
-            
-            std::string type;
-            iss >> currentConfig.name >> type;
-            
-            if (type == "Particle") {
-                currentConfig.type = CustomEffectType::Particle;
-            } else if (type == "PostProcess") {
-                currentConfig.type = CustomEffectType::PostProcess;
-            } else {
-                currentConfig.type = CustomEffectType::Particle;
-            }
-        } else if (cmd == "DESC") {
-            std::getline(iss, currentConfig.description);
-            // 去除前导空格
-            if (!currentConfig.description.empty() && currentConfig.description[0] == ' ') {
-                currentConfig.description = currentConfig.description.substr(1);
-            }
-        } else if (cmd == "DURATION") {
-            iss >> currentConfig.duration;
-        } else if (cmd == "LOOP") {
-            std::string val;
-            iss >> val;
-            currentConfig.loop = (val == "true" || val == "1");
-        } else if (cmd == "EMISSION") {
-            iss >> currentConfig.emitterConfig.emissionRate;
-        } else if (cmd == "LIFE") {
-            iss >> currentConfig.emitterConfig.minLife >> currentConfig.emitterConfig.maxLife;
-        } else if (cmd == "SIZE_START") {
-            iss >> currentConfig.emitterConfig.minStartSize >> currentConfig.emitterConfig.maxStartSize;
-        } else if (cmd == "SIZE_END") {
-            iss >> currentConfig.emitterConfig.minEndSize >> currentConfig.emitterConfig.maxEndSize;
-        } else if (cmd == "VELOCITY") {
-            iss >> currentConfig.emitterConfig.minVelocity.x 
-                >> currentConfig.emitterConfig.minVelocity.y
-                >> currentConfig.emitterConfig.maxVelocity.x
-                >> currentConfig.emitterConfig.maxVelocity.y;
-        } else if (cmd == "ACCEL") {
-            iss >> currentConfig.emitterConfig.acceleration.x 
-                >> currentConfig.emitterConfig.acceleration.y;
-        } else if (cmd == "COLOR_START") {
-            iss >> currentConfig.emitterConfig.startColor.r 
-                >> currentConfig.emitterConfig.startColor.g
-                >> currentConfig.emitterConfig.startColor.b
-                >> currentConfig.emitterConfig.startColor.a;
-        } else if (cmd == "COLOR_END") {
-            iss >> currentConfig.emitterConfig.endColor.r 
-                >> currentConfig.emitterConfig.endColor.g
-                >> currentConfig.emitterConfig.endColor.b
-                >> currentConfig.emitterConfig.endColor.a;
-        } else if (cmd == "BLEND") {
-            std::string mode;
-            iss >> mode;
-            if (mode == "Additive") {
-                currentConfig.emitterConfig.blendMode = BlendMode::Additive;
-            } else if (mode == "Alpha") {
-                currentConfig.emitterConfig.blendMode = BlendMode::Alpha;
-            } else {
-                currentConfig.emitterConfig.blendMode = BlendMode::None;
-            }
-        } else if (cmd == "END") {
-            // 结束当前特效
-            if (inEffect) {
-                registerConfig(currentConfig.name, currentConfig);
-                inEffect = false;
-            }
-        }
-    }
-    
-    // 保存最后一个特效
-    if (inEffect) {
-        registerConfig(currentConfig.name, currentConfig);
-    }
-    
-    file.close();
-    E2D_INFO("从文本文件加载特效配置: {}", filepath);
-    return true;
-}
-
-bool CustomEffectManager::saveToFile(const std::string& name, const std::string& filepath, bool useJson) {
-    auto it = configs_.find(name);
-    if (it == configs_.end()) {
-        E2D_ERROR("特效配置不存在: {}", name);
-        return false;
-    }
-    
-    std::ofstream file(filepath);
-    if (!file.is_open()) {
-        E2D_ERROR("无法创建文件: {}", filepath);
-        return false;
-    }
-    
-    if (useJson) {
-        // 保存为JSON格式
-        json j = effectConfigToJson(it->second);
-        file << j.dump(2);  // 缩进2个空格，更易读
-        E2D_INFO("保存特效配置到JSON文件: {}", filepath);
-    } else {
-        // 保存为文本格式
-        const auto& config = it->second;
-        
-        file << "# Easy2D Custom Effect Config\n";
-        file << "# Generated automatically\n\n";
-        
-        file << "EFFECT " << config.name << " ";
-        if (config.type == CustomEffectType::Particle) {
-            file << "Particle\n";
-        } else if (config.type == CustomEffectType::PostProcess) {
-            file << "PostProcess\n";
-        } else {
-            file << "Particle\n";
-        }
-        
-        file << "DESC " << config.description << "\n";
-        file << "DURATION " << config.duration << "\n";
-        file << "LOOP " << (config.loop ? "true" : "false") << "\n";
-        
-        if (config.type == CustomEffectType::Particle) {
-            const auto& ec = config.emitterConfig;
-            file << "EMISSION " << ec.emissionRate << "\n";
-            file << "LIFE " << ec.minLife << " " << ec.maxLife << "\n";
-            file << "SIZE_START " << ec.minStartSize << " " << ec.maxStartSize << "\n";
-            file << "SIZE_END " << ec.minEndSize << " " << ec.maxEndSize << "\n";
-            file << "VELOCITY " << ec.minVelocity.x << " " << ec.minVelocity.y << " "
-                 << ec.maxVelocity.x << " " << ec.maxVelocity.y << "\n";
-            file << "ACCEL " << ec.acceleration.x << " " << ec.acceleration.y << "\n";
-            file << "COLOR_START " << ec.startColor.r << " " << ec.startColor.g << " "
-                 << ec.startColor.b << " " << ec.startColor.a << "\n";
-            file << "COLOR_END " << ec.endColor.r << " " << ec.endColor.g << " "
-                 << ec.endColor.b << " " << ec.endColor.a << "\n";
-            
-            file << "BLEND ";
-            switch (ec.blendMode) {
-                case BlendMode::Additive:
-                    file << "Additive\n";
-                    break;
-                case BlendMode::Alpha:
-                    file << "Alpha\n";
-                    break;
-                default:
-                    file << "None\n";
-                    break;
-            }
-        }
-        
-        file << "END\n";
-        E2D_INFO("保存特效配置到文本文件: {}", filepath);
-    }
-    
-    file.close();
-    return true;
-}
-
-bool CustomEffectManager::saveAllToFile(const std::string& filepath) {
-    std::ofstream file(filepath);
-    if (!file.is_open()) {
-        E2D_ERROR("无法创建文件: {}", filepath);
-        return false;
-    }
-    
-    json effectsArray = json::array();
-    for (const auto& [name, config] : configs_) {
-        effectsArray.push_back(effectConfigToJson(config));
-    }
-    
-    file << effectsArray.dump(2);
-    file.close();
-    
-    E2D_INFO("保存所有特效配置到: {}", filepath);
-    return true;
-}
-
-void CustomEffectManager::registerConfig(const std::string& name, const CustomEffectConfig& config) {
-    configs_[name] = config;
-    E2D_INFO("注册特效配置: {}", name);
-}
-
-CustomEffectConfig* CustomEffectManager::getConfig(const std::string& name) {
-    auto it = configs_.find(name);
-    if (it != configs_.end()) {
-        return &it->second;
-    }
-    return nullptr;
-}
-
-void CustomEffectManager::removeConfig(const std::string& name) {
-    configs_.erase(name);
-}
-
-std::vector<std::string> CustomEffectManager::getConfigNames() const {
-    std::vector<std::string> names;
-    for (const auto& [name, _] : configs_) {
-        names.push_back(name);
-    }
-    return names;
-}
-
-Ptr<CustomEffect> CustomEffectManager::createEffect(const std::string& name) {
-    auto config = getConfig(name);
-    if (!config) {
-        E2D_ERROR("特效配置不存在: {}", name);
-        return nullptr;
-    }
-    
-    return createEffectFromConfig(*config);
-}
-
-Ptr<CustomEffect> CustomEffectManager::createEffectFromConfig(const CustomEffectConfig& config) {
-    std::string typeName;
-    switch (config.type) {
-        case CustomEffectType::Particle:
-            typeName = "Particle";
-            break;
-        case CustomEffectType::PostProcess:
-            typeName = "PostProcess";
-            break;
-        default:
-            typeName = "Particle";
-            break;
-    }
-    
-    auto effect = E2D_CUSTOM_EFFECT_FACTORY().create(typeName, config);
-    if (effect && effect->init()) {
-        activeEffects_.push_back(effect);
-        return effect;
-    }
-    
-    return nullptr;
-}
-
-void CustomEffectManager::destroyEffect(Ptr<CustomEffect> effect) {
-    if (!effect) return;
-    
-    effect->shutdown();
-    
-    auto it = std::find(activeEffects_.begin(), activeEffects_.end(), effect);
-    if (it != activeEffects_.end()) {
-        activeEffects_.erase(it);
-    }
-}
-
-void CustomEffectManager::update(float dt) {
-    for (auto& effect : activeEffects_) {
-        if (effect->isPlaying()) {
-            effect->update(dt);
-        }
-    }
-    
-    // 清理已完成的特效
-    activeEffects_.erase(
-        std::remove_if(activeEffects_.begin(), activeEffects_.end(),
-            [](const Ptr<CustomEffect>& effect) {
-                return effect->isFinished();
-            }),
-        activeEffects_.end()
-    );
-}
-
-void CustomEffectManager::render(RenderBackend& renderer) {
-    for (auto& effect : activeEffects_) {
-        if (effect->isPlaying()) {
-            effect->render(renderer);
-        }
-    }
-}
-
-void CustomEffectManager::stopAll() {
-    for (auto& effect : activeEffects_) {
-        effect->stop();
-    }
-}
-
-Ptr<CustomEffect> CustomEffectManager::play(const std::string& name, const Vec2& position) {
-    auto effect = createEffect(name);
-    if (effect) {
-        effect->setPosition(position);
-        effect->play();
-    }
-    return effect;
-}
-
-void CustomEffectManager::playOneShot(const std::string& name, const Vec2& position) {
-    auto effect = play(name, position);
-    if (effect) {
-        // 设置非循环，播放一次后自动销毁
-        effect->play();
-    }
-}
-
-// ============================================================================
-// EffectBuilder实现
-// ============================================================================
-
-CustomEffectConfig EffectBuilder::Particle(const std::string& name) {
-    CustomEffectConfig config;
-    config.name = name;
-    config.type = CustomEffectType::Particle;
-    config.duration = -1.0f;
-    config.loop = true;
-    config.delay = 0.0f;
-    
-    // 默认粒子配置
-    config.emitterConfig.emissionRate = 100.0f;
-    config.emitterConfig.minLife = 1.0f;
-    config.emitterConfig.maxLife = 2.0f;
-    config.emitterConfig.minStartSize = 10.0f;
-    config.emitterConfig.maxStartSize = 20.0f;
-    config.emitterConfig.minEndSize = 0.0f;
-    config.emitterConfig.maxEndSize = 5.0f;
-    config.emitterConfig.minVelocity = Vec2(-50.0f, -50.0f);
-    config.emitterConfig.maxVelocity = Vec2(50.0f, 50.0f);
-    config.emitterConfig.acceleration = Vec2(0.0f, 0.0f);
-    config.emitterConfig.startColor = Colors::White;
-    config.emitterConfig.endColor = Colors::Transparent;
-    config.emitterConfig.blendMode = BlendMode::Additive;
-    
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Fire(const std::string& name) {
-    CustomEffectConfig config = Particle(name);
-    config.emitterConfig = ParticlePreset::Fire();
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Smoke(const std::string& name) {
-    CustomEffectConfig config = Particle(name);
-    config.emitterConfig = ParticlePreset::Smoke();
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Explosion(const std::string& name) {
-    CustomEffectConfig config = Particle(name);
-    config.emitterConfig = ParticlePreset::Explosion();
-    config.duration = 2.0f;
-    config.loop = false;
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Magic(const std::string& name) {
-    CustomEffectConfig config = Particle(name);
-    config.emitterConfig = ParticlePreset::Magic();
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Sparkle(const std::string& name) {
-    CustomEffectConfig config = Particle(name);
-    config.emitterConfig = ParticlePreset::Sparkle();
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Bloom(const std::string& name) {
-    CustomEffectConfig config;
-    config.name = name;
-    config.type = CustomEffectType::PostProcess;
-    config.duration = -1.0f;
-    config.loop = true;
-    config.shaderParams["intensity"] = 1.5f;
-    config.shaderParams["threshold"] = 0.8f;
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Blur(const std::string& name) {
-    CustomEffectConfig config;
-    config.name = name;
-    config.type = CustomEffectType::PostProcess;
-    config.duration = -1.0f;
-    config.loop = true;
-    config.shaderParams["radius"] = 2.0f;
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::Vignette(const std::string& name) {
-    CustomEffectConfig config;
-    config.name = name;
-    config.type = CustomEffectType::PostProcess;
-    config.duration = -1.0f;
-    config.loop = true;
-    config.shaderParams["intensity"] = 0.5f;
-    return config;
-}
-
-CustomEffectConfig EffectBuilder::ColorGrading(const std::string& name) {
-    CustomEffectConfig config;
-    config.name = name;
-    config.type = CustomEffectType::PostProcess;
-    config.duration = -1.0f;
-    config.loop = true;
-    config.shaderParams["brightness"] = 1.0f;
-    config.shaderParams["contrast"] = 1.0f;
-    config.shaderParams["saturation"] = 1.0f;
-    return config;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/effects/particle_system.cpp b/Easy2D/src/effects/particle_system.cpp
deleted file mode 100644
index f4614d4..0000000
--- a/Easy2D/src/effects/particle_system.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-#include <easy2d/effects/particle_system.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/utils/logger.h>
-#include <cmath>
-
-namespace easy2d {
-
-// ============================================================================
-// ParticleEmitter实现
-// ============================================================================
-
-ParticleEmitter::ParticleEmitter() : rng_(std::random_device{}()) {}
-
-bool ParticleEmitter::init(size_t maxParticles) {
-    particles_.resize(maxParticles);
-    activeCount_ = 0;
-    return true;
-}
-
-void ParticleEmitter::shutdown() {
-    particles_.clear();
-    activeCount_ = 0;
-}
-
-void ParticleEmitter::start() {
-    emitting_ = true;
-    emissionTime_ = 0.0f;
-}
-
-void ParticleEmitter::stop() {
-    emitting_ = false;
-}
-
-void ParticleEmitter::burst(int count) {
-    for (int i = 0; i < count && activeCount_ < particles_.size(); ++i) {
-        emitParticle();
-    }
-}
-
-void ParticleEmitter::reset() {
-    for (auto& particle : particles_) {
-        particle.active = false;
-    }
-    activeCount_ = 0;
-    emissionTimer_ = 0.0f;
-    emissionTime_ = 0.0f;
-}
-
-void ParticleEmitter::update(float dt) {
-    // 发射新粒子
-    if (emitting_) {
-        emissionTime_ += dt;
-        
-        // 检查持续时间
-        if (config_.emissionDuration > 0 && emissionTime_ >= config_.emissionDuration) {
-            emitting_ = false;
-        }
-        
-        emissionTimer_ += dt;
-        float emissionInterval = 1.0f / config_.emissionRate;
-        
-        while (emissionTimer_ >= emissionInterval && activeCount_ < particles_.size()) {
-            emitParticle();
-            emissionTimer_ -= emissionInterval;
-        }
-    }
-    
-    // 更新活跃粒子
-    size_t newActiveCount = 0;
-    for (size_t i = 0; i < activeCount_; ++i) {
-        auto& p = particles_[i];
-        
-        if (!p.active) continue;
-        
-        // 更新生命周期
-        p.life -= dt;
-        if (p.life <= 0.0f) {
-            p.active = false;
-            continue;
-        }
-        
-        // 更新物理
-        p.velocity += p.acceleration * dt;
-        p.position += p.velocity * dt;
-        p.rotation += p.angularVelocity * dt;
-        
-        // 更新大小
-        p.size += p.sizeDelta * dt;
-        if (p.size < 0.0f) p.size = 0.0f;
-        
-        // 更新颜色
-        p.color += p.colorDelta * dt;
-        
-        // 保持活跃
-        if (newActiveCount != i) {
-            particles_[newActiveCount] = p;
-        }
-        newActiveCount++;
-    }
-    
-    activeCount_ = newActiveCount;
-}
-
-void ParticleEmitter::render(RenderBackend& renderer) {
-    if (activeCount_ == 0) return;
-    
-    // 设置混合模式
-    renderer.setBlendMode(config_.blendMode);
-    
-    // 渲染所有活跃粒子
-    if (config_.texture) {
-        // 使用纹理批量渲染
-        renderer.beginSpriteBatch();
-        
-        for (size_t i = 0; i < activeCount_; ++i) {
-            const auto& p = particles_[i];
-            if (!p.active) continue;
-            
-            // 计算目标矩形
-            float halfSize = p.size * 0.5f;
-            Rect destRect(
-                p.position.x - halfSize,
-                p.position.y - halfSize,
-                p.size,
-                p.size
-            );
-            
-            renderer.drawSprite(*config_.texture, destRect, 
-                              Rect(0, 0, config_.texture->getWidth(), config_.texture->getHeight()),
-                              p.color, p.rotation, Vec2(0.5f, 0.5f));
-        }
-        
-        renderer.endSpriteBatch();
-    } else {
-        // 没有纹理，使用圆形填充渲染
-        for (size_t i = 0; i < activeCount_; ++i) {
-            const auto& p = particles_[i];
-            if (!p.active) continue;
-            
-            // 渲染圆形粒子
-            renderer.fillCircle(p.position, p.size * 0.5f, p.color);
-        }
-    }
-}
-
-void ParticleEmitter::emitParticle() {
-    if (activeCount_ >= particles_.size()) return;
-    
-    Particle& p = particles_[activeCount_];
-    p.active = true;
-    
-    // 位置
-    p.position = position_ + randomPointInShape();
-    
-    // 速度
-    p.velocity = randomVelocity();
-    
-    // 加速度
-    p.acceleration = config_.acceleration;
-    
-    // 旋转
-    p.rotation = randomFloat(config_.minRotation, config_.maxRotation);
-    p.angularVelocity = randomFloat(config_.minAngularVelocity, config_.maxAngularVelocity);
-    
-    // 大小
-    float startSize = randomFloat(config_.minStartSize, config_.maxStartSize);
-    float endSize = randomFloat(config_.minEndSize, config_.maxEndSize);
-    p.size = startSize;
-    
-    // 生命周期
-    p.maxLife = randomFloat(config_.minLife, config_.maxLife);
-    p.life = p.maxLife;
-    
-    // 计算每帧变化量
-    if (p.maxLife > 0.0f) {
-        p.sizeDelta = (endSize - startSize) / p.maxLife;
-        p.colorDelta = (config_.endColor - config_.startColor) / p.maxLife;
-    }
-    
-    // 颜色
-    p.color = config_.startColor;
-    
-    activeCount_++;
-}
-
-float ParticleEmitter::randomFloat(float min, float max) {
-    std::uniform_real_distribution<float> dist(min, max);
-    return dist(rng_);
-}
-
-Vec2 ParticleEmitter::randomPointInShape() {
-    switch (config_.shape) {
-        case EmitterConfig::Shape::Point:
-            return Vec2::Zero();
-            
-        case EmitterConfig::Shape::Circle: {
-            float angle = randomFloat(0.0f, 2.0f * 3.14159265359f);
-            float radius = randomFloat(0.0f, config_.shapeRadius);
-            return Vec2(
-                std::cos(angle) * radius,
-                std::sin(angle) * radius
-            );
-        }
-        
-        case EmitterConfig::Shape::Rectangle:
-            return Vec2(
-                randomFloat(-config_.shapeSize.x * 0.5f, config_.shapeSize.x * 0.5f),
-                randomFloat(-config_.shapeSize.y * 0.5f, config_.shapeSize.y * 0.5f)
-            );
-            
-        case EmitterConfig::Shape::Cone: {
-            float angle = randomFloat(-config_.coneAngle * 0.5f, config_.coneAngle * 0.5f);
-            float radius = randomFloat(0.0f, config_.shapeRadius);
-            float rad = angle * 3.14159265359f / 180.0f;
-            return Vec2(
-                std::cos(rad) * radius,
-                std::sin(rad) * radius
-            );
-        }
-    }
-    
-    return Vec2::Zero();
-}
-
-Vec2 ParticleEmitter::randomVelocity() {
-    return Vec2(
-        randomFloat(config_.minVelocity.x, config_.maxVelocity.x),
-        randomFloat(config_.minVelocity.y, config_.maxVelocity.y)
-    );
-}
-
-// ============================================================================
-// ParticleSystem实现
-// ============================================================================
-
-ParticleSystem::ParticleSystem() {}
-
-Ptr<ParticleSystem> ParticleSystem::create() {
-    return std::make_shared<ParticleSystem>();
-}
-
-Ptr<ParticleEmitter> ParticleSystem::addEmitter(const EmitterConfig& config) {
-    auto emitter = std::make_shared<ParticleEmitter>();
-    emitter->setConfig(config);
-    emitter->init(1000); // 默认最大1000个粒子
-    emitters_.push_back(emitter);
-    return emitter;
-}
-
-void ParticleSystem::removeEmitter(Ptr<ParticleEmitter> emitter) {
-    auto it = std::find(emitters_.begin(), emitters_.end(), emitter);
-    if (it != emitters_.end()) {
-        (*it)->shutdown();
-        emitters_.erase(it);
-    }
-}
-
-void ParticleSystem::removeAllEmitters() {
-    for (auto& emitter : emitters_) {
-        emitter->shutdown();
-    }
-    emitters_.clear();
-}
-
-void ParticleSystem::startAll() {
-    for (auto& emitter : emitters_) {
-        emitter->start();
-    }
-}
-
-void ParticleSystem::stopAll() {
-    for (auto& emitter : emitters_) {
-        emitter->stop();
-    }
-}
-
-void ParticleSystem::resetAll() {
-    for (auto& emitter : emitters_) {
-        emitter->reset();
-    }
-}
-
-void ParticleSystem::onUpdate(float dt) {
-    // 获取粒子系统的世界位置
-    auto worldPos = convertToWorldSpace(Vec2::Zero());
-    
-    for (auto& emitter : emitters_) {
-        // 更新发射器位置为粒子系统的世界位置
-        emitter->setPosition(worldPos);
-        // 更新发射器
-        emitter->update(dt);
-    }
-}
-
-void ParticleSystem::onDraw(RenderBackend& renderer) {
-    for (auto& emitter : emitters_) {
-        emitter->render(renderer);
-    }
-}
-
-// ============================================================================
-// 预设实现
-// ============================================================================
-
-EmitterConfig ParticlePreset::Fire() {
-    EmitterConfig config;
-    config.emissionRate = 200.0f;
-    config.minLife = 0.5f;
-    config.maxLife = 1.5f;
-    config.minStartSize = 20.0f;
-    config.maxStartSize = 40.0f;
-    config.minEndSize = 5.0f;
-    config.maxEndSize = 10.0f;
-    config.minVelocity = Vec2(-30.0f, -150.0f);  // 向上（负y）
-    config.maxVelocity = Vec2(30.0f, -50.0f);
-    config.acceleration = Vec2(0.0f, 0.0f);
-    config.startColor = Color(1.0f, 0.8f, 0.2f, 1.0f);  // 黄色
-    config.endColor = Color(1.0f, 0.2f, 0.0f, 0.0f);    // 红色透明
-    config.blendMode = BlendMode::Additive;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Smoke() {
-    EmitterConfig config;
-    config.emissionRate = 50.0f;
-    config.minLife = 2.0f;
-    config.maxLife = 4.0f;
-    config.minStartSize = 30.0f;
-    config.maxStartSize = 60.0f;
-    config.minEndSize = 80.0f;
-    config.maxEndSize = 120.0f;
-    config.minVelocity = Vec2(-20.0f, -60.0f);  // 向上（负y）
-    config.maxVelocity = Vec2(20.0f, -30.0f);
-    config.acceleration = Vec2(0.0f, -10.0f);  // 向上加速度
-    config.startColor = Color(0.5f, 0.5f, 0.5f, 0.5f);  // 灰色半透明
-    config.endColor = Color(0.3f, 0.3f, 0.3f, 0.0f);    // 深灰透明
-    config.blendMode = BlendMode::Alpha;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Explosion() {
-    EmitterConfig config;
-    config.emissionRate = 1000.0f;
-    config.emissionDuration = 0.1f;  // 瞬间爆发
-    config.minLife = 0.5f;
-    config.maxLife = 1.5f;
-    config.minStartSize = 10.0f;
-    config.maxStartSize = 30.0f;
-    config.minEndSize = 0.0f;
-    config.maxEndSize = 5.0f;
-    config.minVelocity = Vec2(-300.0f, -300.0f);
-    config.maxVelocity = Vec2(300.0f, 300.0f);
-    config.acceleration = Vec2(0.0f, -50.0f);
-    config.startColor = Color(1.0f, 1.0f, 0.5f, 1.0f);  // 亮黄
-    config.endColor = Color(1.0f, 0.3f, 0.0f, 0.0f);    // 橙红透明
-    config.blendMode = BlendMode::Additive;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Sparkle() {
-    EmitterConfig config;
-    config.emissionRate = 20.0f;
-    config.minLife = 0.2f;
-    config.maxLife = 0.8f;
-    config.minStartSize = 2.0f;
-    config.maxStartSize = 5.0f;
-    config.minEndSize = 0.0f;
-    config.maxEndSize = 2.0f;
-    config.minVelocity = Vec2(-10.0f, -10.0f);
-    config.maxVelocity = Vec2(10.0f, 10.0f);
-    config.acceleration = Vec2(0.0f, 0.0f);
-    config.startColor = Color(1.0f, 1.0f, 1.0f, 1.0f);  // 白色
-    config.endColor = Color(1.0f, 1.0f, 1.0f, 0.0f);    // 透明
-    config.blendMode = BlendMode::Additive;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Rain() {
-    EmitterConfig config;
-    config.emissionRate = 500.0f;
-    config.minLife = 1.0f;
-    config.maxLife = 2.0f;
-    config.minStartSize = 2.0f;
-    config.maxStartSize = 4.0f;
-    config.minEndSize = 2.0f;
-    config.maxEndSize = 4.0f;
-    config.minVelocity = Vec2(-100.0f, -400.0f);
-    config.maxVelocity = Vec2(100.0f, -600.0f);
-    config.acceleration = Vec2(0.0f, -100.0f);
-    config.startColor = Color(0.7f, 0.8f, 1.0f, 0.6f);  // 淡蓝
-    config.endColor = Color(0.7f, 0.8f, 1.0f, 0.3f);    // 淡蓝半透明
-    config.shape = EmitterConfig::Shape::Rectangle;
-    config.shapeSize = Vec2(800.0f, 100.0f);  // 在顶部区域发射
-    config.blendMode = BlendMode::Alpha;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Snow() {
-    EmitterConfig config;
-    config.emissionRate = 100.0f;
-    config.minLife = 3.0f;
-    config.maxLife = 6.0f;
-    config.minStartSize = 5.0f;
-    config.maxStartSize = 10.0f;
-    config.minEndSize = 5.0f;
-    config.maxEndSize = 10.0f;
-    config.minVelocity = Vec2(-30.0f, -30.0f);
-    config.maxVelocity = Vec2(30.0f, -80.0f);
-    config.acceleration = Vec2(0.0f, 0.0f);
-    config.startColor = Color(1.0f, 1.0f, 1.0f, 0.8f);  // 白色
-    config.endColor = Color(1.0f, 1.0f, 1.0f, 0.8f);    // 白色
-    config.shape = EmitterConfig::Shape::Rectangle;
-    config.shapeSize = Vec2(800.0f, 100.0f);
-    config.blendMode = BlendMode::Alpha;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Magic() {
-    EmitterConfig config;
-    config.emissionRate = 100.0f;
-    config.minLife = 1.0f;
-    config.maxLife = 2.0f;
-    config.minStartSize = 5.0f;
-    config.maxStartSize = 15.0f;
-    config.minEndSize = 0.0f;
-    config.maxEndSize = 5.0f;
-    config.minVelocity = Vec2(-50.0f, -50.0f);  // 主要向上
-    config.maxVelocity = Vec2(50.0f, -50.0f);
-    config.acceleration = Vec2(0.0f, -20.0f);  // 向上加速度
-    config.startColor = Color(0.5f, 0.2f, 1.0f, 1.0f);  // 紫色
-    config.endColor = Color(0.2f, 0.8f, 1.0f, 0.0f);    // 青色透明
-    config.blendMode = BlendMode::Additive;
-    return config;
-}
-
-EmitterConfig ParticlePreset::Bubbles() {
-    EmitterConfig config;
-    config.emissionRate = 30.0f;
-    config.minLife = 2.0f;
-    config.maxLife = 4.0f;
-    config.minStartSize = 5.0f;
-    config.maxStartSize = 15.0f;
-    config.minEndSize = 5.0f;
-    config.maxEndSize = 15.0f;
-    config.minVelocity = Vec2(-20.0f, 20.0f);
-    config.maxVelocity = Vec2(20.0f, 60.0f);
-    config.acceleration = Vec2(0.0f, 30.0f);
-    config.startColor = Color(0.8f, 0.9f, 1.0f, 0.4f);  // 淡蓝透明
-    config.endColor = Color(0.8f, 0.9f, 1.0f, 0.1f);    // 更透明
-    config.blendMode = BlendMode::Alpha;
-    return config;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/effects/post_process.cpp b/Easy2D/src/effects/post_process.cpp
deleted file mode 100644
index 8c5f7a3..0000000
--- a/Easy2D/src/effects/post_process.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-#include <easy2d/effects/post_process.h>
-#include <easy2d/graphics/render_target.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/utils/logger.h>
-
-// 使用标准 GLES3.2
-#include <GLES3/gl32.h>
-
-namespace easy2d {
-
-// ============================================================================
-// 静态成员初始化
-// ============================================================================
-GLuint PostProcessEffect::quadVao_ = 0;
-GLuint PostProcessEffect::quadVbo_ = 0;
-bool PostProcessEffect::quadInitialized_ = false;
-
-// ============================================================================
-// PostProcessEffect实现
-// ============================================================================
-
-PostProcessEffect::PostProcessEffect(const std::string& name) : name_(name) {}
-
-bool PostProcessEffect::init() {
-    initQuad();
-    valid_ = true;
-    return true;
-}
-
-void PostProcessEffect::shutdown() {
-    shader_.reset();
-    valid_ = false;
-}
-
-void PostProcessEffect::apply(const Texture& source, RenderTarget& target, RenderBackend& renderer) {
-    if (!enabled_ || !valid_) return;
-
-    target.bind();
-    
-    if (shader_) {
-        shader_->bind();
-        shader_->setInt("u_texture", 0);
-        glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(reinterpret_cast<uintptr_t>(source.getNativeHandle())));
-        
-        onShaderBind(*shader_);
-    }
-    
-    renderFullscreenQuad();
-    
-    if (shader_) {
-        shader_->unbind();
-    }
-    
-    target.unbind();
-}
-
-bool PostProcessEffect::loadShader(const std::string& vertSource, const std::string& fragSource) {
-    shader_ = std::make_shared<GLShader>();
-    if (!shader_->compileFromSource(vertSource.c_str(), fragSource.c_str())) {
-        E2D_ERROR("后处理效果 '{}' 加载Shader失败", name_);
-        shader_.reset();
-        return false;
-    }
-    return true;
-}
-
-bool PostProcessEffect::loadShaderFromFile(const std::string& vertPath, const std::string& fragPath) {
-    shader_ = std::make_shared<GLShader>();
-    if (!shader_->compileFromFile(vertPath, fragPath)) {
-        E2D_ERROR("后处理效果 '{}' 从文件加载Shader失败", name_);
-        shader_.reset();
-        return false;
-    }
-    return true;
-}
-
-void PostProcessEffect::initQuad() {
-    if (quadInitialized_) return;
-    
-    // 全屏四边形顶点数据（位置和纹理坐标）
-    float quadVertices[] = {
-        // 位置              // 纹理坐标
-        -1.0f,  1.0f,  0.0f, 1.0f,
-        -1.0f, -1.0f,  0.0f, 0.0f,
-         1.0f, -1.0f,  1.0f, 0.0f,
-        -1.0f,  1.0f,  0.0f, 1.0f,
-         1.0f, -1.0f,  1.0f, 0.0f,
-         1.0f,  1.0f,  1.0f, 1.0f
-    };
-    
-    glGenVertexArrays(1, &quadVao_);
-    glGenBuffers(1, &quadVbo_);
-    
-    glBindVertexArray(quadVao_);
-    glBindBuffer(GL_ARRAY_BUFFER, quadVbo_);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(quadVertices), quadVertices, GL_STATIC_DRAW);
-    
-    // 位置属性
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)0);
-    
-    // 纹理坐标属性
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)(2 * sizeof(float)));
-    
-    glBindVertexArray(0);
-    
-    quadInitialized_ = true;
-}
-
-void PostProcessEffect::destroyQuad() {
-    if (quadVao_ != 0) {
-        glDeleteVertexArrays(1, &quadVao_);
-        quadVao_ = 0;
-    }
-    if (quadVbo_ != 0) {
-        glDeleteBuffers(1, &quadVbo_);
-        quadVbo_ = 0;
-    }
-    quadInitialized_ = false;
-}
-
-void PostProcessEffect::renderFullscreenQuad() {
-    if (!quadInitialized_) {
-        initQuad();
-    }
-    
-    glBindVertexArray(quadVao_);
-    glDrawArrays(GL_TRIANGLES, 0, 6);
-    glBindVertexArray(0);
-}
-
-// ============================================================================
-// PostProcessStack实现
-// ============================================================================
-
-PostProcessStack::PostProcessStack() = default;
-
-PostProcessStack::~PostProcessStack() {
-    shutdown();
-}
-
-bool PostProcessStack::init(int width, int height) {
-    E2D_INFO("初始化后处理栈...");
-    
-    width_ = width;
-    height_ = height;
-    
-    // 创建两个渲染目标用于乒乓渲染
-    RenderTargetConfig config;
-    config.width = width;
-    config.height = height;
-    config.hasDepthBuffer = false;
-    config.autoResize = false;
-    
-    renderTargetA_ = std::make_shared<RenderTarget>();
-    renderTargetB_ = std::make_shared<RenderTarget>();
-    
-    if (!renderTargetA_->init(config)) {
-        E2D_ERROR("创建后处理渲染目标A失败");
-        return false;
-    }
-    
-    if (!renderTargetB_->init(config)) {
-        E2D_ERROR("创建后处理渲染目标B失败");
-        return false;
-    }
-    
-    valid_ = true;
-    E2D_INFO("后处理栈初始化成功");
-    return true;
-}
-
-void PostProcessStack::shutdown() {
-    E2D_INFO("关闭后处理栈...");
-    
-    clearEffects();
-    
-    if (renderTargetA_) {
-        renderTargetA_->shutdown();
-        renderTargetA_.reset();
-    }
-    
-    if (renderTargetB_) {
-        renderTargetB_->shutdown();
-        renderTargetB_.reset();
-    }
-    
-    valid_ = false;
-}
-
-void PostProcessStack::addEffect(Ptr<PostProcessEffect> effect) {
-    if (effect && effect->init()) {
-        effects_.push_back(effect);
-        E2D_INFO("添加后处理效果: {}", effect->getName());
-    }
-}
-
-void PostProcessStack::insertEffect(size_t index, Ptr<PostProcessEffect> effect) {
-    if (effect && effect->init() && index <= effects_.size()) {
-        effects_.insert(effects_.begin() + index, effect);
-        E2D_INFO("插入后处理效果 '{}' 到位置 {}", effect->getName(), index);
-    }
-}
-
-void PostProcessStack::removeEffect(const std::string& name) {
-    for (auto it = effects_.begin(); it != effects_.end(); ++it) {
-        if ((*it)->getName() == name) {
-            (*it)->shutdown();
-            effects_.erase(it);
-            E2D_INFO("移除后处理效果: {}", name);
-            return;
-        }
-    }
-}
-
-void PostProcessStack::removeEffect(size_t index) {
-    if (index < effects_.size()) {
-        effects_[index]->shutdown();
-        effects_.erase(effects_.begin() + index);
-    }
-}
-
-Ptr<PostProcessEffect> PostProcessStack::getEffect(const std::string& name) {
-    for (auto& effect : effects_) {
-        if (effect->getName() == name) {
-            return effect;
-        }
-    }
-    return nullptr;
-}
-
-Ptr<PostProcessEffect> PostProcessStack::getEffect(size_t index) {
-    if (index < effects_.size()) {
-        return effects_[index];
-    }
-    return nullptr;
-}
-
-void PostProcessStack::clearEffects() {
-    for (auto& effect : effects_) {
-        effect->shutdown();
-    }
-    effects_.clear();
-}
-
-void PostProcessStack::beginCapture() {
-    if (!valid_) return;
-    
-    renderTargetA_->bind();
-    renderTargetA_->clear(Colors::Black);
-    capturing_ = true;
-}
-
-void PostProcessStack::endCapture(RenderBackend& renderer) {
-    if (!valid_ || !capturing_) return;
-    
-    renderTargetA_->unbind();
-    
-    // 应用所有后处理效果
-    if (effects_.empty()) {
-        // 没有效果，直接渲染到屏幕
-        // 这里需要渲染renderTargetA_的纹理到屏幕
-        capturing_ = false;
-        return;
-    }
-    
-    // 乒乓渲染
-    RenderTarget* readTarget = renderTargetA_.get();
-    RenderTarget* writeTarget = renderTargetB_.get();
-    
-    for (size_t i = 0; i < effects_.size(); ++i) {
-        auto& effect = effects_[i];
-        
-        if (effect->isEnabled()) {
-            effect->apply(*readTarget->getColorTexture(), *writeTarget, renderer);
-        }
-        
-        // 交换读写目标
-        std::swap(readTarget, writeTarget);
-    }
-    
-    // 最终结果在readTarget中（因为最后一次交换）
-    // 这里应该将结果渲染到屏幕
-    
-    capturing_ = false;
-}
-
-void PostProcessStack::process(const Texture& source, RenderTarget& target, RenderBackend& renderer) {
-    if (!valid_) return;
-    
-    RenderTarget* readTarget = nullptr;
-    RenderTarget* writeTarget = nullptr;
-    
-    // 确定读写目标
-    if (target.getFBO() == renderTargetA_->getFBO()) {
-        readTarget = renderTargetB_.get();
-        writeTarget = renderTargetA_.get();
-    } else {
-        readTarget = renderTargetA_.get();
-        writeTarget = renderTargetB_.get();
-    }
-    
-    // 首先将源纹理复制到读目标
-    readTarget->bind();
-    // 这里需要渲染源纹理到readTarget
-    readTarget->unbind();
-    
-    // 应用效果
-    for (auto& effect : effects_) {
-        if (effect->isEnabled()) {
-            effect->apply(*readTarget->getColorTexture(), *writeTarget, renderer);
-        }
-        std::swap(readTarget, writeTarget);
-    }
-    
-    // 将最终结果复制到目标
-    readTarget->blitTo(target, true, false);
-}
-
-void PostProcessStack::resize(int width, int height) {
-    if (width_ == width && height_ == height) return;
-    
-    width_ = width;
-    height_ = height;
-    
-    if (renderTargetA_) {
-        renderTargetA_->resize(width, height);
-    }
-    
-    if (renderTargetB_) {
-        renderTargetB_->resize(width, height);
-    }
-}
-
-// ============================================================================
-// PostProcessManager实现
-// ============================================================================
-
-PostProcessManager& PostProcessManager::getInstance() {
-    static PostProcessManager instance;
-    return instance;
-}
-
-void PostProcessManager::init(int width, int height) {
-    if (initialized_) return;
-    
-    E2D_INFO("初始化后处理管理器...");
-    mainStack_.init(width, height);
-    initialized_ = true;
-}
-
-void PostProcessManager::shutdown() {
-    if (!initialized_) return;
-    
-    E2D_INFO("关闭后处理管理器...");
-    mainStack_.shutdown();
-    initialized_ = false;
-}
-
-void PostProcessManager::resize(int width, int height) {
-    if (initialized_) {
-        mainStack_.resize(width, height);
-    }
-}
-
-void PostProcessManager::beginFrame() {
-    if (initialized_) {
-        mainStack_.beginCapture();
-    }
-}
-
-void PostProcessManager::endFrame(RenderBackend& renderer) {
-    if (initialized_) {
-        mainStack_.endCapture(renderer);
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/event/event.cpp b/Easy2D/src/event/event.cpp
deleted file mode 100644
index 4fa438d..0000000
--- a/Easy2D/src/event/event.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <easy2d/event/event.h>
-
-namespace easy2d {
-
-Event Event::createWindowResize(int width, int height) {
-    Event event;
-    event.type = EventType::WindowResize;
-    event.data = WindowResizeEvent{width, height};
-    return event;
-}
-
-Event Event::createWindowClose() {
-    Event event;
-    event.type = EventType::WindowClose;
-    return event;
-}
-
-Event Event::createKeyPress(int keyCode, int scancode, int mods) {
-    Event event;
-    event.type = EventType::KeyPressed;
-    event.data = KeyEvent{keyCode, scancode, mods};
-    return event;
-}
-
-Event Event::createKeyRelease(int keyCode, int scancode, int mods) {
-    Event event;
-    event.type = EventType::KeyReleased;
-    event.data = KeyEvent{keyCode, scancode, mods};
-    return event;
-}
-
-Event Event::createMouseButtonPress(int button, int mods, const Vec2& pos) {
-    Event event;
-    event.type = EventType::MouseButtonPressed;
-    event.data = MouseButtonEvent{button, mods, pos};
-    return event;
-}
-
-Event Event::createMouseButtonRelease(int button, int mods, const Vec2& pos) {
-    Event event;
-    event.type = EventType::MouseButtonReleased;
-    event.data = MouseButtonEvent{button, mods, pos};
-    return event;
-}
-
-Event Event::createMouseMove(const Vec2& pos, const Vec2& delta) {
-    Event event;
-    event.type = EventType::MouseMoved;
-    event.data = MouseMoveEvent{pos, delta};
-    return event;
-}
-
-Event Event::createMouseScroll(const Vec2& offset, const Vec2& pos) {
-    Event event;
-    event.type = EventType::MouseScrolled;
-    event.data = MouseScrollEvent{offset, pos};
-    return event;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/event/event_dispatcher.cpp b/Easy2D/src/event/event_dispatcher.cpp
deleted file mode 100644
index 3f52906..0000000
--- a/Easy2D/src/event/event_dispatcher.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <easy2d/event/event_dispatcher.h>
-#include <easy2d/event/event_queue.h>
-
-namespace easy2d {
-
-EventDispatcher::EventDispatcher() : nextId_(1) {
-}
-
-ListenerId EventDispatcher::addListener(EventType type, EventCallback callback) {
-    ListenerId id = nextId_++;
-    listeners_[type].push_back({id, type, callback});
-    return id;
-}
-
-void EventDispatcher::removeListener(ListenerId id) {
-    for (auto& [type, listeners] : listeners_) {
-        auto it = std::remove_if(listeners.begin(), listeners.end(),
-            [id](const Listener& l) { return l.id == id; });
-        if (it != listeners.end()) {
-            listeners.erase(it, listeners.end());
-            return;
-        }
-    }
-}
-
-void EventDispatcher::removeAllListeners(EventType type) {
-    listeners_.erase(type);
-}
-
-void EventDispatcher::removeAllListeners() {
-    listeners_.clear();
-}
-
-void EventDispatcher::dispatch(Event& event) {
-    auto it = listeners_.find(event.type);
-    if (it != listeners_.end()) {
-        for (auto& listener : it->second) {
-            if (event.handled) break;
-            listener.callback(event);
-        }
-    }
-}
-
-void EventDispatcher::dispatch(const Event& event) {
-    Event mutableEvent = event;
-    dispatch(mutableEvent);
-}
-
-void EventDispatcher::processQueue(EventQueue& queue) {
-    Event event;
-    while (queue.poll(event)) {
-        dispatch(event);
-    }
-}
-
-size_t EventDispatcher::getListenerCount(EventType type) const {
-    auto it = listeners_.find(type);
-    return (it != listeners_.end()) ? it->second.size() : 0;
-}
-
-size_t EventDispatcher::getTotalListenerCount() const {
-    size_t count = 0;
-    for (const auto& [type, listeners] : listeners_) {
-        count += listeners.size();
-    }
-    return count;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/event/event_queue.cpp b/Easy2D/src/event/event_queue.cpp
deleted file mode 100644
index 4151236..0000000
--- a/Easy2D/src/event/event_queue.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <easy2d/event/event_queue.h>
-
-namespace easy2d {
-
-EventQueue::EventQueue() = default;
-
-void EventQueue::push(const Event& event) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    queue_.push(event);
-}
-
-void EventQueue::push(Event&& event) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    queue_.push(std::move(event));
-}
-
-bool EventQueue::poll(Event& event) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (queue_.empty()) {
-        return false;
-    }
-    event = queue_.front();
-    queue_.pop();
-    return true;
-}
-
-bool EventQueue::peek(Event& event) const {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (queue_.empty()) {
-        return false;
-    }
-    event = queue_.front();
-    return true;
-}
-
-void EventQueue::clear() {
-    std::lock_guard<std::mutex> lock(mutex_);
-    while (!queue_.empty()) {
-        queue_.pop();
-    }
-}
-
-bool EventQueue::empty() const {
-    std::lock_guard<std::mutex> lock(mutex_);
-    return queue_.empty();
-}
-
-size_t EventQueue::size() const {
-    std::lock_guard<std::mutex> lock(mutex_);
-    return queue_.size();
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/alpha_mask.cpp b/Easy2D/src/graphics/alpha_mask.cpp
deleted file mode 100644
index acc4d34..0000000
--- a/Easy2D/src/graphics/alpha_mask.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <easy2d/graphics/alpha_mask.h>
-
-namespace easy2d {
-
-AlphaMask::AlphaMask(int width, int height)
-    : width_(width)
-    , height_(height)
-    , data_(width * height, 255) {
-}
-
-AlphaMask AlphaMask::createFromPixels(const uint8_t* pixels, int width, int height, int channels) {
-    AlphaMask mask(width, height);
-    
-    if (!pixels || width <= 0 || height <= 0) {
-        return mask;
-    }
-    
-    // 根据通道数提取Alpha值
-    for (int y = 0; y < height; ++y) {
-        for (int x = 0; x < width; ++x) {
-            int pixelIndex = (y * width + x) * channels;
-            uint8_t alpha = 255;
-            
-            if (channels == 4) {
-                // RGBA格式，Alpha在第四个通道
-                alpha = pixels[pixelIndex + 3];
-            } else if (channels == 1) {
-                // 灰度图，直接作为Alpha
-                alpha = pixels[pixelIndex];
-            } else if (channels == 3) {
-                // RGB格式，没有Alpha通道，视为不透明
-                alpha = 255;
-            }
-            
-            mask.data_[y * width + x] = alpha;
-        }
-    }
-    
-    return mask;
-}
-
-uint8_t AlphaMask::getAlpha(int x, int y) const {
-    if (!isValid(x, y)) {
-        return 0;
-    }
-    return data_[y * width_ + x];
-}
-
-bool AlphaMask::isOpaque(int x, int y, uint8_t threshold) const {
-    return getAlpha(x, y) >= threshold;
-}
-
-bool AlphaMask::isValid(int x, int y) const {
-    return x >= 0 && x < width_ && y >= 0 && y < height_;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/camera.cpp b/Easy2D/src/graphics/camera.cpp
deleted file mode 100644
index 009ec75..0000000
--- a/Easy2D/src/graphics/camera.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <easy2d/graphics/camera.h>
-#include <glm/gtc/matrix_transform.hpp>
-#include <algorithm>
-
-namespace easy2d {
-
-Camera::Camera()
-    : left_(-1.0f), right_(1.0f), bottom_(-1.0f), top_(1.0f) {
-}
-
-Camera::Camera(float left, float right, float bottom, float top)
-    : left_(left), right_(right), bottom_(bottom), top_(top) {
-}
-
-Camera::Camera(const Size& viewport)
-    : left_(0.0f), right_(viewport.width), bottom_(viewport.height), top_(0.0f) {
-}
-
-void Camera::setPosition(const Vec2& position) {
-    position_ = position;
-    viewDirty_ = true;
-}
-
-void Camera::setPosition(float x, float y) {
-    position_.x = x;
-    position_.y = y;
-    viewDirty_ = true;
-}
-
-void Camera::setRotation(float degrees) {
-    rotation_ = degrees;
-    viewDirty_ = true;
-}
-
-void Camera::setZoom(float zoom) {
-    zoom_ = zoom;
-    viewDirty_ = true;
-    projDirty_ = true;
-}
-
-void Camera::setViewport(float left, float right, float bottom, float top) {
-    left_ = left;
-    right_ = right;
-    bottom_ = bottom;
-    top_ = top;
-    projDirty_ = true;
-}
-
-void Camera::setViewport(const Rect& rect) {
-    left_ = rect.left();
-    right_ = rect.right();
-    bottom_ = rect.bottom();
-    top_ = rect.top();
-    projDirty_ = true;
-}
-
-Rect Camera::getViewport() const {
-    return Rect(left_, top_, right_ - left_, bottom_ - top_);
-}
-
-glm::mat4 Camera::getViewMatrix() const {
-    if (viewDirty_) {
-        viewMatrix_ = glm::mat4(1.0f);
-        // 对于2D相机，我们只需要平移（注意Y轴方向）
-        viewMatrix_ = glm::translate(viewMatrix_, glm::vec3(-position_.x, -position_.y, 0.0f));
-        viewDirty_ = false;
-    }
-    return viewMatrix_;
-}
-
-glm::mat4 Camera::getProjectionMatrix() const {
-    if (projDirty_) {
-        // 对于2D游戏，Y轴向下增长（屏幕坐标系）
-        // OpenGL默认Y轴向上，所以需要反转Y轴
-        // glm::ortho(left, right, bottom, top)
-        // 为了Y轴向下：传入 (bottom=height, top=0)，这样Y轴翻转
-        projMatrix_ = glm::ortho(
-            left_, right_,     // X轴：从左到右
-            bottom_, top_,     // Y轴：从下到上（传入bottom>top，实现Y轴向下增长）
-            -1.0f, 1.0f
-        );
-        projDirty_ = false;
-    }
-    return projMatrix_;
-}
-
-glm::mat4 Camera::getViewProjectionMatrix() const {
-    // 对于2D相机，我们主要依赖投影矩阵
-    // 视口变换已经处理了坐标系转换
-    return getProjectionMatrix();
-}
-
-Vec2 Camera::screenToWorld(const Vec2& screenPos) const {
-    // 屏幕坐标直接映射到世界坐标（在2D中通常相同）
-    return screenPos;
-}
-
-Vec2 Camera::worldToScreen(const Vec2& worldPos) const {
-    // 世界坐标直接映射到屏幕坐标（在2D中通常相同）
-    return worldPos;
-}
-
-Vec2 Camera::screenToWorld(float x, float y) const {
-    return screenToWorld(Vec2(x, y));
-}
-
-Vec2 Camera::worldToScreen(float x, float y) const {
-    return worldToScreen(Vec2(x, y));
-}
-
-void Camera::move(const Vec2& offset) {
-    position_ += offset;
-    viewDirty_ = true;
-}
-
-void Camera::move(float x, float y) {
-    position_.x += x;
-    position_.y += y;
-    viewDirty_ = true;
-}
-
-void Camera::setBounds(const Rect& bounds) {
-    bounds_ = bounds;
-    hasBounds_ = true;
-}
-
-void Camera::clearBounds() {
-    hasBounds_ = false;
-}
-
-void Camera::clampToBounds() {
-    if (!hasBounds_) return;
-    
-    float viewportWidth = (right_ - left_) / zoom_;
-    float viewportHeight = (bottom_ - top_) / zoom_;
-    
-    float minX = bounds_.left() + viewportWidth * 0.5f;
-    float maxX = bounds_.right() - viewportWidth * 0.5f;
-    float minY = bounds_.top() + viewportHeight * 0.5f;
-    float maxY = bounds_.bottom() - viewportHeight * 0.5f;
-    
-    if (minX > maxX) {
-        position_.x = bounds_.center().x;
-    } else {
-        position_.x = std::clamp(position_.x, minX, maxX);
-    }
-    
-    if (minY > maxY) {
-        position_.y = bounds_.center().y;
-    } else {
-        position_.y = std::clamp(position_.y, minY, maxY);
-    }
-    
-    viewDirty_ = true;
-}
-
-void Camera::lookAt(const Vec2& target) {
-    position_ = target;
-    viewDirty_ = true;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/opengl/gl_font_atlas.cpp b/Easy2D/src/graphics/opengl/gl_font_atlas.cpp
deleted file mode 100644
index 8b9a719..0000000
--- a/Easy2D/src/graphics/opengl/gl_font_atlas.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-#include <easy2d/graphics/opengl/gl_font_atlas.h>
-#define STB_TRUETYPE_IMPLEMENTATION
-#include <stb/stb_truetype.h>
-#define STB_RECT_PACK_IMPLEMENTATION
-#include <stb/stb_rect_pack.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-#include <algorithm>
-
-namespace easy2d {
-
-// ============================================================================
-// 构造函数 - 初始化字体图集
-// ============================================================================
-GLFontAtlas::GLFontAtlas(const std::string& filepath, int fontSize, bool useSDF)
-    : fontSize_(fontSize)
-    , useSDF_(useSDF)
-    , currentY_(0)
-    , scale_(0.0f)
-    , ascent_(0.0f)
-    , descent_(0.0f)
-    , lineGap_(0.0f) {
-    
-    // 加载字体文件
-    std::ifstream file(filepath, std::ios::binary | std::ios::ate);
-    if (!file.is_open()) {
-        E2D_LOG_ERROR("Failed to load font: {}", filepath);
-        return;
-    }
-
-    std::streamsize size = file.tellg();
-    file.seekg(0, std::ios::beg);
-    fontData_.resize(size);
-    if (!file.read(reinterpret_cast<char*>(fontData_.data()), size)) {
-        E2D_LOG_ERROR("Failed to read font file: {}", filepath);
-        return;
-    }
-
-    // 初始化 stb_truetype
-    if (!stbtt_InitFont(&fontInfo_, fontData_.data(), stbtt_GetFontOffsetForIndex(fontData_.data(), 0))) {
-        E2D_LOG_ERROR("Failed to init font: {}", filepath);
-        return;
-    }
-
-    scale_ = stbtt_ScaleForPixelHeight(&fontInfo_, static_cast<float>(fontSize_));
-    
-    int ascent, descent, lineGap;
-    stbtt_GetFontVMetrics(&fontInfo_, &ascent, &descent, &lineGap);
-    ascent_ = static_cast<float>(ascent) * scale_;
-    descent_ = static_cast<float>(descent) * scale_;
-    lineGap_ = static_cast<float>(lineGap) * scale_;
-
-    createAtlas();
-}
-
-// ============================================================================
-// 析构函数
-// ============================================================================
-GLFontAtlas::~GLFontAtlas() = default;
-
-// ============================================================================
-// 获取字形 - 如果字形不存在则缓存它
-// ============================================================================
-const Glyph* GLFontAtlas::getGlyph(char32_t codepoint) const {
-    auto it = glyphs_.find(codepoint);
-    if (it == glyphs_.end()) {
-        cacheGlyph(codepoint);
-        it = glyphs_.find(codepoint);
-    }
-    return (it != glyphs_.end()) ? &it->second : nullptr;
-}
-
-// ============================================================================
-// 测量文本尺寸
-// ============================================================================
-Vec2 GLFontAtlas::measureText(const String& text) {
-    float width = 0.0f;
-    float height = getAscent() - getDescent();
-    float currentWidth = 0.0f;
-
-    for (char32_t codepoint : text.toUtf32()) {
-        if (codepoint == '\n') {
-            width = std::max(width, currentWidth);
-            currentWidth = 0.0f;
-            height += getLineHeight();
-            continue;
-        }
-
-        const Glyph* glyph = getGlyph(codepoint);
-        if (glyph) {
-            currentWidth += glyph->advance;
-        }
-    }
-
-    width = std::max(width, currentWidth);
-    return Vec2(width, height);
-}
-
-// ============================================================================
-// 创建图集纹理 - 初始化空白纹理和矩形打包上下文
-// ============================================================================
-void GLFontAtlas::createAtlas() {
-    int channels = useSDF_ ? 1 : 4;
-    std::vector<uint8_t> emptyData(ATLAS_WIDTH * ATLAS_HEIGHT * channels, 0);
-    texture_ = std::make_unique<GLTexture>(ATLAS_WIDTH, ATLAS_HEIGHT, emptyData.data(), channels);
-    texture_->setFilter(true);
-    
-    // 初始化矩形打包上下文
-    packNodes_.resize(ATLAS_WIDTH);
-    stbrp_init_target(&packContext_, ATLAS_WIDTH, ATLAS_HEIGHT, packNodes_.data(), ATLAS_WIDTH);
-}
-
-// ============================================================================
-// 缓存字形 - 渲染字形到图集并存储信息
-// 使用 stb_rect_pack 进行矩形打包
-// ============================================================================
-void GLFontAtlas::cacheGlyph(char32_t codepoint) const {
-    int advance = 0;
-    stbtt_GetCodepointHMetrics(&fontInfo_, static_cast<int>(codepoint), &advance, nullptr);
-    float advancePx = advance * scale_;
-
-    if (useSDF_) {
-        constexpr int SDF_PADDING = 8;
-        constexpr unsigned char ONEDGE_VALUE = 128;
-        constexpr float PIXEL_DIST_SCALE = 64.0f;
-
-        int w = 0, h = 0, xoff = 0, yoff = 0;
-        unsigned char* sdf = stbtt_GetCodepointSDF(&fontInfo_,
-                                                   scale_,
-                                                   static_cast<int>(codepoint),
-                                                   SDF_PADDING,
-                                                   ONEDGE_VALUE,
-                                                   PIXEL_DIST_SCALE,
-                                                   &w, &h, &xoff, &yoff);
-        if (!sdf || w <= 0 || h <= 0) {
-            if (sdf) stbtt_FreeSDF(sdf, nullptr);
-            Glyph glyph{};
-            glyph.advance = advancePx;
-            glyphs_[codepoint] = glyph;
-            return;
-        }
-
-        stbrp_rect rect;
-        rect.id = static_cast<int>(codepoint);
-        rect.w = w + PADDING * 2;
-        rect.h = h + PADDING * 2;
-
-        stbrp_pack_rects(&packContext_, &rect, 1);
-        if (!rect.was_packed) {
-            E2D_LOG_WARN("Font atlas is full, cannot cache codepoint: {}", static_cast<int>(codepoint));
-            stbtt_FreeSDF(sdf, nullptr);
-            return;
-        }
-
-        int atlasX = rect.x + PADDING;
-        int atlasY = rect.y + PADDING;
-
-        Glyph glyph;
-        glyph.width = static_cast<float>(w);
-        glyph.height = static_cast<float>(h);
-        glyph.bearingX = static_cast<float>(xoff);
-        glyph.bearingY = static_cast<float>(yoff);
-        glyph.advance = advancePx;
-
-        // stb_rect_pack 使用左上角为原点，OpenGL纹理使用左下角为原点
-        // 需要翻转V坐标
-        float v0 = static_cast<float>(atlasY) / ATLAS_HEIGHT;
-        float v1 = static_cast<float>(atlasY + h) / ATLAS_HEIGHT;
-        glyph.u0 = static_cast<float>(atlasX) / ATLAS_WIDTH;
-        glyph.v0 = 1.0f - v1;  // 翻转V坐标
-        glyph.u1 = static_cast<float>(atlasX + w) / ATLAS_WIDTH;
-        glyph.v1 = 1.0f - v0;  // 翻转V坐标
-
-        glyphs_[codepoint] = glyph;
-
-        glBindTexture(GL_TEXTURE_2D, texture_->getTextureID());
-        GLint prevUnpackAlignment = 4;
-        glGetIntegerv(GL_UNPACK_ALIGNMENT, &prevUnpackAlignment);
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        // OpenGL纹理坐标原点在左下角，需要将Y坐标翻转
-        glTexSubImage2D(GL_TEXTURE_2D, 0, atlasX, ATLAS_HEIGHT - atlasY - h, w, h, GL_RED, GL_UNSIGNED_BYTE, sdf);
-        glPixelStorei(GL_UNPACK_ALIGNMENT, prevUnpackAlignment);
-
-        stbtt_FreeSDF(sdf, nullptr);
-        return;
-    }
-
-    int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
-    stbtt_GetCodepointBitmapBox(&fontInfo_, static_cast<int>(codepoint), scale_, scale_, &x0, &y0, &x1, &y1);
-    int w = x1 - x0;
-    int h = y1 - y0;
-    int xoff = x0;
-    int yoff = y0;
-
-    if (w <= 0 || h <= 0) {
-        Glyph glyph{};
-        glyph.advance = advancePx;
-        glyphs_[codepoint] = glyph;
-        return;
-    }
-
-    std::vector<unsigned char> bitmap(static_cast<size_t>(w) * static_cast<size_t>(h), 0);
-    stbtt_MakeCodepointBitmap(&fontInfo_, bitmap.data(), w, h, w, scale_, scale_, static_cast<int>(codepoint));
-
-    // 使用 stb_rect_pack 打包矩形
-    stbrp_rect rect;
-    rect.id = static_cast<int>(codepoint);
-    rect.w = w + PADDING * 2;
-    rect.h = h + PADDING * 2;
-    
-    stbrp_pack_rects(&packContext_, &rect, 1);
-    
-    if (!rect.was_packed) {
-        // 图集已满，无法缓存更多字形
-        E2D_LOG_WARN("Font atlas is full, cannot cache codepoint: {}", static_cast<int>(codepoint));
-        return;
-    }
-
-    int atlasX = rect.x + PADDING;
-    int atlasY = rect.y + PADDING;
-
-    // 创建字形信息
-    Glyph glyph;
-    glyph.width = static_cast<float>(w);
-    glyph.height = static_cast<float>(h);
-    glyph.bearingX = static_cast<float>(xoff);
-    glyph.bearingY = static_cast<float>(yoff);
-    glyph.advance = advancePx;
-
-    // 计算纹理坐标（相对于图集）
-    // stb_rect_pack 使用左上角为原点，OpenGL纹理使用左下角为原点
-    // 需要翻转V坐标
-    float v0 = static_cast<float>(atlasY) / ATLAS_HEIGHT;
-    float v1 = static_cast<float>(atlasY + h) / ATLAS_HEIGHT;
-    glyph.u0 = static_cast<float>(atlasX) / ATLAS_WIDTH;
-    glyph.v0 = 1.0f - v1;  // 翻转V坐标
-    glyph.u1 = static_cast<float>(atlasX + w) / ATLAS_WIDTH;
-    glyph.v1 = 1.0f - v0;  // 翻转V坐标
-
-    // 存储字形
-    glyphs_[codepoint] = glyph;
-
-    // 将单通道字形数据转换为 RGBA 格式（白色字形，Alpha 通道存储灰度）
-    std::vector<uint8_t> rgbaData(w * h * 4);
-    for (int i = 0; i < w * h; ++i) {
-        uint8_t alpha = bitmap[static_cast<size_t>(i)];
-        rgbaData[i * 4 + 0] = 255;  // R
-        rgbaData[i * 4 + 1] = 255;  // G
-        rgbaData[i * 4 + 2] = 255;  // B
-        rgbaData[i * 4 + 3] = alpha; // A
-    }
-
-    // 更新纹理 - 将字形数据上传到图集的指定位置
-    // OpenGL纹理坐标原点在左下角，需要将Y坐标翻转
-    glBindTexture(GL_TEXTURE_2D, texture_->getTextureID());
-    glTexSubImage2D(GL_TEXTURE_2D, 0, atlasX, ATLAS_HEIGHT - atlasY - h, w, h, GL_RGBA, GL_UNSIGNED_BYTE, rgbaData.data());
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/opengl/gl_renderer.cpp b/Easy2D/src/graphics/opengl/gl_renderer.cpp
deleted file mode 100644
index 4aba425..0000000
--- a/Easy2D/src/graphics/opengl/gl_renderer.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-#include <easy2d/graphics/opengl/gl_renderer.h>
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <easy2d/graphics/opengl/gl_font_atlas.h>
-#include <easy2d/graphics/vram_manager.h>
-#include <easy2d/platform/window.h>
-#include <easy2d/utils/logger.h>
-#include <SDL.h>
-#include <cmath>
-#include <vector>
-#include <algorithm>
-#include <cstring>
-
-namespace easy2d {
-
-// 形状渲染着色器 (GLES 3.2)
-static const char* SHAPE_VERTEX_SHADER = R"(
-#version 300 es
-precision highp float;
-layout(location = 0) in vec2 aPosition;
-uniform mat4 uViewProjection;
-void main() {
-    gl_Position = uViewProjection * vec4(aPosition, 0.0, 1.0);
-}
-)";
-
-static const char* SHAPE_FRAGMENT_SHADER = R"(
-#version 300 es
-precision highp float;
-uniform vec4 uColor;
-out vec4 fragColor;
-void main() {
-    fragColor = uColor;
-}
-)";
-
-// VBO 初始大小（用于 VRAM 跟踪）
-static constexpr size_t SHAPE_VBO_SIZE = 1024 * sizeof(float);
-
-GLRenderer::GLRenderer() : window_(nullptr), shapeVao_(0), shapeVbo_(0), vsync_(true) {
-    resetStats();
-}
-
-GLRenderer::~GLRenderer() {
-    shutdown();
-}
-
-bool GLRenderer::init(Window* window) {
-    window_ = window;
-
-    // Switch: GL 上下文已通过 SDL2 + EGL 初始化，无需 glewInit()
-
-    // 初始化精灵批渲染器
-    if (!spriteBatch_.init()) {
-        E2D_LOG_ERROR("Failed to initialize sprite batch");
-        return false;
-    }
-
-    // 初始化形状渲染
-    initShapeRendering();
-
-    // 设置 OpenGL 状态
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    E2D_LOG_INFO("OpenGL Renderer initialized");
-    E2D_LOG_INFO("OpenGL Version: {}", reinterpret_cast<const char*>(glGetString(GL_VERSION)));
-
-    return true;
-}
-
-void GLRenderer::shutdown() {
-    spriteBatch_.shutdown();
-
-    if (shapeVbo_ != 0) {
-        glDeleteBuffers(1, &shapeVbo_);
-        VRAMManager::getInstance().freeBuffer(SHAPE_VBO_SIZE);
-        shapeVbo_ = 0;
-    }
-    if (shapeVao_ != 0) {
-        glDeleteVertexArrays(1, &shapeVao_);
-        shapeVao_ = 0;
-    }
-}
-
-void GLRenderer::beginFrame(const Color& clearColor) {
-    glClearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a);
-    glClear(GL_COLOR_BUFFER_BIT);
-    resetStats();
-}
-
-void GLRenderer::endFrame() {
-    // 交换缓冲区在 Window 类中处理
-}
-
-void GLRenderer::setViewport(int x, int y, int width, int height) {
-    glViewport(x, y, width, height);
-}
-
-void GLRenderer::setVSync(bool enabled) {
-    vsync_ = enabled;
-    // 使用 SDL2 设置交换间隔
-    SDL_GL_SetSwapInterval(enabled ? 1 : 0);
-}
-
-void GLRenderer::setBlendMode(BlendMode mode) {
-    switch (mode) {
-        case BlendMode::None:
-            glDisable(GL_BLEND);
-            break;
-        case BlendMode::Alpha:
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-            break;
-        case BlendMode::Additive:
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-            break;
-        case BlendMode::Multiply:
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA);
-            break;
-    }
-}
-
-void GLRenderer::setViewProjection(const glm::mat4& matrix) {
-    viewProjection_ = matrix;
-}
-
-Ptr<Texture> GLRenderer::createTexture(int width, int height, const uint8_t* pixels, int channels) {
-    return makePtr<GLTexture>(width, height, pixels, channels);
-}
-
-Ptr<Texture> GLRenderer::loadTexture(const std::string& filepath) {
-    return makePtr<GLTexture>(filepath);
-}
-
-void GLRenderer::beginSpriteBatch() {
-    spriteBatch_.begin(viewProjection_);
-}
-
-void GLRenderer::drawSprite(const Texture& texture, const Rect& destRect, const Rect& srcRect,
-                           const Color& tint, float rotation, const Vec2& anchor) {
-    GLSpriteBatch::SpriteData data;
-    data.position = glm::vec2(destRect.origin.x, destRect.origin.y);
-    data.size = glm::vec2(destRect.size.width, destRect.size.height);
-
-    Texture* tex = const_cast<Texture*>(&texture);
-    float texW = static_cast<float>(tex->getWidth());
-    float texH = static_cast<float>(tex->getHeight());
-
-    // 纹理坐标计算
-    float u1 = srcRect.origin.x / texW;
-    float u2 = (srcRect.origin.x + srcRect.size.width) / texW;
-    float v1 = 1.0f - (srcRect.origin.y / texH);
-    float v2 = 1.0f - ((srcRect.origin.y + srcRect.size.height) / texH);
-
-    data.texCoordMin = glm::vec2(glm::min(u1, u2), glm::min(v1, v2));
-    data.texCoordMax = glm::vec2(glm::max(u1, u2), glm::max(v1, v2));
-
-    data.color = glm::vec4(tint.r, tint.g, tint.b, tint.a);
-    data.rotation = rotation * 3.14159f / 180.0f;
-    data.anchor = glm::vec2(anchor.x, anchor.y);
-    data.isSDF = false;
-
-    spriteBatch_.draw(texture, data);
-}
-
-void GLRenderer::drawSprite(const Texture& texture, const Vec2& position, const Color& tint) {
-    Rect destRect(position.x, position.y, static_cast<float>(texture.getWidth()),
-                  static_cast<float>(texture.getHeight()));
-    Rect srcRect(0, 0, static_cast<float>(texture.getWidth()), static_cast<float>(texture.getHeight()));
-    drawSprite(texture, destRect, srcRect, tint, 0.0f, Vec2(0, 0));
-}
-
-void GLRenderer::endSpriteBatch() {
-    spriteBatch_.end();
-    stats_.drawCalls += spriteBatch_.getDrawCallCount();
-}
-
-void GLRenderer::drawLine(const Vec2& start, const Vec2& end, const Color& color, float width) {
-    glLineWidth(width);
-
-    shapeShader_.bind();
-    shapeShader_.setMat4("uViewProjection", viewProjection_);
-    shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
-
-    float vertices[] = { start.x, start.y, end.x, end.y };
-
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
-
-    glBindVertexArray(shapeVao_);
-    glDrawArrays(GL_LINES, 0, 2);
-
-    stats_.drawCalls++;
-    stats_.triangleCount += 1;
-}
-
-void GLRenderer::drawRect(const Rect& rect, const Color& color, float width) {
-    float x1 = rect.origin.x;
-    float y1 = rect.origin.y;
-    float x2 = rect.origin.x + rect.size.width;
-    float y2 = rect.origin.y + rect.size.height;
-
-    drawLine(Vec2(x1, y1), Vec2(x2, y1), color, width);
-    drawLine(Vec2(x2, y1), Vec2(x2, y2), color, width);
-    drawLine(Vec2(x2, y2), Vec2(x1, y2), color, width);
-    drawLine(Vec2(x1, y2), Vec2(x1, y1), color, width);
-}
-
-void GLRenderer::fillRect(const Rect& rect, const Color& color) {
-    shapeShader_.bind();
-    shapeShader_.setMat4("uViewProjection", viewProjection_);
-    shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
-
-    float vertices[] = {
-        rect.origin.x, rect.origin.y,
-        rect.origin.x + rect.size.width, rect.origin.y,
-        rect.origin.x + rect.size.width, rect.origin.y + rect.size.height,
-        rect.origin.x, rect.origin.y + rect.size.height
-    };
-
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
-
-    glBindVertexArray(shapeVao_);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-    stats_.drawCalls++;
-    stats_.triangleCount += 2;
-}
-
-void GLRenderer::drawCircle(const Vec2& center, float radius, const Color& color, int segments, float width) {
-    std::vector<float> vertices;
-    vertices.reserve((segments + 1) * 2);
-
-    for (int i = 0; i <= segments; ++i) {
-        float angle = 2.0f * 3.14159f * i / segments;
-        vertices.push_back(center.x + radius * cosf(angle));
-        vertices.push_back(center.y + radius * sinf(angle));
-    }
-
-    glLineWidth(width);
-
-    shapeShader_.bind();
-    shapeShader_.setMat4("uViewProjection", viewProjection_);
-    shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
-
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float), vertices.data(), GL_DYNAMIC_DRAW);
-
-    glBindVertexArray(shapeVao_);
-    glDrawArrays(GL_LINE_STRIP, 0, segments + 1);
-
-    stats_.drawCalls++;
-}
-
-void GLRenderer::fillCircle(const Vec2& center, float radius, const Color& color, int segments) {
-    std::vector<float> vertices;
-    vertices.reserve((segments + 2) * 2);
-
-    vertices.push_back(center.x);
-    vertices.push_back(center.y);
-
-    for (int i = 0; i <= segments; ++i) {
-        float angle = 2.0f * 3.14159f * i / segments;
-        vertices.push_back(center.x + radius * cosf(angle));
-        vertices.push_back(center.y + radius * sinf(angle));
-    }
-
-    shapeShader_.bind();
-    shapeShader_.setMat4("uViewProjection", viewProjection_);
-    shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
-
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float), vertices.data(), GL_DYNAMIC_DRAW);
-
-    glBindVertexArray(shapeVao_);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, segments + 2);
-
-    stats_.drawCalls++;
-    stats_.triangleCount += segments;
-}
-
-void GLRenderer::drawTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3, const Color& color, float width) {
-    drawLine(p1, p2, color, width);
-    drawLine(p2, p3, color, width);
-    drawLine(p3, p1, color, width);
-}
-
-void GLRenderer::fillTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3, const Color& color) {
-    shapeShader_.bind();
-    shapeShader_.setMat4("uViewProjection", viewProjection_);
-    shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
-
-    float vertices[] = { p1.x, p1.y, p2.x, p2.y, p3.x, p3.y };
-
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
-
-    glBindVertexArray(shapeVao_);
-    glDrawArrays(GL_TRIANGLES, 0, 3);
-
-    stats_.drawCalls++;
-    stats_.triangleCount += 1;
-}
-
-void GLRenderer::drawPolygon(const std::vector<Vec2>& points, const Color& color, float width) {
-    for (size_t i = 0; i < points.size(); ++i) {
-        drawLine(points[i], points[(i + 1) % points.size()], color, width);
-    }
-}
-
-void GLRenderer::fillPolygon(const std::vector<Vec2>& points, const Color& color) {
-    // 简化的三角形扇形填充
-    if (points.size() < 3) return;
-
-    shapeShader_.bind();
-    shapeShader_.setMat4("uViewProjection", viewProjection_);
-    shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
-
-    std::vector<float> vertices;
-    for (const auto& p : points) {
-        vertices.push_back(p.x);
-        vertices.push_back(p.y);
-    }
-
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float), vertices.data(), GL_DYNAMIC_DRAW);
-
-    glBindVertexArray(shapeVao_);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, static_cast<GLsizei>(points.size()));
-
-    stats_.drawCalls++;
-    stats_.triangleCount += static_cast<uint32_t>(points.size() - 2);
-}
-
-Ptr<FontAtlas> GLRenderer::createFontAtlas(const std::string& filepath, int fontSize, bool useSDF) {
-    return makePtr<GLFontAtlas>(filepath, fontSize, useSDF);
-}
-
-void GLRenderer::drawText(const FontAtlas& font, const String& text, const Vec2& position, const Color& color) {
-    drawText(font, text, position.x, position.y, color);
-}
-
-void GLRenderer::drawText(const FontAtlas& font, const String& text, float x, float y, const Color& color) {
-    float cursorX = x;
-    float cursorY = y;
-    float baselineY = cursorY + font.getAscent();
-
-    for (char32_t codepoint : text.toUtf32()) {
-        if (codepoint == '\n') {
-            cursorX = x;
-            cursorY += font.getLineHeight();
-            baselineY = cursorY + font.getAscent();
-            continue;
-        }
-
-        const Glyph* glyph = font.getGlyph(codepoint);
-        if (glyph) {
-            float penX = cursorX;
-            cursorX += glyph->advance;
-
-            if (glyph->width <= 0.0f || glyph->height <= 0.0f) {
-                continue;
-            }
-
-            float xPos = penX + glyph->bearingX;
-            float yPos = baselineY + glyph->bearingY;
-
-            Rect destRect(xPos, yPos, glyph->width, glyph->height);
-
-            GLSpriteBatch::SpriteData data;
-            data.position = glm::vec2(destRect.origin.x, destRect.origin.y);
-            data.size = glm::vec2(destRect.size.width, destRect.size.height);
-            data.texCoordMin = glm::vec2(glyph->u0, glyph->v0);
-            data.texCoordMax = glm::vec2(glyph->u1, glyph->v1);
-            data.color = glm::vec4(color.r, color.g, color.b, color.a);
-            data.rotation = 0.0f;
-            data.anchor = glm::vec2(0.0f, 0.0f);
-            data.isSDF = font.isSDF();
-            spriteBatch_.draw(*font.getTexture(), data);
-        }
-    }
-}
-
-void GLRenderer::resetStats() {
-    stats_ = Stats{};
-}
-
-void GLRenderer::initShapeRendering() {
-    // 编译形状着色器
-    shapeShader_.compileFromSource(SHAPE_VERTEX_SHADER, SHAPE_FRAGMENT_SHADER);
-
-    // 创建 VAO 和 VBO
-    glGenVertexArrays(1, &shapeVao_);
-    glGenBuffers(1, &shapeVbo_);
-
-    glBindVertexArray(shapeVao_);
-    glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
-    glBufferData(GL_ARRAY_BUFFER, SHAPE_VBO_SIZE, nullptr, GL_DYNAMIC_DRAW);
-
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), nullptr);
-
-    glBindVertexArray(0);
-
-    // VRAM 跟踪
-    VRAMManager::getInstance().allocBuffer(SHAPE_VBO_SIZE);
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/opengl/gl_shader.cpp b/Easy2D/src/graphics/opengl/gl_shader.cpp
deleted file mode 100644
index 1f09e59..0000000
--- a/Easy2D/src/graphics/opengl/gl_shader.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include <easy2d/graphics/opengl/gl_shader.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-#include <sstream>
-
-namespace easy2d {
-
-GLShader::GLShader() : programID_(0) {
-}
-
-GLShader::~GLShader() {
-    if (programID_ != 0) {
-        glDeleteProgram(programID_);
-    }
-}
-
-bool GLShader::compileFromSource(const char* vertexSource, const char* fragmentSource) {
-    GLuint vertexShader = compileShader(GL_VERTEX_SHADER, vertexSource);
-    if (vertexShader == 0) return false;
-
-    GLuint fragmentShader = compileShader(GL_FRAGMENT_SHADER, fragmentSource);
-    if (fragmentShader == 0) {
-        glDeleteShader(vertexShader);
-        return false;
-    }
-
-    programID_ = glCreateProgram();
-    glAttachShader(programID_, vertexShader);
-    glAttachShader(programID_, fragmentShader);
-    glLinkProgram(programID_);
-
-    GLint success;
-    glGetProgramiv(programID_, GL_LINK_STATUS, &success);
-    if (!success) {
-        char infoLog[512];
-        glGetProgramInfoLog(programID_, 512, nullptr, infoLog);
-        E2D_LOG_ERROR("Shader program linking failed: {}", infoLog);
-        glDeleteProgram(programID_);
-        programID_ = 0;
-    }
-
-    glDeleteShader(vertexShader);
-    glDeleteShader(fragmentShader);
-
-    return success == GL_TRUE;
-}
-
-bool GLShader::compileFromFile(const std::string& vertexPath, const std::string& fragmentPath) {
-    std::ifstream vShaderFile(vertexPath);
-    std::ifstream fShaderFile(fragmentPath);
-
-    if (!vShaderFile.is_open() || !fShaderFile.is_open()) {
-        E2D_LOG_ERROR("Failed to open shader files: {}, {}", vertexPath, fragmentPath);
-        return false;
-    }
-
-    std::stringstream vShaderStream, fShaderStream;
-    vShaderStream << vShaderFile.rdbuf();
-    fShaderStream << fShaderFile.rdbuf();
-
-    return compileFromSource(vShaderStream.str().c_str(), fShaderStream.str().c_str());
-}
-
-void GLShader::bind() const {
-    glUseProgram(programID_);
-}
-
-void GLShader::unbind() const {
-    glUseProgram(0);
-}
-
-void GLShader::setBool(const std::string& name, bool value) {
-    glUniform1i(getUniformLocation(name), value ? 1 : 0);
-}
-
-void GLShader::setInt(const std::string& name, int value) {
-    glUniform1i(getUniformLocation(name), value);
-}
-
-void GLShader::setFloat(const std::string& name, float value) {
-    glUniform1f(getUniformLocation(name), value);
-}
-
-void GLShader::setVec2(const std::string& name, const glm::vec2& value) {
-    glUniform2fv(getUniformLocation(name), 1, &value[0]);
-}
-
-void GLShader::setVec3(const std::string& name, const glm::vec3& value) {
-    glUniform3fv(getUniformLocation(name), 1, &value[0]);
-}
-
-void GLShader::setVec4(const std::string& name, const glm::vec4& value) {
-    glUniform4fv(getUniformLocation(name), 1, &value[0]);
-}
-
-void GLShader::setMat4(const std::string& name, const glm::mat4& value) {
-    glUniformMatrix4fv(getUniformLocation(name), 1, GL_FALSE, &value[0][0]);
-}
-
-GLuint GLShader::compileShader(GLenum type, const char* source) {
-    GLuint shader = glCreateShader(type);
-    glShaderSource(shader, 1, &source, nullptr);
-    glCompileShader(shader);
-
-    GLint success;
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
-    if (!success) {
-        char infoLog[512];
-        glGetShaderInfoLog(shader, 512, nullptr, infoLog);
-        E2D_LOG_ERROR("Shader compilation failed: {}", infoLog);
-        glDeleteShader(shader);
-        return 0;
-    }
-
-    return shader;
-}
-
-GLint GLShader::getUniformLocation(const std::string& name) {
-    auto it = uniformCache_.find(name);
-    if (it != uniformCache_.end()) {
-        return it->second;
-    }
-
-    GLint location = glGetUniformLocation(programID_, name.c_str());
-    uniformCache_[name] = location;
-    return location;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/opengl/gl_sprite_batch.cpp b/Easy2D/src/graphics/opengl/gl_sprite_batch.cpp
deleted file mode 100644
index 5ea4cf3..0000000
--- a/Easy2D/src/graphics/opengl/gl_sprite_batch.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-#include <easy2d/graphics/opengl/gl_sprite_batch.h>
-#include <easy2d/utils/logger.h>
-#include <glm/gtc/matrix_transform.hpp>
-#include <cstring>
-
-namespace easy2d {
-
-// 顶点着色器 (GLES 3.2)
-static const char* SPRITE_VERTEX_SHADER = R"(
-#version 300 es
-precision highp float;
-layout(location = 0) in vec2 aPosition;
-layout(location = 1) in vec2 aTexCoord;
-layout(location = 2) in vec4 aColor;
-
-uniform mat4 uViewProjection;
-
-out vec2 vTexCoord;
-out vec4 vColor;
-
-void main() {
-    gl_Position = uViewProjection * vec4(aPosition, 0.0, 1.0);
-    vTexCoord = aTexCoord;
-    vColor = aColor;
-}
-)";
-
-// 片段着色器 (GLES 3.2)
-static const char* SPRITE_FRAGMENT_SHADER = R"(
-#version 300 es
-precision highp float;
-in vec2 vTexCoord;
-in vec4 vColor;
-
-uniform sampler2D uTexture;
-uniform int uUseSDF;
-uniform float uSdfOnEdge;
-uniform float uSdfScale;
-
-out vec4 fragColor;
-
-void main() {
-    if (uUseSDF == 1) {
-        float dist = texture(uTexture, vTexCoord).r;
-        float sd = (dist - uSdfOnEdge) * uSdfScale;
-        float w = fwidth(sd);
-        float alpha = smoothstep(-w, w, sd);
-        fragColor = vec4(vColor.rgb, vColor.a * alpha);
-    } else {
-        fragColor = texture(uTexture, vTexCoord) * vColor;
-    }
-}
-)";
-
-GLSpriteBatch::GLSpriteBatch()
-    : vao_(0), vbo_(0), ibo_(0), currentTexture_(nullptr), currentIsSDF_(false), drawCallCount_(0), spriteCount_(0) {
-    vertices_.reserve(MAX_SPRITES * VERTICES_PER_SPRITE);
-    indices_.reserve(MAX_SPRITES * INDICES_PER_SPRITE);
-}
-
-GLSpriteBatch::~GLSpriteBatch() {
-    shutdown();
-}
-
-bool GLSpriteBatch::init() {
-    // 创建并编译着色器
-    if (!shader_.compileFromSource(SPRITE_VERTEX_SHADER, SPRITE_FRAGMENT_SHADER)) {
-        E2D_LOG_ERROR("Failed to compile sprite batch shader");
-        return false;
-    }
-
-    // 生成 VAO、VBO、IBO
-    glGenVertexArrays(1, &vao_);
-    glGenBuffers(1, &vbo_);
-    glGenBuffers(1, &ibo_);
-
-    glBindVertexArray(vao_);
-
-    // 设置 VBO
-    glBindBuffer(GL_ARRAY_BUFFER, vbo_);
-    glBufferData(GL_ARRAY_BUFFER, MAX_SPRITES * VERTICES_PER_SPRITE * sizeof(Vertex), nullptr, GL_DYNAMIC_DRAW);
-
-    // 设置顶点属性
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, position));
-    
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, texCoord));
-    
-    glEnableVertexAttribArray(2);
-    glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void*)offsetof(Vertex, color));
-
-    // 生成索引缓冲区
-    std::vector<GLuint> indices;
-    indices.reserve(MAX_SPRITES * INDICES_PER_SPRITE);
-    for (size_t i = 0; i < MAX_SPRITES; ++i) {
-        GLuint base = static_cast<GLuint>(i * VERTICES_PER_SPRITE);
-        indices.push_back(base + 0);
-        indices.push_back(base + 1);
-        indices.push_back(base + 2);
-        indices.push_back(base + 0);
-        indices.push_back(base + 2);
-        indices.push_back(base + 3);
-    }
-
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_);
-    glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(GLuint), indices.data(), GL_STATIC_DRAW);
-
-    glBindVertexArray(0);
-
-    return true;
-}
-
-void GLSpriteBatch::shutdown() {
-    if (vao_ != 0) {
-        glDeleteVertexArrays(1, &vao_);
-        vao_ = 0;
-    }
-    if (vbo_ != 0) {
-        glDeleteBuffers(1, &vbo_);
-        vbo_ = 0;
-    }
-    if (ibo_ != 0) {
-        glDeleteBuffers(1, &ibo_);
-        ibo_ = 0;
-    }
-}
-
-void GLSpriteBatch::begin(const glm::mat4& viewProjection) {
-    viewProjection_ = viewProjection;
-    vertices_.clear();
-    currentTexture_ = nullptr;
-    currentIsSDF_ = false;
-    drawCallCount_ = 0;
-    spriteCount_ = 0;
-}
-
-void GLSpriteBatch::draw(const Texture& texture, const SpriteData& data) {
-    // 如果纹理改变或缓冲区已满，先 flush
-    if (currentTexture_ != nullptr && (currentTexture_ != &texture || currentIsSDF_ != data.isSDF || vertices_.size() >= MAX_SPRITES * VERTICES_PER_SPRITE)) {
-        flush();
-    }
-
-    currentTexture_ = &texture;
-    currentIsSDF_ = data.isSDF;
-
-    // 计算变换后的顶点位置
-    glm::vec2 anchorOffset(data.size.x * data.anchor.x, data.size.y * data.anchor.y);
-    
-    float cosR = cosf(data.rotation);
-    float sinR = sinf(data.rotation);
-    
-    auto transform = [&](float x, float y) -> glm::vec2 {
-        float rx = x - anchorOffset.x;
-        float ry = y - anchorOffset.y;
-        return glm::vec2(
-            data.position.x + rx * cosR - ry * sinR,
-            data.position.y + rx * sinR + ry * cosR
-        );
-    };
-
-    glm::vec4 color(data.color.r, data.color.g, data.color.b, data.color.a);
-
-    // 添加四个顶点（图片已在加载时翻转，纹理坐标直接使用）
-    // v0(左上) -- v1(右上)
-    //   |           |
-    // v3(左下) -- v2(右下)
-    Vertex v0{ transform(0, 0), glm::vec2(data.texCoordMin.x, data.texCoordMin.y), color };
-    Vertex v1{ transform(data.size.x, 0), glm::vec2(data.texCoordMax.x, data.texCoordMin.y), color };
-    Vertex v2{ transform(data.size.x, data.size.y), glm::vec2(data.texCoordMax.x, data.texCoordMax.y), color };
-    Vertex v3{ transform(0, data.size.y), glm::vec2(data.texCoordMin.x, data.texCoordMax.y), color };
-
-    vertices_.push_back(v0);
-    vertices_.push_back(v1);
-    vertices_.push_back(v2);
-    vertices_.push_back(v3);
-
-    spriteCount_++;
-}
-
-void GLSpriteBatch::end() {
-    if (!vertices_.empty()) {
-        flush();
-    }
-}
-
-void GLSpriteBatch::flush() {
-    if (vertices_.empty() || currentTexture_ == nullptr) return;
-
-    // 绑定纹理
-    GLuint texID = static_cast<GLuint>(reinterpret_cast<uintptr_t>(currentTexture_->getNativeHandle()));
-    glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_2D, texID);
-
-    // 使用着色器
-    shader_.bind();
-    shader_.setMat4("uViewProjection", viewProjection_);
-    shader_.setInt("uTexture", 0);
-    shader_.setInt("uUseSDF", currentIsSDF_ ? 1 : 0);
-    shader_.setFloat("uSdfOnEdge", 128.0f / 255.0f);
-    shader_.setFloat("uSdfScale", 255.0f / 64.0f);
-
-    // 更新 VBO 数据
-    glBindBuffer(GL_ARRAY_BUFFER, vbo_);
-    glBufferSubData(GL_ARRAY_BUFFER, 0, vertices_.size() * sizeof(Vertex), vertices_.data());
-
-    // 绘制
-    glBindVertexArray(vao_);
-    GLsizei indexCount = static_cast<GLsizei>(vertices_.size() / VERTICES_PER_SPRITE * INDICES_PER_SPRITE);
-    glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, nullptr);
-
-    drawCallCount_++;
-    vertices_.clear();
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/opengl/gl_texture.cpp b/Easy2D/src/graphics/opengl/gl_texture.cpp
deleted file mode 100644
index f933225..0000000
--- a/Easy2D/src/graphics/opengl/gl_texture.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <easy2d/graphics/vram_manager.h>
-#define STB_IMAGE_IMPLEMENTATION
-#include <stb/stb_image.h>
-#include <easy2d/utils/logger.h>
-#include <cstring>
-#include <fstream>
-
-namespace easy2d {
-
-// ============================================================================
-// KTX 文件头结构
-// ============================================================================
-#pragma pack(push, 1)
-struct KTXHeader {
-    uint8_t  identifier[12];
-    uint32_t endianness;
-    uint32_t glType;
-    uint32_t glTypeSize;
-    uint32_t glFormat;
-    uint32_t glInternalFormat;
-    uint32_t glBaseInternalFormat;
-    uint32_t pixelWidth;
-    uint32_t pixelHeight;
-    uint32_t pixelDepth;
-    uint32_t numberOfArrayElements;
-    uint32_t numberOfFaces;
-    uint32_t numberOfMipmapLevels;
-    uint32_t bytesOfKeyValueData;
-};
-#pragma pack(pop)
-
-// KTX 文件标识符
-static const uint8_t KTX_IDENTIFIER[12] = {
-    0xAB, 0x4B, 0x54, 0x58, 0x20, 0x31,
-    0x31, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A
-};
-
-// ============================================================================
-// DDS 文件头结构
-// ============================================================================
-#pragma pack(push, 1)
-struct DDSPixelFormat {
-    uint32_t size;
-    uint32_t flags;
-    uint32_t fourCC;
-    uint32_t rgbBitCount;
-    uint32_t rBitMask;
-    uint32_t gBitMask;
-    uint32_t bBitMask;
-    uint32_t aBitMask;
-};
-
-struct DDSHeader {
-    uint32_t       magic;
-    uint32_t       size;
-    uint32_t       flags;
-    uint32_t       height;
-    uint32_t       width;
-    uint32_t       pitchOrLinearSize;
-    uint32_t       depth;
-    uint32_t       mipMapCount;
-    uint32_t       reserved1[11];
-    DDSPixelFormat pixelFormat;
-    uint32_t       caps;
-    uint32_t       caps2;
-    uint32_t       caps3;
-    uint32_t       caps4;
-    uint32_t       reserved2;
-};
-
-struct DDSHeaderDXT10 {
-    uint32_t dxgiFormat;
-    uint32_t resourceDimension;
-    uint32_t miscFlag;
-    uint32_t arraySize;
-    uint32_t miscFlags2;
-};
-#pragma pack(pop)
-
-static constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
-static constexpr uint32_t DDPF_FOURCC = 0x04;
-
-static uint32_t makeFourCC(char a, char b, char c, char d) {
-    return static_cast<uint32_t>(a) | (static_cast<uint32_t>(b) << 8) |
-           (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24);
-}
-
-// ============================================================================
-// GLTexture 实现
-// ============================================================================
-
-GLTexture::GLTexture(int width, int height, const uint8_t* pixels, int channels)
-    : textureID_(0), width_(width), height_(height), channels_(channels),
-      format_(PixelFormat::RGBA8), dataSize_(0) {
-    // 保存像素数据用于生成遮罩
-    if (pixels) {
-        pixelData_.resize(width * height * channels);
-        std::memcpy(pixelData_.data(), pixels, pixelData_.size());
-    }
-    createTexture(pixels);
-}
-
-GLTexture::GLTexture(const std::string& filepath)
-    : textureID_(0), width_(0), height_(0), channels_(0),
-      format_(PixelFormat::RGBA8), dataSize_(0) {
-    // 检查是否为压缩纹理格式
-    std::string ext = filepath.substr(filepath.find_last_of('.') + 1);
-    if (ext == "ktx" || ext == "KTX") {
-        loadCompressed(filepath);
-        return;
-    }
-    if (ext == "dds" || ext == "DDS") {
-        loadCompressed(filepath);
-        return;
-    }
-
-    // 不翻转图片，保持原始方向
-    stbi_set_flip_vertically_on_load(false);
-    uint8_t* data = stbi_load(filepath.c_str(), &width_, &height_, &channels_, 0);
-    if (data) {
-        // 保存像素数据用于生成遮罩
-        pixelData_.resize(width_ * height_ * channels_);
-        std::memcpy(pixelData_.data(), data, pixelData_.size());
-
-        createTexture(data);
-        stbi_image_free(data);
-    } else {
-        E2D_LOG_ERROR("Failed to load texture: {}", filepath);
-    }
-}
-
-GLTexture::~GLTexture() {
-    if (textureID_ != 0) {
-        glDeleteTextures(1, &textureID_);
-        // VRAM 跟踪: 释放纹理显存
-        if (dataSize_ > 0) {
-            VRAMManager::getInstance().freeTexture(dataSize_);
-        }
-    }
-}
-
-void GLTexture::setFilter(bool linear) {
-    bind();
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, linear ? GL_LINEAR : GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear ? GL_LINEAR : GL_NEAREST);
-}
-
-void GLTexture::setWrap(bool repeat) {
-    bind();
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-}
-
-void GLTexture::bind(unsigned int slot) const {
-    glActiveTexture(GL_TEXTURE0 + slot);
-    glBindTexture(GL_TEXTURE_2D, textureID_);
-}
-
-void GLTexture::unbind() const {
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-void GLTexture::createTexture(const uint8_t* pixels) {
-    GLenum format = GL_RGBA;
-    GLenum internalFormat = GL_RGBA8;
-    int unpackAlignment = 4;
-    if (channels_ == 1) {
-        format = GL_RED;
-        internalFormat = GL_R8;
-        unpackAlignment = 1;
-        format_ = PixelFormat::R8;
-    } else if (channels_ == 3) {
-        format = GL_RGB;
-        internalFormat = GL_RGB8;
-        unpackAlignment = 1;
-        format_ = PixelFormat::RGB8;
-    } else if (channels_ == 4) {
-        format = GL_RGBA;
-        internalFormat = GL_RGBA8;
-        unpackAlignment = 4;
-        format_ = PixelFormat::RGBA8;
-    }
-
-    glGenTextures(1, &textureID_);
-    bind();
-
-    GLint prevUnpackAlignment = 4;
-    glGetIntegerv(GL_UNPACK_ALIGNMENT, &prevUnpackAlignment);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, unpackAlignment);
-
-    glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width_, height_, 0, format, GL_UNSIGNED_BYTE, pixels);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, prevUnpackAlignment);
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    // 使用 NEAREST 过滤器，更适合像素艺术风格的精灵
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-    glGenerateMipmap(GL_TEXTURE_2D);
-
-    // VRAM 跟踪
-    dataSize_ = static_cast<size_t>(width_ * height_ * channels_);
-    VRAMManager::getInstance().allocTexture(dataSize_);
-}
-
-// ============================================================================
-// 压缩纹理加载
-// ============================================================================
-
-bool GLTexture::loadCompressed(const std::string& filepath) {
-    std::string ext = filepath.substr(filepath.find_last_of('.') + 1);
-    if (ext == "ktx" || ext == "KTX") {
-        return loadKTX(filepath);
-    }
-    if (ext == "dds" || ext == "DDS") {
-        return loadDDS(filepath);
-    }
-    E2D_LOG_ERROR("Unsupported compressed texture format: {}", filepath);
-    return false;
-}
-
-bool GLTexture::loadKTX(const std::string& filepath) {
-    std::ifstream file(filepath, std::ios::binary);
-    if (!file.is_open()) {
-        E2D_LOG_ERROR("Failed to open KTX file: {}", filepath);
-        return false;
-    }
-
-    KTXHeader header;
-    file.read(reinterpret_cast<char*>(&header), sizeof(header));
-    if (!file) {
-        E2D_LOG_ERROR("Failed to read KTX header: {}", filepath);
-        return false;
-    }
-
-    // 验证标识符
-    if (std::memcmp(header.identifier, KTX_IDENTIFIER, 12) != 0) {
-        E2D_LOG_ERROR("Invalid KTX identifier: {}", filepath);
-        return false;
-    }
-
-    width_ = static_cast<int>(header.pixelWidth);
-    height_ = static_cast<int>(header.pixelHeight);
-    channels_ = 4; // 压缩纹理通常解压为 RGBA
-
-    // 确定压缩格式
-    GLenum glInternalFormat = header.glInternalFormat;
-    switch (glInternalFormat) {
-        case GL_COMPRESSED_RGB8_ETC2:
-            format_ = PixelFormat::ETC2_RGB8;
-            channels_ = 3;
-            break;
-        case GL_COMPRESSED_RGBA8_ETC2_EAC:
-            format_ = PixelFormat::ETC2_RGBA8;
-            break;
-        case GL_COMPRESSED_RGBA_ASTC_4x4:
-            format_ = PixelFormat::ASTC_4x4;
-            break;
-        case GL_COMPRESSED_RGBA_ASTC_6x6:
-            format_ = PixelFormat::ASTC_6x6;
-            break;
-        case GL_COMPRESSED_RGBA_ASTC_8x8:
-            format_ = PixelFormat::ASTC_8x8;
-            break;
-        default:
-            E2D_LOG_ERROR("Unsupported KTX internal format: {:#06x}", glInternalFormat);
-            return false;
-    }
-
-    // 跳过 key-value 数据
-    file.seekg(header.bytesOfKeyValueData, std::ios::cur);
-
-    // 读取第一个 mipmap level
-    uint32_t imageSize = 0;
-    file.read(reinterpret_cast<char*>(&imageSize), sizeof(imageSize));
-    if (!file || imageSize == 0) {
-        E2D_LOG_ERROR("Failed to read KTX image size: {}", filepath);
-        return false;
-    }
-
-    std::vector<uint8_t> compressedData(imageSize);
-    file.read(reinterpret_cast<char*>(compressedData.data()), imageSize);
-    if (!file) {
-        E2D_LOG_ERROR("Failed to read KTX image data: {}", filepath);
-        return false;
-    }
-
-    // 创建 GL 纹理
-    glGenTextures(1, &textureID_);
-    bind();
-
-    glCompressedTexImage2D(GL_TEXTURE_2D, 0, glInternalFormat, width_, height_,
-                           0, static_cast<GLsizei>(imageSize),
-                           compressedData.data());
-
-    GLenum err = glGetError();
-    if (err != GL_NO_ERROR) {
-        E2D_LOG_ERROR("glCompressedTexImage2D failed for KTX: {:#06x}", err);
-        glDeleteTextures(1, &textureID_);
-        textureID_ = 0;
-        return false;
-    }
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-    // VRAM 跟踪
-    dataSize_ = imageSize;
-    VRAMManager::getInstance().allocTexture(dataSize_);
-
-    E2D_LOG_INFO("Loaded compressed KTX texture: {} ({}x{}, format={:#06x})",
-                 filepath, width_, height_, glInternalFormat);
-    return true;
-}
-
-bool GLTexture::loadDDS(const std::string& filepath) {
-    std::ifstream file(filepath, std::ios::binary);
-    if (!file.is_open()) {
-        E2D_LOG_ERROR("Failed to open DDS file: {}", filepath);
-        return false;
-    }
-
-    DDSHeader header;
-    file.read(reinterpret_cast<char*>(&header), sizeof(header));
-    if (!file) {
-        E2D_LOG_ERROR("Failed to read DDS header: {}", filepath);
-        return false;
-    }
-
-    if (header.magic != DDS_MAGIC) {
-        E2D_LOG_ERROR("Invalid DDS magic: {}", filepath);
-        return false;
-    }
-
-    width_ = static_cast<int>(header.width);
-    height_ = static_cast<int>(header.height);
-    channels_ = 4;
-
-    GLenum glInternalFormat = 0;
-
-    // 检查 DX10 扩展头
-    if ((header.pixelFormat.flags & DDPF_FOURCC) &&
-        header.pixelFormat.fourCC == makeFourCC('D', 'X', '1', '0')) {
-        DDSHeaderDXT10 dx10Header;
-        file.read(reinterpret_cast<char*>(&dx10Header), sizeof(dx10Header));
-        if (!file) {
-            E2D_LOG_ERROR("Failed to read DDS DX10 header: {}", filepath);
-            return false;
-        }
-
-        // DXGI_FORMAT 映射到 GL 格式
-        switch (dx10Header.dxgiFormat) {
-            case 147: // DXGI_FORMAT_ETC2_RGB8
-                glInternalFormat = GL_COMPRESSED_RGB8_ETC2;
-                format_ = PixelFormat::ETC2_RGB8;
-                channels_ = 3;
-                break;
-            case 148: // DXGI_FORMAT_ETC2_RGBA8
-                glInternalFormat = GL_COMPRESSED_RGBA8_ETC2_EAC;
-                format_ = PixelFormat::ETC2_RGBA8;
-                break;
-            default:
-                E2D_LOG_ERROR("Unsupported DDS DX10 format: {}", dx10Header.dxgiFormat);
-                return false;
-        }
-    } else {
-        E2D_LOG_ERROR("DDS file does not use DX10 extension, unsupported: {}", filepath);
-        return false;
-    }
-
-    // 计算压缩数据大小
-    size_t blockSize = (glInternalFormat == GL_COMPRESSED_RGB8_ETC2) ? 8 : 16;
-    size_t blocksWide = (width_ + 3) / 4;
-    size_t blocksHigh = (height_ + 3) / 4;
-    size_t imageSize = blocksWide * blocksHigh * blockSize;
-
-    std::vector<uint8_t> compressedData(imageSize);
-    file.read(reinterpret_cast<char*>(compressedData.data()), imageSize);
-    if (!file) {
-        E2D_LOG_ERROR("Failed to read DDS image data: {}", filepath);
-        return false;
-    }
-
-    // 创建 GL 纹理
-    glGenTextures(1, &textureID_);
-    bind();
-
-    glCompressedTexImage2D(GL_TEXTURE_2D, 0, glInternalFormat, width_, height_,
-                           0, static_cast<GLsizei>(imageSize),
-                           compressedData.data());
-
-    GLenum err = glGetError();
-    if (err != GL_NO_ERROR) {
-        E2D_LOG_ERROR("glCompressedTexImage2D failed for DDS: {:#06x}", err);
-        glDeleteTextures(1, &textureID_);
-        textureID_ = 0;
-        return false;
-    }
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-    // VRAM 跟踪
-    dataSize_ = imageSize;
-    VRAMManager::getInstance().allocTexture(dataSize_);
-
-    E2D_LOG_INFO("Loaded compressed DDS texture: {} ({}x{})", filepath, width_, height_);
-    return true;
-}
-
-void GLTexture::generateAlphaMask() {
-    if (pixelData_.empty() || width_ <= 0 || height_ <= 0) {
-        E2D_LOG_WARN("Cannot generate alpha mask: no pixel data available");
-        return;
-    }
-
-    alphaMask_ = std::make_unique<AlphaMask>(
-        AlphaMask::createFromPixels(pixelData_.data(), width_, height_, channels_)
-    );
-
-    E2D_LOG_DEBUG("Generated alpha mask for texture: {}x{}", width_, height_);
-}
-
-PixelFormat GLTexture::getFormat() const {
-    return format_;
-}
-
-Ptr<Texture> GLTexture::create(int width, int height, PixelFormat format) {
-    int channels = 4;
-    switch (format) {
-        case PixelFormat::R8: channels = 1; break;
-        case PixelFormat::RG8: channels = 2; break;
-        case PixelFormat::RGB8: channels = 3; break;
-        case PixelFormat::RGBA8: channels = 4; break;
-        default: channels = 4; break;
-    }
-    return makePtr<GLTexture>(width, height, nullptr, channels);
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/render_backend.cpp b/Easy2D/src/graphics/render_backend.cpp
deleted file mode 100644
index 6b5c394..0000000
--- a/Easy2D/src/graphics/render_backend.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/opengl/gl_renderer.h>
-
-namespace easy2d {
-
-UniquePtr<RenderBackend> RenderBackend::create(BackendType type) {
-    switch (type) {
-        case BackendType::OpenGL:
-            return makeUnique<GLRenderer>();
-        default:
-            return nullptr;
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/shader_preset.cpp b/Easy2D/src/graphics/shader_preset.cpp
deleted file mode 100644
index 3d51f83..0000000
--- a/Easy2D/src/graphics/shader_preset.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include <easy2d/graphics/shader_preset.h>
-#include <easy2d/utils/logger.h>
-
-namespace easy2d {
-
-// ============================================================================
-// ShaderPreset实现
-// ============================================================================
-
-Ptr<GLShader> ShaderPreset::Water(const WaterParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::WaterFrag)) {
-        E2D_ERROR("编译水波纹Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_waveSpeed", params.waveSpeed);
-    shader->setFloat("u_waveAmplitude", params.waveAmplitude);
-    shader->setFloat("u_waveFrequency", params.waveFrequency);
-    
-    E2D_INFO("创建水波纹Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::Outline(const OutlineParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::OutlineFrag)) {
-        E2D_ERROR("编译描边Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setVec4("u_outlineColor", glm::vec4(params.color.r, params.color.g, 
-                                                 params.color.b, params.color.a));
-    shader->setFloat("u_thickness", params.thickness);
-    
-    E2D_INFO("创建描边Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::Distortion(const DistortionParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::DistortionFrag)) {
-        E2D_ERROR("编译扭曲Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_distortionAmount", params.distortionAmount);
-    shader->setFloat("u_timeScale", params.timeScale);
-    
-    E2D_INFO("创建扭曲Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::Pixelate(const PixelateParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::PixelateFrag)) {
-        E2D_ERROR("编译像素化Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_pixelSize", params.pixelSize);
-    
-    E2D_INFO("创建像素化Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::Invert(const InvertParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::InvertFrag)) {
-        E2D_ERROR("编译反相Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_strength", params.strength);
-    
-    E2D_INFO("创建反相Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::Grayscale(const GrayscaleParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::GrayscaleFrag)) {
-        E2D_ERROR("编译灰度Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_intensity", params.intensity);
-    
-    E2D_INFO("创建灰度Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::Blur(const BlurParams& params) {
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, ShaderSource::BlurFrag)) {
-        E2D_ERROR("编译模糊Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_radius", params.radius);
-    
-    E2D_INFO("创建模糊Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::GrayscaleOutline(const GrayscaleParams& grayParams,
-                                              const OutlineParams& outlineParams) {
-    // 创建组合效果的片段着色器 (GLES 3.2)
-    const char* combinedFrag = R"(
-#version 300 es
-precision highp float;
-in vec2 v_texCoord;
-
-uniform sampler2D u_texture;
-uniform float u_grayIntensity;
-uniform vec4 u_outlineColor;
-uniform float u_thickness;
-uniform vec2 u_textureSize;
-
-out vec4 fragColor;
-
-void main() {
-    vec4 color = texture(u_texture, v_texCoord);
-    
-    // 灰度效果
-    float gray = dot(color.rgb, vec3(0.299, 0.587, 0.114));
-    color.rgb = mix(color.rgb, vec3(gray), u_grayIntensity);
-    
-    // 描边效果
-    float alpha = 0.0;
-    vec2 offset = u_thickness / u_textureSize;
-    
-    alpha += texture(u_texture, v_texCoord + vec2(-offset.x, 0.0)).a;
-    alpha += texture(u_texture, v_texCoord + vec2(offset.x, 0.0)).a;
-    alpha += texture(u_texture, v_texCoord + vec2(0.0, -offset.y)).a;
-    alpha += texture(u_texture, v_texCoord + vec2(0.0, offset.y)).a;
-    
-    if (color.a < 0.1 && alpha > 0.0) {
-        fragColor = u_outlineColor;
-    } else {
-        fragColor = color;
-    }
-}
-)";
-    
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, combinedFrag)) {
-        E2D_ERROR("编译灰度+描边Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_grayIntensity", grayParams.intensity);
-    shader->setVec4("u_outlineColor", glm::vec4(outlineParams.color.r, outlineParams.color.g,
-                                                 outlineParams.color.b, outlineParams.color.a));
-    shader->setFloat("u_thickness", outlineParams.thickness);
-    
-    E2D_INFO("创建灰度+描边组合Shader预设");
-    return shader;
-}
-
-Ptr<GLShader> ShaderPreset::PixelateInvert(const PixelateParams& pixParams,
-                                            const InvertParams& invParams) {
-    // 创建组合效果的片段着色器 (GLES 3.2)
-    const char* combinedFrag = R"(
-#version 300 es
-precision highp float;
-in vec2 v_texCoord;
-
-uniform sampler2D u_texture;
-uniform float u_pixelSize;
-uniform vec2 u_textureSize;
-uniform float u_invertStrength;
-
-out vec4 fragColor;
-
-void main() {
-    // 像素化
-    vec2 pixel = u_pixelSize / u_textureSize;
-    vec2 uv = floor(v_texCoord / pixel) * pixel + pixel * 0.5;
-    
-    vec4 color = texture(u_texture, uv);
-    
-    // 反相
-    vec3 inverted = 1.0 - color.rgb;
-    color.rgb = mix(color.rgb, inverted, u_invertStrength);
-    
-    fragColor = color;
-}
-)";
-    
-    auto shader = std::make_shared<GLShader>();
-    
-    if (!shader->compileFromSource(ShaderSource::StandardVert, combinedFrag)) {
-        E2D_ERROR("编译像素化+反相Shader失败");
-        return nullptr;
-    }
-    
-    // 设置默认参数
-    shader->setFloat("u_pixelSize", pixParams.pixelSize);
-    shader->setFloat("u_invertStrength", invParams.strength);
-    
-    E2D_INFO("创建像素化+反相组合Shader预设");
-    return shader;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/shader_system.cpp b/Easy2D/src/graphics/shader_system.cpp
deleted file mode 100644
index 835cb7a..0000000
--- a/Easy2D/src/graphics/shader_system.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-#include <easy2d/graphics/shader_system.h>
-#include <easy2d/core/color.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-#include <sstream>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-namespace easy2d {
-
-// ============================================================================
-// 内置Shader源码
-// ============================================================================
-
-// 标准精灵着色器 (GLES 3.2)
-static const char* BUILTIN_SPRITE_VERT = R"(
-#version 300 es
-precision highp float;
-layout(location = 0) in vec2 a_position;
-layout(location = 1) in vec2 a_texCoord;
-layout(location = 2) in vec4 a_color;
-
-uniform mat4 u_viewProjection;
-uniform mat4 u_model;
-
-out vec2 v_texCoord;
-out vec4 v_color;
-
-void main() {
-    gl_Position = u_viewProjection * u_model * vec4(a_position, 0.0, 1.0);
-    v_texCoord = a_texCoord;
-    v_color = a_color;
-}
-)";
-
-static const char* BUILTIN_SPRITE_FRAG = R"(
-#version 300 es
-precision highp float;
-in vec2 v_texCoord;
-in vec4 v_color;
-
-uniform sampler2D u_texture;
-uniform float u_opacity;
-
-out vec4 fragColor;
-
-void main() {
-    vec4 texColor = texture(u_texture, v_texCoord);
-    fragColor = texColor * v_color;
-    fragColor.a *= u_opacity;
-    
-    if (fragColor.a < 0.01) {
-        discard;
-    }
-}
-)";
-
-// 粒子着色器 (GLES 3.2)
-static const char* BUILTIN_PARTICLE_VERT = R"(
-#version 300 es
-precision highp float;
-layout(location = 0) in vec2 a_position;
-layout(location = 1) in vec2 a_texCoord;
-layout(location = 2) in vec4 a_color;
-layout(location = 3) in float a_size;
-layout(location = 4) in float a_rotation;
-
-uniform mat4 u_viewProjection;
-
-out vec2 v_texCoord;
-out vec4 v_color;
-
-void main() {
-    float c = cos(a_rotation);
-    float s = sin(a_rotation);
-    mat2 rot = mat2(c, -s, s, c);
-    
-    vec2 pos = rot * a_position * a_size;
-    gl_Position = u_viewProjection * vec4(pos, 0.0, 1.0);
-    
-    v_texCoord = a_texCoord;
-    v_color = a_color;
-}
-)";
-
-static const char* BUILTIN_PARTICLE_FRAG = R"(
-#version 300 es
-precision highp float;
-in vec2 v_texCoord;
-in vec4 v_color;
-
-uniform sampler2D u_texture;
-uniform int u_textureEnabled;
-
-out vec4 fragColor;
-
-void main() {
-    vec4 color = v_color;
-    
-    if (u_textureEnabled > 0) {
-        color *= texture(u_texture, v_texCoord);
-    }
-    
-    // 圆形粒子
-    vec2 center = v_texCoord - vec2(0.5);
-    float dist = length(center);
-    float alpha = 1.0 - smoothstep(0.4, 0.5, dist);
-    color.a *= alpha;
-    
-    if (color.a < 0.01) {
-        discard;
-    }
-    
-    fragColor = color;
-}
-)";
-
-// 后处理着色器 (GLES 3.2)
-static const char* BUILTIN_POSTPROCESS_VERT = R"(
-#version 300 es
-precision highp float;
-layout(location = 0) in vec2 a_position;
-layout(location = 1) in vec2 a_texCoord;
-
-out vec2 v_texCoord;
-
-void main() {
-    gl_Position = vec4(a_position, 0.0, 1.0);
-    v_texCoord = a_texCoord;
-}
-)";
-
-static const char* BUILTIN_POSTPROCESS_FRAG = R"(
-#version 300 es
-precision highp float;
-in vec2 v_texCoord;
-
-uniform sampler2D u_texture;
-uniform vec2 u_resolution;
-uniform float u_time;
-
-out vec4 fragColor;
-
-void main() {
-    fragColor = texture(u_texture, v_texCoord);
-}
-)";
-
-// 形状渲染着色器 (GLES 3.2)
-static const char* BUILTIN_SHAPE_VERT = R"(
-#version 300 es
-precision highp float;
-layout(location = 0) in vec2 a_position;
-layout(location = 1) in vec4 a_color;
-
-uniform mat4 u_viewProjection;
-
-out vec4 v_color;
-
-void main() {
-    gl_Position = u_viewProjection * vec4(a_position, 0.0, 1.0);
-    v_color = a_color;
-}
-)";
-
-static const char* BUILTIN_SHAPE_FRAG = R"(
-#version 300 es
-precision highp float;
-in vec4 v_color;
-
-out vec4 fragColor;
-
-void main() {
-    fragColor = v_color;
-}
-)";
-
-// ============================================================================
-// ShaderSystem实现
-// ============================================================================
-
-ShaderSystem& ShaderSystem::getInstance() {
-    static ShaderSystem instance;
-    return instance;
-}
-
-bool ShaderSystem::init() {
-    E2D_INFO("初始化Shader系统...");
-    
-    if (!loadBuiltinShaders()) {
-        E2D_ERROR("加载内置Shader失败！");
-        return false;
-    }
-    
-    E2D_INFO("Shader系统初始化完成");
-    return true;
-}
-
-void ShaderSystem::shutdown() {
-    E2D_INFO("关闭Shader系统...");
-    clear();
-    
-    builtinSpriteShader_.reset();
-    builtinParticleShader_.reset();
-    builtinPostProcessShader_.reset();
-    builtinShapeShader_.reset();
-}
-
-bool ShaderSystem::loadBuiltinShaders() {
-    // 加载精灵Shader
-    builtinSpriteShader_ = std::make_shared<GLShader>();
-    if (!builtinSpriteShader_->compileFromSource(BUILTIN_SPRITE_VERT, BUILTIN_SPRITE_FRAG)) {
-        E2D_ERROR("编译内置精灵Shader失败！");
-        return false;
-    }
-    
-    // 加载粒子Shader
-    builtinParticleShader_ = std::make_shared<GLShader>();
-    if (!builtinParticleShader_->compileFromSource(BUILTIN_PARTICLE_VERT, BUILTIN_PARTICLE_FRAG)) {
-        E2D_ERROR("编译内置粒子Shader失败！");
-        return false;
-    }
-    
-    // 加载后处理Shader
-    builtinPostProcessShader_ = std::make_shared<GLShader>();
-    if (!builtinPostProcessShader_->compileFromSource(BUILTIN_POSTPROCESS_VERT, BUILTIN_POSTPROCESS_FRAG)) {
-        E2D_ERROR("编译内置后处理Shader失败！");
-        return false;
-    }
-    
-    // 加载形状Shader
-    builtinShapeShader_ = std::make_shared<GLShader>();
-    if (!builtinShapeShader_->compileFromSource(BUILTIN_SHAPE_VERT, BUILTIN_SHAPE_FRAG)) {
-        E2D_ERROR("编译内置形状Shader失败！");
-        return false;
-    }
-    
-    E2D_INFO("内置Shader加载成功");
-    return true;
-}
-
-Ptr<GLShader> ShaderSystem::loadFromFile(const std::string& name, 
-                                         const std::string& vertPath, 
-                                         const std::string& fragPath) {
-    // 读取文件内容
-    std::string vertSource = readFile(vertPath);
-    std::string fragSource = readFile(fragPath);
-    
-    if (vertSource.empty()) {
-        E2D_ERROR("无法读取顶点着色器文件: {}", vertPath);
-        return nullptr;
-    }
-    
-    if (fragSource.empty()) {
-        E2D_ERROR("无法读取片段着色器文件: {}", fragPath);
-        return nullptr;
-    }
-    
-    // 编译Shader
-    auto shader = std::make_shared<GLShader>();
-    if (!shader->compileFromSource(vertSource.c_str(), fragSource.c_str())) {
-        E2D_ERROR("编译Shader '{}' 失败", name);
-        return nullptr;
-    }
-    
-    // 存储Shader信息
-    ShaderInfo info;
-    info.shader = shader;
-    info.vertPath = vertPath;
-    info.fragPath = fragPath;
-    info.vertModifiedTime = getFileModifiedTime(vertPath);
-    info.fragModifiedTime = getFileModifiedTime(fragPath);
-    info.isBuiltin = false;
-    
-    shaders_[name] = std::move(info);
-    
-    E2D_INFO("加载Shader '{}' 成功", name);
-    return shader;
-}
-
-Ptr<GLShader> ShaderSystem::loadFromSource(const std::string& name,
-                                           const std::string& vertSource,
-                                           const std::string& fragSource) {
-    auto shader = std::make_shared<GLShader>();
-    if (!shader->compileFromSource(vertSource.c_str(), fragSource.c_str())) {
-        E2D_ERROR("编译Shader '{}' 失败", name);
-        return nullptr;
-    }
-    
-    ShaderInfo info;
-    info.shader = shader;
-    info.vertModifiedTime = 0;
-    info.fragModifiedTime = 0;
-    info.isBuiltin = false;
-    
-    shaders_[name] = std::move(info);
-    
-    E2D_INFO("加载Shader '{}' 成功", name);
-    return shader;
-}
-
-Ptr<GLShader> ShaderSystem::get(const std::string& name) {
-    auto it = shaders_.find(name);
-    if (it != shaders_.end()) {
-        return it->second.shader;
-    }
-    return nullptr;
-}
-
-bool ShaderSystem::has(const std::string& name) const {
-    return shaders_.find(name) != shaders_.end();
-}
-
-void ShaderSystem::remove(const std::string& name) {
-    shaders_.erase(name);
-}
-
-void ShaderSystem::clear() {
-    shaders_.clear();
-}
-
-void ShaderSystem::setFileWatching(bool enable) {
-    fileWatching_ = enable;
-    if (enable) {
-        E2D_INFO("启用Shader文件监视");
-    } else {
-        E2D_INFO("禁用Shader文件监视");
-    }
-}
-
-void ShaderSystem::updateFileWatching() {
-    if (!fileWatching_) return;
-    
-    watchTimer_ += 0.016f; // 假设60fps
-    if (watchTimer_ >= WATCH_INTERVAL) {
-        watchTimer_ = 0.0f;
-        checkAndReload();
-    }
-}
-
-void ShaderSystem::checkAndReload() {
-    for (auto& [name, info] : shaders_) {
-        if (info.isBuiltin) continue;
-        if (info.vertPath.empty() || info.fragPath.empty()) continue;
-        
-        uint64_t vertTime = getFileModifiedTime(info.vertPath);
-        uint64_t fragTime = getFileModifiedTime(info.fragPath);
-        
-        if (vertTime > info.vertModifiedTime || fragTime > info.fragModifiedTime) {
-            E2D_INFO("检测到Shader '{}' 文件变化，正在重载...", name);
-            reload(name);
-        }
-    }
-}
-
-bool ShaderSystem::reload(const std::string& name) {
-    auto it = shaders_.find(name);
-    if (it == shaders_.end()) {
-        E2D_ERROR("无法重载不存在的Shader '{}'", name);
-        return false;
-    }
-    
-    auto& info = it->second;
-    if (info.isBuiltin) {
-        E2D_WARN("无法重载内置Shader '{}'", name);
-        return false;
-    }
-    
-    if (info.vertPath.empty() || info.fragPath.empty()) {
-        E2D_ERROR("Shader '{}' 没有关联的文件路径", name);
-        return false;
-    }
-    
-    // 重新加载
-    auto newShader = loadFromFile(name, info.vertPath, info.fragPath);
-    if (newShader) {
-        E2D_INFO("重载Shader '{}' 成功", name);
-        return true;
-    }
-    
-    return false;
-}
-
-void ShaderSystem::reloadAll() {
-    for (const auto& [name, info] : shaders_) {
-        if (!info.isBuiltin) {
-            reload(name);
-        }
-    }
-}
-
-Ptr<GLShader> ShaderSystem::getBuiltinSpriteShader() {
-    return builtinSpriteShader_;
-}
-
-Ptr<GLShader> ShaderSystem::getBuiltinParticleShader() {
-    return builtinParticleShader_;
-}
-
-Ptr<GLShader> ShaderSystem::getBuiltinPostProcessShader() {
-    return builtinPostProcessShader_;
-}
-
-Ptr<GLShader> ShaderSystem::getBuiltinShapeShader() {
-    return builtinShapeShader_;
-}
-
-std::string ShaderSystem::readFile(const std::string& filepath) {
-    std::ifstream file(filepath, std::ios::in | std::ios::binary);
-    if (!file.is_open()) {
-        return "";
-    }
-    
-    std::stringstream buffer;
-    buffer << file.rdbuf();
-    return buffer.str();
-}
-
-uint64_t ShaderSystem::getFileModifiedTime(const std::string& filepath) {
-#ifdef _WIN32
-    struct _stat64 statBuf;
-    if (_stat64(filepath.c_str(), &statBuf) == 0) {
-        return static_cast<uint64_t>(statBuf.st_mtime);
-    }
-#else
-    struct stat statBuf;
-    if (stat(filepath.c_str(), &statBuf) == 0) {
-        return static_cast<uint64_t>(statBuf.st_mtime);
-    }
-#endif
-    return 0;
-}
-
-// ============================================================================
-// ShaderParams实现
-// ============================================================================
-
-ShaderParams::ShaderParams(GLShader& shader) : shader_(shader) {}
-
-ShaderParams& ShaderParams::setBool(const std::string& name, bool value) {
-    shader_.setBool(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setInt(const std::string& name, int value) {
-    shader_.setInt(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setFloat(const std::string& name, float value) {
-    shader_.setFloat(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setVec2(const std::string& name, const glm::vec2& value) {
-    shader_.setVec2(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setVec3(const std::string& name, const glm::vec3& value) {
-    shader_.setVec3(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setVec4(const std::string& name, const glm::vec4& value) {
-    shader_.setVec4(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setMat4(const std::string& name, const glm::mat4& value) {
-    shader_.setMat4(name, value);
-    return *this;
-}
-
-ShaderParams& ShaderParams::setColor(const std::string& name, const Color& color) {
-    shader_.setVec4(name, glm::vec4(color.r, color.g, color.b, color.a));
-    return *this;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/graphics/vram_manager.cpp b/Easy2D/src/graphics/vram_manager.cpp
deleted file mode 100644
index c420c5d..0000000
--- a/Easy2D/src/graphics/vram_manager.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <easy2d/graphics/vram_manager.h>
-#include <easy2d/utils/logger.h>
-#include <algorithm>
-
-namespace easy2d {
-
-// Switch 推荐 VRAM 预算 ~400MB
-static constexpr size_t DEFAULT_VRAM_BUDGET = 400 * 1024 * 1024;
-
-VRAMManager::VRAMManager()
-    : textureVRAM_(0)
-    , bufferVRAM_(0)
-    , vramBudget_(DEFAULT_VRAM_BUDGET)
-    , textureAllocCount_(0)
-    , textureFreeCount_(0)
-    , bufferAllocCount_(0)
-    , bufferFreeCount_(0)
-    , peakTextureVRAM_(0)
-    , peakBufferVRAM_(0) {
-}
-
-VRAMManager& VRAMManager::getInstance() {
-    static VRAMManager instance;
-    return instance;
-}
-
-void VRAMManager::allocTexture(size_t size) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    textureVRAM_ += size;
-    textureAllocCount_++;
-    peakTextureVRAM_ = std::max(peakTextureVRAM_, textureVRAM_);
-
-    if (isOverBudget()) {
-        E2D_LOG_WARN("VRAM over budget! Used: {} MB / Budget: {} MB",
-                     getUsedVRAM() / (1024 * 1024),
-                     vramBudget_ / (1024 * 1024));
-    }
-}
-
-void VRAMManager::freeTexture(size_t size) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (size <= textureVRAM_) {
-        textureVRAM_ -= size;
-    } else {
-        textureVRAM_ = 0;
-    }
-    textureFreeCount_++;
-}
-
-void VRAMManager::allocBuffer(size_t size) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    bufferVRAM_ += size;
-    bufferAllocCount_++;
-    peakBufferVRAM_ = std::max(peakBufferVRAM_, bufferVRAM_);
-
-    if (isOverBudget()) {
-        E2D_LOG_WARN("VRAM over budget! Used: {} MB / Budget: {} MB",
-                     getUsedVRAM() / (1024 * 1024),
-                     vramBudget_ / (1024 * 1024));
-    }
-}
-
-void VRAMManager::freeBuffer(size_t size) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (size <= bufferVRAM_) {
-        bufferVRAM_ -= size;
-    } else {
-        bufferVRAM_ = 0;
-    }
-    bufferFreeCount_++;
-}
-
-size_t VRAMManager::getUsedVRAM() const {
-    return textureVRAM_ + bufferVRAM_;
-}
-
-size_t VRAMManager::getTextureVRAM() const {
-    return textureVRAM_;
-}
-
-size_t VRAMManager::getBufferVRAM() const {
-    return bufferVRAM_;
-}
-
-size_t VRAMManager::getAvailableVRAM() const {
-    size_t used = getUsedVRAM();
-    return (used < vramBudget_) ? (vramBudget_ - used) : 0;
-}
-
-void VRAMManager::setVRAMBudget(size_t budget) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    vramBudget_ = budget;
-    E2D_LOG_INFO("VRAM budget set to {} MB", budget / (1024 * 1024));
-}
-
-size_t VRAMManager::getVRAMBudget() const {
-    return vramBudget_;
-}
-
-bool VRAMManager::isOverBudget() const {
-    return getUsedVRAM() > vramBudget_;
-}
-
-void VRAMManager::printStats() const {
-    std::lock_guard<std::mutex> lock(mutex_);
-    E2D_LOG_INFO("=== VRAM Stats ===");
-    E2D_LOG_INFO("  Texture VRAM: {} MB (peak: {} MB)",
-                 textureVRAM_ / (1024 * 1024),
-                 peakTextureVRAM_ / (1024 * 1024));
-    E2D_LOG_INFO("  Buffer VRAM:  {} MB (peak: {} MB)",
-                 bufferVRAM_ / (1024 * 1024),
-                 peakBufferVRAM_ / (1024 * 1024));
-    E2D_LOG_INFO("  Total Used:   {} MB / {} MB budget",
-                 (textureVRAM_ + bufferVRAM_) / (1024 * 1024),
-                 vramBudget_ / (1024 * 1024));
-    E2D_LOG_INFO("  Texture allocs/frees: {} / {}",
-                 textureAllocCount_, textureFreeCount_);
-    E2D_LOG_INFO("  Buffer allocs/frees:  {} / {}",
-                 bufferAllocCount_, bufferFreeCount_);
-}
-
-void VRAMManager::reset() {
-    std::lock_guard<std::mutex> lock(mutex_);
-    textureVRAM_ = 0;
-    bufferVRAM_ = 0;
-    textureAllocCount_ = 0;
-    textureFreeCount_ = 0;
-    bufferAllocCount_ = 0;
-    bufferFreeCount_ = 0;
-    peakTextureVRAM_ = 0;
-    peakBufferVRAM_ = 0;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/platform/input.cpp b/Easy2D/src/platform/input.cpp
deleted file mode 100644
index e69416a..0000000
--- a/Easy2D/src/platform/input.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-#include <easy2d/platform/input.h>
-#include <easy2d/event/input_codes.h>
-#include <easy2d/utils/logger.h>
-
-namespace easy2d {
-
-Input::Input()
-    : controller_(nullptr)
-    , leftStickX_(0.0f)
-    , leftStickY_(0.0f)
-    , rightStickX_(0.0f)
-    , rightStickY_(0.0f)
-    , touching_(false)
-    , prevTouching_(false)
-    , touchCount_(0) {
-    buttonsDown_.fill(false);
-    prevButtonsDown_.fill(false);
-}
-
-Input::~Input() {
-    shutdown();
-}
-
-void Input::init() {
-    // 打开第一个可用的游戏控制器
-    for (int i = 0; i < SDL_NumJoysticks(); ++i) {
-        if (SDL_IsGameController(i)) {
-            controller_ = SDL_GameControllerOpen(i);
-            if (controller_) {
-                E2D_LOG_INFO("GameController opened: {}",
-                             SDL_GameControllerName(controller_));
-                break;
-            }
-        }
-    }
-
-    if (!controller_) {
-        E2D_LOG_WARN("No game controller found, input may be limited");
-    }
-}
-
-void Input::shutdown() {
-    if (controller_) {
-        SDL_GameControllerClose(controller_);
-        controller_ = nullptr;
-    }
-}
-
-void Input::update() {
-    // 保存上一帧状态
-    prevButtonsDown_ = buttonsDown_;
-    prevTouching_ = touching_;
-    prevTouchPosition_ = touchPosition_;
-
-    if (controller_) {
-        // 更新按钮状态
-        for (int i = 0; i < MAX_BUTTONS; ++i) {
-            buttonsDown_[i] = SDL_GameControllerGetButton(
-                controller_,
-                static_cast<SDL_GameControllerButton>(i)) != 0;
-        }
-
-        // 读取摇杆（归一化到 -1.0 ~ 1.0）
-        leftStickX_ = static_cast<float>(SDL_GameControllerGetAxis(
-                          controller_, SDL_CONTROLLER_AXIS_LEFTX)) /
-                      32767.0f;
-        leftStickY_ = static_cast<float>(SDL_GameControllerGetAxis(
-                          controller_, SDL_CONTROLLER_AXIS_LEFTY)) /
-                      32767.0f;
-        rightStickX_ = static_cast<float>(SDL_GameControllerGetAxis(
-                           controller_, SDL_CONTROLLER_AXIS_RIGHTX)) /
-                       32767.0f;
-        rightStickY_ = static_cast<float>(SDL_GameControllerGetAxis(
-                           controller_, SDL_CONTROLLER_AXIS_RIGHTY)) /
-                       32767.0f;
-    } else {
-        buttonsDown_.fill(false);
-        leftStickX_ = leftStickY_ = rightStickX_ = rightStickY_ = 0.0f;
-    }
-
-    // 更新触摸屏（SDL2 Touch API）
-    SDL_TouchID touchId = SDL_GetTouchDevice(0);
-    if (touchId != 0) {
-        touchCount_ = SDL_GetNumTouchFingers(touchId);
-        if (touchCount_ > 0) {
-            SDL_Finger* finger = SDL_GetTouchFinger(touchId, 0);
-            if (finger) {
-                touching_ = true;
-                // SDL 触摸坐标是归一化 0.0~1.0，转换为像素坐标
-                touchPosition_ = Vec2(finger->x * 1280.0f, finger->y * 720.0f);
-            } else {
-                touching_ = false;
-            }
-        } else {
-            touching_ = false;
-        }
-    } else {
-        touchCount_ = 0;
-        touching_ = false;
-    }
-}
-
-// ============================================================================
-// 键盘输入映射到 SDL GameController 按钮
-// ============================================================================
-
-SDL_GameControllerButton Input::mapKeyToButton(int keyCode) const {
-    switch (keyCode) {
-        // 方向键 → DPad
-        case Key::Up:    return SDL_CONTROLLER_BUTTON_DPAD_UP;
-        case Key::Down:  return SDL_CONTROLLER_BUTTON_DPAD_DOWN;
-        case Key::Left:  return SDL_CONTROLLER_BUTTON_DPAD_LEFT;
-        case Key::Right: return SDL_CONTROLLER_BUTTON_DPAD_RIGHT;
-
-        // WASD → 也映射到 DPad
-        case Key::W: return SDL_CONTROLLER_BUTTON_DPAD_UP;
-        case Key::S: return SDL_CONTROLLER_BUTTON_DPAD_DOWN;
-        case Key::A: return SDL_CONTROLLER_BUTTON_DPAD_LEFT;
-        case Key::D: return SDL_CONTROLLER_BUTTON_DPAD_RIGHT;
-
-        // 常用键 → 手柄按钮
-        case Key::Z:      return SDL_CONTROLLER_BUTTON_B;       // 确认
-        case Key::X:      return SDL_CONTROLLER_BUTTON_A;       // 取消
-        case Key::C:      return SDL_CONTROLLER_BUTTON_Y;
-        case Key::V:      return SDL_CONTROLLER_BUTTON_X;
-        case Key::Space:  return SDL_CONTROLLER_BUTTON_A;       // 空格 = A
-        case Key::Enter:  return SDL_CONTROLLER_BUTTON_A;       // 回车 = A
-        case Key::Escape: return SDL_CONTROLLER_BUTTON_START;   // ESC = Start
-
-        // 肩键
-        case Key::Q: return SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
-        case Key::E: return SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
-
-        // Start/Select
-        case Key::Tab:       return SDL_CONTROLLER_BUTTON_BACK;
-        case Key::Backspace: return SDL_CONTROLLER_BUTTON_START;
-
-        default: return SDL_CONTROLLER_BUTTON_INVALID;
-    }
-}
-
-bool Input::isKeyDown(int keyCode) const {
-    SDL_GameControllerButton button = mapKeyToButton(keyCode);
-    if (button == SDL_CONTROLLER_BUTTON_INVALID) return false;
-    return buttonsDown_[button];
-}
-
-bool Input::isKeyPressed(int keyCode) const {
-    SDL_GameControllerButton button = mapKeyToButton(keyCode);
-    if (button == SDL_CONTROLLER_BUTTON_INVALID) return false;
-    return buttonsDown_[button] && !prevButtonsDown_[button];
-}
-
-bool Input::isKeyReleased(int keyCode) const {
-    SDL_GameControllerButton button = mapKeyToButton(keyCode);
-    if (button == SDL_CONTROLLER_BUTTON_INVALID) return false;
-    return !buttonsDown_[button] && prevButtonsDown_[button];
-}
-
-// ============================================================================
-// 手柄按钮直接访问
-// ============================================================================
-
-bool Input::isButtonDown(int button) const {
-    if (button < 0 || button >= MAX_BUTTONS) return false;
-    return buttonsDown_[button];
-}
-
-bool Input::isButtonPressed(int button) const {
-    if (button < 0 || button >= MAX_BUTTONS) return false;
-    return buttonsDown_[button] && !prevButtonsDown_[button];
-}
-
-bool Input::isButtonReleased(int button) const {
-    if (button < 0 || button >= MAX_BUTTONS) return false;
-    return !buttonsDown_[button] && prevButtonsDown_[button];
-}
-
-Vec2 Input::getLeftStick() const {
-    return Vec2(leftStickX_, leftStickY_);
-}
-
-Vec2 Input::getRightStick() const {
-    return Vec2(rightStickX_, rightStickY_);
-}
-
-// ============================================================================
-// 鼠标输入映射到触摸屏
-// ============================================================================
-
-bool Input::isMouseDown(MouseButton button) const {
-    if (button == MouseButton::Left) {
-        return touching_;
-    }
-    // A 键映射为右键
-    if (button == MouseButton::Right) {
-        return buttonsDown_[SDL_CONTROLLER_BUTTON_A];
-    }
-    return false;
-}
-
-bool Input::isMousePressed(MouseButton button) const {
-    if (button == MouseButton::Left) {
-        return touching_ && !prevTouching_;
-    }
-    if (button == MouseButton::Right) {
-        return buttonsDown_[SDL_CONTROLLER_BUTTON_A] &&
-               !prevButtonsDown_[SDL_CONTROLLER_BUTTON_A];
-    }
-    return false;
-}
-
-bool Input::isMouseReleased(MouseButton button) const {
-    if (button == MouseButton::Left) {
-        return !touching_ && prevTouching_;
-    }
-    if (button == MouseButton::Right) {
-        return !buttonsDown_[SDL_CONTROLLER_BUTTON_A] &&
-               prevButtonsDown_[SDL_CONTROLLER_BUTTON_A];
-    }
-    return false;
-}
-
-Vec2 Input::getMousePosition() const {
-    return touchPosition_;
-}
-
-Vec2 Input::getMouseDelta() const {
-    if (touching_ && prevTouching_) {
-        return touchPosition_ - prevTouchPosition_;
-    }
-    return Vec2::Zero();
-}
-
-void Input::setMousePosition(const Vec2& /*position*/) {
-    // 不支持在 Switch 上设置触摸位置
-}
-
-void Input::setMouseVisible(bool /*visible*/) {
-    // Switch 无鼠标光标
-}
-
-void Input::setMouseLocked(bool /*locked*/) {
-    // Switch 无鼠标光标
-}
-
-bool Input::isAnyKeyDown() const {
-    for (int i = 0; i < MAX_BUTTONS; ++i) {
-        if (buttonsDown_[i]) return true;
-    }
-    return false;
-}
-
-bool Input::isAnyMouseDown() const {
-    return touching_;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/resource/resource_manager.cpp b/Easy2D/src/resource/resource_manager.cpp
deleted file mode 100644
index 562822b..0000000
--- a/Easy2D/src/resource/resource_manager.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-#include <easy2d/resource/resource_manager.h>
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <easy2d/graphics/opengl/gl_font_atlas.h>
-#include <easy2d/audio/audio_engine.h>
-#include <easy2d/utils/logger.h>
-#include <algorithm>
-#include <cstring>
-#include <sys/stat.h>
-
-namespace easy2d {
-
-ResourceManager::ResourceManager() {
-#ifdef __SWITCH__
-    addSearchPath("romfs:/");
-    addSearchPath("sdmc:/");
-#endif
-}
-ResourceManager::~ResourceManager() = default;
-
-ResourceManager& ResourceManager::getInstance() {
-    static ResourceManager instance;
-    return instance;
-}
-
-// ============================================================================
-// 搜索路径管理
-// ============================================================================
-
-void ResourceManager::addSearchPath(const std::string& path) {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    // 避免重复添加
-    auto it = std::find(searchPaths_.begin(), searchPaths_.end(), path);
-    if (it == searchPaths_.end()) {
-        searchPaths_.push_back(path);
-        E2D_LOG_DEBUG("ResourceManager: added search path: {}", path);
-    }
-}
-
-void ResourceManager::removeSearchPath(const std::string& path) {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    auto it = std::find(searchPaths_.begin(), searchPaths_.end(), path);
-    if (it != searchPaths_.end()) {
-        searchPaths_.erase(it);
-        E2D_LOG_DEBUG("ResourceManager: removed search path: {}", path);
-    }
-}
-
-void ResourceManager::clearSearchPaths() {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    searchPaths_.clear();
-    E2D_LOG_DEBUG("ResourceManager: cleared all search paths");
-}
-
-// 辅助函数：检查文件是否存在
-static bool fileExists(const std::string& path) {
-    struct stat st;
-    return stat(path.c_str(), &st) == 0;
-}
-
-// 辅助函数：检查是否是 romfs 路径
-static bool isRomfsPath(const std::string& path) {
-    return path.find("romfs:/") == 0 || path.find("romfs:\\") == 0;
-}
-
-// 辅助函数：拼接路径
-static std::string joinPath(const std::string& dir, const std::string& filename) {
-    if (dir.empty()) return filename;
-    char lastChar = dir.back();
-    if (lastChar == '/' || lastChar == '\\') {
-        return dir + filename;
-    }
-    return dir + "/" + filename;
-}
-
-std::string ResourceManager::findResourcePath(const std::string& filename) const {
-    // 首先检查是否是 romfs 路径（Switch 平台）
-    if (isRomfsPath(filename)) {
-        if (fileExists(filename)) {
-            return filename;
-        }
-        return "";
-    }
-
-    // 首先检查是否是绝对路径或相对当前目录存在
-    if (fileExists(filename)) {
-        return filename;
-    }
-
-    // 在搜索路径中查找
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    for (const auto& path : searchPaths_) {
-        std::string fullPath = joinPath(path, filename);
-        if (fileExists(fullPath)) {
-            return fullPath;
-        }
-    }
-
-    // 最后尝试在 romfs 中查找（自动添加 romfs:/ 前缀）
-    std::string romfsPath = "romfs:/" + filename;
-    if (fileExists(romfsPath)) {
-        return romfsPath;
-    }
-
-    return "";
-}
-
-// ============================================================================
-// 纹理资源
-// ============================================================================
-
-Ptr<Texture> ResourceManager::loadTexture(const std::string& filepath) {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    // 检查缓存
-    auto it = textureCache_.find(filepath);
-    if (it != textureCache_.end()) {
-        if (auto texture = it->second.lock()) {
-            E2D_LOG_TRACE("ResourceManager: texture cache hit: {}", filepath);
-            return texture;
-        }
-        // 弱引用已失效，移除
-        textureCache_.erase(it);
-    }
-    
-    // 查找完整路径
-    std::string fullPath = findResourcePath(filepath);
-    if (fullPath.empty()) {
-        E2D_LOG_ERROR("ResourceManager: texture file not found: {}", filepath);
-        return nullptr;
-    }
-    
-    // 创建新纹理（根据扩展名自动选择加载路径）
-    try {
-        auto texture = makePtr<GLTexture>(fullPath);
-        if (!texture->isValid()) {
-            E2D_LOG_ERROR("ResourceManager: failed to load texture: {}", filepath);
-            return nullptr;
-        }
-        
-        // 存入缓存
-        textureCache_[filepath] = texture;
-        E2D_LOG_DEBUG("ResourceManager: loaded texture: {}", filepath);
-        return texture;
-    } catch (...) {
-        E2D_LOG_ERROR("ResourceManager: exception loading texture: {}", filepath);
-        return nullptr;
-    }
-}
-
-Ptr<Texture> ResourceManager::loadTextureWithAlphaMask(const std::string& filepath) {
-    // 先加载纹理
-    auto texture = loadTexture(filepath);
-    if (!texture) {
-        return nullptr;
-    }
-    
-    // 生成Alpha遮罩
-    generateAlphaMask(filepath);
-    
-    return texture;
-}
-
-const AlphaMask* ResourceManager::getAlphaMask(const std::string& textureKey) const {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    auto it = textureCache_.find(textureKey);
-    if (it != textureCache_.end()) {
-        if (auto texture = it->second.lock()) {
-            GLTexture* glTexture = static_cast<GLTexture*>(texture.get());
-            return glTexture->getAlphaMask();
-        }
-    }
-    return nullptr;
-}
-
-bool ResourceManager::generateAlphaMask(const std::string& textureKey) {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    auto it = textureCache_.find(textureKey);
-    if (it != textureCache_.end()) {
-        if (auto texture = it->second.lock()) {
-            GLTexture* glTexture = static_cast<GLTexture*>(texture.get());
-            if (!glTexture->hasAlphaMask()) {
-                glTexture->generateAlphaMask();
-            }
-            return glTexture->hasAlphaMask();
-        }
-    }
-    return false;
-}
-
-bool ResourceManager::hasAlphaMask(const std::string& textureKey) const {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    auto it = textureCache_.find(textureKey);
-    if (it != textureCache_.end()) {
-        if (auto texture = it->second.lock()) {
-            GLTexture* glTexture = static_cast<GLTexture*>(texture.get());
-            return glTexture->hasAlphaMask();
-        }
-    }
-    return false;
-}
-
-Ptr<Texture> ResourceManager::getTexture(const std::string& key) const {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    auto it = textureCache_.find(key);
-    if (it != textureCache_.end()) {
-        return it->second.lock();
-    }
-    return nullptr;
-}
-
-bool ResourceManager::hasTexture(const std::string& key) const {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    
-    auto it = textureCache_.find(key);
-    if (it != textureCache_.end()) {
-        return !it->second.expired();
-    }
-    return false;
-}
-
-void ResourceManager::unloadTexture(const std::string& key) {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    textureCache_.erase(key);
-    E2D_LOG_DEBUG("ResourceManager: unloaded texture: {}", key);
-}
-
-// ============================================================================
-// 字体图集资源
-// ============================================================================
-
-std::string ResourceManager::makeFontKey(const std::string& filepath, int fontSize, bool useSDF) const {
-    return filepath + "#" + std::to_string(fontSize) + (useSDF ? "#sdf" : "");
-}
-
-Ptr<FontAtlas> ResourceManager::loadFont(const std::string& filepath, int fontSize, bool useSDF) {
-    std::lock_guard<std::mutex> lock(fontMutex_);
-    
-    std::string key = makeFontKey(filepath, fontSize, useSDF);
-    
-    // 检查缓存
-    auto it = fontCache_.find(key);
-    if (it != fontCache_.end()) {
-        if (auto font = it->second.lock()) {
-            E2D_LOG_TRACE("ResourceManager: font cache hit: {}", key);
-            return font;
-        }
-        // 弱引用已失效，移除
-        fontCache_.erase(it);
-    }
-    
-    // 查找完整路径
-    std::string fullPath = findResourcePath(filepath);
-    if (fullPath.empty()) {
-        E2D_LOG_ERROR("ResourceManager: font file not found: {}", filepath);
-        return nullptr;
-    }
-    
-    // 创建新字体图集
-    try {
-        auto font = makePtr<GLFontAtlas>(fullPath, fontSize, useSDF);
-        if (!font->getTexture() || !font->getTexture()->isValid()) {
-            E2D_LOG_ERROR("ResourceManager: failed to load font: {}", filepath);
-            return nullptr;
-        }
-        
-        // 存入缓存
-        fontCache_[key] = font;
-        E2D_LOG_DEBUG("ResourceManager: loaded font: {} (size={}, sdf={})", filepath, fontSize, useSDF);
-        return font;
-    } catch (...) {
-        E2D_LOG_ERROR("ResourceManager: exception loading font: {}", filepath);
-        return nullptr;
-    }
-}
-
-Ptr<FontAtlas> ResourceManager::getFont(const std::string& key) const {
-    std::lock_guard<std::mutex> lock(fontMutex_);
-    
-    auto it = fontCache_.find(key);
-    if (it != fontCache_.end()) {
-        return it->second.lock();
-    }
-    return nullptr;
-}
-
-bool ResourceManager::hasFont(const std::string& key) const {
-    std::lock_guard<std::mutex> lock(fontMutex_);
-    
-    auto it = fontCache_.find(key);
-    if (it != fontCache_.end()) {
-        return !it->second.expired();
-    }
-    return false;
-}
-
-void ResourceManager::unloadFont(const std::string& key) {
-    std::lock_guard<std::mutex> lock(fontMutex_);
-    fontCache_.erase(key);
-    E2D_LOG_DEBUG("ResourceManager: unloaded font: {}", key);
-}
-
-// ============================================================================
-// 音效资源
-// ============================================================================
-
-Ptr<Sound> ResourceManager::loadSound(const std::string& filepath) {
-    return loadSound(filepath, filepath);
-}
-
-Ptr<Sound> ResourceManager::loadSound(const std::string& name, const std::string& filepath) {
-    std::lock_guard<std::mutex> lock(soundMutex_);
-    
-    // 检查缓存
-    auto it = soundCache_.find(name);
-    if (it != soundCache_.end()) {
-        if (auto sound = it->second.lock()) {
-            E2D_LOG_TRACE("ResourceManager: sound cache hit: {}", name);
-            return sound;
-        }
-        // 弱引用已失效，移除
-        soundCache_.erase(it);
-    }
-    
-    // 查找完整路径
-    std::string fullPath = findResourcePath(filepath);
-    if (fullPath.empty()) {
-        E2D_LOG_ERROR("ResourceManager: sound file not found: {}", filepath);
-        return nullptr;
-    }
-    
-    // 使用 AudioEngine 加载音效
-    auto sound = AudioEngine::getInstance().loadSound(name, fullPath);
-    if (!sound) {
-        E2D_LOG_ERROR("ResourceManager: failed to load sound: {}", filepath);
-        return nullptr;
-    }
-    
-    // 存入缓存
-    soundCache_[name] = sound;
-    E2D_LOG_DEBUG("ResourceManager: loaded sound: {}", filepath);
-    return sound;
-}
-
-Ptr<Sound> ResourceManager::getSound(const std::string& key) const {
-    std::lock_guard<std::mutex> lock(soundMutex_);
-    
-    auto it = soundCache_.find(key);
-    if (it != soundCache_.end()) {
-        return it->second.lock();
-    }
-    return nullptr;
-}
-
-bool ResourceManager::hasSound(const std::string& key) const {
-    std::lock_guard<std::mutex> lock(soundMutex_);
-    
-    auto it = soundCache_.find(key);
-    if (it != soundCache_.end()) {
-        return !it->second.expired();
-    }
-    return false;
-}
-
-void ResourceManager::unloadSound(const std::string& key) {
-    std::lock_guard<std::mutex> lock(soundMutex_);
-    
-    // 从 AudioEngine 也卸载
-    AudioEngine::getInstance().unloadSound(key);
-    soundCache_.erase(key);
-    E2D_LOG_DEBUG("ResourceManager: unloaded sound: {}", key);
-}
-
-// ============================================================================
-// 缓存清理
-// ============================================================================
-
-void ResourceManager::purgeUnused() {
-    // 清理纹理缓存
-    {
-        std::lock_guard<std::mutex> lock(textureMutex_);
-        for (auto it = textureCache_.begin(); it != textureCache_.end();) {
-            if (it->second.expired()) {
-                E2D_LOG_TRACE("ResourceManager: purging unused texture: {}", it->first);
-                it = textureCache_.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-    
-    // 清理字体缓存
-    {
-        std::lock_guard<std::mutex> lock(fontMutex_);
-        for (auto it = fontCache_.begin(); it != fontCache_.end();) {
-            if (it->second.expired()) {
-                E2D_LOG_TRACE("ResourceManager: purging unused font: {}", it->first);
-                it = fontCache_.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-    
-    // 清理音效缓存
-    {
-        std::lock_guard<std::mutex> lock(soundMutex_);
-        for (auto it = soundCache_.begin(); it != soundCache_.end();) {
-            if (it->second.expired()) {
-                E2D_LOG_TRACE("ResourceManager: purging unused sound: {}", it->first);
-                it = soundCache_.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-}
-
-void ResourceManager::clearTextureCache() {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    size_t count = textureCache_.size();
-    textureCache_.clear();
-    E2D_LOG_INFO("ResourceManager: cleared {} textures from cache", count);
-}
-
-void ResourceManager::clearFontCache() {
-    std::lock_guard<std::mutex> lock(fontMutex_);
-    size_t count = fontCache_.size();
-    fontCache_.clear();
-    E2D_LOG_INFO("ResourceManager: cleared {} fonts from cache", count);
-}
-
-void ResourceManager::clearSoundCache() {
-    std::lock_guard<std::mutex> lock(soundMutex_);
-    size_t count = soundCache_.size();
-    
-    // 同时清理 AudioEngine 中的缓存
-    for (const auto& pair : soundCache_) {
-        AudioEngine::getInstance().unloadSound(pair.first);
-    }
-    soundCache_.clear();
-    E2D_LOG_INFO("ResourceManager: cleared {} sounds from cache", count);
-}
-
-void ResourceManager::clearAllCaches() {
-    clearTextureCache();
-    clearFontCache();
-    clearSoundCache();
-    E2D_LOG_INFO("ResourceManager: all caches cleared");
-}
-
-size_t ResourceManager::getTextureCacheSize() const {
-    std::lock_guard<std::mutex> lock(textureMutex_);
-    return textureCache_.size();
-}
-
-size_t ResourceManager::getFontCacheSize() const {
-    std::lock_guard<std::mutex> lock(fontMutex_);
-    return fontCache_.size();
-}
-
-size_t ResourceManager::getSoundCacheSize() const {
-    std::lock_guard<std::mutex> lock(soundMutex_);
-    return soundCache_.size();
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/node.cpp b/Easy2D/src/scene/node.cpp
deleted file mode 100644
index 43c3853..0000000
--- a/Easy2D/src/scene/node.cpp
+++ /dev/null
@@ -1,356 +0,0 @@
-#include <easy2d/scene/node.h>
-#include <easy2d/scene/scene.h>
-#include <easy2d/action/action.h>
-#include <easy2d/utils/logger.h>
-#include <easy2d/graphics/render_command.h>
-#include <algorithm>
-#include <cmath>
-
-namespace easy2d {
-
-Node::Node() = default;
-
-Node::~Node() {
-    removeAllChildren();
-    stopAllActions();
-}
-
-void Node::addChild(Ptr<Node> child) {
-    if (!child || child.get() == this) {
-        return;
-    }
-    
-    child->removeFromParent();
-    child->parent_ = weak_from_this();
-    children_.push_back(child);
-    childrenOrderDirty_ = true;
-    
-    if (running_) {
-        child->onEnter();
-        if (scene_) {
-            child->onAttachToScene(scene_);
-        }
-    }
-}
-
-void Node::removeChild(Ptr<Node> child) {
-    if (!child) return;
-    
-    auto it = std::find(children_.begin(), children_.end(), child);
-    if (it != children_.end()) {
-        if (running_) {
-            (*it)->onDetachFromScene();
-            (*it)->onExit();
-        }
-        (*it)->parent_.reset();
-        children_.erase(it);
-    }
-}
-
-void Node::removeChildByName(const std::string& name) {
-    auto child = getChildByName(name);
-    if (child) {
-        removeChild(child);
-    }
-}
-
-void Node::removeFromParent() {
-    auto p = parent_.lock();
-    if (p) {
-        p->removeChild(shared_from_this());
-    }
-}
-
-void Node::removeAllChildren() {
-    for (auto& child : children_) {
-        if (running_) {
-            child->onDetachFromScene();
-            child->onExit();
-        }
-        child->parent_.reset();
-    }
-    children_.clear();
-}
-
-Ptr<Node> Node::getChildByName(const std::string& name) const {
-    for (const auto& child : children_) {
-        if (child->getName() == name) {
-            return child;
-        }
-    }
-    return nullptr;
-}
-
-Ptr<Node> Node::getChildByTag(int tag) const {
-    for (const auto& child : children_) {
-        if (child->getTag() == tag) {
-            return child;
-        }
-    }
-    return nullptr;
-}
-
-void Node::setPosition(const Vec2& pos) {
-    position_ = pos;
-    transformDirty_ = true;
-    updateSpatialIndex();
-}
-
-void Node::setPosition(float x, float y) {
-    setPosition(Vec2(x, y));
-}
-
-void Node::setRotation(float degrees) {
-    rotation_ = degrees;
-    transformDirty_ = true;
-    updateSpatialIndex();
-}
-
-void Node::setScale(const Vec2& scale) {
-    scale_ = scale;
-    transformDirty_ = true;
-    updateSpatialIndex();
-}
-
-void Node::setScale(float scale) {
-    setScale(Vec2(scale, scale));
-}
-
-void Node::setScale(float x, float y) {
-    setScale(Vec2(x, y));
-}
-
-void Node::setAnchor(const Vec2& anchor) {
-    anchor_ = anchor;
-    transformDirty_ = true;
-}
-
-void Node::setAnchor(float x, float y) {
-    setAnchor(Vec2(x, y));
-}
-
-void Node::setSkew(const Vec2& skew) {
-    skew_ = skew;
-    transformDirty_ = true;
-}
-
-void Node::setSkew(float x, float y) {
-    setSkew(Vec2(x, y));
-}
-
-void Node::setOpacity(float opacity) {
-    opacity_ = std::clamp(opacity, 0.0f, 1.0f);
-}
-
-void Node::setVisible(bool visible) {
-    visible_ = visible;
-}
-
-void Node::setZOrder(int zOrder) {
-    if (zOrder_ != zOrder) {
-        zOrder_ = zOrder;
-        childrenOrderDirty_ = true;
-    }
-}
-
-Vec2 Node::convertToWorldSpace(const Vec2& localPos) const {
-    glm::vec4 worldPos = getWorldTransform() * glm::vec4(localPos.x, localPos.y, 0.0f, 1.0f);
-    return Vec2(worldPos.x, worldPos.y);
-}
-
-Vec2 Node::convertToNodeSpace(const Vec2& worldPos) const {
-    glm::mat4 invWorld = glm::inverse(getWorldTransform());
-    glm::vec4 localPos = invWorld * glm::vec4(worldPos.x, worldPos.y, 0.0f, 1.0f);
-    return Vec2(localPos.x, localPos.y);
-}
-
-glm::mat4 Node::getLocalTransform() const {
-    if (transformDirty_) {
-        localTransform_ = glm::mat4(1.0f);
-        
-        // T - R - S order
-        localTransform_ = glm::translate(localTransform_, glm::vec3(position_.x, position_.y, 0.0f));
-        
-        if (rotation_ != 0.0f) {
-            localTransform_ = glm::rotate(localTransform_, rotation_ * DEG_TO_RAD, glm::vec3(0.0f, 0.0f, 1.0f));
-        }
-        
-        if (skew_.x != 0.0f || skew_.y != 0.0f) {
-            glm::mat4 skewMatrix(1.0f);
-            skewMatrix[1][0] = std::tan(skew_.x * DEG_TO_RAD);
-            skewMatrix[0][1] = std::tan(skew_.y * DEG_TO_RAD);
-            localTransform_ *= skewMatrix;
-        }
-        
-        localTransform_ = glm::scale(localTransform_, glm::vec3(scale_.x, scale_.y, 1.0f));
-        
-        // Apply anchor point offset
-        localTransform_ = glm::translate(localTransform_, glm::vec3(-anchor_.x, -anchor_.y, 0.0f));
-        
-        transformDirty_ = false;
-    }
-    return localTransform_;
-}
-
-glm::mat4 Node::getWorldTransform() const {
-    if (transformDirty_) {
-        worldTransform_ = getLocalTransform();
-        
-        auto p = parent_.lock();
-        if (p) {
-            worldTransform_ = p->getWorldTransform() * worldTransform_;
-        }
-    }
-    return worldTransform_;
-}
-
-void Node::onEnter() {
-    running_ = true;
-    for (auto& child : children_) {
-        child->onEnter();
-    }
-}
-
-void Node::onExit() {
-    running_ = false;
-    for (auto& child : children_) {
-        child->onExit();
-    }
-}
-
-void Node::onUpdate(float dt) {
-    onUpdateNode(dt);
-    
-    // Update actions
-    for (auto it = actions_.begin(); it != actions_.end();) {
-        auto& action = *it;
-        action->update(dt);
-        if (action->isDone()) {
-            it = actions_.erase(it);
-        } else {
-            ++it;
-        }
-    }
-    
-    // Update children
-    for (auto& child : children_) {
-        child->onUpdate(dt);
-    }
-}
-
-void Node::onRender(RenderBackend& renderer) {
-    if (!visible_) return;
-    
-    onDraw(renderer);
-    
-    for (auto& child : children_) {
-        child->onRender(renderer);
-    }
-}
-
-void Node::onAttachToScene(Scene* scene) {
-    scene_ = scene;
-    
-    // 添加到场景的空间索引
-    if (spatialIndexed_ && scene_) {
-        lastSpatialBounds_ = Rect();
-        updateSpatialIndex();
-    }
-    
-    for (auto& child : children_) {
-        child->onAttachToScene(scene);
-    }
-}
-
-void Node::onDetachFromScene() {
-    // 从场景的空间索引移除
-    if (spatialIndexed_ && scene_ && !lastSpatialBounds_.empty()) {
-        scene_->removeNodeFromSpatialIndex(this);
-        lastSpatialBounds_ = Rect();
-    }
-    
-    scene_ = nullptr;
-    for (auto& child : children_) {
-        child->onDetachFromScene();
-    }
-}
-
-Rect Node::getBoundingBox() const {
-    // 默认返回一个以位置为中心的点矩形
-    return Rect(position_.x, position_.y, 0, 0);
-}
-
-void Node::updateSpatialIndex() {
-    if (!spatialIndexed_ || !scene_) {
-        return;
-    }
-    
-    Rect newBounds = getBoundingBox();
-    if (newBounds != lastSpatialBounds_) {
-        scene_->updateNodeInSpatialIndex(this, lastSpatialBounds_, newBounds);
-        lastSpatialBounds_ = newBounds;
-    }
-}
-
-void Node::runAction(Ptr<Action> action) {
-    if (action) {
-        action->start(this);
-        actions_.push_back(action);
-    }
-}
-
-void Node::stopAllActions() {
-    actions_.clear();
-}
-
-void Node::stopAction(Ptr<Action> action) {
-    auto it = std::find(actions_.begin(), actions_.end(), action);
-    if (it != actions_.end()) {
-        actions_.erase(it);
-    }
-}
-
-void Node::stopActionByTag(int tag) {
-    auto it = std::remove_if(actions_.begin(), actions_.end(),
-        [tag](const Ptr<Action>& action) { return action->getTag() == tag; });
-    actions_.erase(it, actions_.end());
-}
-
-Ptr<Action> Node::getActionByTag(int tag) const {
-    for (const auto& action : actions_) {
-        if (action->getTag() == tag) {
-            return action;
-        }
-    }
-    return nullptr;
-}
-
-void Node::update(float dt) {
-    onUpdate(dt);
-}
-
-void Node::render(RenderBackend& renderer) {
-    if (childrenOrderDirty_) {
-        sortChildren();
-    }
-    onRender(renderer);
-}
-
-void Node::sortChildren() {
-    std::sort(children_.begin(), children_.end(),
-        [](const Ptr<Node>& a, const Ptr<Node>& b) {
-            return a->getZOrder() < b->getZOrder();
-        });
-    childrenOrderDirty_ = false;
-}
-
-void Node::collectRenderCommands(std::vector<RenderCommand>& commands, int parentZOrder) {
-    // 暂时最小化实现以测试
-    if (!visible_) return;
-
-    // 不排序，不递归，只生成当前节点的命令
-    int accumulatedZOrder = parentZOrder + zOrder_;
-    generateRenderCommand(commands, accumulatedZOrder);
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/scene.cpp b/Easy2D/src/scene/scene.cpp
deleted file mode 100644
index e485db0..0000000
--- a/Easy2D/src/scene/scene.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#include <easy2d/scene/scene.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/render_command.h>
-#include <easy2d/utils/logger.h>
-
-namespace easy2d {
-
-Scene::Scene() {
-    defaultCamera_ = makePtr<Camera>();
-}
-
-void Scene::setCamera(Ptr<Camera> camera) {
-    camera_ = camera;
-}
-
-void Scene::setViewportSize(float width, float height) {
-    viewportSize_ = Size(width, height);
-    if (defaultCamera_) {
-        defaultCamera_->setViewport(0, width, height, 0);
-    }
-    if (camera_) {
-        camera_->setViewport(0, width, height, 0);
-    }
-}
-
-void Scene::setViewportSize(const Size& size) {
-    setViewportSize(size.width, size.height);
-}
-
-void Scene::renderScene(RenderBackend& renderer) {
-    if (!isVisible()) return;
-    
-    // Begin frame with background color
-    renderer.beginFrame(backgroundColor_);
-    renderContent(renderer);
-    renderer.endFrame();
-}
-
-void Scene::renderContent(RenderBackend& renderer) {
-    if (!isVisible()) return;
-
-    Camera* activeCam = getActiveCamera();
-    if (activeCam) {
-        renderer.setViewProjection(activeCam->getViewProjectionMatrix());
-    }
-
-    renderer.beginSpriteBatch();
-    render(renderer);
-    renderer.endSpriteBatch();
-}
-
-void Scene::updateScene(float dt) {
-    if (!paused_) {
-        update(dt);
-    }
-}
-
-void Scene::onEnter() {
-    Node::onEnter();
-    
-    // 初始化空间索引世界边界
-    if (spatialIndexingEnabled_) {
-        spatialManager_.setWorldBounds(Rect(0, 0, viewportSize_.width, viewportSize_.height));
-    }
-}
-
-void Scene::onExit() {
-    // 清理空间索引
-    spatialManager_.clear();
-    Node::onExit();
-}
-
-void Scene::updateNodeInSpatialIndex(Node* node, const Rect& oldBounds, const Rect& newBounds) {
-    if (!spatialIndexingEnabled_ || !node || !node->isSpatialIndexed()) {
-        return;
-    }
-    
-    // 如果旧边界有效，先移除
-    if (!oldBounds.empty()) {
-        spatialManager_.remove(node);
-    }
-    
-    // 如果新边界有效，插入
-    if (!newBounds.empty()) {
-        spatialManager_.insert(node, newBounds);
-    }
-}
-
-void Scene::removeNodeFromSpatialIndex(Node* node) {
-    if (!spatialIndexingEnabled_ || !node) {
-        return;
-    }
-    
-    spatialManager_.remove(node);
-}
-
-std::vector<Node*> Scene::queryNodesInArea(const Rect& area) const {
-    if (!spatialIndexingEnabled_) {
-        return {};
-    }
-    return spatialManager_.query(area);
-}
-
-std::vector<Node*> Scene::queryNodesAtPoint(const Vec2& point) const {
-    if (!spatialIndexingEnabled_) {
-        return {};
-    }
-    return spatialManager_.query(point);
-}
-
-std::vector<std::pair<Node*, Node*>> Scene::queryCollisions() const {
-    if (!spatialIndexingEnabled_) {
-        return {};
-    }
-    return spatialManager_.queryCollisions();
-}
-
-void Scene::collectRenderCommands(std::vector<RenderCommand>& commands) {
-    if (!isVisible()) return;
-
-    // 从场景的子节点开始收集渲染命令
-    Node::collectRenderCommands(commands);
-}
-
-Ptr<Scene> Scene::create() {
-    return makePtr<Scene>();
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/scene_manager.cpp b/Easy2D/src/scene/scene_manager.cpp
deleted file mode 100644
index ccab0e1..0000000
--- a/Easy2D/src/scene/scene_manager.cpp
+++ /dev/null
@@ -1,688 +0,0 @@
-#include <easy2d/scene/scene_manager.h>
-#include <easy2d/scene/transition.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/render_command.h>
-#include <easy2d/app/application.h>
-#include <easy2d/platform/input.h>
-#include <easy2d/utils/logger.h>
-#include <algorithm>
-
-namespace easy2d {
-
-namespace {
-
-Node* hitTestTopmost(const Ptr<Node>& node, const Vec2& worldPos) {
-    if (!node || !node->isVisible()) {
-        return nullptr;
-    }
-
-    std::vector<Ptr<Node>> children = node->getChildren();
-    std::stable_sort(children.begin(), children.end(),
-        [](const Ptr<Node>& a, const Ptr<Node>& b) {
-            return a->getZOrder() < b->getZOrder();
-        });
-
-    for (auto it = children.rbegin(); it != children.rend(); ++it) {
-        if (Node* hit = hitTestTopmost(*it, worldPos)) {
-            return hit;
-        }
-    }
-
-    if (node->getEventDispatcher().getTotalListenerCount() == 0) {
-        return nullptr;
-    }
-
-    Rect bounds = node->getBoundingBox();
-    if (!bounds.empty() && bounds.containsPoint(worldPos)) {
-        return node.get();
-    }
-
-    return nullptr;
-}
-
-void dispatchToNode(Node* node, Event& event) {
-    if (!node) {
-        return;
-    }
-    node->getEventDispatcher().dispatch(event);
-}
-
-} // namespace
-
-SceneManager& SceneManager::getInstance() {
-    static SceneManager instance;
-    return instance;
-}
-
-void SceneManager::runWithScene(Ptr<Scene> scene) {
-    if (!scene) {
-        return;
-    }
-    
-    if (!sceneStack_.empty()) {
-        E2D_LOG_WARN("SceneManager: runWithScene should only be called once");
-        return;
-    }
-    
-    scene->onEnter();
-    scene->onAttachToScene(scene.get());
-    sceneStack_.push(scene);
-}
-
-void SceneManager::replaceScene(Ptr<Scene> scene) {
-    if (!scene || isTransitioning_) {
-        return;
-    }
-    
-    if (sceneStack_.empty()) {
-        runWithScene(scene);
-        return;
-    }
-    
-    // Pop current scene
-    auto oldScene = sceneStack_.top();
-    oldScene->onExit();
-    oldScene->onDetachFromScene();
-    sceneStack_.pop();
-    
-    // Push new scene
-    scene->onEnter();
-    scene->onAttachToScene(scene.get());
-    sceneStack_.push(scene);
-}
-
-void SceneManager::enterScene(Ptr<Scene> scene) {
-    if (!scene || isTransitioning_) {
-        return;
-    }
-    
-    if (sceneStack_.empty()) {
-        runWithScene(scene);
-    } else {
-        replaceScene(scene);
-    }
-}
-
-void SceneManager::enterScene(Ptr<Scene> scene, Ptr<class Transition> transition) {
-    if (!scene || isTransitioning_) {
-        return;
-    }
-
-    if (!transition) {
-        enterScene(scene);
-        return;
-    }
-
-    auto current = getCurrentScene();
-
-    // 在过渡开始前，发送 UIHoverExit 给当前悬停的节点，重置按钮状态
-    if (hoverTarget_) {
-        Event evt;
-        evt.type = EventType::UIHoverExit;
-        evt.data = CustomEvent{0, hoverTarget_};
-        dispatchToNode(hoverTarget_, evt);
-        hoverTarget_ = nullptr;
-    }
-    captureTarget_ = nullptr;
-    hasLastPointerWorld_ = false;
-
-    transition->start(current, scene);
-    outgoingScene_ = current;
-    incomingScene_ = scene;
-    activeTransition_ = transition;
-    currentTransition_ = TransitionType::None;
-    isTransitioning_ = true;
-    transitionStackAction_ = [this]() {
-        // 退出旧场景
-        auto outgoing = outgoingScene_;
-        if (!sceneStack_.empty() && outgoing && sceneStack_.top() == outgoing) {
-            outgoing->onExit();
-            outgoing->onDetachFromScene();
-            sceneStack_.pop();
-        }
-        // 推入新场景并调用 onEnter
-        auto incoming = incomingScene_;
-        if (incoming) {
-            sceneStack_.push(incoming);
-            if (!incoming->isRunning()) {
-                incoming->onEnter();
-                incoming->onAttachToScene(incoming.get());
-            }
-        }
-    };
-    // 注意：不在此处调用新场景的 onEnter，由 transitionStackAction_ 在过渡完成后调用
-}
-
-void SceneManager::replaceScene(Ptr<Scene> scene, TransitionType transition, float duration) {
-    if (!scene || isTransitioning_) {
-        return;
-    }
-
-    if (sceneStack_.empty()) {
-        runWithScene(scene);
-        return;
-    }
-
-    auto oldScene = sceneStack_.top();
-
-    startTransition(oldScene, scene, transition, duration, [this]() {
-        // 过渡完成后，退出旧场景并从堆栈中移除
-        auto outgoing = outgoingScene_;
-        auto incoming = incomingScene_;
-        if (!sceneStack_.empty() && outgoing && sceneStack_.top() == outgoing) {
-            outgoing->onExit();
-            outgoing->onDetachFromScene();
-            sceneStack_.pop();
-        }
-        // 将新场景推入堆栈并调用 onEnter
-        if (incoming) {
-            sceneStack_.push(incoming);
-            if (!incoming->isRunning()) {
-                incoming->onEnter();
-                incoming->onAttachToScene(incoming.get());
-            }
-        }
-    });
-}
-
-void SceneManager::pushScene(Ptr<Scene> scene) {
-    if (!scene || isTransitioning_) {
-        return;
-    }
-    
-    // Pause current scene
-    if (!sceneStack_.empty()) {
-        sceneStack_.top()->pause();
-    }
-    
-    // Push new scene
-    scene->onEnter();
-    scene->onAttachToScene(scene.get());
-    sceneStack_.push(scene);
-}
-
-void SceneManager::pushScene(Ptr<Scene> scene, TransitionType transition, float duration) {
-    if (!scene || isTransitioning_) {
-        return;
-    }
-
-    if (sceneStack_.empty()) {
-        runWithScene(scene);
-        return;
-    }
-
-    // 暂停当前场景
-    sceneStack_.top()->pause();
-
-    auto currentScene = sceneStack_.top();
-
-    startTransition(currentScene, scene, transition, duration, [this]() {
-        // 过渡完成后，将新场景推入堆栈并调用 onEnter
-        if (incomingScene_) {
-            sceneStack_.push(incomingScene_);
-            if (!incomingScene_->isRunning()) {
-                incomingScene_->onEnter();
-                incomingScene_->onAttachToScene(incomingScene_.get());
-            }
-        }
-    });
-}
-
-void SceneManager::popScene() {
-    if (sceneStack_.size() <= 1 || isTransitioning_) {
-        return;
-    }
-    
-    auto current = sceneStack_.top();
-    current->onExit();
-    current->onDetachFromScene();
-    sceneStack_.pop();
-    
-    // Resume previous scene
-    if (!sceneStack_.empty()) {
-        sceneStack_.top()->resume();
-    }
-}
-
-void SceneManager::popScene(TransitionType transition, float duration) {
-    if (sceneStack_.size() <= 1 || isTransitioning_) {
-        return;
-    }
-
-    auto current = sceneStack_.top();
-    auto previous = getPreviousScene();
-
-    startTransition(current, previous, transition, duration, [this]() {
-        // 过渡完成后，退出当前场景并从堆栈中移除
-        auto outgoing = outgoingScene_;
-        if (!sceneStack_.empty() && outgoing && sceneStack_.top() == outgoing) {
-            outgoing->onExit();
-            outgoing->onDetachFromScene();
-            sceneStack_.pop();
-        }
-        // 恢复前一个场景
-        auto incoming = incomingScene_;
-        if (!sceneStack_.empty() && incoming && sceneStack_.top() == incoming) {
-            if (!incoming->isRunning()) {
-                incoming->onEnter();
-                incoming->onAttachToScene(incoming.get());
-            }
-            incoming->resume();
-        }
-    });
-}
-
-void SceneManager::popToRootScene() {
-    if (sceneStack_.size() <= 1 || isTransitioning_) {
-        return;
-    }
-    
-    // Exit all scenes except root
-    while (sceneStack_.size() > 1) {
-        auto scene = sceneStack_.top();
-        scene->onExit();
-        scene->onDetachFromScene();
-        sceneStack_.pop();
-    }
-    
-    // Resume root
-    sceneStack_.top()->resume();
-}
-
-void SceneManager::popToRootScene(TransitionType transition, float duration) {
-    if (sceneStack_.size() <= 1 || isTransitioning_) {
-        return;
-    }
-
-    auto root = getRootScene();
-    auto current = sceneStack_.top();
-
-    startTransition(current, root, transition, duration, [this, root]() {
-        // 退出所有场景直到根场景
-        while (!sceneStack_.empty() && sceneStack_.top() != root) {
-            auto scene = sceneStack_.top();
-            scene->onExit();
-            scene->onDetachFromScene();
-            sceneStack_.pop();
-        }
-        // 恢复根场景
-        if (!sceneStack_.empty() && sceneStack_.top() == root) {
-            if (!root->isRunning()) {
-                root->onEnter();
-                root->onAttachToScene(root.get());
-            }
-            root->resume();
-        }
-    });
-}
-
-void SceneManager::popToScene(const std::string& name) {
-    if (isTransitioning_) {
-        return;
-    }
-    
-    // Find target scene in stack
-    std::stack<Ptr<Scene>> tempStack;
-    Ptr<Scene> target = nullptr;
-    
-    while (!sceneStack_.empty()) {
-        auto scene = sceneStack_.top();
-        if (scene->getName() == name) {
-            target = scene;
-            break;
-        }
-        scene->onExit();
-        scene->onDetachFromScene();
-        sceneStack_.pop();
-    }
-    
-    if (target) {
-        target->resume();
-    }
-}
-
-void SceneManager::popToScene(const std::string& name, TransitionType transition, float duration) {
-    if (isTransitioning_) {
-        return;
-    }
-
-    auto target = getSceneByName(name);
-    if (target && target != sceneStack_.top()) {
-        auto current = sceneStack_.top();
-
-        startTransition(current, target, transition, duration, [this, target]() {
-            // 退出所有场景直到目标场景
-            while (!sceneStack_.empty() && sceneStack_.top() != target) {
-                auto scene = sceneStack_.top();
-                scene->onExit();
-                scene->onDetachFromScene();
-                sceneStack_.pop();
-            }
-            // 恢复目标场景
-            if (!sceneStack_.empty() && sceneStack_.top() == target) {
-                if (!target->isRunning()) {
-                    target->onEnter();
-                    target->onAttachToScene(target.get());
-                }
-                target->resume();
-            }
-        });
-    }
-}
-
-Ptr<Scene> SceneManager::getCurrentScene() const {
-    if (sceneStack_.empty()) {
-        return nullptr;
-    }
-    return sceneStack_.top();
-}
-
-Ptr<Scene> SceneManager::getPreviousScene() const {
-    if (sceneStack_.size() < 2) {
-        return nullptr;
-    }
-    
-    // Copy stack to access second top
-    auto tempStack = sceneStack_;
-    tempStack.pop();
-    return tempStack.top();
-}
-
-Ptr<Scene> SceneManager::getRootScene() const {
-    if (sceneStack_.empty()) {
-        return nullptr;
-    }
-    
-    // Copy stack to access bottom
-    auto tempStack = sceneStack_;
-    Ptr<Scene> root;
-    while (!tempStack.empty()) {
-        root = tempStack.top();
-        tempStack.pop();
-    }
-    return root;
-}
-
-Ptr<Scene> SceneManager::getSceneByName(const std::string& name) const {
-    auto it = namedScenes_.find(name);
-    if (it != namedScenes_.end()) {
-        return it->second;
-    }
-    
-    // Search in stack
-    auto tempStack = sceneStack_;
-    while (!tempStack.empty()) {
-        auto scene = tempStack.top();
-        if (scene->getName() == name) {
-            return scene;
-        }
-        tempStack.pop();
-    }
-    
-    return nullptr;
-}
-
-bool SceneManager::hasScene(const std::string& name) const {
-    return getSceneByName(name) != nullptr;
-}
-
-void SceneManager::update(float dt) {
-    if (isTransitioning_) {
-        updateTransition(dt);
-        hoverTarget_ = nullptr;
-        captureTarget_ = nullptr;
-        hasLastPointerWorld_ = false;
-    }
-    
-    if (!sceneStack_.empty()) {
-        auto& scene = *sceneStack_.top();
-        scene.updateScene(dt);
-        if (!isTransitioning_) {
-            dispatchPointerEvents(scene);
-        }
-    }
-}
-
-void SceneManager::render(RenderBackend& renderer) {
-    Color clearColor = Colors::Black;
-    if (isTransitioning_) {
-        if (outgoingScene_) {
-            clearColor = outgoingScene_->getBackgroundColor();
-        } else if (incomingScene_) {
-            clearColor = incomingScene_->getBackgroundColor();
-        }
-    } else if (!sceneStack_.empty()) {
-        clearColor = sceneStack_.top()->getBackgroundColor();
-    }
-
-    E2D_LOG_TRACE("SceneManager::render - beginFrame with color({}, {}, {})", 
-                  clearColor.r, clearColor.g, clearColor.b);
-    renderer.beginFrame(clearColor);
-    
-    if (isTransitioning_ && activeTransition_) {
-        E2D_LOG_TRACE("SceneManager::render - rendering transition");
-        activeTransition_->render(renderer);
-    } else if (!sceneStack_.empty()) {
-        E2D_LOG_TRACE("SceneManager::render - rendering scene content");
-        sceneStack_.top()->renderContent(renderer);
-    } else {
-        E2D_LOG_WARN("SceneManager::render - no scene to render");
-    }
-    
-    renderer.endFrame();
-    E2D_LOG_TRACE("SceneManager::render - endFrame");
-}
-
-void SceneManager::collectRenderCommands(std::vector<RenderCommand>& commands) {
-    if (isTransitioning_ && outgoingScene_) {
-        // During transition, collect commands from both scenes
-        outgoingScene_->collectRenderCommands(commands);
-        if (incomingScene_) {
-            incomingScene_->collectRenderCommands(commands);
-        }
-    } else if (!sceneStack_.empty()) {
-        sceneStack_.top()->collectRenderCommands(commands);
-    }
-}
-
-void SceneManager::end() {
-    while (!sceneStack_.empty()) {
-        auto scene = sceneStack_.top();
-        scene->onExit();
-        scene->onDetachFromScene();
-        sceneStack_.pop();
-    }
-    namedScenes_.clear();
-}
-
-void SceneManager::purgeCachedScenes() {
-    namedScenes_.clear();
-}
-
-void SceneManager::startTransition(Ptr<Scene> from, Ptr<Scene> to, TransitionType type, float duration, Function<void()> stackAction) {
-    if (!from || !to) {
-        return;
-    }
-
-    Ptr<Transition> transition;
-    switch (type) {
-        case TransitionType::Fade:
-            transition = makePtr<FadeTransition>(duration);
-            break;
-        case TransitionType::SlideLeft:
-            transition = makePtr<SlideTransition>(duration, TransitionDirection::Left);
-            break;
-        case TransitionType::SlideRight:
-            transition = makePtr<SlideTransition>(duration, TransitionDirection::Right);
-            break;
-        case TransitionType::SlideUp:
-            transition = makePtr<SlideTransition>(duration, TransitionDirection::Up);
-            break;
-        case TransitionType::SlideDown:
-            transition = makePtr<SlideTransition>(duration, TransitionDirection::Down);
-            break;
-        case TransitionType::Scale:
-            transition = makePtr<ScaleTransition>(duration);
-            break;
-        case TransitionType::Flip:
-            transition = makePtr<FlipTransition>(duration);
-            break;
-        default:
-            transition = makePtr<FadeTransition>(duration);
-            break;
-    }
-
-    transition->start(from, to);
-
-    // 在过渡开始前，发送 UIHoverExit 给当前悬停的节点，重置按钮状态
-    if (hoverTarget_) {
-        Event evt;
-        evt.type = EventType::UIHoverExit;
-        evt.data = CustomEvent{0, hoverTarget_};
-        dispatchToNode(hoverTarget_, evt);
-        hoverTarget_ = nullptr;
-    }
-    captureTarget_ = nullptr;
-    hasLastPointerWorld_ = false;
-
-    isTransitioning_ = true;
-    currentTransition_ = type;
-    transitionDuration_ = duration;
-    transitionElapsed_ = 0.0f;
-    outgoingScene_ = from;
-    incomingScene_ = to;
-    activeTransition_ = transition;
-    transitionStackAction_ = std::move(stackAction);
-
-    // 注意：不在此处调用新场景的 onEnter，由 transitionStackAction_ 在过渡完成后调用
-}
-
-void SceneManager::updateTransition(float dt) {
-    transitionElapsed_ += dt;
-
-    if (activeTransition_) {
-        activeTransition_->update(dt);
-        if (activeTransition_->isFinished()) {
-            finishTransition();
-        }
-    } else {
-        finishTransition();
-    }
-}
-
-void SceneManager::finishTransition() {
-    // 先保存当前悬停的节点，然后在 transitionStackAction_ 之后发送 UIHoverExit
-    Node* lastHoverTarget = hoverTarget_;
-
-    isTransitioning_ = false;
-    hoverTarget_ = nullptr;
-    captureTarget_ = nullptr;
-    hasLastPointerWorld_ = false;
-
-    if (transitionStackAction_) {
-        transitionStackAction_();
-    }
-
-    // 在 transitionStackAction_ 之后发送 UIHoverExit，确保旧场景仍然有效
-    if (lastHoverTarget) {
-        Event evt;
-        evt.type = EventType::UIHoverExit;
-        evt.data = CustomEvent{0, lastHoverTarget};
-        dispatchToNode(lastHoverTarget, evt);
-    }
-
-    outgoingScene_.reset();
-    incomingScene_.reset();
-    activeTransition_.reset();
-    transitionStackAction_ = nullptr;
-    
-    if (transitionCallback_) {
-        transitionCallback_();
-        transitionCallback_ = nullptr;
-    }
-}
-
-void SceneManager::dispatchPointerEvents(Scene& scene) {
-    auto& input = Application::instance().input();
-    Vec2 screenPos = input.getMousePosition();
-
-    Vec2 worldPos = screenPos;
-    if (auto* camera = scene.getActiveCamera()) {
-        worldPos = camera->screenToWorld(screenPos);
-    }
-
-    Ptr<Node> root = scene.shared_from_this();
-    Node* newHover = hitTestTopmost(root, worldPos);
-
-    if (newHover != hoverTarget_) {
-        if (hoverTarget_) {
-            Event evt;
-            evt.type = EventType::UIHoverExit;
-            evt.data = CustomEvent{0, hoverTarget_};
-            dispatchToNode(hoverTarget_, evt);
-        }
-        hoverTarget_ = newHover;
-        if (hoverTarget_) {
-            Event evt;
-            evt.type = EventType::UIHoverEnter;
-            evt.data = CustomEvent{0, hoverTarget_};
-            dispatchToNode(hoverTarget_, evt);
-        }
-    }
-
-    if (!hasLastPointerWorld_) {
-        lastPointerWorld_ = worldPos;
-        hasLastPointerWorld_ = true;
-    }
-
-    Vec2 delta = worldPos - lastPointerWorld_;
-    if (hoverTarget_ && (delta.x != 0.0f || delta.y != 0.0f)) {
-        Event evt = Event::createMouseMove(worldPos, delta);
-        dispatchToNode(hoverTarget_, evt);
-    }
-
-    float scrollDelta = input.getMouseScrollDelta();
-    if (hoverTarget_ && scrollDelta != 0.0f) {
-        Event evt = Event::createMouseScroll(Vec2(0.0f, scrollDelta), worldPos);
-        dispatchToNode(hoverTarget_, evt);
-    }
-
-    if (input.isMousePressed(MouseButton::Left)) {
-        captureTarget_ = hoverTarget_;
-        if (captureTarget_) {
-            Event evt = Event::createMouseButtonPress(static_cast<int>(MouseButton::Left), 0, worldPos);
-            dispatchToNode(captureTarget_, evt);
-
-            Event pressed;
-            pressed.type = EventType::UIPressed;
-            pressed.data = CustomEvent{0, captureTarget_};
-            dispatchToNode(captureTarget_, pressed);
-        }
-    }
-
-    if (input.isMouseReleased(MouseButton::Left)) {
-        Node* target = captureTarget_ ? captureTarget_ : hoverTarget_;
-        if (target) {
-            Event evt = Event::createMouseButtonRelease(static_cast<int>(MouseButton::Left), 0, worldPos);
-            dispatchToNode(target, evt);
-
-            Event released;
-            released.type = EventType::UIReleased;
-            released.data = CustomEvent{0, target};
-            dispatchToNode(target, released);
-        }
-
-        if (captureTarget_ && captureTarget_ == hoverTarget_) {
-            Event clicked;
-            clicked.type = EventType::UIClicked;
-            clicked.data = CustomEvent{0, captureTarget_};
-            dispatchToNode(captureTarget_, clicked);
-        }
-
-        captureTarget_ = nullptr;
-    }
-
-    lastPointerWorld_ = worldPos;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/shape_node.cpp b/Easy2D/src/scene/shape_node.cpp
deleted file mode 100644
index 3346a65..0000000
--- a/Easy2D/src/scene/shape_node.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-#include <easy2d/scene/shape_node.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/render_command.h>
-#include <algorithm>
-#include <cmath>
-#include <limits>
-
-namespace easy2d {
-
-ShapeNode::ShapeNode() = default;
-
-Ptr<ShapeNode> ShapeNode::create() {
-    return makePtr<ShapeNode>();
-}
-
-Ptr<ShapeNode> ShapeNode::createPoint(const Vec2& pos, const Color& color) {
-    auto node = makePtr<ShapeNode>();
-    node->shapeType_ = ShapeType::Point;
-    node->color_ = color;
-    node->points_ = {pos};
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createLine(const Vec2& start, const Vec2& end, 
-                                     const Color& color, float width) {
-    auto node = makePtr<ShapeNode>();
-    node->shapeType_ = ShapeType::Line;
-    node->color_ = color;
-    node->lineWidth_ = width;
-    node->points_ = {start, end};
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createRect(const Rect& rect, const Color& color, float width) {
-    auto node = makePtr<ShapeNode>();
-    node->shapeType_ = ShapeType::Rect;
-    node->color_ = color;
-    node->lineWidth_ = width;
-    node->filled_ = false;
-    node->points_ = {
-        Vec2(rect.left(), rect.top()),
-        Vec2(rect.right(), rect.top()),
-        Vec2(rect.right(), rect.bottom()),
-        Vec2(rect.left(), rect.bottom())
-    };
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createFilledRect(const Rect& rect, const Color& color) {
-    auto node = createRect(rect, color, 0);
-    node->filled_ = true;
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createCircle(const Vec2& center, float radius, 
-                                       const Color& color, int segments, float width) {
-    auto node = makePtr<ShapeNode>();
-    node->shapeType_ = ShapeType::Circle;
-    node->color_ = color;
-    node->lineWidth_ = width;
-    node->segments_ = segments;
-    node->filled_ = false;
-    node->points_ = {center};
-    // Store radius in a point for simplicity
-    node->addPoint(Vec2(radius, 0));
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createFilledCircle(const Vec2& center, float radius, 
-                                             const Color& color, int segments) {
-    auto node = createCircle(center, radius, color, segments, 0);
-    node->filled_ = true;
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3,
-                                         const Color& color, float width) {
-    auto node = makePtr<ShapeNode>();
-    node->shapeType_ = ShapeType::Triangle;
-    node->color_ = color;
-    node->lineWidth_ = width;
-    node->filled_ = false;
-    node->points_ = {p1, p2, p3};
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createFilledTriangle(const Vec2& p1, const Vec2& p2, const Vec2& p3,
-                                               const Color& color) {
-    auto node = createTriangle(p1, p2, p3, color, 0);
-    node->filled_ = true;
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createPolygon(const std::vector<Vec2>& points,
-                                        const Color& color, float width) {
-    auto node = makePtr<ShapeNode>();
-    node->shapeType_ = ShapeType::Polygon;
-    node->color_ = color;
-    node->lineWidth_ = width;
-    node->filled_ = false;
-    node->points_ = points;
-    return node;
-}
-
-Ptr<ShapeNode> ShapeNode::createFilledPolygon(const std::vector<Vec2>& points,
-                                              const Color& color) {
-    auto node = createPolygon(points, color, 0);
-    node->filled_ = true;
-    return node;
-}
-
-void ShapeNode::setPoints(const std::vector<Vec2>& points) {
-    points_ = points;
-    updateSpatialIndex();
-}
-
-void ShapeNode::addPoint(const Vec2& point) {
-    points_.push_back(point);
-    updateSpatialIndex();
-}
-
-void ShapeNode::clearPoints() {
-    points_.clear();
-    updateSpatialIndex();
-}
-
-Rect ShapeNode::getBoundingBox() const {
-    if (points_.empty()) {
-        return Rect();
-    }
-
-    Vec2 offset = getPosition();
-
-    if (shapeType_ == ShapeType::Circle && points_.size() >= 2) {
-        float radius = std::abs(points_[1].x);
-        Vec2 center = points_[0] + offset;
-        return Rect(center.x - radius, center.y - radius, radius * 2.0f, radius * 2.0f);
-    }
-
-    float minX = std::numeric_limits<float>::infinity();
-    float minY = std::numeric_limits<float>::infinity();
-    float maxX = -std::numeric_limits<float>::infinity();
-    float maxY = -std::numeric_limits<float>::infinity();
-
-    for (const auto& p : points_) {
-        Vec2 world = p + offset;
-        minX = std::min(minX, world.x);
-        minY = std::min(minY, world.y);
-        maxX = std::max(maxX, world.x);
-        maxY = std::max(maxY, world.y);
-    }
-
-    float inflate = 0.0f;
-    if (!filled_ && (shapeType_ == ShapeType::Line || shapeType_ == ShapeType::Rect || shapeType_ == ShapeType::Triangle || shapeType_ == ShapeType::Polygon || shapeType_ == ShapeType::Point)) {
-        inflate = std::max(0.0f, lineWidth_ * 0.5f);
-    }
-    if (shapeType_ == ShapeType::Point) {
-        inflate = std::max(inflate, lineWidth_ * 0.5f);
-    }
-
-    return Rect(minX - inflate, minY - inflate, (maxX - minX) + inflate * 2.0f, (maxY - minY) + inflate * 2.0f);
-}
-
-void ShapeNode::onDraw(RenderBackend& renderer) {
-    if (points_.empty()) {
-        return;
-    }
-    
-    Vec2 offset = getPosition();
-    
-    switch (shapeType_) {
-        case ShapeType::Point:
-            if (!points_.empty()) {
-                renderer.fillCircle(points_[0] + offset, lineWidth_ * 0.5f, color_, 8);
-            }
-            break;
-            
-        case ShapeType::Line:
-            if (points_.size() >= 2) {
-                renderer.drawLine(points_[0] + offset, points_[1] + offset, color_, lineWidth_);
-            }
-            break;
-            
-        case ShapeType::Rect:
-            if (points_.size() >= 4) {
-                if (filled_) {
-                    Rect rect(points_[0].x, points_[0].y, 
-                             points_[2].x - points_[0].x, 
-                             points_[2].y - points_[0].y);
-                    renderer.fillRect(Rect(rect.origin + offset, rect.size), color_);
-                } else {
-                    for (size_t i = 0; i < points_.size(); ++i) {
-                        Vec2 start = points_[i] + offset;
-                        Vec2 end = points_[(i + 1) % points_.size()] + offset;
-                        renderer.drawLine(start, end, color_, lineWidth_);
-                    }
-                }
-            }
-            break;
-            
-        case ShapeType::Circle:
-            if (points_.size() >= 2) {
-                float radius = points_[1].x;
-                if (filled_) {
-                    renderer.fillCircle(points_[0] + offset, radius, color_, segments_);
-                } else {
-                    renderer.drawCircle(points_[0] + offset, radius, color_, segments_, lineWidth_);
-                }
-            }
-            break;
-            
-        case ShapeType::Triangle:
-            if (points_.size() >= 3) {
-                Vec2 p1 = points_[0] + offset;
-                Vec2 p2 = points_[1] + offset;
-                Vec2 p3 = points_[2] + offset;
-                if (filled_) {
-                    renderer.fillTriangle(p1, p2, p3, color_);
-                } else {
-                    renderer.drawLine(p1, p2, color_, lineWidth_);
-                    renderer.drawLine(p2, p3, color_, lineWidth_);
-                    renderer.drawLine(p3, p1, color_, lineWidth_);
-                }
-            }
-            break;
-            
-        case ShapeType::Polygon:
-            if (!points_.empty()) {
-                std::vector<Vec2> transformedPoints;
-                transformedPoints.reserve(points_.size());
-                for (const auto& p : points_) {
-                    transformedPoints.push_back(p + offset);
-                }
-                
-                if (filled_) {
-                    renderer.fillPolygon(transformedPoints, color_);
-                } else {
-                    renderer.drawPolygon(transformedPoints, color_, lineWidth_);
-                }
-            }
-            break;
-    }
-}
-
-void ShapeNode::generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) {
-    if (points_.empty()) {
-        return;
-    }
-
-    Vec2 offset = getPosition();
-    RenderCommand cmd;
-    cmd.zOrder = zOrder;
-
-    switch (shapeType_) {
-        case ShapeType::Point:
-            if (!points_.empty()) {
-                cmd.type = RenderCommandType::FilledCircle;
-                cmd.data = CircleData{
-                    points_[0] + offset,
-                    lineWidth_ * 0.5f,
-                    color_,
-                    8,
-                    0.0f
-                };
-            }
-            break;
-
-        case ShapeType::Line:
-            if (points_.size() >= 2) {
-                cmd.type = RenderCommandType::Line;
-                cmd.data = LineData{
-                    points_[0] + offset,
-                    points_[1] + offset,
-                    color_,
-                    lineWidth_
-                };
-            }
-            break;
-
-        case ShapeType::Rect:
-            if (points_.size() >= 4) {
-                if (filled_) {
-                    cmd.type = RenderCommandType::FilledRect;
-                    Rect rect(points_[0].x, points_[0].y,
-                             points_[2].x - points_[0].x,
-                             points_[2].y - points_[0].y);
-                    cmd.data = RectData{
-                        Rect(rect.origin + offset, rect.size),
-                        color_,
-                        0.0f
-                    };
-                } else {
-                    cmd.type = RenderCommandType::Rect;
-                    Rect rect(points_[0].x, points_[0].y,
-                             points_[2].x - points_[0].x,
-                             points_[2].y - points_[0].y);
-                    cmd.data = RectData{
-                        Rect(rect.origin + offset, rect.size),
-                        color_,
-                        lineWidth_
-                    };
-                }
-            }
-            break;
-
-        case ShapeType::Circle:
-            if (points_.size() >= 2) {
-                float radius = points_[1].x;
-                if (filled_) {
-                    cmd.type = RenderCommandType::FilledCircle;
-                    cmd.data = CircleData{
-                        points_[0] + offset,
-                        radius,
-                        color_,
-                        segments_,
-                        0.0f
-                    };
-                } else {
-                    cmd.type = RenderCommandType::Circle;
-                    cmd.data = CircleData{
-                        points_[0] + offset,
-                        radius,
-                        color_,
-                        segments_,
-                        lineWidth_
-                    };
-                }
-            }
-            break;
-
-        case ShapeType::Triangle:
-            if (points_.size() >= 3) {
-                Vec2 p1 = points_[0] + offset;
-                Vec2 p2 = points_[1] + offset;
-                Vec2 p3 = points_[2] + offset;
-                if (filled_) {
-                    cmd.type = RenderCommandType::FilledTriangle;
-                    cmd.data = TriangleData{
-                        p1, p2, p3,
-                        color_,
-                        0.0f
-                    };
-                } else {
-                    cmd.type = RenderCommandType::Triangle;
-                    cmd.data = TriangleData{
-                        p1, p2, p3,
-                        color_,
-                        lineWidth_
-                    };
-                }
-            }
-            break;
-
-        case ShapeType::Polygon:
-            if (!points_.empty()) {
-                std::vector<Vec2> transformedPoints;
-                transformedPoints.reserve(points_.size());
-                for (const auto& p : points_) {
-                    transformedPoints.push_back(p + offset);
-                }
-
-                if (filled_) {
-                    cmd.type = RenderCommandType::FilledPolygon;
-                    cmd.data = PolygonData{
-                        transformedPoints,
-                        color_,
-                        0.0f
-                    };
-                } else {
-                    cmd.type = RenderCommandType::Polygon;
-                    cmd.data = PolygonData{
-                        transformedPoints,
-                        color_,
-                        lineWidth_
-                    };
-                }
-            }
-            break;
-    }
-
-    commands.push_back(std::move(cmd));
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/sprite.cpp b/Easy2D/src/scene/sprite.cpp
deleted file mode 100644
index c0b694d..0000000
--- a/Easy2D/src/scene/sprite.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <easy2d/scene/sprite.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/render_command.h>
-#include <algorithm>
-#include <cmath>
-
-namespace easy2d {
-
-Sprite::Sprite() = default;
-
-Sprite::Sprite(Ptr<Texture> texture) {
-    setTexture(texture);
-}
-
-void Sprite::setTexture(Ptr<Texture> texture) {
-    texture_ = texture;
-    if (texture_) {
-        textureRect_ = Rect(0, 0, static_cast<float>(texture_->getWidth()), static_cast<float>(texture_->getHeight()));
-    }
-    updateSpatialIndex();
-}
-
-void Sprite::setTextureRect(const Rect& rect) {
-    textureRect_ = rect;
-    updateSpatialIndex();
-}
-
-void Sprite::setColor(const Color& color) {
-    color_ = color;
-}
-
-void Sprite::setFlipX(bool flip) {
-    flipX_ = flip;
-}
-
-void Sprite::setFlipY(bool flip) {
-    flipY_ = flip;
-}
-
-Ptr<Sprite> Sprite::create() {
-    return makePtr<Sprite>();
-}
-
-Ptr<Sprite> Sprite::create(Ptr<Texture> texture) {
-    return makePtr<Sprite>(texture);
-}
-
-Ptr<Sprite> Sprite::create(Ptr<Texture> texture, const Rect& rect) {
-    auto sprite = makePtr<Sprite>(texture);
-    sprite->setTextureRect(rect);
-    return sprite;
-}
-
-Rect Sprite::getBoundingBox() const {
-    if (!texture_ || !texture_->isValid()) {
-        return Rect();
-    }
-
-    float width = textureRect_.width();
-    float height = textureRect_.height();
-
-    auto pos = getPosition();
-    auto anchor = getAnchor();
-    auto scale = getScale();
-
-    float w = width * scale.x;
-    float h = height * scale.y;
-    float x0 = pos.x - width * anchor.x * scale.x;
-    float y0 = pos.y - height * anchor.y * scale.y;
-    float x1 = x0 + w;
-    float y1 = y0 + h;
-
-    float l = std::min(x0, x1);
-    float t = std::min(y0, y1);
-    return Rect(l, t, std::abs(w), std::abs(h));
-}
-
-void Sprite::onDraw(RenderBackend& renderer) {
-    if (!texture_ || !texture_->isValid()) {
-        return;
-    }
-    
-    // Calculate destination rectangle based on texture rect
-    float width = textureRect_.width();
-    float height = textureRect_.height();
-    
-    auto pos = getPosition();
-    auto anchor = getAnchor();
-    auto scale = getScale();
-    Rect destRect(pos.x - width * anchor.x * scale.x, 
-                  pos.y - height * anchor.y * scale.y,
-                  width * scale.x, 
-                  height * scale.y);
-    
-    // Adjust source rect for flipping
-    Rect srcRect = textureRect_;
-    if (flipX_) {
-        srcRect.origin.x = srcRect.right();
-        srcRect.size.width = -srcRect.size.width;
-    }
-    if (flipY_) {
-        srcRect.origin.y = srcRect.bottom();
-        srcRect.size.height = -srcRect.size.height;
-    }
-    
-    renderer.drawSprite(*texture_, destRect, srcRect, color_, getRotation(), getAnchor());
-}
-
-void Sprite::generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) {
-    if (!texture_ || !texture_->isValid()) {
-        return;
-    }
-
-    // 计算目标矩形（与 onDraw 一致）
-    float width = textureRect_.width();
-    float height = textureRect_.height();
-
-    auto pos = getPosition();
-    auto anchor = getAnchor();
-    auto scale = getScale();
-    Rect destRect(pos.x - width * anchor.x * scale.x,
-                  pos.y - height * anchor.y * scale.y,
-                  width * scale.x,
-                  height * scale.y);
-
-    // 调整源矩形（翻转）
-    Rect srcRect = textureRect_;
-    if (flipX_) {
-        srcRect.origin.x = srcRect.right();
-        srcRect.size.width = -srcRect.size.width;
-    }
-    if (flipY_) {
-        srcRect.origin.y = srcRect.bottom();
-        srcRect.size.height = -srcRect.size.height;
-    }
-
-    // 创建渲染命令
-    RenderCommand cmd;
-    cmd.type = RenderCommandType::Sprite;
-    cmd.zOrder = zOrder;
-    cmd.data = SpriteData{
-        texture_,
-        destRect,
-        srcRect,
-        color_,
-        getRotation(),
-        anchor
-    };
-
-    commands.push_back(std::move(cmd));
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/text.cpp b/Easy2D/src/scene/text.cpp
deleted file mode 100644
index 00c8c96..0000000
--- a/Easy2D/src/scene/text.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include <easy2d/scene/text.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/render_command.h>
-
-namespace easy2d {
-
-Text::Text() {
-    // 文字默认锚点为左上角，这样setPosition(0, 0)会在左上角显示
-    setAnchor(0.0f, 0.0f);
-}
-
-Text::Text(const String& text) : text_(text) {
-    sizeDirty_ = true;
-    // 文字默认锚点为左上角，这样setPosition(0, 0)会在左上角显示
-    setAnchor(0.0f, 0.0f);
-}
-
-void Text::setText(const String& text) {
-    text_ = text;
-    sizeDirty_ = true;
-    updateSpatialIndex();
-}
-
-void Text::setFont(Ptr<FontAtlas> font) {
-    font_ = font;
-    sizeDirty_ = true;
-    updateSpatialIndex();
-}
-
-void Text::setTextColor(const Color& color) {
-    color_ = color;
-}
-
-void Text::setFontSize(int size) {
-    fontSize_ = size;
-    sizeDirty_ = true;
-    updateSpatialIndex();
-}
-
-void Text::setAlignment(Alignment align) {
-    alignment_ = align;
-    updateSpatialIndex();
-}
-
-Vec2 Text::getTextSize() const {
-    updateCache();
-    return cachedSize_;
-}
-
-float Text::getLineHeight() const {
-    if (font_) {
-        return font_->getLineHeight();
-    }
-    return static_cast<float>(fontSize_);
-}
-
-void Text::updateCache() const {
-    if (!sizeDirty_ || !font_) {
-        return;
-    }
-    
-    cachedSize_ = font_->measureText(text_);
-    sizeDirty_ = false;
-}
-
-Ptr<Text> Text::create() {
-    return makePtr<Text>();
-}
-
-Ptr<Text> Text::create(const String& text) {
-    return makePtr<Text>(text);
-}
-
-Ptr<Text> Text::create(const String& text, Ptr<FontAtlas> font) {
-    auto t = makePtr<Text>(text);
-    t->setFont(font);
-    return t;
-}
-
-Rect Text::getBoundingBox() const {
-    if (!font_ || text_.empty()) {
-        return Rect();
-    }
-
-    updateCache();
-    Vec2 size = cachedSize_;
-    if (size.x <= 0.0f || size.y <= 0.0f) {
-        return Rect();
-    }
-
-    Vec2 pos = getPosition();
-
-    if (alignment_ != Alignment::Left) {
-        if (alignment_ == Alignment::Center) {
-            pos.x -= size.x * 0.5f;
-        } else if (alignment_ == Alignment::Right) {
-            pos.x -= size.x;
-        }
-    }
-
-    return Rect(pos.x, pos.y, size.x, size.y);
-}
-
-void Text::onDraw(RenderBackend& renderer) {
-    if (!font_ || text_.empty()) {
-        return;
-    }
-    
-    Vec2 pos = getPosition();
-    
-    // Calculate horizontal offset based on alignment
-    if (alignment_ != Alignment::Left) {
-        Vec2 size = getTextSize();
-        if (alignment_ == Alignment::Center) {
-            pos.x -= size.x * 0.5f;
-        } else if (alignment_ == Alignment::Right) {
-            pos.x -= size.x;
-        }
-    }
-
-    renderer.drawText(*font_, text_, pos, color_);
-}
-
-void Text::generateRenderCommand(std::vector<RenderCommand>& commands, int zOrder) {
-    if (!font_ || text_.empty()) {
-        return;
-    }
-
-    Vec2 pos = getPosition();
-
-    // 计算对齐偏移（与 onDraw 一致）
-    if (alignment_ != Alignment::Left) {
-        Vec2 size = getTextSize();
-        if (alignment_ == Alignment::Center) {
-            pos.x -= size.x * 0.5f;
-        } else if (alignment_ == Alignment::Right) {
-            pos.x -= size.x;
-        }
-    }
-
-    // 创建渲染命令
-    RenderCommand cmd;
-    cmd.type = RenderCommandType::Text;
-    cmd.zOrder = zOrder;
-    cmd.data = TextData{
-        font_,
-        text_,
-        pos,
-        color_
-    };
-
-    commands.push_back(std::move(cmd));
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/scene/transition.cpp b/Easy2D/src/scene/transition.cpp
deleted file mode 100644
index 59719dd..0000000
--- a/Easy2D/src/scene/transition.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-#include <easy2d/scene/transition.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/camera.h>
-#include <easy2d/core/math_types.h>
-#include <glm/gtc/matrix_transform.hpp>
-#include <algorithm>
-
-namespace easy2d {
-
-// ============================================================================
-// 缓动函数
-// ============================================================================
-static float easeInOutQuad(float t) {
-    return t < 0.5f ? 2.0f * t * t : -1.0f + (4.0f - 2.0f * t) * t;
-}
-
-static float easeOutQuad(float t) {
-    return t * (2.0f - t);
-}
-
-// ============================================================================
-// Transition 基类
-// ============================================================================
-Transition::Transition(float duration)
-    : duration_(duration)
-    , elapsed_(0.0f)
-    , progress_(0.0f)
-    , isFinished_(false)
-    , isStarted_(false) {
-}
-
-void Transition::start(Ptr<Scene> from, Ptr<Scene> to) {
-    outgoingScene_ = from;
-    incomingScene_ = to;
-    elapsed_ = 0.0f;
-    progress_ = 0.0f;
-    isFinished_ = false;
-    isStarted_ = true;
-}
-
-void Transition::update(float dt) {
-    if (!isStarted_ || isFinished_) {
-        return;
-    }
-    
-    elapsed_ += dt;
-    progress_ = duration_ > 0.0f 
-        ? std::min(1.0f, elapsed_ / duration_)
-        : 1.0f;
-    
-    if (progress_ >= 1.0f) {
-        onFinish();
-    }
-}
-
-void Transition::render(RenderBackend& renderer) {
-    if (!isStarted_ || isFinished_) {
-        return;
-    }
-    
-    onRenderTransition(renderer, easeInOutQuad(progress_));
-}
-
-float Transition::getFadeInAlpha() const {
-    return easeOutQuad(progress_);
-}
-
-float Transition::getFadeOutAlpha() const {
-    return 1.0f - easeOutQuad(progress_);
-}
-
-void Transition::onFinish() {
-    isFinished_ = true;
-    if (finishCallback_) {
-        finishCallback_();
-    }
-}
-
-// ============================================================================
-// FadeTransition - 淡入淡出
-// ============================================================================
-FadeTransition::FadeTransition(float duration)
-    : Transition(duration) {
-}
-
-void FadeTransition::onRenderTransition(RenderBackend& renderer, float progress) {
-    float screenWidth = 800.0f;
-    float screenHeight = 600.0f;
-
-    if (outgoingScene_) {
-        Size viewportSize = outgoingScene_->getViewportSize();
-        if (viewportSize.width > 0 && viewportSize.height > 0) {
-            screenWidth = viewportSize.width;
-            screenHeight = viewportSize.height;
-        }
-    } else if (incomingScene_) {
-        Size viewportSize = incomingScene_->getViewportSize();
-        if (viewportSize.width > 0 && viewportSize.height > 0) {
-            screenWidth = viewportSize.width;
-            screenHeight = viewportSize.height;
-        }
-    }
-
-    glm::mat4 overlayVP = glm::ortho(0.0f, screenWidth, screenHeight, 0.0f, -1.0f, 1.0f);
-
-    if (progress < 0.5f) {
-        if (outgoingScene_) {
-            outgoingScene_->renderContent(renderer);
-        }
-        float a = std::clamp(progress * 2.0f, 0.0f, 1.0f);
-        renderer.setViewProjection(overlayVP);
-        renderer.fillRect(Rect(0.0f, 0.0f, screenWidth, screenHeight), Color(0.0f, 0.0f, 0.0f, a));
-    } else {
-        if (incomingScene_) {
-            incomingScene_->renderContent(renderer);
-        }
-        float a = std::clamp((1.0f - progress) * 2.0f, 0.0f, 1.0f);
-        renderer.setViewProjection(overlayVP);
-        renderer.fillRect(Rect(0.0f, 0.0f, screenWidth, screenHeight), Color(0.0f, 0.0f, 0.0f, a));
-    }
-}
-
-// ============================================================================
-// SlideTransition - 滑动
-// ============================================================================
-SlideTransition::SlideTransition(float duration, TransitionDirection direction)
-    : Transition(duration)
-    , direction_(direction) {
-}
-
-void SlideTransition::onRenderTransition(RenderBackend& renderer, float progress) {
-    // 获取视口尺寸
-    float screenWidth = 800.0f;
-    float screenHeight = 600.0f;
-    
-    if (outgoingScene_) {
-        Size viewportSize = outgoingScene_->getViewportSize();
-        if (viewportSize.width > 0 && viewportSize.height > 0) {
-            screenWidth = viewportSize.width;
-            screenHeight = viewportSize.height;
-        }
-    } else if (incomingScene_) {
-        Size viewportSize = incomingScene_->getViewportSize();
-        if (viewportSize.width > 0 && viewportSize.height > 0) {
-            screenWidth = viewportSize.width;
-            screenHeight = viewportSize.height;
-        }
-    }
-    
-    // 渲染源场景（滑出）
-    if (outgoingScene_) {
-        float offsetX = 0.0f;
-        float offsetY = 0.0f;
-        
-        switch (direction_) {
-            case TransitionDirection::Left:
-                offsetX = -screenWidth * progress;
-                break;
-            case TransitionDirection::Right:
-                offsetX = screenWidth * progress;
-                break;
-            case TransitionDirection::Up:
-                offsetY = -screenHeight * progress;
-                break;
-            case TransitionDirection::Down:
-                offsetY = screenHeight * progress;
-                break;
-        }
-        
-        // 保存原始相机位置
-        Camera* camera = outgoingScene_->getActiveCamera();
-        Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
-        
-        // 应用偏移
-        if (camera) {
-            camera->setPosition(originalPos.x + offsetX, originalPos.y + offsetY);
-        }
-        
-        // 渲染场景
-        outgoingScene_->renderContent(renderer);
-        
-        // 恢复相机位置
-        if (camera) {
-            camera->setPosition(originalPos);
-        }
-    }
-    
-    // 渲染目标场景（滑入）
-    if (incomingScene_) {
-        float offsetX = 0.0f;
-        float offsetY = 0.0f;
-        
-        switch (direction_) {
-            case TransitionDirection::Left:
-                offsetX = screenWidth * (1.0f - progress);
-                break;
-            case TransitionDirection::Right:
-                offsetX = -screenWidth * (1.0f - progress);
-                break;
-            case TransitionDirection::Up:
-                offsetY = screenHeight * (1.0f - progress);
-                break;
-            case TransitionDirection::Down:
-                offsetY = -screenHeight * (1.0f - progress);
-                break;
-        }
-        
-        // 保存原始相机位置
-        Camera* camera = incomingScene_->getActiveCamera();
-        Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
-        
-        // 应用偏移
-        if (camera) {
-            camera->setPosition(originalPos.x + offsetX, originalPos.y + offsetY);
-        }
-        
-        // 渲染场景
-        incomingScene_->renderContent(renderer);
-        
-        // 恢复相机位置
-        if (camera) {
-            camera->setPosition(originalPos);
-        }
-    }
-}
-
-// ============================================================================
-// ScaleTransition - 缩放
-// ============================================================================
-ScaleTransition::ScaleTransition(float duration)
-    : Transition(duration) {
-}
-
-void ScaleTransition::onRenderTransition(RenderBackend& renderer, float progress) {
-    // 源场景：缩小消失
-    if (outgoingScene_) {
-        float scale = std::max(0.01f, 1.0f - progress);
-        
-        // 保存原始相机状态
-        Camera* camera = outgoingScene_->getActiveCamera();
-        float originalZoom = camera ? camera->getZoom() : 1.0f;
-        Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
-        
-        // 应用缩放（通过调整相机 zoom 实现）
-        if (camera) {
-            camera->setZoom(originalZoom * scale);
-        }
-        
-        // 渲染场景
-        outgoingScene_->renderContent(renderer);
-        
-        // 恢复相机状态
-        if (camera) {
-            camera->setZoom(originalZoom);
-            camera->setPosition(originalPos);
-        }
-    }
-    
-    // 目标场景：放大出现
-    if (incomingScene_) {
-        float scale = std::max(0.01f, progress);
-        
-        // 保存原始相机状态
-        Camera* camera = incomingScene_->getActiveCamera();
-        float originalZoom = camera ? camera->getZoom() : 1.0f;
-        Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
-        
-        // 应用缩放
-        if (camera) {
-            camera->setZoom(originalZoom * scale);
-        }
-        
-        // 渲染场景
-        incomingScene_->renderContent(renderer);
-        
-        // 恢复相机状态
-        if (camera) {
-            camera->setZoom(originalZoom);
-            camera->setPosition(originalPos);
-        }
-    }
-}
-
-// ============================================================================
-// FlipTransition - 翻页
-// ============================================================================
-FlipTransition::FlipTransition(float duration, Axis axis)
-    : Transition(duration)
-    , axis_(axis) {
-}
-
-void FlipTransition::onRenderTransition(RenderBackend& renderer, float progress) {
-    float angle = progress * PI_F; // 180度翻转
-    
-    if (progress < 0.5f) {
-        // 前半段：翻转源场景
-        if (outgoingScene_) {
-            float currentAngle = angle;
-            
-            // 保存原始相机状态
-            Camera* camera = outgoingScene_->getActiveCamera();
-            float originalRotation = camera ? camera->getRotation() : 0.0f;
-            
-            // 应用旋转（水平翻转绕Y轴，垂直翻转绕X轴）
-            if (axis_ == Axis::Horizontal) {
-                // 水平轴翻转 - 模拟绕X轴旋转
-                if (camera) {
-                    camera->setRotation(originalRotation + currentAngle * RAD_TO_DEG);
-                }
-            } else {
-                // 垂直轴翻转 - 模拟绕Y轴旋转
-                if (camera) {
-                    camera->setRotation(originalRotation - currentAngle * RAD_TO_DEG);
-                }
-            }
-            
-            // 渲染场景
-            outgoingScene_->renderContent(renderer);
-            
-            // 恢复相机状态
-            if (camera) {
-                camera->setRotation(originalRotation);
-            }
-        }
-    } else {
-        // 后半段：翻转目标场景
-        if (incomingScene_) {
-            float currentAngle = angle - PI_F;
-            
-            // 保存原始相机状态
-            Camera* camera = incomingScene_->getActiveCamera();
-            float originalRotation = camera ? camera->getRotation() : 0.0f;
-            
-            // 应用旋转
-            if (axis_ == Axis::Horizontal) {
-                if (camera) {
-                    camera->setRotation(originalRotation + currentAngle * RAD_TO_DEG);
-                }
-            } else {
-                if (camera) {
-                    camera->setRotation(originalRotation - currentAngle * RAD_TO_DEG);
-                }
-            }
-            
-            // 渲染场景
-            incomingScene_->renderContent(renderer);
-            
-            // 恢复相机状态
-            if (camera) {
-                camera->setRotation(originalRotation);
-            }
-        }
-    }
-}
-
-// ============================================================================
-// BoxTransition - 方块过渡
-// ============================================================================
-BoxTransition::BoxTransition(float duration, int divisions)
-    : Transition(duration)
-    , divisions_(divisions) {
-}
-
-void BoxTransition::onRenderTransition(RenderBackend& renderer, float progress) {
-    float screenWidth = 800.0f;
-    float screenHeight = 600.0f;
-
-    if (incomingScene_) {
-        Size viewportSize = incomingScene_->getViewportSize();
-        if (viewportSize.width > 0 && viewportSize.height > 0) {
-            screenWidth = viewportSize.width;
-            screenHeight = viewportSize.height;
-        }
-    } else if (outgoingScene_) {
-        Size viewportSize = outgoingScene_->getViewportSize();
-        if (viewportSize.width > 0 && viewportSize.height > 0) {
-            screenWidth = viewportSize.width;
-            screenHeight = viewportSize.height;
-        }
-    }
-
-    if (incomingScene_) {
-        incomingScene_->renderContent(renderer);
-    } else if (outgoingScene_) {
-        outgoingScene_->renderContent(renderer);
-    } else {
-        return;
-    }
-
-    int div = std::max(1, divisions_);
-    int total = div * div;
-    int visible = std::clamp(static_cast<int>(total * progress), 0, total);
-
-    float cellW = screenWidth / static_cast<float>(div);
-    float cellH = screenHeight / static_cast<float>(div);
-    glm::mat4 overlayVP = glm::ortho(0.0f, screenWidth, screenHeight, 0.0f, -1.0f, 1.0f);
-    renderer.setViewProjection(overlayVP);
-
-    for (int idx = visible; idx < total; ++idx) {
-        int x = idx % div;
-        int y = idx / div;
-        renderer.fillRect(Rect(x * cellW, y * cellH, cellW + 1.0f, cellH + 1.0f), Colors::Black);
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/script/script_engine.cpp b/Easy2D/src/script/script_engine.cpp
deleted file mode 100644
index 38073f4..0000000
--- a/Easy2D/src/script/script_engine.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-#include <easy2d/script/script_engine.h>
-#include <easy2d/script/sq_binding_types.h>
-#include <easy2d/script/sq_binding_node.h>
-#include <easy2d/script/sq_binding_input.h>
-#include <easy2d/script/sq_binding_action.h>
-#include <easy2d/script/sq_binding_audio.h>
-#include <easy2d/script/sq_binding_animation.h>
-#include <easy2d/utils/logger.h>
-#include <sqstdaux.h>
-#include <sqstdio.h>
-#include <sqstdmath.h>
-#include <sqstdstring.h>
-#include <sqstdblob.h>
-#include <cstdarg>
-#include <fstream>
-#include <sstream>
-
-namespace easy2d {
-
-ScriptEngine& ScriptEngine::getInstance() {
-    static ScriptEngine instance;
-    return instance;
-}
-
-ScriptEngine::~ScriptEngine() {
-    shutdown();
-}
-
-bool ScriptEngine::initialize() {
-    if (vm_) return true;
-
-    vm_ = sq_open(1024);
-    if (!vm_) {
-        E2D_ERROR("ScriptEngine: failed to create Squirrel VM");
-        return false;
-    }
-
-    sq_setprintfunc(vm_, printFunc, errorFunc);
-    sq_setcompilererrorhandler(vm_, compilerError);
-
-    sq_pushroottable(vm_);
-
-    // Register standard libraries
-    sqstd_register_mathlib(vm_);
-    sqstd_register_stringlib(vm_);
-    sqstd_register_bloblib(vm_);
-    sqstd_register_iolib(vm_);
-
-    // Set error handler
-    sq_newclosure(vm_, errorHandler, 0);
-    sq_seterrorhandler(vm_);
-
-    sq_pop(vm_, 1); // pop root table
-
-    // Register Easy2D bindings
-    sq::registerValueTypes(vm_);
-    sq::registerNodeBindings(vm_);
-    sq::registerInputBindings(vm_);
-    sq::registerActionBindings(vm_);
-    sq::registerAudioBindings(vm_);
-    sq::registerAnimationBindings(vm_);
-
-    // Register global log function
-    sq_pushroottable(vm_);
-    sq_pushstring(vm_, "log", -1);
-    sq_newclosure(vm_, [](HSQUIRRELVM v) -> SQInteger {
-        const SQChar* msg = nullptr;
-        sq_getstring(v, 2, &msg);
-        if (msg) E2D_INFO("[Script] {}", msg);
-        return 0;
-    }, 0);
-    sq_newslot(vm_, -3, SQFalse);
-    sq_pop(vm_, 1);
-
-    E2D_INFO("ScriptEngine: Squirrel VM initialized (v{})", SQUIRREL_VERSION);
-    return true;
-}
-
-void ScriptEngine::shutdown() {
-    if (vm_) {
-        sq_close(vm_);
-        vm_ = nullptr;
-        E2D_INFO("ScriptEngine: Squirrel VM shut down");
-    }
-}
-
-bool ScriptEngine::executeString(const std::string& code) {
-    if (!vm_) {
-        E2D_ERROR("ScriptEngine: VM not initialized");
-        return false;
-    }
-    return compileAndRun(code, "<string>");
-}
-
-bool ScriptEngine::executeFile(const std::string& filepath) {
-    if (!vm_) {
-        E2D_ERROR("ScriptEngine: VM not initialized");
-        return false;
-    }
-
-    std::ifstream file(filepath);
-    if (!file.is_open()) {
-        E2D_ERROR("ScriptEngine: cannot open file '{}'", filepath);
-        return false;
-    }
-
-    std::ostringstream ss;
-    ss << file.rdbuf();
-    return compileAndRun(ss.str(), filepath);
-}
-
-bool ScriptEngine::compileAndRun(const std::string& source, const std::string& sourceName) {
-    SQInteger top = sq_gettop(vm_);
-
-    sq_pushroottable(vm_);
-
-    if (SQ_FAILED(sq_compilebuffer(vm_, source.c_str(),
-                                    static_cast<SQInteger>(source.size()),
-                                    sourceName.c_str(), SQTrue))) {
-        sq_settop(vm_, top);
-        return false;
-    }
-
-    sq_push(vm_, -2); // push root table as 'this'
-
-    if (SQ_FAILED(sq_call(vm_, 1, SQFalse, SQTrue))) {
-        sq_settop(vm_, top);
-        return false;
-    }
-
-    sq_settop(vm_, top);
-    return true;
-}
-
-void ScriptEngine::printFunc(HSQUIRRELVM, const SQChar* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    char buf[2048];
-    vsnprintf(buf, sizeof(buf), fmt, args);
-    va_end(args);
-    E2D_INFO("[Squirrel] {}", buf);
-}
-
-void ScriptEngine::errorFunc(HSQUIRRELVM, const SQChar* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    char buf[2048];
-    vsnprintf(buf, sizeof(buf), fmt, args);
-    va_end(args);
-    E2D_ERROR("[Squirrel] {}", buf);
-}
-
-SQInteger ScriptEngine::errorHandler(HSQUIRRELVM vm) {
-    const SQChar* errMsg = nullptr;
-    if (sq_gettop(vm) >= 1) {
-        if (SQ_FAILED(sq_getstring(vm, 2, &errMsg))) {
-            errMsg = "unknown error";
-        }
-    }
-
-    // Print call stack
-    SQStackInfos si;
-    SQInteger level = 1;
-    E2D_ERROR("[Squirrel] Runtime error: {}", errMsg ? errMsg : "unknown");
-
-    while (SQ_SUCCEEDED(sq_stackinfos(vm, level, &si))) {
-        const SQChar* fn = si.funcname ? si.funcname : "unknown";
-        const SQChar* src = si.source ? si.source : "unknown";
-        E2D_ERROR("  [{}] {}:{} in {}", level, src, si.line, fn);
-        ++level;
-    }
-
-    return 0;
-}
-
-void ScriptEngine::compilerError(HSQUIRRELVM, const SQChar* desc,
-                                  const SQChar* source, SQInteger line, SQInteger column) {
-    E2D_ERROR("[Squirrel] Compile error: {}:{}:{}: {}", source, line, column, desc);
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/script/script_node.cpp b/Easy2D/src/script/script_node.cpp
deleted file mode 100644
index 9f92563..0000000
--- a/Easy2D/src/script/script_node.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-#include <easy2d/script/script_node.h>
-#include <easy2d/script/sq_binding.h>
-#include <easy2d/script/sq_binding_node.h>
-#include <easy2d/utils/logger.h>
-#include <fstream>
-#include <sstream>
-
-namespace easy2d {
-
-// SqClassName needed for pushPtr<Node> which ScriptNode inherits
-namespace sq {
-    // Already defined in sq_binding_node.cpp, but we need it here for pushPtr
-    template<> struct SqClassName<Node> { static const char* name() { return "Node"; } };
-}
-
-ScriptNode::ScriptNode() {
-    sq_resetobject(&scriptTable_);
-}
-
-ScriptNode::~ScriptNode() {
-    if (tableValid_) {
-        auto& engine = ScriptEngine::getInstance();
-        if (engine.isInitialized()) {
-            sq_release(engine.getVM(), &scriptTable_);
-        }
-        tableValid_ = false;
-    }
-}
-
-Ptr<ScriptNode> ScriptNode::create(const std::string& scriptPath) {
-    auto node = makePtr<ScriptNode>();
-    if (!node->loadScript(scriptPath)) {
-        E2D_ERROR("ScriptNode: failed to load '{}'", scriptPath);
-    }
-    return node;
-}
-
-bool ScriptNode::loadScript(const std::string& scriptPath) {
-    scriptPath_ = scriptPath;
-
-    auto& engine = ScriptEngine::getInstance();
-    if (!engine.isInitialized()) {
-        E2D_ERROR("ScriptNode: ScriptEngine not initialized");
-        return false;
-    }
-
-    HSQUIRRELVM vm = engine.getVM();
-
-    // Read file
-    std::ifstream file(scriptPath);
-    if (!file.is_open()) {
-        E2D_ERROR("ScriptNode: cannot open '{}'", scriptPath);
-        return false;
-    }
-    std::ostringstream ss;
-    ss << file.rdbuf();
-    std::string source = ss.str();
-
-    SQInteger top = sq_gettop(vm);
-
-    // Compile
-    sq_pushroottable(vm);
-    if (SQ_FAILED(sq_compilebuffer(vm, source.c_str(),
-                                    static_cast<SQInteger>(source.size()),
-                                    scriptPath.c_str(), SQTrue))) {
-        sq_settop(vm, top);
-        return false;
-    }
-
-    sq_push(vm, -2); // root table as 'this'
-
-    // Execute — expect a return value (the table)
-    if (SQ_FAILED(sq_call(vm, 1, SQTrue, SQTrue))) {
-        sq_settop(vm, top);
-        return false;
-    }
-
-    // Check if return value is a table
-    if (sq_gettype(vm, -1) == OT_TABLE) {
-        sq_getstackobj(vm, -1, &scriptTable_);
-        sq_addref(vm, &scriptTable_);
-        tableValid_ = true;
-    } else {
-        E2D_WARN("ScriptNode: '{}' did not return a table", scriptPath);
-    }
-
-    sq_settop(vm, top);
-    return tableValid_;
-}
-
-void ScriptNode::onEnter() {
-    Node::onEnter();
-    if (tableValid_) {
-        auto& engine = ScriptEngine::getInstance();
-        HSQUIRRELVM vm = engine.getVM();
-        SQInteger top = sq_gettop(vm);
-
-        sq_pushobject(vm, scriptTable_);
-        sq_pushstring(vm, "onEnter", -1);
-        if (SQ_SUCCEEDED(sq_get(vm, -2))) {
-            sq_pushobject(vm, scriptTable_); // 'this' = script table
-            pushSelf();                       // arg: node
-            sq_call(vm, 2, SQFalse, SQTrue);
-            sq_pop(vm, 1); // pop closure
-        }
-
-        sq_settop(vm, top);
-    }
-}
-
-void ScriptNode::onExit() {
-    if (tableValid_) {
-        auto& engine = ScriptEngine::getInstance();
-        HSQUIRRELVM vm = engine.getVM();
-        SQInteger top = sq_gettop(vm);
-
-        sq_pushobject(vm, scriptTable_);
-        sq_pushstring(vm, "onExit", -1);
-        if (SQ_SUCCEEDED(sq_get(vm, -2))) {
-            sq_pushobject(vm, scriptTable_);
-            pushSelf();
-            sq_call(vm, 2, SQFalse, SQTrue);
-            sq_pop(vm, 1);
-        }
-
-        sq_settop(vm, top);
-    }
-    Node::onExit();
-}
-
-void ScriptNode::onUpdate(float dt) {
-    Node::onUpdate(dt);
-    if (tableValid_) {
-        auto& engine = ScriptEngine::getInstance();
-        HSQUIRRELVM vm = engine.getVM();
-        SQInteger top = sq_gettop(vm);
-
-        sq_pushobject(vm, scriptTable_);
-        sq_pushstring(vm, "onUpdate", -1);
-        if (SQ_SUCCEEDED(sq_get(vm, -2))) {
-            sq_pushobject(vm, scriptTable_);
-            pushSelf();
-            sq_pushfloat(vm, dt);
-            sq_call(vm, 3, SQFalse, SQTrue);
-            sq_pop(vm, 1);
-        }
-
-        sq_settop(vm, top);
-    }
-}
-
-void ScriptNode::pushSelf() {
-    auto& engine = ScriptEngine::getInstance();
-    HSQUIRRELVM vm = engine.getVM();
-
-    // Push this node as a Node instance with shared_ptr
-    auto self = std::dynamic_pointer_cast<Node>(shared_from_this());
-    sq::pushPtr(vm, self);
-}
-
-bool ScriptNode::callMethod(const char* name) {
-    if (!tableValid_) return false;
-    auto& engine = ScriptEngine::getInstance();
-    HSQUIRRELVM vm = engine.getVM();
-    SQInteger top = sq_gettop(vm);
-
-    sq_pushobject(vm, scriptTable_);
-    sq_pushstring(vm, name, -1);
-    if (SQ_FAILED(sq_get(vm, -2))) {
-        sq_settop(vm, top);
-        return false;
-    }
-    sq_pushobject(vm, scriptTable_);
-    pushSelf();
-    bool ok = SQ_SUCCEEDED(sq_call(vm, 2, SQFalse, SQTrue));
-    sq_settop(vm, top);
-    return ok;
-}
-
-bool ScriptNode::callMethodWithFloat(const char* name, float arg) {
-    if (!tableValid_) return false;
-    auto& engine = ScriptEngine::getInstance();
-    HSQUIRRELVM vm = engine.getVM();
-    SQInteger top = sq_gettop(vm);
-
-    sq_pushobject(vm, scriptTable_);
-    sq_pushstring(vm, name, -1);
-    if (SQ_FAILED(sq_get(vm, -2))) {
-        sq_settop(vm, top);
-        return false;
-    }
-    sq_pushobject(vm, scriptTable_);
-    pushSelf();
-    sq_pushfloat(vm, arg);
-    bool ok = SQ_SUCCEEDED(sq_call(vm, 3, SQFalse, SQTrue));
-    sq_settop(vm, top);
-    return ok;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/script/sq_binding_action.cpp b/Easy2D/src/script/sq_binding_action.cpp
deleted file mode 100644
index d13a640..0000000
--- a/Easy2D/src/script/sq_binding_action.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-#include <easy2d/script/sq_binding_action.h>
-#include <easy2d/script/sq_binding_types.h>
-#include <easy2d/action/action.h>
-#include <easy2d/action/actions.h>
-
-namespace easy2d {
-namespace sq {
-
-// Actions are stored as Ptr<Action> in userdata (they use raw new in C++ API but
-// we wrap them in shared_ptr for the script bridge)
-
-template<> struct SqClassName<Action> { static const char* name() { return "Action"; } };
-
-// Helper: wrap a raw Action* into Ptr<Action> and push it
-static void pushAction(HSQUIRRELVM vm, Action* raw) {
-    Ptr<Action> ptr(raw);
-
-    sq_pushroottable(vm);
-    sq_pushstring(vm, "Action", -1);
-    if (SQ_FAILED(sq_get(vm, -2))) {
-        sq_pop(vm, 1);
-        sq_pushnull(vm);
-        return;
-    }
-    if (SQ_FAILED(sq_createinstance(vm, -1))) {
-        sq_pop(vm, 2);
-        sq_pushnull(vm);
-        return;
-    }
-
-    auto* storage = new Ptr<Action>(std::move(ptr));
-    sq_setinstanceup(vm, -1, storage);
-    sq_setreleasehook(vm, -1, [](SQUserPointer p, SQInteger) -> SQInteger {
-        delete static_cast<Ptr<Action>*>(p);
-        return 0;
-    });
-
-    sq_remove(vm, -2); // class
-    sq_remove(vm, -2); // roottable
-}
-
-static Ptr<Action> getAction(HSQUIRRELVM vm, SQInteger idx) {
-    SQUserPointer up = nullptr;
-    sq_getinstanceup(vm, idx, &up, nullptr, SQFalse);
-    if (!up) return nullptr;
-    return *static_cast<Ptr<Action>*>(up);
-}
-
-// ============================================================================
-// Factory functions (registered as global functions)
-// ============================================================================
-static SQInteger sqMoveTo(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    Vec2* pos = getValueInstance<Vec2>(vm, 3);
-    if (!pos) return sq_throwerror(vm, "expected Vec2");
-    pushAction(vm, new MoveTo(dur, *pos));
-    return 1;
-}
-
-static SQInteger sqMoveBy(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    Vec2* delta = getValueInstance<Vec2>(vm, 3);
-    if (!delta) return sq_throwerror(vm, "expected Vec2");
-    pushAction(vm, new MoveBy(dur, *delta));
-    return 1;
-}
-
-static SQInteger sqScaleTo(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 4) {
-        float sx = static_cast<float>(getFloat(vm, 3));
-        float sy = static_cast<float>(getFloat(vm, 4));
-        pushAction(vm, new ScaleTo(dur, sx, sy));
-    } else {
-        float s = static_cast<float>(getFloat(vm, 3));
-        pushAction(vm, new ScaleTo(dur, s));
-    }
-    return 1;
-}
-
-static SQInteger sqRotateTo(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    float angle = static_cast<float>(getFloat(vm, 3));
-    pushAction(vm, new RotateTo(dur, angle));
-    return 1;
-}
-
-static SQInteger sqRotateBy(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    float angle = static_cast<float>(getFloat(vm, 3));
-    pushAction(vm, new RotateBy(dur, angle));
-    return 1;
-}
-
-static SQInteger sqFadeIn(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    pushAction(vm, new FadeIn(dur));
-    return 1;
-}
-
-static SQInteger sqFadeOut(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    pushAction(vm, new FadeOut(dur));
-    return 1;
-}
-
-static SQInteger sqFadeTo(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    float opacity = static_cast<float>(getFloat(vm, 3));
-    pushAction(vm, new FadeTo(dur, opacity));
-    return 1;
-}
-
-static SQInteger sqDelay(HSQUIRRELVM vm) {
-    float dur = static_cast<float>(getFloat(vm, 2));
-    pushAction(vm, new Delay(dur));
-    return 1;
-}
-
-static SQInteger sqSequence(HSQUIRRELVM vm) {
-    // arg 2 is an array of actions
-    SQInteger size = sq_getsize(vm, 2);
-    std::vector<Action*> actions;
-    actions.reserve(size);
-    for (SQInteger i = 0; i < size; ++i) {
-        sq_pushinteger(vm, i);
-        sq_get(vm, 2);
-        auto a = getAction(vm, -1);
-        if (a) actions.push_back(a->clone());
-        sq_pop(vm, 1);
-    }
-    if (actions.empty()) return sq_throwerror(vm, "empty sequence");
-    pushAction(vm, new Sequence(actions));
-    return 1;
-}
-
-static SQInteger sqSpawn(HSQUIRRELVM vm) {
-    SQInteger size = sq_getsize(vm, 2);
-    std::vector<Action*> actions;
-    actions.reserve(size);
-    for (SQInteger i = 0; i < size; ++i) {
-        sq_pushinteger(vm, i);
-        sq_get(vm, 2);
-        auto a = getAction(vm, -1);
-        if (a) actions.push_back(a->clone());
-        sq_pop(vm, 1);
-    }
-    if (actions.empty()) return sq_throwerror(vm, "empty spawn");
-    pushAction(vm, new Spawn(actions));
-    return 1;
-}
-
-static SQInteger sqLoop(HSQUIRRELVM vm) {
-    auto a = getAction(vm, 2);
-    if (!a) return sq_throwerror(vm, "null action");
-    int times = -1;
-    if (sq_gettop(vm) >= 3)
-        times = static_cast<int>(getInt(vm, 3));
-    pushAction(vm, new Loop(a->clone(), times));
-    return 1;
-}
-
-static SQInteger sqCallFunc(HSQUIRRELVM vm) {
-    // arg 2 is a Squirrel closure
-    HSQOBJECT closure;
-    sq_resetobject(&closure);
-    sq_getstackobj(vm, 2, &closure);
-    sq_addref(vm, &closure);
-
-    HSQUIRRELVM capturedVM = vm;
-    HSQOBJECT capturedClosure = closure;
-
-    pushAction(vm, new CallFunc([capturedVM, capturedClosure]() mutable {
-        sq_pushobject(capturedVM, capturedClosure);
-        sq_pushroottable(capturedVM);
-        sq_call(capturedVM, 1, SQFalse, SQTrue);
-        sq_pop(capturedVM, 1); // pop closure
-    }));
-    return 1;
-}
-
-void registerActionBindings(HSQUIRRELVM vm) {
-    // Base Action class (used as container)
-    ClassDef(vm, "Action")
-        .setTypeTag(typeTag<Action>())
-        .commit();
-
-    // Register global factory functions
-    auto regFunc = [&](const char* name, SQFUNCTION fn) {
-        sq_pushroottable(vm);
-        sq_pushstring(vm, name, -1);
-        sq_newclosure(vm, fn, 0);
-        sq_newslot(vm, -3, SQFalse);
-        sq_pop(vm, 1);
-    };
-
-    regFunc("MoveTo", sqMoveTo);
-    regFunc("MoveBy", sqMoveBy);
-    regFunc("ScaleTo", sqScaleTo);
-    regFunc("RotateTo", sqRotateTo);
-    regFunc("RotateBy", sqRotateBy);
-    regFunc("FadeIn", sqFadeIn);
-    regFunc("FadeOut", sqFadeOut);
-    regFunc("FadeTo", sqFadeTo);
-    regFunc("Delay", sqDelay);
-    regFunc("Sequence", sqSequence);
-    regFunc("Spawn", sqSpawn);
-    regFunc("Loop", sqLoop);
-    regFunc("CallFunc", sqCallFunc);
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/src/script/sq_binding_animation.cpp b/Easy2D/src/script/sq_binding_animation.cpp
deleted file mode 100644
index da5a9d6..0000000
--- a/Easy2D/src/script/sq_binding_animation.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-#include <easy2d/script/sq_binding_animation.h>
-#include <easy2d/script/sq_binding_node.h>
-#include <easy2d/script/sq_binding_types.h>
-#include <easy2d/animation/animated_sprite.h>
-#include <easy2d/animation/animation_cache.h>
-#include <easy2d/animation/animation_clip.h>
-#include <easy2d/app/application.h>
-#include <easy2d/resource/resource_manager.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/utils/logger.h>
-
-namespace easy2d {
-namespace sq {
-
-// SqClassName specialization for AnimatedSprite
-template<> struct SqClassName<AnimatedSprite> { static const char* name() { return "AnimatedSprite"; } };
-
-// AnimatedSprite inherits Sprite -> Node, all stored as Ptr<Node>
-
-// 从精灵图创建 AnimatedSprite（网格布局）
-// AnimatedSprite.createFromGrid(texturePath, frameWidth, frameHeight, frameDurationMs, frameCount)
-static SQInteger animSpriteCreateFromGrid(HSQUIRRELVM vm) {
-    SQInteger argc = sq_gettop(vm);
-    if (argc < 4) {
-        return sq_throwerror(vm, "createFromGrid requires at least 3 arguments: texturePath, frameWidth, frameHeight");
-    }
-    
-    std::string path = getString(vm, 2);
-    int frameWidth = static_cast<int>(getInt(vm, 3));
-    int frameHeight = static_cast<int>(getInt(vm, 4));
-    
-    float frameDurationMs = 100.0f;
-    if (argc >= 5) {
-        frameDurationMs = static_cast<float>(getFloat(vm, 5));
-    }
-    
-    int frameCount = -1;
-    if (argc >= 6) {
-        frameCount = static_cast<int>(getInt(vm, 6));
-    }
-    
-    // 加载纹理
-    auto& resources = Application::instance().resources();
-    auto texture = resources.loadTexture(path);
-    if (!texture) {
-        E2D_ERROR("Failed to load texture: {}", path);
-        pushNull(vm);
-        return 1;
-    }
-    
-    // 创建动画片段
-    auto clip = AnimationClip::createFromGrid(texture, frameWidth, frameHeight, frameDurationMs, frameCount);
-    if (!clip || clip->empty()) {
-        E2D_ERROR("Failed to create animation clip from grid");
-        pushNull(vm);
-        return 1;
-    }
-    clip->setLooping(true);
-    
-    // 创建 AnimatedSprite
-    auto sprite = AnimatedSprite::create(clip);
-    sprite->setApplyFrameTransform(false);
-    
-    pushPtr<AnimatedSprite>(vm, sprite);
-    return 1;
-}
-
-static SQInteger animSpriteCreate(HSQUIRRELVM vm) {
-    SQInteger argc = sq_gettop(vm);
-    Ptr<AnimatedSprite> sprite;
-    if (argc >= 2 && sq_gettype(vm, 2) == OT_STRING) {
-        std::string path = getString(vm, 2);
-        sprite = AnimatedSprite::create(path);
-    } else {
-        sprite = AnimatedSprite::create();
-    }
-    pushPtr<AnimatedSprite>(vm, sprite);
-    return 1;
-}
-
-static SQInteger animSpritePlay(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 2 && sq_gettype(vm, 2) == OT_STRING) {
-        std::string name = getString(vm, 2);
-        bool loop = true;
-        if (argc >= 3) loop = getBool(vm, 3);
-        anim->play(name, loop);
-    } else {
-        anim->play();
-    }
-    return 0;
-}
-
-static SQInteger animSpritePause(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->pause();
-    return 0;
-}
-
-static SQInteger animSpriteResume(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->resume();
-    return 0;
-}
-
-static SQInteger animSpriteStop(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->stop();
-    return 0;
-}
-
-static SQInteger animSpriteReset(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->reset();
-    return 0;
-}
-
-static SQInteger animSpriteIsPlaying(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    push(vm, anim->isPlaying());
-    return 1;
-}
-
-static SQInteger animSpriteSetLooping(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->setLooping(getBool(vm, 2));
-    return 0;
-}
-
-static SQInteger animSpriteSetPlaybackSpeed(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->setPlaybackSpeed(static_cast<float>(getFloat(vm, 2)));
-    return 0;
-}
-
-static SQInteger animSpriteAddAnimation(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    std::string name = getString(vm, 2);
-    std::string path = getString(vm, 3);
-    auto clip = AnimationCache::getInstance().loadClip(path);
-    if (clip) anim->addAnimation(name, clip);
-    return 0;
-}
-
-static SQInteger animSpriteLoadAnimation(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    std::string path = getString(vm, 2);
-    anim->loadAnimation(path);
-    return 0;
-}
-
-static SQInteger animSpriteSetAutoPlay(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->setAutoPlay(getBool(vm, 2));
-    return 0;
-}
-
-static SQInteger animSpriteGetCurrentFrameIndex(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    push(vm, static_cast<int>(anim->getCurrentFrameIndex()));
-    return 1;
-}
-
-static SQInteger animSpriteGetTotalFrames(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    push(vm, static_cast<int>(anim->getTotalFrames()));
-    return 1;
-}
-
-static SQInteger animSpriteSetFrameRange(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    int start = static_cast<int>(getInt(vm, 2));
-    int end = -1;
-    if (sq_gettop(vm) >= 3) {
-        end = static_cast<int>(getInt(vm, 3));
-    }
-    anim->setFrameRange(start, end);
-    return 0;
-}
-
-static SQInteger animSpriteSetFrameIndex(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    int index = static_cast<int>(getInt(vm, 2));
-    anim->setFrameIndex(static_cast<size_t>(index));
-    return 0;
-}
-
-static SQInteger animSpriteSetApplyFrameTransform(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* anim = dynamic_cast<AnimatedSprite*>(node.get());
-    if (!anim) return sq_throwerror(vm, "not an AnimatedSprite");
-    anim->setApplyFrameTransform(getBool(vm, 2));
-    return 0;
-}
-
-void registerAnimationBindings(HSQUIRRELVM vm) {
-    // Register SqClassName for AnimatedSprite
-    ClassDef(vm, "AnimatedSprite", "Sprite")
-        .setTypeTag(typeTag<AnimatedSprite>())
-        .staticMethod("create", animSpriteCreate)
-        .staticMethod("createFromGrid", animSpriteCreateFromGrid)
-        .method("play", animSpritePlay)
-        .method("pause", animSpritePause)
-        .method("resume", animSpriteResume)
-        .method("stop", animSpriteStop)
-        .method("reset", animSpriteReset)
-        .method("isPlaying", animSpriteIsPlaying)
-        .method("setLooping", animSpriteSetLooping)
-        .method("setPlaybackSpeed", animSpriteSetPlaybackSpeed)
-        .method("addAnimation", animSpriteAddAnimation)
-        .method("loadAnimation", animSpriteLoadAnimation)
-        .method("setAutoPlay", animSpriteSetAutoPlay)
-        .method("getCurrentFrameIndex", animSpriteGetCurrentFrameIndex)
-        .method("getTotalFrames", animSpriteGetTotalFrames)
-        .method("setFrameRange", animSpriteSetFrameRange)
-        .method("setFrameIndex", animSpriteSetFrameIndex)
-        .method("setApplyFrameTransform", animSpriteSetApplyFrameTransform)
-        .commit();
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/src/script/sq_binding_audio.cpp b/Easy2D/src/script/sq_binding_audio.cpp
deleted file mode 100644
index a01c8a1..0000000
--- a/Easy2D/src/script/sq_binding_audio.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include <easy2d/script/sq_binding_audio.h>
-#include <easy2d/script/sq_binding_types.h>
-#include <easy2d/audio/audio_engine.h>
-#include <easy2d/audio/sound.h>
-
-namespace easy2d {
-namespace sq {
-
-// ============================================================================
-// AudioEngine singleton
-// ============================================================================
-static SQInteger audioLoadSound(HSQUIRRELVM vm) {
-    SQInteger argc = sq_gettop(vm);
-    std::shared_ptr<Sound> snd;
-    if (argc >= 3) {
-        std::string name = getString(vm, 2);
-        std::string path = getString(vm, 3);
-        snd = AudioEngine::getInstance().loadSound(name, path);
-    } else {
-        std::string path = getString(vm, 2);
-        snd = AudioEngine::getInstance().loadSound(path);
-    }
-    push(vm, snd != nullptr);
-    return 1;
-}
-
-static SQInteger audioPlaySound(HSQUIRRELVM vm) {
-    std::string name = getString(vm, 2);
-    auto snd = AudioEngine::getInstance().getSound(name);
-    if (snd) snd->play();
-    return 0;
-}
-
-static SQInteger audioStopSound(HSQUIRRELVM vm) {
-    std::string name = getString(vm, 2);
-    auto snd = AudioEngine::getInstance().getSound(name);
-    if (snd) snd->stop();
-    return 0;
-}
-
-static SQInteger audioSetMasterVolume(HSQUIRRELVM vm) {
-    float vol = static_cast<float>(getFloat(vm, 2));
-    AudioEngine::getInstance().setMasterVolume(vol);
-    return 0;
-}
-
-static SQInteger audioGetMasterVolume(HSQUIRRELVM vm) {
-    push(vm, AudioEngine::getInstance().getMasterVolume());
-    return 1;
-}
-
-static SQInteger audioStopAll(HSQUIRRELVM vm) {
-    AudioEngine::getInstance().stopAll();
-    return 0;
-}
-
-static SQInteger audioPauseAll(HSQUIRRELVM vm) {
-    AudioEngine::getInstance().pauseAll();
-    return 0;
-}
-
-static SQInteger audioResumeAll(HSQUIRRELVM vm) {
-    AudioEngine::getInstance().resumeAll();
-    return 0;
-}
-
-void registerAudioBindings(HSQUIRRELVM vm) {
-    ClassDef(vm, "AudioEngineClass")
-        .method("loadSound", audioLoadSound)
-        .method("playSound", audioPlaySound)
-        .method("stopSound", audioStopSound)
-        .method("setMasterVolume", audioSetMasterVolume)
-        .method("getMasterVolume", audioGetMasterVolume)
-        .method("stopAll", audioStopAll)
-        .method("pauseAll", audioPauseAll)
-        .method("resumeAll", audioResumeAll)
-        .commit();
-
-    // Global "Audio" instance
-    pushSingleton(vm, &AudioEngine::getInstance(), "AudioEngineClass");
-    sq_pushroottable(vm);
-    sq_pushstring(vm, "Audio", -1);
-    sq_push(vm, -3);
-    sq_newslot(vm, -3, SQFalse);
-    sq_pop(vm, 2);
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/src/script/sq_binding_input.cpp b/Easy2D/src/script/sq_binding_input.cpp
deleted file mode 100644
index b0460f1..0000000
--- a/Easy2D/src/script/sq_binding_input.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include <easy2d/script/sq_binding_input.h>
-#include <easy2d/script/sq_binding_types.h>
-#include <easy2d/platform/input.h>
-#include <easy2d/event/input_codes.h>
-#include <easy2d/app/application.h>
-
-namespace easy2d {
-namespace sq {
-
-// ============================================================================
-// Input singleton bindings
-// ============================================================================
-static SQInteger inputIsKeyDown(HSQUIRRELVM vm) {
-    int key = static_cast<int>(getInt(vm, 2));
-    push(vm, Application::instance().input().isKeyDown(key));
-    return 1;
-}
-
-static SQInteger inputIsKeyPressed(HSQUIRRELVM vm) {
-    int key = static_cast<int>(getInt(vm, 2));
-    push(vm, Application::instance().input().isKeyPressed(key));
-    return 1;
-}
-
-static SQInteger inputIsKeyReleased(HSQUIRRELVM vm) {
-    int key = static_cast<int>(getInt(vm, 2));
-    push(vm, Application::instance().input().isKeyReleased(key));
-    return 1;
-}
-
-static SQInteger inputIsMouseDown(HSQUIRRELVM vm) {
-    int btn = static_cast<int>(getInt(vm, 2));
-    push(vm, Application::instance().input().isMouseDown(static_cast<MouseButton>(btn)));
-    return 1;
-}
-
-static SQInteger inputIsMousePressed(HSQUIRRELVM vm) {
-    int btn = static_cast<int>(getInt(vm, 2));
-    push(vm, Application::instance().input().isMousePressed(static_cast<MouseButton>(btn)));
-    return 1;
-}
-
-static SQInteger inputIsMouseReleased(HSQUIRRELVM vm) {
-    int btn = static_cast<int>(getInt(vm, 2));
-    push(vm, Application::instance().input().isMouseReleased(static_cast<MouseButton>(btn)));
-    return 1;
-}
-
-static SQInteger inputGetMousePosition(HSQUIRRELVM vm) {
-    pushValueInstance(vm, Application::instance().input().getMousePosition());
-    return 1;
-}
-
-static SQInteger inputGetMouseDelta(HSQUIRRELVM vm) {
-    pushValueInstance(vm, Application::instance().input().getMouseDelta());
-    return 1;
-}
-
-static SQInteger inputGetMouseScroll(HSQUIRRELVM vm) {
-    push(vm, Application::instance().input().getMouseScroll());
-    return 1;
-}
-
-void registerInput(HSQUIRRELVM vm) {
-    ClassDef(vm, "InputClass")
-        .method("isKeyDown", inputIsKeyDown)
-        .method("isKeyPressed", inputIsKeyPressed)
-        .method("isKeyReleased", inputIsKeyReleased)
-        .method("isMouseDown", inputIsMouseDown)
-        .method("isMousePressed", inputIsMousePressed)
-        .method("isMouseReleased", inputIsMouseReleased)
-        .method("getMousePosition", inputGetMousePosition)
-        .method("getMouseDelta", inputGetMouseDelta)
-        .method("getMouseScroll", inputGetMouseScroll)
-        .commit();
-
-    // Global "Input" instance
-    pushSingleton(vm, &Application::instance().input(), "InputClass");
-    sq_pushroottable(vm);
-    sq_pushstring(vm, "Input", -1);
-    sq_push(vm, -3);
-    sq_newslot(vm, -3, SQFalse);
-    sq_pop(vm, 2);
-}
-
-void registerKeyConstants(HSQUIRRELVM vm) {
-    // Key constants table
-    static const char* const keyNames[] = {
-        "Space", "Apostrophe", "Comma", "Minus", "Period", "Slash",
-        "Num0", "Num1", "Num2", "Num3", "Num4", "Num5", "Num6", "Num7", "Num8", "Num9",
-        "Semicolon", "Equal",
-        "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
-        "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-        "LeftBracket", "Backslash", "RightBracket", "GraveAccent",
-        "Escape", "Enter", "Tab", "Backspace", "Insert", "Delete",
-        "Right", "Left", "Down", "Up", "PageUp", "PageDown", "Home", "End",
-        "CapsLock", "ScrollLock", "NumLock", "PrintScreen", "Pause",
-        "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12",
-        "LeftShift", "LeftControl", "LeftAlt", "LeftSuper",
-        "RightShift", "RightControl", "RightAlt", "RightSuper", "Menu"
-    };
-    static const SQInteger keyValues[] = {
-        Key::Space, Key::Apostrophe, Key::Comma, Key::Minus, Key::Period, Key::Slash,
-        Key::Num0, Key::Num1, Key::Num2, Key::Num3, Key::Num4, Key::Num5, Key::Num6, Key::Num7, Key::Num8, Key::Num9,
-        Key::Semicolon, Key::Equal,
-        Key::A, Key::B, Key::C, Key::D, Key::E, Key::F, Key::G, Key::H, Key::I, Key::J, Key::K, Key::L, Key::M,
-        Key::N, Key::O, Key::P, Key::Q, Key::R, Key::S, Key::T, Key::U, Key::V, Key::W, Key::X, Key::Y, Key::Z,
-        Key::LeftBracket, Key::Backslash, Key::RightBracket, Key::GraveAccent,
-        Key::Escape, Key::Enter, Key::Tab, Key::Backspace, Key::Insert, Key::Delete,
-        Key::Right, Key::Left, Key::Down, Key::Up, Key::PageUp, Key::PageDown, Key::Home, Key::End,
-        Key::CapsLock, Key::ScrollLock, Key::NumLock, Key::PrintScreen, Key::Pause,
-        Key::F1, Key::F2, Key::F3, Key::F4, Key::F5, Key::F6, Key::F7, Key::F8, Key::F9, Key::F10, Key::F11, Key::F12,
-        Key::LeftShift, Key::LeftControl, Key::LeftAlt, Key::LeftSuper,
-        Key::RightShift, Key::RightControl, Key::RightAlt, Key::RightSuper, Key::Menu
-    };
-
-    registerConstTable(vm, "Key", keyNames, keyValues,
-                       static_cast<int>(sizeof(keyNames) / sizeof(keyNames[0])));
-
-    // Mouse button constants
-    static const char* const mouseNames[] = {
-        "Left", "Right", "Middle", "Button4", "Button5"
-    };
-    static const SQInteger mouseValues[] = {
-        Mouse::ButtonLeft, Mouse::ButtonRight, Mouse::ButtonMiddle,
-        Mouse::Button4, Mouse::Button5
-    };
-    registerConstTable(vm, "Mouse", mouseNames, mouseValues,
-                       static_cast<int>(sizeof(mouseNames) / sizeof(mouseNames[0])));
-}
-
-void registerInputBindings(HSQUIRRELVM vm) {
-    registerInput(vm);
-    registerKeyConstants(vm);
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/src/script/sq_binding_node.cpp b/Easy2D/src/script/sq_binding_node.cpp
deleted file mode 100644
index 18fec36..0000000
--- a/Easy2D/src/script/sq_binding_node.cpp
+++ /dev/null
@@ -1,505 +0,0 @@
-#include <easy2d/script/sq_binding_node.h>
-#include <easy2d/script/sq_binding_types.h>
-#include <easy2d/scene/node.h>
-#include <easy2d/scene/sprite.h>
-#include <easy2d/scene/scene.h>
-#include <easy2d/scene/scene_manager.h>
-#include <easy2d/app/application.h>
-#include <easy2d/graphics/texture.h>
-#include <easy2d/resource/resource_manager.h>
-
-namespace easy2d {
-namespace sq {
-
-// SqClassName specializations
-template<> struct SqClassName<Node>   { static const char* name() { return "Node"; } };
-template<> struct SqClassName<Sprite> { static const char* name() { return "Sprite"; } };
-template<> struct SqClassName<Scene>  { static const char* name() { return "Scene"; } };
-
-// ============================================================================
-// Node
-// ============================================================================
-static SQInteger nodeCreate(HSQUIRRELVM vm) {
-    auto node = makePtr<Node>();
-    pushPtr(vm, node);
-    return 1;
-}
-
-static SQInteger nodeSetPosition(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 3) {
-        float x = static_cast<float>(getFloat(vm, 2));
-        float y = static_cast<float>(getFloat(vm, 3));
-        node->setPosition(x, y);
-    } else {
-        Vec2* v = getValueInstance<Vec2>(vm, 2);
-        if (v) node->setPosition(*v);
-    }
-    return 0;
-}
-
-static SQInteger nodeGetPosition(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    pushValueInstance(vm, node->getPosition());
-    return 1;
-}
-
-static SQInteger nodeSetRotation(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->setRotation(static_cast<float>(getFloat(vm, 2)));
-    return 0;
-}
-
-static SQInteger nodeGetRotation(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    push(vm, node->getRotation());
-    return 1;
-}
-
-static SQInteger nodeSetScale(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 3) {
-        node->setScale(static_cast<float>(getFloat(vm, 2)), static_cast<float>(getFloat(vm, 3)));
-    } else {
-        // Could be float or Vec2
-        SQObjectType t = sq_gettype(vm, 2);
-        if (t == OT_INSTANCE) {
-            Vec2* v = getValueInstance<Vec2>(vm, 2);
-            if (v) node->setScale(*v);
-        } else {
-            node->setScale(static_cast<float>(getFloat(vm, 2)));
-        }
-    }
-    return 0;
-}
-
-static SQInteger nodeGetScale(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    pushValueInstance(vm, node->getScale());
-    return 1;
-}
-
-static SQInteger nodeSetAnchor(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 3) {
-        node->setAnchor(static_cast<float>(getFloat(vm, 2)), static_cast<float>(getFloat(vm, 3)));
-    } else {
-        Vec2* v = getValueInstance<Vec2>(vm, 2);
-        if (v) node->setAnchor(*v);
-    }
-    return 0;
-}
-
-static SQInteger nodeGetAnchor(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    pushValueInstance(vm, node->getAnchor());
-    return 1;
-}
-
-static SQInteger nodeSetOpacity(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->setOpacity(static_cast<float>(getFloat(vm, 2)));
-    return 0;
-}
-
-static SQInteger nodeGetOpacity(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    push(vm, node->getOpacity());
-    return 1;
-}
-
-static SQInteger nodeSetVisible(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->setVisible(getBool(vm, 2));
-    return 0;
-}
-
-static SQInteger nodeIsVisible(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    push(vm, node->isVisible());
-    return 1;
-}
-
-static SQInteger nodeSetZOrder(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->setZOrder(static_cast<int>(getInt(vm, 2)));
-    return 0;
-}
-
-static SQInteger nodeGetZOrder(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    push(vm, node->getZOrder());
-    return 1;
-}
-
-static SQInteger nodeSetName(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->setName(getString(vm, 2));
-    return 0;
-}
-
-static SQInteger nodeGetName(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    push(vm, node->getName());
-    return 1;
-}
-
-static SQInteger nodeSetTag(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->setTag(static_cast<int>(getInt(vm, 2)));
-    return 0;
-}
-
-static SQInteger nodeGetTag(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    push(vm, node->getTag());
-    return 1;
-}
-
-static SQInteger nodeAddChild(HSQUIRRELVM vm) {
-    auto parent = getPtr<Node>(vm, 1);
-    auto child = getPtr<Node>(vm, 2);
-    if (!parent || !child) return sq_throwerror(vm, "null node");
-    parent->addChild(child);
-    return 0;
-}
-
-static SQInteger nodeRemoveFromParent(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->removeFromParent();
-    return 0;
-}
-
-static SQInteger nodeRemoveAllChildren(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->removeAllChildren();
-    return 0;
-}
-
-static SQInteger nodeGetChildByName(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    auto child = node->getChildByName(getString(vm, 2));
-    if (child) pushPtr(vm, child);
-    else pushNull(vm);
-    return 1;
-}
-
-static SQInteger nodeRunAction(HSQUIRRELVM vm) {
-    // Will be implemented in action bindings
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    // Get action pointer from userdata
-    SQUserPointer up = nullptr;
-    sq_getinstanceup(vm, 2, &up, nullptr, SQFalse);
-    if (!up) return sq_throwerror(vm, "null action");
-    auto actionPtr = *static_cast<Ptr<Action>*>(up);
-    node->runAction(actionPtr);
-    return 0;
-}
-
-static SQInteger nodeStopAllActions(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    node->stopAllActions();
-    return 0;
-}
-
-static SQInteger nodeGetBoundingBox(HSQUIRRELVM vm) {
-    auto* node = getRawPtr<Node>(vm, 1);
-    if (!node) return sq_throwerror(vm, "null node");
-    pushValueInstance(vm, node->getBoundingBox());
-    return 1;
-}
-
-void registerNode(HSQUIRRELVM vm) {
-    // Node class — uses shared_ptr bridge
-    ClassDef(vm, "Node")
-        .setTypeTag(typeTag<Node>())
-        .staticMethod("create", nodeCreate)
-        .method("setPosition", nodeSetPosition)
-        .method("getPosition", nodeGetPosition)
-        .method("setRotation", nodeSetRotation)
-        .method("getRotation", nodeGetRotation)
-        .method("setScale", nodeSetScale)
-        .method("getScale", nodeGetScale)
-        .method("setAnchor", nodeSetAnchor)
-        .method("getAnchor", nodeGetAnchor)
-        .method("setOpacity", nodeSetOpacity)
-        .method("getOpacity", nodeGetOpacity)
-        .method("setVisible", nodeSetVisible)
-        .method("isVisible", nodeIsVisible)
-        .method("setZOrder", nodeSetZOrder)
-        .method("getZOrder", nodeGetZOrder)
-        .method("setName", nodeSetName)
-        .method("getName", nodeGetName)
-        .method("setTag", nodeSetTag)
-        .method("getTag", nodeGetTag)
-        .method("addChild", nodeAddChild)
-        .method("removeFromParent", nodeRemoveFromParent)
-        .method("removeAllChildren", nodeRemoveAllChildren)
-        .method("getChildByName", nodeGetChildByName)
-        .method("runAction", nodeRunAction)
-        .method("stopAllActions", nodeStopAllActions)
-        .method("getBoundingBox", nodeGetBoundingBox)
-        .commit();
-}
-
-// ============================================================================
-// Sprite
-// ============================================================================
-static SQInteger spriteCreate(HSQUIRRELVM vm) {
-    SQInteger argc = sq_gettop(vm);
-    Ptr<Sprite> sprite;
-
-    if (argc >= 2 && sq_gettype(vm, 2) == OT_STRING) {
-        std::string path = getString(vm, 2);
-        auto tex = Application::instance().resources().loadTexture(path);
-        if (tex) sprite = Sprite::create(tex);
-        else sprite = Sprite::create();
-    } else {
-        sprite = Sprite::create();
-    }
-
-    pushPtr<Node>(vm, sprite);
-    return 1;
-}
-
-static SQInteger spriteSetColor(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* sprite = dynamic_cast<Sprite*>(node.get());
-    if (!sprite) return sq_throwerror(vm, "not a sprite");
-    Color* c = getValueInstance<Color>(vm, 2);
-    if (c) sprite->setColor(*c);
-    return 0;
-}
-
-static SQInteger spriteGetColor(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* sprite = dynamic_cast<Sprite*>(node.get());
-    if (!sprite) return sq_throwerror(vm, "not a sprite");
-    pushValueInstance(vm, sprite->getColor());
-    return 1;
-}
-
-static SQInteger spriteSetFlipX(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* sprite = dynamic_cast<Sprite*>(node.get());
-    if (!sprite) return sq_throwerror(vm, "not a sprite");
-    sprite->setFlipX(getBool(vm, 2));
-    return 0;
-}
-
-static SQInteger spriteSetFlipY(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* sprite = dynamic_cast<Sprite*>(node.get());
-    if (!sprite) return sq_throwerror(vm, "not a sprite");
-    sprite->setFlipY(getBool(vm, 2));
-    return 0;
-}
-
-static SQInteger spriteIsFlipX(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* sprite = dynamic_cast<Sprite*>(node.get());
-    if (!sprite) return sq_throwerror(vm, "not a sprite");
-    push(vm, sprite->isFlipX());
-    return 1;
-}
-
-static SQInteger spriteIsFlipY(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* sprite = dynamic_cast<Sprite*>(node.get());
-    if (!sprite) return sq_throwerror(vm, "not a sprite");
-    push(vm, sprite->isFlipY());
-    return 1;
-}
-
-void registerSprite(HSQUIRRELVM vm) {
-    ClassDef(vm, "Sprite", "Node")
-        .setTypeTag(typeTag<Sprite>())
-        .staticMethod("create", spriteCreate)
-        .method("setColor", spriteSetColor)
-        .method("getColor", spriteGetColor)
-        .method("setFlipX", spriteSetFlipX)
-        .method("setFlipY", spriteSetFlipY)
-        .method("isFlipX", spriteIsFlipX)
-        .method("isFlipY", spriteIsFlipY)
-        .commit();
-}
-
-// ============================================================================
-// Scene
-// ============================================================================
-static SQInteger sceneCreate(HSQUIRRELVM vm) {
-    auto scene = Scene::create();
-    pushPtr<Node>(vm, scene);
-    return 1;
-}
-
-static SQInteger sceneSetBackgroundColor(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* scene = dynamic_cast<Scene*>(node.get());
-    if (!scene) return sq_throwerror(vm, "not a scene");
-    Color* c = getValueInstance<Color>(vm, 2);
-    if (c) scene->setBackgroundColor(*c);
-    return 0;
-}
-
-static SQInteger sceneGetBackgroundColor(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 1);
-    auto* scene = dynamic_cast<Scene*>(node.get());
-    if (!scene) return sq_throwerror(vm, "not a scene");
-    pushValueInstance(vm, scene->getBackgroundColor());
-    return 1;
-}
-
-void registerScene(HSQUIRRELVM vm) {
-    ClassDef(vm, "Scene", "Node")
-        .setTypeTag(typeTag<Scene>())
-        .staticMethod("create", sceneCreate)
-        .method("setBackgroundColor", sceneSetBackgroundColor)
-        .method("getBackgroundColor", sceneGetBackgroundColor)
-        .commit();
-}
-
-// ============================================================================
-// SceneManager (global "Scenes" variable)
-// ============================================================================
-static SQInteger smRunWithScene(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 2);
-    auto scene = std::dynamic_pointer_cast<Scene>(node);
-    if (!scene) return sq_throwerror(vm, "expected Scene");
-    SceneManager::getInstance().runWithScene(scene);
-    return 0;
-}
-
-static SQInteger smReplaceScene(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 2);
-    auto scene = std::dynamic_pointer_cast<Scene>(node);
-    if (!scene) return sq_throwerror(vm, "expected Scene");
-    SceneManager::getInstance().replaceScene(scene);
-    return 0;
-}
-
-static SQInteger smPushScene(HSQUIRRELVM vm) {
-    auto node = getPtr<Node>(vm, 2);
-    auto scene = std::dynamic_pointer_cast<Scene>(node);
-    if (!scene) return sq_throwerror(vm, "expected Scene");
-    SceneManager::getInstance().pushScene(scene);
-    return 0;
-}
-
-static SQInteger smPopScene(HSQUIRRELVM vm) {
-    SceneManager::getInstance().popScene();
-    return 0;
-}
-
-static SQInteger smGetCurrentScene(HSQUIRRELVM vm) {
-    auto scene = SceneManager::getInstance().getCurrentScene();
-    if (scene) pushPtr<Node>(vm, scene);
-    else pushNull(vm);
-    return 1;
-}
-
-void registerSceneManager(HSQUIRRELVM vm) {
-    ClassDef(vm, "SceneManagerClass")
-        .method("runWithScene", smRunWithScene)
-        .method("replaceScene", smReplaceScene)
-        .method("pushScene", smPushScene)
-        .method("popScene", smPopScene)
-        .method("getCurrentScene", smGetCurrentScene)
-        .commit();
-
-    // Create global "Scenes" instance
-    pushSingleton(vm, &SceneManager::getInstance(), "SceneManagerClass");
-    sq_pushroottable(vm);
-    sq_pushstring(vm, "Scenes", -1);
-    sq_push(vm, -3);       // push the instance
-    sq_newslot(vm, -3, SQFalse);
-    sq_pop(vm, 2);         // pop root table and instance
-}
-
-// ============================================================================
-// Application (global "App" variable)
-// ============================================================================
-static SQInteger appQuit(HSQUIRRELVM vm) {
-    Application::instance().quit();
-    return 0;
-}
-
-static SQInteger appGetDeltaTime(HSQUIRRELVM vm) {
-    push(vm, Application::instance().deltaTime());
-    return 1;
-}
-
-static SQInteger appGetTotalTime(HSQUIRRELVM vm) {
-    push(vm, Application::instance().totalTime());
-    return 1;
-}
-
-static SQInteger appGetFps(HSQUIRRELVM vm) {
-    push(vm, Application::instance().fps());
-    return 1;
-}
-
-static SQInteger appIsPaused(HSQUIRRELVM vm) {
-    push(vm, Application::instance().isPaused());
-    return 1;
-}
-
-void registerApplication(HSQUIRRELVM vm) {
-    ClassDef(vm, "ApplicationClass")
-        .method("quit", appQuit)
-        .method("getDeltaTime", appGetDeltaTime)
-        .method("getTotalTime", appGetTotalTime)
-        .method("getFps", appGetFps)
-        .method("isPaused", appIsPaused)
-        .commit();
-
-    // Global "App" instance
-    pushSingleton(vm, &Application::instance(), "ApplicationClass");
-    sq_pushroottable(vm);
-    sq_pushstring(vm, "App", -1);
-    sq_push(vm, -3);
-    sq_newslot(vm, -3, SQFalse);
-    sq_pop(vm, 2);
-}
-
-// ============================================================================
-// Register all
-// ============================================================================
-void registerNodeBindings(HSQUIRRELVM vm) {
-    registerNode(vm);
-    registerSprite(vm);
-    registerScene(vm);
-    registerSceneManager(vm);
-    registerApplication(vm);
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/src/script/sq_binding_types.cpp b/Easy2D/src/script/sq_binding_types.cpp
deleted file mode 100644
index af830c7..0000000
--- a/Easy2D/src/script/sq_binding_types.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-#include <easy2d/script/sq_binding_types.h>
-
-namespace easy2d {
-namespace sq {
-
-// ============================================================================
-// Vec2
-// ============================================================================
-static SQInteger vec2Constructor(HSQUIRRELVM vm) {
-    Vec2* self = nullptr;
-    sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*>(&self), nullptr, SQFalse);
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 3) {
-        self->x = static_cast<float>(getFloat(vm, 2));
-        self->y = static_cast<float>(getFloat(vm, 3));
-    } else {
-        self->x = 0.0f;
-        self->y = 0.0f;
-    }
-    return 0;
-}
-
-static SQInteger vec2GetX(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    sq_pushfloat(vm, v->x);
-    return 1;
-}
-
-static SQInteger vec2SetX(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    v->x = static_cast<float>(getFloat(vm, 2));
-    return 0;
-}
-
-static SQInteger vec2GetY(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    sq_pushfloat(vm, v->y);
-    return 1;
-}
-
-static SQInteger vec2SetY(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    v->y = static_cast<float>(getFloat(vm, 2));
-    return 0;
-}
-
-static SQInteger vec2Length(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    sq_pushfloat(vm, v->length());
-    return 1;
-}
-
-static SQInteger vec2Normalized(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    pushValueInstance(vm, v->normalized());
-    return 1;
-}
-
-static SQInteger vec2Dot(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    Vec2* b = getValueInstance<Vec2>(vm, 2);
-    sq_pushfloat(vm, a->dot(*b));
-    return 1;
-}
-
-static SQInteger vec2Distance(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    Vec2* b = getValueInstance<Vec2>(vm, 2);
-    sq_pushfloat(vm, a->distance(*b));
-    return 1;
-}
-
-static SQInteger vec2Add(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    Vec2* b = getValueInstance<Vec2>(vm, 2);
-    pushValueInstance(vm, *a + *b);
-    return 1;
-}
-
-static SQInteger vec2Sub(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    Vec2* b = getValueInstance<Vec2>(vm, 2);
-    pushValueInstance(vm, *a - *b);
-    return 1;
-}
-
-static SQInteger vec2Mul(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    SQFloat s = getFloat(vm, 2);
-    pushValueInstance(vm, *a * static_cast<float>(s));
-    return 1;
-}
-
-static SQInteger vec2Div(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    SQFloat s = getFloat(vm, 2);
-    if (s == 0.0f) return sq_throwerror(vm, "division by zero");
-    pushValueInstance(vm, *a / static_cast<float>(s));
-    return 1;
-}
-
-static SQInteger vec2Neg(HSQUIRRELVM vm) {
-    Vec2* a = getValueInstance<Vec2>(vm, 1);
-    pushValueInstance(vm, -*a);
-    return 1;
-}
-
-static SQInteger vec2ToString(HSQUIRRELVM vm) {
-    Vec2* v = getValueInstance<Vec2>(vm, 1);
-    char buf[64];
-    snprintf(buf, sizeof(buf), "Vec2(%.3f, %.3f)", v->x, v->y);
-    sq_pushstring(vm, buf, -1);
-    return 1;
-}
-
-void registerVec2(HSQUIRRELVM vm) {
-    ClassDef(vm, "Vec2")
-        .setValueType<Vec2>(vec2Constructor)
-        .method("getX", vec2GetX)
-        .method("setX", vec2SetX)
-        .method("getY", vec2GetY)
-        .method("setY", vec2SetY)
-        .method("length", vec2Length)
-        .method("normalized", vec2Normalized)
-        .method("dot", vec2Dot, 2, "xx")
-        .method("distance", vec2Distance, 2, "xx")
-        .method("_add", vec2Add, 2, "xx")
-        .method("_sub", vec2Sub, 2, "xx")
-        .method("_mul", vec2Mul)
-        .method("_div", vec2Div)
-        .method("_unm", vec2Neg)
-        .method("_tostring", vec2ToString)
-        .commit();
-}
-
-// ============================================================================
-// Size
-// ============================================================================
-static SQInteger sizeConstructor(HSQUIRRELVM vm) {
-    Size* self = nullptr;
-    sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*>(&self), nullptr, SQFalse);
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 3) {
-        self->width = static_cast<float>(getFloat(vm, 2));
-        self->height = static_cast<float>(getFloat(vm, 3));
-    } else {
-        self->width = 0.0f;
-        self->height = 0.0f;
-    }
-    return 0;
-}
-
-static SQInteger sizeGetWidth(HSQUIRRELVM vm) {
-    Size* s = getValueInstance<Size>(vm, 1);
-    sq_pushfloat(vm, s->width);
-    return 1;
-}
-
-static SQInteger sizeSetWidth(HSQUIRRELVM vm) {
-    Size* s = getValueInstance<Size>(vm, 1);
-    s->width = static_cast<float>(getFloat(vm, 2));
-    return 0;
-}
-
-static SQInteger sizeGetHeight(HSQUIRRELVM vm) {
-    Size* s = getValueInstance<Size>(vm, 1);
-    sq_pushfloat(vm, s->height);
-    return 1;
-}
-
-static SQInteger sizeSetHeight(HSQUIRRELVM vm) {
-    Size* s = getValueInstance<Size>(vm, 1);
-    s->height = static_cast<float>(getFloat(vm, 2));
-    return 0;
-}
-
-static SQInteger sizeArea(HSQUIRRELVM vm) {
-    Size* s = getValueInstance<Size>(vm, 1);
-    sq_pushfloat(vm, s->area());
-    return 1;
-}
-
-static SQInteger sizeToString(HSQUIRRELVM vm) {
-    Size* s = getValueInstance<Size>(vm, 1);
-    char buf[64];
-    snprintf(buf, sizeof(buf), "Size(%.3f, %.3f)", s->width, s->height);
-    sq_pushstring(vm, buf, -1);
-    return 1;
-}
-
-void registerSize(HSQUIRRELVM vm) {
-    ClassDef(vm, "Size")
-        .setValueType<Size>(sizeConstructor)
-        .method("getWidth", sizeGetWidth)
-        .method("setWidth", sizeSetWidth)
-        .method("getHeight", sizeGetHeight)
-        .method("setHeight", sizeSetHeight)
-        .method("area", sizeArea)
-        .method("_tostring", sizeToString)
-        .commit();
-}
-
-// ============================================================================
-// Rect
-// ============================================================================
-static SQInteger rectConstructor(HSQUIRRELVM vm) {
-    Rect* self = nullptr;
-    sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*>(&self), nullptr, SQFalse);
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 5) {
-        self->origin.x = static_cast<float>(getFloat(vm, 2));
-        self->origin.y = static_cast<float>(getFloat(vm, 3));
-        self->size.width = static_cast<float>(getFloat(vm, 4));
-        self->size.height = static_cast<float>(getFloat(vm, 5));
-    } else {
-        *self = Rect();
-    }
-    return 0;
-}
-
-static SQInteger rectGetX(HSQUIRRELVM vm) {
-    Rect* r = getValueInstance<Rect>(vm, 1);
-    sq_pushfloat(vm, r->origin.x);
-    return 1;
-}
-
-static SQInteger rectGetY(HSQUIRRELVM vm) {
-    Rect* r = getValueInstance<Rect>(vm, 1);
-    sq_pushfloat(vm, r->origin.y);
-    return 1;
-}
-
-static SQInteger rectGetWidth(HSQUIRRELVM vm) {
-    Rect* r = getValueInstance<Rect>(vm, 1);
-    sq_pushfloat(vm, r->size.width);
-    return 1;
-}
-
-static SQInteger rectGetHeight(HSQUIRRELVM vm) {
-    Rect* r = getValueInstance<Rect>(vm, 1);
-    sq_pushfloat(vm, r->size.height);
-    return 1;
-}
-
-static SQInteger rectContainsPoint(HSQUIRRELVM vm) {
-    Rect* r = getValueInstance<Rect>(vm, 1);
-    Vec2* p = getValueInstance<Vec2>(vm, 2);
-    sq_pushbool(vm, r->containsPoint(*p) ? SQTrue : SQFalse);
-    return 1;
-}
-
-static SQInteger rectIntersects(HSQUIRRELVM vm) {
-    Rect* a = getValueInstance<Rect>(vm, 1);
-    Rect* b = getValueInstance<Rect>(vm, 2);
-    sq_pushbool(vm, a->intersects(*b) ? SQTrue : SQFalse);
-    return 1;
-}
-
-static SQInteger rectToString(HSQUIRRELVM vm) {
-    Rect* r = getValueInstance<Rect>(vm, 1);
-    char buf[96];
-    snprintf(buf, sizeof(buf), "Rect(%.1f, %.1f, %.1f, %.1f)",
-             r->origin.x, r->origin.y, r->size.width, r->size.height);
-    sq_pushstring(vm, buf, -1);
-    return 1;
-}
-
-void registerRect(HSQUIRRELVM vm) {
-    ClassDef(vm, "Rect")
-        .setValueType<Rect>(rectConstructor)
-        .method("getX", rectGetX)
-        .method("getY", rectGetY)
-        .method("getWidth", rectGetWidth)
-        .method("getHeight", rectGetHeight)
-        .method("containsPoint", rectContainsPoint, 2, "xx")
-        .method("intersects", rectIntersects, 2, "xx")
-        .method("_tostring", rectToString)
-        .commit();
-}
-
-// ============================================================================
-// Color
-// ============================================================================
-static SQInteger colorConstructor(HSQUIRRELVM vm) {
-    Color* self = nullptr;
-    sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer*>(&self), nullptr, SQFalse);
-    SQInteger argc = sq_gettop(vm);
-    if (argc >= 5) {
-        self->r = static_cast<float>(getFloat(vm, 2));
-        self->g = static_cast<float>(getFloat(vm, 3));
-        self->b = static_cast<float>(getFloat(vm, 4));
-        self->a = static_cast<float>(getFloat(vm, 5));
-    } else if (argc >= 4) {
-        self->r = static_cast<float>(getFloat(vm, 2));
-        self->g = static_cast<float>(getFloat(vm, 3));
-        self->b = static_cast<float>(getFloat(vm, 4));
-        self->a = 1.0f;
-    } else {
-        *self = Color(1.0f, 1.0f, 1.0f, 1.0f);
-    }
-    return 0;
-}
-
-static SQInteger colorGetR(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); sq_pushfloat(vm, c->r); return 1; }
-static SQInteger colorGetG(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); sq_pushfloat(vm, c->g); return 1; }
-static SQInteger colorGetB(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); sq_pushfloat(vm, c->b); return 1; }
-static SQInteger colorGetA(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); sq_pushfloat(vm, c->a); return 1; }
-
-static SQInteger colorSetR(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); c->r = static_cast<float>(getFloat(vm, 2)); return 0; }
-static SQInteger colorSetG(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); c->g = static_cast<float>(getFloat(vm, 2)); return 0; }
-static SQInteger colorSetB(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); c->b = static_cast<float>(getFloat(vm, 2)); return 0; }
-static SQInteger colorSetA(HSQUIRRELVM vm) { Color* c = getValueInstance<Color>(vm, 1); c->a = static_cast<float>(getFloat(vm, 2)); return 0; }
-
-static SQInteger colorFromRGBA(HSQUIRRELVM vm) {
-    auto r = static_cast<uint8_t>(getInt(vm, 2));
-    auto g = static_cast<uint8_t>(getInt(vm, 3));
-    auto b = static_cast<uint8_t>(getInt(vm, 4));
-    uint8_t a = 255;
-    if (sq_gettop(vm) >= 5)
-        a = static_cast<uint8_t>(getInt(vm, 5));
-    pushValueInstance(vm, Color::fromRGBA(r, g, b, a));
-    return 1;
-}
-
-static SQInteger colorToString(HSQUIRRELVM vm) {
-    Color* c = getValueInstance<Color>(vm, 1);
-    char buf[80];
-    snprintf(buf, sizeof(buf), "Color(%.3f, %.3f, %.3f, %.3f)", c->r, c->g, c->b, c->a);
-    sq_pushstring(vm, buf, -1);
-    return 1;
-}
-
-void registerColor(HSQUIRRELVM vm) {
-    ClassDef(vm, "Color")
-        .setValueType<Color>(colorConstructor)
-        .method("getR", colorGetR)
-        .method("setR", colorSetR)
-        .method("getG", colorGetG)
-        .method("setG", colorSetG)
-        .method("getB", colorGetB)
-        .method("setB", colorSetB)
-        .method("getA", colorGetA)
-        .method("setA", colorSetA)
-        .staticMethod("fromRGBA", colorFromRGBA)
-        .method("_tostring", colorToString)
-        .commit();
-}
-
-// ============================================================================
-// Register all value types
-// ============================================================================
-void registerValueTypes(HSQUIRRELVM vm) {
-    registerVec2(vm);
-    registerSize(vm);
-    registerRect(vm);
-    registerColor(vm);
-}
-
-} // namespace sq
-} // namespace easy2d
diff --git a/Easy2D/src/spatial/quadtree.cpp b/Easy2D/src/spatial/quadtree.cpp
deleted file mode 100644
index 8fc473d..0000000
--- a/Easy2D/src/spatial/quadtree.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#include <easy2d/spatial/quadtree.h>
-#include <easy2d/scene/node.h>
-#include <algorithm>
-#include <functional>
-
-namespace easy2d {
-
-QuadTree::QuadTreeNode::QuadTreeNode(const Rect& bounds, int level)
-    : bounds(bounds), level(level) {}
-
-bool QuadTree::QuadTreeNode::contains(const Rect& rect) const {
-    return bounds.contains(rect);
-}
-
-bool QuadTree::QuadTreeNode::intersects(const Rect& rect) const {
-    return bounds.intersects(rect);
-}
-
-QuadTree::QuadTree(const Rect& worldBounds)
-    : worldBounds_(worldBounds) {
-    root_ = std::make_unique<QuadTreeNode>(worldBounds, 0);
-}
-
-void QuadTree::insert(Node* node, const Rect& bounds) {
-    if (!node || !root_->intersects(bounds)) return;
-    insertIntoNode(root_.get(), node, bounds);
-    objectCount_++;
-}
-
-void QuadTree::insertIntoNode(QuadTreeNode* node, Node* object, const Rect& bounds) {
-    if (node->children[0]) {
-        int index = -1;
-        float midX = node->bounds.origin.x + node->bounds.size.width / 2.0f;
-        float midY = node->bounds.origin.y + node->bounds.size.height / 2.0f;
-
-        bool top = bounds.origin.y + bounds.size.height <= midY;
-        bool bottom = bounds.origin.y >= midY;
-        bool left = bounds.origin.x + bounds.size.width <= midX;
-        bool right = bounds.origin.x >= midX;
-
-        if (top && left) index = 0;
-        else if (top && right) index = 1;
-        else if (bottom && left) index = 2;
-        else if (bottom && right) index = 3;
-
-        if (index != -1) {
-            insertIntoNode(node->children[index].get(), object, bounds);
-            return;
-        }
-    }
-
-    node->objects.emplace_back(object, bounds);
-
-    if (node->objects.size() > MAX_OBJECTS && node->level < MAX_LEVELS) {
-        if (!node->children[0]) {
-            split(node);
-        }
-    }
-}
-
-void QuadTree::split(QuadTreeNode* node) {
-    float midX = node->bounds.origin.x + node->bounds.size.width / 2.0f;
-    float midY = node->bounds.origin.y + node->bounds.size.height / 2.0f;
-
-    node->children[0] = std::make_unique<QuadTreeNode>(
-        Rect(node->bounds.origin.x, node->bounds.origin.y, node->bounds.size.width / 2.0f, node->bounds.size.height / 2.0f),
-        node->level + 1);
-    node->children[1] = std::make_unique<QuadTreeNode>(
-        Rect(midX, node->bounds.origin.y, node->bounds.size.width / 2.0f, node->bounds.size.height / 2.0f),
-        node->level + 1);
-    node->children[2] = std::make_unique<QuadTreeNode>(
-        Rect(node->bounds.origin.x, midY, node->bounds.size.width / 2.0f, node->bounds.size.height / 2.0f),
-        node->level + 1);
-    node->children[3] = std::make_unique<QuadTreeNode>(
-        Rect(midX, midY, node->bounds.size.width / 2.0f, node->bounds.size.height / 2.0f),
-        node->level + 1);
-
-    auto objects = std::move(node->objects);
-    node->objects.clear();
-
-    for (const auto& [obj, bounds] : objects) {
-        insertIntoNode(node, obj, bounds);
-    }
-}
-
-void QuadTree::remove(Node* node) {
-    if (!node) return;
-    if (removeFromNode(root_.get(), node)) {
-        objectCount_--;
-    }
-}
-
-bool QuadTree::removeFromNode(QuadTreeNode* node, Node* object) {
-    auto it = std::find_if(node->objects.begin(), node->objects.end(),
-        [object](const auto& pair) { return pair.first == object; });
-    
-    if (it != node->objects.end()) {
-        node->objects.erase(it);
-        return true;
-    }
-
-    if (node->children[0]) {
-        for (auto& child : node->children) {
-            if (removeFromNode(child.get(), object)) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-void QuadTree::update(Node* node, const Rect& newBounds) {
-    remove(node);
-    insert(node, newBounds);
-}
-
-std::vector<Node*> QuadTree::query(const Rect& area) const {
-    std::vector<Node*> results;
-    queryNode(root_.get(), area, results);
-    return results;
-}
-
-void QuadTree::queryNode(const QuadTreeNode* node, const Rect& area, std::vector<Node*>& results) const {
-    if (!node || !node->intersects(area)) return;
-
-    for (const auto& [obj, bounds] : node->objects) {
-        if (bounds.intersects(area)) {
-            results.push_back(obj);
-        }
-    }
-
-    if (node->children[0]) {
-        for (const auto& child : node->children) {
-            queryNode(child.get(), area, results);
-        }
-    }
-}
-
-std::vector<Node*> QuadTree::query(const Vec2& point) const {
-    std::vector<Node*> results;
-    queryNode(root_.get(), point, results);
-    return results;
-}
-
-void QuadTree::queryNode(const QuadTreeNode* node, const Vec2& point, std::vector<Node*>& results) const {
-    if (!node || !node->bounds.containsPoint(point)) return;
-
-    for (const auto& [obj, bounds] : node->objects) {
-        if (bounds.containsPoint(point)) {
-            results.push_back(obj);
-        }
-    }
-
-    if (node->children[0]) {
-        for (const auto& child : node->children) {
-            queryNode(child.get(), point, results);
-        }
-    }
-}
-
-std::vector<std::pair<Node*, Node*>> QuadTree::queryCollisions() const {
-    std::vector<std::pair<Node*, Node*>> collisions;
-    collectCollisions(root_.get(), collisions);
-    return collisions;
-}
-
-void QuadTree::collectCollisions(const QuadTreeNode* node, std::vector<std::pair<Node*, Node*>>& collisions) const {
-    if (!node) return;
-
-    std::vector<std::pair<Node*, Rect>> ancestors;
-    ancestors.reserve(objectCount_);
-
-    std::function<void(const QuadTreeNode*)> visit = [&](const QuadTreeNode* current) {
-        if (!current) return;
-
-        for (const auto& [obj, bounds] : current->objects) {
-            for (const auto& [ancestorObj, ancestorBounds] : ancestors) {
-                if (bounds.intersects(ancestorBounds)) {
-                    collisions.emplace_back(ancestorObj, obj);
-                }
-            }
-        }
-
-        for (size_t i = 0; i < current->objects.size(); ++i) {
-            for (size_t j = i + 1; j < current->objects.size(); ++j) {
-                if (current->objects[i].second.intersects(current->objects[j].second)) {
-                    collisions.emplace_back(current->objects[i].first, current->objects[j].first);
-                }
-            }
-        }
-
-        size_t oldSize = ancestors.size();
-        ancestors.insert(ancestors.end(), current->objects.begin(), current->objects.end());
-
-        if (current->children[0]) {
-            for (const auto& child : current->children) {
-                visit(child.get());
-            }
-        }
-
-        ancestors.resize(oldSize);
-    };
-
-    visit(node);
-}
-
-void QuadTree::clear() {
-    root_ = std::make_unique<QuadTreeNode>(worldBounds_, 0);
-    objectCount_ = 0;
-}
-
-size_t QuadTree::size() const {
-    return objectCount_;
-}
-
-bool QuadTree::empty() const {
-    return objectCount_ == 0;
-}
-
-void QuadTree::rebuild() {
-    std::vector<std::pair<Node*, Rect>> allObjects;
-    
-    std::function<void(QuadTreeNode*)> collect = [&](QuadTreeNode* node) {
-        if (!node) return;
-        for (const auto& obj : node->objects) {
-            allObjects.push_back(obj);
-        }
-        if (node->children[0]) {
-            for (auto& child : node->children) {
-                collect(child.get());
-            }
-        }
-    };
-    
-    collect(root_.get());
-    clear();
-    
-    for (const auto& [obj, bounds] : allObjects) {
-        insert(obj, bounds);
-    }
-}
-
-}
diff --git a/Easy2D/src/spatial/spatial_hash.cpp b/Easy2D/src/spatial/spatial_hash.cpp
deleted file mode 100644
index 866f753..0000000
--- a/Easy2D/src/spatial/spatial_hash.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <easy2d/spatial/spatial_hash.h>
-#include <easy2d/scene/node.h>
-#include <cstdint>
-
-namespace easy2d {
-
-SpatialHash::SpatialHash(float cellSize) : cellSize_(cellSize) {}
-
-SpatialHash::CellKey SpatialHash::getCellKey(float x, float y) const {
-    int64_t cellX = static_cast<int64_t>(std::floor(x / cellSize_));
-    int64_t cellY = static_cast<int64_t>(std::floor(y / cellSize_));
-    return {cellX, cellY};
-}
-
-void SpatialHash::getCellsForRect(const Rect& rect, std::vector<CellKey>& cells) const {
-    cells.clear();
-    
-    CellKey minCell = getCellKey(rect.origin.x, rect.origin.y);
-    CellKey maxCell = getCellKey(rect.origin.x + rect.size.width, rect.origin.y + rect.size.height);
-    
-    for (int64_t x = minCell.first; x <= maxCell.first; ++x) {
-        for (int64_t y = minCell.second; y <= maxCell.second; ++y) {
-            cells.emplace_back(x, y);
-        }
-    }
-}
-
-void SpatialHash::insertIntoCells(Node* node, const Rect& bounds) {
-    std::vector<CellKey> cells;
-    getCellsForRect(bounds, cells);
-    
-    for (const auto& cell : cells) {
-        grid_[cell].insert(node);
-    }
-}
-
-void SpatialHash::removeFromCells(Node* node, const Rect& bounds) {
-    std::vector<CellKey> cells;
-    getCellsForRect(bounds, cells);
-    
-    for (const auto& cell : cells) {
-        auto it = grid_.find(cell);
-        if (it != grid_.end()) {
-            it->second.erase(node);
-            if (it->second.empty()) {
-                grid_.erase(it);
-            }
-        }
-    }
-}
-
-void SpatialHash::insert(Node* node, const Rect& bounds) {
-    if (!node) return;
-    
-    insertIntoCells(node, bounds);
-    objectBounds_[node] = bounds;
-    objectCount_++;
-}
-
-void SpatialHash::remove(Node* node) {
-    if (!node) return;
-    
-    auto it = objectBounds_.find(node);
-    if (it != objectBounds_.end()) {
-        removeFromCells(node, it->second);
-        objectBounds_.erase(it);
-        objectCount_--;
-    }
-}
-
-void SpatialHash::update(Node* node, const Rect& newBounds) {
-    auto it = objectBounds_.find(node);
-    if (it != objectBounds_.end()) {
-        removeFromCells(node, it->second);
-        insertIntoCells(node, newBounds);
-        it->second = newBounds;
-    }
-}
-
-std::vector<Node*> SpatialHash::query(const Rect& area) const {
-    std::vector<Node*> results;
-    std::unordered_set<Node*> found;
-    
-    std::vector<CellKey> cells;
-    getCellsForRect(area, cells);
-    
-    for (const auto& cell : cells) {
-        auto it = grid_.find(cell);
-        if (it != grid_.end()) {
-            for (Node* node : it->second) {
-                if (found.insert(node).second) {
-                    auto boundsIt = objectBounds_.find(node);
-                    if (boundsIt != objectBounds_.end() && boundsIt->second.intersects(area)) {
-                        results.push_back(node);
-                    }
-                }
-            }
-        }
-    }
-    
-    return results;
-}
-
-std::vector<Node*> SpatialHash::query(const Vec2& point) const {
-    std::vector<Node*> results;
-    
-    CellKey cell = getCellKey(point.x, point.y);
-    auto it = grid_.find(cell);
-    
-    if (it != grid_.end()) {
-        for (Node* node : it->second) {
-            auto boundsIt = objectBounds_.find(node);
-            if (boundsIt != objectBounds_.end() && boundsIt->second.containsPoint(point)) {
-                results.push_back(node);
-            }
-        }
-    }
-    
-    return results;
-}
-
-std::vector<std::pair<Node*, Node*>> SpatialHash::queryCollisions() const {
-    std::vector<std::pair<Node*, Node*>> collisions;
-    struct PairHash {
-        size_t operator()(const std::pair<Node*, Node*>& p) const noexcept {
-            auto a = reinterpret_cast<std::uintptr_t>(p.first);
-            auto b = reinterpret_cast<std::uintptr_t>(p.second);
-            return std::hash<std::uintptr_t>{}(a) ^ (std::hash<std::uintptr_t>{}(b) << 1);
-        }
-    };
-    auto makeOrdered = [](Node* a, Node* b) -> std::pair<Node*, Node*> {
-        return a < b ? std::make_pair(a, b) : std::make_pair(b, a);
-    };
-
-    std::unordered_set<std::pair<Node*, Node*>, PairHash> seen;
-    seen.reserve(objectCount_ * 2);
-    
-    for (const auto& [cell, objects] : grid_) {
-        std::vector<Node*> cellObjects(objects.begin(), objects.end());
-        
-        for (size_t i = 0; i < cellObjects.size(); ++i) {
-            auto bounds1 = objectBounds_.find(cellObjects[i]);
-            if (bounds1 == objectBounds_.end()) continue;
-            
-            for (size_t j = i + 1; j < cellObjects.size(); ++j) {
-                auto bounds2 = objectBounds_.find(cellObjects[j]);
-                if (bounds2 == objectBounds_.end()) continue;
-                
-                if (bounds1->second.intersects(bounds2->second)) {
-                    auto key = makeOrdered(cellObjects[i], cellObjects[j]);
-                    if (seen.insert(key).second) {
-                        collisions.emplace_back(key.first, key.second);
-                    }
-                }
-            }
-        }
-    }
-    
-    return collisions;
-}
-
-void SpatialHash::clear() {
-    grid_.clear();
-    objectBounds_.clear();
-    objectCount_ = 0;
-}
-
-size_t SpatialHash::size() const {
-    return objectCount_;
-}
-
-bool SpatialHash::empty() const {
-    return objectCount_ == 0;
-}
-
-void SpatialHash::rebuild() {
-    auto bounds = objectBounds_;
-    clear();
-    
-    for (const auto& [node, bound] : bounds) {
-        insert(node, bound);
-    }
-}
-
-void SpatialHash::setCellSize(float cellSize) {
-    if (cellSize != cellSize_ && cellSize > 0) {
-        cellSize_ = cellSize;
-        rebuild();
-    }
-}
-
-}
diff --git a/Easy2D/src/spatial/spatial_manager.cpp b/Easy2D/src/spatial/spatial_manager.cpp
deleted file mode 100644
index 41c29fd..0000000
--- a/Easy2D/src/spatial/spatial_manager.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-#include <easy2d/spatial/spatial_manager.h>
-#include <easy2d/spatial/quadtree.h>
-#include <easy2d/spatial/spatial_hash.h>
-#include <easy2d/scene/node.h>
-#include <chrono>
-
-namespace easy2d {
-
-SpatialManager::SpatialManager() 
-    : worldBounds_(0, 0, 10000, 10000) {
-    selectOptimalStrategy();
-}
-
-SpatialManager::SpatialManager(const Rect& worldBounds)
-    : worldBounds_(worldBounds) {
-    selectOptimalStrategy();
-}
-
-void SpatialManager::setStrategy(SpatialStrategy strategy) {
-    if (currentStrategy_ == strategy) return;
-    
-    currentStrategy_ = strategy;
-    rebuild();
-}
-
-void SpatialManager::setAutoThresholds(size_t quadTreeThreshold, size_t hashThreshold) {
-    quadTreeThreshold_ = quadTreeThreshold;
-    hashThreshold_ = hashThreshold;
-    
-    if (currentStrategy_ == SpatialStrategy::Auto) {
-        selectOptimalStrategy();
-    }
-}
-
-void SpatialManager::setWorldBounds(const Rect& bounds) {
-    worldBounds_ = bounds;
-    rebuild();
-}
-
-void SpatialManager::insert(Node* node, const Rect& bounds) {
-    if (!index_) {
-        selectOptimalStrategy();
-    }
-    
-    if (index_) {
-        index_->insert(node, bounds);
-    }
-}
-
-void SpatialManager::remove(Node* node) {
-    if (index_) {
-        index_->remove(node);
-    }
-}
-
-void SpatialManager::update(Node* node, const Rect& newBounds) {
-    if (index_) {
-        index_->update(node, newBounds);
-    }
-}
-
-std::vector<Node*> SpatialManager::query(const Rect& area) const {
-    if (!index_) return {};
-    
-    auto start = std::chrono::high_resolution_clock::now();
-    auto results = index_->query(area);
-    auto end = std::chrono::high_resolution_clock::now();
-    
-    queryCount_++;
-    totalQueryTime_ += std::chrono::duration_cast<std::chrono::microseconds>(end - start).count();
-    
-    return results;
-}
-
-std::vector<Node*> SpatialManager::query(const Vec2& point) const {
-    if (!index_) return {};
-    return index_->query(point);
-}
-
-std::vector<std::pair<Node*, Node*>> SpatialManager::queryCollisions() const {
-    if (!index_) return {};
-    return index_->queryCollisions();
-}
-
-void SpatialManager::query(const Rect& area, const QueryCallback& callback) const {
-    auto results = query(area);
-    for (Node* node : results) {
-        if (!callback(node)) break;
-    }
-}
-
-void SpatialManager::query(const Vec2& point, const QueryCallback& callback) const {
-    auto results = query(point);
-    for (Node* node : results) {
-        if (!callback(node)) break;
-    }
-}
-
-void SpatialManager::clear() {
-    if (index_) {
-        index_->clear();
-    }
-}
-
-size_t SpatialManager::size() const {
-    return index_ ? index_->size() : 0;
-}
-
-bool SpatialManager::empty() const {
-    return index_ ? index_->empty() : true;
-}
-
-void SpatialManager::rebuild() {
-    if (!index_) {
-        selectOptimalStrategy();
-        return;
-    }
-    
-    auto oldIndex = std::move(index_);
-    selectOptimalStrategy();
-    
-    if (index_ && oldIndex) {
-        auto bounds = Rect(worldBounds_);
-        auto objects = oldIndex->query(bounds);
-        for (Node* node : objects) {
-            if (node) {
-                auto nodeBounds = node->getBoundingBox();
-                index_->insert(node, nodeBounds);
-            }
-        }
-    }
-}
-
-void SpatialManager::optimize() {
-    if (currentStrategy_ == SpatialStrategy::Auto) {
-        selectOptimalStrategy();
-    }
-    
-    if (index_) {
-        index_->rebuild();
-    }
-}
-
-SpatialStrategy SpatialManager::getCurrentStrategy() const {
-    return activeStrategy_;
-}
-
-const char* SpatialManager::getStrategyName() const {
-    switch (activeStrategy_) {
-        case SpatialStrategy::QuadTree: return "QuadTree";
-        case SpatialStrategy::SpatialHash: return "SpatialHash";
-        default: return "Unknown";
-    }
-}
-
-std::unique_ptr<ISpatialIndex> SpatialManager::createIndex(SpatialStrategy strategy, const Rect& bounds) {
-    switch (strategy) {
-        case SpatialStrategy::QuadTree:
-            return std::make_unique<QuadTree>(bounds);
-        case SpatialStrategy::SpatialHash:
-            return std::make_unique<SpatialHash>(64.0f);
-        default:
-            return std::make_unique<QuadTree>(bounds);
-    }
-}
-
-void SpatialManager::selectOptimalStrategy() {
-    if (currentStrategy_ != SpatialStrategy::Auto) {
-        activeStrategy_ = currentStrategy_;
-    } else {
-        size_t currentSize = index_ ? index_->size() : 0;
-        
-        if (currentSize < quadTreeThreshold_) {
-            activeStrategy_ = SpatialStrategy::QuadTree;
-        } else if (currentSize > hashThreshold_) {
-            activeStrategy_ = SpatialStrategy::SpatialHash;
-        } else {
-            // Keep current strategy in transition zone
-            if (!index_) {
-                activeStrategy_ = SpatialStrategy::QuadTree;
-            }
-        }
-    }
-    
-    index_ = createIndex(activeStrategy_, worldBounds_);
-}
-
-}
diff --git a/Easy2D/src/ui/button.cpp b/Easy2D/src/ui/button.cpp
deleted file mode 100644
index bc31bd0..0000000
--- a/Easy2D/src/ui/button.cpp
+++ /dev/null
@@ -1,683 +0,0 @@
-#include <easy2d/ui/button.h>
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/app/application.h>
-#include <algorithm>
-#include <cmath>
-
-namespace easy2d {
-
-/**
- * @brief 构造函数，初始化按钮状态并设置事件监听器
- */
-Button::Button() {
-    setSpatialIndexed(false);
-    auto& dispatcher = getEventDispatcher();
-    dispatcher.addListener(EventType::UIHoverEnter, [this](Event&) {
-        hovered_ = true;
-        // 鼠标进入按钮区域，改变光标为手型
-        auto& app = Application::instance();
-        app.window().setCursor(hoverCursor_);
-        cursorChanged_ = true;
-    });
-    dispatcher.addListener(EventType::UIHoverExit, [this](Event&) {
-        hovered_ = false;
-        pressed_ = false;
-        // 鼠标离开按钮区域，恢复默认光标
-        if (cursorChanged_) {
-            auto& app = Application::instance();
-            app.window().resetCursor();
-            cursorChanged_ = false;
-        }
-    });
-    dispatcher.addListener(EventType::UIPressed, [this](Event&) { pressed_ = true; });
-    dispatcher.addListener(EventType::UIReleased, [this](Event&) { pressed_ = false; });
-    dispatcher.addListener(EventType::UIClicked, [this](Event&) { if (onClick_) onClick_(); });
-}
-
-/**
- * @brief 创建按钮实例的工厂方法
- * @return 按钮智能指针
- */
-Ptr<Button> Button::create() {
-    return makePtr<Button>();
-}
-
-/**
- * @brief 设置按钮文字，并根据文字大小自动调整按钮尺寸
- * @param text 要显示的文字
- */
-void Button::setText(const String& text) {
-    text_ = text;
-    if (font_ && getSize().empty()) {
-        Vec2 textSize = font_->measureText(text_);
-        setSize(textSize.x + padding_.x * 2.0f, textSize.y + padding_.y * 2.0f);
-    }
-}
-
-/**
- * @brief 设置字体，并根据当前文字自动调整按钮尺寸
- * @param font 字体图集
- */
-void Button::setFont(Ptr<FontAtlas> font) {
-    font_ = font;
-    if (font_ && getSize().empty() && !text_.empty()) {
-        Vec2 textSize = font_->measureText(text_);
-        setSize(textSize.x + padding_.x * 2.0f, textSize.y + padding_.y * 2.0f);
-    }
-}
-
-/**
- * @brief 设置内边距，并根据当前文字自动调整按钮尺寸
- * @param padding 内边距向量
- */
-void Button::setPadding(const Vec2& padding) {
-    padding_ = padding;
-    if (font_ && getSize().empty() && !text_.empty()) {
-        Vec2 textSize = font_->measureText(text_);
-        setSize(textSize.x + padding_.x * 2.0f, textSize.y + padding_.y * 2.0f);
-    }
-}
-
-/**
- * @brief 设置文字颜色
- * @param color 颜色值
- */
-void Button::setTextColor(const Color& color) {
-    textColor_ = color;
-}
-
-/**
- * @brief 设置纯色背景的颜色状态
- * @param normal 正常状态颜色
- * @param hover 悬停状态颜色
- * @param pressed 按下状态颜色
- */
-void Button::setBackgroundColor(const Color& normal, const Color& hover, const Color& pressed) {
-    bgNormal_ = normal;
-    bgHover_ = hover;
-    bgPressed_ = pressed;
-}
-
-/**
- * @brief 设置边框样式
- * @param color 边框颜色
- * @param width 边框宽度
- */
-void Button::setBorder(const Color& color, float width) {
-    borderColor_ = color;
-    borderWidth_ = width;
-}
-
-/**
- * @brief 设置圆角半径
- * @param radius 圆角半径（像素）
- */
-void Button::setCornerRadius(float radius) {
-    cornerRadius_ = std::max(0.0f, radius);
-}
-
-/**
- * @brief 设置是否启用圆角矩形
- * @param enabled 是否启用
- */
-void Button::setRoundedCornersEnabled(bool enabled) {
-    roundedCornersEnabled_ = enabled;
-}
-
-/**
- * @brief 设置是否使用Alpha遮罩进行点击检测（用于不规则形状按钮）
- * @param enabled 是否启用
- */
-void Button::setUseAlphaMaskForHitTest(bool enabled) {
-    useAlphaMaskForHitTest_ = enabled;
-}
-
-/**
- * @brief 设置点击回调函数
- * @param callback 回调函数
- */
-void Button::setOnClick(Function<void()> callback) {
-    onClick_ = std::move(callback);
-}
-
-/**
- * @brief 设置悬停时的鼠标光标形状
- * @param cursor 光标形状枚举
- */
-void Button::setHoverCursor(CursorShape cursor) {
-    hoverCursor_ = cursor;
-}
-
-/**
- * @brief 设置背景图片，支持三种状态
- * @param normal 正常状态图片
- * @param hover 悬停状态图片（可选）
- * @param pressed 按下状态图片（可选）
- */
-void Button::setBackgroundImage(Ptr<Texture> normal, Ptr<Texture> hover, Ptr<Texture> pressed) {
-    imgNormal_ = normal;
-    imgHover_ = hover ? hover : normal;
-    imgPressed_ = pressed ? pressed : (hover ? hover : normal);
-    useImageBackground_ = (normal != nullptr);
-
-    // 如果使用原图大小模式，设置按钮大小为图片大小
-    if (useImageBackground_ && scaleMode_ == ImageScaleMode::Original && normal) {
-        setSize(static_cast<float>(normal->getWidth()), static_cast<float>(normal->getHeight()));
-    }
-}
-
-/**
- * @brief 设置图片缩放模式
- * @param mode 缩放模式枚举值
- */
-void Button::setBackgroundImageScaleMode(ImageScaleMode mode) {
-    scaleMode_ = mode;
-    // 如果切换到原图大小模式，更新按钮大小
-    if (useImageBackground_ && scaleMode_ == ImageScaleMode::Original && imgNormal_) {
-        setSize(static_cast<float>(imgNormal_->getWidth()), static_cast<float>(imgNormal_->getHeight()));
-    }
-}
-
-/**
- * @brief 设置自定义尺寸
- * @param size 尺寸向量
- */
-void Button::setCustomSize(const Vec2& size) {
-    setSize(size.x, size.y);
-}
-
-/**
- * @brief 设置自定义尺寸
- * @param width 宽度
- * @param height 高度
- */
-void Button::setCustomSize(float width, float height) {
-    setSize(width, height);
-}
-
-/**
- * @brief 根据缩放模式计算图片绘制尺寸
- * @param buttonSize 按钮尺寸
- * @param imageSize 图片原始尺寸
- * @return 计算后的绘制尺寸
- */
-Vec2 Button::calculateImageSize(const Vec2& buttonSize, const Vec2& imageSize) {
-    switch (scaleMode_) {
-        case ImageScaleMode::Original:
-            return imageSize;
-
-        case ImageScaleMode::Stretch:
-            return buttonSize;
-
-        case ImageScaleMode::ScaleFit: {
-            float scaleX = buttonSize.x / imageSize.x;
-            float scaleY = buttonSize.y / imageSize.y;
-            float scale = std::min(scaleX, scaleY);
-            return Vec2(imageSize.x * scale, imageSize.y * scale);
-        }
-
-        case ImageScaleMode::ScaleFill: {
-            float scaleX = buttonSize.x / imageSize.x;
-            float scaleY = buttonSize.y / imageSize.y;
-            float scale = std::max(scaleX, scaleY);
-            return Vec2(imageSize.x * scale, imageSize.y * scale);
-        }
-    }
-    return imageSize;
-}
-
-/**
- * @brief 绘制背景图片，根据当前状态选择对应的图片
- * @param renderer 渲染后端
- * @param rect 按钮矩形区域
- */
-void Button::drawBackgroundImage(RenderBackend& renderer, const Rect& rect) {
-    Texture* texture = nullptr;
-    if (pressed_ && imgPressed_) {
-        texture = imgPressed_.get();
-    } else if (hovered_ && imgHover_) {
-        texture = imgHover_.get();
-    } else if (imgNormal_) {
-        texture = imgNormal_.get();
-    }
-
-    if (!texture) return;
-
-    Vec2 imageSize(static_cast<float>(texture->getWidth()), static_cast<float>(texture->getHeight()));
-    Vec2 buttonSize(rect.size.width, rect.size.height);
-    Vec2 drawSize = calculateImageSize(buttonSize, imageSize);
-
-    // 计算绘制位置（居中）
-    Vec2 drawPos(
-        rect.origin.x + (rect.size.width - drawSize.x) * 0.5f,
-        rect.origin.y + (rect.size.height - drawSize.y) * 0.5f
-    );
-
-    Rect destRect(drawPos.x, drawPos.y, drawSize.x, drawSize.y);
-    
-    // 绘制图片（使用Alpha混合）
-    renderer.drawSprite(*texture, destRect, Rect(0, 0, imageSize.x, imageSize.y), Colors::White, 0.0f, Vec2::Zero());
-}
-
-/**
- * @brief 绘制圆角矩形边框
- * @param renderer 渲染后端
- * @param rect 矩形区域
- * @param color 颜色
- * @param radius 圆角半径
- */
-void Button::drawRoundedRect(RenderBackend& renderer, const Rect& rect, const Color& color, float radius) {
-    // 限制圆角半径不超过矩形尺寸的一半
-    float maxRadius = std::min(rect.size.width, rect.size.height) * 0.5f;
-    radius = std::min(radius, maxRadius);
-    
-    if (radius <= 0.0f) {
-        // 圆角为0，使用普通矩形
-        renderer.drawRect(rect, color, borderWidth_);
-        return;
-    }
-
-    const int segments = 8; // 每个圆角的线段数
-    float x = rect.origin.x;
-    float y = rect.origin.y;
-    float w = rect.size.width;
-    float h = rect.size.height;
-    float r = radius;
-
-    // 绘制四条直线边
-    // 上边
-    renderer.drawLine(Vec2(x + r, y), Vec2(x + w - r, y), color, borderWidth_);
-    // 下边
-    renderer.drawLine(Vec2(x + r, y + h), Vec2(x + w - r, y + h), color, borderWidth_);
-    // 左边
-    renderer.drawLine(Vec2(x, y + r), Vec2(x, y + h - r), color, borderWidth_);
-    // 右边
-    renderer.drawLine(Vec2(x + w, y + r), Vec2(x + w, y + h - r), color, borderWidth_);
-
-    // 绘制四个圆角（使用线段近似）
-    // 左上角
-    for (int i = 0; i < segments; i++) {
-        float angle1 = 3.14159f * 0.5f * (float)i / segments + 3.14159f;
-        float angle2 = 3.14159f * 0.5f * (float)(i + 1) / segments + 3.14159f;
-        Vec2 p1(x + r + r * cosf(angle1), y + r + r * sinf(angle1));
-        Vec2 p2(x + r + r * cosf(angle2), y + r + r * sinf(angle2));
-        renderer.drawLine(p1, p2, color, borderWidth_);
-    }
-    // 右上角
-    for (int i = 0; i < segments; i++) {
-        float angle1 = 3.14159f * 0.5f * (float)i / segments + 3.14159f * 1.5f;
-        float angle2 = 3.14159f * 0.5f * (float)(i + 1) / segments + 3.14159f * 1.5f;
-        Vec2 p1(x + w - r + r * cosf(angle1), y + r + r * sinf(angle1));
-        Vec2 p2(x + w - r + r * cosf(angle2), y + r + r * sinf(angle2));
-        renderer.drawLine(p1, p2, color, borderWidth_);
-    }
-    // 右下角
-    for (int i = 0; i < segments; i++) {
-        float angle1 = 3.14159f * 0.5f * (float)i / segments;
-        float angle2 = 3.14159f * 0.5f * (float)(i + 1) / segments;
-        Vec2 p1(x + w - r + r * cosf(angle1), y + h - r + r * sinf(angle1));
-        Vec2 p2(x + w - r + r * cosf(angle2), y + h - r + r * sinf(angle2));
-        renderer.drawLine(p1, p2, color, borderWidth_);
-    }
-    // 左下角
-    for (int i = 0; i < segments; i++) {
-        float angle1 = 3.14159f * 0.5f * (float)i / segments + 3.14159f * 0.5f;
-        float angle2 = 3.14159f * 0.5f * (float)(i + 1) / segments + 3.14159f * 0.5f;
-        Vec2 p1(x + r + r * cosf(angle1), y + h - r + r * sinf(angle1));
-        Vec2 p2(x + r + r * cosf(angle2), y + h - r + r * sinf(angle2));
-        renderer.drawLine(p1, p2, color, borderWidth_);
-    }
-}
-
-/**
- * @brief 填充圆角矩形
- * @param renderer 渲染后端
- * @param rect 矩形区域
- * @param color 颜色
- * @param radius 圆角半径
- */
-void Button::fillRoundedRect(RenderBackend& renderer, const Rect& rect, const Color& color, float radius) {
-    // 限制圆角半径不超过矩形尺寸的一半
-    float maxRadius = std::min(rect.size.width, rect.size.height) * 0.5f;
-    radius = std::min(radius, maxRadius);
-    
-    if (radius <= 0.0f) {
-        // 圆角为0，使用普通矩形填充
-        renderer.fillRect(rect, color);
-        return;
-    }
-
-    const int segments = 8; // 每个圆角的线段数
-    float x = rect.origin.x;
-    float y = rect.origin.y;
-    float w = rect.size.width;
-    float h = rect.size.height;
-    float r = radius;
-
-    // 构建圆角矩形的顶点（使用三角形扇形填充）
-    std::vector<Vec2> vertices;
-    
-    // 中心矩形区域
-    vertices.push_back(Vec2(x + r, y + r));           // 左上内角
-    vertices.push_back(Vec2(x + w - r, y + r));       // 右上内角
-    vertices.push_back(Vec2(x + w - r, y + h - r));   // 右下内角
-    vertices.push_back(Vec2(x + r, y + h - r));       // 左下内角
-    
-    renderer.fillPolygon(vertices, color);
-    
-    // 填充四个侧边矩形
-    // 上边
-    renderer.fillRect(Rect(x + r, y, w - 2 * r, r), color);
-    // 下边
-    renderer.fillRect(Rect(x + r, y + h - r, w - 2 * r, r), color);
-    // 左边
-    renderer.fillRect(Rect(x, y + r, r, h - 2 * r), color);
-    // 右边
-    renderer.fillRect(Rect(x + w - r, y + r, r, h - 2 * r), color);
-
-    // 填充四个圆角（使用扇形）
-    // 左上角
-    vertices.clear();
-    vertices.push_back(Vec2(x + r, y + r));
-    for (int i = 0; i <= segments; i++) {
-        float angle = 3.14159f + 3.14159f * 0.5f * (float)i / segments;
-        vertices.push_back(Vec2(x + r + r * cosf(angle), y + r + r * sinf(angle)));
-    }
-    renderer.fillPolygon(vertices, color);
-    
-    // 右上角
-    vertices.clear();
-    vertices.push_back(Vec2(x + w - r, y + r));
-    for (int i = 0; i <= segments; i++) {
-        float angle = 3.14159f * 1.5f + 3.14159f * 0.5f * (float)i / segments;
-        vertices.push_back(Vec2(x + w - r + r * cosf(angle), y + r + r * sinf(angle)));
-    }
-    renderer.fillPolygon(vertices, color);
-    
-    // 右下角
-    vertices.clear();
-    vertices.push_back(Vec2(x + w - r, y + h - r));
-    for (int i = 0; i <= segments; i++) {
-        float angle = 0 + 3.14159f * 0.5f * (float)i / segments;
-        vertices.push_back(Vec2(x + w - r + r * cosf(angle), y + h - r + r * sinf(angle)));
-    }
-    renderer.fillPolygon(vertices, color);
-    
-    // 左下角
-    vertices.clear();
-    vertices.push_back(Vec2(x + r, y + h - r));
-    for (int i = 0; i <= segments; i++) {
-        float angle = 3.14159f * 0.5f + 3.14159f * 0.5f * (float)i / segments;
-        vertices.push_back(Vec2(x + r + r * cosf(angle), y + h - r + r * sinf(angle)));
-    }
-    renderer.fillPolygon(vertices, color);
-}
-
-/**
- * @brief 按钮绘制主函数，按正确顺序渲染所有视觉元素
- * 
- * 渲染顺序：
- * 1. 背景（图片或纯色）- 最底层
- * 2. 边框 - 中间层
- * 3. 文字 - 最顶层
- * 
- * 注意：此方法在场景渲染的精灵批次中被调用。
- * 由于 fillRect 和 drawRect 使用形状渲染管线（与精灵批次不同），
- * 需要在调用它们之前结束精灵批次，然后在 drawText 之前重新开始。
- */
-void Button::onDraw(RenderBackend& renderer) {
-    Rect rect = getBoundingBox();
-    if (rect.empty()) {
-        return;
-    }
-
-    // ========== 第1层：绘制背景（图片或纯色）==========
-    if (useImageBackground_) {
-        // 图片背景使用精灵批次绘制
-        drawBackgroundImage(renderer, rect);
-    } else {
-        // 纯色背景使用 fillRect 或 fillRoundedRect 绘制
-        renderer.endSpriteBatch();
-        
-        Color bg = bgNormal_;
-        if (pressed_) {
-            bg = bgPressed_;
-        } else if (hovered_) {
-            bg = bgHover_;
-        }
-        
-        if (roundedCornersEnabled_) {
-            fillRoundedRect(renderer, rect, bg, cornerRadius_);
-        } else {
-            renderer.fillRect(rect, bg);
-        }
-        
-        renderer.beginSpriteBatch();
-    }
-
-    // ========== 第2层：绘制边框 ==========
-    renderer.endSpriteBatch();
-    
-    if (borderWidth_ > 0.0f) {
-        if (roundedCornersEnabled_) {
-            drawRoundedRect(renderer, rect, borderColor_, cornerRadius_);
-        } else {
-            renderer.drawRect(rect, borderColor_, borderWidth_);
-        }
-    }
-    
-    renderer.beginSpriteBatch();
-
-    // ========== 第3层：绘制文字 ==========
-    if (font_ && !text_.empty()) {
-        Vec2 textSize = font_->measureText(text_);
-        
-        Vec2 textPos(
-            rect.center().x - textSize.x * 0.5f,
-            rect.center().y - textSize.y * 0.5f
-        );
-
-        float minX = rect.left() + padding_.x;
-        float minY = rect.top() + padding_.y;
-        float maxX = rect.right() - padding_.x - textSize.x;
-        float maxY = rect.bottom() - padding_.y - textSize.y;
-        
-        textPos.x = std::max(minX, std::min(textPos.x, maxX));
-        textPos.y = std::max(minY, std::min(textPos.y, maxY));
-
-        Color finalTextColor = textColor_;
-        finalTextColor.a = 1.0f;
-        
-        renderer.drawText(*font_, text_, textPos, finalTextColor);
-    }
-}
-
-// ============================================================================
-// ToggleImageButton 实现
-// ============================================================================
-
-/**
- * @brief 切换按钮构造函数
- */
-ToggleImageButton::ToggleImageButton() {
-    setOnClick([this]() {
-        toggle();
-    });
-}
-
-/**
- * @brief 创建切换按钮实例的工厂方法
- * @return 切换按钮智能指针
- */
-Ptr<ToggleImageButton> ToggleImageButton::create() {
-    return makePtr<ToggleImageButton>();
-}
-
-/**
- * @brief 设置两种状态的图片
- * @param stateOffNormal 关闭状态-正常
- * @param stateOnNormal 开启状态-正常
- * @param stateOffHover 关闭状态-悬停（可选）
- * @param stateOnHover 开启状态-悬停（可选）
- * @param stateOffPressed 关闭状态-按下（可选）
- * @param stateOnPressed 开启状态-按下（可选）
- */
-void ToggleImageButton::setStateImages(Ptr<Texture> stateOffNormal, Ptr<Texture> stateOnNormal,
-                                        Ptr<Texture> stateOffHover, Ptr<Texture> stateOnHover,
-                                        Ptr<Texture> stateOffPressed, Ptr<Texture> stateOnPressed) {
-    imgOffNormal_ = stateOffNormal;
-    imgOnNormal_ = stateOnNormal;
-    imgOffHover_ = stateOffHover ? stateOffHover : stateOffNormal;
-    imgOnHover_ = stateOnHover ? stateOnHover : stateOnNormal;
-    imgOffPressed_ = stateOffPressed ? stateOffPressed : stateOffNormal;
-    imgOnPressed_ = stateOnPressed ? stateOnPressed : stateOnNormal;
-
-    if (imgOffNormal_) {
-        setSize(static_cast<float>(imgOffNormal_->getWidth()),
-                static_cast<float>(imgOffNormal_->getHeight()));
-    }
-}
-
-/**
- * @brief 设置开关状态
- * @param on 是否开启
- */
-void ToggleImageButton::setOn(bool on) {
-    if (isOn_ != on) {
-        isOn_ = on;
-        if (onStateChange_) {
-            onStateChange_(isOn_);
-        }
-    }
-}
-
-/**
- * @brief 切换当前状态
- */
-void ToggleImageButton::toggle() {
-    setOn(!isOn_);
-}
-
-/**
- * @brief 设置状态改变回调
- * @param callback 回调函数
- */
-void ToggleImageButton::setOnStateChange(Function<void(bool)> callback) {
-    onStateChange_ = std::move(callback);
-}
-
-/**
- * @brief 设置两种状态的文字
- * @param textOff 关闭状态文字
- * @param textOn 开启状态文字
- */
-void ToggleImageButton::setStateText(const String& textOff, const String& textOn) {
-    textOff_ = textOff;
-    textOn_ = textOn;
-    useStateText_ = true;
-}
-
-/**
- * @brief 设置两种状态的文字颜色
- * @param colorOff 关闭状态颜色
- * @param colorOn 开启状态颜色
- */
-void ToggleImageButton::setStateTextColor(const Color& colorOff, const Color& colorOn) {
-    textColorOff_ = colorOff;
-    textColorOn_ = colorOn;
-    useStateTextColor_ = true;
-}
-
-/**
- * @brief 切换按钮绘制主函数
- * 
- * 渲染顺序：
- * 1. 状态图片背景 - 最底层
- * 2. 边框 - 中间层
- * 3. 状态文字 - 最顶层
- */
-void ToggleImageButton::onDraw(RenderBackend& renderer) {
-    Rect rect = getBoundingBox();
-    if (rect.empty()) {
-        return;
-    }
-
-    // ========== 第1层：根据当前状态和交互状态选择并绘制图片 ==========
-    Ptr<Texture> texture = nullptr;
-
-    if (isOn_) {
-        if (isPressed() && imgOnPressed_) {
-            texture = imgOnPressed_;
-        } else if (isHovered() && imgOnHover_) {
-            texture = imgOnHover_;
-        } else {
-            texture = imgOnNormal_;
-        }
-    } else {
-        if (isPressed() && imgOffPressed_) {
-            texture = imgOffPressed_;
-        } else if (isHovered() && imgOffHover_) {
-            texture = imgOffHover_;
-        } else {
-            texture = imgOffNormal_;
-        }
-    }
-
-    if (texture) {
-        Vec2 imageSize(static_cast<float>(texture->getWidth()), static_cast<float>(texture->getHeight()));
-        Vec2 buttonSize(rect.size.width, rect.size.height);
-        Vec2 drawSize = imageSize;
-
-        Vec2 drawPos(
-            rect.origin.x + (buttonSize.x - drawSize.x) * 0.5f,
-            rect.origin.y + (buttonSize.y - drawSize.y) * 0.5f
-        );
-
-        Rect destRect(drawPos.x, drawPos.y, drawSize.x, drawSize.y);
-        renderer.drawSprite(*texture, destRect, Rect(0, 0, imageSize.x, imageSize.y), Colors::White, 0.0f, Vec2::Zero());
-    }
-
-    // ========== 第2层：绘制边框 ==========
-    renderer.endSpriteBatch();
-    
-    float borderWidth = 1.0f;
-    Color borderColor = isOn_ ? Color(0.0f, 1.0f, 0.0f, 0.8f) : Color(0.6f, 0.6f, 0.6f, 1.0f);
-    if (borderWidth > 0.0f) {
-        if (isRoundedCornersEnabled()) {
-            drawRoundedRect(renderer, rect, borderColor, getCornerRadius());
-        } else {
-            renderer.drawRect(rect, borderColor, borderWidth);
-        }
-    }
-    
-    renderer.beginSpriteBatch();
-
-    // ========== 第3层：绘制状态文字 ==========
-    auto font = getFont();
-    if (font) {
-        String textToDraw;
-        if (useStateText_) {
-            textToDraw = isOn_ ? textOn_ : textOff_;
-        } else {
-            textToDraw = getText();
-        }
-
-        Color colorToUse;
-        if (useStateTextColor_) {
-            colorToUse = isOn_ ? textColorOn_ : textColorOff_;
-        } else {
-            colorToUse = getTextColor();
-        }
-
-        if (!textToDraw.empty()) {
-            Vec2 textSize = font->measureText(textToDraw);
-            Vec2 textPos(rect.center().x - textSize.x * 0.5f, rect.center().y - textSize.y * 0.5f);
-            
-            colorToUse.a = 1.0f;
-            
-            renderer.drawText(*font, textToDraw, textPos, colorToUse);
-        }
-    }
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/ui/widget.cpp b/Easy2D/src/ui/widget.cpp
deleted file mode 100644
index b261bf6..0000000
--- a/Easy2D/src/ui/widget.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <easy2d/ui/widget.h>
-#include <cmath>
-
-namespace easy2d {
-
-Widget::Widget() {
-    setSpatialIndexed(false);
-}
-
-void Widget::setSize(const Size& size) {
-    size_ = size;
-    updateSpatialIndex();
-}
-
-void Widget::setSize(float width, float height) {
-    setSize(Size(width, height));
-}
-
-Rect Widget::getBoundingBox() const {
-    if (size_.empty()) {
-        return Rect();
-    }
-
-    auto pos = getPosition();
-    auto anchor = getAnchor();
-    auto scale = getScale();
-
-    float w = size_.width * scale.x;
-    float h = size_.height * scale.y;
-    float x0 = pos.x - size_.width * anchor.x * scale.x;
-    float y0 = pos.y - size_.height * anchor.y * scale.y;
-    float x1 = x0 + w;
-    float y1 = y0 + h;
-
-    float l = std::min(x0, x1);
-    float t = std::min(y0, y1);
-    return Rect(l, t, std::abs(w), std::abs(h));
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/utils/data.cpp b/Easy2D/src/utils/data.cpp
deleted file mode 100644
index a7b2548..0000000
--- a/Easy2D/src/utils/data.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <easy2d/utils/data.h>
-#include <simpleini/SimpleIni.h>
-
-namespace easy2d {
-
-class DataStore::Impl {
-public:
-    CSimpleIniA ini;
-};
-
-DataStore::DataStore()
-    : impl_(makeUnique<Impl>())
-{
-}
-
-DataStore::~DataStore() = default;
-
-bool DataStore::load(const std::string& filename) {
-    filename_ = filename;
-    SI_Error rc = impl_->ini.LoadFile(filename.c_str());
-    return rc >= 0;
-}
-
-bool DataStore::save(const std::string& filename) {
-    const std::string& targetFile = filename.empty() ? filename_ : filename;
-    if (targetFile.empty()) {
-        return false;
-    }
-    
-    SI_Error rc = impl_->ini.SaveFile(targetFile.c_str());
-    return rc >= 0;
-}
-
-std::string DataStore::getString(const std::string& section, const std::string& key, const std::string& defaultValue) {
-    const char* value = impl_->ini.GetValue(section.c_str(), key.c_str(), defaultValue.c_str());
-    return value ? value : defaultValue;
-}
-
-int DataStore::getInt(const std::string& section, const std::string& key, int defaultValue) {
-    return static_cast<int>(impl_->ini.GetLongValue(section.c_str(), key.c_str(), defaultValue));
-}
-
-float DataStore::getFloat(const std::string& section, const std::string& key, float defaultValue) {
-    const char* value = impl_->ini.GetValue(section.c_str(), key.c_str(), nullptr);
-    if (value) {
-        return std::stof(value);
-    }
-    return defaultValue;
-}
-
-bool DataStore::getBool(const std::string& section, const std::string& key, bool defaultValue) {
-    return impl_->ini.GetBoolValue(section.c_str(), key.c_str(), defaultValue);
-}
-
-void DataStore::setString(const std::string& section, const std::string& key, const std::string& value) {
-    impl_->ini.SetValue(section.c_str(), key.c_str(), value.c_str());
-}
-
-void DataStore::setInt(const std::string& section, const std::string& key, int value) {
-    impl_->ini.SetLongValue(section.c_str(), key.c_str(), value);
-}
-
-void DataStore::setFloat(const std::string& section, const std::string& key, float value) {
-    impl_->ini.SetValue(section.c_str(), key.c_str(), std::to_string(value).c_str());
-}
-
-void DataStore::setBool(const std::string& section, const std::string& key, bool value) {
-    impl_->ini.SetBoolValue(section.c_str(), key.c_str(), value);
-}
-
-void DataStore::removeKey(const std::string& section, const std::string& key) {
-    impl_->ini.Delete(section.c_str(), key.c_str());
-}
-
-void DataStore::removeSection(const std::string& section) {
-    impl_->ini.Delete(section.c_str(), nullptr);
-}
-
-bool DataStore::hasKey(const std::string& section, const std::string& key) {
-    return impl_->ini.GetValue(section.c_str(), key.c_str(), nullptr) != nullptr;
-}
-
-bool DataStore::hasSection(const std::string& section) {
-    return impl_->ini.GetSection(section.c_str()) != nullptr;
-}
-
-void DataStore::clear() {
-    impl_->ini.Reset();
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/utils/logger.cpp b/Easy2D/src/utils/logger.cpp
deleted file mode 100644
index b74390e..0000000
--- a/Easy2D/src/utils/logger.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <easy2d/utils/logger.h>
-
-namespace easy2d {
-
-// 静态成员定义
-LogLevel Logger::level_ = LogLevel::Trace;
-bool Logger::initialized_ = false;
-
-void Logger::init() {
-    if (initialized_) {
-        return;
-    }
-
-    initialized_ = true;
-    log(LogLevel::Info, "Logger initialized");
-}
-
-void Logger::shutdown() {
-    if (initialized_) {
-        log(LogLevel::Info, "Logger shutting down");
-    }
-    initialized_ = false;
-}
-
-void Logger::setLevel(LogLevel level) {
-    level_ = level;
-}
-
-void Logger::setConsoleOutput(bool /*enable*/) {
-    // On Switch, console output always goes to nxlink stdout
-    // Nothing to configure
-}
-
-void Logger::setFileOutput(const std::string& /*filename*/) {
-    // File output not supported on Switch
-    // Could potentially write to sdmc:/ in the future
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/utils/random.cpp b/Easy2D/src/utils/random.cpp
deleted file mode 100644
index f153569..0000000
--- a/Easy2D/src/utils/random.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <easy2d/utils/random.h>
-#include <chrono>
-
-namespace easy2d {
-
-Random::Random()
-    : floatDist_(0.0f, 1.0f)
-{
-    // 使用当前时间作为默认种子
-    randomize();
-}
-
-Random& Random::getInstance() {
-    static Random instance;
-    return instance;
-}
-
-void Random::setSeed(uint32 seed) {
-    generator_.seed(seed);
-}
-
-void Random::randomize() {
-    auto now = std::chrono::high_resolution_clock::now();
-    auto time = now.time_since_epoch().count();
-    generator_.seed(static_cast<uint32>(time));
-}
-
-float Random::getFloat() {
-    return floatDist_(generator_);
-}
-
-float Random::getFloat(float min, float max) {
-    if (min >= max) {
-        return min;
-    }
-    return min + floatDist_(generator_) * (max - min);
-}
-
-int Random::getInt(int max) {
-    if (max <= 0) {
-        return 0;
-    }
-    std::uniform_int_distribution<int> dist(0, max);
-    return dist(generator_);
-}
-
-int Random::getInt(int min, int max) {
-    if (min >= max) {
-        return min;
-    }
-    std::uniform_int_distribution<int> dist(min, max);
-    return dist(generator_);
-}
-
-bool Random::getBool() {
-    return floatDist_(generator_) >= 0.5f;
-}
-
-bool Random::getBool(float probability) {
-    if (probability <= 0.0f) {
-        return false;
-    }
-    if (probability >= 1.0f) {
-        return true;
-    }
-    return floatDist_(generator_) < probability;
-}
-
-float Random::getAngle() {
-    static const float TWO_PI = 6.28318530718f;
-    return floatDist_(generator_) * TWO_PI;
-}
-
-float Random::getSigned() {
-    return floatDist_(generator_) * 2.0f - 1.0f;
-}
-
-} // namespace easy2d
diff --git a/Easy2D/src/utils/timer.cpp b/Easy2D/src/utils/timer.cpp
deleted file mode 100644
index 7fb285f..0000000
--- a/Easy2D/src/utils/timer.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <easy2d/utils/timer.h>
-#include <algorithm>
-
-namespace easy2d {
-
-uint32 Timer::nextId_ = 1;
-
-Timer::Timer(float interval, bool repeat, Callback callback)
-    : interval_(interval)
-    , elapsed_(0.0f)
-    , repeat_(repeat)
-    , paused_(false)
-    , valid_(true)
-    , callback_(std::move(callback))
-{
-    id_ = nextId_++;
-}
-
-bool Timer::update(float deltaTime) {
-    if (!valid_ || paused_) {
-        return false;
-    }
-    
-    elapsed_ += deltaTime;
-    
-    if (elapsed_ >= interval_) {
-        if (callback_) {
-            callback_();
-        }
-        
-        if (repeat_) {
-            elapsed_ = 0.0f;
-            return true;
-        } else {
-            valid_ = false;
-            return true;
-        }
-    }
-    
-    return false;
-}
-
-void Timer::reset() {
-    elapsed_ = 0.0f;
-    valid_ = true;
-    paused_ = false;
-}
-
-void Timer::pause() {
-    paused_ = true;
-}
-
-void Timer::resume() {
-    paused_ = false;
-}
-
-void Timer::cancel() {
-    valid_ = false;
-}
-
-float Timer::getRemaining() const {
-    if (!valid_ || paused_) {
-        return 0.0f;
-    }
-    return std::max(0.0f, interval_ - elapsed_);
-}
-
-// ============================================================================
-// TimerManager 实现
-// ============================================================================
-
-uint32 TimerManager::addTimer(float delay, Timer::Callback callback) {
-    auto timer = std::make_unique<Timer>(delay, false, std::move(callback));
-    uint32 id = timer->getId();
-    timers_.emplace(id, std::move(timer));
-    return id;
-}
-
-uint32 TimerManager::addRepeatingTimer(float interval, Timer::Callback callback) {
-    auto timer = std::make_unique<Timer>(interval, true, std::move(callback));
-    uint32 id = timer->getId();
-    timers_.emplace(id, std::move(timer));
-    return id;
-}
-
-void TimerManager::cancelTimer(uint32 timerId) {
-    auto it = timers_.find(timerId);
-    if (it != timers_.end()) {
-        it->second->cancel();
-        timersToRemove_.push_back(timerId);
-    }
-}
-
-void TimerManager::pauseTimer(uint32 timerId) {
-    auto it = timers_.find(timerId);
-    if (it != timers_.end()) {
-        it->second->pause();
-    }
-}
-
-void TimerManager::resumeTimer(uint32 timerId) {
-    auto it = timers_.find(timerId);
-    if (it != timers_.end()) {
-        it->second->resume();
-    }
-}
-
-void TimerManager::update(float deltaTime) {
-    timersToRemove_.clear();
-    
-    for (auto& [id, timer] : timers_) {
-        timer->update(deltaTime);
-        if (!timer->isValid()) {
-            timersToRemove_.push_back(id);
-        }
-    }
-    
-    for (uint32 id : timersToRemove_) {
-        timers_.erase(id);
-    }
-}
-
-void TimerManager::clear() {
-    timers_.clear();
-    timersToRemove_.clear();
-}
-
-} // namespace easy2d
diff --git a/Extra2D/examples/push_box/src/core/audio_context.cpp b/Extra2D/examples/push_box/src/core/audio_context.cpp
new file mode 100644
index 0000000..6adeb5b
--- /dev/null
+++ b/Extra2D/examples/push_box/src/core/audio_context.cpp
@@ -0,0 +1,15 @@
+#include "audio_context.h"
+
+namespace pushbox {
+
+static extra2d::WeakPtr<AudioController> g_audioController;
+
+void setAudioController(const extra2d::Ptr<AudioController> &controller) {
+  g_audioController = controller;
+}
+
+extra2d::Ptr<AudioController> getAudioController() {
+  return g_audioController.lock();
+}
+
+} // namespace pushbox
diff --git a/Extra2D/examples/push_box/src/core/audio_context.h b/Extra2D/examples/push_box/src/core/audio_context.h
new file mode 100644
index 0000000..e7c4c1d
--- /dev/null
+++ b/Extra2D/examples/push_box/src/core/audio_context.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <extra2d/extra2d.h>
+
+namespace pushbox {
+
+class AudioController;
+
+void setAudioController(const extra2d::Ptr<AudioController> &controller);
+extra2d::Ptr<AudioController> getAudioController();
+
+} // namespace pushbox
diff --git a/Easy2D/examples/push_box/src/core/data.cpp b/Extra2D/examples/push_box/src/core/data.cpp
similarity index 100%
rename from Easy2D/examples/push_box/src/core/data.cpp
rename to Extra2D/examples/push_box/src/core/data.cpp
diff --git a/Easy2D/examples/push_box/src/core/data.h b/Extra2D/examples/push_box/src/core/data.h
similarity index 100%
rename from Easy2D/examples/push_box/src/core/data.h
rename to Extra2D/examples/push_box/src/core/data.h
diff --git a/Easy2D/examples/push_box/src/core/storage.cpp b/Extra2D/examples/push_box/src/core/storage.cpp
similarity index 86%
rename from Easy2D/examples/push_box/src/core/storage.cpp
rename to Extra2D/examples/push_box/src/core/storage.cpp
index b71c550..2e27ce0 100644
--- a/Easy2D/examples/push_box/src/core/storage.cpp
+++ b/Extra2D/examples/push_box/src/core/storage.cpp
@@ -1,18 +1,18 @@
 #include "storage.h"
 
-#include <easy2d/utils/data.h>
+#include <extra2d/utils/data.h>
 #include <fstream>
 #include <sstream>
 #include <string>
 
 namespace pushbox {
 
-static easy2d::DataStore g_store;
+static extra2d::DataStore g_store;
 static std::filesystem::path g_filePath;
 static bool g_loaded = false;
 
 // 默认配置内容
-static const char* DEFAULT_CONFIG = R"([game]
+static const char *DEFAULT_CONFIG = R"([game]
 level = 1
 sound = true
 
@@ -26,13 +26,13 @@ sound = true
  */
 static std::string loadDefaultConfigFromRomfs() {
   // 尝试多个可能的路径（按优先级排序）
-  const char* paths[] = {
-    "romfs:/pushbox.ini",     // Switch romfs 正确路径格式
-    "romfs/pushbox.ini",      // 开发环境相对路径
-    "pushbox.ini",            // 当前目录
+  const char *paths[] = {
+      "romfs:/pushbox.ini", // Switch romfs 正确路径格式
+      "romfs/pushbox.ini",  // 开发环境相对路径
+      "pushbox.ini",        // 当前目录
   };
 
-  for (const char* path : paths) {
+  for (const char *path : paths) {
     if (std::filesystem::exists(path)) {
       std::ifstream file(path, std::ios::binary);
       if (file) {
@@ -52,8 +52,9 @@ static std::string loadDefaultConfigFromRomfs() {
  * @param content 配置内容
  * @return 临时文件路径
  */
-static std::filesystem::path writeConfigToTempFile(const std::string& content) {
-  auto tempPath = std::filesystem::temp_directory_path() / "pushbox_default.ini";
+static std::filesystem::path writeConfigToTempFile(const std::string &content) {
+  auto tempPath =
+      std::filesystem::temp_directory_path() / "pushbox_default.ini";
   std::ofstream file(tempPath, std::ios::binary);
   if (file) {
     file << content;
@@ -81,7 +82,7 @@ static void ensureLoaded() {
   g_loaded = true;
 }
 
-void initStorage(const std::filesystem::path& baseDir) {
+void initStorage(const std::filesystem::path &baseDir) {
   g_filePath = baseDir / "pushbox.ini";
 
   // 首先尝试从可执行目录加载用户配置
diff --git a/Easy2D/examples/push_box/src/core/storage.h b/Extra2D/examples/push_box/src/core/storage.h
similarity index 100%
rename from Easy2D/examples/push_box/src/core/storage.h
rename to Extra2D/examples/push_box/src/core/storage.h
diff --git a/Easy2D/examples/push_box/src/main.cpp b/Extra2D/examples/push_box/src/main.cpp
similarity index 88%
rename from Easy2D/examples/push_box/src/main.cpp
rename to Extra2D/examples/push_box/src/main.cpp
index 259b609..ce89085 100644
--- a/Easy2D/examples/push_box/src/main.cpp
+++ b/Extra2D/examples/push_box/src/main.cpp
@@ -1,4 +1,4 @@
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 #include <filesystem>
 
 // Pushbox 游戏核心头文件
@@ -55,12 +55,12 @@ static float parseAutoQuitSeconds(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {
-  easy2d::Logger::init();
-  easy2d::Logger::setLevel(easy2d::LogLevel::Info);
+  extra2d::Logger::init();
+  extra2d::Logger::setLevel(extra2d::LogLevel::Info);
 
-  auto &app = easy2d::Application::instance();
+  auto &app = extra2d::Application::instance();
 
-  easy2d::AppConfig config;
+  extra2d::AppConfig config;
   config.title = "推箱子";
   config.width = 640;
   config.height = 480;
@@ -68,7 +68,7 @@ int main(int argc, char **argv) {
   config.fpsLimit = 0;
 
   if (!app.init(config)) {
-    easy2d::Logger::shutdown();
+    extra2d::Logger::shutdown();
     return -1;
   }
 
@@ -89,7 +89,7 @@ int main(int argc, char **argv) {
   pushbox::g_SoundOpen = pushbox::loadSoundOpen(true);
 
   // 进入开始场景（主界面）
-  app.enterScene(easy2d::makePtr<pushbox::StartScene>());
+  app.enterScene(extra2d::makePtr<pushbox::StartScene>());
 
   const float autoQuitSeconds = parseAutoQuitSeconds(argc, argv);
   if (autoQuitSeconds > 0.0f) {
@@ -98,6 +98,6 @@ int main(int argc, char **argv) {
   app.run();
 
   app.shutdown();
-  easy2d::Logger::shutdown();
+  extra2d::Logger::shutdown();
   return 0;
 }
diff --git a/Easy2D/examples/push_box/src/nodes/audio_controller.cpp b/Extra2D/examples/push_box/src/nodes/audio_controller.cpp
similarity index 64%
rename from Easy2D/examples/push_box/src/nodes/audio_controller.cpp
rename to Extra2D/examples/push_box/src/nodes/audio_controller.cpp
index 430a03f..cb1f432 100644
--- a/Easy2D/examples/push_box/src/nodes/audio_controller.cpp
+++ b/Extra2D/examples/push_box/src/nodes/audio_controller.cpp
@@ -4,17 +4,22 @@
 
 namespace pushbox {
 
-easy2d::Ptr<AudioController> AudioController::create() { return easy2d::makePtr<AudioController>(); }
+extra2d::Ptr<AudioController> AudioController::create() {
+  return extra2d::makePtr<AudioController>();
+}
 
 void AudioController::onEnter() {
   Node::onEnter();
 
   if (!loaded_) {
-    auto& resources = easy2d::Application::instance().resources();
+    auto &resources = extra2d::Application::instance().resources();
 
-    background_ = resources.loadSound("pushbox_bg", "assets/audio/background.wav");
-    manMove_ = resources.loadSound("pushbox_manmove", "assets/audio/manmove.wav");
-    boxMove_ = resources.loadSound("pushbox_boxmove", "assets/audio/boxmove.wav");
+    background_ =
+        resources.loadSound("pushbox_bg", "assets/audio/background.wav");
+    manMove_ =
+        resources.loadSound("pushbox_manmove", "assets/audio/manmove.wav");
+    boxMove_ =
+        resources.loadSound("pushbox_boxmove", "assets/audio/boxmove.wav");
 
     if (background_) {
       background_->setLooping(true);
@@ -58,4 +63,3 @@ void AudioController::playBoxMove() {
 }
 
 } // namespace pushbox
-
diff --git a/Easy2D/examples/push_box/src/nodes/audio_controller.h b/Extra2D/examples/push_box/src/nodes/audio_controller.h
similarity index 55%
rename from Easy2D/examples/push_box/src/nodes/audio_controller.h
rename to Extra2D/examples/push_box/src/nodes/audio_controller.h
index 9e34383..806db84 100644
--- a/Easy2D/examples/push_box/src/nodes/audio_controller.h
+++ b/Extra2D/examples/push_box/src/nodes/audio_controller.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "../core/data.h"
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 
 namespace pushbox {
 
-class AudioController : public easy2d::Node {
+class AudioController : public extra2d::Node {
 public:
-  static easy2d::Ptr<AudioController> create();
+  static extra2d::Ptr<AudioController> create();
 
   void onEnter() override;
 
@@ -21,10 +21,9 @@ private:
   bool loaded_ = false;
   bool enabled_ = true;
 
-  easy2d::Ptr<easy2d::Sound> background_;
-  easy2d::Ptr<easy2d::Sound> manMove_;
-  easy2d::Ptr<easy2d::Sound> boxMove_;
+  extra2d::Ptr<extra2d::Sound> background_;
+  extra2d::Ptr<extra2d::Sound> manMove_;
+  extra2d::Ptr<extra2d::Sound> boxMove_;
 };
 
 } // namespace pushbox
-
diff --git a/Easy2D/examples/push_box/src/romfs/assets/audio/background.wav b/Extra2D/examples/push_box/src/romfs/assets/audio/background.wav
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/audio/background.wav
rename to Extra2D/examples/push_box/src/romfs/assets/audio/background.wav
diff --git a/Easy2D/examples/push_box/src/romfs/assets/audio/boxmove.wav b/Extra2D/examples/push_box/src/romfs/assets/audio/boxmove.wav
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/audio/boxmove.wav
rename to Extra2D/examples/push_box/src/romfs/assets/audio/boxmove.wav
diff --git a/Easy2D/examples/push_box/src/romfs/assets/audio/manmove.wav b/Extra2D/examples/push_box/src/romfs/assets/audio/manmove.wav
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/audio/manmove.wav
rename to Extra2D/examples/push_box/src/romfs/assets/audio/manmove.wav
diff --git a/Easy2D/examples/push_box/src/romfs/assets/font.ttf b/Extra2D/examples/push_box/src/romfs/assets/font.ttf
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/font.ttf
rename to Extra2D/examples/push_box/src/romfs/assets/font.ttf
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/box.gif b/Extra2D/examples/push_box/src/romfs/assets/images/box.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/box.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/box.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/boxinpoint.gif b/Extra2D/examples/push_box/src/romfs/assets/images/boxinpoint.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/boxinpoint.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/boxinpoint.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/floor.gif b/Extra2D/examples/push_box/src/romfs/assets/images/floor.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/floor.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/floor.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/mandown.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/mandown.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/mandown.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/mandown.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manhanddown.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manhanddown.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manhanddown.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manhanddown.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manhandleft.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manhandleft.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manhandleft.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manhandleft.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manhandright.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manhandright.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manhandright.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manhandright.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manhandup.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manhandup.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manhandup.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manhandup.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manleft.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manleft.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manleft.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manleft.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manright.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manright.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manright.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manright.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/player/manup.gif b/Extra2D/examples/push_box/src/romfs/assets/images/player/manup.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/player/manup.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/player/manup.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/point.gif b/Extra2D/examples/push_box/src/romfs/assets/images/point.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/point.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/point.gif
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/soundoff.png b/Extra2D/examples/push_box/src/romfs/assets/images/soundoff.png
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/soundoff.png
rename to Extra2D/examples/push_box/src/romfs/assets/images/soundoff.png
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/soundon.png b/Extra2D/examples/push_box/src/romfs/assets/images/soundon.png
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/soundon.png
rename to Extra2D/examples/push_box/src/romfs/assets/images/soundon.png
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/start.jpg b/Extra2D/examples/push_box/src/romfs/assets/images/start.jpg
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/start.jpg
rename to Extra2D/examples/push_box/src/romfs/assets/images/start.jpg
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/success.jpg b/Extra2D/examples/push_box/src/romfs/assets/images/success.jpg
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/success.jpg
rename to Extra2D/examples/push_box/src/romfs/assets/images/success.jpg
diff --git a/Easy2D/examples/push_box/src/romfs/assets/images/wall.gif b/Extra2D/examples/push_box/src/romfs/assets/images/wall.gif
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/assets/images/wall.gif
rename to Extra2D/examples/push_box/src/romfs/assets/images/wall.gif
diff --git a/Easy2D/examples/push_box/src/romfs/pushbox.ini b/Extra2D/examples/push_box/src/romfs/pushbox.ini
similarity index 100%
rename from Easy2D/examples/push_box/src/romfs/pushbox.ini
rename to Extra2D/examples/push_box/src/romfs/pushbox.ini
diff --git a/Easy2D/examples/push_box/src/scenes/play_scene.cpp b/Extra2D/examples/push_box/src/scenes/play_scene.cpp
similarity index 73%
rename from Easy2D/examples/push_box/src/scenes/play_scene.cpp
rename to Extra2D/examples/push_box/src/scenes/play_scene.cpp
index 5f71486..945235d 100644
--- a/Easy2D/examples/push_box/src/scenes/play_scene.cpp
+++ b/Extra2D/examples/push_box/src/scenes/play_scene.cpp
@@ -5,24 +5,25 @@
 #include "../nodes/audio_controller.h"
 #include "start_scene.h"
 #include "success_scene.h"
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 
 namespace pushbox {
 
-static easy2d::Ptr<easy2d::FontAtlas> loadFont(int size) {
-  auto& resources = easy2d::Application::instance().resources();
+static extra2d::Ptr<extra2d::FontAtlas> loadFont(int size) {
+  auto &resources = extra2d::Application::instance().resources();
   return resources.loadFont("assets/font.ttf", size);
 }
 
 PlayScene::PlayScene(int level) {
-  setBackgroundColor(easy2d::Colors::Black);
+  setBackgroundColor(extra2d::Colors::Black);
 
   // 设置视口大小为窗口尺寸
-  auto& app = easy2d::Application::instance();
-  auto& config = app.getConfig();
-  setViewportSize(static_cast<float>(config.width), static_cast<float>(config.height));
+  auto &app = extra2d::Application::instance();
+  auto &config = app.getConfig();
+  setViewportSize(static_cast<float>(config.width),
+                  static_cast<float>(config.height));
 
-  auto& resources = app.resources();
+  auto &resources = app.resources();
 
   E2D_LOG_INFO("PlayScene: Loading textures...");
 
@@ -35,7 +36,7 @@ PlayScene::PlayScene(int level) {
   texBoxInPoint_ = resources.loadTexture("assets/images/boxinpoint.gif");
 
   if (!texWall_ || !texFloor_ || !texBox_ || !texBoxInPoint_) {
-      E2D_LOG_ERROR("PlayScene: Failed to load basic textures!");
+    E2D_LOG_ERROR("PlayScene: Failed to load basic textures!");
   }
 
   texMan_[1] = resources.loadTexture("assets/images/player/manup.gif");
@@ -44,9 +45,12 @@ PlayScene::PlayScene(int level) {
   texMan_[4] = resources.loadTexture("assets/images/player/manright.gif");
 
   texManPush_[1] = resources.loadTexture("assets/images/player/manhandup.gif");
-  texManPush_[2] = resources.loadTexture("assets/images/player/manhanddown.gif");
-  texManPush_[3] = resources.loadTexture("assets/images/player/manhandleft.gif");
-  texManPush_[4] = resources.loadTexture("assets/images/player/manhandright.gif");
+  texManPush_[2] =
+      resources.loadTexture("assets/images/player/manhanddown.gif");
+  texManPush_[3] =
+      resources.loadTexture("assets/images/player/manhandleft.gif");
+  texManPush_[4] =
+      resources.loadTexture("assets/images/player/manhandright.gif");
 
   font28_ = loadFont(28);
   font20_ = loadFont(20);
@@ -56,42 +60,42 @@ PlayScene::PlayScene(int level) {
   }
 
   if (font28_) {
-    levelText_ = easy2d::Text::create("", font28_);
+    levelText_ = extra2d::Text::create("", font28_);
     levelText_->setPosition(520.0f, 30.0f);
-    levelText_->setTextColor(easy2d::Colors::White);
+    levelText_->setTextColor(extra2d::Colors::White);
     addChild(levelText_);
   }
 
   if (font20_) {
-    stepText_ = easy2d::Text::create("", font20_);
+    stepText_ = extra2d::Text::create("", font20_);
     stepText_->setPosition(520.0f, 100.0f);
-    stepText_->setTextColor(easy2d::Colors::White);
+    stepText_->setTextColor(extra2d::Colors::White);
     addChild(stepText_);
 
-    bestText_ = easy2d::Text::create("", font20_);
+    bestText_ = extra2d::Text::create("", font20_);
     bestText_->setPosition(520.0f, 140.0f);
-    bestText_->setTextColor(easy2d::Colors::White);
+    bestText_->setTextColor(extra2d::Colors::White);
     addChild(bestText_);
 
-    auto exitText = easy2d::Text::create("按ESC返回", font20_);
+    auto exitText = extra2d::Text::create("按ESC返回", font20_);
     exitText->setPosition(520.0f, 250.0f);
-    exitText->setTextColor(easy2d::Colors::White);
+    exitText->setTextColor(extra2d::Colors::White);
     addChild(exitText);
 
-    auto restartText = easy2d::Text::create("按回车重开", font20_);
+    auto restartText = extra2d::Text::create("按回车重开", font20_);
     restartText->setPosition(520.0f, 290.0f);
-    restartText->setTextColor(easy2d::Colors::White);
+    restartText->setTextColor(extra2d::Colors::White);
     addChild(restartText);
   }
 
   auto soundOn = resources.loadTexture("assets/images/soundon.png");
   auto soundOff = resources.loadTexture("assets/images/soundoff.png");
   if (soundOn && soundOff) {
-    soundBtn_ = easy2d::ToggleImageButton::create();
+    soundBtn_ = extra2d::ToggleImageButton::create();
     soundBtn_->setStateImages(soundOff, soundOn);
     soundBtn_->setCustomSize(static_cast<float>(soundOn->getWidth()),
                              static_cast<float>(soundOn->getHeight()));
-    soundBtn_->setBorder(easy2d::Colors::Transparent, 0.0f);
+    soundBtn_->setBorder(extra2d::Colors::Transparent, 0.0f);
     soundBtn_->setPosition(560.0f, 360.0f);
     soundBtn_->setOnStateChange([](bool on) {
       if (auto audio = getAudioController()) {
@@ -101,7 +105,7 @@ PlayScene::PlayScene(int level) {
     addChild(soundBtn_);
   }
 
-  mapLayer_ = easy2d::makePtr<easy2d::Node>();
+  mapLayer_ = extra2d::makePtr<extra2d::Node>();
   mapLayer_->setAnchor(0.0f, 0.0f);
   mapLayer_->setPosition(0.0f, 0.0f);
   addChild(mapLayer_);
@@ -125,30 +129,30 @@ void PlayScene::onEnter() {
 void PlayScene::onUpdate(float dt) {
   Scene::onUpdate(dt);
 
-  auto& app = easy2d::Application::instance();
-  auto& input = app.input();
+  auto &app = extra2d::Application::instance();
+  auto &input = app.input();
 
-  if (input.isKeyPressed(easy2d::Key::Escape)) {
-    app.scenes().replaceScene(
-        easy2d::makePtr<StartScene>(), easy2d::TransitionType::Fade, 0.2f);
+  if (input.isKeyPressed(extra2d::Key::Escape)) {
+    app.scenes().replaceScene(extra2d::makePtr<StartScene>(),
+                              extra2d::TransitionType::Fade, 0.2f);
     return;
   }
 
-  if (input.isKeyPressed(easy2d::Key::Enter)) {
+  if (input.isKeyPressed(extra2d::Key::Enter)) {
     setLevel(g_CurrentLevel);
     return;
   }
 
-  if (input.isKeyPressed(easy2d::Key::Up)) {
+  if (input.isKeyPressed(extra2d::Key::Up)) {
     move(0, -1, 1);
     flush();
-  } else if (input.isKeyPressed(easy2d::Key::Down)) {
+  } else if (input.isKeyPressed(extra2d::Key::Down)) {
     move(0, 1, 2);
     flush();
-  } else if (input.isKeyPressed(easy2d::Key::Left)) {
+  } else if (input.isKeyPressed(extra2d::Key::Left)) {
     move(-1, 0, 3);
     flush();
-  } else if (input.isKeyPressed(easy2d::Key::Right)) {
+  } else if (input.isKeyPressed(extra2d::Key::Right)) {
     move(1, 0, 4);
     flush();
   } else {
@@ -180,7 +184,7 @@ void PlayScene::flush() {
     for (int j = 0; j < map_.height; j++) {
       Piece piece = map_.value[j][i];
 
-      easy2d::Ptr<easy2d::Texture> tex;
+      extra2d::Ptr<extra2d::Texture> tex;
 
       if (piece.type == TYPE::Wall) {
         tex = texWall_;
@@ -204,7 +208,7 @@ void PlayScene::flush() {
         continue;
       }
 
-      auto sprite = easy2d::Sprite::create(tex);
+      auto sprite = extra2d::Sprite::create(tex);
       sprite->setAnchor(0.0f, 0.0f);
       sprite->setPosition(offsetX + static_cast<float>(i * tileW),
                           offsetY + static_cast<float>(j * tileH));
@@ -250,7 +254,8 @@ void PlayScene::move(int dx, int dy, int direct) {
   int targetY = dy + map_.roleY;
   g_Direct = direct;
 
-  if (targetX < 0 || targetX >= map_.width || targetY < 0 || targetY >= map_.height) {
+  if (targetX < 0 || targetX >= map_.width || targetY < 0 ||
+      targetY >= map_.height) {
     return;
   }
 
@@ -295,7 +300,8 @@ void PlayScene::move(int dx, int dy, int direct) {
       return;
     }
 
-    if (map_.value[boxY][boxX].type == TYPE::Wall || map_.value[boxY][boxX].type == TYPE::Box) {
+    if (map_.value[boxY][boxX].type == TYPE::Wall ||
+        map_.value[boxY][boxX].type == TYPE::Box) {
       return;
     }
 
@@ -322,8 +328,8 @@ void PlayScene::gameOver() {
   }
 
   if (g_CurrentLevel == MAX_LEVEL) {
-    easy2d::Application::instance().scenes().pushScene(easy2d::makePtr<SuccessScene>(),
-                                                      easy2d::TransitionType::Fade, 0.25f);
+    extra2d::Application::instance().scenes().pushScene(
+        extra2d::makePtr<SuccessScene>(), extra2d::TransitionType::Fade, 0.25f);
     return;
   }
 
diff --git a/Extra2D/examples/push_box/src/scenes/play_scene.h b/Extra2D/examples/push_box/src/scenes/play_scene.h
new file mode 100644
index 0000000..35f7aa1
--- /dev/null
+++ b/Extra2D/examples/push_box/src/scenes/play_scene.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "../core/data.h"
+#include <extra2d/extra2d.h>
+
+namespace pushbox {
+
+class PlayScene : public extra2d::Scene {
+public:
+  explicit PlayScene(int level);
+
+  void onEnter() override;
+  void onUpdate(float dt) override;
+
+private:
+  void flush();
+  void setLevel(int level);
+  void setStep(int step);
+  void move(int dx, int dy, int direct);
+  void gameOver();
+
+  int step_ = 0;
+  Map map_{};
+
+  extra2d::Ptr<extra2d::FontAtlas> font28_;
+  extra2d::Ptr<extra2d::FontAtlas> font20_;
+
+  extra2d::Ptr<extra2d::Text> levelText_;
+  extra2d::Ptr<extra2d::Text> stepText_;
+  extra2d::Ptr<extra2d::Text> bestText_;
+  extra2d::Ptr<extra2d::Node> mapLayer_;
+
+  extra2d::Ptr<extra2d::ToggleImageButton> soundBtn_;
+
+  extra2d::Ptr<extra2d::Texture> texWall_;
+  extra2d::Ptr<extra2d::Texture> texPoint_;
+  extra2d::Ptr<extra2d::Texture> texFloor_;
+  extra2d::Ptr<extra2d::Texture> texBox_;
+  extra2d::Ptr<extra2d::Texture> texBoxInPoint_;
+
+  extra2d::Ptr<extra2d::Texture> texMan_[5];
+  extra2d::Ptr<extra2d::Texture> texManPush_[5];
+};
+
+} // namespace pushbox
diff --git a/Easy2D/examples/push_box/src/scenes/start_scene.cpp b/Extra2D/examples/push_box/src/scenes/start_scene.cpp
similarity index 64%
rename from Easy2D/examples/push_box/src/scenes/start_scene.cpp
rename to Extra2D/examples/push_box/src/scenes/start_scene.cpp
index 3dc5073..743b564 100644
--- a/Easy2D/examples/push_box/src/scenes/start_scene.cpp
+++ b/Extra2D/examples/push_box/src/scenes/start_scene.cpp
@@ -5,19 +5,20 @@
 #include "../nodes/audio_controller.h"
 #include "../scenes/play_scene.h"
 #include "../ui/menu_button.h"
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 
 namespace pushbox {
 
 StartScene::StartScene() {
   // 设置视口大小为窗口尺寸
-  auto& app = easy2d::Application::instance();
-  auto& config = app.getConfig();
-  setViewportSize(static_cast<float>(config.width), static_cast<float>(config.height));
+  auto &app = extra2d::Application::instance();
+  auto &config = app.getConfig();
+  setViewportSize(static_cast<float>(config.width),
+                  static_cast<float>(config.height));
 }
 
-static easy2d::Ptr<easy2d::FontAtlas> loadMenuFont() {
-  auto& resources = easy2d::Application::instance().resources();
+static extra2d::Ptr<extra2d::FontAtlas> loadMenuFont() {
+  auto &resources = extra2d::Application::instance().resources();
   return resources.loadFont("assets/font.ttf", 28);
 }
 
@@ -26,10 +27,10 @@ void StartScene::onEnter() {
 
   E2D_LOG_INFO("StartScene::onEnter() - BEGIN");
 
-  auto& app = easy2d::Application::instance();
-  auto& resources = app.resources();
+  auto &app = extra2d::Application::instance();
+  auto &resources = app.resources();
   // 设置红色背景用于测试渲染
-  setBackgroundColor(easy2d::Color(1.0f, 0.0f, 0.0f, 1.0f));
+  setBackgroundColor(extra2d::Color(1.0f, 0.0f, 0.0f, 1.0f));
   E2D_LOG_INFO("StartScene: Background color set to RED for testing");
 
   if (getChildren().empty()) {
@@ -44,12 +45,13 @@ void StartScene::onEnter() {
     auto bgTex = resources.loadTexture("assets/images/start.jpg");
     if (bgTex) {
       E2D_LOG_INFO("StartScene: Background texture loaded successfully");
-      auto background = easy2d::Sprite::create(bgTex);
+      auto background = extra2d::Sprite::create(bgTex);
       background->setAnchor(0.0f, 0.0f);
       background->setPosition(0.0f, 0.0f);
-      float sx = static_cast<float>(app.getConfig().width) / static_cast<float>(bgTex->getWidth());
-      float sy =
-          static_cast<float>(app.getConfig().height) / static_cast<float>(bgTex->getHeight());
+      float sx = static_cast<float>(app.getConfig().width) /
+                 static_cast<float>(bgTex->getWidth());
+      float sy = static_cast<float>(app.getConfig().height) /
+                 static_cast<float>(bgTex->getHeight());
       background->setScale(sx, sy);
       addChild(background);
       E2D_LOG_INFO("StartScene: Background sprite added");
@@ -60,22 +62,27 @@ void StartScene::onEnter() {
     E2D_LOG_INFO("StartScene: Loading font...");
     font_ = loadMenuFont();
     if (font_) {
-      E2D_LOG_INFO("StartScene: Font loaded successfully, creating menu buttons");
+      E2D_LOG_INFO(
+          "StartScene: Font loaded successfully, creating menu buttons");
       // 字体加载成功，创建菜单按钮
-      auto startBtn = MenuButton::create(font_, "新游戏", [this]() { startNewGame(); });
+      auto startBtn =
+          MenuButton::create(font_, "新游戏", [this]() { startNewGame(); });
       startBtn->setPosition(app.getConfig().width / 2.0f, 260.0f);
       addChild(startBtn);
 
-      resumeBtn_ = MenuButton::create(font_, "继续关卡", [this]() { continueGame(); });
+      resumeBtn_ =
+          MenuButton::create(font_, "继续关卡", [this]() { continueGame(); });
       resumeBtn_->setPosition(app.getConfig().width / 2.0f, 300.0f);
       addChild(resumeBtn_);
 
-      auto exitBtn = MenuButton::create(font_, "退出", [this]() { exitGame(); });
+      auto exitBtn =
+          MenuButton::create(font_, "退出", [this]() { exitGame(); });
       exitBtn->setPosition(app.getConfig().width / 2.0f, 340.0f);
       addChild(exitBtn);
       E2D_LOG_INFO("StartScene: Menu buttons created");
     } else {
-      E2D_LOG_ERROR("StartScene: Failed to load font, menu buttons will not be displayed");
+      E2D_LOG_ERROR("StartScene: Failed to load font, menu buttons will not be "
+                    "displayed");
     }
 
     E2D_LOG_INFO("StartScene: Loading sound icons...");
@@ -83,11 +90,11 @@ void StartScene::onEnter() {
     auto soundOff = resources.loadTexture("assets/images/soundoff.png");
     if (soundOn && soundOff) {
       E2D_LOG_INFO("StartScene: Sound icons loaded successfully");
-      soundBtn_ = easy2d::ToggleImageButton::create();
+      soundBtn_ = extra2d::ToggleImageButton::create();
       soundBtn_->setStateImages(soundOff, soundOn);
       soundBtn_->setCustomSize(static_cast<float>(soundOn->getWidth()),
                                static_cast<float>(soundOn->getHeight()));
-      soundBtn_->setBorder(easy2d::Colors::Transparent, 0.0f);
+      soundBtn_->setBorder(extra2d::Colors::Transparent, 0.0f);
       soundBtn_->setPosition(50.0f, 50.0f);
       soundBtn_->setOnStateChange([](bool on) {
         if (auto audio = getAudioController()) {
@@ -112,15 +119,16 @@ void StartScene::onEnter() {
 }
 
 void StartScene::startNewGame() {
-  easy2d::Application::instance().scenes().replaceScene(
-      easy2d::makePtr<PlayScene>(1), easy2d::TransitionType::Fade, 0.25f);
+  extra2d::Application::instance().scenes().replaceScene(
+      extra2d::makePtr<PlayScene>(1), extra2d::TransitionType::Fade, 0.25f);
 }
 
 void StartScene::continueGame() {
-  easy2d::Application::instance().scenes().replaceScene(
-      easy2d::makePtr<PlayScene>(g_CurrentLevel), easy2d::TransitionType::Fade, 0.25f);
+  extra2d::Application::instance().scenes().replaceScene(
+      extra2d::makePtr<PlayScene>(g_CurrentLevel),
+      extra2d::TransitionType::Fade, 0.25f);
 }
 
-void StartScene::exitGame() { easy2d::Application::instance().quit(); }
+void StartScene::exitGame() { extra2d::Application::instance().quit(); }
 
 } // namespace pushbox
diff --git a/Easy2D/examples/push_box/src/scenes/start_scene.h b/Extra2D/examples/push_box/src/scenes/start_scene.h
similarity index 50%
rename from Easy2D/examples/push_box/src/scenes/start_scene.h
rename to Extra2D/examples/push_box/src/scenes/start_scene.h
index d2515f9..f95cd8d 100644
--- a/Easy2D/examples/push_box/src/scenes/start_scene.h
+++ b/Extra2D/examples/push_box/src/scenes/start_scene.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 
 namespace pushbox {
 
 class MenuButton;
 
-class StartScene : public easy2d::Scene {
+class StartScene : public extra2d::Scene {
 public:
   StartScene();
   void onEnter() override;
@@ -16,9 +16,9 @@ private:
   void continueGame();
   void exitGame();
 
-  easy2d::Ptr<MenuButton> resumeBtn_;
-  easy2d::Ptr<easy2d::ToggleImageButton> soundBtn_;
-  easy2d::Ptr<easy2d::FontAtlas> font_;
+  extra2d::Ptr<MenuButton> resumeBtn_;
+  extra2d::Ptr<extra2d::ToggleImageButton> soundBtn_;
+  extra2d::Ptr<extra2d::FontAtlas> font_;
 };
 
 } // namespace pushbox
diff --git a/Extra2D/examples/push_box/src/scenes/success_scene.cpp b/Extra2D/examples/push_box/src/scenes/success_scene.cpp
new file mode 100644
index 0000000..1e8af17
--- /dev/null
+++ b/Extra2D/examples/push_box/src/scenes/success_scene.cpp
@@ -0,0 +1,58 @@
+#include "success_scene.h"
+
+#include "../ui/menu_button.h"
+#include <extra2d/app/application.h>
+#include <extra2d/resource/resource_manager.h>
+#include <extra2d/scene/scene_manager.h>
+#include <extra2d/scene/sprite.h>
+
+namespace pushbox {
+
+SuccessScene::SuccessScene() {
+  // 设置视口大小为窗口尺寸
+  auto &app = extra2d::Application::instance();
+  auto &config = app.getConfig();
+  setViewportSize(static_cast<float>(config.width),
+                  static_cast<float>(config.height));
+}
+
+static extra2d::Ptr<extra2d::FontAtlas> loadMenuFont() {
+  auto &resources = extra2d::Application::instance().resources();
+  return resources.loadFont("assets/font.ttf", 28);
+}
+
+void SuccessScene::onEnter() {
+  Scene::onEnter();
+
+  auto &app = extra2d::Application::instance();
+  auto &resources = app.resources();
+  setBackgroundColor(extra2d::Colors::Black);
+
+  if (getChildren().empty()) {
+    auto bgTex = resources.loadTexture("assets/images/success.jpg");
+    if (bgTex) {
+      auto background = extra2d::Sprite::create(bgTex);
+      background->setAnchor(0.0f, 0.0f);
+      background->setPosition(0.0f, 0.0f);
+      float sx = static_cast<float>(app.getConfig().width) /
+                 static_cast<float>(bgTex->getWidth());
+      float sy = static_cast<float>(app.getConfig().height) /
+                 static_cast<float>(bgTex->getHeight());
+      background->setScale(sx, sy);
+      addChild(background);
+    }
+
+    auto font = loadMenuFont();
+    if (font) {
+      auto backBtn = MenuButton::create(font, "回主菜单", []() {
+        auto &scenes = extra2d::Application::instance().scenes();
+        scenes.popScene(extra2d::TransitionType::Fade, 0.2f);
+        scenes.popScene(extra2d::TransitionType::Fade, 0.2f);
+      });
+      backBtn->setPosition(app.getConfig().width / 2.0f, 350.0f);
+      addChild(backBtn);
+    }
+  }
+}
+
+} // namespace pushbox
diff --git a/Easy2D/examples/push_box/src/scenes/success_scene.h b/Extra2D/examples/push_box/src/scenes/success_scene.h
similarity index 61%
rename from Easy2D/examples/push_box/src/scenes/success_scene.h
rename to Extra2D/examples/push_box/src/scenes/success_scene.h
index bbc6c27..235b9c3 100644
--- a/Easy2D/examples/push_box/src/scenes/success_scene.h
+++ b/Extra2D/examples/push_box/src/scenes/success_scene.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 
 namespace pushbox {
 
-class SuccessScene : public easy2d::Scene {
+class SuccessScene : public extra2d::Scene {
 public:
   SuccessScene();
   void onEnter() override;
diff --git a/Extra2D/examples/push_box/src/ui/menu_button.cpp b/Extra2D/examples/push_box/src/ui/menu_button.cpp
new file mode 100644
index 0000000..683ef2e
--- /dev/null
+++ b/Extra2D/examples/push_box/src/ui/menu_button.cpp
@@ -0,0 +1,59 @@
+#include "menu_button.h"
+
+#include <extra2d/core/color.h>
+#include <extra2d/event/event.h>
+
+namespace pushbox {
+
+extra2d::Ptr<MenuButton>
+MenuButton::create(extra2d::Ptr<extra2d::FontAtlas> font,
+                   const extra2d::String &text,
+                   extra2d::Function<void()> onClick) {
+  auto btn = extra2d::makePtr<MenuButton>();
+  btn->setFont(font);
+  btn->setText(text);
+  btn->setPadding(extra2d::Vec2(0.0f, 0.0f));
+  btn->setBackgroundColor(extra2d::Colors::Transparent,
+                          extra2d::Colors::Transparent,
+                          extra2d::Colors::Transparent);
+  btn->setBorder(extra2d::Colors::Transparent, 0.0f);
+  btn->setTextColor(extra2d::Colors::Black);
+
+  btn->onClick_ = std::move(onClick);
+  btn->setOnClick([wbtn = extra2d::WeakPtr<MenuButton>(btn)]() {
+    if (auto self = wbtn.lock()) {
+      if (self->enabled_ && self->onClick_) {
+        self->onClick_();
+      }
+    }
+  });
+
+  btn->getEventDispatcher().addListener(
+      extra2d::EventType::UIHoverEnter,
+      [wbtn = extra2d::WeakPtr<MenuButton>(btn)](extra2d::Event &) {
+        if (auto self = wbtn.lock()) {
+          if (self->enabled_) {
+            self->setTextColor(extra2d::Colors::Blue);
+          }
+        }
+      });
+
+  btn->getEventDispatcher().addListener(
+      extra2d::EventType::UIHoverExit,
+      [wbtn = extra2d::WeakPtr<MenuButton>(btn)](extra2d::Event &) {
+        if (auto self = wbtn.lock()) {
+          if (self->enabled_) {
+            self->setTextColor(extra2d::Colors::Black);
+          }
+        }
+      });
+
+  return btn;
+}
+
+void MenuButton::setEnabled(bool enabled) {
+  enabled_ = enabled;
+  setTextColor(enabled ? extra2d::Colors::Black : extra2d::Colors::LightGray);
+}
+
+} // namespace pushbox
diff --git a/Extra2D/examples/push_box/src/ui/menu_button.h b/Extra2D/examples/push_box/src/ui/menu_button.h
new file mode 100644
index 0000000..62e8455
--- /dev/null
+++ b/Extra2D/examples/push_box/src/ui/menu_button.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <extra2d/extra2d.h>
+
+namespace pushbox {
+
+class MenuButton : public extra2d::Button {
+public:
+  static extra2d::Ptr<MenuButton> create(extra2d::Ptr<extra2d::FontAtlas> font,
+                                         const extra2d::String &text,
+                                         extra2d::Function<void()> onClick);
+
+  void setEnabled(bool enabled);
+  bool isEnabled() const { return enabled_; }
+
+private:
+  bool enabled_ = true;
+  extra2d::Function<void()> onClick_;
+};
+
+} // namespace pushbox
diff --git a/Easy2D/examples/switch_simple_test/main.cpp b/Extra2D/examples/switch_simple_test/main.cpp
similarity index 90%
rename from Easy2D/examples/switch_simple_test/main.cpp
rename to Extra2D/examples/switch_simple_test/main.cpp
index d3d0c68..c4791cb 100644
--- a/Easy2D/examples/switch_simple_test/main.cpp
+++ b/Extra2D/examples/switch_simple_test/main.cpp
@@ -1,4 +1,4 @@
-#include <easy2d/easy2d.h>
+#include <extra2d/extra2d.h>
 #include <iostream>
 
 // Nintendo Switch 平台支持
@@ -6,12 +6,12 @@
 #include <switch.h>
 #endif
 
-using namespace easy2d;
+using namespace extra2d;
 
 // 加载系统字体的辅助函数
-easy2d::Ptr<easy2d::FontAtlas> loadSystemFont(int size) {
+extra2d::Ptr<extra2d::FontAtlas> loadSystemFont(int size) {
   auto &resources = Application::instance().resources();
-  easy2d::Ptr<easy2d::FontAtlas> font = nullptr;
+  extra2d::Ptr<extra2d::FontAtlas> font = nullptr;
 
 #ifdef __SWITCH__
   // Nintendo Switch 系统字体路径
@@ -59,12 +59,13 @@ public:
 
     // 创建一个红色填充矩形（用于测试渲染）
     // 矩形在屏幕左上角，大小 200x200
-    Rect rectBounds(50, 50, 200, 200);  // x, y, width, height
+    Rect rectBounds(50, 50, 200, 200); // x, y, width, height
     auto rect = ShapeNode::createFilledRect(rectBounds, Colors::Red);
     addChild(rect);
 
     // 创建一个黄色圆形
-    auto circle = ShapeNode::createFilledCircle(Vec2(400, 300), 100, Colors::Yellow);
+    auto circle =
+        ShapeNode::createFilledCircle(Vec2(400, 300), 100, Colors::Yellow);
     addChild(circle);
 
     // 创建一个绿色三角形
@@ -85,7 +86,7 @@ public:
     }
 
     label->setTextColor(Colors::White);
-    label->setPosition(640, 100);  // 屏幕上方居中
+    label->setPosition(640, 100); // 屏幕上方居中
     label->setAnchor(0.5f, 0.5f);
     addChild(label);
 
diff --git a/Easy2D/examples/switch_simple_test/romfs/font.ttf b/Extra2D/examples/switch_simple_test/romfs/font.ttf
similarity index 100%
rename from Easy2D/examples/switch_simple_test/romfs/font.ttf
rename to Extra2D/examples/switch_simple_test/romfs/font.ttf
diff --git a/Extra2D/include/extra2d/action/action.h b/Extra2D/include/extra2d/action/action.h
new file mode 100644
index 0000000..5c4428f
--- /dev/null
+++ b/Extra2D/include/extra2d/action/action.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+
+namespace extra2d {
+class Node;
+
+enum class ActionState { Idle, Running, Paused, Completed };
+
+class Action {
+public:
+  using ProgressCallback = std::function<void(float)>;
+  using CompletionCallback = std::function<void()>;
+
+  Action();
+  virtual ~Action() = default;
+
+  Action(const Action &) = delete;
+  Action &operator=(const Action &) = delete;
+  Action(Action &&) = default;
+  Action &operator=(Action &&) = default;
+
+  virtual void start(Node *target);
+  virtual void stop();
+  virtual void update(float dt);
+  virtual void step(float dt);
+
+  virtual bool isDone() const = 0;
+  virtual Action *clone() const = 0;
+  virtual Action *reverse() const = 0;
+
+  void pause();
+  void resume();
+  void restart();
+
+  ActionState getState() const { return state_; }
+  float getElapsed() const { return elapsed_; }
+  float getDuration() const { return duration_; }
+  Node *getTarget() const { return target_; }
+  Node *getOriginalTarget() const { return originalTarget_; }
+
+  void setDuration(float duration) { duration_ = duration; }
+  void setSpeed(float speed) { speed_ = speed; }
+  float getSpeed() const { return speed_; }
+
+  void setProgressCallback(ProgressCallback callback) {
+    progressCallback_ = std::move(callback);
+  }
+  void setCompletionCallback(CompletionCallback callback) {
+    completionCallback_ = std::move(callback);
+  }
+
+  void setTag(int tag) { tag_ = tag; }
+  int getTag() const { return tag_; }
+
+protected:
+  virtual void onStart() {}
+  virtual void onUpdate(float progress) = 0;
+  virtual void onComplete() {}
+
+  void setDone() { state_ = ActionState::Completed; }
+
+  Node *target_ = nullptr;
+  Node *originalTarget_ = nullptr;
+  ActionState state_ = ActionState::Idle;
+  float elapsed_ = 0.0f;
+  float duration_ = 0.0f;
+  float speed_ = 1.0f;
+  int tag_ = -1;
+  ProgressCallback progressCallback_;
+  CompletionCallback completionCallback_;
+};
+
+using ActionPtr = std::unique_ptr<Action>;
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/action/actions.h b/Extra2D/include/extra2d/action/actions.h
new file mode 100644
index 0000000..9dd956c
--- /dev/null
+++ b/Extra2D/include/extra2d/action/actions.h
@@ -0,0 +1,278 @@
+#pragma once
+
+#include "extra2d/action/action.h"
+#include "extra2d/core/math_types.h"
+#include <functional>
+#include <vector>
+
+namespace extra2d {
+// Interval Action Base
+class IntervalAction : public Action {
+public:
+  explicit IntervalAction(float duration);
+  bool isDone() const override;
+};
+
+// Instant Action Base
+class InstantAction : public Action {
+public:
+  InstantAction();
+  bool isDone() const override;
+};
+
+// Move Actions
+class MoveBy : public IntervalAction {
+public:
+  MoveBy(float duration, const Vec2 &delta);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  Vec2 delta_;
+  Vec2 startPosition_;
+};
+
+class MoveTo : public IntervalAction {
+public:
+  MoveTo(float duration, const Vec2 &position);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  Vec2 endPosition_;
+  Vec2 startPosition_;
+  Vec2 delta_;
+};
+
+// Scale Actions
+class ScaleBy : public IntervalAction {
+public:
+  ScaleBy(float duration, float scale);
+  ScaleBy(float duration, float scaleX, float scaleY);
+  ScaleBy(float duration, const Vec2 &scale);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  Vec2 deltaScale_;
+  Vec2 startScale_;
+};
+
+class ScaleTo : public IntervalAction {
+public:
+  ScaleTo(float duration, float scale);
+  ScaleTo(float duration, float scaleX, float scaleY);
+  ScaleTo(float duration, const Vec2 &scale);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  Vec2 endScale_;
+  Vec2 startScale_;
+  Vec2 delta_;
+};
+
+// Rotate Actions
+class RotateBy : public IntervalAction {
+public:
+  RotateBy(float duration, float deltaAngle);
+  RotateBy(float duration, float deltaAngleX, float deltaAngleY);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  float deltaAngle_ = 0.0f;
+  float startAngle_ = 0.0f;
+};
+
+class RotateTo : public IntervalAction {
+public:
+  RotateTo(float duration, float angle);
+  RotateTo(float duration, float angleX, float angleY);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  float endAngle_ = 0.0f;
+  float startAngle_ = 0.0f;
+  float deltaAngle_ = 0.0f;
+};
+
+// Fade Actions
+class FadeIn : public IntervalAction {
+public:
+  explicit FadeIn(float duration);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  float startOpacity_ = 0.0f;
+};
+
+class FadeOut : public IntervalAction {
+public:
+  explicit FadeOut(float duration);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  float startOpacity_ = 0.0f;
+};
+
+class FadeTo : public IntervalAction {
+public:
+  FadeTo(float duration, float opacity);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  float endOpacity_ = 0.0f;
+  float startOpacity_ = 0.0f;
+  float deltaOpacity_ = 0.0f;
+};
+
+// Composite Actions
+class Sequence : public IntervalAction {
+public:
+  Sequence(const std::vector<Action *> &actions);
+  ~Sequence();
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  std::vector<Action *> actions_;
+  int currentIndex_ = 0;
+  float split_ = 0.0f;
+  float last_ = 0.0f;
+};
+
+class Spawn : public IntervalAction {
+public:
+  Spawn(const std::vector<Action *> &actions);
+  ~Spawn();
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  std::vector<Action *> actions_;
+};
+
+// Loop Action
+class Loop : public Action {
+public:
+  Loop(Action *action, int times = -1);
+  ~Loop();
+
+  bool isDone() const override;
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onStart() override;
+  void onUpdate(float progress) override;
+
+private:
+  Action *action_ = nullptr;
+  int times_ = 1;
+  int currentTimes_ = 0;
+};
+
+// Delay Action
+class Delay : public IntervalAction {
+public:
+  explicit Delay(float duration);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onUpdate(float progress) override;
+};
+
+// CallFunc Action
+class CallFunc : public InstantAction {
+public:
+  using Callback = std::function<void()>;
+
+  explicit CallFunc(Callback callback);
+
+  Action *clone() const override;
+  Action *reverse() const override;
+
+protected:
+  void onUpdate(float progress) override;
+
+private:
+  Callback callback_;
+};
+
+// Helper functions
+inline Sequence *sequence(const std::vector<Action *> &actions) {
+  return new Sequence(actions);
+}
+inline Spawn *spawn(const std::vector<Action *> &actions) {
+  return new Spawn(actions);
+}
+inline Loop *loop(Action *action, int times = -1) {
+  return new Loop(action, times);
+}
+inline Delay *delay(float duration) { return new Delay(duration); }
+inline CallFunc *callFunc(CallFunc::Callback callback) {
+  return new CallFunc(std::move(callback));
+}
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/action/ease.h b/Extra2D/include/extra2d/action/ease.h
new file mode 100644
index 0000000..d91b48f
--- /dev/null
+++ b/Extra2D/include/extra2d/action/ease.h
@@ -0,0 +1,67 @@
+#pragma once
+
+namespace extra2d {
+// Easing function type
+using EaseFunction = float (*)(float);
+
+// Linear (no easing)
+float easeLinear(float t);
+
+// Quadratic
+float easeInQuad(float t);
+float easeOutQuad(float t);
+float easeInOutQuad(float t);
+
+// Cubic
+float easeInCubic(float t);
+float easeOutCubic(float t);
+float easeInOutCubic(float t);
+
+// Quartic
+float easeInQuart(float t);
+float easeOutQuart(float t);
+float easeInOutQuart(float t);
+
+// Quintic
+float easeInQuint(float t);
+float easeOutQuint(float t);
+float easeInOutQuint(float t);
+
+// Sine
+float easeInSine(float t);
+float easeOutSine(float t);
+float easeInOutSine(float t);
+
+// Exponential
+float easeInExpo(float t);
+float easeOutExpo(float t);
+float easeInOutExpo(float t);
+
+// Circular
+float easeInCirc(float t);
+float easeOutCirc(float t);
+float easeInOutCirc(float t);
+
+// Back
+float easeInBack(float t);
+float easeOutBack(float t);
+float easeInOutBack(float t);
+
+// Elastic
+float easeInElastic(float t);
+float easeOutElastic(float t);
+float easeInOutElastic(float t);
+
+// Bounce
+float easeInBounce(float t);
+float easeOutBounce(float t);
+float easeInOutBounce(float t);
+
+// Ease Action wrapper
+class Action;
+
+class EaseAction {
+public:
+  static Action *create(Action *action, EaseFunction easeFunc);
+};
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/als_parser.h b/Extra2D/include/extra2d/animation/als_parser.h
new file mode 100644
index 0000000..5215091
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/als_parser.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <string>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// ALS 图层信息
+// ============================================================================
+struct AlsLayerInfo {
+  std::string aniPath; // 子动画的 ANI 文件路径
+  int zOrder = 0;      // 层级顺序
+  Vec2 offset;         // 层偏移
+};
+
+// ============================================================================
+// ALS 解析结果
+// ============================================================================
+struct AlsParseResult {
+  bool success = false;
+  std::string errorMessage;
+  std::vector<AlsLayerInfo> layers;
+};
+
+// ============================================================================
+// AlsParser - ALS 复合动画文件解析器
+// 解析 .als 文件获取多层动画的图层信息
+// ============================================================================
+class AlsParser {
+public:
+  AlsParser() = default;
+
+  /// 从文件解析
+  AlsParseResult parse(const std::string &filePath);
+
+  /// 从内存内容解析
+  AlsParseResult parseFromMemory(const std::string &content,
+                                 const std::string &basePath = "");
+
+  /// 设置基础路径
+  void setBasePath(const std::string &basePath) { basePath_ = basePath; }
+
+private:
+  std::string basePath_;
+
+  std::string resolvePath(const std::string &relativePath) const;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/ani_binary_parser.h b/Extra2D/include/extra2d/animation/ani_binary_parser.h
new file mode 100644
index 0000000..08627a8
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/ani_binary_parser.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include <cstdint>
+#include <extra2d/animation/ani_parser.h>
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/core/types.h>
+#include <functional>
+#include <string>
+
+namespace extra2d {
+
+// ============================================================================
+// DNF ANI 二进制格式中的节点类型枚举
+// ============================================================================
+enum class AniNodeType : uint16_t {
+  Loop = 0,
+  Shadow = 1,
+  Coord = 3,
+  ImageRate = 7,
+  ImageRotate = 8,
+  RGBA = 9,
+  Interpolation = 10,
+  GraphicEffect = 11,
+  Delay = 12,
+  DamageType = 13,
+  DamageBox = 14,
+  AttackBox = 15,
+  PlaySound = 16,
+  Preload = 17,
+  Spectrum = 18,
+  SetFlag = 23,
+  FlipType = 24,
+  LoopStart = 25,
+  LoopEnd = 26,
+  Clip = 27,
+  Operation = 28,
+};
+
+// ============================================================================
+// AniBinaryParser - ANI 二进制格式解析器
+// 参考 DNF-Porting 的 PvfAnimation 实现
+// ============================================================================
+class AniBinaryParser {
+public:
+  AniBinaryParser() = default;
+
+  /// 从二进制数据解析
+  AniParseResult parse(const uint8_t *data, size_t length);
+
+  /// 从文件解析
+  AniParseResult parseFromFile(const std::string &filePath);
+
+  /// 设置路径替换回调
+  void setPathResolver(PathResolveCallback callback) {
+    pathResolver_ = std::move(callback);
+  }
+
+  /// 设置基础路径
+  void setBasePath(const std::string &basePath) { basePath_ = basePath; }
+
+private:
+  PathResolveCallback pathResolver_;
+  std::string basePath_;
+
+  std::string resolvePath(const std::string &relativePath) const;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/ani_parser.h b/Extra2D/include/extra2d/animation/ani_parser.h
new file mode 100644
index 0000000..d704faa
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/ani_parser.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/animation/animation_clip.h>
+#include <extra2d/core/types.h>
+#include <functional>
+#include <string>
+
+namespace extra2d {
+
+// ============================================================================
+// ANI 文件解析结果
+// ============================================================================
+struct AniParseResult {
+  bool success = false;
+  std::string errorMessage;
+  Ptr<AnimationClip> clip;
+};
+
+// ============================================================================
+// AniParser - ANI 脚本文件解析器
+// 将原始 ANI 文件格式解析为 AnimationClip 数据
+// ============================================================================
+class AniParser {
+public:
+  AniParser() = default;
+
+  /// 从文件解析
+  AniParseResult parse(const std::string &filePath);
+
+  /// 从内存内容解析
+  AniParseResult parseFromMemory(const std::string &content,
+                                 const std::string &basePath = "");
+
+  /// 设置路径替换回调（对应原始 AdditionalOptions）
+  void setPathResolver(PathResolveCallback callback) {
+    pathResolver_ = std::move(callback);
+  }
+
+  /// 设置基础路径（用于解析相对路径）
+  void setBasePath(const std::string &basePath) { basePath_ = basePath; }
+
+private:
+  PathResolveCallback pathResolver_;
+  std::string basePath_;
+
+  std::string resolvePath(const std::string &relativePath) const;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/animated_sprite.h b/Extra2D/include/extra2d/animation/animated_sprite.h
new file mode 100644
index 0000000..66fc72f
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/animated_sprite.h
@@ -0,0 +1,128 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/animation/animation_controller.h>
+#include <extra2d/scene/sprite.h>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// AnimatedSprite - 动画精灵节点
+// 将 AnimationController 与 Sprite 渲染桥接，接入场景图
+// ============================================================================
+class AnimatedSprite : public Sprite {
+public:
+  AnimatedSprite();
+  ~AnimatedSprite() override = default;
+
+  // ------ 静态工厂 ------
+  static Ptr<AnimatedSprite> create();
+  static Ptr<AnimatedSprite> create(Ptr<AnimationClip> clip);
+  static Ptr<AnimatedSprite> create(const std::string &aniFilePath);
+
+  // ------ 动画绑定 ------
+  void setAnimationClip(Ptr<AnimationClip> clip);
+  void loadAnimation(const std::string &aniFilePath);
+  Ptr<AnimationClip> getAnimationClip() const;
+
+  // ------ 动画字典 ------
+  void addAnimation(const std::string &name, Ptr<AnimationClip> clip);
+  void play(const std::string &name, bool loop = true);
+  bool hasAnimation(const std::string &name) const;
+  Ptr<AnimationClip> getAnimation(const std::string &name) const;
+  const std::string &getCurrentAnimationName() const;
+
+  // ------ 播放控制（委托 controller_）------
+  void play();
+  void pause();
+  void resume();
+  void stop();
+  void reset();
+  bool isPlaying() const;
+  bool isPaused() const;
+  bool isStopped() const;
+
+  // ------ 属性控制 ------
+  void setLooping(bool loop);
+  bool isLooping() const;
+  void setPlaybackSpeed(float speed);
+  float getPlaybackSpeed() const;
+
+  // ------ 帧控制 ------
+  void setFrameIndex(size_t index);
+  size_t getCurrentFrameIndex() const;
+  size_t getTotalFrames() const;
+  void nextFrame();
+  void prevFrame();
+
+  // ------ 帧范围限制 ------
+  /// 设置帧播放范围（用于精灵图动画，限制在指定范围内循环）
+  /// @param start 起始帧索引（包含）
+  /// @param end 结束帧索引（包含），-1表示不限制
+  void setFrameRange(int start, int end = -1);
+
+  /// 获取当前帧范围
+  /// @return pair<起始帧, 结束帧>，结束帧为-1表示不限制
+  std::pair<int, int> getFrameRange() const;
+
+  /// 清除帧范围限制（恢复播放所有帧）
+  void clearFrameRange();
+
+  /// 检查是否设置了帧范围限制
+  bool hasFrameRange() const;
+
+  // ------ 回调 ------
+  void setCompletionCallback(AnimationController::CompletionCallback cb);
+  void setKeyframeCallback(AnimationController::KeyframeCallback cb);
+  void setSoundTriggerCallback(AnimationController::SoundTriggerCallback cb);
+
+  // ------ 碰撞盒访问（当前帧）------
+  const std::vector<std::array<int32_t, 6>> &getCurrentDamageBoxes() const;
+  const std::vector<std::array<int32_t, 6>> &getCurrentAttackBoxes() const;
+
+  // ------ 帧变换控制 ------
+  /// 设置是否由动画帧数据覆盖节点的 position/scale/rotation
+  /// ANI 动画需要开启（默认），精灵图动画应关闭
+  void setApplyFrameTransform(bool apply) { applyFrameTransform_ = apply; }
+  bool isApplyFrameTransform() const { return applyFrameTransform_; }
+
+  // ------ 自动播放 ------
+  void setAutoPlay(bool autoPlay) { autoPlay_ = autoPlay; }
+  bool isAutoPlay() const { return autoPlay_; }
+
+  // ------ 直接控制器访问 ------
+  AnimationController &getController() { return controller_; }
+  const AnimationController &getController() const { return controller_; }
+
+protected:
+  void onUpdate(float dt) override;
+  void onEnter() override;
+
+private:
+  AnimationController controller_;
+  bool autoPlay_ = false;
+  bool applyFrameTransform_ = true;
+
+  // 动画字典
+  std::unordered_map<std::string, Ptr<AnimationClip>> animations_;
+  std::string currentAnimationName_;
+  static const std::string emptyString_;
+
+  // 帧范围限制（用于精灵图动画）
+  int frameRangeStart_ = 0; // 起始帧索引
+  int frameRangeEnd_ = -1;  // 结束帧索引，-1表示不限制
+
+  // 空碰撞盒列表（用于无帧时返回引用）
+  static const std::vector<std::array<int32_t, 6>> emptyBoxes_;
+
+  void applyFrame(const AnimationFrame &frame);
+  void onFrameChanged(size_t oldIdx, size_t newIdx,
+                      const AnimationFrame &frame);
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/animation_cache.h b/Extra2D/include/extra2d/animation/animation_cache.h
new file mode 100644
index 0000000..e894fd0
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/animation_cache.h
@@ -0,0 +1,102 @@
+#pragma once
+
+#include <extra2d/animation/animation_clip.h>
+#include <functional>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace extra2d {
+
+// 路径替换回调（对应原始 AdditionalOptions）
+using PathResolveCallback = std::function<std::string(const std::string &)>;
+
+// ============================================================================
+// AnimationCache - 动画片段全局缓存（借鉴 Cocos AnimationCache）
+// 同一 ANI 文件只解析一次，后续直接复用数据
+// ============================================================================
+class AnimationCache {
+public:
+  static AnimationCache &getInstance() {
+    static AnimationCache instance;
+    return instance;
+  }
+
+  // ------ 加载与获取 ------
+
+  /// 从文件加载（自动缓存），已缓存则直接返回
+  /// 注意：实际的 ANI 解析逻辑在 AniParser 中实现
+  /// 此方法在 animation_cache.cpp 中实现，依赖 AniParser
+  Ptr<AnimationClip> loadClip(const std::string &aniFilePath);
+
+  /// 从缓存获取（不触发加载）
+  Ptr<AnimationClip> getClip(const std::string &name) const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    auto it = clips_.find(name);
+    if (it != clips_.end())
+      return it->second;
+    return nullptr;
+  }
+
+  /// 手动添加到缓存
+  void addClip(Ptr<AnimationClip> clip, const std::string &name) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    clips_[name] = std::move(clip);
+  }
+
+  // ------ 缓存管理 ------
+
+  bool has(const std::string &name) const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return clips_.find(name) != clips_.end();
+  }
+
+  void removeClip(const std::string &name) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    clips_.erase(name);
+  }
+
+  /// 移除未被外部引用的动画片段
+  void removeUnusedClips() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    for (auto it = clips_.begin(); it != clips_.end();) {
+      if (it->second.use_count() == 1) {
+        it = clips_.erase(it);
+      } else {
+        ++it;
+      }
+    }
+  }
+
+  void clear() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    clips_.clear();
+  }
+
+  size_t count() const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return clips_.size();
+  }
+
+  // ------ 路径配置 ------
+  void setPathResolver(PathResolveCallback resolver) {
+    pathResolver_ = std::move(resolver);
+  }
+
+  PathResolveCallback getPathResolver() const { return pathResolver_; }
+
+private:
+  AnimationCache() = default;
+  ~AnimationCache() = default;
+  AnimationCache(const AnimationCache &) = delete;
+  AnimationCache &operator=(const AnimationCache &) = delete;
+
+  mutable std::mutex mutex_;
+  std::unordered_map<std::string, Ptr<AnimationClip>> clips_;
+  PathResolveCallback pathResolver_;
+};
+
+// 便捷宏
+#define E2D_ANIMATION_CACHE() ::extra2d::AnimationCache::getInstance()
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/animation_clip.h b/Extra2D/include/extra2d/animation/animation_clip.h
new file mode 100644
index 0000000..16bd5c2
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/animation_clip.h
@@ -0,0 +1,184 @@
+#pragma once
+
+#include <cassert>
+#include <extra2d/animation/animation_frame.h>
+#include <extra2d/animation/sprite_frame_cache.h>
+#include <string>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// AnimationClip - 动画片段（纯数据，可复用）
+// 借鉴 Cocos：一份 AnimationClip 可被多个 AnimationNode 同时使用
+// ============================================================================
+class AnimationClip {
+public:
+  AnimationClip() = default;
+
+  explicit AnimationClip(const std::string &name) : name_(name) {}
+
+  // ------ 帧管理 ------
+  void addFrame(const AnimationFrame &frame) { frames_.push_back(frame); }
+
+  void addFrame(AnimationFrame &&frame) { frames_.push_back(std::move(frame)); }
+
+  void insertFrame(size_t index, const AnimationFrame &frame) {
+    assert(index <= frames_.size());
+    frames_.insert(frames_.begin() + static_cast<ptrdiff_t>(index), frame);
+  }
+
+  void removeFrame(size_t index) {
+    assert(index < frames_.size());
+    frames_.erase(frames_.begin() + static_cast<ptrdiff_t>(index));
+  }
+
+  void clearFrames() { frames_.clear(); }
+
+  const AnimationFrame &getFrame(size_t index) const {
+    assert(index < frames_.size());
+    return frames_[index];
+  }
+
+  AnimationFrame &getFrame(size_t index) {
+    assert(index < frames_.size());
+    return frames_[index];
+  }
+
+  size_t getFrameCount() const { return frames_.size(); }
+  bool empty() const { return frames_.empty(); }
+
+  // ------ 全局属性（对应原始 AnimationFlag）------
+  FramePropertySet &globalProperties() { return globalProperties_; }
+  const FramePropertySet &globalProperties() const { return globalProperties_; }
+
+  bool isLooping() const {
+    return globalProperties_.getOr<bool>(FramePropertyKey::Loop, false);
+  }
+
+  void setLooping(bool loop) { globalProperties_.withLoop(loop); }
+
+  // ------ 时间信息 ------
+  float getTotalDuration() const {
+    float total = 0.0f;
+    for (const auto &frame : frames_) {
+      total += frame.delay;
+    }
+    return total;
+  }
+
+  // ------ 预计算最大帧尺寸 ------
+  Size getMaxFrameSize() const {
+    Size maxSize;
+    for (const auto &frame : frames_) {
+      if (frame.spriteFrame && frame.spriteFrame->isValid()) {
+        const auto &rect = frame.spriteFrame->getRect();
+        if (rect.size.width > maxSize.width)
+          maxSize.width = rect.size.width;
+        if (rect.size.height > maxSize.height)
+          maxSize.height = rect.size.height;
+      }
+    }
+    return maxSize;
+  }
+
+  // ------ 元数据 ------
+  void setName(const std::string &name) { name_ = name; }
+  const std::string &getName() const { return name_; }
+
+  void setSourcePath(const std::string &path) { sourcePath_ = path; }
+  const std::string &getSourcePath() const { return sourcePath_; }
+
+  // ------ 静态工厂 ------
+  static Ptr<AnimationClip> create(const std::string &name = "") {
+    return makePtr<AnimationClip>(name);
+  }
+
+  /// 从精灵图网格创建（所有帧按顺序）
+  static Ptr<AnimationClip> createFromGrid(Ptr<Texture> texture, int frameWidth,
+                                           int frameHeight,
+                                           float frameDurationMs = 100.0f,
+                                           int frameCount = -1, int spacing = 0,
+                                           int margin = 0) {
+    if (!texture)
+      return nullptr;
+
+    int texW = texture->getWidth();
+    int texH = texture->getHeight();
+    int usableW = texW - 2 * margin;
+    int usableH = texH - 2 * margin;
+    int cols = (usableW + spacing) / (frameWidth + spacing);
+    int rows = (usableH + spacing) / (frameHeight + spacing);
+    int total = (frameCount > 0) ? frameCount : cols * rows;
+
+    auto clip = makePtr<AnimationClip>();
+    for (int i = 0; i < total; ++i) {
+      int col = i % cols;
+      int row = i / cols;
+      if (row >= rows)
+        break;
+
+      // 翻转行顺序：精灵图第0行在顶部，但OpenGL纹理V坐标从底部开始
+      // 所以将行索引翻转，使第0行对应纹理底部（V=1.0），第3行对应纹理顶部（V=0.0）
+      int flippedRow = (rows - 1) - row;
+
+      Rect rect(
+          static_cast<float>(margin + col * (frameWidth + spacing)),
+          static_cast<float>(margin + flippedRow * (frameHeight + spacing)),
+          static_cast<float>(frameWidth), static_cast<float>(frameHeight));
+
+      auto sf = SpriteFrame::create(texture, rect);
+      AnimationFrame frame;
+      frame.spriteFrame = std::move(sf);
+      frame.delay = frameDurationMs;
+      clip->addFrame(std::move(frame));
+    }
+    return clip;
+  }
+
+  /// 从精灵图网格创建（指定帧索引列表）
+  static Ptr<AnimationClip>
+  createFromGridIndices(Ptr<Texture> texture, int frameWidth, int frameHeight,
+                        const std::vector<int> &frameIndices,
+                        float frameDurationMs = 100.0f, int spacing = 0,
+                        int margin = 0) {
+    if (!texture)
+      return nullptr;
+
+    int texW = texture->getWidth();
+    int texH = texture->getHeight();
+    int usableW = texW - 2 * margin;
+    int usableH = texH - 2 * margin;
+    int cols = (usableW + spacing) / (frameWidth + spacing);
+    int rows = (usableH + spacing) / (frameHeight + spacing);
+
+    auto clip = makePtr<AnimationClip>();
+    for (int idx : frameIndices) {
+      int col = idx % cols;
+      int row = idx / cols;
+
+      // 翻转行顺序：精灵图第0行在顶部，但OpenGL纹理V坐标从底部开始
+      int flippedRow = (rows - 1) - row;
+
+      Rect rect(
+          static_cast<float>(margin + col * (frameWidth + spacing)),
+          static_cast<float>(margin + flippedRow * (frameHeight + spacing)),
+          static_cast<float>(frameWidth), static_cast<float>(frameHeight));
+
+      auto sf = SpriteFrame::create(texture, rect);
+      AnimationFrame frame;
+      frame.spriteFrame = std::move(sf);
+      frame.delay = frameDurationMs;
+      clip->addFrame(std::move(frame));
+    }
+    return clip;
+  }
+
+private:
+  std::string name_;
+  std::string sourcePath_;
+  std::vector<AnimationFrame> frames_;
+  FramePropertySet globalProperties_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/animation_controller.h b/Extra2D/include/extra2d/animation/animation_controller.h
new file mode 100644
index 0000000..0bf18f4
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/animation_controller.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <extra2d/animation/animation_clip.h>
+#include <extra2d/animation/interpolation_engine.h>
+#include <extra2d/core/types.h>
+#include <functional>
+#include <string>
+
+namespace extra2d {
+
+// ============================================================================
+// 动画播放状态
+// ============================================================================
+enum class AnimPlayState : uint8 { Stopped, Playing, Paused };
+
+// ============================================================================
+// AnimationController - 动画播放控制器
+// 借鉴 Cocos Creator 的 AnimationState：纯播放逻辑，不持有渲染资源
+// ============================================================================
+class AnimationController {
+public:
+  // 回调类型定义
+  using FrameChangeCallback = std::function<void(size_t oldIdx, size_t newIdx,
+                                                 const AnimationFrame &frame)>;
+  using KeyframeCallback = std::function<void(int flagIndex)>;
+  using SoundTriggerCallback = std::function<void(const std::string &path)>;
+  using CompletionCallback = std::function<void()>;
+
+  AnimationController() = default;
+
+  // ------ 绑定动画数据 ------
+  void setClip(Ptr<AnimationClip> clip);
+  Ptr<AnimationClip> getClip() const { return clip_; }
+
+  // ------ 播放控制 ------
+  void play();
+  void pause();
+  void resume();
+  void stop();
+  void reset();
+
+  // ------ 帧控制 ------
+  void setFrameIndex(size_t index);
+  void nextFrame();
+  void prevFrame();
+
+  // ------ 核心更新（每帧调用）------
+  void update(float dt);
+
+  // ------ 状态查询 ------
+  AnimPlayState getState() const { return state_; }
+  bool isPlaying() const { return state_ == AnimPlayState::Playing; }
+  bool isPaused() const { return state_ == AnimPlayState::Paused; }
+  bool isStopped() const { return state_ == AnimPlayState::Stopped; }
+
+  size_t getCurrentFrameIndex() const { return currentFrameIndex_; }
+  size_t getTotalFrames() const;
+  const AnimationFrame &getCurrentFrame() const;
+
+  float getPlaybackSpeed() const { return playbackSpeed_; }
+  void setPlaybackSpeed(float speed) { playbackSpeed_ = speed; }
+
+  bool isLooping() const;
+  void setLooping(bool loop);
+
+  // ------ 插值状态 ------
+  float getInterpolationFactor() const { return interpolationFactor_; }
+  bool isInterpolating() const { return interpolating_; }
+
+  // ------ 回调注册 ------
+  void setFrameChangeCallback(FrameChangeCallback cb) {
+    onFrameChange_ = std::move(cb);
+  }
+  void setKeyframeCallback(KeyframeCallback cb) { onKeyframe_ = std::move(cb); }
+  void setSoundTriggerCallback(SoundTriggerCallback cb) {
+    onSoundTrigger_ = std::move(cb);
+  }
+  void setCompletionCallback(CompletionCallback cb) {
+    onComplete_ = std::move(cb);
+  }
+
+private:
+  Ptr<AnimationClip> clip_;
+  AnimPlayState state_ = AnimPlayState::Stopped;
+
+  size_t currentFrameIndex_ = 0;
+  float accumulatedTime_ = 0.0f; // 当前帧已累积时间 (ms)
+  float playbackSpeed_ = 1.0f;
+  bool loopOverride_ = false;    // 外部循环覆盖值
+  bool hasLoopOverride_ = false; // 是否使用外部循环覆盖
+
+  // 插值状态
+  bool interpolating_ = false;
+  float interpolationFactor_ = 0.0f;
+
+  // 回调
+  FrameChangeCallback onFrameChange_;
+  KeyframeCallback onKeyframe_;
+  SoundTriggerCallback onSoundTrigger_;
+  CompletionCallback onComplete_;
+
+  // 内部方法
+  void advanceFrame(size_t newIndex);
+  void processFrameProperties(const AnimationFrame &frame);
+  void updateInterpolation();
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/animation/animation_event.h b/Extra2D/include/extra2d/animation/animation_event.h
similarity index 54%
rename from Easy2D/include/easy2d/animation/animation_event.h
rename to Extra2D/include/extra2d/animation/animation_event.h
index 6eb7757..f94af58 100644
--- a/Easy2D/include/easy2d/animation/animation_event.h
+++ b/Extra2D/include/extra2d/animation/animation_event.h
@@ -4,7 +4,7 @@
 #include <functional>
 #include <string>
 
-namespace easy2d {
+namespace extra2d {
 
 // 前向声明
 class Node;
@@ -13,31 +13,31 @@ class Node;
 // 动画事件类型
 // ============================================================================
 enum class AnimationEventType : uint32_t {
-    FrameChanged   = 0x2001,   // 帧切换
-    KeyframeHit    = 0x2002,   // 关键帧触发
-    SoundTrigger   = 0x2003,   // 音效触发
-    AnimationStart = 0x2004,   // 动画开始播放
-    AnimationEnd   = 0x2005,   // 动画播放结束
-    AnimationLoop  = 0x2006,   // 动画循环一轮
+  FrameChanged = 0x2001,   // 帧切换
+  KeyframeHit = 0x2002,    // 关键帧触发
+  SoundTrigger = 0x2003,   // 音效触发
+  AnimationStart = 0x2004, // 动画开始播放
+  AnimationEnd = 0x2005,   // 动画播放结束
+  AnimationLoop = 0x2006,  // 动画循环一轮
 };
 
 // ============================================================================
 // 动画事件数据
 // ============================================================================
 struct AnimationEvent {
-    AnimationEventType type;
-    size_t frameIndex = 0;
-    size_t previousFrameIndex = 0;
-    int keyframeFlag = -1;
-    std::string soundPath;
-    Node* source = nullptr;
+  AnimationEventType type;
+  size_t frameIndex = 0;
+  size_t previousFrameIndex = 0;
+  int keyframeFlag = -1;
+  std::string soundPath;
+  Node *source = nullptr;
 };
 
 // ============================================================================
 // 动画事件回调类型
 // ============================================================================
-using AnimationEventCallback    = std::function<void(const AnimationEvent&)>;
-using KeyframeHitCallback       = std::function<void(int flagIndex)>;
+using AnimationEventCallback = std::function<void(const AnimationEvent &)>;
+using KeyframeHitCallback = std::function<void(int flagIndex)>;
 using AnimationCompleteCallback = std::function<void()>;
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/animation_frame.h b/Extra2D/include/extra2d/animation/animation_frame.h
new file mode 100644
index 0000000..71536a2
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/animation_frame.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <extra2d/animation/frame_property.h>
+#include <extra2d/animation/sprite_frame.h>
+#include <string>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// AnimationFrame - 单帧数据
+// 引用 SpriteFrame 而非直接持有纹理（借鉴 Cocos 模式）
+// 通过 FramePropertySet 支持不固定数据（ANI Flag 系统增强版）
+// ============================================================================
+struct AnimationFrame {
+  // ------ 核心数据（固定部分）------
+  Ptr<SpriteFrame> spriteFrame; // 精灵帧引用（Cocos 模式）
+  std::string texturePath;      // 原始图片路径（用于解析时定位资源）
+  int textureIndex = 0;         // 精灵图集索引
+  Vec2 offset;                  // 位置偏移
+  float delay = 100.0f;         // 帧延迟（毫秒）
+
+  // ------ 碰撞盒数据（DNF ANI 格式）------
+  std::vector<std::array<int32_t, 6>> damageBoxes; // 伤害碰撞盒
+  std::vector<std::array<int32_t, 6>> attackBoxes; // 攻击碰撞盒
+
+  // ------ 不固定数据（属性集合）------
+  FramePropertySet properties; // 类型安全的 Flag 系统
+
+  // ------ 便捷方法 ------
+  bool hasTexture() const {
+    return spriteFrame != nullptr && spriteFrame->isValid();
+  }
+
+  bool hasInterpolation() const {
+    return properties.getOr<bool>(FramePropertyKey::Interpolation, false);
+  }
+
+  bool hasKeyframeCallback() const {
+    return properties.has(FramePropertyKey::SetFlag);
+  }
+
+  int getKeyframeIndex() const {
+    return properties.getOr<int>(FramePropertyKey::SetFlag, -1);
+  }
+
+  Vec2 getEffectiveScale() const {
+    return properties.getOr<Vec2>(FramePropertyKey::ImageRate, Vec2::One());
+  }
+
+  float getEffectiveRotation() const {
+    return properties.getOr<float>(FramePropertyKey::ImageRotate, 0.0f);
+  }
+
+  Color getEffectiveColor() const {
+    return properties.getOr<Color>(FramePropertyKey::ColorTint, Colors::White);
+  }
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/animation_node.h b/Extra2D/include/extra2d/animation/animation_node.h
new file mode 100644
index 0000000..84d5f10
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/animation_node.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/animation/animation_clip.h>
+#include <extra2d/animation/animation_controller.h>
+#include <extra2d/animation/animation_event.h>
+#include <extra2d/animation/frame_renderer.h>
+#include <extra2d/scene/node.h>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// AnimationNode - 动画节点（继承 Node）
+// 使用 FrameRenderer 单渲染器策略，不依赖 Sprite 基类
+// 适用于需要独立渲染控制的动画（如特效、复合动画图层）
+// ============================================================================
+class AnimationNode : public Node {
+public:
+  AnimationNode();
+  ~AnimationNode() override = default;
+
+  // ------ 静态工厂（Cocos 风格）------
+  static Ptr<AnimationNode> create();
+  static Ptr<AnimationNode> create(Ptr<AnimationClip> clip);
+  static Ptr<AnimationNode> create(const std::string &aniFilePath);
+
+  // ------ 动画数据 ------
+  void setClip(Ptr<AnimationClip> clip);
+  Ptr<AnimationClip> getClip() const;
+  bool loadFromFile(const std::string &aniFilePath);
+
+  // ------ 播放控制 ------
+  void play();
+  void pause();
+  void resume();
+  void stop();
+  void reset();
+
+  bool isPlaying() const;
+  bool isPaused() const;
+  bool isStopped() const;
+
+  void setPlaybackSpeed(float speed);
+  float getPlaybackSpeed() const;
+  void setLooping(bool loop);
+  bool isLooping() const;
+
+  // ------ 帧控制 ------
+  void setFrameIndex(size_t index);
+  size_t getCurrentFrameIndex() const;
+  size_t getTotalFrames() const;
+
+  // ------ 事件回调 ------
+  void setKeyframeCallback(KeyframeHitCallback callback);
+  void setCompletionCallback(AnimationCompleteCallback callback);
+  void
+  setFrameChangeCallback(AnimationController::FrameChangeCallback callback);
+  void addEventListener(AnimationEventCallback callback);
+
+  // ------ 视觉属性 ------
+  void setTintColor(const Color &color);
+  Color getTintColor() const { return tintColor_; }
+  void setFlipX(bool flip) { flipX_ = flip; }
+  void setFlipY(bool flip) { flipY_ = flip; }
+  bool isFlipX() const { return flipX_; }
+  bool isFlipY() const { return flipY_; }
+
+  // ------ 自动播放 ------
+  void setAutoPlay(bool autoPlay) { autoPlay_ = autoPlay; }
+  bool isAutoPlay() const { return autoPlay_; }
+
+  // ------ 碰撞盒访问 ------
+  const std::vector<std::array<int32_t, 6>> &getCurrentDamageBoxes() const;
+  const std::vector<std::array<int32_t, 6>> &getCurrentAttackBoxes() const;
+
+  // ------ 查询 ------
+  Size getMaxFrameSize() const;
+  Rect getBoundingBox() const override;
+
+  // ------ 直接访问 ------
+  AnimationController &getController() { return controller_; }
+  const AnimationController &getController() const { return controller_; }
+  FrameRenderer &getFrameRenderer() { return frameRenderer_; }
+  const FrameRenderer &getFrameRenderer() const { return frameRenderer_; }
+
+protected:
+  void onUpdate(float dt) override;
+  void onDraw(RenderBackend &renderer) override;
+  void onEnter() override;
+  void onExit() override;
+
+private:
+  AnimationController controller_;
+  FrameRenderer frameRenderer_;
+  Color tintColor_ = Colors::White;
+  bool flipX_ = false;
+  bool flipY_ = false;
+  bool autoPlay_ = false;
+  std::vector<AnimationEventCallback> eventListeners_;
+
+  static const std::vector<std::array<int32_t, 6>> emptyBoxes_;
+
+  void setupControllerCallbacks();
+  void dispatchEvent(const AnimationEvent &event);
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/composite_animation.h b/Extra2D/include/extra2d/animation/composite_animation.h
new file mode 100644
index 0000000..2439749
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/composite_animation.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <extra2d/animation/als_parser.h>
+#include <extra2d/animation/animation_event.h>
+#include <extra2d/animation/animation_node.h>
+#include <extra2d/scene/node.h>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// CompositeAnimation - ALS 多层复合动画节点
+// 管理多个 AnimationNode 图层，统一控制播放
+// 对应 DNF 的 ALS 格式（多层动画叠加）
+// ============================================================================
+class CompositeAnimation : public Node {
+public:
+  CompositeAnimation() = default;
+  ~CompositeAnimation() override = default;
+
+  // ------ 静态工厂 ------
+  static Ptr<CompositeAnimation> create();
+  static Ptr<CompositeAnimation> create(const std::string &alsFilePath);
+
+  // ------ 加载 ------
+  bool loadFromFile(const std::string &alsFilePath);
+
+  // ------ 图层管理 ------
+  void addLayer(Ptr<AnimationNode> node, int zOrder = 0);
+  void removeLayer(size_t index);
+  Ptr<AnimationNode> getLayer(size_t index) const;
+  Ptr<AnimationNode> getMainLayer() const;
+  size_t getLayerCount() const;
+
+  // ------ 统一播放控制 ------
+  void play();
+  void pause();
+  void resume();
+  void stop();
+  void reset();
+  void setPlaybackSpeed(float speed);
+  void setLooping(bool loop);
+
+  bool isPlaying() const;
+  bool isStopped() const;
+
+  // ------ 事件回调（绑定到主图层）------
+  void setKeyframeCallback(KeyframeHitCallback callback);
+  void setCompletionCallback(AnimationCompleteCallback callback);
+  void addEventListener(AnimationEventCallback callback);
+
+  // ------ 视觉属性（应用到所有图层）------
+  void setTintColor(const Color &color);
+  void setFlipX(bool flip);
+  void setFlipY(bool flip);
+
+private:
+  struct LayerEntry {
+    Ptr<AnimationNode> node;
+    int zOrder = 0;
+  };
+  std::vector<LayerEntry> layers_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/frame_property.h b/Extra2D/include/extra2d/animation/frame_property.h
new file mode 100644
index 0000000..9089015
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/frame_property.h
@@ -0,0 +1,183 @@
+#pragma once
+
+#include <any>
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <variant>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 帧属性键 - 强类型枚举替代原始 ANI 的字符串键
+// ============================================================================
+enum class FramePropertyKey : uint32 {
+  // 事件触发
+  SetFlag = 0x0001,   // int: 关键帧回调索引
+  PlaySound = 0x0002, // string: 音效路径
+
+  // 变换属性
+  ImageRate = 0x0010,   // Vec2: 缩放比例
+  ImageRotate = 0x0011, // float: 旋转角度（度）
+  ImageOffset = 0x0012, // Vec2: 额外位置偏移
+
+  // 视觉效果
+  BlendLinearDodge = 0x0020, // bool: 线性减淡
+  BlendAdditive = 0x0021,    // bool: 加法混合
+  ColorTint = 0x0022,        // Color: RGBA 颜色
+
+  // 控制标记
+  Interpolation = 0x0030, // bool: 启用到下一帧的插值
+  Loop = 0x0031,          // bool: 全局循环标记
+
+  // DNF ANI 扩展属性
+  DamageType = 0x0040, // int: 伤害类型 (0=Normal, 1=SuperArmor, 2=Unbreakable)
+  Shadow = 0x0041,     // bool: 阴影
+  FlipType = 0x0042,   // int: 翻转类型 (1=Horizon, 2=Vertical, 3=All)
+  Coord = 0x0043,      // int: 坐标系
+  LoopStart = 0x0044,  // bool: 循环起始标记
+  LoopEnd = 0x0045,    // int: 循环结束帧数
+  GraphicEffect = 0x0046, // int: 图形特效类型
+  ClipRegion = 0x0047,    // vector<int>: 裁剪区域 [4个int16]
+
+  // 用户自定义扩展区间 (0x1000+)
+  UserDefined = 0x1000,
+};
+
+// ============================================================================
+// 帧属性值 - variant 多态值
+// ============================================================================
+using FramePropertyValue =
+    std::variant<bool, int, float, std::string, Vec2, Color, std::vector<int>>;
+
+// ============================================================================
+// FramePropertyKey 的 hash 支持
+// ============================================================================
+struct FramePropertyKeyHash {
+  size_t operator()(FramePropertyKey key) const noexcept {
+    return std::hash<uint32>{}(static_cast<uint32>(key));
+  }
+};
+
+// ============================================================================
+// FramePropertySet - 单帧属性集合
+// 同时支持强类型属性和自定义扩展（不固定数据）
+// ============================================================================
+class FramePropertySet {
+public:
+  FramePropertySet() = default;
+
+  // ------ 设置属性 ------
+  void set(FramePropertyKey key, FramePropertyValue value) {
+    properties_[key] = std::move(value);
+  }
+
+  void setCustom(const std::string &key, std::any value) {
+    customProperties_[key] = std::move(value);
+  }
+
+  // ------ 类型安全获取 ------
+  template <typename T> std::optional<T> get(FramePropertyKey key) const {
+    auto it = properties_.find(key);
+    if (it == properties_.end())
+      return std::nullopt;
+    if (auto *val = std::get_if<T>(&it->second)) {
+      return *val;
+    }
+    return std::nullopt;
+  }
+
+  template <typename T>
+  T getOr(FramePropertyKey key, const T &defaultValue) const {
+    auto result = get<T>(key);
+    return result.value_or(defaultValue);
+  }
+
+  std::optional<std::any> getCustom(const std::string &key) const {
+    auto it = customProperties_.find(key);
+    if (it == customProperties_.end())
+      return std::nullopt;
+    return it->second;
+  }
+
+  // ------ 查询 ------
+  bool has(FramePropertyKey key) const {
+    return properties_.find(key) != properties_.end();
+  }
+
+  bool hasCustom(const std::string &key) const {
+    return customProperties_.find(key) != customProperties_.end();
+  }
+
+  bool empty() const {
+    return properties_.empty() && customProperties_.empty();
+  }
+
+  size_t count() const { return properties_.size() + customProperties_.size(); }
+
+  // ------ 移除 ------
+  void remove(FramePropertyKey key) { properties_.erase(key); }
+
+  void removeCustom(const std::string &key) { customProperties_.erase(key); }
+
+  void clear() {
+    properties_.clear();
+    customProperties_.clear();
+  }
+
+  // ------ 迭代 ------
+  using PropertyMap = std::unordered_map<FramePropertyKey, FramePropertyValue,
+                                         FramePropertyKeyHash>;
+  const PropertyMap &properties() const { return properties_; }
+
+  // ------ 链式 API ------
+  FramePropertySet &withSetFlag(int index) {
+    set(FramePropertyKey::SetFlag, index);
+    return *this;
+  }
+
+  FramePropertySet &withPlaySound(const std::string &path) {
+    set(FramePropertyKey::PlaySound, path);
+    return *this;
+  }
+
+  FramePropertySet &withImageRate(const Vec2 &scale) {
+    set(FramePropertyKey::ImageRate, scale);
+    return *this;
+  }
+
+  FramePropertySet &withImageRotate(float degrees) {
+    set(FramePropertyKey::ImageRotate, degrees);
+    return *this;
+  }
+
+  FramePropertySet &withColorTint(const Color &color) {
+    set(FramePropertyKey::ColorTint, color);
+    return *this;
+  }
+
+  FramePropertySet &withInterpolation(bool enabled = true) {
+    set(FramePropertyKey::Interpolation, enabled);
+    return *this;
+  }
+
+  FramePropertySet &withBlendLinearDodge(bool enabled = true) {
+    set(FramePropertyKey::BlendLinearDodge, enabled);
+    return *this;
+  }
+
+  FramePropertySet &withLoop(bool enabled = true) {
+    set(FramePropertyKey::Loop, enabled);
+    return *this;
+  }
+
+private:
+  PropertyMap properties_;
+  std::unordered_map<std::string, std::any> customProperties_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/frame_renderer.h b/Extra2D/include/extra2d/animation/frame_renderer.h
new file mode 100644
index 0000000..e9be061
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/frame_renderer.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <extra2d/animation/animation_frame.h>
+#include <extra2d/animation/interpolation_engine.h>
+#include <extra2d/animation/sprite_frame.h>
+#include <extra2d/animation/sprite_frame_cache.h>
+#include <extra2d/graphics/render_backend.h>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// FrameRenderer - 帧渲染器
+// 单渲染器 + SpriteFrame 引用策略，替代 N帧=N个Sprite 的旧设计
+// 负责预加载帧的 SpriteFrame、渲染当前帧、处理混合模式
+// ============================================================================
+class FrameRenderer {
+public:
+  FrameRenderer() = default;
+
+  // ------ 预加载 ------
+  // 解析所有帧的 SpriteFrame（通过 SpriteFrameCache）
+  bool preloadFrames(const std::vector<AnimationFrame> &frames);
+  void releaseFrames();
+
+  // ------ 渲染当前帧 ------
+  void renderFrame(RenderBackend &renderer, const AnimationFrame &frame,
+                   size_t frameIndex, const Vec2 &position, float nodeOpacity,
+                   const Color &tintColor, bool flipX, bool flipY);
+
+  // ------ 渲染插值帧 ------
+  void renderInterpolated(RenderBackend &renderer,
+                          const AnimationFrame &fromFrame, size_t fromIndex,
+                          const InterpolatedProperties &props,
+                          const Vec2 &position, float nodeOpacity,
+                          const Color &tintColor, bool flipX, bool flipY);
+
+  // ------ 混合模式映射 ------
+  static BlendMode mapBlendMode(const FramePropertySet &props);
+
+  // ------ 查询 ------
+  Ptr<SpriteFrame> getSpriteFrame(size_t frameIndex) const;
+  Size getMaxFrameSize() const { return maxFrameSize_; }
+  bool isLoaded() const { return !spriteFrames_.empty(); }
+
+private:
+  std::vector<Ptr<SpriteFrame>> spriteFrames_;
+  Size maxFrameSize_;
+
+  void drawSpriteFrame(RenderBackend &renderer, Ptr<SpriteFrame> sf,
+                       const Vec2 &position, const Vec2 &offset,
+                       const Vec2 &scale, float rotation, float opacity,
+                       const Color &tint, bool flipX, bool flipY,
+                       BlendMode blend);
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/interpolation_engine.h b/Extra2D/include/extra2d/animation/interpolation_engine.h
new file mode 100644
index 0000000..8978ab5
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/interpolation_engine.h
@@ -0,0 +1,106 @@
+#pragma once
+
+#include <cmath>
+#include <extra2d/animation/animation_frame.h>
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 插值结果 - 两帧之间的插值后属性
+// ============================================================================
+struct InterpolatedProperties {
+  Vec2 position;
+  Vec2 scale = Vec2::One();
+  float rotation = 0.0f;
+  Color color = Colors::White;
+};
+
+// ============================================================================
+// 插值曲线类型
+// ============================================================================
+enum class InterpolationCurve : uint8 {
+  Linear,    // 线性（原始系统的 uniform velocity）
+  EaseIn,    // 缓入
+  EaseOut,   // 缓出
+  EaseInOut, // 缓入缓出
+};
+
+// ============================================================================
+// InterpolationEngine - 帧间属性插值计算（静态方法，无状态）
+// 独立于 AnimationController，可复用于其他系统
+// ============================================================================
+class InterpolationEngine {
+public:
+  /// 核心插值计算：根据 t 因子 (0~1) 计算两帧之间的插值属性
+  static InterpolatedProperties
+  interpolate(const AnimationFrame &from, const AnimationFrame &to, float t,
+              InterpolationCurve curve = InterpolationCurve::Linear) {
+    float curvedT = applyCurve(t, curve);
+
+    InterpolatedProperties result;
+    result.position = lerpPosition(from, to, curvedT);
+    result.scale = lerpScale(from, to, curvedT);
+    result.rotation = lerpRotation(from, to, curvedT);
+    result.color = lerpColor(from, to, curvedT);
+    return result;
+  }
+
+  /// 位置插值
+  static Vec2 lerpPosition(const AnimationFrame &from, const AnimationFrame &to,
+                           float t) {
+    return Vec2::lerp(from.offset, to.offset, t);
+  }
+
+  /// 缩放插值
+  static Vec2 lerpScale(const AnimationFrame &from, const AnimationFrame &to,
+                        float t) {
+    Vec2 fromScale = from.getEffectiveScale();
+    Vec2 toScale = to.getEffectiveScale();
+    return Vec2::lerp(fromScale, toScale, t);
+  }
+
+  /// 旋转插值
+  static float lerpRotation(const AnimationFrame &from,
+                            const AnimationFrame &to, float t) {
+    float fromRot = from.getEffectiveRotation();
+    float toRot = to.getEffectiveRotation();
+    return math::lerp(fromRot, toRot, t);
+  }
+
+  /// 颜色插值
+  static Color lerpColor(const AnimationFrame &from, const AnimationFrame &to,
+                         float t) {
+    Color fromColor = from.getEffectiveColor();
+    Color toColor = to.getEffectiveColor();
+    return Color::lerp(fromColor, toColor, t);
+  }
+
+  /// 应用曲线函数
+  static float applyCurve(float t, InterpolationCurve curve) {
+    t = math::clamp(t, 0.0f, 1.0f);
+
+    switch (curve) {
+    case InterpolationCurve::Linear:
+      return t;
+
+    case InterpolationCurve::EaseIn:
+      return t * t;
+
+    case InterpolationCurve::EaseOut:
+      return t * (2.0f - t);
+
+    case InterpolationCurve::EaseInOut:
+      if (t < 0.5f)
+        return 2.0f * t * t;
+      else
+        return -1.0f + (4.0f - 2.0f * t) * t;
+    }
+
+    return t;
+  }
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/sprite_frame.h b/Extra2D/include/extra2d/animation/sprite_frame.h
new file mode 100644
index 0000000..45a843d
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/sprite_frame.h
@@ -0,0 +1,73 @@
+#pragma once
+
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/texture.h>
+#include <string>
+
+namespace extra2d {
+
+// ============================================================================
+// SpriteFrame - 精灵帧（纹理 + 区域 + 偏移的中间抽象）
+// 借鉴 Cocos2d-x SpriteFrame：解耦纹理物理存储与逻辑帧
+// 一个纹理图集可包含多个 SpriteFrame，减少纹理切换提升渲染性能
+// ============================================================================
+class SpriteFrame {
+public:
+  SpriteFrame() = default;
+
+  SpriteFrame(Ptr<Texture> texture, const Rect &rect)
+      : texture_(std::move(texture)), rect_(rect), originalSize_(rect.size) {}
+
+  SpriteFrame(Ptr<Texture> texture, const Rect &rect, const Vec2 &offset,
+              const Size &originalSize)
+      : texture_(std::move(texture)), rect_(rect), offset_(offset),
+        originalSize_(originalSize) {}
+
+  // ------ 静态创建 ------
+  static Ptr<SpriteFrame> create(Ptr<Texture> texture, const Rect &rect) {
+    return makePtr<SpriteFrame>(std::move(texture), rect);
+  }
+
+  static Ptr<SpriteFrame> create(Ptr<Texture> texture, const Rect &rect,
+                                 const Vec2 &offset, const Size &originalSize) {
+    return makePtr<SpriteFrame>(std::move(texture), rect, offset, originalSize);
+  }
+
+  // ------ 纹理信息 ------
+  void setTexture(Ptr<Texture> texture) { texture_ = std::move(texture); }
+  Ptr<Texture> getTexture() const { return texture_; }
+
+  // ------ 矩形区域（在纹理图集中的位置）------
+  void setRect(const Rect &rect) { rect_ = rect; }
+  const Rect &getRect() const { return rect_; }
+
+  // ------ 偏移（图集打包时的裁剪偏移）------
+  void setOffset(const Vec2 &offset) { offset_ = offset; }
+  const Vec2 &getOffset() const { return offset_; }
+
+  // ------ 原始尺寸（裁剪前的完整尺寸）------
+  void setOriginalSize(const Size &size) { originalSize_ = size; }
+  const Size &getOriginalSize() const { return originalSize_; }
+
+  // ------ 旋转标志（图集工具可能旋转90度）------
+  void setRotated(bool rotated) { rotated_ = rotated; }
+  bool isRotated() const { return rotated_; }
+
+  // ------ 名称（用于缓存索引）------
+  void setName(const std::string &name) { name_ = name; }
+  const std::string &getName() const { return name_; }
+
+  // ------ 有效性检查 ------
+  bool isValid() const { return texture_ != nullptr; }
+
+private:
+  Ptr<Texture> texture_;
+  Rect rect_;
+  Vec2 offset_;
+  Size originalSize_;
+  bool rotated_ = false;
+  std::string name_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/animation/sprite_frame_cache.h b/Extra2D/include/extra2d/animation/sprite_frame_cache.h
new file mode 100644
index 0000000..aa6a03c
--- /dev/null
+++ b/Extra2D/include/extra2d/animation/sprite_frame_cache.h
@@ -0,0 +1,171 @@
+#pragma once
+
+#include <extra2d/animation/sprite_frame.h>
+#include <extra2d/graphics/texture_pool.h>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace extra2d {
+
+// ============================================================================
+// SpriteFrameCache - 精灵帧全局缓存（借鉴 Cocos SpriteFrameCache）
+// 全局单例管理所有精灵帧，避免重复创建，支持图集自动切割
+// ============================================================================
+class SpriteFrameCache {
+public:
+  static SpriteFrameCache &getInstance() {
+    static SpriteFrameCache instance;
+    return instance;
+  }
+
+  // ------ 添加帧 ------
+
+  /// 添加单个精灵帧
+  void addSpriteFrame(Ptr<SpriteFrame> frame, const std::string &name) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    frames_[name] = std::move(frame);
+  }
+
+  /// 从纹理和矩形区域创建并添加帧
+  void addSpriteFrameFromTexture(Ptr<Texture> texture, const Rect &rect,
+                                 const std::string &name) {
+    auto frame = SpriteFrame::create(std::move(texture), rect);
+    frame->setName(name);
+    addSpriteFrame(std::move(frame), name);
+  }
+
+  /// 从纹理图集批量切割添加（等宽等高网格）
+  void addSpriteFramesFromGrid(const std::string &texturePath, int frameWidth,
+                               int frameHeight, int frameCount = -1,
+                               int spacing = 0, int margin = 0) {
+    auto texture = TexturePool::getInstance().get(texturePath);
+    if (!texture)
+      return;
+    addSpriteFramesFromGrid(texture, texturePath, frameWidth, frameHeight,
+                            frameCount, spacing, margin);
+  }
+
+  /// 从纹理对象批量切割添加（等宽等高网格，无需走 TexturePool）
+  void addSpriteFramesFromGrid(Ptr<Texture> texture,
+                               const std::string &keyPrefix, int frameWidth,
+                               int frameHeight, int frameCount = -1,
+                               int spacing = 0, int margin = 0) {
+    if (!texture)
+      return;
+
+    int texW = texture->getWidth();
+    int texH = texture->getHeight();
+    int usableW = texW - 2 * margin;
+    int usableH = texH - 2 * margin;
+    int cols = (usableW + spacing) / (frameWidth + spacing);
+    int rows = (usableH + spacing) / (frameHeight + spacing);
+    int total = (frameCount > 0) ? frameCount : cols * rows;
+
+    std::lock_guard<std::mutex> lock(mutex_);
+    for (int i = 0; i < total; ++i) {
+      int col = i % cols;
+      int row = i / cols;
+      if (row >= rows)
+        break;
+
+      Rect rect(static_cast<float>(margin + col * (frameWidth + spacing)),
+                static_cast<float>(margin + row * (frameHeight + spacing)),
+                static_cast<float>(frameWidth),
+                static_cast<float>(frameHeight));
+
+      std::string name = keyPrefix + "#" + std::to_string(i);
+      auto frame = SpriteFrame::create(texture, rect);
+      frame->setName(name);
+      frames_[name] = std::move(frame);
+    }
+  }
+
+  // ------ 获取帧 ------
+
+  /// 按名称获取
+  Ptr<SpriteFrame> getSpriteFrame(const std::string &name) const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    auto it = frames_.find(name);
+    if (it != frames_.end())
+      return it->second;
+    return nullptr;
+  }
+
+  /// 通过路径+索引获取或创建（ANI 格式的定位方式）
+  Ptr<SpriteFrame> getOrCreateFromFile(const std::string &texturePath,
+                                       int index = 0) {
+    std::string key = texturePath + "#" + std::to_string(index);
+
+    {
+      std::lock_guard<std::mutex> lock(mutex_);
+      auto it = frames_.find(key);
+      if (it != frames_.end())
+        return it->second;
+    }
+
+    // 缓存未命中，从 TexturePool 加载纹理并创建 SpriteFrame
+    auto texture = TexturePool::getInstance().get(texturePath);
+    if (!texture)
+      return nullptr;
+
+    // 默认整张纹理作为一帧（index=0），或用整张纹理
+    Rect rect(0.0f, 0.0f, static_cast<float>(texture->getWidth()),
+              static_cast<float>(texture->getHeight()));
+
+    auto frame = SpriteFrame::create(texture, rect);
+    frame->setName(key);
+
+    std::lock_guard<std::mutex> lock(mutex_);
+    frames_[key] = frame;
+    return frame;
+  }
+
+  // ------ 缓存管理 ------
+
+  bool has(const std::string &name) const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return frames_.find(name) != frames_.end();
+  }
+
+  void removeSpriteFrame(const std::string &name) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    frames_.erase(name);
+  }
+
+  /// 移除未被外部引用的精灵帧（use_count == 1 表示仅缓存自身持有）
+  void removeUnusedSpriteFrames() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    for (auto it = frames_.begin(); it != frames_.end();) {
+      if (it->second.use_count() == 1) {
+        it = frames_.erase(it);
+      } else {
+        ++it;
+      }
+    }
+  }
+
+  void clear() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    frames_.clear();
+  }
+
+  size_t count() const {
+    std::lock_guard<std::mutex> lock(mutex_);
+    return frames_.size();
+  }
+
+private:
+  SpriteFrameCache() = default;
+  ~SpriteFrameCache() = default;
+  SpriteFrameCache(const SpriteFrameCache &) = delete;
+  SpriteFrameCache &operator=(const SpriteFrameCache &) = delete;
+
+  mutable std::mutex mutex_;
+  std::unordered_map<std::string, Ptr<SpriteFrame>> frames_;
+};
+
+// 便捷宏
+#define E2D_SPRITE_FRAME_CACHE() ::extra2d::SpriteFrameCache::getInstance()
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/app/application.h b/Extra2D/include/extra2d/app/application.h
new file mode 100644
index 0000000..cecb694
--- /dev/null
+++ b/Extra2D/include/extra2d/app/application.h
@@ -0,0 +1,127 @@
+#pragma once
+
+#include <extra2d/core/string.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/platform/window.h>
+#include <memory>
+
+namespace extra2d {
+
+// 前向声明
+class Input;
+class AudioEngine;
+class SceneManager;
+class ResourceManager;
+class TimerManager;
+class EventQueue;
+class EventDispatcher;
+class Camera;
+
+// ============================================================================
+// Application 配置
+// ============================================================================
+struct AppConfig {
+  String title = "Easy2D Application";
+  int width = 800;
+  int height = 600;
+  bool fullscreen = false;
+  bool resizable = true; // 窗口是否可调整大小
+  bool vsync = true;
+  int fpsLimit = 0; // 0 = 不限制
+  BackendType renderBackend = BackendType::OpenGL;
+  int msaaSamples = 0;
+};
+
+// ============================================================================
+// Application 单例 - 应用主控
+// ============================================================================
+class Application {
+public:
+  // Meyer's 单例
+  static Application &instance();
+
+  // 禁止拷贝
+  Application(const Application &) = delete;
+  Application &operator=(const Application &) = delete;
+
+  // ------------------------------------------------------------------------
+  // 生命周期
+  // ------------------------------------------------------------------------
+  bool init(const AppConfig &config);
+  void shutdown();
+  void run();
+  void quit();
+
+  // ------------------------------------------------------------------------
+  // 状态控制
+  // ------------------------------------------------------------------------
+  void pause();
+  void resume();
+  bool isPaused() const { return paused_; }
+  bool isRunning() const { return running_; }
+
+  // ------------------------------------------------------------------------
+  // 子系统访问
+  // ------------------------------------------------------------------------
+  Window &window() { return *window_; }
+  RenderBackend &renderer() { return *renderer_; }
+  Input &input();
+  AudioEngine &audio();
+  SceneManager &scenes();
+  ResourceManager &resources();
+  TimerManager &timers();
+  EventQueue &eventQueue();
+  EventDispatcher &eventDispatcher();
+  Camera &camera();
+
+  // ------------------------------------------------------------------------
+  // 便捷方法
+  // ------------------------------------------------------------------------
+  void enterScene(Ptr<class Scene> scene);
+  void enterScene(Ptr<class Scene> scene, Ptr<class Transition> transition);
+
+  float deltaTime() const { return deltaTime_; }
+  float totalTime() const { return totalTime_; }
+  int fps() const { return currentFps_; }
+
+  // 获取配置
+  const AppConfig &getConfig() const { return config_; }
+
+private:
+  Application() = default;
+  ~Application();
+
+  void mainLoop();
+  void update();
+  void render();
+
+  // 配置
+  AppConfig config_;
+
+  // 子系统
+  UniquePtr<Window> window_;
+  UniquePtr<RenderBackend> renderer_;
+  UniquePtr<SceneManager> sceneManager_;
+  UniquePtr<ResourceManager> resourceManager_;
+  UniquePtr<TimerManager> timerManager_;
+  UniquePtr<EventQueue> eventQueue_;
+  UniquePtr<EventDispatcher> eventDispatcher_;
+  UniquePtr<Camera> camera_;
+
+  // 状态
+  bool initialized_ = false;
+  bool running_ = false;
+  bool paused_ = false;
+  bool shouldQuit_ = false;
+
+  // 时间
+  float deltaTime_ = 0.0f;
+  float totalTime_ = 0.0f;
+  double lastFrameTime_ = 0.0;
+  int frameCount_ = 0;
+  float fpsTimer_ = 0.0f;
+  int currentFps_ = 0;
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/audio/audio_engine.h b/Extra2D/include/extra2d/audio/audio_engine.h
similarity index 93%
rename from Easy2D/include/easy2d/audio/audio_engine.h
rename to Extra2D/include/extra2d/audio/audio_engine.h
index dd12fb4..c388d7e 100644
--- a/Easy2D/include/easy2d/audio/audio_engine.h
+++ b/Extra2D/include/extra2d/audio/audio_engine.h
@@ -3,9 +3,9 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <easy2d/core/types.h>
+#include <extra2d/core/types.h>
 
-namespace easy2d {
+namespace extra2d {
 
 class Sound;
 
@@ -44,4 +44,4 @@ private:
     bool initialized_ = false;
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/audio/sound.h b/Extra2D/include/extra2d/audio/sound.h
similarity index 93%
rename from Easy2D/include/easy2d/audio/sound.h
rename to Extra2D/include/extra2d/audio/sound.h
index f61cc6f..399cc00 100644
--- a/Easy2D/include/easy2d/audio/sound.h
+++ b/Extra2D/include/extra2d/audio/sound.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <string>
-#include <easy2d/core/types.h>
+#include <extra2d/core/types.h>
 
 struct Mix_Chunk;
 
-namespace easy2d {
+namespace extra2d {
 
 class AudioEngine;
 
@@ -54,4 +54,4 @@ private:
     bool looping_ = false;
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/core/color.h b/Extra2D/include/extra2d/core/color.h
new file mode 100644
index 0000000..9f853b1
--- /dev/null
+++ b/Extra2D/include/extra2d/core/color.h
@@ -0,0 +1,137 @@
+#pragma once
+
+#include <algorithm>
+#include <extra2d/core/types.h>
+#include <glm/vec4.hpp>
+
+namespace extra2d {
+
+/// RGBA 颜色（浮点数，每通道 0.0 - 1.0）
+struct Color {
+  float r = 0.0f;
+  float g = 0.0f;
+  float b = 0.0f;
+  float a = 1.0f;
+
+  constexpr Color() = default;
+
+  constexpr Color(float r, float g, float b, float a = 1.0f)
+      : r(r), g(g), b(b), a(a) {}
+
+  /// 从 0xRRGGBB 整数构造
+  constexpr explicit Color(uint32_t rgb, float a = 1.0f)
+      : r(static_cast<float>((rgb >> 16) & 0xFF) / 255.0f),
+        g(static_cast<float>((rgb >> 8) & 0xFF) / 255.0f),
+        b(static_cast<float>((rgb) & 0xFF) / 255.0f), a(a) {}
+
+  /// 从 0-255 整数构造
+  static constexpr Color fromRGBA(uint8_t r, uint8_t g, uint8_t b,
+                                  uint8_t a = 255) {
+    return Color(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f);
+  }
+
+  /// 转换为 glm::vec4
+  glm::vec4 toVec4() const { return {r, g, b, a}; }
+
+  /// 线性插值
+  static Color lerp(const Color &a, const Color &b, float t) {
+    t = std::clamp(t, 0.0f, 1.0f);
+    return Color(a.r + (b.r - a.r) * t, a.g + (b.g - a.g) * t,
+                 a.b + (b.b - a.b) * t, a.a + (b.a - a.a) * t);
+  }
+
+  bool operator==(const Color &other) const {
+    return r == other.r && g == other.g && b == other.b && a == other.a;
+  }
+
+  bool operator!=(const Color &other) const { return !(*this == other); }
+
+  // 算术运算符
+  Color operator+(const Color &other) const {
+    return Color(r + other.r, g + other.g, b + other.b, a + other.a);
+  }
+
+  Color operator-(const Color &other) const {
+    return Color(r - other.r, g - other.g, b - other.b, a - other.a);
+  }
+
+  Color operator*(float scalar) const {
+    return Color(r * scalar, g * scalar, b * scalar, a * scalar);
+  }
+
+  Color operator/(float scalar) const {
+    return Color(r / scalar, g / scalar, b / scalar, a / scalar);
+  }
+
+  Color &operator+=(const Color &other) {
+    r += other.r;
+    g += other.g;
+    b += other.b;
+    a += other.a;
+    return *this;
+  }
+
+  Color &operator-=(const Color &other) {
+    r -= other.r;
+    g -= other.g;
+    b -= other.b;
+    a -= other.a;
+    return *this;
+  }
+
+  Color &operator*=(float scalar) {
+    r *= scalar;
+    g *= scalar;
+    b *= scalar;
+    a *= scalar;
+    return *this;
+  }
+
+  Color &operator/=(float scalar) {
+    r /= scalar;
+    g /= scalar;
+    b /= scalar;
+    a /= scalar;
+    return *this;
+  }
+};
+
+// 命名颜色常量
+namespace Colors {
+inline constexpr Color White{1.0f, 1.0f, 1.0f, 1.0f};
+inline constexpr Color Black{0.0f, 0.0f, 0.0f, 1.0f};
+inline constexpr Color Red{1.0f, 0.0f, 0.0f, 1.0f};
+inline constexpr Color Green{0.0f, 1.0f, 0.0f, 1.0f};
+inline constexpr Color Blue{0.0f, 0.0f, 1.0f, 1.0f};
+inline constexpr Color Yellow{1.0f, 1.0f, 0.0f, 1.0f};
+inline constexpr Color Cyan{0.0f, 1.0f, 1.0f, 1.0f};
+inline constexpr Color Magenta{1.0f, 0.0f, 1.0f, 1.0f};
+inline constexpr Color Orange{1.0f, 0.647f, 0.0f, 1.0f};
+inline constexpr Color Purple{0.502f, 0.0f, 0.502f, 1.0f};
+inline constexpr Color Pink{1.0f, 0.753f, 0.796f, 1.0f};
+inline constexpr Color Gray{0.502f, 0.502f, 0.502f, 1.0f};
+inline constexpr Color LightGray{0.827f, 0.827f, 0.827f, 1.0f};
+inline constexpr Color DarkGray{0.412f, 0.412f, 0.412f, 1.0f};
+inline constexpr Color Brown{0.647f, 0.165f, 0.165f, 1.0f};
+inline constexpr Color Gold{1.0f, 0.843f, 0.0f, 1.0f};
+inline constexpr Color Silver{0.753f, 0.753f, 0.753f, 1.0f};
+inline constexpr Color SkyBlue{0.529f, 0.808f, 0.922f, 1.0f};
+inline constexpr Color LimeGreen{0.196f, 0.804f, 0.196f, 1.0f};
+inline constexpr Color Coral{1.0f, 0.498f, 0.314f, 1.0f};
+inline constexpr Color Transparent{0.0f, 0.0f, 0.0f, 0.0f};
+} // namespace Colors
+
+// 为了向后兼容，在 Color 结构体内提供静态引用
+struct ColorConstants {
+  static const Color &White;
+  static const Color &Black;
+  static const Color &Red;
+  static const Color &Green;
+  static const Color &Blue;
+  static const Color &Yellow;
+  static const Color &Cyan;
+  static const Color &Magenta;
+  static const Color &Transparent;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/core/math_types.h b/Extra2D/include/extra2d/core/math_types.h
new file mode 100644
index 0000000..2c4d68e
--- /dev/null
+++ b/Extra2D/include/extra2d/core/math_types.h
@@ -0,0 +1,335 @@
+#pragma once
+
+#include <algorithm>
+#include <cmath>
+#include <extra2d/core/types.h>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/mat4x4.hpp>
+#include <glm/vec2.hpp>
+
+namespace extra2d {
+
+// ---------------------------------------------------------------------------
+// 常量
+// ---------------------------------------------------------------------------
+constexpr float PI_F = 3.14159265358979323846f;
+constexpr float DEG_TO_RAD = PI_F / 180.0f;
+constexpr float RAD_TO_DEG = 180.0f / PI_F;
+
+// ---------------------------------------------------------------------------
+// 2D 向量
+// ---------------------------------------------------------------------------
+struct Vec2 {
+  float x = 0.0f;
+  float y = 0.0f;
+
+  constexpr Vec2() = default;
+  constexpr Vec2(float x, float y) : x(x), y(y) {}
+  explicit Vec2(const glm::vec2 &v) : x(v.x), y(v.y) {}
+
+  glm::vec2 toGlm() const { return {x, y}; }
+  static Vec2 fromGlm(const glm::vec2 &v) { return {v.x, v.y}; }
+
+  // 基础运算
+  Vec2 operator+(const Vec2 &v) const { return {x + v.x, y + v.y}; }
+  Vec2 operator-(const Vec2 &v) const { return {x - v.x, y - v.y}; }
+  Vec2 operator*(float s) const { return {x * s, y * s}; }
+  Vec2 operator/(float s) const { return {x / s, y / s}; }
+  Vec2 operator-() const { return {-x, -y}; }
+
+  Vec2 &operator+=(const Vec2 &v) {
+    x += v.x;
+    y += v.y;
+    return *this;
+  }
+  Vec2 &operator-=(const Vec2 &v) {
+    x -= v.x;
+    y -= v.y;
+    return *this;
+  }
+  Vec2 &operator*=(float s) {
+    x *= s;
+    y *= s;
+    return *this;
+  }
+  Vec2 &operator/=(float s) {
+    x /= s;
+    y /= s;
+    return *this;
+  }
+
+  bool operator==(const Vec2 &v) const { return x == v.x && y == v.y; }
+  bool operator!=(const Vec2 &v) const { return !(*this == v); }
+
+  // 向量运算
+  float length() const { return std::sqrt(x * x + y * y); }
+  float lengthSquared() const { return x * x + y * y; }
+
+  Vec2 normalized() const {
+    float len = length();
+    if (len > 0.0f)
+      return {x / len, y / len};
+    return {0.0f, 0.0f};
+  }
+
+  float dot(const Vec2 &v) const { return x * v.x + y * v.y; }
+  float cross(const Vec2 &v) const { return x * v.y - y * v.x; }
+
+  float distance(const Vec2 &v) const { return (*this - v).length(); }
+  float angle() const { return std::atan2(y, x) * RAD_TO_DEG; }
+
+  static Vec2 lerp(const Vec2 &a, const Vec2 &b, float t) {
+    return a + (b - a) * t;
+  }
+
+  static constexpr Vec2 Zero() { return {0.0f, 0.0f}; }
+  static constexpr Vec2 One() { return {1.0f, 1.0f}; }
+  static constexpr Vec2 UnitX() { return {1.0f, 0.0f}; }
+  static constexpr Vec2 UnitY() { return {0.0f, 1.0f}; }
+};
+
+inline Vec2 operator*(float s, const Vec2 &v) { return v * s; }
+
+using Point = Vec2;
+
+// ---------------------------------------------------------------------------
+// 3D 向量 (用于3D动作)
+// ---------------------------------------------------------------------------
+struct Vec3 {
+  float x = 0.0f;
+  float y = 0.0f;
+  float z = 0.0f;
+
+  constexpr Vec3() = default;
+  constexpr Vec3(float x, float y, float z) : x(x), y(y), z(z) {}
+  explicit Vec3(const glm::vec3 &v) : x(v.x), y(v.y), z(v.z) {}
+
+  glm::vec3 toGlm() const { return {x, y, z}; }
+  static Vec3 fromGlm(const glm::vec3 &v) { return {v.x, v.y, v.z}; }
+
+  Vec3 operator+(const Vec3 &v) const { return {x + v.x, y + v.y, z + v.z}; }
+  Vec3 operator-(const Vec3 &v) const { return {x - v.x, y - v.y, z - v.z}; }
+  Vec3 operator*(float s) const { return {x * s, y * s, z * s}; }
+  Vec3 operator/(float s) const { return {x / s, y / s, z / s}; }
+  Vec3 operator-() const { return {-x, -y, -z}; }
+
+  Vec3 &operator+=(const Vec3 &v) {
+    x += v.x;
+    y += v.y;
+    z += v.z;
+    return *this;
+  }
+  Vec3 &operator-=(const Vec3 &v) {
+    x -= v.x;
+    y -= v.y;
+    z -= v.z;
+    return *this;
+  }
+  Vec3 &operator*=(float s) {
+    x *= s;
+    y *= s;
+    z *= s;
+    return *this;
+  }
+  Vec3 &operator/=(float s) {
+    x /= s;
+    y /= s;
+    z /= s;
+    return *this;
+  }
+
+  bool operator==(const Vec3 &v) const {
+    return x == v.x && y == v.y && z == v.z;
+  }
+  bool operator!=(const Vec3 &v) const { return !(*this == v); }
+
+  float length() const { return std::sqrt(x * x + y * y + z * z); }
+  float lengthSquared() const { return x * x + y * y + z * z; }
+
+  Vec3 normalized() const {
+    float len = length();
+    if (len > 0.0f)
+      return {x / len, y / len, z / len};
+    return {0.0f, 0.0f, 0.0f};
+  }
+
+  float dot(const Vec3 &v) const { return x * v.x + y * v.y + z * v.z; }
+
+  static Vec3 lerp(const Vec3 &a, const Vec3 &b, float t) {
+    return a + (b - a) * t;
+  }
+
+  static constexpr Vec3 Zero() { return {0.0f, 0.0f, 0.0f}; }
+  static constexpr Vec3 One() { return {1.0f, 1.0f, 1.0f}; }
+};
+
+inline Vec3 operator*(float s, const Vec3 &v) { return v * s; }
+
+// ---------------------------------------------------------------------------
+// 2D 尺寸
+// ---------------------------------------------------------------------------
+struct Size {
+  float width = 0.0f;
+  float height = 0.0f;
+
+  constexpr Size() = default;
+  constexpr Size(float w, float h) : width(w), height(h) {}
+
+  bool operator==(const Size &s) const {
+    return width == s.width && height == s.height;
+  }
+  bool operator!=(const Size &s) const { return !(*this == s); }
+
+  float area() const { return width * height; }
+  bool empty() const { return width <= 0.0f || height <= 0.0f; }
+
+  static constexpr Size Zero() { return {0.0f, 0.0f}; }
+};
+
+// ---------------------------------------------------------------------------
+// 2D 矩形
+// ---------------------------------------------------------------------------
+struct Rect {
+  Point origin;
+  Size size;
+
+  constexpr Rect() = default;
+  constexpr Rect(float x, float y, float w, float h)
+      : origin(x, y), size(w, h) {}
+  constexpr Rect(const Point &o, const Size &s) : origin(o), size(s) {}
+
+  float left() const { return origin.x; }
+  float top() const { return origin.y; }
+  float right() const { return origin.x + size.width; }
+  float bottom() const { return origin.y + size.height; }
+  float width() const { return size.width; }
+  float height() const { return size.height; }
+  Point center() const {
+    return {origin.x + size.width * 0.5f, origin.y + size.height * 0.5f};
+  }
+
+  bool empty() const { return size.empty(); }
+
+  bool containsPoint(const Point &p) const {
+    return p.x >= left() && p.x <= right() && p.y >= top() && p.y <= bottom();
+  }
+
+  bool contains(const Rect &r) const {
+    return r.left() >= left() && r.right() <= right() && r.top() >= top() &&
+           r.bottom() <= bottom();
+  }
+
+  bool intersects(const Rect &r) const {
+    return !(left() > r.right() || right() < r.left() || top() > r.bottom() ||
+             bottom() < r.top());
+  }
+
+  Rect intersection(const Rect &r) const {
+    float l = std::max(left(), r.left());
+    float t = std::max(top(), r.top());
+    float ri = std::min(right(), r.right());
+    float b = std::min(bottom(), r.bottom());
+    if (l < ri && t < b)
+      return {l, t, ri - l, b - t};
+    return {};
+  }
+
+  Rect unionWith(const Rect &r) const {
+    if (empty())
+      return r;
+    if (r.empty())
+      return *this;
+    float l = std::min(left(), r.left());
+    float t = std::min(top(), r.top());
+    float ri = std::max(right(), r.right());
+    float b = std::max(bottom(), r.bottom());
+    return {l, t, ri - l, b - t};
+  }
+
+  bool operator==(const Rect &r) const {
+    return origin == r.origin && size == r.size;
+  }
+  bool operator!=(const Rect &r) const { return !(*this == r); }
+
+  static constexpr Rect Zero() { return {0, 0, 0, 0}; }
+};
+
+// ---------------------------------------------------------------------------
+// 2D 变换矩阵（基于 glm::mat4，兼容 OpenGL）
+// ---------------------------------------------------------------------------
+struct Transform2D {
+  glm::mat4 matrix{1.0f}; // 单位矩阵
+
+  Transform2D() = default;
+  explicit Transform2D(const glm::mat4 &m) : matrix(m) {}
+
+  static Transform2D identity() { return Transform2D{}; }
+
+  static Transform2D translation(float x, float y) {
+    Transform2D t;
+    t.matrix = glm::translate(glm::mat4(1.0f), glm::vec3(x, y, 0.0f));
+    return t;
+  }
+
+  static Transform2D translation(const Vec2 &v) {
+    return translation(v.x, v.y);
+  }
+
+  static Transform2D rotation(float degrees) {
+    Transform2D t;
+    t.matrix = glm::rotate(glm::mat4(1.0f), degrees * DEG_TO_RAD,
+                           glm::vec3(0.0f, 0.0f, 1.0f));
+    return t;
+  }
+
+  static Transform2D scaling(float sx, float sy) {
+    Transform2D t;
+    t.matrix = glm::scale(glm::mat4(1.0f), glm::vec3(sx, sy, 1.0f));
+    return t;
+  }
+
+  static Transform2D scaling(float s) { return scaling(s, s); }
+
+  static Transform2D skewing(float skewX, float skewY) {
+    Transform2D t;
+    t.matrix = glm::mat4(1.0f);
+    t.matrix[1][0] = std::tan(skewX * DEG_TO_RAD);
+    t.matrix[0][1] = std::tan(skewY * DEG_TO_RAD);
+    return t;
+  }
+
+  Transform2D operator*(const Transform2D &other) const {
+    return Transform2D(matrix * other.matrix);
+  }
+
+  Transform2D &operator*=(const Transform2D &other) {
+    matrix *= other.matrix;
+    return *this;
+  }
+
+  Vec2 transformPoint(const Vec2 &p) const {
+    glm::vec4 result = matrix * glm::vec4(p.x, p.y, 0.0f, 1.0f);
+    return {result.x, result.y};
+  }
+
+  Transform2D inverse() const { return Transform2D(glm::inverse(matrix)); }
+};
+
+// ---------------------------------------------------------------------------
+// 数学工具函数
+// ---------------------------------------------------------------------------
+namespace math {
+
+inline float clamp(float value, float minVal, float maxVal) {
+  return std::clamp(value, minVal, maxVal);
+}
+
+inline float lerp(float a, float b, float t) { return a + (b - a) * t; }
+
+inline float degrees(float radians) { return radians * RAD_TO_DEG; }
+
+inline float radians(float degrees) { return degrees * DEG_TO_RAD; }
+
+} // namespace math
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/core/string.h b/Extra2D/include/extra2d/core/string.h
similarity index 99%
rename from Easy2D/include/easy2d/core/string.h
rename to Extra2D/include/extra2d/core/string.h
index 7a56d82..c9752d9 100644
--- a/Easy2D/include/easy2d/core/string.h
+++ b/Extra2D/include/extra2d/core/string.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <easy2d/core/types.h>
+#include <extra2d/core/types.h>
 #include <string>
 #include <vector>
 #include <cstring>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // String 类 - 跨平台字符串，内部统一使用 UTF-8 存储
@@ -504,4 +504,4 @@ inline String operator+(const char* lhs, const String& rhs) {
     return String(lhs) + rhs;
 }
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/core/types.h b/Extra2D/include/extra2d/core/types.h
similarity index 52%
rename from Easy2D/include/easy2d/core/types.h
rename to Extra2D/include/extra2d/core/types.h
index a6445d1..1b51f75 100644
--- a/Easy2D/include/easy2d/core/types.h
+++ b/Extra2D/include/extra2d/core/types.h
@@ -4,48 +4,43 @@
 #include <functional>
 #include <memory>
 
-namespace easy2d {
+namespace extra2d {
 
 // ---------------------------------------------------------------------------
 // 智能指针别名
 // ---------------------------------------------------------------------------
-template<typename T>
-using Ptr = std::shared_ptr<T>;
+template <typename T> using Ptr = std::shared_ptr<T>;
 
-template<typename T>
-using UniquePtr = std::unique_ptr<T>;
+template <typename T> using UniquePtr = std::unique_ptr<T>;
 
-template<typename T>
-using WeakPtr = std::weak_ptr<T>;
+template <typename T> using WeakPtr = std::weak_ptr<T>;
 
 /// 创建 shared_ptr 的便捷函数
-template<typename T, typename... Args>
-inline Ptr<T> makePtr(Args&&... args) {
-    return std::make_shared<T>(std::forward<Args>(args)...);
+template <typename T, typename... Args> inline Ptr<T> makePtr(Args &&...args) {
+  return std::make_shared<T>(std::forward<Args>(args)...);
 }
 
 /// 创建 unique_ptr 的便捷函数
-template<typename T, typename... Args>
-inline UniquePtr<T> makeUnique(Args&&... args) {
-    return std::make_unique<T>(std::forward<Args>(args)...);
+template <typename T, typename... Args>
+inline UniquePtr<T> makeUnique(Args &&...args) {
+  return std::make_unique<T>(std::forward<Args>(args)...);
 }
 
 // ---------------------------------------------------------------------------
 // 函数别名
 // ---------------------------------------------------------------------------
-template<typename Sig>
-using Function = std::function<Sig>;
+template <typename Sig> using Function = std::function<Sig>;
 
 // ---------------------------------------------------------------------------
 // 基础类型别名
 // ---------------------------------------------------------------------------
-using int8   = std::int8_t;
-using int16  = std::int16_t;
-using int32  = std::int32_t;
-using int64  = std::int64_t;
-using uint8  = std::uint8_t;
+using int8 = std::int8_t;
+using int16 = std::int16_t;
+using int32 = std::int32_t;
+using int64 = std::int64_t;
+using uint8 = std::uint8_t;
 using uint16 = std::uint16_t;
 using uint32 = std::uint32_t;
 using uint64 = std::uint64_t;
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/effects/custom_effect_manager.h b/Extra2D/include/extra2d/effects/custom_effect_manager.h
new file mode 100644
index 0000000..9cc7000
--- /dev/null
+++ b/Extra2D/include/extra2d/effects/custom_effect_manager.h
@@ -0,0 +1,324 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/types.h>
+#include <extra2d/effects/particle_system.h>
+#include <extra2d/effects/post_process.h>
+#include <extra2d/graphics/shader_system.h>
+#include <functional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 自定义特效类型
+// ============================================================================
+enum class CustomEffectType {
+  Particle,    // 粒子特效
+  PostProcess, // 后处理特效
+  Shader,      // Shader特效
+  Combined     // 组合特效
+};
+
+// ============================================================================
+// 自定义特效配置
+// ============================================================================
+struct CustomEffectConfig {
+  std::string name;        // 特效名称
+  CustomEffectType type;   // 特效类型
+  std::string description; // 描述
+
+  // 粒子特效配置
+  EmitterConfig emitterConfig;
+
+  // 后处理特效配置
+  std::string shaderVertPath;                          // 顶点着色器路径
+  std::string shaderFragPath;                          // 片段着色器路径
+  std::unordered_map<std::string, float> shaderParams; // Shader参数
+
+  // 通用配置
+  float duration; // 持续时间(-1表示无限)
+  bool loop;      // 是否循环
+  float delay;    // 延迟启动时间
+};
+
+// ============================================================================
+// 自定义特效基类
+// ============================================================================
+class CustomEffect {
+public:
+  explicit CustomEffect(const CustomEffectConfig &config);
+  virtual ~CustomEffect() = default;
+
+  // ------------------------------------------------------------------------
+  // 生命周期
+  // ------------------------------------------------------------------------
+  virtual bool init();
+  virtual void update(float dt);
+  virtual void render(RenderBackend &renderer);
+  virtual void shutdown();
+
+  // ------------------------------------------------------------------------
+  // 控制
+  // ------------------------------------------------------------------------
+  void play();
+  void pause();
+  void stop();
+  void reset();
+
+  bool isPlaying() const { return playing_; }
+  bool isFinished() const { return finished_; }
+  float getElapsedTime() const { return elapsedTime_; }
+
+  // ------------------------------------------------------------------------
+  // 配置
+  // ------------------------------------------------------------------------
+  const std::string &getName() const { return config_.name; }
+  const CustomEffectConfig &getConfig() const { return config_; }
+
+  void setPosition(const Vec2 &pos) { position_ = pos; }
+  void setRotation(float rot) { rotation_ = rot; }
+  void setScale(float scale) { scale_ = scale; }
+
+  Vec2 getPosition() const { return position_; }
+  float getRotation() const { return rotation_; }
+  float getScale() const { return scale_; }
+
+protected:
+  CustomEffectConfig config_;
+  Vec2 position_ = Vec2::Zero();
+  float rotation_ = 0.0f;
+  float scale_ = 1.0f;
+
+  bool playing_ = false;
+  bool paused_ = false;
+  bool finished_ = false;
+  float elapsedTime_ = 0.0f;
+  float delayTimer_ = 0.0f;
+};
+
+// ============================================================================
+// 自定义粒子特效
+// ============================================================================
+class CustomParticleEffect : public CustomEffect {
+public:
+  explicit CustomParticleEffect(const CustomEffectConfig &config);
+
+  bool init() override;
+  void update(float dt) override;
+  void render(RenderBackend &renderer) override;
+  void shutdown() override;
+
+  void play();
+  void stop();
+
+  Ptr<ParticleEmitter> getEmitter() { return emitter_; }
+
+private:
+  Ptr<ParticleSystem> particleSystem_;
+  Ptr<ParticleEmitter> emitter_;
+};
+
+// ============================================================================
+// 自定义后处理特效
+// ============================================================================
+class CustomPostProcessEffect : public CustomEffect, public PostProcessEffect {
+public:
+  explicit CustomPostProcessEffect(const CustomEffectConfig &config);
+
+  bool init() override;
+  void update(float dt) override;
+  void shutdown() override;
+
+  void onShaderBind(GLShader &shader) override;
+
+  void setParam(const std::string &name, float value);
+  float getParam(const std::string &name) const;
+
+private:
+  std::unordered_map<std::string, float> runtimeParams_;
+};
+
+// ============================================================================
+// 自定义特效工厂
+// ============================================================================
+class CustomEffectFactory {
+public:
+  using EffectCreator =
+      std::function<Ptr<CustomEffect>(const CustomEffectConfig &)>;
+
+  static CustomEffectFactory &getInstance();
+
+  // 注册自定义特效创建器
+  void registerEffect(const std::string &typeName, EffectCreator creator);
+
+  // 创建特效
+  Ptr<CustomEffect> create(const std::string &typeName,
+                           const CustomEffectConfig &config);
+
+  // 检查是否已注册
+  bool isRegistered(const std::string &typeName) const;
+
+  // 获取所有已注册的类型
+  std::vector<std::string> getRegisteredTypes() const;
+
+private:
+  CustomEffectFactory() = default;
+  ~CustomEffectFactory() = default;
+  CustomEffectFactory(const CustomEffectFactory &) = delete;
+  CustomEffectFactory &operator=(const CustomEffectFactory &) = delete;
+
+  std::unordered_map<std::string, EffectCreator> creators_;
+};
+
+// ============================================================================
+// 自定义特效管理器
+// ============================================================================
+class CustomEffectManager {
+public:
+  static CustomEffectManager &getInstance();
+
+  // ------------------------------------------------------------------------
+  // 初始化和关闭
+  // ------------------------------------------------------------------------
+  bool init();
+  void shutdown();
+
+  // ------------------------------------------------------------------------
+  // 特效管理
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 从文件加载特效配置（支持JSON和文本格式）
+   * 自动检测格式：JSON格式优先，失败则回退到文本格式
+   */
+  bool loadFromFile(const std::string &filepath);
+
+  /**
+   * @brief 从文本文件加载特效配置（简化格式）
+   * 格式：每行一个参数，如 EMISSION 100
+   */
+  bool loadFromTextFile(const std::string &filepath);
+
+  /**
+   * @brief 保存特效配置到文件
+   * @param useJson true=JSON格式, false=文本格式
+   */
+  bool saveToFile(const std::string &name, const std::string &filepath,
+                  bool useJson = true);
+
+  /**
+   * @brief 保存所有特效配置到一个JSON文件
+   */
+  bool saveAllToFile(const std::string &filepath);
+
+  /**
+   * @brief 注册特效配置
+   */
+  void registerConfig(const std::string &name,
+                      const CustomEffectConfig &config);
+
+  /**
+   * @brief 获取特效配置
+   */
+  CustomEffectConfig *getConfig(const std::string &name);
+
+  /**
+   * @brief 移除特效配置
+   */
+  void removeConfig(const std::string &name);
+
+  /**
+   * @brief 获取所有配置名称
+   */
+  std::vector<std::string> getConfigNames() const;
+
+  // ------------------------------------------------------------------------
+  // 特效实例管理
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 创建特效实例
+   */
+  Ptr<CustomEffect> createEffect(const std::string &name);
+
+  /**
+   * @brief 从配置直接创建特效
+   */
+  Ptr<CustomEffect> createEffectFromConfig(const CustomEffectConfig &config);
+
+  /**
+   * @brief 销毁特效实例
+   */
+  void destroyEffect(Ptr<CustomEffect> effect);
+
+  /**
+   * @brief 更新所有特效
+   */
+  void update(float dt);
+
+  /**
+   * @brief 渲染所有特效
+   */
+  void render(RenderBackend &renderer);
+
+  /**
+   * @brief 停止所有特效
+   */
+  void stopAll();
+
+  // ------------------------------------------------------------------------
+  // 便捷方法
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 播放特效（简写）
+   */
+  Ptr<CustomEffect> play(const std::string &name, const Vec2 &position);
+
+  /**
+   * @brief 播放特效并自动销毁
+   */
+  void playOneShot(const std::string &name, const Vec2 &position);
+
+private:
+  CustomEffectManager() = default;
+  ~CustomEffectManager() = default;
+  CustomEffectManager(const CustomEffectManager &) = delete;
+  CustomEffectManager &operator=(const CustomEffectManager &) = delete;
+
+  std::unordered_map<std::string, CustomEffectConfig> configs_;
+  std::vector<Ptr<CustomEffect>> activeEffects_;
+};
+
+// ============================================================================
+// 便捷宏
+// ============================================================================
+#define E2D_CUSTOM_EFFECT_MANAGER()                                            \
+  ::extra2d::CustomEffectManager::getInstance()
+#define E2D_CUSTOM_EFFECT_FACTORY()                                            \
+  ::extra2d::CustomEffectFactory::getInstance()
+
+// ============================================================================
+// 预设特效快速创建
+// ============================================================================
+class EffectBuilder {
+public:
+  // 粒子特效
+  static CustomEffectConfig Particle(const std::string &name);
+  static CustomEffectConfig Fire(const std::string &name);
+  static CustomEffectConfig Smoke(const std::string &name);
+  static CustomEffectConfig Explosion(const std::string &name);
+  static CustomEffectConfig Magic(const std::string &name);
+  static CustomEffectConfig Sparkle(const std::string &name);
+
+  // 后处理特效
+  static CustomEffectConfig Bloom(const std::string &name);
+  static CustomEffectConfig Blur(const std::string &name);
+  static CustomEffectConfig Vignette(const std::string &name);
+  static CustomEffectConfig ColorGrading(const std::string &name);
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/effects/particle_system.h b/Extra2D/include/extra2d/effects/particle_system.h
new file mode 100644
index 0000000..8c56158
--- /dev/null
+++ b/Extra2D/include/extra2d/effects/particle_system.h
@@ -0,0 +1,266 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/scene/node.h>
+#include <functional>
+#include <random>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 粒子数据
+// ============================================================================
+struct Particle {
+  Vec2 position;
+  Vec2 velocity;
+  Vec2 acceleration;
+  float rotation;
+  float angularVelocity;
+  float size;
+  float sizeDelta;
+  Color color;
+  Color colorDelta;
+  float life;
+  float maxLife;
+  bool active;
+
+  Particle()
+      : position(Vec2::Zero()), velocity(Vec2::Zero()),
+        acceleration(Vec2::Zero()), rotation(0.0f), angularVelocity(0.0f),
+        size(1.0f), sizeDelta(0.0f), color(Colors::White),
+        colorDelta(Colors::Transparent), life(0.0f), maxLife(1.0f),
+        active(false) {}
+};
+
+// ============================================================================
+// 发射器配置
+// ============================================================================
+struct EmitterConfig {
+  // 发射速率
+  float emissionRate = 100.0f;    // 每秒发射粒子数
+  float emissionDuration = -1.0f; // 发射持续时间（-1表示无限）
+
+  // 粒子生命周期
+  float minLife = 1.0f;
+  float maxLife = 2.0f;
+
+  // 粒子大小
+  float minStartSize = 10.0f;
+  float maxStartSize = 20.0f;
+  float minEndSize = 0.0f;
+  float maxEndSize = 5.0f;
+
+  // 粒子速度
+  Vec2 minVelocity = Vec2(-50.0f, -50.0f);
+  Vec2 maxVelocity = Vec2(50.0f, 50.0f);
+
+  // 粒子加速度
+  Vec2 acceleration = Vec2(0.0f, -100.0f); // 重力
+
+  // 粒子旋转
+  float minRotation = 0.0f;
+  float maxRotation = 360.0f;
+  float minAngularVelocity = -90.0f;
+  float maxAngularVelocity = 90.0f;
+
+  // 颜色
+  Color startColor = Colors::White;
+  Color endColor = Colors::Transparent;
+
+  // 发射形状
+  enum class Shape {
+    Point,     // 点发射
+    Circle,    // 圆形区域
+    Rectangle, // 矩形区域
+    Cone       // 锥形
+  };
+  Shape shape = Shape::Point;
+  float shapeRadius = 50.0f;             // 圆形/锥形半径
+  Vec2 shapeSize = Vec2(100.0f, 100.0f); // 矩形大小
+  float coneAngle = 45.0f;               // 锥形角度
+
+  // 纹理
+  Ptr<Texture> texture = nullptr;
+
+  // 混合模式
+  BlendMode blendMode = BlendMode::Additive;
+};
+
+// ============================================================================
+// 粒子发射器
+// ============================================================================
+class ParticleEmitter {
+public:
+  ParticleEmitter();
+  ~ParticleEmitter() = default;
+
+  // ------------------------------------------------------------------------
+  // 初始化和关闭
+  // ------------------------------------------------------------------------
+  bool init(size_t maxParticles);
+  void shutdown();
+
+  // ------------------------------------------------------------------------
+  // 配置
+  // ------------------------------------------------------------------------
+  void setConfig(const EmitterConfig &config) { config_ = config; }
+  const EmitterConfig &getConfig() const { return config_; }
+
+  // 链式配置API
+  ParticleEmitter &withEmissionRate(float rate) {
+    config_.emissionRate = rate;
+    return *this;
+  }
+  ParticleEmitter &withLife(float minLife, float maxLife) {
+    config_.minLife = minLife;
+    config_.maxLife = maxLife;
+    return *this;
+  }
+  ParticleEmitter &withSize(float minStart, float maxStart, float minEnd = 0.0f,
+                            float maxEnd = 0.0f) {
+    config_.minStartSize = minStart;
+    config_.maxStartSize = maxStart;
+    config_.minEndSize = minEnd;
+    config_.maxEndSize = maxEnd;
+    return *this;
+  }
+  ParticleEmitter &withVelocity(const Vec2 &minVel, const Vec2 &maxVel) {
+    config_.minVelocity = minVel;
+    config_.maxVelocity = maxVel;
+    return *this;
+  }
+  ParticleEmitter &withAcceleration(const Vec2 &accel) {
+    config_.acceleration = accel;
+    return *this;
+  }
+  ParticleEmitter &withColor(const Color &start, const Color &end) {
+    config_.startColor = start;
+    config_.endColor = end;
+    return *this;
+  }
+  ParticleEmitter &withTexture(Ptr<Texture> texture) {
+    config_.texture = texture;
+    return *this;
+  }
+  ParticleEmitter &withBlendMode(BlendMode mode) {
+    config_.blendMode = mode;
+    return *this;
+  }
+
+  // ------------------------------------------------------------------------
+  // 发射控制
+  // ------------------------------------------------------------------------
+  void start();
+  void stop();
+  void burst(int count); // 爆发发射
+  void reset();
+  bool isEmitting() const { return emitting_; }
+
+  // ------------------------------------------------------------------------
+  // 更新和渲染
+  // ------------------------------------------------------------------------
+  void update(float dt);
+  void render(RenderBackend &renderer);
+
+  // ------------------------------------------------------------------------
+  // 状态查询
+  // ------------------------------------------------------------------------
+  size_t getActiveParticleCount() const { return activeCount_; }
+  size_t getMaxParticles() const { return particles_.size(); }
+  bool isActive() const { return activeCount_ > 0 || emitting_; }
+
+  // ------------------------------------------------------------------------
+  // 变换
+  // ------------------------------------------------------------------------
+  void setPosition(const Vec2 &pos) { position_ = pos; }
+  void setRotation(float rot) { rotation_ = rot; }
+  Vec2 getPosition() const { return position_; }
+  float getRotation() const { return rotation_; }
+
+private:
+  EmitterConfig config_;
+  std::vector<Particle> particles_;
+  size_t activeCount_ = 0;
+
+  Vec2 position_ = Vec2::Zero();
+  float rotation_ = 0.0f;
+
+  bool emitting_ = false;
+  float emissionTimer_ = 0.0f;
+  float emissionTime_ = 0.0f;
+
+  std::mt19937 rng_;
+
+  void emitParticle();
+  float randomFloat(float min, float max);
+  Vec2 randomPointInShape();
+  Vec2 randomVelocity();
+};
+
+// ============================================================================
+// 粒子系统 - 管理多个发射器
+// ============================================================================
+class ParticleSystem : public Node {
+public:
+  ParticleSystem();
+  ~ParticleSystem() override = default;
+
+  // ------------------------------------------------------------------------
+  // 静态创建方法
+  // ------------------------------------------------------------------------
+  static Ptr<ParticleSystem> create();
+
+  // ------------------------------------------------------------------------
+  // 发射器管理
+  // ------------------------------------------------------------------------
+  Ptr<ParticleEmitter> addEmitter(const EmitterConfig &config = {});
+  void removeEmitter(Ptr<ParticleEmitter> emitter);
+  void removeAllEmitters();
+  size_t getEmitterCount() const { return emitters_.size(); }
+
+  // ------------------------------------------------------------------------
+  // 全局控制
+  // ------------------------------------------------------------------------
+  void startAll();
+  void stopAll();
+  void resetAll();
+
+  // ------------------------------------------------------------------------
+  // 预设
+  // ------------------------------------------------------------------------
+  static EmitterConfig PresetFire();
+  static EmitterConfig PresetSmoke();
+  static EmitterConfig PresetExplosion();
+  static EmitterConfig PresetSparkle();
+  static EmitterConfig PresetRain();
+  static EmitterConfig PresetSnow();
+
+  // ------------------------------------------------------------------------
+  // 重写Node方法
+  // ------------------------------------------------------------------------
+  void onUpdate(float dt) override;
+  void onDraw(RenderBackend &renderer) override;
+
+private:
+  std::vector<Ptr<ParticleEmitter>> emitters_;
+};
+
+// ============================================================================
+// 粒子预设（便捷类）
+// ============================================================================
+class ParticlePreset {
+public:
+  static EmitterConfig Fire();
+  static EmitterConfig Smoke();
+  static EmitterConfig Explosion();
+  static EmitterConfig Sparkle();
+  static EmitterConfig Rain();
+  static EmitterConfig Snow();
+  static EmitterConfig Magic();
+  static EmitterConfig Bubbles();
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/effects/post_process.h b/Extra2D/include/extra2d/effects/post_process.h
new file mode 100644
index 0000000..638bc68
--- /dev/null
+++ b/Extra2D/include/extra2d/effects/post_process.h
@@ -0,0 +1,228 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/opengl/gl_shader.h>
+#include <extra2d/graphics/texture.h>
+#include <functional>
+#include <string>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 前向声明
+// ============================================================================
+class RenderTarget;
+class RenderBackend;
+
+// ============================================================================
+// 后处理效果基类
+// ============================================================================
+class PostProcessEffect {
+public:
+  PostProcessEffect(const std::string &name);
+  virtual ~PostProcessEffect() = default;
+
+  // ------------------------------------------------------------------------
+  // 生命周期
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 初始化效果
+   */
+  virtual bool init();
+
+  /**
+   * @brief 关闭效果
+   */
+  virtual void shutdown();
+
+  // ------------------------------------------------------------------------
+  // 渲染
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 应用效果
+   * @param source 输入纹理
+   * @param target 输出渲染目标
+   * @param renderer 渲染后端
+   */
+  virtual void apply(const Texture &source, RenderTarget &target,
+                     RenderBackend &renderer);
+
+  /**
+   * @brief 设置Shader参数（子类重写）
+   */
+  virtual void onShaderBind(GLShader &shader) {}
+
+  // ------------------------------------------------------------------------
+  // 状态
+  // ------------------------------------------------------------------------
+  const std::string &getName() const { return name_; }
+  bool isEnabled() const { return enabled_; }
+  void setEnabled(bool enabled) { enabled_ = enabled; }
+  bool isValid() const { return valid_; }
+
+  // ------------------------------------------------------------------------
+  // 链式API
+  // ------------------------------------------------------------------------
+  PostProcessEffect &withEnabled(bool enabled) {
+    enabled_ = enabled;
+    return *this;
+  }
+
+protected:
+  std::string name_;
+  bool enabled_ = true;
+  bool valid_ = false;
+  Ptr<GLShader> shader_;
+
+  /**
+   * @brief 加载自定义Shader
+   */
+  bool loadShader(const std::string &vertSource, const std::string &fragSource);
+  bool loadShaderFromFile(const std::string &vertPath,
+                          const std::string &fragPath);
+
+  /**
+   * @brief 渲染全屏四边形
+   */
+  void renderFullscreenQuad();
+
+private:
+  static GLuint quadVao_;
+  static GLuint quadVbo_;
+  static bool quadInitialized_;
+
+  void initQuad();
+  void destroyQuad();
+};
+
+// ============================================================================
+// 后处理栈 - 管理多个后处理效果
+// ============================================================================
+class PostProcessStack {
+public:
+  PostProcessStack();
+  ~PostProcessStack();
+
+  // ------------------------------------------------------------------------
+  // 初始化和关闭
+  // ------------------------------------------------------------------------
+  bool init(int width, int height);
+  void shutdown();
+
+  // ------------------------------------------------------------------------
+  // 效果管理
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 添加效果到栈
+   */
+  void addEffect(Ptr<PostProcessEffect> effect);
+
+  /**
+   * @brief 插入效果到指定位置
+   */
+  void insertEffect(size_t index, Ptr<PostProcessEffect> effect);
+
+  /**
+   * @brief 移除效果
+   */
+  void removeEffect(const std::string &name);
+  void removeEffect(size_t index);
+
+  /**
+   * @brief 获取效果
+   */
+  Ptr<PostProcessEffect> getEffect(const std::string &name);
+  Ptr<PostProcessEffect> getEffect(size_t index);
+
+  /**
+   * @brief 清空所有效果
+   */
+  void clearEffects();
+
+  /**
+   * @brief 获取效果数量
+   */
+  size_t getEffectCount() const { return effects_.size(); }
+
+  // ------------------------------------------------------------------------
+  // 渲染
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 开始捕获场景
+   */
+  void beginCapture();
+
+  /**
+   * @brief 结束捕获并应用所有效果
+   */
+  void endCapture(RenderBackend &renderer);
+
+  /**
+   * @brief 直接应用效果到纹理
+   */
+  void process(const Texture &source, RenderTarget &target,
+               RenderBackend &renderer);
+
+  // ------------------------------------------------------------------------
+  // 配置
+  // ------------------------------------------------------------------------
+  void resize(int width, int height);
+  bool isValid() const { return valid_; }
+
+  // ------------------------------------------------------------------------
+  // 便捷方法 - 添加内置效果
+  // ------------------------------------------------------------------------
+  PostProcessStack &addBloom(float intensity = 1.0f, float threshold = 0.8f);
+  PostProcessStack &addBlur(float radius = 2.0f);
+  PostProcessStack &addColorGrading(const Color &tint);
+  PostProcessStack &addVignette(float intensity = 0.5f);
+  PostProcessStack &addChromaticAberration(float amount = 1.0f);
+
+private:
+  std::vector<Ptr<PostProcessEffect>> effects_;
+  Ptr<RenderTarget> renderTargetA_;
+  Ptr<RenderTarget> renderTargetB_;
+  int width_ = 0;
+  int height_ = 0;
+  bool valid_ = false;
+  bool capturing_ = false;
+};
+
+// ============================================================================
+// 全局后处理管理
+// ============================================================================
+class PostProcessManager {
+public:
+  static PostProcessManager &getInstance();
+
+  void init(int width, int height);
+  void shutdown();
+
+  PostProcessStack &getMainStack() { return mainStack_; }
+
+  void resize(int width, int height);
+  void beginFrame();
+  void endFrame(RenderBackend &renderer);
+
+private:
+  PostProcessManager() = default;
+  ~PostProcessManager() = default;
+  PostProcessManager(const PostProcessManager &) = delete;
+  PostProcessManager &operator=(const PostProcessManager &) = delete;
+
+  PostProcessStack mainStack_;
+  bool initialized_ = false;
+};
+
+// ============================================================================
+// 便捷宏
+// ============================================================================
+#define E2D_POST_PROCESS() ::extra2d::PostProcessManager::getInstance()
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/event/event.h b/Extra2D/include/extra2d/event/event.h
new file mode 100644
index 0000000..45eb403
--- /dev/null
+++ b/Extra2D/include/extra2d/event/event.h
@@ -0,0 +1,172 @@
+#pragma once
+
+#include <cstdint>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <variant>
+
+namespace extra2d {
+
+// ============================================================================
+// 事件类型枚举
+// ============================================================================
+enum class EventType {
+  None = 0,
+
+  // 窗口事件
+  WindowClose,
+  WindowResize,
+  WindowFocus,
+  WindowLostFocus,
+  WindowMoved,
+
+  // 键盘事件
+  KeyPressed,
+  KeyReleased,
+  KeyRepeat,
+
+  // 鼠标事件
+  MouseButtonPressed,
+  MouseButtonReleased,
+  MouseMoved,
+  MouseScrolled,
+
+  // UI 事件
+  UIHoverEnter,
+  UIHoverExit,
+  UIPressed,
+  UIReleased,
+  UIClicked,
+
+  // 游戏手柄事件
+  GamepadConnected,
+  GamepadDisconnected,
+  GamepadButtonPressed,
+  GamepadButtonReleased,
+  GamepadAxisMoved,
+
+  // 触摸事件 (移动端)
+  TouchBegan,
+  TouchMoved,
+  TouchEnded,
+  TouchCancelled,
+
+  // 自定义事件
+  Custom
+};
+
+// ============================================================================
+// 键盘事件数据
+// ============================================================================
+struct KeyEvent {
+  int keyCode;
+  int scancode;
+  int mods; // 修饰键 (Shift, Ctrl, Alt, etc.)
+};
+
+// ============================================================================
+// 鼠标事件数据
+// ============================================================================
+struct MouseButtonEvent {
+  int button;
+  int mods;
+  Vec2 position;
+};
+
+struct MouseMoveEvent {
+  Vec2 position;
+  Vec2 delta;
+};
+
+struct MouseScrollEvent {
+  Vec2 offset;
+  Vec2 position;
+};
+
+// ============================================================================
+// 窗口事件数据
+// ============================================================================
+struct WindowResizeEvent {
+  int width;
+  int height;
+};
+
+struct WindowMoveEvent {
+  int x;
+  int y;
+};
+
+// ============================================================================
+// 游戏手柄事件数据
+// ============================================================================
+struct GamepadButtonEvent {
+  int gamepadId;
+  int button;
+};
+
+struct GamepadAxisEvent {
+  int gamepadId;
+  int axis;
+  float value;
+};
+
+// ============================================================================
+// 触摸事件数据
+// ============================================================================
+struct TouchEvent {
+  int touchId;
+  Vec2 position;
+};
+
+// ============================================================================
+// 自定义事件数据
+// ============================================================================
+struct CustomEvent {
+  uint32_t id;
+  void *data;
+};
+
+// ============================================================================
+// 事件结构
+// ============================================================================
+struct Event {
+  EventType type = EventType::None;
+  double timestamp = 0.0;
+  bool handled = false;
+
+  // 事件数据联合体
+  std::variant<std::monostate, KeyEvent, MouseButtonEvent, MouseMoveEvent,
+               MouseScrollEvent, WindowResizeEvent, WindowMoveEvent,
+               GamepadButtonEvent, GamepadAxisEvent, TouchEvent, CustomEvent>
+      data;
+
+  // 便捷访问方法
+  bool isWindowEvent() const {
+    return type == EventType::WindowClose || type == EventType::WindowResize ||
+           type == EventType::WindowFocus ||
+           type == EventType::WindowLostFocus || type == EventType::WindowMoved;
+  }
+
+  bool isKeyboardEvent() const {
+    return type == EventType::KeyPressed || type == EventType::KeyReleased ||
+           type == EventType::KeyRepeat;
+  }
+
+  bool isMouseEvent() const {
+    return type == EventType::MouseButtonPressed ||
+           type == EventType::MouseButtonReleased ||
+           type == EventType::MouseMoved || type == EventType::MouseScrolled;
+  }
+
+  // 静态工厂方法
+  static Event createWindowResize(int width, int height);
+  static Event createWindowClose();
+  static Event createKeyPress(int keyCode, int scancode, int mods);
+  static Event createKeyRelease(int keyCode, int scancode, int mods);
+  static Event createMouseButtonPress(int button, int mods, const Vec2 &pos);
+  static Event createMouseButtonRelease(int button, int mods, const Vec2 &pos);
+  static Event createMouseMove(const Vec2 &pos, const Vec2 &delta);
+  static Event createMouseScroll(const Vec2 &offset, const Vec2 &pos);
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/event/event_dispatcher.h b/Extra2D/include/extra2d/event/event_dispatcher.h
new file mode 100644
index 0000000..1ddff8a
--- /dev/null
+++ b/Extra2D/include/extra2d/event/event_dispatcher.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <extra2d/event/event.h>
+#include <functional>
+#include <unordered_map>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 事件监听器 ID
+// ============================================================================
+using ListenerId = uint64_t;
+
+// ============================================================================
+// 事件分发器
+// ============================================================================
+class EventDispatcher {
+public:
+  using EventCallback = std::function<void(Event &)>;
+
+  EventDispatcher();
+  ~EventDispatcher() = default;
+
+  // 添加监听器
+  ListenerId addListener(EventType type, EventCallback callback);
+
+  // 移除监听器
+  void removeListener(ListenerId id);
+  void removeAllListeners(EventType type);
+  void removeAllListeners();
+
+  // 分发事件
+  void dispatch(Event &event);
+  void dispatch(const Event &event);
+
+  // 处理事件队列
+  void processQueue(class EventQueue &queue);
+
+  // 统计
+  size_t getListenerCount(EventType type) const;
+  size_t getTotalListenerCount() const;
+
+private:
+  struct Listener {
+    ListenerId id;
+    EventType type;
+    EventCallback callback;
+  };
+
+  std::unordered_map<EventType, std::vector<Listener>> listeners_;
+  ListenerId nextId_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/event/event_queue.h b/Extra2D/include/extra2d/event/event_queue.h
new file mode 100644
index 0000000..5ef03bd
--- /dev/null
+++ b/Extra2D/include/extra2d/event/event_queue.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <extra2d/event/event.h>
+#include <mutex>
+#include <queue>
+
+namespace extra2d {
+
+// ============================================================================
+// 事件队列 - 线程安全的事件队列
+// ============================================================================
+class EventQueue {
+public:
+  EventQueue();
+  ~EventQueue() = default;
+
+  // 添加事件到队列
+  void push(const Event &event);
+  void push(Event &&event);
+
+  // 从队列取出事件
+  bool poll(Event &event);
+
+  // 查看队列头部事件（不移除）
+  bool peek(Event &event) const;
+
+  // 清空队列
+  void clear();
+
+  // 队列状态
+  bool empty() const;
+  size_t size() const;
+
+private:
+  std::queue<Event> queue_;
+  mutable std::mutex mutex_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/event/input_codes.h b/Extra2D/include/extra2d/event/input_codes.h
new file mode 100644
index 0000000..49a7381
--- /dev/null
+++ b/Extra2D/include/extra2d/event/input_codes.h
@@ -0,0 +1,212 @@
+#pragma once
+
+namespace extra2d {
+
+// ============================================================================
+// 键盘按键码 (基于 GLFW)
+// ============================================================================
+namespace Key {
+enum : int {
+  Unknown = -1,
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+  Period = 46,
+  Slash = 47,
+  Num0 = 48,
+  Num1 = 49,
+  Num2 = 50,
+  Num3 = 51,
+  Num4 = 52,
+  Num5 = 53,
+  Num6 = 54,
+  Num7 = 55,
+  Num8 = 56,
+  Num9 = 57,
+  Semicolon = 59,
+  Equal = 61,
+  A = 65,
+  B = 66,
+  C = 67,
+  D = 68,
+  E = 69,
+  F = 70,
+  G = 71,
+  H = 72,
+  I = 73,
+  J = 74,
+  K = 75,
+  L = 76,
+  M = 77,
+  N = 78,
+  O = 79,
+  P = 80,
+  Q = 81,
+  R = 82,
+  S = 83,
+  T = 84,
+  U = 85,
+  V = 86,
+  W = 87,
+  X = 88,
+  Y = 89,
+  Z = 90,
+  LeftBracket = 91,
+  Backslash = 92,
+  RightBracket = 93,
+  GraveAccent = 96,
+  World1 = 161,
+  World2 = 162,
+  Escape = 256,
+  Enter = 257,
+  Tab = 258,
+  Backspace = 259,
+  Insert = 260,
+  Delete = 261,
+  Right = 262,
+  Left = 263,
+  Down = 264,
+  Up = 265,
+  PageUp = 266,
+  PageDown = 267,
+  Home = 268,
+  End = 269,
+  CapsLock = 280,
+  ScrollLock = 281,
+  NumLock = 282,
+  PrintScreen = 283,
+  Pause = 284,
+  F1 = 290,
+  F2 = 291,
+  F3 = 292,
+  F4 = 293,
+  F5 = 294,
+  F6 = 295,
+  F7 = 296,
+  F8 = 297,
+  F9 = 298,
+  F10 = 299,
+  F11 = 300,
+  F12 = 301,
+  F13 = 302,
+  F14 = 303,
+  F15 = 304,
+  F16 = 305,
+  F17 = 306,
+  F18 = 307,
+  F19 = 308,
+  F20 = 309,
+  F21 = 310,
+  F22 = 311,
+  F23 = 312,
+  F24 = 313,
+  F25 = 314,
+  KP0 = 320,
+  KP1 = 321,
+  KP2 = 322,
+  KP3 = 323,
+  KP4 = 324,
+  KP5 = 325,
+  KP6 = 326,
+  KP7 = 327,
+  KP8 = 328,
+  KP9 = 329,
+  KPDecimal = 330,
+  KPDivide = 331,
+  KPMultiply = 332,
+  KPSubtract = 333,
+  KPAdd = 334,
+  KPEnter = 335,
+  KPEqual = 336,
+  LeftShift = 340,
+  LeftControl = 341,
+  LeftAlt = 342,
+  LeftSuper = 343,
+  RightShift = 344,
+  RightControl = 345,
+  RightAlt = 346,
+  RightSuper = 347,
+  Menu = 348,
+  Last = Menu
+};
+}
+
+// ============================================================================
+// 修饰键
+// ============================================================================
+namespace Mod {
+enum : int {
+  Shift = 0x0001,
+  Control = 0x0002,
+  Alt = 0x0004,
+  Super = 0x0008,
+  CapsLock = 0x0010,
+  NumLock = 0x0020
+};
+}
+
+// ============================================================================
+// 鼠标按键码
+// ============================================================================
+namespace Mouse {
+enum : int {
+  Button1 = 0,
+  Button2 = 1,
+  Button3 = 2,
+  Button4 = 3,
+  Button5 = 4,
+  Button6 = 5,
+  Button7 = 6,
+  Button8 = 7,
+  ButtonLast = Button8,
+  ButtonLeft = Button1,
+  ButtonRight = Button2,
+  ButtonMiddle = Button3
+};
+}
+
+// ============================================================================
+// 游戏手柄按键
+// ============================================================================
+namespace GamepadButton {
+enum : int {
+  A = 0,
+  B = 1,
+  X = 2,
+  Y = 3,
+  LeftBumper = 4,
+  RightBumper = 5,
+  Back = 6,
+  Start = 7,
+  Guide = 8,
+  LeftThumb = 9,
+  RightThumb = 10,
+  DPadUp = 11,
+  DPadRight = 12,
+  DPadDown = 13,
+  DPadLeft = 14,
+  Last = DPadLeft,
+  Cross = A,
+  Circle = B,
+  Square = X,
+  Triangle = Y
+};
+}
+
+// ============================================================================
+// 游戏手柄轴
+// ============================================================================
+namespace GamepadAxis {
+enum : int {
+  LeftX = 0,
+  LeftY = 1,
+  RightX = 2,
+  RightY = 3,
+  LeftTrigger = 4,
+  RightTrigger = 5,
+  Last = RightTrigger
+};
+}
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/extra2d.h b/Extra2D/include/extra2d/extra2d.h
new file mode 100644
index 0000000..1cf3117
--- /dev/null
+++ b/Extra2D/include/extra2d/extra2d.h
@@ -0,0 +1,97 @@
+#pragma once
+
+// Easy2D v3.0 - 统一入口头文件
+// 包含所有公共 API
+
+// Core
+#include <extra2d/core/types.h>
+#include <extra2d/core/string.h>
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+
+// Platform
+#include <extra2d/platform/window.h>
+#include <extra2d/platform/input.h>
+
+// Graphics
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/graphics/font.h>
+#include <extra2d/graphics/camera.h>
+#include <extra2d/graphics/shader_system.h>
+#include <extra2d/graphics/texture_pool.h>
+#include <extra2d/graphics/render_target.h>
+#include <extra2d/graphics/vram_manager.h>
+
+// Scene
+#include <extra2d/scene/node.h>
+#include <extra2d/scene/scene.h>
+#include <extra2d/scene/sprite.h>
+#include <extra2d/scene/text.h>
+#include <extra2d/scene/shape_node.h>
+#include <extra2d/scene/scene_manager.h>
+#include <extra2d/scene/transition.h>
+
+// Animation
+#include <extra2d/animation/sprite_frame.h>
+#include <extra2d/animation/sprite_frame_cache.h>
+#include <extra2d/animation/frame_property.h>
+#include <extra2d/animation/animation_frame.h>
+#include <extra2d/animation/animation_clip.h>
+#include <extra2d/animation/animation_controller.h>
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/animation/interpolation_engine.h>
+#include <extra2d/animation/animated_sprite.h>
+#include <extra2d/animation/frame_renderer.h>
+#include <extra2d/animation/animation_event.h>
+#include <extra2d/animation/animation_node.h>
+#include <extra2d/animation/composite_animation.h>
+#include <extra2d/animation/ani_parser.h>
+#include <extra2d/animation/ani_binary_parser.h>
+#include <extra2d/animation/als_parser.h>
+
+// UI
+#include <extra2d/ui/widget.h>
+#include <extra2d/ui/button.h>
+
+// Action
+#include <extra2d/action/action.h>
+#include <extra2d/action/actions.h>
+#include <extra2d/action/ease.h>
+
+// Event
+#include <extra2d/event/event.h>
+#include <extra2d/event/event_queue.h>
+#include <extra2d/event/event_dispatcher.h>
+#include <extra2d/event/input_codes.h>
+
+// Audio
+#include <extra2d/audio/audio_engine.h>
+#include <extra2d/audio/sound.h>
+
+// Resource
+#include <extra2d/resource/resource_manager.h>
+
+// Utils
+#include <extra2d/utils/logger.h>
+#include <extra2d/utils/timer.h>
+#include <extra2d/utils/data.h>
+#include <extra2d/utils/random.h>
+
+// Spatial
+#include <extra2d/spatial/spatial_index.h>
+#include <extra2d/spatial/quadtree.h>
+#include <extra2d/spatial/spatial_hash.h>
+#include <extra2d/spatial/spatial_manager.h>
+
+// Effects
+#include <extra2d/effects/post_process.h>
+#include <extra2d/effects/particle_system.h>
+#include <extra2d/effects/custom_effect_manager.h>
+
+// Application
+#include <extra2d/app/application.h>
+
+// Script
+#include <extra2d/script/script_engine.h>
+#include <extra2d/script/script_node.h>
diff --git a/Extra2D/include/extra2d/graphics/alpha_mask.h b/Extra2D/include/extra2d/graphics/alpha_mask.h
new file mode 100644
index 0000000..98cdd6b
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/alpha_mask.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// Alpha 遮罩 - 存储图片的非透明区域信息
+// ============================================================================
+class AlphaMask {
+public:
+  AlphaMask() = default;
+  AlphaMask(int width, int height);
+
+  /// 从像素数据创建遮罩
+  static AlphaMask createFromPixels(const uint8_t *pixels, int width,
+                                    int height, int channels);
+
+  /// 获取指定位置的透明度（0-255）
+  uint8_t getAlpha(int x, int y) const;
+
+  /// 检查指定位置是否不透明
+  bool isOpaque(int x, int y, uint8_t threshold = 128) const;
+
+  /// 检查指定位置是否在遮罩范围内
+  bool isValid(int x, int y) const;
+
+  /// 获取遮罩尺寸
+  int getWidth() const { return width_; }
+  int getHeight() const { return height_; }
+  Size getSize() const {
+    return Size(static_cast<float>(width_), static_cast<float>(height_));
+  }
+
+  /// 获取原始数据
+  const std::vector<uint8_t> &getData() const { return data_; }
+
+  /// 检查遮罩是否有效
+  bool isValid() const { return !data_.empty() && width_ > 0 && height_ > 0; }
+
+private:
+  int width_ = 0;
+  int height_ = 0;
+  std::vector<uint8_t> data_; // Alpha值数组
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/camera.h b/Extra2D/include/extra2d/graphics/camera.h
new file mode 100644
index 0000000..2b56423
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/camera.h
@@ -0,0 +1,93 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <glm/mat4x4.hpp>
+
+namespace extra2d {
+
+// ============================================================================
+// 2D 正交相机
+// ============================================================================
+class Camera {
+public:
+  Camera();
+  Camera(float left, float right, float bottom, float top);
+  Camera(const Size &viewport);
+  ~Camera() = default;
+
+  // ------------------------------------------------------------------------
+  // 位置和变换
+  // ------------------------------------------------------------------------
+  void setPosition(const Vec2 &position);
+  void setPosition(float x, float y);
+  Vec2 getPosition() const { return position_; }
+
+  void setRotation(float degrees);
+  float getRotation() const { return rotation_; }
+
+  void setZoom(float zoom);
+  float getZoom() const { return zoom_; }
+
+  // ------------------------------------------------------------------------
+  // 视口设置
+  // ------------------------------------------------------------------------
+  void setViewport(float left, float right, float bottom, float top);
+  void setViewport(const Rect &rect);
+  Rect getViewport() const;
+
+  // ------------------------------------------------------------------------
+  // 矩阵获取
+  // ------------------------------------------------------------------------
+  glm::mat4 getViewMatrix() const;
+  glm::mat4 getProjectionMatrix() const;
+  glm::mat4 getViewProjectionMatrix() const;
+
+  // ------------------------------------------------------------------------
+  // 坐标转换
+  // ------------------------------------------------------------------------
+  Vec2 screenToWorld(const Vec2 &screenPos) const;
+  Vec2 worldToScreen(const Vec2 &worldPos) const;
+  Vec2 screenToWorld(float x, float y) const;
+  Vec2 worldToScreen(float x, float y) const;
+
+  // ------------------------------------------------------------------------
+  // 移动相机
+  // ------------------------------------------------------------------------
+  void move(const Vec2 &offset);
+  void move(float x, float y);
+
+  // ------------------------------------------------------------------------
+  // 边界限制
+  // ------------------------------------------------------------------------
+  void setBounds(const Rect &bounds);
+  void clearBounds();
+  void clampToBounds();
+
+  // ------------------------------------------------------------------------
+  // 快捷方法：看向某点
+  // ------------------------------------------------------------------------
+  void lookAt(const Vec2 &target);
+
+private:
+  Vec2 position_ = Vec2::Zero();
+  float rotation_ = 0.0f;
+  float zoom_ = 1.0f;
+
+  float left_ = -1.0f;
+  float right_ = 1.0f;
+  float bottom_ = -1.0f;
+  float top_ = 1.0f;
+
+  Rect bounds_;
+  bool hasBounds_ = false;
+
+  mutable glm::mat4 viewMatrix_;
+  mutable glm::mat4 projMatrix_;
+  mutable glm::mat4 vpMatrix_;
+  mutable bool viewDirty_ = true;
+  mutable bool projDirty_ = true;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/font.h b/Extra2D/include/extra2d/graphics/font.h
new file mode 100644
index 0000000..3c807f7
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/font.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/string.h>
+#include <extra2d/core/types.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 字形信息
+// ============================================================================
+struct Glyph {
+  float u0, v0;   // 纹理坐标左下角
+  float u1, v1;   // 纹理坐标右上角
+  float width;    // 字形宽度（像素）
+  float height;   // 字形高度（像素）
+  float bearingX; // 水平偏移
+  float bearingY; // 垂直偏移
+  float advance;  // 前进距离
+};
+
+// ============================================================================
+// 字体图集接口
+// ============================================================================
+class FontAtlas {
+public:
+  virtual ~FontAtlas() = default;
+
+  // 获取字形信息
+  virtual const Glyph *getGlyph(char32_t codepoint) const = 0;
+
+  // 获取纹理
+  virtual class Texture *getTexture() const = 0;
+
+  // 获取字体大小
+  virtual int getFontSize() const = 0;
+
+  virtual float getAscent() const = 0;
+  virtual float getDescent() const = 0;
+  virtual float getLineGap() const = 0;
+  virtual float getLineHeight() const = 0;
+
+  // 计算文字尺寸
+  virtual Vec2 measureText(const String &text) = 0;
+
+  // 是否支持 SDF 渲染
+  virtual bool isSDF() const = 0;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_font_atlas.h b/Extra2D/include/extra2d/graphics/opengl/gl_font_atlas.h
new file mode 100644
index 0000000..2afe1b7
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/opengl/gl_font_atlas.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/font.h>
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/graphics/texture.h>
+#include <memory>
+#include <stb/stb_rect_pack.h>
+#include <stb/stb_truetype.h>
+#include <unordered_map>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// OpenGL 字体图集实现 - 使用 stb_rect_pack 进行矩形打包
+// ============================================================================
+class GLFontAtlas : public FontAtlas {
+public:
+  GLFontAtlas(const std::string &filepath, int fontSize, bool useSDF = false);
+  ~GLFontAtlas();
+
+  // FontAtlas 接口实现
+  const Glyph *getGlyph(char32_t codepoint) const override;
+  Texture *getTexture() const override { return texture_.get(); }
+  int getFontSize() const override { return fontSize_; }
+  float getAscent() const override { return ascent_; }
+  float getDescent() const override { return descent_; }
+  float getLineGap() const override { return lineGap_; }
+  float getLineHeight() const override { return ascent_ - descent_ + lineGap_; }
+  Vec2 measureText(const String &text) override;
+  bool isSDF() const override { return useSDF_; }
+
+private:
+  // 图集配置
+  static constexpr int ATLAS_WIDTH = 512;
+  static constexpr int ATLAS_HEIGHT = 512;
+  static constexpr int PADDING = 2; // 字形之间的间距
+
+  int fontSize_;
+  bool useSDF_;
+  mutable std::unique_ptr<GLTexture> texture_;
+  mutable std::unordered_map<char32_t, Glyph> glyphs_;
+
+  // stb_rect_pack 上下文
+  mutable stbrp_context packContext_;
+  mutable std::vector<stbrp_node> packNodes_;
+  mutable int currentY_;
+
+  std::vector<unsigned char> fontData_;
+  stbtt_fontinfo fontInfo_;
+  float scale_;
+  float ascent_;
+  float descent_;
+  float lineGap_;
+
+  void createAtlas();
+  void cacheGlyph(char32_t codepoint) const;
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/opengl/gl_renderer.h b/Extra2D/include/extra2d/graphics/opengl/gl_renderer.h
similarity index 93%
rename from Easy2D/include/easy2d/graphics/opengl/gl_renderer.h
rename to Extra2D/include/extra2d/graphics/opengl/gl_renderer.h
index 2d07a68..26e1a9a 100644
--- a/Easy2D/include/easy2d/graphics/opengl/gl_renderer.h
+++ b/Extra2D/include/extra2d/graphics/opengl/gl_renderer.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <easy2d/graphics/render_backend.h>
-#include <easy2d/graphics/opengl/gl_shader.h>
-#include <easy2d/graphics/opengl/gl_sprite_batch.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/opengl/gl_shader.h>
+#include <extra2d/graphics/opengl/gl_sprite_batch.h>
 
 // 使用标准 GLES3.2
 #include <GLES3/gl32.h>
 
-namespace easy2d {
+namespace extra2d {
 
 class Window;
 
@@ -73,4 +73,4 @@ private:
     void setupBlendMode(BlendMode mode);
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/opengl/gl_shader.h b/Extra2D/include/extra2d/graphics/opengl/gl_shader.h
similarity index 97%
rename from Easy2D/include/easy2d/graphics/opengl/gl_shader.h
rename to Extra2D/include/extra2d/graphics/opengl/gl_shader.h
index be37260..7f6fc3d 100644
--- a/Easy2D/include/easy2d/graphics/opengl/gl_shader.h
+++ b/Extra2D/include/extra2d/graphics/opengl/gl_shader.h
@@ -10,7 +10,7 @@
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // OpenGL Shader 程序
@@ -53,4 +53,4 @@ private:
     GLint getUniformLocation(const std::string& name);
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_sprite_batch.h b/Extra2D/include/extra2d/graphics/opengl/gl_sprite_batch.h
new file mode 100644
index 0000000..41c2eba
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/opengl/gl_sprite_batch.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/opengl/gl_shader.h>
+#include <extra2d/graphics/texture.h>
+#include <glm/mat4x4.hpp>
+#include <vector>
+
+// 使用标准 GLES3.2
+#include <GLES3/gl32.h>
+
+namespace extra2d {
+
+// ============================================================================
+// OpenGL 精灵批渲染器
+// ============================================================================
+class GLSpriteBatch {
+public:
+  static constexpr size_t MAX_SPRITES = 10000;
+  static constexpr size_t VERTICES_PER_SPRITE = 4;
+  static constexpr size_t INDICES_PER_SPRITE = 6;
+
+  struct Vertex {
+    glm::vec2 position;
+    glm::vec2 texCoord;
+    glm::vec4 color;
+  };
+
+  struct SpriteData {
+    glm::vec2 position;
+    glm::vec2 size;
+    glm::vec2 texCoordMin;
+    glm::vec2 texCoordMax;
+    glm::vec4 color;
+    float rotation;
+    glm::vec2 anchor;
+    bool isSDF = false;
+  };
+
+  GLSpriteBatch();
+  ~GLSpriteBatch();
+
+  bool init();
+  void shutdown();
+
+  void begin(const glm::mat4 &viewProjection);
+  void draw(const Texture &texture, const SpriteData &data);
+  void end();
+
+  // 统计
+  uint32_t getDrawCallCount() const { return drawCallCount_; }
+  uint32_t getSpriteCount() const { return spriteCount_; }
+
+private:
+  GLuint vao_;
+  GLuint vbo_;
+  GLuint ibo_;
+  GLShader shader_;
+
+  std::vector<Vertex> vertices_;
+  std::vector<GLuint> indices_;
+
+  const Texture *currentTexture_;
+  bool currentIsSDF_;
+  glm::mat4 viewProjection_;
+
+  uint32_t drawCallCount_;
+  uint32_t spriteCount_;
+
+  void flush();
+  void setupShader();
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/opengl/gl_texture.h b/Extra2D/include/extra2d/graphics/opengl/gl_texture.h
similarity index 94%
rename from Easy2D/include/easy2d/graphics/opengl/gl_texture.h
rename to Extra2D/include/extra2d/graphics/opengl/gl_texture.h
index 1faef19..0a17dbf 100644
--- a/Easy2D/include/easy2d/graphics/opengl/gl_texture.h
+++ b/Extra2D/include/extra2d/graphics/opengl/gl_texture.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <easy2d/graphics/texture.h>
-#include <easy2d/graphics/alpha_mask.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/graphics/alpha_mask.h>
 
 // 使用标准 GLES3.2
 #include <GLES3/gl32.h>
 
 #include <memory>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // OpenGL 纹理实现
@@ -69,4 +69,4 @@ private:
     bool loadDDS(const std::string& filepath);
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/render_backend.h b/Extra2D/include/extra2d/graphics/render_backend.h
new file mode 100644
index 0000000..7c9f7eb
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/render_backend.h
@@ -0,0 +1,132 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/string.h>
+#include <extra2d/core/types.h>
+#include <glm/mat4x4.hpp>
+
+namespace extra2d {
+
+// 前向声明
+class Window;
+class Texture;
+class FontAtlas;
+class Shader;
+
+// ============================================================================
+// 渲染后端类型
+// ============================================================================
+enum class BackendType {
+  OpenGL,
+  // Vulkan,
+  // Metal,
+  // D3D11,
+  // D3D12
+};
+
+// ============================================================================
+// 混合模式
+// ============================================================================
+enum class BlendMode {
+  None,     // 不混合
+  Alpha,    // 标准 Alpha 混合
+  Additive, // 加法混合
+  Multiply  // 乘法混合
+};
+
+// ============================================================================
+// 渲染后端抽象接口
+// ============================================================================
+class RenderBackend {
+public:
+  virtual ~RenderBackend() = default;
+
+  // ------------------------------------------------------------------------
+  // 生命周期
+  // ------------------------------------------------------------------------
+  virtual bool init(Window *window) = 0;
+  virtual void shutdown() = 0;
+
+  // ------------------------------------------------------------------------
+  // 帧管理
+  // ------------------------------------------------------------------------
+  virtual void beginFrame(const Color &clearColor) = 0;
+  virtual void endFrame() = 0;
+  virtual void setViewport(int x, int y, int width, int height) = 0;
+  virtual void setVSync(bool enabled) = 0;
+
+  // ------------------------------------------------------------------------
+  // 状态设置
+  // ------------------------------------------------------------------------
+  virtual void setBlendMode(BlendMode mode) = 0;
+  virtual void setViewProjection(const glm::mat4 &matrix) = 0;
+
+  // ------------------------------------------------------------------------
+  // 纹理
+  // ------------------------------------------------------------------------
+  virtual Ptr<Texture> createTexture(int width, int height,
+                                     const uint8_t *pixels, int channels) = 0;
+  virtual Ptr<Texture> loadTexture(const std::string &filepath) = 0;
+
+  // ------------------------------------------------------------------------
+  // 精灵批渲染
+  // ------------------------------------------------------------------------
+  virtual void beginSpriteBatch() = 0;
+  virtual void drawSprite(const Texture &texture, const Rect &destRect,
+                          const Rect &srcRect, const Color &tint,
+                          float rotation, const Vec2 &anchor) = 0;
+  virtual void drawSprite(const Texture &texture, const Vec2 &position,
+                          const Color &tint) = 0;
+  virtual void endSpriteBatch() = 0;
+
+  // ------------------------------------------------------------------------
+  // 形状渲染
+  // ------------------------------------------------------------------------
+  virtual void drawLine(const Vec2 &start, const Vec2 &end, const Color &color,
+                        float width = 1.0f) = 0;
+  virtual void drawRect(const Rect &rect, const Color &color,
+                        float width = 1.0f) = 0;
+  virtual void fillRect(const Rect &rect, const Color &color) = 0;
+  virtual void drawCircle(const Vec2 &center, float radius, const Color &color,
+                          int segments = 32, float width = 1.0f) = 0;
+  virtual void fillCircle(const Vec2 &center, float radius, const Color &color,
+                          int segments = 32) = 0;
+  virtual void drawTriangle(const Vec2 &p1, const Vec2 &p2, const Vec2 &p3,
+                            const Color &color, float width = 1.0f) = 0;
+  virtual void fillTriangle(const Vec2 &p1, const Vec2 &p2, const Vec2 &p3,
+                            const Color &color) = 0;
+  virtual void drawPolygon(const std::vector<Vec2> &points, const Color &color,
+                           float width = 1.0f) = 0;
+  virtual void fillPolygon(const std::vector<Vec2> &points,
+                           const Color &color) = 0;
+
+  // ------------------------------------------------------------------------
+  // 文字渲染
+  // ------------------------------------------------------------------------
+  virtual Ptr<FontAtlas> createFontAtlas(const std::string &filepath,
+                                         int fontSize, bool useSDF = false) = 0;
+  virtual void drawText(const FontAtlas &font, const String &text,
+                        const Vec2 &position, const Color &color) = 0;
+  virtual void drawText(const FontAtlas &font, const String &text, float x,
+                        float y, const Color &color) = 0;
+
+  // ------------------------------------------------------------------------
+  // 统计信息
+  // ------------------------------------------------------------------------
+  struct Stats {
+    uint32_t drawCalls = 0;
+    uint32_t triangleCount = 0;
+    uint32_t textureBinds = 0;
+    uint32_t shaderBinds = 0;
+  };
+  virtual Stats getStats() const = 0;
+  virtual void resetStats() = 0;
+
+  // ------------------------------------------------------------------------
+  // 工厂方法
+  // ------------------------------------------------------------------------
+  static UniquePtr<RenderBackend> create(BackendType type);
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/render_command.h b/Extra2D/include/extra2d/graphics/render_command.h
similarity index 61%
rename from Easy2D/include/easy2d/graphics/render_command.h
rename to Extra2D/include/extra2d/graphics/render_command.h
index c36fa49..7064fc2 100644
--- a/Easy2D/include/easy2d/graphics/render_command.h
+++ b/Extra2D/include/extra2d/graphics/render_command.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
-#include <easy2d/core/color.h>
-#include <easy2d/core/string.h>
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/string.h>
+#include <extra2d/core/types.h>
 #include <variant>
 #include <vector>
 
-namespace easy2d {
+namespace extra2d {
 
 // 前向声明
 class Texture;
@@ -17,112 +17,106 @@ class FontAtlas;
 // 渲染命令类型
 // ============================================================================
 enum class RenderCommandType {
-    Sprite,
-    Line,
-    Rect,
-    FilledRect,
-    Circle,
-    FilledCircle,
-    Triangle,
-    FilledTriangle,
-    Polygon,
-    FilledPolygon,
-    Text
+  Sprite,
+  Line,
+  Rect,
+  FilledRect,
+  Circle,
+  FilledCircle,
+  Triangle,
+  FilledTriangle,
+  Polygon,
+  FilledPolygon,
+  Text
 };
 
 // ============================================================================
 // 精灵数据
 // ============================================================================
 struct SpriteData {
-    Ptr<Texture> texture;
-    Rect destRect;
-    Rect srcRect;
-    Color tint;
-    float rotation;
-    Vec2 anchor;
+  Ptr<Texture> texture;
+  Rect destRect;
+  Rect srcRect;
+  Color tint;
+  float rotation;
+  Vec2 anchor;
 };
 
 // ============================================================================
 // 直线数据
 // ============================================================================
 struct LineData {
-    Vec2 start;
-    Vec2 end;
-    Color color;
-    float width;
+  Vec2 start;
+  Vec2 end;
+  Color color;
+  float width;
 };
 
 // ============================================================================
 // 矩形数据
 // ============================================================================
 struct RectData {
-    Rect rect;
-    Color color;
-    float width;
+  Rect rect;
+  Color color;
+  float width;
 };
 
 // ============================================================================
 // 圆形数据
 // ============================================================================
 struct CircleData {
-    Vec2 center;
-    float radius;
-    Color color;
-    int segments;
-    float width;
+  Vec2 center;
+  float radius;
+  Color color;
+  int segments;
+  float width;
 };
 
 // ============================================================================
 // 三角形数据
 // ============================================================================
 struct TriangleData {
-    Vec2 p1;
-    Vec2 p2;
-    Vec2 p3;
-    Color color;
-    float width;
+  Vec2 p1;
+  Vec2 p2;
+  Vec2 p3;
+  Color color;
+  float width;
 };
 
 // ============================================================================
 // 多边形数据
 // ============================================================================
 struct PolygonData {
-    std::vector<Vec2> points;
-    Color color;
-    float width;
+  std::vector<Vec2> points;
+  Color color;
+  float width;
 };
 
 // ============================================================================
 // 文字数据
 // ============================================================================
 struct TextData {
-    Ptr<FontAtlas> font;
-    String text;
-    Vec2 position;
-    Color color;
+  Ptr<FontAtlas> font;
+  String text;
+  Vec2 position;
+  Color color;
 };
 
 // ============================================================================
 // 渲染命令
 // ============================================================================
 struct RenderCommand {
-    RenderCommandType type;
-    int zOrder;
+  RenderCommandType type;
+  int zOrder;
 
-    std::variant<
-        SpriteData,
-        LineData,
-        RectData,
-        CircleData,
-        TriangleData,
-        PolygonData,
-        TextData
-    > data;
+  std::variant<SpriteData, LineData, RectData, CircleData, TriangleData,
+               PolygonData, TextData>
+      data;
 
-    // 用于排序
-    bool operator<(const RenderCommand& other) const {
-        return zOrder < other.zOrder;
-    }
+  // 用于排序
+  bool operator<(const RenderCommand &other) const {
+    return zOrder < other.zOrder;
+  }
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/render_target.h b/Extra2D/include/extra2d/graphics/render_target.h
new file mode 100644
index 0000000..e214c7d
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/render_target.h
@@ -0,0 +1,333 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/graphics/texture.h>
+#include <mutex>
+
+namespace extra2d {
+
+// ============================================================================
+// 渲染目标配置
+// ============================================================================
+struct RenderTargetConfig {
+  int width = 800;                              // 宽度
+  int height = 600;                             // 高度
+  PixelFormat colorFormat = PixelFormat::RGBA8; // 颜色格式
+  bool hasDepth = true;                         // 是否包含深度缓冲
+  bool hasDepthBuffer = true;                   // 兼容旧API的别名 (同hasDepth)
+  bool hasStencil = false;                      // 是否包含模板缓冲
+  int samples = 1;                              // 多重采样数 (1 = 无MSAA)
+  bool autoResize = true;                       // 是否自动调整大小
+};
+
+// ============================================================================
+// 渲染目标 - 基于FBO的离屏渲染
+// ============================================================================
+class RenderTarget {
+public:
+  RenderTarget();
+  ~RenderTarget();
+
+  // 禁止拷贝
+  RenderTarget(const RenderTarget &) = delete;
+  RenderTarget &operator=(const RenderTarget &) = delete;
+
+  // 允许移动
+  RenderTarget(RenderTarget &&other) noexcept;
+  RenderTarget &operator=(RenderTarget &&other) noexcept;
+
+  // ------------------------------------------------------------------------
+  // 创建和销毁
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 创建渲染目标
+   */
+  bool create(const RenderTargetConfig &config);
+
+  /**
+   * @brief 初始化渲染目标（create的别名，兼容旧API）
+   */
+  bool init(const RenderTargetConfig &config) { return create(config); }
+
+  /**
+   * @brief 从现有纹理创建渲染目标
+   */
+  bool createFromTexture(Ptr<Texture> texture, bool hasDepth = false);
+
+  /**
+   * @brief 销毁渲染目标
+   */
+  void destroy();
+
+  /**
+   * @brief 关闭渲染目标（destroy的别名，兼容旧API）
+   */
+  void shutdown() { destroy(); }
+
+  /**
+   * @brief 检查是否有效
+   */
+  bool isValid() const { return fbo_ != 0; }
+
+  // ------------------------------------------------------------------------
+  // 尺寸和格式
+  // ------------------------------------------------------------------------
+
+  int getWidth() const { return width_; }
+  int getHeight() const { return height_; }
+  Vec2 getSize() const {
+    return Vec2(static_cast<float>(width_), static_cast<float>(height_));
+  }
+  PixelFormat getColorFormat() const { return colorFormat_; }
+
+  // ------------------------------------------------------------------------
+  // 绑定和解绑
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 绑定为当前渲染目标
+   */
+  void bind();
+
+  /**
+   * @brief 解绑（恢复默认渲染目标）
+   */
+  void unbind();
+
+  /**
+   * @brief 清除渲染目标
+   */
+  void clear(const Color &color = Colors::Transparent);
+
+  // ------------------------------------------------------------------------
+  // 纹理访问
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 获取颜色纹理
+   */
+  Ptr<Texture> getColorTexture() const { return colorTexture_; }
+
+  /**
+   * @brief 获取深度纹理（如果有）
+   */
+  Ptr<Texture> getDepthTexture() const { return depthTexture_; }
+
+  // ------------------------------------------------------------------------
+  // 视口和裁剪
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 设置视口（相对于渲染目标）
+   */
+  void setViewport(int x, int y, int width, int height);
+
+  /**
+   * @brief 获取完整视口
+   */
+  void getFullViewport(int &x, int &y, int &width, int &height) const;
+
+  // ------------------------------------------------------------------------
+  // 工具方法
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 调整大小（会销毁并重新创建）
+   */
+  bool resize(int width, int height);
+
+  /**
+   * @brief 复制到另一个渲染目标
+   */
+  void copyTo(RenderTarget &target);
+
+  /**
+   * @brief 复制到另一个渲染目标（blitTo的别名，兼容旧API）
+   * @param target 目标渲染目标
+   * @param color 是否复制颜色缓冲
+   * @param depth 是否复制深度缓冲
+   */
+  void blitTo(RenderTarget &target, bool color = true, bool depth = false);
+
+  /**
+   * @brief 复制到屏幕
+   */
+  void copyToScreen(int screenWidth, int screenHeight);
+
+  /**
+   * @brief 保存为图像文件
+   */
+  bool saveToFile(const std::string &filepath);
+
+  // ------------------------------------------------------------------------
+  // 静态方法
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 创建渲染目标的静态工厂方法
+   */
+  static Ptr<RenderTarget> createFromConfig(const RenderTargetConfig &config);
+
+  /**
+   * @brief 获取当前绑定的渲染目标ID
+   */
+  static GLuint getCurrentFBO();
+
+  /**
+   * @brief 绑定默认渲染目标（屏幕）
+   */
+  static void bindDefault();
+
+  /**
+   * @brief 获取FBO ID（供内部使用）
+   */
+  GLuint getFBO() const { return fbo_; }
+
+protected:
+  GLuint fbo_ = 0; // 帧缓冲对象
+  GLuint rbo_ = 0; // 渲染缓冲对象（深度/模板）
+
+  Ptr<Texture> colorTexture_; // 颜色纹理
+  Ptr<Texture> depthTexture_; // 深度纹理（可选）
+
+  int width_ = 0;
+  int height_ = 0;
+  PixelFormat colorFormat_ = PixelFormat::RGBA8;
+  bool hasDepth_ = false;
+  bool hasStencil_ = false;
+  int samples_ = 1;
+
+  bool createFBO();
+  void deleteFBO();
+};
+
+// ============================================================================
+// 多重采样渲染目标（用于MSAA）
+// ============================================================================
+class MultisampleRenderTarget : public RenderTarget {
+public:
+  /**
+   * @brief 创建多重采样渲染目标
+   */
+  bool create(int width, int height, int samples = 4);
+
+  /**
+   * @brief 解析到普通渲染目标（用于显示）
+   */
+  void resolveTo(RenderTarget &target);
+
+  /**
+   * @brief 销毁渲染目标
+   */
+  void destroy();
+
+private:
+  GLuint colorRBO_ = 0; // 多重采样颜色渲染缓冲
+};
+
+// ============================================================================
+// 渲染目标栈（用于嵌套渲染）
+// ============================================================================
+class RenderTargetStack {
+public:
+  static RenderTargetStack &getInstance();
+
+  /**
+   * @brief 压入渲染目标
+   */
+  void push(RenderTarget *target);
+
+  /**
+   * @brief 弹出渲染目标
+   */
+  void pop();
+
+  /**
+   * @brief 获取当前渲染目标
+   */
+  RenderTarget *getCurrent() const;
+
+  /**
+   * @brief 获取栈大小
+   */
+  size_t size() const;
+
+  /**
+   * @brief 清空栈
+   */
+  void clear();
+
+private:
+  RenderTargetStack() = default;
+  ~RenderTargetStack() = default;
+
+  std::vector<RenderTarget *> stack_;
+  mutable std::mutex mutex_;
+};
+
+// ============================================================================
+// 渲染目标管理器 - 全局渲染目标管理
+// ============================================================================
+class RenderTargetManager {
+public:
+  /**
+   * @brief 获取单例实例
+   */
+  static RenderTargetManager &getInstance();
+
+  /**
+   * @brief 初始化渲染目标管理器
+   * @param width 默认宽度
+   * @param height 默认高度
+   */
+  bool init(int width, int height);
+
+  /**
+   * @brief 关闭渲染目标管理器
+   */
+  void shutdown();
+
+  /**
+   * @brief 创建新的渲染目标
+   */
+  Ptr<RenderTarget> createRenderTarget(const RenderTargetConfig &config);
+
+  /**
+   * @brief 获取默认渲染目标
+   */
+  RenderTarget *getDefaultRenderTarget() const {
+    return defaultRenderTarget_.get();
+  }
+
+  /**
+   * @brief 调整所有受管渲染目标的大小
+   */
+  void resize(int width, int height);
+
+  /**
+   * @brief 检查是否已初始化
+   */
+  bool isInitialized() const { return initialized_; }
+
+private:
+  RenderTargetManager() = default;
+  ~RenderTargetManager() = default;
+  RenderTargetManager(const RenderTargetManager &) = delete;
+  RenderTargetManager &operator=(const RenderTargetManager &) = delete;
+
+  Ptr<RenderTarget> defaultRenderTarget_;
+  std::vector<Ptr<RenderTarget>> renderTargets_;
+  bool initialized_ = false;
+};
+
+// ============================================================================
+// 便捷宏
+// ============================================================================
+#define E2D_RENDER_TARGET_STACK() ::extra2d::RenderTargetStack::getInstance()
+#define E2D_RENDER_TARGET_MANAGER()                                            \
+  ::extra2d::RenderTargetManager::getInstance()
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/shader_preset.h b/Extra2D/include/extra2d/graphics/shader_preset.h
similarity index 97%
rename from Easy2D/include/easy2d/graphics/shader_preset.h
rename to Extra2D/include/extra2d/graphics/shader_preset.h
index 1006c8e..801f88b 100644
--- a/Easy2D/include/easy2d/graphics/shader_preset.h
+++ b/Extra2D/include/extra2d/graphics/shader_preset.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <easy2d/graphics/opengl/gl_shader.h>
-#include <easy2d/core/types.h>
-#include <easy2d/core/color.h>
+#include <extra2d/graphics/opengl/gl_shader.h>
+#include <extra2d/core/types.h>
+#include <extra2d/core/color.h>
 #include <glm/vec4.hpp>
 
-namespace easy2d {
+namespace extra2d {
 
 struct WaterParams {
     float waveSpeed = 1.0f;
@@ -316,4 +316,4 @@ public:
                                         const InvertParams& invParams);
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/shader_system.h b/Extra2D/include/extra2d/graphics/shader_system.h
new file mode 100644
index 0000000..a3af2fe
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/shader_system.h
@@ -0,0 +1,179 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/opengl/gl_shader.h>
+#include <functional>
+#include <string>
+#include <unordered_map>
+
+namespace extra2d {
+
+// ============================================================================
+// Shader参数绑定回调
+// ============================================================================
+using ShaderBindCallback = std::function<void(GLShader &)>;
+
+// ============================================================================
+// Shader系统 - 管理所有Shader的加载、缓存和热重载
+// ============================================================================
+class ShaderSystem {
+public:
+  // ------------------------------------------------------------------------
+  // 单例访问
+  // ------------------------------------------------------------------------
+  static ShaderSystem &getInstance();
+
+  // ------------------------------------------------------------------------
+  // 初始化和关闭
+  // ------------------------------------------------------------------------
+  bool init();
+  void shutdown();
+
+  // ------------------------------------------------------------------------
+  // Shader加载
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 从文件加载Shader
+   * @param name Shader名称（用于缓存）
+   * @param vertPath 顶点着色器文件路径
+   * @param fragPath 片段着色器文件路径
+   * @return 加载的Shader，失败返回nullptr
+   */
+  Ptr<GLShader> loadFromFile(const std::string &name,
+                             const std::string &vertPath,
+                             const std::string &fragPath);
+
+  /**
+   * @brief 从源码字符串加载Shader
+   * @param name Shader名称（用于缓存）
+   * @param vertSource 顶点着色器源码
+   * @param fragSource 片段着色器源码
+   * @return 加载的Shader，失败返回nullptr
+   */
+  Ptr<GLShader> loadFromSource(const std::string &name,
+                               const std::string &vertSource,
+                               const std::string &fragSource);
+
+  /**
+   * @brief 从已编译的程序获取Shader
+   * @param name Shader名称
+   * @return 缓存的Shader，不存在返回nullptr
+   */
+  Ptr<GLShader> get(const std::string &name);
+
+  /**
+   * @brief 检查Shader是否存在
+   */
+  bool has(const std::string &name) const;
+
+  // ------------------------------------------------------------------------
+  // Shader移除
+  // ------------------------------------------------------------------------
+  void remove(const std::string &name);
+  void clear();
+
+  // ------------------------------------------------------------------------
+  // 热重载支持
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 启用/禁用文件监视
+   */
+  void setFileWatching(bool enable);
+  bool isFileWatching() const { return fileWatching_; }
+
+  /**
+   * @brief 更新文件监视（在主循环中调用）
+   */
+  void updateFileWatching();
+
+  /**
+   * @brief 重载指定Shader
+   */
+  bool reload(const std::string &name);
+
+  /**
+   * @brief 重载所有Shader
+   */
+  void reloadAll();
+
+  // ------------------------------------------------------------------------
+  // 内置Shader获取
+  // ------------------------------------------------------------------------
+  Ptr<GLShader> getBuiltinSpriteShader();
+  Ptr<GLShader> getBuiltinParticleShader();
+  Ptr<GLShader> getBuiltinPostProcessShader();
+  Ptr<GLShader> getBuiltinShapeShader();
+
+  // ------------------------------------------------------------------------
+  // 工具方法
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 从文件读取文本内容
+   */
+  static std::string readFile(const std::string &filepath);
+
+  /**
+   * @brief 获取Shader文件的最后修改时间
+   */
+  static uint64_t getFileModifiedTime(const std::string &filepath);
+
+private:
+  ShaderSystem() = default;
+  ~ShaderSystem() = default;
+  ShaderSystem(const ShaderSystem &) = delete;
+  ShaderSystem &operator=(const ShaderSystem &) = delete;
+
+  struct ShaderInfo {
+    Ptr<GLShader> shader;
+    std::string vertPath;
+    std::string fragPath;
+    uint64_t vertModifiedTime;
+    uint64_t fragModifiedTime;
+    bool isBuiltin;
+  };
+
+  std::unordered_map<std::string, ShaderInfo> shaders_;
+  bool fileWatching_ = false;
+  float watchTimer_ = 0.0f;
+  static constexpr float WATCH_INTERVAL = 1.0f; // 检查间隔（秒）
+
+  // 内置Shader缓存
+  Ptr<GLShader> builtinSpriteShader_;
+  Ptr<GLShader> builtinParticleShader_;
+  Ptr<GLShader> builtinPostProcessShader_;
+  Ptr<GLShader> builtinShapeShader_;
+
+  bool loadBuiltinShaders();
+  void checkAndReload();
+};
+
+// ============================================================================
+// Shader参数包装器 - 简化Uniform设置
+// ============================================================================
+class ShaderParams {
+public:
+  explicit ShaderParams(GLShader &shader);
+
+  ShaderParams &setBool(const std::string &name, bool value);
+  ShaderParams &setInt(const std::string &name, int value);
+  ShaderParams &setFloat(const std::string &name, float value);
+  ShaderParams &setVec2(const std::string &name, const glm::vec2 &value);
+  ShaderParams &setVec3(const std::string &name, const glm::vec3 &value);
+  ShaderParams &setVec4(const std::string &name, const glm::vec4 &value);
+  ShaderParams &setMat4(const std::string &name, const glm::mat4 &value);
+  ShaderParams &setColor(const std::string &name, const Color &color);
+
+private:
+  GLShader &shader_;
+};
+
+// ============================================================================
+// 便捷宏
+// ============================================================================
+#define E2D_SHADER_SYSTEM() ::extra2d::ShaderSystem::getInstance()
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/texture.h b/Extra2D/include/extra2d/graphics/texture.h
similarity index 93%
rename from Easy2D/include/easy2d/graphics/texture.h
rename to Extra2D/include/extra2d/graphics/texture.h
index a81e5fc..712915e 100644
--- a/Easy2D/include/easy2d/graphics/texture.h
+++ b/Extra2D/include/extra2d/graphics/texture.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <easy2d/core/types.h>
-#include <easy2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <extra2d/core/math_types.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // 像素格式枚举
@@ -61,4 +61,4 @@ public:
     virtual void setWrap(bool repeat) = 0;
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/graphics/texture_pool.h b/Extra2D/include/extra2d/graphics/texture_pool.h
new file mode 100644
index 0000000..8d23c58
--- /dev/null
+++ b/Extra2D/include/extra2d/graphics/texture_pool.h
@@ -0,0 +1,192 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/texture.h>
+#include <functional>
+#include <list>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace extra2d {
+
+// ============================================================================
+// 纹理池配置
+// ============================================================================
+struct TexturePoolConfig {
+  size_t maxCacheSize = 64 * 1024 * 1024; // 最大缓存大小 (64MB)
+  size_t maxTextureCount = 256;           // 最大纹理数量
+  float unloadInterval = 30.0f;           // 自动清理间隔 (秒)
+  bool enableAsyncLoad = true;            // 启用异步加载
+};
+
+// ============================================================================
+// 纹理池 - 使用LRU缓存策略管理纹理复用
+// ============================================================================
+class TexturePool {
+public:
+  // ------------------------------------------------------------------------
+  // 单例访问
+  // ------------------------------------------------------------------------
+  static TexturePool &getInstance();
+
+  // ------------------------------------------------------------------------
+  // 初始化和关闭
+  // ------------------------------------------------------------------------
+  bool init(const TexturePoolConfig &config = TexturePoolConfig{});
+  void shutdown();
+
+  // ------------------------------------------------------------------------
+  // 纹理获取
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 从文件获取纹理（带缓存）
+   * @param filepath 纹理文件路径
+   * @return 纹理对象，失败返回nullptr
+   */
+  Ptr<Texture> get(const std::string &filepath);
+
+  /**
+   * @brief 异步加载纹理
+   * @param filepath 纹理文件路径
+   * @param callback 加载完成回调
+   */
+  void getAsync(const std::string &filepath,
+                std::function<void(Ptr<Texture>)> callback);
+
+  /**
+   * @brief 从内存数据创建纹理（自动缓存）
+   * @param name 纹理名称（用于缓存键）
+   * @param data 图像数据
+   * @param width 宽度
+   * @param height 高度
+   * @param format 像素格式
+   * @return 纹理对象
+   */
+  Ptr<Texture> createFromData(const std::string &name, const uint8_t *data,
+                              int width, int height,
+                              PixelFormat format = PixelFormat::RGBA8);
+
+  // ------------------------------------------------------------------------
+  // 缓存管理
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 手动添加纹理到缓存
+   */
+  void add(const std::string &key, Ptr<Texture> texture);
+
+  /**
+   * @brief 从缓存移除纹理
+   */
+  void remove(const std::string &key);
+
+  /**
+   * @brief 检查纹理是否在缓存中
+   */
+  bool has(const std::string &key) const;
+
+  /**
+   * @brief 清空所有缓存
+   */
+  void clear();
+
+  /**
+   * @brief 清理未使用的纹理（LRU策略）
+   * @param targetSize 目标缓存大小
+   */
+  void trim(size_t targetSize);
+
+  // ------------------------------------------------------------------------
+  // 统计信息
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 获取当前缓存的纹理数量
+   */
+  size_t getTextureCount() const;
+
+  /**
+   * @brief 获取当前缓存的总大小（字节）
+   */
+  size_t getCacheSize() const;
+
+  /**
+   * @brief 获取缓存命中率
+   */
+  float getHitRate() const;
+
+  /**
+   * @brief 打印统计信息
+   */
+  void printStats() const;
+
+  // ------------------------------------------------------------------------
+  // 自动清理
+  // ------------------------------------------------------------------------
+
+  /**
+   * @brief 更新（在主循环中调用，用于自动清理）
+   */
+  void update(float dt);
+
+  /**
+   * @brief 设置自动清理间隔
+   */
+  void setAutoUnloadInterval(float interval);
+
+private:
+  TexturePool() = default;
+  ~TexturePool() = default;
+  TexturePool(const TexturePool &) = delete;
+  TexturePool &operator=(const TexturePool &) = delete;
+
+  // 缓存项
+  struct CacheEntry {
+    Ptr<Texture> texture;
+    size_t size;          // 纹理大小（字节）
+    float lastAccessTime; // 最后访问时间
+    uint32_t accessCount; // 访问次数
+  };
+
+  // LRU列表（最近使用的在前面）
+  using LRUList = std::list<std::string>;
+  using LRUIterator = LRUList::iterator;
+
+  mutable std::mutex mutex_;
+  TexturePoolConfig config_;
+
+  // 缓存存储
+  std::unordered_map<std::string, CacheEntry> cache_;
+  std::unordered_map<std::string, LRUIterator> lruMap_;
+  LRUList lruList_;
+
+  // 统计
+  size_t totalSize_ = 0;
+  uint64_t hitCount_ = 0;
+  uint64_t missCount_ = 0;
+  float autoUnloadTimer_ = 0.0f;
+  bool initialized_ = false;
+
+  // 异步加载队列
+  struct AsyncLoadTask {
+    std::string filepath;
+    std::function<void(Ptr<Texture>)> callback;
+  };
+  std::vector<AsyncLoadTask> asyncTasks_;
+
+  // 内部方法
+  void touch(const std::string &key);
+  void evict();
+  Ptr<Texture> loadTexture(const std::string &filepath);
+  size_t calculateTextureSize(int width, int height, PixelFormat format);
+  void processAsyncTasks();
+};
+
+// ============================================================================
+// 便捷宏
+// ============================================================================
+#define E2D_TEXTURE_POOL() ::extra2d::TexturePool::getInstance()
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/graphics/vram_manager.h b/Extra2D/include/extra2d/graphics/vram_manager.h
similarity index 97%
rename from Easy2D/include/easy2d/graphics/vram_manager.h
rename to Extra2D/include/extra2d/graphics/vram_manager.h
index 98f4da6..1375413 100644
--- a/Easy2D/include/easy2d/graphics/vram_manager.h
+++ b/Extra2D/include/extra2d/graphics/vram_manager.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <mutex>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // VRAM 管理器 - 跟踪显存使用情况
@@ -59,4 +59,4 @@ private:
     size_t peakBufferVRAM_;
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/platform/input.h b/Extra2D/include/extra2d/platform/input.h
new file mode 100644
index 0000000..81106f1
--- /dev/null
+++ b/Extra2D/include/extra2d/platform/input.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include <array>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+
+#include <SDL.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 鼠标按钮枚举 (保留接口兼容性)
+// ============================================================================
+enum class MouseButton {
+  Left = 0,
+  Right = 1,
+  Middle = 2,
+  Button4 = 3,
+  Button5 = 4,
+  Button6 = 5,
+  Button7 = 6,
+  Button8 = 7,
+  Count = 8
+};
+
+// ============================================================================
+// Input 类 - SDL2 GameController + Touch 输入管理
+// ============================================================================
+class Input {
+public:
+  Input();
+  ~Input();
+
+  // 初始化 (使用 SDL2 GameController API)
+  void init();
+  void shutdown();
+
+  // 每帧更新
+  void update();
+
+  // ------------------------------------------------------------------------
+  // 键盘输入 (映射到手柄按钮)
+  // ------------------------------------------------------------------------
+  bool isKeyDown(int keyCode) const;
+  bool isKeyPressed(int keyCode) const;
+  bool isKeyReleased(int keyCode) const;
+
+  // ------------------------------------------------------------------------
+  // 手柄按钮 (通过 SDL_GameController)
+  // ------------------------------------------------------------------------
+  bool isButtonDown(int button) const;
+  bool isButtonPressed(int button) const;
+  bool isButtonReleased(int button) const;
+
+  // 摇杆
+  Vec2 getLeftStick() const;
+  Vec2 getRightStick() const;
+
+  // ------------------------------------------------------------------------
+  // 鼠标输入 (映射到触摸屏)
+  // ------------------------------------------------------------------------
+  bool isMouseDown(MouseButton button) const;
+  bool isMousePressed(MouseButton button) const;
+  bool isMouseReleased(MouseButton button) const;
+
+  Vec2 getMousePosition() const;
+  Vec2 getMouseDelta() const;
+  float getMouseScroll() const { return 0.0f; }
+  float getMouseScrollDelta() const { return 0.0f; }
+
+  void setMousePosition(const Vec2 &position);
+  void setMouseVisible(bool visible);
+  void setMouseLocked(bool locked);
+
+  // ------------------------------------------------------------------------
+  // 触摸屏
+  // ------------------------------------------------------------------------
+  bool isTouching() const { return touching_; }
+  Vec2 getTouchPosition() const { return touchPosition_; }
+  int getTouchCount() const { return touchCount_; }
+
+  // ------------------------------------------------------------------------
+  // 便捷方法
+  // ------------------------------------------------------------------------
+  bool isAnyKeyDown() const;
+  bool isAnyMouseDown() const;
+
+private:
+  static constexpr int MAX_BUTTONS = SDL_CONTROLLER_BUTTON_MAX;
+
+  SDL_GameController *controller_;
+
+  // 手柄按钮状态
+  std::array<bool, MAX_BUTTONS> buttonsDown_;
+  std::array<bool, MAX_BUTTONS> prevButtonsDown_;
+
+  // 摇杆状态
+  float leftStickX_;
+  float leftStickY_;
+  float rightStickX_;
+  float rightStickY_;
+
+  // 触摸屏状态
+  bool touching_;
+  bool prevTouching_;
+  Vec2 touchPosition_;
+  Vec2 prevTouchPosition_;
+  int touchCount_;
+
+  // 映射键盘 keyCode 到 SDL GameController 按钮
+  SDL_GameControllerButton mapKeyToButton(int keyCode) const;
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/platform/switch_compat.h b/Extra2D/include/extra2d/platform/switch_compat.h
similarity index 95%
rename from Easy2D/include/easy2d/platform/switch_compat.h
rename to Extra2D/include/extra2d/platform/switch_compat.h
index 3a8b8f1..62f163d 100644
--- a/Easy2D/include/easy2d/platform/switch_compat.h
+++ b/Extra2D/include/extra2d/platform/switch_compat.h
@@ -32,7 +32,7 @@
 #define SWITCH_ROMFS_PREFIX "romfs:/"
 
 // RomFS 根路径常量
-namespace easy2d {
+namespace extra2d {
 namespace romfs {
     static constexpr const char* ROMFS_ROOT = "romfs:/";
 
@@ -54,13 +54,13 @@ namespace romfs {
         return result;
     }
 } // namespace romfs
-} // namespace easy2d
+} // namespace extra2d
 
 // ============================================================================
 // Switch 调试输出
 // ============================================================================
 #ifdef E2D_DEBUG
-    #define SWITCH_DEBUG_PRINTF(fmt, ...) printf("[Easy2D] " fmt "\n", ##__VA_ARGS__)
+    #define SWITCH_DEBUG_PRINTF(fmt, ...) printf("[Extra2D] " fmt "\n", ##__VA_ARGS__)
 #else
     #define SWITCH_DEBUG_PRINTF(fmt, ...) ((void)0)
 #endif
diff --git a/Easy2D/include/easy2d/platform/window.h b/Extra2D/include/extra2d/platform/window.h
similarity index 95%
rename from Easy2D/include/easy2d/platform/window.h
rename to Extra2D/include/extra2d/platform/window.h
index 1d3adaa..620a0f9 100644
--- a/Easy2D/include/easy2d/platform/window.h
+++ b/Extra2D/include/extra2d/platform/window.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <easy2d/core/types.h>
-#include <easy2d/core/string.h>
-#include <easy2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <extra2d/core/string.h>
+#include <extra2d/core/math_types.h>
 #include <functional>
 
 #include <SDL.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // 前向声明
 class EventQueue;
@@ -17,7 +17,7 @@ class Input;
 // 窗口配置
 // ============================================================================
 struct WindowConfig {
-    String title = "Easy2D Application";
+    String title = "Extra2D Application";
     int width = 1280;
     int height = 720;
     bool fullscreen = true;   // Switch 始终全屏
@@ -135,4 +135,4 @@ private:
     void deinitSDL();
 };
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/resource/resource_manager.h b/Extra2D/include/extra2d/resource/resource_manager.h
new file mode 100644
index 0000000..19548cb
--- /dev/null
+++ b/Extra2D/include/extra2d/resource/resource_manager.h
@@ -0,0 +1,155 @@
+#pragma once
+
+#include <extra2d/audio/sound.h>
+#include <extra2d/core/types.h>
+#include <extra2d/graphics/alpha_mask.h>
+#include <extra2d/graphics/font.h>
+#include <extra2d/graphics/texture.h>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 资源管理器 - 统一管理纹理、字体、音效等资源
+// ============================================================================
+class ResourceManager {
+public:
+  // ------------------------------------------------------------------------
+  // 单例访问
+  // ------------------------------------------------------------------------
+  static ResourceManager &getInstance();
+
+  // ------------------------------------------------------------------------
+  // 搜索路径管理
+  // ------------------------------------------------------------------------
+
+  /// 添加资源搜索路径
+  void addSearchPath(const std::string &path);
+
+  /// 移除资源搜索路径
+  void removeSearchPath(const std::string &path);
+
+  /// 清空所有搜索路径
+  void clearSearchPaths();
+
+  /// 获取搜索路径列表
+  const std::vector<std::string> &getSearchPaths() const {
+    return searchPaths_;
+  }
+
+  /// 查找资源文件完整路径
+  std::string findResourcePath(const std::string &filename) const;
+
+  // ------------------------------------------------------------------------
+  // 纹理资源
+  // ------------------------------------------------------------------------
+
+  /// 加载纹理（带缓存）
+  Ptr<Texture> loadTexture(const std::string &filepath);
+
+  /// 加载纹理并生成Alpha遮罩（用于不规则形状图片）
+  Ptr<Texture> loadTextureWithAlphaMask(const std::string &filepath);
+
+  /// 通过key获取已缓存的纹理
+  Ptr<Texture> getTexture(const std::string &key) const;
+
+  /// 检查纹理是否已缓存
+  bool hasTexture(const std::string &key) const;
+
+  /// 卸载指定纹理
+  void unloadTexture(const std::string &key);
+
+  // ------------------------------------------------------------------------
+  // Alpha遮罩资源
+  // ------------------------------------------------------------------------
+
+  /// 获取纹理的Alpha遮罩（如果已生成）
+  const AlphaMask *getAlphaMask(const std::string &textureKey) const;
+
+  /// 为已加载的纹理生成Alpha遮罩
+  bool generateAlphaMask(const std::string &textureKey);
+
+  /// 检查纹理是否有Alpha遮罩
+  bool hasAlphaMask(const std::string &textureKey) const;
+
+  // ------------------------------------------------------------------------
+  // 字体图集资源
+  // ------------------------------------------------------------------------
+
+  /// 加载字体图集（带缓存）
+  Ptr<FontAtlas> loadFont(const std::string &filepath, int fontSize,
+                          bool useSDF = false);
+
+  /// 通过key获取已缓存的字体图集
+  Ptr<FontAtlas> getFont(const std::string &key) const;
+
+  /// 检查字体是否已缓存
+  bool hasFont(const std::string &key) const;
+
+  /// 卸载指定字体
+  void unloadFont(const std::string &key);
+
+  // ------------------------------------------------------------------------
+  // 音效资源
+  // ------------------------------------------------------------------------
+
+  /// 加载音效（带缓存）
+  Ptr<Sound> loadSound(const std::string &filepath);
+  Ptr<Sound> loadSound(const std::string &name, const std::string &filepath);
+
+  /// 通过key获取已缓存的音效
+  Ptr<Sound> getSound(const std::string &key) const;
+
+  /// 检查音效是否已缓存
+  bool hasSound(const std::string &key) const;
+
+  /// 卸载指定音效
+  void unloadSound(const std::string &key);
+
+  // ------------------------------------------------------------------------
+  // 缓存清理
+  // ------------------------------------------------------------------------
+
+  /// 清理所有失效的弱引用（自动清理已释放的资源）
+  void purgeUnused();
+
+  /// 清理指定类型的所有缓存
+  void clearTextureCache();
+  void clearFontCache();
+  void clearSoundCache();
+
+  /// 清理所有资源缓存
+  void clearAllCaches();
+
+  /// 获取各类资源的缓存数量
+  size_t getTextureCacheSize() const;
+  size_t getFontCacheSize() const;
+  size_t getSoundCacheSize() const;
+
+  ResourceManager();
+  ~ResourceManager();
+  ResourceManager(const ResourceManager &) = delete;
+  ResourceManager &operator=(const ResourceManager &) = delete;
+
+  // 生成字体缓存key
+  std::string makeFontKey(const std::string &filepath, int fontSize,
+                          bool useSDF) const;
+
+  // 互斥锁保护缓存
+  mutable std::mutex textureMutex_;
+  mutable std::mutex fontMutex_;
+  mutable std::mutex soundMutex_;
+
+  // 搜索路径
+  std::vector<std::string> searchPaths_;
+
+  // 资源缓存 - 使用弱指针实现自动清理
+  std::unordered_map<std::string, WeakPtr<Texture>> textureCache_;
+  std::unordered_map<std::string, WeakPtr<FontAtlas>> fontCache_;
+  std::unordered_map<std::string, WeakPtr<Sound>> soundCache_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/node.h b/Extra2D/include/extra2d/scene/node.h
new file mode 100644
index 0000000..5fe39e7
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/node.h
@@ -0,0 +1,196 @@
+#pragma once
+
+#include <algorithm>
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <extra2d/event/event_dispatcher.h>
+#include <extra2d/graphics/render_backend.h>
+#include <functional>
+#include <string>
+#include <vector>
+
+namespace extra2d {
+
+// 前向声明
+class Scene;
+class Action;
+class RenderBackend;
+struct RenderCommand;
+
+// ============================================================================
+// 节点基类 - 场景图的基础
+// ============================================================================
+class Node : public std::enable_shared_from_this<Node> {
+public:
+  Node();
+  virtual ~Node();
+
+  // ------------------------------------------------------------------------
+  // 层级管理
+  // ------------------------------------------------------------------------
+  void addChild(Ptr<Node> child);
+  void removeChild(Ptr<Node> child);
+  void removeChildByName(const std::string &name);
+  void removeFromParent();
+  void removeAllChildren();
+
+  Ptr<Node> getParent() const { return parent_.lock(); }
+  const std::vector<Ptr<Node>> &getChildren() const { return children_; }
+  Ptr<Node> getChildByName(const std::string &name) const;
+  Ptr<Node> getChildByTag(int tag) const;
+
+  // ------------------------------------------------------------------------
+  // 变换属性
+  // ------------------------------------------------------------------------
+  void setPosition(const Vec2 &pos);
+  void setPosition(float x, float y);
+  Vec2 getPosition() const { return position_; }
+
+  void setRotation(float degrees);
+  float getRotation() const { return rotation_; }
+
+  void setScale(const Vec2 &scale);
+  void setScale(float scale);
+  void setScale(float x, float y);
+  Vec2 getScale() const { return scale_; }
+
+  void setAnchor(const Vec2 &anchor);
+  void setAnchor(float x, float y);
+  Vec2 getAnchor() const { return anchor_; }
+
+  void setSkew(const Vec2 &skew);
+  void setSkew(float x, float y);
+  Vec2 getSkew() const { return skew_; }
+
+  void setOpacity(float opacity);
+  float getOpacity() const { return opacity_; }
+
+  void setVisible(bool visible);
+  bool isVisible() const { return visible_; }
+
+  void setZOrder(int zOrder);
+  int getZOrder() const { return zOrder_; }
+
+  // ------------------------------------------------------------------------
+  // 世界变换
+  // ------------------------------------------------------------------------
+  Vec2 convertToWorldSpace(const Vec2 &localPos) const;
+  Vec2 convertToNodeSpace(const Vec2 &worldPos) const;
+
+  glm::mat4 getLocalTransform() const;
+  glm::mat4 getWorldTransform() const;
+
+  // ------------------------------------------------------------------------
+  // 名称和标签
+  // ------------------------------------------------------------------------
+  void setName(const std::string &name) { name_ = name; }
+  const std::string &getName() const { return name_; }
+
+  void setTag(int tag) { tag_ = tag; }
+  int getTag() const { return tag_; }
+
+  // ------------------------------------------------------------------------
+  // 生命周期回调
+  // ------------------------------------------------------------------------
+  virtual void onEnter();
+  virtual void onExit();
+  virtual void onUpdate(float dt);
+  virtual void onRender(RenderBackend &renderer);
+  virtual void onAttachToScene(Scene *scene);
+  virtual void onDetachFromScene();
+
+  // ------------------------------------------------------------------------
+  // 边界框（用于空间索引）
+  // ------------------------------------------------------------------------
+  virtual Rect getBoundingBox() const;
+
+  // 是否需要参与空间索引（默认 true）
+  void setSpatialIndexed(bool indexed) { spatialIndexed_ = indexed; }
+  bool isSpatialIndexed() const { return spatialIndexed_; }
+
+  // 更新空间索引（手动调用，通常在边界框变化后）
+  void updateSpatialIndex();
+
+  // ------------------------------------------------------------------------
+  // 动作系统
+  // ------------------------------------------------------------------------
+  void runAction(Ptr<Action> action);
+  void stopAllActions();
+  void stopAction(Ptr<Action> action);
+  void stopActionByTag(int tag);
+  Ptr<Action> getActionByTag(int tag) const;
+  size_t getActionCount() const { return actions_.size(); }
+
+  // ------------------------------------------------------------------------
+  // 事件系统
+  // ------------------------------------------------------------------------
+  EventDispatcher &getEventDispatcher() { return eventDispatcher_; }
+
+  // ------------------------------------------------------------------------
+  // 内部方法
+  // ------------------------------------------------------------------------
+  void update(float dt);
+  void render(RenderBackend &renderer);
+  void sortChildren();
+
+  bool isRunning() const { return running_; }
+  Scene *getScene() const { return scene_; }
+
+  // 多线程渲染命令收集
+  virtual void collectRenderCommands(std::vector<RenderCommand> &commands,
+                                     int parentZOrder = 0);
+
+protected:
+  // 子类重写
+  virtual void onDraw(RenderBackend &renderer) {}
+  virtual void onUpdateNode(float dt) {}
+  virtual void generateRenderCommand(std::vector<RenderCommand> &commands,
+                                     int zOrder) {};
+
+  // 供子类访问的内部状态
+  Vec2 &getPositionRef() { return position_; }
+  Vec2 &getScaleRef() { return scale_; }
+  Vec2 &getAnchorRef() { return anchor_; }
+  float getRotationRef() { return rotation_; }
+  float getOpacityRef() { return opacity_; }
+
+private:
+  // 层级
+  WeakPtr<Node> parent_;
+  std::vector<Ptr<Node>> children_;
+  bool childrenOrderDirty_ = false;
+
+  // 变换
+  Vec2 position_ = Vec2::Zero();
+  float rotation_ = 0.0f;
+  Vec2 scale_ = Vec2(1.0f, 1.0f);
+  Vec2 anchor_ = Vec2(0.5f, 0.5f);
+  Vec2 skew_ = Vec2::Zero();
+  float opacity_ = 1.0f;
+  bool visible_ = true;
+  int zOrder_ = 0;
+
+  // 缓存
+  mutable bool transformDirty_ = true;
+  mutable glm::mat4 localTransform_;
+  mutable glm::mat4 worldTransform_;
+
+  // 元数据
+  std::string name_;
+  int tag_ = -1;
+
+  // 状态
+  bool running_ = false;
+  Scene *scene_ = nullptr;
+  bool spatialIndexed_ = true; // 是否参与空间索引
+  Rect lastSpatialBounds_;     // 上一次的空间索引边界（用于检测变化）
+
+  // 动作
+  std::vector<Ptr<Action>> actions_;
+
+  // 事件
+  EventDispatcher eventDispatcher_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/scene.h b/Extra2D/include/extra2d/scene/scene.h
new file mode 100644
index 0000000..b03c613
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/scene.h
@@ -0,0 +1,110 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/graphics/camera.h>
+#include <extra2d/scene/node.h>
+#include <extra2d/spatial/spatial_manager.h>
+#include <vector>
+
+namespace extra2d {
+
+// 前向声明
+struct RenderCommand;
+
+// ============================================================================
+// 场景类 - 节点容器，管理整个场景图
+// ============================================================================
+class Scene : public Node {
+public:
+  Scene();
+  ~Scene() override = default;
+
+  // ------------------------------------------------------------------------
+  // 场景属性
+  // ------------------------------------------------------------------------
+  void setBackgroundColor(const Color &color) { backgroundColor_ = color; }
+  Color getBackgroundColor() const { return backgroundColor_; }
+
+  // ------------------------------------------------------------------------
+  // 摄像机
+  // ------------------------------------------------------------------------
+  void setCamera(Ptr<Camera> camera);
+  Ptr<Camera> getCamera() const { return camera_; }
+
+  Camera *getActiveCamera() const {
+    return camera_ ? camera_.get() : defaultCamera_.get();
+  }
+
+  // ------------------------------------------------------------------------
+  // 视口和尺寸
+  // ------------------------------------------------------------------------
+  void setViewportSize(float width, float height);
+  void setViewportSize(const Size &size);
+  Size getViewportSize() const { return viewportSize_; }
+
+  float getWidth() const { return viewportSize_.width; }
+  float getHeight() const { return viewportSize_.height; }
+
+  // ------------------------------------------------------------------------
+  // 场景状态
+  // ------------------------------------------------------------------------
+  bool isPaused() const { return paused_; }
+  void pause() { paused_ = true; }
+  void resume() { paused_ = false; }
+
+  // ------------------------------------------------------------------------
+  // 渲染和更新
+  // ------------------------------------------------------------------------
+  void renderScene(RenderBackend &renderer);
+  void renderContent(RenderBackend &renderer);
+  void updateScene(float dt);
+  void collectRenderCommands(std::vector<RenderCommand> &commands);
+
+  // ------------------------------------------------------------------------
+  // 空间索引系统
+  // ------------------------------------------------------------------------
+  SpatialManager &getSpatialManager() { return spatialManager_; }
+  const SpatialManager &getSpatialManager() const { return spatialManager_; }
+
+  // 启用/禁用空间索引
+  void setSpatialIndexingEnabled(bool enabled) {
+    spatialIndexingEnabled_ = enabled;
+  }
+  bool isSpatialIndexingEnabled() const { return spatialIndexingEnabled_; }
+
+  // 节点空间索引管理（内部使用）
+  void updateNodeInSpatialIndex(Node *node, const Rect &oldBounds,
+                                const Rect &newBounds);
+  void removeNodeFromSpatialIndex(Node *node);
+
+  // 碰撞检测查询
+  std::vector<Node *> queryNodesInArea(const Rect &area) const;
+  std::vector<Node *> queryNodesAtPoint(const Vec2 &point) const;
+  std::vector<std::pair<Node *, Node *>> queryCollisions() const;
+
+  // ------------------------------------------------------------------------
+  // 静态创建方法
+  // ------------------------------------------------------------------------
+  static Ptr<Scene> create();
+
+protected:
+  void onEnter() override;
+  void onExit() override;
+
+  friend class SceneManager;
+
+private:
+  Color backgroundColor_ = Colors::Black;
+  Size viewportSize_ = Size::Zero();
+
+  Ptr<Camera> camera_;
+  Ptr<Camera> defaultCamera_;
+
+  bool paused_ = false;
+
+  // 空间索引系统
+  SpatialManager spatialManager_;
+  bool spatialIndexingEnabled_ = true;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/scene_manager.h b/Extra2D/include/extra2d/scene/scene_manager.h
new file mode 100644
index 0000000..bbe19d8
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/scene_manager.h
@@ -0,0 +1,153 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <extra2d/scene/scene.h>
+#include <functional>
+#include <stack>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace extra2d {
+
+// 前向声明
+struct RenderCommand;
+class Transition;
+
+// ============================================================================
+// 场景切换特效类型
+// ============================================================================
+enum class TransitionType {
+  None,
+  Fade,
+  SlideLeft,
+  SlideRight,
+  SlideUp,
+  SlideDown,
+  Scale,
+  Flip
+};
+
+// ============================================================================
+// 场景管理器 - 管理场景的生命周期和切换
+// ============================================================================
+class SceneManager {
+public:
+  using TransitionCallback = std::function<void()>;
+
+  // ------------------------------------------------------------------------
+  // 单例访问
+  // ------------------------------------------------------------------------
+  static SceneManager &getInstance();
+
+  // ------------------------------------------------------------------------
+  // 场景栈操作
+  // ------------------------------------------------------------------------
+
+  // 运行第一个场景
+  void runWithScene(Ptr<Scene> scene);
+
+  // 替换当前场景
+  void replaceScene(Ptr<Scene> scene);
+  void replaceScene(Ptr<Scene> scene, TransitionType transition,
+                    float duration = 0.5f);
+
+  // 压入新场景（当前场景暂停）
+  void pushScene(Ptr<Scene> scene);
+  void pushScene(Ptr<Scene> scene, TransitionType transition,
+                 float duration = 0.5f);
+
+  // 弹出当前场景（恢复上一个场景）
+  void popScene();
+  void popScene(TransitionType transition, float duration = 0.5f);
+
+  // 弹出到根场景
+  void popToRootScene();
+  void popToRootScene(TransitionType transition, float duration = 0.5f);
+
+  // 弹出到指定场景
+  void popToScene(const std::string &name);
+  void popToScene(const std::string &name, TransitionType transition,
+                  float duration = 0.5f);
+
+  // ------------------------------------------------------------------------
+  // 获取场景
+  // ------------------------------------------------------------------------
+  Ptr<Scene> getCurrentScene() const;
+  Ptr<Scene> getPreviousScene() const;
+  Ptr<Scene> getRootScene() const;
+
+  // 通过名称获取场景
+  Ptr<Scene> getSceneByName(const std::string &name) const;
+
+  // ------------------------------------------------------------------------
+  // 查询
+  // ------------------------------------------------------------------------
+  size_t getSceneCount() const { return sceneStack_.size(); }
+  bool isEmpty() const { return sceneStack_.empty(); }
+  bool hasScene(const std::string &name) const;
+
+  // ------------------------------------------------------------------------
+  // 更新和渲染
+  // ------------------------------------------------------------------------
+  void update(float dt);
+  void render(RenderBackend &renderer);
+  void collectRenderCommands(std::vector<RenderCommand> &commands);
+
+  // ------------------------------------------------------------------------
+  // 过渡控制
+  // ------------------------------------------------------------------------
+  bool isTransitioning() const { return isTransitioning_; }
+  void setTransitionCallback(TransitionCallback callback) {
+    transitionCallback_ = callback;
+  }
+
+  // ------------------------------------------------------------------------
+  // 清理
+  // ------------------------------------------------------------------------
+  void end();
+  void purgeCachedScenes();
+
+public:
+  SceneManager() = default;
+  ~SceneManager() = default;
+  SceneManager(const SceneManager &) = delete;
+  SceneManager &operator=(const SceneManager &) = delete;
+
+  // 场景切换（供 Application 使用）
+  void enterScene(Ptr<Scene> scene);
+  void enterScene(Ptr<Scene> scene, Ptr<class Transition> transition);
+
+private:
+  void doSceneSwitch();
+  void startTransition(Ptr<Scene> from, Ptr<Scene> to, TransitionType type,
+                       float duration, Function<void()> stackAction);
+  void updateTransition(float dt);
+  void finishTransition();
+  void dispatchPointerEvents(Scene &scene);
+
+  std::stack<Ptr<Scene>> sceneStack_;
+  std::unordered_map<std::string, Ptr<Scene>> namedScenes_;
+
+  // Transition state
+  bool isTransitioning_ = false;
+  TransitionType currentTransition_ = TransitionType::None;
+  float transitionDuration_ = 0.0f;
+  float transitionElapsed_ = 0.0f;
+  Ptr<Scene> outgoingScene_;
+  Ptr<Scene> incomingScene_;
+  Ptr<Transition> activeTransition_;
+  Function<void()> transitionStackAction_;
+  TransitionCallback transitionCallback_;
+
+  // Next scene to switch to (queued during transition)
+  Ptr<Scene> nextScene_;
+  bool sendCleanupToScene_ = false;
+
+  Node *hoverTarget_ = nullptr;
+  Node *captureTarget_ = nullptr;
+  Vec2 lastPointerWorld_ = Vec2::Zero();
+  bool hasLastPointerWorld_ = false;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/shape_node.h b/Extra2D/include/extra2d/scene/shape_node.h
new file mode 100644
index 0000000..64550e6
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/shape_node.h
@@ -0,0 +1,104 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/scene/node.h>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// 形状类型
+// ============================================================================
+enum class ShapeType { Point, Line, Rect, Circle, Triangle, Polygon };
+
+// ============================================================================
+// 形状节点 - 用于绘制几何形状
+// ============================================================================
+class ShapeNode : public Node {
+public:
+  ShapeNode();
+  ~ShapeNode() override = default;
+
+  // ------------------------------------------------------------------------
+  // 静态创建方法
+  // ------------------------------------------------------------------------
+  static Ptr<ShapeNode> create();
+
+  // 点
+  static Ptr<ShapeNode> createPoint(const Vec2 &pos, const Color &color);
+
+  // 线
+  static Ptr<ShapeNode> createLine(const Vec2 &start, const Vec2 &end,
+                                   const Color &color, float width = 1.0f);
+
+  // 矩形
+  static Ptr<ShapeNode> createRect(const Rect &rect, const Color &color,
+                                   float width = 1.0f);
+  static Ptr<ShapeNode> createFilledRect(const Rect &rect, const Color &color);
+
+  // 圆形
+  static Ptr<ShapeNode> createCircle(const Vec2 &center, float radius,
+                                     const Color &color, int segments = 32,
+                                     float width = 1.0f);
+  static Ptr<ShapeNode> createFilledCircle(const Vec2 &center, float radius,
+                                           const Color &color,
+                                           int segments = 32);
+
+  // 三角形
+  static Ptr<ShapeNode> createTriangle(const Vec2 &p1, const Vec2 &p2,
+                                       const Vec2 &p3, const Color &color,
+                                       float width = 1.0f);
+  static Ptr<ShapeNode> createFilledTriangle(const Vec2 &p1, const Vec2 &p2,
+                                             const Vec2 &p3,
+                                             const Color &color);
+
+  // 多边形
+  static Ptr<ShapeNode> createPolygon(const std::vector<Vec2> &points,
+                                      const Color &color, float width = 1.0f);
+  static Ptr<ShapeNode> createFilledPolygon(const std::vector<Vec2> &points,
+                                            const Color &color);
+
+  // ------------------------------------------------------------------------
+  // 属性设置
+  // ------------------------------------------------------------------------
+  void setShapeType(ShapeType type) { shapeType_ = type; }
+  ShapeType getShapeType() const { return shapeType_; }
+
+  void setColor(const Color &color) { color_ = color; }
+  Color getColor() const { return color_; }
+
+  void setFilled(bool filled) { filled_ = filled; }
+  bool isFilled() const { return filled_; }
+
+  void setLineWidth(float width) { lineWidth_ = width; }
+  float getLineWidth() const { return lineWidth_; }
+
+  void setSegments(int segments) { segments_ = segments; }
+  int getSegments() const { return segments_; }
+
+  // ------------------------------------------------------------------------
+  // 点设置
+  // ------------------------------------------------------------------------
+  void setPoints(const std::vector<Vec2> &points);
+  const std::vector<Vec2> &getPoints() const { return points_; }
+  void addPoint(const Vec2 &point);
+  void clearPoints();
+
+  Rect getBoundingBox() const override;
+
+protected:
+  void onDraw(RenderBackend &renderer) override;
+  void generateRenderCommand(std::vector<RenderCommand> &commands,
+                             int zOrder) override;
+
+private:
+  ShapeType shapeType_ = ShapeType::Rect;
+  Color color_ = Colors::White;
+  bool filled_ = false;
+  float lineWidth_ = 1.0f;
+  int segments_ = 32;
+  std::vector<Vec2> points_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/sprite.h b/Extra2D/include/extra2d/scene/sprite.h
new file mode 100644
index 0000000..0968ec4
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/sprite.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <extra2d/graphics/texture.h>
+#include <extra2d/scene/node.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 精灵节点
+// ============================================================================
+class Sprite : public Node {
+public:
+  Sprite();
+  explicit Sprite(Ptr<Texture> texture);
+  ~Sprite() override = default;
+
+  // 纹理
+  void setTexture(Ptr<Texture> texture);
+  Ptr<Texture> getTexture() const { return texture_; }
+
+  // 纹理矩形 (用于图集)
+  void setTextureRect(const Rect &rect);
+  Rect getTextureRect() const { return textureRect_; }
+
+  // 颜色混合
+  void setColor(const Color &color);
+  Color getColor() const { return color_; }
+
+  // 翻转
+  void setFlipX(bool flip);
+  void setFlipY(bool flip);
+  bool isFlipX() const { return flipX_; }
+  bool isFlipY() const { return flipY_; }
+
+  // 静态创建方法
+  static Ptr<Sprite> create();
+  static Ptr<Sprite> create(Ptr<Texture> texture);
+  static Ptr<Sprite> create(Ptr<Texture> texture, const Rect &rect);
+
+  Rect getBoundingBox() const override;
+
+protected:
+  void onDraw(RenderBackend &renderer) override;
+  void generateRenderCommand(std::vector<RenderCommand> &commands,
+                             int zOrder) override;
+
+private:
+  Ptr<Texture> texture_;
+  Rect textureRect_;
+  Color color_ = Colors::White;
+  bool flipX_ = false;
+  bool flipY_ = false;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/text.h b/Extra2D/include/extra2d/scene/text.h
new file mode 100644
index 0000000..8462ed7
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/text.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/string.h>
+#include <extra2d/graphics/font.h>
+#include <extra2d/scene/node.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 文字节点
+// ============================================================================
+class Text : public Node {
+public:
+  Text();
+  explicit Text(const String &text);
+  ~Text() override = default;
+
+  // ------------------------------------------------------------------------
+  // 文字内容
+  // ------------------------------------------------------------------------
+  void setText(const String &text);
+  const String &getText() const { return text_; }
+
+  // ------------------------------------------------------------------------
+  // 字体
+  // ------------------------------------------------------------------------
+  void setFont(Ptr<FontAtlas> font);
+  Ptr<FontAtlas> getFont() const { return font_; }
+
+  // ------------------------------------------------------------------------
+  // 文字属性
+  // ------------------------------------------------------------------------
+  void setTextColor(const Color &color);
+  Color getTextColor() const { return color_; }
+
+  void setFontSize(int size);
+  int getFontSize() const { return fontSize_; }
+
+  // ------------------------------------------------------------------------
+  // 对齐方式
+  // ------------------------------------------------------------------------
+  enum class Alignment { Left, Center, Right };
+
+  void setAlignment(Alignment align);
+  Alignment getAlignment() const { return alignment_; }
+
+  // ------------------------------------------------------------------------
+  // 尺寸计算
+  // ------------------------------------------------------------------------
+  Vec2 getTextSize() const;
+  float getLineHeight() const;
+
+  // ------------------------------------------------------------------------
+  // 静态创建方法
+  // ------------------------------------------------------------------------
+  static Ptr<Text> create();
+  static Ptr<Text> create(const String &text);
+  static Ptr<Text> create(const String &text, Ptr<FontAtlas> font);
+
+  Rect getBoundingBox() const override;
+
+protected:
+  void onDraw(RenderBackend &renderer) override;
+  void generateRenderCommand(std::vector<RenderCommand> &commands,
+                             int zOrder) override;
+
+private:
+  String text_;
+  Ptr<FontAtlas> font_;
+  Color color_ = Colors::White;
+  int fontSize_ = 16;
+  Alignment alignment_ = Alignment::Left;
+
+  mutable Vec2 cachedSize_ = Vec2::Zero();
+  mutable bool sizeDirty_ = true;
+
+  void updateCache() const;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/scene/transition.h b/Extra2D/include/extra2d/scene/transition.h
new file mode 100644
index 0000000..0c2353f
--- /dev/null
+++ b/Extra2D/include/extra2d/scene/transition.h
@@ -0,0 +1,137 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/types.h>
+#include <extra2d/scene/scene.h>
+#include <functional>
+
+namespace extra2d {
+
+// ============================================================================
+// 过渡方向
+// ============================================================================
+enum class TransitionDirection { Left, Right, Up, Down };
+
+// ============================================================================
+// 过渡效果基类
+// ============================================================================
+class Transition : public std::enable_shared_from_this<Transition> {
+public:
+  using FinishCallback = std::function<void()>;
+
+  Transition(float duration);
+  virtual ~Transition() = default;
+
+  // 开始过渡
+  void start(Ptr<Scene> from, Ptr<Scene> to);
+
+  // 更新过渡进度
+  void update(float dt);
+
+  // 渲染过渡效果
+  virtual void render(RenderBackend &renderer);
+
+  // 是否完成
+  bool isFinished() const { return isFinished_; }
+
+  // 获取进度 [0, 1]
+  float getProgress() const { return progress_; }
+
+  // 获取淡入淡出进度 (0->1 for fade in, 1->0 for fade out)
+  float getFadeInAlpha() const;
+  float getFadeOutAlpha() const;
+
+  // 设置完成回调
+  void setFinishCallback(FinishCallback callback) {
+    finishCallback_ = callback;
+  }
+
+  // 获取源场景和目标场景
+  Ptr<Scene> getOutgoingScene() const { return outgoingScene_; }
+  Ptr<Scene> getIncomingScene() const { return incomingScene_; }
+
+protected:
+  // 子类实现具体的渲染效果
+  virtual void onRenderTransition(RenderBackend &renderer, float progress) = 0;
+
+  // 过渡完成时调用
+  virtual void onFinish();
+
+  float duration_;
+  float elapsed_;
+  float progress_;
+  bool isFinished_;
+  bool isStarted_;
+
+  Ptr<Scene> outgoingScene_;
+  Ptr<Scene> incomingScene_;
+  FinishCallback finishCallback_;
+};
+
+// ============================================================================
+// 淡入淡出过渡
+// ============================================================================
+class FadeTransition : public Transition {
+public:
+  FadeTransition(float duration);
+
+protected:
+  void onRenderTransition(RenderBackend &renderer, float progress) override;
+};
+
+// ============================================================================
+// 滑动过渡
+// ============================================================================
+class SlideTransition : public Transition {
+public:
+  SlideTransition(float duration, TransitionDirection direction);
+
+protected:
+  void onRenderTransition(RenderBackend &renderer, float progress) override;
+
+private:
+  TransitionDirection direction_;
+};
+
+// ============================================================================
+// 缩放过渡
+// ============================================================================
+class ScaleTransition : public Transition {
+public:
+  ScaleTransition(float duration);
+
+protected:
+  void onRenderTransition(RenderBackend &renderer, float progress) override;
+};
+
+// ============================================================================
+// 翻页过渡
+// ============================================================================
+class FlipTransition : public Transition {
+public:
+  enum class Axis { Horizontal, Vertical };
+
+  FlipTransition(float duration, Axis axis = Axis::Horizontal);
+
+protected:
+  void onRenderTransition(RenderBackend &renderer, float progress) override;
+
+private:
+  Axis axis_;
+};
+
+// ============================================================================
+// 马赛克/方块过渡
+// ============================================================================
+class BoxTransition : public Transition {
+public:
+  BoxTransition(float duration, int divisions = 8);
+
+protected:
+  void onRenderTransition(RenderBackend &renderer, float progress) override;
+
+private:
+  int divisions_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/script/script_engine.h b/Extra2D/include/extra2d/script/script_engine.h
new file mode 100644
index 0000000..a5ce1ae
--- /dev/null
+++ b/Extra2D/include/extra2d/script/script_engine.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <squirrel.h>
+#include <string>
+
+namespace extra2d {
+
+class ScriptEngine {
+public:
+  static ScriptEngine &getInstance();
+
+  ScriptEngine(const ScriptEngine &) = delete;
+  ScriptEngine &operator=(const ScriptEngine &) = delete;
+
+  bool initialize();
+  void shutdown();
+
+  bool executeString(const std::string &code);
+  bool executeFile(const std::string &filepath);
+
+  HSQUIRRELVM getVM() const { return vm_; }
+  bool isInitialized() const { return vm_ != nullptr; }
+
+private:
+  ScriptEngine() = default;
+  ~ScriptEngine();
+
+  bool compileAndRun(const std::string &source, const std::string &sourceName);
+
+  static void printFunc(HSQUIRRELVM vm, const SQChar *fmt, ...);
+  static void errorFunc(HSQUIRRELVM vm, const SQChar *fmt, ...);
+  static SQInteger errorHandler(HSQUIRRELVM vm);
+  static void compilerError(HSQUIRRELVM vm, const SQChar *desc,
+                            const SQChar *source, SQInteger line,
+                            SQInteger column);
+
+  HSQUIRRELVM vm_ = nullptr;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/script/script_node.h b/Extra2D/include/extra2d/script/script_node.h
new file mode 100644
index 0000000..87d7551
--- /dev/null
+++ b/Extra2D/include/extra2d/script/script_node.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <extra2d/scene/node.h>
+#include <extra2d/script/script_engine.h>
+#include <string>
+
+namespace extra2d {
+
+class ScriptNode : public Node {
+public:
+  ScriptNode();
+  ~ScriptNode() override;
+
+  static Ptr<ScriptNode> create(const std::string &scriptPath);
+
+  bool loadScript(const std::string &scriptPath);
+  const std::string &getScriptPath() const { return scriptPath_; }
+
+  void onEnter() override;
+  void onExit() override;
+  void onUpdate(float dt) override;
+
+private:
+  bool callMethod(const char *name);
+  bool callMethodWithFloat(const char *name, float arg);
+  void pushSelf();
+
+  std::string scriptPath_;
+  HSQOBJECT scriptTable_;
+  bool tableValid_ = false;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/script/sq_binding.h b/Extra2D/include/extra2d/script/sq_binding.h
new file mode 100644
index 0000000..d541ed4
--- /dev/null
+++ b/Extra2D/include/extra2d/script/sq_binding.h
@@ -0,0 +1,263 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <squirrel.h>
+#include <string>
+
+namespace extra2d {
+namespace sq {
+
+// ============================================================================
+// Type tag helpers — unique address per type
+// ============================================================================
+template <typename T> inline SQUserPointer typeTag() {
+  static int tag;
+  return &tag;
+}
+
+// ============================================================================
+// SqClassName trait — maps C++ types to Squirrel class names
+// ============================================================================
+template <typename T> struct SqClassName {
+  static const char *name();
+};
+
+// ============================================================================
+// push / get primitives
+// ============================================================================
+inline void push(HSQUIRRELVM vm, int v) {
+  sq_pushinteger(vm, static_cast<SQInteger>(v));
+}
+inline void push(HSQUIRRELVM vm, float v) {
+  sq_pushfloat(vm, static_cast<SQFloat>(v));
+}
+inline void push(HSQUIRRELVM vm, double v) {
+  sq_pushfloat(vm, static_cast<SQFloat>(v));
+}
+inline void push(HSQUIRRELVM vm, bool v) {
+  sq_pushbool(vm, v ? SQTrue : SQFalse);
+}
+inline void push(HSQUIRRELVM vm, const char *v) { sq_pushstring(vm, v, -1); }
+inline void push(HSQUIRRELVM vm, const std::string &v) {
+  sq_pushstring(vm, v.c_str(), static_cast<SQInteger>(v.size()));
+}
+inline void pushNull(HSQUIRRELVM vm) { sq_pushnull(vm); }
+
+inline SQInteger getInt(HSQUIRRELVM vm, SQInteger idx) {
+  SQInteger val = 0;
+  sq_getinteger(vm, idx, &val);
+  return val;
+}
+
+inline SQFloat getFloat(HSQUIRRELVM vm, SQInteger idx) {
+  SQFloat val = 0;
+  if (SQ_FAILED(sq_getfloat(vm, idx, &val))) {
+    SQInteger ival = 0;
+    if (SQ_SUCCEEDED(sq_getinteger(vm, idx, &ival)))
+      val = static_cast<SQFloat>(ival);
+  }
+  return val;
+}
+
+inline bool getBool(HSQUIRRELVM vm, SQInteger idx) {
+  SQBool val = SQFalse;
+  sq_getbool(vm, idx, &val);
+  return val != SQFalse;
+}
+
+inline std::string getString(HSQUIRRELVM vm, SQInteger idx) {
+  const SQChar *str = nullptr;
+  sq_getstring(vm, idx, &str);
+  return str ? std::string(str) : std::string();
+}
+
+// ============================================================================
+// Value type userdata helpers
+// ============================================================================
+template <typename T> T *pushValueInstance(HSQUIRRELVM vm, const T &val) {
+  sq_pushroottable(vm);
+  sq_pushstring(vm, SqClassName<T>::name(), -1);
+  if (SQ_FAILED(sq_get(vm, -2))) {
+    sq_pop(vm, 1);
+    return nullptr;
+  }
+  if (SQ_FAILED(sq_createinstance(vm, -1))) {
+    sq_pop(vm, 2);
+    return nullptr;
+  }
+
+  T *ud = nullptr;
+  sq_getinstanceup(vm, -1, reinterpret_cast<SQUserPointer *>(&ud), nullptr,
+                   SQFalse);
+  if (ud)
+    *ud = val;
+
+  sq_remove(vm, -2); // class
+  sq_remove(vm, -2); // roottable
+  return ud;
+}
+
+template <typename T> T *getValueInstance(HSQUIRRELVM vm, SQInteger idx) {
+  T *ud = nullptr;
+  sq_getinstanceup(vm, idx, reinterpret_cast<SQUserPointer *>(&ud),
+                   typeTag<T>(), SQFalse);
+  return ud;
+}
+
+// ============================================================================
+// Shared pointer bridge for reference types
+// ============================================================================
+template <typename T> void pushPtr(HSQUIRRELVM vm, Ptr<T> ptr) {
+  if (!ptr) {
+    sq_pushnull(vm);
+    return;
+  }
+
+  sq_pushroottable(vm);
+  sq_pushstring(vm, SqClassName<T>::name(), -1);
+  if (SQ_FAILED(sq_get(vm, -2))) {
+    sq_pop(vm, 1);
+    sq_pushnull(vm);
+    return;
+  }
+  if (SQ_FAILED(sq_createinstance(vm, -1))) {
+    sq_pop(vm, 2);
+    sq_pushnull(vm);
+    return;
+  }
+
+  auto *storage = new Ptr<T>(std::move(ptr));
+  sq_setinstanceup(vm, -1, storage);
+  sq_setreleasehook(vm, -1, [](SQUserPointer p, SQInteger) -> SQInteger {
+    delete static_cast<Ptr<T> *>(p);
+    return 0;
+  });
+
+  sq_remove(vm, -2); // class
+  sq_remove(vm, -2); // roottable
+}
+
+template <typename T> Ptr<T> getPtr(HSQUIRRELVM vm, SQInteger idx) {
+  SQUserPointer up = nullptr;
+  sq_getinstanceup(vm, idx, &up, typeTag<T>(), SQFalse);
+  if (!up)
+    return nullptr;
+  return *static_cast<Ptr<T> *>(up);
+}
+
+template <typename T> T *getRawPtr(HSQUIRRELVM vm, SQInteger idx) {
+  auto p = getPtr<T>(vm, idx);
+  return p ? p.get() : nullptr;
+}
+
+// ============================================================================
+// Singleton pointer (no release hook)
+// ============================================================================
+template <typename T>
+void pushSingleton(HSQUIRRELVM vm, T *ptr, const char *className) {
+  sq_pushroottable(vm);
+  sq_pushstring(vm, className, -1);
+  if (SQ_FAILED(sq_get(vm, -2))) {
+    sq_pop(vm, 1);
+    sq_pushnull(vm);
+    return;
+  }
+  if (SQ_FAILED(sq_createinstance(vm, -1))) {
+    sq_pop(vm, 2);
+    sq_pushnull(vm);
+    return;
+  }
+  sq_setinstanceup(vm, -1, ptr);
+  sq_remove(vm, -2); // class
+  sq_remove(vm, -2); // roottable
+}
+
+template <typename T> T *getSingleton(HSQUIRRELVM vm, SQInteger idx) {
+  SQUserPointer up = nullptr;
+  sq_getinstanceup(vm, idx, &up, nullptr, SQFalse);
+  return static_cast<T *>(up);
+}
+
+// ============================================================================
+// ClassDef — fluent API for registering a class
+// ============================================================================
+struct ClassDef {
+  HSQUIRRELVM vm;
+
+  ClassDef(HSQUIRRELVM v, const char *name, const char *base = nullptr)
+      : vm(v) {
+    sq_pushroottable(vm);
+    sq_pushstring(vm, name, -1);
+
+    if (base) {
+      sq_pushstring(vm, base, -1);
+      if (SQ_FAILED(sq_get(vm, -3))) {
+        sq_newclass(vm, SQFalse);
+      } else {
+        sq_newclass(vm, SQTrue);
+      }
+    } else {
+      sq_newclass(vm, SQFalse);
+    }
+  }
+
+  ClassDef &setTypeTag(SQUserPointer tag) {
+    sq_settypetag(vm, -1, tag);
+    return *this;
+  }
+
+  ClassDef &method(const char *name, SQFUNCTION fn, SQInteger nparams = 0,
+                   const char *typemask = nullptr) {
+    sq_pushstring(vm, name, -1);
+    sq_newclosure(vm, fn, 0);
+    if (nparams > 0 && typemask)
+      sq_setparamscheck(vm, nparams, typemask);
+    sq_newslot(vm, -3, SQFalse);
+    return *this;
+  }
+
+  ClassDef &staticMethod(const char *name, SQFUNCTION fn, SQInteger nparams = 0,
+                         const char *typemask = nullptr) {
+    sq_pushstring(vm, name, -1);
+    sq_newclosure(vm, fn, 0);
+    if (nparams > 0 && typemask)
+      sq_setparamscheck(vm, nparams, typemask);
+    sq_newslot(vm, -3, SQTrue);
+    return *this;
+  }
+
+  template <typename T> ClassDef &setValueType(SQFUNCTION constructor) {
+    sq_settypetag(vm, -1, typeTag<T>());
+    sq_setclassudsize(vm, -1, sizeof(T));
+    sq_pushstring(vm, "constructor", -1);
+    sq_newclosure(vm, constructor, 0);
+    sq_newslot(vm, -3, SQFalse);
+    return *this;
+  }
+
+  void commit() {
+    sq_newslot(vm, -3, SQFalse);
+    sq_pop(vm, 1);
+  }
+};
+
+// ============================================================================
+// Register a table of integer constants
+// ============================================================================
+inline void registerConstTable(HSQUIRRELVM vm, const char *tableName,
+                               const char *const *names,
+                               const SQInteger *values, int count) {
+  sq_pushroottable(vm);
+  sq_pushstring(vm, tableName, -1);
+  sq_newtable(vm);
+  for (int i = 0; i < count; ++i) {
+    sq_pushstring(vm, names[i], -1);
+    sq_pushinteger(vm, values[i]);
+    sq_newslot(vm, -3, SQFalse);
+  }
+  sq_newslot(vm, -3, SQFalse);
+  sq_pop(vm, 1);
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/script/sq_binding_action.h b/Extra2D/include/extra2d/script/sq_binding_action.h
similarity index 53%
rename from Easy2D/include/easy2d/script/sq_binding_action.h
rename to Extra2D/include/extra2d/script/sq_binding_action.h
index b56099d..ae3cee1 100644
--- a/Easy2D/include/easy2d/script/sq_binding_action.h
+++ b/Extra2D/include/extra2d/script/sq_binding_action.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <easy2d/script/sq_binding.h>
+#include <extra2d/script/sq_binding.h>
 
-namespace easy2d {
+namespace extra2d {
 namespace sq {
 
 void registerActionBindings(HSQUIRRELVM vm);
 
 } // namespace sq
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/script/sq_binding_animation.h b/Extra2D/include/extra2d/script/sq_binding_animation.h
similarity index 54%
rename from Easy2D/include/easy2d/script/sq_binding_animation.h
rename to Extra2D/include/extra2d/script/sq_binding_animation.h
index 7a7e934..dc4f9ee 100644
--- a/Easy2D/include/easy2d/script/sq_binding_animation.h
+++ b/Extra2D/include/extra2d/script/sq_binding_animation.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <easy2d/script/sq_binding.h>
+#include <extra2d/script/sq_binding.h>
 
-namespace easy2d {
+namespace extra2d {
 namespace sq {
 
 void registerAnimationBindings(HSQUIRRELVM vm);
 
 } // namespace sq
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/script/sq_binding_audio.h b/Extra2D/include/extra2d/script/sq_binding_audio.h
similarity index 53%
rename from Easy2D/include/easy2d/script/sq_binding_audio.h
rename to Extra2D/include/extra2d/script/sq_binding_audio.h
index 3f99730..aa106e0 100644
--- a/Easy2D/include/easy2d/script/sq_binding_audio.h
+++ b/Extra2D/include/extra2d/script/sq_binding_audio.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <easy2d/script/sq_binding.h>
+#include <extra2d/script/sq_binding.h>
 
-namespace easy2d {
+namespace extra2d {
 namespace sq {
 
 void registerAudioBindings(HSQUIRRELVM vm);
 
 } // namespace sq
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/script/sq_binding_input.h b/Extra2D/include/extra2d/script/sq_binding_input.h
similarity index 67%
rename from Easy2D/include/easy2d/script/sq_binding_input.h
rename to Extra2D/include/extra2d/script/sq_binding_input.h
index d34a386..371748e 100644
--- a/Easy2D/include/easy2d/script/sq_binding_input.h
+++ b/Extra2D/include/extra2d/script/sq_binding_input.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <easy2d/script/sq_binding.h>
+#include <extra2d/script/sq_binding.h>
 
-namespace easy2d {
+namespace extra2d {
 namespace sq {
 
 void registerInput(HSQUIRRELVM vm);
@@ -10,4 +10,4 @@ void registerKeyConstants(HSQUIRRELVM vm);
 void registerInputBindings(HSQUIRRELVM vm);
 
 } // namespace sq
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/include/easy2d/script/sq_binding_node.h b/Extra2D/include/extra2d/script/sq_binding_node.h
similarity index 77%
rename from Easy2D/include/easy2d/script/sq_binding_node.h
rename to Extra2D/include/extra2d/script/sq_binding_node.h
index 5e3f174..69505e3 100644
--- a/Easy2D/include/easy2d/script/sq_binding_node.h
+++ b/Extra2D/include/extra2d/script/sq_binding_node.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <easy2d/script/sq_binding.h>
+#include <extra2d/script/sq_binding.h>
 
-namespace easy2d {
+namespace extra2d {
 namespace sq {
 
 void registerNode(HSQUIRRELVM vm);
@@ -13,4 +13,4 @@ void registerApplication(HSQUIRRELVM vm);
 void registerNodeBindings(HSQUIRRELVM vm);
 
 } // namespace sq
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/script/sq_binding_types.h b/Extra2D/include/extra2d/script/sq_binding_types.h
new file mode 100644
index 0000000..63a24ee
--- /dev/null
+++ b/Extra2D/include/extra2d/script/sq_binding_types.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <extra2d/core/color.h>
+#include <extra2d/core/math_types.h>
+#include <extra2d/script/sq_binding.h>
+
+namespace extra2d {
+namespace sq {
+
+// SqClassName specializations for value types
+template <> struct SqClassName<Vec2> {
+  static const char *name() { return "Vec2"; }
+};
+template <> struct SqClassName<Size> {
+  static const char *name() { return "Size"; }
+};
+template <> struct SqClassName<Rect> {
+  static const char *name() { return "Rect"; }
+};
+template <> struct SqClassName<Color> {
+  static const char *name() { return "Color"; }
+};
+
+void registerVec2(HSQUIRRELVM vm);
+void registerSize(HSQUIRRELVM vm);
+void registerRect(HSQUIRRELVM vm);
+void registerColor(HSQUIRRELVM vm);
+void registerValueTypes(HSQUIRRELVM vm);
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/spatial/quadtree.h b/Extra2D/include/extra2d/spatial/quadtree.h
new file mode 100644
index 0000000..0b021b8
--- /dev/null
+++ b/Extra2D/include/extra2d/spatial/quadtree.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <array>
+#include <extra2d/spatial/spatial_index.h>
+
+namespace extra2d {
+
+class QuadTree : public ISpatialIndex {
+public:
+  static constexpr int MAX_OBJECTS = 10;
+  static constexpr int MAX_LEVELS = 5;
+
+  struct QuadTreeNode {
+    Rect bounds;
+    int level;
+    std::vector<std::pair<Node *, Rect>> objects;
+    std::array<std::unique_ptr<QuadTreeNode>, 4> children;
+
+    QuadTreeNode(const Rect &bounds, int level);
+    bool contains(const Rect &rect) const;
+    bool intersects(const Rect &rect) const;
+  };
+
+  explicit QuadTree(const Rect &worldBounds);
+  ~QuadTree() override = default;
+
+  void insert(Node *node, const Rect &bounds) override;
+  void remove(Node *node) override;
+  void update(Node *node, const Rect &newBounds) override;
+
+  std::vector<Node *> query(const Rect &area) const override;
+  std::vector<Node *> query(const Vec2 &point) const override;
+  std::vector<std::pair<Node *, Node *>> queryCollisions() const override;
+
+  void clear() override;
+  size_t size() const override;
+  bool empty() const override;
+
+  void rebuild() override;
+
+private:
+  void split(QuadTreeNode *node);
+  void insertIntoNode(QuadTreeNode *node, Node *object, const Rect &bounds);
+  void queryNode(const QuadTreeNode *node, const Rect &area,
+                 std::vector<Node *> &results) const;
+  void queryNode(const QuadTreeNode *node, const Vec2 &point,
+                 std::vector<Node *> &results) const;
+  void
+  collectCollisions(const QuadTreeNode *node,
+                    std::vector<std::pair<Node *, Node *>> &collisions) const;
+  bool removeFromNode(QuadTreeNode *node, Node *object);
+
+  std::unique_ptr<QuadTreeNode> root_;
+  Rect worldBounds_;
+  size_t objectCount_ = 0;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/spatial/spatial_hash.h b/Extra2D/include/extra2d/spatial/spatial_hash.h
new file mode 100644
index 0000000..de22563
--- /dev/null
+++ b/Extra2D/include/extra2d/spatial/spatial_hash.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <extra2d/spatial/spatial_index.h>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace extra2d {
+
+class SpatialHash : public ISpatialIndex {
+public:
+  using CellKey = std::pair<int64_t, int64_t>;
+
+  struct CellKeyHash {
+    size_t operator()(const CellKey &key) const {
+      return std::hash<int64_t>()(key.first) ^
+             (std::hash<int64_t>()(key.second) << 1);
+    }
+  };
+
+  explicit SpatialHash(float cellSize = 64.0f);
+  ~SpatialHash() override = default;
+
+  void insert(Node *node, const Rect &bounds) override;
+  void remove(Node *node) override;
+  void update(Node *node, const Rect &newBounds) override;
+
+  std::vector<Node *> query(const Rect &area) const override;
+  std::vector<Node *> query(const Vec2 &point) const override;
+  std::vector<std::pair<Node *, Node *>> queryCollisions() const override;
+
+  void clear() override;
+  size_t size() const override;
+  bool empty() const override;
+
+  void rebuild() override;
+
+  void setCellSize(float cellSize);
+  float getCellSize() const { return cellSize_; }
+
+private:
+  CellKey getCellKey(float x, float y) const;
+  void getCellsForRect(const Rect &rect, std::vector<CellKey> &cells) const;
+  void insertIntoCells(Node *node, const Rect &bounds);
+  void removeFromCells(Node *node, const Rect &bounds);
+
+  float cellSize_;
+  std::unordered_map<CellKey, std::unordered_set<Node *>, CellKeyHash> grid_;
+  std::unordered_map<Node *, Rect> objectBounds_;
+  size_t objectCount_ = 0;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/spatial/spatial_index.h b/Extra2D/include/extra2d/spatial/spatial_index.h
new file mode 100644
index 0000000..a8e33dd
--- /dev/null
+++ b/Extra2D/include/extra2d/spatial/spatial_index.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <extra2d/core/math_types.h>
+#include <extra2d/core/types.h>
+#include <memory>
+#include <vector>
+
+namespace extra2d {
+
+class Node;
+
+enum class SpatialStrategy { Auto, QuadTree, SpatialHash };
+
+struct SpatialQueryResult {
+  Node *node;
+  Rect bounds;
+};
+
+class ISpatialIndex {
+public:
+  virtual ~ISpatialIndex() = default;
+
+  virtual void insert(Node *node, const Rect &bounds) = 0;
+  virtual void remove(Node *node) = 0;
+  virtual void update(Node *node, const Rect &newBounds) = 0;
+
+  virtual std::vector<Node *> query(const Rect &area) const = 0;
+  virtual std::vector<Node *> query(const Vec2 &point) const = 0;
+  virtual std::vector<std::pair<Node *, Node *>> queryCollisions() const = 0;
+
+  virtual void clear() = 0;
+  virtual size_t size() const = 0;
+  virtual bool empty() const = 0;
+
+  virtual void rebuild() = 0;
+};
+
+using SpatialIndexPtr = std::unique_ptr<ISpatialIndex>;
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/spatial/spatial_manager.h b/Extra2D/include/extra2d/spatial/spatial_manager.h
new file mode 100644
index 0000000..ad6ddad
--- /dev/null
+++ b/Extra2D/include/extra2d/spatial/spatial_manager.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include <extra2d/spatial/spatial_index.h>
+#include <functional>
+#include <memory>
+
+namespace extra2d {
+
+class SpatialManager {
+public:
+  using QueryCallback = std::function<bool(Node *)>;
+
+  SpatialManager();
+  explicit SpatialManager(const Rect &worldBounds);
+  ~SpatialManager() = default;
+
+  void setStrategy(SpatialStrategy strategy);
+  void setAutoThresholds(size_t quadTreeThreshold, size_t hashThreshold);
+
+  void setWorldBounds(const Rect &bounds);
+  Rect getWorldBounds() const { return worldBounds_; }
+
+  void insert(Node *node, const Rect &bounds);
+  void remove(Node *node);
+  void update(Node *node, const Rect &newBounds);
+
+  std::vector<Node *> query(const Rect &area) const;
+  std::vector<Node *> query(const Vec2 &point) const;
+  std::vector<std::pair<Node *, Node *>> queryCollisions() const;
+
+  void query(const Rect &area, const QueryCallback &callback) const;
+  void query(const Vec2 &point, const QueryCallback &callback) const;
+
+  void clear();
+  size_t size() const;
+  bool empty() const;
+
+  void rebuild();
+  void optimize();
+
+  SpatialStrategy getCurrentStrategy() const;
+  const char *getStrategyName() const;
+
+  static std::unique_ptr<ISpatialIndex> createIndex(SpatialStrategy strategy,
+                                                    const Rect &bounds);
+
+private:
+  void selectOptimalStrategy();
+
+  SpatialStrategy currentStrategy_ = SpatialStrategy::Auto;
+  SpatialStrategy activeStrategy_ = SpatialStrategy::QuadTree;
+  std::unique_ptr<ISpatialIndex> index_;
+  Rect worldBounds_;
+
+  size_t quadTreeThreshold_ = 1000;
+  size_t hashThreshold_ = 5000;
+
+  mutable size_t queryCount_ = 0;
+  mutable size_t totalQueryTime_ = 0;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/ui/button.h b/Extra2D/include/extra2d/ui/button.h
new file mode 100644
index 0000000..7d1d822
--- /dev/null
+++ b/Extra2D/include/extra2d/ui/button.h
@@ -0,0 +1,175 @@
+#pragma once
+
+#include <extra2d/graphics/font.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/platform/window.h>
+#include <extra2d/ui/widget.h>
+
+namespace extra2d {
+
+// 图片缩放模式
+enum class ImageScaleMode {
+  Original, // 使用原图大小
+  Stretch,  // 拉伸填充
+  ScaleFit, // 等比缩放，保持完整显示
+  ScaleFill // 等比缩放，填充整个区域（可能裁剪）
+};
+
+// ============================================================================
+// 基础按钮类
+// ============================================================================
+class Button : public Widget {
+public:
+  Button();
+  ~Button() override = default;
+
+  static Ptr<Button> create();
+
+  void setText(const String &text);
+  const String &getText() const { return text_; }
+
+  void setFont(Ptr<FontAtlas> font);
+  Ptr<FontAtlas> getFont() const { return font_; }
+
+  void setPadding(const Vec2 &padding);
+  Vec2 getPadding() const { return padding_; }
+
+  void setTextColor(const Color &color);
+  Color getTextColor() const { return textColor_; }
+
+  // 纯色背景设置
+  void setBackgroundColor(const Color &normal, const Color &hover,
+                          const Color &pressed);
+  void setBorder(const Color &color, float width);
+
+  // 图片背景设置
+  void setBackgroundImage(Ptr<Texture> normal, Ptr<Texture> hover = nullptr,
+                          Ptr<Texture> pressed = nullptr);
+  void setBackgroundImageScaleMode(ImageScaleMode mode);
+  void setCustomSize(const Vec2 &size);
+  void setCustomSize(float width, float height);
+
+  // 圆角矩形设置
+  void setCornerRadius(float radius);
+  float getCornerRadius() const { return cornerRadius_; }
+  void setRoundedCornersEnabled(bool enabled);
+  bool isRoundedCornersEnabled() const { return roundedCornersEnabled_; }
+
+  // 鼠标光标设置（悬停时显示的光标形状）
+  void setHoverCursor(CursorShape cursor);
+  CursorShape getHoverCursor() const { return hoverCursor_; }
+
+  // Alpha遮罩点击检测（用于不规则形状按钮）
+  void setUseAlphaMaskForHitTest(bool enabled);
+  bool isUseAlphaMaskForHitTest() const { return useAlphaMaskForHitTest_; }
+
+  void setOnClick(Function<void()> callback);
+
+protected:
+  void onDraw(RenderBackend &renderer) override;
+  void drawBackgroundImage(RenderBackend &renderer, const Rect &rect);
+  void drawRoundedRect(RenderBackend &renderer, const Rect &rect,
+                       const Color &color, float radius);
+  void fillRoundedRect(RenderBackend &renderer, const Rect &rect,
+                       const Color &color, float radius);
+  Vec2 calculateImageSize(const Vec2 &buttonSize, const Vec2 &imageSize);
+
+  // 状态访问（供子类使用）
+  bool isHovered() const { return hovered_; }
+  bool isPressed() const { return pressed_; }
+
+private:
+  String text_;
+  Ptr<FontAtlas> font_;
+  Vec2 padding_ = Vec2(10.0f, 6.0f);
+
+  // 文字颜色
+  Color textColor_ = Colors::White;
+
+  // 纯色背景
+  Color bgNormal_ = Color(0.2f, 0.2f, 0.2f, 1.0f);
+  Color bgHover_ = Color(0.28f, 0.28f, 0.28f, 1.0f);
+  Color bgPressed_ = Color(0.15f, 0.15f, 0.15f, 1.0f);
+
+  // 图片背景
+  Ptr<Texture> imgNormal_;
+  Ptr<Texture> imgHover_;
+  Ptr<Texture> imgPressed_;
+  ImageScaleMode scaleMode_ = ImageScaleMode::Original;
+  bool useImageBackground_ = false;
+
+  // 边框
+  Color borderColor_ = Color(0.6f, 0.6f, 0.6f, 1.0f);
+  float borderWidth_ = 1.0f;
+
+  // 圆角矩形
+  float cornerRadius_ = 8.0f;          // 圆角半径
+  bool roundedCornersEnabled_ = false; // 默认关闭
+
+  // 鼠标光标
+  CursorShape hoverCursor_ = CursorShape::Hand; // 悬停时默认显示手型光标
+  bool cursorChanged_ = false;                  // 标记是否已改变光标
+
+  // Alpha遮罩点击检测（用于不规则形状按钮）
+  bool useAlphaMaskForHitTest_ = false; // 默认关闭
+
+  bool hovered_ = false;
+  bool pressed_ = false;
+
+  Function<void()> onClick_;
+};
+
+// ============================================================================
+// 切换按钮 - 点击切换两种状态（支持图片和文字）
+// ============================================================================
+class ToggleImageButton : public Button {
+public:
+  ToggleImageButton();
+  ~ToggleImageButton() override = default;
+
+  static Ptr<ToggleImageButton> create();
+
+  // 设置两种状态的图片
+  void setStateImages(Ptr<Texture> stateOffNormal, Ptr<Texture> stateOnNormal,
+                      Ptr<Texture> stateOffHover = nullptr,
+                      Ptr<Texture> stateOnHover = nullptr,
+                      Ptr<Texture> stateOffPressed = nullptr,
+                      Ptr<Texture> stateOnPressed = nullptr);
+
+  // 设置两种状态的文字
+  void setStateText(const String &textOff, const String &textOn);
+
+  // 设置两种状态的文字颜色
+  void setStateTextColor(const Color &colorOff, const Color &colorOn);
+
+  // 获取/设置当前状态
+  bool isOn() const { return isOn_; }
+  void setOn(bool on);
+  void toggle();
+
+  // 设置状态改变回调
+  void setOnStateChange(Function<void(bool)> callback);
+
+protected:
+  void onDraw(RenderBackend &renderer) override;
+
+private:
+  // 状态图片
+  Ptr<Texture> imgOffNormal_, imgOnNormal_;
+  Ptr<Texture> imgOffHover_, imgOnHover_;
+  Ptr<Texture> imgOffPressed_, imgOnPressed_;
+
+  // 状态文字
+  String textOff_, textOn_;
+  bool useStateText_ = false;
+
+  // 状态文字颜色
+  Color textColorOff_ = Colors::White;
+  Color textColorOn_ = Colors::White;
+  bool useStateTextColor_ = false;
+
+  bool isOn_ = false;
+  Function<void(bool)> onStateChange_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/ui/widget.h b/Extra2D/include/extra2d/ui/widget.h
new file mode 100644
index 0000000..90ce8c6
--- /dev/null
+++ b/Extra2D/include/extra2d/ui/widget.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <extra2d/scene/node.h>
+
+namespace extra2d {
+
+class Widget : public Node {
+public:
+  Widget();
+  ~Widget() override = default;
+
+  void setSize(const Size &size);
+  void setSize(float width, float height);
+  Size getSize() const { return size_; }
+
+  Rect getBoundingBox() const override;
+
+private:
+  Size size_ = Size::Zero();
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/utils/data.h b/Extra2D/include/extra2d/utils/data.h
new file mode 100644
index 0000000..da678c9
--- /dev/null
+++ b/Extra2D/include/extra2d/utils/data.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <string>
+
+namespace extra2d {
+
+// ============================================================================
+// DataStore 类 - INI 文件数据持久化
+// ============================================================================
+class DataStore {
+public:
+  DataStore();
+  ~DataStore();
+
+  /// 加载 INI 文件
+  bool load(const std::string &filename);
+
+  /// 保存到 INI 文件
+  bool save(const std::string &filename);
+
+  /// 获取字符串值
+  std::string getString(const std::string &section, const std::string &key,
+                        const std::string &defaultValue = "");
+
+  /// 获取整数值
+  int getInt(const std::string &section, const std::string &key,
+             int defaultValue = 0);
+
+  /// 获取浮点数值
+  float getFloat(const std::string &section, const std::string &key,
+                 float defaultValue = 0.0f);
+
+  /// 获取布尔值
+  bool getBool(const std::string &section, const std::string &key,
+               bool defaultValue = false);
+
+  /// 设置字符串值
+  void setString(const std::string &section, const std::string &key,
+                 const std::string &value);
+
+  /// 设置整数值
+  void setInt(const std::string &section, const std::string &key, int value);
+
+  /// 设置浮点数值
+  void setFloat(const std::string &section, const std::string &key,
+                float value);
+
+  /// 设置布尔值
+  void setBool(const std::string &section, const std::string &key, bool value);
+
+  /// 删除键
+  void removeKey(const std::string &section, const std::string &key);
+
+  /// 删除整个 section
+  void removeSection(const std::string &section);
+
+  /// 检查键是否存在
+  bool hasKey(const std::string &section, const std::string &key);
+
+  /// 检查 section 是否存在
+  bool hasSection(const std::string &section);
+
+  /// 清除所有数据
+  void clear();
+
+  /// 获取当前文件名
+  const std::string &getFilename() const { return filename_; }
+
+private:
+  class Impl;
+  UniquePtr<Impl> impl_;
+  std::string filename_;
+};
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/utils/logger.h b/Extra2D/include/extra2d/utils/logger.h
new file mode 100644
index 0000000..b93344e
--- /dev/null
+++ b/Extra2D/include/extra2d/utils/logger.h
@@ -0,0 +1,263 @@
+#pragma once
+
+#include <cstdarg>
+#include <cstdio>
+#include <extra2d/core/types.h>
+#include <sstream>
+#include <string>
+#include <type_traits>
+
+namespace extra2d {
+
+// ============================================================================
+// 日志级别枚举
+// ============================================================================
+enum class LogLevel {
+  Trace = 0,
+  Debug = 1,
+  Info = 2,
+  Warn = 3,
+  Error = 4,
+  Fatal = 5,
+  Off = 6
+};
+
+// ============================================================================
+// 简单的 fmt-style {} 格式化器
+// ============================================================================
+namespace detail {
+
+// 将单个参数转为字符串
+template <typename T> inline std::string to_string_arg(const T &value) {
+  if constexpr (std::is_same_v<T, std::string>) {
+    return value;
+  } else if constexpr (std::is_same_v<T, const char *> ||
+                       std::is_same_v<T, char *>) {
+    return value ? std::string(value) : std::string("(null)");
+  } else if constexpr (std::is_same_v<T, bool>) {
+    return value ? "true" : "false";
+  } else if constexpr (std::is_arithmetic_v<T>) {
+    // 对浮点数使用特殊格式
+    if constexpr (std::is_floating_point_v<T>) {
+      char buf[64];
+      snprintf(buf, sizeof(buf), "%.2f", static_cast<double>(value));
+      return buf;
+    } else {
+      return std::to_string(value);
+    }
+  } else {
+    std::ostringstream oss;
+    oss << value;
+    return oss.str();
+  }
+}
+
+// 格式化基础情况：没有更多参数
+inline std::string format_impl(const char *fmt) {
+  std::string result;
+  while (*fmt) {
+    if (*fmt == '{' && *(fmt + 1) == '}') {
+      result += "{}"; // 无参数可替换，保留原样
+      fmt += 2;
+    } else {
+      result += *fmt;
+      ++fmt;
+    }
+  }
+  return result;
+}
+
+// 格式化递归：替换第一个 {} 并递归处理剩余
+template <typename T, typename... Args>
+inline std::string format_impl(const char *fmt, const T &first,
+                               const Args &...rest) {
+  std::string result;
+  while (*fmt) {
+    if (*fmt == '{') {
+      // 检查 {:#x} 等格式说明符
+      if (*(fmt + 1) == '}') {
+        result += to_string_arg(first);
+        fmt += 2;
+        result += format_impl(fmt, rest...);
+        return result;
+      } else if (*(fmt + 1) == ':') {
+        // 跳过格式说明符直到 }
+        const char *end = fmt + 2;
+        while (*end && *end != '}')
+          ++end;
+        if (*end == '}') {
+          // 检查是否是十六进制格式
+          std::string spec(fmt + 2, end);
+          if (spec.find('x') != std::string::npos ||
+              spec.find('X') != std::string::npos) {
+            if constexpr (std::is_integral_v<T>) {
+              char buf[32];
+              snprintf(buf, sizeof(buf), "0x%x",
+                       static_cast<unsigned int>(first));
+              result += buf;
+            } else {
+              result += to_string_arg(first);
+            }
+          } else if (spec.find('f') != std::string::npos ||
+                     spec.find('.') != std::string::npos) {
+            if constexpr (std::is_arithmetic_v<T>) {
+              // 解析精度
+              int precision = 2;
+              auto dot = spec.find('.');
+              if (dot != std::string::npos) {
+                precision = 0;
+                for (size_t i = dot + 1;
+                     i < spec.size() && spec[i] >= '0' && spec[i] <= '9'; ++i) {
+                  precision = precision * 10 + (spec[i] - '0');
+                }
+              }
+              char fmtbuf[16];
+              snprintf(fmtbuf, sizeof(fmtbuf), "%%.%df", precision);
+              char buf[64];
+              snprintf(buf, sizeof(buf), fmtbuf, static_cast<double>(first));
+              result += buf;
+            } else {
+              result += to_string_arg(first);
+            }
+          } else {
+            result += to_string_arg(first);
+          }
+          fmt = end + 1;
+          result += format_impl(fmt, rest...);
+          return result;
+        }
+      }
+    }
+    result += *fmt;
+    ++fmt;
+  }
+  return result;
+}
+
+} // namespace detail
+
+// 顶层格式化函数
+template <typename... Args>
+inline std::string e2d_format(const char *fmt, const Args &...args) {
+  return detail::format_impl(fmt, args...);
+}
+
+// 无参数版本
+inline std::string e2d_format(const char *fmt) { return std::string(fmt); }
+
+// ============================================================================
+// Logger 类 - 简单 printf 日志
+// ============================================================================
+class Logger {
+public:
+  static void init();
+  static void shutdown();
+  static void setLevel(LogLevel level);
+  static void setConsoleOutput(bool enable);
+  static void setFileOutput(const std::string &filename);
+
+  static LogLevel getLevel() { return level_; }
+
+  template <typename... Args>
+  static void log(LogLevel level, const char *fmt, const Args &...args) {
+    if (level < level_)
+      return;
+    std::string msg = e2d_format(fmt, args...);
+    const char *levelStr = "";
+    switch (level) {
+    case LogLevel::Trace:
+      levelStr = "TRACE";
+      break;
+    case LogLevel::Debug:
+      levelStr = "DEBUG";
+      break;
+    case LogLevel::Info:
+      levelStr = "INFO ";
+      break;
+    case LogLevel::Warn:
+      levelStr = "WARN ";
+      break;
+    case LogLevel::Error:
+      levelStr = "ERROR";
+      break;
+    case LogLevel::Fatal:
+      levelStr = "FATAL";
+      break;
+    default:
+      break;
+    }
+    printf("[%s] %s\n", levelStr, msg.c_str());
+  }
+
+  // 无参数版本
+  static void log(LogLevel level, const char *msg) {
+    if (level < level_)
+      return;
+    const char *levelStr = "";
+    switch (level) {
+    case LogLevel::Trace:
+      levelStr = "TRACE";
+      break;
+    case LogLevel::Debug:
+      levelStr = "DEBUG";
+      break;
+    case LogLevel::Info:
+      levelStr = "INFO ";
+      break;
+    case LogLevel::Warn:
+      levelStr = "WARN ";
+      break;
+    case LogLevel::Error:
+      levelStr = "ERROR";
+      break;
+    case LogLevel::Fatal:
+      levelStr = "FATAL";
+      break;
+    default:
+      break;
+    }
+    printf("[%s] %s\n", levelStr, msg);
+  }
+
+private:
+  static LogLevel level_;
+  static bool initialized_;
+};
+
+// ============================================================================
+// 日志宏
+// ============================================================================
+
+#ifdef E2D_DEBUG
+#define E2D_LOG_TRACE(...)                                                     \
+  ::extra2d::Logger::log(::extra2d::LogLevel::Trace, __VA_ARGS__)
+#define E2D_LOG_DEBUG(...)                                                     \
+  ::extra2d::Logger::log(::extra2d::LogLevel::Debug, __VA_ARGS__)
+#else
+#define E2D_LOG_TRACE(...)
+#define E2D_LOG_DEBUG(...)
+#endif
+
+#define E2D_LOG_INFO(...)                                                      \
+  ::extra2d::Logger::log(::extra2d::LogLevel::Info, __VA_ARGS__)
+#define E2D_LOG_WARN(...)                                                      \
+  ::extra2d::Logger::log(::extra2d::LogLevel::Warn, __VA_ARGS__)
+#define E2D_LOG_ERROR(...)                                                     \
+  ::extra2d::Logger::log(::extra2d::LogLevel::Error, __VA_ARGS__)
+#define E2D_LOG_FATAL(...)                                                     \
+  ::extra2d::Logger::log(::extra2d::LogLevel::Fatal, __VA_ARGS__)
+
+// 简化的日志宏
+#define E2D_INFO(...) E2D_LOG_INFO(__VA_ARGS__)
+#define E2D_WARN(...) E2D_LOG_WARN(__VA_ARGS__)
+#define E2D_ERROR(...) E2D_LOG_ERROR(__VA_ARGS__)
+#define E2D_FATAL(...) E2D_LOG_FATAL(__VA_ARGS__)
+#ifdef E2D_DEBUG
+#define E2D_DEBUG_LOG(...) E2D_LOG_DEBUG(__VA_ARGS__)
+#define E2D_TRACE(...) E2D_LOG_TRACE(__VA_ARGS__)
+#else
+#define E2D_DEBUG_LOG(...)
+#define E2D_TRACE(...)
+#endif
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/utils/random.h b/Extra2D/include/extra2d/utils/random.h
new file mode 100644
index 0000000..3909059
--- /dev/null
+++ b/Extra2D/include/extra2d/utils/random.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include <extra2d/core/types.h>
+#include <random>
+
+namespace extra2d {
+
+// ============================================================================
+// Random 类 - 随机数生成器
+// ============================================================================
+class Random {
+public:
+  /// 获取单例实例
+  static Random &getInstance();
+
+  /// 设置随机种子
+  void setSeed(uint32 seed);
+
+  /// 使用当前时间作为种子
+  void randomize();
+
+  /// 获取 [0, 1) 范围内的随机浮点数
+  float getFloat();
+
+  /// 获取 [min, max] 范围内的随机浮点数
+  float getFloat(float min, float max);
+
+  /// 获取 [0, max] 范围内的随机整数
+  int getInt(int max);
+
+  /// 获取 [min, max] 范围内的随机整数
+  int getInt(int min, int max);
+
+  /// 获取随机布尔值
+  bool getBool();
+
+  /// 获取随机布尔值（带概率）
+  bool getBool(float probability);
+
+  /// 获取指定范围内的随机角度（弧度）
+  float getAngle();
+
+  /// 获取 [-1, 1] 范围内的随机数（用于方向）
+  float getSigned();
+
+private:
+  Random();
+  ~Random() = default;
+
+  Random(const Random &) = delete;
+  Random &operator=(const Random &) = delete;
+
+  std::mt19937 generator_;
+  std::uniform_real_distribution<float> floatDist_;
+};
+
+// ============================================================================
+// 便捷函数
+// ============================================================================
+
+/// 获取 [0, 1) 范围内的随机浮点数
+inline float randomFloat() { return Random::getInstance().getFloat(); }
+
+/// 获取 [min, max] 范围内的随机浮点数
+inline float randomFloat(float min, float max) {
+  return Random::getInstance().getFloat(min, max);
+}
+
+/// 获取 [0, max] 范围内的随机整数
+inline int randomInt(int max) { return Random::getInstance().getInt(max); }
+
+/// 获取 [min, max] 范围内的随机整数
+inline int randomInt(int min, int max) {
+  return Random::getInstance().getInt(min, max);
+}
+
+/// 获取随机布尔值
+inline bool randomBool() { return Random::getInstance().getBool(); }
+
+/// 获取随机布尔值（带概率）
+inline bool randomBool(float probability) {
+  return Random::getInstance().getBool(probability);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/include/extra2d/utils/timer.h b/Extra2D/include/extra2d/utils/timer.h
new file mode 100644
index 0000000..e220a8b
--- /dev/null
+++ b/Extra2D/include/extra2d/utils/timer.h
@@ -0,0 +1,99 @@
+#pragma once
+
+#include <chrono>
+#include <extra2d/core/types.h>
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace extra2d {
+
+// ============================================================================
+// Timer 类 - 单次/重复计时器
+// ============================================================================
+class Timer {
+public:
+  using Clock = std::chrono::steady_clock;
+  using TimePoint = Clock::time_point;
+  using Duration = Clock::duration;
+  using Callback = Function<void()>;
+
+  Timer(float interval, bool repeat, Callback callback);
+
+  /// 更新计时器，返回 true 如果触发了回调
+  bool update(float deltaTime);
+
+  /// 重置计时器
+  void reset();
+
+  /// 暂停计时器
+  void pause();
+
+  /// 恢复计时器
+  void resume();
+
+  /// 取消计时器（标记为无效）
+  void cancel();
+
+  /// 是否有效
+  bool isValid() const { return valid_; }
+
+  /// 是否暂停
+  bool isPaused() const { return paused_; }
+
+  /// 获取剩余时间（秒）
+  float getRemaining() const;
+
+  /// 获取唯一ID
+  uint32 getId() const { return id_; }
+
+private:
+  uint32 id_;
+  float interval_;
+  float elapsed_;
+  bool repeat_;
+  bool paused_;
+  bool valid_;
+  Callback callback_;
+
+  static uint32 nextId_;
+};
+
+// ============================================================================
+// TimerManager 类 - 管理所有计时器
+// ============================================================================
+class TimerManager {
+public:
+  TimerManager() = default;
+  ~TimerManager() = default;
+
+  /// 创建单次计时器，返回计时器ID
+  uint32 addTimer(float delay, Timer::Callback callback);
+
+  /// 创建重复计时器，返回计时器ID
+  uint32 addRepeatingTimer(float interval, Timer::Callback callback);
+
+  /// 取消指定ID的计时器
+  void cancelTimer(uint32 timerId);
+
+  /// 暂停指定ID的计时器
+  void pauseTimer(uint32 timerId);
+
+  /// 恢复指定ID的计时器
+  void resumeTimer(uint32 timerId);
+
+  /// 更新所有计时器（每帧调用）
+  void update(float deltaTime);
+
+  /// 清除所有计时器
+  void clear();
+
+  /// 获取计时器数量
+  size_t getTimerCount() const { return timers_.size(); }
+
+private:
+  std::map<uint32, std::unique_ptr<Timer>> timers_;
+  std::vector<uint32> timersToRemove_;
+};
+
+} // namespace extra2d
diff --git a/Easy2D/include/json/json.hpp b/Extra2D/include/json/json.hpp
similarity index 100%
rename from Easy2D/include/json/json.hpp
rename to Extra2D/include/json/json.hpp
diff --git a/Easy2D/include/simpleini/SimpleIni.h b/Extra2D/include/simpleini/SimpleIni.h
similarity index 100%
rename from Easy2D/include/simpleini/SimpleIni.h
rename to Extra2D/include/simpleini/SimpleIni.h
diff --git a/Easy2D/include/stb/stb_image.h b/Extra2D/include/stb/stb_image.h
similarity index 100%
rename from Easy2D/include/stb/stb_image.h
rename to Extra2D/include/stb/stb_image.h
diff --git a/Easy2D/include/stb/stb_image_resize2.h b/Extra2D/include/stb/stb_image_resize2.h
similarity index 100%
rename from Easy2D/include/stb/stb_image_resize2.h
rename to Extra2D/include/stb/stb_image_resize2.h
diff --git a/Easy2D/include/stb/stb_image_write.h b/Extra2D/include/stb/stb_image_write.h
similarity index 100%
rename from Easy2D/include/stb/stb_image_write.h
rename to Extra2D/include/stb/stb_image_write.h
diff --git a/Easy2D/include/stb/stb_perlin.h b/Extra2D/include/stb/stb_perlin.h
similarity index 100%
rename from Easy2D/include/stb/stb_perlin.h
rename to Extra2D/include/stb/stb_perlin.h
diff --git a/Easy2D/include/stb/stb_rect_pack.h b/Extra2D/include/stb/stb_rect_pack.h
similarity index 100%
rename from Easy2D/include/stb/stb_rect_pack.h
rename to Extra2D/include/stb/stb_rect_pack.h
diff --git a/Easy2D/include/stb/stb_truetype.h b/Extra2D/include/stb/stb_truetype.h
similarity index 100%
rename from Easy2D/include/stb/stb_truetype.h
rename to Extra2D/include/stb/stb_truetype.h
diff --git a/Extra2D/src/action/action.cpp b/Extra2D/src/action/action.cpp
new file mode 100644
index 0000000..a8ddb79
--- /dev/null
+++ b/Extra2D/src/action/action.cpp
@@ -0,0 +1,68 @@
+#include "extra2d/action/action.h"
+#include "extra2d/scene/node.h"
+
+namespace extra2d {
+Action::Action() : elapsed_(0.0f), duration_(0.0f), speed_(1.0f), tag_(-1) {}
+
+void Action::start(Node *target) {
+  target_ = target;
+  originalTarget_ = target;
+  elapsed_ = 0.0f;
+  state_ = ActionState::Running;
+  onStart();
+}
+
+void Action::stop() {
+  target_ = nullptr;
+  state_ = ActionState::Completed;
+}
+
+void Action::update(float dt) {
+  if (state_ != ActionState::Running)
+    return;
+
+  step(dt);
+
+  if (isDone()) {
+    state_ = ActionState::Completed;
+    onComplete();
+    if (completionCallback_)
+      completionCallback_();
+  }
+}
+
+void Action::step(float dt) {
+  if (state_ != ActionState::Running)
+    return;
+
+  elapsed_ += dt * speed_;
+
+  float progress = 0.0f;
+  if (duration_ > 0.0f) {
+    progress = std::min(1.0f, elapsed_ / duration_);
+  } else {
+    progress = 1.0f;
+  }
+
+  if (progressCallback_)
+    progressCallback_(progress);
+
+  onUpdate(progress);
+}
+
+void Action::pause() {
+  if (state_ == ActionState::Running)
+    state_ = ActionState::Paused;
+}
+
+void Action::resume() {
+  if (state_ == ActionState::Paused)
+    state_ = ActionState::Running;
+}
+
+void Action::restart() {
+  elapsed_ = 0.0f;
+  state_ = ActionState::Running;
+  onStart();
+}
+} // namespace extra2d
diff --git a/Extra2D/src/action/actions.cpp b/Extra2D/src/action/actions.cpp
new file mode 100644
index 0000000..a94d244
--- /dev/null
+++ b/Extra2D/src/action/actions.cpp
@@ -0,0 +1,405 @@
+#include "extra2d/action/actions.h"
+#include "extra2d/scene/node.h"
+#include <algorithm>
+
+namespace extra2d {
+// IntervalAction
+IntervalAction::IntervalAction(float duration) { duration_ = duration; }
+
+bool IntervalAction::isDone() const { return elapsed_ >= duration_; }
+
+// InstantAction
+InstantAction::InstantAction() { duration_ = 0.0f; }
+
+bool InstantAction::isDone() const { return true; }
+
+// MoveBy
+MoveBy::MoveBy(float duration, const Vec2 &delta)
+    : IntervalAction(duration), delta_(delta) {}
+
+void MoveBy::onStart() { startPosition_ = target_->getPosition(); }
+
+void MoveBy::onUpdate(float progress) {
+  Vec2 newPos = startPosition_ + delta_ * progress;
+  target_->setPosition(newPos);
+}
+
+Action *MoveBy::clone() const { return new MoveBy(duration_, delta_); }
+
+Action *MoveBy::reverse() const { return new MoveBy(duration_, -delta_); }
+
+// MoveTo
+MoveTo::MoveTo(float duration, const Vec2 &position)
+    : IntervalAction(duration), endPosition_(position) {}
+
+void MoveTo::onStart() {
+  startPosition_ = target_->getPosition();
+  delta_ = endPosition_ - startPosition_;
+}
+
+void MoveTo::onUpdate(float progress) {
+  Vec2 newPos = startPosition_ + delta_ * progress;
+  target_->setPosition(newPos);
+}
+
+Action *MoveTo::clone() const { return new MoveTo(duration_, endPosition_); }
+
+Action *MoveTo::reverse() const {
+  return new MoveTo(duration_, startPosition_);
+}
+
+// ScaleBy
+ScaleBy::ScaleBy(float duration, float scale)
+    : IntervalAction(duration), deltaScale_(scale - 1.0f, scale - 1.0f) {}
+
+ScaleBy::ScaleBy(float duration, float scaleX, float scaleY)
+    : IntervalAction(duration), deltaScale_(scaleX - 1.0f, scaleY - 1.0f) {}
+
+ScaleBy::ScaleBy(float duration, const Vec2 &scale)
+    : IntervalAction(duration), deltaScale_(scale.x - 1.0f, scale.y - 1.0f) {}
+
+void ScaleBy::onStart() { startScale_ = target_->getScale(); }
+
+void ScaleBy::onUpdate(float progress) {
+  Vec2 newScale = startScale_ + deltaScale_ * progress;
+  target_->setScale(newScale);
+}
+
+Action *ScaleBy::clone() const {
+  return new ScaleBy(duration_, Vec2(startScale_.x + deltaScale_.x,
+                                     startScale_.y + deltaScale_.y));
+}
+
+Action *ScaleBy::reverse() const {
+  return new ScaleBy(duration_, Vec2(startScale_.x - deltaScale_.x,
+                                     startScale_.y - deltaScale_.y));
+}
+
+// ScaleTo
+ScaleTo::ScaleTo(float duration, float scale)
+    : IntervalAction(duration), endScale_(scale, scale) {}
+
+ScaleTo::ScaleTo(float duration, float scaleX, float scaleY)
+    : IntervalAction(duration), endScale_(scaleX, scaleY) {}
+
+ScaleTo::ScaleTo(float duration, const Vec2 &scale)
+    : IntervalAction(duration), endScale_(scale) {}
+
+void ScaleTo::onStart() {
+  startScale_ = target_->getScale();
+  delta_ = endScale_ - startScale_;
+}
+
+void ScaleTo::onUpdate(float progress) {
+  Vec2 newScale = startScale_ + delta_ * progress;
+  target_->setScale(newScale);
+}
+
+Action *ScaleTo::clone() const { return new ScaleTo(duration_, endScale_); }
+
+Action *ScaleTo::reverse() const { return new ScaleTo(duration_, startScale_); }
+
+// RotateBy
+RotateBy::RotateBy(float duration, float deltaAngle)
+    : IntervalAction(duration), deltaAngle_(deltaAngle) {}
+
+RotateBy::RotateBy(float duration, float deltaAngleX, float deltaAngleY)
+    : IntervalAction(duration), deltaAngle_(deltaAngleX) {
+  (void)deltaAngleY;
+}
+
+void RotateBy::onStart() { startAngle_ = target_->getRotation(); }
+
+void RotateBy::onUpdate(float progress) {
+  float newAngle = startAngle_ + deltaAngle_ * progress;
+  target_->setRotation(newAngle);
+}
+
+Action *RotateBy::clone() const { return new RotateBy(duration_, deltaAngle_); }
+
+Action *RotateBy::reverse() const {
+  return new RotateBy(duration_, -deltaAngle_);
+}
+
+// RotateTo
+RotateTo::RotateTo(float duration, float angle)
+    : IntervalAction(duration), endAngle_(angle) {}
+
+RotateTo::RotateTo(float duration, float angleX, float angleY)
+    : IntervalAction(duration), endAngle_(angleX) {
+  (void)angleY;
+}
+
+void RotateTo::onStart() {
+  startAngle_ = target_->getRotation();
+  deltaAngle_ = endAngle_ - startAngle_;
+
+  // Shortest path
+  if (deltaAngle_ > 180.0f)
+    deltaAngle_ -= 360.0f;
+  if (deltaAngle_ < -180.0f)
+    deltaAngle_ += 360.0f;
+}
+
+void RotateTo::onUpdate(float progress) {
+  float newAngle = startAngle_ + deltaAngle_ * progress;
+  target_->setRotation(newAngle);
+}
+
+Action *RotateTo::clone() const { return new RotateTo(duration_, endAngle_); }
+
+Action *RotateTo::reverse() const {
+  return new RotateTo(duration_, startAngle_);
+}
+
+// FadeIn
+FadeIn::FadeIn(float duration) : IntervalAction(duration) {}
+
+void FadeIn::onStart() {
+  startOpacity_ = target_->getOpacity();
+  target_->setOpacity(0.0f);
+}
+
+void FadeIn::onUpdate(float progress) { target_->setOpacity(progress); }
+
+Action *FadeIn::clone() const { return new FadeIn(duration_); }
+
+Action *FadeIn::reverse() const { return new FadeOut(duration_); }
+
+// FadeOut
+FadeOut::FadeOut(float duration) : IntervalAction(duration) {}
+
+void FadeOut::onStart() {
+  startOpacity_ = target_->getOpacity();
+  target_->setOpacity(1.0f);
+}
+
+void FadeOut::onUpdate(float progress) { target_->setOpacity(1.0f - progress); }
+
+Action *FadeOut::clone() const { return new FadeOut(duration_); }
+
+Action *FadeOut::reverse() const { return new FadeIn(duration_); }
+
+// FadeTo
+FadeTo::FadeTo(float duration, float opacity)
+    : IntervalAction(duration), endOpacity_(opacity) {}
+
+void FadeTo::onStart() {
+  startOpacity_ = target_->getOpacity();
+  deltaOpacity_ = endOpacity_ - startOpacity_;
+}
+
+void FadeTo::onUpdate(float progress) {
+  target_->setOpacity(startOpacity_ + deltaOpacity_ * progress);
+}
+
+Action *FadeTo::clone() const { return new FadeTo(duration_, endOpacity_); }
+
+Action *FadeTo::reverse() const { return new FadeTo(duration_, startOpacity_); }
+
+// Sequence
+Sequence::Sequence(const std::vector<Action *> &actions)
+    : IntervalAction(0.0f) {
+  for (auto *action : actions) {
+    if (action) {
+      actions_.push_back(action->clone());
+      duration_ += action->getDuration();
+    }
+  }
+}
+
+Sequence::~Sequence() {
+  for (auto *action : actions_)
+    delete action;
+}
+
+void Sequence::onStart() {
+  currentIndex_ = 0;
+  split_ = 0.0f;
+  last_ = -1.0f;
+
+  if (!actions_.empty()) {
+    actions_[0]->start(target_);
+  }
+}
+
+void Sequence::onUpdate(float progress) {
+  int found = 0;
+  float newTime = progress * duration_;
+
+  if (newTime < last_) {
+    // Rewind
+    for (auto *action : actions_) {
+      action->stop();
+    }
+  }
+
+  last_ = newTime;
+
+  for (size_t i = 0; i < actions_.size(); ++i) {
+    split_ += actions_[i]->getDuration();
+
+    if (split_ > newTime) {
+      found = static_cast<int>(i);
+      break;
+    } else if (split_ == newTime) {
+      found = static_cast<int>(i) + 1;
+      break;
+    }
+  }
+
+  if (found != currentIndex_) {
+    if (currentIndex_ >= 0 &&
+        currentIndex_ < static_cast<int>(actions_.size())) {
+      actions_[currentIndex_]->update(actions_[currentIndex_]->getDuration());
+    }
+
+    if (found >= 0 && found < static_cast<int>(actions_.size())) {
+      actions_[found]->start(target_);
+    }
+
+    currentIndex_ = found;
+  }
+
+  if (currentIndex_ >= 0 && currentIndex_ < static_cast<int>(actions_.size())) {
+    float localProgress = 0.0f;
+    if (actions_[currentIndex_]->getDuration() > 0.0f) {
+      localProgress =
+          (newTime - (split_ - actions_[currentIndex_]->getDuration())) /
+          actions_[currentIndex_]->getDuration();
+    }
+    actions_[currentIndex_]->step(actions_[currentIndex_]->getDuration() *
+                                  localProgress);
+  }
+}
+
+Action *Sequence::clone() const { return new Sequence(actions_); }
+
+Action *Sequence::reverse() const {
+  std::vector<Action *> rev;
+  for (auto it = actions_.rbegin(); it != actions_.rend(); ++it) {
+    rev.push_back((*it)->reverse());
+  }
+  return new Sequence(rev);
+}
+
+// Spawn
+Spawn::Spawn(const std::vector<Action *> &actions) : IntervalAction(0.0f) {
+  for (auto *action : actions) {
+    if (action) {
+      actions_.push_back(action->clone());
+      duration_ = std::max(duration_, action->getDuration());
+    }
+  }
+}
+
+Spawn::~Spawn() {
+  for (auto *action : actions_)
+    delete action;
+}
+
+void Spawn::onStart() {
+  for (auto *action : actions_) {
+    action->start(target_);
+  }
+}
+
+void Spawn::onUpdate(float progress) {
+  for (auto *action : actions_) {
+    float localProgress = 0.0f;
+    if (action->getDuration() > 0.0f) {
+      localProgress =
+          std::min(1.0f, (progress * duration_) / action->getDuration());
+    } else {
+      localProgress = 1.0f;
+    }
+    action->step(action->getDuration() * localProgress);
+  }
+}
+
+Action *Spawn::clone() const { return new Spawn(actions_); }
+
+Action *Spawn::reverse() const {
+  std::vector<Action *> rev;
+  for (auto *action : actions_) {
+    rev.push_back(action->reverse());
+  }
+  return new Spawn(rev);
+}
+
+// Loop
+Loop::Loop(Action *action, int times)
+    : action_(action ? action->clone() : nullptr), times_(times),
+      currentTimes_(0) {
+  if (action_) {
+    duration_ = times < 0 ? -1.0f : action_->getDuration() * times;
+  }
+}
+
+Loop::~Loop() { delete action_; }
+
+bool Loop::isDone() const {
+  if (times_ < 0)
+    return false;
+  return currentTimes_ >= times_;
+}
+
+void Loop::onStart() {
+  currentTimes_ = 0;
+  if (action_) {
+    action_->start(target_);
+  }
+}
+
+void Loop::onUpdate(float progress) {
+  if (!action_)
+    return;
+
+  float actionDuration = action_->getDuration();
+  float dt = progress * duration_ - elapsed_;
+
+  while (dt > 0.0f) {
+    float localProgress = std::min(1.0f, dt / actionDuration);
+    action_->step(actionDuration * localProgress);
+
+    if (action_->isDone()) {
+      currentTimes_++;
+      if (times_ > 0 && currentTimes_ >= times_)
+        break;
+      action_->restart();
+    }
+
+    dt -= actionDuration;
+  }
+}
+
+Action *Loop::clone() const { return new Loop(action_, times_); }
+
+Action *Loop::reverse() const {
+  return new Loop(action_ ? action_->reverse() : nullptr, times_);
+}
+
+// Delay
+Delay::Delay(float duration) : IntervalAction(duration) {}
+
+void Delay::onUpdate(float progress) {
+  // No update needed, just wait
+}
+
+Action *Delay::clone() const { return new Delay(duration_); }
+
+Action *Delay::reverse() const { return new Delay(duration_); }
+
+// CallFunc
+CallFunc::CallFunc(Callback callback) : callback_(std::move(callback)) {}
+
+void CallFunc::onUpdate(float progress) {
+  (void)progress;
+  if (callback_)
+    callback_();
+}
+
+Action *CallFunc::clone() const { return new CallFunc(callback_); }
+
+Action *CallFunc::reverse() const { return new CallFunc(callback_); }
+} // namespace extra2d
diff --git a/Extra2D/src/action/ease.cpp b/Extra2D/src/action/ease.cpp
new file mode 100644
index 0000000..4a819fb
--- /dev/null
+++ b/Extra2D/src/action/ease.cpp
@@ -0,0 +1,179 @@
+#include <cmath>
+#include <extra2d/action/ease.h>
+
+namespace extra2d {
+// Linear
+float easeLinear(float t) { return t; }
+
+// Quadratic
+float easeInQuad(float t) { return t * t; }
+
+float easeOutQuad(float t) { return 1.0f - (1.0f - t) * (1.0f - t); }
+
+float easeInOutQuad(float t) {
+  return t < 0.5f ? 2.0f * t * t
+                  : 1.0f - std::pow(-2.0f * t + 2.0f, 2.0f) / 2.0f;
+}
+
+// Cubic
+float easeInCubic(float t) { return t * t * t; }
+
+float easeOutCubic(float t) { return 1.0f - std::pow(1.0f - t, 3.0f); }
+
+float easeInOutCubic(float t) {
+  return t < 0.5f ? 4.0f * t * t * t
+                  : 1.0f - std::pow(-2.0f * t + 2.0f, 3.0f) / 2.0f;
+}
+
+// Quartic
+float easeInQuart(float t) { return t * t * t * t; }
+
+float easeOutQuart(float t) { return 1.0f - std::pow(1.0f - t, 4.0f); }
+
+float easeInOutQuart(float t) {
+  return t < 0.5f ? 8.0f * t * t * t * t
+                  : 1.0f - std::pow(-2.0f * t + 2.0f, 4.0f) / 2.0f;
+}
+
+// Quintic
+float easeInQuint(float t) { return t * t * t * t * t; }
+
+float easeOutQuint(float t) { return 1.0f - std::pow(1.0f - t, 5.0f); }
+
+float easeInOutQuint(float t) {
+  return t < 0.5f ? 16.0f * t * t * t * t * t
+                  : 1.0f - std::pow(-2.0f * t + 2.0f, 5.0f) / 2.0f;
+}
+
+// Sine
+float easeInSine(float t) {
+  return 1.0f - std::cos((t * 3.14159265359f) / 2.0f);
+}
+
+float easeOutSine(float t) { return std::sin((t * 3.14159265359f) / 2.0f); }
+
+float easeInOutSine(float t) {
+  return -(std::cos(3.14159265359f * t) - 1.0f) / 2.0f;
+}
+
+// Exponential
+float easeInExpo(float t) {
+  return t == 0.0f ? 0.0f : std::pow(2.0f, 10.0f * (t - 1.0f));
+}
+
+float easeOutExpo(float t) {
+  return t == 1.0f ? 1.0f : 1.0f - std::pow(2.0f, -10.0f * t);
+}
+
+float easeInOutExpo(float t) {
+  if (t == 0.0f)
+    return 0.0f;
+  if (t == 1.0f)
+    return 1.0f;
+  return t < 0.5f ? std::pow(2.0f, 20.0f * t - 10.0f) / 2.0f
+                  : (2.0f - std::pow(2.0f, -20.0f * t + 10.0f)) / 2.0f;
+}
+
+// Circular
+float easeInCirc(float t) { return 1.0f - std::sqrt(1.0f - std::pow(t, 2.0f)); }
+
+float easeOutCirc(float t) {
+  return std::sqrt(1.0f - std::pow(t - 1.0f, 2.0f));
+}
+
+float easeInOutCirc(float t) {
+  return t < 0.5f
+             ? (1.0f - std::sqrt(1.0f - std::pow(2.0f * t, 2.0f))) / 2.0f
+             : (std::sqrt(1.0f - std::pow(-2.0f * t + 2.0f, 2.0f)) + 1.0f) /
+                   2.0f;
+}
+
+// Back
+float easeInBack(float t) {
+  const float c1 = 1.70158f;
+  const float c3 = c1 + 1.0f;
+  return c3 * t * t * t - c1 * t * t;
+}
+
+float easeOutBack(float t) {
+  const float c1 = 1.70158f;
+  const float c3 = c1 + 1.0f;
+  return 1.0f + c3 * std::pow(t - 1.0f, 3.0f) + c1 * std::pow(t - 1.0f, 2.0f);
+}
+
+float easeInOutBack(float t) {
+  const float c1 = 1.70158f;
+  const float c2 = c1 * 1.525f;
+  return t < 0.5f
+             ? (std::pow(2.0f * t, 2.0f) * ((c2 + 1.0f) * 2.0f * t - c2)) / 2.0f
+             : (std::pow(2.0f * t - 2.0f, 2.0f) *
+                    ((c2 + 1.0f) * (t * 2.0f - 2.0f) + c2) +
+                2.0f) /
+                   2.0f;
+}
+
+// Elastic
+float easeInElastic(float t) {
+  const float c4 = (2.0f * 3.14159265359f) / 3.0f;
+  if (t == 0.0f)
+    return 0.0f;
+  if (t == 1.0f)
+    return 1.0f;
+  return -std::pow(2.0f, 10.0f * t - 10.0f) *
+         std::sin((t * 10.0f - 10.75f) * c4);
+}
+
+float easeOutElastic(float t) {
+  const float c4 = (2.0f * 3.14159265359f) / 3.0f;
+  if (t == 0.0f)
+    return 0.0f;
+  if (t == 1.0f)
+    return 1.0f;
+  return std::pow(2.0f, -10.0f * t) * std::sin((t * 10.0f - 0.75f) * c4) + 1.0f;
+}
+
+float easeInOutElastic(float t) {
+  const float c5 = (2.0f * 3.14159265359f) / 4.5f;
+  if (t == 0.0f)
+    return 0.0f;
+  if (t == 1.0f)
+    return 1.0f;
+  return t < 0.5f ? -(std::pow(2.0f, 20.0f * t - 10.0f) *
+                      std::sin((20.0f * t - 11.125f) * c5)) /
+                        2.0f
+                  : (std::pow(2.0f, -20.0f * t + 10.0f) *
+                     std::sin((20.0f * t - 11.125f) * c5)) /
+                            2.0f +
+                        1.0f;
+}
+
+// Bounce
+namespace {
+float easeOutBounceInternal(float t) {
+  const float n1 = 7.5625f;
+  const float d1 = 2.75f;
+
+  if (t < 1.0f / d1) {
+    return n1 * t * t;
+  } else if (t < 2.0f / d1) {
+    t -= 1.5f / d1;
+    return n1 * t * t + 0.75f;
+  } else if (t < 2.5f / d1) {
+    t -= 2.25f / d1;
+    return n1 * t * t + 0.9375f;
+  } else {
+    t -= 2.625f / d1;
+    return n1 * t * t + 0.984375f;
+  }
+}
+} // namespace
+
+float easeInBounce(float t) { return 1.0f - easeOutBounceInternal(1.0f - t); }
+
+float easeOutBounce(float t) { return easeOutBounceInternal(t); }
+
+float easeInOutBounce(float t) {
+  return t < 0.5f ? (1.0f - easeOutBounceInternal(1.0f - 2.0f * t)) / 2.0f
+                  : (1.0f + easeOutBounceInternal(2.0f * t - 1.0f)) / 2.0f;
+}
+} // namespace extra2d
diff --git a/Extra2D/src/animation/als_parser.cpp b/Extra2D/src/animation/als_parser.cpp
new file mode 100644
index 0000000..73808ad
--- /dev/null
+++ b/Extra2D/src/animation/als_parser.cpp
@@ -0,0 +1,44 @@
+#include <extra2d/animation/als_parser.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+AlsParseResult AlsParser::parse(const std::string &filePath) {
+  AlsParseResult result;
+
+  // TODO: 实现实际的 ALS 文件格式解析
+  // 当前为框架实现，需要根据实际 ALS 文件格式补充解析逻辑
+  //
+  // 解析流程：
+  // 1. 读取 ALS 文件内容
+  // 2. 解析子动画列表：
+  //    - 子动画 ANI 文件路径
+  //    - 层级 zOrder
+  //    - 偏移量
+  // 3. 组装 AlsLayerInfo 数组
+
+  result.success = true;
+  result.errorMessage =
+      "ALS parser framework ready - actual format parsing to be implemented";
+
+  return result;
+}
+
+AlsParseResult AlsParser::parseFromMemory(const std::string &content,
+                                          const std::string &basePath) {
+  AlsParseResult result;
+
+  // TODO: 从内存内容解析
+  result.success = true;
+
+  return result;
+}
+
+std::string AlsParser::resolvePath(const std::string &relativePath) const {
+  if (!basePath_.empty() && !relativePath.empty() && relativePath[0] != '/') {
+    return basePath_ + "/" + relativePath;
+  }
+  return relativePath;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/animation/ani_binary_parser.cpp b/Extra2D/src/animation/ani_binary_parser.cpp
new file mode 100644
index 0000000..e7c035a
--- /dev/null
+++ b/Extra2D/src/animation/ani_binary_parser.cpp
@@ -0,0 +1,313 @@
+#include <cassert>
+#include <cstring>
+#include <extra2d/animation/ani_binary_parser.h>
+#include <extra2d/animation/sprite_frame_cache.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+
+namespace extra2d {
+
+namespace {
+
+// 简易二进制缓冲区读取器
+class BufferReader {
+public:
+  BufferReader(const uint8_t *data, size_t length)
+      : data_(data), length_(length), pos_(0) {}
+
+  template <typename T> T read() {
+    if (pos_ + sizeof(T) > length_) {
+      return T{};
+    }
+    T value;
+    std::memcpy(&value, data_ + pos_, sizeof(T));
+    pos_ += sizeof(T);
+    return value;
+  }
+
+  std::string readAsciiString(int32_t len) {
+    if (len <= 0 || pos_ + static_cast<size_t>(len) > length_) {
+      return "";
+    }
+    std::string result(reinterpret_cast<const char *>(data_ + pos_), len);
+    pos_ += len;
+    return result;
+  }
+
+  bool hasRemaining() const { return pos_ < length_; }
+  size_t remaining() const { return length_ - pos_; }
+
+private:
+  const uint8_t *data_;
+  size_t length_;
+  size_t pos_;
+};
+
+// 字符串转小写
+void toLower(std::string &s) {
+  for (auto &c : s) {
+    c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+  }
+}
+
+} // anonymous namespace
+
+AniParseResult AniBinaryParser::parse(const uint8_t *data, size_t length) {
+  AniParseResult result;
+  result.clip = AnimationClip::create();
+
+  if (!data || length < 4) {
+    result.success = false;
+    result.errorMessage = "Invalid binary ANI data";
+    return result;
+  }
+
+  BufferReader reader(data, length);
+
+  // 读取帧数和资源数
+  uint16_t frameCount = reader.read<uint16_t>();
+  uint16_t resourceCount = reader.read<uint16_t>();
+
+  // 读取精灵路径列表
+  std::vector<std::string> sprites;
+  sprites.reserve(resourceCount);
+  for (uint16_t i = 0; i < resourceCount; ++i) {
+    int32_t len = reader.read<int32_t>();
+    std::string path = reader.readAsciiString(len);
+    toLower(path);
+    sprites.push_back(std::move(path));
+  }
+
+  // 读取全局参数
+  uint16_t globalParamCount = reader.read<uint16_t>();
+  for (uint16_t j = 0; j < globalParamCount; ++j) {
+    uint16_t type = reader.read<uint16_t>();
+    switch (type) {
+    case static_cast<uint16_t>(AniNodeType::Loop):
+      if (reader.read<int8_t>()) {
+        result.clip->setLooping(true);
+      }
+      break;
+    case static_cast<uint16_t>(AniNodeType::Shadow):
+      if (reader.read<int8_t>()) {
+        result.clip->globalProperties().set(FramePropertyKey::Shadow, true);
+      }
+      break;
+    default:
+      break;
+    }
+  }
+
+  // 逐帧解析
+  for (uint16_t i = 0; i < frameCount; ++i) {
+    AnimationFrame frame;
+
+    // 碰撞盒
+    uint16_t boxCount = reader.read<uint16_t>();
+    for (uint16_t j = 0; j < boxCount; ++j) {
+      uint16_t boxType = reader.read<uint16_t>();
+      std::array<int32_t, 6> box;
+      for (int m = 0; m < 6; ++m) {
+        box[m] = reader.read<int32_t>();
+      }
+      if (boxType == static_cast<uint16_t>(AniNodeType::DamageBox)) {
+        frame.damageBoxes.push_back(box);
+      } else if (boxType == static_cast<uint16_t>(AniNodeType::AttackBox)) {
+        frame.attackBoxes.push_back(box);
+      }
+    }
+
+    // 图片 ID 和参数
+    uint16_t imgId = reader.read<uint16_t>();
+    uint16_t imgParam = reader.read<uint16_t>();
+    (void)imgParam;
+
+    if (imgId < sprites.size()) {
+      frame.texturePath = sprites[imgId];
+      frame.textureIndex = imgId;
+
+      std::string resolvedPath = resolvePath(frame.texturePath);
+      auto spriteFrame = SpriteFrameCache::getInstance().getOrCreateFromFile(
+          resolvedPath, frame.textureIndex);
+      frame.spriteFrame = spriteFrame;
+    }
+
+    // 位置
+    frame.offset = Vec2(static_cast<float>(reader.read<int32_t>()),
+                        static_cast<float>(reader.read<int32_t>()));
+
+    // 帧属性
+    uint16_t propertyCount = reader.read<uint16_t>();
+    for (uint16_t m = 0; m < propertyCount; ++m) {
+      uint16_t propType = reader.read<uint16_t>();
+      AniNodeType nodeType = static_cast<AniNodeType>(propType);
+
+      switch (nodeType) {
+      case AniNodeType::Loop:
+        frame.properties.set(FramePropertyKey::Loop,
+                             static_cast<bool>(reader.read<int8_t>()));
+        break;
+
+      case AniNodeType::Shadow:
+        frame.properties.set(FramePropertyKey::Shadow,
+                             static_cast<bool>(reader.read<int8_t>()));
+        break;
+
+      case AniNodeType::Interpolation:
+        frame.properties.withInterpolation(
+            static_cast<bool>(reader.read<int8_t>()));
+        break;
+
+      case AniNodeType::Coord:
+        frame.properties.set(FramePropertyKey::Coord,
+                             static_cast<int>(reader.read<uint16_t>()));
+        break;
+
+      case AniNodeType::ImageRate: {
+        float rateX = reader.read<float>();
+        float rateY = reader.read<float>();
+        frame.properties.withImageRate(Vec2(rateX, rateY));
+        break;
+      }
+
+      case AniNodeType::ImageRotate:
+        frame.properties.withImageRotate(
+            static_cast<float>(reader.read<int32_t>()));
+        break;
+
+      case AniNodeType::RGBA: {
+        uint32_t rgba = reader.read<uint32_t>();
+        uint8_t a = static_cast<uint8_t>((rgba >> 24) & 0xFF);
+        uint8_t r = static_cast<uint8_t>((rgba >> 16) & 0xFF);
+        uint8_t g = static_cast<uint8_t>((rgba >> 8) & 0xFF);
+        uint8_t b = static_cast<uint8_t>((rgba) & 0xFF);
+        frame.properties.withColorTint(Color::fromRGBA(r, g, b, a));
+        break;
+      }
+
+      case AniNodeType::GraphicEffect: {
+        uint16_t effectType = reader.read<uint16_t>();
+        frame.properties.set(FramePropertyKey::GraphicEffect,
+                             static_cast<int>(effectType));
+        // MONOCHROME 额外读取 rgb
+        if (effectType == 5) {
+          reader.read<uint8_t>(); // r
+          reader.read<uint8_t>(); // g
+          reader.read<uint8_t>(); // b
+        }
+        // SPACEDISTORT 额外读取 pos
+        else if (effectType == 6) {
+          reader.read<uint16_t>(); // x
+          reader.read<uint16_t>(); // y
+        }
+        break;
+      }
+
+      case AniNodeType::Delay:
+        frame.delay = static_cast<float>(reader.read<int32_t>());
+        break;
+
+      case AniNodeType::DamageType:
+        frame.properties.set(FramePropertyKey::DamageType,
+                             static_cast<int>(reader.read<uint16_t>()));
+        break;
+
+      case AniNodeType::PlaySound: {
+        int32_t len = reader.read<int32_t>();
+        std::string soundPath = reader.readAsciiString(len);
+        frame.properties.withPlaySound(resolvePath(soundPath));
+        break;
+      }
+
+      case AniNodeType::SetFlag:
+        frame.properties.withSetFlag(reader.read<int32_t>());
+        break;
+
+      case AniNodeType::FlipType:
+        frame.properties.set(FramePropertyKey::FlipType,
+                             static_cast<int>(reader.read<uint16_t>()));
+        break;
+
+      case AniNodeType::LoopStart:
+        frame.properties.set(FramePropertyKey::LoopStart, true);
+        break;
+
+      case AniNodeType::LoopEnd:
+        frame.properties.set(FramePropertyKey::LoopEnd, reader.read<int32_t>());
+        break;
+
+      case AniNodeType::Clip: {
+        std::vector<int> clipRegion = {
+            static_cast<int>(reader.read<int16_t>()),
+            static_cast<int>(reader.read<int16_t>()),
+            static_cast<int>(reader.read<int16_t>()),
+            static_cast<int>(reader.read<int16_t>())};
+        frame.properties.set(FramePropertyKey::ClipRegion, clipRegion);
+        break;
+      }
+
+      default:
+        // 未知类型 - 跳过
+        break;
+      }
+    }
+
+    result.clip->addFrame(std::move(frame));
+  }
+
+  result.success = true;
+  return result;
+}
+
+AniParseResult AniBinaryParser::parseFromFile(const std::string &filePath) {
+  std::ifstream file(filePath, std::ios::binary | std::ios::ate);
+  if (!file.is_open()) {
+    AniParseResult result;
+    result.success = false;
+    result.errorMessage = "Cannot open binary ANI file: " + filePath;
+    return result;
+  }
+
+  auto size = file.tellg();
+  file.seekg(0, std::ios::beg);
+
+  std::vector<uint8_t> buffer(static_cast<size_t>(size));
+  file.read(reinterpret_cast<char *>(buffer.data()), size);
+  file.close();
+
+  // 提取基础路径
+  auto lastSlash = filePath.find_last_of("/\\");
+  if (lastSlash != std::string::npos && basePath_.empty()) {
+    basePath_ = filePath.substr(0, lastSlash);
+  }
+
+  auto result = parse(buffer.data(), buffer.size());
+
+  if (result.clip) {
+    result.clip->setSourcePath(filePath);
+    std::string name = (lastSlash != std::string::npos)
+                           ? filePath.substr(lastSlash + 1)
+                           : filePath;
+    result.clip->setName(name);
+  }
+
+  return result;
+}
+
+std::string
+AniBinaryParser::resolvePath(const std::string &relativePath) const {
+  std::string resolved = relativePath;
+  if (pathResolver_) {
+    resolved = pathResolver_(relativePath);
+  }
+
+  if (!basePath_.empty() && !resolved.empty() && resolved[0] != '/') {
+    if (resolved.size() < 2 || resolved[1] != ':') {
+      resolved = basePath_ + "/" + resolved;
+    }
+  }
+
+  return resolved;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/animation/ani_parser.cpp b/Extra2D/src/animation/ani_parser.cpp
new file mode 100644
index 0000000..06878ee
--- /dev/null
+++ b/Extra2D/src/animation/ani_parser.cpp
@@ -0,0 +1,430 @@
+#include <algorithm>
+#include <cctype>
+#include <extra2d/animation/ani_parser.h>
+#include <extra2d/animation/sprite_frame_cache.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <sstream>
+
+namespace extra2d {
+
+namespace {
+
+std::string trim(const std::string &s) {
+  auto start = s.find_first_not_of(" \t\r\n");
+  if (start == std::string::npos)
+    return "";
+  auto end = s.find_last_not_of(" \t\r\n");
+  return s.substr(start, end - start + 1);
+}
+
+std::string stripBackticks(const std::string &s) {
+  std::string t = trim(s);
+  if (t.size() >= 2 && t.front() == '`' && t.back() == '`') {
+    return t.substr(1, t.size() - 2);
+  }
+  return t;
+}
+
+std::vector<std::string> splitWhitespace(const std::string &s) {
+  std::vector<std::string> tokens;
+  std::istringstream iss(s);
+  std::string token;
+  while (iss >> token) {
+    tokens.push_back(token);
+  }
+  return tokens;
+}
+
+bool lineStartsWith(const std::string &trimmed, const std::string &tag) {
+  return trimmed.find(tag) == 0;
+}
+
+std::string valueAfterTag(const std::string &trimmed, const std::string &tag) {
+  auto pos = trimmed.find(tag);
+  if (pos == std::string::npos)
+    return "";
+  return trim(trimmed.substr(pos + tag.size()));
+}
+
+// 读取标签后的值，如果同行没有则从流中读取下一行
+std::string readValue(const std::string &trimmed, const std::string &tag,
+                      std::istringstream &stream) {
+  std::string val = valueAfterTag(trimmed, tag);
+  if (val.empty()) {
+    std::string nextLine;
+    if (std::getline(stream, nextLine)) {
+      val = trim(nextLine);
+    }
+  }
+  return val;
+}
+
+} // anonymous namespace
+
+AniParseResult AniParser::parse(const std::string &filePath) {
+  AniParseResult result;
+
+  std::ifstream file(filePath);
+  if (!file.is_open()) {
+    result.success = false;
+    result.errorMessage = "Cannot open ANI file: " + filePath;
+    return result;
+  }
+
+  std::string content((std::istreambuf_iterator<char>(file)),
+                      std::istreambuf_iterator<char>());
+  file.close();
+
+  // 提取基础路径
+  auto lastSlash = filePath.find_last_of("/\\");
+  std::string basePath;
+  if (lastSlash != std::string::npos) {
+    basePath = filePath.substr(0, lastSlash);
+  }
+
+  if (basePath_.empty() && !basePath.empty()) {
+    basePath_ = basePath;
+  }
+
+  result = parseFromMemory(content, basePath_.empty() ? basePath : basePath_);
+
+  if (result.clip) {
+    result.clip->setSourcePath(filePath);
+    std::string name = (lastSlash != std::string::npos)
+                           ? filePath.substr(lastSlash + 1)
+                           : filePath;
+    result.clip->setName(name);
+  }
+
+  return result;
+}
+
+AniParseResult AniParser::parseFromMemory(const std::string &content,
+                                          const std::string &basePath) {
+  AniParseResult result;
+  result.clip = AnimationClip::create();
+
+  if (!basePath.empty() && basePath_.empty()) {
+    basePath_ = basePath;
+  }
+
+  std::istringstream stream(content);
+  std::string line;
+
+  AnimationFrame currentFrame;
+  bool inFrame = false;
+  bool hasCurrentFrame = false;
+
+  // [IMAGE] 标签的多行读取状态
+  bool pendingImage = false;
+  std::string imagePath;
+
+  auto finalizeFrame = [&]() {
+    if (!hasCurrentFrame)
+      return;
+    if (!currentFrame.texturePath.empty()) {
+      std::string resolvedPath = resolvePath(currentFrame.texturePath);
+      auto spriteFrame = SpriteFrameCache::getInstance().getOrCreateFromFile(
+          resolvedPath, currentFrame.textureIndex);
+      currentFrame.spriteFrame = spriteFrame;
+    }
+    result.clip->addFrame(std::move(currentFrame));
+    currentFrame = AnimationFrame();
+    hasCurrentFrame = false;
+  };
+
+  while (std::getline(stream, line)) {
+    std::string trimmed = trim(line);
+
+    if (trimmed.empty())
+      continue;
+    if (trimmed[0] == '#')
+      continue;
+
+    // [FRAME MAX]
+    if (lineStartsWith(trimmed, "[FRAME MAX]")) {
+      readValue(trimmed, "[FRAME MAX]", stream);
+      continue;
+    }
+
+    // [FRAMEXXX] - 新帧开始
+    if (trimmed.size() >= 7 && trimmed.substr(0, 6) == "[FRAME" &&
+        trimmed.back() == ']' && !lineStartsWith(trimmed, "[FRAME MAX]")) {
+      finalizeFrame();
+      currentFrame = AnimationFrame();
+      inFrame = true;
+      hasCurrentFrame = true;
+      pendingImage = false;
+      continue;
+    }
+
+    if (!inFrame) {
+      // 全局属性
+      if (lineStartsWith(trimmed, "[LOOP]")) {
+        result.clip->setLooping(true);
+      } else if (lineStartsWith(trimmed, "[SHADOW]")) {
+        result.clip->globalProperties().set(FramePropertyKey::Shadow, true);
+      }
+      continue;
+    }
+
+    // === 帧内属性解析 ===
+
+    // [IMAGE] - 图片路径和索引（跨行）
+    if (lineStartsWith(trimmed, "[IMAGE]")) {
+      std::string val = valueAfterTag(trimmed, "[IMAGE]");
+      if (!val.empty()) {
+        auto tokens = splitWhitespace(val);
+        imagePath = stripBackticks(tokens[0]);
+        if (tokens.size() >= 2) {
+          currentFrame.texturePath = imagePath;
+          currentFrame.textureIndex = std::stoi(tokens[1]);
+          pendingImage = false;
+        } else {
+          pendingImage = true;
+        }
+      } else {
+        pendingImage = true;
+        imagePath.clear();
+      }
+      continue;
+    }
+
+    // [IMAGE] 后续行
+    if (pendingImage) {
+      if (imagePath.empty()) {
+        imagePath = stripBackticks(trimmed);
+      } else {
+        currentFrame.texturePath = imagePath;
+        currentFrame.textureIndex = std::stoi(trimmed);
+        pendingImage = false;
+      }
+      continue;
+    }
+
+    // [IMAGE POS]
+    if (lineStartsWith(trimmed, "[IMAGE POS]")) {
+      std::string val = readValue(trimmed, "[IMAGE POS]", stream);
+      auto tokens = splitWhitespace(val);
+      if (tokens.size() >= 2) {
+        currentFrame.offset = Vec2(static_cast<float>(std::stoi(tokens[0])),
+                                   static_cast<float>(std::stoi(tokens[1])));
+      }
+      continue;
+    }
+
+    // [DELAY]
+    if (lineStartsWith(trimmed, "[DELAY]")) {
+      std::string val = readValue(trimmed, "[DELAY]", stream);
+      currentFrame.delay = static_cast<float>(std::stoi(trim(val)));
+      continue;
+    }
+
+    // [DAMAGE TYPE]
+    if (lineStartsWith(trimmed, "[DAMAGE TYPE]")) {
+      std::string val = readValue(trimmed, "[DAMAGE TYPE]", stream);
+      val = stripBackticks(val);
+      int damageType = 0;
+      if (val == "SUPERARMOR")
+        damageType = 1;
+      else if (val == "UNBREAKABLE")
+        damageType = 2;
+      currentFrame.properties.set(FramePropertyKey::DamageType, damageType);
+      continue;
+    }
+
+    // [DAMAGE BOX]
+    if (lineStartsWith(trimmed, "[DAMAGE BOX]")) {
+      std::string val = readValue(trimmed, "[DAMAGE BOX]", stream);
+      auto tokens = splitWhitespace(val);
+      if (tokens.size() >= 6) {
+        std::array<int32_t, 6> box;
+        for (int i = 0; i < 6; ++i) {
+          box[i] = std::stoi(tokens[i]);
+        }
+        currentFrame.damageBoxes.push_back(box);
+      }
+      continue;
+    }
+
+    // [ATTACK BOX]
+    if (lineStartsWith(trimmed, "[ATTACK BOX]")) {
+      std::string val = readValue(trimmed, "[ATTACK BOX]", stream);
+      auto tokens = splitWhitespace(val);
+      if (tokens.size() >= 6) {
+        std::array<int32_t, 6> box;
+        for (int i = 0; i < 6; ++i) {
+          box[i] = std::stoi(tokens[i]);
+        }
+        currentFrame.attackBoxes.push_back(box);
+      }
+      continue;
+    }
+
+    // [SET FLAG]
+    if (lineStartsWith(trimmed, "[SET FLAG]")) {
+      std::string val = readValue(trimmed, "[SET FLAG]", stream);
+      currentFrame.properties.withSetFlag(std::stoi(trim(val)));
+      continue;
+    }
+
+    // [PLAY SOUND]
+    if (lineStartsWith(trimmed, "[PLAY SOUND]")) {
+      std::string val = readValue(trimmed, "[PLAY SOUND]", stream);
+      currentFrame.properties.withPlaySound(resolvePath(stripBackticks(val)));
+      continue;
+    }
+
+    // [IMAGE RATE]
+    if (lineStartsWith(trimmed, "[IMAGE RATE]")) {
+      std::string val = readValue(trimmed, "[IMAGE RATE]", stream);
+      auto tokens = splitWhitespace(val);
+      if (tokens.size() >= 2) {
+        currentFrame.properties.withImageRate(
+            Vec2(std::stof(tokens[0]), std::stof(tokens[1])));
+      }
+      continue;
+    }
+
+    // [IMAGE ROTATE]
+    if (lineStartsWith(trimmed, "[IMAGE ROTATE]")) {
+      std::string val = readValue(trimmed, "[IMAGE ROTATE]", stream);
+      currentFrame.properties.withImageRotate(std::stof(trim(val)));
+      continue;
+    }
+
+    // [RGBA]
+    if (lineStartsWith(trimmed, "[RGBA]")) {
+      std::string val = readValue(trimmed, "[RGBA]", stream);
+      auto tokens = splitWhitespace(val);
+      if (tokens.size() >= 4) {
+        Color color =
+            Color::fromRGBA(static_cast<uint8_t>(std::stoi(tokens[0])),
+                            static_cast<uint8_t>(std::stoi(tokens[1])),
+                            static_cast<uint8_t>(std::stoi(tokens[2])),
+                            static_cast<uint8_t>(std::stoi(tokens[3])));
+        currentFrame.properties.withColorTint(color);
+      }
+      continue;
+    }
+
+    // [INTERPOLATION]
+    if (lineStartsWith(trimmed, "[INTERPOLATION]")) {
+      currentFrame.properties.withInterpolation(true);
+      continue;
+    }
+
+    // [LOOP]
+    if (lineStartsWith(trimmed, "[LOOP]")) {
+      currentFrame.properties.set(FramePropertyKey::Loop, true);
+      continue;
+    }
+
+    // [SHADOW]
+    if (lineStartsWith(trimmed, "[SHADOW]")) {
+      currentFrame.properties.set(FramePropertyKey::Shadow, true);
+      continue;
+    }
+
+    // [FLIP TYPE]
+    if (lineStartsWith(trimmed, "[FLIP TYPE]")) {
+      std::string val = readValue(trimmed, "[FLIP TYPE]", stream);
+      val = stripBackticks(val);
+      int flipType = 0;
+      if (val == "HORIZON")
+        flipType = 1;
+      else if (val == "VERTICAL")
+        flipType = 2;
+      else if (val == "ALL")
+        flipType = 3;
+      else
+        flipType = std::stoi(val);
+      currentFrame.properties.set(FramePropertyKey::FlipType, flipType);
+      continue;
+    }
+
+    // [COORD]
+    if (lineStartsWith(trimmed, "[COORD]")) {
+      std::string val = readValue(trimmed, "[COORD]", stream);
+      currentFrame.properties.set(FramePropertyKey::Coord,
+                                  std::stoi(trim(val)));
+      continue;
+    }
+
+    // [GRAPHIC EFFECT]
+    if (lineStartsWith(trimmed, "[GRAPHIC EFFECT]")) {
+      std::string val = readValue(trimmed, "[GRAPHIC EFFECT]", stream);
+      val = stripBackticks(val);
+      int effectType = 0;
+      if (val == "DODGE")
+        effectType = 1;
+      else if (val == "LINEARDODGE")
+        effectType = 2;
+      else if (val == "DARK")
+        effectType = 3;
+      else if (val == "XOR")
+        effectType = 4;
+      else if (val == "MONOCHROME")
+        effectType = 5;
+      else if (val == "SPACEDISTORT")
+        effectType = 6;
+      else
+        effectType = std::stoi(val);
+      currentFrame.properties.set(FramePropertyKey::GraphicEffect, effectType);
+      continue;
+    }
+
+    // [CLIP]
+    if (lineStartsWith(trimmed, "[CLIP]")) {
+      std::string val = readValue(trimmed, "[CLIP]", stream);
+      auto tokens = splitWhitespace(val);
+      if (tokens.size() >= 4) {
+        std::vector<int> clipRegion = {
+            std::stoi(tokens[0]), std::stoi(tokens[1]), std::stoi(tokens[2]),
+            std::stoi(tokens[3])};
+        currentFrame.properties.set(FramePropertyKey::ClipRegion, clipRegion);
+      }
+      continue;
+    }
+
+    // [LOOP START]
+    if (lineStartsWith(trimmed, "[LOOP START]")) {
+      currentFrame.properties.set(FramePropertyKey::LoopStart, true);
+      continue;
+    }
+
+    // [LOOP END]
+    if (lineStartsWith(trimmed, "[LOOP END]")) {
+      std::string val = readValue(trimmed, "[LOOP END]", stream);
+      currentFrame.properties.set(FramePropertyKey::LoopEnd,
+                                  std::stoi(trim(val)));
+      continue;
+    }
+
+    // 未识别标签 - 静默忽略
+  }
+
+  // 保存最后一帧
+  finalizeFrame();
+
+  result.success = true;
+  return result;
+}
+
+std::string AniParser::resolvePath(const std::string &relativePath) const {
+  std::string resolved = relativePath;
+  if (pathResolver_) {
+    resolved = pathResolver_(relativePath);
+  }
+
+  if (!basePath_.empty() && !resolved.empty() && resolved[0] != '/') {
+    if (resolved.size() < 2 || resolved[1] != ':') {
+      resolved = basePath_ + "/" + resolved;
+    }
+  }
+
+  return resolved;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/animation/animated_sprite.cpp b/Extra2D/src/animation/animated_sprite.cpp
new file mode 100644
index 0000000..4619df3
--- /dev/null
+++ b/Extra2D/src/animation/animated_sprite.cpp
@@ -0,0 +1,290 @@
+#include <extra2d/animation/animated_sprite.h>
+#include <extra2d/animation/interpolation_engine.h>
+
+namespace extra2d {
+
+const std::vector<std::array<int32_t, 6>> AnimatedSprite::emptyBoxes_;
+const std::string AnimatedSprite::emptyString_;
+
+AnimatedSprite::AnimatedSprite() {
+  controller_.setFrameChangeCallback(
+      [this](size_t oldIdx, size_t newIdx, const AnimationFrame &frame) {
+        onFrameChanged(oldIdx, newIdx, frame);
+      });
+}
+
+// ------ 静态工厂 ------
+
+Ptr<AnimatedSprite> AnimatedSprite::create() {
+  return makePtr<AnimatedSprite>();
+}
+
+Ptr<AnimatedSprite> AnimatedSprite::create(Ptr<AnimationClip> clip) {
+  auto sprite = makePtr<AnimatedSprite>();
+  sprite->setAnimationClip(std::move(clip));
+  return sprite;
+}
+
+Ptr<AnimatedSprite> AnimatedSprite::create(const std::string &aniFilePath) {
+  auto sprite = makePtr<AnimatedSprite>();
+  sprite->loadAnimation(aniFilePath);
+  return sprite;
+}
+
+// ------ 动画绑定 ------
+
+void AnimatedSprite::setAnimationClip(Ptr<AnimationClip> clip) {
+  controller_.setClip(clip);
+  if (clip && !clip->empty()) {
+    applyFrame(clip->getFrame(0));
+  }
+}
+
+void AnimatedSprite::loadAnimation(const std::string &aniFilePath) {
+  auto clip = AnimationCache::getInstance().loadClip(aniFilePath);
+  if (clip) {
+    setAnimationClip(clip);
+  }
+}
+
+Ptr<AnimationClip> AnimatedSprite::getAnimationClip() const {
+  return controller_.getClip();
+}
+
+// ------ 动画字典 ------
+
+void AnimatedSprite::addAnimation(const std::string &name,
+                                  Ptr<AnimationClip> clip) {
+  if (clip) {
+    animations_[name] = std::move(clip);
+  }
+}
+
+void AnimatedSprite::play(const std::string &name, bool loop) {
+  auto it = animations_.find(name);
+  if (it == animations_.end())
+    return;
+
+  currentAnimationName_ = name;
+  // 精灵图动画不应覆盖节点的 position/scale/rotation
+  applyFrameTransform_ = false;
+  setAnimationClip(it->second);
+  setLooping(loop);
+  play();
+}
+
+bool AnimatedSprite::hasAnimation(const std::string &name) const {
+  return animations_.find(name) != animations_.end();
+}
+
+Ptr<AnimationClip> AnimatedSprite::getAnimation(const std::string &name) const {
+  auto it = animations_.find(name);
+  if (it != animations_.end())
+    return it->second;
+  return nullptr;
+}
+
+const std::string &AnimatedSprite::getCurrentAnimationName() const {
+  return currentAnimationName_;
+}
+
+// ------ 播放控制 ------
+
+void AnimatedSprite::play() { controller_.play(); }
+void AnimatedSprite::pause() { controller_.pause(); }
+void AnimatedSprite::resume() { controller_.resume(); }
+void AnimatedSprite::stop() { controller_.stop(); }
+void AnimatedSprite::reset() { controller_.reset(); }
+bool AnimatedSprite::isPlaying() const { return controller_.isPlaying(); }
+bool AnimatedSprite::isPaused() const { return controller_.isPaused(); }
+bool AnimatedSprite::isStopped() const { return controller_.isStopped(); }
+
+// ------ 属性控制 ------
+
+void AnimatedSprite::setLooping(bool loop) { controller_.setLooping(loop); }
+bool AnimatedSprite::isLooping() const { return controller_.isLooping(); }
+void AnimatedSprite::setPlaybackSpeed(float speed) {
+  controller_.setPlaybackSpeed(speed);
+}
+float AnimatedSprite::getPlaybackSpeed() const {
+  return controller_.getPlaybackSpeed();
+}
+
+// ------ 帧控制 ------
+
+void AnimatedSprite::setFrameIndex(size_t index) {
+  controller_.setFrameIndex(index);
+}
+size_t AnimatedSprite::getCurrentFrameIndex() const {
+  return controller_.getCurrentFrameIndex();
+}
+size_t AnimatedSprite::getTotalFrames() const {
+  return controller_.getTotalFrames();
+}
+void AnimatedSprite::nextFrame() { controller_.nextFrame(); }
+void AnimatedSprite::prevFrame() { controller_.prevFrame(); }
+
+// ------ 帧范围限制 ------
+
+void AnimatedSprite::setFrameRange(int start, int end) {
+  frameRangeStart_ = start;
+  frameRangeEnd_ = end;
+
+  // 确保当前帧在新的范围内
+  auto clip = controller_.getClip();
+  if (clip && !clip->empty()) {
+    size_t currentFrame = controller_.getCurrentFrameIndex();
+    size_t minFrame = static_cast<size_t>(start);
+    size_t maxFrame =
+        (end < 0) ? clip->getFrameCount() - 1 : static_cast<size_t>(end);
+
+    if (currentFrame < minFrame || currentFrame > maxFrame) {
+      controller_.setFrameIndex(minFrame);
+    }
+  }
+}
+
+std::pair<int, int> AnimatedSprite::getFrameRange() const {
+  return {frameRangeStart_, frameRangeEnd_};
+}
+
+void AnimatedSprite::clearFrameRange() {
+  frameRangeStart_ = 0;
+  frameRangeEnd_ = -1;
+}
+
+bool AnimatedSprite::hasFrameRange() const { return frameRangeEnd_ >= 0; }
+
+// ------ 回调 ------
+
+void AnimatedSprite::setCompletionCallback(
+    AnimationController::CompletionCallback cb) {
+  controller_.setCompletionCallback(std::move(cb));
+}
+
+void AnimatedSprite::setKeyframeCallback(
+    AnimationController::KeyframeCallback cb) {
+  controller_.setKeyframeCallback(std::move(cb));
+}
+
+void AnimatedSprite::setSoundTriggerCallback(
+    AnimationController::SoundTriggerCallback cb) {
+  controller_.setSoundTriggerCallback(std::move(cb));
+}
+
+// ------ 碰撞盒访问 ------
+
+const std::vector<std::array<int32_t, 6>> &
+AnimatedSprite::getCurrentDamageBoxes() const {
+  auto clip = controller_.getClip();
+  if (!clip || clip->empty())
+    return emptyBoxes_;
+  return clip->getFrame(controller_.getCurrentFrameIndex()).damageBoxes;
+}
+
+const std::vector<std::array<int32_t, 6>> &
+AnimatedSprite::getCurrentAttackBoxes() const {
+  auto clip = controller_.getClip();
+  if (!clip || clip->empty())
+    return emptyBoxes_;
+  return clip->getFrame(controller_.getCurrentFrameIndex()).attackBoxes;
+}
+
+// ------ 生命周期 ------
+
+void AnimatedSprite::onEnter() {
+  Sprite::onEnter();
+  if (autoPlay_ && controller_.getClip() && !controller_.getClip()->empty()) {
+    play();
+  }
+}
+
+void AnimatedSprite::onUpdate(float dt) {
+  Sprite::onUpdate(dt);
+
+  // 保存更新前的帧索引
+  size_t prevFrameIdx = controller_.getCurrentFrameIndex();
+
+  controller_.update(dt);
+
+  // 应用帧范围限制
+  if (hasFrameRange() && controller_.isPlaying()) {
+    size_t currentFrame = controller_.getCurrentFrameIndex();
+    size_t minFrame = static_cast<size_t>(frameRangeStart_);
+    size_t maxFrame = static_cast<size_t>(frameRangeEnd_);
+
+    auto clip = controller_.getClip();
+    if (clip && !clip->empty()) {
+      // 确保范围有效
+      if (maxFrame >= clip->getFrameCount()) {
+        maxFrame = clip->getFrameCount() - 1;
+      }
+
+      // 如果超出范围，回到起始帧
+      if (currentFrame < minFrame || currentFrame > maxFrame) {
+        controller_.setFrameIndex(minFrame);
+      }
+    }
+  }
+
+  // 插值处理
+  if (controller_.isInterpolating()) {
+    auto clip = controller_.getClip();
+    if (clip) {
+      size_t idx = controller_.getCurrentFrameIndex();
+      if (idx + 1 < clip->getFrameCount()) {
+        auto props = InterpolationEngine::interpolate(
+            clip->getFrame(idx), clip->getFrame(idx + 1),
+            controller_.getInterpolationFactor());
+        // 仅更新插值属性，不覆盖帧纹理
+        Sprite::setColor(props.color);
+      }
+    }
+  }
+}
+
+// ------ 内部方法 ------
+
+void AnimatedSprite::onFrameChanged(size_t /*oldIdx*/, size_t /*newIdx*/,
+                                    const AnimationFrame &frame) {
+  applyFrame(frame);
+}
+
+void AnimatedSprite::applyFrame(const AnimationFrame &frame) {
+  // 更新纹理
+  if (frame.spriteFrame && frame.spriteFrame->isValid()) {
+    Sprite::setTexture(frame.spriteFrame->getTexture());
+    Sprite::setTextureRect(frame.spriteFrame->getRect());
+  }
+
+  // 帧变换仅在 ANI 动画模式下应用；精灵图模式跳过，避免覆盖节点世界坐标
+  if (applyFrameTransform_) {
+    // 应用帧偏移（作为精灵位置）
+    Node::setPosition(frame.offset);
+
+    // 应用缩放
+    Vec2 scale = frame.getEffectiveScale();
+    Node::setScale(scale);
+
+    // 应用旋转
+    float rotation = frame.getEffectiveRotation();
+    Node::setRotation(rotation);
+
+    // 应用翻转
+    auto flipType = frame.properties.get<int>(FramePropertyKey::FlipType);
+    if (flipType.has_value()) {
+      int flip = flipType.value();
+      Sprite::setFlipX(flip == 1 || flip == 3);
+      Sprite::setFlipY(flip == 2 || flip == 3);
+    } else {
+      Sprite::setFlipX(false);
+      Sprite::setFlipY(false);
+    }
+  }
+
+  // 颜色始终应用
+  Color color = frame.getEffectiveColor();
+  Sprite::setColor(color);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/animation/animation_cache.cpp b/Extra2D/src/animation/animation_cache.cpp
new file mode 100644
index 0000000..95bcff2
--- /dev/null
+++ b/Extra2D/src/animation/animation_cache.cpp
@@ -0,0 +1,103 @@
+#include <extra2d/animation/ani_binary_parser.h>
+#include <extra2d/animation/ani_parser.h>
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+
+namespace extra2d {
+
+namespace {
+
+// 检测文件是否为文本格式 ANI
+// 文本格式以 '#' 或 '[' 开头（跳过空白后）
+bool isTextFormat(const std::string &filePath) {
+  std::ifstream file(filePath, std::ios::binary);
+  if (!file.is_open())
+    return false;
+
+  // 读取前几个字节判断
+  char buf[16] = {};
+  file.read(buf, sizeof(buf));
+  auto bytesRead = file.gcount();
+  file.close();
+
+  // 跳过 BOM 和空白
+  size_t pos = 0;
+  // UTF-8 BOM
+  if (bytesRead >= 3 && static_cast<uint8_t>(buf[0]) == 0xEF &&
+      static_cast<uint8_t>(buf[1]) == 0xBB &&
+      static_cast<uint8_t>(buf[2]) == 0xBF) {
+    pos = 3;
+  }
+
+  // 跳过空白
+  while (pos < static_cast<size_t>(bytesRead) &&
+         (buf[pos] == ' ' || buf[pos] == '\t' || buf[pos] == '\r' ||
+          buf[pos] == '\n')) {
+    ++pos;
+  }
+
+  if (pos >= static_cast<size_t>(bytesRead))
+    return false;
+
+  // 文本 ANI 文件以 '#' (注释/PVF_File) 或 '[' (标签) 开头
+  return buf[pos] == '#' || buf[pos] == '[';
+}
+
+} // anonymous namespace
+
+Ptr<AnimationClip> AnimationCache::loadClip(const std::string &aniFilePath) {
+  // 先检查缓存
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    auto it = clips_.find(aniFilePath);
+    if (it != clips_.end()) {
+      return it->second;
+    }
+  }
+
+  // 提取基础路径
+  std::string basePath;
+  auto lastSlash = aniFilePath.find_last_of("/\\");
+  if (lastSlash != std::string::npos) {
+    basePath = aniFilePath.substr(0, lastSlash);
+  }
+
+  AniParseResult result;
+
+  if (isTextFormat(aniFilePath)) {
+    // 文本格式
+    AniParser parser;
+    if (pathResolver_) {
+      parser.setPathResolver(pathResolver_);
+    }
+    if (!basePath.empty()) {
+      parser.setBasePath(basePath);
+    }
+    result = parser.parse(aniFilePath);
+  } else {
+    // 二进制格式
+    AniBinaryParser parser;
+    if (pathResolver_) {
+      parser.setPathResolver(pathResolver_);
+    }
+    if (!basePath.empty()) {
+      parser.setBasePath(basePath);
+    }
+    result = parser.parseFromFile(aniFilePath);
+  }
+
+  if (!result.success || !result.clip) {
+    return nullptr;
+  }
+
+  // 添加到缓存
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    clips_[aniFilePath] = result.clip;
+  }
+
+  return result.clip;
+}
+
+} // namespace extra2d
diff --git a/Easy2D/src/animation/animation_clip.cpp b/Extra2D/src/animation/animation_clip.cpp
similarity index 59%
rename from Easy2D/src/animation/animation_clip.cpp
rename to Extra2D/src/animation/animation_clip.cpp
index aa66496..a37a281 100644
--- a/Easy2D/src/animation/animation_clip.cpp
+++ b/Extra2D/src/animation/animation_clip.cpp
@@ -1,8 +1,8 @@
-#include <easy2d/animation/animation_clip.h>
+#include <extra2d/animation/animation_clip.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // AnimationClip 的实现全部在头文件中以内联方式完成
 // 此文件保留用于未来可能需要的非内联实现
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/animation/animation_controller.cpp b/Extra2D/src/animation/animation_controller.cpp
new file mode 100644
index 0000000..8466510
--- /dev/null
+++ b/Extra2D/src/animation/animation_controller.cpp
@@ -0,0 +1,209 @@
+#include <cassert>
+#include <extra2d/animation/animation_controller.h>
+
+namespace extra2d {
+
+void AnimationController::setClip(Ptr<AnimationClip> clip) {
+  clip_ = std::move(clip);
+  currentFrameIndex_ = 0;
+  accumulatedTime_ = 0.0f;
+  interpolating_ = false;
+  interpolationFactor_ = 0.0f;
+  state_ = AnimPlayState::Stopped;
+}
+
+void AnimationController::play() {
+  if (!clip_ || clip_->empty())
+    return;
+  state_ = AnimPlayState::Playing;
+}
+
+void AnimationController::pause() {
+  if (state_ == AnimPlayState::Playing) {
+    state_ = AnimPlayState::Paused;
+  }
+}
+
+void AnimationController::resume() {
+  if (state_ == AnimPlayState::Paused) {
+    state_ = AnimPlayState::Playing;
+  }
+}
+
+void AnimationController::stop() {
+  state_ = AnimPlayState::Stopped;
+  accumulatedTime_ = 0.0f;
+  interpolating_ = false;
+  interpolationFactor_ = 0.0f;
+}
+
+void AnimationController::reset() {
+  stop();
+  if (clip_ && !clip_->empty()) {
+    advanceFrame(0);
+  }
+}
+
+void AnimationController::setFrameIndex(size_t index) {
+  if (!clip_ || index >= clip_->getFrameCount())
+    return;
+  accumulatedTime_ = 0.0f;
+  advanceFrame(index);
+}
+
+void AnimationController::nextFrame() {
+  if (!clip_ || clip_->empty())
+    return;
+  size_t next = currentFrameIndex_ + 1;
+  if (next >= clip_->getFrameCount()) {
+    if (isLooping()) {
+      next = 0;
+    } else {
+      return;
+    }
+  }
+  accumulatedTime_ = 0.0f;
+  advanceFrame(next);
+}
+
+void AnimationController::prevFrame() {
+  if (!clip_ || clip_->empty())
+    return;
+  if (currentFrameIndex_ > 0) {
+    accumulatedTime_ = 0.0f;
+    advanceFrame(currentFrameIndex_ - 1);
+  } else if (isLooping()) {
+    accumulatedTime_ = 0.0f;
+    advanceFrame(clip_->getFrameCount() - 1);
+  }
+}
+
+void AnimationController::update(float dt) {
+  if (state_ != AnimPlayState::Playing)
+    return;
+  if (!clip_ || clip_->empty())
+    return;
+
+  // 累加时间（转换为毫秒）
+  float dt_ms = dt * 1000.0f * playbackSpeed_;
+  accumulatedTime_ += dt_ms;
+
+  const AnimationFrame &currentFrame = clip_->getFrame(currentFrameIndex_);
+  float frameDelay = currentFrame.delay;
+
+  // 更新插值状态
+  updateInterpolation();
+
+  // 循环处理：支持一次跳过多帧（与原始 ANI 系统行为一致）
+  while (accumulatedTime_ >= frameDelay) {
+    accumulatedTime_ -= frameDelay;
+
+    size_t totalFrames = clip_->getFrameCount();
+
+    if (currentFrameIndex_ < totalFrames - 1) {
+      // 推进到下一帧
+      advanceFrame(currentFrameIndex_ + 1);
+    } else {
+      // 最后一帧播放完毕
+      if (isLooping()) {
+        advanceFrame(0);
+      } else {
+        // 动画结束
+        state_ = AnimPlayState::Stopped;
+        if (onComplete_) {
+          onComplete_();
+        }
+        return;
+      }
+    }
+
+    // 更新下一帧的延迟
+    frameDelay = clip_->getFrame(currentFrameIndex_).delay;
+  }
+
+  // 更新插值因子
+  updateInterpolation();
+}
+
+size_t AnimationController::getTotalFrames() const {
+  return clip_ ? clip_->getFrameCount() : 0;
+}
+
+const AnimationFrame &AnimationController::getCurrentFrame() const {
+  assert(clip_ && currentFrameIndex_ < clip_->getFrameCount());
+  return clip_->getFrame(currentFrameIndex_);
+}
+
+bool AnimationController::isLooping() const {
+  if (hasLoopOverride_)
+    return loopOverride_;
+  return clip_ ? clip_->isLooping() : false;
+}
+
+void AnimationController::setLooping(bool loop) {
+  hasLoopOverride_ = true;
+  loopOverride_ = loop;
+}
+
+void AnimationController::advanceFrame(size_t newIndex) {
+  if (!clip_ || newIndex >= clip_->getFrameCount())
+    return;
+
+  size_t oldIndex = currentFrameIndex_;
+  currentFrameIndex_ = newIndex;
+
+  const AnimationFrame &frame = clip_->getFrame(newIndex);
+
+  // 触发帧变更回调
+  if (onFrameChange_) {
+    onFrameChange_(oldIndex, newIndex, frame);
+  }
+
+  // 处理帧属性（关键帧、音效等）
+  processFrameProperties(frame);
+}
+
+void AnimationController::processFrameProperties(const AnimationFrame &frame) {
+  const auto &props = frame.properties;
+
+  // 关键帧回调
+  if (props.has(FramePropertyKey::SetFlag)) {
+    auto flagIndex = props.get<int>(FramePropertyKey::SetFlag);
+    if (flagIndex.has_value() && onKeyframe_) {
+      onKeyframe_(flagIndex.value());
+    }
+  }
+
+  // 音效触发
+  if (props.has(FramePropertyKey::PlaySound)) {
+    auto soundPath = props.get<std::string>(FramePropertyKey::PlaySound);
+    if (soundPath.has_value() && onSoundTrigger_) {
+      onSoundTrigger_(soundPath.value());
+    }
+  }
+}
+
+void AnimationController::updateInterpolation() {
+  if (!clip_ || clip_->empty()) {
+    interpolating_ = false;
+    interpolationFactor_ = 0.0f;
+    return;
+  }
+
+  const AnimationFrame &currentFrame = clip_->getFrame(currentFrameIndex_);
+
+  if (currentFrame.hasInterpolation() &&
+      currentFrameIndex_ + 1 < clip_->getFrameCount()) {
+    interpolating_ = true;
+    float frameDelay = currentFrame.delay;
+    interpolationFactor_ =
+        (frameDelay > 0.0f)
+            ? math::clamp(accumulatedTime_ / frameDelay, 0.0f, 1.0f)
+            : 0.0f;
+  } else {
+    interpolating_ = false;
+    interpolationFactor_ = 0.0f;
+  }
+}
+
+} // namespace extra2d
diff --git a/Easy2D/src/animation/animation_frame.cpp b/Extra2D/src/animation/animation_frame.cpp
similarity index 59%
rename from Easy2D/src/animation/animation_frame.cpp
rename to Extra2D/src/animation/animation_frame.cpp
index 44818b1..f4396dd 100644
--- a/Easy2D/src/animation/animation_frame.cpp
+++ b/Extra2D/src/animation/animation_frame.cpp
@@ -1,8 +1,8 @@
-#include <easy2d/animation/animation_frame.h>
+#include <extra2d/animation/animation_frame.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // AnimationFrame 的实现全部在头文件中以内联方式完成
 // 此文件保留用于未来可能需要的非内联实现
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/animation/animation_node.cpp b/Extra2D/src/animation/animation_node.cpp
new file mode 100644
index 0000000..3b8788d
--- /dev/null
+++ b/Extra2D/src/animation/animation_node.cpp
@@ -0,0 +1,266 @@
+#include <extra2d/animation/animation_node.h>
+#include <extra2d/animation/interpolation_engine.h>
+
+namespace extra2d {
+
+const std::vector<std::array<int32_t, 6>> AnimationNode::emptyBoxes_;
+
+// ============================================================================
+// 构造
+// ============================================================================
+
+AnimationNode::AnimationNode() { setupControllerCallbacks(); }
+
+// ============================================================================
+// 静态工厂
+// ============================================================================
+
+Ptr<AnimationNode> AnimationNode::create() { return makePtr<AnimationNode>(); }
+
+Ptr<AnimationNode> AnimationNode::create(Ptr<AnimationClip> clip) {
+  auto node = makePtr<AnimationNode>();
+  node->setClip(std::move(clip));
+  return node;
+}
+
+Ptr<AnimationNode> AnimationNode::create(const std::string &aniFilePath) {
+  auto node = makePtr<AnimationNode>();
+  node->loadFromFile(aniFilePath);
+  return node;
+}
+
+// ============================================================================
+// 动画数据
+// ============================================================================
+
+void AnimationNode::setClip(Ptr<AnimationClip> clip) {
+  controller_.setClip(clip);
+  if (clip && !clip->empty()) {
+    // 预加载所有帧的 SpriteFrame
+    std::vector<AnimationFrame> frames;
+    frames.reserve(clip->getFrameCount());
+    for (size_t i = 0; i < clip->getFrameCount(); ++i) {
+      frames.push_back(clip->getFrame(i));
+    }
+    frameRenderer_.preloadFrames(frames);
+  } else {
+    frameRenderer_.releaseFrames();
+  }
+}
+
+Ptr<AnimationClip> AnimationNode::getClip() const {
+  return controller_.getClip();
+}
+
+bool AnimationNode::loadFromFile(const std::string &aniFilePath) {
+  auto clip = AnimationCache::getInstance().loadClip(aniFilePath);
+  if (clip) {
+    setClip(clip);
+    return true;
+  }
+  return false;
+}
+
+// ============================================================================
+// 播放控制
+// ============================================================================
+
+void AnimationNode::play() { controller_.play(); }
+void AnimationNode::pause() { controller_.pause(); }
+void AnimationNode::resume() { controller_.resume(); }
+void AnimationNode::stop() { controller_.stop(); }
+void AnimationNode::reset() { controller_.reset(); }
+
+bool AnimationNode::isPlaying() const { return controller_.isPlaying(); }
+bool AnimationNode::isPaused() const { return controller_.isPaused(); }
+bool AnimationNode::isStopped() const { return controller_.isStopped(); }
+
+void AnimationNode::setPlaybackSpeed(float speed) {
+  controller_.setPlaybackSpeed(speed);
+}
+float AnimationNode::getPlaybackSpeed() const {
+  return controller_.getPlaybackSpeed();
+}
+void AnimationNode::setLooping(bool loop) { controller_.setLooping(loop); }
+bool AnimationNode::isLooping() const { return controller_.isLooping(); }
+
+// ============================================================================
+// 帧控制
+// ============================================================================
+
+void AnimationNode::setFrameIndex(size_t index) {
+  controller_.setFrameIndex(index);
+}
+size_t AnimationNode::getCurrentFrameIndex() const {
+  return controller_.getCurrentFrameIndex();
+}
+size_t AnimationNode::getTotalFrames() const {
+  return controller_.getTotalFrames();
+}
+
+// ============================================================================
+// 事件回调
+// ============================================================================
+
+void AnimationNode::setKeyframeCallback(KeyframeHitCallback callback) {
+  controller_.setKeyframeCallback(
+      [this, cb = std::move(callback)](int flagIndex) {
+        if (cb)
+          cb(flagIndex);
+        AnimationEvent evt;
+        evt.type = AnimationEventType::KeyframeHit;
+        evt.frameIndex = controller_.getCurrentFrameIndex();
+        evt.keyframeFlag = flagIndex;
+        evt.source = this;
+        dispatchEvent(evt);
+      });
+}
+
+void AnimationNode::setCompletionCallback(AnimationCompleteCallback callback) {
+  controller_.setCompletionCallback([this, cb = std::move(callback)]() {
+    if (cb)
+      cb();
+    AnimationEvent evt;
+    evt.type = AnimationEventType::AnimationEnd;
+    evt.frameIndex = controller_.getCurrentFrameIndex();
+    evt.source = this;
+    dispatchEvent(evt);
+  });
+}
+
+void AnimationNode::setFrameChangeCallback(
+    AnimationController::FrameChangeCallback callback) {
+  // 保存外部回调，在 setupControllerCallbacks 中已设置内部回调
+  // 需要重新绑定，将两者合并
+  controller_.setFrameChangeCallback(
+      [this, cb = std::move(callback)](size_t oldIdx, size_t newIdx,
+                                       const AnimationFrame &frame) {
+        if (cb)
+          cb(oldIdx, newIdx, frame);
+        AnimationEvent evt;
+        evt.type = AnimationEventType::FrameChanged;
+        evt.frameIndex = newIdx;
+        evt.previousFrameIndex = oldIdx;
+        evt.source = this;
+        dispatchEvent(evt);
+      });
+}
+
+void AnimationNode::addEventListener(AnimationEventCallback callback) {
+  eventListeners_.push_back(std::move(callback));
+}
+
+// ============================================================================
+// 视觉属性
+// ============================================================================
+
+void AnimationNode::setTintColor(const Color &color) { tintColor_ = color; }
+
+// ============================================================================
+// 碰撞盒
+// ============================================================================
+
+const std::vector<std::array<int32_t, 6>> &
+AnimationNode::getCurrentDamageBoxes() const {
+  auto clip = controller_.getClip();
+  if (!clip || clip->empty())
+    return emptyBoxes_;
+  return clip->getFrame(controller_.getCurrentFrameIndex()).damageBoxes;
+}
+
+const std::vector<std::array<int32_t, 6>> &
+AnimationNode::getCurrentAttackBoxes() const {
+  auto clip = controller_.getClip();
+  if (!clip || clip->empty())
+    return emptyBoxes_;
+  return clip->getFrame(controller_.getCurrentFrameIndex()).attackBoxes;
+}
+
+// ============================================================================
+// 查询
+// ============================================================================
+
+Size AnimationNode::getMaxFrameSize() const {
+  return frameRenderer_.getMaxFrameSize();
+}
+
+Rect AnimationNode::getBoundingBox() const {
+  Size size = frameRenderer_.getMaxFrameSize();
+  Vec2 pos = getPosition();
+  Vec2 anchor = getAnchor();
+  return Rect{{pos.x - size.width * anchor.x, pos.y - size.height * anchor.y},
+              size};
+}
+
+// ============================================================================
+// 生命周期
+// ============================================================================
+
+void AnimationNode::onEnter() {
+  Node::onEnter();
+  if (autoPlay_ && controller_.getClip() && !controller_.getClip()->empty()) {
+    play();
+  }
+}
+
+void AnimationNode::onExit() { Node::onExit(); }
+
+void AnimationNode::onUpdate(float dt) {
+  Node::onUpdate(dt);
+  controller_.update(dt);
+}
+
+void AnimationNode::onDraw(RenderBackend &renderer) {
+  auto clip = controller_.getClip();
+  if (!clip || clip->empty())
+    return;
+
+  size_t idx = controller_.getCurrentFrameIndex();
+  const auto &frame = clip->getFrame(idx);
+  Vec2 pos = getPosition();
+
+  if (controller_.isInterpolating() && idx + 1 < clip->getFrameCount()) {
+    auto props = InterpolationEngine::interpolate(
+        frame, clip->getFrame(idx + 1), controller_.getInterpolationFactor());
+
+    frameRenderer_.renderInterpolated(renderer, frame, idx, props, pos,
+                                      getOpacity(), tintColor_, flipX_, flipY_);
+  } else {
+    frameRenderer_.renderFrame(renderer, frame, idx, pos, getOpacity(),
+                               tintColor_, flipX_, flipY_);
+  }
+}
+
+// ============================================================================
+// 内部方法
+// ============================================================================
+
+void AnimationNode::setupControllerCallbacks() {
+  controller_.setFrameChangeCallback(
+      [this](size_t oldIdx, size_t newIdx, const AnimationFrame &frame) {
+        AnimationEvent evt;
+        evt.type = AnimationEventType::FrameChanged;
+        evt.frameIndex = newIdx;
+        evt.previousFrameIndex = oldIdx;
+        evt.source = this;
+        dispatchEvent(evt);
+      });
+
+  controller_.setSoundTriggerCallback([this](const std::string &path) {
+    AnimationEvent evt;
+    evt.type = AnimationEventType::SoundTrigger;
+    evt.frameIndex = controller_.getCurrentFrameIndex();
+    evt.soundPath = path;
+    evt.source = this;
+    dispatchEvent(evt);
+  });
+}
+
+void AnimationNode::dispatchEvent(const AnimationEvent &event) {
+  for (auto &listener : eventListeners_) {
+    if (listener)
+      listener(event);
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/animation/composite_animation.cpp b/Extra2D/src/animation/composite_animation.cpp
new file mode 100644
index 0000000..07b186a
--- /dev/null
+++ b/Extra2D/src/animation/composite_animation.cpp
@@ -0,0 +1,200 @@
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/animation/composite_animation.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 静态工厂
+// ============================================================================
+
+Ptr<CompositeAnimation> CompositeAnimation::create() {
+  return makePtr<CompositeAnimation>();
+}
+
+Ptr<CompositeAnimation>
+CompositeAnimation::create(const std::string &alsFilePath) {
+  auto comp = makePtr<CompositeAnimation>();
+  comp->loadFromFile(alsFilePath);
+  return comp;
+}
+
+// ============================================================================
+// 加载 ALS 文件
+// ============================================================================
+
+bool CompositeAnimation::loadFromFile(const std::string &alsFilePath) {
+  AlsParser parser;
+  auto result = parser.parse(alsFilePath);
+  if (!result.success)
+    return false;
+
+  // 清除现有图层
+  for (auto &entry : layers_) {
+    if (entry.node) {
+      removeChild(entry.node);
+    }
+  }
+  layers_.clear();
+
+  // 创建每个图层
+  for (const auto &layer : result.layers) {
+    auto node = AnimationNode::create();
+    if (node->loadFromFile(layer.aniPath)) {
+      node->setPosition(layer.offset);
+      addLayer(node, layer.zOrder);
+    }
+  }
+
+  return !layers_.empty();
+}
+
+// ============================================================================
+// 图层管理
+// ============================================================================
+
+void CompositeAnimation::addLayer(Ptr<AnimationNode> node, int zOrder) {
+  if (!node)
+    return;
+
+  node->setZOrder(zOrder);
+  addChild(node);
+  layers_.push_back({node, zOrder});
+}
+
+void CompositeAnimation::removeLayer(size_t index) {
+  if (index >= layers_.size())
+    return;
+
+  auto &entry = layers_[index];
+  if (entry.node) {
+    removeChild(entry.node);
+  }
+  layers_.erase(layers_.begin() + static_cast<ptrdiff_t>(index));
+}
+
+Ptr<AnimationNode> CompositeAnimation::getLayer(size_t index) const {
+  if (index >= layers_.size())
+    return nullptr;
+  return layers_[index].node;
+}
+
+Ptr<AnimationNode> CompositeAnimation::getMainLayer() const {
+  if (layers_.empty())
+    return nullptr;
+  return layers_[0].node;
+}
+
+size_t CompositeAnimation::getLayerCount() const { return layers_.size(); }
+
+// ============================================================================
+// 统一播放控制
+// ============================================================================
+
+void CompositeAnimation::play() {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->play();
+  }
+}
+
+void CompositeAnimation::pause() {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->pause();
+  }
+}
+
+void CompositeAnimation::resume() {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->resume();
+  }
+}
+
+void CompositeAnimation::stop() {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->stop();
+  }
+}
+
+void CompositeAnimation::reset() {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->reset();
+  }
+}
+
+void CompositeAnimation::setPlaybackSpeed(float speed) {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->setPlaybackSpeed(speed);
+  }
+}
+
+void CompositeAnimation::setLooping(bool loop) {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->setLooping(loop);
+  }
+}
+
+bool CompositeAnimation::isPlaying() const {
+  auto main = getMainLayer();
+  return main ? main->isPlaying() : false;
+}
+
+bool CompositeAnimation::isStopped() const {
+  auto main = getMainLayer();
+  return main ? main->isStopped() : true;
+}
+
+// ============================================================================
+// 事件回调（绑定到主图层）
+// ============================================================================
+
+void CompositeAnimation::setKeyframeCallback(KeyframeHitCallback callback) {
+  auto main = getMainLayer();
+  if (main)
+    main->setKeyframeCallback(std::move(callback));
+}
+
+void CompositeAnimation::setCompletionCallback(
+    AnimationCompleteCallback callback) {
+  auto main = getMainLayer();
+  if (main)
+    main->setCompletionCallback(std::move(callback));
+}
+
+void CompositeAnimation::addEventListener(AnimationEventCallback callback) {
+  auto main = getMainLayer();
+  if (main)
+    main->addEventListener(std::move(callback));
+}
+
+// ============================================================================
+// 视觉属性（应用到所有图层）
+// ============================================================================
+
+void CompositeAnimation::setTintColor(const Color &color) {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->setTintColor(color);
+  }
+}
+
+void CompositeAnimation::setFlipX(bool flip) {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->setFlipX(flip);
+  }
+}
+
+void CompositeAnimation::setFlipY(bool flip) {
+  for (auto &entry : layers_) {
+    if (entry.node)
+      entry.node->setFlipY(flip);
+  }
+}
+
+} // namespace extra2d
diff --git a/Easy2D/src/animation/frame_property.cpp b/Extra2D/src/animation/frame_property.cpp
similarity index 60%
rename from Easy2D/src/animation/frame_property.cpp
rename to Extra2D/src/animation/frame_property.cpp
index c290305..8e04bf7 100644
--- a/Easy2D/src/animation/frame_property.cpp
+++ b/Extra2D/src/animation/frame_property.cpp
@@ -1,8 +1,8 @@
-#include <easy2d/animation/frame_property.h>
+#include <extra2d/animation/frame_property.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // FramePropertySet 的实现全部在头文件中以内联方式完成
 // 此文件保留用于未来可能需要的非内联实现
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/animation/frame_renderer.cpp b/Extra2D/src/animation/frame_renderer.cpp
new file mode 100644
index 0000000..d9d25a4
--- /dev/null
+++ b/Extra2D/src/animation/frame_renderer.cpp
@@ -0,0 +1,168 @@
+#include <extra2d/animation/frame_renderer.h>
+#include <extra2d/graphics/texture.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 预加载
+// ============================================================================
+
+bool FrameRenderer::preloadFrames(const std::vector<AnimationFrame> &frames) {
+  releaseFrames();
+  spriteFrames_.reserve(frames.size());
+  maxFrameSize_ = Size{0.0f, 0.0f};
+
+  for (const auto &frame : frames) {
+    Ptr<SpriteFrame> sf = frame.spriteFrame;
+
+    // 如果帧自身没有 SpriteFrame，尝试通过缓存获取
+    if (!sf && !frame.texturePath.empty()) {
+      sf = SpriteFrameCache::getInstance().getOrCreateFromFile(
+          frame.texturePath, frame.textureIndex);
+    }
+
+    spriteFrames_.push_back(sf);
+
+    // 更新最大帧尺寸
+    if (sf && sf->isValid()) {
+      const auto &rect = sf->getRect();
+      if (rect.size.width > maxFrameSize_.width)
+        maxFrameSize_.width = rect.size.width;
+      if (rect.size.height > maxFrameSize_.height)
+        maxFrameSize_.height = rect.size.height;
+    }
+  }
+
+  return true;
+}
+
+void FrameRenderer::releaseFrames() {
+  spriteFrames_.clear();
+  maxFrameSize_ = Size{0.0f, 0.0f};
+}
+
+// ============================================================================
+// 渲染当前帧
+// ============================================================================
+
+void FrameRenderer::renderFrame(RenderBackend &renderer,
+                                const AnimationFrame &frame, size_t frameIndex,
+                                const Vec2 &position, float nodeOpacity,
+                                const Color &tintColor, bool flipX,
+                                bool flipY) {
+  if (frameIndex >= spriteFrames_.size())
+    return;
+
+  auto sf = spriteFrames_[frameIndex];
+  if (!sf || !sf->isValid())
+    return;
+
+  BlendMode blend = mapBlendMode(frame.properties);
+  Vec2 scale = frame.getEffectiveScale();
+  float rotation = frame.getEffectiveRotation();
+  Color frameColor = frame.getEffectiveColor();
+
+  // 合并帧颜色和节点染色
+  Color finalTint{tintColor.r * frameColor.r, tintColor.g * frameColor.g,
+                  tintColor.b * frameColor.b,
+                  tintColor.a * frameColor.a * nodeOpacity};
+
+  drawSpriteFrame(renderer, sf, position, frame.offset, scale, rotation, 1.0f,
+                  finalTint, flipX, flipY, blend);
+}
+
+// ============================================================================
+// 渲染插值帧
+// ============================================================================
+
+void FrameRenderer::renderInterpolated(
+    RenderBackend &renderer, const AnimationFrame &fromFrame, size_t fromIndex,
+    const InterpolatedProperties &props, const Vec2 &position,
+    float nodeOpacity, const Color &tintColor, bool flipX, bool flipY) {
+  if (fromIndex >= spriteFrames_.size())
+    return;
+
+  auto sf = spriteFrames_[fromIndex];
+  if (!sf || !sf->isValid())
+    return;
+
+  BlendMode blend = mapBlendMode(fromFrame.properties);
+
+  Color finalTint{tintColor.r * props.color.r, tintColor.g * props.color.g,
+                  tintColor.b * props.color.b,
+                  tintColor.a * props.color.a * nodeOpacity};
+
+  drawSpriteFrame(renderer, sf, position, props.position, props.scale,
+                  props.rotation, 1.0f, finalTint, flipX, flipY, blend);
+}
+
+// ============================================================================
+// 混合模式映射
+// ============================================================================
+
+BlendMode FrameRenderer::mapBlendMode(const FramePropertySet &props) {
+  if (props.has(FramePropertyKey::BlendAdditive)) {
+    auto val = props.get<bool>(FramePropertyKey::BlendAdditive);
+    if (val.has_value() && val.value())
+      return BlendMode::Additive;
+  }
+  if (props.has(FramePropertyKey::BlendLinearDodge)) {
+    auto val = props.get<bool>(FramePropertyKey::BlendLinearDodge);
+    if (val.has_value() && val.value())
+      return BlendMode::Additive; // 线性减淡 ≈ 加法混合
+  }
+  return BlendMode::Alpha;
+}
+
+// ============================================================================
+// 查询
+// ============================================================================
+
+Ptr<SpriteFrame> FrameRenderer::getSpriteFrame(size_t frameIndex) const {
+  if (frameIndex >= spriteFrames_.size())
+    return nullptr;
+  return spriteFrames_[frameIndex];
+}
+
+// ============================================================================
+// 内部绘制
+// ============================================================================
+
+void FrameRenderer::drawSpriteFrame(RenderBackend &renderer,
+                                    Ptr<SpriteFrame> sf, const Vec2 &position,
+                                    const Vec2 &offset, const Vec2 &scale,
+                                    float rotation, float opacity,
+                                    const Color &tint, bool flipX, bool flipY,
+                                    BlendMode blend) {
+  if (!sf || !sf->isValid())
+    return;
+
+  auto texture = sf->getTexture();
+  if (!texture)
+    return;
+
+  renderer.setBlendMode(blend);
+
+  const Rect &srcRect = sf->getRect();
+
+  // 计算目标矩形
+  float w = srcRect.size.width * std::abs(scale.x);
+  float h = srcRect.size.height * std::abs(scale.y);
+
+  Vec2 finalPos{position.x + offset.x, position.y + offset.y};
+
+  // 处理翻转（通过缩放符号）
+  float flipScaleX = flipX ? -1.0f : 1.0f;
+  float flipScaleY = flipY ? -1.0f : 1.0f;
+
+  Rect destRect{
+      {finalPos.x - w * 0.5f * flipScaleX, finalPos.y - h * 0.5f * flipScaleY},
+      {w, h}};
+
+  Color finalColor{tint.r, tint.g, tint.b, tint.a * opacity};
+
+  renderer.drawSprite(*texture, destRect, srcRect, finalColor, rotation,
+                      Vec2{0.5f, 0.5f});
+}
+
+} // namespace extra2d
diff --git a/Easy2D/src/animation/interpolation_engine.cpp b/Extra2D/src/animation/interpolation_engine.cpp
similarity index 60%
rename from Easy2D/src/animation/interpolation_engine.cpp
rename to Extra2D/src/animation/interpolation_engine.cpp
index 52826af..d0799bc 100644
--- a/Easy2D/src/animation/interpolation_engine.cpp
+++ b/Extra2D/src/animation/interpolation_engine.cpp
@@ -1,8 +1,8 @@
-#include <easy2d/animation/interpolation_engine.h>
+#include <extra2d/animation/interpolation_engine.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // InterpolationEngine 的实现全部在头文件中以静态内联方式完成
 // 此文件保留用于未来可能需要的非内联实现
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/src/animation/sprite_frame.cpp b/Extra2D/src/animation/sprite_frame.cpp
similarity index 60%
rename from Easy2D/src/animation/sprite_frame.cpp
rename to Extra2D/src/animation/sprite_frame.cpp
index 2bb01c1..2b72137 100644
--- a/Easy2D/src/animation/sprite_frame.cpp
+++ b/Extra2D/src/animation/sprite_frame.cpp
@@ -1,8 +1,8 @@
-#include <easy2d/animation/sprite_frame.h>
+#include <extra2d/animation/sprite_frame.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // SpriteFrame 的实现全部在头文件中以内联方式完成
 // 此文件保留用于未来可能需要的非内联实现
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/src/animation/sprite_frame_cache.cpp b/Extra2D/src/animation/sprite_frame_cache.cpp
similarity index 59%
rename from Easy2D/src/animation/sprite_frame_cache.cpp
rename to Extra2D/src/animation/sprite_frame_cache.cpp
index adbf20a..0a08b67 100644
--- a/Easy2D/src/animation/sprite_frame_cache.cpp
+++ b/Extra2D/src/animation/sprite_frame_cache.cpp
@@ -1,8 +1,8 @@
-#include <easy2d/animation/sprite_frame_cache.h>
+#include <extra2d/animation/sprite_frame_cache.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // SpriteFrameCache 的实现全部在头文件中以内联方式完成
 // 此文件保留用于未来可能需要的非内联实现
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/app/application.cpp b/Extra2D/src/app/application.cpp
new file mode 100644
index 0000000..dbdacb5
--- /dev/null
+++ b/Extra2D/src/app/application.cpp
@@ -0,0 +1,306 @@
+#include <extra2d/app/application.h>
+#include <extra2d/audio/audio_engine.h>
+#include <extra2d/event/event_dispatcher.h>
+#include <extra2d/event/event_queue.h>
+#include <extra2d/graphics/camera.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/vram_manager.h>
+#include <extra2d/platform/input.h>
+#include <extra2d/platform/window.h>
+#include <extra2d/resource/resource_manager.h>
+#include <extra2d/scene/scene_manager.h>
+#include <extra2d/utils/logger.h>
+#include <extra2d/utils/timer.h>
+
+#include <chrono>
+#include <switch.h>
+#include <thread>
+#include <time.h>
+
+namespace extra2d {
+
+// 获取当前时间（秒）
+static double getTimeSeconds() {
+  struct timespec ts;
+  clock_gettime(CLOCK_MONOTONIC, &ts);
+  return static_cast<double>(ts.tv_sec) +
+         static_cast<double>(ts.tv_nsec) / 1000000000.0;
+}
+
+Application &Application::instance() {
+  static Application instance;
+  return instance;
+}
+
+Application::~Application() { shutdown(); }
+
+bool Application::init(const AppConfig &config) {
+  if (initialized_) {
+    E2D_LOG_WARN("Application already initialized");
+    return true;
+  }
+
+  config_ = config;
+
+  // ========================================
+  // 1. 初始化 RomFS 文件系统（必须在 SDL_Init 之前）
+  // ========================================
+  Result rc;
+  rc = romfsInit();
+  if (R_SUCCEEDED(rc)) {
+    E2D_LOG_INFO("RomFS initialized successfully");
+  } else {
+    E2D_LOG_WARN("romfsInit failed: {:#08X}, will use regular filesystem", rc);
+  }
+
+  // ========================================
+  // 2. 初始化 nxlink 调试输出（可选）
+  // ========================================
+  rc = socketInitializeDefault();
+  if (R_FAILED(rc)) {
+    E2D_LOG_WARN(
+        "socketInitializeDefault failed, nxlink will not be available");
+  }
+
+  // ========================================
+  // 3. 创建窗口（包含 SDL_Init + GLES 3.2 上下文创建）
+  // ========================================
+  window_ = makeUnique<Window>();
+  WindowConfig winConfig;
+  winConfig.title = config.title;
+  winConfig.width = 1280;
+  winConfig.height = 720;
+  winConfig.fullscreen = true;
+  winConfig.resizable = false;
+  winConfig.vsync = config.vsync;
+  winConfig.msaaSamples = config.msaaSamples;
+
+  if (!window_->create(winConfig)) {
+    E2D_LOG_ERROR("Failed to create window");
+    return false;
+  }
+
+  // ========================================
+  // 4. 初始化渲染器
+  // ========================================
+  renderer_ = RenderBackend::create(config.renderBackend);
+  if (!renderer_ || !renderer_->init(window_.get())) {
+    E2D_LOG_ERROR("Failed to initialize renderer");
+    window_->destroy();
+    return false;
+  }
+
+  // ========================================
+  // 5. 初始化其他子系统
+  // ========================================
+  sceneManager_ = makeUnique<SceneManager>();
+  resourceManager_ = makeUnique<ResourceManager>();
+  timerManager_ = makeUnique<TimerManager>();
+  eventQueue_ = makeUnique<EventQueue>();
+  eventDispatcher_ = makeUnique<EventDispatcher>();
+  camera_ = makeUnique<Camera>(0, static_cast<float>(window_->getWidth()),
+                               static_cast<float>(window_->getHeight()), 0);
+
+  // 窗口大小回调（Switch 上不会触发，但保留接口）
+  window_->setResizeCallback([this](int width, int height) {
+    if (camera_) {
+      camera_->setViewport(0, static_cast<float>(width),
+                           static_cast<float>(height), 0);
+    }
+    if (sceneManager_) {
+      auto currentScene = sceneManager_->getCurrentScene();
+      if (currentScene) {
+        currentScene->setViewportSize(static_cast<float>(width),
+                                      static_cast<float>(height));
+      }
+    }
+  });
+
+  // 初始化音频引擎
+  AudioEngine::getInstance().initialize();
+
+  // 添加 romfs:/ 到资源搜索路径
+  resourceManager_->addSearchPath("romfs:/");
+
+  initialized_ = true;
+  running_ = true;
+
+  E2D_LOG_INFO("Application initialized successfully");
+  return true;
+}
+
+void Application::shutdown() {
+  if (!initialized_)
+    return;
+
+  E2D_LOG_INFO("Shutting down application...");
+
+  // 打印 VRAM 统计
+  VRAMManager::getInstance().printStats();
+
+  // 清理子系统
+  sceneManager_.reset();
+  resourceManager_.reset();
+  timerManager_.reset();
+  eventQueue_.reset();
+  eventDispatcher_.reset();
+  camera_.reset();
+
+  // 关闭音频
+  AudioEngine::getInstance().shutdown();
+
+  // 关闭渲染器
+  if (renderer_) {
+    renderer_->shutdown();
+    renderer_.reset();
+  }
+
+  // 销毁窗口（包含 SDL_Quit）
+  if (window_) {
+    window_->destroy();
+    window_.reset();
+  }
+
+  // Switch 清理
+  romfsExit();
+  socketExit();
+
+  initialized_ = false;
+  running_ = false;
+
+  E2D_LOG_INFO("Application shutdown complete");
+}
+
+void Application::run() {
+  if (!initialized_) {
+    E2D_LOG_ERROR("Application not initialized");
+    return;
+  }
+
+  lastFrameTime_ = getTimeSeconds();
+
+  // SDL2 on Switch 内部已处理 appletMainLoop
+  while (running_ && !window_->shouldClose()) {
+    mainLoop();
+  }
+}
+
+void Application::quit() {
+  shouldQuit_ = true;
+  running_ = false;
+}
+
+void Application::pause() {
+  if (!paused_) {
+    paused_ = true;
+    E2D_LOG_INFO("Application paused");
+  }
+}
+
+void Application::resume() {
+  if (paused_) {
+    paused_ = false;
+    lastFrameTime_ = getTimeSeconds();
+    E2D_LOG_INFO("Application resumed");
+  }
+}
+
+void Application::mainLoop() {
+  // 计算 delta time
+  double currentTime = getTimeSeconds();
+  deltaTime_ = static_cast<float>(currentTime - lastFrameTime_);
+  lastFrameTime_ = currentTime;
+
+  totalTime_ += deltaTime_;
+
+  // 计算 FPS
+  frameCount_++;
+  fpsTimer_ += deltaTime_;
+  if (fpsTimer_ >= 1.0f) {
+    currentFps_ = frameCount_;
+    frameCount_ = 0;
+    fpsTimer_ -= 1.0f;
+  }
+
+  // 处理窗口事件（SDL_PollEvent + 输入更新）
+  window_->pollEvents();
+
+  // 处理事件队列
+  if (eventDispatcher_ && eventQueue_) {
+    eventDispatcher_->processQueue(*eventQueue_);
+  }
+
+  // 更新
+  if (!paused_) {
+    update();
+  }
+
+  // 渲染
+  render();
+
+  if (!config_.vsync && config_.fpsLimit > 0) {
+    double frameEndTime = getTimeSeconds();
+    double frameTime = frameEndTime - currentTime;
+    double target = 1.0 / static_cast<double>(config_.fpsLimit);
+    if (frameTime < target) {
+      auto sleepSeconds = target - frameTime;
+      std::this_thread::sleep_for(std::chrono::duration<double>(sleepSeconds));
+    }
+  }
+}
+
+void Application::update() {
+  if (timerManager_) {
+    timerManager_->update(deltaTime_);
+  }
+
+  if (sceneManager_) {
+    sceneManager_->update(deltaTime_);
+  }
+}
+
+void Application::render() {
+  if (!renderer_) {
+    E2D_LOG_ERROR("Render failed: renderer is null");
+    return;
+  }
+
+  renderer_->setViewport(0, 0, window_->getWidth(), window_->getHeight());
+
+  if (sceneManager_) {
+    sceneManager_->render(*renderer_);
+  } else {
+    E2D_LOG_WARN("Render: sceneManager is null");
+  }
+
+  window_->swapBuffers();
+}
+
+Input &Application::input() { return *window_->getInput(); }
+
+AudioEngine &Application::audio() { return AudioEngine::getInstance(); }
+
+SceneManager &Application::scenes() { return *sceneManager_; }
+
+ResourceManager &Application::resources() { return *resourceManager_; }
+
+TimerManager &Application::timers() { return *timerManager_; }
+
+EventQueue &Application::eventQueue() { return *eventQueue_; }
+
+EventDispatcher &Application::eventDispatcher() { return *eventDispatcher_; }
+
+Camera &Application::camera() { return *camera_; }
+
+void Application::enterScene(Ptr<Scene> scene) { enterScene(scene, nullptr); }
+
+void Application::enterScene(Ptr<Scene> scene,
+                             Ptr<class Transition> transition) {
+  if (sceneManager_ && scene) {
+    scene->setViewportSize(static_cast<float>(window_->getWidth()),
+                           static_cast<float>(window_->getHeight()));
+    sceneManager_->enterScene(scene, transition);
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/audio/audio_engine.cpp b/Extra2D/src/audio/audio_engine.cpp
new file mode 100644
index 0000000..cc7f6f1
--- /dev/null
+++ b/Extra2D/src/audio/audio_engine.cpp
@@ -0,0 +1,134 @@
+#include "extra2d/audio/audio_engine.h"
+#include "extra2d/audio/sound.h"
+#include "extra2d/utils/logger.h"
+
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_mixer.h>
+
+namespace extra2d {
+
+AudioEngine &AudioEngine::getInstance() {
+  static AudioEngine instance;
+  return instance;
+}
+
+AudioEngine::~AudioEngine() { shutdown(); }
+
+bool AudioEngine::initialize() {
+  if (initialized_) {
+    return true;
+  }
+
+  // 初始化 SDL 音频子系统
+  if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
+    E2D_LOG_ERROR("Failed to initialize SDL audio: {}", SDL_GetError());
+    return false;
+  }
+
+  // 打开音频设备
+  if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 4096) < 0) {
+    E2D_LOG_ERROR("Failed to open audio: {}", Mix_GetError());
+    SDL_QuitSubSystem(SDL_INIT_AUDIO);
+    return false;
+  }
+
+  // 分配混音通道
+  Mix_AllocateChannels(32);
+
+  initialized_ = true;
+  E2D_LOG_INFO("AudioEngine initialized successfully (SDL2_mixer)");
+  return true;
+}
+
+void AudioEngine::shutdown() {
+  if (!initialized_) {
+    return;
+  }
+
+  unloadAllSounds();
+
+  Mix_CloseAudio();
+  SDL_QuitSubSystem(SDL_INIT_AUDIO);
+
+  initialized_ = false;
+  E2D_LOG_INFO("AudioEngine shutdown");
+}
+
+std::shared_ptr<Sound> AudioEngine::loadSound(const std::string &filePath) {
+  return loadSound(filePath, filePath);
+}
+
+std::shared_ptr<Sound> AudioEngine::loadSound(const std::string &name,
+                                              const std::string &filePath) {
+  if (!initialized_) {
+    E2D_LOG_ERROR("AudioEngine not initialized");
+    return nullptr;
+  }
+
+  // 检查是否已存在
+  auto it = sounds_.find(name);
+  if (it != sounds_.end()) {
+    return it->second;
+  }
+
+  Mix_Chunk *chunk = Mix_LoadWAV(filePath.c_str());
+  if (!chunk) {
+    E2D_LOG_ERROR("Failed to load sound: {} ({})", filePath, Mix_GetError());
+    return nullptr;
+  }
+
+  auto sound = std::shared_ptr<Sound>(new Sound(name, filePath, chunk));
+  sounds_[name] = sound;
+
+  E2D_LOG_DEBUG("Loaded sound: {}", filePath);
+  return sound;
+}
+
+std::shared_ptr<Sound> AudioEngine::getSound(const std::string &name) {
+  auto it = sounds_.find(name);
+  if (it != sounds_.end()) {
+    return it->second;
+  }
+  return nullptr;
+}
+
+void AudioEngine::unloadSound(const std::string &name) {
+  auto it = sounds_.find(name);
+  if (it != sounds_.end()) {
+    sounds_.erase(it);
+    E2D_LOG_DEBUG("Unloaded sound: {}", name);
+  }
+}
+
+void AudioEngine::unloadAllSounds() {
+  stopAll();
+  sounds_.clear();
+  E2D_LOG_DEBUG("Unloaded all sounds");
+}
+
+void AudioEngine::setMasterVolume(float volume) {
+  masterVolume_ = volume;
+  int mixVol = static_cast<int>(volume * MIX_MAX_VOLUME);
+  Mix_Volume(-1, mixVol);  // 所有通道
+  Mix_VolumeMusic(mixVol); // 音乐
+}
+
+float AudioEngine::getMasterVolume() const { return masterVolume_; }
+
+void AudioEngine::pauseAll() {
+  Mix_Pause(-1); // 暂停所有通道
+}
+
+void AudioEngine::resumeAll() {
+  Mix_Resume(-1); // 恢复所有通道
+}
+
+void AudioEngine::stopAll() {
+  for (auto &pair : sounds_) {
+    if (pair.second) {
+      pair.second->stop();
+    }
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/audio/sound.cpp b/Extra2D/src/audio/sound.cpp
new file mode 100644
index 0000000..197938a
--- /dev/null
+++ b/Extra2D/src/audio/sound.cpp
@@ -0,0 +1,113 @@
+#include <SDL2/SDL_mixer.h>
+#include <extra2d/audio/sound.h>
+
+namespace extra2d {
+
+Sound::Sound(const std::string &name, const std::string &filePath,
+             Mix_Chunk *chunk)
+    : name_(name), filePath_(filePath), chunk_(chunk) {}
+
+Sound::~Sound() {
+  if (channel_ >= 0) {
+    Mix_HaltChannel(channel_);
+    channel_ = -1;
+  }
+  if (chunk_) {
+    Mix_FreeChunk(chunk_);
+    chunk_ = nullptr;
+  }
+}
+
+bool Sound::play() {
+  if (!chunk_) {
+    return false;
+  }
+
+  // 如果已在播放，先停止
+  if (channel_ >= 0 && Mix_Playing(channel_)) {
+    Mix_HaltChannel(channel_);
+  }
+
+  int loops = looping_ ? -1 : 0;
+  channel_ = Mix_PlayChannel(-1, chunk_, loops); // -1 = 自动分配通道
+
+  if (channel_ < 0) {
+    return false;
+  }
+
+  // 设置音量
+  int mixVol = static_cast<int>(volume_ * MIX_MAX_VOLUME);
+  Mix_Volume(channel_, mixVol);
+
+  return true;
+}
+
+void Sound::pause() {
+  if (channel_ >= 0) {
+    Mix_Pause(channel_);
+  }
+}
+
+void Sound::resume() {
+  if (channel_ >= 0) {
+    Mix_Resume(channel_);
+  }
+}
+
+void Sound::stop() {
+  if (channel_ >= 0) {
+    Mix_HaltChannel(channel_);
+    channel_ = -1;
+  }
+}
+
+bool Sound::isPlaying() const {
+  if (channel_ < 0) {
+    return false;
+  }
+  return Mix_Playing(channel_) && !Mix_Paused(channel_);
+}
+
+bool Sound::isPaused() const {
+  if (channel_ < 0) {
+    return false;
+  }
+  return Mix_Paused(channel_) != 0;
+}
+
+void Sound::setVolume(float volume) {
+  volume_ = volume;
+  if (channel_ >= 0) {
+    int mixVol = static_cast<int>(volume * MIX_MAX_VOLUME);
+    Mix_Volume(channel_, mixVol);
+  }
+}
+
+void Sound::setLooping(bool looping) {
+  looping_ = looping;
+  // SDL_mixer 的循环在播放时设置，运行中无法更改
+  // 如果需要即时生效，需要重新播放
+}
+
+void Sound::setPitch(float pitch) {
+  pitch_ = pitch;
+  // SDL2_mixer 不直接支持变速播放
+  // 需要更高级的音频处理才能实现
+}
+
+float Sound::getDuration() const {
+  // SDL2_mixer 没有直接获取时长的 API
+  // 返回 0 表示不支持
+  return 0.0f;
+}
+
+float Sound::getCursor() const {
+  // SDL2_mixer 没有直接获取播放位置的 API
+  return 0.0f;
+}
+
+void Sound::setCursor(float /*seconds*/) {
+  // SDL2_mixer 不支持 seek 到特定位置 (对 chunks)
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/core/string.cpp b/Extra2D/src/core/string.cpp
new file mode 100644
index 0000000..ba6f7d6
--- /dev/null
+++ b/Extra2D/src/core/string.cpp
@@ -0,0 +1,218 @@
+#include <cstdint>
+#include <cstring>
+#include <extra2d/core/string.h>
+
+namespace extra2d {
+
+// ============================================================================
+// GBK/GB2312 到 UTF-8 转换表
+// 使用简化的转换表，覆盖常用中文字符
+// ============================================================================
+
+// GBK 编码范围：
+// - 单字节：0x00-0x7F (ASCII)
+// - 双字节：0x81-0xFE 0x40-0xFE
+
+// 将 GBK 双字节解码为 Unicode 码点
+// 这是简化的实现，使用 GBK 到 Unicode 的映射公式
+static uint32_t gbkToUnicode(uint16_t gbkCode) {
+  // GBK 编码转 Unicode 的简化算法
+  // 对于常见汉字，使用近似转换
+
+  uint8_t high = (gbkCode >> 8) & 0xFF;
+  uint8_t low = gbkCode & 0xFF;
+
+  // ASCII 范围
+  if (high < 0x80) {
+    return high;
+  }
+
+  // GBK 双字节范围
+  if (high >= 0x81 && high <= 0xFE && low >= 0x40 && low <= 0xFE) {
+    // GBK 到 Unicode 的偏移计算（近似）
+    // GB2312 区域：0xB0A1-0xF7FE -> Unicode 0x4E00-0x9FA5
+    if (high >= 0xB0 && high <= 0xF7 && low >= 0xA1 && low <= 0xFE) {
+      uint32_t area = high - 0xB0;
+      uint32_t pos = low - 0xA1;
+      return 0x4E00 + area * 94 + pos;
+    }
+
+    // 其他 GBK 区域使用线性映射
+    uint32_t gbkOffset = (high - 0x81) * 190 + (low - 0x40);
+    if (low > 0x7F) {
+      gbkOffset--;
+    }
+
+    // 映射到扩展 Unicode 区域
+    return 0x4E00 + (gbkOffset % 0x51A5);
+  }
+
+  // 无效字符返回替换字符
+  return 0xFFFD;
+}
+
+// 将 Unicode 码点编码为 UTF-8
+static std::string unicodeToUtf8(uint32_t codepoint) {
+  std::string result;
+
+  if (codepoint <= 0x7F) {
+    // 1-byte
+    result.push_back(static_cast<char>(codepoint));
+  } else if (codepoint <= 0x7FF) {
+    // 2-byte
+    result.push_back(static_cast<char>(0xC0 | ((codepoint >> 6) & 0x1F)));
+    result.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
+  } else if (codepoint <= 0xFFFF) {
+    // 3-byte
+    result.push_back(static_cast<char>(0xE0 | ((codepoint >> 12) & 0x0F)));
+    result.push_back(static_cast<char>(0x80 | ((codepoint >> 6) & 0x3F)));
+    result.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
+  } else if (codepoint <= 0x10FFFF) {
+    // 4-byte
+    result.push_back(static_cast<char>(0xF0 | ((codepoint >> 18) & 0x07)));
+    result.push_back(static_cast<char>(0x80 | ((codepoint >> 12) & 0x3F)));
+    result.push_back(static_cast<char>(0x80 | ((codepoint >> 6) & 0x3F)));
+    result.push_back(static_cast<char>(0x80 | (codepoint & 0x3F)));
+  }
+
+  return result;
+}
+
+// 将 UTF-8 解码为 Unicode 码点
+// 返回解码后的码点和消耗的 UTF-8 字节数
+static std::pair<uint32_t, size_t> utf8ToUnicode(const char *utf8) {
+  unsigned char byte = static_cast<unsigned char>(*utf8);
+
+  if ((byte & 0x80) == 0) {
+    // 1-byte
+    return {byte, 1};
+  } else if ((byte & 0xE0) == 0xC0) {
+    // 2-byte
+    uint32_t ch = (byte & 0x1F) << 6;
+    ch |= (static_cast<unsigned char>(utf8[1]) & 0x3F);
+    return {ch, 2};
+  } else if ((byte & 0xF0) == 0xE0) {
+    // 3-byte
+    uint32_t ch = (byte & 0x0F) << 12;
+    ch |= (static_cast<unsigned char>(utf8[1]) & 0x3F) << 6;
+    ch |= (static_cast<unsigned char>(utf8[2]) & 0x3F);
+    return {ch, 3};
+  } else if ((byte & 0xF8) == 0xF0) {
+    // 4-byte
+    uint32_t ch = (byte & 0x07) << 18;
+    ch |= (static_cast<unsigned char>(utf8[1]) & 0x3F) << 12;
+    ch |= (static_cast<unsigned char>(utf8[2]) & 0x3F) << 6;
+    ch |= (static_cast<unsigned char>(utf8[3]) & 0x3F);
+    return {ch, 4};
+  }
+
+  // Invalid UTF-8
+  return {0xFFFD, 1};
+}
+
+// 将 Unicode 码点编码为 GBK 双字节
+static uint16_t unicodeToGbk(uint32_t unicode) {
+  // ASCII 范围
+  if (unicode <= 0x7F) {
+    return static_cast<uint16_t>(unicode);
+  }
+
+  // CJK Unified Ideographs (U+4E00 - U+9FA5) -> GB2312
+  if (unicode >= 0x4E00 && unicode <= 0x9FA5) {
+    uint32_t offset = unicode - 0x4E00;
+    uint32_t area = offset / 94;
+    uint32_t pos = offset % 94;
+
+    uint8_t high = static_cast<uint8_t>(0xB0 + area);
+    uint8_t low = static_cast<uint8_t>(0xA1 + pos);
+
+    return (static_cast<uint16_t>(high) << 8) | low;
+  }
+
+  // 其他字符无法转换，返回 '?'
+  return 0x3F;
+}
+
+// ============================================================================
+// String 类 GBK 转换实现
+// ============================================================================
+
+String String::fromGBK(const char *gbk) {
+  if (!gbk || std::strlen(gbk) == 0) {
+    return String();
+  }
+
+  return fromGBK(std::string(gbk));
+}
+
+String String::fromGBK(const std::string &gbk) {
+  if (gbk.empty()) {
+    return String();
+  }
+
+  std::string utf8Result;
+  utf8Result.reserve(gbk.size() * 2); // 预估 UTF-8 可能比 GBK 大
+
+  size_t i = 0;
+  while (i < gbk.size()) {
+    unsigned char byte = static_cast<unsigned char>(gbk[i]);
+
+    if (byte < 0x80) {
+      // ASCII 字符，直接复制
+      utf8Result.push_back(static_cast<char>(byte));
+      i++;
+    } else if (i + 1 < gbk.size()) {
+      // GBK 双字节字符
+      uint8_t high = byte;
+      uint8_t low = static_cast<unsigned char>(gbk[i + 1]);
+      uint16_t gbkCode = (static_cast<uint16_t>(high) << 8) | low;
+
+      uint32_t unicode = gbkToUnicode(gbkCode);
+      utf8Result += unicodeToUtf8(unicode);
+
+      i += 2;
+    } else {
+      // 不完整的 GBK 字符，跳过
+      i++;
+    }
+  }
+
+  return String(utf8Result);
+}
+
+std::string String::toGBK() const {
+  if (data_.empty()) {
+    return std::string();
+  }
+
+  std::string gbkResult;
+  gbkResult.reserve(data_.size()); // 预估 GBK 可能更小或与 UTF-8 相当
+
+  size_t i = 0;
+  while (i < data_.size()) {
+    auto [unicode, bytes] = utf8ToUnicode(data_.c_str() + i);
+
+    if (unicode <= 0x7F) {
+      // ASCII 字符
+      gbkResult.push_back(static_cast<char>(unicode));
+    } else {
+      // 转换为 GBK 双字节
+      uint16_t gbkCode = unicodeToGbk(unicode);
+
+      if (gbkCode > 0xFF) {
+        // 双字节 GBK
+        gbkResult.push_back(static_cast<char>((gbkCode >> 8) & 0xFF));
+        gbkResult.push_back(static_cast<char>(gbkCode & 0xFF));
+      } else {
+        // 单字节（ASCII）
+        gbkResult.push_back(static_cast<char>(gbkCode));
+      }
+    }
+
+    i += bytes;
+  }
+
+  return gbkResult;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/effects/custom_effect_manager.cpp b/Extra2D/src/effects/custom_effect_manager.cpp
new file mode 100644
index 0000000..5c9114e
--- /dev/null
+++ b/Extra2D/src/effects/custom_effect_manager.cpp
@@ -0,0 +1,918 @@
+#include <extra2d/effects/custom_effect_manager.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <json/json.hpp>
+#include <sstream>
+
+namespace extra2d {
+
+using json = nlohmann::json;
+
+// ============================================================================
+// JSON序列化辅助函数
+// ============================================================================
+
+/**
+ * @brief 将Vec2转换为JSON数组
+ */
+static json vec2ToJson(const Vec2 &v) { return json::array({v.x, v.y}); }
+
+/**
+ * @brief 从JSON数组解析Vec2
+ */
+static Vec2 jsonToVec2(const json &j) {
+  if (j.is_array() && j.size() >= 2) {
+    return Vec2(j[0].get<float>(), j[1].get<float>());
+  }
+  return Vec2();
+}
+
+/**
+ * @brief 将Color转换为JSON数组
+ */
+static json colorToJson(const Color &c) {
+  return json::array({c.r, c.g, c.b, c.a});
+}
+
+/**
+ * @brief 从JSON数组解析Color
+ */
+static Color jsonToColor(const json &j) {
+  if (j.is_array() && j.size() >= 4) {
+    return Color(j[0].get<float>(), j[1].get<float>(), j[2].get<float>(),
+                 j[3].get<float>());
+  }
+  return Colors::White;
+}
+
+/**
+ * @brief 将EmitterConfig转换为JSON
+ */
+static json emitterConfigToJson(const EmitterConfig &config) {
+  json j;
+  j["emissionRate"] = config.emissionRate;
+  j["life"] = json::array({config.minLife, config.maxLife});
+  j["startSize"] = json::array({config.minStartSize, config.maxStartSize});
+  j["endSize"] = json::array({config.minEndSize, config.maxEndSize});
+  j["velocity"] = json::object({{"min", vec2ToJson(config.minVelocity)},
+                                {"max", vec2ToJson(config.maxVelocity)}});
+  j["acceleration"] = vec2ToJson(config.acceleration);
+  j["startColor"] = colorToJson(config.startColor);
+  j["endColor"] = colorToJson(config.endColor);
+  j["blendMode"] = static_cast<int>(config.blendMode);
+  j["shape"] = static_cast<int>(config.shape);
+  j["shapeRadius"] = config.shapeRadius;
+  return j;
+}
+
+/**
+ * @brief 从JSON解析EmitterConfig
+ */
+static EmitterConfig jsonToEmitterConfig(const json &j) {
+  EmitterConfig config;
+
+  if (j.contains("emissionRate")) {
+    config.emissionRate = j["emissionRate"].get<float>();
+  }
+  if (j.contains("life") && j["life"].is_array() && j["life"].size() >= 2) {
+    config.minLife = j["life"][0].get<float>();
+    config.maxLife = j["life"][1].get<float>();
+  }
+  if (j.contains("startSize") && j["startSize"].is_array() &&
+      j["startSize"].size() >= 2) {
+    config.minStartSize = j["startSize"][0].get<float>();
+    config.maxStartSize = j["startSize"][1].get<float>();
+  }
+  if (j.contains("endSize") && j["endSize"].is_array() &&
+      j["endSize"].size() >= 2) {
+    config.minEndSize = j["endSize"][0].get<float>();
+    config.maxEndSize = j["endSize"][1].get<float>();
+  }
+  if (j.contains("velocity")) {
+    const auto &vel = j["velocity"];
+    if (vel.contains("min")) {
+      config.minVelocity = jsonToVec2(vel["min"]);
+    }
+    if (vel.contains("max")) {
+      config.maxVelocity = jsonToVec2(vel["max"]);
+    }
+  }
+  if (j.contains("acceleration")) {
+    config.acceleration = jsonToVec2(j["acceleration"]);
+  }
+  if (j.contains("startColor")) {
+    config.startColor = jsonToColor(j["startColor"]);
+  }
+  if (j.contains("endColor")) {
+    config.endColor = jsonToColor(j["endColor"]);
+  }
+  if (j.contains("blendMode")) {
+    config.blendMode = static_cast<BlendMode>(j["blendMode"].get<int>());
+  }
+  if (j.contains("shape")) {
+    config.shape = static_cast<EmitterConfig::Shape>(j["shape"].get<int>());
+  }
+  if (j.contains("shapeRadius")) {
+    config.shapeRadius = j["shapeRadius"].get<float>();
+  }
+
+  return config;
+}
+
+/**
+ * @brief 将CustomEffectConfig转换为JSON
+ */
+static json effectConfigToJson(const CustomEffectConfig &config) {
+  json j;
+  j["name"] = config.name;
+  j["type"] = static_cast<int>(config.type);
+  j["description"] = config.description;
+  j["duration"] = config.duration;
+  j["loop"] = config.loop;
+  j["delay"] = config.delay;
+
+  if (config.type == CustomEffectType::Particle) {
+    j["emitter"] = emitterConfigToJson(config.emitterConfig);
+  } else if (config.type == CustomEffectType::PostProcess) {
+    j["shaderVert"] = config.shaderVertPath;
+    j["shaderFrag"] = config.shaderFragPath;
+    j["params"] = config.shaderParams;
+  }
+
+  return j;
+}
+
+/**
+ * @brief 从JSON解析CustomEffectConfig
+ */
+static CustomEffectConfig jsonToEffectConfig(const json &j) {
+  CustomEffectConfig config;
+
+  if (j.contains("name")) {
+    config.name = j["name"].get<std::string>();
+  }
+  if (j.contains("type")) {
+    config.type = static_cast<CustomEffectType>(j["type"].get<int>());
+  }
+  if (j.contains("description")) {
+    config.description = j["description"].get<std::string>();
+  }
+  if (j.contains("duration")) {
+    config.duration = j["duration"].get<float>();
+  }
+  if (j.contains("loop")) {
+    config.loop = j["loop"].get<bool>();
+  }
+  if (j.contains("delay")) {
+    config.delay = j["delay"].get<float>();
+  }
+  if (j.contains("emitter")) {
+    config.emitterConfig = jsonToEmitterConfig(j["emitter"]);
+  }
+  if (j.contains("shaderVert")) {
+    config.shaderVertPath = j["shaderVert"].get<std::string>();
+  }
+  if (j.contains("shaderFrag")) {
+    config.shaderFragPath = j["shaderFrag"].get<std::string>();
+  }
+  if (j.contains("params")) {
+    for (auto &[key, value] : j["params"].items()) {
+      config.shaderParams[key] = value.get<float>();
+    }
+  }
+
+  return config;
+}
+
+// ============================================================================
+// CustomEffect实现
+// ============================================================================
+
+CustomEffect::CustomEffect(const CustomEffectConfig &config)
+    : config_(config) {}
+
+bool CustomEffect::init() { return true; }
+
+void CustomEffect::update(float dt) {
+  if (!playing_ || paused_ || finished_)
+    return;
+
+  // 处理延迟
+  if (delayTimer_ < config_.delay) {
+    delayTimer_ += dt;
+    return;
+  }
+
+  elapsedTime_ += dt;
+
+  // 检查是否结束
+  if (config_.duration > 0 && elapsedTime_ >= config_.duration) {
+    if (config_.loop) {
+      elapsedTime_ = 0.0f;
+    } else {
+      finished_ = true;
+      playing_ = false;
+    }
+  }
+}
+
+void CustomEffect::render(RenderBackend &renderer) {
+  // 基类不渲染任何内容
+}
+
+void CustomEffect::shutdown() {
+  playing_ = false;
+  paused_ = false;
+  finished_ = true;
+}
+
+void CustomEffect::play() {
+  if (finished_) {
+    reset();
+  }
+  playing_ = true;
+  paused_ = false;
+}
+
+void CustomEffect::pause() { paused_ = true; }
+
+void CustomEffect::stop() {
+  playing_ = false;
+  paused_ = false;
+}
+
+void CustomEffect::reset() {
+  elapsedTime_ = 0.0f;
+  delayTimer_ = 0.0f;
+  finished_ = false;
+  playing_ = false;
+  paused_ = false;
+}
+
+// ============================================================================
+// CustomParticleEffect实现
+// ============================================================================
+
+CustomParticleEffect::CustomParticleEffect(const CustomEffectConfig &config)
+    : CustomEffect(config) {}
+
+bool CustomParticleEffect::init() {
+  particleSystem_ = ParticleSystem::create();
+  if (!particleSystem_) {
+    E2D_ERROR("创建粒子系统失败");
+    return false;
+  }
+
+  emitter_ = particleSystem_->addEmitter(config_.emitterConfig);
+  if (!emitter_) {
+    E2D_ERROR("创建粒子发射器失败");
+    return false;
+  }
+
+  // 初始化时启动发射器
+  emitter_->start();
+
+  return true;
+}
+
+void CustomParticleEffect::play() {
+  CustomEffect::play();
+  if (emitter_) {
+    emitter_->start();
+  }
+}
+
+void CustomParticleEffect::stop() {
+  CustomEffect::stop();
+  if (emitter_) {
+    emitter_->stop();
+  }
+}
+
+void CustomParticleEffect::update(float dt) {
+  CustomEffect::update(dt);
+
+  if (particleSystem_) {
+    particleSystem_->setPosition(position_);
+    particleSystem_->onUpdate(dt);
+  }
+}
+
+void CustomParticleEffect::render(RenderBackend &renderer) {
+  if (particleSystem_) {
+    particleSystem_->onDraw(renderer);
+  }
+}
+
+void CustomParticleEffect::shutdown() {
+  if (emitter_) {
+    emitter_->stop();
+    emitter_.reset();
+  }
+  if (particleSystem_) {
+    particleSystem_->removeAllEmitters();
+    particleSystem_.reset();
+  }
+  CustomEffect::shutdown();
+}
+
+// ============================================================================
+// CustomPostProcessEffect实现
+// ============================================================================
+
+CustomPostProcessEffect::CustomPostProcessEffect(
+    const CustomEffectConfig &config)
+    : CustomEffect(config), PostProcessEffect(config.name) {}
+
+bool CustomPostProcessEffect::init() {
+  if (!config_.shaderVertPath.empty() && !config_.shaderFragPath.empty()) {
+    if (!loadShaderFromFile(config_.shaderVertPath, config_.shaderFragPath)) {
+      E2D_ERROR("加载后处理Shader失败");
+      return false;
+    }
+  }
+
+  runtimeParams_ = config_.shaderParams;
+  return true;
+}
+
+void CustomPostProcessEffect::update(float dt) { CustomEffect::update(dt); }
+
+void CustomPostProcessEffect::shutdown() {
+  PostProcessEffect::shutdown();
+  CustomEffect::shutdown();
+}
+
+void CustomPostProcessEffect::onShaderBind(GLShader &shader) {
+  for (const auto &[name, value] : runtimeParams_) {
+    shader.setFloat(name, value);
+  }
+}
+
+void CustomPostProcessEffect::setParam(const std::string &name, float value) {
+  runtimeParams_[name] = value;
+}
+
+float CustomPostProcessEffect::getParam(const std::string &name) const {
+  auto it = runtimeParams_.find(name);
+  if (it != runtimeParams_.end()) {
+    return it->second;
+  }
+  return 0.0f;
+}
+
+// ============================================================================
+// CustomEffectFactory实现
+// ============================================================================
+
+CustomEffectFactory &CustomEffectFactory::getInstance() {
+  static CustomEffectFactory instance;
+  return instance;
+}
+
+void CustomEffectFactory::registerEffect(const std::string &typeName,
+                                         EffectCreator creator) {
+  creators_[typeName] = creator;
+  E2D_INFO("注册自定义特效类型: {}", typeName);
+}
+
+Ptr<CustomEffect>
+CustomEffectFactory::create(const std::string &typeName,
+                            const CustomEffectConfig &config) {
+  auto it = creators_.find(typeName);
+  if (it != creators_.end()) {
+    return it->second(config);
+  }
+
+  // 默认创建器
+  if (typeName == "Particle") {
+    return std::make_shared<CustomParticleEffect>(config);
+  } else if (typeName == "PostProcess") {
+    return std::make_shared<CustomPostProcessEffect>(config);
+  }
+
+  E2D_ERROR("未知的特效类型: {}", typeName);
+  return nullptr;
+}
+
+bool CustomEffectFactory::isRegistered(const std::string &typeName) const {
+  return creators_.find(typeName) != creators_.end();
+}
+
+std::vector<std::string> CustomEffectFactory::getRegisteredTypes() const {
+  std::vector<std::string> types;
+  for (const auto &[name, _] : creators_) {
+    types.push_back(name);
+  }
+  return types;
+}
+
+// ============================================================================
+// CustomEffectManager实现
+// ============================================================================
+
+CustomEffectManager &CustomEffectManager::getInstance() {
+  static CustomEffectManager instance;
+  return instance;
+}
+
+bool CustomEffectManager::init() {
+  E2D_INFO("初始化自定义特效管理器...");
+
+  // 注册默认特效类型
+  auto &factory = E2D_CUSTOM_EFFECT_FACTORY();
+  factory.registerEffect("Particle", [](const CustomEffectConfig &config) {
+    return std::make_shared<CustomParticleEffect>(config);
+  });
+  factory.registerEffect("PostProcess", [](const CustomEffectConfig &config) {
+    return std::make_shared<CustomPostProcessEffect>(config);
+  });
+
+  E2D_INFO("自定义特效管理器初始化完成");
+  return true;
+}
+
+void CustomEffectManager::shutdown() {
+  E2D_INFO("关闭自定义特效管理器...");
+  stopAll();
+  activeEffects_.clear();
+  configs_.clear();
+}
+
+bool CustomEffectManager::loadFromFile(const std::string &filepath) {
+  std::ifstream file(filepath);
+  if (!file.is_open()) {
+    E2D_ERROR("无法打开特效配置文件: {}", filepath);
+    return false;
+  }
+
+  try {
+    // 尝试解析为JSON
+    json j;
+    file >> j;
+    file.close();
+
+    if (j.is_array()) {
+      // 多个特效配置数组
+      for (const auto &effectJson : j) {
+        auto config = jsonToEffectConfig(effectJson);
+        if (!config.name.empty()) {
+          registerConfig(config.name, config);
+        }
+      }
+    } else if (j.is_object()) {
+      // 单个特效配置
+      auto config = jsonToEffectConfig(j);
+      if (!config.name.empty()) {
+        registerConfig(config.name, config);
+      }
+    }
+
+    E2D_INFO("从JSON文件加载特效配置: {}", filepath);
+    return true;
+
+  } catch (const json::exception &e) {
+    // JSON解析失败，回退到文本格式
+    file.close();
+    return loadFromTextFile(filepath);
+  }
+}
+
+bool CustomEffectManager::loadFromTextFile(const std::string &filepath) {
+  std::ifstream file(filepath);
+  if (!file.is_open()) {
+    E2D_ERROR("无法打开特效配置文件: {}", filepath);
+    return false;
+  }
+
+  // 简化格式：每行一个特效配置
+  // 格式: EFFECT name type
+  //       PARAM key value
+  //       END
+
+  std::string line;
+  CustomEffectConfig currentConfig;
+  bool inEffect = false;
+
+  while (std::getline(file, line)) {
+    // 跳过空行和注释
+    if (line.empty() || line[0] == '#')
+      continue;
+
+    std::istringstream iss(line);
+    std::string cmd;
+    iss >> cmd;
+
+    if (cmd == "EFFECT") {
+      // 开始新特效
+      if (inEffect) {
+        // 保存上一个特效
+        registerConfig(currentConfig.name, currentConfig);
+      }
+      inEffect = true;
+      currentConfig = CustomEffectConfig();
+
+      std::string type;
+      iss >> currentConfig.name >> type;
+
+      if (type == "Particle") {
+        currentConfig.type = CustomEffectType::Particle;
+      } else if (type == "PostProcess") {
+        currentConfig.type = CustomEffectType::PostProcess;
+      } else {
+        currentConfig.type = CustomEffectType::Particle;
+      }
+    } else if (cmd == "DESC") {
+      std::getline(iss, currentConfig.description);
+      // 去除前导空格
+      if (!currentConfig.description.empty() &&
+          currentConfig.description[0] == ' ') {
+        currentConfig.description = currentConfig.description.substr(1);
+      }
+    } else if (cmd == "DURATION") {
+      iss >> currentConfig.duration;
+    } else if (cmd == "LOOP") {
+      std::string val;
+      iss >> val;
+      currentConfig.loop = (val == "true" || val == "1");
+    } else if (cmd == "EMISSION") {
+      iss >> currentConfig.emitterConfig.emissionRate;
+    } else if (cmd == "LIFE") {
+      iss >> currentConfig.emitterConfig.minLife >>
+          currentConfig.emitterConfig.maxLife;
+    } else if (cmd == "SIZE_START") {
+      iss >> currentConfig.emitterConfig.minStartSize >>
+          currentConfig.emitterConfig.maxStartSize;
+    } else if (cmd == "SIZE_END") {
+      iss >> currentConfig.emitterConfig.minEndSize >>
+          currentConfig.emitterConfig.maxEndSize;
+    } else if (cmd == "VELOCITY") {
+      iss >> currentConfig.emitterConfig.minVelocity.x >>
+          currentConfig.emitterConfig.minVelocity.y >>
+          currentConfig.emitterConfig.maxVelocity.x >>
+          currentConfig.emitterConfig.maxVelocity.y;
+    } else if (cmd == "ACCEL") {
+      iss >> currentConfig.emitterConfig.acceleration.x >>
+          currentConfig.emitterConfig.acceleration.y;
+    } else if (cmd == "COLOR_START") {
+      iss >> currentConfig.emitterConfig.startColor.r >>
+          currentConfig.emitterConfig.startColor.g >>
+          currentConfig.emitterConfig.startColor.b >>
+          currentConfig.emitterConfig.startColor.a;
+    } else if (cmd == "COLOR_END") {
+      iss >> currentConfig.emitterConfig.endColor.r >>
+          currentConfig.emitterConfig.endColor.g >>
+          currentConfig.emitterConfig.endColor.b >>
+          currentConfig.emitterConfig.endColor.a;
+    } else if (cmd == "BLEND") {
+      std::string mode;
+      iss >> mode;
+      if (mode == "Additive") {
+        currentConfig.emitterConfig.blendMode = BlendMode::Additive;
+      } else if (mode == "Alpha") {
+        currentConfig.emitterConfig.blendMode = BlendMode::Alpha;
+      } else {
+        currentConfig.emitterConfig.blendMode = BlendMode::None;
+      }
+    } else if (cmd == "END") {
+      // 结束当前特效
+      if (inEffect) {
+        registerConfig(currentConfig.name, currentConfig);
+        inEffect = false;
+      }
+    }
+  }
+
+  // 保存最后一个特效
+  if (inEffect) {
+    registerConfig(currentConfig.name, currentConfig);
+  }
+
+  file.close();
+  E2D_INFO("从文本文件加载特效配置: {}", filepath);
+  return true;
+}
+
+bool CustomEffectManager::saveToFile(const std::string &name,
+                                     const std::string &filepath,
+                                     bool useJson) {
+  auto it = configs_.find(name);
+  if (it == configs_.end()) {
+    E2D_ERROR("特效配置不存在: {}", name);
+    return false;
+  }
+
+  std::ofstream file(filepath);
+  if (!file.is_open()) {
+    E2D_ERROR("无法创建文件: {}", filepath);
+    return false;
+  }
+
+  if (useJson) {
+    // 保存为JSON格式
+    json j = effectConfigToJson(it->second);
+    file << j.dump(2); // 缩进2个空格，更易读
+    E2D_INFO("保存特效配置到JSON文件: {}", filepath);
+  } else {
+    // 保存为文本格式
+    const auto &config = it->second;
+
+    file << "# Easy2D Custom Effect Config\n";
+    file << "# Generated automatically\n\n";
+
+    file << "EFFECT " << config.name << " ";
+    if (config.type == CustomEffectType::Particle) {
+      file << "Particle\n";
+    } else if (config.type == CustomEffectType::PostProcess) {
+      file << "PostProcess\n";
+    } else {
+      file << "Particle\n";
+    }
+
+    file << "DESC " << config.description << "\n";
+    file << "DURATION " << config.duration << "\n";
+    file << "LOOP " << (config.loop ? "true" : "false") << "\n";
+
+    if (config.type == CustomEffectType::Particle) {
+      const auto &ec = config.emitterConfig;
+      file << "EMISSION " << ec.emissionRate << "\n";
+      file << "LIFE " << ec.minLife << " " << ec.maxLife << "\n";
+      file << "SIZE_START " << ec.minStartSize << " " << ec.maxStartSize
+           << "\n";
+      file << "SIZE_END " << ec.minEndSize << " " << ec.maxEndSize << "\n";
+      file << "VELOCITY " << ec.minVelocity.x << " " << ec.minVelocity.y << " "
+           << ec.maxVelocity.x << " " << ec.maxVelocity.y << "\n";
+      file << "ACCEL " << ec.acceleration.x << " " << ec.acceleration.y << "\n";
+      file << "COLOR_START " << ec.startColor.r << " " << ec.startColor.g << " "
+           << ec.startColor.b << " " << ec.startColor.a << "\n";
+      file << "COLOR_END " << ec.endColor.r << " " << ec.endColor.g << " "
+           << ec.endColor.b << " " << ec.endColor.a << "\n";
+
+      file << "BLEND ";
+      switch (ec.blendMode) {
+      case BlendMode::Additive:
+        file << "Additive\n";
+        break;
+      case BlendMode::Alpha:
+        file << "Alpha\n";
+        break;
+      default:
+        file << "None\n";
+        break;
+      }
+    }
+
+    file << "END\n";
+    E2D_INFO("保存特效配置到文本文件: {}", filepath);
+  }
+
+  file.close();
+  return true;
+}
+
+bool CustomEffectManager::saveAllToFile(const std::string &filepath) {
+  std::ofstream file(filepath);
+  if (!file.is_open()) {
+    E2D_ERROR("无法创建文件: {}", filepath);
+    return false;
+  }
+
+  json effectsArray = json::array();
+  for (const auto &[name, config] : configs_) {
+    effectsArray.push_back(effectConfigToJson(config));
+  }
+
+  file << effectsArray.dump(2);
+  file.close();
+
+  E2D_INFO("保存所有特效配置到: {}", filepath);
+  return true;
+}
+
+void CustomEffectManager::registerConfig(const std::string &name,
+                                         const CustomEffectConfig &config) {
+  configs_[name] = config;
+  E2D_INFO("注册特效配置: {}", name);
+}
+
+CustomEffectConfig *CustomEffectManager::getConfig(const std::string &name) {
+  auto it = configs_.find(name);
+  if (it != configs_.end()) {
+    return &it->second;
+  }
+  return nullptr;
+}
+
+void CustomEffectManager::removeConfig(const std::string &name) {
+  configs_.erase(name);
+}
+
+std::vector<std::string> CustomEffectManager::getConfigNames() const {
+  std::vector<std::string> names;
+  for (const auto &[name, _] : configs_) {
+    names.push_back(name);
+  }
+  return names;
+}
+
+Ptr<CustomEffect> CustomEffectManager::createEffect(const std::string &name) {
+  auto config = getConfig(name);
+  if (!config) {
+    E2D_ERROR("特效配置不存在: {}", name);
+    return nullptr;
+  }
+
+  return createEffectFromConfig(*config);
+}
+
+Ptr<CustomEffect>
+CustomEffectManager::createEffectFromConfig(const CustomEffectConfig &config) {
+  std::string typeName;
+  switch (config.type) {
+  case CustomEffectType::Particle:
+    typeName = "Particle";
+    break;
+  case CustomEffectType::PostProcess:
+    typeName = "PostProcess";
+    break;
+  default:
+    typeName = "Particle";
+    break;
+  }
+
+  auto effect = E2D_CUSTOM_EFFECT_FACTORY().create(typeName, config);
+  if (effect && effect->init()) {
+    activeEffects_.push_back(effect);
+    return effect;
+  }
+
+  return nullptr;
+}
+
+void CustomEffectManager::destroyEffect(Ptr<CustomEffect> effect) {
+  if (!effect)
+    return;
+
+  effect->shutdown();
+
+  auto it = std::find(activeEffects_.begin(), activeEffects_.end(), effect);
+  if (it != activeEffects_.end()) {
+    activeEffects_.erase(it);
+  }
+}
+
+void CustomEffectManager::update(float dt) {
+  for (auto &effect : activeEffects_) {
+    if (effect->isPlaying()) {
+      effect->update(dt);
+    }
+  }
+
+  // 清理已完成的特效
+  activeEffects_.erase(std::remove_if(activeEffects_.begin(),
+                                      activeEffects_.end(),
+                                      [](const Ptr<CustomEffect> &effect) {
+                                        return effect->isFinished();
+                                      }),
+                       activeEffects_.end());
+}
+
+void CustomEffectManager::render(RenderBackend &renderer) {
+  for (auto &effect : activeEffects_) {
+    if (effect->isPlaying()) {
+      effect->render(renderer);
+    }
+  }
+}
+
+void CustomEffectManager::stopAll() {
+  for (auto &effect : activeEffects_) {
+    effect->stop();
+  }
+}
+
+Ptr<CustomEffect> CustomEffectManager::play(const std::string &name,
+                                            const Vec2 &position) {
+  auto effect = createEffect(name);
+  if (effect) {
+    effect->setPosition(position);
+    effect->play();
+  }
+  return effect;
+}
+
+void CustomEffectManager::playOneShot(const std::string &name,
+                                      const Vec2 &position) {
+  auto effect = play(name, position);
+  if (effect) {
+    // 设置非循环，播放一次后自动销毁
+    effect->play();
+  }
+}
+
+// ============================================================================
+// EffectBuilder实现
+// ============================================================================
+
+CustomEffectConfig EffectBuilder::Particle(const std::string &name) {
+  CustomEffectConfig config;
+  config.name = name;
+  config.type = CustomEffectType::Particle;
+  config.duration = -1.0f;
+  config.loop = true;
+  config.delay = 0.0f;
+
+  // 默认粒子配置
+  config.emitterConfig.emissionRate = 100.0f;
+  config.emitterConfig.minLife = 1.0f;
+  config.emitterConfig.maxLife = 2.0f;
+  config.emitterConfig.minStartSize = 10.0f;
+  config.emitterConfig.maxStartSize = 20.0f;
+  config.emitterConfig.minEndSize = 0.0f;
+  config.emitterConfig.maxEndSize = 5.0f;
+  config.emitterConfig.minVelocity = Vec2(-50.0f, -50.0f);
+  config.emitterConfig.maxVelocity = Vec2(50.0f, 50.0f);
+  config.emitterConfig.acceleration = Vec2(0.0f, 0.0f);
+  config.emitterConfig.startColor = Colors::White;
+  config.emitterConfig.endColor = Colors::Transparent;
+  config.emitterConfig.blendMode = BlendMode::Additive;
+
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Fire(const std::string &name) {
+  CustomEffectConfig config = Particle(name);
+  config.emitterConfig = ParticlePreset::Fire();
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Smoke(const std::string &name) {
+  CustomEffectConfig config = Particle(name);
+  config.emitterConfig = ParticlePreset::Smoke();
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Explosion(const std::string &name) {
+  CustomEffectConfig config = Particle(name);
+  config.emitterConfig = ParticlePreset::Explosion();
+  config.duration = 2.0f;
+  config.loop = false;
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Magic(const std::string &name) {
+  CustomEffectConfig config = Particle(name);
+  config.emitterConfig = ParticlePreset::Magic();
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Sparkle(const std::string &name) {
+  CustomEffectConfig config = Particle(name);
+  config.emitterConfig = ParticlePreset::Sparkle();
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Bloom(const std::string &name) {
+  CustomEffectConfig config;
+  config.name = name;
+  config.type = CustomEffectType::PostProcess;
+  config.duration = -1.0f;
+  config.loop = true;
+  config.shaderParams["intensity"] = 1.5f;
+  config.shaderParams["threshold"] = 0.8f;
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Blur(const std::string &name) {
+  CustomEffectConfig config;
+  config.name = name;
+  config.type = CustomEffectType::PostProcess;
+  config.duration = -1.0f;
+  config.loop = true;
+  config.shaderParams["radius"] = 2.0f;
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::Vignette(const std::string &name) {
+  CustomEffectConfig config;
+  config.name = name;
+  config.type = CustomEffectType::PostProcess;
+  config.duration = -1.0f;
+  config.loop = true;
+  config.shaderParams["intensity"] = 0.5f;
+  return config;
+}
+
+CustomEffectConfig EffectBuilder::ColorGrading(const std::string &name) {
+  CustomEffectConfig config;
+  config.name = name;
+  config.type = CustomEffectType::PostProcess;
+  config.duration = -1.0f;
+  config.loop = true;
+  config.shaderParams["brightness"] = 1.0f;
+  config.shaderParams["contrast"] = 1.0f;
+  config.shaderParams["saturation"] = 1.0f;
+  return config;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/effects/particle_system.cpp b/Extra2D/src/effects/particle_system.cpp
new file mode 100644
index 0000000..48bbb9b
--- /dev/null
+++ b/Extra2D/src/effects/particle_system.cpp
@@ -0,0 +1,450 @@
+#include <cmath>
+#include <extra2d/effects/particle_system.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+// ============================================================================
+// ParticleEmitter实现
+// ============================================================================
+
+ParticleEmitter::ParticleEmitter() : rng_(std::random_device{}()) {}
+
+bool ParticleEmitter::init(size_t maxParticles) {
+  particles_.resize(maxParticles);
+  activeCount_ = 0;
+  return true;
+}
+
+void ParticleEmitter::shutdown() {
+  particles_.clear();
+  activeCount_ = 0;
+}
+
+void ParticleEmitter::start() {
+  emitting_ = true;
+  emissionTime_ = 0.0f;
+}
+
+void ParticleEmitter::stop() { emitting_ = false; }
+
+void ParticleEmitter::burst(int count) {
+  for (int i = 0; i < count && activeCount_ < particles_.size(); ++i) {
+    emitParticle();
+  }
+}
+
+void ParticleEmitter::reset() {
+  for (auto &particle : particles_) {
+    particle.active = false;
+  }
+  activeCount_ = 0;
+  emissionTimer_ = 0.0f;
+  emissionTime_ = 0.0f;
+}
+
+void ParticleEmitter::update(float dt) {
+  // 发射新粒子
+  if (emitting_) {
+    emissionTime_ += dt;
+
+    // 检查持续时间
+    if (config_.emissionDuration > 0 &&
+        emissionTime_ >= config_.emissionDuration) {
+      emitting_ = false;
+    }
+
+    emissionTimer_ += dt;
+    float emissionInterval = 1.0f / config_.emissionRate;
+
+    while (emissionTimer_ >= emissionInterval &&
+           activeCount_ < particles_.size()) {
+      emitParticle();
+      emissionTimer_ -= emissionInterval;
+    }
+  }
+
+  // 更新活跃粒子
+  size_t newActiveCount = 0;
+  for (size_t i = 0; i < activeCount_; ++i) {
+    auto &p = particles_[i];
+
+    if (!p.active)
+      continue;
+
+    // 更新生命周期
+    p.life -= dt;
+    if (p.life <= 0.0f) {
+      p.active = false;
+      continue;
+    }
+
+    // 更新物理
+    p.velocity += p.acceleration * dt;
+    p.position += p.velocity * dt;
+    p.rotation += p.angularVelocity * dt;
+
+    // 更新大小
+    p.size += p.sizeDelta * dt;
+    if (p.size < 0.0f)
+      p.size = 0.0f;
+
+    // 更新颜色
+    p.color += p.colorDelta * dt;
+
+    // 保持活跃
+    if (newActiveCount != i) {
+      particles_[newActiveCount] = p;
+    }
+    newActiveCount++;
+  }
+
+  activeCount_ = newActiveCount;
+}
+
+void ParticleEmitter::render(RenderBackend &renderer) {
+  if (activeCount_ == 0)
+    return;
+
+  // 设置混合模式
+  renderer.setBlendMode(config_.blendMode);
+
+  // 渲染所有活跃粒子
+  if (config_.texture) {
+    // 使用纹理批量渲染
+    renderer.beginSpriteBatch();
+
+    for (size_t i = 0; i < activeCount_; ++i) {
+      const auto &p = particles_[i];
+      if (!p.active)
+        continue;
+
+      // 计算目标矩形
+      float halfSize = p.size * 0.5f;
+      Rect destRect(p.position.x - halfSize, p.position.y - halfSize, p.size,
+                    p.size);
+
+      renderer.drawSprite(
+          *config_.texture, destRect,
+          Rect(0, 0, config_.texture->getWidth(), config_.texture->getHeight()),
+          p.color, p.rotation, Vec2(0.5f, 0.5f));
+    }
+
+    renderer.endSpriteBatch();
+  } else {
+    // 没有纹理，使用圆形填充渲染
+    for (size_t i = 0; i < activeCount_; ++i) {
+      const auto &p = particles_[i];
+      if (!p.active)
+        continue;
+
+      // 渲染圆形粒子
+      renderer.fillCircle(p.position, p.size * 0.5f, p.color);
+    }
+  }
+}
+
+void ParticleEmitter::emitParticle() {
+  if (activeCount_ >= particles_.size())
+    return;
+
+  Particle &p = particles_[activeCount_];
+  p.active = true;
+
+  // 位置
+  p.position = position_ + randomPointInShape();
+
+  // 速度
+  p.velocity = randomVelocity();
+
+  // 加速度
+  p.acceleration = config_.acceleration;
+
+  // 旋转
+  p.rotation = randomFloat(config_.minRotation, config_.maxRotation);
+  p.angularVelocity =
+      randomFloat(config_.minAngularVelocity, config_.maxAngularVelocity);
+
+  // 大小
+  float startSize = randomFloat(config_.minStartSize, config_.maxStartSize);
+  float endSize = randomFloat(config_.minEndSize, config_.maxEndSize);
+  p.size = startSize;
+
+  // 生命周期
+  p.maxLife = randomFloat(config_.minLife, config_.maxLife);
+  p.life = p.maxLife;
+
+  // 计算每帧变化量
+  if (p.maxLife > 0.0f) {
+    p.sizeDelta = (endSize - startSize) / p.maxLife;
+    p.colorDelta = (config_.endColor - config_.startColor) / p.maxLife;
+  }
+
+  // 颜色
+  p.color = config_.startColor;
+
+  activeCount_++;
+}
+
+float ParticleEmitter::randomFloat(float min, float max) {
+  std::uniform_real_distribution<float> dist(min, max);
+  return dist(rng_);
+}
+
+Vec2 ParticleEmitter::randomPointInShape() {
+  switch (config_.shape) {
+  case EmitterConfig::Shape::Point:
+    return Vec2::Zero();
+
+  case EmitterConfig::Shape::Circle: {
+    float angle = randomFloat(0.0f, 2.0f * 3.14159265359f);
+    float radius = randomFloat(0.0f, config_.shapeRadius);
+    return Vec2(std::cos(angle) * radius, std::sin(angle) * radius);
+  }
+
+  case EmitterConfig::Shape::Rectangle:
+    return Vec2(
+        randomFloat(-config_.shapeSize.x * 0.5f, config_.shapeSize.x * 0.5f),
+        randomFloat(-config_.shapeSize.y * 0.5f, config_.shapeSize.y * 0.5f));
+
+  case EmitterConfig::Shape::Cone: {
+    float angle =
+        randomFloat(-config_.coneAngle * 0.5f, config_.coneAngle * 0.5f);
+    float radius = randomFloat(0.0f, config_.shapeRadius);
+    float rad = angle * 3.14159265359f / 180.0f;
+    return Vec2(std::cos(rad) * radius, std::sin(rad) * radius);
+  }
+  }
+
+  return Vec2::Zero();
+}
+
+Vec2 ParticleEmitter::randomVelocity() {
+  return Vec2(randomFloat(config_.minVelocity.x, config_.maxVelocity.x),
+              randomFloat(config_.minVelocity.y, config_.maxVelocity.y));
+}
+
+// ============================================================================
+// ParticleSystem实现
+// ============================================================================
+
+ParticleSystem::ParticleSystem() {}
+
+Ptr<ParticleSystem> ParticleSystem::create() {
+  return std::make_shared<ParticleSystem>();
+}
+
+Ptr<ParticleEmitter> ParticleSystem::addEmitter(const EmitterConfig &config) {
+  auto emitter = std::make_shared<ParticleEmitter>();
+  emitter->setConfig(config);
+  emitter->init(1000); // 默认最大1000个粒子
+  emitters_.push_back(emitter);
+  return emitter;
+}
+
+void ParticleSystem::removeEmitter(Ptr<ParticleEmitter> emitter) {
+  auto it = std::find(emitters_.begin(), emitters_.end(), emitter);
+  if (it != emitters_.end()) {
+    (*it)->shutdown();
+    emitters_.erase(it);
+  }
+}
+
+void ParticleSystem::removeAllEmitters() {
+  for (auto &emitter : emitters_) {
+    emitter->shutdown();
+  }
+  emitters_.clear();
+}
+
+void ParticleSystem::startAll() {
+  for (auto &emitter : emitters_) {
+    emitter->start();
+  }
+}
+
+void ParticleSystem::stopAll() {
+  for (auto &emitter : emitters_) {
+    emitter->stop();
+  }
+}
+
+void ParticleSystem::resetAll() {
+  for (auto &emitter : emitters_) {
+    emitter->reset();
+  }
+}
+
+void ParticleSystem::onUpdate(float dt) {
+  // 获取粒子系统的世界位置
+  auto worldPos = convertToWorldSpace(Vec2::Zero());
+
+  for (auto &emitter : emitters_) {
+    // 更新发射器位置为粒子系统的世界位置
+    emitter->setPosition(worldPos);
+    // 更新发射器
+    emitter->update(dt);
+  }
+}
+
+void ParticleSystem::onDraw(RenderBackend &renderer) {
+  for (auto &emitter : emitters_) {
+    emitter->render(renderer);
+  }
+}
+
+// ============================================================================
+// 预设实现
+// ============================================================================
+
+EmitterConfig ParticlePreset::Fire() {
+  EmitterConfig config;
+  config.emissionRate = 200.0f;
+  config.minLife = 0.5f;
+  config.maxLife = 1.5f;
+  config.minStartSize = 20.0f;
+  config.maxStartSize = 40.0f;
+  config.minEndSize = 5.0f;
+  config.maxEndSize = 10.0f;
+  config.minVelocity = Vec2(-30.0f, -150.0f); // 向上（负y）
+  config.maxVelocity = Vec2(30.0f, -50.0f);
+  config.acceleration = Vec2(0.0f, 0.0f);
+  config.startColor = Color(1.0f, 0.8f, 0.2f, 1.0f); // 黄色
+  config.endColor = Color(1.0f, 0.2f, 0.0f, 0.0f);   // 红色透明
+  config.blendMode = BlendMode::Additive;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Smoke() {
+  EmitterConfig config;
+  config.emissionRate = 50.0f;
+  config.minLife = 2.0f;
+  config.maxLife = 4.0f;
+  config.minStartSize = 30.0f;
+  config.maxStartSize = 60.0f;
+  config.minEndSize = 80.0f;
+  config.maxEndSize = 120.0f;
+  config.minVelocity = Vec2(-20.0f, -60.0f); // 向上（负y）
+  config.maxVelocity = Vec2(20.0f, -30.0f);
+  config.acceleration = Vec2(0.0f, -10.0f);          // 向上加速度
+  config.startColor = Color(0.5f, 0.5f, 0.5f, 0.5f); // 灰色半透明
+  config.endColor = Color(0.3f, 0.3f, 0.3f, 0.0f);   // 深灰透明
+  config.blendMode = BlendMode::Alpha;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Explosion() {
+  EmitterConfig config;
+  config.emissionRate = 1000.0f;
+  config.emissionDuration = 0.1f; // 瞬间爆发
+  config.minLife = 0.5f;
+  config.maxLife = 1.5f;
+  config.minStartSize = 10.0f;
+  config.maxStartSize = 30.0f;
+  config.minEndSize = 0.0f;
+  config.maxEndSize = 5.0f;
+  config.minVelocity = Vec2(-300.0f, -300.0f);
+  config.maxVelocity = Vec2(300.0f, 300.0f);
+  config.acceleration = Vec2(0.0f, -50.0f);
+  config.startColor = Color(1.0f, 1.0f, 0.5f, 1.0f); // 亮黄
+  config.endColor = Color(1.0f, 0.3f, 0.0f, 0.0f);   // 橙红透明
+  config.blendMode = BlendMode::Additive;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Sparkle() {
+  EmitterConfig config;
+  config.emissionRate = 20.0f;
+  config.minLife = 0.2f;
+  config.maxLife = 0.8f;
+  config.minStartSize = 2.0f;
+  config.maxStartSize = 5.0f;
+  config.minEndSize = 0.0f;
+  config.maxEndSize = 2.0f;
+  config.minVelocity = Vec2(-10.0f, -10.0f);
+  config.maxVelocity = Vec2(10.0f, 10.0f);
+  config.acceleration = Vec2(0.0f, 0.0f);
+  config.startColor = Color(1.0f, 1.0f, 1.0f, 1.0f); // 白色
+  config.endColor = Color(1.0f, 1.0f, 1.0f, 0.0f);   // 透明
+  config.blendMode = BlendMode::Additive;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Rain() {
+  EmitterConfig config;
+  config.emissionRate = 500.0f;
+  config.minLife = 1.0f;
+  config.maxLife = 2.0f;
+  config.minStartSize = 2.0f;
+  config.maxStartSize = 4.0f;
+  config.minEndSize = 2.0f;
+  config.maxEndSize = 4.0f;
+  config.minVelocity = Vec2(-100.0f, -400.0f);
+  config.maxVelocity = Vec2(100.0f, -600.0f);
+  config.acceleration = Vec2(0.0f, -100.0f);
+  config.startColor = Color(0.7f, 0.8f, 1.0f, 0.6f); // 淡蓝
+  config.endColor = Color(0.7f, 0.8f, 1.0f, 0.3f);   // 淡蓝半透明
+  config.shape = EmitterConfig::Shape::Rectangle;
+  config.shapeSize = Vec2(800.0f, 100.0f); // 在顶部区域发射
+  config.blendMode = BlendMode::Alpha;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Snow() {
+  EmitterConfig config;
+  config.emissionRate = 100.0f;
+  config.minLife = 3.0f;
+  config.maxLife = 6.0f;
+  config.minStartSize = 5.0f;
+  config.maxStartSize = 10.0f;
+  config.minEndSize = 5.0f;
+  config.maxEndSize = 10.0f;
+  config.minVelocity = Vec2(-30.0f, -30.0f);
+  config.maxVelocity = Vec2(30.0f, -80.0f);
+  config.acceleration = Vec2(0.0f, 0.0f);
+  config.startColor = Color(1.0f, 1.0f, 1.0f, 0.8f); // 白色
+  config.endColor = Color(1.0f, 1.0f, 1.0f, 0.8f);   // 白色
+  config.shape = EmitterConfig::Shape::Rectangle;
+  config.shapeSize = Vec2(800.0f, 100.0f);
+  config.blendMode = BlendMode::Alpha;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Magic() {
+  EmitterConfig config;
+  config.emissionRate = 100.0f;
+  config.minLife = 1.0f;
+  config.maxLife = 2.0f;
+  config.minStartSize = 5.0f;
+  config.maxStartSize = 15.0f;
+  config.minEndSize = 0.0f;
+  config.maxEndSize = 5.0f;
+  config.minVelocity = Vec2(-50.0f, -50.0f); // 主要向上
+  config.maxVelocity = Vec2(50.0f, -50.0f);
+  config.acceleration = Vec2(0.0f, -20.0f);          // 向上加速度
+  config.startColor = Color(0.5f, 0.2f, 1.0f, 1.0f); // 紫色
+  config.endColor = Color(0.2f, 0.8f, 1.0f, 0.0f);   // 青色透明
+  config.blendMode = BlendMode::Additive;
+  return config;
+}
+
+EmitterConfig ParticlePreset::Bubbles() {
+  EmitterConfig config;
+  config.emissionRate = 30.0f;
+  config.minLife = 2.0f;
+  config.maxLife = 4.0f;
+  config.minStartSize = 5.0f;
+  config.maxStartSize = 15.0f;
+  config.minEndSize = 5.0f;
+  config.maxEndSize = 15.0f;
+  config.minVelocity = Vec2(-20.0f, 20.0f);
+  config.maxVelocity = Vec2(20.0f, 60.0f);
+  config.acceleration = Vec2(0.0f, 30.0f);
+  config.startColor = Color(0.8f, 0.9f, 1.0f, 0.4f); // 淡蓝透明
+  config.endColor = Color(0.8f, 0.9f, 1.0f, 0.1f);   // 更透明
+  config.blendMode = BlendMode::Alpha;
+  return config;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/effects/post_process.cpp b/Extra2D/src/effects/post_process.cpp
new file mode 100644
index 0000000..bec5735
--- /dev/null
+++ b/Extra2D/src/effects/post_process.cpp
@@ -0,0 +1,390 @@
+#include <extra2d/effects/post_process.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/render_target.h>
+#include <extra2d/utils/logger.h>
+
+// 使用标准 GLES3.2
+#include <GLES3/gl32.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 静态成员初始化
+// ============================================================================
+GLuint PostProcessEffect::quadVao_ = 0;
+GLuint PostProcessEffect::quadVbo_ = 0;
+bool PostProcessEffect::quadInitialized_ = false;
+
+// ============================================================================
+// PostProcessEffect实现
+// ============================================================================
+
+PostProcessEffect::PostProcessEffect(const std::string &name) : name_(name) {}
+
+bool PostProcessEffect::init() {
+  initQuad();
+  valid_ = true;
+  return true;
+}
+
+void PostProcessEffect::shutdown() {
+  shader_.reset();
+  valid_ = false;
+}
+
+void PostProcessEffect::apply(const Texture &source, RenderTarget &target,
+                              RenderBackend &renderer) {
+  if (!enabled_ || !valid_)
+    return;
+
+  target.bind();
+
+  if (shader_) {
+    shader_->bind();
+    shader_->setInt("u_texture", 0);
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D,
+                  static_cast<GLuint>(
+                      reinterpret_cast<uintptr_t>(source.getNativeHandle())));
+
+    onShaderBind(*shader_);
+  }
+
+  renderFullscreenQuad();
+
+  if (shader_) {
+    shader_->unbind();
+  }
+
+  target.unbind();
+}
+
+bool PostProcessEffect::loadShader(const std::string &vertSource,
+                                   const std::string &fragSource) {
+  shader_ = std::make_shared<GLShader>();
+  if (!shader_->compileFromSource(vertSource.c_str(), fragSource.c_str())) {
+    E2D_ERROR("后处理效果 '{}' 加载Shader失败", name_);
+    shader_.reset();
+    return false;
+  }
+  return true;
+}
+
+bool PostProcessEffect::loadShaderFromFile(const std::string &vertPath,
+                                           const std::string &fragPath) {
+  shader_ = std::make_shared<GLShader>();
+  if (!shader_->compileFromFile(vertPath, fragPath)) {
+    E2D_ERROR("后处理效果 '{}' 从文件加载Shader失败", name_);
+    shader_.reset();
+    return false;
+  }
+  return true;
+}
+
+void PostProcessEffect::initQuad() {
+  if (quadInitialized_)
+    return;
+
+  // 全屏四边形顶点数据（位置和纹理坐标）
+  float quadVertices[] = {// 位置              // 纹理坐标
+                          -1.0f, 1.0f,  0.0f, 1.0f, -1.0f, -1.0f, 0.0f, 0.0f,
+                          1.0f,  -1.0f, 1.0f, 0.0f, -1.0f, 1.0f,  0.0f, 1.0f,
+                          1.0f,  -1.0f, 1.0f, 0.0f, 1.0f,  1.0f,  1.0f, 1.0f};
+
+  glGenVertexArrays(1, &quadVao_);
+  glGenBuffers(1, &quadVbo_);
+
+  glBindVertexArray(quadVao_);
+  glBindBuffer(GL_ARRAY_BUFFER, quadVbo_);
+  glBufferData(GL_ARRAY_BUFFER, sizeof(quadVertices), quadVertices,
+               GL_STATIC_DRAW);
+
+  // 位置属性
+  glEnableVertexAttribArray(0);
+  glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void *)0);
+
+  // 纹理坐标属性
+  glEnableVertexAttribArray(1);
+  glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float),
+                        (void *)(2 * sizeof(float)));
+
+  glBindVertexArray(0);
+
+  quadInitialized_ = true;
+}
+
+void PostProcessEffect::destroyQuad() {
+  if (quadVao_ != 0) {
+    glDeleteVertexArrays(1, &quadVao_);
+    quadVao_ = 0;
+  }
+  if (quadVbo_ != 0) {
+    glDeleteBuffers(1, &quadVbo_);
+    quadVbo_ = 0;
+  }
+  quadInitialized_ = false;
+}
+
+void PostProcessEffect::renderFullscreenQuad() {
+  if (!quadInitialized_) {
+    initQuad();
+  }
+
+  glBindVertexArray(quadVao_);
+  glDrawArrays(GL_TRIANGLES, 0, 6);
+  glBindVertexArray(0);
+}
+
+// ============================================================================
+// PostProcessStack实现
+// ============================================================================
+
+PostProcessStack::PostProcessStack() = default;
+
+PostProcessStack::~PostProcessStack() { shutdown(); }
+
+bool PostProcessStack::init(int width, int height) {
+  E2D_INFO("初始化后处理栈...");
+
+  width_ = width;
+  height_ = height;
+
+  // 创建两个渲染目标用于乒乓渲染
+  RenderTargetConfig config;
+  config.width = width;
+  config.height = height;
+  config.hasDepthBuffer = false;
+  config.autoResize = false;
+
+  renderTargetA_ = std::make_shared<RenderTarget>();
+  renderTargetB_ = std::make_shared<RenderTarget>();
+
+  if (!renderTargetA_->init(config)) {
+    E2D_ERROR("创建后处理渲染目标A失败");
+    return false;
+  }
+
+  if (!renderTargetB_->init(config)) {
+    E2D_ERROR("创建后处理渲染目标B失败");
+    return false;
+  }
+
+  valid_ = true;
+  E2D_INFO("后处理栈初始化成功");
+  return true;
+}
+
+void PostProcessStack::shutdown() {
+  E2D_INFO("关闭后处理栈...");
+
+  clearEffects();
+
+  if (renderTargetA_) {
+    renderTargetA_->shutdown();
+    renderTargetA_.reset();
+  }
+
+  if (renderTargetB_) {
+    renderTargetB_->shutdown();
+    renderTargetB_.reset();
+  }
+
+  valid_ = false;
+}
+
+void PostProcessStack::addEffect(Ptr<PostProcessEffect> effect) {
+  if (effect && effect->init()) {
+    effects_.push_back(effect);
+    E2D_INFO("添加后处理效果: {}", effect->getName());
+  }
+}
+
+void PostProcessStack::insertEffect(size_t index,
+                                    Ptr<PostProcessEffect> effect) {
+  if (effect && effect->init() && index <= effects_.size()) {
+    effects_.insert(effects_.begin() + index, effect);
+    E2D_INFO("插入后处理效果 '{}' 到位置 {}", effect->getName(), index);
+  }
+}
+
+void PostProcessStack::removeEffect(const std::string &name) {
+  for (auto it = effects_.begin(); it != effects_.end(); ++it) {
+    if ((*it)->getName() == name) {
+      (*it)->shutdown();
+      effects_.erase(it);
+      E2D_INFO("移除后处理效果: {}", name);
+      return;
+    }
+  }
+}
+
+void PostProcessStack::removeEffect(size_t index) {
+  if (index < effects_.size()) {
+    effects_[index]->shutdown();
+    effects_.erase(effects_.begin() + index);
+  }
+}
+
+Ptr<PostProcessEffect> PostProcessStack::getEffect(const std::string &name) {
+  for (auto &effect : effects_) {
+    if (effect->getName() == name) {
+      return effect;
+    }
+  }
+  return nullptr;
+}
+
+Ptr<PostProcessEffect> PostProcessStack::getEffect(size_t index) {
+  if (index < effects_.size()) {
+    return effects_[index];
+  }
+  return nullptr;
+}
+
+void PostProcessStack::clearEffects() {
+  for (auto &effect : effects_) {
+    effect->shutdown();
+  }
+  effects_.clear();
+}
+
+void PostProcessStack::beginCapture() {
+  if (!valid_)
+    return;
+
+  renderTargetA_->bind();
+  renderTargetA_->clear(Colors::Black);
+  capturing_ = true;
+}
+
+void PostProcessStack::endCapture(RenderBackend &renderer) {
+  if (!valid_ || !capturing_)
+    return;
+
+  renderTargetA_->unbind();
+
+  // 应用所有后处理效果
+  if (effects_.empty()) {
+    // 没有效果，直接渲染到屏幕
+    // 这里需要渲染renderTargetA_的纹理到屏幕
+    capturing_ = false;
+    return;
+  }
+
+  // 乒乓渲染
+  RenderTarget *readTarget = renderTargetA_.get();
+  RenderTarget *writeTarget = renderTargetB_.get();
+
+  for (size_t i = 0; i < effects_.size(); ++i) {
+    auto &effect = effects_[i];
+
+    if (effect->isEnabled()) {
+      effect->apply(*readTarget->getColorTexture(), *writeTarget, renderer);
+    }
+
+    // 交换读写目标
+    std::swap(readTarget, writeTarget);
+  }
+
+  // 最终结果在readTarget中（因为最后一次交换）
+  // 这里应该将结果渲染到屏幕
+
+  capturing_ = false;
+}
+
+void PostProcessStack::process(const Texture &source, RenderTarget &target,
+                               RenderBackend &renderer) {
+  if (!valid_)
+    return;
+
+  RenderTarget *readTarget = nullptr;
+  RenderTarget *writeTarget = nullptr;
+
+  // 确定读写目标
+  if (target.getFBO() == renderTargetA_->getFBO()) {
+    readTarget = renderTargetB_.get();
+    writeTarget = renderTargetA_.get();
+  } else {
+    readTarget = renderTargetA_.get();
+    writeTarget = renderTargetB_.get();
+  }
+
+  // 首先将源纹理复制到读目标
+  readTarget->bind();
+  // 这里需要渲染源纹理到readTarget
+  readTarget->unbind();
+
+  // 应用效果
+  for (auto &effect : effects_) {
+    if (effect->isEnabled()) {
+      effect->apply(*readTarget->getColorTexture(), *writeTarget, renderer);
+    }
+    std::swap(readTarget, writeTarget);
+  }
+
+  // 将最终结果复制到目标
+  readTarget->blitTo(target, true, false);
+}
+
+void PostProcessStack::resize(int width, int height) {
+  if (width_ == width && height_ == height)
+    return;
+
+  width_ = width;
+  height_ = height;
+
+  if (renderTargetA_) {
+    renderTargetA_->resize(width, height);
+  }
+
+  if (renderTargetB_) {
+    renderTargetB_->resize(width, height);
+  }
+}
+
+// ============================================================================
+// PostProcessManager实现
+// ============================================================================
+
+PostProcessManager &PostProcessManager::getInstance() {
+  static PostProcessManager instance;
+  return instance;
+}
+
+void PostProcessManager::init(int width, int height) {
+  if (initialized_)
+    return;
+
+  E2D_INFO("初始化后处理管理器...");
+  mainStack_.init(width, height);
+  initialized_ = true;
+}
+
+void PostProcessManager::shutdown() {
+  if (!initialized_)
+    return;
+
+  E2D_INFO("关闭后处理管理器...");
+  mainStack_.shutdown();
+  initialized_ = false;
+}
+
+void PostProcessManager::resize(int width, int height) {
+  if (initialized_) {
+    mainStack_.resize(width, height);
+  }
+}
+
+void PostProcessManager::beginFrame() {
+  if (initialized_) {
+    mainStack_.beginCapture();
+  }
+}
+
+void PostProcessManager::endFrame(RenderBackend &renderer) {
+  if (initialized_) {
+    mainStack_.endCapture(renderer);
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/event/event.cpp b/Extra2D/src/event/event.cpp
new file mode 100644
index 0000000..b4b85dc
--- /dev/null
+++ b/Extra2D/src/event/event.cpp
@@ -0,0 +1,60 @@
+#include <extra2d/event/event.h>
+
+namespace extra2d {
+
+Event Event::createWindowResize(int width, int height) {
+  Event event;
+  event.type = EventType::WindowResize;
+  event.data = WindowResizeEvent{width, height};
+  return event;
+}
+
+Event Event::createWindowClose() {
+  Event event;
+  event.type = EventType::WindowClose;
+  return event;
+}
+
+Event Event::createKeyPress(int keyCode, int scancode, int mods) {
+  Event event;
+  event.type = EventType::KeyPressed;
+  event.data = KeyEvent{keyCode, scancode, mods};
+  return event;
+}
+
+Event Event::createKeyRelease(int keyCode, int scancode, int mods) {
+  Event event;
+  event.type = EventType::KeyReleased;
+  event.data = KeyEvent{keyCode, scancode, mods};
+  return event;
+}
+
+Event Event::createMouseButtonPress(int button, int mods, const Vec2 &pos) {
+  Event event;
+  event.type = EventType::MouseButtonPressed;
+  event.data = MouseButtonEvent{button, mods, pos};
+  return event;
+}
+
+Event Event::createMouseButtonRelease(int button, int mods, const Vec2 &pos) {
+  Event event;
+  event.type = EventType::MouseButtonReleased;
+  event.data = MouseButtonEvent{button, mods, pos};
+  return event;
+}
+
+Event Event::createMouseMove(const Vec2 &pos, const Vec2 &delta) {
+  Event event;
+  event.type = EventType::MouseMoved;
+  event.data = MouseMoveEvent{pos, delta};
+  return event;
+}
+
+Event Event::createMouseScroll(const Vec2 &offset, const Vec2 &pos) {
+  Event event;
+  event.type = EventType::MouseScrolled;
+  event.data = MouseScrollEvent{offset, pos};
+  return event;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/event/event_dispatcher.cpp b/Extra2D/src/event/event_dispatcher.cpp
new file mode 100644
index 0000000..8e69221
--- /dev/null
+++ b/Extra2D/src/event/event_dispatcher.cpp
@@ -0,0 +1,68 @@
+#include <extra2d/event/event_dispatcher.h>
+#include <extra2d/event/event_queue.h>
+
+namespace extra2d {
+
+EventDispatcher::EventDispatcher() : nextId_(1) {}
+
+ListenerId EventDispatcher::addListener(EventType type,
+                                        EventCallback callback) {
+  ListenerId id = nextId_++;
+  listeners_[type].push_back({id, type, callback});
+  return id;
+}
+
+void EventDispatcher::removeListener(ListenerId id) {
+  for (auto &[type, listeners] : listeners_) {
+    auto it = std::remove_if(listeners.begin(), listeners.end(),
+                             [id](const Listener &l) { return l.id == id; });
+    if (it != listeners.end()) {
+      listeners.erase(it, listeners.end());
+      return;
+    }
+  }
+}
+
+void EventDispatcher::removeAllListeners(EventType type) {
+  listeners_.erase(type);
+}
+
+void EventDispatcher::removeAllListeners() { listeners_.clear(); }
+
+void EventDispatcher::dispatch(Event &event) {
+  auto it = listeners_.find(event.type);
+  if (it != listeners_.end()) {
+    for (auto &listener : it->second) {
+      if (event.handled)
+        break;
+      listener.callback(event);
+    }
+  }
+}
+
+void EventDispatcher::dispatch(const Event &event) {
+  Event mutableEvent = event;
+  dispatch(mutableEvent);
+}
+
+void EventDispatcher::processQueue(EventQueue &queue) {
+  Event event;
+  while (queue.poll(event)) {
+    dispatch(event);
+  }
+}
+
+size_t EventDispatcher::getListenerCount(EventType type) const {
+  auto it = listeners_.find(type);
+  return (it != listeners_.end()) ? it->second.size() : 0;
+}
+
+size_t EventDispatcher::getTotalListenerCount() const {
+  size_t count = 0;
+  for (const auto &[type, listeners] : listeners_) {
+    count += listeners.size();
+  }
+  return count;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/event/event_queue.cpp b/Extra2D/src/event/event_queue.cpp
new file mode 100644
index 0000000..538254a
--- /dev/null
+++ b/Extra2D/src/event/event_queue.cpp
@@ -0,0 +1,53 @@
+#include <extra2d/event/event_queue.h>
+
+namespace extra2d {
+
+EventQueue::EventQueue() = default;
+
+void EventQueue::push(const Event &event) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  queue_.push(event);
+}
+
+void EventQueue::push(Event &&event) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  queue_.push(std::move(event));
+}
+
+bool EventQueue::poll(Event &event) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (queue_.empty()) {
+    return false;
+  }
+  event = queue_.front();
+  queue_.pop();
+  return true;
+}
+
+bool EventQueue::peek(Event &event) const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (queue_.empty()) {
+    return false;
+  }
+  event = queue_.front();
+  return true;
+}
+
+void EventQueue::clear() {
+  std::lock_guard<std::mutex> lock(mutex_);
+  while (!queue_.empty()) {
+    queue_.pop();
+  }
+}
+
+bool EventQueue::empty() const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  return queue_.empty();
+}
+
+size_t EventQueue::size() const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  return queue_.size();
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/alpha_mask.cpp b/Extra2D/src/graphics/alpha_mask.cpp
new file mode 100644
index 0000000..1a6fde9
--- /dev/null
+++ b/Extra2D/src/graphics/alpha_mask.cpp
@@ -0,0 +1,55 @@
+#include <extra2d/graphics/alpha_mask.h>
+
+namespace extra2d {
+
+AlphaMask::AlphaMask(int width, int height)
+    : width_(width), height_(height), data_(width * height, 255) {}
+
+AlphaMask AlphaMask::createFromPixels(const uint8_t *pixels, int width,
+                                      int height, int channels) {
+  AlphaMask mask(width, height);
+
+  if (!pixels || width <= 0 || height <= 0) {
+    return mask;
+  }
+
+  // 根据通道数提取Alpha值
+  for (int y = 0; y < height; ++y) {
+    for (int x = 0; x < width; ++x) {
+      int pixelIndex = (y * width + x) * channels;
+      uint8_t alpha = 255;
+
+      if (channels == 4) {
+        // RGBA格式，Alpha在第四个通道
+        alpha = pixels[pixelIndex + 3];
+      } else if (channels == 1) {
+        // 灰度图，直接作为Alpha
+        alpha = pixels[pixelIndex];
+      } else if (channels == 3) {
+        // RGB格式，没有Alpha通道，视为不透明
+        alpha = 255;
+      }
+
+      mask.data_[y * width + x] = alpha;
+    }
+  }
+
+  return mask;
+}
+
+uint8_t AlphaMask::getAlpha(int x, int y) const {
+  if (!isValid(x, y)) {
+    return 0;
+  }
+  return data_[y * width_ + x];
+}
+
+bool AlphaMask::isOpaque(int x, int y, uint8_t threshold) const {
+  return getAlpha(x, y) >= threshold;
+}
+
+bool AlphaMask::isValid(int x, int y) const {
+  return x >= 0 && x < width_ && y >= 0 && y < height_;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/camera.cpp b/Extra2D/src/graphics/camera.cpp
new file mode 100644
index 0000000..1d982d2
--- /dev/null
+++ b/Extra2D/src/graphics/camera.cpp
@@ -0,0 +1,158 @@
+#include <algorithm>
+#include <extra2d/graphics/camera.h>
+#include <glm/gtc/matrix_transform.hpp>
+
+namespace extra2d {
+
+Camera::Camera() : left_(-1.0f), right_(1.0f), bottom_(-1.0f), top_(1.0f) {}
+
+Camera::Camera(float left, float right, float bottom, float top)
+    : left_(left), right_(right), bottom_(bottom), top_(top) {}
+
+Camera::Camera(const Size &viewport)
+    : left_(0.0f), right_(viewport.width), bottom_(viewport.height),
+      top_(0.0f) {}
+
+void Camera::setPosition(const Vec2 &position) {
+  position_ = position;
+  viewDirty_ = true;
+}
+
+void Camera::setPosition(float x, float y) {
+  position_.x = x;
+  position_.y = y;
+  viewDirty_ = true;
+}
+
+void Camera::setRotation(float degrees) {
+  rotation_ = degrees;
+  viewDirty_ = true;
+}
+
+void Camera::setZoom(float zoom) {
+  zoom_ = zoom;
+  viewDirty_ = true;
+  projDirty_ = true;
+}
+
+void Camera::setViewport(float left, float right, float bottom, float top) {
+  left_ = left;
+  right_ = right;
+  bottom_ = bottom;
+  top_ = top;
+  projDirty_ = true;
+}
+
+void Camera::setViewport(const Rect &rect) {
+  left_ = rect.left();
+  right_ = rect.right();
+  bottom_ = rect.bottom();
+  top_ = rect.top();
+  projDirty_ = true;
+}
+
+Rect Camera::getViewport() const {
+  return Rect(left_, top_, right_ - left_, bottom_ - top_);
+}
+
+glm::mat4 Camera::getViewMatrix() const {
+  if (viewDirty_) {
+    viewMatrix_ = glm::mat4(1.0f);
+    // 对于2D相机，我们只需要平移（注意Y轴方向）
+    viewMatrix_ = glm::translate(viewMatrix_,
+                                 glm::vec3(-position_.x, -position_.y, 0.0f));
+    viewDirty_ = false;
+  }
+  return viewMatrix_;
+}
+
+glm::mat4 Camera::getProjectionMatrix() const {
+  if (projDirty_) {
+    // 对于2D游戏，Y轴向下增长（屏幕坐标系）
+    // OpenGL默认Y轴向上，所以需要反转Y轴
+    // glm::ortho(left, right, bottom, top)
+    // 为了Y轴向下：传入 (bottom=height, top=0)，这样Y轴翻转
+    projMatrix_ = glm::ortho(
+        left_, right_, // X轴：从左到右
+        bottom_, top_, // Y轴：从下到上（传入bottom>top，实现Y轴向下增长）
+        -1.0f, 1.0f);
+    projDirty_ = false;
+  }
+  return projMatrix_;
+}
+
+glm::mat4 Camera::getViewProjectionMatrix() const {
+  // 对于2D相机，我们主要依赖投影矩阵
+  // 视口变换已经处理了坐标系转换
+  return getProjectionMatrix();
+}
+
+Vec2 Camera::screenToWorld(const Vec2 &screenPos) const {
+  // 屏幕坐标直接映射到世界坐标（在2D中通常相同）
+  return screenPos;
+}
+
+Vec2 Camera::worldToScreen(const Vec2 &worldPos) const {
+  // 世界坐标直接映射到屏幕坐标（在2D中通常相同）
+  return worldPos;
+}
+
+Vec2 Camera::screenToWorld(float x, float y) const {
+  return screenToWorld(Vec2(x, y));
+}
+
+Vec2 Camera::worldToScreen(float x, float y) const {
+  return worldToScreen(Vec2(x, y));
+}
+
+void Camera::move(const Vec2 &offset) {
+  position_ += offset;
+  viewDirty_ = true;
+}
+
+void Camera::move(float x, float y) {
+  position_.x += x;
+  position_.y += y;
+  viewDirty_ = true;
+}
+
+void Camera::setBounds(const Rect &bounds) {
+  bounds_ = bounds;
+  hasBounds_ = true;
+}
+
+void Camera::clearBounds() { hasBounds_ = false; }
+
+void Camera::clampToBounds() {
+  if (!hasBounds_)
+    return;
+
+  float viewportWidth = (right_ - left_) / zoom_;
+  float viewportHeight = (bottom_ - top_) / zoom_;
+
+  float minX = bounds_.left() + viewportWidth * 0.5f;
+  float maxX = bounds_.right() - viewportWidth * 0.5f;
+  float minY = bounds_.top() + viewportHeight * 0.5f;
+  float maxY = bounds_.bottom() - viewportHeight * 0.5f;
+
+  if (minX > maxX) {
+    position_.x = bounds_.center().x;
+  } else {
+    position_.x = std::clamp(position_.x, minX, maxX);
+  }
+
+  if (minY > maxY) {
+    position_.y = bounds_.center().y;
+  } else {
+    position_.y = std::clamp(position_.y, minY, maxY);
+  }
+
+  viewDirty_ = true;
+}
+
+void Camera::lookAt(const Vec2 &target) {
+  position_ = target;
+  viewDirty_ = true;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/opengl/gl_font_atlas.cpp b/Extra2D/src/graphics/opengl/gl_font_atlas.cpp
new file mode 100644
index 0000000..0c9516f
--- /dev/null
+++ b/Extra2D/src/graphics/opengl/gl_font_atlas.cpp
@@ -0,0 +1,262 @@
+#include <extra2d/graphics/opengl/gl_font_atlas.h>
+#define STB_TRUETYPE_IMPLEMENTATION
+#include <stb/stb_truetype.h>
+#define STB_RECT_PACK_IMPLEMENTATION
+#include <algorithm>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <stb/stb_rect_pack.h>
+
+namespace extra2d {
+
+// ============================================================================
+// 构造函数 - 初始化字体图集
+// ============================================================================
+GLFontAtlas::GLFontAtlas(const std::string &filepath, int fontSize, bool useSDF)
+    : fontSize_(fontSize), useSDF_(useSDF), currentY_(0), scale_(0.0f),
+      ascent_(0.0f), descent_(0.0f), lineGap_(0.0f) {
+
+  // 加载字体文件
+  std::ifstream file(filepath, std::ios::binary | std::ios::ate);
+  if (!file.is_open()) {
+    E2D_LOG_ERROR("Failed to load font: {}", filepath);
+    return;
+  }
+
+  std::streamsize size = file.tellg();
+  file.seekg(0, std::ios::beg);
+  fontData_.resize(size);
+  if (!file.read(reinterpret_cast<char *>(fontData_.data()), size)) {
+    E2D_LOG_ERROR("Failed to read font file: {}", filepath);
+    return;
+  }
+
+  // 初始化 stb_truetype
+  if (!stbtt_InitFont(&fontInfo_, fontData_.data(),
+                      stbtt_GetFontOffsetForIndex(fontData_.data(), 0))) {
+    E2D_LOG_ERROR("Failed to init font: {}", filepath);
+    return;
+  }
+
+  scale_ = stbtt_ScaleForPixelHeight(&fontInfo_, static_cast<float>(fontSize_));
+
+  int ascent, descent, lineGap;
+  stbtt_GetFontVMetrics(&fontInfo_, &ascent, &descent, &lineGap);
+  ascent_ = static_cast<float>(ascent) * scale_;
+  descent_ = static_cast<float>(descent) * scale_;
+  lineGap_ = static_cast<float>(lineGap) * scale_;
+
+  createAtlas();
+}
+
+// ============================================================================
+// 析构函数
+// ============================================================================
+GLFontAtlas::~GLFontAtlas() = default;
+
+// ============================================================================
+// 获取字形 - 如果字形不存在则缓存它
+// ============================================================================
+const Glyph *GLFontAtlas::getGlyph(char32_t codepoint) const {
+  auto it = glyphs_.find(codepoint);
+  if (it == glyphs_.end()) {
+    cacheGlyph(codepoint);
+    it = glyphs_.find(codepoint);
+  }
+  return (it != glyphs_.end()) ? &it->second : nullptr;
+}
+
+// ============================================================================
+// 测量文本尺寸
+// ============================================================================
+Vec2 GLFontAtlas::measureText(const String &text) {
+  float width = 0.0f;
+  float height = getAscent() - getDescent();
+  float currentWidth = 0.0f;
+
+  for (char32_t codepoint : text.toUtf32()) {
+    if (codepoint == '\n') {
+      width = std::max(width, currentWidth);
+      currentWidth = 0.0f;
+      height += getLineHeight();
+      continue;
+    }
+
+    const Glyph *glyph = getGlyph(codepoint);
+    if (glyph) {
+      currentWidth += glyph->advance;
+    }
+  }
+
+  width = std::max(width, currentWidth);
+  return Vec2(width, height);
+}
+
+// ============================================================================
+// 创建图集纹理 - 初始化空白纹理和矩形打包上下文
+// ============================================================================
+void GLFontAtlas::createAtlas() {
+  int channels = useSDF_ ? 1 : 4;
+  std::vector<uint8_t> emptyData(ATLAS_WIDTH * ATLAS_HEIGHT * channels, 0);
+  texture_ = std::make_unique<GLTexture>(ATLAS_WIDTH, ATLAS_HEIGHT,
+                                         emptyData.data(), channels);
+  texture_->setFilter(true);
+
+  // 初始化矩形打包上下文
+  packNodes_.resize(ATLAS_WIDTH);
+  stbrp_init_target(&packContext_, ATLAS_WIDTH, ATLAS_HEIGHT, packNodes_.data(),
+                    ATLAS_WIDTH);
+}
+
+// ============================================================================
+// 缓存字形 - 渲染字形到图集并存储信息
+// 使用 stb_rect_pack 进行矩形打包
+// ============================================================================
+void GLFontAtlas::cacheGlyph(char32_t codepoint) const {
+  int advance = 0;
+  stbtt_GetCodepointHMetrics(&fontInfo_, static_cast<int>(codepoint), &advance,
+                             nullptr);
+  float advancePx = advance * scale_;
+
+  if (useSDF_) {
+    constexpr int SDF_PADDING = 8;
+    constexpr unsigned char ONEDGE_VALUE = 128;
+    constexpr float PIXEL_DIST_SCALE = 64.0f;
+
+    int w = 0, h = 0, xoff = 0, yoff = 0;
+    unsigned char *sdf = stbtt_GetCodepointSDF(
+        &fontInfo_, scale_, static_cast<int>(codepoint), SDF_PADDING,
+        ONEDGE_VALUE, PIXEL_DIST_SCALE, &w, &h, &xoff, &yoff);
+    if (!sdf || w <= 0 || h <= 0) {
+      if (sdf)
+        stbtt_FreeSDF(sdf, nullptr);
+      Glyph glyph{};
+      glyph.advance = advancePx;
+      glyphs_[codepoint] = glyph;
+      return;
+    }
+
+    stbrp_rect rect;
+    rect.id = static_cast<int>(codepoint);
+    rect.w = w + PADDING * 2;
+    rect.h = h + PADDING * 2;
+
+    stbrp_pack_rects(&packContext_, &rect, 1);
+    if (!rect.was_packed) {
+      E2D_LOG_WARN("Font atlas is full, cannot cache codepoint: {}",
+                   static_cast<int>(codepoint));
+      stbtt_FreeSDF(sdf, nullptr);
+      return;
+    }
+
+    int atlasX = rect.x + PADDING;
+    int atlasY = rect.y + PADDING;
+
+    Glyph glyph;
+    glyph.width = static_cast<float>(w);
+    glyph.height = static_cast<float>(h);
+    glyph.bearingX = static_cast<float>(xoff);
+    glyph.bearingY = static_cast<float>(yoff);
+    glyph.advance = advancePx;
+
+    // stb_rect_pack 使用左上角为原点，OpenGL纹理使用左下角为原点
+    // 需要翻转V坐标
+    float v0 = static_cast<float>(atlasY) / ATLAS_HEIGHT;
+    float v1 = static_cast<float>(atlasY + h) / ATLAS_HEIGHT;
+    glyph.u0 = static_cast<float>(atlasX) / ATLAS_WIDTH;
+    glyph.v0 = 1.0f - v1; // 翻转V坐标
+    glyph.u1 = static_cast<float>(atlasX + w) / ATLAS_WIDTH;
+    glyph.v1 = 1.0f - v0; // 翻转V坐标
+
+    glyphs_[codepoint] = glyph;
+
+    glBindTexture(GL_TEXTURE_2D, texture_->getTextureID());
+    GLint prevUnpackAlignment = 4;
+    glGetIntegerv(GL_UNPACK_ALIGNMENT, &prevUnpackAlignment);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    // OpenGL纹理坐标原点在左下角，需要将Y坐标翻转
+    glTexSubImage2D(GL_TEXTURE_2D, 0, atlasX, ATLAS_HEIGHT - atlasY - h, w, h,
+                    GL_RED, GL_UNSIGNED_BYTE, sdf);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, prevUnpackAlignment);
+
+    stbtt_FreeSDF(sdf, nullptr);
+    return;
+  }
+
+  int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
+  stbtt_GetCodepointBitmapBox(&fontInfo_, static_cast<int>(codepoint), scale_,
+                              scale_, &x0, &y0, &x1, &y1);
+  int w = x1 - x0;
+  int h = y1 - y0;
+  int xoff = x0;
+  int yoff = y0;
+
+  if (w <= 0 || h <= 0) {
+    Glyph glyph{};
+    glyph.advance = advancePx;
+    glyphs_[codepoint] = glyph;
+    return;
+  }
+
+  std::vector<unsigned char> bitmap(
+      static_cast<size_t>(w) * static_cast<size_t>(h), 0);
+  stbtt_MakeCodepointBitmap(&fontInfo_, bitmap.data(), w, h, w, scale_, scale_,
+                            static_cast<int>(codepoint));
+
+  // 使用 stb_rect_pack 打包矩形
+  stbrp_rect rect;
+  rect.id = static_cast<int>(codepoint);
+  rect.w = w + PADDING * 2;
+  rect.h = h + PADDING * 2;
+
+  stbrp_pack_rects(&packContext_, &rect, 1);
+
+  if (!rect.was_packed) {
+    // 图集已满，无法缓存更多字形
+    E2D_LOG_WARN("Font atlas is full, cannot cache codepoint: {}",
+                 static_cast<int>(codepoint));
+    return;
+  }
+
+  int atlasX = rect.x + PADDING;
+  int atlasY = rect.y + PADDING;
+
+  // 创建字形信息
+  Glyph glyph;
+  glyph.width = static_cast<float>(w);
+  glyph.height = static_cast<float>(h);
+  glyph.bearingX = static_cast<float>(xoff);
+  glyph.bearingY = static_cast<float>(yoff);
+  glyph.advance = advancePx;
+
+  // 计算纹理坐标（相对于图集）
+  // stb_rect_pack 使用左上角为原点，OpenGL纹理使用左下角为原点
+  // 需要翻转V坐标
+  float v0 = static_cast<float>(atlasY) / ATLAS_HEIGHT;
+  float v1 = static_cast<float>(atlasY + h) / ATLAS_HEIGHT;
+  glyph.u0 = static_cast<float>(atlasX) / ATLAS_WIDTH;
+  glyph.v0 = 1.0f - v1; // 翻转V坐标
+  glyph.u1 = static_cast<float>(atlasX + w) / ATLAS_WIDTH;
+  glyph.v1 = 1.0f - v0; // 翻转V坐标
+
+  // 存储字形
+  glyphs_[codepoint] = glyph;
+
+  // 将单通道字形数据转换为 RGBA 格式（白色字形，Alpha 通道存储灰度）
+  std::vector<uint8_t> rgbaData(w * h * 4);
+  for (int i = 0; i < w * h; ++i) {
+    uint8_t alpha = bitmap[static_cast<size_t>(i)];
+    rgbaData[i * 4 + 0] = 255;   // R
+    rgbaData[i * 4 + 1] = 255;   // G
+    rgbaData[i * 4 + 2] = 255;   // B
+    rgbaData[i * 4 + 3] = alpha; // A
+  }
+
+  // 更新纹理 - 将字形数据上传到图集的指定位置
+  // OpenGL纹理坐标原点在左下角，需要将Y坐标翻转
+  glBindTexture(GL_TEXTURE_2D, texture_->getTextureID());
+  glTexSubImage2D(GL_TEXTURE_2D, 0, atlasX, ATLAS_HEIGHT - atlasY - h, w, h,
+                  GL_RGBA, GL_UNSIGNED_BYTE, rgbaData.data());
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/opengl/gl_renderer.cpp b/Extra2D/src/graphics/opengl/gl_renderer.cpp
new file mode 100644
index 0000000..8b7093c
--- /dev/null
+++ b/Extra2D/src/graphics/opengl/gl_renderer.cpp
@@ -0,0 +1,428 @@
+#include <SDL.h>
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <extra2d/graphics/opengl/gl_font_atlas.h>
+#include <extra2d/graphics/opengl/gl_renderer.h>
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/graphics/vram_manager.h>
+#include <extra2d/platform/window.h>
+#include <extra2d/utils/logger.h>
+#include <vector>
+
+namespace extra2d {
+
+// 形状渲染着色器 (GLES 3.2)
+static const char *SHAPE_VERTEX_SHADER = R"(
+#version 300 es
+precision highp float;
+layout(location = 0) in vec2 aPosition;
+uniform mat4 uViewProjection;
+void main() {
+    gl_Position = uViewProjection * vec4(aPosition, 0.0, 1.0);
+}
+)";
+
+static const char *SHAPE_FRAGMENT_SHADER = R"(
+#version 300 es
+precision highp float;
+uniform vec4 uColor;
+out vec4 fragColor;
+void main() {
+    fragColor = uColor;
+}
+)";
+
+// VBO 初始大小（用于 VRAM 跟踪）
+static constexpr size_t SHAPE_VBO_SIZE = 1024 * sizeof(float);
+
+GLRenderer::GLRenderer()
+    : window_(nullptr), shapeVao_(0), shapeVbo_(0), vsync_(true) {
+  resetStats();
+}
+
+GLRenderer::~GLRenderer() { shutdown(); }
+
+bool GLRenderer::init(Window *window) {
+  window_ = window;
+
+  // Switch: GL 上下文已通过 SDL2 + EGL 初始化，无需 glewInit()
+
+  // 初始化精灵批渲染器
+  if (!spriteBatch_.init()) {
+    E2D_LOG_ERROR("Failed to initialize sprite batch");
+    return false;
+  }
+
+  // 初始化形状渲染
+  initShapeRendering();
+
+  // 设置 OpenGL 状态
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+  E2D_LOG_INFO("OpenGL Renderer initialized");
+  E2D_LOG_INFO("OpenGL Version: {}",
+               reinterpret_cast<const char *>(glGetString(GL_VERSION)));
+
+  return true;
+}
+
+void GLRenderer::shutdown() {
+  spriteBatch_.shutdown();
+
+  if (shapeVbo_ != 0) {
+    glDeleteBuffers(1, &shapeVbo_);
+    VRAMManager::getInstance().freeBuffer(SHAPE_VBO_SIZE);
+    shapeVbo_ = 0;
+  }
+  if (shapeVao_ != 0) {
+    glDeleteVertexArrays(1, &shapeVao_);
+    shapeVao_ = 0;
+  }
+}
+
+void GLRenderer::beginFrame(const Color &clearColor) {
+  glClearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a);
+  glClear(GL_COLOR_BUFFER_BIT);
+  resetStats();
+}
+
+void GLRenderer::endFrame() {
+  // 交换缓冲区在 Window 类中处理
+}
+
+void GLRenderer::setViewport(int x, int y, int width, int height) {
+  glViewport(x, y, width, height);
+}
+
+void GLRenderer::setVSync(bool enabled) {
+  vsync_ = enabled;
+  // 使用 SDL2 设置交换间隔
+  SDL_GL_SetSwapInterval(enabled ? 1 : 0);
+}
+
+void GLRenderer::setBlendMode(BlendMode mode) {
+  switch (mode) {
+  case BlendMode::None:
+    glDisable(GL_BLEND);
+    break;
+  case BlendMode::Alpha:
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    break;
+  case BlendMode::Additive:
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    break;
+  case BlendMode::Multiply:
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA);
+    break;
+  }
+}
+
+void GLRenderer::setViewProjection(const glm::mat4 &matrix) {
+  viewProjection_ = matrix;
+}
+
+Ptr<Texture> GLRenderer::createTexture(int width, int height,
+                                       const uint8_t *pixels, int channels) {
+  return makePtr<GLTexture>(width, height, pixels, channels);
+}
+
+Ptr<Texture> GLRenderer::loadTexture(const std::string &filepath) {
+  return makePtr<GLTexture>(filepath);
+}
+
+void GLRenderer::beginSpriteBatch() { spriteBatch_.begin(viewProjection_); }
+
+void GLRenderer::drawSprite(const Texture &texture, const Rect &destRect,
+                            const Rect &srcRect, const Color &tint,
+                            float rotation, const Vec2 &anchor) {
+  GLSpriteBatch::SpriteData data;
+  data.position = glm::vec2(destRect.origin.x, destRect.origin.y);
+  data.size = glm::vec2(destRect.size.width, destRect.size.height);
+
+  Texture *tex = const_cast<Texture *>(&texture);
+  float texW = static_cast<float>(tex->getWidth());
+  float texH = static_cast<float>(tex->getHeight());
+
+  // 纹理坐标计算
+  float u1 = srcRect.origin.x / texW;
+  float u2 = (srcRect.origin.x + srcRect.size.width) / texW;
+  float v1 = 1.0f - (srcRect.origin.y / texH);
+  float v2 = 1.0f - ((srcRect.origin.y + srcRect.size.height) / texH);
+
+  data.texCoordMin = glm::vec2(glm::min(u1, u2), glm::min(v1, v2));
+  data.texCoordMax = glm::vec2(glm::max(u1, u2), glm::max(v1, v2));
+
+  data.color = glm::vec4(tint.r, tint.g, tint.b, tint.a);
+  data.rotation = rotation * 3.14159f / 180.0f;
+  data.anchor = glm::vec2(anchor.x, anchor.y);
+  data.isSDF = false;
+
+  spriteBatch_.draw(texture, data);
+}
+
+void GLRenderer::drawSprite(const Texture &texture, const Vec2 &position,
+                            const Color &tint) {
+  Rect destRect(position.x, position.y, static_cast<float>(texture.getWidth()),
+                static_cast<float>(texture.getHeight()));
+  Rect srcRect(0, 0, static_cast<float>(texture.getWidth()),
+               static_cast<float>(texture.getHeight()));
+  drawSprite(texture, destRect, srcRect, tint, 0.0f, Vec2(0, 0));
+}
+
+void GLRenderer::endSpriteBatch() {
+  spriteBatch_.end();
+  stats_.drawCalls += spriteBatch_.getDrawCallCount();
+}
+
+void GLRenderer::drawLine(const Vec2 &start, const Vec2 &end,
+                          const Color &color, float width) {
+  glLineWidth(width);
+
+  shapeShader_.bind();
+  shapeShader_.setMat4("uViewProjection", viewProjection_);
+  shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
+
+  float vertices[] = {start.x, start.y, end.x, end.y};
+
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
+
+  glBindVertexArray(shapeVao_);
+  glDrawArrays(GL_LINES, 0, 2);
+
+  stats_.drawCalls++;
+  stats_.triangleCount += 1;
+}
+
+void GLRenderer::drawRect(const Rect &rect, const Color &color, float width) {
+  float x1 = rect.origin.x;
+  float y1 = rect.origin.y;
+  float x2 = rect.origin.x + rect.size.width;
+  float y2 = rect.origin.y + rect.size.height;
+
+  drawLine(Vec2(x1, y1), Vec2(x2, y1), color, width);
+  drawLine(Vec2(x2, y1), Vec2(x2, y2), color, width);
+  drawLine(Vec2(x2, y2), Vec2(x1, y2), color, width);
+  drawLine(Vec2(x1, y2), Vec2(x1, y1), color, width);
+}
+
+void GLRenderer::fillRect(const Rect &rect, const Color &color) {
+  shapeShader_.bind();
+  shapeShader_.setMat4("uViewProjection", viewProjection_);
+  shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
+
+  float vertices[] = {rect.origin.x,
+                      rect.origin.y,
+                      rect.origin.x + rect.size.width,
+                      rect.origin.y,
+                      rect.origin.x + rect.size.width,
+                      rect.origin.y + rect.size.height,
+                      rect.origin.x,
+                      rect.origin.y + rect.size.height};
+
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
+
+  glBindVertexArray(shapeVao_);
+  glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+  stats_.drawCalls++;
+  stats_.triangleCount += 2;
+}
+
+void GLRenderer::drawCircle(const Vec2 &center, float radius,
+                            const Color &color, int segments, float width) {
+  std::vector<float> vertices;
+  vertices.reserve((segments + 1) * 2);
+
+  for (int i = 0; i <= segments; ++i) {
+    float angle = 2.0f * 3.14159f * i / segments;
+    vertices.push_back(center.x + radius * cosf(angle));
+    vertices.push_back(center.y + radius * sinf(angle));
+  }
+
+  glLineWidth(width);
+
+  shapeShader_.bind();
+  shapeShader_.setMat4("uViewProjection", viewProjection_);
+  shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
+
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float),
+               vertices.data(), GL_DYNAMIC_DRAW);
+
+  glBindVertexArray(shapeVao_);
+  glDrawArrays(GL_LINE_STRIP, 0, segments + 1);
+
+  stats_.drawCalls++;
+}
+
+void GLRenderer::fillCircle(const Vec2 &center, float radius,
+                            const Color &color, int segments) {
+  std::vector<float> vertices;
+  vertices.reserve((segments + 2) * 2);
+
+  vertices.push_back(center.x);
+  vertices.push_back(center.y);
+
+  for (int i = 0; i <= segments; ++i) {
+    float angle = 2.0f * 3.14159f * i / segments;
+    vertices.push_back(center.x + radius * cosf(angle));
+    vertices.push_back(center.y + radius * sinf(angle));
+  }
+
+  shapeShader_.bind();
+  shapeShader_.setMat4("uViewProjection", viewProjection_);
+  shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
+
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float),
+               vertices.data(), GL_DYNAMIC_DRAW);
+
+  glBindVertexArray(shapeVao_);
+  glDrawArrays(GL_TRIANGLE_FAN, 0, segments + 2);
+
+  stats_.drawCalls++;
+  stats_.triangleCount += segments;
+}
+
+void GLRenderer::drawTriangle(const Vec2 &p1, const Vec2 &p2, const Vec2 &p3,
+                              const Color &color, float width) {
+  drawLine(p1, p2, color, width);
+  drawLine(p2, p3, color, width);
+  drawLine(p3, p1, color, width);
+}
+
+void GLRenderer::fillTriangle(const Vec2 &p1, const Vec2 &p2, const Vec2 &p3,
+                              const Color &color) {
+  shapeShader_.bind();
+  shapeShader_.setMat4("uViewProjection", viewProjection_);
+  shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
+
+  float vertices[] = {p1.x, p1.y, p2.x, p2.y, p3.x, p3.y};
+
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
+
+  glBindVertexArray(shapeVao_);
+  glDrawArrays(GL_TRIANGLES, 0, 3);
+
+  stats_.drawCalls++;
+  stats_.triangleCount += 1;
+}
+
+void GLRenderer::drawPolygon(const std::vector<Vec2> &points,
+                             const Color &color, float width) {
+  for (size_t i = 0; i < points.size(); ++i) {
+    drawLine(points[i], points[(i + 1) % points.size()], color, width);
+  }
+}
+
+void GLRenderer::fillPolygon(const std::vector<Vec2> &points,
+                             const Color &color) {
+  // 简化的三角形扇形填充
+  if (points.size() < 3)
+    return;
+
+  shapeShader_.bind();
+  shapeShader_.setMat4("uViewProjection", viewProjection_);
+  shapeShader_.setVec4("uColor", glm::vec4(color.r, color.g, color.b, color.a));
+
+  std::vector<float> vertices;
+  for (const auto &p : points) {
+    vertices.push_back(p.x);
+    vertices.push_back(p.y);
+  }
+
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float),
+               vertices.data(), GL_DYNAMIC_DRAW);
+
+  glBindVertexArray(shapeVao_);
+  glDrawArrays(GL_TRIANGLE_FAN, 0, static_cast<GLsizei>(points.size()));
+
+  stats_.drawCalls++;
+  stats_.triangleCount += static_cast<uint32_t>(points.size() - 2);
+}
+
+Ptr<FontAtlas> GLRenderer::createFontAtlas(const std::string &filepath,
+                                           int fontSize, bool useSDF) {
+  return makePtr<GLFontAtlas>(filepath, fontSize, useSDF);
+}
+
+void GLRenderer::drawText(const FontAtlas &font, const String &text,
+                          const Vec2 &position, const Color &color) {
+  drawText(font, text, position.x, position.y, color);
+}
+
+void GLRenderer::drawText(const FontAtlas &font, const String &text, float x,
+                          float y, const Color &color) {
+  float cursorX = x;
+  float cursorY = y;
+  float baselineY = cursorY + font.getAscent();
+
+  for (char32_t codepoint : text.toUtf32()) {
+    if (codepoint == '\n') {
+      cursorX = x;
+      cursorY += font.getLineHeight();
+      baselineY = cursorY + font.getAscent();
+      continue;
+    }
+
+    const Glyph *glyph = font.getGlyph(codepoint);
+    if (glyph) {
+      float penX = cursorX;
+      cursorX += glyph->advance;
+
+      if (glyph->width <= 0.0f || glyph->height <= 0.0f) {
+        continue;
+      }
+
+      float xPos = penX + glyph->bearingX;
+      float yPos = baselineY + glyph->bearingY;
+
+      Rect destRect(xPos, yPos, glyph->width, glyph->height);
+
+      GLSpriteBatch::SpriteData data;
+      data.position = glm::vec2(destRect.origin.x, destRect.origin.y);
+      data.size = glm::vec2(destRect.size.width, destRect.size.height);
+      data.texCoordMin = glm::vec2(glyph->u0, glyph->v0);
+      data.texCoordMax = glm::vec2(glyph->u1, glyph->v1);
+      data.color = glm::vec4(color.r, color.g, color.b, color.a);
+      data.rotation = 0.0f;
+      data.anchor = glm::vec2(0.0f, 0.0f);
+      data.isSDF = font.isSDF();
+      spriteBatch_.draw(*font.getTexture(), data);
+    }
+  }
+}
+
+void GLRenderer::resetStats() { stats_ = Stats{}; }
+
+void GLRenderer::initShapeRendering() {
+  // 编译形状着色器
+  shapeShader_.compileFromSource(SHAPE_VERTEX_SHADER, SHAPE_FRAGMENT_SHADER);
+
+  // 创建 VAO 和 VBO
+  glGenVertexArrays(1, &shapeVao_);
+  glGenBuffers(1, &shapeVbo_);
+
+  glBindVertexArray(shapeVao_);
+  glBindBuffer(GL_ARRAY_BUFFER, shapeVbo_);
+  glBufferData(GL_ARRAY_BUFFER, SHAPE_VBO_SIZE, nullptr, GL_DYNAMIC_DRAW);
+
+  glEnableVertexAttribArray(0);
+  glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), nullptr);
+
+  glBindVertexArray(0);
+
+  // VRAM 跟踪
+  VRAMManager::getInstance().allocBuffer(SHAPE_VBO_SIZE);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/opengl/gl_shader.cpp b/Extra2D/src/graphics/opengl/gl_shader.cpp
new file mode 100644
index 0000000..c20e777
--- /dev/null
+++ b/Extra2D/src/graphics/opengl/gl_shader.cpp
@@ -0,0 +1,129 @@
+#include <extra2d/graphics/opengl/gl_shader.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <sstream>
+
+namespace extra2d {
+
+GLShader::GLShader() : programID_(0) {}
+
+GLShader::~GLShader() {
+  if (programID_ != 0) {
+    glDeleteProgram(programID_);
+  }
+}
+
+bool GLShader::compileFromSource(const char *vertexSource,
+                                 const char *fragmentSource) {
+  GLuint vertexShader = compileShader(GL_VERTEX_SHADER, vertexSource);
+  if (vertexShader == 0)
+    return false;
+
+  GLuint fragmentShader = compileShader(GL_FRAGMENT_SHADER, fragmentSource);
+  if (fragmentShader == 0) {
+    glDeleteShader(vertexShader);
+    return false;
+  }
+
+  programID_ = glCreateProgram();
+  glAttachShader(programID_, vertexShader);
+  glAttachShader(programID_, fragmentShader);
+  glLinkProgram(programID_);
+
+  GLint success;
+  glGetProgramiv(programID_, GL_LINK_STATUS, &success);
+  if (!success) {
+    char infoLog[512];
+    glGetProgramInfoLog(programID_, 512, nullptr, infoLog);
+    E2D_LOG_ERROR("Shader program linking failed: {}", infoLog);
+    glDeleteProgram(programID_);
+    programID_ = 0;
+  }
+
+  glDeleteShader(vertexShader);
+  glDeleteShader(fragmentShader);
+
+  return success == GL_TRUE;
+}
+
+bool GLShader::compileFromFile(const std::string &vertexPath,
+                               const std::string &fragmentPath) {
+  std::ifstream vShaderFile(vertexPath);
+  std::ifstream fShaderFile(fragmentPath);
+
+  if (!vShaderFile.is_open() || !fShaderFile.is_open()) {
+    E2D_LOG_ERROR("Failed to open shader files: {}, {}", vertexPath,
+                  fragmentPath);
+    return false;
+  }
+
+  std::stringstream vShaderStream, fShaderStream;
+  vShaderStream << vShaderFile.rdbuf();
+  fShaderStream << fShaderFile.rdbuf();
+
+  return compileFromSource(vShaderStream.str().c_str(),
+                           fShaderStream.str().c_str());
+}
+
+void GLShader::bind() const { glUseProgram(programID_); }
+
+void GLShader::unbind() const { glUseProgram(0); }
+
+void GLShader::setBool(const std::string &name, bool value) {
+  glUniform1i(getUniformLocation(name), value ? 1 : 0);
+}
+
+void GLShader::setInt(const std::string &name, int value) {
+  glUniform1i(getUniformLocation(name), value);
+}
+
+void GLShader::setFloat(const std::string &name, float value) {
+  glUniform1f(getUniformLocation(name), value);
+}
+
+void GLShader::setVec2(const std::string &name, const glm::vec2 &value) {
+  glUniform2fv(getUniformLocation(name), 1, &value[0]);
+}
+
+void GLShader::setVec3(const std::string &name, const glm::vec3 &value) {
+  glUniform3fv(getUniformLocation(name), 1, &value[0]);
+}
+
+void GLShader::setVec4(const std::string &name, const glm::vec4 &value) {
+  glUniform4fv(getUniformLocation(name), 1, &value[0]);
+}
+
+void GLShader::setMat4(const std::string &name, const glm::mat4 &value) {
+  glUniformMatrix4fv(getUniformLocation(name), 1, GL_FALSE, &value[0][0]);
+}
+
+GLuint GLShader::compileShader(GLenum type, const char *source) {
+  GLuint shader = glCreateShader(type);
+  glShaderSource(shader, 1, &source, nullptr);
+  glCompileShader(shader);
+
+  GLint success;
+  glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
+  if (!success) {
+    char infoLog[512];
+    glGetShaderInfoLog(shader, 512, nullptr, infoLog);
+    E2D_LOG_ERROR("Shader compilation failed: {}", infoLog);
+    glDeleteShader(shader);
+    return 0;
+  }
+
+  return shader;
+}
+
+GLint GLShader::getUniformLocation(const std::string &name) {
+  auto it = uniformCache_.find(name);
+  if (it != uniformCache_.end()) {
+    return it->second;
+  }
+
+  GLint location = glGetUniformLocation(programID_, name.c_str());
+  uniformCache_[name] = location;
+  return location;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp b/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp
new file mode 100644
index 0000000..3ba11a9
--- /dev/null
+++ b/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp
@@ -0,0 +1,231 @@
+#include <cstring>
+#include <extra2d/graphics/opengl/gl_sprite_batch.h>
+#include <extra2d/utils/logger.h>
+#include <glm/gtc/matrix_transform.hpp>
+
+namespace extra2d {
+
+// 顶点着色器 (GLES 3.2)
+static const char *SPRITE_VERTEX_SHADER = R"(
+#version 300 es
+precision highp float;
+layout(location = 0) in vec2 aPosition;
+layout(location = 1) in vec2 aTexCoord;
+layout(location = 2) in vec4 aColor;
+
+uniform mat4 uViewProjection;
+
+out vec2 vTexCoord;
+out vec4 vColor;
+
+void main() {
+    gl_Position = uViewProjection * vec4(aPosition, 0.0, 1.0);
+    vTexCoord = aTexCoord;
+    vColor = aColor;
+}
+)";
+
+// 片段着色器 (GLES 3.2)
+static const char *SPRITE_FRAGMENT_SHADER = R"(
+#version 300 es
+precision highp float;
+in vec2 vTexCoord;
+in vec4 vColor;
+
+uniform sampler2D uTexture;
+uniform int uUseSDF;
+uniform float uSdfOnEdge;
+uniform float uSdfScale;
+
+out vec4 fragColor;
+
+void main() {
+    if (uUseSDF == 1) {
+        float dist = texture(uTexture, vTexCoord).r;
+        float sd = (dist - uSdfOnEdge) * uSdfScale;
+        float w = fwidth(sd);
+        float alpha = smoothstep(-w, w, sd);
+        fragColor = vec4(vColor.rgb, vColor.a * alpha);
+    } else {
+        fragColor = texture(uTexture, vTexCoord) * vColor;
+    }
+}
+)";
+
+GLSpriteBatch::GLSpriteBatch()
+    : vao_(0), vbo_(0), ibo_(0), currentTexture_(nullptr), currentIsSDF_(false),
+      drawCallCount_(0), spriteCount_(0) {
+  vertices_.reserve(MAX_SPRITES * VERTICES_PER_SPRITE);
+  indices_.reserve(MAX_SPRITES * INDICES_PER_SPRITE);
+}
+
+GLSpriteBatch::~GLSpriteBatch() { shutdown(); }
+
+bool GLSpriteBatch::init() {
+  // 创建并编译着色器
+  if (!shader_.compileFromSource(SPRITE_VERTEX_SHADER,
+                                 SPRITE_FRAGMENT_SHADER)) {
+    E2D_LOG_ERROR("Failed to compile sprite batch shader");
+    return false;
+  }
+
+  // 生成 VAO、VBO、IBO
+  glGenVertexArrays(1, &vao_);
+  glGenBuffers(1, &vbo_);
+  glGenBuffers(1, &ibo_);
+
+  glBindVertexArray(vao_);
+
+  // 设置 VBO
+  glBindBuffer(GL_ARRAY_BUFFER, vbo_);
+  glBufferData(GL_ARRAY_BUFFER,
+               MAX_SPRITES * VERTICES_PER_SPRITE * sizeof(Vertex), nullptr,
+               GL_DYNAMIC_DRAW);
+
+  // 设置顶点属性
+  glEnableVertexAttribArray(0);
+  glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
+                        (void *)offsetof(Vertex, position));
+
+  glEnableVertexAttribArray(1);
+  glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
+                        (void *)offsetof(Vertex, texCoord));
+
+  glEnableVertexAttribArray(2);
+  glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex),
+                        (void *)offsetof(Vertex, color));
+
+  // 生成索引缓冲区
+  std::vector<GLuint> indices;
+  indices.reserve(MAX_SPRITES * INDICES_PER_SPRITE);
+  for (size_t i = 0; i < MAX_SPRITES; ++i) {
+    GLuint base = static_cast<GLuint>(i * VERTICES_PER_SPRITE);
+    indices.push_back(base + 0);
+    indices.push_back(base + 1);
+    indices.push_back(base + 2);
+    indices.push_back(base + 0);
+    indices.push_back(base + 2);
+    indices.push_back(base + 3);
+  }
+
+  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_);
+  glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(GLuint),
+               indices.data(), GL_STATIC_DRAW);
+
+  glBindVertexArray(0);
+
+  return true;
+}
+
+void GLSpriteBatch::shutdown() {
+  if (vao_ != 0) {
+    glDeleteVertexArrays(1, &vao_);
+    vao_ = 0;
+  }
+  if (vbo_ != 0) {
+    glDeleteBuffers(1, &vbo_);
+    vbo_ = 0;
+  }
+  if (ibo_ != 0) {
+    glDeleteBuffers(1, &ibo_);
+    ibo_ = 0;
+  }
+}
+
+void GLSpriteBatch::begin(const glm::mat4 &viewProjection) {
+  viewProjection_ = viewProjection;
+  vertices_.clear();
+  currentTexture_ = nullptr;
+  currentIsSDF_ = false;
+  drawCallCount_ = 0;
+  spriteCount_ = 0;
+}
+
+void GLSpriteBatch::draw(const Texture &texture, const SpriteData &data) {
+  // 如果纹理改变或缓冲区已满，先 flush
+  if (currentTexture_ != nullptr &&
+      (currentTexture_ != &texture || currentIsSDF_ != data.isSDF ||
+       vertices_.size() >= MAX_SPRITES * VERTICES_PER_SPRITE)) {
+    flush();
+  }
+
+  currentTexture_ = &texture;
+  currentIsSDF_ = data.isSDF;
+
+  // 计算变换后的顶点位置
+  glm::vec2 anchorOffset(data.size.x * data.anchor.x,
+                         data.size.y * data.anchor.y);
+
+  float cosR = cosf(data.rotation);
+  float sinR = sinf(data.rotation);
+
+  auto transform = [&](float x, float y) -> glm::vec2 {
+    float rx = x - anchorOffset.x;
+    float ry = y - anchorOffset.y;
+    return glm::vec2(data.position.x + rx * cosR - ry * sinR,
+                     data.position.y + rx * sinR + ry * cosR);
+  };
+
+  glm::vec4 color(data.color.r, data.color.g, data.color.b, data.color.a);
+
+  // 添加四个顶点（图片已在加载时翻转，纹理坐标直接使用）
+  // v0(左上) -- v1(右上)
+  //   |           |
+  // v3(左下) -- v2(右下)
+  Vertex v0{transform(0, 0), glm::vec2(data.texCoordMin.x, data.texCoordMin.y),
+            color};
+  Vertex v1{transform(data.size.x, 0),
+            glm::vec2(data.texCoordMax.x, data.texCoordMin.y), color};
+  Vertex v2{transform(data.size.x, data.size.y),
+            glm::vec2(data.texCoordMax.x, data.texCoordMax.y), color};
+  Vertex v3{transform(0, data.size.y),
+            glm::vec2(data.texCoordMin.x, data.texCoordMax.y), color};
+
+  vertices_.push_back(v0);
+  vertices_.push_back(v1);
+  vertices_.push_back(v2);
+  vertices_.push_back(v3);
+
+  spriteCount_++;
+}
+
+void GLSpriteBatch::end() {
+  if (!vertices_.empty()) {
+    flush();
+  }
+}
+
+void GLSpriteBatch::flush() {
+  if (vertices_.empty() || currentTexture_ == nullptr)
+    return;
+
+  // 绑定纹理
+  GLuint texID = static_cast<GLuint>(
+      reinterpret_cast<uintptr_t>(currentTexture_->getNativeHandle()));
+  glActiveTexture(GL_TEXTURE0);
+  glBindTexture(GL_TEXTURE_2D, texID);
+
+  // 使用着色器
+  shader_.bind();
+  shader_.setMat4("uViewProjection", viewProjection_);
+  shader_.setInt("uTexture", 0);
+  shader_.setInt("uUseSDF", currentIsSDF_ ? 1 : 0);
+  shader_.setFloat("uSdfOnEdge", 128.0f / 255.0f);
+  shader_.setFloat("uSdfScale", 255.0f / 64.0f);
+
+  // 更新 VBO 数据
+  glBindBuffer(GL_ARRAY_BUFFER, vbo_);
+  glBufferSubData(GL_ARRAY_BUFFER, 0, vertices_.size() * sizeof(Vertex),
+                  vertices_.data());
+
+  // 绘制
+  glBindVertexArray(vao_);
+  GLsizei indexCount = static_cast<GLsizei>(
+      vertices_.size() / VERTICES_PER_SPRITE * INDICES_PER_SPRITE);
+  glDrawElements(GL_TRIANGLES, indexCount, GL_UNSIGNED_INT, nullptr);
+
+  drawCallCount_++;
+  vertices_.clear();
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/opengl/gl_texture.cpp b/Extra2D/src/graphics/opengl/gl_texture.cpp
new file mode 100644
index 0000000..43441e6
--- /dev/null
+++ b/Extra2D/src/graphics/opengl/gl_texture.cpp
@@ -0,0 +1,456 @@
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/graphics/vram_manager.h>
+#define STB_IMAGE_IMPLEMENTATION
+#include <cstring>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <stb/stb_image.h>
+
+namespace extra2d {
+
+// ============================================================================
+// KTX 文件头结构
+// ============================================================================
+#pragma pack(push, 1)
+struct KTXHeader {
+  uint8_t identifier[12];
+  uint32_t endianness;
+  uint32_t glType;
+  uint32_t glTypeSize;
+  uint32_t glFormat;
+  uint32_t glInternalFormat;
+  uint32_t glBaseInternalFormat;
+  uint32_t pixelWidth;
+  uint32_t pixelHeight;
+  uint32_t pixelDepth;
+  uint32_t numberOfArrayElements;
+  uint32_t numberOfFaces;
+  uint32_t numberOfMipmapLevels;
+  uint32_t bytesOfKeyValueData;
+};
+#pragma pack(pop)
+
+// KTX 文件标识符
+static const uint8_t KTX_IDENTIFIER[12] = {0xAB, 0x4B, 0x54, 0x58, 0x20, 0x31,
+                                           0x31, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A};
+
+// ============================================================================
+// DDS 文件头结构
+// ============================================================================
+#pragma pack(push, 1)
+struct DDSPixelFormat {
+  uint32_t size;
+  uint32_t flags;
+  uint32_t fourCC;
+  uint32_t rgbBitCount;
+  uint32_t rBitMask;
+  uint32_t gBitMask;
+  uint32_t bBitMask;
+  uint32_t aBitMask;
+};
+
+struct DDSHeader {
+  uint32_t magic;
+  uint32_t size;
+  uint32_t flags;
+  uint32_t height;
+  uint32_t width;
+  uint32_t pitchOrLinearSize;
+  uint32_t depth;
+  uint32_t mipMapCount;
+  uint32_t reserved1[11];
+  DDSPixelFormat pixelFormat;
+  uint32_t caps;
+  uint32_t caps2;
+  uint32_t caps3;
+  uint32_t caps4;
+  uint32_t reserved2;
+};
+
+struct DDSHeaderDXT10 {
+  uint32_t dxgiFormat;
+  uint32_t resourceDimension;
+  uint32_t miscFlag;
+  uint32_t arraySize;
+  uint32_t miscFlags2;
+};
+#pragma pack(pop)
+
+static constexpr uint32_t DDS_MAGIC = 0x20534444; // "DDS "
+static constexpr uint32_t DDPF_FOURCC = 0x04;
+
+static uint32_t makeFourCC(char a, char b, char c, char d) {
+  return static_cast<uint32_t>(a) | (static_cast<uint32_t>(b) << 8) |
+         (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24);
+}
+
+// ============================================================================
+// GLTexture 实现
+// ============================================================================
+
+GLTexture::GLTexture(int width, int height, const uint8_t *pixels, int channels)
+    : textureID_(0), width_(width), height_(height), channels_(channels),
+      format_(PixelFormat::RGBA8), dataSize_(0) {
+  // 保存像素数据用于生成遮罩
+  if (pixels) {
+    pixelData_.resize(width * height * channels);
+    std::memcpy(pixelData_.data(), pixels, pixelData_.size());
+  }
+  createTexture(pixels);
+}
+
+GLTexture::GLTexture(const std::string &filepath)
+    : textureID_(0), width_(0), height_(0), channels_(0),
+      format_(PixelFormat::RGBA8), dataSize_(0) {
+  // 检查是否为压缩纹理格式
+  std::string ext = filepath.substr(filepath.find_last_of('.') + 1);
+  if (ext == "ktx" || ext == "KTX") {
+    loadCompressed(filepath);
+    return;
+  }
+  if (ext == "dds" || ext == "DDS") {
+    loadCompressed(filepath);
+    return;
+  }
+
+  // 不翻转图片，保持原始方向
+  stbi_set_flip_vertically_on_load(false);
+  uint8_t *data = stbi_load(filepath.c_str(), &width_, &height_, &channels_, 0);
+  if (data) {
+    // 保存像素数据用于生成遮罩
+    pixelData_.resize(width_ * height_ * channels_);
+    std::memcpy(pixelData_.data(), data, pixelData_.size());
+
+    createTexture(data);
+    stbi_image_free(data);
+  } else {
+    E2D_LOG_ERROR("Failed to load texture: {}", filepath);
+  }
+}
+
+GLTexture::~GLTexture() {
+  if (textureID_ != 0) {
+    glDeleteTextures(1, &textureID_);
+    // VRAM 跟踪: 释放纹理显存
+    if (dataSize_ > 0) {
+      VRAMManager::getInstance().freeTexture(dataSize_);
+    }
+  }
+}
+
+void GLTexture::setFilter(bool linear) {
+  bind();
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+                  linear ? GL_LINEAR : GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+                  linear ? GL_LINEAR : GL_NEAREST);
+}
+
+void GLTexture::setWrap(bool repeat) {
+  bind();
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
+                  repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
+                  repeat ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+}
+
+void GLTexture::bind(unsigned int slot) const {
+  glActiveTexture(GL_TEXTURE0 + slot);
+  glBindTexture(GL_TEXTURE_2D, textureID_);
+}
+
+void GLTexture::unbind() const { glBindTexture(GL_TEXTURE_2D, 0); }
+
+void GLTexture::createTexture(const uint8_t *pixels) {
+  GLenum format = GL_RGBA;
+  GLenum internalFormat = GL_RGBA8;
+  int unpackAlignment = 4;
+  if (channels_ == 1) {
+    format = GL_RED;
+    internalFormat = GL_R8;
+    unpackAlignment = 1;
+    format_ = PixelFormat::R8;
+  } else if (channels_ == 3) {
+    format = GL_RGB;
+    internalFormat = GL_RGB8;
+    unpackAlignment = 1;
+    format_ = PixelFormat::RGB8;
+  } else if (channels_ == 4) {
+    format = GL_RGBA;
+    internalFormat = GL_RGBA8;
+    unpackAlignment = 4;
+    format_ = PixelFormat::RGBA8;
+  }
+
+  glGenTextures(1, &textureID_);
+  bind();
+
+  GLint prevUnpackAlignment = 4;
+  glGetIntegerv(GL_UNPACK_ALIGNMENT, &prevUnpackAlignment);
+  glPixelStorei(GL_UNPACK_ALIGNMENT, unpackAlignment);
+
+  glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width_, height_, 0, format,
+               GL_UNSIGNED_BYTE, pixels);
+  glPixelStorei(GL_UNPACK_ALIGNMENT, prevUnpackAlignment);
+
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  // 使用 NEAREST 过滤器，更适合像素艺术风格的精灵
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+  glGenerateMipmap(GL_TEXTURE_2D);
+
+  // VRAM 跟踪
+  dataSize_ = static_cast<size_t>(width_ * height_ * channels_);
+  VRAMManager::getInstance().allocTexture(dataSize_);
+}
+
+// ============================================================================
+// 压缩纹理加载
+// ============================================================================
+
+bool GLTexture::loadCompressed(const std::string &filepath) {
+  std::string ext = filepath.substr(filepath.find_last_of('.') + 1);
+  if (ext == "ktx" || ext == "KTX") {
+    return loadKTX(filepath);
+  }
+  if (ext == "dds" || ext == "DDS") {
+    return loadDDS(filepath);
+  }
+  E2D_LOG_ERROR("Unsupported compressed texture format: {}", filepath);
+  return false;
+}
+
+bool GLTexture::loadKTX(const std::string &filepath) {
+  std::ifstream file(filepath, std::ios::binary);
+  if (!file.is_open()) {
+    E2D_LOG_ERROR("Failed to open KTX file: {}", filepath);
+    return false;
+  }
+
+  KTXHeader header;
+  file.read(reinterpret_cast<char *>(&header), sizeof(header));
+  if (!file) {
+    E2D_LOG_ERROR("Failed to read KTX header: {}", filepath);
+    return false;
+  }
+
+  // 验证标识符
+  if (std::memcmp(header.identifier, KTX_IDENTIFIER, 12) != 0) {
+    E2D_LOG_ERROR("Invalid KTX identifier: {}", filepath);
+    return false;
+  }
+
+  width_ = static_cast<int>(header.pixelWidth);
+  height_ = static_cast<int>(header.pixelHeight);
+  channels_ = 4; // 压缩纹理通常解压为 RGBA
+
+  // 确定压缩格式
+  GLenum glInternalFormat = header.glInternalFormat;
+  switch (glInternalFormat) {
+  case GL_COMPRESSED_RGB8_ETC2:
+    format_ = PixelFormat::ETC2_RGB8;
+    channels_ = 3;
+    break;
+  case GL_COMPRESSED_RGBA8_ETC2_EAC:
+    format_ = PixelFormat::ETC2_RGBA8;
+    break;
+  case GL_COMPRESSED_RGBA_ASTC_4x4:
+    format_ = PixelFormat::ASTC_4x4;
+    break;
+  case GL_COMPRESSED_RGBA_ASTC_6x6:
+    format_ = PixelFormat::ASTC_6x6;
+    break;
+  case GL_COMPRESSED_RGBA_ASTC_8x8:
+    format_ = PixelFormat::ASTC_8x8;
+    break;
+  default:
+    E2D_LOG_ERROR("Unsupported KTX internal format: {:#06x}", glInternalFormat);
+    return false;
+  }
+
+  // 跳过 key-value 数据
+  file.seekg(header.bytesOfKeyValueData, std::ios::cur);
+
+  // 读取第一个 mipmap level
+  uint32_t imageSize = 0;
+  file.read(reinterpret_cast<char *>(&imageSize), sizeof(imageSize));
+  if (!file || imageSize == 0) {
+    E2D_LOG_ERROR("Failed to read KTX image size: {}", filepath);
+    return false;
+  }
+
+  std::vector<uint8_t> compressedData(imageSize);
+  file.read(reinterpret_cast<char *>(compressedData.data()), imageSize);
+  if (!file) {
+    E2D_LOG_ERROR("Failed to read KTX image data: {}", filepath);
+    return false;
+  }
+
+  // 创建 GL 纹理
+  glGenTextures(1, &textureID_);
+  bind();
+
+  glCompressedTexImage2D(GL_TEXTURE_2D, 0, glInternalFormat, width_, height_, 0,
+                         static_cast<GLsizei>(imageSize),
+                         compressedData.data());
+
+  GLenum err = glGetError();
+  if (err != GL_NO_ERROR) {
+    E2D_LOG_ERROR("glCompressedTexImage2D failed for KTX: {:#06x}", err);
+    glDeleteTextures(1, &textureID_);
+    textureID_ = 0;
+    return false;
+  }
+
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+  // VRAM 跟踪
+  dataSize_ = imageSize;
+  VRAMManager::getInstance().allocTexture(dataSize_);
+
+  E2D_LOG_INFO("Loaded compressed KTX texture: {} ({}x{}, format={:#06x})",
+               filepath, width_, height_, glInternalFormat);
+  return true;
+}
+
+bool GLTexture::loadDDS(const std::string &filepath) {
+  std::ifstream file(filepath, std::ios::binary);
+  if (!file.is_open()) {
+    E2D_LOG_ERROR("Failed to open DDS file: {}", filepath);
+    return false;
+  }
+
+  DDSHeader header;
+  file.read(reinterpret_cast<char *>(&header), sizeof(header));
+  if (!file) {
+    E2D_LOG_ERROR("Failed to read DDS header: {}", filepath);
+    return false;
+  }
+
+  if (header.magic != DDS_MAGIC) {
+    E2D_LOG_ERROR("Invalid DDS magic: {}", filepath);
+    return false;
+  }
+
+  width_ = static_cast<int>(header.width);
+  height_ = static_cast<int>(header.height);
+  channels_ = 4;
+
+  GLenum glInternalFormat = 0;
+
+  // 检查 DX10 扩展头
+  if ((header.pixelFormat.flags & DDPF_FOURCC) &&
+      header.pixelFormat.fourCC == makeFourCC('D', 'X', '1', '0')) {
+    DDSHeaderDXT10 dx10Header;
+    file.read(reinterpret_cast<char *>(&dx10Header), sizeof(dx10Header));
+    if (!file) {
+      E2D_LOG_ERROR("Failed to read DDS DX10 header: {}", filepath);
+      return false;
+    }
+
+    // DXGI_FORMAT 映射到 GL 格式
+    switch (dx10Header.dxgiFormat) {
+    case 147: // DXGI_FORMAT_ETC2_RGB8
+      glInternalFormat = GL_COMPRESSED_RGB8_ETC2;
+      format_ = PixelFormat::ETC2_RGB8;
+      channels_ = 3;
+      break;
+    case 148: // DXGI_FORMAT_ETC2_RGBA8
+      glInternalFormat = GL_COMPRESSED_RGBA8_ETC2_EAC;
+      format_ = PixelFormat::ETC2_RGBA8;
+      break;
+    default:
+      E2D_LOG_ERROR("Unsupported DDS DX10 format: {}", dx10Header.dxgiFormat);
+      return false;
+    }
+  } else {
+    E2D_LOG_ERROR("DDS file does not use DX10 extension, unsupported: {}",
+                  filepath);
+    return false;
+  }
+
+  // 计算压缩数据大小
+  size_t blockSize = (glInternalFormat == GL_COMPRESSED_RGB8_ETC2) ? 8 : 16;
+  size_t blocksWide = (width_ + 3) / 4;
+  size_t blocksHigh = (height_ + 3) / 4;
+  size_t imageSize = blocksWide * blocksHigh * blockSize;
+
+  std::vector<uint8_t> compressedData(imageSize);
+  file.read(reinterpret_cast<char *>(compressedData.data()), imageSize);
+  if (!file) {
+    E2D_LOG_ERROR("Failed to read DDS image data: {}", filepath);
+    return false;
+  }
+
+  // 创建 GL 纹理
+  glGenTextures(1, &textureID_);
+  bind();
+
+  glCompressedTexImage2D(GL_TEXTURE_2D, 0, glInternalFormat, width_, height_, 0,
+                         static_cast<GLsizei>(imageSize),
+                         compressedData.data());
+
+  GLenum err = glGetError();
+  if (err != GL_NO_ERROR) {
+    E2D_LOG_ERROR("glCompressedTexImage2D failed for DDS: {:#06x}", err);
+    glDeleteTextures(1, &textureID_);
+    textureID_ = 0;
+    return false;
+  }
+
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+  // VRAM 跟踪
+  dataSize_ = imageSize;
+  VRAMManager::getInstance().allocTexture(dataSize_);
+
+  E2D_LOG_INFO("Loaded compressed DDS texture: {} ({}x{})", filepath, width_,
+               height_);
+  return true;
+}
+
+void GLTexture::generateAlphaMask() {
+  if (pixelData_.empty() || width_ <= 0 || height_ <= 0) {
+    E2D_LOG_WARN("Cannot generate alpha mask: no pixel data available");
+    return;
+  }
+
+  alphaMask_ = std::make_unique<AlphaMask>(AlphaMask::createFromPixels(
+      pixelData_.data(), width_, height_, channels_));
+
+  E2D_LOG_DEBUG("Generated alpha mask for texture: {}x{}", width_, height_);
+}
+
+PixelFormat GLTexture::getFormat() const { return format_; }
+
+Ptr<Texture> GLTexture::create(int width, int height, PixelFormat format) {
+  int channels = 4;
+  switch (format) {
+  case PixelFormat::R8:
+    channels = 1;
+    break;
+  case PixelFormat::RG8:
+    channels = 2;
+    break;
+  case PixelFormat::RGB8:
+    channels = 3;
+    break;
+  case PixelFormat::RGBA8:
+    channels = 4;
+    break;
+  default:
+    channels = 4;
+    break;
+  }
+  return makePtr<GLTexture>(width, height, nullptr, channels);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/render_backend.cpp b/Extra2D/src/graphics/render_backend.cpp
new file mode 100644
index 0000000..3a4c1db
--- /dev/null
+++ b/Extra2D/src/graphics/render_backend.cpp
@@ -0,0 +1,15 @@
+#include <extra2d/graphics/opengl/gl_renderer.h>
+#include <extra2d/graphics/render_backend.h>
+
+namespace extra2d {
+
+UniquePtr<RenderBackend> RenderBackend::create(BackendType type) {
+  switch (type) {
+  case BackendType::OpenGL:
+    return makeUnique<GLRenderer>();
+  default:
+    return nullptr;
+  }
+}
+
+} // namespace extra2d
diff --git a/Easy2D/src/graphics/render_command.cpp b/Extra2D/src/graphics/render_command.cpp
similarity index 59%
rename from Easy2D/src/graphics/render_command.cpp
rename to Extra2D/src/graphics/render_command.cpp
index 1c5b76f..9ff0abb 100644
--- a/Easy2D/src/graphics/render_command.cpp
+++ b/Extra2D/src/graphics/render_command.cpp
@@ -1,6 +1,6 @@
-#include <easy2d/graphics/render_command.h>
+#include <extra2d/graphics/render_command.h>
 
-namespace easy2d {
+namespace extra2d {
 // This file exists to allow compilation of the render_command header
 // The RenderCommand struct is header-only for performance
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Easy2D/src/graphics/render_target.cpp b/Extra2D/src/graphics/render_target.cpp
similarity index 97%
rename from Easy2D/src/graphics/render_target.cpp
rename to Extra2D/src/graphics/render_target.cpp
index 014e319..3b0b7f1 100644
--- a/Easy2D/src/graphics/render_target.cpp
+++ b/Extra2D/src/graphics/render_target.cpp
@@ -1,13 +1,13 @@
 // Switch: 使用 GLES 3.2
 #include <GLES3/gl32.h>
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <easy2d/graphics/render_target.h>
-#include <easy2d/utils/logger.h>
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/graphics/render_target.h>
+#include <extra2d/utils/logger.h>
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <stb/stb_image_write.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // RenderTarget实现
@@ -96,8 +96,8 @@ bool RenderTarget::createFromTexture(Ptr<Texture> texture, bool hasDepth) {
   glBindFramebuffer(GL_FRAMEBUFFER, fbo_);
 
   // 附加颜色纹理
-  GLuint texId =
-      static_cast<GLuint>(reinterpret_cast<uintptr_t>(texture->getNativeHandle()));
+  GLuint texId = static_cast<GLuint>(
+      reinterpret_cast<uintptr_t>(texture->getNativeHandle()));
   glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
                          texId, 0);
 
@@ -157,7 +157,7 @@ void RenderTarget::clear(const Color &color) {
   GLbitfield mask = GL_COLOR_BUFFER_BIT;
   if (hasDepth_) {
     mask |= GL_DEPTH_BUFFER_BIT;
-    glClearDepthf(1.0f);  // GLES 使用 glClearDepthf
+    glClearDepthf(1.0f); // GLES 使用 glClearDepthf
   }
   if (hasStencil_) {
     mask |= GL_STENCIL_BUFFER_BIT;
@@ -584,4 +584,4 @@ void RenderTargetManager::resize(int width, int height) {
   E2D_INFO("渲染目标管理器调整大小: {}x{}", width, height);
 }
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/shader_preset.cpp b/Extra2D/src/graphics/shader_preset.cpp
new file mode 100644
index 0000000..e9cce1e
--- /dev/null
+++ b/Extra2D/src/graphics/shader_preset.cpp
@@ -0,0 +1,231 @@
+#include <extra2d/graphics/shader_preset.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+// ============================================================================
+// ShaderPreset实现
+// ============================================================================
+
+Ptr<GLShader> ShaderPreset::Water(const WaterParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::WaterFrag)) {
+    E2D_ERROR("编译水波纹Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_waveSpeed", params.waveSpeed);
+  shader->setFloat("u_waveAmplitude", params.waveAmplitude);
+  shader->setFloat("u_waveFrequency", params.waveFrequency);
+
+  E2D_INFO("创建水波纹Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::Outline(const OutlineParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::OutlineFrag)) {
+    E2D_ERROR("编译描边Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setVec4("u_outlineColor", glm::vec4(params.color.r, params.color.g,
+                                              params.color.b, params.color.a));
+  shader->setFloat("u_thickness", params.thickness);
+
+  E2D_INFO("创建描边Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::Distortion(const DistortionParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::DistortionFrag)) {
+    E2D_ERROR("编译扭曲Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_distortionAmount", params.distortionAmount);
+  shader->setFloat("u_timeScale", params.timeScale);
+
+  E2D_INFO("创建扭曲Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::Pixelate(const PixelateParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::PixelateFrag)) {
+    E2D_ERROR("编译像素化Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_pixelSize", params.pixelSize);
+
+  E2D_INFO("创建像素化Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::Invert(const InvertParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::InvertFrag)) {
+    E2D_ERROR("编译反相Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_strength", params.strength);
+
+  E2D_INFO("创建反相Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::Grayscale(const GrayscaleParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::GrayscaleFrag)) {
+    E2D_ERROR("编译灰度Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_intensity", params.intensity);
+
+  E2D_INFO("创建灰度Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::Blur(const BlurParams &params) {
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert,
+                                 ShaderSource::BlurFrag)) {
+    E2D_ERROR("编译模糊Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_radius", params.radius);
+
+  E2D_INFO("创建模糊Shader预设");
+  return shader;
+}
+
+Ptr<GLShader>
+ShaderPreset::GrayscaleOutline(const GrayscaleParams &grayParams,
+                               const OutlineParams &outlineParams) {
+  // 创建组合效果的片段着色器 (GLES 3.2)
+  const char *combinedFrag = R"(
+#version 300 es
+precision highp float;
+in vec2 v_texCoord;
+
+uniform sampler2D u_texture;
+uniform float u_grayIntensity;
+uniform vec4 u_outlineColor;
+uniform float u_thickness;
+uniform vec2 u_textureSize;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = texture(u_texture, v_texCoord);
+    
+    // 灰度效果
+    float gray = dot(color.rgb, vec3(0.299, 0.587, 0.114));
+    color.rgb = mix(color.rgb, vec3(gray), u_grayIntensity);
+    
+    // 描边效果
+    float alpha = 0.0;
+    vec2 offset = u_thickness / u_textureSize;
+    
+    alpha += texture(u_texture, v_texCoord + vec2(-offset.x, 0.0)).a;
+    alpha += texture(u_texture, v_texCoord + vec2(offset.x, 0.0)).a;
+    alpha += texture(u_texture, v_texCoord + vec2(0.0, -offset.y)).a;
+    alpha += texture(u_texture, v_texCoord + vec2(0.0, offset.y)).a;
+    
+    if (color.a < 0.1 && alpha > 0.0) {
+        fragColor = u_outlineColor;
+    } else {
+        fragColor = color;
+    }
+}
+)";
+
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert, combinedFrag)) {
+    E2D_ERROR("编译灰度+描边Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_grayIntensity", grayParams.intensity);
+  shader->setVec4("u_outlineColor",
+                  glm::vec4(outlineParams.color.r, outlineParams.color.g,
+                            outlineParams.color.b, outlineParams.color.a));
+  shader->setFloat("u_thickness", outlineParams.thickness);
+
+  E2D_INFO("创建灰度+描边组合Shader预设");
+  return shader;
+}
+
+Ptr<GLShader> ShaderPreset::PixelateInvert(const PixelateParams &pixParams,
+                                           const InvertParams &invParams) {
+  // 创建组合效果的片段着色器 (GLES 3.2)
+  const char *combinedFrag = R"(
+#version 300 es
+precision highp float;
+in vec2 v_texCoord;
+
+uniform sampler2D u_texture;
+uniform float u_pixelSize;
+uniform vec2 u_textureSize;
+uniform float u_invertStrength;
+
+out vec4 fragColor;
+
+void main() {
+    // 像素化
+    vec2 pixel = u_pixelSize / u_textureSize;
+    vec2 uv = floor(v_texCoord / pixel) * pixel + pixel * 0.5;
+    
+    vec4 color = texture(u_texture, uv);
+    
+    // 反相
+    vec3 inverted = 1.0 - color.rgb;
+    color.rgb = mix(color.rgb, inverted, u_invertStrength);
+    
+    fragColor = color;
+}
+)";
+
+  auto shader = std::make_shared<GLShader>();
+
+  if (!shader->compileFromSource(ShaderSource::StandardVert, combinedFrag)) {
+    E2D_ERROR("编译像素化+反相Shader失败");
+    return nullptr;
+  }
+
+  // 设置默认参数
+  shader->setFloat("u_pixelSize", pixParams.pixelSize);
+  shader->setFloat("u_invertStrength", invParams.strength);
+
+  E2D_INFO("创建像素化+反相组合Shader预设");
+  return shader;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/shader_system.cpp b/Extra2D/src/graphics/shader_system.cpp
new file mode 100644
index 0000000..f330f7c
--- /dev/null
+++ b/Extra2D/src/graphics/shader_system.cpp
@@ -0,0 +1,491 @@
+#include <extra2d/core/color.h>
+#include <extra2d/graphics/shader_system.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <sstream>
+#include <sys/stat.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+namespace extra2d {
+
+// ============================================================================
+// 内置Shader源码
+// ============================================================================
+
+// 标准精灵着色器 (GLES 3.2)
+static const char *BUILTIN_SPRITE_VERT = R"(
+#version 300 es
+precision highp float;
+layout(location = 0) in vec2 a_position;
+layout(location = 1) in vec2 a_texCoord;
+layout(location = 2) in vec4 a_color;
+
+uniform mat4 u_viewProjection;
+uniform mat4 u_model;
+
+out vec2 v_texCoord;
+out vec4 v_color;
+
+void main() {
+    gl_Position = u_viewProjection * u_model * vec4(a_position, 0.0, 1.0);
+    v_texCoord = a_texCoord;
+    v_color = a_color;
+}
+)";
+
+static const char *BUILTIN_SPRITE_FRAG = R"(
+#version 300 es
+precision highp float;
+in vec2 v_texCoord;
+in vec4 v_color;
+
+uniform sampler2D u_texture;
+uniform float u_opacity;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 texColor = texture(u_texture, v_texCoord);
+    fragColor = texColor * v_color;
+    fragColor.a *= u_opacity;
+    
+    if (fragColor.a < 0.01) {
+        discard;
+    }
+}
+)";
+
+// 粒子着色器 (GLES 3.2)
+static const char *BUILTIN_PARTICLE_VERT = R"(
+#version 300 es
+precision highp float;
+layout(location = 0) in vec2 a_position;
+layout(location = 1) in vec2 a_texCoord;
+layout(location = 2) in vec4 a_color;
+layout(location = 3) in float a_size;
+layout(location = 4) in float a_rotation;
+
+uniform mat4 u_viewProjection;
+
+out vec2 v_texCoord;
+out vec4 v_color;
+
+void main() {
+    float c = cos(a_rotation);
+    float s = sin(a_rotation);
+    mat2 rot = mat2(c, -s, s, c);
+    
+    vec2 pos = rot * a_position * a_size;
+    gl_Position = u_viewProjection * vec4(pos, 0.0, 1.0);
+    
+    v_texCoord = a_texCoord;
+    v_color = a_color;
+}
+)";
+
+static const char *BUILTIN_PARTICLE_FRAG = R"(
+#version 300 es
+precision highp float;
+in vec2 v_texCoord;
+in vec4 v_color;
+
+uniform sampler2D u_texture;
+uniform int u_textureEnabled;
+
+out vec4 fragColor;
+
+void main() {
+    vec4 color = v_color;
+    
+    if (u_textureEnabled > 0) {
+        color *= texture(u_texture, v_texCoord);
+    }
+    
+    // 圆形粒子
+    vec2 center = v_texCoord - vec2(0.5);
+    float dist = length(center);
+    float alpha = 1.0 - smoothstep(0.4, 0.5, dist);
+    color.a *= alpha;
+    
+    if (color.a < 0.01) {
+        discard;
+    }
+    
+    fragColor = color;
+}
+)";
+
+// 后处理着色器 (GLES 3.2)
+static const char *BUILTIN_POSTPROCESS_VERT = R"(
+#version 300 es
+precision highp float;
+layout(location = 0) in vec2 a_position;
+layout(location = 1) in vec2 a_texCoord;
+
+out vec2 v_texCoord;
+
+void main() {
+    gl_Position = vec4(a_position, 0.0, 1.0);
+    v_texCoord = a_texCoord;
+}
+)";
+
+static const char *BUILTIN_POSTPROCESS_FRAG = R"(
+#version 300 es
+precision highp float;
+in vec2 v_texCoord;
+
+uniform sampler2D u_texture;
+uniform vec2 u_resolution;
+uniform float u_time;
+
+out vec4 fragColor;
+
+void main() {
+    fragColor = texture(u_texture, v_texCoord);
+}
+)";
+
+// 形状渲染着色器 (GLES 3.2)
+static const char *BUILTIN_SHAPE_VERT = R"(
+#version 300 es
+precision highp float;
+layout(location = 0) in vec2 a_position;
+layout(location = 1) in vec4 a_color;
+
+uniform mat4 u_viewProjection;
+
+out vec4 v_color;
+
+void main() {
+    gl_Position = u_viewProjection * vec4(a_position, 0.0, 1.0);
+    v_color = a_color;
+}
+)";
+
+static const char *BUILTIN_SHAPE_FRAG = R"(
+#version 300 es
+precision highp float;
+in vec4 v_color;
+
+out vec4 fragColor;
+
+void main() {
+    fragColor = v_color;
+}
+)";
+
+// ============================================================================
+// ShaderSystem实现
+// ============================================================================
+
+ShaderSystem &ShaderSystem::getInstance() {
+  static ShaderSystem instance;
+  return instance;
+}
+
+bool ShaderSystem::init() {
+  E2D_INFO("初始化Shader系统...");
+
+  if (!loadBuiltinShaders()) {
+    E2D_ERROR("加载内置Shader失败！");
+    return false;
+  }
+
+  E2D_INFO("Shader系统初始化完成");
+  return true;
+}
+
+void ShaderSystem::shutdown() {
+  E2D_INFO("关闭Shader系统...");
+  clear();
+
+  builtinSpriteShader_.reset();
+  builtinParticleShader_.reset();
+  builtinPostProcessShader_.reset();
+  builtinShapeShader_.reset();
+}
+
+bool ShaderSystem::loadBuiltinShaders() {
+  // 加载精灵Shader
+  builtinSpriteShader_ = std::make_shared<GLShader>();
+  if (!builtinSpriteShader_->compileFromSource(BUILTIN_SPRITE_VERT,
+                                               BUILTIN_SPRITE_FRAG)) {
+    E2D_ERROR("编译内置精灵Shader失败！");
+    return false;
+  }
+
+  // 加载粒子Shader
+  builtinParticleShader_ = std::make_shared<GLShader>();
+  if (!builtinParticleShader_->compileFromSource(BUILTIN_PARTICLE_VERT,
+                                                 BUILTIN_PARTICLE_FRAG)) {
+    E2D_ERROR("编译内置粒子Shader失败！");
+    return false;
+  }
+
+  // 加载后处理Shader
+  builtinPostProcessShader_ = std::make_shared<GLShader>();
+  if (!builtinPostProcessShader_->compileFromSource(BUILTIN_POSTPROCESS_VERT,
+                                                    BUILTIN_POSTPROCESS_FRAG)) {
+    E2D_ERROR("编译内置后处理Shader失败！");
+    return false;
+  }
+
+  // 加载形状Shader
+  builtinShapeShader_ = std::make_shared<GLShader>();
+  if (!builtinShapeShader_->compileFromSource(BUILTIN_SHAPE_VERT,
+                                              BUILTIN_SHAPE_FRAG)) {
+    E2D_ERROR("编译内置形状Shader失败！");
+    return false;
+  }
+
+  E2D_INFO("内置Shader加载成功");
+  return true;
+}
+
+Ptr<GLShader> ShaderSystem::loadFromFile(const std::string &name,
+                                         const std::string &vertPath,
+                                         const std::string &fragPath) {
+  // 读取文件内容
+  std::string vertSource = readFile(vertPath);
+  std::string fragSource = readFile(fragPath);
+
+  if (vertSource.empty()) {
+    E2D_ERROR("无法读取顶点着色器文件: {}", vertPath);
+    return nullptr;
+  }
+
+  if (fragSource.empty()) {
+    E2D_ERROR("无法读取片段着色器文件: {}", fragPath);
+    return nullptr;
+  }
+
+  // 编译Shader
+  auto shader = std::make_shared<GLShader>();
+  if (!shader->compileFromSource(vertSource.c_str(), fragSource.c_str())) {
+    E2D_ERROR("编译Shader '{}' 失败", name);
+    return nullptr;
+  }
+
+  // 存储Shader信息
+  ShaderInfo info;
+  info.shader = shader;
+  info.vertPath = vertPath;
+  info.fragPath = fragPath;
+  info.vertModifiedTime = getFileModifiedTime(vertPath);
+  info.fragModifiedTime = getFileModifiedTime(fragPath);
+  info.isBuiltin = false;
+
+  shaders_[name] = std::move(info);
+
+  E2D_INFO("加载Shader '{}' 成功", name);
+  return shader;
+}
+
+Ptr<GLShader> ShaderSystem::loadFromSource(const std::string &name,
+                                           const std::string &vertSource,
+                                           const std::string &fragSource) {
+  auto shader = std::make_shared<GLShader>();
+  if (!shader->compileFromSource(vertSource.c_str(), fragSource.c_str())) {
+    E2D_ERROR("编译Shader '{}' 失败", name);
+    return nullptr;
+  }
+
+  ShaderInfo info;
+  info.shader = shader;
+  info.vertModifiedTime = 0;
+  info.fragModifiedTime = 0;
+  info.isBuiltin = false;
+
+  shaders_[name] = std::move(info);
+
+  E2D_INFO("加载Shader '{}' 成功", name);
+  return shader;
+}
+
+Ptr<GLShader> ShaderSystem::get(const std::string &name) {
+  auto it = shaders_.find(name);
+  if (it != shaders_.end()) {
+    return it->second.shader;
+  }
+  return nullptr;
+}
+
+bool ShaderSystem::has(const std::string &name) const {
+  return shaders_.find(name) != shaders_.end();
+}
+
+void ShaderSystem::remove(const std::string &name) { shaders_.erase(name); }
+
+void ShaderSystem::clear() { shaders_.clear(); }
+
+void ShaderSystem::setFileWatching(bool enable) {
+  fileWatching_ = enable;
+  if (enable) {
+    E2D_INFO("启用Shader文件监视");
+  } else {
+    E2D_INFO("禁用Shader文件监视");
+  }
+}
+
+void ShaderSystem::updateFileWatching() {
+  if (!fileWatching_)
+    return;
+
+  watchTimer_ += 0.016f; // 假设60fps
+  if (watchTimer_ >= WATCH_INTERVAL) {
+    watchTimer_ = 0.0f;
+    checkAndReload();
+  }
+}
+
+void ShaderSystem::checkAndReload() {
+  for (auto &[name, info] : shaders_) {
+    if (info.isBuiltin)
+      continue;
+    if (info.vertPath.empty() || info.fragPath.empty())
+      continue;
+
+    uint64_t vertTime = getFileModifiedTime(info.vertPath);
+    uint64_t fragTime = getFileModifiedTime(info.fragPath);
+
+    if (vertTime > info.vertModifiedTime || fragTime > info.fragModifiedTime) {
+      E2D_INFO("检测到Shader '{}' 文件变化，正在重载...", name);
+      reload(name);
+    }
+  }
+}
+
+bool ShaderSystem::reload(const std::string &name) {
+  auto it = shaders_.find(name);
+  if (it == shaders_.end()) {
+    E2D_ERROR("无法重载不存在的Shader '{}'", name);
+    return false;
+  }
+
+  auto &info = it->second;
+  if (info.isBuiltin) {
+    E2D_WARN("无法重载内置Shader '{}'", name);
+    return false;
+  }
+
+  if (info.vertPath.empty() || info.fragPath.empty()) {
+    E2D_ERROR("Shader '{}' 没有关联的文件路径", name);
+    return false;
+  }
+
+  // 重新加载
+  auto newShader = loadFromFile(name, info.vertPath, info.fragPath);
+  if (newShader) {
+    E2D_INFO("重载Shader '{}' 成功", name);
+    return true;
+  }
+
+  return false;
+}
+
+void ShaderSystem::reloadAll() {
+  for (const auto &[name, info] : shaders_) {
+    if (!info.isBuiltin) {
+      reload(name);
+    }
+  }
+}
+
+Ptr<GLShader> ShaderSystem::getBuiltinSpriteShader() {
+  return builtinSpriteShader_;
+}
+
+Ptr<GLShader> ShaderSystem::getBuiltinParticleShader() {
+  return builtinParticleShader_;
+}
+
+Ptr<GLShader> ShaderSystem::getBuiltinPostProcessShader() {
+  return builtinPostProcessShader_;
+}
+
+Ptr<GLShader> ShaderSystem::getBuiltinShapeShader() {
+  return builtinShapeShader_;
+}
+
+std::string ShaderSystem::readFile(const std::string &filepath) {
+  std::ifstream file(filepath, std::ios::in | std::ios::binary);
+  if (!file.is_open()) {
+    return "";
+  }
+
+  std::stringstream buffer;
+  buffer << file.rdbuf();
+  return buffer.str();
+}
+
+uint64_t ShaderSystem::getFileModifiedTime(const std::string &filepath) {
+#ifdef _WIN32
+  struct _stat64 statBuf;
+  if (_stat64(filepath.c_str(), &statBuf) == 0) {
+    return static_cast<uint64_t>(statBuf.st_mtime);
+  }
+#else
+  struct stat statBuf;
+  if (stat(filepath.c_str(), &statBuf) == 0) {
+    return static_cast<uint64_t>(statBuf.st_mtime);
+  }
+#endif
+  return 0;
+}
+
+// ============================================================================
+// ShaderParams实现
+// ============================================================================
+
+ShaderParams::ShaderParams(GLShader &shader) : shader_(shader) {}
+
+ShaderParams &ShaderParams::setBool(const std::string &name, bool value) {
+  shader_.setBool(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setInt(const std::string &name, int value) {
+  shader_.setInt(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setFloat(const std::string &name, float value) {
+  shader_.setFloat(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setVec2(const std::string &name,
+                                    const glm::vec2 &value) {
+  shader_.setVec2(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setVec3(const std::string &name,
+                                    const glm::vec3 &value) {
+  shader_.setVec3(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setVec4(const std::string &name,
+                                    const glm::vec4 &value) {
+  shader_.setVec4(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setMat4(const std::string &name,
+                                    const glm::mat4 &value) {
+  shader_.setMat4(name, value);
+  return *this;
+}
+
+ShaderParams &ShaderParams::setColor(const std::string &name,
+                                     const Color &color) {
+  shader_.setVec4(name, glm::vec4(color.r, color.g, color.b, color.a));
+  return *this;
+}
+
+} // namespace extra2d
diff --git a/Easy2D/src/graphics/texture_pool.cpp b/Extra2D/src/graphics/texture_pool.cpp
similarity index 98%
rename from Easy2D/src/graphics/texture_pool.cpp
rename to Extra2D/src/graphics/texture_pool.cpp
index e3c316e..f73d899 100644
--- a/Easy2D/src/graphics/texture_pool.cpp
+++ b/Extra2D/src/graphics/texture_pool.cpp
@@ -1,9 +1,9 @@
-#include <easy2d/graphics/opengl/gl_texture.h>
-#include <easy2d/graphics/texture_pool.h>
-#include <easy2d/utils/logger.h>
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/graphics/texture_pool.h>
+#include <extra2d/utils/logger.h>
 #include <stb/stb_image.h>
 
-namespace easy2d {
+namespace extra2d {
 
 // ============================================================================
 // TexturePool实现
@@ -442,4 +442,4 @@ void TexturePool::processAsyncTasks() {
   }
 }
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/graphics/vram_manager.cpp b/Extra2D/src/graphics/vram_manager.cpp
new file mode 100644
index 0000000..97dfae4
--- /dev/null
+++ b/Extra2D/src/graphics/vram_manager.cpp
@@ -0,0 +1,113 @@
+#include <algorithm>
+#include <extra2d/graphics/vram_manager.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+// Switch 推荐 VRAM 预算 ~400MB
+static constexpr size_t DEFAULT_VRAM_BUDGET = 400 * 1024 * 1024;
+
+VRAMManager::VRAMManager()
+    : textureVRAM_(0), bufferVRAM_(0), vramBudget_(DEFAULT_VRAM_BUDGET),
+      textureAllocCount_(0), textureFreeCount_(0), bufferAllocCount_(0),
+      bufferFreeCount_(0), peakTextureVRAM_(0), peakBufferVRAM_(0) {}
+
+VRAMManager &VRAMManager::getInstance() {
+  static VRAMManager instance;
+  return instance;
+}
+
+void VRAMManager::allocTexture(size_t size) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  textureVRAM_ += size;
+  textureAllocCount_++;
+  peakTextureVRAM_ = std::max(peakTextureVRAM_, textureVRAM_);
+
+  if (isOverBudget()) {
+    E2D_LOG_WARN("VRAM over budget! Used: {} MB / Budget: {} MB",
+                 getUsedVRAM() / (1024 * 1024), vramBudget_ / (1024 * 1024));
+  }
+}
+
+void VRAMManager::freeTexture(size_t size) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (size <= textureVRAM_) {
+    textureVRAM_ -= size;
+  } else {
+    textureVRAM_ = 0;
+  }
+  textureFreeCount_++;
+}
+
+void VRAMManager::allocBuffer(size_t size) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  bufferVRAM_ += size;
+  bufferAllocCount_++;
+  peakBufferVRAM_ = std::max(peakBufferVRAM_, bufferVRAM_);
+
+  if (isOverBudget()) {
+    E2D_LOG_WARN("VRAM over budget! Used: {} MB / Budget: {} MB",
+                 getUsedVRAM() / (1024 * 1024), vramBudget_ / (1024 * 1024));
+  }
+}
+
+void VRAMManager::freeBuffer(size_t size) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (size <= bufferVRAM_) {
+    bufferVRAM_ -= size;
+  } else {
+    bufferVRAM_ = 0;
+  }
+  bufferFreeCount_++;
+}
+
+size_t VRAMManager::getUsedVRAM() const { return textureVRAM_ + bufferVRAM_; }
+
+size_t VRAMManager::getTextureVRAM() const { return textureVRAM_; }
+
+size_t VRAMManager::getBufferVRAM() const { return bufferVRAM_; }
+
+size_t VRAMManager::getAvailableVRAM() const {
+  size_t used = getUsedVRAM();
+  return (used < vramBudget_) ? (vramBudget_ - used) : 0;
+}
+
+void VRAMManager::setVRAMBudget(size_t budget) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  vramBudget_ = budget;
+  E2D_LOG_INFO("VRAM budget set to {} MB", budget / (1024 * 1024));
+}
+
+size_t VRAMManager::getVRAMBudget() const { return vramBudget_; }
+
+bool VRAMManager::isOverBudget() const { return getUsedVRAM() > vramBudget_; }
+
+void VRAMManager::printStats() const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  E2D_LOG_INFO("=== VRAM Stats ===");
+  E2D_LOG_INFO("  Texture VRAM: {} MB (peak: {} MB)",
+               textureVRAM_ / (1024 * 1024), peakTextureVRAM_ / (1024 * 1024));
+  E2D_LOG_INFO("  Buffer VRAM:  {} MB (peak: {} MB)",
+               bufferVRAM_ / (1024 * 1024), peakBufferVRAM_ / (1024 * 1024));
+  E2D_LOG_INFO("  Total Used:   {} MB / {} MB budget",
+               (textureVRAM_ + bufferVRAM_) / (1024 * 1024),
+               vramBudget_ / (1024 * 1024));
+  E2D_LOG_INFO("  Texture allocs/frees: {} / {}", textureAllocCount_,
+               textureFreeCount_);
+  E2D_LOG_INFO("  Buffer allocs/frees:  {} / {}", bufferAllocCount_,
+               bufferFreeCount_);
+}
+
+void VRAMManager::reset() {
+  std::lock_guard<std::mutex> lock(mutex_);
+  textureVRAM_ = 0;
+  bufferVRAM_ = 0;
+  textureAllocCount_ = 0;
+  textureFreeCount_ = 0;
+  bufferAllocCount_ = 0;
+  bufferFreeCount_ = 0;
+  peakTextureVRAM_ = 0;
+  peakBufferVRAM_ = 0;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/platform/input.cpp b/Extra2D/src/platform/input.cpp
new file mode 100644
index 0000000..ce87fb3
--- /dev/null
+++ b/Extra2D/src/platform/input.cpp
@@ -0,0 +1,270 @@
+#include <extra2d/event/input_codes.h>
+#include <extra2d/platform/input.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+Input::Input()
+    : controller_(nullptr), leftStickX_(0.0f), leftStickY_(0.0f),
+      rightStickX_(0.0f), rightStickY_(0.0f), touching_(false),
+      prevTouching_(false), touchCount_(0) {
+  buttonsDown_.fill(false);
+  prevButtonsDown_.fill(false);
+}
+
+Input::~Input() { shutdown(); }
+
+void Input::init() {
+  // 打开第一个可用的游戏控制器
+  for (int i = 0; i < SDL_NumJoysticks(); ++i) {
+    if (SDL_IsGameController(i)) {
+      controller_ = SDL_GameControllerOpen(i);
+      if (controller_) {
+        E2D_LOG_INFO("GameController opened: {}",
+                     SDL_GameControllerName(controller_));
+        break;
+      }
+    }
+  }
+
+  if (!controller_) {
+    E2D_LOG_WARN("No game controller found, input may be limited");
+  }
+}
+
+void Input::shutdown() {
+  if (controller_) {
+    SDL_GameControllerClose(controller_);
+    controller_ = nullptr;
+  }
+}
+
+void Input::update() {
+  // 保存上一帧状态
+  prevButtonsDown_ = buttonsDown_;
+  prevTouching_ = touching_;
+  prevTouchPosition_ = touchPosition_;
+
+  if (controller_) {
+    // 更新按钮状态
+    for (int i = 0; i < MAX_BUTTONS; ++i) {
+      buttonsDown_[i] =
+          SDL_GameControllerGetButton(
+              controller_, static_cast<SDL_GameControllerButton>(i)) != 0;
+    }
+
+    // 读取摇杆（归一化到 -1.0 ~ 1.0）
+    leftStickX_ = static_cast<float>(SDL_GameControllerGetAxis(
+                      controller_, SDL_CONTROLLER_AXIS_LEFTX)) /
+                  32767.0f;
+    leftStickY_ = static_cast<float>(SDL_GameControllerGetAxis(
+                      controller_, SDL_CONTROLLER_AXIS_LEFTY)) /
+                  32767.0f;
+    rightStickX_ = static_cast<float>(SDL_GameControllerGetAxis(
+                       controller_, SDL_CONTROLLER_AXIS_RIGHTX)) /
+                   32767.0f;
+    rightStickY_ = static_cast<float>(SDL_GameControllerGetAxis(
+                       controller_, SDL_CONTROLLER_AXIS_RIGHTY)) /
+                   32767.0f;
+  } else {
+    buttonsDown_.fill(false);
+    leftStickX_ = leftStickY_ = rightStickX_ = rightStickY_ = 0.0f;
+  }
+
+  // 更新触摸屏（SDL2 Touch API）
+  SDL_TouchID touchId = SDL_GetTouchDevice(0);
+  if (touchId != 0) {
+    touchCount_ = SDL_GetNumTouchFingers(touchId);
+    if (touchCount_ > 0) {
+      SDL_Finger *finger = SDL_GetTouchFinger(touchId, 0);
+      if (finger) {
+        touching_ = true;
+        // SDL 触摸坐标是归一化 0.0~1.0，转换为像素坐标
+        touchPosition_ = Vec2(finger->x * 1280.0f, finger->y * 720.0f);
+      } else {
+        touching_ = false;
+      }
+    } else {
+      touching_ = false;
+    }
+  } else {
+    touchCount_ = 0;
+    touching_ = false;
+  }
+}
+
+// ============================================================================
+// 键盘输入映射到 SDL GameController 按钮
+// ============================================================================
+
+SDL_GameControllerButton Input::mapKeyToButton(int keyCode) const {
+  switch (keyCode) {
+  // 方向键 → DPad
+  case Key::Up:
+    return SDL_CONTROLLER_BUTTON_DPAD_UP;
+  case Key::Down:
+    return SDL_CONTROLLER_BUTTON_DPAD_DOWN;
+  case Key::Left:
+    return SDL_CONTROLLER_BUTTON_DPAD_LEFT;
+  case Key::Right:
+    return SDL_CONTROLLER_BUTTON_DPAD_RIGHT;
+
+  // WASD → 也映射到 DPad
+  case Key::W:
+    return SDL_CONTROLLER_BUTTON_DPAD_UP;
+  case Key::S:
+    return SDL_CONTROLLER_BUTTON_DPAD_DOWN;
+  case Key::A:
+    return SDL_CONTROLLER_BUTTON_DPAD_LEFT;
+  case Key::D:
+    return SDL_CONTROLLER_BUTTON_DPAD_RIGHT;
+
+  // 常用键 → 手柄按钮
+  case Key::Z:
+    return SDL_CONTROLLER_BUTTON_B; // 确认
+  case Key::X:
+    return SDL_CONTROLLER_BUTTON_A; // 取消
+  case Key::C:
+    return SDL_CONTROLLER_BUTTON_Y;
+  case Key::V:
+    return SDL_CONTROLLER_BUTTON_X;
+  case Key::Space:
+    return SDL_CONTROLLER_BUTTON_A; // 空格 = A
+  case Key::Enter:
+    return SDL_CONTROLLER_BUTTON_A; // 回车 = A
+  case Key::Escape:
+    return SDL_CONTROLLER_BUTTON_START; // ESC = Start
+
+  // 肩键
+  case Key::Q:
+    return SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
+  case Key::E:
+    return SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
+
+  // Start/Select
+  case Key::Tab:
+    return SDL_CONTROLLER_BUTTON_BACK;
+  case Key::Backspace:
+    return SDL_CONTROLLER_BUTTON_START;
+
+  default:
+    return SDL_CONTROLLER_BUTTON_INVALID;
+  }
+}
+
+bool Input::isKeyDown(int keyCode) const {
+  SDL_GameControllerButton button = mapKeyToButton(keyCode);
+  if (button == SDL_CONTROLLER_BUTTON_INVALID)
+    return false;
+  return buttonsDown_[button];
+}
+
+bool Input::isKeyPressed(int keyCode) const {
+  SDL_GameControllerButton button = mapKeyToButton(keyCode);
+  if (button == SDL_CONTROLLER_BUTTON_INVALID)
+    return false;
+  return buttonsDown_[button] && !prevButtonsDown_[button];
+}
+
+bool Input::isKeyReleased(int keyCode) const {
+  SDL_GameControllerButton button = mapKeyToButton(keyCode);
+  if (button == SDL_CONTROLLER_BUTTON_INVALID)
+    return false;
+  return !buttonsDown_[button] && prevButtonsDown_[button];
+}
+
+// ============================================================================
+// 手柄按钮直接访问
+// ============================================================================
+
+bool Input::isButtonDown(int button) const {
+  if (button < 0 || button >= MAX_BUTTONS)
+    return false;
+  return buttonsDown_[button];
+}
+
+bool Input::isButtonPressed(int button) const {
+  if (button < 0 || button >= MAX_BUTTONS)
+    return false;
+  return buttonsDown_[button] && !prevButtonsDown_[button];
+}
+
+bool Input::isButtonReleased(int button) const {
+  if (button < 0 || button >= MAX_BUTTONS)
+    return false;
+  return !buttonsDown_[button] && prevButtonsDown_[button];
+}
+
+Vec2 Input::getLeftStick() const { return Vec2(leftStickX_, leftStickY_); }
+
+Vec2 Input::getRightStick() const { return Vec2(rightStickX_, rightStickY_); }
+
+// ============================================================================
+// 鼠标输入映射到触摸屏
+// ============================================================================
+
+bool Input::isMouseDown(MouseButton button) const {
+  if (button == MouseButton::Left) {
+    return touching_;
+  }
+  // A 键映射为右键
+  if (button == MouseButton::Right) {
+    return buttonsDown_[SDL_CONTROLLER_BUTTON_A];
+  }
+  return false;
+}
+
+bool Input::isMousePressed(MouseButton button) const {
+  if (button == MouseButton::Left) {
+    return touching_ && !prevTouching_;
+  }
+  if (button == MouseButton::Right) {
+    return buttonsDown_[SDL_CONTROLLER_BUTTON_A] &&
+           !prevButtonsDown_[SDL_CONTROLLER_BUTTON_A];
+  }
+  return false;
+}
+
+bool Input::isMouseReleased(MouseButton button) const {
+  if (button == MouseButton::Left) {
+    return !touching_ && prevTouching_;
+  }
+  if (button == MouseButton::Right) {
+    return !buttonsDown_[SDL_CONTROLLER_BUTTON_A] &&
+           prevButtonsDown_[SDL_CONTROLLER_BUTTON_A];
+  }
+  return false;
+}
+
+Vec2 Input::getMousePosition() const { return touchPosition_; }
+
+Vec2 Input::getMouseDelta() const {
+  if (touching_ && prevTouching_) {
+    return touchPosition_ - prevTouchPosition_;
+  }
+  return Vec2::Zero();
+}
+
+void Input::setMousePosition(const Vec2 & /*position*/) {
+  // 不支持在 Switch 上设置触摸位置
+}
+
+void Input::setMouseVisible(bool /*visible*/) {
+  // Switch 无鼠标光标
+}
+
+void Input::setMouseLocked(bool /*locked*/) {
+  // Switch 无鼠标光标
+}
+
+bool Input::isAnyKeyDown() const {
+  for (int i = 0; i < MAX_BUTTONS; ++i) {
+    if (buttonsDown_[i])
+      return true;
+  }
+  return false;
+}
+
+bool Input::isAnyMouseDown() const { return touching_; }
+
+} // namespace extra2d
diff --git a/Easy2D/src/platform/window.cpp b/Extra2D/src/platform/window.cpp
similarity index 90%
rename from Easy2D/src/platform/window.cpp
rename to Extra2D/src/platform/window.cpp
index bc8f03c..8b1c625 100644
--- a/Easy2D/src/platform/window.cpp
+++ b/Extra2D/src/platform/window.cpp
@@ -1,14 +1,14 @@
-#include <easy2d/event/event_queue.h>
-#include <easy2d/platform/input.h>
-#include <easy2d/platform/window.h>
-#include <easy2d/utils/logger.h>
+#include <extra2d/event/event_queue.h>
+#include <extra2d/platform/input.h>
+#include <extra2d/platform/window.h>
+#include <extra2d/utils/logger.h>
 
 #include <SDL.h>
 
 // 使用标准 GLES3.2
 #include <GLES3/gl32.h>
 
-namespace easy2d {
+namespace extra2d {
 
 Window::Window()
     : sdlWindow_(nullptr), glContext_(nullptr), width_(1280), height_(720),
@@ -50,8 +50,7 @@ bool Window::initSDL() {
   }
 
   // 设置 OpenGL ES 3.2 上下文属性
-  SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
-                      SDL_GL_CONTEXT_PROFILE_ES);
+  SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
   SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
 
@@ -65,9 +64,9 @@ bool Window::initSDL() {
 
   // 创建 SDL2 窗口（Switch 全屏）
   Uint32 windowFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN;
-  sdlWindow_ = SDL_CreateWindow("Easy2D", SDL_WINDOWPOS_CENTERED,
-                                SDL_WINDOWPOS_CENTERED, width_, height_,
-                                windowFlags);
+  sdlWindow_ =
+      SDL_CreateWindow("Easy2D", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+                       width_, height_, windowFlags);
   if (!sdlWindow_) {
     E2D_LOG_ERROR("SDL_CreateWindow failed: {}", SDL_GetError());
     SDL_Quit();
@@ -198,4 +197,4 @@ void Window::resetCursor() {
   // Switch 无鼠标光标
 }
 
-} // namespace easy2d
+} // namespace extra2d
diff --git a/Extra2D/src/resource/resource_manager.cpp b/Extra2D/src/resource/resource_manager.cpp
new file mode 100644
index 0000000..b12e79b
--- /dev/null
+++ b/Extra2D/src/resource/resource_manager.cpp
@@ -0,0 +1,481 @@
+#include <algorithm>
+#include <cstring>
+#include <extra2d/audio/audio_engine.h>
+#include <extra2d/graphics/opengl/gl_font_atlas.h>
+#include <extra2d/graphics/opengl/gl_texture.h>
+#include <extra2d/resource/resource_manager.h>
+#include <extra2d/utils/logger.h>
+#include <sys/stat.h>
+
+namespace extra2d {
+
+ResourceManager::ResourceManager() {
+#ifdef __SWITCH__
+  addSearchPath("romfs:/");
+  addSearchPath("sdmc:/");
+#endif
+}
+ResourceManager::~ResourceManager() = default;
+
+ResourceManager &ResourceManager::getInstance() {
+  static ResourceManager instance;
+  return instance;
+}
+
+// ============================================================================
+// 搜索路径管理
+// ============================================================================
+
+void ResourceManager::addSearchPath(const std::string &path) {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  // 避免重复添加
+  auto it = std::find(searchPaths_.begin(), searchPaths_.end(), path);
+  if (it == searchPaths_.end()) {
+    searchPaths_.push_back(path);
+    E2D_LOG_DEBUG("ResourceManager: added search path: {}", path);
+  }
+}
+
+void ResourceManager::removeSearchPath(const std::string &path) {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  auto it = std::find(searchPaths_.begin(), searchPaths_.end(), path);
+  if (it != searchPaths_.end()) {
+    searchPaths_.erase(it);
+    E2D_LOG_DEBUG("ResourceManager: removed search path: {}", path);
+  }
+}
+
+void ResourceManager::clearSearchPaths() {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+  searchPaths_.clear();
+  E2D_LOG_DEBUG("ResourceManager: cleared all search paths");
+}
+
+// 辅助函数：检查文件是否存在
+static bool fileExists(const std::string &path) {
+  struct stat st;
+  return stat(path.c_str(), &st) == 0;
+}
+
+// 辅助函数：检查是否是 romfs 路径
+static bool isRomfsPath(const std::string &path) {
+  return path.find("romfs:/") == 0 || path.find("romfs:\\") == 0;
+}
+
+// 辅助函数：拼接路径
+static std::string joinPath(const std::string &dir,
+                            const std::string &filename) {
+  if (dir.empty())
+    return filename;
+  char lastChar = dir.back();
+  if (lastChar == '/' || lastChar == '\\') {
+    return dir + filename;
+  }
+  return dir + "/" + filename;
+}
+
+std::string
+ResourceManager::findResourcePath(const std::string &filename) const {
+  // 首先检查是否是 romfs 路径（Switch 平台）
+  if (isRomfsPath(filename)) {
+    if (fileExists(filename)) {
+      return filename;
+    }
+    return "";
+  }
+
+  // 首先检查是否是绝对路径或相对当前目录存在
+  if (fileExists(filename)) {
+    return filename;
+  }
+
+  // 在搜索路径中查找
+  std::lock_guard<std::mutex> lock(textureMutex_);
+  for (const auto &path : searchPaths_) {
+    std::string fullPath = joinPath(path, filename);
+    if (fileExists(fullPath)) {
+      return fullPath;
+    }
+  }
+
+  // 最后尝试在 romfs 中查找（自动添加 romfs:/ 前缀）
+  std::string romfsPath = "romfs:/" + filename;
+  if (fileExists(romfsPath)) {
+    return romfsPath;
+  }
+
+  return "";
+}
+
+// ============================================================================
+// 纹理资源
+// ============================================================================
+
+Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath) {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  // 检查缓存
+  auto it = textureCache_.find(filepath);
+  if (it != textureCache_.end()) {
+    if (auto texture = it->second.lock()) {
+      E2D_LOG_TRACE("ResourceManager: texture cache hit: {}", filepath);
+      return texture;
+    }
+    // 弱引用已失效，移除
+    textureCache_.erase(it);
+  }
+
+  // 查找完整路径
+  std::string fullPath = findResourcePath(filepath);
+  if (fullPath.empty()) {
+    E2D_LOG_ERROR("ResourceManager: texture file not found: {}", filepath);
+    return nullptr;
+  }
+
+  // 创建新纹理（根据扩展名自动选择加载路径）
+  try {
+    auto texture = makePtr<GLTexture>(fullPath);
+    if (!texture->isValid()) {
+      E2D_LOG_ERROR("ResourceManager: failed to load texture: {}", filepath);
+      return nullptr;
+    }
+
+    // 存入缓存
+    textureCache_[filepath] = texture;
+    E2D_LOG_DEBUG("ResourceManager: loaded texture: {}", filepath);
+    return texture;
+  } catch (...) {
+    E2D_LOG_ERROR("ResourceManager: exception loading texture: {}", filepath);
+    return nullptr;
+  }
+}
+
+Ptr<Texture>
+ResourceManager::loadTextureWithAlphaMask(const std::string &filepath) {
+  // 先加载纹理
+  auto texture = loadTexture(filepath);
+  if (!texture) {
+    return nullptr;
+  }
+
+  // 生成Alpha遮罩
+  generateAlphaMask(filepath);
+
+  return texture;
+}
+
+const AlphaMask *
+ResourceManager::getAlphaMask(const std::string &textureKey) const {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  auto it = textureCache_.find(textureKey);
+  if (it != textureCache_.end()) {
+    if (auto texture = it->second.lock()) {
+      GLTexture *glTexture = static_cast<GLTexture *>(texture.get());
+      return glTexture->getAlphaMask();
+    }
+  }
+  return nullptr;
+}
+
+bool ResourceManager::generateAlphaMask(const std::string &textureKey) {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  auto it = textureCache_.find(textureKey);
+  if (it != textureCache_.end()) {
+    if (auto texture = it->second.lock()) {
+      GLTexture *glTexture = static_cast<GLTexture *>(texture.get());
+      if (!glTexture->hasAlphaMask()) {
+        glTexture->generateAlphaMask();
+      }
+      return glTexture->hasAlphaMask();
+    }
+  }
+  return false;
+}
+
+bool ResourceManager::hasAlphaMask(const std::string &textureKey) const {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  auto it = textureCache_.find(textureKey);
+  if (it != textureCache_.end()) {
+    if (auto texture = it->second.lock()) {
+      GLTexture *glTexture = static_cast<GLTexture *>(texture.get());
+      return glTexture->hasAlphaMask();
+    }
+  }
+  return false;
+}
+
+Ptr<Texture> ResourceManager::getTexture(const std::string &key) const {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  auto it = textureCache_.find(key);
+  if (it != textureCache_.end()) {
+    return it->second.lock();
+  }
+  return nullptr;
+}
+
+bool ResourceManager::hasTexture(const std::string &key) const {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+
+  auto it = textureCache_.find(key);
+  if (it != textureCache_.end()) {
+    return !it->second.expired();
+  }
+  return false;
+}
+
+void ResourceManager::unloadTexture(const std::string &key) {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+  textureCache_.erase(key);
+  E2D_LOG_DEBUG("ResourceManager: unloaded texture: {}", key);
+}
+
+// ============================================================================
+// 字体图集资源
+// ============================================================================
+
+std::string ResourceManager::makeFontKey(const std::string &filepath,
+                                         int fontSize, bool useSDF) const {
+  return filepath + "#" + std::to_string(fontSize) + (useSDF ? "#sdf" : "");
+}
+
+Ptr<FontAtlas> ResourceManager::loadFont(const std::string &filepath,
+                                         int fontSize, bool useSDF) {
+  std::lock_guard<std::mutex> lock(fontMutex_);
+
+  std::string key = makeFontKey(filepath, fontSize, useSDF);
+
+  // 检查缓存
+  auto it = fontCache_.find(key);
+  if (it != fontCache_.end()) {
+    if (auto font = it->second.lock()) {
+      E2D_LOG_TRACE("ResourceManager: font cache hit: {}", key);
+      return font;
+    }
+    // 弱引用已失效，移除
+    fontCache_.erase(it);
+  }
+
+  // 查找完整路径
+  std::string fullPath = findResourcePath(filepath);
+  if (fullPath.empty()) {
+    E2D_LOG_ERROR("ResourceManager: font file not found: {}", filepath);
+    return nullptr;
+  }
+
+  // 创建新字体图集
+  try {
+    auto font = makePtr<GLFontAtlas>(fullPath, fontSize, useSDF);
+    if (!font->getTexture() || !font->getTexture()->isValid()) {
+      E2D_LOG_ERROR("ResourceManager: failed to load font: {}", filepath);
+      return nullptr;
+    }
+
+    // 存入缓存
+    fontCache_[key] = font;
+    E2D_LOG_DEBUG("ResourceManager: loaded font: {} (size={}, sdf={})",
+                  filepath, fontSize, useSDF);
+    return font;
+  } catch (...) {
+    E2D_LOG_ERROR("ResourceManager: exception loading font: {}", filepath);
+    return nullptr;
+  }
+}
+
+Ptr<FontAtlas> ResourceManager::getFont(const std::string &key) const {
+  std::lock_guard<std::mutex> lock(fontMutex_);
+
+  auto it = fontCache_.find(key);
+  if (it != fontCache_.end()) {
+    return it->second.lock();
+  }
+  return nullptr;
+}
+
+bool ResourceManager::hasFont(const std::string &key) const {
+  std::lock_guard<std::mutex> lock(fontMutex_);
+
+  auto it = fontCache_.find(key);
+  if (it != fontCache_.end()) {
+    return !it->second.expired();
+  }
+  return false;
+}
+
+void ResourceManager::unloadFont(const std::string &key) {
+  std::lock_guard<std::mutex> lock(fontMutex_);
+  fontCache_.erase(key);
+  E2D_LOG_DEBUG("ResourceManager: unloaded font: {}", key);
+}
+
+// ============================================================================
+// 音效资源
+// ============================================================================
+
+Ptr<Sound> ResourceManager::loadSound(const std::string &filepath) {
+  return loadSound(filepath, filepath);
+}
+
+Ptr<Sound> ResourceManager::loadSound(const std::string &name,
+                                      const std::string &filepath) {
+  std::lock_guard<std::mutex> lock(soundMutex_);
+
+  // 检查缓存
+  auto it = soundCache_.find(name);
+  if (it != soundCache_.end()) {
+    if (auto sound = it->second.lock()) {
+      E2D_LOG_TRACE("ResourceManager: sound cache hit: {}", name);
+      return sound;
+    }
+    // 弱引用已失效，移除
+    soundCache_.erase(it);
+  }
+
+  // 查找完整路径
+  std::string fullPath = findResourcePath(filepath);
+  if (fullPath.empty()) {
+    E2D_LOG_ERROR("ResourceManager: sound file not found: {}", filepath);
+    return nullptr;
+  }
+
+  // 使用 AudioEngine 加载音效
+  auto sound = AudioEngine::getInstance().loadSound(name, fullPath);
+  if (!sound) {
+    E2D_LOG_ERROR("ResourceManager: failed to load sound: {}", filepath);
+    return nullptr;
+  }
+
+  // 存入缓存
+  soundCache_[name] = sound;
+  E2D_LOG_DEBUG("ResourceManager: loaded sound: {}", filepath);
+  return sound;
+}
+
+Ptr<Sound> ResourceManager::getSound(const std::string &key) const {
+  std::lock_guard<std::mutex> lock(soundMutex_);
+
+  auto it = soundCache_.find(key);
+  if (it != soundCache_.end()) {
+    return it->second.lock();
+  }
+  return nullptr;
+}
+
+bool ResourceManager::hasSound(const std::string &key) const {
+  std::lock_guard<std::mutex> lock(soundMutex_);
+
+  auto it = soundCache_.find(key);
+  if (it != soundCache_.end()) {
+    return !it->second.expired();
+  }
+  return false;
+}
+
+void ResourceManager::unloadSound(const std::string &key) {
+  std::lock_guard<std::mutex> lock(soundMutex_);
+
+  // 从 AudioEngine 也卸载
+  AudioEngine::getInstance().unloadSound(key);
+  soundCache_.erase(key);
+  E2D_LOG_DEBUG("ResourceManager: unloaded sound: {}", key);
+}
+
+// ============================================================================
+// 缓存清理
+// ============================================================================
+
+void ResourceManager::purgeUnused() {
+  // 清理纹理缓存
+  {
+    std::lock_guard<std::mutex> lock(textureMutex_);
+    for (auto it = textureCache_.begin(); it != textureCache_.end();) {
+      if (it->second.expired()) {
+        E2D_LOG_TRACE("ResourceManager: purging unused texture: {}", it->first);
+        it = textureCache_.erase(it);
+      } else {
+        ++it;
+      }
+    }
+  }
+
+  // 清理字体缓存
+  {
+    std::lock_guard<std::mutex> lock(fontMutex_);
+    for (auto it = fontCache_.begin(); it != fontCache_.end();) {
+      if (it->second.expired()) {
+        E2D_LOG_TRACE("ResourceManager: purging unused font: {}", it->first);
+        it = fontCache_.erase(it);
+      } else {
+        ++it;
+      }
+    }
+  }
+
+  // 清理音效缓存
+  {
+    std::lock_guard<std::mutex> lock(soundMutex_);
+    for (auto it = soundCache_.begin(); it != soundCache_.end();) {
+      if (it->second.expired()) {
+        E2D_LOG_TRACE("ResourceManager: purging unused sound: {}", it->first);
+        it = soundCache_.erase(it);
+      } else {
+        ++it;
+      }
+    }
+  }
+}
+
+void ResourceManager::clearTextureCache() {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+  size_t count = textureCache_.size();
+  textureCache_.clear();
+  E2D_LOG_INFO("ResourceManager: cleared {} textures from cache", count);
+}
+
+void ResourceManager::clearFontCache() {
+  std::lock_guard<std::mutex> lock(fontMutex_);
+  size_t count = fontCache_.size();
+  fontCache_.clear();
+  E2D_LOG_INFO("ResourceManager: cleared {} fonts from cache", count);
+}
+
+void ResourceManager::clearSoundCache() {
+  std::lock_guard<std::mutex> lock(soundMutex_);
+  size_t count = soundCache_.size();
+
+  // 同时清理 AudioEngine 中的缓存
+  for (const auto &pair : soundCache_) {
+    AudioEngine::getInstance().unloadSound(pair.first);
+  }
+  soundCache_.clear();
+  E2D_LOG_INFO("ResourceManager: cleared {} sounds from cache", count);
+}
+
+void ResourceManager::clearAllCaches() {
+  clearTextureCache();
+  clearFontCache();
+  clearSoundCache();
+  E2D_LOG_INFO("ResourceManager: all caches cleared");
+}
+
+size_t ResourceManager::getTextureCacheSize() const {
+  std::lock_guard<std::mutex> lock(textureMutex_);
+  return textureCache_.size();
+}
+
+size_t ResourceManager::getFontCacheSize() const {
+  std::lock_guard<std::mutex> lock(fontMutex_);
+  return fontCache_.size();
+}
+
+size_t ResourceManager::getSoundCacheSize() const {
+  std::lock_guard<std::mutex> lock(soundMutex_);
+  return soundCache_.size();
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/node.cpp b/Extra2D/src/scene/node.cpp
new file mode 100644
index 0000000..e73ce50
--- /dev/null
+++ b/Extra2D/src/scene/node.cpp
@@ -0,0 +1,350 @@
+#include <algorithm>
+#include <cmath>
+#include <extra2d/action/action.h>
+#include <extra2d/graphics/render_command.h>
+#include <extra2d/scene/node.h>
+#include <extra2d/scene/scene.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+Node::Node() = default;
+
+Node::~Node() {
+  removeAllChildren();
+  stopAllActions();
+}
+
+void Node::addChild(Ptr<Node> child) {
+  if (!child || child.get() == this) {
+    return;
+  }
+
+  child->removeFromParent();
+  child->parent_ = weak_from_this();
+  children_.push_back(child);
+  childrenOrderDirty_ = true;
+
+  if (running_) {
+    child->onEnter();
+    if (scene_) {
+      child->onAttachToScene(scene_);
+    }
+  }
+}
+
+void Node::removeChild(Ptr<Node> child) {
+  if (!child)
+    return;
+
+  auto it = std::find(children_.begin(), children_.end(), child);
+  if (it != children_.end()) {
+    if (running_) {
+      (*it)->onDetachFromScene();
+      (*it)->onExit();
+    }
+    (*it)->parent_.reset();
+    children_.erase(it);
+  }
+}
+
+void Node::removeChildByName(const std::string &name) {
+  auto child = getChildByName(name);
+  if (child) {
+    removeChild(child);
+  }
+}
+
+void Node::removeFromParent() {
+  auto p = parent_.lock();
+  if (p) {
+    p->removeChild(shared_from_this());
+  }
+}
+
+void Node::removeAllChildren() {
+  for (auto &child : children_) {
+    if (running_) {
+      child->onDetachFromScene();
+      child->onExit();
+    }
+    child->parent_.reset();
+  }
+  children_.clear();
+}
+
+Ptr<Node> Node::getChildByName(const std::string &name) const {
+  for (const auto &child : children_) {
+    if (child->getName() == name) {
+      return child;
+    }
+  }
+  return nullptr;
+}
+
+Ptr<Node> Node::getChildByTag(int tag) const {
+  for (const auto &child : children_) {
+    if (child->getTag() == tag) {
+      return child;
+    }
+  }
+  return nullptr;
+}
+
+void Node::setPosition(const Vec2 &pos) {
+  position_ = pos;
+  transformDirty_ = true;
+  updateSpatialIndex();
+}
+
+void Node::setPosition(float x, float y) { setPosition(Vec2(x, y)); }
+
+void Node::setRotation(float degrees) {
+  rotation_ = degrees;
+  transformDirty_ = true;
+  updateSpatialIndex();
+}
+
+void Node::setScale(const Vec2 &scale) {
+  scale_ = scale;
+  transformDirty_ = true;
+  updateSpatialIndex();
+}
+
+void Node::setScale(float scale) { setScale(Vec2(scale, scale)); }
+
+void Node::setScale(float x, float y) { setScale(Vec2(x, y)); }
+
+void Node::setAnchor(const Vec2 &anchor) {
+  anchor_ = anchor;
+  transformDirty_ = true;
+}
+
+void Node::setAnchor(float x, float y) { setAnchor(Vec2(x, y)); }
+
+void Node::setSkew(const Vec2 &skew) {
+  skew_ = skew;
+  transformDirty_ = true;
+}
+
+void Node::setSkew(float x, float y) { setSkew(Vec2(x, y)); }
+
+void Node::setOpacity(float opacity) {
+  opacity_ = std::clamp(opacity, 0.0f, 1.0f);
+}
+
+void Node::setVisible(bool visible) { visible_ = visible; }
+
+void Node::setZOrder(int zOrder) {
+  if (zOrder_ != zOrder) {
+    zOrder_ = zOrder;
+    childrenOrderDirty_ = true;
+  }
+}
+
+Vec2 Node::convertToWorldSpace(const Vec2 &localPos) const {
+  glm::vec4 worldPos =
+      getWorldTransform() * glm::vec4(localPos.x, localPos.y, 0.0f, 1.0f);
+  return Vec2(worldPos.x, worldPos.y);
+}
+
+Vec2 Node::convertToNodeSpace(const Vec2 &worldPos) const {
+  glm::mat4 invWorld = glm::inverse(getWorldTransform());
+  glm::vec4 localPos = invWorld * glm::vec4(worldPos.x, worldPos.y, 0.0f, 1.0f);
+  return Vec2(localPos.x, localPos.y);
+}
+
+glm::mat4 Node::getLocalTransform() const {
+  if (transformDirty_) {
+    localTransform_ = glm::mat4(1.0f);
+
+    // T - R - S order
+    localTransform_ = glm::translate(localTransform_,
+                                     glm::vec3(position_.x, position_.y, 0.0f));
+
+    if (rotation_ != 0.0f) {
+      localTransform_ = glm::rotate(localTransform_, rotation_ * DEG_TO_RAD,
+                                    glm::vec3(0.0f, 0.0f, 1.0f));
+    }
+
+    if (skew_.x != 0.0f || skew_.y != 0.0f) {
+      glm::mat4 skewMatrix(1.0f);
+      skewMatrix[1][0] = std::tan(skew_.x * DEG_TO_RAD);
+      skewMatrix[0][1] = std::tan(skew_.y * DEG_TO_RAD);
+      localTransform_ *= skewMatrix;
+    }
+
+    localTransform_ =
+        glm::scale(localTransform_, glm::vec3(scale_.x, scale_.y, 1.0f));
+
+    // Apply anchor point offset
+    localTransform_ = glm::translate(localTransform_,
+                                     glm::vec3(-anchor_.x, -anchor_.y, 0.0f));
+
+    transformDirty_ = false;
+  }
+  return localTransform_;
+}
+
+glm::mat4 Node::getWorldTransform() const {
+  if (transformDirty_) {
+    worldTransform_ = getLocalTransform();
+
+    auto p = parent_.lock();
+    if (p) {
+      worldTransform_ = p->getWorldTransform() * worldTransform_;
+    }
+  }
+  return worldTransform_;
+}
+
+void Node::onEnter() {
+  running_ = true;
+  for (auto &child : children_) {
+    child->onEnter();
+  }
+}
+
+void Node::onExit() {
+  running_ = false;
+  for (auto &child : children_) {
+    child->onExit();
+  }
+}
+
+void Node::onUpdate(float dt) {
+  onUpdateNode(dt);
+
+  // Update actions
+  for (auto it = actions_.begin(); it != actions_.end();) {
+    auto &action = *it;
+    action->update(dt);
+    if (action->isDone()) {
+      it = actions_.erase(it);
+    } else {
+      ++it;
+    }
+  }
+
+  // Update children
+  for (auto &child : children_) {
+    child->onUpdate(dt);
+  }
+}
+
+void Node::onRender(RenderBackend &renderer) {
+  if (!visible_)
+    return;
+
+  onDraw(renderer);
+
+  for (auto &child : children_) {
+    child->onRender(renderer);
+  }
+}
+
+void Node::onAttachToScene(Scene *scene) {
+  scene_ = scene;
+
+  // 添加到场景的空间索引
+  if (spatialIndexed_ && scene_) {
+    lastSpatialBounds_ = Rect();
+    updateSpatialIndex();
+  }
+
+  for (auto &child : children_) {
+    child->onAttachToScene(scene);
+  }
+}
+
+void Node::onDetachFromScene() {
+  // 从场景的空间索引移除
+  if (spatialIndexed_ && scene_ && !lastSpatialBounds_.empty()) {
+    scene_->removeNodeFromSpatialIndex(this);
+    lastSpatialBounds_ = Rect();
+  }
+
+  scene_ = nullptr;
+  for (auto &child : children_) {
+    child->onDetachFromScene();
+  }
+}
+
+Rect Node::getBoundingBox() const {
+  // 默认返回一个以位置为中心的点矩形
+  return Rect(position_.x, position_.y, 0, 0);
+}
+
+void Node::updateSpatialIndex() {
+  if (!spatialIndexed_ || !scene_) {
+    return;
+  }
+
+  Rect newBounds = getBoundingBox();
+  if (newBounds != lastSpatialBounds_) {
+    scene_->updateNodeInSpatialIndex(this, lastSpatialBounds_, newBounds);
+    lastSpatialBounds_ = newBounds;
+  }
+}
+
+void Node::runAction(Ptr<Action> action) {
+  if (action) {
+    action->start(this);
+    actions_.push_back(action);
+  }
+}
+
+void Node::stopAllActions() { actions_.clear(); }
+
+void Node::stopAction(Ptr<Action> action) {
+  auto it = std::find(actions_.begin(), actions_.end(), action);
+  if (it != actions_.end()) {
+    actions_.erase(it);
+  }
+}
+
+void Node::stopActionByTag(int tag) {
+  auto it = std::remove_if(
+      actions_.begin(), actions_.end(),
+      [tag](const Ptr<Action> &action) { return action->getTag() == tag; });
+  actions_.erase(it, actions_.end());
+}
+
+Ptr<Action> Node::getActionByTag(int tag) const {
+  for (const auto &action : actions_) {
+    if (action->getTag() == tag) {
+      return action;
+    }
+  }
+  return nullptr;
+}
+
+void Node::update(float dt) { onUpdate(dt); }
+
+void Node::render(RenderBackend &renderer) {
+  if (childrenOrderDirty_) {
+    sortChildren();
+  }
+  onRender(renderer);
+}
+
+void Node::sortChildren() {
+  std::sort(children_.begin(), children_.end(),
+            [](const Ptr<Node> &a, const Ptr<Node> &b) {
+              return a->getZOrder() < b->getZOrder();
+            });
+  childrenOrderDirty_ = false;
+}
+
+void Node::collectRenderCommands(std::vector<RenderCommand> &commands,
+                                 int parentZOrder) {
+  // 暂时最小化实现以测试
+  if (!visible_)
+    return;
+
+  // 不排序，不递归，只生成当前节点的命令
+  int accumulatedZOrder = parentZOrder + zOrder_;
+  generateRenderCommand(commands, accumulatedZOrder);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/scene.cpp b/Extra2D/src/scene/scene.cpp
new file mode 100644
index 0000000..72f9f23
--- /dev/null
+++ b/Extra2D/src/scene/scene.cpp
@@ -0,0 +1,128 @@
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/render_command.h>
+#include <extra2d/scene/scene.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+Scene::Scene() { defaultCamera_ = makePtr<Camera>(); }
+
+void Scene::setCamera(Ptr<Camera> camera) { camera_ = camera; }
+
+void Scene::setViewportSize(float width, float height) {
+  viewportSize_ = Size(width, height);
+  if (defaultCamera_) {
+    defaultCamera_->setViewport(0, width, height, 0);
+  }
+  if (camera_) {
+    camera_->setViewport(0, width, height, 0);
+  }
+}
+
+void Scene::setViewportSize(const Size &size) {
+  setViewportSize(size.width, size.height);
+}
+
+void Scene::renderScene(RenderBackend &renderer) {
+  if (!isVisible())
+    return;
+
+  // Begin frame with background color
+  renderer.beginFrame(backgroundColor_);
+  renderContent(renderer);
+  renderer.endFrame();
+}
+
+void Scene::renderContent(RenderBackend &renderer) {
+  if (!isVisible())
+    return;
+
+  Camera *activeCam = getActiveCamera();
+  if (activeCam) {
+    renderer.setViewProjection(activeCam->getViewProjectionMatrix());
+  }
+
+  renderer.beginSpriteBatch();
+  render(renderer);
+  renderer.endSpriteBatch();
+}
+
+void Scene::updateScene(float dt) {
+  if (!paused_) {
+    update(dt);
+  }
+}
+
+void Scene::onEnter() {
+  Node::onEnter();
+
+  // 初始化空间索引世界边界
+  if (spatialIndexingEnabled_) {
+    spatialManager_.setWorldBounds(
+        Rect(0, 0, viewportSize_.width, viewportSize_.height));
+  }
+}
+
+void Scene::onExit() {
+  // 清理空间索引
+  spatialManager_.clear();
+  Node::onExit();
+}
+
+void Scene::updateNodeInSpatialIndex(Node *node, const Rect &oldBounds,
+                                     const Rect &newBounds) {
+  if (!spatialIndexingEnabled_ || !node || !node->isSpatialIndexed()) {
+    return;
+  }
+
+  // 如果旧边界有效，先移除
+  if (!oldBounds.empty()) {
+    spatialManager_.remove(node);
+  }
+
+  // 如果新边界有效，插入
+  if (!newBounds.empty()) {
+    spatialManager_.insert(node, newBounds);
+  }
+}
+
+void Scene::removeNodeFromSpatialIndex(Node *node) {
+  if (!spatialIndexingEnabled_ || !node) {
+    return;
+  }
+
+  spatialManager_.remove(node);
+}
+
+std::vector<Node *> Scene::queryNodesInArea(const Rect &area) const {
+  if (!spatialIndexingEnabled_) {
+    return {};
+  }
+  return spatialManager_.query(area);
+}
+
+std::vector<Node *> Scene::queryNodesAtPoint(const Vec2 &point) const {
+  if (!spatialIndexingEnabled_) {
+    return {};
+  }
+  return spatialManager_.query(point);
+}
+
+std::vector<std::pair<Node *, Node *>> Scene::queryCollisions() const {
+  if (!spatialIndexingEnabled_) {
+    return {};
+  }
+  return spatialManager_.queryCollisions();
+}
+
+void Scene::collectRenderCommands(std::vector<RenderCommand> &commands) {
+  if (!isVisible())
+    return;
+
+  // 从场景的子节点开始收集渲染命令
+  Node::collectRenderCommands(commands);
+}
+
+Ptr<Scene> Scene::create() { return makePtr<Scene>(); }
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/scene_manager.cpp b/Extra2D/src/scene/scene_manager.cpp
new file mode 100644
index 0000000..75a25c1
--- /dev/null
+++ b/Extra2D/src/scene/scene_manager.cpp
@@ -0,0 +1,696 @@
+#include <algorithm>
+#include <extra2d/app/application.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/render_command.h>
+#include <extra2d/platform/input.h>
+#include <extra2d/scene/scene_manager.h>
+#include <extra2d/scene/transition.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+namespace {
+
+Node *hitTestTopmost(const Ptr<Node> &node, const Vec2 &worldPos) {
+  if (!node || !node->isVisible()) {
+    return nullptr;
+  }
+
+  std::vector<Ptr<Node>> children = node->getChildren();
+  std::stable_sort(children.begin(), children.end(),
+                   [](const Ptr<Node> &a, const Ptr<Node> &b) {
+                     return a->getZOrder() < b->getZOrder();
+                   });
+
+  for (auto it = children.rbegin(); it != children.rend(); ++it) {
+    if (Node *hit = hitTestTopmost(*it, worldPos)) {
+      return hit;
+    }
+  }
+
+  if (node->getEventDispatcher().getTotalListenerCount() == 0) {
+    return nullptr;
+  }
+
+  Rect bounds = node->getBoundingBox();
+  if (!bounds.empty() && bounds.containsPoint(worldPos)) {
+    return node.get();
+  }
+
+  return nullptr;
+}
+
+void dispatchToNode(Node *node, Event &event) {
+  if (!node) {
+    return;
+  }
+  node->getEventDispatcher().dispatch(event);
+}
+
+} // namespace
+
+SceneManager &SceneManager::getInstance() {
+  static SceneManager instance;
+  return instance;
+}
+
+void SceneManager::runWithScene(Ptr<Scene> scene) {
+  if (!scene) {
+    return;
+  }
+
+  if (!sceneStack_.empty()) {
+    E2D_LOG_WARN("SceneManager: runWithScene should only be called once");
+    return;
+  }
+
+  scene->onEnter();
+  scene->onAttachToScene(scene.get());
+  sceneStack_.push(scene);
+}
+
+void SceneManager::replaceScene(Ptr<Scene> scene) {
+  if (!scene || isTransitioning_) {
+    return;
+  }
+
+  if (sceneStack_.empty()) {
+    runWithScene(scene);
+    return;
+  }
+
+  // Pop current scene
+  auto oldScene = sceneStack_.top();
+  oldScene->onExit();
+  oldScene->onDetachFromScene();
+  sceneStack_.pop();
+
+  // Push new scene
+  scene->onEnter();
+  scene->onAttachToScene(scene.get());
+  sceneStack_.push(scene);
+}
+
+void SceneManager::enterScene(Ptr<Scene> scene) {
+  if (!scene || isTransitioning_) {
+    return;
+  }
+
+  if (sceneStack_.empty()) {
+    runWithScene(scene);
+  } else {
+    replaceScene(scene);
+  }
+}
+
+void SceneManager::enterScene(Ptr<Scene> scene,
+                              Ptr<class Transition> transition) {
+  if (!scene || isTransitioning_) {
+    return;
+  }
+
+  if (!transition) {
+    enterScene(scene);
+    return;
+  }
+
+  auto current = getCurrentScene();
+
+  // 在过渡开始前，发送 UIHoverExit 给当前悬停的节点，重置按钮状态
+  if (hoverTarget_) {
+    Event evt;
+    evt.type = EventType::UIHoverExit;
+    evt.data = CustomEvent{0, hoverTarget_};
+    dispatchToNode(hoverTarget_, evt);
+    hoverTarget_ = nullptr;
+  }
+  captureTarget_ = nullptr;
+  hasLastPointerWorld_ = false;
+
+  transition->start(current, scene);
+  outgoingScene_ = current;
+  incomingScene_ = scene;
+  activeTransition_ = transition;
+  currentTransition_ = TransitionType::None;
+  isTransitioning_ = true;
+  transitionStackAction_ = [this]() {
+    // 退出旧场景
+    auto outgoing = outgoingScene_;
+    if (!sceneStack_.empty() && outgoing && sceneStack_.top() == outgoing) {
+      outgoing->onExit();
+      outgoing->onDetachFromScene();
+      sceneStack_.pop();
+    }
+    // 推入新场景并调用 onEnter
+    auto incoming = incomingScene_;
+    if (incoming) {
+      sceneStack_.push(incoming);
+      if (!incoming->isRunning()) {
+        incoming->onEnter();
+        incoming->onAttachToScene(incoming.get());
+      }
+    }
+  };
+  // 注意：不在此处调用新场景的 onEnter，由 transitionStackAction_
+  // 在过渡完成后调用
+}
+
+void SceneManager::replaceScene(Ptr<Scene> scene, TransitionType transition,
+                                float duration) {
+  if (!scene || isTransitioning_) {
+    return;
+  }
+
+  if (sceneStack_.empty()) {
+    runWithScene(scene);
+    return;
+  }
+
+  auto oldScene = sceneStack_.top();
+
+  startTransition(oldScene, scene, transition, duration, [this]() {
+    // 过渡完成后，退出旧场景并从堆栈中移除
+    auto outgoing = outgoingScene_;
+    auto incoming = incomingScene_;
+    if (!sceneStack_.empty() && outgoing && sceneStack_.top() == outgoing) {
+      outgoing->onExit();
+      outgoing->onDetachFromScene();
+      sceneStack_.pop();
+    }
+    // 将新场景推入堆栈并调用 onEnter
+    if (incoming) {
+      sceneStack_.push(incoming);
+      if (!incoming->isRunning()) {
+        incoming->onEnter();
+        incoming->onAttachToScene(incoming.get());
+      }
+    }
+  });
+}
+
+void SceneManager::pushScene(Ptr<Scene> scene) {
+  if (!scene || isTransitioning_) {
+    return;
+  }
+
+  // Pause current scene
+  if (!sceneStack_.empty()) {
+    sceneStack_.top()->pause();
+  }
+
+  // Push new scene
+  scene->onEnter();
+  scene->onAttachToScene(scene.get());
+  sceneStack_.push(scene);
+}
+
+void SceneManager::pushScene(Ptr<Scene> scene, TransitionType transition,
+                             float duration) {
+  if (!scene || isTransitioning_) {
+    return;
+  }
+
+  if (sceneStack_.empty()) {
+    runWithScene(scene);
+    return;
+  }
+
+  // 暂停当前场景
+  sceneStack_.top()->pause();
+
+  auto currentScene = sceneStack_.top();
+
+  startTransition(currentScene, scene, transition, duration, [this]() {
+    // 过渡完成后，将新场景推入堆栈并调用 onEnter
+    if (incomingScene_) {
+      sceneStack_.push(incomingScene_);
+      if (!incomingScene_->isRunning()) {
+        incomingScene_->onEnter();
+        incomingScene_->onAttachToScene(incomingScene_.get());
+      }
+    }
+  });
+}
+
+void SceneManager::popScene() {
+  if (sceneStack_.size() <= 1 || isTransitioning_) {
+    return;
+  }
+
+  auto current = sceneStack_.top();
+  current->onExit();
+  current->onDetachFromScene();
+  sceneStack_.pop();
+
+  // Resume previous scene
+  if (!sceneStack_.empty()) {
+    sceneStack_.top()->resume();
+  }
+}
+
+void SceneManager::popScene(TransitionType transition, float duration) {
+  if (sceneStack_.size() <= 1 || isTransitioning_) {
+    return;
+  }
+
+  auto current = sceneStack_.top();
+  auto previous = getPreviousScene();
+
+  startTransition(current, previous, transition, duration, [this]() {
+    // 过渡完成后，退出当前场景并从堆栈中移除
+    auto outgoing = outgoingScene_;
+    if (!sceneStack_.empty() && outgoing && sceneStack_.top() == outgoing) {
+      outgoing->onExit();
+      outgoing->onDetachFromScene();
+      sceneStack_.pop();
+    }
+    // 恢复前一个场景
+    auto incoming = incomingScene_;
+    if (!sceneStack_.empty() && incoming && sceneStack_.top() == incoming) {
+      if (!incoming->isRunning()) {
+        incoming->onEnter();
+        incoming->onAttachToScene(incoming.get());
+      }
+      incoming->resume();
+    }
+  });
+}
+
+void SceneManager::popToRootScene() {
+  if (sceneStack_.size() <= 1 || isTransitioning_) {
+    return;
+  }
+
+  // Exit all scenes except root
+  while (sceneStack_.size() > 1) {
+    auto scene = sceneStack_.top();
+    scene->onExit();
+    scene->onDetachFromScene();
+    sceneStack_.pop();
+  }
+
+  // Resume root
+  sceneStack_.top()->resume();
+}
+
+void SceneManager::popToRootScene(TransitionType transition, float duration) {
+  if (sceneStack_.size() <= 1 || isTransitioning_) {
+    return;
+  }
+
+  auto root = getRootScene();
+  auto current = sceneStack_.top();
+
+  startTransition(current, root, transition, duration, [this, root]() {
+    // 退出所有场景直到根场景
+    while (!sceneStack_.empty() && sceneStack_.top() != root) {
+      auto scene = sceneStack_.top();
+      scene->onExit();
+      scene->onDetachFromScene();
+      sceneStack_.pop();
+    }
+    // 恢复根场景
+    if (!sceneStack_.empty() && sceneStack_.top() == root) {
+      if (!root->isRunning()) {
+        root->onEnter();
+        root->onAttachToScene(root.get());
+      }
+      root->resume();
+    }
+  });
+}
+
+void SceneManager::popToScene(const std::string &name) {
+  if (isTransitioning_) {
+    return;
+  }
+
+  // Find target scene in stack
+  std::stack<Ptr<Scene>> tempStack;
+  Ptr<Scene> target = nullptr;
+
+  while (!sceneStack_.empty()) {
+    auto scene = sceneStack_.top();
+    if (scene->getName() == name) {
+      target = scene;
+      break;
+    }
+    scene->onExit();
+    scene->onDetachFromScene();
+    sceneStack_.pop();
+  }
+
+  if (target) {
+    target->resume();
+  }
+}
+
+void SceneManager::popToScene(const std::string &name,
+                              TransitionType transition, float duration) {
+  if (isTransitioning_) {
+    return;
+  }
+
+  auto target = getSceneByName(name);
+  if (target && target != sceneStack_.top()) {
+    auto current = sceneStack_.top();
+
+    startTransition(current, target, transition, duration, [this, target]() {
+      // 退出所有场景直到目标场景
+      while (!sceneStack_.empty() && sceneStack_.top() != target) {
+        auto scene = sceneStack_.top();
+        scene->onExit();
+        scene->onDetachFromScene();
+        sceneStack_.pop();
+      }
+      // 恢复目标场景
+      if (!sceneStack_.empty() && sceneStack_.top() == target) {
+        if (!target->isRunning()) {
+          target->onEnter();
+          target->onAttachToScene(target.get());
+        }
+        target->resume();
+      }
+    });
+  }
+}
+
+Ptr<Scene> SceneManager::getCurrentScene() const {
+  if (sceneStack_.empty()) {
+    return nullptr;
+  }
+  return sceneStack_.top();
+}
+
+Ptr<Scene> SceneManager::getPreviousScene() const {
+  if (sceneStack_.size() < 2) {
+    return nullptr;
+  }
+
+  // Copy stack to access second top
+  auto tempStack = sceneStack_;
+  tempStack.pop();
+  return tempStack.top();
+}
+
+Ptr<Scene> SceneManager::getRootScene() const {
+  if (sceneStack_.empty()) {
+    return nullptr;
+  }
+
+  // Copy stack to access bottom
+  auto tempStack = sceneStack_;
+  Ptr<Scene> root;
+  while (!tempStack.empty()) {
+    root = tempStack.top();
+    tempStack.pop();
+  }
+  return root;
+}
+
+Ptr<Scene> SceneManager::getSceneByName(const std::string &name) const {
+  auto it = namedScenes_.find(name);
+  if (it != namedScenes_.end()) {
+    return it->second;
+  }
+
+  // Search in stack
+  auto tempStack = sceneStack_;
+  while (!tempStack.empty()) {
+    auto scene = tempStack.top();
+    if (scene->getName() == name) {
+      return scene;
+    }
+    tempStack.pop();
+  }
+
+  return nullptr;
+}
+
+bool SceneManager::hasScene(const std::string &name) const {
+  return getSceneByName(name) != nullptr;
+}
+
+void SceneManager::update(float dt) {
+  if (isTransitioning_) {
+    updateTransition(dt);
+    hoverTarget_ = nullptr;
+    captureTarget_ = nullptr;
+    hasLastPointerWorld_ = false;
+  }
+
+  if (!sceneStack_.empty()) {
+    auto &scene = *sceneStack_.top();
+    scene.updateScene(dt);
+    if (!isTransitioning_) {
+      dispatchPointerEvents(scene);
+    }
+  }
+}
+
+void SceneManager::render(RenderBackend &renderer) {
+  Color clearColor = Colors::Black;
+  if (isTransitioning_) {
+    if (outgoingScene_) {
+      clearColor = outgoingScene_->getBackgroundColor();
+    } else if (incomingScene_) {
+      clearColor = incomingScene_->getBackgroundColor();
+    }
+  } else if (!sceneStack_.empty()) {
+    clearColor = sceneStack_.top()->getBackgroundColor();
+  }
+
+  E2D_LOG_TRACE("SceneManager::render - beginFrame with color({}, {}, {})",
+                clearColor.r, clearColor.g, clearColor.b);
+  renderer.beginFrame(clearColor);
+
+  if (isTransitioning_ && activeTransition_) {
+    E2D_LOG_TRACE("SceneManager::render - rendering transition");
+    activeTransition_->render(renderer);
+  } else if (!sceneStack_.empty()) {
+    E2D_LOG_TRACE("SceneManager::render - rendering scene content");
+    sceneStack_.top()->renderContent(renderer);
+  } else {
+    E2D_LOG_WARN("SceneManager::render - no scene to render");
+  }
+
+  renderer.endFrame();
+  E2D_LOG_TRACE("SceneManager::render - endFrame");
+}
+
+void SceneManager::collectRenderCommands(std::vector<RenderCommand> &commands) {
+  if (isTransitioning_ && outgoingScene_) {
+    // During transition, collect commands from both scenes
+    outgoingScene_->collectRenderCommands(commands);
+    if (incomingScene_) {
+      incomingScene_->collectRenderCommands(commands);
+    }
+  } else if (!sceneStack_.empty()) {
+    sceneStack_.top()->collectRenderCommands(commands);
+  }
+}
+
+void SceneManager::end() {
+  while (!sceneStack_.empty()) {
+    auto scene = sceneStack_.top();
+    scene->onExit();
+    scene->onDetachFromScene();
+    sceneStack_.pop();
+  }
+  namedScenes_.clear();
+}
+
+void SceneManager::purgeCachedScenes() { namedScenes_.clear(); }
+
+void SceneManager::startTransition(Ptr<Scene> from, Ptr<Scene> to,
+                                   TransitionType type, float duration,
+                                   Function<void()> stackAction) {
+  if (!from || !to) {
+    return;
+  }
+
+  Ptr<Transition> transition;
+  switch (type) {
+  case TransitionType::Fade:
+    transition = makePtr<FadeTransition>(duration);
+    break;
+  case TransitionType::SlideLeft:
+    transition = makePtr<SlideTransition>(duration, TransitionDirection::Left);
+    break;
+  case TransitionType::SlideRight:
+    transition = makePtr<SlideTransition>(duration, TransitionDirection::Right);
+    break;
+  case TransitionType::SlideUp:
+    transition = makePtr<SlideTransition>(duration, TransitionDirection::Up);
+    break;
+  case TransitionType::SlideDown:
+    transition = makePtr<SlideTransition>(duration, TransitionDirection::Down);
+    break;
+  case TransitionType::Scale:
+    transition = makePtr<ScaleTransition>(duration);
+    break;
+  case TransitionType::Flip:
+    transition = makePtr<FlipTransition>(duration);
+    break;
+  default:
+    transition = makePtr<FadeTransition>(duration);
+    break;
+  }
+
+  transition->start(from, to);
+
+  // 在过渡开始前，发送 UIHoverExit 给当前悬停的节点，重置按钮状态
+  if (hoverTarget_) {
+    Event evt;
+    evt.type = EventType::UIHoverExit;
+    evt.data = CustomEvent{0, hoverTarget_};
+    dispatchToNode(hoverTarget_, evt);
+    hoverTarget_ = nullptr;
+  }
+  captureTarget_ = nullptr;
+  hasLastPointerWorld_ = false;
+
+  isTransitioning_ = true;
+  currentTransition_ = type;
+  transitionDuration_ = duration;
+  transitionElapsed_ = 0.0f;
+  outgoingScene_ = from;
+  incomingScene_ = to;
+  activeTransition_ = transition;
+  transitionStackAction_ = std::move(stackAction);
+
+  // 注意：不在此处调用新场景的 onEnter，由 transitionStackAction_
+  // 在过渡完成后调用
+}
+
+void SceneManager::updateTransition(float dt) {
+  transitionElapsed_ += dt;
+
+  if (activeTransition_) {
+    activeTransition_->update(dt);
+    if (activeTransition_->isFinished()) {
+      finishTransition();
+    }
+  } else {
+    finishTransition();
+  }
+}
+
+void SceneManager::finishTransition() {
+  // 先保存当前悬停的节点，然后在 transitionStackAction_ 之后发送 UIHoverExit
+  Node *lastHoverTarget = hoverTarget_;
+
+  isTransitioning_ = false;
+  hoverTarget_ = nullptr;
+  captureTarget_ = nullptr;
+  hasLastPointerWorld_ = false;
+
+  if (transitionStackAction_) {
+    transitionStackAction_();
+  }
+
+  // 在 transitionStackAction_ 之后发送 UIHoverExit，确保旧场景仍然有效
+  if (lastHoverTarget) {
+    Event evt;
+    evt.type = EventType::UIHoverExit;
+    evt.data = CustomEvent{0, lastHoverTarget};
+    dispatchToNode(lastHoverTarget, evt);
+  }
+
+  outgoingScene_.reset();
+  incomingScene_.reset();
+  activeTransition_.reset();
+  transitionStackAction_ = nullptr;
+
+  if (transitionCallback_) {
+    transitionCallback_();
+    transitionCallback_ = nullptr;
+  }
+}
+
+void SceneManager::dispatchPointerEvents(Scene &scene) {
+  auto &input = Application::instance().input();
+  Vec2 screenPos = input.getMousePosition();
+
+  Vec2 worldPos = screenPos;
+  if (auto *camera = scene.getActiveCamera()) {
+    worldPos = camera->screenToWorld(screenPos);
+  }
+
+  Ptr<Node> root = scene.shared_from_this();
+  Node *newHover = hitTestTopmost(root, worldPos);
+
+  if (newHover != hoverTarget_) {
+    if (hoverTarget_) {
+      Event evt;
+      evt.type = EventType::UIHoverExit;
+      evt.data = CustomEvent{0, hoverTarget_};
+      dispatchToNode(hoverTarget_, evt);
+    }
+    hoverTarget_ = newHover;
+    if (hoverTarget_) {
+      Event evt;
+      evt.type = EventType::UIHoverEnter;
+      evt.data = CustomEvent{0, hoverTarget_};
+      dispatchToNode(hoverTarget_, evt);
+    }
+  }
+
+  if (!hasLastPointerWorld_) {
+    lastPointerWorld_ = worldPos;
+    hasLastPointerWorld_ = true;
+  }
+
+  Vec2 delta = worldPos - lastPointerWorld_;
+  if (hoverTarget_ && (delta.x != 0.0f || delta.y != 0.0f)) {
+    Event evt = Event::createMouseMove(worldPos, delta);
+    dispatchToNode(hoverTarget_, evt);
+  }
+
+  float scrollDelta = input.getMouseScrollDelta();
+  if (hoverTarget_ && scrollDelta != 0.0f) {
+    Event evt = Event::createMouseScroll(Vec2(0.0f, scrollDelta), worldPos);
+    dispatchToNode(hoverTarget_, evt);
+  }
+
+  if (input.isMousePressed(MouseButton::Left)) {
+    captureTarget_ = hoverTarget_;
+    if (captureTarget_) {
+      Event evt = Event::createMouseButtonPress(
+          static_cast<int>(MouseButton::Left), 0, worldPos);
+      dispatchToNode(captureTarget_, evt);
+
+      Event pressed;
+      pressed.type = EventType::UIPressed;
+      pressed.data = CustomEvent{0, captureTarget_};
+      dispatchToNode(captureTarget_, pressed);
+    }
+  }
+
+  if (input.isMouseReleased(MouseButton::Left)) {
+    Node *target = captureTarget_ ? captureTarget_ : hoverTarget_;
+    if (target) {
+      Event evt = Event::createMouseButtonRelease(
+          static_cast<int>(MouseButton::Left), 0, worldPos);
+      dispatchToNode(target, evt);
+
+      Event released;
+      released.type = EventType::UIReleased;
+      released.data = CustomEvent{0, target};
+      dispatchToNode(target, released);
+    }
+
+    if (captureTarget_ && captureTarget_ == hoverTarget_) {
+      Event clicked;
+      clicked.type = EventType::UIClicked;
+      clicked.data = CustomEvent{0, captureTarget_};
+      dispatchToNode(captureTarget_, clicked);
+    }
+
+    captureTarget_ = nullptr;
+  }
+
+  lastPointerWorld_ = worldPos;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/shape_node.cpp b/Extra2D/src/scene/shape_node.cpp
new file mode 100644
index 0000000..ab1b59d
--- /dev/null
+++ b/Extra2D/src/scene/shape_node.cpp
@@ -0,0 +1,348 @@
+#include <algorithm>
+#include <cmath>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/render_command.h>
+#include <extra2d/scene/shape_node.h>
+#include <limits>
+
+namespace extra2d {
+
+ShapeNode::ShapeNode() = default;
+
+Ptr<ShapeNode> ShapeNode::create() { return makePtr<ShapeNode>(); }
+
+Ptr<ShapeNode> ShapeNode::createPoint(const Vec2 &pos, const Color &color) {
+  auto node = makePtr<ShapeNode>();
+  node->shapeType_ = ShapeType::Point;
+  node->color_ = color;
+  node->points_ = {pos};
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createLine(const Vec2 &start, const Vec2 &end,
+                                     const Color &color, float width) {
+  auto node = makePtr<ShapeNode>();
+  node->shapeType_ = ShapeType::Line;
+  node->color_ = color;
+  node->lineWidth_ = width;
+  node->points_ = {start, end};
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createRect(const Rect &rect, const Color &color,
+                                     float width) {
+  auto node = makePtr<ShapeNode>();
+  node->shapeType_ = ShapeType::Rect;
+  node->color_ = color;
+  node->lineWidth_ = width;
+  node->filled_ = false;
+  node->points_ = {
+      Vec2(rect.left(), rect.top()), Vec2(rect.right(), rect.top()),
+      Vec2(rect.right(), rect.bottom()), Vec2(rect.left(), rect.bottom())};
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createFilledRect(const Rect &rect,
+                                           const Color &color) {
+  auto node = createRect(rect, color, 0);
+  node->filled_ = true;
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createCircle(const Vec2 &center, float radius,
+                                       const Color &color, int segments,
+                                       float width) {
+  auto node = makePtr<ShapeNode>();
+  node->shapeType_ = ShapeType::Circle;
+  node->color_ = color;
+  node->lineWidth_ = width;
+  node->segments_ = segments;
+  node->filled_ = false;
+  node->points_ = {center};
+  // Store radius in a point for simplicity
+  node->addPoint(Vec2(radius, 0));
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createFilledCircle(const Vec2 &center, float radius,
+                                             const Color &color, int segments) {
+  auto node = createCircle(center, radius, color, segments, 0);
+  node->filled_ = true;
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createTriangle(const Vec2 &p1, const Vec2 &p2,
+                                         const Vec2 &p3, const Color &color,
+                                         float width) {
+  auto node = makePtr<ShapeNode>();
+  node->shapeType_ = ShapeType::Triangle;
+  node->color_ = color;
+  node->lineWidth_ = width;
+  node->filled_ = false;
+  node->points_ = {p1, p2, p3};
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createFilledTriangle(const Vec2 &p1, const Vec2 &p2,
+                                               const Vec2 &p3,
+                                               const Color &color) {
+  auto node = createTriangle(p1, p2, p3, color, 0);
+  node->filled_ = true;
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createPolygon(const std::vector<Vec2> &points,
+                                        const Color &color, float width) {
+  auto node = makePtr<ShapeNode>();
+  node->shapeType_ = ShapeType::Polygon;
+  node->color_ = color;
+  node->lineWidth_ = width;
+  node->filled_ = false;
+  node->points_ = points;
+  return node;
+}
+
+Ptr<ShapeNode> ShapeNode::createFilledPolygon(const std::vector<Vec2> &points,
+                                              const Color &color) {
+  auto node = createPolygon(points, color, 0);
+  node->filled_ = true;
+  return node;
+}
+
+void ShapeNode::setPoints(const std::vector<Vec2> &points) {
+  points_ = points;
+  updateSpatialIndex();
+}
+
+void ShapeNode::addPoint(const Vec2 &point) {
+  points_.push_back(point);
+  updateSpatialIndex();
+}
+
+void ShapeNode::clearPoints() {
+  points_.clear();
+  updateSpatialIndex();
+}
+
+Rect ShapeNode::getBoundingBox() const {
+  if (points_.empty()) {
+    return Rect();
+  }
+
+  Vec2 offset = getPosition();
+
+  if (shapeType_ == ShapeType::Circle && points_.size() >= 2) {
+    float radius = std::abs(points_[1].x);
+    Vec2 center = points_[0] + offset;
+    return Rect(center.x - radius, center.y - radius, radius * 2.0f,
+                radius * 2.0f);
+  }
+
+  float minX = std::numeric_limits<float>::infinity();
+  float minY = std::numeric_limits<float>::infinity();
+  float maxX = -std::numeric_limits<float>::infinity();
+  float maxY = -std::numeric_limits<float>::infinity();
+
+  for (const auto &p : points_) {
+    Vec2 world = p + offset;
+    minX = std::min(minX, world.x);
+    minY = std::min(minY, world.y);
+    maxX = std::max(maxX, world.x);
+    maxY = std::max(maxY, world.y);
+  }
+
+  float inflate = 0.0f;
+  if (!filled_ &&
+      (shapeType_ == ShapeType::Line || shapeType_ == ShapeType::Rect ||
+       shapeType_ == ShapeType::Triangle || shapeType_ == ShapeType::Polygon ||
+       shapeType_ == ShapeType::Point)) {
+    inflate = std::max(0.0f, lineWidth_ * 0.5f);
+  }
+  if (shapeType_ == ShapeType::Point) {
+    inflate = std::max(inflate, lineWidth_ * 0.5f);
+  }
+
+  return Rect(minX - inflate, minY - inflate, (maxX - minX) + inflate * 2.0f,
+              (maxY - minY) + inflate * 2.0f);
+}
+
+void ShapeNode::onDraw(RenderBackend &renderer) {
+  if (points_.empty()) {
+    return;
+  }
+
+  Vec2 offset = getPosition();
+
+  switch (shapeType_) {
+  case ShapeType::Point:
+    if (!points_.empty()) {
+      renderer.fillCircle(points_[0] + offset, lineWidth_ * 0.5f, color_, 8);
+    }
+    break;
+
+  case ShapeType::Line:
+    if (points_.size() >= 2) {
+      renderer.drawLine(points_[0] + offset, points_[1] + offset, color_,
+                        lineWidth_);
+    }
+    break;
+
+  case ShapeType::Rect:
+    if (points_.size() >= 4) {
+      if (filled_) {
+        Rect rect(points_[0].x, points_[0].y, points_[2].x - points_[0].x,
+                  points_[2].y - points_[0].y);
+        renderer.fillRect(Rect(rect.origin + offset, rect.size), color_);
+      } else {
+        for (size_t i = 0; i < points_.size(); ++i) {
+          Vec2 start = points_[i] + offset;
+          Vec2 end = points_[(i + 1) % points_.size()] + offset;
+          renderer.drawLine(start, end, color_, lineWidth_);
+        }
+      }
+    }
+    break;
+
+  case ShapeType::Circle:
+    if (points_.size() >= 2) {
+      float radius = points_[1].x;
+      if (filled_) {
+        renderer.fillCircle(points_[0] + offset, radius, color_, segments_);
+      } else {
+        renderer.drawCircle(points_[0] + offset, radius, color_, segments_,
+                            lineWidth_);
+      }
+    }
+    break;
+
+  case ShapeType::Triangle:
+    if (points_.size() >= 3) {
+      Vec2 p1 = points_[0] + offset;
+      Vec2 p2 = points_[1] + offset;
+      Vec2 p3 = points_[2] + offset;
+      if (filled_) {
+        renderer.fillTriangle(p1, p2, p3, color_);
+      } else {
+        renderer.drawLine(p1, p2, color_, lineWidth_);
+        renderer.drawLine(p2, p3, color_, lineWidth_);
+        renderer.drawLine(p3, p1, color_, lineWidth_);
+      }
+    }
+    break;
+
+  case ShapeType::Polygon:
+    if (!points_.empty()) {
+      std::vector<Vec2> transformedPoints;
+      transformedPoints.reserve(points_.size());
+      for (const auto &p : points_) {
+        transformedPoints.push_back(p + offset);
+      }
+
+      if (filled_) {
+        renderer.fillPolygon(transformedPoints, color_);
+      } else {
+        renderer.drawPolygon(transformedPoints, color_, lineWidth_);
+      }
+    }
+    break;
+  }
+}
+
+void ShapeNode::generateRenderCommand(std::vector<RenderCommand> &commands,
+                                      int zOrder) {
+  if (points_.empty()) {
+    return;
+  }
+
+  Vec2 offset = getPosition();
+  RenderCommand cmd;
+  cmd.zOrder = zOrder;
+
+  switch (shapeType_) {
+  case ShapeType::Point:
+    if (!points_.empty()) {
+      cmd.type = RenderCommandType::FilledCircle;
+      cmd.data =
+          CircleData{points_[0] + offset, lineWidth_ * 0.5f, color_, 8, 0.0f};
+    }
+    break;
+
+  case ShapeType::Line:
+    if (points_.size() >= 2) {
+      cmd.type = RenderCommandType::Line;
+      cmd.data = LineData{points_[0] + offset, points_[1] + offset, color_,
+                          lineWidth_};
+    }
+    break;
+
+  case ShapeType::Rect:
+    if (points_.size() >= 4) {
+      if (filled_) {
+        cmd.type = RenderCommandType::FilledRect;
+        Rect rect(points_[0].x, points_[0].y, points_[2].x - points_[0].x,
+                  points_[2].y - points_[0].y);
+        cmd.data =
+            RectData{Rect(rect.origin + offset, rect.size), color_, 0.0f};
+      } else {
+        cmd.type = RenderCommandType::Rect;
+        Rect rect(points_[0].x, points_[0].y, points_[2].x - points_[0].x,
+                  points_[2].y - points_[0].y);
+        cmd.data =
+            RectData{Rect(rect.origin + offset, rect.size), color_, lineWidth_};
+      }
+    }
+    break;
+
+  case ShapeType::Circle:
+    if (points_.size() >= 2) {
+      float radius = points_[1].x;
+      if (filled_) {
+        cmd.type = RenderCommandType::FilledCircle;
+        cmd.data =
+            CircleData{points_[0] + offset, radius, color_, segments_, 0.0f};
+      } else {
+        cmd.type = RenderCommandType::Circle;
+        cmd.data = CircleData{points_[0] + offset, radius, color_, segments_,
+                              lineWidth_};
+      }
+    }
+    break;
+
+  case ShapeType::Triangle:
+    if (points_.size() >= 3) {
+      Vec2 p1 = points_[0] + offset;
+      Vec2 p2 = points_[1] + offset;
+      Vec2 p3 = points_[2] + offset;
+      if (filled_) {
+        cmd.type = RenderCommandType::FilledTriangle;
+        cmd.data = TriangleData{p1, p2, p3, color_, 0.0f};
+      } else {
+        cmd.type = RenderCommandType::Triangle;
+        cmd.data = TriangleData{p1, p2, p3, color_, lineWidth_};
+      }
+    }
+    break;
+
+  case ShapeType::Polygon:
+    if (!points_.empty()) {
+      std::vector<Vec2> transformedPoints;
+      transformedPoints.reserve(points_.size());
+      for (const auto &p : points_) {
+        transformedPoints.push_back(p + offset);
+      }
+
+      if (filled_) {
+        cmd.type = RenderCommandType::FilledPolygon;
+        cmd.data = PolygonData{transformedPoints, color_, 0.0f};
+      } else {
+        cmd.type = RenderCommandType::Polygon;
+        cmd.data = PolygonData{transformedPoints, color_, lineWidth_};
+      }
+    }
+    break;
+  }
+
+  commands.push_back(std::move(cmd));
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/sprite.cpp b/Extra2D/src/scene/sprite.cpp
new file mode 100644
index 0000000..88f7130
--- /dev/null
+++ b/Extra2D/src/scene/sprite.cpp
@@ -0,0 +1,139 @@
+#include <algorithm>
+#include <cmath>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/render_command.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/scene/sprite.h>
+
+namespace extra2d {
+
+Sprite::Sprite() = default;
+
+Sprite::Sprite(Ptr<Texture> texture) { setTexture(texture); }
+
+void Sprite::setTexture(Ptr<Texture> texture) {
+  texture_ = texture;
+  if (texture_) {
+    textureRect_ = Rect(0, 0, static_cast<float>(texture_->getWidth()),
+                        static_cast<float>(texture_->getHeight()));
+  }
+  updateSpatialIndex();
+}
+
+void Sprite::setTextureRect(const Rect &rect) {
+  textureRect_ = rect;
+  updateSpatialIndex();
+}
+
+void Sprite::setColor(const Color &color) { color_ = color; }
+
+void Sprite::setFlipX(bool flip) { flipX_ = flip; }
+
+void Sprite::setFlipY(bool flip) { flipY_ = flip; }
+
+Ptr<Sprite> Sprite::create() { return makePtr<Sprite>(); }
+
+Ptr<Sprite> Sprite::create(Ptr<Texture> texture) {
+  return makePtr<Sprite>(texture);
+}
+
+Ptr<Sprite> Sprite::create(Ptr<Texture> texture, const Rect &rect) {
+  auto sprite = makePtr<Sprite>(texture);
+  sprite->setTextureRect(rect);
+  return sprite;
+}
+
+Rect Sprite::getBoundingBox() const {
+  if (!texture_ || !texture_->isValid()) {
+    return Rect();
+  }
+
+  float width = textureRect_.width();
+  float height = textureRect_.height();
+
+  auto pos = getPosition();
+  auto anchor = getAnchor();
+  auto scale = getScale();
+
+  float w = width * scale.x;
+  float h = height * scale.y;
+  float x0 = pos.x - width * anchor.x * scale.x;
+  float y0 = pos.y - height * anchor.y * scale.y;
+  float x1 = x0 + w;
+  float y1 = y0 + h;
+
+  float l = std::min(x0, x1);
+  float t = std::min(y0, y1);
+  return Rect(l, t, std::abs(w), std::abs(h));
+}
+
+void Sprite::onDraw(RenderBackend &renderer) {
+  if (!texture_ || !texture_->isValid()) {
+    return;
+  }
+
+  // Calculate destination rectangle based on texture rect
+  float width = textureRect_.width();
+  float height = textureRect_.height();
+
+  auto pos = getPosition();
+  auto anchor = getAnchor();
+  auto scale = getScale();
+  Rect destRect(pos.x - width * anchor.x * scale.x,
+                pos.y - height * anchor.y * scale.y, width * scale.x,
+                height * scale.y);
+
+  // Adjust source rect for flipping
+  Rect srcRect = textureRect_;
+  if (flipX_) {
+    srcRect.origin.x = srcRect.right();
+    srcRect.size.width = -srcRect.size.width;
+  }
+  if (flipY_) {
+    srcRect.origin.y = srcRect.bottom();
+    srcRect.size.height = -srcRect.size.height;
+  }
+
+  renderer.drawSprite(*texture_, destRect, srcRect, color_, getRotation(),
+                      getAnchor());
+}
+
+void Sprite::generateRenderCommand(std::vector<RenderCommand> &commands,
+                                   int zOrder) {
+  if (!texture_ || !texture_->isValid()) {
+    return;
+  }
+
+  // 计算目标矩形（与 onDraw 一致）
+  float width = textureRect_.width();
+  float height = textureRect_.height();
+
+  auto pos = getPosition();
+  auto anchor = getAnchor();
+  auto scale = getScale();
+  Rect destRect(pos.x - width * anchor.x * scale.x,
+                pos.y - height * anchor.y * scale.y, width * scale.x,
+                height * scale.y);
+
+  // 调整源矩形（翻转）
+  Rect srcRect = textureRect_;
+  if (flipX_) {
+    srcRect.origin.x = srcRect.right();
+    srcRect.size.width = -srcRect.size.width;
+  }
+  if (flipY_) {
+    srcRect.origin.y = srcRect.bottom();
+    srcRect.size.height = -srcRect.size.height;
+  }
+
+  // 创建渲染命令
+  RenderCommand cmd;
+  cmd.type = RenderCommandType::Sprite;
+  cmd.zOrder = zOrder;
+  cmd.data =
+      SpriteData{texture_, destRect, srcRect, color_, getRotation(), anchor};
+
+  commands.push_back(std::move(cmd));
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/text.cpp b/Extra2D/src/scene/text.cpp
new file mode 100644
index 0000000..77c6782
--- /dev/null
+++ b/Extra2D/src/scene/text.cpp
@@ -0,0 +1,145 @@
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/graphics/render_command.h>
+#include <extra2d/scene/text.h>
+
+namespace extra2d {
+
+Text::Text() {
+  // 文字默认锚点为左上角，这样setPosition(0, 0)会在左上角显示
+  setAnchor(0.0f, 0.0f);
+}
+
+Text::Text(const String &text) : text_(text) {
+  sizeDirty_ = true;
+  // 文字默认锚点为左上角，这样setPosition(0, 0)会在左上角显示
+  setAnchor(0.0f, 0.0f);
+}
+
+void Text::setText(const String &text) {
+  text_ = text;
+  sizeDirty_ = true;
+  updateSpatialIndex();
+}
+
+void Text::setFont(Ptr<FontAtlas> font) {
+  font_ = font;
+  sizeDirty_ = true;
+  updateSpatialIndex();
+}
+
+void Text::setTextColor(const Color &color) { color_ = color; }
+
+void Text::setFontSize(int size) {
+  fontSize_ = size;
+  sizeDirty_ = true;
+  updateSpatialIndex();
+}
+
+void Text::setAlignment(Alignment align) {
+  alignment_ = align;
+  updateSpatialIndex();
+}
+
+Vec2 Text::getTextSize() const {
+  updateCache();
+  return cachedSize_;
+}
+
+float Text::getLineHeight() const {
+  if (font_) {
+    return font_->getLineHeight();
+  }
+  return static_cast<float>(fontSize_);
+}
+
+void Text::updateCache() const {
+  if (!sizeDirty_ || !font_) {
+    return;
+  }
+
+  cachedSize_ = font_->measureText(text_);
+  sizeDirty_ = false;
+}
+
+Ptr<Text> Text::create() { return makePtr<Text>(); }
+
+Ptr<Text> Text::create(const String &text) { return makePtr<Text>(text); }
+
+Ptr<Text> Text::create(const String &text, Ptr<FontAtlas> font) {
+  auto t = makePtr<Text>(text);
+  t->setFont(font);
+  return t;
+}
+
+Rect Text::getBoundingBox() const {
+  if (!font_ || text_.empty()) {
+    return Rect();
+  }
+
+  updateCache();
+  Vec2 size = cachedSize_;
+  if (size.x <= 0.0f || size.y <= 0.0f) {
+    return Rect();
+  }
+
+  Vec2 pos = getPosition();
+
+  if (alignment_ != Alignment::Left) {
+    if (alignment_ == Alignment::Center) {
+      pos.x -= size.x * 0.5f;
+    } else if (alignment_ == Alignment::Right) {
+      pos.x -= size.x;
+    }
+  }
+
+  return Rect(pos.x, pos.y, size.x, size.y);
+}
+
+void Text::onDraw(RenderBackend &renderer) {
+  if (!font_ || text_.empty()) {
+    return;
+  }
+
+  Vec2 pos = getPosition();
+
+  // Calculate horizontal offset based on alignment
+  if (alignment_ != Alignment::Left) {
+    Vec2 size = getTextSize();
+    if (alignment_ == Alignment::Center) {
+      pos.x -= size.x * 0.5f;
+    } else if (alignment_ == Alignment::Right) {
+      pos.x -= size.x;
+    }
+  }
+
+  renderer.drawText(*font_, text_, pos, color_);
+}
+
+void Text::generateRenderCommand(std::vector<RenderCommand> &commands,
+                                 int zOrder) {
+  if (!font_ || text_.empty()) {
+    return;
+  }
+
+  Vec2 pos = getPosition();
+
+  // 计算对齐偏移（与 onDraw 一致）
+  if (alignment_ != Alignment::Left) {
+    Vec2 size = getTextSize();
+    if (alignment_ == Alignment::Center) {
+      pos.x -= size.x * 0.5f;
+    } else if (alignment_ == Alignment::Right) {
+      pos.x -= size.x;
+    }
+  }
+
+  // 创建渲染命令
+  RenderCommand cmd;
+  cmd.type = RenderCommandType::Text;
+  cmd.zOrder = zOrder;
+  cmd.data = TextData{font_, text_, pos, color_};
+
+  commands.push_back(std::move(cmd));
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/scene/transition.cpp b/Extra2D/src/scene/transition.cpp
new file mode 100644
index 0000000..531602a
--- /dev/null
+++ b/Extra2D/src/scene/transition.cpp
@@ -0,0 +1,396 @@
+#include <algorithm>
+#include <extra2d/core/math_types.h>
+#include <extra2d/graphics/camera.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/scene/transition.h>
+#include <glm/gtc/matrix_transform.hpp>
+
+namespace extra2d {
+
+// ============================================================================
+// 缓动函数
+// ============================================================================
+static float easeInOutQuad(float t) {
+  return t < 0.5f ? 2.0f * t * t : -1.0f + (4.0f - 2.0f * t) * t;
+}
+
+static float easeOutQuad(float t) { return t * (2.0f - t); }
+
+// ============================================================================
+// Transition 基类
+// ============================================================================
+Transition::Transition(float duration)
+    : duration_(duration), elapsed_(0.0f), progress_(0.0f), isFinished_(false),
+      isStarted_(false) {}
+
+void Transition::start(Ptr<Scene> from, Ptr<Scene> to) {
+  outgoingScene_ = from;
+  incomingScene_ = to;
+  elapsed_ = 0.0f;
+  progress_ = 0.0f;
+  isFinished_ = false;
+  isStarted_ = true;
+}
+
+void Transition::update(float dt) {
+  if (!isStarted_ || isFinished_) {
+    return;
+  }
+
+  elapsed_ += dt;
+  progress_ = duration_ > 0.0f ? std::min(1.0f, elapsed_ / duration_) : 1.0f;
+
+  if (progress_ >= 1.0f) {
+    onFinish();
+  }
+}
+
+void Transition::render(RenderBackend &renderer) {
+  if (!isStarted_ || isFinished_) {
+    return;
+  }
+
+  onRenderTransition(renderer, easeInOutQuad(progress_));
+}
+
+float Transition::getFadeInAlpha() const { return easeOutQuad(progress_); }
+
+float Transition::getFadeOutAlpha() const {
+  return 1.0f - easeOutQuad(progress_);
+}
+
+void Transition::onFinish() {
+  isFinished_ = true;
+  if (finishCallback_) {
+    finishCallback_();
+  }
+}
+
+// ============================================================================
+// FadeTransition - 淡入淡出
+// ============================================================================
+FadeTransition::FadeTransition(float duration) : Transition(duration) {}
+
+void FadeTransition::onRenderTransition(RenderBackend &renderer,
+                                        float progress) {
+  float screenWidth = 800.0f;
+  float screenHeight = 600.0f;
+
+  if (outgoingScene_) {
+    Size viewportSize = outgoingScene_->getViewportSize();
+    if (viewportSize.width > 0 && viewportSize.height > 0) {
+      screenWidth = viewportSize.width;
+      screenHeight = viewportSize.height;
+    }
+  } else if (incomingScene_) {
+    Size viewportSize = incomingScene_->getViewportSize();
+    if (viewportSize.width > 0 && viewportSize.height > 0) {
+      screenWidth = viewportSize.width;
+      screenHeight = viewportSize.height;
+    }
+  }
+
+  glm::mat4 overlayVP =
+      glm::ortho(0.0f, screenWidth, screenHeight, 0.0f, -1.0f, 1.0f);
+
+  if (progress < 0.5f) {
+    if (outgoingScene_) {
+      outgoingScene_->renderContent(renderer);
+    }
+    float a = std::clamp(progress * 2.0f, 0.0f, 1.0f);
+    renderer.setViewProjection(overlayVP);
+    renderer.fillRect(Rect(0.0f, 0.0f, screenWidth, screenHeight),
+                      Color(0.0f, 0.0f, 0.0f, a));
+  } else {
+    if (incomingScene_) {
+      incomingScene_->renderContent(renderer);
+    }
+    float a = std::clamp((1.0f - progress) * 2.0f, 0.0f, 1.0f);
+    renderer.setViewProjection(overlayVP);
+    renderer.fillRect(Rect(0.0f, 0.0f, screenWidth, screenHeight),
+                      Color(0.0f, 0.0f, 0.0f, a));
+  }
+}
+
+// ============================================================================
+// SlideTransition - 滑动
+// ============================================================================
+SlideTransition::SlideTransition(float duration, TransitionDirection direction)
+    : Transition(duration), direction_(direction) {}
+
+void SlideTransition::onRenderTransition(RenderBackend &renderer,
+                                         float progress) {
+  // 获取视口尺寸
+  float screenWidth = 800.0f;
+  float screenHeight = 600.0f;
+
+  if (outgoingScene_) {
+    Size viewportSize = outgoingScene_->getViewportSize();
+    if (viewportSize.width > 0 && viewportSize.height > 0) {
+      screenWidth = viewportSize.width;
+      screenHeight = viewportSize.height;
+    }
+  } else if (incomingScene_) {
+    Size viewportSize = incomingScene_->getViewportSize();
+    if (viewportSize.width > 0 && viewportSize.height > 0) {
+      screenWidth = viewportSize.width;
+      screenHeight = viewportSize.height;
+    }
+  }
+
+  // 渲染源场景（滑出）
+  if (outgoingScene_) {
+    float offsetX = 0.0f;
+    float offsetY = 0.0f;
+
+    switch (direction_) {
+    case TransitionDirection::Left:
+      offsetX = -screenWidth * progress;
+      break;
+    case TransitionDirection::Right:
+      offsetX = screenWidth * progress;
+      break;
+    case TransitionDirection::Up:
+      offsetY = -screenHeight * progress;
+      break;
+    case TransitionDirection::Down:
+      offsetY = screenHeight * progress;
+      break;
+    }
+
+    // 保存原始相机位置
+    Camera *camera = outgoingScene_->getActiveCamera();
+    Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
+
+    // 应用偏移
+    if (camera) {
+      camera->setPosition(originalPos.x + offsetX, originalPos.y + offsetY);
+    }
+
+    // 渲染场景
+    outgoingScene_->renderContent(renderer);
+
+    // 恢复相机位置
+    if (camera) {
+      camera->setPosition(originalPos);
+    }
+  }
+
+  // 渲染目标场景（滑入）
+  if (incomingScene_) {
+    float offsetX = 0.0f;
+    float offsetY = 0.0f;
+
+    switch (direction_) {
+    case TransitionDirection::Left:
+      offsetX = screenWidth * (1.0f - progress);
+      break;
+    case TransitionDirection::Right:
+      offsetX = -screenWidth * (1.0f - progress);
+      break;
+    case TransitionDirection::Up:
+      offsetY = screenHeight * (1.0f - progress);
+      break;
+    case TransitionDirection::Down:
+      offsetY = -screenHeight * (1.0f - progress);
+      break;
+    }
+
+    // 保存原始相机位置
+    Camera *camera = incomingScene_->getActiveCamera();
+    Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
+
+    // 应用偏移
+    if (camera) {
+      camera->setPosition(originalPos.x + offsetX, originalPos.y + offsetY);
+    }
+
+    // 渲染场景
+    incomingScene_->renderContent(renderer);
+
+    // 恢复相机位置
+    if (camera) {
+      camera->setPosition(originalPos);
+    }
+  }
+}
+
+// ============================================================================
+// ScaleTransition - 缩放
+// ============================================================================
+ScaleTransition::ScaleTransition(float duration) : Transition(duration) {}
+
+void ScaleTransition::onRenderTransition(RenderBackend &renderer,
+                                         float progress) {
+  // 源场景：缩小消失
+  if (outgoingScene_) {
+    float scale = std::max(0.01f, 1.0f - progress);
+
+    // 保存原始相机状态
+    Camera *camera = outgoingScene_->getActiveCamera();
+    float originalZoom = camera ? camera->getZoom() : 1.0f;
+    Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
+
+    // 应用缩放（通过调整相机 zoom 实现）
+    if (camera) {
+      camera->setZoom(originalZoom * scale);
+    }
+
+    // 渲染场景
+    outgoingScene_->renderContent(renderer);
+
+    // 恢复相机状态
+    if (camera) {
+      camera->setZoom(originalZoom);
+      camera->setPosition(originalPos);
+    }
+  }
+
+  // 目标场景：放大出现
+  if (incomingScene_) {
+    float scale = std::max(0.01f, progress);
+
+    // 保存原始相机状态
+    Camera *camera = incomingScene_->getActiveCamera();
+    float originalZoom = camera ? camera->getZoom() : 1.0f;
+    Vec2 originalPos = camera ? camera->getPosition() : Vec2::Zero();
+
+    // 应用缩放
+    if (camera) {
+      camera->setZoom(originalZoom * scale);
+    }
+
+    // 渲染场景
+    incomingScene_->renderContent(renderer);
+
+    // 恢复相机状态
+    if (camera) {
+      camera->setZoom(originalZoom);
+      camera->setPosition(originalPos);
+    }
+  }
+}
+
+// ============================================================================
+// FlipTransition - 翻页
+// ============================================================================
+FlipTransition::FlipTransition(float duration, Axis axis)
+    : Transition(duration), axis_(axis) {}
+
+void FlipTransition::onRenderTransition(RenderBackend &renderer,
+                                        float progress) {
+  float angle = progress * PI_F; // 180度翻转
+
+  if (progress < 0.5f) {
+    // 前半段：翻转源场景
+    if (outgoingScene_) {
+      float currentAngle = angle;
+
+      // 保存原始相机状态
+      Camera *camera = outgoingScene_->getActiveCamera();
+      float originalRotation = camera ? camera->getRotation() : 0.0f;
+
+      // 应用旋转（水平翻转绕Y轴，垂直翻转绕X轴）
+      if (axis_ == Axis::Horizontal) {
+        // 水平轴翻转 - 模拟绕X轴旋转
+        if (camera) {
+          camera->setRotation(originalRotation + currentAngle * RAD_TO_DEG);
+        }
+      } else {
+        // 垂直轴翻转 - 模拟绕Y轴旋转
+        if (camera) {
+          camera->setRotation(originalRotation - currentAngle * RAD_TO_DEG);
+        }
+      }
+
+      // 渲染场景
+      outgoingScene_->renderContent(renderer);
+
+      // 恢复相机状态
+      if (camera) {
+        camera->setRotation(originalRotation);
+      }
+    }
+  } else {
+    // 后半段：翻转目标场景
+    if (incomingScene_) {
+      float currentAngle = angle - PI_F;
+
+      // 保存原始相机状态
+      Camera *camera = incomingScene_->getActiveCamera();
+      float originalRotation = camera ? camera->getRotation() : 0.0f;
+
+      // 应用旋转
+      if (axis_ == Axis::Horizontal) {
+        if (camera) {
+          camera->setRotation(originalRotation + currentAngle * RAD_TO_DEG);
+        }
+      } else {
+        if (camera) {
+          camera->setRotation(originalRotation - currentAngle * RAD_TO_DEG);
+        }
+      }
+
+      // 渲染场景
+      incomingScene_->renderContent(renderer);
+
+      // 恢复相机状态
+      if (camera) {
+        camera->setRotation(originalRotation);
+      }
+    }
+  }
+}
+
+// ============================================================================
+// BoxTransition - 方块过渡
+// ============================================================================
+BoxTransition::BoxTransition(float duration, int divisions)
+    : Transition(duration), divisions_(divisions) {}
+
+void BoxTransition::onRenderTransition(RenderBackend &renderer,
+                                       float progress) {
+  float screenWidth = 800.0f;
+  float screenHeight = 600.0f;
+
+  if (incomingScene_) {
+    Size viewportSize = incomingScene_->getViewportSize();
+    if (viewportSize.width > 0 && viewportSize.height > 0) {
+      screenWidth = viewportSize.width;
+      screenHeight = viewportSize.height;
+    }
+  } else if (outgoingScene_) {
+    Size viewportSize = outgoingScene_->getViewportSize();
+    if (viewportSize.width > 0 && viewportSize.height > 0) {
+      screenWidth = viewportSize.width;
+      screenHeight = viewportSize.height;
+    }
+  }
+
+  if (incomingScene_) {
+    incomingScene_->renderContent(renderer);
+  } else if (outgoingScene_) {
+    outgoingScene_->renderContent(renderer);
+  } else {
+    return;
+  }
+
+  int div = std::max(1, divisions_);
+  int total = div * div;
+  int visible = std::clamp(static_cast<int>(total * progress), 0, total);
+
+  float cellW = screenWidth / static_cast<float>(div);
+  float cellH = screenHeight / static_cast<float>(div);
+  glm::mat4 overlayVP =
+      glm::ortho(0.0f, screenWidth, screenHeight, 0.0f, -1.0f, 1.0f);
+  renderer.setViewProjection(overlayVP);
+
+  for (int idx = visible; idx < total; ++idx) {
+    int x = idx % div;
+    int y = idx / div;
+    renderer.fillRect(Rect(x * cellW, y * cellH, cellW + 1.0f, cellH + 1.0f),
+                      Colors::Black);
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/script/script_engine.cpp b/Extra2D/src/script/script_engine.cpp
new file mode 100644
index 0000000..1a06e20
--- /dev/null
+++ b/Extra2D/src/script/script_engine.cpp
@@ -0,0 +1,187 @@
+#include <cstdarg>
+#include <extra2d/script/script_engine.h>
+#include <extra2d/script/sq_binding_action.h>
+#include <extra2d/script/sq_binding_animation.h>
+#include <extra2d/script/sq_binding_audio.h>
+#include <extra2d/script/sq_binding_input.h>
+#include <extra2d/script/sq_binding_node.h>
+#include <extra2d/script/sq_binding_types.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <sqstdaux.h>
+#include <sqstdblob.h>
+#include <sqstdio.h>
+#include <sqstdmath.h>
+#include <sqstdstring.h>
+#include <sstream>
+
+namespace extra2d {
+
+ScriptEngine &ScriptEngine::getInstance() {
+  static ScriptEngine instance;
+  return instance;
+}
+
+ScriptEngine::~ScriptEngine() { shutdown(); }
+
+bool ScriptEngine::initialize() {
+  if (vm_)
+    return true;
+
+  vm_ = sq_open(1024);
+  if (!vm_) {
+    E2D_ERROR("ScriptEngine: failed to create Squirrel VM");
+    return false;
+  }
+
+  sq_setprintfunc(vm_, printFunc, errorFunc);
+  sq_setcompilererrorhandler(vm_, compilerError);
+
+  sq_pushroottable(vm_);
+
+  // Register standard libraries
+  sqstd_register_mathlib(vm_);
+  sqstd_register_stringlib(vm_);
+  sqstd_register_bloblib(vm_);
+  sqstd_register_iolib(vm_);
+
+  // Set error handler
+  sq_newclosure(vm_, errorHandler, 0);
+  sq_seterrorhandler(vm_);
+
+  sq_pop(vm_, 1); // pop root table
+
+  // Register Easy2D bindings
+  sq::registerValueTypes(vm_);
+  sq::registerNodeBindings(vm_);
+  sq::registerInputBindings(vm_);
+  sq::registerActionBindings(vm_);
+  sq::registerAudioBindings(vm_);
+  sq::registerAnimationBindings(vm_);
+
+  // Register global log function
+  sq_pushroottable(vm_);
+  sq_pushstring(vm_, "log", -1);
+  sq_newclosure(
+      vm_,
+      [](HSQUIRRELVM v) -> SQInteger {
+        const SQChar *msg = nullptr;
+        sq_getstring(v, 2, &msg);
+        if (msg)
+          E2D_INFO("[Script] {}", msg);
+        return 0;
+      },
+      0);
+  sq_newslot(vm_, -3, SQFalse);
+  sq_pop(vm_, 1);
+
+  E2D_INFO("ScriptEngine: Squirrel VM initialized (v{})", SQUIRREL_VERSION);
+  return true;
+}
+
+void ScriptEngine::shutdown() {
+  if (vm_) {
+    sq_close(vm_);
+    vm_ = nullptr;
+    E2D_INFO("ScriptEngine: Squirrel VM shut down");
+  }
+}
+
+bool ScriptEngine::executeString(const std::string &code) {
+  if (!vm_) {
+    E2D_ERROR("ScriptEngine: VM not initialized");
+    return false;
+  }
+  return compileAndRun(code, "<string>");
+}
+
+bool ScriptEngine::executeFile(const std::string &filepath) {
+  if (!vm_) {
+    E2D_ERROR("ScriptEngine: VM not initialized");
+    return false;
+  }
+
+  std::ifstream file(filepath);
+  if (!file.is_open()) {
+    E2D_ERROR("ScriptEngine: cannot open file '{}'", filepath);
+    return false;
+  }
+
+  std::ostringstream ss;
+  ss << file.rdbuf();
+  return compileAndRun(ss.str(), filepath);
+}
+
+bool ScriptEngine::compileAndRun(const std::string &source,
+                                 const std::string &sourceName) {
+  SQInteger top = sq_gettop(vm_);
+
+  sq_pushroottable(vm_);
+
+  if (SQ_FAILED(sq_compilebuffer(vm_, source.c_str(),
+                                 static_cast<SQInteger>(source.size()),
+                                 sourceName.c_str(), SQTrue))) {
+    sq_settop(vm_, top);
+    return false;
+  }
+
+  sq_push(vm_, -2); // push root table as 'this'
+
+  if (SQ_FAILED(sq_call(vm_, 1, SQFalse, SQTrue))) {
+    sq_settop(vm_, top);
+    return false;
+  }
+
+  sq_settop(vm_, top);
+  return true;
+}
+
+void ScriptEngine::printFunc(HSQUIRRELVM, const SQChar *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  char buf[2048];
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
+  E2D_INFO("[Squirrel] {}", buf);
+}
+
+void ScriptEngine::errorFunc(HSQUIRRELVM, const SQChar *fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  char buf[2048];
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
+  E2D_ERROR("[Squirrel] {}", buf);
+}
+
+SQInteger ScriptEngine::errorHandler(HSQUIRRELVM vm) {
+  const SQChar *errMsg = nullptr;
+  if (sq_gettop(vm) >= 1) {
+    if (SQ_FAILED(sq_getstring(vm, 2, &errMsg))) {
+      errMsg = "unknown error";
+    }
+  }
+
+  // Print call stack
+  SQStackInfos si;
+  SQInteger level = 1;
+  E2D_ERROR("[Squirrel] Runtime error: {}", errMsg ? errMsg : "unknown");
+
+  while (SQ_SUCCEEDED(sq_stackinfos(vm, level, &si))) {
+    const SQChar *fn = si.funcname ? si.funcname : "unknown";
+    const SQChar *src = si.source ? si.source : "unknown";
+    E2D_ERROR("  [{}] {}:{} in {}", level, src, si.line, fn);
+    ++level;
+  }
+
+  return 0;
+}
+
+void ScriptEngine::compilerError(HSQUIRRELVM, const SQChar *desc,
+                                 const SQChar *source, SQInteger line,
+                                 SQInteger column) {
+  E2D_ERROR("[Squirrel] Compile error: {}:{}:{}: {}", source, line, column,
+            desc);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/script/script_node.cpp b/Extra2D/src/script/script_node.cpp
new file mode 100644
index 0000000..8ff0e67
--- /dev/null
+++ b/Extra2D/src/script/script_node.cpp
@@ -0,0 +1,202 @@
+#include <extra2d/script/script_node.h>
+#include <extra2d/script/sq_binding.h>
+#include <extra2d/script/sq_binding_node.h>
+#include <extra2d/utils/logger.h>
+#include <fstream>
+#include <sstream>
+
+namespace extra2d {
+
+// SqClassName needed for pushPtr<Node> which ScriptNode inherits
+namespace sq {
+// Already defined in sq_binding_node.cpp, but we need it here for pushPtr
+template <> struct SqClassName<Node> {
+  static const char *name() { return "Node"; }
+};
+} // namespace sq
+
+ScriptNode::ScriptNode() { sq_resetobject(&scriptTable_); }
+
+ScriptNode::~ScriptNode() {
+  if (tableValid_) {
+    auto &engine = ScriptEngine::getInstance();
+    if (engine.isInitialized()) {
+      sq_release(engine.getVM(), &scriptTable_);
+    }
+    tableValid_ = false;
+  }
+}
+
+Ptr<ScriptNode> ScriptNode::create(const std::string &scriptPath) {
+  auto node = makePtr<ScriptNode>();
+  if (!node->loadScript(scriptPath)) {
+    E2D_ERROR("ScriptNode: failed to load '{}'", scriptPath);
+  }
+  return node;
+}
+
+bool ScriptNode::loadScript(const std::string &scriptPath) {
+  scriptPath_ = scriptPath;
+
+  auto &engine = ScriptEngine::getInstance();
+  if (!engine.isInitialized()) {
+    E2D_ERROR("ScriptNode: ScriptEngine not initialized");
+    return false;
+  }
+
+  HSQUIRRELVM vm = engine.getVM();
+
+  // Read file
+  std::ifstream file(scriptPath);
+  if (!file.is_open()) {
+    E2D_ERROR("ScriptNode: cannot open '{}'", scriptPath);
+    return false;
+  }
+  std::ostringstream ss;
+  ss << file.rdbuf();
+  std::string source = ss.str();
+
+  SQInteger top = sq_gettop(vm);
+
+  // Compile
+  sq_pushroottable(vm);
+  if (SQ_FAILED(sq_compilebuffer(vm, source.c_str(),
+                                 static_cast<SQInteger>(source.size()),
+                                 scriptPath.c_str(), SQTrue))) {
+    sq_settop(vm, top);
+    return false;
+  }
+
+  sq_push(vm, -2); // root table as 'this'
+
+  // Execute — expect a return value (the table)
+  if (SQ_FAILED(sq_call(vm, 1, SQTrue, SQTrue))) {
+    sq_settop(vm, top);
+    return false;
+  }
+
+  // Check if return value is a table
+  if (sq_gettype(vm, -1) == OT_TABLE) {
+    sq_getstackobj(vm, -1, &scriptTable_);
+    sq_addref(vm, &scriptTable_);
+    tableValid_ = true;
+  } else {
+    E2D_WARN("ScriptNode: '{}' did not return a table", scriptPath);
+  }
+
+  sq_settop(vm, top);
+  return tableValid_;
+}
+
+void ScriptNode::onEnter() {
+  Node::onEnter();
+  if (tableValid_) {
+    auto &engine = ScriptEngine::getInstance();
+    HSQUIRRELVM vm = engine.getVM();
+    SQInteger top = sq_gettop(vm);
+
+    sq_pushobject(vm, scriptTable_);
+    sq_pushstring(vm, "onEnter", -1);
+    if (SQ_SUCCEEDED(sq_get(vm, -2))) {
+      sq_pushobject(vm, scriptTable_); // 'this' = script table
+      pushSelf();                      // arg: node
+      sq_call(vm, 2, SQFalse, SQTrue);
+      sq_pop(vm, 1); // pop closure
+    }
+
+    sq_settop(vm, top);
+  }
+}
+
+void ScriptNode::onExit() {
+  if (tableValid_) {
+    auto &engine = ScriptEngine::getInstance();
+    HSQUIRRELVM vm = engine.getVM();
+    SQInteger top = sq_gettop(vm);
+
+    sq_pushobject(vm, scriptTable_);
+    sq_pushstring(vm, "onExit", -1);
+    if (SQ_SUCCEEDED(sq_get(vm, -2))) {
+      sq_pushobject(vm, scriptTable_);
+      pushSelf();
+      sq_call(vm, 2, SQFalse, SQTrue);
+      sq_pop(vm, 1);
+    }
+
+    sq_settop(vm, top);
+  }
+  Node::onExit();
+}
+
+void ScriptNode::onUpdate(float dt) {
+  Node::onUpdate(dt);
+  if (tableValid_) {
+    auto &engine = ScriptEngine::getInstance();
+    HSQUIRRELVM vm = engine.getVM();
+    SQInteger top = sq_gettop(vm);
+
+    sq_pushobject(vm, scriptTable_);
+    sq_pushstring(vm, "onUpdate", -1);
+    if (SQ_SUCCEEDED(sq_get(vm, -2))) {
+      sq_pushobject(vm, scriptTable_);
+      pushSelf();
+      sq_pushfloat(vm, dt);
+      sq_call(vm, 3, SQFalse, SQTrue);
+      sq_pop(vm, 1);
+    }
+
+    sq_settop(vm, top);
+  }
+}
+
+void ScriptNode::pushSelf() {
+  auto &engine = ScriptEngine::getInstance();
+  HSQUIRRELVM vm = engine.getVM();
+
+  // Push this node as a Node instance with shared_ptr
+  auto self = std::dynamic_pointer_cast<Node>(shared_from_this());
+  sq::pushPtr(vm, self);
+}
+
+bool ScriptNode::callMethod(const char *name) {
+  if (!tableValid_)
+    return false;
+  auto &engine = ScriptEngine::getInstance();
+  HSQUIRRELVM vm = engine.getVM();
+  SQInteger top = sq_gettop(vm);
+
+  sq_pushobject(vm, scriptTable_);
+  sq_pushstring(vm, name, -1);
+  if (SQ_FAILED(sq_get(vm, -2))) {
+    sq_settop(vm, top);
+    return false;
+  }
+  sq_pushobject(vm, scriptTable_);
+  pushSelf();
+  bool ok = SQ_SUCCEEDED(sq_call(vm, 2, SQFalse, SQTrue));
+  sq_settop(vm, top);
+  return ok;
+}
+
+bool ScriptNode::callMethodWithFloat(const char *name, float arg) {
+  if (!tableValid_)
+    return false;
+  auto &engine = ScriptEngine::getInstance();
+  HSQUIRRELVM vm = engine.getVM();
+  SQInteger top = sq_gettop(vm);
+
+  sq_pushobject(vm, scriptTable_);
+  sq_pushstring(vm, name, -1);
+  if (SQ_FAILED(sq_get(vm, -2))) {
+    sq_settop(vm, top);
+    return false;
+  }
+  sq_pushobject(vm, scriptTable_);
+  pushSelf();
+  sq_pushfloat(vm, arg);
+  bool ok = SQ_SUCCEEDED(sq_call(vm, 3, SQFalse, SQTrue));
+  sq_settop(vm, top);
+  return ok;
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/script/sq_binding_action.cpp b/Extra2D/src/script/sq_binding_action.cpp
new file mode 100644
index 0000000..4f0e13a
--- /dev/null
+++ b/Extra2D/src/script/sq_binding_action.cpp
@@ -0,0 +1,222 @@
+#include <extra2d/action/action.h>
+#include <extra2d/action/actions.h>
+#include <extra2d/script/sq_binding_action.h>
+#include <extra2d/script/sq_binding_types.h>
+
+namespace extra2d {
+namespace sq {
+
+// Actions are stored as Ptr<Action> in userdata (they use raw new in C++ API
+// but we wrap them in shared_ptr for the script bridge)
+
+template <> struct SqClassName<Action> {
+  static const char *name() { return "Action"; }
+};
+
+// Helper: wrap a raw Action* into Ptr<Action> and push it
+static void pushAction(HSQUIRRELVM vm, Action *raw) {
+  Ptr<Action> ptr(raw);
+
+  sq_pushroottable(vm);
+  sq_pushstring(vm, "Action", -1);
+  if (SQ_FAILED(sq_get(vm, -2))) {
+    sq_pop(vm, 1);
+    sq_pushnull(vm);
+    return;
+  }
+  if (SQ_FAILED(sq_createinstance(vm, -1))) {
+    sq_pop(vm, 2);
+    sq_pushnull(vm);
+    return;
+  }
+
+  auto *storage = new Ptr<Action>(std::move(ptr));
+  sq_setinstanceup(vm, -1, storage);
+  sq_setreleasehook(vm, -1, [](SQUserPointer p, SQInteger) -> SQInteger {
+    delete static_cast<Ptr<Action> *>(p);
+    return 0;
+  });
+
+  sq_remove(vm, -2); // class
+  sq_remove(vm, -2); // roottable
+}
+
+static Ptr<Action> getAction(HSQUIRRELVM vm, SQInteger idx) {
+  SQUserPointer up = nullptr;
+  sq_getinstanceup(vm, idx, &up, nullptr, SQFalse);
+  if (!up)
+    return nullptr;
+  return *static_cast<Ptr<Action> *>(up);
+}
+
+// ============================================================================
+// Factory functions (registered as global functions)
+// ============================================================================
+static SQInteger sqMoveTo(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  Vec2 *pos = getValueInstance<Vec2>(vm, 3);
+  if (!pos)
+    return sq_throwerror(vm, "expected Vec2");
+  pushAction(vm, new MoveTo(dur, *pos));
+  return 1;
+}
+
+static SQInteger sqMoveBy(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  Vec2 *delta = getValueInstance<Vec2>(vm, 3);
+  if (!delta)
+    return sq_throwerror(vm, "expected Vec2");
+  pushAction(vm, new MoveBy(dur, *delta));
+  return 1;
+}
+
+static SQInteger sqScaleTo(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 4) {
+    float sx = static_cast<float>(getFloat(vm, 3));
+    float sy = static_cast<float>(getFloat(vm, 4));
+    pushAction(vm, new ScaleTo(dur, sx, sy));
+  } else {
+    float s = static_cast<float>(getFloat(vm, 3));
+    pushAction(vm, new ScaleTo(dur, s));
+  }
+  return 1;
+}
+
+static SQInteger sqRotateTo(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  float angle = static_cast<float>(getFloat(vm, 3));
+  pushAction(vm, new RotateTo(dur, angle));
+  return 1;
+}
+
+static SQInteger sqRotateBy(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  float angle = static_cast<float>(getFloat(vm, 3));
+  pushAction(vm, new RotateBy(dur, angle));
+  return 1;
+}
+
+static SQInteger sqFadeIn(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  pushAction(vm, new FadeIn(dur));
+  return 1;
+}
+
+static SQInteger sqFadeOut(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  pushAction(vm, new FadeOut(dur));
+  return 1;
+}
+
+static SQInteger sqFadeTo(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  float opacity = static_cast<float>(getFloat(vm, 3));
+  pushAction(vm, new FadeTo(dur, opacity));
+  return 1;
+}
+
+static SQInteger sqDelay(HSQUIRRELVM vm) {
+  float dur = static_cast<float>(getFloat(vm, 2));
+  pushAction(vm, new Delay(dur));
+  return 1;
+}
+
+static SQInteger sqSequence(HSQUIRRELVM vm) {
+  // arg 2 is an array of actions
+  SQInteger size = sq_getsize(vm, 2);
+  std::vector<Action *> actions;
+  actions.reserve(size);
+  for (SQInteger i = 0; i < size; ++i) {
+    sq_pushinteger(vm, i);
+    sq_get(vm, 2);
+    auto a = getAction(vm, -1);
+    if (a)
+      actions.push_back(a->clone());
+    sq_pop(vm, 1);
+  }
+  if (actions.empty())
+    return sq_throwerror(vm, "empty sequence");
+  pushAction(vm, new Sequence(actions));
+  return 1;
+}
+
+static SQInteger sqSpawn(HSQUIRRELVM vm) {
+  SQInteger size = sq_getsize(vm, 2);
+  std::vector<Action *> actions;
+  actions.reserve(size);
+  for (SQInteger i = 0; i < size; ++i) {
+    sq_pushinteger(vm, i);
+    sq_get(vm, 2);
+    auto a = getAction(vm, -1);
+    if (a)
+      actions.push_back(a->clone());
+    sq_pop(vm, 1);
+  }
+  if (actions.empty())
+    return sq_throwerror(vm, "empty spawn");
+  pushAction(vm, new Spawn(actions));
+  return 1;
+}
+
+static SQInteger sqLoop(HSQUIRRELVM vm) {
+  auto a = getAction(vm, 2);
+  if (!a)
+    return sq_throwerror(vm, "null action");
+  int times = -1;
+  if (sq_gettop(vm) >= 3)
+    times = static_cast<int>(getInt(vm, 3));
+  pushAction(vm, new Loop(a->clone(), times));
+  return 1;
+}
+
+static SQInteger sqCallFunc(HSQUIRRELVM vm) {
+  // arg 2 is a Squirrel closure
+  HSQOBJECT closure;
+  sq_resetobject(&closure);
+  sq_getstackobj(vm, 2, &closure);
+  sq_addref(vm, &closure);
+
+  HSQUIRRELVM capturedVM = vm;
+  HSQOBJECT capturedClosure = closure;
+
+  pushAction(vm, new CallFunc([capturedVM, capturedClosure]() mutable {
+               sq_pushobject(capturedVM, capturedClosure);
+               sq_pushroottable(capturedVM);
+               sq_call(capturedVM, 1, SQFalse, SQTrue);
+               sq_pop(capturedVM, 1); // pop closure
+             }));
+  return 1;
+}
+
+void registerActionBindings(HSQUIRRELVM vm) {
+  // Base Action class (used as container)
+  ClassDef(vm, "Action").setTypeTag(typeTag<Action>()).commit();
+
+  // Register global factory functions
+  auto regFunc = [&](const char *name, SQFUNCTION fn) {
+    sq_pushroottable(vm);
+    sq_pushstring(vm, name, -1);
+    sq_newclosure(vm, fn, 0);
+    sq_newslot(vm, -3, SQFalse);
+    sq_pop(vm, 1);
+  };
+
+  regFunc("MoveTo", sqMoveTo);
+  regFunc("MoveBy", sqMoveBy);
+  regFunc("ScaleTo", sqScaleTo);
+  regFunc("RotateTo", sqRotateTo);
+  regFunc("RotateBy", sqRotateBy);
+  regFunc("FadeIn", sqFadeIn);
+  regFunc("FadeOut", sqFadeOut);
+  regFunc("FadeTo", sqFadeTo);
+  regFunc("Delay", sqDelay);
+  regFunc("Sequence", sqSequence);
+  regFunc("Spawn", sqSpawn);
+  regFunc("Loop", sqLoop);
+  regFunc("CallFunc", sqCallFunc);
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/src/script/sq_binding_animation.cpp b/Extra2D/src/script/sq_binding_animation.cpp
new file mode 100644
index 0000000..685fb9d
--- /dev/null
+++ b/Extra2D/src/script/sq_binding_animation.cpp
@@ -0,0 +1,277 @@
+#include <extra2d/animation/animated_sprite.h>
+#include <extra2d/animation/animation_cache.h>
+#include <extra2d/animation/animation_clip.h>
+#include <extra2d/app/application.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/resource/resource_manager.h>
+#include <extra2d/script/sq_binding_animation.h>
+#include <extra2d/script/sq_binding_node.h>
+#include <extra2d/script/sq_binding_types.h>
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+namespace sq {
+
+// SqClassName specialization for AnimatedSprite
+template <> struct SqClassName<AnimatedSprite> {
+  static const char *name() { return "AnimatedSprite"; }
+};
+
+// AnimatedSprite inherits Sprite -> Node, all stored as Ptr<Node>
+
+// 从精灵图创建 AnimatedSprite（网格布局）
+// AnimatedSprite.createFromGrid(texturePath, frameWidth, frameHeight,
+// frameDurationMs, frameCount)
+static SQInteger animSpriteCreateFromGrid(HSQUIRRELVM vm) {
+  SQInteger argc = sq_gettop(vm);
+  if (argc < 4) {
+    return sq_throwerror(vm, "createFromGrid requires at least 3 arguments: "
+                             "texturePath, frameWidth, frameHeight");
+  }
+
+  std::string path = getString(vm, 2);
+  int frameWidth = static_cast<int>(getInt(vm, 3));
+  int frameHeight = static_cast<int>(getInt(vm, 4));
+
+  float frameDurationMs = 100.0f;
+  if (argc >= 5) {
+    frameDurationMs = static_cast<float>(getFloat(vm, 5));
+  }
+
+  int frameCount = -1;
+  if (argc >= 6) {
+    frameCount = static_cast<int>(getInt(vm, 6));
+  }
+
+  // 加载纹理
+  auto &resources = Application::instance().resources();
+  auto texture = resources.loadTexture(path);
+  if (!texture) {
+    E2D_ERROR("Failed to load texture: {}", path);
+    pushNull(vm);
+    return 1;
+  }
+
+  // 创建动画片段
+  auto clip = AnimationClip::createFromGrid(texture, frameWidth, frameHeight,
+                                            frameDurationMs, frameCount);
+  if (!clip || clip->empty()) {
+    E2D_ERROR("Failed to create animation clip from grid");
+    pushNull(vm);
+    return 1;
+  }
+  clip->setLooping(true);
+
+  // 创建 AnimatedSprite
+  auto sprite = AnimatedSprite::create(clip);
+  sprite->setApplyFrameTransform(false);
+
+  pushPtr<AnimatedSprite>(vm, sprite);
+  return 1;
+}
+
+static SQInteger animSpriteCreate(HSQUIRRELVM vm) {
+  SQInteger argc = sq_gettop(vm);
+  Ptr<AnimatedSprite> sprite;
+  if (argc >= 2 && sq_gettype(vm, 2) == OT_STRING) {
+    std::string path = getString(vm, 2);
+    sprite = AnimatedSprite::create(path);
+  } else {
+    sprite = AnimatedSprite::create();
+  }
+  pushPtr<AnimatedSprite>(vm, sprite);
+  return 1;
+}
+
+static SQInteger animSpritePlay(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 2 && sq_gettype(vm, 2) == OT_STRING) {
+    std::string name = getString(vm, 2);
+    bool loop = true;
+    if (argc >= 3)
+      loop = getBool(vm, 3);
+    anim->play(name, loop);
+  } else {
+    anim->play();
+  }
+  return 0;
+}
+
+static SQInteger animSpritePause(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->pause();
+  return 0;
+}
+
+static SQInteger animSpriteResume(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->resume();
+  return 0;
+}
+
+static SQInteger animSpriteStop(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->stop();
+  return 0;
+}
+
+static SQInteger animSpriteReset(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->reset();
+  return 0;
+}
+
+static SQInteger animSpriteIsPlaying(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  push(vm, anim->isPlaying());
+  return 1;
+}
+
+static SQInteger animSpriteSetLooping(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->setLooping(getBool(vm, 2));
+  return 0;
+}
+
+static SQInteger animSpriteSetPlaybackSpeed(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->setPlaybackSpeed(static_cast<float>(getFloat(vm, 2)));
+  return 0;
+}
+
+static SQInteger animSpriteAddAnimation(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  std::string name = getString(vm, 2);
+  std::string path = getString(vm, 3);
+  auto clip = AnimationCache::getInstance().loadClip(path);
+  if (clip)
+    anim->addAnimation(name, clip);
+  return 0;
+}
+
+static SQInteger animSpriteLoadAnimation(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  std::string path = getString(vm, 2);
+  anim->loadAnimation(path);
+  return 0;
+}
+
+static SQInteger animSpriteSetAutoPlay(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->setAutoPlay(getBool(vm, 2));
+  return 0;
+}
+
+static SQInteger animSpriteGetCurrentFrameIndex(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  push(vm, static_cast<int>(anim->getCurrentFrameIndex()));
+  return 1;
+}
+
+static SQInteger animSpriteGetTotalFrames(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  push(vm, static_cast<int>(anim->getTotalFrames()));
+  return 1;
+}
+
+static SQInteger animSpriteSetFrameRange(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  int start = static_cast<int>(getInt(vm, 2));
+  int end = -1;
+  if (sq_gettop(vm) >= 3) {
+    end = static_cast<int>(getInt(vm, 3));
+  }
+  anim->setFrameRange(start, end);
+  return 0;
+}
+
+static SQInteger animSpriteSetFrameIndex(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  int index = static_cast<int>(getInt(vm, 2));
+  anim->setFrameIndex(static_cast<size_t>(index));
+  return 0;
+}
+
+static SQInteger animSpriteSetApplyFrameTransform(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *anim = dynamic_cast<AnimatedSprite *>(node.get());
+  if (!anim)
+    return sq_throwerror(vm, "not an AnimatedSprite");
+  anim->setApplyFrameTransform(getBool(vm, 2));
+  return 0;
+}
+
+void registerAnimationBindings(HSQUIRRELVM vm) {
+  // Register SqClassName for AnimatedSprite
+  ClassDef(vm, "AnimatedSprite", "Sprite")
+      .setTypeTag(typeTag<AnimatedSprite>())
+      .staticMethod("create", animSpriteCreate)
+      .staticMethod("createFromGrid", animSpriteCreateFromGrid)
+      .method("play", animSpritePlay)
+      .method("pause", animSpritePause)
+      .method("resume", animSpriteResume)
+      .method("stop", animSpriteStop)
+      .method("reset", animSpriteReset)
+      .method("isPlaying", animSpriteIsPlaying)
+      .method("setLooping", animSpriteSetLooping)
+      .method("setPlaybackSpeed", animSpriteSetPlaybackSpeed)
+      .method("addAnimation", animSpriteAddAnimation)
+      .method("loadAnimation", animSpriteLoadAnimation)
+      .method("setAutoPlay", animSpriteSetAutoPlay)
+      .method("getCurrentFrameIndex", animSpriteGetCurrentFrameIndex)
+      .method("getTotalFrames", animSpriteGetTotalFrames)
+      .method("setFrameRange", animSpriteSetFrameRange)
+      .method("setFrameIndex", animSpriteSetFrameIndex)
+      .method("setApplyFrameTransform", animSpriteSetApplyFrameTransform)
+      .commit();
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/src/script/sq_binding_audio.cpp b/Extra2D/src/script/sq_binding_audio.cpp
new file mode 100644
index 0000000..3c6f866
--- /dev/null
+++ b/Extra2D/src/script/sq_binding_audio.cpp
@@ -0,0 +1,91 @@
+#include <extra2d/audio/audio_engine.h>
+#include <extra2d/audio/sound.h>
+#include <extra2d/script/sq_binding_audio.h>
+#include <extra2d/script/sq_binding_types.h>
+
+namespace extra2d {
+namespace sq {
+
+// ============================================================================
+// AudioEngine singleton
+// ============================================================================
+static SQInteger audioLoadSound(HSQUIRRELVM vm) {
+  SQInteger argc = sq_gettop(vm);
+  std::shared_ptr<Sound> snd;
+  if (argc >= 3) {
+    std::string name = getString(vm, 2);
+    std::string path = getString(vm, 3);
+    snd = AudioEngine::getInstance().loadSound(name, path);
+  } else {
+    std::string path = getString(vm, 2);
+    snd = AudioEngine::getInstance().loadSound(path);
+  }
+  push(vm, snd != nullptr);
+  return 1;
+}
+
+static SQInteger audioPlaySound(HSQUIRRELVM vm) {
+  std::string name = getString(vm, 2);
+  auto snd = AudioEngine::getInstance().getSound(name);
+  if (snd)
+    snd->play();
+  return 0;
+}
+
+static SQInteger audioStopSound(HSQUIRRELVM vm) {
+  std::string name = getString(vm, 2);
+  auto snd = AudioEngine::getInstance().getSound(name);
+  if (snd)
+    snd->stop();
+  return 0;
+}
+
+static SQInteger audioSetMasterVolume(HSQUIRRELVM vm) {
+  float vol = static_cast<float>(getFloat(vm, 2));
+  AudioEngine::getInstance().setMasterVolume(vol);
+  return 0;
+}
+
+static SQInteger audioGetMasterVolume(HSQUIRRELVM vm) {
+  push(vm, AudioEngine::getInstance().getMasterVolume());
+  return 1;
+}
+
+static SQInteger audioStopAll(HSQUIRRELVM vm) {
+  AudioEngine::getInstance().stopAll();
+  return 0;
+}
+
+static SQInteger audioPauseAll(HSQUIRRELVM vm) {
+  AudioEngine::getInstance().pauseAll();
+  return 0;
+}
+
+static SQInteger audioResumeAll(HSQUIRRELVM vm) {
+  AudioEngine::getInstance().resumeAll();
+  return 0;
+}
+
+void registerAudioBindings(HSQUIRRELVM vm) {
+  ClassDef(vm, "AudioEngineClass")
+      .method("loadSound", audioLoadSound)
+      .method("playSound", audioPlaySound)
+      .method("stopSound", audioStopSound)
+      .method("setMasterVolume", audioSetMasterVolume)
+      .method("getMasterVolume", audioGetMasterVolume)
+      .method("stopAll", audioStopAll)
+      .method("pauseAll", audioPauseAll)
+      .method("resumeAll", audioResumeAll)
+      .commit();
+
+  // Global "Audio" instance
+  pushSingleton(vm, &AudioEngine::getInstance(), "AudioEngineClass");
+  sq_pushroottable(vm);
+  sq_pushstring(vm, "Audio", -1);
+  sq_push(vm, -3);
+  sq_newslot(vm, -3, SQFalse);
+  sq_pop(vm, 2);
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/src/script/sq_binding_input.cpp b/Extra2D/src/script/sq_binding_input.cpp
new file mode 100644
index 0000000..e9df263
--- /dev/null
+++ b/Extra2D/src/script/sq_binding_input.cpp
@@ -0,0 +1,288 @@
+#include <extra2d/app/application.h>
+#include <extra2d/event/input_codes.h>
+#include <extra2d/platform/input.h>
+#include <extra2d/script/sq_binding_input.h>
+#include <extra2d/script/sq_binding_types.h>
+
+namespace extra2d {
+namespace sq {
+
+// ============================================================================
+// Input singleton bindings
+// ============================================================================
+static SQInteger inputIsKeyDown(HSQUIRRELVM vm) {
+  int key = static_cast<int>(getInt(vm, 2));
+  push(vm, Application::instance().input().isKeyDown(key));
+  return 1;
+}
+
+static SQInteger inputIsKeyPressed(HSQUIRRELVM vm) {
+  int key = static_cast<int>(getInt(vm, 2));
+  push(vm, Application::instance().input().isKeyPressed(key));
+  return 1;
+}
+
+static SQInteger inputIsKeyReleased(HSQUIRRELVM vm) {
+  int key = static_cast<int>(getInt(vm, 2));
+  push(vm, Application::instance().input().isKeyReleased(key));
+  return 1;
+}
+
+static SQInteger inputIsMouseDown(HSQUIRRELVM vm) {
+  int btn = static_cast<int>(getInt(vm, 2));
+  push(vm, Application::instance().input().isMouseDown(
+               static_cast<MouseButton>(btn)));
+  return 1;
+}
+
+static SQInteger inputIsMousePressed(HSQUIRRELVM vm) {
+  int btn = static_cast<int>(getInt(vm, 2));
+  push(vm, Application::instance().input().isMousePressed(
+               static_cast<MouseButton>(btn)));
+  return 1;
+}
+
+static SQInteger inputIsMouseReleased(HSQUIRRELVM vm) {
+  int btn = static_cast<int>(getInt(vm, 2));
+  push(vm, Application::instance().input().isMouseReleased(
+               static_cast<MouseButton>(btn)));
+  return 1;
+}
+
+static SQInteger inputGetMousePosition(HSQUIRRELVM vm) {
+  pushValueInstance(vm, Application::instance().input().getMousePosition());
+  return 1;
+}
+
+static SQInteger inputGetMouseDelta(HSQUIRRELVM vm) {
+  pushValueInstance(vm, Application::instance().input().getMouseDelta());
+  return 1;
+}
+
+static SQInteger inputGetMouseScroll(HSQUIRRELVM vm) {
+  push(vm, Application::instance().input().getMouseScroll());
+  return 1;
+}
+
+void registerInput(HSQUIRRELVM vm) {
+  ClassDef(vm, "InputClass")
+      .method("isKeyDown", inputIsKeyDown)
+      .method("isKeyPressed", inputIsKeyPressed)
+      .method("isKeyReleased", inputIsKeyReleased)
+      .method("isMouseDown", inputIsMouseDown)
+      .method("isMousePressed", inputIsMousePressed)
+      .method("isMouseReleased", inputIsMouseReleased)
+      .method("getMousePosition", inputGetMousePosition)
+      .method("getMouseDelta", inputGetMouseDelta)
+      .method("getMouseScroll", inputGetMouseScroll)
+      .commit();
+
+  // Global "Input" instance
+  pushSingleton(vm, &Application::instance().input(), "InputClass");
+  sq_pushroottable(vm);
+  sq_pushstring(vm, "Input", -1);
+  sq_push(vm, -3);
+  sq_newslot(vm, -3, SQFalse);
+  sq_pop(vm, 2);
+}
+
+void registerKeyConstants(HSQUIRRELVM vm) {
+  // Key constants table
+  static const char *const keyNames[] = {"Space",
+                                         "Apostrophe",
+                                         "Comma",
+                                         "Minus",
+                                         "Period",
+                                         "Slash",
+                                         "Num0",
+                                         "Num1",
+                                         "Num2",
+                                         "Num3",
+                                         "Num4",
+                                         "Num5",
+                                         "Num6",
+                                         "Num7",
+                                         "Num8",
+                                         "Num9",
+                                         "Semicolon",
+                                         "Equal",
+                                         "A",
+                                         "B",
+                                         "C",
+                                         "D",
+                                         "E",
+                                         "F",
+                                         "G",
+                                         "H",
+                                         "I",
+                                         "J",
+                                         "K",
+                                         "L",
+                                         "M",
+                                         "N",
+                                         "O",
+                                         "P",
+                                         "Q",
+                                         "R",
+                                         "S",
+                                         "T",
+                                         "U",
+                                         "V",
+                                         "W",
+                                         "X",
+                                         "Y",
+                                         "Z",
+                                         "LeftBracket",
+                                         "Backslash",
+                                         "RightBracket",
+                                         "GraveAccent",
+                                         "Escape",
+                                         "Enter",
+                                         "Tab",
+                                         "Backspace",
+                                         "Insert",
+                                         "Delete",
+                                         "Right",
+                                         "Left",
+                                         "Down",
+                                         "Up",
+                                         "PageUp",
+                                         "PageDown",
+                                         "Home",
+                                         "End",
+                                         "CapsLock",
+                                         "ScrollLock",
+                                         "NumLock",
+                                         "PrintScreen",
+                                         "Pause",
+                                         "F1",
+                                         "F2",
+                                         "F3",
+                                         "F4",
+                                         "F5",
+                                         "F6",
+                                         "F7",
+                                         "F8",
+                                         "F9",
+                                         "F10",
+                                         "F11",
+                                         "F12",
+                                         "LeftShift",
+                                         "LeftControl",
+                                         "LeftAlt",
+                                         "LeftSuper",
+                                         "RightShift",
+                                         "RightControl",
+                                         "RightAlt",
+                                         "RightSuper",
+                                         "Menu"};
+  static const SQInteger keyValues[] = {Key::Space,
+                                        Key::Apostrophe,
+                                        Key::Comma,
+                                        Key::Minus,
+                                        Key::Period,
+                                        Key::Slash,
+                                        Key::Num0,
+                                        Key::Num1,
+                                        Key::Num2,
+                                        Key::Num3,
+                                        Key::Num4,
+                                        Key::Num5,
+                                        Key::Num6,
+                                        Key::Num7,
+                                        Key::Num8,
+                                        Key::Num9,
+                                        Key::Semicolon,
+                                        Key::Equal,
+                                        Key::A,
+                                        Key::B,
+                                        Key::C,
+                                        Key::D,
+                                        Key::E,
+                                        Key::F,
+                                        Key::G,
+                                        Key::H,
+                                        Key::I,
+                                        Key::J,
+                                        Key::K,
+                                        Key::L,
+                                        Key::M,
+                                        Key::N,
+                                        Key::O,
+                                        Key::P,
+                                        Key::Q,
+                                        Key::R,
+                                        Key::S,
+                                        Key::T,
+                                        Key::U,
+                                        Key::V,
+                                        Key::W,
+                                        Key::X,
+                                        Key::Y,
+                                        Key::Z,
+                                        Key::LeftBracket,
+                                        Key::Backslash,
+                                        Key::RightBracket,
+                                        Key::GraveAccent,
+                                        Key::Escape,
+                                        Key::Enter,
+                                        Key::Tab,
+                                        Key::Backspace,
+                                        Key::Insert,
+                                        Key::Delete,
+                                        Key::Right,
+                                        Key::Left,
+                                        Key::Down,
+                                        Key::Up,
+                                        Key::PageUp,
+                                        Key::PageDown,
+                                        Key::Home,
+                                        Key::End,
+                                        Key::CapsLock,
+                                        Key::ScrollLock,
+                                        Key::NumLock,
+                                        Key::PrintScreen,
+                                        Key::Pause,
+                                        Key::F1,
+                                        Key::F2,
+                                        Key::F3,
+                                        Key::F4,
+                                        Key::F5,
+                                        Key::F6,
+                                        Key::F7,
+                                        Key::F8,
+                                        Key::F9,
+                                        Key::F10,
+                                        Key::F11,
+                                        Key::F12,
+                                        Key::LeftShift,
+                                        Key::LeftControl,
+                                        Key::LeftAlt,
+                                        Key::LeftSuper,
+                                        Key::RightShift,
+                                        Key::RightControl,
+                                        Key::RightAlt,
+                                        Key::RightSuper,
+                                        Key::Menu};
+
+  registerConstTable(vm, "Key", keyNames, keyValues,
+                     static_cast<int>(sizeof(keyNames) / sizeof(keyNames[0])));
+
+  // Mouse button constants
+  static const char *const mouseNames[] = {"Left", "Right", "Middle", "Button4",
+                                           "Button5"};
+  static const SQInteger mouseValues[] = {Mouse::ButtonLeft, Mouse::ButtonRight,
+                                          Mouse::ButtonMiddle, Mouse::Button4,
+                                          Mouse::Button5};
+  registerConstTable(
+      vm, "Mouse", mouseNames, mouseValues,
+      static_cast<int>(sizeof(mouseNames) / sizeof(mouseNames[0])));
+}
+
+void registerInputBindings(HSQUIRRELVM vm) {
+  registerInput(vm);
+  registerKeyConstants(vm);
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/src/script/sq_binding_node.cpp b/Extra2D/src/script/sq_binding_node.cpp
new file mode 100644
index 0000000..42b0674
--- /dev/null
+++ b/Extra2D/src/script/sq_binding_node.cpp
@@ -0,0 +1,561 @@
+#include <extra2d/app/application.h>
+#include <extra2d/graphics/texture.h>
+#include <extra2d/resource/resource_manager.h>
+#include <extra2d/scene/node.h>
+#include <extra2d/scene/scene.h>
+#include <extra2d/scene/scene_manager.h>
+#include <extra2d/scene/sprite.h>
+#include <extra2d/script/sq_binding_node.h>
+#include <extra2d/script/sq_binding_types.h>
+
+namespace extra2d {
+namespace sq {
+
+// SqClassName specializations
+template <> struct SqClassName<Node> {
+  static const char *name() { return "Node"; }
+};
+template <> struct SqClassName<Sprite> {
+  static const char *name() { return "Sprite"; }
+};
+template <> struct SqClassName<Scene> {
+  static const char *name() { return "Scene"; }
+};
+
+// ============================================================================
+// Node
+// ============================================================================
+static SQInteger nodeCreate(HSQUIRRELVM vm) {
+  auto node = makePtr<Node>();
+  pushPtr(vm, node);
+  return 1;
+}
+
+static SQInteger nodeSetPosition(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 3) {
+    float x = static_cast<float>(getFloat(vm, 2));
+    float y = static_cast<float>(getFloat(vm, 3));
+    node->setPosition(x, y);
+  } else {
+    Vec2 *v = getValueInstance<Vec2>(vm, 2);
+    if (v)
+      node->setPosition(*v);
+  }
+  return 0;
+}
+
+static SQInteger nodeGetPosition(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  pushValueInstance(vm, node->getPosition());
+  return 1;
+}
+
+static SQInteger nodeSetRotation(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->setRotation(static_cast<float>(getFloat(vm, 2)));
+  return 0;
+}
+
+static SQInteger nodeGetRotation(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  push(vm, node->getRotation());
+  return 1;
+}
+
+static SQInteger nodeSetScale(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 3) {
+    node->setScale(static_cast<float>(getFloat(vm, 2)),
+                   static_cast<float>(getFloat(vm, 3)));
+  } else {
+    // Could be float or Vec2
+    SQObjectType t = sq_gettype(vm, 2);
+    if (t == OT_INSTANCE) {
+      Vec2 *v = getValueInstance<Vec2>(vm, 2);
+      if (v)
+        node->setScale(*v);
+    } else {
+      node->setScale(static_cast<float>(getFloat(vm, 2)));
+    }
+  }
+  return 0;
+}
+
+static SQInteger nodeGetScale(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  pushValueInstance(vm, node->getScale());
+  return 1;
+}
+
+static SQInteger nodeSetAnchor(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 3) {
+    node->setAnchor(static_cast<float>(getFloat(vm, 2)),
+                    static_cast<float>(getFloat(vm, 3)));
+  } else {
+    Vec2 *v = getValueInstance<Vec2>(vm, 2);
+    if (v)
+      node->setAnchor(*v);
+  }
+  return 0;
+}
+
+static SQInteger nodeGetAnchor(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  pushValueInstance(vm, node->getAnchor());
+  return 1;
+}
+
+static SQInteger nodeSetOpacity(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->setOpacity(static_cast<float>(getFloat(vm, 2)));
+  return 0;
+}
+
+static SQInteger nodeGetOpacity(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  push(vm, node->getOpacity());
+  return 1;
+}
+
+static SQInteger nodeSetVisible(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->setVisible(getBool(vm, 2));
+  return 0;
+}
+
+static SQInteger nodeIsVisible(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  push(vm, node->isVisible());
+  return 1;
+}
+
+static SQInteger nodeSetZOrder(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->setZOrder(static_cast<int>(getInt(vm, 2)));
+  return 0;
+}
+
+static SQInteger nodeGetZOrder(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  push(vm, node->getZOrder());
+  return 1;
+}
+
+static SQInteger nodeSetName(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->setName(getString(vm, 2));
+  return 0;
+}
+
+static SQInteger nodeGetName(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  push(vm, node->getName());
+  return 1;
+}
+
+static SQInteger nodeSetTag(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->setTag(static_cast<int>(getInt(vm, 2)));
+  return 0;
+}
+
+static SQInteger nodeGetTag(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  push(vm, node->getTag());
+  return 1;
+}
+
+static SQInteger nodeAddChild(HSQUIRRELVM vm) {
+  auto parent = getPtr<Node>(vm, 1);
+  auto child = getPtr<Node>(vm, 2);
+  if (!parent || !child)
+    return sq_throwerror(vm, "null node");
+  parent->addChild(child);
+  return 0;
+}
+
+static SQInteger nodeRemoveFromParent(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->removeFromParent();
+  return 0;
+}
+
+static SQInteger nodeRemoveAllChildren(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->removeAllChildren();
+  return 0;
+}
+
+static SQInteger nodeGetChildByName(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  auto child = node->getChildByName(getString(vm, 2));
+  if (child)
+    pushPtr(vm, child);
+  else
+    pushNull(vm);
+  return 1;
+}
+
+static SQInteger nodeRunAction(HSQUIRRELVM vm) {
+  // Will be implemented in action bindings
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  // Get action pointer from userdata
+  SQUserPointer up = nullptr;
+  sq_getinstanceup(vm, 2, &up, nullptr, SQFalse);
+  if (!up)
+    return sq_throwerror(vm, "null action");
+  auto actionPtr = *static_cast<Ptr<Action> *>(up);
+  node->runAction(actionPtr);
+  return 0;
+}
+
+static SQInteger nodeStopAllActions(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  node->stopAllActions();
+  return 0;
+}
+
+static SQInteger nodeGetBoundingBox(HSQUIRRELVM vm) {
+  auto *node = getRawPtr<Node>(vm, 1);
+  if (!node)
+    return sq_throwerror(vm, "null node");
+  pushValueInstance(vm, node->getBoundingBox());
+  return 1;
+}
+
+void registerNode(HSQUIRRELVM vm) {
+  // Node class — uses shared_ptr bridge
+  ClassDef(vm, "Node")
+      .setTypeTag(typeTag<Node>())
+      .staticMethod("create", nodeCreate)
+      .method("setPosition", nodeSetPosition)
+      .method("getPosition", nodeGetPosition)
+      .method("setRotation", nodeSetRotation)
+      .method("getRotation", nodeGetRotation)
+      .method("setScale", nodeSetScale)
+      .method("getScale", nodeGetScale)
+      .method("setAnchor", nodeSetAnchor)
+      .method("getAnchor", nodeGetAnchor)
+      .method("setOpacity", nodeSetOpacity)
+      .method("getOpacity", nodeGetOpacity)
+      .method("setVisible", nodeSetVisible)
+      .method("isVisible", nodeIsVisible)
+      .method("setZOrder", nodeSetZOrder)
+      .method("getZOrder", nodeGetZOrder)
+      .method("setName", nodeSetName)
+      .method("getName", nodeGetName)
+      .method("setTag", nodeSetTag)
+      .method("getTag", nodeGetTag)
+      .method("addChild", nodeAddChild)
+      .method("removeFromParent", nodeRemoveFromParent)
+      .method("removeAllChildren", nodeRemoveAllChildren)
+      .method("getChildByName", nodeGetChildByName)
+      .method("runAction", nodeRunAction)
+      .method("stopAllActions", nodeStopAllActions)
+      .method("getBoundingBox", nodeGetBoundingBox)
+      .commit();
+}
+
+// ============================================================================
+// Sprite
+// ============================================================================
+static SQInteger spriteCreate(HSQUIRRELVM vm) {
+  SQInteger argc = sq_gettop(vm);
+  Ptr<Sprite> sprite;
+
+  if (argc >= 2 && sq_gettype(vm, 2) == OT_STRING) {
+    std::string path = getString(vm, 2);
+    auto tex = Application::instance().resources().loadTexture(path);
+    if (tex)
+      sprite = Sprite::create(tex);
+    else
+      sprite = Sprite::create();
+  } else {
+    sprite = Sprite::create();
+  }
+
+  pushPtr<Node>(vm, sprite);
+  return 1;
+}
+
+static SQInteger spriteSetColor(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *sprite = dynamic_cast<Sprite *>(node.get());
+  if (!sprite)
+    return sq_throwerror(vm, "not a sprite");
+  Color *c = getValueInstance<Color>(vm, 2);
+  if (c)
+    sprite->setColor(*c);
+  return 0;
+}
+
+static SQInteger spriteGetColor(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *sprite = dynamic_cast<Sprite *>(node.get());
+  if (!sprite)
+    return sq_throwerror(vm, "not a sprite");
+  pushValueInstance(vm, sprite->getColor());
+  return 1;
+}
+
+static SQInteger spriteSetFlipX(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *sprite = dynamic_cast<Sprite *>(node.get());
+  if (!sprite)
+    return sq_throwerror(vm, "not a sprite");
+  sprite->setFlipX(getBool(vm, 2));
+  return 0;
+}
+
+static SQInteger spriteSetFlipY(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *sprite = dynamic_cast<Sprite *>(node.get());
+  if (!sprite)
+    return sq_throwerror(vm, "not a sprite");
+  sprite->setFlipY(getBool(vm, 2));
+  return 0;
+}
+
+static SQInteger spriteIsFlipX(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *sprite = dynamic_cast<Sprite *>(node.get());
+  if (!sprite)
+    return sq_throwerror(vm, "not a sprite");
+  push(vm, sprite->isFlipX());
+  return 1;
+}
+
+static SQInteger spriteIsFlipY(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *sprite = dynamic_cast<Sprite *>(node.get());
+  if (!sprite)
+    return sq_throwerror(vm, "not a sprite");
+  push(vm, sprite->isFlipY());
+  return 1;
+}
+
+void registerSprite(HSQUIRRELVM vm) {
+  ClassDef(vm, "Sprite", "Node")
+      .setTypeTag(typeTag<Sprite>())
+      .staticMethod("create", spriteCreate)
+      .method("setColor", spriteSetColor)
+      .method("getColor", spriteGetColor)
+      .method("setFlipX", spriteSetFlipX)
+      .method("setFlipY", spriteSetFlipY)
+      .method("isFlipX", spriteIsFlipX)
+      .method("isFlipY", spriteIsFlipY)
+      .commit();
+}
+
+// ============================================================================
+// Scene
+// ============================================================================
+static SQInteger sceneCreate(HSQUIRRELVM vm) {
+  auto scene = Scene::create();
+  pushPtr<Node>(vm, scene);
+  return 1;
+}
+
+static SQInteger sceneSetBackgroundColor(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *scene = dynamic_cast<Scene *>(node.get());
+  if (!scene)
+    return sq_throwerror(vm, "not a scene");
+  Color *c = getValueInstance<Color>(vm, 2);
+  if (c)
+    scene->setBackgroundColor(*c);
+  return 0;
+}
+
+static SQInteger sceneGetBackgroundColor(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 1);
+  auto *scene = dynamic_cast<Scene *>(node.get());
+  if (!scene)
+    return sq_throwerror(vm, "not a scene");
+  pushValueInstance(vm, scene->getBackgroundColor());
+  return 1;
+}
+
+void registerScene(HSQUIRRELVM vm) {
+  ClassDef(vm, "Scene", "Node")
+      .setTypeTag(typeTag<Scene>())
+      .staticMethod("create", sceneCreate)
+      .method("setBackgroundColor", sceneSetBackgroundColor)
+      .method("getBackgroundColor", sceneGetBackgroundColor)
+      .commit();
+}
+
+// ============================================================================
+// SceneManager (global "Scenes" variable)
+// ============================================================================
+static SQInteger smRunWithScene(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 2);
+  auto scene = std::dynamic_pointer_cast<Scene>(node);
+  if (!scene)
+    return sq_throwerror(vm, "expected Scene");
+  SceneManager::getInstance().runWithScene(scene);
+  return 0;
+}
+
+static SQInteger smReplaceScene(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 2);
+  auto scene = std::dynamic_pointer_cast<Scene>(node);
+  if (!scene)
+    return sq_throwerror(vm, "expected Scene");
+  SceneManager::getInstance().replaceScene(scene);
+  return 0;
+}
+
+static SQInteger smPushScene(HSQUIRRELVM vm) {
+  auto node = getPtr<Node>(vm, 2);
+  auto scene = std::dynamic_pointer_cast<Scene>(node);
+  if (!scene)
+    return sq_throwerror(vm, "expected Scene");
+  SceneManager::getInstance().pushScene(scene);
+  return 0;
+}
+
+static SQInteger smPopScene(HSQUIRRELVM vm) {
+  SceneManager::getInstance().popScene();
+  return 0;
+}
+
+static SQInteger smGetCurrentScene(HSQUIRRELVM vm) {
+  auto scene = SceneManager::getInstance().getCurrentScene();
+  if (scene)
+    pushPtr<Node>(vm, scene);
+  else
+    pushNull(vm);
+  return 1;
+}
+
+void registerSceneManager(HSQUIRRELVM vm) {
+  ClassDef(vm, "SceneManagerClass")
+      .method("runWithScene", smRunWithScene)
+      .method("replaceScene", smReplaceScene)
+      .method("pushScene", smPushScene)
+      .method("popScene", smPopScene)
+      .method("getCurrentScene", smGetCurrentScene)
+      .commit();
+
+  // Create global "Scenes" instance
+  pushSingleton(vm, &SceneManager::getInstance(), "SceneManagerClass");
+  sq_pushroottable(vm);
+  sq_pushstring(vm, "Scenes", -1);
+  sq_push(vm, -3); // push the instance
+  sq_newslot(vm, -3, SQFalse);
+  sq_pop(vm, 2); // pop root table and instance
+}
+
+// ============================================================================
+// Application (global "App" variable)
+// ============================================================================
+static SQInteger appQuit(HSQUIRRELVM vm) {
+  Application::instance().quit();
+  return 0;
+}
+
+static SQInteger appGetDeltaTime(HSQUIRRELVM vm) {
+  push(vm, Application::instance().deltaTime());
+  return 1;
+}
+
+static SQInteger appGetTotalTime(HSQUIRRELVM vm) {
+  push(vm, Application::instance().totalTime());
+  return 1;
+}
+
+static SQInteger appGetFps(HSQUIRRELVM vm) {
+  push(vm, Application::instance().fps());
+  return 1;
+}
+
+static SQInteger appIsPaused(HSQUIRRELVM vm) {
+  push(vm, Application::instance().isPaused());
+  return 1;
+}
+
+void registerApplication(HSQUIRRELVM vm) {
+  ClassDef(vm, "ApplicationClass")
+      .method("quit", appQuit)
+      .method("getDeltaTime", appGetDeltaTime)
+      .method("getTotalTime", appGetTotalTime)
+      .method("getFps", appGetFps)
+      .method("isPaused", appIsPaused)
+      .commit();
+
+  // Global "App" instance
+  pushSingleton(vm, &Application::instance(), "ApplicationClass");
+  sq_pushroottable(vm);
+  sq_pushstring(vm, "App", -1);
+  sq_push(vm, -3);
+  sq_newslot(vm, -3, SQFalse);
+  sq_pop(vm, 2);
+}
+
+// ============================================================================
+// Register all
+// ============================================================================
+void registerNodeBindings(HSQUIRRELVM vm) {
+  registerNode(vm);
+  registerSprite(vm);
+  registerScene(vm);
+  registerSceneManager(vm);
+  registerApplication(vm);
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/src/script/sq_binding_types.cpp b/Extra2D/src/script/sq_binding_types.cpp
new file mode 100644
index 0000000..6b8733f
--- /dev/null
+++ b/Extra2D/src/script/sq_binding_types.cpp
@@ -0,0 +1,398 @@
+#include <extra2d/script/sq_binding_types.h>
+
+namespace extra2d {
+namespace sq {
+
+// ============================================================================
+// Vec2
+// ============================================================================
+static SQInteger vec2Constructor(HSQUIRRELVM vm) {
+  Vec2 *self = nullptr;
+  sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer *>(&self), nullptr,
+                   SQFalse);
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 3) {
+    self->x = static_cast<float>(getFloat(vm, 2));
+    self->y = static_cast<float>(getFloat(vm, 3));
+  } else {
+    self->x = 0.0f;
+    self->y = 0.0f;
+  }
+  return 0;
+}
+
+static SQInteger vec2GetX(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  sq_pushfloat(vm, v->x);
+  return 1;
+}
+
+static SQInteger vec2SetX(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  v->x = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+
+static SQInteger vec2GetY(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  sq_pushfloat(vm, v->y);
+  return 1;
+}
+
+static SQInteger vec2SetY(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  v->y = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+
+static SQInteger vec2Length(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  sq_pushfloat(vm, v->length());
+  return 1;
+}
+
+static SQInteger vec2Normalized(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  pushValueInstance(vm, v->normalized());
+  return 1;
+}
+
+static SQInteger vec2Dot(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  Vec2 *b = getValueInstance<Vec2>(vm, 2);
+  sq_pushfloat(vm, a->dot(*b));
+  return 1;
+}
+
+static SQInteger vec2Distance(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  Vec2 *b = getValueInstance<Vec2>(vm, 2);
+  sq_pushfloat(vm, a->distance(*b));
+  return 1;
+}
+
+static SQInteger vec2Add(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  Vec2 *b = getValueInstance<Vec2>(vm, 2);
+  pushValueInstance(vm, *a + *b);
+  return 1;
+}
+
+static SQInteger vec2Sub(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  Vec2 *b = getValueInstance<Vec2>(vm, 2);
+  pushValueInstance(vm, *a - *b);
+  return 1;
+}
+
+static SQInteger vec2Mul(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  SQFloat s = getFloat(vm, 2);
+  pushValueInstance(vm, *a * static_cast<float>(s));
+  return 1;
+}
+
+static SQInteger vec2Div(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  SQFloat s = getFloat(vm, 2);
+  if (s == 0.0f)
+    return sq_throwerror(vm, "division by zero");
+  pushValueInstance(vm, *a / static_cast<float>(s));
+  return 1;
+}
+
+static SQInteger vec2Neg(HSQUIRRELVM vm) {
+  Vec2 *a = getValueInstance<Vec2>(vm, 1);
+  pushValueInstance(vm, -*a);
+  return 1;
+}
+
+static SQInteger vec2ToString(HSQUIRRELVM vm) {
+  Vec2 *v = getValueInstance<Vec2>(vm, 1);
+  char buf[64];
+  snprintf(buf, sizeof(buf), "Vec2(%.3f, %.3f)", v->x, v->y);
+  sq_pushstring(vm, buf, -1);
+  return 1;
+}
+
+void registerVec2(HSQUIRRELVM vm) {
+  ClassDef(vm, "Vec2")
+      .setValueType<Vec2>(vec2Constructor)
+      .method("getX", vec2GetX)
+      .method("setX", vec2SetX)
+      .method("getY", vec2GetY)
+      .method("setY", vec2SetY)
+      .method("length", vec2Length)
+      .method("normalized", vec2Normalized)
+      .method("dot", vec2Dot, 2, "xx")
+      .method("distance", vec2Distance, 2, "xx")
+      .method("_add", vec2Add, 2, "xx")
+      .method("_sub", vec2Sub, 2, "xx")
+      .method("_mul", vec2Mul)
+      .method("_div", vec2Div)
+      .method("_unm", vec2Neg)
+      .method("_tostring", vec2ToString)
+      .commit();
+}
+
+// ============================================================================
+// Size
+// ============================================================================
+static SQInteger sizeConstructor(HSQUIRRELVM vm) {
+  Size *self = nullptr;
+  sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer *>(&self), nullptr,
+                   SQFalse);
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 3) {
+    self->width = static_cast<float>(getFloat(vm, 2));
+    self->height = static_cast<float>(getFloat(vm, 3));
+  } else {
+    self->width = 0.0f;
+    self->height = 0.0f;
+  }
+  return 0;
+}
+
+static SQInteger sizeGetWidth(HSQUIRRELVM vm) {
+  Size *s = getValueInstance<Size>(vm, 1);
+  sq_pushfloat(vm, s->width);
+  return 1;
+}
+
+static SQInteger sizeSetWidth(HSQUIRRELVM vm) {
+  Size *s = getValueInstance<Size>(vm, 1);
+  s->width = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+
+static SQInteger sizeGetHeight(HSQUIRRELVM vm) {
+  Size *s = getValueInstance<Size>(vm, 1);
+  sq_pushfloat(vm, s->height);
+  return 1;
+}
+
+static SQInteger sizeSetHeight(HSQUIRRELVM vm) {
+  Size *s = getValueInstance<Size>(vm, 1);
+  s->height = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+
+static SQInteger sizeArea(HSQUIRRELVM vm) {
+  Size *s = getValueInstance<Size>(vm, 1);
+  sq_pushfloat(vm, s->area());
+  return 1;
+}
+
+static SQInteger sizeToString(HSQUIRRELVM vm) {
+  Size *s = getValueInstance<Size>(vm, 1);
+  char buf[64];
+  snprintf(buf, sizeof(buf), "Size(%.3f, %.3f)", s->width, s->height);
+  sq_pushstring(vm, buf, -1);
+  return 1;
+}
+
+void registerSize(HSQUIRRELVM vm) {
+  ClassDef(vm, "Size")
+      .setValueType<Size>(sizeConstructor)
+      .method("getWidth", sizeGetWidth)
+      .method("setWidth", sizeSetWidth)
+      .method("getHeight", sizeGetHeight)
+      .method("setHeight", sizeSetHeight)
+      .method("area", sizeArea)
+      .method("_tostring", sizeToString)
+      .commit();
+}
+
+// ============================================================================
+// Rect
+// ============================================================================
+static SQInteger rectConstructor(HSQUIRRELVM vm) {
+  Rect *self = nullptr;
+  sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer *>(&self), nullptr,
+                   SQFalse);
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 5) {
+    self->origin.x = static_cast<float>(getFloat(vm, 2));
+    self->origin.y = static_cast<float>(getFloat(vm, 3));
+    self->size.width = static_cast<float>(getFloat(vm, 4));
+    self->size.height = static_cast<float>(getFloat(vm, 5));
+  } else {
+    *self = Rect();
+  }
+  return 0;
+}
+
+static SQInteger rectGetX(HSQUIRRELVM vm) {
+  Rect *r = getValueInstance<Rect>(vm, 1);
+  sq_pushfloat(vm, r->origin.x);
+  return 1;
+}
+
+static SQInteger rectGetY(HSQUIRRELVM vm) {
+  Rect *r = getValueInstance<Rect>(vm, 1);
+  sq_pushfloat(vm, r->origin.y);
+  return 1;
+}
+
+static SQInteger rectGetWidth(HSQUIRRELVM vm) {
+  Rect *r = getValueInstance<Rect>(vm, 1);
+  sq_pushfloat(vm, r->size.width);
+  return 1;
+}
+
+static SQInteger rectGetHeight(HSQUIRRELVM vm) {
+  Rect *r = getValueInstance<Rect>(vm, 1);
+  sq_pushfloat(vm, r->size.height);
+  return 1;
+}
+
+static SQInteger rectContainsPoint(HSQUIRRELVM vm) {
+  Rect *r = getValueInstance<Rect>(vm, 1);
+  Vec2 *p = getValueInstance<Vec2>(vm, 2);
+  sq_pushbool(vm, r->containsPoint(*p) ? SQTrue : SQFalse);
+  return 1;
+}
+
+static SQInteger rectIntersects(HSQUIRRELVM vm) {
+  Rect *a = getValueInstance<Rect>(vm, 1);
+  Rect *b = getValueInstance<Rect>(vm, 2);
+  sq_pushbool(vm, a->intersects(*b) ? SQTrue : SQFalse);
+  return 1;
+}
+
+static SQInteger rectToString(HSQUIRRELVM vm) {
+  Rect *r = getValueInstance<Rect>(vm, 1);
+  char buf[96];
+  snprintf(buf, sizeof(buf), "Rect(%.1f, %.1f, %.1f, %.1f)", r->origin.x,
+           r->origin.y, r->size.width, r->size.height);
+  sq_pushstring(vm, buf, -1);
+  return 1;
+}
+
+void registerRect(HSQUIRRELVM vm) {
+  ClassDef(vm, "Rect")
+      .setValueType<Rect>(rectConstructor)
+      .method("getX", rectGetX)
+      .method("getY", rectGetY)
+      .method("getWidth", rectGetWidth)
+      .method("getHeight", rectGetHeight)
+      .method("containsPoint", rectContainsPoint, 2, "xx")
+      .method("intersects", rectIntersects, 2, "xx")
+      .method("_tostring", rectToString)
+      .commit();
+}
+
+// ============================================================================
+// Color
+// ============================================================================
+static SQInteger colorConstructor(HSQUIRRELVM vm) {
+  Color *self = nullptr;
+  sq_getinstanceup(vm, 1, reinterpret_cast<SQUserPointer *>(&self), nullptr,
+                   SQFalse);
+  SQInteger argc = sq_gettop(vm);
+  if (argc >= 5) {
+    self->r = static_cast<float>(getFloat(vm, 2));
+    self->g = static_cast<float>(getFloat(vm, 3));
+    self->b = static_cast<float>(getFloat(vm, 4));
+    self->a = static_cast<float>(getFloat(vm, 5));
+  } else if (argc >= 4) {
+    self->r = static_cast<float>(getFloat(vm, 2));
+    self->g = static_cast<float>(getFloat(vm, 3));
+    self->b = static_cast<float>(getFloat(vm, 4));
+    self->a = 1.0f;
+  } else {
+    *self = Color(1.0f, 1.0f, 1.0f, 1.0f);
+  }
+  return 0;
+}
+
+static SQInteger colorGetR(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  sq_pushfloat(vm, c->r);
+  return 1;
+}
+static SQInteger colorGetG(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  sq_pushfloat(vm, c->g);
+  return 1;
+}
+static SQInteger colorGetB(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  sq_pushfloat(vm, c->b);
+  return 1;
+}
+static SQInteger colorGetA(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  sq_pushfloat(vm, c->a);
+  return 1;
+}
+
+static SQInteger colorSetR(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  c->r = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+static SQInteger colorSetG(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  c->g = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+static SQInteger colorSetB(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  c->b = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+static SQInteger colorSetA(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  c->a = static_cast<float>(getFloat(vm, 2));
+  return 0;
+}
+
+static SQInteger colorFromRGBA(HSQUIRRELVM vm) {
+  auto r = static_cast<uint8_t>(getInt(vm, 2));
+  auto g = static_cast<uint8_t>(getInt(vm, 3));
+  auto b = static_cast<uint8_t>(getInt(vm, 4));
+  uint8_t a = 255;
+  if (sq_gettop(vm) >= 5)
+    a = static_cast<uint8_t>(getInt(vm, 5));
+  pushValueInstance(vm, Color::fromRGBA(r, g, b, a));
+  return 1;
+}
+
+static SQInteger colorToString(HSQUIRRELVM vm) {
+  Color *c = getValueInstance<Color>(vm, 1);
+  char buf[80];
+  snprintf(buf, sizeof(buf), "Color(%.3f, %.3f, %.3f, %.3f)", c->r, c->g, c->b,
+           c->a);
+  sq_pushstring(vm, buf, -1);
+  return 1;
+}
+
+void registerColor(HSQUIRRELVM vm) {
+  ClassDef(vm, "Color")
+      .setValueType<Color>(colorConstructor)
+      .method("getR", colorGetR)
+      .method("setR", colorSetR)
+      .method("getG", colorGetG)
+      .method("setG", colorSetG)
+      .method("getB", colorGetB)
+      .method("setB", colorSetB)
+      .method("getA", colorGetA)
+      .method("setA", colorSetA)
+      .staticMethod("fromRGBA", colorFromRGBA)
+      .method("_tostring", colorToString)
+      .commit();
+}
+
+// ============================================================================
+// Register all value types
+// ============================================================================
+void registerValueTypes(HSQUIRRELVM vm) {
+  registerVec2(vm);
+  registerSize(vm);
+  registerRect(vm);
+  registerColor(vm);
+}
+
+} // namespace sq
+} // namespace extra2d
diff --git a/Extra2D/src/spatial/quadtree.cpp b/Extra2D/src/spatial/quadtree.cpp
new file mode 100644
index 0000000..fb5a878
--- /dev/null
+++ b/Extra2D/src/spatial/quadtree.cpp
@@ -0,0 +1,264 @@
+#include <algorithm>
+#include <extra2d/scene/node.h>
+#include <extra2d/spatial/quadtree.h>
+#include <functional>
+
+namespace extra2d {
+
+QuadTree::QuadTreeNode::QuadTreeNode(const Rect &bounds, int level)
+    : bounds(bounds), level(level) {}
+
+bool QuadTree::QuadTreeNode::contains(const Rect &rect) const {
+  return bounds.contains(rect);
+}
+
+bool QuadTree::QuadTreeNode::intersects(const Rect &rect) const {
+  return bounds.intersects(rect);
+}
+
+QuadTree::QuadTree(const Rect &worldBounds) : worldBounds_(worldBounds) {
+  root_ = std::make_unique<QuadTreeNode>(worldBounds, 0);
+}
+
+void QuadTree::insert(Node *node, const Rect &bounds) {
+  if (!node || !root_->intersects(bounds))
+    return;
+  insertIntoNode(root_.get(), node, bounds);
+  objectCount_++;
+}
+
+void QuadTree::insertIntoNode(QuadTreeNode *node, Node *object,
+                              const Rect &bounds) {
+  if (node->children[0]) {
+    int index = -1;
+    float midX = node->bounds.origin.x + node->bounds.size.width / 2.0f;
+    float midY = node->bounds.origin.y + node->bounds.size.height / 2.0f;
+
+    bool top = bounds.origin.y + bounds.size.height <= midY;
+    bool bottom = bounds.origin.y >= midY;
+    bool left = bounds.origin.x + bounds.size.width <= midX;
+    bool right = bounds.origin.x >= midX;
+
+    if (top && left)
+      index = 0;
+    else if (top && right)
+      index = 1;
+    else if (bottom && left)
+      index = 2;
+    else if (bottom && right)
+      index = 3;
+
+    if (index != -1) {
+      insertIntoNode(node->children[index].get(), object, bounds);
+      return;
+    }
+  }
+
+  node->objects.emplace_back(object, bounds);
+
+  if (node->objects.size() > MAX_OBJECTS && node->level < MAX_LEVELS) {
+    if (!node->children[0]) {
+      split(node);
+    }
+  }
+}
+
+void QuadTree::split(QuadTreeNode *node) {
+  float midX = node->bounds.origin.x + node->bounds.size.width / 2.0f;
+  float midY = node->bounds.origin.y + node->bounds.size.height / 2.0f;
+
+  node->children[0] = std::make_unique<QuadTreeNode>(
+      Rect(node->bounds.origin.x, node->bounds.origin.y,
+           node->bounds.size.width / 2.0f, node->bounds.size.height / 2.0f),
+      node->level + 1);
+  node->children[1] = std::make_unique<QuadTreeNode>(
+      Rect(midX, node->bounds.origin.y, node->bounds.size.width / 2.0f,
+           node->bounds.size.height / 2.0f),
+      node->level + 1);
+  node->children[2] = std::make_unique<QuadTreeNode>(
+      Rect(node->bounds.origin.x, midY, node->bounds.size.width / 2.0f,
+           node->bounds.size.height / 2.0f),
+      node->level + 1);
+  node->children[3] = std::make_unique<QuadTreeNode>(
+      Rect(midX, midY, node->bounds.size.width / 2.0f,
+           node->bounds.size.height / 2.0f),
+      node->level + 1);
+
+  auto objects = std::move(node->objects);
+  node->objects.clear();
+
+  for (const auto &[obj, bounds] : objects) {
+    insertIntoNode(node, obj, bounds);
+  }
+}
+
+void QuadTree::remove(Node *node) {
+  if (!node)
+    return;
+  if (removeFromNode(root_.get(), node)) {
+    objectCount_--;
+  }
+}
+
+bool QuadTree::removeFromNode(QuadTreeNode *node, Node *object) {
+  auto it =
+      std::find_if(node->objects.begin(), node->objects.end(),
+                   [object](const auto &pair) { return pair.first == object; });
+
+  if (it != node->objects.end()) {
+    node->objects.erase(it);
+    return true;
+  }
+
+  if (node->children[0]) {
+    for (auto &child : node->children) {
+      if (removeFromNode(child.get(), object)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+void QuadTree::update(Node *node, const Rect &newBounds) {
+  remove(node);
+  insert(node, newBounds);
+}
+
+std::vector<Node *> QuadTree::query(const Rect &area) const {
+  std::vector<Node *> results;
+  queryNode(root_.get(), area, results);
+  return results;
+}
+
+void QuadTree::queryNode(const QuadTreeNode *node, const Rect &area,
+                         std::vector<Node *> &results) const {
+  if (!node || !node->intersects(area))
+    return;
+
+  for (const auto &[obj, bounds] : node->objects) {
+    if (bounds.intersects(area)) {
+      results.push_back(obj);
+    }
+  }
+
+  if (node->children[0]) {
+    for (const auto &child : node->children) {
+      queryNode(child.get(), area, results);
+    }
+  }
+}
+
+std::vector<Node *> QuadTree::query(const Vec2 &point) const {
+  std::vector<Node *> results;
+  queryNode(root_.get(), point, results);
+  return results;
+}
+
+void QuadTree::queryNode(const QuadTreeNode *node, const Vec2 &point,
+                         std::vector<Node *> &results) const {
+  if (!node || !node->bounds.containsPoint(point))
+    return;
+
+  for (const auto &[obj, bounds] : node->objects) {
+    if (bounds.containsPoint(point)) {
+      results.push_back(obj);
+    }
+  }
+
+  if (node->children[0]) {
+    for (const auto &child : node->children) {
+      queryNode(child.get(), point, results);
+    }
+  }
+}
+
+std::vector<std::pair<Node *, Node *>> QuadTree::queryCollisions() const {
+  std::vector<std::pair<Node *, Node *>> collisions;
+  collectCollisions(root_.get(), collisions);
+  return collisions;
+}
+
+void QuadTree::collectCollisions(
+    const QuadTreeNode *node,
+    std::vector<std::pair<Node *, Node *>> &collisions) const {
+  if (!node)
+    return;
+
+  std::vector<std::pair<Node *, Rect>> ancestors;
+  ancestors.reserve(objectCount_);
+
+  std::function<void(const QuadTreeNode *)> visit =
+      [&](const QuadTreeNode *current) {
+        if (!current)
+          return;
+
+        for (const auto &[obj, bounds] : current->objects) {
+          for (const auto &[ancestorObj, ancestorBounds] : ancestors) {
+            if (bounds.intersects(ancestorBounds)) {
+              collisions.emplace_back(ancestorObj, obj);
+            }
+          }
+        }
+
+        for (size_t i = 0; i < current->objects.size(); ++i) {
+          for (size_t j = i + 1; j < current->objects.size(); ++j) {
+            if (current->objects[i].second.intersects(
+                    current->objects[j].second)) {
+              collisions.emplace_back(current->objects[i].first,
+                                      current->objects[j].first);
+            }
+          }
+        }
+
+        size_t oldSize = ancestors.size();
+        ancestors.insert(ancestors.end(), current->objects.begin(),
+                         current->objects.end());
+
+        if (current->children[0]) {
+          for (const auto &child : current->children) {
+            visit(child.get());
+          }
+        }
+
+        ancestors.resize(oldSize);
+      };
+
+  visit(node);
+}
+
+void QuadTree::clear() {
+  root_ = std::make_unique<QuadTreeNode>(worldBounds_, 0);
+  objectCount_ = 0;
+}
+
+size_t QuadTree::size() const { return objectCount_; }
+
+bool QuadTree::empty() const { return objectCount_ == 0; }
+
+void QuadTree::rebuild() {
+  std::vector<std::pair<Node *, Rect>> allObjects;
+
+  std::function<void(QuadTreeNode *)> collect = [&](QuadTreeNode *node) {
+    if (!node)
+      return;
+    for (const auto &obj : node->objects) {
+      allObjects.push_back(obj);
+    }
+    if (node->children[0]) {
+      for (auto &child : node->children) {
+        collect(child.get());
+      }
+    }
+  };
+
+  collect(root_.get());
+  clear();
+
+  for (const auto &[obj, bounds] : allObjects) {
+    insert(obj, bounds);
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/spatial/spatial_hash.cpp b/Extra2D/src/spatial/spatial_hash.cpp
new file mode 100644
index 0000000..6e71fea
--- /dev/null
+++ b/Extra2D/src/spatial/spatial_hash.cpp
@@ -0,0 +1,197 @@
+#include <cstdint>
+#include <extra2d/scene/node.h>
+#include <extra2d/spatial/spatial_hash.h>
+
+namespace extra2d {
+
+SpatialHash::SpatialHash(float cellSize) : cellSize_(cellSize) {}
+
+SpatialHash::CellKey SpatialHash::getCellKey(float x, float y) const {
+  int64_t cellX = static_cast<int64_t>(std::floor(x / cellSize_));
+  int64_t cellY = static_cast<int64_t>(std::floor(y / cellSize_));
+  return {cellX, cellY};
+}
+
+void SpatialHash::getCellsForRect(const Rect &rect,
+                                  std::vector<CellKey> &cells) const {
+  cells.clear();
+
+  CellKey minCell = getCellKey(rect.origin.x, rect.origin.y);
+  CellKey maxCell = getCellKey(rect.origin.x + rect.size.width,
+                               rect.origin.y + rect.size.height);
+
+  for (int64_t x = minCell.first; x <= maxCell.first; ++x) {
+    for (int64_t y = minCell.second; y <= maxCell.second; ++y) {
+      cells.emplace_back(x, y);
+    }
+  }
+}
+
+void SpatialHash::insertIntoCells(Node *node, const Rect &bounds) {
+  std::vector<CellKey> cells;
+  getCellsForRect(bounds, cells);
+
+  for (const auto &cell : cells) {
+    grid_[cell].insert(node);
+  }
+}
+
+void SpatialHash::removeFromCells(Node *node, const Rect &bounds) {
+  std::vector<CellKey> cells;
+  getCellsForRect(bounds, cells);
+
+  for (const auto &cell : cells) {
+    auto it = grid_.find(cell);
+    if (it != grid_.end()) {
+      it->second.erase(node);
+      if (it->second.empty()) {
+        grid_.erase(it);
+      }
+    }
+  }
+}
+
+void SpatialHash::insert(Node *node, const Rect &bounds) {
+  if (!node)
+    return;
+
+  insertIntoCells(node, bounds);
+  objectBounds_[node] = bounds;
+  objectCount_++;
+}
+
+void SpatialHash::remove(Node *node) {
+  if (!node)
+    return;
+
+  auto it = objectBounds_.find(node);
+  if (it != objectBounds_.end()) {
+    removeFromCells(node, it->second);
+    objectBounds_.erase(it);
+    objectCount_--;
+  }
+}
+
+void SpatialHash::update(Node *node, const Rect &newBounds) {
+  auto it = objectBounds_.find(node);
+  if (it != objectBounds_.end()) {
+    removeFromCells(node, it->second);
+    insertIntoCells(node, newBounds);
+    it->second = newBounds;
+  }
+}
+
+std::vector<Node *> SpatialHash::query(const Rect &area) const {
+  std::vector<Node *> results;
+  std::unordered_set<Node *> found;
+
+  std::vector<CellKey> cells;
+  getCellsForRect(area, cells);
+
+  for (const auto &cell : cells) {
+    auto it = grid_.find(cell);
+    if (it != grid_.end()) {
+      for (Node *node : it->second) {
+        if (found.insert(node).second) {
+          auto boundsIt = objectBounds_.find(node);
+          if (boundsIt != objectBounds_.end() &&
+              boundsIt->second.intersects(area)) {
+            results.push_back(node);
+          }
+        }
+      }
+    }
+  }
+
+  return results;
+}
+
+std::vector<Node *> SpatialHash::query(const Vec2 &point) const {
+  std::vector<Node *> results;
+
+  CellKey cell = getCellKey(point.x, point.y);
+  auto it = grid_.find(cell);
+
+  if (it != grid_.end()) {
+    for (Node *node : it->second) {
+      auto boundsIt = objectBounds_.find(node);
+      if (boundsIt != objectBounds_.end() &&
+          boundsIt->second.containsPoint(point)) {
+        results.push_back(node);
+      }
+    }
+  }
+
+  return results;
+}
+
+std::vector<std::pair<Node *, Node *>> SpatialHash::queryCollisions() const {
+  std::vector<std::pair<Node *, Node *>> collisions;
+  struct PairHash {
+    size_t operator()(const std::pair<Node *, Node *> &p) const noexcept {
+      auto a = reinterpret_cast<std::uintptr_t>(p.first);
+      auto b = reinterpret_cast<std::uintptr_t>(p.second);
+      return std::hash<std::uintptr_t>{}(a) ^
+             (std::hash<std::uintptr_t>{}(b) << 1);
+    }
+  };
+  auto makeOrdered = [](Node *a, Node *b) -> std::pair<Node *, Node *> {
+    return a < b ? std::make_pair(a, b) : std::make_pair(b, a);
+  };
+
+  std::unordered_set<std::pair<Node *, Node *>, PairHash> seen;
+  seen.reserve(objectCount_ * 2);
+
+  for (const auto &[cell, objects] : grid_) {
+    std::vector<Node *> cellObjects(objects.begin(), objects.end());
+
+    for (size_t i = 0; i < cellObjects.size(); ++i) {
+      auto bounds1 = objectBounds_.find(cellObjects[i]);
+      if (bounds1 == objectBounds_.end())
+        continue;
+
+      for (size_t j = i + 1; j < cellObjects.size(); ++j) {
+        auto bounds2 = objectBounds_.find(cellObjects[j]);
+        if (bounds2 == objectBounds_.end())
+          continue;
+
+        if (bounds1->second.intersects(bounds2->second)) {
+          auto key = makeOrdered(cellObjects[i], cellObjects[j]);
+          if (seen.insert(key).second) {
+            collisions.emplace_back(key.first, key.second);
+          }
+        }
+      }
+    }
+  }
+
+  return collisions;
+}
+
+void SpatialHash::clear() {
+  grid_.clear();
+  objectBounds_.clear();
+  objectCount_ = 0;
+}
+
+size_t SpatialHash::size() const { return objectCount_; }
+
+bool SpatialHash::empty() const { return objectCount_ == 0; }
+
+void SpatialHash::rebuild() {
+  auto bounds = objectBounds_;
+  clear();
+
+  for (const auto &[node, bound] : bounds) {
+    insert(node, bound);
+  }
+}
+
+void SpatialHash::setCellSize(float cellSize) {
+  if (cellSize != cellSize_ && cellSize > 0) {
+    cellSize_ = cellSize;
+    rebuild();
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/spatial/spatial_manager.cpp b/Extra2D/src/spatial/spatial_manager.cpp
new file mode 100644
index 0000000..45bd2d7
--- /dev/null
+++ b/Extra2D/src/spatial/spatial_manager.cpp
@@ -0,0 +1,198 @@
+#include <chrono>
+#include <extra2d/scene/node.h>
+#include <extra2d/spatial/quadtree.h>
+#include <extra2d/spatial/spatial_hash.h>
+#include <extra2d/spatial/spatial_manager.h>
+
+namespace extra2d {
+
+SpatialManager::SpatialManager() : worldBounds_(0, 0, 10000, 10000) {
+  selectOptimalStrategy();
+}
+
+SpatialManager::SpatialManager(const Rect &worldBounds)
+    : worldBounds_(worldBounds) {
+  selectOptimalStrategy();
+}
+
+void SpatialManager::setStrategy(SpatialStrategy strategy) {
+  if (currentStrategy_ == strategy)
+    return;
+
+  currentStrategy_ = strategy;
+  rebuild();
+}
+
+void SpatialManager::setAutoThresholds(size_t quadTreeThreshold,
+                                       size_t hashThreshold) {
+  quadTreeThreshold_ = quadTreeThreshold;
+  hashThreshold_ = hashThreshold;
+
+  if (currentStrategy_ == SpatialStrategy::Auto) {
+    selectOptimalStrategy();
+  }
+}
+
+void SpatialManager::setWorldBounds(const Rect &bounds) {
+  worldBounds_ = bounds;
+  rebuild();
+}
+
+void SpatialManager::insert(Node *node, const Rect &bounds) {
+  if (!index_) {
+    selectOptimalStrategy();
+  }
+
+  if (index_) {
+    index_->insert(node, bounds);
+  }
+}
+
+void SpatialManager::remove(Node *node) {
+  if (index_) {
+    index_->remove(node);
+  }
+}
+
+void SpatialManager::update(Node *node, const Rect &newBounds) {
+  if (index_) {
+    index_->update(node, newBounds);
+  }
+}
+
+std::vector<Node *> SpatialManager::query(const Rect &area) const {
+  if (!index_)
+    return {};
+
+  auto start = std::chrono::high_resolution_clock::now();
+  auto results = index_->query(area);
+  auto end = std::chrono::high_resolution_clock::now();
+
+  queryCount_++;
+  totalQueryTime_ +=
+      std::chrono::duration_cast<std::chrono::microseconds>(end - start)
+          .count();
+
+  return results;
+}
+
+std::vector<Node *> SpatialManager::query(const Vec2 &point) const {
+  if (!index_)
+    return {};
+  return index_->query(point);
+}
+
+std::vector<std::pair<Node *, Node *>> SpatialManager::queryCollisions() const {
+  if (!index_)
+    return {};
+  return index_->queryCollisions();
+}
+
+void SpatialManager::query(const Rect &area,
+                           const QueryCallback &callback) const {
+  auto results = query(area);
+  for (Node *node : results) {
+    if (!callback(node))
+      break;
+  }
+}
+
+void SpatialManager::query(const Vec2 &point,
+                           const QueryCallback &callback) const {
+  auto results = query(point);
+  for (Node *node : results) {
+    if (!callback(node))
+      break;
+  }
+}
+
+void SpatialManager::clear() {
+  if (index_) {
+    index_->clear();
+  }
+}
+
+size_t SpatialManager::size() const { return index_ ? index_->size() : 0; }
+
+bool SpatialManager::empty() const { return index_ ? index_->empty() : true; }
+
+void SpatialManager::rebuild() {
+  if (!index_) {
+    selectOptimalStrategy();
+    return;
+  }
+
+  auto oldIndex = std::move(index_);
+  selectOptimalStrategy();
+
+  if (index_ && oldIndex) {
+    auto bounds = Rect(worldBounds_);
+    auto objects = oldIndex->query(bounds);
+    for (Node *node : objects) {
+      if (node) {
+        auto nodeBounds = node->getBoundingBox();
+        index_->insert(node, nodeBounds);
+      }
+    }
+  }
+}
+
+void SpatialManager::optimize() {
+  if (currentStrategy_ == SpatialStrategy::Auto) {
+    selectOptimalStrategy();
+  }
+
+  if (index_) {
+    index_->rebuild();
+  }
+}
+
+SpatialStrategy SpatialManager::getCurrentStrategy() const {
+  return activeStrategy_;
+}
+
+const char *SpatialManager::getStrategyName() const {
+  switch (activeStrategy_) {
+  case SpatialStrategy::QuadTree:
+    return "QuadTree";
+  case SpatialStrategy::SpatialHash:
+    return "SpatialHash";
+  default:
+    return "Unknown";
+  }
+}
+
+std::unique_ptr<ISpatialIndex>
+SpatialManager::createIndex(SpatialStrategy strategy, const Rect &bounds) {
+  switch (strategy) {
+  case SpatialStrategy::QuadTree:
+    return std::make_unique<QuadTree>(bounds);
+  case SpatialStrategy::SpatialHash:
+    return std::make_unique<SpatialHash>(64.0f);
+  default:
+    return std::make_unique<QuadTree>(bounds);
+  }
+}
+
+void SpatialManager::selectOptimalStrategy() {
+  if (currentStrategy_ != SpatialStrategy::Auto) {
+    activeStrategy_ = currentStrategy_;
+  } else {
+    size_t currentSize = index_ ? index_->size() : 0;
+
+    if (currentSize < quadTreeThreshold_) {
+      activeStrategy_ = SpatialStrategy::QuadTree;
+    } else if (currentSize > hashThreshold_) {
+      activeStrategy_ = SpatialStrategy::SpatialHash;
+    } else {
+      // Keep current strategy in transition zone
+      if (!index_) {
+        activeStrategy_ = SpatialStrategy::QuadTree;
+      }
+    }
+  }
+
+  index_ = createIndex(activeStrategy_, worldBounds_);
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/ui/button.cpp b/Extra2D/src/ui/button.cpp
new file mode 100644
index 0000000..853ce67
--- /dev/null
+++ b/Extra2D/src/ui/button.cpp
@@ -0,0 +1,697 @@
+#include <algorithm>
+#include <cmath>
+#include <extra2d/app/application.h>
+#include <extra2d/graphics/render_backend.h>
+#include <extra2d/ui/button.h>
+
+namespace extra2d {
+
+/**
+ * @brief 构造函数，初始化按钮状态并设置事件监听器
+ */
+Button::Button() {
+  setSpatialIndexed(false);
+  auto &dispatcher = getEventDispatcher();
+  dispatcher.addListener(EventType::UIHoverEnter, [this](Event &) {
+    hovered_ = true;
+    // 鼠标进入按钮区域，改变光标为手型
+    auto &app = Application::instance();
+    app.window().setCursor(hoverCursor_);
+    cursorChanged_ = true;
+  });
+  dispatcher.addListener(EventType::UIHoverExit, [this](Event &) {
+    hovered_ = false;
+    pressed_ = false;
+    // 鼠标离开按钮区域，恢复默认光标
+    if (cursorChanged_) {
+      auto &app = Application::instance();
+      app.window().resetCursor();
+      cursorChanged_ = false;
+    }
+  });
+  dispatcher.addListener(EventType::UIPressed,
+                         [this](Event &) { pressed_ = true; });
+  dispatcher.addListener(EventType::UIReleased,
+                         [this](Event &) { pressed_ = false; });
+  dispatcher.addListener(EventType::UIClicked, [this](Event &) {
+    if (onClick_)
+      onClick_();
+  });
+}
+
+/**
+ * @brief 创建按钮实例的工厂方法
+ * @return 按钮智能指针
+ */
+Ptr<Button> Button::create() { return makePtr<Button>(); }
+
+/**
+ * @brief 设置按钮文字，并根据文字大小自动调整按钮尺寸
+ * @param text 要显示的文字
+ */
+void Button::setText(const String &text) {
+  text_ = text;
+  if (font_ && getSize().empty()) {
+    Vec2 textSize = font_->measureText(text_);
+    setSize(textSize.x + padding_.x * 2.0f, textSize.y + padding_.y * 2.0f);
+  }
+}
+
+/**
+ * @brief 设置字体，并根据当前文字自动调整按钮尺寸
+ * @param font 字体图集
+ */
+void Button::setFont(Ptr<FontAtlas> font) {
+  font_ = font;
+  if (font_ && getSize().empty() && !text_.empty()) {
+    Vec2 textSize = font_->measureText(text_);
+    setSize(textSize.x + padding_.x * 2.0f, textSize.y + padding_.y * 2.0f);
+  }
+}
+
+/**
+ * @brief 设置内边距，并根据当前文字自动调整按钮尺寸
+ * @param padding 内边距向量
+ */
+void Button::setPadding(const Vec2 &padding) {
+  padding_ = padding;
+  if (font_ && getSize().empty() && !text_.empty()) {
+    Vec2 textSize = font_->measureText(text_);
+    setSize(textSize.x + padding_.x * 2.0f, textSize.y + padding_.y * 2.0f);
+  }
+}
+
+/**
+ * @brief 设置文字颜色
+ * @param color 颜色值
+ */
+void Button::setTextColor(const Color &color) { textColor_ = color; }
+
+/**
+ * @brief 设置纯色背景的颜色状态
+ * @param normal 正常状态颜色
+ * @param hover 悬停状态颜色
+ * @param pressed 按下状态颜色
+ */
+void Button::setBackgroundColor(const Color &normal, const Color &hover,
+                                const Color &pressed) {
+  bgNormal_ = normal;
+  bgHover_ = hover;
+  bgPressed_ = pressed;
+}
+
+/**
+ * @brief 设置边框样式
+ * @param color 边框颜色
+ * @param width 边框宽度
+ */
+void Button::setBorder(const Color &color, float width) {
+  borderColor_ = color;
+  borderWidth_ = width;
+}
+
+/**
+ * @brief 设置圆角半径
+ * @param radius 圆角半径（像素）
+ */
+void Button::setCornerRadius(float radius) {
+  cornerRadius_ = std::max(0.0f, radius);
+}
+
+/**
+ * @brief 设置是否启用圆角矩形
+ * @param enabled 是否启用
+ */
+void Button::setRoundedCornersEnabled(bool enabled) {
+  roundedCornersEnabled_ = enabled;
+}
+
+/**
+ * @brief 设置是否使用Alpha遮罩进行点击检测（用于不规则形状按钮）
+ * @param enabled 是否启用
+ */
+void Button::setUseAlphaMaskForHitTest(bool enabled) {
+  useAlphaMaskForHitTest_ = enabled;
+}
+
+/**
+ * @brief 设置点击回调函数
+ * @param callback 回调函数
+ */
+void Button::setOnClick(Function<void()> callback) {
+  onClick_ = std::move(callback);
+}
+
+/**
+ * @brief 设置悬停时的鼠标光标形状
+ * @param cursor 光标形状枚举
+ */
+void Button::setHoverCursor(CursorShape cursor) { hoverCursor_ = cursor; }
+
+/**
+ * @brief 设置背景图片，支持三种状态
+ * @param normal 正常状态图片
+ * @param hover 悬停状态图片（可选）
+ * @param pressed 按下状态图片（可选）
+ */
+void Button::setBackgroundImage(Ptr<Texture> normal, Ptr<Texture> hover,
+                                Ptr<Texture> pressed) {
+  imgNormal_ = normal;
+  imgHover_ = hover ? hover : normal;
+  imgPressed_ = pressed ? pressed : (hover ? hover : normal);
+  useImageBackground_ = (normal != nullptr);
+
+  // 如果使用原图大小模式，设置按钮大小为图片大小
+  if (useImageBackground_ && scaleMode_ == ImageScaleMode::Original && normal) {
+    setSize(static_cast<float>(normal->getWidth()),
+            static_cast<float>(normal->getHeight()));
+  }
+}
+
+/**
+ * @brief 设置图片缩放模式
+ * @param mode 缩放模式枚举值
+ */
+void Button::setBackgroundImageScaleMode(ImageScaleMode mode) {
+  scaleMode_ = mode;
+  // 如果切换到原图大小模式，更新按钮大小
+  if (useImageBackground_ && scaleMode_ == ImageScaleMode::Original &&
+      imgNormal_) {
+    setSize(static_cast<float>(imgNormal_->getWidth()),
+            static_cast<float>(imgNormal_->getHeight()));
+  }
+}
+
+/**
+ * @brief 设置自定义尺寸
+ * @param size 尺寸向量
+ */
+void Button::setCustomSize(const Vec2 &size) { setSize(size.x, size.y); }
+
+/**
+ * @brief 设置自定义尺寸
+ * @param width 宽度
+ * @param height 高度
+ */
+void Button::setCustomSize(float width, float height) {
+  setSize(width, height);
+}
+
+/**
+ * @brief 根据缩放模式计算图片绘制尺寸
+ * @param buttonSize 按钮尺寸
+ * @param imageSize 图片原始尺寸
+ * @return 计算后的绘制尺寸
+ */
+Vec2 Button::calculateImageSize(const Vec2 &buttonSize, const Vec2 &imageSize) {
+  switch (scaleMode_) {
+  case ImageScaleMode::Original:
+    return imageSize;
+
+  case ImageScaleMode::Stretch:
+    return buttonSize;
+
+  case ImageScaleMode::ScaleFit: {
+    float scaleX = buttonSize.x / imageSize.x;
+    float scaleY = buttonSize.y / imageSize.y;
+    float scale = std::min(scaleX, scaleY);
+    return Vec2(imageSize.x * scale, imageSize.y * scale);
+  }
+
+  case ImageScaleMode::ScaleFill: {
+    float scaleX = buttonSize.x / imageSize.x;
+    float scaleY = buttonSize.y / imageSize.y;
+    float scale = std::max(scaleX, scaleY);
+    return Vec2(imageSize.x * scale, imageSize.y * scale);
+  }
+  }
+  return imageSize;
+}
+
+/**
+ * @brief 绘制背景图片，根据当前状态选择对应的图片
+ * @param renderer 渲染后端
+ * @param rect 按钮矩形区域
+ */
+void Button::drawBackgroundImage(RenderBackend &renderer, const Rect &rect) {
+  Texture *texture = nullptr;
+  if (pressed_ && imgPressed_) {
+    texture = imgPressed_.get();
+  } else if (hovered_ && imgHover_) {
+    texture = imgHover_.get();
+  } else if (imgNormal_) {
+    texture = imgNormal_.get();
+  }
+
+  if (!texture)
+    return;
+
+  Vec2 imageSize(static_cast<float>(texture->getWidth()),
+                 static_cast<float>(texture->getHeight()));
+  Vec2 buttonSize(rect.size.width, rect.size.height);
+  Vec2 drawSize = calculateImageSize(buttonSize, imageSize);
+
+  // 计算绘制位置（居中）
+  Vec2 drawPos(rect.origin.x + (rect.size.width - drawSize.x) * 0.5f,
+               rect.origin.y + (rect.size.height - drawSize.y) * 0.5f);
+
+  Rect destRect(drawPos.x, drawPos.y, drawSize.x, drawSize.y);
+
+  // 绘制图片（使用Alpha混合）
+  renderer.drawSprite(*texture, destRect, Rect(0, 0, imageSize.x, imageSize.y),
+                      Colors::White, 0.0f, Vec2::Zero());
+}
+
+/**
+ * @brief 绘制圆角矩形边框
+ * @param renderer 渲染后端
+ * @param rect 矩形区域
+ * @param color 颜色
+ * @param radius 圆角半径
+ */
+void Button::drawRoundedRect(RenderBackend &renderer, const Rect &rect,
+                             const Color &color, float radius) {
+  // 限制圆角半径不超过矩形尺寸的一半
+  float maxRadius = std::min(rect.size.width, rect.size.height) * 0.5f;
+  radius = std::min(radius, maxRadius);
+
+  if (radius <= 0.0f) {
+    // 圆角为0，使用普通矩形
+    renderer.drawRect(rect, color, borderWidth_);
+    return;
+  }
+
+  const int segments = 8; // 每个圆角的线段数
+  float x = rect.origin.x;
+  float y = rect.origin.y;
+  float w = rect.size.width;
+  float h = rect.size.height;
+  float r = radius;
+
+  // 绘制四条直线边
+  // 上边
+  renderer.drawLine(Vec2(x + r, y), Vec2(x + w - r, y), color, borderWidth_);
+  // 下边
+  renderer.drawLine(Vec2(x + r, y + h), Vec2(x + w - r, y + h), color,
+                    borderWidth_);
+  // 左边
+  renderer.drawLine(Vec2(x, y + r), Vec2(x, y + h - r), color, borderWidth_);
+  // 右边
+  renderer.drawLine(Vec2(x + w, y + r), Vec2(x + w, y + h - r), color,
+                    borderWidth_);
+
+  // 绘制四个圆角（使用线段近似）
+  // 左上角
+  for (int i = 0; i < segments; i++) {
+    float angle1 = 3.14159f * 0.5f * (float)i / segments + 3.14159f;
+    float angle2 = 3.14159f * 0.5f * (float)(i + 1) / segments + 3.14159f;
+    Vec2 p1(x + r + r * cosf(angle1), y + r + r * sinf(angle1));
+    Vec2 p2(x + r + r * cosf(angle2), y + r + r * sinf(angle2));
+    renderer.drawLine(p1, p2, color, borderWidth_);
+  }
+  // 右上角
+  for (int i = 0; i < segments; i++) {
+    float angle1 = 3.14159f * 0.5f * (float)i / segments + 3.14159f * 1.5f;
+    float angle2 =
+        3.14159f * 0.5f * (float)(i + 1) / segments + 3.14159f * 1.5f;
+    Vec2 p1(x + w - r + r * cosf(angle1), y + r + r * sinf(angle1));
+    Vec2 p2(x + w - r + r * cosf(angle2), y + r + r * sinf(angle2));
+    renderer.drawLine(p1, p2, color, borderWidth_);
+  }
+  // 右下角
+  for (int i = 0; i < segments; i++) {
+    float angle1 = 3.14159f * 0.5f * (float)i / segments;
+    float angle2 = 3.14159f * 0.5f * (float)(i + 1) / segments;
+    Vec2 p1(x + w - r + r * cosf(angle1), y + h - r + r * sinf(angle1));
+    Vec2 p2(x + w - r + r * cosf(angle2), y + h - r + r * sinf(angle2));
+    renderer.drawLine(p1, p2, color, borderWidth_);
+  }
+  // 左下角
+  for (int i = 0; i < segments; i++) {
+    float angle1 = 3.14159f * 0.5f * (float)i / segments + 3.14159f * 0.5f;
+    float angle2 =
+        3.14159f * 0.5f * (float)(i + 1) / segments + 3.14159f * 0.5f;
+    Vec2 p1(x + r + r * cosf(angle1), y + h - r + r * sinf(angle1));
+    Vec2 p2(x + r + r * cosf(angle2), y + h - r + r * sinf(angle2));
+    renderer.drawLine(p1, p2, color, borderWidth_);
+  }
+}
+
+/**
+ * @brief 填充圆角矩形
+ * @param renderer 渲染后端
+ * @param rect 矩形区域
+ * @param color 颜色
+ * @param radius 圆角半径
+ */
+void Button::fillRoundedRect(RenderBackend &renderer, const Rect &rect,
+                             const Color &color, float radius) {
+  // 限制圆角半径不超过矩形尺寸的一半
+  float maxRadius = std::min(rect.size.width, rect.size.height) * 0.5f;
+  radius = std::min(radius, maxRadius);
+
+  if (radius <= 0.0f) {
+    // 圆角为0，使用普通矩形填充
+    renderer.fillRect(rect, color);
+    return;
+  }
+
+  const int segments = 8; // 每个圆角的线段数
+  float x = rect.origin.x;
+  float y = rect.origin.y;
+  float w = rect.size.width;
+  float h = rect.size.height;
+  float r = radius;
+
+  // 构建圆角矩形的顶点（使用三角形扇形填充）
+  std::vector<Vec2> vertices;
+
+  // 中心矩形区域
+  vertices.push_back(Vec2(x + r, y + r));         // 左上内角
+  vertices.push_back(Vec2(x + w - r, y + r));     // 右上内角
+  vertices.push_back(Vec2(x + w - r, y + h - r)); // 右下内角
+  vertices.push_back(Vec2(x + r, y + h - r));     // 左下内角
+
+  renderer.fillPolygon(vertices, color);
+
+  // 填充四个侧边矩形
+  // 上边
+  renderer.fillRect(Rect(x + r, y, w - 2 * r, r), color);
+  // 下边
+  renderer.fillRect(Rect(x + r, y + h - r, w - 2 * r, r), color);
+  // 左边
+  renderer.fillRect(Rect(x, y + r, r, h - 2 * r), color);
+  // 右边
+  renderer.fillRect(Rect(x + w - r, y + r, r, h - 2 * r), color);
+
+  // 填充四个圆角（使用扇形）
+  // 左上角
+  vertices.clear();
+  vertices.push_back(Vec2(x + r, y + r));
+  for (int i = 0; i <= segments; i++) {
+    float angle = 3.14159f + 3.14159f * 0.5f * (float)i / segments;
+    vertices.push_back(Vec2(x + r + r * cosf(angle), y + r + r * sinf(angle)));
+  }
+  renderer.fillPolygon(vertices, color);
+
+  // 右上角
+  vertices.clear();
+  vertices.push_back(Vec2(x + w - r, y + r));
+  for (int i = 0; i <= segments; i++) {
+    float angle = 3.14159f * 1.5f + 3.14159f * 0.5f * (float)i / segments;
+    vertices.push_back(
+        Vec2(x + w - r + r * cosf(angle), y + r + r * sinf(angle)));
+  }
+  renderer.fillPolygon(vertices, color);
+
+  // 右下角
+  vertices.clear();
+  vertices.push_back(Vec2(x + w - r, y + h - r));
+  for (int i = 0; i <= segments; i++) {
+    float angle = 0 + 3.14159f * 0.5f * (float)i / segments;
+    vertices.push_back(
+        Vec2(x + w - r + r * cosf(angle), y + h - r + r * sinf(angle)));
+  }
+  renderer.fillPolygon(vertices, color);
+
+  // 左下角
+  vertices.clear();
+  vertices.push_back(Vec2(x + r, y + h - r));
+  for (int i = 0; i <= segments; i++) {
+    float angle = 3.14159f * 0.5f + 3.14159f * 0.5f * (float)i / segments;
+    vertices.push_back(
+        Vec2(x + r + r * cosf(angle), y + h - r + r * sinf(angle)));
+  }
+  renderer.fillPolygon(vertices, color);
+}
+
+/**
+ * @brief 按钮绘制主函数，按正确顺序渲染所有视觉元素
+ *
+ * 渲染顺序：
+ * 1. 背景（图片或纯色）- 最底层
+ * 2. 边框 - 中间层
+ * 3. 文字 - 最顶层
+ *
+ * 注意：此方法在场景渲染的精灵批次中被调用。
+ * 由于 fillRect 和 drawRect 使用形状渲染管线（与精灵批次不同），
+ * 需要在调用它们之前结束精灵批次，然后在 drawText 之前重新开始。
+ */
+void Button::onDraw(RenderBackend &renderer) {
+  Rect rect = getBoundingBox();
+  if (rect.empty()) {
+    return;
+  }
+
+  // ========== 第1层：绘制背景（图片或纯色）==========
+  if (useImageBackground_) {
+    // 图片背景使用精灵批次绘制
+    drawBackgroundImage(renderer, rect);
+  } else {
+    // 纯色背景使用 fillRect 或 fillRoundedRect 绘制
+    renderer.endSpriteBatch();
+
+    Color bg = bgNormal_;
+    if (pressed_) {
+      bg = bgPressed_;
+    } else if (hovered_) {
+      bg = bgHover_;
+    }
+
+    if (roundedCornersEnabled_) {
+      fillRoundedRect(renderer, rect, bg, cornerRadius_);
+    } else {
+      renderer.fillRect(rect, bg);
+    }
+
+    renderer.beginSpriteBatch();
+  }
+
+  // ========== 第2层：绘制边框 ==========
+  renderer.endSpriteBatch();
+
+  if (borderWidth_ > 0.0f) {
+    if (roundedCornersEnabled_) {
+      drawRoundedRect(renderer, rect, borderColor_, cornerRadius_);
+    } else {
+      renderer.drawRect(rect, borderColor_, borderWidth_);
+    }
+  }
+
+  renderer.beginSpriteBatch();
+
+  // ========== 第3层：绘制文字 ==========
+  if (font_ && !text_.empty()) {
+    Vec2 textSize = font_->measureText(text_);
+
+    Vec2 textPos(rect.center().x - textSize.x * 0.5f,
+                 rect.center().y - textSize.y * 0.5f);
+
+    float minX = rect.left() + padding_.x;
+    float minY = rect.top() + padding_.y;
+    float maxX = rect.right() - padding_.x - textSize.x;
+    float maxY = rect.bottom() - padding_.y - textSize.y;
+
+    textPos.x = std::max(minX, std::min(textPos.x, maxX));
+    textPos.y = std::max(minY, std::min(textPos.y, maxY));
+
+    Color finalTextColor = textColor_;
+    finalTextColor.a = 1.0f;
+
+    renderer.drawText(*font_, text_, textPos, finalTextColor);
+  }
+}
+
+// ============================================================================
+// ToggleImageButton 实现
+// ============================================================================
+
+/**
+ * @brief 切换按钮构造函数
+ */
+ToggleImageButton::ToggleImageButton() {
+  setOnClick([this]() { toggle(); });
+}
+
+/**
+ * @brief 创建切换按钮实例的工厂方法
+ * @return 切换按钮智能指针
+ */
+Ptr<ToggleImageButton> ToggleImageButton::create() {
+  return makePtr<ToggleImageButton>();
+}
+
+/**
+ * @brief 设置两种状态的图片
+ * @param stateOffNormal 关闭状态-正常
+ * @param stateOnNormal 开启状态-正常
+ * @param stateOffHover 关闭状态-悬停（可选）
+ * @param stateOnHover 开启状态-悬停（可选）
+ * @param stateOffPressed 关闭状态-按下（可选）
+ * @param stateOnPressed 开启状态-按下（可选）
+ */
+void ToggleImageButton::setStateImages(Ptr<Texture> stateOffNormal,
+                                       Ptr<Texture> stateOnNormal,
+                                       Ptr<Texture> stateOffHover,
+                                       Ptr<Texture> stateOnHover,
+                                       Ptr<Texture> stateOffPressed,
+                                       Ptr<Texture> stateOnPressed) {
+  imgOffNormal_ = stateOffNormal;
+  imgOnNormal_ = stateOnNormal;
+  imgOffHover_ = stateOffHover ? stateOffHover : stateOffNormal;
+  imgOnHover_ = stateOnHover ? stateOnHover : stateOnNormal;
+  imgOffPressed_ = stateOffPressed ? stateOffPressed : stateOffNormal;
+  imgOnPressed_ = stateOnPressed ? stateOnPressed : stateOnNormal;
+
+  if (imgOffNormal_) {
+    setSize(static_cast<float>(imgOffNormal_->getWidth()),
+            static_cast<float>(imgOffNormal_->getHeight()));
+  }
+}
+
+/**
+ * @brief 设置开关状态
+ * @param on 是否开启
+ */
+void ToggleImageButton::setOn(bool on) {
+  if (isOn_ != on) {
+    isOn_ = on;
+    if (onStateChange_) {
+      onStateChange_(isOn_);
+    }
+  }
+}
+
+/**
+ * @brief 切换当前状态
+ */
+void ToggleImageButton::toggle() { setOn(!isOn_); }
+
+/**
+ * @brief 设置状态改变回调
+ * @param callback 回调函数
+ */
+void ToggleImageButton::setOnStateChange(Function<void(bool)> callback) {
+  onStateChange_ = std::move(callback);
+}
+
+/**
+ * @brief 设置两种状态的文字
+ * @param textOff 关闭状态文字
+ * @param textOn 开启状态文字
+ */
+void ToggleImageButton::setStateText(const String &textOff,
+                                     const String &textOn) {
+  textOff_ = textOff;
+  textOn_ = textOn;
+  useStateText_ = true;
+}
+
+/**
+ * @brief 设置两种状态的文字颜色
+ * @param colorOff 关闭状态颜色
+ * @param colorOn 开启状态颜色
+ */
+void ToggleImageButton::setStateTextColor(const Color &colorOff,
+                                          const Color &colorOn) {
+  textColorOff_ = colorOff;
+  textColorOn_ = colorOn;
+  useStateTextColor_ = true;
+}
+
+/**
+ * @brief 切换按钮绘制主函数
+ *
+ * 渲染顺序：
+ * 1. 状态图片背景 - 最底层
+ * 2. 边框 - 中间层
+ * 3. 状态文字 - 最顶层
+ */
+void ToggleImageButton::onDraw(RenderBackend &renderer) {
+  Rect rect = getBoundingBox();
+  if (rect.empty()) {
+    return;
+  }
+
+  // ========== 第1层：根据当前状态和交互状态选择并绘制图片 ==========
+  Ptr<Texture> texture = nullptr;
+
+  if (isOn_) {
+    if (isPressed() && imgOnPressed_) {
+      texture = imgOnPressed_;
+    } else if (isHovered() && imgOnHover_) {
+      texture = imgOnHover_;
+    } else {
+      texture = imgOnNormal_;
+    }
+  } else {
+    if (isPressed() && imgOffPressed_) {
+      texture = imgOffPressed_;
+    } else if (isHovered() && imgOffHover_) {
+      texture = imgOffHover_;
+    } else {
+      texture = imgOffNormal_;
+    }
+  }
+
+  if (texture) {
+    Vec2 imageSize(static_cast<float>(texture->getWidth()),
+                   static_cast<float>(texture->getHeight()));
+    Vec2 buttonSize(rect.size.width, rect.size.height);
+    Vec2 drawSize = imageSize;
+
+    Vec2 drawPos(rect.origin.x + (buttonSize.x - drawSize.x) * 0.5f,
+                 rect.origin.y + (buttonSize.y - drawSize.y) * 0.5f);
+
+    Rect destRect(drawPos.x, drawPos.y, drawSize.x, drawSize.y);
+    renderer.drawSprite(*texture, destRect,
+                        Rect(0, 0, imageSize.x, imageSize.y), Colors::White,
+                        0.0f, Vec2::Zero());
+  }
+
+  // ========== 第2层：绘制边框 ==========
+  renderer.endSpriteBatch();
+
+  float borderWidth = 1.0f;
+  Color borderColor =
+      isOn_ ? Color(0.0f, 1.0f, 0.0f, 0.8f) : Color(0.6f, 0.6f, 0.6f, 1.0f);
+  if (borderWidth > 0.0f) {
+    if (isRoundedCornersEnabled()) {
+      drawRoundedRect(renderer, rect, borderColor, getCornerRadius());
+    } else {
+      renderer.drawRect(rect, borderColor, borderWidth);
+    }
+  }
+
+  renderer.beginSpriteBatch();
+
+  // ========== 第3层：绘制状态文字 ==========
+  auto font = getFont();
+  if (font) {
+    String textToDraw;
+    if (useStateText_) {
+      textToDraw = isOn_ ? textOn_ : textOff_;
+    } else {
+      textToDraw = getText();
+    }
+
+    Color colorToUse;
+    if (useStateTextColor_) {
+      colorToUse = isOn_ ? textColorOn_ : textColorOff_;
+    } else {
+      colorToUse = getTextColor();
+    }
+
+    if (!textToDraw.empty()) {
+      Vec2 textSize = font->measureText(textToDraw);
+      Vec2 textPos(rect.center().x - textSize.x * 0.5f,
+                   rect.center().y - textSize.y * 0.5f);
+
+      colorToUse.a = 1.0f;
+
+      renderer.drawText(*font, textToDraw, textPos, colorToUse);
+    }
+  }
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/ui/widget.cpp b/Extra2D/src/ui/widget.cpp
new file mode 100644
index 0000000..31b8bb0
--- /dev/null
+++ b/Extra2D/src/ui/widget.cpp
@@ -0,0 +1,38 @@
+#include <cmath>
+#include <extra2d/ui/widget.h>
+
+namespace extra2d {
+
+Widget::Widget() { setSpatialIndexed(false); }
+
+void Widget::setSize(const Size &size) {
+  size_ = size;
+  updateSpatialIndex();
+}
+
+void Widget::setSize(float width, float height) {
+  setSize(Size(width, height));
+}
+
+Rect Widget::getBoundingBox() const {
+  if (size_.empty()) {
+    return Rect();
+  }
+
+  auto pos = getPosition();
+  auto anchor = getAnchor();
+  auto scale = getScale();
+
+  float w = size_.width * scale.x;
+  float h = size_.height * scale.y;
+  float x0 = pos.x - size_.width * anchor.x * scale.x;
+  float y0 = pos.y - size_.height * anchor.y * scale.y;
+  float x1 = x0 + w;
+  float y1 = y0 + h;
+
+  float l = std::min(x0, x1);
+  float t = std::min(y0, y1);
+  return Rect(l, t, std::abs(w), std::abs(h));
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/utils/data.cpp b/Extra2D/src/utils/data.cpp
new file mode 100644
index 0000000..8274bb9
--- /dev/null
+++ b/Extra2D/src/utils/data.cpp
@@ -0,0 +1,99 @@
+#include <extra2d/utils/data.h>
+#include <simpleini/SimpleIni.h>
+
+namespace extra2d {
+
+class DataStore::Impl {
+public:
+  CSimpleIniA ini;
+};
+
+DataStore::DataStore() : impl_(makeUnique<Impl>()) {}
+
+DataStore::~DataStore() = default;
+
+bool DataStore::load(const std::string &filename) {
+  filename_ = filename;
+  SI_Error rc = impl_->ini.LoadFile(filename.c_str());
+  return rc >= 0;
+}
+
+bool DataStore::save(const std::string &filename) {
+  const std::string &targetFile = filename.empty() ? filename_ : filename;
+  if (targetFile.empty()) {
+    return false;
+  }
+
+  SI_Error rc = impl_->ini.SaveFile(targetFile.c_str());
+  return rc >= 0;
+}
+
+std::string DataStore::getString(const std::string &section,
+                                 const std::string &key,
+                                 const std::string &defaultValue) {
+  const char *value =
+      impl_->ini.GetValue(section.c_str(), key.c_str(), defaultValue.c_str());
+  return value ? value : defaultValue;
+}
+
+int DataStore::getInt(const std::string &section, const std::string &key,
+                      int defaultValue) {
+  return static_cast<int>(
+      impl_->ini.GetLongValue(section.c_str(), key.c_str(), defaultValue));
+}
+
+float DataStore::getFloat(const std::string &section, const std::string &key,
+                          float defaultValue) {
+  const char *value =
+      impl_->ini.GetValue(section.c_str(), key.c_str(), nullptr);
+  if (value) {
+    return std::stof(value);
+  }
+  return defaultValue;
+}
+
+bool DataStore::getBool(const std::string &section, const std::string &key,
+                        bool defaultValue) {
+  return impl_->ini.GetBoolValue(section.c_str(), key.c_str(), defaultValue);
+}
+
+void DataStore::setString(const std::string &section, const std::string &key,
+                          const std::string &value) {
+  impl_->ini.SetValue(section.c_str(), key.c_str(), value.c_str());
+}
+
+void DataStore::setInt(const std::string &section, const std::string &key,
+                       int value) {
+  impl_->ini.SetLongValue(section.c_str(), key.c_str(), value);
+}
+
+void DataStore::setFloat(const std::string &section, const std::string &key,
+                         float value) {
+  impl_->ini.SetValue(section.c_str(), key.c_str(),
+                      std::to_string(value).c_str());
+}
+
+void DataStore::setBool(const std::string &section, const std::string &key,
+                        bool value) {
+  impl_->ini.SetBoolValue(section.c_str(), key.c_str(), value);
+}
+
+void DataStore::removeKey(const std::string &section, const std::string &key) {
+  impl_->ini.Delete(section.c_str(), key.c_str());
+}
+
+void DataStore::removeSection(const std::string &section) {
+  impl_->ini.Delete(section.c_str(), nullptr);
+}
+
+bool DataStore::hasKey(const std::string &section, const std::string &key) {
+  return impl_->ini.GetValue(section.c_str(), key.c_str(), nullptr) != nullptr;
+}
+
+bool DataStore::hasSection(const std::string &section) {
+  return impl_->ini.GetSection(section.c_str()) != nullptr;
+}
+
+void DataStore::clear() { impl_->ini.Reset(); }
+
+} // namespace extra2d
diff --git a/Extra2D/src/utils/logger.cpp b/Extra2D/src/utils/logger.cpp
new file mode 100644
index 0000000..5887752
--- /dev/null
+++ b/Extra2D/src/utils/logger.cpp
@@ -0,0 +1,37 @@
+#include <extra2d/utils/logger.h>
+
+namespace extra2d {
+
+// 静态成员定义
+LogLevel Logger::level_ = LogLevel::Trace;
+bool Logger::initialized_ = false;
+
+void Logger::init() {
+  if (initialized_) {
+    return;
+  }
+
+  initialized_ = true;
+  log(LogLevel::Info, "Logger initialized");
+}
+
+void Logger::shutdown() {
+  if (initialized_) {
+    log(LogLevel::Info, "Logger shutting down");
+  }
+  initialized_ = false;
+}
+
+void Logger::setLevel(LogLevel level) { level_ = level; }
+
+void Logger::setConsoleOutput(bool /*enable*/) {
+  // On Switch, console output always goes to nxlink stdout
+  // Nothing to configure
+}
+
+void Logger::setFileOutput(const std::string & /*filename*/) {
+  // File output not supported on Switch
+  // Could potentially write to sdmc:/ in the future
+}
+
+} // namespace extra2d
diff --git a/Extra2D/src/utils/random.cpp b/Extra2D/src/utils/random.cpp
new file mode 100644
index 0000000..cc2a528
--- /dev/null
+++ b/Extra2D/src/utils/random.cpp
@@ -0,0 +1,68 @@
+#include <chrono>
+#include <extra2d/utils/random.h>
+
+namespace extra2d {
+
+Random::Random() : floatDist_(0.0f, 1.0f) {
+  // 使用当前时间作为默认种子
+  randomize();
+}
+
+Random &Random::getInstance() {
+  static Random instance;
+  return instance;
+}
+
+void Random::setSeed(uint32 seed) { generator_.seed(seed); }
+
+void Random::randomize() {
+  auto now = std::chrono::high_resolution_clock::now();
+  auto time = now.time_since_epoch().count();
+  generator_.seed(static_cast<uint32>(time));
+}
+
+float Random::getFloat() { return floatDist_(generator_); }
+
+float Random::getFloat(float min, float max) {
+  if (min >= max) {
+    return min;
+  }
+  return min + floatDist_(generator_) * (max - min);
+}
+
+int Random::getInt(int max) {
+  if (max <= 0) {
+    return 0;
+  }
+  std::uniform_int_distribution<int> dist(0, max);
+  return dist(generator_);
+}
+
+int Random::getInt(int min, int max) {
+  if (min >= max) {
+    return min;
+  }
+  std::uniform_int_distribution<int> dist(min, max);
+  return dist(generator_);
+}
+
+bool Random::getBool() { return floatDist_(generator_) >= 0.5f; }
+
+bool Random::getBool(float probability) {
+  if (probability <= 0.0f) {
+    return false;
+  }
+  if (probability >= 1.0f) {
+    return true;
+  }
+  return floatDist_(generator_) < probability;
+}
+
+float Random::getAngle() {
+  static const float TWO_PI = 6.28318530718f;
+  return floatDist_(generator_) * TWO_PI;
+}
+
+float Random::getSigned() { return floatDist_(generator_) * 2.0f - 1.0f; }
+
+} // namespace extra2d
diff --git a/Extra2D/src/utils/timer.cpp b/Extra2D/src/utils/timer.cpp
new file mode 100644
index 0000000..ec1ae7d
--- /dev/null
+++ b/Extra2D/src/utils/timer.cpp
@@ -0,0 +1,118 @@
+#include <algorithm>
+#include <extra2d/utils/timer.h>
+
+namespace extra2d {
+
+uint32 Timer::nextId_ = 1;
+
+Timer::Timer(float interval, bool repeat, Callback callback)
+    : interval_(interval), elapsed_(0.0f), repeat_(repeat), paused_(false),
+      valid_(true), callback_(std::move(callback)) {
+  id_ = nextId_++;
+}
+
+bool Timer::update(float deltaTime) {
+  if (!valid_ || paused_) {
+    return false;
+  }
+
+  elapsed_ += deltaTime;
+
+  if (elapsed_ >= interval_) {
+    if (callback_) {
+      callback_();
+    }
+
+    if (repeat_) {
+      elapsed_ = 0.0f;
+      return true;
+    } else {
+      valid_ = false;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+void Timer::reset() {
+  elapsed_ = 0.0f;
+  valid_ = true;
+  paused_ = false;
+}
+
+void Timer::pause() { paused_ = true; }
+
+void Timer::resume() { paused_ = false; }
+
+void Timer::cancel() { valid_ = false; }
+
+float Timer::getRemaining() const {
+  if (!valid_ || paused_) {
+    return 0.0f;
+  }
+  return std::max(0.0f, interval_ - elapsed_);
+}
+
+// ============================================================================
+// TimerManager 实现
+// ============================================================================
+
+uint32 TimerManager::addTimer(float delay, Timer::Callback callback) {
+  auto timer = std::make_unique<Timer>(delay, false, std::move(callback));
+  uint32 id = timer->getId();
+  timers_.emplace(id, std::move(timer));
+  return id;
+}
+
+uint32 TimerManager::addRepeatingTimer(float interval,
+                                       Timer::Callback callback) {
+  auto timer = std::make_unique<Timer>(interval, true, std::move(callback));
+  uint32 id = timer->getId();
+  timers_.emplace(id, std::move(timer));
+  return id;
+}
+
+void TimerManager::cancelTimer(uint32 timerId) {
+  auto it = timers_.find(timerId);
+  if (it != timers_.end()) {
+    it->second->cancel();
+    timersToRemove_.push_back(timerId);
+  }
+}
+
+void TimerManager::pauseTimer(uint32 timerId) {
+  auto it = timers_.find(timerId);
+  if (it != timers_.end()) {
+    it->second->pause();
+  }
+}
+
+void TimerManager::resumeTimer(uint32 timerId) {
+  auto it = timers_.find(timerId);
+  if (it != timers_.end()) {
+    it->second->resume();
+  }
+}
+
+void TimerManager::update(float deltaTime) {
+  timersToRemove_.clear();
+
+  for (auto &[id, timer] : timers_) {
+    timer->update(deltaTime);
+    if (!timer->isValid()) {
+      timersToRemove_.push_back(id);
+    }
+  }
+
+  for (uint32 id : timersToRemove_) {
+    timers_.erase(id);
+  }
+}
+
+void TimerManager::clear() {
+  timers_.clear();
+  timersToRemove_.clear();
+}
+
+} // namespace extra2d
diff --git a/xmake.lua b/xmake.lua
index 3a68ec4..b87840c 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,12 +1,12 @@
 -- ==============================================
--- Easy2D for Nintendo Switch - Xmake Build Script
--- Purpose: Build Easy2D static library and Switch demo programs
+-- Extra2D for Nintendo Switch - Xmake Build Script
+-- Purpose: Build Extra2D static library and Switch demo programs
 -- Platform: Nintendo Switch (ARM64)
 -- Graphics: Desktop OpenGL 3.3+ via Mesa EGL
 -- Audio: SDL2_mixer
 -- ==============================================
 
-set_project("Easy2D")
+set_project("Extra2D")
 set_version("3.1.0")
 set_languages("c++17")
 set_encodings("utf-8")
@@ -57,13 +57,13 @@ toolchain("switch")
     add_syslinks("nx", "m")
 
 -- 核心路径定义
-local SRC_DIR = "Easy2D/src"
-local INC_DIR = "Easy2D/include"
+local SRC_DIR = "Extra2D/src"
+local INC_DIR = "Extra2D/include"
 
 -- ==============================================
--- 1. Easy2D 静态库 (Switch 专用)
+-- 1. Extra2D 静态库 (Switch 专用)
 -- ==============================================
-target("easy2d")
+target("extra2d")
     set_kind("static")
     set_plat("switch")
     set_arch("arm64")
@@ -106,7 +106,7 @@ target("easy2d")
     -- add_files(path.join(INC_DIR, "pfd/pfd_switch.cpp"))
 
     -- 添加 Switch 兼容性头文件路径
-    add_includedirs(path.join(INC_DIR, "easy2d/platform"), {public = true})
+    add_includedirs(path.join(INC_DIR, "extra2d/platform"), {public = true})
 
     -- Switch 特定编译标志
     -- 注意：Squirrel 脚本绑定使用 dynamic_cast，需要 RTTI 支持
@@ -122,7 +122,7 @@ target("easy2d")
     -- ==============================================
     -- 头文件安装配置
     -- ==============================================
-    add_headerfiles(path.join(INC_DIR, "easy2d/**.h"), {prefixdir = "easy2d"})
+    add_headerfiles(path.join(INC_DIR, "extra2d/**.h"), {prefixdir = "extra2d"})
     -- 使用 devkitPro 的 switch-glm 替代项目自带的 GLM
     -- add_headerfiles(path.join(INC_DIR, "glm/**.hpp"), {prefixdir = "glm"})
     add_headerfiles(path.join(INC_DIR, "stb/**.h"), {prefixdir = "stb"})
@@ -149,8 +149,8 @@ target("switch_audio_demo")
     set_arch("arm64")
     set_toolchains("switch")
     
-    add_files("Easy2D/examples/push_box/src/**.cpp")
-    add_deps("easy2d")
+    add_files("Extra2D/examples/push_box/src/**.cpp")
+    add_deps("extra2d")
     set_targetdir("$(builddir)/switch")
     
     -- 链接 EGL、OpenGL ES 3.0 和 SDL2 音频库
@@ -160,8 +160,8 @@ target("switch_audio_demo")
                  "opusfile", "opus", "vorbisidec", "ogg",
                  "modplug", "mpg123", "FLAC")
 
-    local appTitle = "Easy2D Switch Audio Demo"
-    local appAuthor = "Easy2D Switch Audio Demo"
+    local appTitle = "Extra2D Switch Audio Demo"
+    local appAuthor = "Extra2D Switch Audio Demo"
     local appVersion = "1.0.0"
     
     after_build(function (target)
@@ -171,7 +171,7 @@ target("switch_audio_demo")
         local output_dir = path.directory(elf_file)
         local nacp_file = path.join(output_dir, "switch_audio_demo.nacp")
         local nro_file = path.join(output_dir, "switch_audio_demo.nro")
-        local romfs_dir = "Easy2D/examples/push_box/src/romfs"
+        local romfs_dir = "Extra2D/examples/push_box/src/romfs"
         local nacptool = path.join(devkitPro, "tools/bin/nacptool.exe")
         local elf2nro = path.join(devkitPro, "tools/bin/elf2nro.exe")
 
@@ -209,18 +209,18 @@ target("switch_simple_test")
     set_targetdir("build/switch")
     
     -- 应用信息
-    local appTitle = "Easy2D Simple Test"
-    local appAuthor = "Easy2D Team"
+    local appTitle = "Extra2D Simple Test"
+    local appAuthor = "Extra2D Team"
     local appVersion = "1.0.0"
     
     -- 添加源文件
-    add_files("Easy2D/examples/switch_simple_test/main.cpp")
+    add_files("Extra2D/examples/switch_simple_test/main.cpp")
     
     -- 添加头文件路径
-    add_includedirs("Easy2D/include")
+    add_includedirs("Extra2D/include")
     
-    -- 链接 easy2d 库
-    add_deps("easy2d")
+    -- 链接 extra2d 库
+    add_deps("extra2d")
     
 
     -- 构建后生成 .nro 文件（包含 RomFS）
@@ -230,7 +230,7 @@ target("switch_simple_test")
         local output_dir = path.directory(elf_file)
         local nacp_file = path.join(output_dir, "switch_simple_test.nacp")
         local nro_file = path.join(output_dir, "switch_simple_test.nro")
-        local romfs_dir = "Easy2D/examples/switch_simple_test/romfs"
+        local romfs_dir = "Extra2D/examples/switch_simple_test/romfs"
         local nacptool = path.join(devkitPro, "tools/bin/nacptool.exe")
         local elf2nro = path.join(devkitPro, "tools/bin/elf2nro.exe")