Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

refactor(ui): delete FlexItem (subsumed by UINode) + dead GridLayout component (REARCH_GUI F4)

esengineae8613fb1cf6
diff --git a/sdk/src/component.generated.ts b/sdk/src/component.generated.ts
index 69941b94b..59c53bdbd 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 = '7540dc008d0e3d93';
+export const ABI_LAYOUT_HASH = 'ea147a61d787f430';
export interface AssetFieldMeta {
field: string;
@@ -157,38 +157,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: [],
animatableFields: [],
},
- FlexItem: {
- defaults: {
- flexGrow: 0,
- flexShrink: 1,
- flexBasis: -1,
- order: 0,
- alignSelf: 0,
- margin: { left: 0, top: 0, right: 0, bottom: 0 },
- minWidth: -1,
- minHeight: -1,
- maxWidth: -1,
- maxHeight: -1,
- widthPercent: -1,
- heightPercent: -1,
- },
- assetFields: [],
- entityFields: [],
- colorFields: [],
- animatableFields: [],
- },
- GridLayout: {
- defaults: {
- direction: 0,
- crossAxisCount: 3,
- itemSize: { x: 100, y: 100 },
- spacing: { x: 4, y: 4 },
- },
- assetFields: [],
- entityFields: [],
- colorFields: [],
- animatableFields: [],
- },
Interactable: {
defaults: {
enabled: true,
diff --git a/sdk/src/core-ui.ts b/sdk/src/core-ui.ts
index 89d866b96..e81971229 100644
--- a/sdk/src/core-ui.ts
+++ b/sdk/src/core-ui.ts
@@ -33,8 +33,6 @@ export {
type RichTextRun,
type TextSegment,
type ImageSegment,
- GridLayout,
- type GridLayoutData,
intersectRects,
invertMatrix4,
screenToWorld,
diff --git a/sdk/src/ecs/ptrAccessors.generated.ts b/sdk/src/ecs/ptrAccessors.generated.ts
index 3bc7956aa..71c9fc2bd 100644
--- a/sdk/src/ecs/ptrAccessors.generated.ts
+++ b/sdk/src/ecs/ptrAccessors.generated.ts
@@ -373,106 +373,6 @@ export function createFlexContainerData(): FlexContainerPtrData {
};
}
-export interface FlexItemPtrData {
- flexGrow: number;
- flexShrink: number;
- flexBasis: number;
- order: number;
- alignSelf: number;
- minWidth: number;
- minHeight: number;
- maxWidth: number;
- maxHeight: number;
- widthPercent: number;
- heightPercent: number;
-}
-
-export function fillFlexItem(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, out: FlexItemPtrData,
-): void {
- out.flexGrow = f32[ptr >> 2];
- out.flexShrink = f32[(ptr + 4) >> 2];
- out.flexBasis = f32[(ptr + 8) >> 2];
- out.order = u32[(ptr + 12) >> 2] | 0;
- out.alignSelf = u8[ptr + 16];
- out.minWidth = f32[(ptr + 36) >> 2];
- out.minHeight = f32[(ptr + 40) >> 2];
- out.maxWidth = f32[(ptr + 44) >> 2];
- out.maxHeight = f32[(ptr + 48) >> 2];
- out.widthPercent = f32[(ptr + 52) >> 2];
- out.heightPercent = f32[(ptr + 56) >> 2];
-}
-
-export function writeFlexItem(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, data: FlexItemPtrData,
-): void {
- f32[ptr >> 2] = data.flexGrow;
- f32[(ptr + 4) >> 2] = data.flexShrink;
- f32[(ptr + 8) >> 2] = data.flexBasis;
- u32[(ptr + 12) >> 2] = data.order | 0;
- u8[ptr + 16] = data.alignSelf;
- f32[(ptr + 36) >> 2] = data.minWidth;
- f32[(ptr + 40) >> 2] = data.minHeight;
- f32[(ptr + 44) >> 2] = data.maxWidth;
- f32[(ptr + 48) >> 2] = data.maxHeight;
- f32[(ptr + 52) >> 2] = data.widthPercent;
- f32[(ptr + 56) >> 2] = data.heightPercent;
-}
-
-export function createFlexItemData(): FlexItemPtrData {
- return {
- flexGrow: 0,
- flexShrink: 0,
- flexBasis: 0,
- order: 0,
- alignSelf: 0,
- minWidth: 0,
- minHeight: 0,
- maxWidth: 0,
- maxHeight: 0,
- widthPercent: 0,
- heightPercent: 0,
- };
-}
-
-export interface GridLayoutPtrData {
- direction: number;
- crossAxisCount: number;
- itemSize: Vec2;
- spacing: Vec2;
-}
-
-export function fillGridLayout(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, out: GridLayoutPtrData,
-): void {
- out.direction = u8[ptr];
- out.crossAxisCount = u32[(ptr + 4) >> 2] | 0;
- const itemSize_ = out.itemSize; itemSize_.x = f32[(ptr + 8) >> 2]; itemSize_.y = f32[((ptr + 8) >> 2) + 1];
- const spacing_ = out.spacing; spacing_.x = f32[(ptr + 16) >> 2]; spacing_.y = f32[((ptr + 16) >> 2) + 1];
-}
-
-export function writeGridLayout(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, data: GridLayoutPtrData,
-): void {
- u8[ptr] = data.direction;
- u32[(ptr + 4) >> 2] = data.crossAxisCount | 0;
- f32[(ptr + 8) >> 2] = data.itemSize.x; f32[((ptr + 8) >> 2) + 1] = data.itemSize.y;
- f32[(ptr + 16) >> 2] = data.spacing.x; f32[((ptr + 16) >> 2) + 1] = data.spacing.y;
-}
-
-export function createGridLayoutData(): GridLayoutPtrData {
- return {
- direction: 0,
- crossAxisCount: 0,
- itemSize: { x: 0, y: 0 },
- spacing: { x: 0, y: 0 },
- };
-}
-
export interface InteractablePtrData {
enabled: boolean;
blockRaycast: boolean;
@@ -1283,8 +1183,6 @@ export const PTR_ACCESSORS: Record<string, PtrAccessor<any>> = {
CapsuleCollider: { fill: fillCapsuleCollider, write: writeCapsuleCollider, create: createCapsuleColliderData },
CircleCollider: { fill: fillCircleCollider, write: writeCircleCollider, create: createCircleColliderData },
FlexContainer: { fill: fillFlexContainer, write: writeFlexContainer, create: createFlexContainerData },
- FlexItem: { fill: fillFlexItem, write: writeFlexItem, create: createFlexItemData },
- GridLayout: { fill: fillGridLayout, write: writeGridLayout, create: createGridLayoutData },
Interactable: { fill: fillInteractable, write: writeInteractable, create: createInteractableData },
ParticleEmitter: { fill: fillParticleEmitter, write: writeParticleEmitter, create: createParticleEmitterData },
RigidBody: { fill: fillRigidBody, write: writeRigidBody, create: createRigidBodyData },
diff --git a/sdk/src/ptrLayouts.generated.ts b/sdk/src/ptrLayouts.generated.ts
index 30dd57c65..e71ce4dc3 100644
--- a/sdk/src/ptrLayouts.generated.ts
+++ b/sdk/src/ptrLayouts.generated.ts
@@ -109,31 +109,6 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {
{ name: 'gap', type: 'vec2', offset: 8 },
],
},
- FlexItem: {
- ptrFn: 'getFlexItemPtr',
- fields: [
- { name: 'flexGrow', type: 'f32', offset: 0 },
- { name: 'flexShrink', type: 'f32', offset: 4 },
- { name: 'flexBasis', type: 'f32', offset: 8 },
- { name: 'order', type: 'i32', offset: 12 },
- { name: 'alignSelf', type: 'u8', offset: 16 },
- { name: 'minWidth', type: 'f32', offset: 36 },
- { name: 'minHeight', type: 'f32', offset: 40 },
- { name: 'maxWidth', type: 'f32', offset: 44 },
- { name: 'maxHeight', type: 'f32', offset: 48 },
- { name: 'widthPercent', type: 'f32', offset: 52 },
- { name: 'heightPercent', type: 'f32', offset: 56 },
- ],
- },
- GridLayout: {
- ptrFn: 'getGridLayoutPtr',
- fields: [
- { name: 'direction', type: 'u8', offset: 0 },
- { name: 'crossAxisCount', type: 'i32', offset: 4 },
- { name: 'itemSize', type: 'vec2', offset: 8 },
- { name: 'spacing', type: 'vec2', offset: 16 },
- ],
- },
Interactable: {
ptrFn: 'getInteractablePtr',
fields: [
diff --git a/sdk/src/ui/core/ui-node.ts b/sdk/src/ui/core/ui-node.ts
index 34607447b..b3155c1b3 100644
--- a/sdk/src/ui/core/ui-node.ts
+++ b/sdk/src/ui/core/ui-node.ts
@@ -6,10 +6,12 @@
*
* The primary way to author UI geometry: every size is a {@link Dimension}
* (px / percent / auto) fed straight into the single-pass Yoga solver, replacing
- * the RectTransform anchor/offset/pivot model. Container properties stay on
- * FlexContainer (→ UILayout in F4); anchors move to an optional UIAnchors
- * component. Mirrors the C++ `UINode` builtin; `computed_size_` is C++-internal
- * (not serialized). Construct lengths with `px()/percent()/auto()`.
+ * the RectTransform anchor/offset/pivot model. The per-item flex properties
+ * (grow/shrink/basis/alignSelf/margin/min-max) live here — the standalone
+ * FlexItem component was subsumed by UINode and removed (REARCH_GUI F4).
+ * Container properties stay on {@link FlexContainer}. Mirrors the C++ `UINode`
+ * builtin; `computed_size_` is C++-internal (not serialized). Construct lengths
+ * with `px()/percent()/auto()`.
*/
import { defineBuiltin } from '../../component';
import { auto, px, type Dimension } from './dimension';
@@ -24,6 +26,16 @@ export const UIPositionType = {
} as const;
export type UIPositionType = (typeof UIPositionType)[keyof typeof UIPositionType];
+/** Per-item cross-axis alignment override (mirrors the C++ AlignSelf enum). */
+export const AlignSelf = {
+ Auto: 0,
+ Start: 1,
+ Center: 2,
+ End: 3,
+ Stretch: 4,
+} as const;
+export type AlignSelf = (typeof AlignSelf)[keyof typeof AlignSelf];
+
export interface UINodeData {
/** Relative (flex flow) or Absolute (placed by inset). */
position: number;
diff --git a/sdk/src/ui/index.ts b/sdk/src/ui/index.ts
index 04fdc986d..bb879a9e5 100644
--- a/sdk/src/ui/index.ts
+++ b/sdk/src/ui/index.ts
@@ -63,7 +63,7 @@ export {
// ─── Layer 1: Primitives ────────────────────────────────────────────────────
export { DimensionUnit, type Dimension, px, percent, auto, isAuto } from './core/dimension';
-export { UINode, UIPositionType, type UINodeData } from './core/ui-node';
+export { UINode, UIPositionType, AlignSelf, type UINodeData } from './core/ui-node';
export {
UIVisual,
@@ -91,17 +91,8 @@ export {
AlignItems,
AlignContent,
type FlexContainerData,
- FlexItem,
- AlignSelf,
- type FlexItemData,
} from './layout/flex';
-export {
- GridLayout,
- GridLayoutDirection,
- type GridLayoutData,
-} from './layout/grid';
-
// ─── Layer 2: Behaviors ─────────────────────────────────────────────────────
export {
diff --git a/sdk/src/ui/layout/flex.ts b/sdk/src/ui/layout/flex.ts
index 03496dd15..7dea49ec0 100644
--- a/sdk/src/ui/layout/flex.ts
+++ b/sdk/src/ui/layout/flex.ts
@@ -41,37 +41,6 @@ export const FlexContainer = defineBuiltin<FlexContainerData>('FlexContainer', {
padding: { left: 0, top: 0, right: 0, bottom: 0 },
});
-// -- FlexItem -----------------------------------------------------------------
-
-export const AlignSelf = { Auto: 0, Start: 1, Center: 2, End: 3, Stretch: 4 } as const;
-export type AlignSelf = (typeof AlignSelf)[keyof typeof AlignSelf];
-
-export interface FlexItemData {
- flexGrow: number;
- flexShrink: number;
- flexBasis: number;
- order: number;
- alignSelf: AlignSelf;
- margin: Padding;
- minWidth: number;
- minHeight: number;
- maxWidth: number;
- maxHeight: number;
- widthPercent: number;
- heightPercent: number;
-}
-
-export const FlexItem = defineBuiltin<FlexItemData>('FlexItem', {
- flexGrow: 0,
- flexShrink: 1,
- flexBasis: -1,
- order: 0,
- alignSelf: AlignSelf.Auto,
- margin: { left: 0, top: 0, right: 0, bottom: 0 },
- minWidth: -1,
- minHeight: -1,
- maxWidth: -1,
- maxHeight: -1,
- widthPercent: -1,
- heightPercent: -1,
-});
+// Per-item flex properties (grow/shrink/basis/alignSelf/margin/min-max) live on
+// UINode now; the standalone FlexItem component was removed in REARCH_GUI F4.
+// `AlignSelf` moved to ui/core/ui-node.ts alongside the other item properties.
diff --git a/sdk/src/ui/layout/grid.ts b/sdk/src/ui/layout/grid.ts
deleted file mode 100644
index 7a77abc37..000000000
--- a/sdk/src/ui/layout/grid.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: LicenseRef-PolyForm-Noncommercial-1.0.0
-// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team
-import { defineBuiltin } from '../../component';
-
-export interface GridLayoutData {
- direction: number; // 0=Vertical, 1=Horizontal
- crossAxisCount: number;
- itemSize: { x: number; y: number };
- spacing: { x: number; y: number };
-}
-
-export const GridLayoutDirection = {
- Vertical: 0,
- Horizontal: 1,
-} as const;
-
-export const GridLayout = defineBuiltin<GridLayoutData>('GridLayout', {
- direction: GridLayoutDirection.Vertical,
- crossAxisCount: 3,
- itemSize: { x: 100, y: 100 },
- spacing: { x: 4, y: 4 },
-});
diff --git a/sdk/src/ui/layout/layout.ts b/sdk/src/ui/layout/layout.ts
index 640195206..ebc90306f 100644
--- a/sdk/src/ui/layout/layout.ts
+++ b/sdk/src/ui/layout/layout.ts
@@ -20,8 +20,7 @@ import { SystemLabel } from '../../systemLabels';
import { Res } from '../../resource';
import { UINode } from '../core/ui-node';
import { UIVisual } from '../core/ui-visual';
-import { FlexContainer, FlexItem } from './flex';
-import { GridLayout } from './grid';
+import { FlexContainer } from './flex';
import { UICameraInfo } from '../UICameraInfo';
import type { UICameraData } from '../UICameraInfo';
import { UILayoutGeneration } from '../UILayoutGeneration';
@@ -37,8 +36,6 @@ export class UILayoutPlugin implements Plugin {
registerComponent('UINode', UINode);
registerComponent('UIVisual', UIVisual);
registerComponent('FlexContainer', FlexContainer);
- registerComponent('FlexItem', FlexItem);
- registerComponent('GridLayout', GridLayout);
const world = app.world;
const module = app.wasmModule as ESEngineModule;
diff --git a/sdk/src/wasm.generated.ts b/sdk/src/wasm.generated.ts
index 2260dbb06..dc0946451 100644
--- a/sdk/src/wasm.generated.ts
+++ b/sdk/src/wasm.generated.ts
@@ -87,11 +87,6 @@ export enum FlexWrap {
Wrap = 1,
}
-export enum GridDirection {
- Vertical = 0,
- Horizontal = 1,
-}
-
export enum JustifyContent {
Start = 0,
Center = 1,
@@ -233,28 +228,6 @@ export interface FlexContainer {
padding: Padding;
}
-export interface FlexItem {
- flexGrow: number;
- flexShrink: number;
- flexBasis: number;
- order: number;
- alignSelf: number;
- margin: Padding;
- minWidth: number;
- minHeight: number;
- maxWidth: number;
- maxHeight: number;
- widthPercent: number;
- heightPercent: number;
-}
-
-export interface GridLayout {
- direction: number;
- crossAxisCount: number;
- itemSize: Vec2;
- spacing: Vec2;
-}
-
export interface Interactable {
enabled: boolean;
blockRaycast: boolean;
@@ -531,14 +504,6 @@ export interface Registry {
getFlexContainer(entity: Entity): FlexContainer;
addFlexContainer(entity: Entity, component: FlexContainer): void;
removeFlexContainer(entity: Entity): void;
- hasFlexItem(entity: Entity): boolean;
- getFlexItem(entity: Entity): FlexItem;
- addFlexItem(entity: Entity, component: FlexItem): void;
- removeFlexItem(entity: Entity): void;
- hasGridLayout(entity: Entity): boolean;
- getGridLayout(entity: Entity): GridLayout;
- addGridLayout(entity: Entity, component: GridLayout): void;
- removeGridLayout(entity: Entity): void;
hasInteractable(entity: Entity): boolean;
getInteractable(entity: Entity): Interactable;
addInteractable(entity: Entity, component: Interactable): void;
@@ -629,8 +594,6 @@ export interface ESEngineModule {
Children: new () => Children;
CircleCollider: new () => CircleCollider;
FlexContainer: new () => FlexContainer;
- FlexItem: new () => FlexItem;
- GridLayout: new () => GridLayout;
Interactable: new () => Interactable;
Parent: new () => Parent;
ParticleEmitter: new () => ParticleEmitter;
diff --git a/sdk/tests/ui-components.test.ts b/sdk/tests/ui-components.test.ts
index 06ab34631..0e3687e61 100644
--- a/sdk/tests/ui-components.test.ts
+++ b/sdk/tests/ui-components.test.ts
@@ -3,7 +3,7 @@
/**
* @file ui-components.test.ts
* @brief Integration tests for the UI components (UINode, UIMask,
- * FlexContainer, FlexItem, Interactable, UIInteraction, Canvas) over
+ * FlexContainer, Interactable, UIInteraction, Canvas) over
* the real WASM module — CRUD plus the single-pass Yoga layout.
*
* Requires pre-built WASM at desktop/public/wasm/esengine.wasm.
@@ -15,7 +15,6 @@ import { Transform, Sprite, Canvas } from '../src/component';
import { UINode, type UINodeData } from '../src/ui/core/ui-node';
import { UIMask, MaskMode } from '../src/ui/core/ui-mask';
import { FlexContainer, FlexDirection, JustifyContent, AlignItems } from '../src/ui/layout/flex';
-import { FlexItem } from '../src/ui/layout/flex';
import { Interactable } from '../src/ui/behavior/interactable';
import { UIInteraction } from '../src/ui/behavior/interactable';
import { UICameraInfo } from '../src/ui/UICameraInfo';
@@ -203,7 +202,7 @@ describe.skipIf(!HAS_WASM)('UI Components (WASM integration)', () => {
});
});
- describe('FlexContainer and FlexItem', () => {
+ describe('FlexContainer', () => {
it('should insert FlexContainer with default values', () => {
const { app, registry } = createEditorApp();
const world = app.world;
@@ -243,56 +242,16 @@ describe.skipIf(!HAS_WASM)('UI Components (WASM integration)', () => {
disposeApp(app, registry);
});
- it('should insert FlexItem with defaults', () => {
- const { app, registry } = createEditorApp();
- const world = app.world;
-
- const entity = world.spawn();
- world.insert(entity, FlexItem);
-
- expect(registry.hasFlexItem(entity)).toBe(true);
- const fi = registry.getFlexItem(entity);
- expect(fi.flexGrow).toBeCloseTo(0);
- expect(fi.flexShrink).toBeCloseTo(1);
- expect(fi.order).toBe(0);
-
- disposeApp(app, registry);
- });
-
- it('should insert FlexItem with custom grow/shrink', () => {
- const { app, registry } = createEditorApp();
- const world = app.world;
-
- const entity = world.spawn();
- world.insert(entity, FlexItem, {
- flexGrow: 2,
- flexShrink: 0,
- flexBasis: 100,
- order: 3,
- });
-
- const fi = registry.getFlexItem(entity);
- expect(fi.flexGrow).toBeCloseTo(2);
- expect(fi.flexShrink).toBeCloseTo(0);
- expect(fi.flexBasis).toBeCloseTo(100);
- expect(fi.order).toBe(3);
-
- disposeApp(app, registry);
- });
-
- it('should remove FlexContainer and FlexItem', () => {
+ it('should remove FlexContainer', () => {
const { app, registry } = createEditorApp();
const world = app.world;
const entity = world.spawn();
world.insert(entity, FlexContainer);
- world.insert(entity, FlexItem);
world.remove(entity, FlexContainer);
- world.remove(entity, FlexItem);
expect(registry.hasFlexContainer(entity)).toBe(false);
- expect(registry.hasFlexItem(entity)).toBe(false);
disposeApp(app, registry);
});
diff --git a/src/esengine/bindings/EditorAPI.generated.cpp b/src/esengine/bindings/EditorAPI.generated.cpp
index 0b939fa0d..ac15f1d17 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 b75998de1f66a401
+ * @schema_hash b95550ef1870c19d
*/
-#define ES_EDITOR_API_SCHEMA_HASH "b75998de1f66a401"
+#define ES_EDITOR_API_SCHEMA_HASH "b95550ef1870c19d"
#include <emscripten/bind.h>
#include <string>
@@ -16,8 +16,6 @@
#include "../ecs/components/Canvas.hpp"
#include "../ecs/components/Collider.hpp"
#include "../ecs/components/FlexContainer.hpp"
-#include "../ecs/components/FlexItem.hpp"
-#include "../ecs/components/GridLayout.hpp"
#include "../ecs/components/Hierarchy.hpp"
#include "../ecs/components/Interactable.hpp"
#include "../ecs/components/ParticleEmitter.hpp"
@@ -61,8 +59,6 @@ std::vector<std::string> editor_getComponentNames() {
"Children",
"CircleCollider",
"FlexContainer",
- "FlexItem",
- "GridLayout",
"Interactable",
"Parent",
"ParticleEmitter",
@@ -187,33 +183,6 @@ std::string editor_getComponentSchema(const std::string& name) {
{"key":"padding.right","type":"float","group":"FlexContainer"},
{"key":"padding.bottom","type":"float","group":"FlexContainer"}
])JSON";
- } else if (name == "FlexItem") {
- return R"JSON([
- {"key":"flexGrow","type":"float","group":"FlexItem"},
- {"key":"flexShrink","type":"float","group":"FlexItem"},
- {"key":"flexBasis","type":"float","group":"FlexItem"},
- {"key":"order","type":"int","group":"FlexItem"},
- {"key":"alignSelf","type":"enum","group":"FlexItem","values":["Auto","Start","Center","End","Stretch"]},
- {"key":"margin.left","type":"float","group":"FlexItem"},
- {"key":"margin.top","type":"float","group":"FlexItem"},
- {"key":"margin.right","type":"float","group":"FlexItem"},
- {"key":"margin.bottom","type":"float","group":"FlexItem"},
- {"key":"minWidth","type":"float","group":"FlexItem"},
- {"key":"minHeight","type":"float","group":"FlexItem"},
- {"key":"maxWidth","type":"float","group":"FlexItem"},
- {"key":"maxHeight","type":"float","group":"FlexItem"},
- {"key":"widthPercent","type":"float","group":"FlexItem"},
- {"key":"heightPercent","type":"float","group":"FlexItem"}
- ])JSON";
- } else if (name == "GridLayout") {
- return R"JSON([
- {"key":"direction","type":"enum","group":"GridLayout","values":["Vertical","Horizontal"]},
- {"key":"crossAxisCount","type":"int","group":"GridLayout"},
- {"key":"itemSize.x","type":"float","group":"GridLayout"},
- {"key":"itemSize.y","type":"float","group":"GridLayout"},
- {"key":"spacing.x","type":"float","group":"GridLayout"},
- {"key":"spacing.y","type":"float","group":"GridLayout"}
- ])JSON";
} else if (name == "Interactable") {
return R"JSON([
{"key":"enabled","type":"bool","group":"Interactable"},
@@ -571,12 +540,6 @@ bool editor_addComponent(Registry& reg, u32 e, const std::string& name) {
} else if (name == "FlexContainer") {
if (!reg.has<esengine::ecs::FlexContainer>(entity)) reg.emplace<esengine::ecs::FlexContainer>(entity);
return true;
- } else if (name == "FlexItem") {
- if (!reg.has<esengine::ecs::FlexItem>(entity)) reg.emplace<esengine::ecs::FlexItem>(entity);
- return true;
- } else if (name == "GridLayout") {
- if (!reg.has<esengine::ecs::GridLayout>(entity)) reg.emplace<esengine::ecs::GridLayout>(entity);
- return true;
} else if (name == "Interactable") {
if (!reg.has<esengine::ecs::Interactable>(entity)) reg.emplace<esengine::ecs::Interactable>(entity);
return true;
@@ -651,10 +614,6 @@ bool editor_removeComponent(Registry& reg, u32 e, const std::string& name) {
if (reg.has<esengine::ecs::CircleCollider>(entity)) { reg.remove<esengine::ecs::CircleCollider>(entity); return true; }
} else if (name == "FlexContainer") {
if (reg.has<esengine::ecs::FlexContainer>(entity)) { reg.remove<esengine::ecs::FlexContainer>(entity); return true; }
- } else if (name == "FlexItem") {
- if (reg.has<esengine::ecs::FlexItem>(entity)) { reg.remove<esengine::ecs::FlexItem>(entity); return true; }
- } else if (name == "GridLayout") {
- if (reg.has<esengine::ecs::GridLayout>(entity)) { reg.remove<esengine::ecs::GridLayout>(entity); return true; }
} else if (name == "Interactable") {
if (reg.has<esengine::ecs::Interactable>(entity)) { reg.remove<esengine::ecs::Interactable>(entity); return true; }
} else if (name == "Parent") {
@@ -704,8 +663,6 @@ bool editor_hasComponent(Registry& reg, u32 e, const std::string& name) {
if (name == "Children") return reg.has<esengine::ecs::Children>(entity);
if (name == "CircleCollider") return reg.has<esengine::ecs::CircleCollider>(entity);
if (name == "FlexContainer") return reg.has<esengine::ecs::FlexContainer>(entity);
- if (name == "FlexItem") return reg.has<esengine::ecs::FlexItem>(entity);
- if (name == "GridLayout") return reg.has<esengine::ecs::GridLayout>(entity);
if (name == "Interactable") return reg.has<esengine::ecs::Interactable>(entity);
if (name == "Parent") return reg.has<esengine::ecs::Parent>(entity);
if (name == "ParticleEmitter") return reg.has<esengine::ecs::ParticleEmitter>(entity);
@@ -740,8 +697,6 @@ std::vector<std::string> editor_getComponents(Registry& reg, u32 e) {
if (reg.has<esengine::ecs::Children>(entity)) result.push_back("Children");
if (reg.has<esengine::ecs::CircleCollider>(entity)) result.push_back("CircleCollider");
if (reg.has<esengine::ecs::FlexContainer>(entity)) result.push_back("FlexContainer");
- if (reg.has<esengine::ecs::FlexItem>(entity)) result.push_back("FlexItem");
- if (reg.has<esengine::ecs::GridLayout>(entity)) result.push_back("GridLayout");
if (reg.has<esengine::ecs::Interactable>(entity)) result.push_back("Interactable");
if (reg.has<esengine::ecs::Parent>(entity)) result.push_back("Parent");
if (reg.has<esengine::ecs::ParticleEmitter>(entity)) result.push_back("ParticleEmitter");
@@ -849,33 +804,6 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::s
else if (field == "padding.bottom") { c.padding.bottom = value; }
else { return false; }
return true;
- } else if (comp == "FlexItem") {
- if (!reg.has<esengine::ecs::FlexItem>(entity)) return false;
- auto& c = reg.get<esengine::ecs::FlexItem>(entity);
- if (field == "flexGrow") { c.flexGrow = value; }
- else if (field == "flexShrink") { c.flexShrink = value; }
- else if (field == "flexBasis") { c.flexBasis = value; }
- else if (field == "margin.left") { c.margin.left = value; }
- else if (field == "margin.top") { c.margin.top = value; }
- else if (field == "margin.right") { c.margin.right = value; }
- else if (field == "margin.bottom") { c.margin.bottom = value; }
- else if (field == "minWidth") { c.minWidth = value; }
- else if (field == "minHeight") { c.minHeight = value; }
- else if (field == "maxWidth") { c.maxWidth = value; }
- else if (field == "maxHeight") { c.maxHeight = value; }
- else if (field == "widthPercent") { c.widthPercent = value; }
- else if (field == "heightPercent") { c.heightPercent = value; }
- else { return false; }
- return true;
- } else if (comp == "GridLayout") {
- if (!reg.has<esengine::ecs::GridLayout>(entity)) return false;
- auto& c = reg.get<esengine::ecs::GridLayout>(entity);
- if (field == "itemSize.x") { c.itemSize.x = value; }
- else if (field == "itemSize.y") { c.itemSize.y = value; }
- else if (field == "spacing.x") { c.spacing.x = value; }
- else if (field == "spacing.y") { c.spacing.y = value; }
- else { return false; }
- return true;
} else if (comp == "ParticleEmitter") {
if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) return false;
auto& c = reg.get<esengine::ecs::ParticleEmitter>(entity);
@@ -1211,29 +1139,6 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "padding.top") { return c.padding.top; }
else if (field == "padding.right") { return c.padding.right; }
else if (field == "padding.bottom") { return c.padding.bottom; }
- } else if (comp == "FlexItem") {
- if (!reg.has<esengine::ecs::FlexItem>(entity)) return 0.0f;
- const auto& c = reg.get<esengine::ecs::FlexItem>(entity);
- if (field == "flexGrow") { return c.flexGrow; }
- else if (field == "flexShrink") { return c.flexShrink; }
- else if (field == "flexBasis") { return c.flexBasis; }
- else if (field == "margin.left") { return c.margin.left; }
- else if (field == "margin.top") { return c.margin.top; }
- else if (field == "margin.right") { return c.margin.right; }
- else if (field == "margin.bottom") { return c.margin.bottom; }
- else if (field == "minWidth") { return c.minWidth; }
- else if (field == "minHeight") { return c.minHeight; }
- else if (field == "maxWidth") { return c.maxWidth; }
- else if (field == "maxHeight") { return c.maxHeight; }
- else if (field == "widthPercent") { return c.widthPercent; }
- else if (field == "heightPercent") { return c.heightPercent; }
- } else if (comp == "GridLayout") {
- if (!reg.has<esengine::ecs::GridLayout>(entity)) return 0.0f;
- const auto& c = reg.get<esengine::ecs::GridLayout>(entity);
- if (field == "itemSize.x") { return c.itemSize.x; }
- else if (field == "itemSize.y") { return c.itemSize.y; }
- else if (field == "spacing.x") { return c.spacing.x; }
- else if (field == "spacing.y") { return c.spacing.y; }
} else if (comp == "ParticleEmitter") {
if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) return 0.0f;
const auto& c = reg.get<esengine::ecs::ParticleEmitter>(entity);
@@ -1518,20 +1423,6 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::str
else if (field == "alignContent") { c.alignContent = static_cast<AlignContent>(value); }
else { return false; }
return true;
- } else if (comp == "FlexItem") {
- if (!reg.has<esengine::ecs::FlexItem>(entity)) return false;
- auto& c = reg.get<esengine::ecs::FlexItem>(entity);
- if (field == "order") { c.order = static_cast<i32>(value); }
- else if (field == "alignSelf") { c.alignSelf = static_cast<AlignSelf>(value); }
- else { return false; }
- return true;
- } else if (comp == "GridLayout") {
- if (!reg.has<esengine::ecs::GridLayout>(entity)) return false;
- auto& c = reg.get<esengine::ecs::GridLayout>(entity);
- if (field == "direction") { c.direction = static_cast<GridDirection>(value); }
- else if (field == "crossAxisCount") { c.crossAxisCount = static_cast<i32>(value); }
- else { return false; }
- return true;
} else if (comp == "Parent") {
if (!reg.has<esengine::ecs::Parent>(entity)) return false;
auto& c = reg.get<esengine::ecs::Parent>(entity);
@@ -1685,16 +1576,6 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::stri
else if (field == "justifyContent") { return static_cast<i32>(c.justifyContent); }
else if (field == "alignItems") { return static_cast<i32>(c.alignItems); }
else if (field == "alignContent") { return static_cast<i32>(c.alignContent); }
- } else if (comp == "FlexItem") {
- if (!reg.has<esengine::ecs::FlexItem>(entity)) return 0;
- const auto& c = reg.get<esengine::ecs::FlexItem>(entity);
- if (field == "order") { return static_cast<i32>(c.order); }
- else if (field == "alignSelf") { return static_cast<i32>(c.alignSelf); }
- } else if (comp == "GridLayout") {
- if (!reg.has<esengine::ecs::GridLayout>(entity)) return 0;
- const auto& c = reg.get<esengine::ecs::GridLayout>(entity);
- if (field == "direction") { return static_cast<i32>(c.direction); }
- else if (field == "crossAxisCount") { return static_cast<i32>(c.crossAxisCount); }
} else if (comp == "Parent") {
if (!reg.has<esengine::ecs::Parent>(entity)) return 0;
const auto& c = reg.get<esengine::ecs::Parent>(entity);
diff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cpp
index 1f4d8d694..92bebc578 100644
--- a/src/esengine/bindings/WebBindings.generated.cpp
+++ b/src/esengine/bindings/WebBindings.generated.cpp
@@ -16,8 +16,6 @@
#include "../ecs/components/Canvas.hpp"
#include "../ecs/components/Collider.hpp"
#include "../ecs/components/FlexContainer.hpp"
-#include "../ecs/components/FlexItem.hpp"
-#include "../ecs/components/GridLayout.hpp"
#include "../ecs/components/Hierarchy.hpp"
#include "../ecs/components/Interactable.hpp"
#include "../ecs/components/ParticleEmitter.hpp"
@@ -140,10 +138,6 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {
.value("NoWrap", esengine::ecs::FlexWrap::NoWrap)
.value("Wrap", esengine::ecs::FlexWrap::Wrap);
- enum_<esengine::ecs::GridDirection>("GridDirection")
- .value("Vertical", esengine::ecs::GridDirection::Vertical)
- .value("Horizontal", esengine::ecs::GridDirection::Horizontal);
-
enum_<esengine::ecs::JustifyContent>("JustifyContent")
.value("Start", esengine::ecs::JustifyContent::Start)
.value("Center", esengine::ecs::JustifyContent::Center)
@@ -357,80 +351,6 @@ FlexContainerJS flexcontainerToJS(const esengine::ecs::FlexContainer& c) {
return js;
}
-struct FlexItemJS {
- f32 flexGrow;
- f32 flexShrink;
- f32 flexBasis;
- i32 order;
- i32 alignSelf;
- Padding margin;
- f32 minWidth;
- f32 minHeight;
- f32 maxWidth;
- f32 maxHeight;
- f32 widthPercent;
- f32 heightPercent;
-};
-
-esengine::ecs::FlexItem flexitemFromJS(const FlexItemJS& js) {
- esengine::ecs::FlexItem c;
- c.flexGrow = js.flexGrow;
- c.flexShrink = js.flexShrink;
- c.flexBasis = js.flexBasis;
- c.order = js.order;
- c.alignSelf = static_cast<AlignSelf>(js.alignSelf);
- c.margin = js.margin;
- c.minWidth = js.minWidth;
- c.minHeight = js.minHeight;
- c.maxWidth = js.maxWidth;
- c.maxHeight = js.maxHeight;
- c.widthPercent = js.widthPercent;
- c.heightPercent = js.heightPercent;
- return c;
-}
-
-FlexItemJS flexitemToJS(const esengine::ecs::FlexItem& c) {
- FlexItemJS js;
- js.flexGrow = c.flexGrow;
- js.flexShrink = c.flexShrink;
- js.flexBasis = c.flexBasis;
- js.order = c.order;
- js.alignSelf = static_cast<i32>(c.alignSelf);
- js.margin = c.margin;
- js.minWidth = c.minWidth;
- js.minHeight = c.minHeight;
- js.maxWidth = c.maxWidth;
- js.maxHeight = c.maxHeight;
- js.widthPercent = c.widthPercent;
- js.heightPercent = c.heightPercent;
- return js;
-}
-
-struct GridLayoutJS {
- i32 direction;
- i32 crossAxisCount;
- glm::vec2 itemSize;
- glm::vec2 spacing;
-};
-
-esengine::ecs::GridLayout gridlayoutFromJS(const GridLayoutJS& js) {
- esengine::ecs::GridLayout c;
- c.direction = static_cast<GridDirection>(js.direction);
- c.crossAxisCount = js.crossAxisCount;
- c.itemSize = js.itemSize;
- c.spacing = js.spacing;
- return c;
-}
-
-GridLayoutJS gridlayoutToJS(const esengine::ecs::GridLayout& c) {
- GridLayoutJS js;
- js.direction = static_cast<i32>(c.direction);
- js.crossAxisCount = c.crossAxisCount;
- js.itemSize = c.itemSize;
- js.spacing = c.spacing;
- return js;
-}
-
struct ParentJS {
u32 entity;
};
@@ -1046,26 +966,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {
.field("gap", &FlexContainerJS::gap)
.field("padding", &FlexContainerJS::padding);
- value_object<FlexItemJS>("FlexItem")
- .field("flexGrow", &FlexItemJS::flexGrow)
- .field("flexShrink", &FlexItemJS::flexShrink)
- .field("flexBasis", &FlexItemJS::flexBasis)
- .field("order", &FlexItemJS::order)
- .field("alignSelf", &FlexItemJS::alignSelf)
- .field("margin", &FlexItemJS::margin)
- .field("minWidth", &FlexItemJS::minWidth)
- .field("minHeight", &FlexItemJS::minHeight)
- .field("maxWidth", &FlexItemJS::maxWidth)
- .field("maxHeight", &FlexItemJS::maxHeight)
- .field("widthPercent", &FlexItemJS::widthPercent)
- .field("heightPercent", &FlexItemJS::heightPercent);
-
- value_object<GridLayoutJS>("GridLayout")
- .field("direction", &GridLayoutJS::direction)
- .field("crossAxisCount", &GridLayoutJS::crossAxisCount)
- .field("itemSize", &GridLayoutJS::itemSize)
- .field("spacing", &GridLayoutJS::spacing);
-
value_object<esengine::ecs::Interactable>("Interactable")
.field("enabled", &esengine::ecs::Interactable::enabled)
.field("blockRaycast", &esengine::ecs::Interactable::blockRaycast)
@@ -1469,46 +1369,6 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::FlexContainer>(entity);
}))
- // FlexItem
- .function("hasFlexItem", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::FlexItem>(static_cast<Entity>(e));
- }))
- .function("getFlexItem", optional_override([](Registry& r, u32 e) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::FlexItem>(entity)) return FlexItemJS{};
- return flexitemToJS(r.get<esengine::ecs::FlexItem>(entity));
- }))
- .function("addFlexItem", optional_override([](Registry& r, u32 e, const FlexItemJS& js) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity)) return;
- r.emplaceOrReplace<esengine::ecs::FlexItem>(entity, flexitemFromJS(js));
- }))
- .function("removeFlexItem", optional_override([](Registry& r, u32 e) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::FlexItem>(entity)) return;
- r.remove<esengine::ecs::FlexItem>(entity);
- }))
-
- // GridLayout
- .function("hasGridLayout", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::GridLayout>(static_cast<Entity>(e));
- }))
- .function("getGridLayout", optional_override([](Registry& r, u32 e) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::GridLayout>(entity)) return GridLayoutJS{};
- return gridlayoutToJS(r.get<esengine::ecs::GridLayout>(entity));
- }))
- .function("addGridLayout", optional_override([](Registry& r, u32 e, const GridLayoutJS& js) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity)) return;
- r.emplaceOrReplace<esengine::ecs::GridLayout>(entity, gridlayoutFromJS(js));
- }))
- .function("removeGridLayout", optional_override([](Registry& r, u32 e) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::GridLayout>(entity)) return;
- r.remove<esengine::ecs::GridLayout>(entity);
- }))
-
// Interactable
.function("hasInteractable", optional_override([](Registry& r, u32 e) {
return r.has<esengine::ecs::Interactable>(static_cast<Entity>(e));
@@ -1883,8 +1743,6 @@ emscripten::val esengineGetBuiltinComponentNames() {
arr.set(i++, val(std::string("Children")));
arr.set(i++, val(std::string("CircleCollider")));
arr.set(i++, val(std::string("FlexContainer")));
- arr.set(i++, val(std::string("FlexItem")));
- arr.set(i++, val(std::string("GridLayout")));
arr.set(i++, val(std::string("Interactable")));
arr.set(i++, val(std::string("Parent")));
arr.set(i++, val(std::string("ParticleEmitter")));
@@ -1972,21 +1830,6 @@ static_assert(offsetof(esengine::ecs::FlexContainer, justifyContent) == 2, "ABI
static_assert(offsetof(esengine::ecs::FlexContainer, alignItems) == 3, "ABI offset drift: esengine::ecs::FlexContainer.alignItems (EHT expected 3)");
static_assert(offsetof(esengine::ecs::FlexContainer, alignContent) == 4, "ABI offset drift: esengine::ecs::FlexContainer.alignContent (EHT expected 4)");
static_assert(offsetof(esengine::ecs::FlexContainer, gap) == 8, "ABI offset drift: esengine::ecs::FlexContainer.gap (EHT expected 8)");
-static_assert(offsetof(esengine::ecs::FlexItem, flexGrow) == 0, "ABI offset drift: esengine::ecs::FlexItem.flexGrow (EHT expected 0)");
-static_assert(offsetof(esengine::ecs::FlexItem, flexShrink) == 4, "ABI offset drift: esengine::ecs::FlexItem.flexShrink (EHT expected 4)");
-static_assert(offsetof(esengine::ecs::FlexItem, flexBasis) == 8, "ABI offset drift: esengine::ecs::FlexItem.flexBasis (EHT expected 8)");
-static_assert(offsetof(esengine::ecs::FlexItem, order) == 12, "ABI offset drift: esengine::ecs::FlexItem.order (EHT expected 12)");
-static_assert(offsetof(esengine::ecs::FlexItem, alignSelf) == 16, "ABI offset drift: esengine::ecs::FlexItem.alignSelf (EHT expected 16)");
-static_assert(offsetof(esengine::ecs::FlexItem, minWidth) == 36, "ABI offset drift: esengine::ecs::FlexItem.minWidth (EHT expected 36)");
-static_assert(offsetof(esengine::ecs::FlexItem, minHeight) == 40, "ABI offset drift: esengine::ecs::FlexItem.minHeight (EHT expected 40)");
-static_assert(offsetof(esengine::ecs::FlexItem, maxWidth) == 44, "ABI offset drift: esengine::ecs::FlexItem.maxWidth (EHT expected 44)");
-static_assert(offsetof(esengine::ecs::FlexItem, maxHeight) == 48, "ABI offset drift: esengine::ecs::FlexItem.maxHeight (EHT expected 48)");
-static_assert(offsetof(esengine::ecs::FlexItem, widthPercent) == 52, "ABI offset drift: esengine::ecs::FlexItem.widthPercent (EHT expected 52)");
-static_assert(offsetof(esengine::ecs::FlexItem, heightPercent) == 56, "ABI offset drift: esengine::ecs::FlexItem.heightPercent (EHT expected 56)");
-static_assert(offsetof(esengine::ecs::GridLayout, direction) == 0, "ABI offset drift: esengine::ecs::GridLayout.direction (EHT expected 0)");
-static_assert(offsetof(esengine::ecs::GridLayout, crossAxisCount) == 4, "ABI offset drift: esengine::ecs::GridLayout.crossAxisCount (EHT expected 4)");
-static_assert(offsetof(esengine::ecs::GridLayout, itemSize) == 8, "ABI offset drift: esengine::ecs::GridLayout.itemSize (EHT expected 8)");
-static_assert(offsetof(esengine::ecs::GridLayout, spacing) == 16, "ABI offset drift: esengine::ecs::GridLayout.spacing (EHT expected 16)");
static_assert(offsetof(esengine::ecs::Interactable, enabled) == 0, "ABI offset drift: esengine::ecs::Interactable.enabled (EHT expected 0)");
static_assert(offsetof(esengine::ecs::Interactable, blockRaycast) == 1, "ABI offset drift: esengine::ecs::Interactable.blockRaycast (EHT expected 1)");
static_assert(offsetof(esengine::ecs::Interactable, raycastTarget) == 2, "ABI offset drift: esengine::ecs::Interactable.raycastTarget (EHT expected 2)");
@@ -2122,7 +1965,7 @@ static_assert(offsetof(esengine::ecs::Velocity, angular) == 12, "ABI offset drif
// ABI Hash -- runtime handshake against the SDK bundle
// =============================================================================
-static const char* kEsAbiLayoutHash = "7540dc008d0e3d93";
+static const char* kEsAbiLayoutHash = "ea147a61d787f430";
std::string esengineGetAbiLayoutHash() {
return std::string(kEsAbiLayoutHash);
diff --git a/src/esengine/ecs/UILayoutSystem.cpp b/src/esengine/ecs/UILayoutSystem.cpp
index 891f34e32..67d762255 100644
--- a/src/esengine/ecs/UILayoutSystem.cpp
+++ b/src/esengine/ecs/UILayoutSystem.cpp
@@ -6,8 +6,7 @@
#include "components/Transform.hpp"
#include "components/Canvas.hpp"
#include "components/FlexContainer.hpp"
-#include "components/FlexItem.hpp" // AlignSelf
-#include "components/UINode.hpp"
+#include "components/UINode.hpp" // UINode + AlignSelf
#include <yoga/Yoga.h>
#include <unordered_map>
diff --git a/src/esengine/ecs/components/FlexItem.hpp b/src/esengine/ecs/components/FlexItem.hpp
deleted file mode 100644
index f3e60029c..000000000
--- a/src/esengine/ecs/components/FlexItem.hpp
+++ /dev/null
@@ -1,48 +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/UITypes.hpp"
-#include "../../core/Reflection.hpp"
-
-namespace esengine::ecs {
-
-ES_ENUM()
-enum class AlignSelf : u8 {
- Auto,
- Start,
- Center,
- End,
- Stretch
-};
-
-ES_COMPONENT()
-struct FlexItem {
- ES_PROPERTY()
- f32 flexGrow{0.0f};
- ES_PROPERTY()
- f32 flexShrink{1.0f};
- ES_PROPERTY()
- f32 flexBasis{-1.0f};
- ES_PROPERTY()
- i32 order{0};
- ES_PROPERTY()
- AlignSelf alignSelf{AlignSelf::Auto};
- ES_PROPERTY()
- Padding margin{};
- ES_PROPERTY()
- f32 minWidth{-1.0f};
- ES_PROPERTY()
- f32 minHeight{-1.0f};
- ES_PROPERTY()
- f32 maxWidth{-1.0f};
- ES_PROPERTY()
- f32 maxHeight{-1.0f};
- ES_PROPERTY()
- f32 widthPercent{-1.0f};
- ES_PROPERTY()
- f32 heightPercent{-1.0f};
-};
-
-} // namespace esengine::ecs
diff --git a/src/esengine/ecs/components/GridLayout.hpp b/src/esengine/ecs/components/GridLayout.hpp
deleted file mode 100644
index e4fe9c8ce..000000000
--- a/src/esengine/ecs/components/GridLayout.hpp
+++ /dev/null
@@ -1,32 +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"
-
-namespace esengine::ecs {
-
-ES_ENUM()
-enum class GridDirection : u8 {
- Vertical = 0,
- Horizontal = 1,
-};
-
-ES_COMPONENT()
-struct GridLayout {
- ES_PROPERTY()
- GridDirection direction{GridDirection::Vertical};
-
- ES_PROPERTY()
- i32 crossAxisCount{3};
-
- ES_PROPERTY()
- glm::vec2 itemSize{100.0f, 100.0f};
-
- ES_PROPERTY()
- glm::vec2 spacing{4.0f, 4.0f};
-};
-
-} // namespace esengine::ecs
diff --git a/src/esengine/ecs/components/UINode.hpp b/src/esengine/ecs/components/UINode.hpp
index 60f123037..9c3dc8227 100644
--- a/src/esengine/ecs/components/UINode.hpp
+++ b/src/esengine/ecs/components/UINode.hpp
@@ -6,10 +6,23 @@
#include "../../core/UITypes.hpp" // Dimension
#include "../../core/Reflection.hpp"
#include "../../math/Math.hpp" // glm::vec2 (computed output)
-#include "FlexItem.hpp" // reuse AlignSelf
namespace esengine::ecs {
+/**
+ * @brief Per-item cross-axis alignment override (CSS align-self). Lives on
+ * UINode since UINode carries the flex-item properties (REARCH_GUI F4:
+ * the standalone FlexItem component was subsumed by UINode and removed).
+ */
+ES_ENUM()
+enum class AlignSelf : u8 {
+ Auto,
+ Start,
+ Center,
+ End,
+ Stretch
+};
+
/**
* @brief Box positioning scheme. Absolute takes the node out of flex flow and
* places it by `inset` against the parent's box — this is how anchor /