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(ui): merge UIRenderer+Image into UIVisual, delete the frame-late copy (REARCH_GUI F4)
esengined945cb2c59af
diff --git a/desktop/public/scenes/space-shooter.esscene b/desktop/public/scenes/space-shooter.essceneindex ea392570d..1eb3eb79a 100644--- a/desktop/public/scenes/space-shooter.esscene+++ b/desktop/public/scenes/space-shooter.esscene@@ -244,8 +244,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 2,"texture": "@uuid:5b21b6a6-dffa-4256-872a-36f4e4549408","color": {"r": 1,@@ -309,8 +310,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 2,"texture": "@uuid:5b21b6a6-dffa-4256-872a-36f4e4549408","color": {"r": 1,@@ -374,8 +376,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 2,"texture": "@uuid:5b21b6a6-dffa-4256-872a-36f4e4549408","color": {"r": 1,diff --git a/desktop/public/scenes/ui-layout.esscene b/desktop/public/scenes/ui-layout.essceneindex 080dc88b6..963667fe7 100644--- a/desktop/public/scenes/ui-layout.esscene+++ b/desktop/public/scenes/ui-layout.esscene@@ -180,8 +180,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.4,@@ -292,8 +293,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.7,"g": 0.2,@@ -404,8 +406,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.6,@@ -516,8 +519,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.6,"g": 0.4,@@ -624,8 +628,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.5,"g": 0.2,@@ -732,8 +737,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,@@ -786,8 +792,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.5,@@ -840,8 +847,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.85,@@ -894,8 +902,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.5,"g": 0.85,@@ -948,8 +957,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -1002,8 +1012,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -1056,8 +1067,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -1110,8 +1122,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.5,@@ -1164,8 +1177,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.15,@@ -1218,8 +1232,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.5,"g": 0.15,@@ -1272,8 +1287,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,@@ -1326,8 +1342,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,diff --git a/desktop/public/scenes/ui-node-absolute.esscene b/desktop/public/scenes/ui-node-absolute.essceneindex 22a6626db..018f3df2d 100644--- a/desktop/public/scenes/ui-node-absolute.esscene+++ b/desktop/public/scenes/ui-node-absolute.esscene@@ -87,7 +87,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {@@ -135,7 +135,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {@@ -183,7 +183,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {@@ -231,7 +231,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {diff --git a/desktop/public/scenes/ui-node-flex.esscene b/desktop/public/scenes/ui-node-flex.essceneindex 24263ce0f..714206513 100644--- a/desktop/public/scenes/ui-node-flex.esscene+++ b/desktop/public/scenes/ui-node-flex.esscene@@ -99,7 +99,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {@@ -138,7 +138,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {@@ -177,7 +177,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {@@ -216,7 +216,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {diff --git a/desktop/public/scenes/ui-text-uinode.esscene b/desktop/public/scenes/ui-text-uinode.essceneindex b8661482b..699b681f7 100644--- a/desktop/public/scenes/ui-text-uinode.esscene+++ b/desktop/public/scenes/ui-text-uinode.esscene@@ -92,7 +92,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {diff --git a/desktop/public/scenes/ui-text-zorder.esscene b/desktop/public/scenes/ui-text-zorder.essceneindex 7dce375fd..ece1d706e 100644--- a/desktop/public/scenes/ui-text-zorder.esscene+++ b/desktop/public/scenes/ui-text-zorder.esscene@@ -102,7 +102,7 @@}},{- "type": "UIRenderer",+ "type": "UIVisual","data": {"visualType": 1,"color": {diff --git a/desktop/src/engine/schema.ts b/desktop/src/engine/schema.tsindex cac577892..ca95a3d9a 100644--- a/desktop/src/engine/schema.ts+++ b/desktop/src/engine/schema.ts@@ -200,8 +200,7 @@ const BUILTIN_ASSET_FIELDS: Record<string, Record<string, string>> = {Sprite: { texture: 'texture', material: 'material' },SpineAnimation: { material: 'material' },BitmapText: { font: 'font' },- Image: { texture: 'texture', material: 'material' },- UIRenderer: { texture: 'texture', material: 'material' },+ UIVisual: { texture: 'texture', material: 'material' },SpriteAnimator: { clip: 'anim-clip' },AudioSource: { clip: 'audio' },ParticleEmitter: { texture: 'texture', material: 'material' },diff --git a/examples/audio-demo/assets/scenes/main.esscene b/examples/audio-demo/assets/scenes/main.essceneindex 8a9f9fc9c..e56c4a654 100644--- a/examples/audio-demo/assets/scenes/main.esscene+++ b/examples/audio-demo/assets/scenes/main.esscene@@ -182,8 +182,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.9,"g": 0.3,@@ -310,8 +311,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.3,"g": 0.7,@@ -438,8 +440,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.3,"g": 0.9,@@ -566,8 +569,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.9,"g": 0.7,@@ -694,8 +698,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.91,"g": 0.19,@@ -752,8 +757,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.91,"g": 0.46,@@ -810,8 +816,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.91,"g": 0.73,@@ -868,8 +875,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.82,"g": 0.91,@@ -926,8 +934,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.55,"g": 0.91,@@ -984,8 +993,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.28,"g": 0.91,@@ -1042,8 +1052,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.19,"g": 0.91,@@ -1100,8 +1111,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.19,"g": 0.91,@@ -1158,8 +1170,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.19,"g": 0.91,@@ -1216,8 +1229,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.19,"g": 0.64,@@ -1274,8 +1288,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.19,"g": 0.37,@@ -1332,8 +1347,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.28,"g": 0.19,@@ -1390,8 +1406,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.55,"g": 0.19,@@ -1448,8 +1465,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.82,"g": 0.19,@@ -1506,8 +1524,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.91,"g": 0.19,@@ -1564,8 +1583,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.91,"g": 0.19,diff --git a/examples/space-shooter/assets/scenes/main.esscene b/examples/space-shooter/assets/scenes/main.essceneindex ea392570d..1eb3eb79a 100644--- a/examples/space-shooter/assets/scenes/main.esscene+++ b/examples/space-shooter/assets/scenes/main.esscene@@ -244,8 +244,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 2,"texture": "@uuid:5b21b6a6-dffa-4256-872a-36f4e4549408","color": {"r": 1,@@ -309,8 +310,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 2,"texture": "@uuid:5b21b6a6-dffa-4256-872a-36f4e4549408","color": {"r": 1,@@ -374,8 +376,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 2,"texture": "@uuid:5b21b6a6-dffa-4256-872a-36f4e4549408","color": {"r": 1,diff --git a/examples/ui-controls/assets/scenes/main.esscene b/examples/ui-controls/assets/scenes/main.essceneindex 14414fc65..dda263c15 100644--- a/examples/ui-controls/assets/scenes/main.esscene+++ b/examples/ui-controls/assets/scenes/main.esscene@@ -173,8 +173,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.6,@@ -315,8 +316,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.8,@@ -457,8 +459,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.9,"g": 0.3,@@ -597,8 +600,10 @@}},{- "type": "Image",- "data": {}+ "type": "UIVisual",+ "data": {+ "visualType": 1+ }},{"type": "Toggle",@@ -712,8 +717,10 @@}},{- "type": "Image",- "data": {}+ "type": "UIVisual",+ "data": {+ "visualType": 1+ }},{"type": "Toggle",@@ -827,8 +834,10 @@}},{- "type": "Image",- "data": {}+ "type": "UIVisual",+ "data": {+ "visualType": 1+ }},{"type": "Toggle",@@ -945,8 +954,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.3,"g": 0.3,@@ -1010,8 +1020,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.6,@@ -1064,8 +1075,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 1,"g": 1,@@ -1120,8 +1132,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.2,@@ -1185,8 +1198,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.8,@@ -1241,8 +1255,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.2,@@ -1306,8 +1321,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 1,"g": 0.7,@@ -1362,8 +1378,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.2,@@ -1427,8 +1444,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.9,"g": 0.3,diff --git a/examples/ui-interaction/assets/scenes/main.esscene b/examples/ui-interaction/assets/scenes/main.essceneindex 4a9c0306d..f96bdf8af 100644--- a/examples/ui-interaction/assets/scenes/main.esscene+++ b/examples/ui-interaction/assets/scenes/main.esscene@@ -222,8 +222,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,@@ -336,8 +337,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.85,@@ -450,8 +452,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -564,8 +567,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -678,8 +682,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.15,@@ -792,8 +797,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,@@ -910,8 +916,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.15,diff --git a/examples/ui-layout/assets/scenes/main.esscene b/examples/ui-layout/assets/scenes/main.essceneindex 080dc88b6..963667fe7 100644--- a/examples/ui-layout/assets/scenes/main.esscene+++ b/examples/ui-layout/assets/scenes/main.esscene@@ -180,8 +180,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.4,@@ -292,8 +293,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.7,"g": 0.2,@@ -404,8 +406,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.2,"g": 0.6,@@ -516,8 +519,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.6,"g": 0.4,@@ -624,8 +628,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.5,"g": 0.2,@@ -732,8 +737,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,@@ -786,8 +792,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.5,@@ -840,8 +847,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.85,@@ -894,8 +902,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.5,"g": 0.85,@@ -948,8 +957,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -1002,8 +1012,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -1056,8 +1067,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.85,@@ -1110,8 +1122,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.5,@@ -1164,8 +1177,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.15,"g": 0.15,@@ -1218,8 +1232,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.5,"g": 0.15,@@ -1272,8 +1287,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,@@ -1326,8 +1342,9 @@}},{- "type": "Image",+ "type": "UIVisual","data": {+ "visualType": 1,"color": {"r": 0.85,"g": 0.15,diff --git a/sdk/src/asset/AssetFieldRegistry.ts b/sdk/src/asset/AssetFieldRegistry.tsindex 350f05231..7d9d0a4bd 100644--- a/sdk/src/asset/AssetFieldRegistry.ts+++ b/sdk/src/asset/AssetFieldRegistry.ts@@ -72,12 +72,7 @@ export function initBuiltinAssetFields(): void {{ field: 'font', type: 'font' },]);- registerAssetFields('Image', [- { field: 'texture', type: 'texture' },- { field: 'material', type: 'material' },- ]);-- registerAssetFields('UIRenderer', [+ registerAssetFields('UIVisual', [{ field: 'texture', type: 'texture' },{ field: 'material', type: 'material' },]);diff --git a/sdk/src/component.generated.ts b/sdk/src/component.generated.tsindex 2a9693a98..69941b94b 100644--- a/sdk/src/component.generated.ts+++ b/sdk/src/component.generated.ts@@ -12,7 +12,7 @@ import type { AssetFieldType } from './scene';* getAbiLayoutHash(); BuiltinBridge.connect() compares them and refuses to* run on mismatch, because mismatched offsets read the wrong heap bytes.*/-export const ABI_LAYOUT_HASH = 'b20732a9b17a5058';+export const ABI_LAYOUT_HASH = '7540dc008d0e3d93';export interface AssetFieldMeta {field: string;@@ -482,7 +482,7 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {colorFields: [],animatableFields: [],},- UIRenderer: {+ UIVisual: {defaults: {visualType: 0,texture: 0,@@ -490,13 +490,17 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {uvOffset: { x: 0, y: 0 },uvScale: { x: 1, y: 1 },sliceBorder: { x: 0, y: 0, z: 0, w: 0 },+ tileSize: { x: 32, y: 32 },+ fillMethod: 0,+ fillOrigin: 0,+ fillAmount: 1,material: 0,enabled: true,},assetFields: [{ field: 'texture', type: 'texture' as AssetFieldType }, { field: 'material', type: 'material' as AssetFieldType }],entityFields: [],colorFields: ['color'],- animatableFields: ['color.r', 'color.g', 'color.b', 'color.a'],+ animatableFields: ['color.r', 'color.g', 'color.b', 'color.a', 'fillAmount'],},Velocity: {defaults: {diff --git a/sdk/src/core-ui.ts b/sdk/src/core-ui.tsindex dfdb79eae..89d866b96 100644--- a/sdk/src/core-ui.ts+++ b/sdk/src/core-ui.ts@@ -18,7 +18,7 @@ export {TextAlign,TextVerticalAlign,TextOverflow,- UIRenderer,+ UIVisual,UIVisualType,UILayoutGeneration,UIMask,@@ -51,8 +51,6 @@ export {/** @internal fill-sprite sizing helper used by widget composition, unstable */syncFillSpriteSize,TextInput,- Image,- ImageType,FillMethod,FillOrigin,Draggable,@@ -75,9 +73,8 @@ export {type Unsubscribe,type UICameraData,type TextInputData,- type UIRendererData,+ type UIVisualData,type UILayoutGenerationData,- type ImageData,type DraggableData,type DragStateData,type FocusableData,diff --git a/sdk/src/ecs/ptrAccessors.generated.ts b/sdk/src/ecs/ptrAccessors.generated.tsindex fd9fc6cdd..3bc7956aa 100644--- a/sdk/src/ecs/ptrAccessors.generated.ts+++ b/sdk/src/ecs/ptrAccessors.generated.ts@@ -1173,20 +1173,24 @@ export function createUINodeData(): UINodePtrData {};}-export interface UIRendererPtrData {+export interface UIVisualPtrData {visualType: number;texture: number;color: Color;uvOffset: Vec2;uvScale: Vec2;sliceBorder: Vec4;+ tileSize: Vec2;+ fillMethod: number;+ fillOrigin: number;+ fillAmount: number;material: number;enabled: boolean;}-export function fillUIRenderer(+export function fillUIVisual(f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, out: UIRendererPtrData,+ ptr: number, out: UIVisualPtrData,): void {out.visualType = u8[ptr];out.texture = u32[(ptr + 4) >> 2];@@ -1194,13 +1198,17 @@ export function fillUIRenderer(const uvOffset_ = out.uvOffset; uvOffset_.x = f32[(ptr + 24) >> 2]; uvOffset_.y = f32[((ptr + 24) >> 2) + 1];const uvScale_ = out.uvScale; uvScale_.x = f32[(ptr + 32) >> 2]; uvScale_.y = f32[((ptr + 32) >> 2) + 1];const sliceBorder_ = out.sliceBorder; sliceBorder_.x = f32[(ptr + 40) >> 2]; sliceBorder_.y = f32[((ptr + 40) >> 2) + 1]; sliceBorder_.z = f32[((ptr + 40) >> 2) + 2]; sliceBorder_.w = f32[((ptr + 40) >> 2) + 3];- out.material = u32[(ptr + 56) >> 2];- out.enabled = u8[ptr + 60] !== 0;+ const tileSize_ = out.tileSize; tileSize_.x = f32[(ptr + 56) >> 2]; tileSize_.y = f32[((ptr + 56) >> 2) + 1];+ out.fillMethod = u8[ptr + 64];+ out.fillOrigin = u8[ptr + 65];+ out.fillAmount = f32[(ptr + 68) >> 2];+ out.material = u32[(ptr + 72) >> 2];+ out.enabled = u8[ptr + 76] !== 0;}-export function writeUIRenderer(+export function writeUIVisual(f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, data: UIRendererPtrData,+ ptr: number, data: UIVisualPtrData,): void {u8[ptr] = data.visualType;u32[(ptr + 4) >> 2] = data.texture;@@ -1208,11 +1216,15 @@ export function writeUIRenderer(f32[(ptr + 24) >> 2] = data.uvOffset.x; f32[((ptr + 24) >> 2) + 1] = data.uvOffset.y;f32[(ptr + 32) >> 2] = data.uvScale.x; f32[((ptr + 32) >> 2) + 1] = data.uvScale.y;f32[(ptr + 40) >> 2] = data.sliceBorder.x; f32[((ptr + 40) >> 2) + 1] = data.sliceBorder.y; f32[((ptr + 40) >> 2) + 2] = data.sliceBorder.z; f32[((ptr + 40) >> 2) + 3] = data.sliceBorder.w;- u32[(ptr + 56) >> 2] = data.material;- u8[ptr + 60] = data.enabled ? 1 : 0;+ f32[(ptr + 56) >> 2] = data.tileSize.x; f32[((ptr + 56) >> 2) + 1] = data.tileSize.y;+ u8[ptr + 64] = data.fillMethod;+ u8[ptr + 65] = data.fillOrigin;+ f32[(ptr + 68) >> 2] = data.fillAmount;+ u32[(ptr + 72) >> 2] = data.material;+ u8[ptr + 76] = data.enabled ? 1 : 0;}-export function createUIRendererData(): UIRendererPtrData {+export function createUIVisualData(): UIVisualPtrData {return {visualType: 0,texture: 0,@@ -1220,6 +1232,10 @@ export function createUIRendererData(): UIRendererPtrData {uvOffset: { x: 0, y: 0 },uvScale: { x: 0, y: 0 },sliceBorder: { x: 0, y: 0, z: 0, w: 0 },+ tileSize: { x: 0, y: 0 },+ fillMethod: 0,+ fillOrigin: 0,+ fillAmount: 0,material: 0,enabled: false,};@@ -1281,6 +1297,6 @@ export const PTR_ACCESSORS: Record<string, PtrAccessor<any>> = {UIInteraction: { fill: fillUIInteraction, write: writeUIInteraction, create: createUIInteractionData },UIMask: { fill: fillUIMask, write: writeUIMask, create: createUIMaskData },UINode: { fill: fillUINode, write: writeUINode, create: createUINodeData },- UIRenderer: { fill: fillUIRenderer, write: writeUIRenderer, create: createUIRendererData },+ UIVisual: { fill: fillUIVisual, write: writeUIVisual, create: createUIVisualData },Velocity: { fill: fillVelocity, write: writeVelocity, create: createVelocityData },};diff --git a/sdk/src/ptrLayouts.generated.ts b/sdk/src/ptrLayouts.generated.tsindex 6aa3a5495..30dd57c65 100644--- a/sdk/src/ptrLayouts.generated.ts+++ b/sdk/src/ptrLayouts.generated.ts@@ -309,8 +309,8 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {{ name: 'alignSelf', type: 'u8', offset: 68 },],},- UIRenderer: {- ptrFn: 'getUIRendererPtr',+ UIVisual: {+ ptrFn: 'getUIVisualPtr',fields: [{ name: 'visualType', type: 'u8', offset: 0 },{ name: 'texture', type: 'u32', offset: 4 },@@ -318,8 +318,12 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {{ name: 'uvOffset', type: 'vec2', offset: 24 },{ name: 'uvScale', type: 'vec2', offset: 32 },{ name: 'sliceBorder', type: 'vec4', offset: 40 },- { name: 'material', type: 'u32', offset: 56 },- { name: 'enabled', type: 'bool', offset: 60 },+ { name: 'tileSize', type: 'vec2', offset: 56 },+ { name: 'fillMethod', type: 'u8', offset: 64 },+ { name: 'fillOrigin', type: 'u8', offset: 65 },+ { name: 'fillAmount', type: 'f32', offset: 68 },+ { name: 'material', type: 'u32', offset: 72 },+ { name: 'enabled', type: 'bool', offset: 76 },],},Velocity: {diff --git a/sdk/src/sceneManager.ts b/sdk/src/sceneManager.tsindex 0628bd507..cbe3319ed 100644--- a/sdk/src/sceneManager.ts+++ b/sdk/src/sceneManager.ts@@ -23,13 +23,13 @@ import {ShapeRenderer, ParticleEmitter,type AnyComponentDef,} from './component';-import { UIRenderer } from './ui/core/ui-renderer';+import { UIVisual } from './ui/core/ui-visual';import { Assets } from './asset/AssetPlugin';import { RuntimeConfig } from './defaults';import { log } from './logger';const RENDERABLE_COMPONENTS: AnyComponentDef[] = [- Sprite, SpineAnimation, BitmapText, ShapeRenderer, ParticleEmitter, UIRenderer,+ Sprite, SpineAnimation, BitmapText, ShapeRenderer, ParticleEmitter, UIVisual,];// =============================================================================diff --git a/sdk/src/systemLabels.ts b/sdk/src/systemLabels.tsindex b26f77599..852195650 100644--- a/sdk/src/systemLabels.ts+++ b/sdk/src/systemLabels.ts@@ -11,7 +11,6 @@ export const PluginName = {UIRenderOrder: 'uiRenderOrder',UIMask: 'uiMask',Text: 'text',- Image: 'image',Focus: 'focus',Drag: 'drag',SafeArea: 'safeArea',@@ -25,7 +24,6 @@ export const SystemLabel = {UIInteraction: 'UIInteractionSystem',ListView: 'ListViewSystem',Text: 'TextSystem',- Image: 'ImageSystem',Focus: 'FocusSystem',Tween: 'TweenSystem',} as const;diff --git a/sdk/src/ui/ImagePlugin.ts b/sdk/src/ui/ImagePlugin.tsdeleted file mode 100644index 8c97ec50e..000000000--- a/sdk/src/ui/ImagePlugin.ts+++ /dev/null@@ -1,9 +0,0 @@-// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0-// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team-/**- * @file ui/ImagePlugin.ts- * @brief Back-compat shim — the Image→UIRenderer system moved to the render- * concept module (REARCH_GUI P0). Re-exported here to keep the public- * symbol + existing imports stable until REARCH_GUI P4.- */-export { ImagePlugin, imagePlugin } from './render/image';diff --git a/sdk/src/ui/TextInputPlugin.ts b/sdk/src/ui/TextInputPlugin.tsindex eb63de693..aac412811 100644--- a/sdk/src/ui/TextInputPlugin.ts+++ b/sdk/src/ui/TextInputPlugin.ts@@ -7,8 +7,8 @@ import { defineSystem, Schedule } from '../system';import { registerComponent } from '../component';import { TextInput, type TextInputData } from './TextInput';import { UINode } from './core/ui-node';-import { UIRenderer, UIVisualType } from './core/ui-renderer';-import type { UIRendererData } from './core/ui-renderer';+import { UIVisual, UIVisualType } from './core/ui-visual';+import type { UIVisualData } from './core/ui-visual';import { Interactable } from './behavior/interactable';import { Focusable } from './behavior/focusable';import { FocusManager, FocusManagerState } from './behavior/focusable';@@ -289,14 +289,18 @@ export class TextInputPlugin implements Plugin {const h = Math.ceil(getUINodeHeight(entity));if (w <= 0 || h <= 0) continue;- if (!world.has(entity, UIRenderer)) {- world.insert(entity, UIRenderer, {+ if (!world.has(entity, UIVisual)) {+ world.insert(entity, UIVisual, {visualType: UIVisualType.None,texture: 0,color: { r: 1, g: 1, b: 1, a: 1 },uvOffset: { x: 0, y: 0 },uvScale: { x: 1, y: 1 },sliceBorder: { x: 0, y: 0, z: 0, w: 0 },+ tileSize: { x: 32, y: 32 },+ fillMethod: 0,+ fillOrigin: 0,+ fillAmount: 1,material: 0,enabled: true,});@@ -418,14 +422,14 @@ export class TextInputPlugin implements Plugin {const textureHandle = rm.createTexture(w, h, wasmPixelPtr, pixels.length, 1, true);textureCache.set(entity, textureHandle);- const renderer = world.get(entity, UIRenderer) as UIRendererData;+ const renderer = world.get(entity, UIVisual) as UIVisualData;renderer.texture = textureHandle;renderer.visualType = UIVisualType.Image;renderer.uvOffset = { x: 0, y: 0 };renderer.uvScale = { x: 1, y: 1 };renderer.color = { r: 1, g: 1, b: 1, a: 1 };renderer.enabled = true;- world.insert(entity, UIRenderer, renderer);+ world.insert(entity, UIVisual, renderer);}}}diff --git a/sdk/src/ui/behavior/systems.ts b/sdk/src/ui/behavior/systems.tsindex 45e265d19..e313a8171 100644--- a/sdk/src/ui/behavior/systems.ts+++ b/sdk/src/ui/behavior/systems.ts@@ -14,7 +14,7 @@ import {STATE_VISUALS_SLOT_COUNT,type StateVisualsData,} from './state-visuals';-import { UIRenderer, type UIRendererData } from '../core/ui-renderer';+import { UIVisual, type UIVisualData } from '../core/ui-visual';import { UIEventType, type UIEventQueue } from '../core/events';/**@@ -173,8 +173,8 @@ export function createStateVisualsApplySystem(world: World): SystemDef {// blends from whatever the user/driver left there.let tx = transitions.get(e);if (!tx || tx.toSlot !== slot) {- const startColor = (flags & TransitionFlag.ColorTint) && world.has(target, UIRenderer)- ? { ...(world.get(target, UIRenderer) as UIRendererData).color }+ const startColor = (flags & TransitionFlag.ColorTint) && world.has(target, UIVisual)+ ? { ...(world.get(target, UIVisual) as UIVisualData).color }: { ...targetColor };const startScale = (flags & TransitionFlag.Scale) && world.has(target, Transform)? (world.get(target, Transform) as TransformData).scale.x@@ -187,17 +187,17 @@ export function createStateVisualsApplySystem(world: World): SystemDef {const t = fade > 0 ? Math.min(tx.elapsed / fade, 1) : 1;- if ((flags & TransitionFlag.ColorTint) && world.has(target, UIRenderer)) {- const r = world.get(target, UIRenderer) as UIRendererData;+ if ((flags & TransitionFlag.ColorTint) && world.has(target, UIVisual)) {+ const r = world.get(target, UIVisual) as UIVisualData;r.color = t >= 1 ? targetColor : lerpColor(tx.startColor, targetColor, t);- world.insert(target, UIRenderer, r);+ world.insert(target, UIVisual, r);}- if ((flags & TransitionFlag.SpriteSwap) && world.has(target, UIRenderer)) {+ if ((flags & TransitionFlag.SpriteSwap) && world.has(target, UIVisual)) {// Sprite swap is discrete: apply immediately at the slot change.- const r = world.get(target, UIRenderer) as UIRendererData;+ const r = world.get(target, UIVisual) as UIVisualData;r.texture = record[`slot${slot}Sprite`] as number;- world.insert(target, UIRenderer, r);+ world.insert(target, UIVisual, r);}if ((flags & TransitionFlag.Scale) && world.has(target, Transform)) {diff --git a/sdk/src/ui/collection/view-pool.ts b/sdk/src/ui/collection/view-pool.tsindex f68e6f4d0..be9a084dd 100644--- a/sdk/src/ui/collection/view-pool.ts+++ b/sdk/src/ui/collection/view-pool.ts@@ -11,7 +11,7 @@* fresh one is created).** Visibility is toggled through an injected `setVisible` hook; this keeps- * ViewPool decoupled from the UIRenderer component shape.+ * ViewPool decoupled from the UIVisual component shape.*/import type { Entity } from '../../types';@@ -41,7 +41,7 @@ export interface ViewPoolOptions {* Hook called on acquire/release to toggle item visibility. Default:* noop (ViewPool tracks free/used state without touching the entity).*- * Typical implementation toggles `UIRenderer.enabled` on the entity+ * Typical implementation toggles `UIVisual.enabled` on the entity* and its UI-visible descendants. Passed as a hook so ViewPool does* not depend on the UI primitives.*/diff --git a/sdk/src/ui/core/image.ts b/sdk/src/ui/core/image.tsdeleted file mode 100644index cc8a1ba0c..000000000--- a/sdk/src/ui/core/image.ts+++ /dev/null@@ -1,60 +0,0 @@-// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0-// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team-import { defineComponent } from '../../component';-import type { Color } from '../../types';-import { INVALID_TEXTURE } from '../../types';--export const ImageType = {- Simple: 0,- Sliced: 1,- Tiled: 2,- Filled: 3,-} as const;-export type ImageType = (typeof ImageType)[keyof typeof ImageType];--export const FillMethod = {- Horizontal: 0,- Vertical: 1,-} as const;-export type FillMethod = (typeof FillMethod)[keyof typeof FillMethod];--export const FillOrigin = {- Left: 0,- Right: 1,- Bottom: 2,- Top: 3,-} as const;-export type FillOrigin = (typeof FillOrigin)[keyof typeof FillOrigin];--export interface ImageData {- texture: number;- color: Color;- imageType: number;- fillMethod: number;- fillOrigin: number;- fillAmount: number;- preserveAspect: boolean;- tileSize: { x: number; y: number };- layer: number;- material: number;- enabled: boolean;-}--export const Image = defineComponent<ImageData>('Image', {- texture: INVALID_TEXTURE,- color: { r: 1, g: 1, b: 1, a: 1 },- imageType: ImageType.Simple,- fillMethod: FillMethod.Horizontal,- fillOrigin: FillOrigin.Left,- fillAmount: 1,- preserveAspect: false,- tileSize: { x: 32, y: 32 },- layer: 0,- material: 0,- enabled: true,-}, {- assetFields: [- { field: 'texture', type: 'texture' },- { field: 'material', type: 'material' },- ],-});diff --git a/sdk/src/ui/core/ui-renderer.ts b/sdk/src/ui/core/ui-renderer.tsdeleted file mode 100644index 89975743a..000000000--- a/sdk/src/ui/core/ui-renderer.ts+++ /dev/null@@ -1,35 +0,0 @@-// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0-// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team-import { defineBuiltin } from '../../component';-import type { Color, Vec2, Vec4 } from '../../types';--export const UIVisualType = {- None: 0,- SolidColor: 1,- Image: 2,- NineSlice: 3,-} as const;--export type UIVisualType = (typeof UIVisualType)[keyof typeof UIVisualType];--export interface UIRendererData {- visualType: UIVisualType;- texture: number;- color: Color;- uvOffset: Vec2;- uvScale: Vec2;- sliceBorder: Vec4;- material: number;- enabled: boolean;-}--export const UIRenderer = defineBuiltin<UIRendererData>('UIRenderer', {- visualType: UIVisualType.None,- texture: 0,- color: { r: 1, g: 1, b: 1, a: 1 },- uvOffset: { x: 0, y: 0 },- uvScale: { x: 1, y: 1 },- sliceBorder: { x: 0, y: 0, z: 0, w: 0 },- material: 0,- enabled: true,-});diff --git a/sdk/src/ui/core/ui-visual.ts b/sdk/src/ui/core/ui-visual.tsnew file mode 100644index 000000000..724f3d85b--- /dev/null+++ b/sdk/src/ui/core/ui-visual.ts@@ -0,0 +1,86 @@+// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0+// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team+/**+ * @file ui/core/ui-visual.ts+ * @brief UIVisual — the single UI visual component (REARCH_GUI F4).+ *+ * Merges the former low-level `UIRenderer` (what the renderer drew) and the+ * high-level `Image` (Simple/Sliced/Tiled/Filled intent that used to be copied+ * into a UIRenderer every frame). One component authored directly; the C+++ * `UIElementPlugin` reads it and derives the sampled UV inline (Tiled by+ * box/tileSize, Filled by fillAmount) — the deferred Image→UIRenderer copy is+ * gone. Geometry comes from the sibling {@link UINode}. Mirrors the C+++ * `UIVisual` builtin.+ */+import { defineBuiltin } from '../../component';+import type { Color, Vec2, Vec4 } from '../../types';++/** Draw mode (mirrors the C++ UIVisualType enum). */+export const UIVisualType = {+ /** Invisible — present only for render-order/hit participation. */+ None: 0,+ /** Tinted white quad (no texture). */+ SolidColor: 1,+ /** Textured quad; uvOffset/uvScale select a sprite sub-region. */+ Image: 2,+ /** 9-slice via sliceBorder. */+ NineSlice: 3,+ /** Texture repeated every tileSize px of the box. */+ Tiled: 4,+ /** Texture cropped to fillAmount along fillMethod/fillOrigin. */+ Filled: 5,+} as const;+export type UIVisualType = (typeof UIVisualType)[keyof typeof UIVisualType];++/** Fill axis for Filled visuals (mirrors the C++ UIFillMethod enum). */+export const FillMethod = {+ Horizontal: 0,+ Vertical: 1,+} as const;+export type FillMethod = (typeof FillMethod)[keyof typeof FillMethod];++/** Fill anchor edge for Filled visuals (mirrors the C++ UIFillOrigin enum). */+export const FillOrigin = {+ Left: 0,+ Right: 1,+ Bottom: 2,+ Top: 3,+} as const;+export type FillOrigin = (typeof FillOrigin)[keyof typeof FillOrigin];++export interface UIVisualData {+ visualType: UIVisualType;+ texture: number;+ color: Color;+ /** Base UV sub-region offset (identity = whole texture). */+ uvOffset: Vec2;+ /** Base UV sub-region scale (identity = whole texture). */+ uvScale: Vec2;+ /** NineSlice border (texture metadata wins when present). */+ sliceBorder: Vec4;+ /** Tiled: texture repeats every tileSize px of the box. */+ tileSize: Vec2;+ /** Filled: axis to crop along. */+ fillMethod: FillMethod;+ /** Filled: edge the fill grows from. */+ fillOrigin: FillOrigin;+ /** Filled: visible fraction [0,1]. */+ fillAmount: number;+ material: number;+ enabled: boolean;+}++export const UIVisual = defineBuiltin<UIVisualData>('UIVisual', {+ visualType: UIVisualType.None,+ texture: 0,+ color: { r: 1, g: 1, b: 1, a: 1 },+ uvOffset: { x: 0, y: 0 },+ uvScale: { x: 1, y: 1 },+ sliceBorder: { x: 0, y: 0, z: 0, w: 0 },+ tileSize: { x: 32, y: 32 },+ fillMethod: FillMethod.Horizontal,+ fillOrigin: FillOrigin.Left,+ fillAmount: 1,+ material: 0,+ enabled: true,+});diff --git a/sdk/src/ui/index.ts b/sdk/src/ui/index.tsindex cacd5a78e..04fdc986d 100644--- a/sdk/src/ui/index.ts+++ b/sdk/src/ui/index.ts@@ -66,10 +66,12 @@ export { DimensionUnit, type Dimension, px, percent, auto, isAuto } from './coreexport { UINode, UIPositionType, type UINodeData } from './core/ui-node';export {- UIRenderer,+ UIVisual,UIVisualType,- type UIRendererData,-} from './core/ui-renderer';+ FillMethod,+ FillOrigin,+ type UIVisualData,+} from './core/ui-visual';export { UIMask, MaskMode, type UIMaskData } from './core/ui-mask';@@ -81,14 +83,6 @@ export {type TextData,} from './core/text';-export {- Image,- ImageType,- FillMethod,- FillOrigin,- type ImageData,-} from './core/image';-export {FlexContainer,FlexDirection,@@ -196,12 +190,12 @@ export {export {identityTransform,buildUINode,- buildUIRenderer,+ buildUIVisual,buildText,spawnUIEntity,setUIVisible,type UINodeInit,- type UIRendererInit,+ type UIVisualInit,type TextInit,type UIEntityInit,} from './widgets/helpers';@@ -292,8 +286,6 @@ export {export { TextInputPlugin, textInputPlugin } from './TextInputPlugin';-export { ImagePlugin, imagePlugin } from './ImagePlugin';-export { DragPlugin, dragPlugin } from './DragPlugin';export { FocusPlugin, focusPlugin } from './FocusPlugin';diff --git a/sdk/src/ui/layout/layout.ts b/sdk/src/ui/layout/layout.tsindex dac61da6d..640195206 100644--- a/sdk/src/ui/layout/layout.ts+++ b/sdk/src/ui/layout/layout.ts@@ -19,7 +19,7 @@ import { defineSystem, Schedule } from '../../system';import { SystemLabel } from '../../systemLabels';import { Res } from '../../resource';import { UINode } from '../core/ui-node';-import { UIRenderer } from '../core/ui-renderer';+import { UIVisual } from '../core/ui-visual';import { FlexContainer, FlexItem } from './flex';import { GridLayout } from './grid';import { UICameraInfo } from '../UICameraInfo';@@ -35,7 +35,7 @@ export class UILayoutPlugin implements Plugin {build(app: App): void {registerComponent('UINode', UINode);- registerComponent('UIRenderer', UIRenderer);+ registerComponent('UIVisual', UIVisual);registerComponent('FlexContainer', FlexContainer);registerComponent('FlexItem', FlexItem);registerComponent('GridLayout', GridLayout);diff --git a/sdk/src/ui/render/image.ts b/sdk/src/ui/render/image.tsdeleted file mode 100644index c39779ea5..000000000--- a/sdk/src/ui/render/image.ts+++ /dev/null@@ -1,113 +0,0 @@-// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0-// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team-import type { App, Plugin } from '../../app';-import type { Entity } from '../../types';-import { registerComponent } from '../../component';-import { defineSystem, Schedule } from '../../system';-import { Image, ImageType, FillMethod, FillOrigin } from '../core/image';-import type { ImageData } from '../core/image';-import { UINode } from '../core/ui-node';-import { UIRenderer, UIVisualType } from '../core/ui-renderer';-import type { UIRendererData } from '../core/ui-renderer';-import { getUINodeWidth, getUINodeHeight, ensureUIRenderer } from '../uiHelpers';-import { SystemLabel, PluginName } from '../../systemLabels';--export class ImagePlugin implements Plugin {- name = PluginName.Image;- dependencies = [PluginName.UILayout];-- build(app: App): void {- registerComponent('Image', Image);-- const world = app.world;- const lastRenderedTick = new Map<Entity, number>();-- world.enableChangeTracking(Image);- world.enableChangeTracking(UINode);-- app.addSystemToSchedule(Schedule.PreUpdate, defineSystem(- [],- () => {- for (const entity of lastRenderedTick.keys()) {- if (!world.valid(entity) || !world.has(entity, Image)) {- lastRenderedTick.delete(entity);- }- }-- const entities = world.getEntitiesWithComponents([Image]);-- for (const entity of entities) {- const image = world.get(entity, Image) as ImageData;- const hasNode = world.has(entity, UINode);-- const prevTick = lastRenderedTick.get(entity);- if (prevTick !== undefined && world.has(entity, UIRenderer)) {- const imageChanged = world.isChangedSince(entity, Image, prevTick);- const boxChanged = hasNode && world.isChangedSince(entity, UINode, prevTick);- if (!imageChanged && !boxChanged) continue;- }-- ensureUIRenderer(world, entity);-- const renderer = world.get(entity, UIRenderer) as UIRendererData;-- if (!image.enabled) {- renderer.enabled = false;- world.insert(entity, UIRenderer, renderer);- lastRenderedTick.set(entity, world.getWorldTick());- continue;- }-- renderer.enabled = true;- renderer.texture = image.texture;- renderer.color = { r: image.color.r, g: image.color.g, b: image.color.b, a: image.color.a };- renderer.material = image.material;-- renderer.uvOffset = { x: 0, y: 0 };- renderer.uvScale = { x: 1, y: 1 };-- const hasTexture = !!image.texture;- if (!hasTexture) {- renderer.visualType = UIVisualType.SolidColor;- } else if (image.imageType === ImageType.Sliced) {- renderer.visualType = UIVisualType.NineSlice;- } else {- renderer.visualType = UIVisualType.Image;- }-- if (image.imageType === ImageType.Filled) {- const amount = Math.max(0, Math.min(1, image.fillAmount));-- if (image.fillMethod === FillMethod.Horizontal) {- if (image.fillOrigin === FillOrigin.Left) {- renderer.uvScale = { x: amount, y: 1 };- } else {- renderer.uvOffset = { x: 1 - amount, y: 0 };- renderer.uvScale = { x: amount, y: 1 };- }- } else {- if (image.fillOrigin === FillOrigin.Bottom) {- renderer.uvScale = { x: 1, y: amount };- } else {- renderer.uvOffset = { x: 0, y: 1 - amount };- renderer.uvScale = { x: 1, y: amount };- }- }- } else if (image.imageType === ImageType.Tiled) {- const w = hasNode ? getUINodeWidth(entity) : 0;- const h = hasNode ? getUINodeHeight(entity) : 0;- if (image.tileSize.x > 0 && image.tileSize.y > 0) {- renderer.uvScale = { x: w / image.tileSize.x, y: h / image.tileSize.y };- }- }-- world.insert(entity, UIRenderer, renderer);- lastRenderedTick.set(entity, world.getWorldTick());- }- },- { name: 'ImageSystem' }- ), { runAfter: [SystemLabel.UILayout] });- }-}--export const imagePlugin = new ImagePlugin();diff --git a/sdk/src/ui/render/render-order.ts b/sdk/src/ui/render/render-order.tsindex 398d2179d..47abd7566 100644--- a/sdk/src/ui/render/render-order.ts+++ b/sdk/src/ui/render/render-order.ts@@ -9,7 +9,7 @@ export class UIRenderOrderPlugin implements Plugin {name = PluginName.UIRenderOrder;dependencies = [PluginName.UILayout];after = [- PluginName.Text, PluginName.Image, PluginName.UIMask,+ PluginName.Text, PluginName.UIMask,PluginName.UIInteraction,];diff --git a/sdk/src/ui/text/plugin.ts b/sdk/src/ui/text/plugin.tsindex 189518b3f..dd9ca9696 100644--- a/sdk/src/ui/text/plugin.ts+++ b/sdk/src/ui/text/plugin.ts@@ -18,7 +18,7 @@ import { SdfTextRenderer } from './text-renderer';import { composeTRS, rectTextBox, UI_TEXT_BOLD, UI_TEXT_ITALIC } from './text-transform';import { Text, type TextData } from '../core/text';import { UINode } from '../core/ui-node';-import { getUINodeWidth, getUINodeHeight, ensureUIRenderer } from '../uiHelpers';+import { getUINodeWidth, getUINodeHeight, ensureUIVisual } from '../uiHelpers';// Matches C++ UIElementPlugin::UI_BASE_LAYER — UI quads use layer = base + uiOrder.const UI_BASE_LAYER = 1000;@@ -35,12 +35,12 @@ export class TextPlugin implements Plugin {const world = app.world;// A Text node inside a UINode is a UI render node: ensure it carries a- // UIRenderer (visualType None — not drawn as a quad) so the UI+ // UIVisual (visualType None — not drawn as a quad) so the UI// render-order pass assigns it a uiOrder and the SDF glyphs sort with// sibling UI elements. Idempotent; runs before the PostUpdate order pass.app.addSystemToSchedule(Schedule.PreUpdate, defineSystem([], () => {for (const e of world.getEntitiesWithComponents([Text, UINode])) {- ensureUIRenderer(world, e as Entity);+ ensureUIVisual(world, e as Entity);}}, { name: 'TextRenderNodeSystem' }));diff --git a/sdk/src/ui/uiHelpers.ts b/sdk/src/ui/uiHelpers.tsindex 5b73ef70f..e55bac39f 100644--- a/sdk/src/ui/uiHelpers.ts+++ b/sdk/src/ui/uiHelpers.ts@@ -3,12 +3,10 @@import { CoreApiBridge } from '../CoreApiBridge';import { Sprite, Parent, Transform } from '../component';import type { ParentData, SpriteData, TransformData, AnyComponentDef } from '../component';-import { Image } from './core/image';-import type { ImageData } from './core/image';import type { Entity, Color } from '../types';import type { World } from '../world';-import { UIRenderer, UIVisualType } from './core/ui-renderer';-import type { UIRendererData } from './core/ui-renderer';+import { UIVisual, UIVisualType } from './core/ui-visual';+import type { UIVisualData } from './core/ui-visual';import { FillDirection } from './uiTypes';import type { ColorTransition } from './uiTypes';import type { ESEngineModule, CppRegistry } from '../wasm';@@ -216,15 +214,19 @@ export function ensureComponent(}}-export function ensureUIRenderer(world: World, entity: Entity): void {- if (!world.has(entity, UIRenderer)) {- world.insert(entity, UIRenderer, {+export function ensureUIVisual(world: World, entity: Entity): void {+ if (!world.has(entity, UIVisual)) {+ world.insert(entity, UIVisual, {visualType: UIVisualType.None,texture: 0,color: { r: 1, g: 1, b: 1, a: 1 },uvOffset: { x: 0, y: 0 },uvScale: { x: 1, y: 1 },sliceBorder: { x: 0, y: 0, z: 0, w: 0 },+ tileSize: { x: 32, y: 32 },+ fillMethod: 0,+ fillOrigin: 0,+ fillAmount: 1,material: 0,enabled: true,});@@ -254,45 +256,33 @@ function colorEquals(a: Color, b: Color): boolean {}export function setEntityColor(world: World, entity: Entity, color: Color): void {- if (world.has(entity, Image)) {- const img = world.get(entity, Image) as ImageData;- if (!colorEquals(img.color, color)) {- img.color = color;- world.insert(entity, Image, img);- }- } else if (world.has(entity, Sprite)) {+ if (world.has(entity, Sprite)) {const s = world.get(entity, Sprite) as SpriteData;if (!colorEquals(s.color, color)) {s.color = color;world.insert(entity, Sprite, s);}- } else if (world.has(entity, UIRenderer)) {- const r = world.get(entity, UIRenderer) as UIRendererData;+ } else if (world.has(entity, UIVisual)) {+ const r = world.get(entity, UIVisual) as UIVisualData;if (!colorEquals(r.color, color)) {r.color = color;- world.insert(entity, UIRenderer, r);+ world.insert(entity, UIVisual, r);}}}export function setEntityEnabled(world: World, entity: Entity, enabled: boolean): void {- if (world.has(entity, Image)) {- const img = world.get(entity, Image) as ImageData;- if (img.enabled !== enabled) {- img.enabled = enabled;- world.insert(entity, Image, img);- }- } else if (world.has(entity, Sprite)) {+ if (world.has(entity, Sprite)) {const s = world.get(entity, Sprite) as SpriteData;if (s.enabled !== enabled) {s.enabled = enabled;world.insert(entity, Sprite, s);}- } else if (world.has(entity, UIRenderer)) {- const r = world.get(entity, UIRenderer) as UIRendererData;+ } else if (world.has(entity, UIVisual)) {+ const r = world.get(entity, UIVisual) as UIVisualData;if (r.enabled !== enabled) {r.enabled = enabled;- world.insert(entity, UIRenderer, r);+ world.insert(entity, UIVisual, r);}}}diff --git a/sdk/src/ui/widgets/button.ts b/sdk/src/ui/widgets/button.tsindex c158c7b89..0a21c1903 100644--- a/sdk/src/ui/widgets/button.ts+++ b/sdk/src/ui/widgets/button.ts@@ -15,7 +15,7 @@ import { UIEventType, type UIEventQueue } from '../core/events';import {spawnUIEntity,type UINodeInit,- type UIRendererInit,+ type UIVisualInit,type TextInit,} from './helpers';@@ -36,7 +36,7 @@ export interface ButtonOptions {/** CSS-box layout. Default: fill the parent. */node?: UINodeInit;/** Background renderer config. Default: solid white quad. */- background?: UIRendererInit;+ background?: UIVisualInit;/** Label text. Omit to skip spawning a child label entity. */text?: string | TextInit;/**@@ -92,7 +92,7 @@ export function createButton(opts: ButtonOptions): Entity {world,parent: opts.parent,node: opts.node ?? { fill: true },- renderer: opts.background ?? {},+ visual: opts.background ?? {},});world.insert(entity, Interactable, {diff --git a/sdk/src/ui/widgets/dialog.ts b/sdk/src/ui/widgets/dialog.tsindex 2580fef83..bf47d2c45 100644--- a/sdk/src/ui/widgets/dialog.ts+++ b/sdk/src/ui/widgets/dialog.ts@@ -5,7 +5,7 @@ import type { World } from '../../world';import { Interactable, UIInteraction } from '../behavior/interactable';-import { spawnUIEntity, setUIVisible, type UINodeInit, type UIRendererInit } from './helpers';+import { spawnUIEntity, setUIVisible, type UINodeInit, type UIVisualInit } from './helpers';import { px, percent } from '../core/dimension';export interface DialogOptions {@@ -14,10 +14,10 @@ export interface DialogOptions {/** Full-viewport backdrop. Default: fill the parent. */backdropNode?: UINodeInit;/** Backdrop visuals. Default: 50% black overlay. */- backdropRenderer?: UIRendererInit;+ backdropRenderer?: UIVisualInit;/** Panel box (the modal). Default: 400x300 centered. */panelNode?: UINodeInit;- panelRenderer?: UIRendererInit;+ panelRenderer?: UIVisualInit;/** Start hidden. Default true. */startHidden?: boolean;}@@ -48,7 +48,7 @@ export function createDialog(opts: DialogOptions): DialogHandle {world,parent: opts.parent,node: opts.backdropNode ?? { fill: true },- renderer: opts.backdropRenderer ?? { color: DEFAULT_BACKDROP_COLOR },+ visual: opts.backdropRenderer ?? { color: DEFAULT_BACKDROP_COLOR },});// Blocks hit-test on the scene behind the dialog.@@ -74,7 +74,7 @@ export function createDialog(opts: DialogOptions): DialogHandle {marginLeft: px(-200),marginTop: px(-150),},- renderer: opts.panelRenderer ?? { color: DEFAULT_PANEL_COLOR },+ visual: opts.panelRenderer ?? { color: DEFAULT_PANEL_COLOR },});let open = !(opts.startHidden ?? true);diff --git a/sdk/src/ui/widgets/dropdown.ts b/sdk/src/ui/widgets/dropdown.tsindex 12775e127..78143d87d 100644--- a/sdk/src/ui/widgets/dropdown.ts+++ b/sdk/src/ui/widgets/dropdown.ts@@ -9,7 +9,7 @@ import { StateVisuals, TransitionFlag, type StateVisualsData } from '../behaviorimport { UIEventType, type UIEventQueue } from '../core/events';import { Text, type TextData } from '../core/text';-import { spawnUIEntity, type UINodeInit, type UIRendererInit } from './helpers';+import { spawnUIEntity, type UINodeInit, type UIVisualInit } from './helpers';import { px, percent } from '../core/dimension';export interface DropdownOptions<T> {@@ -35,7 +35,7 @@ export interface DropdownOptions<T> {pressed?: Color;};/** Popup panel background. */- popupRenderer?: UIRendererInit;+ popupRenderer?: UIVisualInit;/** Height of each option row in pixels. Default 32. */optionHeight?: number;@@ -114,7 +114,7 @@ export function createDropdown<T>(opts: DropdownOptions<T>): DropdownHandle<T> {world,parent: opts.parent,node: opts.node ?? { fill: true },- renderer: { color: btnColors.normal },+ visual: { color: btnColors.normal },});world.insert(button, Interactable, { enabled: true, blockRaycast: true, raycastTarget: true });world.insert(button, UIInteraction, INTERACTION_DEFAULT);@@ -150,7 +150,7 @@ export function createDropdown<T>(opts: DropdownOptions<T>): DropdownHandle<T> {insetTop: percent(100),height: px(totalHeight),},- renderer: opts.popupRenderer ?? { color: DEFAULT_POPUP_BG },+ visual: opts.popupRenderer ?? { color: DEFAULT_POPUP_BG },});for (let i = 0; i < opts.options.length; i++) {@@ -178,7 +178,7 @@ export function createDropdown<T>(opts: DropdownOptions<T>): DropdownHandle<T> {insetTop: px(index * optionHeight),height: px(optionHeight),},- renderer: { color: optColors.normal },+ visual: { color: optColors.normal },});world.insert(row, Interactable, { enabled: true, blockRaycast: true, raycastTarget: true });world.insert(row, UIInteraction, INTERACTION_DEFAULT);diff --git a/sdk/src/ui/widgets/helpers.ts b/sdk/src/ui/widgets/helpers.tsindex cd5702ace..4bfd1acc5 100644--- a/sdk/src/ui/widgets/helpers.ts+++ b/sdk/src/ui/widgets/helpers.ts@@ -9,7 +9,7 @@ import type { World } from '../../world';import { UINode, UIPositionType, type UINodeData } from '../core/ui-node';import { px, percent, auto, type Dimension } from '../core/dimension';-import { UIRenderer, UIVisualType, type UIRendererData } from '../core/ui-renderer';+import { UIVisual, UIVisualType, FillMethod, FillOrigin, type UIVisualData } from '../core/ui-visual';import { Text, TextAlign, TextVerticalAlign, type TextData } from '../core/text';/** Identity Transform. Fresh object per call — safe to insert into ECS. */@@ -73,18 +73,22 @@ export function buildUINode(init: UINodeInit = {}): UINodeData {};}-export interface UIRendererInit {+export interface UIVisualInit {visualType?: UIVisualType;texture?: number;color?: { r: number; g: number; b: number; a: number };uvOffset?: Vec2;uvScale?: Vec2;sliceBorder?: { x: number; y: number; z: number; w: number };+ tileSize?: Vec2;+ fillMethod?: FillMethod;+ fillOrigin?: FillOrigin;+ fillAmount?: number;material?: number;enabled?: boolean;}-export function buildUIRenderer(init: UIRendererInit = {}): UIRendererData {+export function buildUIVisual(init: UIVisualInit = {}): UIVisualData {return {visualType: init.visualType ?? UIVisualType.SolidColor,texture: init.texture ?? 0,@@ -92,6 +96,10 @@ export function buildUIRenderer(init: UIRendererInit = {}): UIRendererData {uvOffset: init.uvOffset ?? { x: 0, y: 0 },uvScale: init.uvScale ?? { x: 1, y: 1 },sliceBorder: init.sliceBorder ?? { x: 0, y: 0, z: 0, w: 0 },+ tileSize: init.tileSize ?? { x: 32, y: 32 },+ fillMethod: init.fillMethod ?? FillMethod.Horizontal,+ fillOrigin: init.fillOrigin ?? FillOrigin.Left,+ fillAmount: init.fillAmount ?? 1,material: init.material ?? 0,enabled: init.enabled ?? true,};@@ -127,12 +135,12 @@ export interface UIEntityInit {parent?: Entity;/** CSS-box layout (defaults to fill the parent). */node?: UINodeInit;- renderer?: UIRendererInit;+ visual?: UIVisualInit;text?: TextInit;}/**- * Spawn a UI entity with Transform + UINode, optionally UIRenderer and+ * Spawn a UI entity with Transform + UINode, optionally UIVisual and* Text, optionally parented. Returns the entity.** Widgets compose with this to avoid repeating the same insert dance.@@ -144,8 +152,8 @@ export function spawnUIEntity(init: UIEntityInit): Entity {world.insert(entity, Transform, identityTransform());world.insert(entity, UINode, buildUINode(init.node));- if (init.renderer) {- world.insert(entity, UIRenderer, buildUIRenderer(init.renderer));+ if (init.visual) {+ world.insert(entity, UIVisual, buildUIVisual(init.visual));}if (init.text) {world.insert(entity, Text, buildText(init.text));@@ -158,14 +166,14 @@ export function spawnUIEntity(init: UIEntityInit): Entity {}/**- * Toggle visibility of a UI entity via UIRenderer.enabled. Safe if the- * entity has no UIRenderer — no-op in that case.+ * Toggle visibility of a UI entity via UIVisual.enabled. Safe if the+ * entity has no UIVisual — no-op in that case.*/export function setUIVisible(world: World, entity: Entity, visible: boolean): void {- if (!world.valid(entity) || !world.has(entity, UIRenderer)) return;- const r = world.get(entity, UIRenderer) as UIRendererData;+ if (!world.valid(entity) || !world.has(entity, UIVisual)) return;+ const r = world.get(entity, UIVisual) as UIVisualData;if (r.enabled !== visible) {r.enabled = visible;- world.insert(entity, UIRenderer, r);+ world.insert(entity, UIVisual, r);}}diff --git a/sdk/src/ui/widgets/progress.ts b/sdk/src/ui/widgets/progress.tsindex 945b3c35a..f2ff3e259 100644--- a/sdk/src/ui/widgets/progress.ts+++ b/sdk/src/ui/widgets/progress.ts@@ -6,14 +6,14 @@ import type { World } from '../../world';import { UINode, type UINodeData } from '../core/ui-node';import { px, percent } from '../core/dimension';-import { spawnUIEntity, type UINodeInit, type UIRendererInit } from './helpers';+import { spawnUIEntity, type UINodeInit, type UIVisualInit } from './helpers';export interface ProgressOptions {world: World;parent?: Entity;node?: UINodeInit;/** Background (track) renderer. */- background?: UIRendererInit;+ background?: UIVisualInit;/** Fill renderer config (the filled bar). */fill?: { color?: Color; sprite?: number };/** Direction the fill grows. Default: 'right'. */@@ -44,14 +44,14 @@ export function createProgress(opts: ProgressOptions): ProgressHandle {world,parent: opts.parent,node: opts.node ?? { fill: true },- renderer: opts.background ?? { color: { r: 0.15, g: 0.15, b: 0.15, a: 1 } },+ visual: opts.background ?? { color: { r: 0.15, g: 0.15, b: 0.15, a: 1 } },});const fill = spawnUIEntity({world,parent: track,node: nodeForProgress(direction, value),- renderer: {+ visual: {color: opts.fill?.color ?? { r: 0.25, g: 0.56, b: 0.96, a: 1 },texture: opts.fill?.sprite ?? 0,visualType: opts.fill?.sprite ? 2 /* Image */ : 1 /* SolidColor */,diff --git a/sdk/src/ui/widgets/slider.ts b/sdk/src/ui/widgets/slider.tsindex 62979ad5a..a9652be31 100644--- a/sdk/src/ui/widgets/slider.ts+++ b/sdk/src/ui/widgets/slider.ts@@ -6,7 +6,7 @@ import type { World } from '../../world';import { UINode, type UINodeData } from '../core/ui-node';import { px, percent } from '../core/dimension';-import { spawnUIEntity, type UINodeInit, type UIRendererInit } from './helpers';+import { spawnUIEntity, type UINodeInit, type UIVisualInit } from './helpers';export interface SliderOptions {world: World;@@ -22,9 +22,9 @@ export interface SliderOptions {/** Handle width in pixels. Default 12. */handleWidth?: number;- trackRenderer?: UIRendererInit;- fillRenderer?: UIRendererInit;- handleRenderer?: UIRendererInit;+ trackRenderer?: UIVisualInit;+ fillRenderer?: UIVisualInit;+ handleRenderer?: UIVisualInit;onChange?: (value: number, entity: Entity) => void;}@@ -45,9 +45,9 @@ export interface SliderHandle {dispose(): void;}-const DEFAULT_TRACK: UIRendererInit = { color: { r: 0.15, g: 0.15, b: 0.15, a: 1 } };-const DEFAULT_FILL: UIRendererInit = { color: { r: 0.25, g: 0.56, b: 0.96, a: 1 } };-const DEFAULT_HANDLE: UIRendererInit = { color: { r: 1, g: 1, b: 1, a: 1 } };+const DEFAULT_TRACK: UIVisualInit = { color: { r: 0.15, g: 0.15, b: 0.15, a: 1 } };+const DEFAULT_FILL: UIVisualInit = { color: { r: 0.25, g: 0.56, b: 0.96, a: 1 } };+const DEFAULT_HANDLE: UIVisualInit = { color: { r: 1, g: 1, b: 1, a: 1 } };/*** Horizontal slider composed of a track, a fill bar, and a handle thumb.@@ -66,21 +66,21 @@ export function createSlider(opts: SliderOptions): SliderHandle {world: opts.world,parent: opts.parent,node: opts.node ?? { fill: true },- renderer: opts.trackRenderer ?? DEFAULT_TRACK,+ visual: opts.trackRenderer ?? DEFAULT_TRACK,});const fill = spawnUIEntity({world: opts.world,parent: track,node: fillNodeAt(fraction(value, min, max)),- renderer: opts.fillRenderer ?? DEFAULT_FILL,+ visual: opts.fillRenderer ?? DEFAULT_FILL,});const handle = spawnUIEntity({world: opts.world,parent: track,node: handleNodeAt(fraction(value, min, max), handleWidth),- renderer: opts.handleRenderer ?? DEFAULT_HANDLE,+ visual: opts.handleRenderer ?? DEFAULT_HANDLE,});// Value -> geometry: the fill's width is the value fraction; the handle'sdiff --git a/sdk/src/ui/widgets/toggle.ts b/sdk/src/ui/widgets/toggle.tsindex a237584aa..11ba1f8bc 100644--- a/sdk/src/ui/widgets/toggle.ts+++ b/sdk/src/ui/widgets/toggle.ts@@ -6,7 +6,7 @@ import type { World } from '../../world';import { UIEventType, type UIEventQueue } from '../core/events';import { createButton, type ButtonStateVisual } from './button';-import { spawnUIEntity, setUIVisible, type UINodeInit, type UIRendererInit } from './helpers';+import { spawnUIEntity, setUIVisible, type UINodeInit, type UIVisualInit } from './helpers';export interface ToggleOptions {world: World;@@ -15,7 +15,7 @@ export interface ToggleOptions {node?: UINodeInit;/** Background renderer for the frame. */- background?: UIRendererInit;+ background?: UIVisualInit;/** Interaction states (normal / hover / pressed / disabled) for the frame. */interactionStates: Record<string, ButtonStateVisual>;@@ -69,7 +69,7 @@ export function createToggle(opts: ToggleOptions): ToggleHandle {world,parent: button,node: opts.check?.node ?? { fill: true },- renderer: opts.check+ visual: opts.check? {color: opts.check.color,texture: opts.check.sprite,diff --git a/sdk/src/uiPlugins.ts b/sdk/src/uiPlugins.tsindex b78204743..52f8b4615 100644--- a/sdk/src/uiPlugins.ts+++ b/sdk/src/uiPlugins.ts@@ -6,7 +6,6 @@ import { uiInteractionPlugin } from './ui/UIInteractionPlugin';import { uiBehaviorPlugin } from './ui/plugin';import { uiLayoutPlugin } from './ui/UILayoutPlugin';import { textInputPlugin } from './ui/TextInputPlugin';-import { imagePlugin } from './ui/ImagePlugin';import { dragPlugin } from './ui/DragPlugin';import { focusPlugin } from './ui/FocusPlugin';import { safeAreaPlugin } from './ui/SafeAreaPlugin';@@ -14,10 +13,10 @@ import { uiRenderOrderPlugin } from './ui/UIRenderOrderPlugin';import type { Plugin } from './app';// `textPlugin` now renders the Text component via the dynamic SDF glyph atlas-// (REARCH_GUI P1.4d); the legacy Canvas2D-per-entity path is retired.+// (REARCH_GUI P1.4d); the legacy Canvas2D-per-entity path is retired. The+// Image→UIRenderer copy plugin is gone too — UIVisual is drawn directly (F4).export const uiPlugins: Plugin[] = [textPlugin, uiMaskPlugin, uiLayoutPlugin,- imagePlugin,uiInteractionPlugin, uiBehaviorPlugin, dragPlugin,textInputPlugin,focusPlugin, safeAreaPlugin,diff --git a/sdk/src/wasm.generated.ts b/sdk/src/wasm.generated.tsindex bdb5a6fb8..2260dbb06 100644--- a/sdk/src/wasm.generated.ts+++ b/sdk/src/wasm.generated.ts@@ -122,6 +122,18 @@ export enum TextAlign {Right = 2,}+export enum UIFillMethod {+ Horizontal = 0,+ Vertical = 1,+}++export enum UIFillOrigin {+ Left = 0,+ Right = 1,+ Bottom = 2,+ Top = 3,+}+export enum UIPositionType {Relative = 0,Absolute = 1,@@ -132,6 +144,8 @@ export enum UIVisualType {SolidColor = 1,Image = 2,NineSlice = 3,+ Tiled = 4,+ Filled = 5,}// Components@@ -458,13 +472,17 @@ export interface UINode {insetBottom: Dimension;}-export interface UIRenderer {+export interface UIVisual {visualType: number;texture: number;color: Vec4;uvOffset: Vec2;uvScale: Vec2;sliceBorder: Vec4;+ tileSize: Vec2;+ fillMethod: number;+ fillOrigin: number;+ fillAmount: number;material: number;enabled: boolean;}@@ -581,10 +599,10 @@ export interface Registry {getUINode(entity: Entity): UINode;addUINode(entity: Entity, component: UINode): void;removeUINode(entity: Entity): void;- hasUIRenderer(entity: Entity): boolean;- getUIRenderer(entity: Entity): UIRenderer;- addUIRenderer(entity: Entity, component: UIRenderer): void;- removeUIRenderer(entity: Entity): void;+ hasUIVisual(entity: Entity): boolean;+ getUIVisual(entity: Entity): UIVisual;+ addUIVisual(entity: Entity, component: UIVisual): void;+ removeUIVisual(entity: Entity): void;hasVelocity(entity: Entity): boolean;getVelocity(entity: Entity): Velocity;addVelocity(entity: Entity, component: Velocity): void;@@ -628,6 +646,6 @@ export interface ESEngineModule {UIInteraction: new () => UIInteraction;UIMask: new () => UIMask;UINode: new () => UINode;- UIRenderer: new () => UIRenderer;+ UIVisual: new () => UIVisual;Velocity: new () => Velocity;}diff --git a/sdk/src/wasm.ts b/sdk/src/wasm.tsindex 64407aed0..5c181a2f8 100644--- a/sdk/src/wasm.ts+++ b/sdk/src/wasm.ts@@ -127,7 +127,7 @@ export interface ESEngineModule {*/sdfFromAlpha?(alphaPtr: number, outPtr: number, width: number, height: number, spread: number): void;/**- * UI draw order of an entity (its UIRenderer.uiOrder, assigned by the UI+ * UI draw order of an entity (its UIVisual.uiOrder, assigned by the UI* render-order pass), so SDF text quads interleave with UI quads. -1 if the* entity is not a UI render node (REARCH_GUI P1.4d #1).*/diff --git a/sdk/src/webAppFactory.ts b/sdk/src/webAppFactory.tsindex 778970cb4..59ae89a89 100644--- a/sdk/src/webAppFactory.ts+++ b/sdk/src/webAppFactory.ts@@ -23,7 +23,6 @@ export { uiLayoutPlugin, UILayoutPlugin } from './ui/UILayoutPlugin';export { uiRenderOrderPlugin, UIRenderOrderPlugin } from './ui/UIRenderOrderPlugin';export { textInputPlugin, TextInputPlugin } from './ui/TextInputPlugin';-export { imagePlugin, ImagePlugin } from './ui/ImagePlugin';export { dragPlugin, DragPlugin } from './ui/DragPlugin';export { focusPlugin, FocusPlugin } from './ui/FocusPlugin';export { safeAreaPlugin, SafeAreaPlugin } from './ui/SafeAreaPlugin';diff --git a/sdk/tests/asset-field-registry.test.ts b/sdk/tests/asset-field-registry.test.tsindex 6d95f6331..4341e572f 100644--- a/sdk/tests/asset-field-registry.test.ts+++ b/sdk/tests/asset-field-registry.test.ts@@ -61,8 +61,7 @@ describe('AssetFieldRegistry', () => {expect(components).toContain('Sprite');expect(components).toContain('SpineAnimation');expect(components).toContain('BitmapText');- expect(components).toContain('Image');- expect(components).toContain('UIRenderer');+ expect(components).toContain('UIVisual');expect(components).toContain('SpriteAnimator');expect(components).toContain('AudioSource');expect(components).toContain('ParticleEmitter');diff --git a/sdk/tests/ui-state-visuals-fade.test.ts b/sdk/tests/ui-state-visuals-fade.test.tsindex 011e77f47..ca49c51e0 100644--- a/sdk/tests/ui-state-visuals-fade.test.ts+++ b/sdk/tests/ui-state-visuals-fade.test.ts@@ -13,7 +13,7 @@ import {TransitionFlag,type StateVisualsData,} from '../src/ui/behavior/state-visuals';-import { UIRenderer, type UIRendererData } from '../src/ui/core/ui-renderer';+import { UIVisual, type UIVisualData } from '../src/ui/core/ui-visual';import { createStateVisualsApplySystem } from '../src/ui/behavior/systems';import type { Entity } from '../src/types';import type { SystemDef } from '../src/system';@@ -21,7 +21,7 @@ import type { AnyComponentDef } from '../src/component';/*** Minimal World surface the apply system uses. Backed by per-component- * Maps so builtin components (Transform, UIRenderer, StateVisuals) don't+ * Maps so builtin components (Transform, UIVisual, StateVisuals) don't* need a real C++ registry. Enough for behavior-level testing of the* fade logic.*/@@ -87,11 +87,11 @@ function makeTransform(scale = 1): TransformData {};}-function makeRenderer(color = { r: 1, g: 1, b: 1, a: 1 }, texture = 0): UIRendererData {+function makeRenderer(color = { r: 1, g: 1, b: 1, a: 1 }, texture = 0): UIVisualData {return {texture, color, size: { x: 10, y: 10 },pivot: { x: 0.5, y: 0.5 }, layer: 0, enabled: true,- } as UIRendererData;+ } as UIVisualData;}describe('StateVisualsApplySystem — color fade', () => {@@ -102,7 +102,7 @@ describe('StateVisualsApplySystem — color fade', () => {world = makeMockWorld();entity = world.spawn();world.insert(entity, Transform, makeTransform());- world.insert(entity, UIRenderer, makeRenderer());+ world.insert(entity, UIVisual, makeRenderer());});it('snaps immediately when fadeDuration is 0', () => {@@ -117,7 +117,7 @@ describe('StateVisualsApplySystem — color fade', () => {const sys = createStateVisualsApplySystem(world as never);runSystem(sys, 1 / 60);- const r = world.get(entity, UIRenderer) as UIRendererData;+ const r = world.get(entity, UIVisual) as UIVisualData;expect(r.color).toEqual({ r: 0, g: 0, b: 1, a: 1 });});@@ -132,11 +132,11 @@ describe('StateVisualsApplySystem — color fade', () => {const sys = createStateVisualsApplySystem(world as never);runSystem(sys, 0); // seed transition, t=0- let r = world.get(entity, UIRenderer) as UIRendererData;+ let r = world.get(entity, UIVisual) as UIVisualData;expect(r.color.r).toBeCloseTo(1);runSystem(sys, 0.5); // advance to t=0.5- r = world.get(entity, UIRenderer) as UIRendererData;+ r = world.get(entity, UIVisual) as UIVisualData;expect(r.color.r).toBeCloseTo(0.5, 2);expect(r.color.g).toBeCloseTo(0.5, 2);expect(r.color.b).toBeCloseTo(0.5, 2);@@ -155,7 +155,7 @@ describe('StateVisualsApplySystem — color fade', () => {runSystem(sys, 0);runSystem(sys, 1.0);- const r = world.get(entity, UIRenderer) as UIRendererData;+ const r = world.get(entity, UIVisual) as UIVisualData;expect(r.color).toEqual({ r: 0, g: 0, b: 0, a: 1 });});@@ -171,7 +171,7 @@ describe('StateVisualsApplySystem — color fade', () => {const sys = createStateVisualsApplySystem(world as never);runSystem(sys, 0);runSystem(sys, 0.5);- let r = world.get(entity, UIRenderer) as UIRendererData;+ let r = world.get(entity, UIVisual) as UIVisualData;expect(r.color.r).toBeCloseTo(0.5, 1);const sm = world.get(entity, StateMachine) as StateMachineData;@@ -179,11 +179,11 @@ describe('StateVisualsApplySystem — color fade', () => {world.insert(entity, StateMachine, sm);runSystem(sys, 0);- r = world.get(entity, UIRenderer) as UIRendererData;+ r = world.get(entity, UIVisual) as UIVisualData;expect(r.color.r).toBeCloseTo(0.5, 1);runSystem(sys, 1.0);- r = world.get(entity, UIRenderer) as UIRendererData;+ r = world.get(entity, UIVisual) as UIVisualData;expect(r.color).toEqual({ r: 1, g: 0, b: 0, a: 1 });});});@@ -193,7 +193,7 @@ describe('StateVisualsApplySystem — scale fade', () => {const world = makeMockWorld();const entity = world.spawn();world.insert(entity, Transform, makeTransform(1));- world.insert(entity, UIRenderer, makeRenderer());+ world.insert(entity, UIVisual, makeRenderer());world.insert(entity, StateMachine, { current: 'pressed', previous: '' } as StateMachineData);world.insert(entity, StateVisuals, makeVisuals({transitionFlags: TransitionFlag.Scale,@@ -216,7 +216,7 @@ describe('StateVisualsApplySystem — sprite swap', () => {it('always snaps (never lerps) because textures are discrete', () => {const world = makeMockWorld();const entity = world.spawn();- world.insert(entity, UIRenderer, makeRenderer({ r: 1, g: 1, b: 1, a: 1 }, 7));+ world.insert(entity, UIVisual, makeRenderer({ r: 1, g: 1, b: 1, a: 1 }, 7));world.insert(entity, StateMachine, { current: 'pressed', previous: '' } as StateMachineData);world.insert(entity, StateVisuals, makeVisuals({transitionFlags: TransitionFlag.SpriteSwap,@@ -228,7 +228,7 @@ describe('StateVisualsApplySystem — sprite swap', () => {const sys = createStateVisualsApplySystem(world as never);runSystem(sys, 0);- const r = world.get(entity, UIRenderer) as UIRendererData;+ const r = world.get(entity, UIVisual) as UIVisualData;expect(r.texture).toBe(42);});});diff --git a/sdk/tests/ui-widgets.test.ts b/sdk/tests/ui-widgets.test.tsindex e4347ae6c..2768cfd97 100644--- a/sdk/tests/ui-widgets.test.ts+++ b/sdk/tests/ui-widgets.test.ts@@ -10,10 +10,9 @@ import {Interactable,StateMachine,StateVisuals,- UIRect,UINode,DimensionUnit,- UIRenderer,+ UIVisual,UIEventQueue,UIEventType,TransitionFlag,@@ -110,7 +109,7 @@ describe('createButton', () => {});expect(world.has(btn, UINode)).toBe(true);- expect(world.has(btn, UIRenderer)).toBe(true);+ expect(world.has(btn, UIVisual)).toBe(true);expect(world.has(btn, Interactable)).toBe(true);expect(world.has(btn, StateMachine)).toBe(true);expect(world.has(btn, StateVisuals)).toBe(true);@@ -332,7 +331,7 @@ describe('createDialog', () => {it('starts hidden by default', () => {const dialog = createDialog({ world: world as unknown as World });expect(dialog.isOpen()).toBe(false);- const bg = world.get(dialog.backdropEntity, UIRenderer) as { enabled: boolean };+ const bg = world.get(dialog.backdropEntity, UIVisual) as { enabled: boolean };expect(bg.enabled).toBe(false);});@@ -341,8 +340,8 @@ describe('createDialog', () => {dialog.open();expect(dialog.isOpen()).toBe(true);- const bg = world.get(dialog.backdropEntity, UIRenderer) as { enabled: boolean };- const panel = world.get(dialog.panelEntity, UIRenderer) as { enabled: boolean };+ const bg = world.get(dialog.backdropEntity, UIVisual) as { enabled: boolean };+ const panel = world.get(dialog.panelEntity, UIVisual) as { enabled: boolean };const inter = world.get(dialog.backdropEntity, Interactable) as { enabled: boolean };expect(bg.enabled).toBe(true);expect(panel.enabled).toBe(true);diff --git a/src/esengine/bindings/EditorAPI.generated.cpp b/src/esengine/bindings/EditorAPI.generated.cppindex 30ef0eb6c..0b939fa0d 100644--- a/src/esengine/bindings/EditorAPI.generated.cpp+++ b/src/esengine/bindings/EditorAPI.generated.cpp@@ -2,10 +2,10 @@* @file EditorAPI.generated.cpp* @brief Auto-generated editor API with string-dispatched component access* @details Generated by EHT - DO NOT EDIT- * @schema_hash 4f7df7328b5a8159+ * @schema_hash b75998de1f66a401*/-#define ES_EDITOR_API_SCHEMA_HASH "4f7df7328b5a8159"+#define ES_EDITOR_API_SCHEMA_HASH "b75998de1f66a401"#include <emscripten/bind.h>#include <string>@@ -32,7 +32,7 @@#include "../ecs/components/UIInteraction.hpp"#include "../ecs/components/UIMask.hpp"#include "../ecs/components/UINode.hpp"-#include "../ecs/components/UIRenderer.hpp"+#include "../ecs/components/UIVisual.hpp"#include "../ecs/components/Velocity.hpp"#include <glm/gtc/quaternion.hpp>@@ -78,7 +78,7 @@ std::vector<std::string> editor_getComponentNames() {"UIInteraction","UIMask","UINode",- "UIRenderer",+ "UIVisual","Velocity",};}@@ -505,24 +505,29 @@ std::string editor_getComponentSchema(const std::string& name) {{"key":"insetBottom.value","type":"float","group":"UINode"},{"key":"insetBottom.unit","type":"float","group":"UINode"}])JSON";- } else if (name == "UIRenderer") {+ } else if (name == "UIVisual") {return R"JSON([- {"key":"visualType","type":"enum","group":"UIRenderer","values":["None","SolidColor","Image","NineSlice"]},- {"key":"texture","type":"asset","group":"UIRenderer"},- {"key":"color.r","type":"color","group":"UIRenderer"},- {"key":"color.g","type":"color","group":"UIRenderer"},- {"key":"color.b","type":"color","group":"UIRenderer"},- {"key":"color.a","type":"color","group":"UIRenderer"},- {"key":"uvOffset.x","type":"float","group":"UIRenderer"},- {"key":"uvOffset.y","type":"float","group":"UIRenderer"},- {"key":"uvScale.x","type":"float","group":"UIRenderer"},- {"key":"uvScale.y","type":"float","group":"UIRenderer"},- {"key":"sliceBorder.x","type":"float","group":"UIRenderer"},- {"key":"sliceBorder.y","type":"float","group":"UIRenderer"},- {"key":"sliceBorder.z","type":"float","group":"UIRenderer"},- {"key":"sliceBorder.w","type":"float","group":"UIRenderer"},- {"key":"material","type":"asset","group":"UIRenderer"},- {"key":"enabled","type":"bool","group":"UIRenderer"}+ {"key":"visualType","type":"enum","group":"UIVisual","values":["None","SolidColor","Image","NineSlice","Tiled","Filled"]},+ {"key":"texture","type":"asset","group":"UIVisual"},+ {"key":"color.r","type":"color","group":"UIVisual"},+ {"key":"color.g","type":"color","group":"UIVisual"},+ {"key":"color.b","type":"color","group":"UIVisual"},+ {"key":"color.a","type":"color","group":"UIVisual"},+ {"key":"uvOffset.x","type":"float","group":"UIVisual"},+ {"key":"uvOffset.y","type":"float","group":"UIVisual"},+ {"key":"uvScale.x","type":"float","group":"UIVisual"},+ {"key":"uvScale.y","type":"float","group":"UIVisual"},+ {"key":"sliceBorder.x","type":"float","group":"UIVisual"},+ {"key":"sliceBorder.y","type":"float","group":"UIVisual"},+ {"key":"sliceBorder.z","type":"float","group":"UIVisual"},+ {"key":"sliceBorder.w","type":"float","group":"UIVisual"},+ {"key":"tileSize.x","type":"float","group":"UIVisual"},+ {"key":"tileSize.y","type":"float","group":"UIVisual"},+ {"key":"fillMethod","type":"enum","group":"UIVisual","values":["Horizontal","Vertical"]},+ {"key":"fillOrigin","type":"enum","group":"UIVisual","values":["Left","Right","Bottom","Top"]},+ {"key":"fillAmount","type":"float","group":"UIVisual"},+ {"key":"material","type":"asset","group":"UIVisual"},+ {"key":"enabled","type":"bool","group":"UIVisual"}])JSON";} else if (name == "Velocity") {return R"JSON([@@ -617,8 +622,8 @@ bool editor_addComponent(Registry& reg, u32 e, const std::string& name) {} else if (name == "UINode") {if (!reg.has<esengine::ecs::UINode>(entity)) reg.emplace<esengine::ecs::UINode>(entity);return true;- } else if (name == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) reg.emplace<esengine::ecs::UIRenderer>(entity);+ } else if (name == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) reg.emplace<esengine::ecs::UIVisual>(entity);return true;} else if (name == "Velocity") {if (!reg.has<esengine::ecs::Velocity>(entity)) reg.emplace<esengine::ecs::Velocity>(entity);@@ -680,8 +685,8 @@ bool editor_removeComponent(Registry& reg, u32 e, const std::string& name) {if (reg.has<esengine::ecs::UIMask>(entity)) { reg.remove<esengine::ecs::UIMask>(entity); return true; }} else if (name == "UINode") {if (reg.has<esengine::ecs::UINode>(entity)) { reg.remove<esengine::ecs::UINode>(entity); return true; }- } else if (name == "UIRenderer") {- if (reg.has<esengine::ecs::UIRenderer>(entity)) { reg.remove<esengine::ecs::UIRenderer>(entity); return true; }+ } else if (name == "UIVisual") {+ if (reg.has<esengine::ecs::UIVisual>(entity)) { reg.remove<esengine::ecs::UIVisual>(entity); return true; }} else if (name == "Velocity") {if (reg.has<esengine::ecs::Velocity>(entity)) { reg.remove<esengine::ecs::Velocity>(entity); return true; }}@@ -716,7 +721,7 @@ bool editor_hasComponent(Registry& reg, u32 e, const std::string& name) {if (name == "UIInteraction") return reg.has<esengine::ecs::UIInteraction>(entity);if (name == "UIMask") return reg.has<esengine::ecs::UIMask>(entity);if (name == "UINode") return reg.has<esengine::ecs::UINode>(entity);- if (name == "UIRenderer") return reg.has<esengine::ecs::UIRenderer>(entity);+ if (name == "UIVisual") return reg.has<esengine::ecs::UIVisual>(entity);if (name == "Velocity") return reg.has<esengine::ecs::Velocity>(entity);return false;}@@ -752,7 +757,7 @@ std::vector<std::string> editor_getComponents(Registry& reg, u32 e) {if (reg.has<esengine::ecs::UIInteraction>(entity)) result.push_back("UIInteraction");if (reg.has<esengine::ecs::UIMask>(entity)) result.push_back("UIMask");if (reg.has<esengine::ecs::UINode>(entity)) result.push_back("UINode");- if (reg.has<esengine::ecs::UIRenderer>(entity)) result.push_back("UIRenderer");+ if (reg.has<esengine::ecs::UIVisual>(entity)) result.push_back("UIVisual");if (reg.has<esengine::ecs::Velocity>(entity)) result.push_back("Velocity");return result;}@@ -1098,9 +1103,9 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::selse if (field == "insetBottom.unit") { c.insetBottom.unit = value; }else { return false; }return true;- } else if (comp == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) return false;- auto& c = reg.get<esengine::ecs::UIRenderer>(entity);+ } else if (comp == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) return false;+ auto& c = reg.get<esengine::ecs::UIVisual>(entity);if (field == "color.r") { c.color.r = value; }else if (field == "color.g") { c.color.g = value; }else if (field == "color.b") { c.color.b = value; }@@ -1113,6 +1118,9 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::selse if (field == "sliceBorder.y") { c.sliceBorder.y = value; }else if (field == "sliceBorder.z") { c.sliceBorder.z = value; }else if (field == "sliceBorder.w") { c.sliceBorder.w = value; }+ else if (field == "tileSize.x") { c.tileSize.x = value; }+ else if (field == "tileSize.y") { c.tileSize.y = value; }+ else if (field == "fillAmount") { c.fillAmount = value; }else { return false; }return true;} else if (comp == "Velocity") {@@ -1421,9 +1429,9 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::stelse if (field == "insetRight.unit") { return c.insetRight.unit; }else if (field == "insetBottom.value") { return c.insetBottom.value; }else if (field == "insetBottom.unit") { return c.insetBottom.unit; }- } else if (comp == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) return 0.0f;- const auto& c = reg.get<esengine::ecs::UIRenderer>(entity);+ } else if (comp == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) return 0.0f;+ const auto& c = reg.get<esengine::ecs::UIVisual>(entity);if (field == "color.r") { return c.color.r; }else if (field == "color.g") { return c.color.g; }else if (field == "color.b") { return c.color.b; }@@ -1436,6 +1444,9 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::stelse if (field == "sliceBorder.y") { return c.sliceBorder.y; }else if (field == "sliceBorder.z") { return c.sliceBorder.z; }else if (field == "sliceBorder.w") { return c.sliceBorder.w; }+ else if (field == "tileSize.x") { return c.tileSize.x; }+ else if (field == "tileSize.y") { return c.tileSize.y; }+ else if (field == "fillAmount") { return c.fillAmount; }} else if (comp == "Velocity") {if (!reg.has<esengine::ecs::Velocity>(entity)) return 0.0f;const auto& c = reg.get<esengine::ecs::Velocity>(entity);@@ -1616,11 +1627,13 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::strelse if (field == "alignSelf") { c.alignSelf = static_cast<AlignSelf>(value); }else { return false; }return true;- } else if (comp == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) return false;- auto& c = reg.get<esengine::ecs::UIRenderer>(entity);+ } else if (comp == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) return false;+ auto& c = reg.get<esengine::ecs::UIVisual>(entity);if (field == "visualType") { c.visualType = static_cast<UIVisualType>(value); }else if (field == "texture") { c.texture = resource::TextureHandle(static_cast<u32>(value)); }+ else if (field == "fillMethod") { c.fillMethod = static_cast<UIFillMethod>(value); }+ else if (field == "fillOrigin") { c.fillOrigin = static_cast<UIFillOrigin>(value); }else if (field == "material") { c.material = static_cast<u32>(value); }else { return false; }return true;@@ -1755,11 +1768,13 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::striconst auto& c = reg.get<esengine::ecs::UINode>(entity);if (field == "position") { return static_cast<i32>(c.position); }else if (field == "alignSelf") { return static_cast<i32>(c.alignSelf); }- } else if (comp == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) return 0;- const auto& c = reg.get<esengine::ecs::UIRenderer>(entity);+ } else if (comp == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) return 0;+ const auto& c = reg.get<esengine::ecs::UIVisual>(entity);if (field == "visualType") { return static_cast<i32>(c.visualType); }else if (field == "texture") { return static_cast<i32>(c.texture.id()); }+ else if (field == "fillMethod") { return static_cast<i32>(c.fillMethod); }+ else if (field == "fillOrigin") { return static_cast<i32>(c.fillOrigin); }else if (field == "material") { return static_cast<i32>(c.material); }}return 0;@@ -1880,9 +1895,9 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::stif (field == "enabled") { c.enabled = value; }else { return false; }return true;- } else if (comp == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) return false;- auto& c = reg.get<esengine::ecs::UIRenderer>(entity);+ } else if (comp == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) return false;+ auto& c = reg.get<esengine::ecs::UIVisual>(entity);if (field == "enabled") { c.enabled = value; }else { return false; }return true;@@ -1975,9 +1990,9 @@ bool editor_getBool(Registry& reg, u32 e, const std::string& comp, const std::stif (!reg.has<esengine::ecs::UIMask>(entity)) return false;const auto& c = reg.get<esengine::ecs::UIMask>(entity);if (field == "enabled") { return c.enabled; }- } else if (comp == "UIRenderer") {- if (!reg.has<esengine::ecs::UIRenderer>(entity)) return false;- const auto& c = reg.get<esengine::ecs::UIRenderer>(entity);+ } else if (comp == "UIVisual") {+ if (!reg.has<esengine::ecs::UIVisual>(entity)) return false;+ const auto& c = reg.get<esengine::ecs::UIVisual>(entity);if (field == "enabled") { return c.enabled; }}return false;diff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cppindex 0129ec4a6..1f4d8d694 100644--- a/src/esengine/bindings/WebBindings.generated.cpp+++ b/src/esengine/bindings/WebBindings.generated.cpp@@ -32,7 +32,7 @@#include "../ecs/components/UIInteraction.hpp"#include "../ecs/components/UIMask.hpp"#include "../ecs/components/UINode.hpp"-#include "../ecs/components/UIRenderer.hpp"+#include "../ecs/components/UIVisual.hpp"#include "../ecs/components/Velocity.hpp"using namespace emscripten;@@ -169,6 +169,16 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {.value("Center", esengine::ecs::TextAlign::Center).value("Right", esengine::ecs::TextAlign::Right);+ enum_<esengine::ecs::UIFillMethod>("UIFillMethod")+ .value("Horizontal", esengine::ecs::UIFillMethod::Horizontal)+ .value("Vertical", esengine::ecs::UIFillMethod::Vertical);++ enum_<esengine::ecs::UIFillOrigin>("UIFillOrigin")+ .value("Left", esengine::ecs::UIFillOrigin::Left)+ .value("Right", esengine::ecs::UIFillOrigin::Right)+ .value("Bottom", esengine::ecs::UIFillOrigin::Bottom)+ .value("Top", esengine::ecs::UIFillOrigin::Top);+enum_<esengine::ecs::UIPositionType>("UIPositionType").value("Relative", esengine::ecs::UIPositionType::Relative).value("Absolute", esengine::ecs::UIPositionType::Absolute);@@ -177,7 +187,9 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {.value("None", esengine::ecs::UIVisualType::None).value("SolidColor", esengine::ecs::UIVisualType::SolidColor).value("Image", esengine::ecs::UIVisualType::Image)- .value("NineSlice", esengine::ecs::UIVisualType::NineSlice);+ .value("NineSlice", esengine::ecs::UIVisualType::NineSlice)+ .value("Tiled", esengine::ecs::UIVisualType::Tiled)+ .value("Filled", esengine::ecs::UIVisualType::Filled);}@@ -907,38 +919,50 @@ UINodeJS uinodeToJS(const esengine::ecs::UINode& c) {return js;}-struct UIRendererJS {+struct UIVisualJS {i32 visualType;u32 texture;glm::vec4 color;glm::vec2 uvOffset;glm::vec2 uvScale;glm::vec4 sliceBorder;+ glm::vec2 tileSize;+ i32 fillMethod;+ i32 fillOrigin;+ f32 fillAmount;u32 material;bool enabled;};-esengine::ecs::UIRenderer uirendererFromJS(const UIRendererJS& js) {- esengine::ecs::UIRenderer c;+esengine::ecs::UIVisual uivisualFromJS(const UIVisualJS& js) {+ esengine::ecs::UIVisual c;c.visualType = static_cast<UIVisualType>(js.visualType);c.texture = resource::TextureHandle(js.texture);c.color = js.color;c.uvOffset = js.uvOffset;c.uvScale = js.uvScale;c.sliceBorder = js.sliceBorder;+ c.tileSize = js.tileSize;+ c.fillMethod = static_cast<UIFillMethod>(js.fillMethod);+ c.fillOrigin = static_cast<UIFillOrigin>(js.fillOrigin);+ c.fillAmount = js.fillAmount;c.material = js.material;c.enabled = js.enabled;return c;}-UIRendererJS uirendererToJS(const esengine::ecs::UIRenderer& c) {- UIRendererJS js;+UIVisualJS uivisualToJS(const esengine::ecs::UIVisual& c) {+ UIVisualJS js;js.visualType = static_cast<i32>(c.visualType);js.texture = c.texture.id();js.color = c.color;js.uvOffset = c.uvOffset;js.uvScale = c.uvScale;js.sliceBorder = c.sliceBorder;+ js.tileSize = c.tileSize;+ js.fillMethod = static_cast<i32>(c.fillMethod);+ js.fillOrigin = static_cast<i32>(c.fillOrigin);+ js.fillAmount = c.fillAmount;js.material = c.material;js.enabled = c.enabled;return js;@@ -1244,15 +1268,19 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("insetRight", &UINodeJS::insetRight).field("insetBottom", &UINodeJS::insetBottom);- value_object<UIRendererJS>("UIRenderer")- .field("visualType", &UIRendererJS::visualType)- .field("texture", &UIRendererJS::texture)- .field("color", &UIRendererJS::color)- .field("uvOffset", &UIRendererJS::uvOffset)- .field("uvScale", &UIRendererJS::uvScale)- .field("sliceBorder", &UIRendererJS::sliceBorder)- .field("material", &UIRendererJS::material)- .field("enabled", &UIRendererJS::enabled);+ value_object<UIVisualJS>("UIVisual")+ .field("visualType", &UIVisualJS::visualType)+ .field("texture", &UIVisualJS::texture)+ .field("color", &UIVisualJS::color)+ .field("uvOffset", &UIVisualJS::uvOffset)+ .field("uvScale", &UIVisualJS::uvScale)+ .field("sliceBorder", &UIVisualJS::sliceBorder)+ .field("tileSize", &UIVisualJS::tileSize)+ .field("fillMethod", &UIVisualJS::fillMethod)+ .field("fillOrigin", &UIVisualJS::fillOrigin)+ .field("fillAmount", &UIVisualJS::fillAmount)+ .field("material", &UIVisualJS::material)+ .field("enabled", &UIVisualJS::enabled);value_object<esengine::ecs::Velocity>("Velocity").field("linear", &esengine::ecs::Velocity::linear)@@ -1790,24 +1818,24 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::UINode>(entity);}))- // UIRenderer- .function("hasUIRenderer", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::UIRenderer>(static_cast<Entity>(e));+ // UIVisual+ .function("hasUIVisual", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::UIVisual>(static_cast<Entity>(e));}))- .function("getUIRenderer", optional_override([](Registry& r, u32 e) {+ .function("getUIVisual", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIRenderer>(entity)) return UIRendererJS{};- return uirendererToJS(r.get<esengine::ecs::UIRenderer>(entity));+ if (!r.valid(entity) || !r.has<esengine::ecs::UIVisual>(entity)) return UIVisualJS{};+ return uivisualToJS(r.get<esengine::ecs::UIVisual>(entity));}))- .function("addUIRenderer", optional_override([](Registry& r, u32 e, const UIRendererJS& js) {+ .function("addUIVisual", optional_override([](Registry& r, u32 e, const UIVisualJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::UIRenderer>(entity, uirendererFromJS(js));+ r.emplaceOrReplace<esengine::ecs::UIVisual>(entity, uivisualFromJS(js));}))- .function("removeUIRenderer", optional_override([](Registry& r, u32 e) {+ .function("removeUIVisual", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIRenderer>(entity)) return;- r.remove<esengine::ecs::UIRenderer>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::UIVisual>(entity)) return;+ r.remove<esengine::ecs::UIVisual>(entity);}))// Velocity@@ -1872,7 +1900,7 @@ emscripten::val esengineGetBuiltinComponentNames() {arr.set(i++, val(std::string("UIInteraction")));arr.set(i++, val(std::string("UIMask")));arr.set(i++, val(std::string("UINode")));- arr.set(i++, val(std::string("UIRenderer")));+ arr.set(i++, val(std::string("UIVisual")));arr.set(i++, val(std::string("Velocity")));return arr;}@@ -2074,14 +2102,18 @@ static_assert(offsetof(esengine::ecs::UINode, position) == 0, "ABI offset drift:static_assert(offsetof(esengine::ecs::UINode, flexGrow) == 52, "ABI offset drift: esengine::ecs::UINode.flexGrow (EHT expected 52)");static_assert(offsetof(esengine::ecs::UINode, flexShrink) == 56, "ABI offset drift: esengine::ecs::UINode.flexShrink (EHT expected 56)");static_assert(offsetof(esengine::ecs::UINode, alignSelf) == 68, "ABI offset drift: esengine::ecs::UINode.alignSelf (EHT expected 68)");-static_assert(offsetof(esengine::ecs::UIRenderer, visualType) == 0, "ABI offset drift: esengine::ecs::UIRenderer.visualType (EHT expected 0)");-static_assert(offsetof(esengine::ecs::UIRenderer, texture) == 4, "ABI offset drift: esengine::ecs::UIRenderer.texture (EHT expected 4)");-static_assert(offsetof(esengine::ecs::UIRenderer, color) == 8, "ABI offset drift: esengine::ecs::UIRenderer.color (EHT expected 8)");-static_assert(offsetof(esengine::ecs::UIRenderer, uvOffset) == 24, "ABI offset drift: esengine::ecs::UIRenderer.uvOffset (EHT expected 24)");-static_assert(offsetof(esengine::ecs::UIRenderer, uvScale) == 32, "ABI offset drift: esengine::ecs::UIRenderer.uvScale (EHT expected 32)");-static_assert(offsetof(esengine::ecs::UIRenderer, sliceBorder) == 40, "ABI offset drift: esengine::ecs::UIRenderer.sliceBorder (EHT expected 40)");-static_assert(offsetof(esengine::ecs::UIRenderer, material) == 56, "ABI offset drift: esengine::ecs::UIRenderer.material (EHT expected 56)");-static_assert(offsetof(esengine::ecs::UIRenderer, enabled) == 60, "ABI offset drift: esengine::ecs::UIRenderer.enabled (EHT expected 60)");+static_assert(offsetof(esengine::ecs::UIVisual, visualType) == 0, "ABI offset drift: esengine::ecs::UIVisual.visualType (EHT expected 0)");+static_assert(offsetof(esengine::ecs::UIVisual, texture) == 4, "ABI offset drift: esengine::ecs::UIVisual.texture (EHT expected 4)");+static_assert(offsetof(esengine::ecs::UIVisual, color) == 8, "ABI offset drift: esengine::ecs::UIVisual.color (EHT expected 8)");+static_assert(offsetof(esengine::ecs::UIVisual, uvOffset) == 24, "ABI offset drift: esengine::ecs::UIVisual.uvOffset (EHT expected 24)");+static_assert(offsetof(esengine::ecs::UIVisual, uvScale) == 32, "ABI offset drift: esengine::ecs::UIVisual.uvScale (EHT expected 32)");+static_assert(offsetof(esengine::ecs::UIVisual, sliceBorder) == 40, "ABI offset drift: esengine::ecs::UIVisual.sliceBorder (EHT expected 40)");+static_assert(offsetof(esengine::ecs::UIVisual, tileSize) == 56, "ABI offset drift: esengine::ecs::UIVisual.tileSize (EHT expected 56)");+static_assert(offsetof(esengine::ecs::UIVisual, fillMethod) == 64, "ABI offset drift: esengine::ecs::UIVisual.fillMethod (EHT expected 64)");+static_assert(offsetof(esengine::ecs::UIVisual, fillOrigin) == 65, "ABI offset drift: esengine::ecs::UIVisual.fillOrigin (EHT expected 65)");+static_assert(offsetof(esengine::ecs::UIVisual, fillAmount) == 68, "ABI offset drift: esengine::ecs::UIVisual.fillAmount (EHT expected 68)");+static_assert(offsetof(esengine::ecs::UIVisual, material) == 72, "ABI offset drift: esengine::ecs::UIVisual.material (EHT expected 72)");+static_assert(offsetof(esengine::ecs::UIVisual, enabled) == 76, "ABI offset drift: esengine::ecs::UIVisual.enabled (EHT expected 76)");static_assert(offsetof(esengine::ecs::Velocity, linear) == 0, "ABI offset drift: esengine::ecs::Velocity.linear (EHT expected 0)");static_assert(offsetof(esengine::ecs::Velocity, angular) == 12, "ABI offset drift: esengine::ecs::Velocity.angular (EHT expected 12)");@@ -2090,7 +2122,7 @@ static_assert(offsetof(esengine::ecs::Velocity, angular) == 12, "ABI offset drif// ABI Hash -- runtime handshake against the SDK bundle// =============================================================================-static const char* kEsAbiLayoutHash = "b20732a9b17a5058";+static const char* kEsAbiLayoutHash = "7540dc008d0e3d93";std::string esengineGetAbiLayoutHash() {return std::string(kEsAbiLayoutHash);diff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cppindex 9c93d9c59..1bb64daee 100644--- a/src/esengine/bindings/WebSDKEntry.cpp+++ b/src/esengine/bindings/WebSDKEntry.cpp@@ -44,7 +44,7 @@#include "../ecs/components/Velocity.hpp"#include "../ecs/components/Camera.hpp"#include "../ecs/components/UINode.hpp"-#include "../ecs/components/UIRenderer.hpp"+#include "../ecs/components/UIVisual.hpp"#include "../ecs/components/RigidBody.hpp"#include "../ecs/components/Collider.hpp"#include "../ecs/components/ShapeRenderer.hpp"@@ -547,10 +547,10 @@ void uiRenderOrder_update(ecs::Registry& registry) {// REARCH_GUI P1.4d (#1 z-order): the SDF text path (TS) reads an entity's UI// draw order so glyph quads interleave with UI quads. uiRenderOrderUpdate-// assigns uiOrder to every UIRenderer in the UI tree (text nodes carry a-// visualType=None UIRenderer purely to be ordered). -1 = not a UI node.+// assigns uiOrder to every UIVisual in the UI tree (text nodes carry a+// visualType=None UIVisual purely to be ordered). -1 = not a UI node.i32 ui_getRenderOrder(ecs::Registry& registry, u32 entity) {- auto* ui = registry.tryGet<ecs::UIRenderer>(Entity::fromRaw(entity));+ auto* ui = registry.tryGet<ecs::UIVisual>(Entity::fromRaw(entity));return ui ? ui->uiOrder : -1;}diff --git a/src/esengine/ecs/UIRenderOrderSystem.hpp b/src/esengine/ecs/UIRenderOrderSystem.hppindex 649bceeff..94124d863 100644--- a/src/esengine/ecs/UIRenderOrderSystem.hpp+++ b/src/esengine/ecs/UIRenderOrderSystem.hpp@@ -6,16 +6,16 @@#include "components/Hierarchy.hpp"#include "components/UINode.hpp"#include "components/Sprite.hpp"-#include "components/UIRenderer.hpp"+#include "components/UIVisual.hpp"#include "components/Canvas.hpp"namespace esengine::ecs {inline i32 assignRenderOrder(Registry& registry, Entity entity, i32 counter) {if (registry.has<UINode>(entity)) {- auto* uiRenderer = registry.tryGet<UIRenderer>(entity);- if (uiRenderer) {- uiRenderer->uiOrder = counter;+ auto* uiVisual = registry.tryGet<UIVisual>(entity);+ if (uiVisual) {+ uiVisual->uiOrder = counter;counter++;} else if (registry.has<Sprite>(entity)) {auto& sprite = registry.get<Sprite>(entity);diff --git a/src/esengine/ecs/components/StateVisuals.hpp b/src/esengine/ecs/components/StateVisuals.hppindex 8e59cc757..efbbf99ea 100644--- a/src/esengine/ecs/components/StateVisuals.hpp+++ b/src/esengine/ecs/components/StateVisuals.hpp@@ -20,8 +20,8 @@ namespace esengine::ecs {*/namespace StateVisualsTransition {constexpr u32 None = 0;- constexpr u32 ColorTint = 1u << 0; // write color to targetGraphic UIRenderer- constexpr u32 SpriteSwap = 1u << 1; // write texture to targetGraphic UIRenderer+ constexpr u32 ColorTint = 1u << 0; // write color to targetGraphic UIVisual+ constexpr u32 SpriteSwap = 1u << 1; // write texture to targetGraphic UIVisualconstexpr u32 Scale = 1u << 2; // multiply targetGraphic Transform scale}diff --git a/src/esengine/ecs/components/UIRenderer.hpp b/src/esengine/ecs/components/UIRenderer.hppdeleted file mode 100644index c4eefcb7c..000000000--- a/src/esengine/ecs/components/UIRenderer.hpp+++ /dev/null@@ -1,51 +0,0 @@-// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0-// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team-#pragma once--#include "../../core/Types.hpp"-#include "../../core/Reflection.hpp"-#include "../../math/Math.hpp"-#include "../../resource/Handle.hpp"--namespace esengine::ecs {--ES_ENUM()-enum class UIVisualType : u8 {- None,- SolidColor,- Image,- NineSlice-};--ES_COMPONENT()-struct UIRenderer {- ES_PROPERTY()- UIVisualType visualType{UIVisualType::None};-- ES_PROPERTY(asset = texture)- resource::TextureHandle texture;-- ES_PROPERTY(animatable)- glm::vec4 color{1.0f, 1.0f, 1.0f, 1.0f};-- ES_PROPERTY()- glm::vec2 uvOffset{0.0f, 0.0f};-- ES_PROPERTY()- glm::vec2 uvScale{1.0f, 1.0f};-- ES_PROPERTY()- glm::vec4 sliceBorder{0.0f};-- ES_PROPERTY(asset = material)- u32 material{0};-- ES_PROPERTY()- bool enabled{true};-- i32 uiOrder{0};-- UIRenderer() = default;-};--} // namespace esengine::ecsdiff --git a/src/esengine/ecs/components/UIVisual.hpp b/src/esengine/ecs/components/UIVisual.hppnew file mode 100644index 000000000..779c4cec2--- /dev/null+++ b/src/esengine/ecs/components/UIVisual.hpp@@ -0,0 +1,103 @@+// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0+// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team+#pragma once++#include "../../core/Types.hpp"+#include "../../core/Reflection.hpp"+#include "../../math/Math.hpp"+#include "../../resource/Handle.hpp"++namespace esengine::ecs {++/**+ * @brief How a UIVisual fills its UINode box. Replaces the old UIRenderer+ * visualType + Image imageType pair (REARCH_GUI F4): a single draw mode,+ * so the renderer derives the sampled UV at draw time and no frame-late+ * Image->UIRenderer copy system is needed.+ *+ * None = invisible; SolidColor = tinted white quad; Image = textured quad+ * (uvOffset/uvScale select a sprite sub-region); NineSlice = 9-slice via+ * sliceBorder; Tiled = texture repeated by box/tileSize; Filled = texture+ * cropped to fillAmount along fillMethod/fillOrigin.+ */+ES_ENUM()+enum class UIVisualType : u8 {+ None,+ SolidColor,+ Image,+ NineSlice,+ Tiled,+ Filled+};++ES_ENUM()+enum class UIFillMethod : u8 {+ Horizontal,+ Vertical+};++ES_ENUM()+enum class UIFillOrigin : u8 {+ Left,+ Right,+ Bottom,+ Top+};++/**+ * @brief UIVisual — the single UI visual component (REARCH_GUI F4), merging the+ * former low-level UIRenderer (what the renderer drew) and high-level+ * Image (Simple/Sliced/Tiled/Filled intent that used to be copied into a+ * UIRenderer each frame). One component authored directly; UIElementPlugin+ * reads it and computes the effective UV inline — the deferred copy is gone.+ *+ * Geometry comes from the sibling UINode (computed_size_, pivot 0.5). `uvOffset`/+ * `uvScale` are the base sub-region (identity = whole texture); Tiled/Filled+ * derive their final UV from this base at draw time.+ */+ES_COMPONENT()+struct UIVisual {+ ES_PROPERTY()+ UIVisualType visualType{UIVisualType::None};++ ES_PROPERTY(asset = texture)+ resource::TextureHandle texture;++ ES_PROPERTY(animatable)+ glm::vec4 color{1.0f, 1.0f, 1.0f, 1.0f};++ // Base sub-region (identity = whole texture); Tiled/Filled build on it.+ ES_PROPERTY()+ glm::vec2 uvOffset{0.0f, 0.0f};+ ES_PROPERTY()+ glm::vec2 uvScale{1.0f, 1.0f};++ // NineSlice border override (texture metadata wins when present).+ ES_PROPERTY()+ glm::vec4 sliceBorder{0.0f};++ // Tiled: texture repeats every tileSize px of the box.+ ES_PROPERTY()+ glm::vec2 tileSize{32.0f, 32.0f};++ // Filled: crop to fillAmount [0,1] along method/origin.+ ES_PROPERTY()+ UIFillMethod fillMethod{UIFillMethod::Horizontal};+ ES_PROPERTY()+ UIFillOrigin fillOrigin{UIFillOrigin::Left};+ ES_PROPERTY(animatable)+ f32 fillAmount{1.0f};++ ES_PROPERTY(asset = material)+ u32 material{0};++ ES_PROPERTY()+ bool enabled{true};++ // Render order assigned by UIRenderOrderSystem (not serialized).+ i32 uiOrder{0};++ UIVisual() = default;+};++} // namespace esengine::ecsdiff --git a/src/esengine/renderer/plugins/UIElementPlugin.cpp b/src/esengine/renderer/plugins/UIElementPlugin.cppindex e5b8f05e5..0f60c0948 100644--- a/src/esengine/renderer/plugins/UIElementPlugin.cpp+++ b/src/esengine/renderer/plugins/UIElementPlugin.cpp@@ -5,9 +5,10 @@#include "../RenderFrame.hpp"#include "../Texture.hpp"#include "../../ecs/components/Transform.hpp"-#include "../../ecs/components/UIRenderer.hpp"+#include "../../ecs/components/UIVisual.hpp"#include "../../ecs/components/UINode.hpp"+#include <algorithm>#include <cmath>namespace esengine {@@ -19,10 +20,10 @@ void UIElementPlugin::collect(RenderCollectContext& collect_ctx) {auto& buffers = collect_ctx.buffer_pool;auto& draw_list = collect_ctx.draw_list;auto& ctx = collect_ctx.frame_context;- auto uiView = registry.view<ecs::Transform, ecs::UIRenderer>();+ auto uiView = registry.view<ecs::Transform, ecs::UIVisual>();for (auto entity : uiView) {- const auto& renderer = uiView.get<ecs::UIRenderer>(entity);+ const auto& renderer = uiView.get<ecs::UIVisual>(entity);if (!renderer.enabled || renderer.visualType == ecs::UIVisualType::None) continue;// Geometry from the UINode (CSS box) — always pivot-centered.@@ -94,6 +95,31 @@ void UIElementPlugin::collect(RenderCollectContext& collect_ctx) {}}+ // Derive the sampled UV from the base sub-region + the fill mode. This+ // replaces the old per-frame Image->UIRenderer copy: Tiled repeats by+ // box/tileSize, Filled crops to fillAmount. (REARCH_GUI F4.)+ glm::vec2 uvOffset = renderer.uvOffset;+ glm::vec2 uvScale = renderer.uvScale;+ if (renderer.visualType == ecs::UIVisualType::Tiled) {+ if (renderer.tileSize.x > 0.0f && renderer.tileSize.y > 0.0f) {+ uvScale.x = renderer.uvScale.x * (w / renderer.tileSize.x);+ uvScale.y = renderer.uvScale.y * (h / renderer.tileSize.y);+ }+ } else if (renderer.visualType == ecs::UIVisualType::Filled) {+ f32 amount = std::clamp(renderer.fillAmount, 0.0f, 1.0f);+ if (renderer.fillMethod == ecs::UIFillMethod::Horizontal) {+ uvScale.x = renderer.uvScale.x * amount;+ if (renderer.fillOrigin == ecs::UIFillOrigin::Right) {+ uvOffset.x = renderer.uvOffset.x + renderer.uvScale.x * (1.0f - amount);+ }+ } else {+ uvScale.y = renderer.uvScale.y * amount;+ if (renderer.fillOrigin == ecs::UIFillOrigin::Top) {+ uvOffset.y = renderer.uvOffset.y + renderer.uvScale.y * (1.0f - amount);+ }+ }+ }+glm::vec2 finalSize = glm::vec2(w, h) * glm::vec2(scale);BatchDrawKey key{@@ -113,11 +139,11 @@ void UIElementPlugin::collect(RenderCollectContext& collect_ctx) {emitNineSlice(buffers, draw_list, clips,glm::vec2(position), finalSize, CENTERED_PIVOT,angle, texSize, sliceBorder,- renderer.uvOffset, renderer.uvScale, renderer.color, key);+ uvOffset, uvScale, renderer.color, key);} else {emitQuad(buffers, draw_list, clips,glm::vec2(position), finalSize, CENTERED_PIVOT,- angle, renderer.uvOffset, renderer.uvScale, renderer.color, key);+ angle, uvOffset, uvScale, renderer.color, key);}}}