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

refactor: 整理头文件顺序并格式化代码 

重构头文件引入顺序以保持一致性，并统一代码格式化风格
This commit is contained in:
ChestnutYueyue 2026-02-17 00:12:32 +08:00
parent 9f83b8fde5
commit 4b1de5e36a
2 changed files with 221 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Extra2D/src/app/application.cpp
View File

@ -1,20 +1,20 @@
#include <extra2d/app/application.h>
#include <extra2d/core/registry.h>
#include <extra2d/platform/window_module.h>
#include <extra2d/platform/input_module.h>
#include <extra2d/graphics/core/render_module.h>
#include <extra2d/platform/iwindow.h>
#include <extra2d/platform/iinput.h>
#include <extra2d/graphics/core/render_backend.h>
#include <extra2d/graphics/core/render_module.h>
#include <extra2d/graphics/memory/vram_manager.h>
#include <extra2d/platform/iinput.h>
#include <extra2d/platform/input_module.h>
#include <extra2d/platform/iwindow.h>
#include <extra2d/platform/window_module.h>
#include <extra2d/services/camera_service.h>
#include <extra2d/services/event_service.h>
#include <extra2d/services/logger_service.h>
#include <extra2d/services/scene_service.h>
#include <extra2d/services/timer_service.h>
#include <extra2d/services/event_service.h>
#include <extra2d/services/camera_service.h>
#include <extra2d/services/logger_service.h>
#include <extra2d/graphics/memory/vram_manager.h>
#include <chrono>
#include <thread>
namespace extra2d {
@ -32,14 +32,12 @@ static double getTimeSeconds() {
#endif
}
Application& Application::get() {
Application &Application::get() {
static Application instance;
return instance;
}
Application::Application() {
Registry::instance().setApp(this);
}
Application::Application() { Registry::instance().setApp(this); }
Application::~Application() {
if (initialized_) {
@ -52,7 +50,7 @@ bool Application::init() {
return init(cfg);
}
bool Application::init(const AppConfig& config) {
bool Application::init(const AppConfig &config) {
if (initialized_) {
return true;
}
@ -60,7 +58,7 @@ bool Application::init(const AppConfig& config) {
appConfig_ = config;
// 首先注册日志服务（模块初始化可能需要它）
auto& locator = ServiceLocator::instance();
auto &locator = ServiceLocator::instance();
if (!locator.hasService<ILogger>()) {
auto logger = makeShared<ConsoleLogger>();
locator.registerService(std::static_pointer_cast<ILogger>(logger));
@ -80,7 +78,7 @@ bool Application::init(const AppConfig& config) {
}
void Application::registerCoreServices() {
auto& locator = ServiceLocator::instance();
auto &locator = ServiceLocator::instance();
if (!locator.hasService<ISceneService>()) {
auto service = makeShared<SceneService>();
@ -97,10 +95,10 @@ void Application::registerCoreServices() {
locator.registerService(std::static_pointer_cast<IEventService>(service));
}
auto* winMod = get<WindowModule>();
auto *winMod = get<WindowModule>();
if (winMod && winMod->win() && !locator.hasService<ICameraService>()) {
auto cameraService = makeShared<CameraService>();
auto* win = winMod->win();
auto *win = winMod->win();
cameraService->setViewport(0, static_cast<float>(win->width()),
static_cast<float>(win->height()), 0);
ViewportConfig vpConfig;
@ -109,7 +107,8 @@ void Application::registerCoreServices() {
vpConfig.mode = ViewportMode::AspectRatio;
cameraService->setViewportConfig(vpConfig);
cameraService->updateViewport(win->width(), win->height());
locator.registerService(std::static_pointer_cast<ICameraService>(cameraService));
locator.registerService(
std::static_pointer_cast<ICameraService>(cameraService));
win->onResize([cameraService](int width, int height) {
cameraService->updateViewport(width, height);
@ -121,7 +120,8 @@ void Application::registerCoreServices() {
}
void Application::shutdown() {
if (!initialized_) return;
if (!initialized_)
return;
VRAMMgr::get().printStats();
@ -134,10 +134,12 @@ void Application::shutdown() {
}
void Application::run() {
if (!initialized_) return;
if (!initialized_)
return;
auto* winMod = get<WindowModule>();
if (!winMod || !winMod->win()) return;
auto *winMod = get<WindowModule>();
if (!winMod || !winMod->win())
return;
lastFrameTime_ = getTimeSeconds();
@ -181,7 +183,7 @@ void Application::mainLoop() {
fpsTimer_ -= 1.0f;
}
auto* winMod = get<WindowModule>();
auto *winMod = get<WindowModule>();
if (winMod && winMod->win()) {
winMod->win()->poll();
}
@ -198,7 +200,7 @@ void Application::mainLoop() {
render();
// 帧率限制
auto* renderMod = get<RenderModule>();
auto *renderMod = get<RenderModule>();
if (renderMod && renderMod->renderer()) {
// 这里可以添加帧率限制逻辑
}
@ -207,29 +209,32 @@ void Application::mainLoop() {
void Application::update() {
ServiceLocator::instance().updateAll(deltaTime_);
auto* inputMod = get<InputModule>();
auto *inputMod = get<InputModule>();
if (inputMod) {
inputMod->update();
}
}
void Application::render() {
auto* renderMod = get<RenderModule>();
if (!renderMod || !renderMod->renderer()) return;
auto *renderMod = get<RenderModule>();
if (!renderMod || !renderMod->renderer())
return;
auto* renderer = renderMod->renderer();
auto* winMod = get<WindowModule>();
if (!winMod || !winMod->win()) return;
auto *renderer = renderMod->renderer();
auto *winMod = get<WindowModule>();
if (!winMod || !winMod->win())
return;
auto cameraService = ServiceLocator::instance().getService<ICameraService>();
if (cameraService) {
const auto& vp = cameraService->getViewportResult().viewport;
const auto &vp = cameraService->getViewportResult().viewport;
renderer->setViewport(
static_cast<int>(vp.origin.x), static_cast<int>(vp.origin.y),
static_cast<int>(vp.size.width), static_cast<int>(vp.size.height));
renderer->setViewProjection(cameraService->getViewProjectionMatrix());
} else {
renderer->setViewport(0, 0, winMod->win()->width(), winMod->win()->height());
renderer->setViewport(0, 0, winMod->win()->width(),
winMod->win()->height());
}
auto sceneService = ServiceLocator::instance().getService<ISceneService>();
@ -240,24 +245,24 @@ void Application::render() {
winMod->win()->swap();
}
IWindow* Application::window() {
auto* winMod = get<WindowModule>();
IWindow *Application::window() {
auto *winMod = get<WindowModule>();
return winMod ? winMod->win() : nullptr;
}
RenderBackend* Application::renderer() {
auto* renderMod = get<RenderModule>();
RenderBackend *Application::renderer() {
auto *renderMod = get<RenderModule>();
return renderMod ? renderMod->renderer() : nullptr;
}
IInput* Application::input() {
auto* winMod = get<WindowModule>();
IInput *Application::input() {
auto *winMod = get<WindowModule>();
return (winMod && winMod->win()) ? winMod->win()->input() : nullptr;
}
void Application::enterScene(Ptr<Scene> scene) {
auto sceneService = ServiceLocator::instance().getService<ISceneService>();
auto* winMod = get<WindowModule>();
auto *winMod = get<WindowModule>();
if (sceneService && scene && winMod && winMod->win()) {
scene->setViewportSize(static_cast<float>(winMod->win()->width()),
static_cast<float>(winMod->win()->height()));

17
examples/basic/main.cpp
View File

@ -3,15 +3,16 @@
* @brief Extra2D 场景图测试示例
*/
#include <extra2d/extra2d.h>
#include <extra2d/platform/window_module.h>
#include <extra2d/platform/input_module.h>
#include <extra2d/graphics/core/render_module.h>
#include <extra2d/core/service_locator.h>
#include <extra2d/services/event_service.h>
#include <extra2d/extra2d.h>
#include <extra2d/graphics/core/render_module.h>
#include <extra2d/platform/input_module.h>
#include <extra2d/platform/window_module.h>
#include <extra2d/services/camera_service.h>
#include <extra2d/services/event_service.h>
#include <iostream>
using namespace extra2d;
void createSceneGraph(Scene *scene) {
@ -106,6 +107,7 @@ int main(int argc, char *argv[]) {
winCfg.w = 1280;
winCfg.h = 720;
winCfg.priority = 0;
winCfg.backend = "glfw";
app.use<WindowModule>(winCfg);
RenderModule::Cfg renderCfg;
@ -124,9 +126,10 @@ int main(int argc, char *argv[]) {
std::cout << "Application initialized successfully!" << std::endl;
auto* win = app.window();
auto *win = app.window();
if (win) {
std::cout << "Window: " << win->width() << "x" << win->height() << std::endl;
std::cout << "Window: " << win->width() << "x" << win->height()
<< std::endl;
}
auto eventService = ServiceLocator::instance().getService<IEventService>();