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.

Retain planar captures across cached editor frames

yhhb01fa3df1a29
diff --git a/desktop b/desktop
index f888bb8f2..9935d372e 160000
--- a/desktop
+++ b/desktop
@@ -1 +1 @@
-Subproject commit f888bb8f2c81db9098d65495c96d73806e75050d
+Subproject commit 9935d372eba2673870601883771beb211e870638
diff --git a/src/esengine/renderer/frame/RenderFrame.cpp b/src/esengine/renderer/frame/RenderFrame.cpp
index 209764c5f..dedbc911d 100644
--- a/src/esengine/renderer/frame/RenderFrame.cpp
+++ b/src/esengine/renderer/frame/RenderFrame.cpp
@@ -268,7 +268,7 @@ void RenderFrame::releaseFrameTargets() {
void RenderFrame::beginFrame() {
++planar_frame_;
for (auto it = planar_captures_.begin(); it != planar_captures_.end();) {
- if (it->second.lastSeen + 1 < planar_frame_) {
+ if (frame_collected_ && it->second.lastSeen + 1 < planar_frame_) {
if (it->second.frameUbo != BufferHandle::Invalid) device_.deleteBuffer(it->second.frameUbo);
it = planar_captures_.erase(it);
} else ++it;
diff --git a/src/esengine/renderer/frame/RenderFramePlanar.cpp b/src/esengine/renderer/frame/RenderFramePlanar.cpp
index 7c19982d0..bbe5af1b8 100644
--- a/src/esengine/renderer/frame/RenderFramePlanar.cpp
+++ b/src/esengine/renderer/frame/RenderFramePlanar.cpp
@@ -60,7 +60,14 @@ void RenderFrame::declarePlanarReflection(ecs::Registry& registry) {
selected = entity;
camera = candidate;
}
- if (selected == INVALID_ENTITY) return;
+ if (selected == INVALID_ENTITY) {
+ const auto previous = planar_captures_.find(view_id_);
+ if (previous != planar_captures_.end()) {
+ if (previous->second.frameUbo != BufferHandle::Invalid) device_.deleteBuffer(previous->second.frameUbo);
+ planar_captures_.erase(previous);
+ }
+ return;
+ }
const auto& surface = registry.get<ecs::PlanarReflection>(selected);
auto& capture = planar_captures_[view_id_];
capture.lastSeen = planar_frame_;
@@ -165,7 +172,7 @@ void RenderFrame::executePlanarReflection(ecs::Registry& registry, u32 view) {
std::string RenderFrame::planarStatus(u32 view, u32 entity) const {
const auto found = planar_captures_.find(view);
- if (found == planar_captures_.end() || found->second.lastSeen != planar_frame_) return "{\"state\":\"inactive\"}";
+ if (found == planar_captures_.end()) return "{\"state\":\"inactive\"}";
const auto& c = found->second;
if (c.receiver.id() != entity) return "{\"state\":\"budget-excluded\"}";
if (!c.valid || !c.target) return "{\"state\":\"unavailable\"}";
diff --git a/tools/render-host/host.ts b/tools/render-host/host.ts
index a89e977af..dbf708f12 100644
--- a/tools/render-host/host.ts
+++ b/tools/render-host/host.ts
@@ -417,6 +417,13 @@ function skeletalSource(toUrl: (ref: string) => string, label: string): RuntimeA
const api = {
loadScene,
+ idleRenderFrames(count: number) {
+ if (!module) throw new Error('idleRenderFrames before boot');
+ for (let i = 0; i < count; i++) {
+ module.renderer_beginFrame(i / 60);
+ module.renderer_endFrame?.();
+ }
+ },
planarReflectionStatus(id: number, cameraId?: number) {
if (!app) throw new Error('planarReflectionStatus before boot');
return planarReflectionStatus(app, requireEntity(id), cameraId === undefined ? 0 : requireEntity(cameraId));
diff --git a/tools/tests/planar-reflection.e2e.mjs b/tools/tests/planar-reflection.e2e.mjs
index d609b712f..7e5c27113 100644
--- a/tools/tests/planar-reflection.e2e.mjs
+++ b/tools/tests/planar-reflection.e2e.mjs
@@ -73,6 +73,9 @@ try {
assert.equal(ready.width,512); assert.ok(ready.draws>0);
const on = await capture('enabled');
const drawsOn = await page.evaluate(() => window.__estellaHeadless.api.getStats().drawCalls);
+ await page.evaluate(() => window.__estellaHeadless.api.idleRenderFrames(8));
+ assert.equal((await status()).state,'ready','cached editor frames must retain the last capture');
+ await step(1);
const pixel = (image,x,y) => Array.from(image.data.subarray((y*image.width+x)*4,(y*image.width+x)*4+3));
for (const [x,y,r,g] of [[200,210,255,0],[200,290,255,0],[310,214,0,255],[310,268,0,255]]) {
const c = pixel(on,x,y);