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(f1): remove vacuous ES_PLATFORM_WEB binding guards + dead scripting fields
esengined47979702c3c
diff --git a/src/esengine/bindings/ActiveContext.hpp b/src/esengine/bindings/ActiveContext.hppindex 8a51bc412..8d2594001 100644--- a/src/esengine/bindings/ActiveContext.hpp+++ b/src/esengine/bindings/ActiveContext.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/EstellaContext.hpp"@@ -22,4 +21,3 @@ inline EstellaContext& activeCtx() {} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/EditorAPI.generated.cpp b/src/esengine/bindings/EditorAPI.generated.cppindex 0809f701e..7f0318cfb 100644--- a/src/esengine/bindings/EditorAPI.generated.cpp+++ b/src/esengine/bindings/EditorAPI.generated.cpp@@ -7,8 +7,6 @@#define ES_EDITOR_API_SCHEMA_HASH "ec0e5e49aabdea7f"-#ifdef ES_PLATFORM_WEB-#include <emscripten/bind.h>#include <string>#include <vector>@@ -2016,5 +2014,3 @@ EMSCRIPTEN_BINDINGS(esengine_editor_api) {emscripten::register_vector<std::string>("VectorString");}--#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/EngineContext.cpp b/src/esengine/bindings/EngineContext.cppindex be8928b90..0ad9cc862 100644--- a/src/esengine/bindings/EngineContext.cpp+++ b/src/esengine/bindings/EngineContext.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#include "EngineContext.hpp"@@ -11,4 +10,3 @@ EngineContext& EngineContext::instance() {} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/EngineContext.hpp b/src/esengine/bindings/EngineContext.hppindex 7d0a3509a..a8da6d696 100644--- a/src/esengine/bindings/EngineContext.hpp+++ b/src/esengine/bindings/EngineContext.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/Types.hpp"#include "../core/ServiceRegistry.hpp"@@ -45,4 +44,3 @@ private:} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/GeometryBindings.cpp b/src/esengine/bindings/GeometryBindings.cppindex d6adea281..ca5c7b0a1 100644--- a/src/esengine/bindings/GeometryBindings.cpp+++ b/src/esengine/bindings/GeometryBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#include "GeometryBindings.hpp"#include "ActiveContext.hpp"@@ -250,4 +249,3 @@ void draw_meshWithUniforms(u32 geometryHandle, u32 shaderHandle, uintptr_t trans} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/GeometryBindings.hpp b/src/esengine/bindings/GeometryBindings.hppindex d88bdda20..c0578028b 100644--- a/src/esengine/bindings/GeometryBindings.hpp+++ b/src/esengine/bindings/GeometryBindings.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/Types.hpp"@@ -21,4 +20,3 @@ void draw_meshWithUniforms(u32 geometryHandle, u32 shaderHandle, uintptr_t trans} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/ImmediateDrawBindings.cpp b/src/esengine/bindings/ImmediateDrawBindings.cppindex 630adec10..657d0bab4 100644--- a/src/esengine/bindings/ImmediateDrawBindings.cpp+++ b/src/esengine/bindings/ImmediateDrawBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#include "ImmediateDrawBindings.hpp"#include "ActiveContext.hpp"@@ -174,4 +173,3 @@ void draw_setDepthTest(bool enabled) {} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/ImmediateDrawBindings.hpp b/src/esengine/bindings/ImmediateDrawBindings.hppindex 8616a78cb..104a538ee 100644--- a/src/esengine/bindings/ImmediateDrawBindings.hpp+++ b/src/esengine/bindings/ImmediateDrawBindings.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/Types.hpp"@@ -31,4 +30,3 @@ void draw_setDepthTest(bool enabled);} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/PostProcessBindings.cpp b/src/esengine/bindings/PostProcessBindings.cppindex aa37240aa..ce4b90677 100644--- a/src/esengine/bindings/PostProcessBindings.cpp+++ b/src/esengine/bindings/PostProcessBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#ifdef ES_ENABLE_POSTPROCESS#include "PostProcessBindings.hpp"@@ -188,4 +187,3 @@ void postprocess_setScreenUniformVec4(const std::string& passName,} // namespace esengine#endif // ES_ENABLE_POSTPROCESS-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/PostProcessBindings.hpp b/src/esengine/bindings/PostProcessBindings.hppindex a8b62811a..7c0c8481c 100644--- a/src/esengine/bindings/PostProcessBindings.hpp+++ b/src/esengine/bindings/PostProcessBindings.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/Types.hpp"#include <string>@@ -42,4 +41,3 @@ void postprocess_setScreenUniformVec4(const std::string& passName,} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/RendererBindings.cpp b/src/esengine/bindings/RendererBindings.cppindex 5f3548282..125c4904b 100644--- a/src/esengine/bindings/RendererBindings.cpp+++ b/src/esengine/bindings/RendererBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#include "RendererBindings.hpp"#include "ActiveContext.hpp"@@ -818,4 +817,3 @@ void renderer_setTextureParams(u32 textureId, i32 minFilter, i32 magFilter, i32} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/RendererBindings.hpp b/src/esengine/bindings/RendererBindings.hppindex 79cee3f3a..75f26665a 100644--- a/src/esengine/bindings/RendererBindings.hpp+++ b/src/esengine/bindings/RendererBindings.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/Types.hpp"#include <string>@@ -153,4 +152,3 @@ void registry_batchSyncPhysicsTransforms(ecs::Registry& registry, uintptr_t buff} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/ResourceManagerBindings.cpp b/src/esengine/bindings/ResourceManagerBindings.cppindex d59de9c40..d9a9c5f10 100644--- a/src/esengine/bindings/ResourceManagerBindings.cpp+++ b/src/esengine/bindings/ResourceManagerBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#include "ResourceManagerBindings.hpp"#include "../resource/TextureMetadata.hpp"@@ -163,4 +162,3 @@ void rm_setTextureMetadata(resource::ResourceManager& rm, u32 handleId,} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/ResourceManagerBindings.hpp b/src/esengine/bindings/ResourceManagerBindings.hppindex 0e7c7b744..dfe4ecc9b 100644--- a/src/esengine/bindings/ResourceManagerBindings.hpp+++ b/src/esengine/bindings/ResourceManagerBindings.hpp@@ -1,6 +1,5 @@#pragma once-#ifdef ES_PLATFORM_WEB#include "../core/Types.hpp"#include "../resource/ResourceManager.hpp"@@ -44,4 +43,3 @@ void rm_setTextureMetadata(resource::ResourceManager& rm, u32 handleId,} // namespace esengine-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/TilemapBindings.cpp b/src/esengine/bindings/TilemapBindings.cppindex a89e5edb1..e8aa9f281 100644--- a/src/esengine/bindings/TilemapBindings.cpp+++ b/src/esengine/bindings/TilemapBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#ifdef ES_ENABLE_TILEMAP#include "ActiveContext.hpp"@@ -828,4 +827,3 @@ EMSCRIPTEN_BINDINGS(esengine_tilemap) {}#endif // ES_ENABLE_TILEMAP-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/TimelineBindings.cpp b/src/esengine/bindings/TimelineBindings.cppindex 890db6ebd..ff89ae124 100644--- a/src/esengine/bindings/TimelineBindings.cpp+++ b/src/esengine/bindings/TimelineBindings.cpp@@ -1,4 +1,3 @@-#ifdef ES_PLATFORM_WEB#ifdef ES_ENABLE_TIMELINE#include <emscripten.h>@@ -391,4 +390,3 @@ EMSCRIPTEN_BINDINGS(esengine_timeline) {}#endif // ES_ENABLE_TIMELINE-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cppindex 6ccfb24d2..d9473799b 100644--- a/src/esengine/bindings/WebBindings.generated.cpp+++ b/src/esengine/bindings/WebBindings.generated.cpp@@ -4,8 +4,6 @@* @details Generated by EHT - DO NOT EDIT*/-#ifdef ES_PLATFORM_WEB-#include <emscripten/bind.h>#include <cstddef>#include <string>@@ -2013,5 +2011,3 @@ std::string esengineGetAbiLayoutHash() {EMSCRIPTEN_BINDINGS(esengine_abi) {emscripten::function("getAbiLayoutHash", &esengineGetAbiLayoutHash);}--#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cppindex 1cdc3c4c7..b1a06552b 100644--- a/src/esengine/bindings/WebSDKEntry.cpp+++ b/src/esengine/bindings/WebSDKEntry.cpp@@ -9,7 +9,6 @@* Licensed under the MIT License.*/-#ifdef ES_PLATFORM_WEB#include <emscripten.h>#include <emscripten/bind.h>@@ -742,4 +741,3 @@ int main() {return 0;}-#endif // ES_PLATFORM_WEBdiff --git a/src/esengine/ecs/components/Script.hpp b/src/esengine/ecs/components/Script.hppindex 89b5f93a2..45e990261 100644--- a/src/esengine/ecs/components/Script.hpp+++ b/src/esengine/ecs/components/Script.hpp@@ -16,10 +16,6 @@#include <any>#include <unordered_map>-#ifdef ES_SCRIPTING_ENABLED- #include <quickjs.h>-#endif-namespace esengine::ecs {/**@@ -36,14 +32,6 @@ struct ScriptComponent {std::string scriptPath; ///< Path to JavaScript file (if loading from file)std::string scriptSource; ///< Inline JavaScript source codebool enabled = true; ///< Whether the script should execute--#ifdef ES_SCRIPTING_ENABLED- JSValue instance = JS_UNDEFINED; ///< JavaScript object instance- JSValue onInitFunc = JS_UNDEFINED; ///< Cached onInit function- JSValue onUpdateFunc = JS_UNDEFINED; ///< Cached onUpdate function- JSValue onDestroyFunc = JS_UNDEFINED; ///< Cached onDestroy function-#endif-bool isLoaded = false; ///< Whether the script has been loadedstd::string lastError; ///< Last error message (if any)diff --git a/tools/eht/generators/editor_api.py b/tools/eht/generators/editor_api.pyindex f092b1bc9..af1bbaa9c 100644--- a/tools/eht/generators/editor_api.py+++ b/tools/eht/generators/editor_api.py@@ -57,8 +57,6 @@ class EditorAPIGenerator:lines.extend(self._gen_get_string())lines.extend(self._gen_embind())lines.append('')- lines.append('#endif // ES_PLATFORM_WEB')- lines.append('')return '\n'.join(lines)def _gen_header(self) -> List[str]:@@ -73,8 +71,6 @@ class EditorAPIGenerator:'',f'#define ES_EDITOR_API_SCHEMA_HASH "{schema_hash}"','',- '#ifdef ES_PLATFORM_WEB',- '','#include <emscripten/bind.h>','#include <string>','#include <vector>',diff --git a/tools/eht/generators/embind.py b/tools/eht/generators/embind.pyindex a6bf57c1a..b7274594e 100644--- a/tools/eht/generators/embind.py+++ b/tools/eht/generators/embind.py@@ -28,8 +28,6 @@ class EmbindGenerator:lines.extend(self._gen_layout_asserts())lines.extend(self._gen_abi_hash())lines.append('')- lines.append('#endif // ES_PLATFORM_WEB')- lines.append('')return '\n'.join(lines)def _gen_layout_asserts(self) -> List[str]:@@ -67,8 +65,6 @@ class EmbindGenerator:' * @details Generated by EHT - DO NOT EDIT',' */','',- '#ifdef ES_PLATFORM_WEB',- '','#include <emscripten/bind.h>','#include <cstddef>','#include <string>',