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

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 {
@ -37,9 +37,7 @@ Application& Application::get() {
return instance;
}
Application::Application() {
Registry::instance().setApp(this);
}
Application::Application() { Registry::instance().setApp(this); }
Application::~Application() {
if (initialized_) {
@ -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;
if (!winMod || !winMod->win())
return;
lastFrameTime_ = getTimeSeconds();
@ -215,11 +217,13 @@ void Application::update() {
void Application::render() {
auto *renderMod = get<RenderModule>();
if (!renderMod || !renderMod->renderer()) return;
if (!renderMod || !renderMod->renderer())
return;
auto *renderer = renderMod->renderer();
auto *winMod = get<WindowModule>();
if (!winMod || !winMod->win()) return;
if (!winMod || !winMod->win())
return;
auto cameraService = ServiceLocator::instance().getService<ICameraService>();
if (cameraService) {
@ -229,7 +233,8 @@ void Application::render() {
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>();

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;
@ -126,7 +128,8 @@ int main(int argc, char *argv[]) {
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>();