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): delete dead / domain-specific C++ components
esengine06ce8f34ead2
diff --git a/sdk/src/component.generated.ts b/sdk/src/component.generated.tsindex 0db2b070c..4e8c30427 100644--- a/sdk/src/component.generated.ts+++ b/sdk/src/component.generated.ts@@ -142,20 +142,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {colorFields: [],animatableFields: [],},- FanLayout: {- defaults: {- radius: 600,- maxSpreadAngle: 30,- maxCardAngle: 8,- tiltFactor: 1,- cardSpacing: 0,- direction: 0,- },- assetFields: [],- entityFields: [],- colorFields: [],- animatableFields: [],- },FlexContainer: {defaults: {direction: 0,@@ -232,19 +218,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {colorFields: [],animatableFields: [],},- LayoutGroup: {- defaults: {- direction: 0,- spacing: 0,- padding: { left: 0, top: 0, right: 0, bottom: 0 },- childAlignment: 0,- reverseOrder: false,- },- assetFields: [],- entityFields: [],- colorFields: [],- animatableFields: [],- },ParticleEmitter: {defaults: {rate: 10,@@ -309,16 +282,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {colorFields: [],animatableFields: [],},- Selectable: {- defaults: {- selected: false,- group: 0,- },- assetFields: [],- entityFields: [],- colorFields: [],- animatableFields: [],- },ShapeRenderer: {defaults: {shapeType: 0,diff --git a/sdk/src/ecs/ptrAccessors.generated.ts b/sdk/src/ecs/ptrAccessors.generated.tsindex ee0fe7886..026cf49cd 100644--- a/sdk/src/ecs/ptrAccessors.generated.ts+++ b/sdk/src/ecs/ptrAccessors.generated.ts@@ -385,50 +385,6 @@ export function createSegmentColliderData(): SegmentColliderPtrData {};}-export interface FanLayoutPtrData {- radius: number;- maxSpreadAngle: number;- maxCardAngle: number;- tiltFactor: number;- cardSpacing: number;- direction: number;-}--export function fillFanLayout(- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, out: FanLayoutPtrData,-): void {- out.radius = f32[ptr >> 2];- out.maxSpreadAngle = f32[(ptr + 4) >> 2];- out.maxCardAngle = f32[(ptr + 8) >> 2];- out.tiltFactor = f32[(ptr + 12) >> 2];- out.cardSpacing = f32[(ptr + 16) >> 2];- out.direction = u8[ptr + 20];-}--export function writeFanLayout(- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, data: FanLayoutPtrData,-): void {- f32[ptr >> 2] = data.radius;- f32[(ptr + 4) >> 2] = data.maxSpreadAngle;- f32[(ptr + 8) >> 2] = data.maxCardAngle;- f32[(ptr + 12) >> 2] = data.tiltFactor;- f32[(ptr + 16) >> 2] = data.cardSpacing;- u8[ptr + 20] = data.direction;-}--export function createFanLayoutData(): FanLayoutPtrData {- return {- radius: 0,- maxSpreadAngle: 0,- maxCardAngle: 0,- tiltFactor: 0,- cardSpacing: 0,- direction: 0,- };-}-export interface FlexContainerPtrData {direction: number;wrap: number;@@ -605,42 +561,6 @@ export function createInteractableData(): InteractablePtrData {};}-export interface LayoutGroupPtrData {- direction: number;- spacing: number;- childAlignment: number;- reverseOrder: boolean;-}--export function fillLayoutGroup(- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, out: LayoutGroupPtrData,-): void {- out.direction = u8[ptr];- out.spacing = f32[(ptr + 4) >> 2];- out.childAlignment = u8[ptr + 8];- out.reverseOrder = u8[ptr + 9] !== 0;-}--export function writeLayoutGroup(- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, data: LayoutGroupPtrData,-): void {- u8[ptr] = data.direction;- f32[(ptr + 4) >> 2] = data.spacing;- u8[ptr + 8] = data.childAlignment;- u8[ptr + 9] = data.reverseOrder ? 1 : 0;-}--export function createLayoutGroupData(): LayoutGroupPtrData {- return {- direction: 0,- spacing: 0,- childAlignment: 0,- reverseOrder: false,- };-}-export interface ParticleEmitterPtrData {rate: number;burstCount: number;@@ -873,34 +793,6 @@ export function createRigidBodyData(): RigidBodyPtrData {};}-export interface SelectablePtrData {- selected: boolean;- group: number;-}--export function fillSelectable(- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, out: SelectablePtrData,-): void {- out.selected = u8[ptr] !== 0;- out.group = u32[(ptr + 4) >> 2] | 0;-}--export function writeSelectable(- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,- ptr: number, data: SelectablePtrData,-): void {- u8[ptr] = data.selected ? 1 : 0;- u32[(ptr + 4) >> 2] = data.group | 0;-}--export function createSelectableData(): SelectablePtrData {- return {- selected: false,- group: 0,- };-}-export interface ShapeRendererPtrData {shapeType: number;color: Color;@@ -1447,15 +1339,12 @@ export const PTR_ACCESSORS: Record<string, PtrAccessor<any>> = {CircleCollider: { fill: fillCircleCollider, write: writeCircleCollider, create: createCircleColliderData },CapsuleCollider: { fill: fillCapsuleCollider, write: writeCapsuleCollider, create: createCapsuleColliderData },SegmentCollider: { fill: fillSegmentCollider, write: writeSegmentCollider, create: createSegmentColliderData },- FanLayout: { fill: fillFanLayout, write: writeFanLayout, create: createFanLayoutData },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 },- LayoutGroup: { fill: fillLayoutGroup, write: writeLayoutGroup, create: createLayoutGroupData },ParticleEmitter: { fill: fillParticleEmitter, write: writeParticleEmitter, create: createParticleEmitterData },RigidBody: { fill: fillRigidBody, write: writeRigidBody, create: createRigidBodyData },- Selectable: { fill: fillSelectable, write: writeSelectable, create: createSelectableData },ShapeRenderer: { fill: fillShapeRenderer, write: writeShapeRenderer, create: createShapeRendererData },SpineAnimation: { fill: fillSpineAnimation, write: writeSpineAnimation, create: createSpineAnimationData },Sprite: { fill: fillSprite, write: writeSprite, create: createSpriteData },diff --git a/sdk/src/ptrLayouts.generated.ts b/sdk/src/ptrLayouts.generated.tsindex 747348334..2b56ecba4 100644--- a/sdk/src/ptrLayouts.generated.ts+++ b/sdk/src/ptrLayouts.generated.ts@@ -112,17 +112,6 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {{ name: 'maskBits', type: 'u32', offset: 36 },],},- FanLayout: {- ptrFn: 'getFanLayoutPtr',- fields: [- { name: 'radius', type: 'f32', offset: 0 },- { name: 'maxSpreadAngle', type: 'f32', offset: 4 },- { name: 'maxCardAngle', type: 'f32', offset: 8 },- { name: 'tiltFactor', type: 'f32', offset: 12 },- { name: 'cardSpacing', type: 'f32', offset: 16 },- { name: 'direction', type: 'u8', offset: 20 },- ],- },FlexContainer: {ptrFn: 'getFlexContainerPtr',fields: [@@ -167,15 +156,6 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {{ name: 'raycastTarget', type: 'bool', offset: 2 },],},- LayoutGroup: {- ptrFn: 'getLayoutGroupPtr',- fields: [- { name: 'direction', type: 'u8', offset: 0 },- { name: 'spacing', type: 'f32', offset: 4 },- { name: 'childAlignment', type: 'u8', offset: 8 },- { name: 'reverseOrder', type: 'bool', offset: 9 },- ],- },ParticleEmitter: {ptrFn: 'getParticleEmitterPtr',fields: [@@ -234,13 +214,6 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {{ name: 'enabled', type: 'bool', offset: 18 },],},- Selectable: {- ptrFn: 'getSelectablePtr',- fields: [- { name: 'selected', type: 'bool', offset: 0 },- { name: 'group', type: 'i32', offset: 4 },- ],- },ShapeRenderer: {ptrFn: 'getShapeRendererPtr',fields: [diff --git a/sdk/src/wasm.generated.ts b/sdk/src/wasm.generated.tsindex 2af47760c..eb232d7fc 100644--- a/sdk/src/wasm.generated.ts+++ b/sdk/src/wasm.generated.ts@@ -48,11 +48,6 @@ export enum CanvasScaleMode {Match = 4,}-export enum FanDirection {- Up = 0,- Down = 1,-}-export enum FlexDirection {Row = 0,Column = 1,@@ -103,17 +98,6 @@ export enum GridDirection {Horizontal = 1,}-export enum LayoutDirection {- Horizontal = 0,- Vertical = 1,-}--export enum ChildAlignment {- Start = 0,- Center = 1,- End = 2,-}-export enum EmitterShape {Point = 0,Circle = 1,@@ -227,15 +211,6 @@ export interface SegmentCollider {maskBits: number;}-export interface FanLayout {- radius: number;- maxSpreadAngle: number;- maxCardAngle: number;- tiltFactor: number;- cardSpacing: number;- direction: number;-}-export interface FlexContainer {direction: number;wrap: number;@@ -282,14 +257,6 @@ export interface Interactable {raycastTarget: boolean;}-export interface LayoutGroup {- direction: number;- spacing: number;- padding: Padding;- childAlignment: number;- reverseOrder: boolean;-}-export interface ParticleEmitter {rate: number;burstCount: number;@@ -344,14 +311,6 @@ export interface RigidBody {enabled: boolean;}-export interface ScreenSpace {-}--export interface Selectable {- selected: boolean;- group: number;-}-export interface ShapeRenderer {shapeType: number;color: Vec4;@@ -518,10 +477,6 @@ export interface Registry {getSegmentCollider(entity: Entity): SegmentCollider;addSegmentCollider(entity: Entity, component: SegmentCollider): void;removeSegmentCollider(entity: Entity): void;- hasFanLayout(entity: Entity): boolean;- getFanLayout(entity: Entity): FanLayout;- addFanLayout(entity: Entity, component: FanLayout): void;- removeFanLayout(entity: Entity): void;hasFlexContainer(entity: Entity): boolean;getFlexContainer(entity: Entity): FlexContainer;addFlexContainer(entity: Entity, component: FlexContainer): void;@@ -546,10 +501,6 @@ export interface Registry {getInteractable(entity: Entity): Interactable;addInteractable(entity: Entity, component: Interactable): void;removeInteractable(entity: Entity): void;- hasLayoutGroup(entity: Entity): boolean;- getLayoutGroup(entity: Entity): LayoutGroup;- addLayoutGroup(entity: Entity, component: LayoutGroup): void;- removeLayoutGroup(entity: Entity): void;hasParticleEmitter(entity: Entity): boolean;getParticleEmitter(entity: Entity): ParticleEmitter;addParticleEmitter(entity: Entity, component: ParticleEmitter): void;@@ -558,14 +509,6 @@ export interface Registry {getRigidBody(entity: Entity): RigidBody;addRigidBody(entity: Entity, component: RigidBody): void;removeRigidBody(entity: Entity): void;- hasScreenSpace(entity: Entity): boolean;- getScreenSpace(entity: Entity): ScreenSpace;- addScreenSpace(entity: Entity, component: ScreenSpace): void;- removeScreenSpace(entity: Entity): void;- hasSelectable(entity: Entity): boolean;- getSelectable(entity: Entity): Selectable;- addSelectable(entity: Entity, component: Selectable): void;- removeSelectable(entity: Entity): void;hasShapeRenderer(entity: Entity): boolean;getShapeRenderer(entity: Entity): ShapeRenderer;addShapeRenderer(entity: Entity, component: ShapeRenderer): void;@@ -625,18 +568,14 @@ export interface ESEngineModule {CircleCollider: new () => CircleCollider;CapsuleCollider: new () => CapsuleCollider;SegmentCollider: new () => SegmentCollider;- FanLayout: new () => FanLayout;FlexContainer: new () => FlexContainer;FlexItem: new () => FlexItem;GridLayout: new () => GridLayout;Parent: new () => Parent;Children: new () => Children;Interactable: new () => Interactable;- LayoutGroup: new () => LayoutGroup;ParticleEmitter: new () => ParticleEmitter;RigidBody: new () => RigidBody;- ScreenSpace: new () => ScreenSpace;- Selectable: new () => Selectable;ShapeRenderer: new () => ShapeRenderer;SpineAnimation: new () => SpineAnimation;Sprite: new () => Sprite;diff --git a/sdk/wasm.generated.ts b/sdk/wasm.generated.tsindex 2af47760c..eb232d7fc 100644--- a/sdk/wasm.generated.ts+++ b/sdk/wasm.generated.ts@@ -48,11 +48,6 @@ export enum CanvasScaleMode {Match = 4,}-export enum FanDirection {- Up = 0,- Down = 1,-}-export enum FlexDirection {Row = 0,Column = 1,@@ -103,17 +98,6 @@ export enum GridDirection {Horizontal = 1,}-export enum LayoutDirection {- Horizontal = 0,- Vertical = 1,-}--export enum ChildAlignment {- Start = 0,- Center = 1,- End = 2,-}-export enum EmitterShape {Point = 0,Circle = 1,@@ -227,15 +211,6 @@ export interface SegmentCollider {maskBits: number;}-export interface FanLayout {- radius: number;- maxSpreadAngle: number;- maxCardAngle: number;- tiltFactor: number;- cardSpacing: number;- direction: number;-}-export interface FlexContainer {direction: number;wrap: number;@@ -282,14 +257,6 @@ export interface Interactable {raycastTarget: boolean;}-export interface LayoutGroup {- direction: number;- spacing: number;- padding: Padding;- childAlignment: number;- reverseOrder: boolean;-}-export interface ParticleEmitter {rate: number;burstCount: number;@@ -344,14 +311,6 @@ export interface RigidBody {enabled: boolean;}-export interface ScreenSpace {-}--export interface Selectable {- selected: boolean;- group: number;-}-export interface ShapeRenderer {shapeType: number;color: Vec4;@@ -518,10 +477,6 @@ export interface Registry {getSegmentCollider(entity: Entity): SegmentCollider;addSegmentCollider(entity: Entity, component: SegmentCollider): void;removeSegmentCollider(entity: Entity): void;- hasFanLayout(entity: Entity): boolean;- getFanLayout(entity: Entity): FanLayout;- addFanLayout(entity: Entity, component: FanLayout): void;- removeFanLayout(entity: Entity): void;hasFlexContainer(entity: Entity): boolean;getFlexContainer(entity: Entity): FlexContainer;addFlexContainer(entity: Entity, component: FlexContainer): void;@@ -546,10 +501,6 @@ export interface Registry {getInteractable(entity: Entity): Interactable;addInteractable(entity: Entity, component: Interactable): void;removeInteractable(entity: Entity): void;- hasLayoutGroup(entity: Entity): boolean;- getLayoutGroup(entity: Entity): LayoutGroup;- addLayoutGroup(entity: Entity, component: LayoutGroup): void;- removeLayoutGroup(entity: Entity): void;hasParticleEmitter(entity: Entity): boolean;getParticleEmitter(entity: Entity): ParticleEmitter;addParticleEmitter(entity: Entity, component: ParticleEmitter): void;@@ -558,14 +509,6 @@ export interface Registry {getRigidBody(entity: Entity): RigidBody;addRigidBody(entity: Entity, component: RigidBody): void;removeRigidBody(entity: Entity): void;- hasScreenSpace(entity: Entity): boolean;- getScreenSpace(entity: Entity): ScreenSpace;- addScreenSpace(entity: Entity, component: ScreenSpace): void;- removeScreenSpace(entity: Entity): void;- hasSelectable(entity: Entity): boolean;- getSelectable(entity: Entity): Selectable;- addSelectable(entity: Entity, component: Selectable): void;- removeSelectable(entity: Entity): void;hasShapeRenderer(entity: Entity): boolean;getShapeRenderer(entity: Entity): ShapeRenderer;addShapeRenderer(entity: Entity, component: ShapeRenderer): void;@@ -625,18 +568,14 @@ export interface ESEngineModule {CircleCollider: new () => CircleCollider;CapsuleCollider: new () => CapsuleCollider;SegmentCollider: new () => SegmentCollider;- FanLayout: new () => FanLayout;FlexContainer: new () => FlexContainer;FlexItem: new () => FlexItem;GridLayout: new () => GridLayout;Parent: new () => Parent;Children: new () => Children;Interactable: new () => Interactable;- LayoutGroup: new () => LayoutGroup;ParticleEmitter: new () => ParticleEmitter;RigidBody: new () => RigidBody;- ScreenSpace: new () => ScreenSpace;- Selectable: new () => Selectable;ShapeRenderer: new () => ShapeRenderer;SpineAnimation: new () => SpineAnimation;Sprite: new () => Sprite;diff --git a/src/esengine/bindings/EditorAPI.generated.cpp b/src/esengine/bindings/EditorAPI.generated.cppindex deb8e2780..8fa4bbd81 100644--- a/src/esengine/bindings/EditorAPI.generated.cpp+++ b/src/esengine/bindings/EditorAPI.generated.cpp@@ -14,17 +14,13 @@#include "../ecs/components/Camera.hpp"#include "../ecs/components/Canvas.hpp"#include "../ecs/components/Collider.hpp"-#include "../ecs/components/FanLayout.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/LayoutGroup.hpp"#include "../ecs/components/ParticleEmitter.hpp"#include "../ecs/components/RigidBody.hpp"-#include "../ecs/components/ScreenSpace.hpp"-#include "../ecs/components/Selectable.hpp"#include "../ecs/components/ShapeRenderer.hpp"#include "../ecs/components/SpineAnimation.hpp"#include "../ecs/components/Sprite.hpp"@@ -62,17 +58,14 @@ std::vector<std::string> editor_getComponentNames() {"CircleCollider","CapsuleCollider","SegmentCollider",- "FanLayout","FlexContainer","FlexItem","GridLayout","Parent","Children","Interactable",- "LayoutGroup","ParticleEmitter","RigidBody",- "Selectable","ShapeRenderer","SpineAnimation","Sprite",@@ -187,15 +180,6 @@ std::string editor_getComponentSchema(const std::string& name) {{"key":"categoryBits","type":"int","group":"SegmentCollider"},{"key":"maskBits","type":"int","group":"SegmentCollider"}])JSON";- } else if (name == "FanLayout") {- return R"JSON([- {"key":"radius","type":"float","group":"FanLayout"},- {"key":"maxSpreadAngle","type":"float","group":"FanLayout"},- {"key":"maxCardAngle","type":"float","group":"FanLayout"},- {"key":"tiltFactor","type":"float","group":"FanLayout"},- {"key":"cardSpacing","type":"float","group":"FanLayout"},- {"key":"direction","type":"enum","group":"FanLayout","values":["Up","Down"]}- ])JSON";} else if (name == "FlexContainer") {return R"JSON([{"key":"direction","type":"enum","group":"FlexContainer","values":["Row","Column","RowReverse","ColumnReverse"]},@@ -251,17 +235,6 @@ std::string editor_getComponentSchema(const std::string& name) {{"key":"blockRaycast","type":"bool","group":"Interactable"},{"key":"raycastTarget","type":"bool","group":"Interactable"}])JSON";- } else if (name == "LayoutGroup") {- return R"JSON([- {"key":"direction","type":"enum","group":"LayoutGroup","values":["Horizontal","Vertical"]},- {"key":"spacing","type":"float","group":"LayoutGroup"},- {"key":"padding.left","type":"float","group":"LayoutGroup"},- {"key":"padding.top","type":"float","group":"LayoutGroup"},- {"key":"padding.right","type":"float","group":"LayoutGroup"},- {"key":"padding.bottom","type":"float","group":"LayoutGroup"},- {"key":"childAlignment","type":"enum","group":"LayoutGroup","values":["Start","Center","End"]},- {"key":"reverseOrder","type":"bool","group":"LayoutGroup"}- ])JSON";} else if (name == "ParticleEmitter") {return R"JSON([{"key":"rate","type":"float","group":"ParticleEmitter"},@@ -324,11 +297,6 @@ std::string editor_getComponentSchema(const std::string& name) {{"key":"bullet","type":"bool","group":"RigidBody"},{"key":"enabled","type":"bool","group":"RigidBody"}])JSON";- } else if (name == "Selectable") {- return R"JSON([- {"key":"selected","type":"bool","group":"Selectable"},- {"key":"group","type":"int","group":"Selectable"}- ])JSON";} else if (name == "ShapeRenderer") {return R"JSON([{"key":"shapeType","type":"int","group":"ShapeRenderer"},@@ -551,9 +519,6 @@ bool editor_addComponent(Registry& reg, u32 e, const std::string& name) {} else if (name == "SegmentCollider") {if (!reg.has<esengine::ecs::SegmentCollider>(entity)) reg.emplace<esengine::ecs::SegmentCollider>(entity);return true;- } else if (name == "FanLayout") {- if (!reg.has<esengine::ecs::FanLayout>(entity)) reg.emplace<esengine::ecs::FanLayout>(entity);- return true;} else if (name == "FlexContainer") {if (!reg.has<esengine::ecs::FlexContainer>(entity)) reg.emplace<esengine::ecs::FlexContainer>(entity);return true;@@ -572,18 +537,12 @@ bool editor_addComponent(Registry& reg, u32 e, const std::string& name) {} else if (name == "Interactable") {if (!reg.has<esengine::ecs::Interactable>(entity)) reg.emplace<esengine::ecs::Interactable>(entity);return true;- } else if (name == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) reg.emplace<esengine::ecs::LayoutGroup>(entity);- return true;} else if (name == "ParticleEmitter") {if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) reg.emplace<esengine::ecs::ParticleEmitter>(entity);return true;} else if (name == "RigidBody") {if (!reg.has<esengine::ecs::RigidBody>(entity)) reg.emplace<esengine::ecs::RigidBody>(entity);return true;- } else if (name == "Selectable") {- if (!reg.has<esengine::ecs::Selectable>(entity)) reg.emplace<esengine::ecs::Selectable>(entity);- return true;} else if (name == "ShapeRenderer") {if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) reg.emplace<esengine::ecs::ShapeRenderer>(entity);return true;@@ -638,8 +597,6 @@ bool editor_removeComponent(Registry& reg, u32 e, const std::string& name) {if (reg.has<esengine::ecs::CapsuleCollider>(entity)) { reg.remove<esengine::ecs::CapsuleCollider>(entity); return true; }} else if (name == "SegmentCollider") {if (reg.has<esengine::ecs::SegmentCollider>(entity)) { reg.remove<esengine::ecs::SegmentCollider>(entity); return true; }- } else if (name == "FanLayout") {- if (reg.has<esengine::ecs::FanLayout>(entity)) { reg.remove<esengine::ecs::FanLayout>(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") {@@ -652,14 +609,10 @@ bool editor_removeComponent(Registry& reg, u32 e, const std::string& name) {if (reg.has<esengine::ecs::Children>(entity)) { reg.remove<esengine::ecs::Children>(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 == "LayoutGroup") {- if (reg.has<esengine::ecs::LayoutGroup>(entity)) { reg.remove<esengine::ecs::LayoutGroup>(entity); return true; }} else if (name == "ParticleEmitter") {if (reg.has<esengine::ecs::ParticleEmitter>(entity)) { reg.remove<esengine::ecs::ParticleEmitter>(entity); return true; }} else if (name == "RigidBody") {if (reg.has<esengine::ecs::RigidBody>(entity)) { reg.remove<esengine::ecs::RigidBody>(entity); return true; }- } else if (name == "Selectable") {- if (reg.has<esengine::ecs::Selectable>(entity)) { reg.remove<esengine::ecs::Selectable>(entity); return true; }} else if (name == "ShapeRenderer") {if (reg.has<esengine::ecs::ShapeRenderer>(entity)) { reg.remove<esengine::ecs::ShapeRenderer>(entity); return true; }} else if (name == "SpineAnimation") {@@ -696,17 +649,14 @@ bool editor_hasComponent(Registry& reg, u32 e, const std::string& name) {if (name == "CircleCollider") return reg.has<esengine::ecs::CircleCollider>(entity);if (name == "CapsuleCollider") return reg.has<esengine::ecs::CapsuleCollider>(entity);if (name == "SegmentCollider") return reg.has<esengine::ecs::SegmentCollider>(entity);- if (name == "FanLayout") return reg.has<esengine::ecs::FanLayout>(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 == "Parent") return reg.has<esengine::ecs::Parent>(entity);if (name == "Children") return reg.has<esengine::ecs::Children>(entity);if (name == "Interactable") return reg.has<esengine::ecs::Interactable>(entity);- if (name == "LayoutGroup") return reg.has<esengine::ecs::LayoutGroup>(entity);if (name == "ParticleEmitter") return reg.has<esengine::ecs::ParticleEmitter>(entity);if (name == "RigidBody") return reg.has<esengine::ecs::RigidBody>(entity);- if (name == "Selectable") return reg.has<esengine::ecs::Selectable>(entity);if (name == "ShapeRenderer") return reg.has<esengine::ecs::ShapeRenderer>(entity);if (name == "SpineAnimation") return reg.has<esengine::ecs::SpineAnimation>(entity);if (name == "Sprite") return reg.has<esengine::ecs::Sprite>(entity);@@ -734,17 +684,14 @@ std::vector<std::string> editor_getComponents(Registry& reg, u32 e) {if (reg.has<esengine::ecs::CircleCollider>(entity)) result.push_back("CircleCollider");if (reg.has<esengine::ecs::CapsuleCollider>(entity)) result.push_back("CapsuleCollider");if (reg.has<esengine::ecs::SegmentCollider>(entity)) result.push_back("SegmentCollider");- if (reg.has<esengine::ecs::FanLayout>(entity)) result.push_back("FanLayout");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::Parent>(entity)) result.push_back("Parent");if (reg.has<esengine::ecs::Children>(entity)) result.push_back("Children");if (reg.has<esengine::ecs::Interactable>(entity)) result.push_back("Interactable");- if (reg.has<esengine::ecs::LayoutGroup>(entity)) result.push_back("LayoutGroup");if (reg.has<esengine::ecs::ParticleEmitter>(entity)) result.push_back("ParticleEmitter");if (reg.has<esengine::ecs::RigidBody>(entity)) result.push_back("RigidBody");- if (reg.has<esengine::ecs::Selectable>(entity)) result.push_back("Selectable");if (reg.has<esengine::ecs::ShapeRenderer>(entity)) result.push_back("ShapeRenderer");if (reg.has<esengine::ecs::SpineAnimation>(entity)) result.push_back("SpineAnimation");if (reg.has<esengine::ecs::Sprite>(entity)) result.push_back("Sprite");@@ -847,16 +794,6 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::selse if (field == "restitution") { c.restitution = value; }else { return false; }return true;- } else if (comp == "FanLayout") {- if (!reg.has<esengine::ecs::FanLayout>(entity)) return false;- auto& c = reg.get<esengine::ecs::FanLayout>(entity);- if (field == "radius") { c.radius = value; }- else if (field == "maxSpreadAngle") { c.maxSpreadAngle = value; }- else if (field == "maxCardAngle") { c.maxCardAngle = value; }- else if (field == "tiltFactor") { c.tiltFactor = value; }- else if (field == "cardSpacing") { c.cardSpacing = value; }- else { return false; }- return true;} else if (comp == "FlexContainer") {if (!reg.has<esengine::ecs::FlexContainer>(entity)) return false;auto& c = reg.get<esengine::ecs::FlexContainer>(entity);@@ -895,16 +832,6 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::selse if (field == "spacing.y") { c.spacing.y = value; }else { return false; }return true;- } else if (comp == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) return false;- auto& c = reg.get<esengine::ecs::LayoutGroup>(entity);- if (field == "spacing") { c.spacing = value; }- else if (field == "padding.left") { c.padding.left = value; }- else if (field == "padding.top") { c.padding.top = value; }- else if (field == "padding.right") { c.padding.right = value; }- else if (field == "padding.bottom") { c.padding.bottom = 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);@@ -1190,14 +1117,6 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::stelse if (field == "density") { return c.density; }else if (field == "friction") { return c.friction; }else if (field == "restitution") { return c.restitution; }- } else if (comp == "FanLayout") {- if (!reg.has<esengine::ecs::FanLayout>(entity)) return 0.0f;- const auto& c = reg.get<esengine::ecs::FanLayout>(entity);- if (field == "radius") { return c.radius; }- else if (field == "maxSpreadAngle") { return c.maxSpreadAngle; }- else if (field == "maxCardAngle") { return c.maxCardAngle; }- else if (field == "tiltFactor") { return c.tiltFactor; }- else if (field == "cardSpacing") { return c.cardSpacing; }} else if (comp == "FlexContainer") {if (!reg.has<esengine::ecs::FlexContainer>(entity)) return 0.0f;const auto& c = reg.get<esengine::ecs::FlexContainer>(entity);@@ -1230,14 +1149,6 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::stelse 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 == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) return 0.0f;- const auto& c = reg.get<esengine::ecs::LayoutGroup>(entity);- if (field == "spacing") { return c.spacing; }- else if (field == "padding.left") { return c.padding.left; }- 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 == "ParticleEmitter") {if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) return 0.0f;const auto& c = reg.get<esengine::ecs::ParticleEmitter>(entity);@@ -1471,12 +1382,6 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::strelse if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }else { return false; }return true;- } else if (comp == "FanLayout") {- if (!reg.has<esengine::ecs::FanLayout>(entity)) return false;- auto& c = reg.get<esengine::ecs::FanLayout>(entity);- if (field == "direction") { c.direction = static_cast<FanDirection>(value); }- else { return false; }- return true;} else if (comp == "FlexContainer") {if (!reg.has<esengine::ecs::FlexContainer>(entity)) return false;auto& c = reg.get<esengine::ecs::FlexContainer>(entity);@@ -1507,13 +1412,6 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::strif (field == "entity") { c.entity = static_cast<Entity>(value); }else { return false; }return true;- } else if (comp == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) return false;- auto& c = reg.get<esengine::ecs::LayoutGroup>(entity);- if (field == "direction") { c.direction = static_cast<LayoutDirection>(value); }- else if (field == "childAlignment") { c.childAlignment = static_cast<ChildAlignment>(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);@@ -1535,12 +1433,6 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::strif (field == "bodyType") { c.bodyType = static_cast<BodyType>(value); }else { return false; }return true;- } else if (comp == "Selectable") {- if (!reg.has<esengine::ecs::Selectable>(entity)) return false;- auto& c = reg.get<esengine::ecs::Selectable>(entity);- if (field == "group") { c.group = static_cast<i32>(value); }- else { return false; }- return true;} else if (comp == "ShapeRenderer") {if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);@@ -1623,10 +1515,6 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::striconst auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }- } else if (comp == "FanLayout") {- if (!reg.has<esengine::ecs::FanLayout>(entity)) return 0;- const auto& c = reg.get<esengine::ecs::FanLayout>(entity);- if (field == "direction") { return static_cast<i32>(c.direction); }} else if (comp == "FlexContainer") {if (!reg.has<esengine::ecs::FlexContainer>(entity)) return 0;const auto& c = reg.get<esengine::ecs::FlexContainer>(entity);@@ -1649,11 +1537,6 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::striif (!reg.has<esengine::ecs::Parent>(entity)) return 0;const auto& c = reg.get<esengine::ecs::Parent>(entity);if (field == "entity") { return static_cast<i32>(static_cast<u32>(c.entity)); }- } else if (comp == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) return 0;- const auto& c = reg.get<esengine::ecs::LayoutGroup>(entity);- if (field == "direction") { return static_cast<i32>(c.direction); }- else if (field == "childAlignment") { return static_cast<i32>(c.childAlignment); }} else if (comp == "ParticleEmitter") {if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) return 0;const auto& c = reg.get<esengine::ecs::ParticleEmitter>(entity);@@ -1671,10 +1554,6 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::striif (!reg.has<esengine::ecs::RigidBody>(entity)) return 0;const auto& c = reg.get<esengine::ecs::RigidBody>(entity);if (field == "bodyType") { return static_cast<i32>(c.bodyType); }- } else if (comp == "Selectable") {- if (!reg.has<esengine::ecs::Selectable>(entity)) return 0;- const auto& c = reg.get<esengine::ecs::Selectable>(entity);- if (field == "group") { return static_cast<i32>(c.group); }} else if (comp == "ShapeRenderer") {if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return 0;const auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);@@ -1758,12 +1637,6 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::stelse if (field == "raycastTarget") { c.raycastTarget = value; }else { return false; }return true;- } else if (comp == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) return false;- auto& c = reg.get<esengine::ecs::LayoutGroup>(entity);- if (field == "reverseOrder") { c.reverseOrder = 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);@@ -1781,12 +1654,6 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::stelse if (field == "enabled") { c.enabled = value; }else { return false; }return true;- } else if (comp == "Selectable") {- if (!reg.has<esengine::ecs::Selectable>(entity)) return false;- auto& c = reg.get<esengine::ecs::Selectable>(entity);- if (field == "selected") { c.selected = value; }- else { return false; }- return true;} else if (comp == "ShapeRenderer") {if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);@@ -1875,10 +1742,6 @@ bool editor_getBool(Registry& reg, u32 e, const std::string& comp, const std::stif (field == "enabled") { return c.enabled; }else if (field == "blockRaycast") { return c.blockRaycast; }else if (field == "raycastTarget") { return c.raycastTarget; }- } else if (comp == "LayoutGroup") {- if (!reg.has<esengine::ecs::LayoutGroup>(entity)) return false;- const auto& c = reg.get<esengine::ecs::LayoutGroup>(entity);- if (field == "reverseOrder") { return c.reverseOrder; }} else if (comp == "ParticleEmitter") {if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) return false;const auto& c = reg.get<esengine::ecs::ParticleEmitter>(entity);@@ -1892,10 +1755,6 @@ bool editor_getBool(Registry& reg, u32 e, const std::string& comp, const std::stif (field == "fixedRotation") { return c.fixedRotation; }else if (field == "bullet") { return c.bullet; }else if (field == "enabled") { return c.enabled; }- } else if (comp == "Selectable") {- if (!reg.has<esengine::ecs::Selectable>(entity)) return false;- const auto& c = reg.get<esengine::ecs::Selectable>(entity);- if (field == "selected") { return c.selected; }} else if (comp == "ShapeRenderer") {if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;const auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);diff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cppindex dcf544009..da06ef600 100644--- a/src/esengine/bindings/WebBindings.generated.cpp+++ b/src/esengine/bindings/WebBindings.generated.cpp@@ -15,17 +15,13 @@#include "../ecs/components/Camera.hpp"#include "../ecs/components/Canvas.hpp"#include "../ecs/components/Collider.hpp"-#include "../ecs/components/FanLayout.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/LayoutGroup.hpp"#include "../ecs/components/ParticleEmitter.hpp"#include "../ecs/components/RigidBody.hpp"-#include "../ecs/components/ScreenSpace.hpp"-#include "../ecs/components/Selectable.hpp"#include "../ecs/components/ShapeRenderer.hpp"#include "../ecs/components/SpineAnimation.hpp"#include "../ecs/components/Sprite.hpp"@@ -106,10 +102,6 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {.value("Shrink", esengine::ecs::CanvasScaleMode::Shrink).value("Match", esengine::ecs::CanvasScaleMode::Match);- enum_<esengine::ecs::FanDirection>("FanDirection")- .value("Up", esengine::ecs::FanDirection::Up)- .value("Down", esengine::ecs::FanDirection::Down);-enum_<esengine::ecs::FlexDirection>("FlexDirection").value("Row", esengine::ecs::FlexDirection::Row).value("Column", esengine::ecs::FlexDirection::Column)@@ -153,15 +145,6 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {.value("Vertical", esengine::ecs::GridDirection::Vertical).value("Horizontal", esengine::ecs::GridDirection::Horizontal);- enum_<esengine::ecs::LayoutDirection>("LayoutDirection")- .value("Horizontal", esengine::ecs::LayoutDirection::Horizontal)- .value("Vertical", esengine::ecs::LayoutDirection::Vertical);-- enum_<esengine::ecs::ChildAlignment>("ChildAlignment")- .value("Start", esengine::ecs::ChildAlignment::Start)- .value("Center", esengine::ecs::ChildAlignment::Center)- .value("End", esengine::ecs::ChildAlignment::End);-enum_<esengine::ecs::EmitterShape>("EmitterShape").value("Point", esengine::ecs::EmitterShape::Point).value("Circle", esengine::ecs::EmitterShape::Circle)@@ -301,37 +284,6 @@ CanvasJS canvasToJS(const esengine::ecs::Canvas& c) {return js;}-struct FanLayoutJS {- f32 radius;- f32 maxSpreadAngle;- f32 maxCardAngle;- f32 tiltFactor;- f32 cardSpacing;- i32 direction;-};--esengine::ecs::FanLayout fanlayoutFromJS(const FanLayoutJS& js) {- esengine::ecs::FanLayout c;- c.radius = js.radius;- c.maxSpreadAngle = js.maxSpreadAngle;- c.maxCardAngle = js.maxCardAngle;- c.tiltFactor = js.tiltFactor;- c.cardSpacing = js.cardSpacing;- c.direction = static_cast<FanDirection>(js.direction);- return c;-}--FanLayoutJS fanlayoutToJS(const esengine::ecs::FanLayout& c) {- FanLayoutJS js;- js.radius = c.radius;- js.maxSpreadAngle = c.maxSpreadAngle;- js.maxCardAngle = c.maxCardAngle;- js.tiltFactor = c.tiltFactor;- js.cardSpacing = c.cardSpacing;- js.direction = static_cast<i32>(c.direction);- return js;-}-struct FlexContainerJS {i32 direction;i32 wrap;@@ -474,34 +426,6 @@ ChildrenJS childrenToJS(const esengine::ecs::Children& c) {return js;}-struct LayoutGroupJS {- i32 direction;- f32 spacing;- Padding padding;- i32 childAlignment;- bool reverseOrder;-};--esengine::ecs::LayoutGroup layoutgroupFromJS(const LayoutGroupJS& js) {- esengine::ecs::LayoutGroup c;- c.direction = static_cast<LayoutDirection>(js.direction);- c.spacing = js.spacing;- c.padding = js.padding;- c.childAlignment = static_cast<ChildAlignment>(js.childAlignment);- c.reverseOrder = js.reverseOrder;- return c;-}--LayoutGroupJS layoutgroupToJS(const esengine::ecs::LayoutGroup& c) {- LayoutGroupJS js;- js.direction = static_cast<i32>(c.direction);- js.spacing = c.spacing;- js.padding = c.padding;- js.childAlignment = static_cast<i32>(c.childAlignment);- js.reverseOrder = c.reverseOrder;- return js;-}-struct ParticleEmitterJS {f32 rate;i32 burstCount;@@ -975,14 +899,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("categoryBits", &esengine::ecs::SegmentCollider::categoryBits).field("maskBits", &esengine::ecs::SegmentCollider::maskBits);- value_object<FanLayoutJS>("FanLayout")- .field("radius", &FanLayoutJS::radius)- .field("maxSpreadAngle", &FanLayoutJS::maxSpreadAngle)- .field("maxCardAngle", &FanLayoutJS::maxCardAngle)- .field("tiltFactor", &FanLayoutJS::tiltFactor)- .field("cardSpacing", &FanLayoutJS::cardSpacing)- .field("direction", &FanLayoutJS::direction);-value_object<FlexContainerJS>("FlexContainer").field("direction", &FlexContainerJS::direction).field("wrap", &FlexContainerJS::wrap)@@ -1023,13 +939,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("blockRaycast", &esengine::ecs::Interactable::blockRaycast).field("raycastTarget", &esengine::ecs::Interactable::raycastTarget);- value_object<LayoutGroupJS>("LayoutGroup")- .field("direction", &LayoutGroupJS::direction)- .field("spacing", &LayoutGroupJS::spacing)- .field("padding", &LayoutGroupJS::padding)- .field("childAlignment", &LayoutGroupJS::childAlignment)- .field("reverseOrder", &LayoutGroupJS::reverseOrder);-value_object<ParticleEmitterJS>("ParticleEmitter").field("rate", &ParticleEmitterJS::rate).field("burstCount", &ParticleEmitterJS::burstCount)@@ -1082,12 +991,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("bullet", &RigidBodyJS::bullet).field("enabled", &RigidBodyJS::enabled);- value_object<esengine::ecs::ScreenSpace>("ScreenSpace");-- value_object<esengine::ecs::Selectable>("Selectable")- .field("selected", &esengine::ecs::Selectable::selected)- .field("group", &esengine::ecs::Selectable::group);-value_object<esengine::ecs::ShapeRenderer>("ShapeRenderer").field("shapeType", &esengine::ecs::ShapeRenderer::shapeType).field("color", &esengine::ecs::ShapeRenderer::color)@@ -1372,26 +1275,6 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::SegmentCollider>(entity);}))- // FanLayout- .function("hasFanLayout", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::FanLayout>(static_cast<Entity>(e));- }))- .function("getFanLayout", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::FanLayout>(entity)) return FanLayoutJS{};- return fanlayoutToJS(r.get<esengine::ecs::FanLayout>(entity));- }))- .function("addFanLayout", optional_override([](Registry& r, u32 e, const FanLayoutJS& js) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::FanLayout>(entity, fanlayoutFromJS(js));- }))- .function("removeFanLayout", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::FanLayout>(entity)) return;- r.remove<esengine::ecs::FanLayout>(entity);- }))-// FlexContainer.function("hasFlexContainer", optional_override([](Registry& r, u32 e) {return r.has<esengine::ecs::FlexContainer>(static_cast<Entity>(e));@@ -1513,26 +1396,6 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::Interactable>(entity);}))- // LayoutGroup- .function("hasLayoutGroup", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::LayoutGroup>(static_cast<Entity>(e));- }))- .function("getLayoutGroup", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::LayoutGroup>(entity)) return LayoutGroupJS{};- return layoutgroupToJS(r.get<esengine::ecs::LayoutGroup>(entity));- }))- .function("addLayoutGroup", optional_override([](Registry& r, u32 e, const LayoutGroupJS& js) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::LayoutGroup>(entity, layoutgroupFromJS(js));- }))- .function("removeLayoutGroup", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::LayoutGroup>(entity)) return;- r.remove<esengine::ecs::LayoutGroup>(entity);- }))-// ParticleEmitter.function("hasParticleEmitter", optional_override([](Registry& r, u32 e) {return r.has<esengine::ecs::ParticleEmitter>(static_cast<Entity>(e));@@ -1573,48 +1436,6 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::RigidBody>(entity);}))- // ScreenSpace- .function("hasScreenSpace", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::ScreenSpace>(static_cast<Entity>(e));- }))- .function("getScreenSpace", optional_override([](Registry& r, u32 e) -> esengine::ecs::ScreenSpace& {- auto entity = static_cast<Entity>(e);- static esengine::ecs::ScreenSpace s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::ScreenSpace>(entity)) return s_dummy;- return r.get<esengine::ecs::ScreenSpace>(entity);- }), allow_raw_pointers())- .function("addScreenSpace", optional_override([](Registry& r, u32 e, const esengine::ecs::ScreenSpace& c) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::ScreenSpace>(entity, c);- }))- .function("removeScreenSpace", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::ScreenSpace>(entity)) return;- r.remove<esengine::ecs::ScreenSpace>(entity);- }))-- // Selectable- .function("hasSelectable", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Selectable>(static_cast<Entity>(e));- }))- .function("getSelectable", optional_override([](Registry& r, u32 e) -> esengine::ecs::Selectable& {- auto entity = static_cast<Entity>(e);- static esengine::ecs::Selectable s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::Selectable>(entity)) return s_dummy;- return r.get<esengine::ecs::Selectable>(entity);- }), allow_raw_pointers())- .function("addSelectable", optional_override([](Registry& r, u32 e, const esengine::ecs::Selectable& c) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Selectable>(entity, c);- }))- .function("removeSelectable", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Selectable>(entity)) return;- r.remove<esengine::ecs::Selectable>(entity);- }))-// ShapeRenderer.function("hasShapeRenderer", optional_override([](Registry& r, u32 e) {return r.has<esengine::ecs::ShapeRenderer>(static_cast<Entity>(e));diff --git a/src/esengine/ecs/UILayoutSystem.cpp b/src/esengine/ecs/UILayoutSystem.cppindex 9cd82b662..b2d175d1f 100644--- a/src/esengine/ecs/UILayoutSystem.cpp+++ b/src/esengine/ecs/UILayoutSystem.cpp@@ -6,9 +6,7 @@#include "components/Canvas.hpp"#include "components/FlexContainer.hpp"#include "components/FlexItem.hpp"-#include "components/LayoutGroup.hpp"#include "components/GridLayout.hpp"-#include "components/FanLayout.hpp"#include <yoga/Yoga.h>#include <algorithm>@@ -88,12 +86,6 @@ void setLayoutPosition(Transform& t, UIRect* rect, f32 x, f32 y) {}}-void setLayoutRotation(Transform& t, UIRect* rect, f32 rot) {- if (rect && (rect->anim_override_ & UIRect::ANIM_ROT_Z)) return;- f32 halfRad = rot / 2.0f;- t.rotation = glm::quat(std::cos(halfRad), 0.0f, 0.0f, std::sin(halfRad));-}-void writePosition(Registry& registry,const UITree::Node& node,@@ -326,7 +318,7 @@ void resolveFlexChildren(}}- if (registry.has<FlexContainer>(info.entity) || registry.has<LayoutGroup>(info.entity)) {+ if (registry.has<FlexContainer>(info.entity)) {tree.nodes_[info.tree_index].flags |= LAYOUT_DIRTY;} else {tree.nodes_[info.tree_index].flags &= ~LAYOUT_DIRTY;@@ -336,97 +328,6 @@ void resolveFlexChildren(YGNodeFreeRecursive(root);}-void resolveLayoutGroupChildren(- Registry& registry,- UITree& tree,- i32 containerIndex,- const LayoutRect& cameraRect-) {- Entity containerEntity = tree.nodes_[containerIndex].entity;- auto& group = registry.get<LayoutGroup>(containerEntity);- auto& parentRect = registry.get<UIRect>(containerEntity);-- f32 pw = parentRect.computed_size_.x;- f32 ph = parentRect.computed_size_.y;- f32 pivotX = parentRect.pivot.x;- f32 pivotY = parentRect.pivot.y;-- f32 padLeft = group.padding.left;- f32 padTop = group.padding.top;- f32 padRight = group.padding.right;- f32 padBottom = group.padding.bottom;-- bool isHorizontal = (group.direction == LayoutDirection::Horizontal);-- struct ChildInfo {- i32 tree_index;- Entity entity;- f32 w;- f32 h;- };-- std::vector<ChildInfo> children;- for (i32 j = containerIndex + 1; j < static_cast<i32>(tree.nodes_.size()); j++) {- if (tree.nodes_[j].parent != containerEntity) continue;- if (tree.nodes_[j].depth != tree.nodes_[containerIndex].depth + 1) continue;-- Entity childEntity = tree.nodes_[j].entity;- auto* childRect = registry.tryGet<UIRect>(childEntity);- if (!childRect || !registry.has<Transform>(childEntity)) continue;-- f32 cw = childRect->computed_size_.x > 0.0f ? childRect->computed_size_.x : childRect->size.x;- f32 ch = childRect->computed_size_.y > 0.0f ? childRect->computed_size_.y : childRect->size.y;- children.push_back({j, childEntity, cw, ch});- }-- if (children.empty()) return;-- if (group.reverseOrder) {- std::reverse(children.begin(), children.end());- }-- f32 cursor = 0.0f;- for (usize i = 0; i < children.size(); i++) {- auto& child = children[i];- auto& childRect = registry.get<UIRect>(child.entity);- f32 cpx = childRect.pivot.x;- f32 cpy = childRect.pivot.y;-- f32 localX, localY;-- if (isHorizontal) {- localX = -pivotX * pw + padLeft + cursor + cpx * child.w;- if (group.childAlignment == ChildAlignment::Start) {- localY = (1.0f - pivotY) * ph - padTop - (1.0f - cpy) * child.h;- } else if (group.childAlignment == ChildAlignment::End) {- localY = -pivotY * ph + padBottom + cpy * child.h;- } else {- localY = (0.5f - pivotY) * ph + (padBottom - padTop) * 0.5f + (cpy - 0.5f) * child.h;- }- cursor += child.w;- if (i < children.size() - 1) cursor += group.spacing;- } else {- if (group.childAlignment == ChildAlignment::Start) {- localX = -pivotX * pw + padLeft + cpx * child.w;- } else if (group.childAlignment == ChildAlignment::End) {- localX = (1.0f - pivotX) * pw - padRight - (1.0f - cpx) * child.w;- } else {- localX = (0.5f - pivotX) * pw + (padLeft - padRight) * 0.5f + (cpx - 0.5f) * child.w;- }- localY = (1.0f - pivotY) * ph - padTop - cursor - (1.0f - cpy) * child.h;- cursor += child.h;- if (i < children.size() - 1) cursor += group.spacing;- }-- auto* transform = registry.tryGet<Transform>(child.entity);- if (transform) {- setLayoutPosition(*transform, registry.tryGet<UIRect>(child.entity), localX, localY);- }-- tree.nodes_[child.tree_index].flags &= ~LAYOUT_DIRTY;- }-}-void resolveGridLayoutChildren(Registry& registry,UITree& tree,@@ -475,69 +376,6 @@ void resolveGridLayoutChildren(}}-void resolveFanLayoutChildren(- Registry& registry,- UITree& tree,- i32 containerIndex,- const LayoutRect& cameraRect-) {- (void)cameraRect;- Entity containerEntity = tree.nodes_[containerIndex].entity;- auto& fan = registry.get<FanLayout>(containerEntity);-- struct ChildInfo {- i32 tree_index;- Entity entity;- };-- std::vector<ChildInfo> children;- for (i32 j = containerIndex + 1; j < static_cast<i32>(tree.nodes_.size()); j++) {- if (tree.nodes_[j].parent != containerEntity) continue;- if (tree.nodes_[j].depth != tree.nodes_[containerIndex].depth + 1) continue;-- Entity childEntity = tree.nodes_[j].entity;- if (registry.has<Transform>(childEntity)) {- children.push_back({j, childEntity});- }- }-- i32 n = static_cast<i32>(children.size());- if (n == 0) return;-- f32 spreadAngle = std::min(fan.maxSpreadAngle, (n - 1) * fan.maxCardAngle);- f32 dirSign = (fan.direction == FanDirection::Down) ? -1.0f : 1.0f;- constexpr f32 DEG2RAD = 3.14159265358979f / 180.0f;- bool useFixedSpacing = (fan.cardSpacing > 0.0f && n > 1);-- for (i32 i = 0; i < n; i++) {- f32 t = (n == 1) ? 0.0f : (static_cast<f32>(i) / (n - 1) - 0.5f);- f32 angle = spreadAngle * t * DEG2RAD;-- f32 x, y;- if (useFixedSpacing) {- x = (static_cast<f32>(i) - (n - 1) * 0.5f) * fan.cardSpacing;- y = fan.radius * (1.0f - std::cos(angle)) * dirSign;- } else {- x = fan.radius * std::sin(angle);- y = fan.radius * (1.0f - std::cos(angle)) * dirSign;- }- f32 rot = angle * fan.tiltFactor * dirSign;-- Entity childEntity = children[i].entity;- auto& transform = registry.get<Transform>(childEntity);- auto* childRect = registry.tryGet<UIRect>(childEntity);-- setLayoutPosition(transform, childRect, x, -y);- setLayoutRotation(transform, childRect, rot);-- if (childRect) {- childRect->computed_size_ = childRect->size;- }-- tree.nodes_[children[i].tree_index].flags &= ~LAYOUT_DIRTY;- }-}-void unifiedLayoutPass(Registry& registry, UITree& tree, const LayoutRect& cameraRect) {for (i32 i = 0; i < static_cast<i32>(tree.nodes_.size()); ) {auto& node = tree.nodes_[i];@@ -550,9 +388,7 @@ void unifiedLayoutPass(Registry& registry, UITree& tree, const LayoutRect& camerif (node.flags & LAYOUT_DIRTY) {bool parentManaged = node.parent != INVALID_ENTITY && (registry.has<FlexContainer>(node.parent) ||- registry.has<LayoutGroup>(node.parent) ||- registry.has<GridLayout>(node.parent) ||- registry.has<FanLayout>(node.parent)+ registry.has<GridLayout>(node.parent));if (!parentManaged) {@@ -561,12 +397,8 @@ void unifiedLayoutPass(Registry& registry, UITree& tree, const LayoutRect& camerif (registry.has<FlexContainer>(node.entity)) {resolveFlexChildren(registry, tree, i, cameraRect);- } else if (registry.has<LayoutGroup>(node.entity)) {- resolveLayoutGroupChildren(registry, tree, i, cameraRect);} else if (registry.has<GridLayout>(node.entity)) {resolveGridLayoutChildren(registry, tree, i, cameraRect);- } else if (registry.has<FanLayout>(node.entity)) {- resolveFanLayoutChildren(registry, tree, i, cameraRect);}}diff --git a/src/esengine/ecs/components/FanLayout.hpp b/src/esengine/ecs/components/FanLayout.hppdeleted file mode 100644index 733148118..000000000--- a/src/esengine/ecs/components/FanLayout.hpp+++ /dev/null@@ -1,36 +0,0 @@-#pragma once--#include "../../core/Types.hpp"-#include "../../core/Reflection.hpp"-#include "../../math/Math.hpp"--namespace esengine::ecs {--ES_ENUM()-enum class FanDirection : u8 {- Up = 0,- Down = 1,-};--ES_COMPONENT()-struct FanLayout {- ES_PROPERTY()- f32 radius{600.0f};-- ES_PROPERTY()- f32 maxSpreadAngle{30.0f};-- ES_PROPERTY()- f32 maxCardAngle{8.0f};-- ES_PROPERTY()- f32 tiltFactor{1.0f};-- ES_PROPERTY()- f32 cardSpacing{0.0f}; // 0=auto (arc-based), >0=fixed center-to-center distance-- ES_PROPERTY()- FanDirection direction{FanDirection::Up};-};--} // namespace esengine::ecsdiff --git a/src/esengine/ecs/components/LayoutGroup.hpp b/src/esengine/ecs/components/LayoutGroup.hppdeleted file mode 100644index 2c3861fd9..000000000--- a/src/esengine/ecs/components/LayoutGroup.hpp+++ /dev/null@@ -1,40 +0,0 @@-#pragma once--#include "../../core/Types.hpp"-#include "../../core/UITypes.hpp"-#include "../../core/Reflection.hpp"--namespace esengine::ecs {--ES_ENUM()-enum class LayoutDirection : u8 {- Horizontal,- Vertical-};--ES_ENUM()-enum class ChildAlignment : u8 {- Start,- Center,- End-};--ES_COMPONENT()-struct LayoutGroup {- ES_PROPERTY()- LayoutDirection direction{LayoutDirection::Horizontal};-- ES_PROPERTY()- f32 spacing{0.0f};-- ES_PROPERTY()- Padding padding{};-- ES_PROPERTY()- ChildAlignment childAlignment{ChildAlignment::Start};-- ES_PROPERTY()- bool reverseOrder{false};-};--} // namespace esengine::ecsdiff --git a/src/esengine/ecs/components/ScreenSpace.hpp b/src/esengine/ecs/components/ScreenSpace.hppdeleted file mode 100644index 584eb85a7..000000000--- a/src/esengine/ecs/components/ScreenSpace.hpp+++ /dev/null@@ -1,11 +0,0 @@-#pragma once--#include "../../core/Types.hpp"-#include "../../core/Reflection.hpp"--namespace esengine::ecs {--ES_COMPONENT()-struct ScreenSpace {};--} // namespace esengine::ecsdiff --git a/src/esengine/ecs/components/Selectable.hpp b/src/esengine/ecs/components/Selectable.hppdeleted file mode 100644index f305f42d9..000000000--- a/src/esengine/ecs/components/Selectable.hpp+++ /dev/null@@ -1,17 +0,0 @@-#pragma once--#include "../../core/Types.hpp"-#include "../../core/Reflection.hpp"--namespace esengine::ecs {--ES_COMPONENT()-struct Selectable {- ES_PROPERTY()- bool selected{false};-- ES_PROPERTY()- i32 group{0};-};--} // namespace esengine::ecs