A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
refactor: remove RenderCommand static proxy
esengine010afd83d8f5
diff --git a/src/esengine/ESEngine.hpp b/src/esengine/ESEngine.hppindex bf3cb8890..1a82a15db 100644--- a/src/esengine/ESEngine.hpp+++ b/src/esengine/ESEngine.hpp@@ -44,7 +44,6 @@#include "renderer/Buffer.hpp"#include "renderer/Shader.hpp"#include "renderer/Texture.hpp"-#include "renderer/RenderCommand.hpp"#include "renderer/Renderer.hpp"// Platformdiff --git a/src/esengine/app/App.cpp b/src/esengine/app/App.cppindex 7a01b9f3d..9782ca860 100644--- a/src/esengine/app/App.cpp+++ b/src/esengine/app/App.cpp@@ -14,7 +14,7 @@#include "../platform/FileSystem.hpp"#include "../ecs/components/Canvas.hpp"#include "../renderer/GLDevice.hpp"-#include "../renderer/RenderCommand.hpp"+#include "../renderer/GfxDevice.hpp"#include <glm/gtc/matrix_transform.hpp>diff --git a/src/esengine/bindings/GeometryBindings.cpp b/src/esengine/bindings/GeometryBindings.cppindex c6b535bee..f13d9fc8e 100644--- a/src/esengine/bindings/GeometryBindings.cpp+++ b/src/esengine/bindings/GeometryBindings.cpp@@ -3,7 +3,7 @@#include "GeometryBindings.hpp"#include "EngineContext.hpp"#include "../renderer/OpenGLHeaders.hpp"-#include "../renderer/RenderCommand.hpp"+#include "../renderer/GfxDevice.hpp"#include "../renderer/CustomGeometry.hpp"#include "../renderer/Buffer.hpp"#include "../renderer/RenderContext.hpp"@@ -25,6 +25,7 @@ namespace esengine {static EngineContext& ctx() { return EngineContext::instance(); }+#define g_device (ctx().tryGet<GfxDevice>())#define g_initialized (ctx().state().initialized)#define g_geometryManager (ctx().tryGet<GeometryManager>())#define g_resourceManager (ctx().tryGet<resource::ResourceManager>())@@ -40,7 +41,7 @@ static void flushImmediateDrawIfActive() {static void restoreImmediateDrawState() {if (g_immediateDrawActive) {- auto* dev = RenderCommand::getDevice();+ auto* dev = g_device;dev->setBlendEnabled(true);dev->setBlendMode(BlendMode::Normal);dev->setDepthTest(false);@@ -147,10 +148,10 @@ void draw_mesh(u32 geometryHandle, u32 shaderHandle, uintptr_t transformPtr) {auto* ib = geom->getVAO() ? geom->getVAO()->getIndexBuffer().get() : nullptr;if (ib) {auto type = ib->is16Bit() ? GfxDataType::UnsignedShort : GfxDataType::UnsignedInt;- RenderCommand::getDevice()->drawElements(geom->getIndexCount(), type, 0);+ g_device->drawElements(geom->getIndexCount(), type, 0);}} else {- RenderCommand::getDevice()->drawArrays(0, geom->getVertexCount());+ g_device->drawArrays(0, geom->getVertexCount());}geom->unbind();@@ -222,7 +223,7 @@ void draw_meshWithUniforms(u32 geometryHandle, u32 shaderHandle, uintptr_t transcase 10: {i32 slot = static_cast<i32>(uniforms[idx++]);u32 textureId = static_cast<u32>(uniforms[idx++]);- RenderCommand::getDevice()->bindTexture(static_cast<u32>(slot), textureId);+ g_device->bindTexture(static_cast<u32>(slot), textureId);shader->setUniform(name, slot);break;}@@ -237,10 +238,10 @@ void draw_meshWithUniforms(u32 geometryHandle, u32 shaderHandle, uintptr_t transauto* ib = geom->getVAO() ? geom->getVAO()->getIndexBuffer().get() : nullptr;if (ib) {auto type = ib->is16Bit() ? GfxDataType::UnsignedShort : GfxDataType::UnsignedInt;- RenderCommand::getDevice()->drawElements(geom->getIndexCount(), type, 0);+ g_device->drawElements(geom->getIndexCount(), type, 0);}} else {- RenderCommand::getDevice()->drawArrays(0, geom->getVertexCount());+ g_device->drawArrays(0, geom->getVertexCount());}geom->unbind();diff --git a/src/esengine/bindings/ImmediateDrawBindings.cpp b/src/esengine/bindings/ImmediateDrawBindings.cppindex 95b3d3d40..f025f0458 100644--- a/src/esengine/bindings/ImmediateDrawBindings.cpp+++ b/src/esengine/bindings/ImmediateDrawBindings.cpp@@ -3,7 +3,7 @@#include "ImmediateDrawBindings.hpp"#include "EngineContext.hpp"#include "../renderer/OpenGLHeaders.hpp"-#include "../renderer/RenderCommand.hpp"+#include "../renderer/GfxDevice.hpp"#include "../renderer/BlendMode.hpp"#include "../renderer/RenderContext.hpp"#include "../renderer/RenderFrame.hpp"@@ -23,6 +23,7 @@ namespace esengine {static EngineContext& ctx() { return EngineContext::instance(); }+#define g_device (ctx().tryGet<GfxDevice>())#define g_initialized (ctx().state().initialized)#define g_immediateDraw (ctx().tryGet<ImmediateDraw>())#define g_immediateDrawActive (ctx().state().immediate_draw_active)@@ -39,7 +40,7 @@ static void flushImmediateDrawIfActive() {void draw_begin(uintptr_t matrixPtr) {if (!g_initialized || !g_immediateDraw) return;- RenderCommand::getDevice()->setViewport(0, 0, g_viewportWidth, g_viewportHeight);+ g_device->setViewport(0, 0, g_viewportWidth, g_viewportHeight);const f32* matrixData = reinterpret_cast<const f32*>(matrixPtr);ctx().state().current_view_projection = glm::make_mat4(matrixData);@@ -163,12 +164,12 @@ u32 draw_getPrimitiveCount() {void draw_setBlendMode(i32 mode) {flushImmediateDrawIfActive();- RenderCommand::setBlendMode(static_cast<BlendMode>(mode));+ g_device->setBlendMode(static_cast<BlendMode>(mode));}void draw_setDepthTest(bool enabled) {flushImmediateDrawIfActive();- RenderCommand::setDepthTest(enabled);+ g_device->setDepthTest(enabled);}} // namespace esenginediff --git a/src/esengine/bindings/PostProcessBindings.cpp b/src/esengine/bindings/PostProcessBindings.cppindex 408d3a9f1..543dc47a6 100644--- a/src/esengine/bindings/PostProcessBindings.cpp+++ b/src/esengine/bindings/PostProcessBindings.cpp@@ -4,7 +4,7 @@#include "PostProcessBindings.hpp"#include "EngineContext.hpp"#include "../renderer/OpenGLHeaders.hpp"-#include "../renderer/RenderCommand.hpp"+#include "../renderer/GfxDevice.hpp"#include "../renderer/PostProcessPipeline.hpp"#include "../renderer/RenderContext.hpp"#include "../renderer/RenderFrame.hpp"@@ -23,6 +23,7 @@ namespace esengine {static EngineContext& ctx() { return EngineContext::instance(); }+#define g_device (ctx().tryGet<GfxDevice>())#define g_initialized (ctx().state().initialized)#define g_renderContext (ctx().tryGet<RenderContext>())#define g_resourceManager (ctx().tryGet<resource::ResourceManager>())@@ -37,7 +38,7 @@ bool postprocess_init(u32 width, u32 height) {}g_postProcessPipeline->init(width, height);- RenderCommand::getDevice()->bindFramebuffer(0);+ g_device->bindFramebuffer(0);return g_postProcessPipeline->isInitialized();}diff --git a/src/esengine/bindings/RendererBindings.cpp b/src/esengine/bindings/RendererBindings.cppindex 854f2e741..5432c43c6 100644--- a/src/esengine/bindings/RendererBindings.cpp+++ b/src/esengine/bindings/RendererBindings.cpp@@ -3,7 +3,7 @@#include "RendererBindings.hpp"#include "EngineContext.hpp"#include "../renderer/OpenGLHeaders.hpp"-#include "../renderer/RenderCommand.hpp"+#include "../renderer/GfxDevice.hpp"#include "../renderer/RenderFrame.hpp"#include "../renderer/RenderContext.hpp"#include "../renderer/RenderStage.hpp"@@ -35,6 +35,7 @@ namespace esengine {static EngineContext& ctx() { return EngineContext::instance(); }+#define g_device (ctx().tryGet<GfxDevice>())#define g_initialized (ctx().state().initialized)#define g_renderFrame (ctx().tryGet<RenderFrame>())#define g_transformSystem (ctx().tryGet<ecs::TransformSystem>())@@ -52,7 +53,7 @@ static u32 checkGLErrors(const char* context) {if (!g_glErrorCheckEnabled) return 0;u32 errorCount = 0;GLenum err;- while ((err = static_cast<GLenum>(RenderCommand::getDevice()->getError())) != GL_NO_ERROR) {+ while ((err = static_cast<GLenum>(g_device->getError())) != GL_NO_ERROR) {const char* errStr = "UNKNOWN";switch (err) {case GL_INVALID_ENUM: errStr = "INVALID_ENUM"; break;@@ -309,7 +310,7 @@ void renderFrame(ecs::Registry& registry, i32 viewportWidth, i32 viewportHeight)ctx().state().viewport_height = static_cast<u32>(viewportHeight);g_renderFrame->resize(g_viewportWidth, g_viewportHeight);- auto* dev = RenderCommand::getDevice();+ auto* dev = g_device;dev->setViewport(0, 0, static_cast<u32>(viewportWidth), static_cast<u32>(viewportHeight));const auto& cc = ctx().state().clear_color;dev->setClearColor(cc.r, cc.g, cc.b, cc.a);@@ -374,7 +375,7 @@ void renderFrameWithMatrix(ecs::Registry& registry, i32 viewportWidth, i32 viewpctx().state().viewport_height = static_cast<u32>(viewportHeight);g_renderFrame->resize(g_viewportWidth, g_viewportHeight);- auto* dev = RenderCommand::getDevice();+ auto* dev = g_device;dev->setViewport(0, 0, static_cast<u32>(viewportWidth), static_cast<u32>(viewportHeight));const auto& cc = ctx().state().clear_color;dev->setClearColor(cc.r, cc.g, cc.b, cc.a);@@ -582,11 +583,11 @@ void renderer_setClearColor(f32 r, f32 g, f32 b, f32 a) {}void renderer_setViewport(i32 x, i32 y, i32 w, i32 h) {- RenderCommand::getDevice()->setViewport(x, y, static_cast<u32>(w), static_cast<u32>(h));+ g_device->setViewport(x, y, static_cast<u32>(w), static_cast<u32>(h));}void renderer_setScissor(i32 x, i32 y, i32 w, i32 h, bool enable) {- auto* dev = RenderCommand::getDevice();+ auto* dev = g_device;if (enable) {dev->setScissorTest(true);dev->setScissor(x, y, w, h);@@ -599,7 +600,7 @@ void renderer_clearBuffers(i32 flags) {bool color = (flags & 1) != 0;bool depth = (flags & 2) != 0;if (color || depth) {- RenderCommand::getDevice()->clear(color, depth, false);+ g_device->clear(color, depth, false);}}@@ -655,7 +656,7 @@ void renderer_clearAllClipRects() {void renderer_clearStencil() {glClearStencil(0);- RenderCommand::getDevice()->clear(false, false, true);+ g_device->clear(false, false, true);}void renderer_setEntityStencilMask(u32 entity, i32 refValue) {@@ -685,7 +686,7 @@ void renderer_clearAllStencilMasks() {void gl_enableErrorCheck(bool enabled) {ctx().state().gl_error_check_enabled = enabled;if (enabled) {- while (RenderCommand::getDevice()->getError() != 0) {}+ while (g_device->getError() != 0) {}ES_LOG_INFO("[GL] Error checking enabled");}}@@ -833,7 +834,7 @@ u32 renderer_getSnapshotHeight() {}void renderer_setTextureParams(u32 textureId, i32 minFilter, i32 magFilter, i32 wrapS, i32 wrapT) {- auto* device = RenderCommand::getDevice();+ auto* device = g_device;if (!device) return;device->setTextureParams(textureId,diff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cppindex 314982690..00257c98e 100644--- a/src/esengine/bindings/WebSDKEntry.cpp+++ b/src/esengine/bindings/WebSDKEntry.cpp@@ -31,7 +31,6 @@#include "../renderer/OpenGLHeaders.hpp"#include "../renderer/GLDevice.hpp"-#include "../renderer/RenderCommand.hpp"#include "../renderer/RenderContext.hpp"#include "../renderer/RenderFrame.hpp"#include "../renderer/ImmediateDraw.hpp"diff --git a/src/esengine/renderer/Buffer.hpp b/src/esengine/renderer/Buffer.hppindex 506e3e3b3..0f4d2cb70 100644--- a/src/esengine/renderer/Buffer.hpp+++ b/src/esengine/renderer/Buffer.hpp@@ -477,7 +477,7 @@ private:** // Rendering* vao->bind();- * RenderCommand::drawIndexed(*vao);+ * device.drawElements(ebo->getCount(), GfxDataType::UnsignedShort, 0);* @endcode*/class VertexArray {diff --git a/src/esengine/renderer/Framebuffer.hpp b/src/esengine/renderer/Framebuffer.hppindex 69d7987f4..5c2b9868c 100644--- a/src/esengine/renderer/Framebuffer.hpp+++ b/src/esengine/renderer/Framebuffer.hpp@@ -72,7 +72,7 @@ struct FramebufferSpec {** // Render to texture* fbo->bind();- * RenderCommand::clear();+ * device.clear(true, true, false);* // ... render scene ...* fbo->unbind();*diff --git a/src/esengine/renderer/RenderCommand.hpp b/src/esengine/renderer/RenderCommand.hppdeleted file mode 100644index cd06feb83..000000000--- a/src/esengine/renderer/RenderCommand.hpp+++ /dev/null@@ -1,72 +0,0 @@-/**- * @file RenderCommand.hpp- * @brief Low-level rendering commands (GfxDevice proxy)- * @details Provides a static interface that delegates to the active GfxDevice.- * Preserves the existing static API so callers need not change.- *- * @author ESEngine Team- * @date 2026- *- * @copyright Copyright (c) 2026 ESEngine Team- * Licensed under the MIT License.- */-#pragma once--// =============================================================================-// Includes-// =============================================================================--#include "../core/Types.hpp"-#include "../math/Math.hpp"-#include "BlendMode.hpp"-#include "GfxDevice.hpp"--namespace esengine {--class VertexArray;--// =============================================================================-// RenderCommand Class-// =============================================================================--/**- * @brief Static proxy to the active GfxDevice- *- * @details All methods delegate to the GfxDevice set via setDevice().- * This keeps existing call-sites unchanged.- */-class RenderCommand {-public:- /** @brief Sets the GfxDevice that all static methods delegate to */- static void setDevice(GfxDevice* device);-- /** @brief Gets the current GfxDevice */- static GfxDevice* getDevice();-- static void init();- static void shutdown();-- static void setViewport(i32 x, i32 y, u32 width, u32 height);- static void setClearColor(const glm::vec4& color);- static void clear();-- static void drawIndexed(const VertexArray& vao, u32 indexCount = 0);- static void drawArrays(u32 vertexCount);-- static void setDepthTest(bool enabled);- static void setDepthWrite(bool enabled);-- static void setBlending(bool enabled);- static void setBlendFunc();- static void setBlendMode(BlendMode mode);-- static void setCulling(bool enabled);- static void setCullFace(bool front);-- static void setWireframe(bool enabled);--private:- static GfxDevice* device_;-};--} // namespace esenginediff --git a/src/esengine/renderer/Renderer.cpp b/src/esengine/renderer/Renderer.cppindex 8c7358da1..624ac7821 100644--- a/src/esengine/renderer/Renderer.cpp+++ b/src/esengine/renderer/Renderer.cpp@@ -25,91 +25,6 @@namespace esengine {-// ========================================-// RenderCommand Implementation (GfxDevice proxy)-// ========================================--GfxDevice* RenderCommand::device_ = nullptr;--void RenderCommand::setDevice(GfxDevice* device) {- device_ = device;-}--GfxDevice* RenderCommand::getDevice() {- return device_;-}--void RenderCommand::init() {- if (device_) {- device_->init();- }-}--void RenderCommand::shutdown() {- if (device_) {- device_->shutdown();- }- ES_LOG_INFO("RenderCommand shutdown");-}--void RenderCommand::setViewport(i32 x, i32 y, u32 width, u32 height) {- device_->setViewport(x, y, width, height);-}--void RenderCommand::setClearColor(const glm::vec4& color) {- device_->setClearColor(color.r, color.g, color.b, color.a);-}--void RenderCommand::clear() {- device_->clear(true, true, false);-}--void RenderCommand::drawIndexed(const VertexArray& vao, u32 indexCount) {- vao.bind();- auto ib = vao.getIndexBuffer();- u32 count = indexCount ? indexCount : (ib ? ib->getCount() : 0);- if (count > 0 && ib) {- auto type = ib->is16Bit() ? GfxDataType::UnsignedShort : GfxDataType::UnsignedInt;- device_->drawElements(count, type, 0);- }-}--void RenderCommand::drawArrays(u32 vertexCount) {- device_->drawArrays(0, vertexCount);-}--void RenderCommand::setDepthTest(bool enabled) {- device_->setDepthTest(enabled);-}--void RenderCommand::setDepthWrite(bool enabled) {- device_->setDepthWrite(enabled);-}--void RenderCommand::setBlending(bool enabled) {- device_->setBlendEnabled(enabled);-}--void RenderCommand::setBlendFunc() {- device_->setBlendMode(BlendMode::Normal);-}--void RenderCommand::setBlendMode(BlendMode mode) {- device_->setBlendMode(mode);-}--void RenderCommand::setCulling(bool enabled) {- device_->setCulling(enabled);-}--void RenderCommand::setCullFace(bool front) {- device_->setCullFace(front);-}--void RenderCommand::setWireframe(bool enabled) {- device_->setWireframe(enabled);-}-// ========================================// Renderer Implementation// ========================================