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.

fix: complete UI redesign Phase 2F cleanup

esengine0bf839e26bb5
diff --git a/editor/src/renderer/EditorSceneRenderer.ts b/editor/src/renderer/EditorSceneRenderer.ts
index d43c50c6a..2c5ba910f 100644
--- a/editor/src/renderer/EditorSceneRenderer.ts
+++ b/editor/src/renderer/EditorSceneRenderer.ts
@@ -304,16 +304,13 @@ export class EditorSceneRenderer {
let px = wt.worldPosition.x;
let py = wt.worldPosition.y;
- if (registry.hasUIRect(entity) && (registry.hasUIRenderer(entity) || registry.hasSprite(entity))) {
+ if (registry.hasUIRect(entity)) {
const uiRect = registry.getUIRect(entity);
- let sizeX: number, sizeY: number;
- if (registry.hasUIRenderer(entity) && this.module_) {
- sizeX = this.module_.getUIRectComputedWidth(registry, entity) || uiRect.size.x;
- sizeY = this.module_.getUIRectComputedHeight(registry, entity) || uiRect.size.y;
- } else {
- const sprite = registry.getSprite(entity);
- sizeX = sprite.size.x;
- sizeY = sprite.size.y;
+ let sizeX = uiRect.size.x;
+ let sizeY = uiRect.size.y;
+ if (this.module_) {
+ sizeX = this.module_.getUIRectComputedWidth(registry, entity) || sizeX;
+ sizeY = this.module_.getUIRectComputedHeight(registry, entity) || sizeY;
}
let dx = (0.5 - uiRect.pivot.x) * sizeX * wt.worldScale.x;
let dy = (0.5 - uiRect.pivot.y) * sizeY * wt.worldScale.y;
diff --git a/sdk/src/scene.ts b/sdk/src/scene.ts
index 4a994d817..36b9ff6be 100644
--- a/sdk/src/scene.ts
+++ b/sdk/src/scene.ts
@@ -228,6 +228,35 @@ export function remapEntityFields(compData: SceneComponentData, entityMap: Map<n
}
}
+// =============================================================================
+// Scene Migration
+// =============================================================================
+
+function migrateToUIRenderer(entityData: SceneEntityData): void {
+ const hasUIRect = entityData.components.some(c => c.type === 'UIRect');
+ const spriteIdx = entityData.components.findIndex(c => c.type === 'Sprite');
+ const hasUIRenderer = entityData.components.some(c => c.type === 'UIRenderer');
+
+ if (!hasUIRect || spriteIdx === -1 || hasUIRenderer) return;
+
+ const sprite = entityData.components[spriteIdx].data;
+ const tex = sprite.texture as number | undefined;
+ entityData.components.push({
+ type: 'UIRenderer',
+ data: {
+ visualType: tex ? 2 : 1,
+ texture: tex ?? 0,
+ color: sprite.color ?? { r: 1, g: 1, b: 1, a: 1 },
+ uvOffset: sprite.uvOffset ?? { x: 0, y: 0 },
+ uvScale: sprite.uvScale ?? { x: 1, y: 1 },
+ sliceBorder: sprite.sliceBorder ?? { x: 0, y: 0, z: 0, w: 0 },
+ material: sprite.material ?? 0,
+ enabled: sprite.enabled ?? true,
+ },
+ });
+ entityData.components.splice(spriteIdx, 1);
+}
+
// =============================================================================
// Scene Loader
// =============================================================================
@@ -244,6 +273,7 @@ function spawnAndLoadEntities(world: World, sceneData: SceneData): Map<number, E
for (const entityData of sceneData.entities) {
if (entityData.visible === false) continue;
+ migrateToUIRenderer(entityData);
const entity = entityMap.get(entityData.id)!;
for (const compData of entityData.components) {
remapEntityFields(compData, entityMap);
diff --git a/sdk/src/sceneManager.ts b/sdk/src/sceneManager.ts
index 5396f3b85..1bb25cb7e 100644
--- a/sdk/src/sceneManager.ts
+++ b/sdk/src/sceneManager.ts
@@ -16,6 +16,8 @@ import { PostProcess, PostProcessStack } from './postprocess';
import { Draw } from './draw';
import { defineResource } from './resource';
import { SceneOwner, Sprite, SpineAnimation, BitmapText } from './component';
+import { UIRenderer } from './ui/UIRenderer';
+import type { UIRendererData } from './ui/UIRenderer';
import { Assets } from './asset/AssetPlugin';
import { RuntimeConfig } from './defaults';
@@ -78,7 +80,7 @@ class SceneInstance {
readonly entities = new Set<Entity>();
readonly drawCallbacks = new Map<string, DrawCallback>();
readonly postProcessBindings = new Map<Entity, PostProcessStack>();
- readonly savedAlphas = new Map<Entity, { sprite?: number; spine?: number; bitmapText?: number }>();
+ readonly savedAlphas = new Map<Entity, { sprite?: number; spine?: number; bitmapText?: number; uiRenderer?: number }>();
loadedAssets: LoadedSceneAssets | null = null;
status: SceneStatus = 'loading';
@@ -564,7 +566,7 @@ export class SceneManagerState {
const world = this.app_.world;
for (const entity of instance.entities) {
if (!world.valid(entity)) continue;
- const saved: { sprite?: number; spine?: number; bitmapText?: number } = {};
+ const saved: { sprite?: number; spine?: number; bitmapText?: number; uiRenderer?: number } = {};
let hasSaved = false;
if (world.has(entity, Sprite)) {
@@ -588,6 +590,13 @@ export class SceneManagerState {
world.insert(entity, BitmapText, bt);
hasSaved = true;
}
+ if (world.has(entity, UIRenderer)) {
+ const r = world.get(entity, UIRenderer) as UIRendererData;
+ saved.uiRenderer = r.color.a;
+ r.color.a = 0;
+ world.insert(entity, UIRenderer, r);
+ hasSaved = true;
+ }
if (hasSaved) {
instance.savedAlphas.set(entity, saved);
@@ -623,6 +632,11 @@ export class SceneManagerState {
bt.color.a = saved.bitmapText;
world.insert(entity, BitmapText, bt);
}
+ if (saved.uiRenderer !== undefined && world.has(entity, UIRenderer)) {
+ const r = world.get(entity, UIRenderer) as UIRendererData;
+ r.color.a = saved.uiRenderer;
+ world.insert(entity, UIRenderer, r);
+ }
}
instance.savedAlphas.clear();
}
diff --git a/sdk/tests/sceneManager.test.ts b/sdk/tests/sceneManager.test.ts
index 37f7a22bd..d0b3d1166 100644
--- a/sdk/tests/sceneManager.test.ts
+++ b/sdk/tests/sceneManager.test.ts
@@ -46,6 +46,7 @@ vi.mock('../src/component', () => ({
Sprite: Symbol('Sprite'),
SpineAnimation: Symbol('SpineAnimation'),
BitmapText: Symbol('BitmapText'),
+ defineBuiltin: (name: string, defaults: unknown) => Symbol(name),
}));
vi.mock('../src/asset/AssetPlugin', () => ({
diff --git a/src/esengine/renderer/RenderFrame.cpp b/src/esengine/renderer/RenderFrame.cpp
index 9147aef8b..03527d6e5 100644
--- a/src/esengine/renderer/RenderFrame.cpp
+++ b/src/esengine/renderer/RenderFrame.cpp
@@ -564,30 +564,14 @@ void RenderFrame::submitSprites(ecs::Registry& registry) {
const auto& sprite = spriteView.get<ecs::Sprite>(entity);
if (!sprite.enabled) continue;
+ if (registry.has<ecs::UIRect>(entity)) continue;
+
auto& transform = spriteView.get<ecs::Transform>(entity);
transform.ensureDecomposed();
glm::vec3 position = transform.worldPosition;
const auto& rotation = transform.worldRotation;
const auto& scale = transform.worldScale;
- auto* uiRect = registry.tryGet<ecs::UIRect>(entity);
- if (uiRect) {
- f32 dx = (0.5f - uiRect->pivot.x) * sprite.size.x * scale.x;
- f32 dy = (0.5f - uiRect->pivot.y) * sprite.size.y * scale.y;
- f32 sinHalf = rotation.z;
- if (sinHalf * sinHalf > 1e-6f) {
- f32 cosHalf = rotation.w;
- f32 s = 2.0f * sinHalf * cosHalf;
- f32 c = cosHalf * cosHalf - sinHalf * sinHalf;
- f32 rdx = dx * c - dy * s;
- f32 rdy = dx * s + dy * c;
- dx = rdx;
- dy = rdy;
- }
- position.x += dx;
- position.y += dy;
- }
-
glm::vec3 halfExtents = glm::vec3(sprite.size.x * scale.x, sprite.size.y * scale.y, 0.0f) * 0.5f;
if (!frustum_.intersectsAABB(position, halfExtents)) {
stats_.culled++;