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: use zero-based invalid handle and add getTextureDimensions binding
esenginec7206f85ac31
diff --git a/src/esengine/bindings/ResourceManagerBindings.cpp b/src/esengine/bindings/ResourceManagerBindings.cppindex 8ed089169..d59de9c40 100644--- a/src/esengine/bindings/ResourceManagerBindings.cpp+++ b/src/esengine/bindings/ResourceManagerBindings.cpp@@ -98,6 +98,17 @@ u32 rm_getTextureGLId(resource::ResourceManager& rm, u32 handleId) {return tex ? tex->getId() : 0;}+emscripten::val rm_getTextureDimensions(resource::ResourceManager& rm, u32 handleId) {+ auto* tex = rm.getTexture(resource::TextureHandle(handleId));+ if (!tex) {+ return emscripten::val::null();+ }+ auto result = emscripten::val::object();+ result.set("width", tex->getWidth());+ result.set("height", tex->getHeight());+ return result;+}+#ifdef ES_ENABLE_BITMAP_TEXTu32 rm_loadBitmapFont(resource::ResourceManager& rm, const std::string& fntContent,u32 textureHandle, u32 texWidth, u32 texHeight) {diff --git a/src/esengine/bindings/ResourceManagerBindings.hpp b/src/esengine/bindings/ResourceManagerBindings.hppindex 395812db1..0e7c7b744 100644--- a/src/esengine/bindings/ResourceManagerBindings.hpp+++ b/src/esengine/bindings/ResourceManagerBindings.hpp@@ -27,6 +27,7 @@ void rm_registerTextureWithPath(resource::ResourceManager& rm, u32 handleId, convoid rm_releaseShader(resource::ResourceManager& rm, u32 handleId);u32 rm_getShaderRefCount(resource::ResourceManager& rm, u32 handleId);u32 rm_getTextureGLId(resource::ResourceManager& rm, u32 handleId);+emscripten::val rm_getTextureDimensions(resource::ResourceManager& rm, u32 handleId);#ifdef ES_ENABLE_BITMAP_TEXTu32 rm_loadBitmapFont(resource::ResourceManager& rm, const std::string& fntContent,u32 textureHandle, u32 texWidth, u32 texHeight);diff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cppindex df2ad7a9d..d67f1889f 100644--- a/src/esengine/bindings/WebSDKEntry.cpp+++ b/src/esengine/bindings/WebSDKEntry.cpp@@ -511,6 +511,7 @@ EMSCRIPTEN_BINDINGS(esengine_renderer) {.function("releaseShader", &esengine::rm_releaseShader).function("getShaderRefCount", &esengine::rm_getShaderRefCount).function("getTextureGLId", &esengine::rm_getTextureGLId)+ .function("getTextureDimensions", &esengine::rm_getTextureDimensions).function("setTextureMetadata", &esengine::rm_setTextureMetadata).function("registerTextureWithPath", &esengine::rm_registerTextureWithPath)#ifdef ES_ENABLE_BITMAP_TEXTdiff --git a/src/esengine/renderer/plugins/TilemapRenderPlugin.cpp b/src/esengine/renderer/plugins/TilemapRenderPlugin.cppindex 2e45cecde..1bfc08178 100644--- a/src/esengine/renderer/plugins/TilemapRenderPlugin.cpp+++ b/src/esengine/renderer/plugins/TilemapRenderPlugin.cpp@@ -70,7 +70,7 @@ void TilemapRenderPlugin::rebuildChunk(}f32 u0 = static_cast<f32>(tileCol) * layer.uv_tile_width;- f32 v0 = static_cast<f32>(tileRow) * layer.uv_tile_height;+ f32 v0 = 1.0f - static_cast<f32>(tileRow + 1) * layer.uv_tile_height;f32 su = layer.uv_tile_width;f32 sv = layer.uv_tile_height;diff --git a/src/esengine/resource/Handle.hpp b/src/esengine/resource/Handle.hppindex b4931d590..e9ba29160 100644--- a/src/esengine/resource/Handle.hpp+++ b/src/esengine/resource/Handle.hpp@@ -19,9 +19,6 @@// Project includes#include "../core/Types.hpp"-// Standard library-#include <limits>-namespace esengine::resource {// =============================================================================@@ -53,7 +50,7 @@ public:static constexpr u32 GEN_BITS = 12;static constexpr u32 INDEX_MASK = (1u << INDEX_BITS) - 1;static constexpr u32 GEN_MASK = (1u << GEN_BITS) - 1;- static constexpr IdType INVALID = std::numeric_limits<IdType>::max();+ static constexpr IdType INVALID = 0;/** @brief Creates an invalid handle */Handle() = default;diff --git a/src/esengine/resource/ResourcePool.hpp b/src/esengine/resource/ResourcePool.hppindex b901e633a..16e41b705 100644--- a/src/esengine/resource/ResourcePool.hpp+++ b/src/esengine/resource/ResourcePool.hpp@@ -92,7 +92,9 @@ public:u32 generation = 0; ///< Reuse counter for stale handle detection};- ResourcePool() = default;+ ResourcePool() {+ entries_.push_back({nullptr, 0, "", 0});+ }~ResourcePool() override = default;// Non-copyable, movable