RiCoCoSoul
/
Extra2D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(渲染系统): 重命名 RenderBackend 为 Renderer 并统一相关接口命名 

将渲染后端基类从 RenderBackend 重命名为 Renderer，使其更简洁直观
更新所有相关派生类和接口引用，保持命名一致性
修改渲染器相关方法参数类型为 Renderer&
调整部分成员函数命名风格，如 getWidth()/getHeight() 改为 width()/height()
更新文档和注释中的渲染后端相关描述
This commit is contained in:
ChestnutYueyue 2026-02-26 00:59:16 +08:00
parent bd3cebf0b5
commit 7b1e1299e0
68 changed files with 555 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -114,7 +114,7 @@ mindmap
触摸 Touch
输入码 InputCodes
渲染系统
渲染后端 RenderBackend
渲染后端 Renderer
OpenGL 实现
GLRenderer
GLShader

2
examples/collision_demo/main.cpp
View File

@ -23,7 +23,7 @@ public:
height_);
}
void onRender(RenderBackend &renderer) override {
void onRender(Renderer &renderer) override {
Vec2 position = pos();
// 绘制填充矩形

16
examples/flappy_bird/BaseScene.cpp
View File

@ -21,8 +21,8 @@ void BaseScene::onEnter() {
void BaseScene::updateViewport() {
auto &app = extra2d::Application::instance();
float windowWidth = static_cast<float>(app.window().getWidth());
float windowHeight = static_cast<float>(app.window().getHeight());
float windowWidth = static_cast<float>(app.window().width());
float windowHeight = static_cast<float>(app.window().height());
// 计算游戏内容在窗口中的居中位置
// 保持游戏原始宽高比，进行"黑边"适配
@ -48,11 +48,11 @@ void BaseScene::updateViewport() {
setCamera(camera);
}
void BaseScene::onRender(extra2d::RenderBackend &renderer) {
void BaseScene::onRender(extra2d::Renderer &renderer) {
// 检查窗口大小是否改变，如果改变则更新视口
auto &app = extra2d::Application::instance();
float currentWindowWidth = static_cast<float>(app.window().getWidth());
float currentWindowHeight = static_cast<float>(app.window().getHeight());
float currentWindowWidth = static_cast<float>(app.window().width());
float currentWindowHeight = static_cast<float>(app.window().height());
// 如果窗口大小改变，重新计算视口
float expectedWidth = scaledGameWidth_ + viewportOffsetX_ * 2.0f;
@ -75,7 +75,7 @@ void BaseScene::onRender(extra2d::RenderBackend &renderer) {
extra2d::Scene::onRender(renderer);
}
void BaseScene::renderContent(extra2d::RenderBackend &renderer) {
void BaseScene::renderContent(extra2d::Renderer &renderer) {
// 如果视口参数未初始化（onEnter 还没被调用），先初始化
if (scaledGameWidth_ <= 0.0f || scaledGameHeight_ <= 0.0f) {
updateViewport();
@ -83,8 +83,8 @@ void BaseScene::renderContent(extra2d::RenderBackend &renderer) {
// 检查窗口大小是否改变
auto &app = extra2d::Application::instance();
float currentWindowWidth = static_cast<float>(app.window().getWidth());
float currentWindowHeight = static_cast<float>(app.window().getHeight());
float currentWindowWidth = static_cast<float>(app.window().width());
float currentWindowHeight = static_cast<float>(app.window().height());
float expectedWidth = scaledGameWidth_ + viewportOffsetX_ * 2.0f;
float expectedHeight = scaledGameHeight_ + viewportOffsetY_ * 2.0f;

4
examples/flappy_bird/BaseScene.h
View File

@ -33,13 +33,13 @@ public:
* @brief 渲染时调用，设置居中视口
* @param renderer 渲染后端
*/
void onRender(extra2d::RenderBackend &renderer) override;
void onRender(extra2d::Renderer &renderer) override;
/**
* @brief 渲染场景内容，确保视口正确设置
* @param renderer 渲染后端
*/
void renderContent(extra2d::RenderBackend &renderer) override;
void renderContent(extra2d::Renderer &renderer) override;
protected:
/**

4
examples/flappy_bird/ResLoader.cpp
View File

@ -73,8 +73,8 @@ ResLoader::getKeyFrame(const std::string &name) {
// 检查纹理尺寸
if (atlasTexture_) {
E2D_LOG_INFO("图集纹理尺寸: {}x{}", atlasTexture_->getWidth(),
atlasTexture_->getHeight());
E2D_LOG_INFO("图集纹理尺寸: {}x{}", atlasTexture_->width(),
atlasTexture_->height());
}
return extra2d::makePtr<extra2d::SpriteFrame>(

2
examples/flappy_bird/bird.cpp
View File

@ -89,7 +89,7 @@ void Bird::onUpdate(float dt) {
}
}
void Bird::onRender(extra2d::RenderBackend &renderer) {
void Bird::onRender(extra2d::Renderer &renderer) {
// 精灵会自动渲染，这里只需要处理旋转和偏移
if (sprite_) {
sprite_->setRotation(rotation_);

2
examples/flappy_bird/bird.h
View File

@ -45,7 +45,7 @@ public:
* @brief 渲染小鸟
* @param renderer 渲染后端
*/
void onRender(extra2d::RenderBackend &renderer) override;
void onRender(extra2d::Renderer &renderer) override;
/**
* @brief 进入场景时调用

96
examples/flappy_bird/ground.cpp
View File

@ -3,75 +3,77 @@
// ============================================================================
#include "Ground.h"
#include "ResLoader.h"
#include "BaseScene.h"
#include "ResLoader.h"
namespace flappybird {
Ground::Ground() {
moving_ = true;
moving_ = true;
// 使用游戏逻辑高度，而不是窗口高度
float screenHeight = GAME_HEIGHT;
// 使用游戏逻辑高度，而不是窗口高度
float screenHeight = GAME_HEIGHT;
// 获取地面纹理帧
auto landFrame = ResLoader::getKeyFrame("land");
if (!landFrame) return;
// 获取地面纹理帧
auto landFrame = ResLoader::getKeyFrame("land");
if (!landFrame)
return;
// 获取地面纹理和矩形
auto texture = landFrame->getTexture();
auto rect = landFrame->getRect();
float groundWidth = rect.size.width;
float groundHeight = rect.size.height;
// 获取地面纹理和矩形
auto texture = landFrame->getTexture();
auto rect = landFrame->getRect();
float groundWidth = rect.size.width;
float groundHeight = rect.size.height;
// 创建第一块地面
ground1_ = extra2d::Sprite::create(texture, rect);
ground1_->setAnchor(extra2d::Vec2(0.0f, 1.0f)); // 锚点设在左下角
ground1_->setPosition(extra2d::Vec2(0.0f, screenHeight));
addChild(ground1_);
// 创建第一块地面
ground1_ = extra2d::Sprite::create(texture, rect);
ground1_->setAnchor(extra2d::Vec2(0.0f, 1.0f)); // 锚点设在左下角
ground1_->setPosition(extra2d::Vec2(0.0f, screenHeight));
addChild(ground1_);
// 创建第二块地面，紧挨在第一块右边
ground2_ = extra2d::Sprite::create(texture, rect);
ground2_->setAnchor(extra2d::Vec2(0.0f, 1.0f));
ground2_->setPosition(extra2d::Vec2(groundWidth - 1.0f, screenHeight));
addChild(ground2_);
// 创建第二块地面，紧挨在第一块右边
ground2_ = extra2d::Sprite::create(texture, rect);
ground2_->setAnchor(extra2d::Vec2(0.0f, 1.0f));
ground2_->setPosition(extra2d::Vec2(groundWidth - 1.0f, screenHeight));
addChild(ground2_);
}
void Ground::onUpdate(float dt) {
extra2d::Node::onUpdate(dt);
extra2d::Node::onUpdate(dt);
if (!moving_) return;
if (!ground1_ || !ground2_) return;
if (!moving_)
return;
if (!ground1_ || !ground2_)
return;
// 获取地面宽度（从纹理矩形获取）
float groundWidth = ground1_->getTextureRect().size.width;
// 获取地面宽度（从纹理矩形获取）
float groundWidth = ground1_->getTextureRect().size.width;
// 移动两块地面
extra2d::Vec2 pos1 = ground1_->pos();
extra2d::Vec2 pos2 = ground2_->pos();
// 移动两块地面
extra2d::Vec2 pos1 = ground1_->pos();
extra2d::Vec2 pos2 = ground2_->pos();
pos1.x -= speed * dt;
pos2.x -= speed * dt;
pos1.x -= speed * dt;
pos2.x -= speed * dt;
// 当地面完全移出屏幕左侧时，重置到右侧
if (pos1.x <= -groundWidth) {
pos1.x = pos2.x + groundWidth - 1.0f;
}
if (pos2.x <= -groundWidth) {
pos2.x = pos1.x + groundWidth - 1.0f;
}
// 当地面完全移出屏幕左侧时，重置到右侧
if (pos1.x <= -groundWidth) {
pos1.x = pos2.x + groundWidth - 1.0f;
}
if (pos2.x <= -groundWidth) {
pos2.x = pos1.x + groundWidth - 1.0f;
}
ground1_->setPosition(pos1);
ground2_->setPosition(pos2);
ground1_->setPosition(pos1);
ground2_->setPosition(pos2);
}
void Ground::stop() {
moving_ = false;
}
void Ground::stop() { moving_ = false; }
float Ground::getHeight() const {
auto landFrame = ResLoader::getKeyFrame("land");
return landFrame ? landFrame->getRect().size.height : 112.0f;
float Ground::height() const {
auto landFrame = ResLoader::getKeyFrame("land");
return landFrame ? landFrame->getRect().size.height : 112.0f;
}
} // namespace flappybird

44
examples/flappy_bird/ground.h
View File

@ -15,34 +15,34 @@ namespace flappybird {
*/
class Ground : public extra2d::Node {
public:
/**
* @brief 构造函数
*/
Ground();
/**
* @brief 构造函数
*/
Ground();
/**
* @brief 每帧更新
* @param dt 时间间隔（秒）
*/
void onUpdate(float dt) override;
/**
* @brief 每帧更新
* @param dt 时间间隔（秒）
*/
void onUpdate(float dt) override;
/**
* @brief 停止地面滚动
*/
void stop();
/**
* @brief 停止地面滚动
*/
void stop();
/**
* @brief 获取地面高度
* @return 地面高度
*/
float getHeight() const;
/**
* @brief 获取地面高度
* @return 地面高度
*/
float height() const;
private:
extra2d::Ptr<extra2d::Sprite> ground1_; // 第一块地面
extra2d::Ptr<extra2d::Sprite> ground2_; // 第二块地面
extra2d::Ptr<extra2d::Sprite> ground1_; // 第一块地面
extra2d::Ptr<extra2d::Sprite> ground2_; // 第二块地面
static constexpr float speed = 120.0f; // 滚动速度（像素/秒）
bool moving_ = true; // 是否正在滚动
static constexpr float speed = 120.0f; // 滚动速度（像素/秒）
bool moving_ = true; // 是否正在滚动
};
} // namespace flappybird

16
examples/push_box/BaseScene.cpp
View File

@ -24,8 +24,8 @@ void BaseScene::onEnter() {
*/
void BaseScene::updateViewport() {
auto &app = extra2d::Application::instance();
float windowWidth = static_cast<float>(app.window().getWidth());
float windowHeight = static_cast<float>(app.window().getHeight());
float windowWidth = static_cast<float>(app.window().width());
float windowHeight = static_cast<float>(app.window().height());
// 计算游戏内容在窗口中的居中位置
// 保持游戏原始宽高比，进行"黑边"适配
@ -55,11 +55,11 @@ void BaseScene::updateViewport() {
* @brief 渲染时调用，设置居中视口
* @param renderer 渲染后端
*/
void BaseScene::onRender(extra2d::RenderBackend &renderer) {
void BaseScene::onRender(extra2d::Renderer &renderer) {
// 检查窗口大小是否改变，如果改变则更新视口
auto &app = extra2d::Application::instance();
float currentWindowWidth = static_cast<float>(app.window().getWidth());
float currentWindowHeight = static_cast<float>(app.window().getHeight());
float currentWindowWidth = static_cast<float>(app.window().width());
float currentWindowHeight = static_cast<float>(app.window().height());
// 如果窗口大小改变，重新计算视口
float expectedWidth = scaledGameWidth_ + viewportOffsetX_ * 2.0f;
@ -86,7 +86,7 @@ void BaseScene::onRender(extra2d::RenderBackend &renderer) {
* @brief 渲染场景内容，确保视口正确设置
* @param renderer 渲染后端
*/
void BaseScene::renderContent(extra2d::RenderBackend &renderer) {
void BaseScene::renderContent(extra2d::Renderer &renderer) {
// 如果视口参数未初始化（onEnter 还没被调用），先初始化
if (scaledGameWidth_ <= 0.0f || scaledGameHeight_ <= 0.0f) {
updateViewport();
@ -94,8 +94,8 @@ void BaseScene::renderContent(extra2d::RenderBackend &renderer) {
// 检查窗口大小是否改变
auto &app = extra2d::Application::instance();
float currentWindowWidth = static_cast<float>(app.window().getWidth());
float currentWindowHeight = static_cast<float>(app.window().getHeight());
float currentWindowWidth = static_cast<float>(app.window().width());
float currentWindowHeight = static_cast<float>(app.window().height());
float expectedWidth = scaledGameWidth_ + viewportOffsetX_ * 2.0f;
float expectedHeight = scaledGameHeight_ + viewportOffsetY_ * 2.0f;

54
examples/push_box/BaseScene.h
View File

@ -19,39 +19,39 @@ static constexpr float GAME_HEIGHT = 480.0f;
*/
class BaseScene : public extra2d::Scene {
public:
/**
* @brief 构造函数
*/
BaseScene();
/**
* @brief 构造函数
*/
BaseScene();
/**
* @brief 场景进入时调用
*/
void onEnter() override;
/**
* @brief 场景进入时调用
*/
void onEnter() override;
/**
* @brief 渲染时调用，设置居中视口
* @param renderer 渲染后端
*/
void onRender(extra2d::RenderBackend &renderer) override;
/**
* @brief 渲染时调用，设置居中视口
* @param renderer 渲染后端
*/
void onRender(extra2d::Renderer &renderer) override;
/**
* @brief 渲染场景内容，确保视口正确设置
* @param renderer 渲染后端
*/
void renderContent(extra2d::RenderBackend &renderer) override;
/**
* @brief 渲染场景内容，确保视口正确设置
* @param renderer 渲染后端
*/
void renderContent(extra2d::Renderer &renderer) override;
protected:
/**
* @brief 更新视口计算，使游戏内容在窗口中居中显示
*/
void updateViewport();
/**
* @brief 更新视口计算，使游戏内容在窗口中居中显示
*/
void updateViewport();
// 视口适配参数（用于在窗口中居中显示游戏内容）
float scaledGameWidth_ = 0.0f; // 缩放后的游戏宽度
float scaledGameHeight_ = 0.0f; // 缩放后的游戏高度
float viewportOffsetX_ = 0.0f; // 视口水平偏移
float viewportOffsetY_ = 0.0f; // 视口垂直偏移
// 视口适配参数（用于在窗口中居中显示游戏内容）
float scaledGameWidth_ = 0.0f; // 缩放后的游戏宽度
float scaledGameHeight_ = 0.0f; // 缩放后的游戏高度
float viewportOffsetX_ = 0.0f; // 视口水平偏移
float viewportOffsetY_ = 0.0f; // 视口垂直偏移
};
} // namespace pushbox

7
examples/push_box/PlayScene.cpp
View File

@ -238,8 +238,8 @@ void PlayScene::executeMenuItem() {
void PlayScene::flush() {
mapLayer_->removeAllChildren();
int tileW = texFloor_ ? texFloor_->getWidth() : 32;
int tileH = texFloor_ ? texFloor_->getHeight() : 32;
int tileW = texFloor_ ? texFloor_->width() : 32;
int tileH = texFloor_ ? texFloor_->height() : 32;
// 使用游戏逻辑分辨率
float gameWidth = GAME_WIDTH;
@ -368,7 +368,8 @@ void PlayScene::move(int dx, int dy, int direct) {
}
// 使用对象池创建移动记录（自动管理内存）
auto record = E2D_MAKE_POOLED(MoveRecord, map_.roleX, map_.roleY, targetX, targetY, false);
auto record = E2D_MAKE_POOLED(MoveRecord, map_.roleX, map_.roleY, targetX,
targetY, false);
if (map_.value[targetY][targetX].type == TYPE::Ground) {
g_Pushing = false;

4
examples/push_box/StartScene.cpp
View File

@ -38,8 +38,8 @@ void StartScene::onEnter() {
auto bgTex = resources.loadTexture("assets/images/start.jpg");
if (bgTex) {
auto background = extra2d::Sprite::create(bgTex);
float bgWidth = static_cast<float>(bgTex->getWidth());
float bgHeight = static_cast<float>(bgTex->getHeight());
float bgWidth = static_cast<float>(bgTex->width());
float bgHeight = static_cast<float>(bgTex->height());
float offsetX = (screenW - bgWidth) / 2.0f;
float offsetY = (screenH - bgHeight) / 2.0f;

90
examples/push_box/SuccessScene.cpp
View File

@ -9,73 +9,73 @@
namespace pushbox {
SuccessScene::SuccessScene() : BaseScene() {
// BaseScene 已处理视口设置
// BaseScene 已处理视口设置
}
/**
* @brief 加载菜单字体
*/
static extra2d::Ptr<extra2d::FontAtlas> loadMenuFont() {
auto& resources = extra2d::Application::instance().resources();
auto font = resources.loadFont("assets/font.ttf", 28);
return font;
auto &resources = extra2d::Application::instance().resources();
auto font = resources.loadFont("assets/font.ttf", 28);
return font;
}
void SuccessScene::onEnter() {
BaseScene::onEnter();
BaseScene::onEnter();
auto& app = extra2d::Application::instance();
auto& resources = app.resources();
auto &app = extra2d::Application::instance();
auto &resources = app.resources();
if (children().empty()) {
// 使用游戏逻辑分辨率
float screenW = GAME_WIDTH;
float screenH = GAME_HEIGHT;
if (children().empty()) {
// 使用游戏逻辑分辨率
float screenW = GAME_WIDTH;
float screenH = GAME_HEIGHT;
auto bgTex = resources.loadTexture("assets/images/success.jpg");
if (bgTex) {
auto background = extra2d::Sprite::create(bgTex);
float bgWidth = static_cast<float>(bgTex->getWidth());
float bgHeight = static_cast<float>(bgTex->getHeight());
float offsetX = (screenW - bgWidth) / 2.0f;
float offsetY = (screenH - bgHeight) / 2.0f;
auto bgTex = resources.loadTexture("assets/images/success.jpg");
if (bgTex) {
auto background = extra2d::Sprite::create(bgTex);
float bgWidth = static_cast<float>(bgTex->width());
float bgHeight = static_cast<float>(bgTex->height());
float offsetX = (screenW - bgWidth) / 2.0f;
float offsetY = (screenH - bgHeight) / 2.0f;
background->setAnchor(0.0f, 0.0f);
background->setPosition(offsetX, offsetY);
addChild(background);
background->setAnchor(0.0f, 0.0f);
background->setPosition(offsetX, offsetY);
addChild(background);
float centerX = screenW / 2.0f;
float centerX = screenW / 2.0f;
auto font = loadMenuFont();
if (font) {
// 创建按钮文本（仅显示，不响应鼠标）
auto backText = extra2d::Text::create("回主菜单", font);
backText->setPosition(centerX, offsetY + 350.0f);
backText->setTextColor(extra2d::Colors::Black);
addChild(backText);
auto font = loadMenuFont();
if (font) {
// 创建按钮文本（仅显示，不响应鼠标）
auto backText = extra2d::Text::create("回主菜单", font);
backText->setPosition(centerX, offsetY + 350.0f);
backText->setTextColor(extra2d::Colors::Black);
addChild(backText);
// 创建选择指示器（箭头）
selectorText_ = extra2d::Text::create(">", font);
selectorText_->setTextColor(extra2d::Colors::Red);
selectorText_->setPosition(centerX - 80.0f, offsetY + 350.0f);
addChild(selectorText_);
}
}
// 创建选择指示器（箭头）
selectorText_ = extra2d::Text::create(">", font);
selectorText_->setTextColor(extra2d::Colors::Red);
selectorText_->setPosition(centerX - 80.0f, offsetY + 350.0f);
addChild(selectorText_);
}
}
}
}
void SuccessScene::onUpdate(float dt) {
BaseScene::onUpdate(dt);
BaseScene::onUpdate(dt);
auto& app = extra2d::Application::instance();
auto& input = app.input();
auto &app = extra2d::Application::instance();
auto &input = app.input();
// A键确认返回主菜单
if (input.isButtonPressed(extra2d::GamepadButton::A)) {
auto& scenes = extra2d::Application::instance().scenes();
scenes.popScene(extra2d::TransitionType::Fade, 0.5f);
scenes.popScene(extra2d::TransitionType::Fade, 0.5f);
}
// A键确认返回主菜单
if (input.isButtonPressed(extra2d::GamepadButton::A)) {
auto &scenes = extra2d::Application::instance().scenes();
scenes.popScene(extra2d::TransitionType::Fade, 0.5f);
scenes.popScene(extra2d::TransitionType::Fade, 0.5f);
}
}
} // namespace pushbox

6
examples/spatial_index_demo/main.cpp
View File

@ -60,7 +60,7 @@ public:
setPosition(position);
}
void onRender(RenderBackend &renderer) override {
void onRender(Renderer &renderer) override {
Vec2 position = pos();
// 碰撞时变红色
@ -175,7 +175,7 @@ public:
}
}
void onRender(RenderBackend &renderer) override {
void onRender(Renderer &renderer) override {
auto renderStart = std::chrono::high_resolution_clock::now();
Scene::onRender(renderer);
@ -460,7 +460,7 @@ private:
/**
* @brief 绘制图例方块
*/
void drawLegend(RenderBackend &renderer) {
void drawLegend(Renderer &renderer) {
float legendX = screenWidth_ - 200.0f;
float legendY = 20.0f + 25.0f; // 在标题下方

12
include/animation/sprite_frame_cache.h
View File

@ -2,11 +2,11 @@
#include <animation/sprite_frame.h>
#include <graphics/texture.h>
#include <resource/resource_manager.h>
#include <utils/logger.h>
#include <mutex>
#include <resource/resource_manager.h>
#include <string>
#include <unordered_map>
#include <utils/logger.h>
namespace extra2d {
@ -56,8 +56,8 @@ public:
if (!texture)
return;
int texW = texture->getWidth();
int texH = texture->getHeight();
int texW = texture->width();
int texH = texture->height();
int usableW = texW - 2 * margin;
int usableH = texH - 2 * margin;
int cols = (usableW + spacing) / (frameWidth + spacing);
@ -112,8 +112,8 @@ public:
return nullptr;
// 默认整张纹理作为一帧（index=0），或用整张纹理
Rect rect(0.0f, 0.0f, static_cast<float>(texture->getWidth()),
static_cast<float>(texture->getHeight()));
Rect rect(0.0f, 0.0f, static_cast<float>(texture->width()),
static_cast<float>(texture->height()));
auto frame = SpriteFrame::create(texture, rect);
frame->setName(key);

22
include/app/application.h
View File

@ -3,8 +3,9 @@
#include <core/string.h>
#include <core/types.h>
#include <graphics/render_backend.h>
#include <platform/window.h>
#include <memory>
#include <platform/window.h>
namespace extra2d {
@ -22,11 +23,7 @@ class Camera;
// Application 配置
// ============================================================================
enum class PlatformType {
Auto = 0,
PC,
Switch
};
enum class PlatformType { Auto = 0, PC, Switch };
struct AppConfig {
std::string title = "Easy2D Application";
@ -36,12 +33,12 @@ struct AppConfig {
bool resizable = true;
bool vsync = true;
int fpsLimit = 0;
BackendType renderBackend = BackendType::OpenGL;
BackendType Renderer = BackendType::OpenGL;
int msaaSamples = 0;
PlatformType platform = PlatformType::Auto;
// 窗口高级配置
bool enableCursors = true; // 是否启用光标
bool enableDpiScale = false; // 是否启用DPI缩放
bool enableCursors = true; // 是否启用光标
bool enableDpiScale = false; // 是否启用DPI缩放
};
// ============================================================================
@ -76,7 +73,7 @@ public:
// 子系统访问
// ------------------------------------------------------------------------
Window &window() { return *window_; }
RenderBackend &renderer() { return *renderer_; }
Renderer &renderer() { return *renderer_; }
Input &input();
AudioEngine &audio();
SceneManager &scenes();
@ -90,7 +87,8 @@ public:
// 便捷方法
// ------------------------------------------------------------------------
void enterScene(Ptr<class Scene> scene);
void enterScene(Ptr<class Scene> scene, Ptr<class TransitionScene> transitionScene);
void enterScene(Ptr<class Scene> scene,
Ptr<class TransitionScene> transitionScene);
float deltaTime() const { return deltaTime_; }
float totalTime() const { return totalTime_; }
@ -113,7 +111,7 @@ private:
// 子系统
UniquePtr<Window> window_;
UniquePtr<RenderBackend> renderer_;
UniquePtr<Renderer> renderer_;
UniquePtr<SceneManager> sceneManager_;
UniquePtr<ResourceManager> resourceManager_;
UniquePtr<TimerManager> timerManager_;

4
include/graphics/alpha_mask.h
View File

@ -28,8 +28,8 @@ public:
bool isValid(int x, int y) const;
/// 获取遮罩尺寸
int getWidth() const { return width_; }
int getHeight() const { return height_; }
int width() const { return width_; }
int height() const { return height_; }
Size size() const {
return Size(static_cast<float>(width_), static_cast<float>(height_));
}

4
include/graphics/opengl/gl_renderer.h
View File

@ -15,12 +15,12 @@ class Window;
// ============================================================================
// OpenGL 渲染器实现
// ============================================================================
class GLRenderer : public RenderBackend {
class GLRenderer : public Renderer {
public:
GLRenderer();
~GLRenderer() override;
// RenderBackend 接口实现
// Renderer 接口实现
bool init(Window *window) override;
void shutdown() override;

5
include/graphics/opengl/gl_texture.h
View File

@ -3,7 +3,6 @@
#include <graphics/alpha_mask.h>
#include <graphics/texture.h>
#include <glad/glad.h>
#include <memory>
@ -21,8 +20,8 @@ public:
~GLTexture();
// Texture 接口实现
int getWidth() const override { return width_; }
int getHeight() const override { return height_; }
int width() const override { return width_; }
int height() const override { return height_; }
Size size() const override {
return Size(static_cast<float>(width_), static_cast<float>(height_));
}

6
include/graphics/render_backend.h
View File

@ -37,9 +37,9 @@ enum class BlendMode {
// ============================================================================
// 渲染后端抽象接口
// ============================================================================
class RenderBackend {
class Renderer {
public:
virtual ~RenderBackend() = default;
virtual ~Renderer() = default;
// ------------------------------------------------------------------------
// 生命周期
@ -132,7 +132,7 @@ public:
// ------------------------------------------------------------------------
// 工厂方法
// ------------------------------------------------------------------------
static UniquePtr<RenderBackend> create(BackendType type);
static UniquePtr<Renderer> create(BackendType type);
};
} // namespace extra2d

4
include/graphics/render_target.h
View File

@ -76,8 +76,8 @@ public:
// 尺寸和格式
// ------------------------------------------------------------------------
int getWidth() const { return width_; }
int getHeight() const { return height_; }
int width() const { return width_; }
int height() const { return height_; }
Vec2 size() const {
return Vec2(static_cast<float>(width_), static_cast<float>(height_));
}

5
include/graphics/texture.h
View File

@ -3,7 +3,6 @@
#include <core/math_types.h>
#include <core/types.h>
namespace extra2d {
// ============================================================================
@ -39,8 +38,8 @@ public:
virtual ~Texture() = default;
// 获取尺寸
virtual int getWidth() const = 0;
virtual int getHeight() const = 0;
virtual int width() const = 0;
virtual int height() const = 0;
virtual Size size() const = 0;
// 获取通道数

74
include/graphics/texture_atlas.h
View File

@ -3,12 +3,12 @@
#include <core/color.h>
#include <core/math_types.h>
#include <core/types.h>
#include <graphics/texture.h>
#include <graphics/opengl/gl_texture.h>
#include <string>
#include <vector>
#include <unordered_map>
#include <graphics/texture.h>
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
namespace extra2d {
@ -20,10 +20,10 @@ namespace extra2d {
* @brief 图集中的单个纹理条目
*/
struct AtlasEntry {
std::string name; // 原始纹理名称/路径
Rect uvRect; // 在图集中的 UV 坐标范围
Vec2 originalSize; // 原始纹理尺寸
uint32_t padding; // 边距（用于避免纹理 bleeding）
std::string name; // 原始纹理名称/路径
Rect uvRect; // 在图集中的 UV 坐标范围
Vec2 originalSize; // 原始纹理尺寸
uint32_t padding; // 边距（用于避免纹理 bleeding）
AtlasEntry() : uvRect(), originalSize(), padding(2) {}
};
@ -36,29 +36,29 @@ class TextureAtlasPage {
public:
static constexpr int DEFAULT_SIZE = 2048;
static constexpr int MAX_SIZE = 4096;
static constexpr int MIN_TEXTURE_SIZE = 32; // 小于此大小的纹理才考虑合并
static constexpr int PADDING = 2; // 纹理间边距
static constexpr int MIN_TEXTURE_SIZE = 32; // 小于此大小的纹理才考虑合并
static constexpr int PADDING = 2; // 纹理间边距
TextureAtlasPage(int width = DEFAULT_SIZE, int height = DEFAULT_SIZE);
~TextureAtlasPage();
// 尝试添加纹理到图集
// 返回是否成功，如果成功则输出 uvRect
bool tryAddTexture(const std::string& name, int texWidth, int texHeight,
const uint8_t* pixels, Rect& outUvRect);
bool tryAddTexture(const std::string &name, int texWidth, int texHeight,
const uint8_t *pixels, Rect &outUvRect);
// 获取图集纹理
Ptr<Texture> getTexture() const { return texture_; }
// 获取条目
const AtlasEntry* getEntry(const std::string& name) const;
const AtlasEntry *getEntry(const std::string &name) const;
// 获取使用率
float getUsageRatio() const;
// 获取尺寸
int getWidth() const { return width_; }
int getHeight() const { return height_; }
int width() const { return width_; }
int height() const { return height_; }
// 是否已满
bool isFull() const { return isFull_; }
@ -76,7 +76,7 @@ private:
std::unique_ptr<PackNode> right;
PackNode(int x_, int y_, int w, int h)
: x(x_), y(y_), width(w), height(h), used(false) {}
: x(x_), y(y_), width(w), height(h), used(false) {}
};
std::unique_ptr<PackNode> root_;
@ -84,8 +84,8 @@ private:
int usedArea_;
// 递归插入
PackNode* insert(PackNode* node, int width, int height);
void writePixels(int x, int y, int w, int h, const uint8_t* pixels);
PackNode *insert(PackNode *node, int width, int height);
void writePixels(int x, int y, int w, int h, const uint8_t *pixels);
};
/**
@ -102,22 +102,24 @@ public:
// 添加纹理到图集
// 如果纹理太大，返回 false，应该作为独立纹理加载
bool addTexture(const std::string& name, int width, int height,
const uint8_t* pixels);
bool addTexture(const std::string &name, int width, int height,
const uint8_t *pixels);
// 查询纹理是否在图集中
bool contains(const std::string& name) const;
bool contains(const std::string &name) const;
// 获取纹理在图集中的信息
// 返回图集纹理和 UV 坐标
const Texture* getAtlasTexture(const std::string& name) const;
Rect getUVRect(const std::string& name) const;
const Texture *getAtlasTexture(const std::string &name) const;
Rect getUVRect(const std::string &name) const;
// 获取原始纹理尺寸
Vec2 getOriginalSize(const std::string& name) const;
Vec2 getOriginalSize(const std::string &name) const;
// 获取所有图集页面
const std::vector<std::unique_ptr<TextureAtlasPage>>& getPages() const { return pages_; }
const std::vector<std::unique_ptr<TextureAtlasPage>> &getPages() const {
return pages_;
}
// 获取总使用率
float getTotalUsageRatio() const;
@ -135,7 +137,7 @@ public:
private:
std::vector<std::unique_ptr<TextureAtlasPage>> pages_;
std::unordered_map<std::string, TextureAtlasPage*> entryToPage_;
std::unordered_map<std::string, TextureAtlasPage *> entryToPage_;
int pageSize_;
int sizeThreshold_;
@ -148,26 +150,24 @@ private:
*/
class TextureAtlasManager {
public:
static TextureAtlasManager& getInstance();
static TextureAtlasManager &getInstance();
// 获取主图集
TextureAtlas& getAtlas() { return atlas_; }
TextureAtlas &getAtlas() { return atlas_; }
// 快捷方法
bool addTexture(const std::string& name, int width, int height,
const uint8_t* pixels) {
bool addTexture(const std::string &name, int width, int height,
const uint8_t *pixels) {
return atlas_.addTexture(name, width, height, pixels);
}
bool contains(const std::string& name) const {
return atlas_.contains(name);
}
bool contains(const std::string &name) const { return atlas_.contains(name); }
const Texture* getAtlasTexture(const std::string& name) const {
const Texture *getAtlasTexture(const std::string &name) const {
return atlas_.getAtlasTexture(name);
}
Rect getUVRect(const std::string& name) const {
Rect getUVRect(const std::string &name) const {
return atlas_.getUVRect(name);
}
@ -175,8 +175,8 @@ private:
TextureAtlasManager() = default;
~TextureAtlasManager() = default;
TextureAtlasManager(const TextureAtlasManager&) = delete;
TextureAtlasManager& operator=(const TextureAtlasManager&) = delete;
TextureAtlasManager(const TextureAtlasManager &) = delete;
TextureAtlasManager &operator=(const TextureAtlasManager &) = delete;
TextureAtlas atlas_;
};

5
include/platform/window.h
View File

@ -5,7 +5,6 @@
#include <core/types.h>
#include <functional>
#include <SDL.h>
namespace extra2d {
@ -75,8 +74,8 @@ public:
void setResizable(bool resizable);
// 获取窗口属性
int getWidth() const { return width_; }
int getHeight() const { return height_; }
int width() const { return width_; }
int height() const { return height_; }
Size size() const {
return Size(static_cast<float>(width_), static_cast<float>(height_));
}

9
include/scene/node.h
View File

@ -11,12 +11,11 @@
#include <string>
#include <vector>
namespace extra2d {
// 前向声明
class Scene;
class RenderBackend;
class Renderer;
struct RenderCommand;
class Tween;
enum class TweenEasing : uint8_t;
@ -142,7 +141,7 @@ public:
virtual void onEnter();
virtual void onExit();
virtual void onUpdate(float dt);
virtual void onRender(RenderBackend &renderer);
virtual void onRender(Renderer &renderer);
virtual void onAttachToScene(Scene *scene);
virtual void onDetachFromScene();
@ -246,7 +245,7 @@ public:
// 内部方法
// ------------------------------------------------------------------------
void update(float dt);
void render(RenderBackend &renderer);
void render(Renderer &renderer);
void sortChildren();
bool isRunning() const { return running_; }
@ -258,7 +257,7 @@ public:
protected:
// 子类重写
virtual void onDraw(RenderBackend &renderer) {}
virtual void onDraw(Renderer &renderer) {}
virtual void onUpdateNode(float dt) {}
virtual void generateRenderCommand(std::vector<RenderCommand> &commands,
int zOrder) {};

10
include/scene/scene.h
View File

@ -42,8 +42,8 @@ public:
void setViewportSize(const Size &size);
Size getViewportSize() const { return viewportSize_; }
float getWidth() const { return viewportSize_.width; }
float getHeight() const { return viewportSize_.height; }
float width() const { return viewportSize_.width; }
float height() const { return viewportSize_.height; }
// ------------------------------------------------------------------------
// 场景状态
@ -55,11 +55,11 @@ public:
// ------------------------------------------------------------------------
// 渲染和更新
// ------------------------------------------------------------------------
void renderScene(RenderBackend &renderer);
virtual void renderContent(RenderBackend &renderer);
void renderScene(Renderer &renderer);
virtual void renderContent(Renderer &renderer);
void updateScene(float dt);
void collectRenderCommands(std::vector<RenderCommand> &commands,
int parentZOrder = 0) override;
int parentZOrder = 0) override;
// ------------------------------------------------------------------------
// 空间索引系统

9
include/scene/scene_manager.h
View File

@ -1,14 +1,15 @@
#pragma once
#include <core/types.h>
#include <functional>
#include <scene/scene.h>
#include <scene/transition_scene.h>
#include <functional>
#include <stack>
#include <string>
#include <unordered_map>
#include <vector>
namespace extra2d {
// 前向声明
@ -78,7 +79,7 @@ public:
// 更新和渲染
// ------------------------------------------------------------------------
void update(float dt);
void render(RenderBackend &renderer);
void render(Renderer &renderer);
void collectRenderCommands(std::vector<RenderCommand> &commands);
// ------------------------------------------------------------------------
@ -114,8 +115,8 @@ private:
// 创建过渡场景
Ptr<TransitionScene> createTransitionScene(TransitionType type,
float duration,
Ptr<Scene> inScene);
float duration,
Ptr<Scene> inScene);
std::stack<Ptr<Scene>> sceneStack_;
std::unordered_map<std::string, Ptr<Scene>> namedScenes_;

2
include/scene/shape_node.h
View File

@ -88,7 +88,7 @@ public:
Rect boundingBox() const override;
protected:
void onDraw(RenderBackend &renderer) override;
void onDraw(Renderer &renderer) override;
void generateRenderCommand(std::vector<RenderCommand> &commands,
int zOrder) override;

2
include/scene/sprite.h
View File

@ -40,7 +40,7 @@ public:
Rect boundingBox() const override;
protected:
void onDraw(RenderBackend &renderer) override;
void onDraw(Renderer &renderer) override;
void generateRenderCommand(std::vector<RenderCommand> &commands,
int zOrder) override;

2
include/scene/transition_box_scene.h
View File

@ -25,7 +25,7 @@ public:
protected:
void onTransitionStart() override;
void renderContent(RenderBackend &renderer) override;
void renderContent(Renderer &renderer) override;
private:
int divisions_;

11
include/scene/transition_fade_scene.h
View File

@ -1,8 +1,9 @@
#pragma once
#include <scene/transition_scene.h>
#include <scene/sprite.h>
#include <core/color.h>
#include <scene/sprite.h>
#include <scene/transition_scene.h>
namespace extra2d {
@ -39,7 +40,7 @@ protected:
* @brief 渲染内容
* 根据进度控制新旧场景的显示
*/
void renderContent(RenderBackend &renderer) override;
void renderContent(Renderer &renderer) override;
private:
/**
@ -47,8 +48,8 @@ private:
*/
void hideOutShowIn();
Color maskColor_; // 遮罩颜色
bool hasSwitched_ = false; // 是否已经切换场景
Color maskColor_; // 遮罩颜色
bool hasSwitched_ = false; // 是否已经切换场景
};
} // namespace extra2d

2
include/scene/transition_flip_scene.h
View File

@ -28,7 +28,7 @@ public:
protected:
void onTransitionStart() override;
void renderContent(RenderBackend &renderer) override;
void renderContent(Renderer &renderer) override;
private:
Axis axis_;

2
include/scene/transition_scale_scene.h
View File

@ -23,7 +23,7 @@ public:
protected:
void onTransitionStart() override;
void renderContent(RenderBackend &renderer) override;
void renderContent(Renderer &renderer) override;
};
} // namespace extra2d

17
include/scene/transition_scene.h
View File

@ -1,7 +1,8 @@
#pragma once
#include <scene/scene.h>
#include <functional>
#include <scene/scene.h>
namespace extra2d {
@ -63,7 +64,9 @@ public:
/**
* @brief 设置过渡完成回调
*/
void setFinishCallback(FinishCallback callback) { finishCallback_ = callback; }
void setFinishCallback(FinishCallback callback) {
finishCallback_ = callback;
}
/**
* @brief 获取过渡持续时间
@ -88,7 +91,7 @@ public:
// ------------------------------------------------------------------------
// 渲染 - 在 TransitionScene 上渲染新旧两个子场景
// ------------------------------------------------------------------------
void renderContent(RenderBackend &renderer) override;
void renderContent(Renderer &renderer) override;
// ------------------------------------------------------------------------
// 生命周期
@ -106,20 +109,20 @@ protected:
/**
* @brief 绘制源场景（旧场景）
*/
virtual void drawOutScene(RenderBackend &renderer);
virtual void drawOutScene(Renderer &renderer);
/**
* @brief 绘制目标场景（新场景）
*/
virtual void drawInScene(RenderBackend &renderer);
virtual void drawInScene(Renderer &renderer);
float duration_;
float elapsed_ = 0.0f;
float progress_ = 0.0f;
bool isFinished_ = false;
Ptr<Scene> inScene_; // 要进入的场景
Ptr<Scene> outScene_; // 要退出的场景
Ptr<Scene> inScene_; // 要进入的场景
Ptr<Scene> outScene_; // 要退出的场景
FinishCallback finishCallback_;
};

2
include/scene/transition_slide_scene.h
View File

@ -26,7 +26,7 @@ public:
protected:
void onTransitionStart() override;
void renderContent(RenderBackend &renderer) override;
void renderContent(Renderer &renderer) override;
private:
TransitionDirection direction_;

12
include/ui/button.h
View File

@ -181,12 +181,12 @@ public:
Rect boundingBox() const override;
protected:
void onDrawWidget(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);
void onDrawWidget(Renderer &renderer) override;
void drawBackgroundImage(Renderer &renderer, const Rect &rect);
void drawRoundedRect(Renderer &renderer, const Rect &rect, const Color &color,
float radius);
void fillRoundedRect(Renderer &renderer, const Rect &rect, const Color &color,
float radius);
Vec2 calculateImageSize(const Vec2 &buttonSize, const Vec2 &imageSize);
// 状态访问（供子类使用）

2
include/ui/check_box.h
View File

@ -74,7 +74,7 @@ public:
Rect boundingBox() const override;
protected:
void onDrawWidget(RenderBackend &renderer) override;
void onDrawWidget(Renderer &renderer) override;
bool onMousePress(const MouseEvent &event) override;
bool onMouseRelease(const MouseEvent &event) override;

5
include/ui/label.h
View File

@ -111,7 +111,7 @@ public:
Rect boundingBox() const override;
protected:
void onDrawWidget(RenderBackend &renderer) override;
void onDrawWidget(Renderer &renderer) override;
private:
std::string text_;
@ -138,8 +138,7 @@ private:
mutable bool sizeDirty_ = true;
void updateCache() const;
void drawText(RenderBackend &renderer, const Vec2 &position,
const Color &color);
void drawText(Renderer &renderer, const Vec2 &position, const Color &color);
Vec2 calculateDrawPosition() const;
std::vector<std::string> splitLines() const;
};

12
include/ui/progress_bar.h
View File

@ -151,7 +151,7 @@ public:
protected:
void onUpdate(float deltaTime) override;
void onDrawWidget(RenderBackend &renderer) override;
void onDrawWidget(Renderer &renderer) override;
private:
// 数值
@ -210,11 +210,11 @@ private:
Color getCurrentFillColor() const;
std::string formatText() const;
void drawRoundedRect(RenderBackend &renderer, const Rect &rect,
const Color &color, float radius);
void fillRoundedRect(RenderBackend &renderer, const Rect &rect,
const Color &color, float radius);
void drawStripes(RenderBackend &renderer, const Rect &rect);
void drawRoundedRect(Renderer &renderer, const Rect &rect, const Color &color,
float radius);
void fillRoundedRect(Renderer &renderer, const Rect &rect, const Color &color,
float radius);
void drawStripes(Renderer &renderer, const Rect &rect);
};
} // namespace extra2d

2
include/ui/radio_button.h
View File

@ -79,7 +79,7 @@ public:
Rect boundingBox() const override;
protected:
void onDrawWidget(RenderBackend &renderer) override;
void onDrawWidget(Renderer &renderer) override;
bool onMousePress(const MouseEvent &event) override;
bool onMouseRelease(const MouseEvent &event) override;

2
include/ui/slider.h
View File

@ -106,7 +106,7 @@ public:
Rect boundingBox() const override;
protected:
void onDrawWidget(RenderBackend &renderer) override;
void onDrawWidget(Renderer &renderer) override;
bool onMousePress(const MouseEvent &event) override;
bool onMouseRelease(const MouseEvent &event) override;
bool onMouseMove(const MouseEvent &event) override;

3
include/ui/text.h
View File

@ -8,7 +8,6 @@
#include <string>
#include <ui/widget.h>
namespace extra2d {
// ============================================================================
@ -102,7 +101,7 @@ public:
Rect boundingBox() const override;
protected:
void onDrawWidget(RenderBackend &renderer) override;
void onDrawWidget(Renderer &renderer) override;
private:
std::string text_;

4
include/ui/widget.h
View File

@ -59,10 +59,10 @@ protected:
}
// 子类重写此方法以支持自定义渲染
virtual void onDrawWidget(RenderBackend &renderer) {}
virtual void onDrawWidget(Renderer &renderer) {}
// 重写 Node 的 onDraw
void onDraw(RenderBackend &renderer) override;
void onDraw(Renderer &renderer) override;
private:
Size size_ = Size::Zero();

13
src/app/application.cpp
View File

@ -13,7 +13,6 @@
#include <utils/object_pool.h>
#include <utils/timer.h>
#include <chrono>
#include <thread>
@ -121,7 +120,7 @@ bool Application::init(const AppConfig &config) {
// ========================================
// 4. 初始化渲染器
// ========================================
renderer_ = RenderBackend::create(config.renderBackend);
renderer_ = Renderer::create(config.Renderer);
if (!renderer_ || !renderer_->init(window_.get())) {
E2D_LOG_ERROR("Failed to initialize renderer");
window_->destroy();
@ -136,8 +135,8 @@ bool Application::init(const AppConfig &config) {
timerManager_ = makeUnique<TimerManager>();
eventQueue_ = makeUnique<EventQueue>();
eventDispatcher_ = makeUnique<EventDispatcher>();
camera_ = makeUnique<Camera>(0, static_cast<float>(window_->getWidth()),
static_cast<float>(window_->getHeight()), 0);
camera_ = makeUnique<Camera>(0, static_cast<float>(window_->width()),
static_cast<float>(window_->height()), 0);
// 窗口大小回调
window_->setResizeCallback([this](int width, int height) {
@ -356,7 +355,7 @@ void Application::render() {
return;
}
renderer_->setViewport(0, 0, window_->getWidth(), window_->getHeight());
renderer_->setViewport(0, 0, window_->width(), window_->height());
if (sceneManager_) {
sceneManager_->render(*renderer_);
@ -388,8 +387,8 @@ void Application::enterScene(Ptr<Scene> scene) { enterScene(scene, nullptr); }
void Application::enterScene(Ptr<Scene> scene,
Ptr<class TransitionScene> transitionScene) {
if (sceneManager_ && scene) {
scene->setViewportSize(static_cast<float>(window_->getWidth()),
static_cast<float>(window_->getHeight()));
scene->setViewportSize(static_cast<float>(window_->width()),
static_cast<float>(window_->height()));
sceneManager_->enterScene(scene, transitionScene);
}
}

16
src/graphics/opengl/gl_renderer.cpp
View File

@ -1,8 +1,8 @@
#include <SDL.h>
#include <algorithm>
#include <cmath>
#include <cstring>
#include <core/string.h>
#include <cstring>
#include <graphics/gpu_context.h>
#include <graphics/opengl/gl_font_atlas.h>
#include <graphics/opengl/gl_renderer.h>
@ -227,8 +227,8 @@ void GLRenderer::drawSprite(const Texture &texture, const Rect &destRect,
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 texW = static_cast<float>(tex->width());
float texH = static_cast<float>(tex->height());
// 纹理坐标计算
float u1 = srcRect.origin.x / texW;
@ -249,10 +249,10 @@ void GLRenderer::drawSprite(const Texture &texture, const Rect &destRect,
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()));
Rect destRect(position.x, position.y, static_cast<float>(texture.width()),
static_cast<float>(texture.height()));
Rect srcRect(0, 0, static_cast<float>(texture.width()),
static_cast<float>(texture.height()));
drawSprite(texture, destRect, srcRect, tint, 0.0f, Vec2(0, 0));
}
@ -446,7 +446,7 @@ void GLRenderer::drawText(const FontAtlas &font, const std::string &text,
// 收集所有字符数据用于批处理
std::vector<GLSpriteBatch::SpriteData> sprites;
sprites.reserve(text.size()); // 预分配空间
sprites.reserve(text.size()); // 预分配空间
for (char32_t codepoint : utf8ToUtf32(text)) {
if (codepoint == '\n') {

2
src/graphics/render_backend.cpp
View File

@ -3,7 +3,7 @@
namespace extra2d {
UniquePtr<RenderBackend> RenderBackend::create(BackendType type) {
UniquePtr<Renderer> Renderer::create(BackendType type) {
switch (type) {
case BackendType::OpenGL:
return makeUnique<GLRenderer>();

12
src/graphics/render_target.cpp
View File

@ -81,8 +81,8 @@ bool RenderTarget::createFromTexture(Ptr<Texture> texture, bool hasDepth) {
destroy();
width_ = texture->getWidth();
height_ = texture->getHeight();
width_ = texture->width();
height_ = texture->height();
colorFormat_ = texture->getFormat();
hasDepth_ = hasDepth;
hasStencil_ = false;
@ -238,8 +238,8 @@ void RenderTarget::blitTo(RenderTarget &target, bool color, bool depth) {
}
if (mask != 0) {
glBlitFramebuffer(0, 0, width_, height_, 0, 0, target.getWidth(),
target.getHeight(), mask, GL_LINEAR);
glBlitFramebuffer(0, 0, width_, height_, 0, 0, target.width(),
target.height(), mask, GL_LINEAR);
}
glBindFramebuffer(GL_FRAMEBUFFER, 0);
@ -453,8 +453,8 @@ void MultisampleRenderTarget::resolveTo(RenderTarget &target) {
glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target.getFBO());
glBlitFramebuffer(0, 0, width_, height_, 0, 0, target.getWidth(),
target.getHeight(), GL_COLOR_BUFFER_BIT, GL_LINEAR);
glBlitFramebuffer(0, 0, width_, height_, 0, 0, target.width(),
target.height(), GL_COLOR_BUFFER_BIT, GL_LINEAR);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}

145
src/resource/resource_manager.cpp
View File

@ -1,11 +1,11 @@
#include <algorithm>
#include <cstring>
#include <audio/audio_engine.h>
#include <cstring>
#include <graphics/opengl/gl_font_atlas.h>
#include <graphics/opengl/gl_texture.h>
#include <resource/resource_manager.h>
#include <utils/logger.h>
#include <sys/stat.h>
#include <utils/logger.h>
// Windows 平台需要包含的头文件
#ifdef _WIN32
@ -41,7 +41,8 @@ static std::string getExecutableDirectory() {
}
#endif
// 解析资源路径（优先尝试 romfs:/ 前缀，然后 sdmc:/，最后尝试相对于可执行文件的路径）
// 解析资源路径（优先尝试 romfs:/ 前缀，然后
// sdmc:/，最后尝试相对于可执行文件的路径）
static std::string resolveResourcePath(const std::string &filepath) {
// 如果已经是 romfs 或 sdmc 路径，直接返回
if (isRomfsPath(filepath) || filepath.find("sdmc:/") == 0) {
@ -81,9 +82,7 @@ static std::string resolveResourcePath(const std::string &filepath) {
ResourceManager::ResourceManager() = default;
ResourceManager::~ResourceManager() {
shutdownAsyncLoader();
}
ResourceManager::~ResourceManager() { shutdownAsyncLoader(); }
ResourceManager &ResourceManager::getInstance() {
static ResourceManager instance;
@ -100,7 +99,8 @@ void ResourceManager::initAsyncLoader() {
}
asyncRunning_ = true;
asyncThread_ = std::make_unique<std::thread>(&ResourceManager::asyncLoadLoop, this);
asyncThread_ =
std::make_unique<std::thread>(&ResourceManager::asyncLoadLoop, this);
E2D_LOG_INFO("ResourceManager: async loader initialized");
}
@ -135,7 +135,8 @@ void ResourceManager::asyncLoadLoop() {
{
std::unique_lock<std::mutex> lock(asyncQueueMutex_);
asyncCondition_.wait(lock, [this] { return !asyncTaskQueue_.empty() || !asyncRunning_; });
asyncCondition_.wait(
lock, [this] { return !asyncTaskQueue_.empty() || !asyncRunning_; });
if (!asyncRunning_) {
break;
@ -172,11 +173,13 @@ Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath) {
return loadTexture(filepath, false, TextureFormat::Auto);
}
Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath, bool async) {
Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath,
bool async) {
return loadTexture(filepath, async, TextureFormat::Auto);
}
Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath, bool async, TextureFormat format) {
Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath,
bool async, TextureFormat format) {
if (async) {
// 异步加载：返回空指针，实际纹理通过回调获取
loadTextureAsync(filepath, format, nullptr);
@ -186,11 +189,14 @@ Ptr<Texture> ResourceManager::loadTexture(const std::string &filepath, bool asyn
return loadTextureInternal(filepath, format);
}
void ResourceManager::loadTextureAsync(const std::string &filepath, TextureLoadCallback callback) {
void ResourceManager::loadTextureAsync(const std::string &filepath,
TextureLoadCallback callback) {
loadTextureAsync(filepath, TextureFormat::Auto, callback);
}
void ResourceManager::loadTextureAsync(const std::string &filepath, TextureFormat format, TextureLoadCallback callback) {
void ResourceManager::loadTextureAsync(const std::string &filepath,
TextureFormat format,
TextureLoadCallback callback) {
// 确保异步加载系统已启动
if (!asyncRunning_) {
initAsyncLoader();
@ -229,7 +235,8 @@ void ResourceManager::loadTextureAsync(const std::string &filepath, TextureForma
E2D_LOG_DEBUG("ResourceManager: queued async texture load: {}", filepath);
}
Ptr<Texture> ResourceManager::loadTextureInternal(const std::string &filepath, TextureFormat format) {
Ptr<Texture> ResourceManager::loadTextureInternal(const std::string &filepath,
TextureFormat format) {
std::lock_guard<std::mutex> lock(textureMutex_);
// 检查缓存
@ -273,7 +280,8 @@ Ptr<Texture> ResourceManager::loadTextureInternal(const std::string &filepath, T
evictTexturesIfNeeded();
// 计算纹理大小
size_t textureSize = calculateTextureSize(texture->getWidth(), texture->getHeight(), texture->getFormat());
size_t textureSize = calculateTextureSize(
texture->width(), texture->height(), texture->getFormat());
// 分配LRU节点
uint32_t lruIndex = allocateLRUNode(filepath);
@ -292,7 +300,8 @@ Ptr<Texture> ResourceManager::loadTextureInternal(const std::string &filepath, T
// 添加到LRU链表头部
moveToFront(lruIndex);
E2D_LOG_DEBUG("ResourceManager: loaded texture: {} ({} KB)", filepath, textureSize / 1024);
E2D_LOG_DEBUG("ResourceManager: loaded texture: {} ({} KB)", filepath,
textureSize / 1024);
return texture;
} catch (...) {
E2D_LOG_ERROR("ResourceManager: exception loading texture: {}", filepath);
@ -316,8 +325,10 @@ TextureFormat ResourceManager::selectBestFormat(TextureFormat requested) const {
return TextureFormat::RGBA8;
}
std::vector<uint8_t> ResourceManager::compressTexture(const uint8_t* data, int width, int height,
int channels, TextureFormat format) {
std::vector<uint8_t> ResourceManager::compressTexture(const uint8_t *data,
int width, int height,
int channels,
TextureFormat format) {
// 纹理压缩实现
// 这里需要根据格式使用相应的压缩库
// 如：squish (DXT), etcpack (ETC2), astc-encoder (ASTC)
@ -383,9 +394,9 @@ Ptr<Texture> ResourceManager::getTexture(const std::string &key) const {
auto it = textureCache_.find(key);
if (it != textureCache_.end()) {
const_cast<ResourceManager*>(this)->touchTexture(key);
const_cast<ResourceManager*>(this)->textureHitCount_++;
const_cast<uint32_t&>(it->second.accessCount)++;
const_cast<ResourceManager *>(this)->touchTexture(key);
const_cast<ResourceManager *>(this)->textureHitCount_++;
const_cast<uint32_t &>(it->second.accessCount)++;
return it->second.texture;
}
return nullptr;
@ -402,8 +413,9 @@ void ResourceManager::unloadTexture(const std::string &key) {
auto it = textureCache_.find(key);
if (it != textureCache_.end()) {
// 从LRU链表中移除
auto nodeIt = std::find_if(lruNodes_.begin(), lruNodes_.end(),
[&key](const LRUNode &node) { return node.valid && node.key == key; });
auto nodeIt = std::find_if(
lruNodes_.begin(), lruNodes_.end(),
[&key](const LRUNode &node) { return node.valid && node.key == key; });
if (nodeIt != lruNodes_.end()) {
removeFromList(static_cast<uint32_t>(nodeIt - lruNodes_.begin()) + 1);
freeLRUNode(static_cast<uint32_t>(nodeIt - lruNodes_.begin()) + 1);
@ -648,7 +660,8 @@ size_t ResourceManager::getTextureCacheSize() const {
// LRU 缓存管理
// ============================================================================
void ResourceManager::setTextureCache(size_t maxCacheSize, size_t maxTextureCount,
void ResourceManager::setTextureCache(size_t maxCacheSize,
size_t maxTextureCount,
float unloadInterval) {
std::lock_guard<std::mutex> lock(textureMutex_);
maxCacheSize_ = maxCacheSize;
@ -694,7 +707,8 @@ void ResourceManager::update(float dt) {
size_t targetSize = static_cast<size_t>(maxCacheSize_ * 0.5f);
while (totalTextureSize_ > targetSize && lruTail_ != 0) {
std::string key = evictLRU();
if (key.empty()) break;
if (key.empty())
break;
auto it = textureCache_.find(key);
if (it != textureCache_.end()) {
@ -703,7 +717,8 @@ void ResourceManager::update(float dt) {
E2D_LOG_DEBUG("ResourceManager: auto-evicted texture: {}", key);
}
}
E2D_LOG_INFO("ResourceManager: texture cache trimmed to {} MB", totalTextureSize_ / (1024 * 1024));
E2D_LOG_INFO("ResourceManager: texture cache trimmed to {} MB",
totalTextureSize_ / (1024 * 1024));
}
}
}
@ -733,7 +748,8 @@ uint32_t ResourceManager::allocateLRUNode(const std::string &key) {
}
void ResourceManager::freeLRUNode(uint32_t index) {
if (index == 0 || index > lruNodes_.size()) return;
if (index == 0 || index > lruNodes_.size())
return;
LRUNode &node = lruNodes_[index - 1];
node.valid = false;
@ -744,7 +760,8 @@ void ResourceManager::freeLRUNode(uint32_t index) {
}
void ResourceManager::moveToFront(uint32_t index) {
if (index == 0 || index > lruNodes_.size() || index == lruHead_) return;
if (index == 0 || index > lruNodes_.size() || index == lruHead_)
return;
removeFromList(index);
@ -763,7 +780,8 @@ void ResourceManager::moveToFront(uint32_t index) {
}
void ResourceManager::removeFromList(uint32_t index) {
if (index == 0 || index > lruNodes_.size()) return;
if (index == 0 || index > lruNodes_.size())
return;
LRUNode &node = lruNodes_[index - 1];
@ -781,7 +799,8 @@ void ResourceManager::removeFromList(uint32_t index) {
}
std::string ResourceManager::evictLRU() {
if (lruTail_ == 0) return "";
if (lruTail_ == 0)
return "";
uint32_t index = lruTail_;
std::string key = lruNodes_[index - 1].key;
@ -794,8 +813,9 @@ std::string ResourceManager::evictLRU() {
void ResourceManager::touchTexture(const std::string &key) {
// 查找对应的LRU节点
auto nodeIt = std::find_if(lruNodes_.begin(), lruNodes_.end(),
[&key](const LRUNode &node) { return node.valid && node.key == key; });
auto nodeIt = std::find_if(
lruNodes_.begin(), lruNodes_.end(),
[&key](const LRUNode &node) { return node.valid && node.key == key; });
if (nodeIt != lruNodes_.end()) {
uint32_t index = static_cast<uint32_t>(nodeIt - lruNodes_.begin()) + 1;
moveToFront(index);
@ -813,7 +833,8 @@ void ResourceManager::evictTexturesIfNeeded() {
textureCache_.size() >= maxTextureCount_) &&
lruTail_ != 0) {
std::string key = evictLRU();
if (key.empty()) break;
if (key.empty())
break;
auto it = textureCache_.find(key);
if (it != textureCache_.end()) {
@ -824,24 +845,25 @@ void ResourceManager::evictTexturesIfNeeded() {
}
}
size_t ResourceManager::calculateTextureSize(int width, int height, PixelFormat format) const {
size_t ResourceManager::calculateTextureSize(int width, int height,
PixelFormat format) const {
int bytesPerPixel = 4;
switch (format) {
case PixelFormat::R8:
bytesPerPixel = 1;
break;
case PixelFormat::RG8:
bytesPerPixel = 2;
break;
case PixelFormat::RGB8:
bytesPerPixel = 3;
break;
case PixelFormat::RGBA8:
bytesPerPixel = 4;
break;
default:
bytesPerPixel = 4;
break;
case PixelFormat::R8:
bytesPerPixel = 1;
break;
case PixelFormat::RG8:
bytesPerPixel = 2;
break;
case PixelFormat::RGB8:
bytesPerPixel = 3;
break;
case PixelFormat::RGBA8:
bytesPerPixel = 4;
break;
default:
bytesPerPixel = 4;
break;
}
return static_cast<size_t>(width * height * bytesPerPixel);
}
@ -864,7 +886,8 @@ std::string ResourceManager::loadTextFile(const std::string &filepath) {
return loadTextFile(filepath, "UTF-8");
}
std::string ResourceManager::loadTextFile(const std::string &filepath, const std::string &encoding) {
std::string ResourceManager::loadTextFile(const std::string &filepath,
const std::string &encoding) {
(void)encoding; // 目前只支持 UTF-8
std::lock_guard<std::mutex> lock(textFileMutex_);
@ -888,13 +911,15 @@ std::string ResourceManager::loadTextFile(const std::string &filepath, const std
#ifdef _WIN32
errno_t err = fopen_s(&file, resolvedPath.c_str(), "rb");
if (err != 0 || !file) {
E2D_LOG_ERROR("ResourceManager: failed to open text file: {}", resolvedPath);
E2D_LOG_ERROR("ResourceManager: failed to open text file: {}",
resolvedPath);
return "";
}
#else
file = fopen(resolvedPath.c_str(), "rb");
if (!file) {
E2D_LOG_ERROR("ResourceManager: failed to open text file: {}", resolvedPath);
E2D_LOG_ERROR("ResourceManager: failed to open text file: {}",
resolvedPath);
return "";
}
#endif
@ -917,13 +942,15 @@ std::string ResourceManager::loadTextFile(const std::string &filepath, const std
fclose(file);
if (readSize != static_cast<size_t>(fileSize)) {
E2D_LOG_ERROR("ResourceManager: failed to read text file: {}", resolvedPath);
E2D_LOG_ERROR("ResourceManager: failed to read text file: {}",
resolvedPath);
return "";
}
// 缓存内容
textFileCache_[filepath] = content;
E2D_LOG_DEBUG("ResourceManager: loaded text file: {} ({} bytes)", filepath, content.size());
E2D_LOG_DEBUG("ResourceManager: loaded text file: {} ({} bytes)", filepath,
content.size());
return content;
}
@ -989,13 +1016,15 @@ std::string ResourceManager::loadJsonFile(const std::string &filepath) {
#ifdef _WIN32
errno_t err = fopen_s(&file, resolvedPath.c_str(), "rb");
if (err != 0 || !file) {
E2D_LOG_ERROR("ResourceManager: failed to open JSON file: {}", resolvedPath);
E2D_LOG_ERROR("ResourceManager: failed to open JSON file: {}",
resolvedPath);
return "";
}
#else
file = fopen(resolvedPath.c_str(), "rb");
if (!file) {
E2D_LOG_ERROR("ResourceManager: failed to open JSON file: {}", resolvedPath);
E2D_LOG_ERROR("ResourceManager: failed to open JSON file: {}",
resolvedPath);
return "";
}
#endif
@ -1018,7 +1047,8 @@ std::string ResourceManager::loadJsonFile(const std::string &filepath) {
fclose(file);
if (readSize != static_cast<size_t>(fileSize)) {
E2D_LOG_ERROR("ResourceManager: failed to read JSON file: {}", resolvedPath);
E2D_LOG_ERROR("ResourceManager: failed to read JSON file: {}",
resolvedPath);
return "";
}
@ -1032,7 +1062,8 @@ std::string ResourceManager::loadJsonFile(const std::string &filepath) {
// 缓存内容
jsonFileCache_[filepath] = content;
E2D_LOG_DEBUG("ResourceManager: loaded JSON file: {} ({} bytes)", filepath, content.size());
E2D_LOG_DEBUG("ResourceManager: loaded JSON file: {} ({} bytes)", filepath,
content.size());
return content;
}

5
src/scene/node.cpp
View File

@ -6,7 +6,6 @@
#include <scene/scene.h>
#include <utils/logger.h>
namespace extra2d {
Node::Node() = default;
@ -343,7 +342,7 @@ void Node::onUpdate(float dt) {
}
}
void Node::onRender(RenderBackend &renderer) {
void Node::onRender(Renderer &renderer) {
if (!visible_)
return;
@ -402,7 +401,7 @@ void Node::updateSpatialIndex() {
void Node::update(float dt) { onUpdate(dt); }
void Node::render(RenderBackend &renderer) {
void Node::render(Renderer &renderer) {
if (childrenOrderDirty_) {
sortChildren();
}

4
src/scene/scene.cpp
View File

@ -22,7 +22,7 @@ void Scene::setViewportSize(const Size &size) {
setViewportSize(size.width, size.height);
}
void Scene::renderScene(RenderBackend &renderer) {
void Scene::renderScene(Renderer &renderer) {
if (!visible())
return;
@ -32,7 +32,7 @@ void Scene::renderScene(RenderBackend &renderer) {
renderer.endFrame();
}
void Scene::renderContent(RenderBackend &renderer) {
void Scene::renderContent(Renderer &renderer) {
if (!visible())
return;

2
src/scene/scene_manager.cpp
View File

@ -479,7 +479,7 @@ void SceneManager::update(float dt) {
}
}
void SceneManager::render(RenderBackend &renderer) {
void SceneManager::render(Renderer &renderer) {
Color clearColor = Colors::Black;
if (!sceneStack_.empty()) {
clearColor = sceneStack_.top()->getBackgroundColor();

3
src/scene/shape_node.cpp
View File

@ -5,7 +5,6 @@
#include <limits>
#include <scene/shape_node.h>
namespace extra2d {
ShapeNode::ShapeNode() = default;
@ -167,7 +166,7 @@ Rect ShapeNode::boundingBox() const {
(maxY - minY) + inflate * 2.0f);
}
void ShapeNode::onDraw(RenderBackend &renderer) {
void ShapeNode::onDraw(Renderer &renderer) {
if (points_.empty()) {
return;
}

10
src/scene/sprite.cpp
View File

@ -14,8 +14,8 @@ 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()));
textureRect_ = Rect(0, 0, static_cast<float>(texture_->width()),
static_cast<float>(texture_->height()));
}
updateSpatialIndex();
}
@ -67,7 +67,7 @@ Rect Sprite::boundingBox() const {
return Rect(l, t, std::abs(w), std::abs(h));
}
void Sprite::onDraw(RenderBackend &renderer) {
void Sprite::onDraw(Renderer &renderer) {
if (!texture_ || !texture_->isValid()) {
return;
}
@ -91,7 +91,7 @@ void Sprite::onDraw(RenderBackend &renderer) {
auto anchorPt = anchor();
// 锚点由 RenderBackend 在绘制时处理，这里只传递位置和尺寸
// 锚点由 Renderer 在绘制时处理，这里只传递位置和尺寸
Rect destRect(worldX, worldY, width * worldScaleX, height * worldScaleY);
// Adjust source rect for flipping
@ -137,7 +137,7 @@ void Sprite::generateRenderCommand(std::vector<RenderCommand> &commands,
auto anchorPt = anchor();
// 锚点由 RenderBackend 在绘制时处理，这里只传递位置和尺寸
// 锚点由 Renderer 在绘制时处理，这里只传递位置和尺寸
Rect destRect(worldX, worldY, width * worldScaleX, height * worldScaleY);
// 调整源矩形（翻转）

17
src/scene/transition_box_scene.cpp
View File

@ -1,9 +1,9 @@
#include <scene/transition_box_scene.h>
#include <algorithm>
#include <app/application.h>
#include <graphics/render_backend.h>
#include <core/color.h>
#include <glm/gtc/matrix_transform.hpp>
#include <algorithm>
#include <graphics/render_backend.h>
#include <scene/transition_box_scene.h>
namespace extra2d {
@ -11,9 +11,8 @@ TransitionBoxScene::TransitionBoxScene(float duration, Ptr<Scene> inScene,
int divisions)
: TransitionScene(duration, inScene), divisions_(divisions) {}
Ptr<TransitionBoxScene> TransitionBoxScene::create(float duration,
Ptr<Scene> inScene,
int divisions) {
Ptr<TransitionBoxScene>
TransitionBoxScene::create(float duration, Ptr<Scene> inScene, int divisions) {
return makePtr<TransitionBoxScene>(duration, inScene, divisions);
}
@ -21,11 +20,11 @@ void TransitionBoxScene::onTransitionStart() {
// 方块过渡不需要特殊的初始化
}
void TransitionBoxScene::renderContent(RenderBackend &renderer) {
void TransitionBoxScene::renderContent(Renderer &renderer) {
// 获取窗口大小
auto &app = Application::instance();
float windowWidth = static_cast<float>(app.window().getWidth());
float windowHeight = static_cast<float>(app.window().getHeight());
float windowWidth = static_cast<float>(app.window().width());
float windowHeight = static_cast<float>(app.window().height());
// 更新进度
elapsed_ += 1.0f / 60.0f;

16
src/scene/transition_fade_scene.cpp
View File

@ -1,9 +1,9 @@
#include <scene/transition_fade_scene.h>
#include <app/application.h>
#include <glm/gtc/matrix_transform.hpp>
#include <graphics/render_backend.h>
#include <graphics/render_target.h>
#include <scene/transition_fade_scene.h>
#include <utils/logger.h>
#include <glm/gtc/matrix_transform.hpp>
namespace extra2d {
@ -25,14 +25,14 @@ void TransitionFadeScene::onTransitionStart() {
// 实际进度更新由 SceneManager 的 update 驱动
}
void TransitionFadeScene::renderContent(RenderBackend &renderer) {
void TransitionFadeScene::renderContent(Renderer &renderer) {
// 获取窗口大小
auto &app = Application::instance();
float windowWidth = static_cast<float>(app.window().getWidth());
float windowHeight = static_cast<float>(app.window().getHeight());
float windowWidth = static_cast<float>(app.window().width());
float windowHeight = static_cast<float>(app.window().height());
// 计算当前进度
elapsed_ += 1.0f / 60.0f; // 假设 60fps，实际应该由 update 传递 dt
elapsed_ += 1.0f / 60.0f; // 假设 60fps，实际应该由 update 传递 dt
progress_ = duration_ > 0.0f ? std::min(1.0f, elapsed_ / duration_) : 1.0f;
// 检查是否需要切换场景（进度过半时）
@ -54,10 +54,10 @@ void TransitionFadeScene::renderContent(RenderBackend &renderer) {
float maskAlpha;
if (progress_ < 0.5f) {
// 前半段：从透明到不透明
maskAlpha = progress_ * 2.0f; // 0 -> 1
maskAlpha = progress_ * 2.0f; // 0 -> 1
} else {
// 后半段：从不透明到透明
maskAlpha = (1.0f - progress_) * 2.0f; // 1 -> 0
maskAlpha = (1.0f - progress_) * 2.0f; // 1 -> 0
}
// 设置视口为整个窗口

19
src/scene/transition_flip_scene.cpp
View File

@ -1,7 +1,8 @@
#include <scene/transition_flip_scene.h>
#include <core/math_types.h>
#include <graphics/camera.h>
#include <graphics/render_backend.h>
#include <core/math_types.h>
#include <scene/transition_flip_scene.h>
namespace extra2d {
@ -9,9 +10,8 @@ TransitionFlipScene::TransitionFlipScene(float duration, Ptr<Scene> inScene,
Axis axis)
: TransitionScene(duration, inScene), axis_(axis) {}
Ptr<TransitionFlipScene> TransitionFlipScene::create(float duration,
Ptr<Scene> inScene,
Axis axis) {
Ptr<TransitionFlipScene>
TransitionFlipScene::create(float duration, Ptr<Scene> inScene, Axis axis) {
return makePtr<TransitionFlipScene>(duration, inScene, axis);
}
@ -19,16 +19,17 @@ void TransitionFlipScene::onTransitionStart() {
// 翻页过渡不需要特殊的初始化
}
void TransitionFlipScene::renderContent(RenderBackend &renderer) {
void TransitionFlipScene::renderContent(Renderer &renderer) {
// 更新进度
elapsed_ += 1.0f / 60.0f;
progress_ = duration_ > 0.0f ? std::min(1.0f, elapsed_ / duration_) : 1.0f;
// 缓动函数
float easeProgress = progress_ < 0.5f ? 2.0f * progress_ * progress_
: -1.0f + (4.0f - 2.0f * progress_) * progress_;
float easeProgress = progress_ < 0.5f
? 2.0f * progress_ * progress_
: -1.0f + (4.0f - 2.0f * progress_) * progress_;
float angle = easeProgress * PI_F; // 180度翻转
float angle = easeProgress * PI_F; // 180度翻转
if (progress_ < 0.5f) {
// 前半段：翻转源场景

12
src/scene/transition_scale_scene.cpp
View File

@ -1,7 +1,8 @@
#include <scene/transition_scale_scene.h>
#include <algorithm>
#include <graphics/camera.h>
#include <graphics/render_backend.h>
#include <algorithm>
#include <scene/transition_scale_scene.h>
namespace extra2d {
@ -17,14 +18,15 @@ void TransitionScaleScene::onTransitionStart() {
// 缩放过渡不需要特殊的初始化
}
void TransitionScaleScene::renderContent(RenderBackend &renderer) {
void TransitionScaleScene::renderContent(Renderer &renderer) {
// 更新进度
elapsed_ += 1.0f / 60.0f;
progress_ = duration_ > 0.0f ? std::min(1.0f, elapsed_ / duration_) : 1.0f;
// 缓动函数
float easeProgress = progress_ < 0.5f ? 2.0f * progress_ * progress_
: -1.0f + (4.0f - 2.0f * progress_) * progress_;
float easeProgress = progress_ < 0.5f
? 2.0f * progress_ * progress_
: -1.0f + (4.0f - 2.0f * progress_) * progress_;
// 源场景：缩小消失
if (outScene_) {

9
src/scene/transition_scene.cpp
View File

@ -1,7 +1,8 @@
#include <scene/transition_scene.h>
#include <graphics/render_backend.h>
#include <scene/transition_scene.h>
#include <utils/logger.h>
namespace extra2d {
TransitionScene::TransitionScene(float duration, Ptr<Scene> inScene)
@ -57,7 +58,7 @@ void TransitionScene::finish() {
}
}
void TransitionScene::renderContent(RenderBackend &renderer) {
void TransitionScene::renderContent(Renderer &renderer) {
// 在 TransitionScene 上渲染新旧两个子场景
// 子类可以重写此方法来控制渲染顺序和效果
@ -66,13 +67,13 @@ void TransitionScene::renderContent(RenderBackend &renderer) {
drawInScene(renderer);
}
void TransitionScene::drawOutScene(RenderBackend &renderer) {
void TransitionScene::drawOutScene(Renderer &renderer) {
if (outScene_) {
outScene_->renderContent(renderer);
}
}
void TransitionScene::drawInScene(RenderBackend &renderer) {
void TransitionScene::drawInScene(Renderer &renderer) {
if (inScene_) {
inScene_->renderContent(renderer);
}

15
src/scene/transition_slide_scene.cpp
View File

@ -1,6 +1,7 @@
#include <scene/transition_slide_scene.h>
#include <graphics/camera.h>
#include <graphics/render_backend.h>
#include <scene/transition_slide_scene.h>
namespace extra2d {
@ -8,8 +9,9 @@ TransitionSlideScene::TransitionSlideScene(float duration, Ptr<Scene> inScene,
TransitionDirection direction)
: TransitionScene(duration, inScene), direction_(direction) {}
Ptr<TransitionSlideScene> TransitionSlideScene::create(
float duration, Ptr<Scene> inScene, TransitionDirection direction) {
Ptr<TransitionSlideScene>
TransitionSlideScene::create(float duration, Ptr<Scene> inScene,
TransitionDirection direction) {
return makePtr<TransitionSlideScene>(duration, inScene, direction);
}
@ -17,7 +19,7 @@ void TransitionSlideScene::onTransitionStart() {
// 滑动过渡不需要特殊的初始化
}
void TransitionSlideScene::renderContent(RenderBackend &renderer) {
void TransitionSlideScene::renderContent(Renderer &renderer) {
// 获取视口尺寸
float screenWidth = 800.0f;
float screenHeight = 600.0f;
@ -41,8 +43,9 @@ void TransitionSlideScene::renderContent(RenderBackend &renderer) {
progress_ = duration_ > 0.0f ? std::min(1.0f, elapsed_ / duration_) : 1.0f;
// 缓动函数
float easeProgress = progress_ < 0.5f ? 2.0f * progress_ * progress_
: -1.0f + (4.0f - 2.0f * progress_) * progress_;
float easeProgress = progress_ < 0.5f
? 2.0f * progress_ * progress_
: -1.0f + (4.0f - 2.0f * progress_) * progress_;
// 渲染退出场景（滑出）
if (outScene_) {

36
src/ui/button.cpp
View File

@ -267,8 +267,8 @@ void Button::setBackgroundImage(Ptr<Texture> normal, Ptr<Texture> hover,
useTextureRect_ = false;
if (useImageBackground_ && scaleMode_ == ImageScaleMode::Original && normal) {
setSize(static_cast<float>(normal->getWidth()),
static_cast<float>(normal->getHeight()));
setSize(static_cast<float>(normal->width()),
static_cast<float>(normal->height()));
}
}
@ -317,8 +317,8 @@ void Button::setStateBackgroundImage(
useTextureRect_ = false;
if (useStateImages_ && scaleMode_ == ImageScaleMode::Original && offNormal) {
setSize(static_cast<float>(offNormal->getWidth()),
static_cast<float>(offNormal->getHeight()));
setSize(static_cast<float>(offNormal->width()),
static_cast<float>(offNormal->height()));
}
}
@ -330,8 +330,8 @@ void Button::setBackgroundImageScaleMode(ImageScaleMode mode) {
scaleMode_ = mode;
if (useImageBackground_ && scaleMode_ == ImageScaleMode::Original &&
imgNormal_) {
setSize(static_cast<float>(imgNormal_->getWidth()),
static_cast<float>(imgNormal_->getHeight()));
setSize(static_cast<float>(imgNormal_->width()),
static_cast<float>(imgNormal_->height()));
}
}
@ -408,7 +408,7 @@ Vec2 Button::calculateImageSize(const Vec2 &buttonSize, const Vec2 &imageSize) {
* @param renderer 渲染后端
* @param rect 绘制区域
*/
void Button::drawBackgroundImage(RenderBackend &renderer, const Rect &rect) {
void Button::drawBackgroundImage(Renderer &renderer, const Rect &rect) {
Texture *texture = nullptr;
Rect srcRect;
@ -431,28 +431,28 @@ void Button::drawBackgroundImage(RenderBackend &renderer, const Rect &rect) {
}
}
if (texture) {
srcRect = Rect(0, 0, static_cast<float>(texture->getWidth()),
static_cast<float>(texture->getHeight()));
srcRect = Rect(0, 0, static_cast<float>(texture->width()),
static_cast<float>(texture->height()));
}
} else {
if (pressed_ && imgPressed_) {
texture = imgPressed_.get();
srcRect = useTextureRect_
? imgPressedRect_
: Rect(0, 0, static_cast<float>(imgPressed_->getWidth()),
static_cast<float>(imgPressed_->getHeight()));
: Rect(0, 0, static_cast<float>(imgPressed_->width()),
static_cast<float>(imgPressed_->height()));
} else if (hovered_ && imgHover_) {
texture = imgHover_.get();
srcRect = useTextureRect_
? imgHoverRect_
: Rect(0, 0, static_cast<float>(imgHover_->getWidth()),
static_cast<float>(imgHover_->getHeight()));
: Rect(0, 0, static_cast<float>(imgHover_->width()),
static_cast<float>(imgHover_->height()));
} else if (imgNormal_) {
texture = imgNormal_.get();
srcRect = useTextureRect_
? imgNormalRect_
: Rect(0, 0, static_cast<float>(imgNormal_->getWidth()),
static_cast<float>(imgNormal_->getHeight()));
: Rect(0, 0, static_cast<float>(imgNormal_->width()),
static_cast<float>(imgNormal_->height()));
}
}
@ -479,7 +479,7 @@ void Button::drawBackgroundImage(RenderBackend &renderer, const Rect &rect) {
* @param color 颜色
* @param radius 圆角半径
*/
void Button::drawRoundedRect(RenderBackend &renderer, const Rect &rect,
void Button::drawRoundedRect(Renderer &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);
@ -542,7 +542,7 @@ void Button::drawRoundedRect(RenderBackend &renderer, const Rect &rect,
* @param color 颜色
* @param radius 圆角半径
*/
void Button::fillRoundedRect(RenderBackend &renderer, const Rect &rect,
void Button::fillRoundedRect(Renderer &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);
@ -613,7 +613,7 @@ void Button::fillRoundedRect(RenderBackend &renderer, const Rect &rect,
* @brief 绘制组件
* @param renderer 渲染后端
*/
void Button::onDrawWidget(RenderBackend &renderer) {
void Button::onDrawWidget(Renderer &renderer) {
Rect rect = boundingBox();
if (rect.empty()) {
return;

2
src/ui/check_box.cpp
View File

@ -127,7 +127,7 @@ Rect CheckBox::boundingBox() const {
* @brief 绘制组件
* @param renderer 渲染后端
*/
void CheckBox::onDrawWidget(RenderBackend &renderer) {
void CheckBox::onDrawWidget(Renderer &renderer) {
Vec2 position = pos();
Rect boxRect(position.x, position.y + (size().height - boxSize_) * 0.5f,

4
src/ui/label.cpp
View File

@ -323,7 +323,7 @@ Vec2 Label::calculateDrawPosition() const {
* @param position 绘制位置
* @param color 文本颜色
*/
void Label::drawText(RenderBackend &renderer, const Vec2 &position,
void Label::drawText(Renderer &renderer, const Vec2 &position,
const Color &color) {
if (!font_ || text_.empty()) {
return;
@ -366,7 +366,7 @@ Rect Label::boundingBox() const {
* @brief 绘制组件
* @param renderer 渲染后端
*/
void Label::onDrawWidget(RenderBackend &renderer) {
void Label::onDrawWidget(Renderer &renderer) {
if (!font_ || text_.empty()) {
return;
}

8
src/ui/progress_bar.cpp
View File

@ -340,7 +340,7 @@ void ProgressBar::onUpdate(float deltaTime) {
* @brief 绘制组件
* @param renderer 渲染后端
*/
void ProgressBar::onDrawWidget(RenderBackend &renderer) {
void ProgressBar::onDrawWidget(Renderer &renderer) {
Vec2 position = pos();
Size widgetSize = size();
@ -446,7 +446,7 @@ void ProgressBar::onDrawWidget(RenderBackend &renderer) {
* @param color 颜色
* @param radius 圆角半径
*/
void ProgressBar::drawRoundedRect(RenderBackend &renderer, const Rect &rect,
void ProgressBar::drawRoundedRect(Renderer &renderer, const Rect &rect,
const Color &color, float radius) {
renderer.drawRect(rect, color, borderWidth_);
}
@ -458,7 +458,7 @@ void ProgressBar::drawRoundedRect(RenderBackend &renderer, const Rect &rect,
* @param color 颜色
* @param radius 圆角半径
*/
void ProgressBar::fillRoundedRect(RenderBackend &renderer, const Rect &rect,
void ProgressBar::fillRoundedRect(Renderer &renderer, const Rect &rect,
const Color &color, float radius) {
renderer.fillRect(rect, color);
}
@ -468,7 +468,7 @@ void ProgressBar::fillRoundedRect(RenderBackend &renderer, const Rect &rect,
* @param renderer 渲染后端
* @param rect 矩形区域
*/
void ProgressBar::drawStripes(RenderBackend &renderer, const Rect &rect) {
void ProgressBar::drawStripes(Renderer &renderer, const Rect &rect) {
const float stripeWidth = 10.0f;
const float spacing = 20.0f;
float rectRight = rect.origin.x + rect.size.width;

2
src/ui/radio_button.cpp
View File

@ -128,7 +128,7 @@ Rect RadioButton::boundingBox() const {
* @brief 绘制组件
* @param renderer 渲染后端
*/
void RadioButton::onDrawWidget(RenderBackend &renderer) {
void RadioButton::onDrawWidget(Renderer &renderer) {
Vec2 position = pos();
float centerX = position.x + circleSize_ * 0.5f;
float centerY = position.y + size().height * 0.5f;

2
src/ui/slider.cpp
View File

@ -306,7 +306,7 @@ float Slider::snapToStep(float value) const {
* @brief 绘制组件
* @param renderer 渲染后端
*/
void Slider::onDrawWidget(RenderBackend &renderer) {
void Slider::onDrawWidget(Renderer &renderer) {
Rect trackRect = getTrackRect();
renderer.fillRect(trackRect, trackColor_);

2
src/ui/text.cpp
View File

@ -234,7 +234,7 @@ Rect Text::boundingBox() const {
* @brief 绘制组件
* @param renderer 渲染后端
*/
void Text::onDrawWidget(RenderBackend &renderer) {
void Text::onDrawWidget(Renderer &renderer) {
if (!font_ || text_.empty()) {
return;
}

2
src/ui/widget.cpp
View File

@ -38,6 +38,6 @@ Rect Widget::boundingBox() const {
// ------------------------------------------------------------------------
// 重写 onDraw
// ------------------------------------------------------------------------
void Widget::onDraw(RenderBackend &renderer) { onDrawWidget(renderer); }
void Widget::onDraw(Renderer &renderer) { onDrawWidget(renderer); }
} // namespace extra2d