Skip to content

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.

feat(sdk): the two pieces re-upload needs

esengine211ec7141728
diff --git a/sdk/etc/index.api.md b/sdk/etc/index.api.md
index d76d954a7..3262de941 100644
--- a/sdk/etc/index.api.md
+++ b/sdk/etc/index.api.md
@@ -670,6 +670,7 @@ AssetsClass
clear: () => void
clearAll: () => void
delete: (key: string) => boolean
+entries: () => IterableIterator<[string, T]>
get: (key: string) => T | undefined
getOrLoad: (key: string, loader: () => Promise<T>, timeout?: number) => Promise<T>
has: (key: string) => boolean
@@ -1991,6 +1992,7 @@ registerTextureWithPath: (handle: number, path: string) => void
releaseBitmapFont: (handle: number) => void
releaseShader: (handle: number) => void
releaseTexture: (handle: number) => void
+retargetExternalTexture: ((handle: number, glTextureId: number, width: number, height: number) => boolean) | undefined
setTextureBudget: (bytes: number) => void
setTextureMetadata: (handle: number, left: number, right: number, top: number, bottom: number) => void
trimTextureCache: () => number
diff --git a/sdk/etc/index.native.api.md b/sdk/etc/index.native.api.md
index 3f30fb927..2250447c1 100644
--- a/sdk/etc/index.native.api.md
+++ b/sdk/etc/index.native.api.md
@@ -670,6 +670,7 @@ AssetsClass
clear: () => void
clearAll: () => void
delete: (key: string) => boolean
+entries: () => IterableIterator<[string, T]>
get: (key: string) => T | undefined
getOrLoad: (key: string, loader: () => Promise<T>, timeout?: number) => Promise<T>
has: (key: string) => boolean
@@ -1999,6 +2000,7 @@ registerTextureWithPath: (handle: number, path: string) => void
releaseBitmapFont: (handle: number) => void
releaseShader: (handle: number) => void
releaseTexture: (handle: number) => void
+retargetExternalTexture: ((handle: number, glTextureId: number, width: number, height: number) => boolean) | undefined
setTextureBudget: (bytes: number) => void
setTextureMetadata: (handle: number, left: number, right: number, top: number, bottom: number) => void
trimTextureCache: () => number
diff --git a/sdk/etc/index.node.api.md b/sdk/etc/index.node.api.md
index 817c7bc0a..e0444a9bb 100644
--- a/sdk/etc/index.node.api.md
+++ b/sdk/etc/index.node.api.md
@@ -665,6 +665,7 @@ AssetsClass
clear: () => void
clearAll: () => void
delete: (key: string) => boolean
+entries: () => IterableIterator<[string, T]>
get: (key: string) => T | undefined
getOrLoad: (key: string, loader: () => Promise<T>, timeout?: number) => Promise<T>
has: (key: string) => boolean
@@ -1986,6 +1987,7 @@ registerTextureWithPath: (handle: number, path: string) => void
releaseBitmapFont: (handle: number) => void
releaseShader: (handle: number) => void
releaseTexture: (handle: number) => void
+retargetExternalTexture: ((handle: number, glTextureId: number, width: number, height: number) => boolean) | undefined
setTextureBudget: (bytes: number) => void
setTextureMetadata: (handle: number, left: number, right: number, top: number, bottom: number) => void
trimTextureCache: () => number
diff --git a/sdk/etc/minigame.api.md b/sdk/etc/minigame.api.md
index fd7eec19f..7616df120 100644
--- a/sdk/etc/minigame.api.md
+++ b/sdk/etc/minigame.api.md
@@ -665,6 +665,7 @@ AssetsClass
clear: () => void
clearAll: () => void
delete: (key: string) => boolean
+entries: () => IterableIterator<[string, T]>
get: (key: string) => T | undefined
getOrLoad: (key: string, loader: () => Promise<T>, timeout?: number) => Promise<T>
has: (key: string) => boolean
@@ -1986,6 +1987,7 @@ registerTextureWithPath: (handle: number, path: string) => void
releaseBitmapFont: (handle: number) => void
releaseShader: (handle: number) => void
releaseTexture: (handle: number) => void
+retargetExternalTexture: ((handle: number, glTextureId: number, width: number, height: number) => boolean) | undefined
setTextureBudget: (bytes: number) => void
setTextureMetadata: (handle: number, left: number, right: number, top: number, bottom: number) => void
trimTextureCache: () => number
diff --git a/sdk/etc/wasm.api.md b/sdk/etc/wasm.api.md
index 2bf700bf3..b86b2653c 100644
--- a/sdk/etc/wasm.api.md
+++ b/sdk/etc/wasm.api.md
@@ -165,6 +165,7 @@ registerTextureWithPath: (handle: number, path: string) => void
releaseBitmapFont: (handle: number) => void
releaseShader: (handle: number) => void
releaseTexture: (handle: number) => void
+retargetExternalTexture: ((handle: number, glTextureId: number, width: number, height: number) => boolean) | undefined
setTextureBudget: (bytes: number) => void
setTextureMetadata: (handle: number, left: number, right: number, top: number, bottom: number) => void
trimTextureCache: () => number
diff --git a/sdk/etc/wechat.api.md b/sdk/etc/wechat.api.md
index a2c770a35..2bd4fd86d 100644
--- a/sdk/etc/wechat.api.md
+++ b/sdk/etc/wechat.api.md
@@ -665,6 +665,7 @@ AssetsClass
clear: () => void
clearAll: () => void
delete: (key: string) => boolean
+entries: () => IterableIterator<[string, T]>
get: (key: string) => T | undefined
getOrLoad: (key: string, loader: () => Promise<T>, timeout?: number) => Promise<T>
has: (key: string) => boolean
@@ -1986,6 +1987,7 @@ registerTextureWithPath: (handle: number, path: string) => void
releaseBitmapFont: (handle: number) => void
releaseShader: (handle: number) => void
releaseTexture: (handle: number) => void
+retargetExternalTexture: ((handle: number, glTextureId: number, width: number, height: number) => boolean) | undefined
setTextureBudget: (bytes: number) => void
setTextureMetadata: (handle: number, left: number, right: number, top: number, bottom: number) => void
trimTextureCache: () => number
diff --git a/sdk/src/asset/AsyncCache.ts b/sdk/src/asset/AsyncCache.ts
index e35f00bee..dbe71af79 100644
--- a/sdk/src/asset/AsyncCache.ts
+++ b/sdk/src/asset/AsyncCache.ts
@@ -172,6 +172,14 @@ export class AsyncCache<T> {
this.pending_.clear();
}
+ /**
+ * Key/value pairs of what is resolved. `values()` is not enough for a sweep
+ * that has to RELOAD each entry: the key is what names the asset.
+ */
+ entries(): IterableIterator<[string, T]> {
+ return this.cache_.entries();
+ }
+
values(): IterableIterator<T> {
return this.cache_.values();
}
diff --git a/sdk/src/wasm.ts b/sdk/src/wasm.ts
index ba680f5bf..9c2c9ed75 100644
--- a/sdk/src/wasm.ts
+++ b/sdk/src/wasm.ts
@@ -62,6 +62,12 @@ export interface CppResourceManager {
* eviction budget (compressed textures are 4–8× smaller than the RGBA8
* estimate the plain variant books). */
registerExternalTextureSized(glTextureId: number, width: number, height: number, bytes: number): number;
+ /**
+ * Point an EXISTING texture handle at a freshly uploaded GPU object, so a
+ * re-upload after a device loss is invisible to everything holding it.
+ * Optional: absent on an older wasm build.
+ */
+ retargetExternalTexture?(handle: number, glTextureId: number, width: number, height: number): boolean;
getTextureGLId(handle: number): number;
getTextureDimensions(handle: number): { width: number; height: number } | null;
releaseTexture(handle: number): void;
diff --git a/src/esengine/bindings/ResourceManagerBindings.cpp b/src/esengine/bindings/ResourceManagerBindings.cpp
index 0c303f046..671ec1a71 100644
--- a/src/esengine/bindings/ResourceManagerBindings.cpp
+++ b/src/esengine/bindings/ResourceManagerBindings.cpp
@@ -96,6 +96,11 @@ u32 rm_registerExternalTexture(resource::ResourceManager& rm, u32 glTextureId,
return handle.id();
}
+bool rm_retargetExternalTexture(resource::ResourceManager& rm, u32 handle,
+ u32 glTextureId, u32 width, u32 height) {
+ return rm.retargetExternalTexture(resource::TextureHandle(handle), glTextureId, width, height);
+}
+
u32 rm_registerExternalTextureSized(resource::ResourceManager& rm, u32 glTextureId,
u32 width, u32 height, u32 bytes) {
auto handle = rm.registerExternalTexture(glTextureId, width, height,
diff --git a/src/esengine/bindings/ResourceManagerBindings.hpp b/src/esengine/bindings/ResourceManagerBindings.hpp
index 3df1cac10..1c35c7a5d 100644
--- a/src/esengine/bindings/ResourceManagerBindings.hpp
+++ b/src/esengine/bindings/ResourceManagerBindings.hpp
@@ -27,6 +27,10 @@ u32 rm_createShader(resource::ResourceManager& rm,
const std::string& vertSrc, const std::string& fragSrc);
u32 rm_registerExternalTexture(resource::ResourceManager& rm, u32 glTextureId,
u32 width, u32 height);
+/** @brief Points an EXISTING texture handle at a freshly uploaded GPU object. */
+bool rm_retargetExternalTexture(resource::ResourceManager& rm, u32 handle,
+ u32 glTextureId, u32 width, u32 height);
+
u32 rm_registerExternalTextureSized(resource::ResourceManager& rm, u32 glTextureId,
u32 width, u32 height, u32 bytes);
void rm_releaseTexture(resource::ResourceManager& rm, u32 handleId);
diff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cpp
index 2cf547ad6..aaab157a1 100644
--- a/src/esengine/bindings/WebSDKEntry.cpp
+++ b/src/esengine/bindings/WebSDKEntry.cpp
@@ -412,6 +412,7 @@ EMSCRIPTEN_BINDINGS(esengine_renderer) {
.function("createShader", &esengine::rm_createShader)
.function("registerExternalTexture", &esengine::rm_registerExternalTexture)
.function("registerExternalTextureSized", &esengine::rm_registerExternalTextureSized)
+ .function("retargetExternalTexture", &esengine::rm_retargetExternalTexture)
.function("releaseTexture", &esengine::rm_releaseTexture)
.function("getTextureRefCount", &esengine::rm_getTextureRefCount)
.function("releaseShader", &esengine::rm_releaseShader)