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: remove App class, fix TilemapSystem ownership, clean WebPlatform
esenginee2ec511cceab
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 73295b532..4e273168d 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -37,7 +37,6 @@ set(ESENGINE_SOURCESsrc/esengine/core/Engine.cppsrc/esengine/core/EstellaContext.cppsrc/esengine/core/Log.cpp- src/esengine/app/App.cppsrc/esengine/resource/ResourceManager.cppsrc/esengine/resource/ShaderParser.cppsrc/esengine/renderer/RenderContext.cpp@@ -142,7 +141,6 @@ set(ESENGINE_HEADERSsrc/esengine/renderer/Buffer.hppsrc/esengine/renderer/Texture.hppsrc/esengine/renderer/Framebuffer.hpp- src/esengine/renderer/RenderCommand.hppsrc/esengine/renderer/RenderStage.hppsrc/esengine/renderer/RenderItem.hppsrc/esengine/renderer/RenderTarget.hppdiff --git a/sdk/src/wasm.generated.ts b/sdk/src/wasm.generated.tsindex 2789148b3..7609479d8 100644--- a/sdk/src/wasm.generated.ts+++ b/sdk/src/wasm.generated.ts@@ -22,48 +22,23 @@ export interface VectorEntity {// Enums-export enum AlignSelf {- Auto = 0,- Start = 1,- Center = 2,- End = 3,- Stretch = 4,-}--export enum EmitterShape {- Point = 0,- Circle = 1,- Rectangle = 2,- Cone = 3,-}--export enum SimulationSpace {- World = 0,- Local = 1,-}--export enum UIVisualType {- None = 0,- SolidColor = 1,- Image = 2,- NineSlice = 3,-}--export enum BodyType {- Static = 0,- Kinematic = 1,- Dynamic = 2,-}-export enum TextAlign {Left = 0,Center = 1,Right = 2,}-export enum MaskMode {- Scissor = 0,- Stencil = 1,+export enum ProjectionType {+ Perspective = 0,+ Orthographic = 1,+}++export enum CanvasScaleMode {+ FixedWidth = 0,+ FixedHeight = 1,+ Expand = 2,+ Shrink = 3,+ Match = 4,}export enum FlexDirection {@@ -103,6 +78,14 @@ export enum AlignContent {SpaceAround = 5,}+export enum AlignSelf {+ Auto = 0,+ Start = 1,+ Center = 2,+ End = 3,+ Stretch = 4,+}+export enum LayoutDirection {Horizontal = 0,Vertical = 1,@@ -114,43 +97,71 @@ export enum ChildAlignment {End = 2,}-export enum CanvasScaleMode {- FixedWidth = 0,- FixedHeight = 1,- Expand = 2,- Shrink = 3,- Match = 4,+export enum EmitterShape {+ Point = 0,+ Circle = 1,+ Rectangle = 2,+ Cone = 3,}-export enum ProjectionType {- Perspective = 0,- Orthographic = 1,+export enum SimulationSpace {+ World = 0,+ Local = 1,+}++export enum BodyType {+ Static = 0,+ Kinematic = 1,+ Dynamic = 2,+}++export enum MaskMode {+ Scissor = 0,+ Stencil = 1,+}++export enum UIVisualType {+ None = 0,+ SolidColor = 1,+ Image = 2,+ NineSlice = 3,}// Components-export interface UIRect {- anchorMin: Vec2;- anchorMax: Vec2;- offsetMin: Vec2;- offsetMax: Vec2;- size: Vec2;- pivot: Vec2;+export interface BitmapText {+ text: string;+ color: Vec4;+ fontSize: number;+ align: number;+ spacing: number;+ layer: number;+ font: number;+ enabled: boolean;}-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 Camera {+ projectionType: number;+ fov: number;+ orthoSize: number;+ nearPlane: number;+ farPlane: number;+ aspectRatio: number;+ isActive: boolean;+ priority: number;+ viewportX: number;+ viewportY: number;+ viewportW: number;+ viewportH: number;+ clearFlags: number;+}++export interface Canvas {+ designResolution: UVec2;+ pixelsPerUnit: number;+ scaleMode: number;+ matchWidthOrHeight: number;+ backgroundColor: Vec4;}export interface BoxCollider {@@ -211,6 +222,60 @@ export interface FanLayout {direction: number;}+export interface FlexContainer {+ direction: number;+ wrap: number;+ justifyContent: number;+ alignItems: number;+ alignContent: number;+ gap: Vec2;+ 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 Parent {+ entity: number;+}++export interface Children {+ entities: VectorEntity;+}++export interface Interactable {+ enabled: boolean;+ blockRaycast: boolean;+ raycastTarget: boolean;+}++export interface LayoutGroup {+ direction: number;+ spacing: number;+ padding: Padding;+ childAlignment: number;+ reverseOrder: boolean;+}+export interface ParticleEmitter {rate: number;burstCount: number;@@ -255,36 +320,31 @@ export interface ParticleEmitter {enabled: boolean;}-export interface Transform {- position: Vec3;- rotation: Quat;- scale: Vec3;- worldPosition: Vec3;- worldRotation: Quat;- worldScale: Vec3;+export interface RigidBody {+ bodyType: number;+ gravityScale: number;+ linearDamping: number;+ angularDamping: number;+ fixedRotation: boolean;+ bullet: boolean;+ enabled: boolean;}-export interface UIRenderer {- visualType: number;- texture: number;- color: Vec4;- uvOffset: Vec2;- uvScale: Vec2;- sliceBorder: Vec4;- material: number;- enabled: boolean;+export interface ScreenSpace {}-export interface GridLayout {- direction: number;- crossAxisCount: number;- itemSize: Vec2;- spacing: Vec2;+export interface Selectable {+ selected: boolean;+ group: number;}-export interface Velocity {- linear: Vec3;- angular: Vec3;+export interface ShapeRenderer {+ shapeType: number;+ color: Vec4;+ size: Vec2;+ cornerRadius: number;+ layer: number;+ enabled: boolean;}export interface SpineAnimation {@@ -304,126 +364,66 @@ export interface SpineAnimation {enabled: boolean;}-export interface Interactable {+export interface Sprite {+ texture: number;+ color: Vec4;+ size: Vec2;+ pivot: Vec2;+ uvOffset: Vec2;+ uvScale: Vec2;+ layer: number;+ flipX: boolean;+ flipY: boolean;+ tileSize: Vec2;+ tileSpacing: Vec2;+ material: number;enabled: boolean;- blockRaycast: boolean;- raycastTarget: boolean;}-export interface UIInteraction {- hovered: boolean;+export interface Transform {+ position: Vec3;+ rotation: Quat;+ scale: Vec3;+ worldPosition: Vec3;+ worldRotation: Quat;+ worldScale: Vec3;+}++export interface UIInteraction {+ hovered: boolean;pressed: boolean;justPressed: boolean;justReleased: boolean;}-export interface RigidBody {- bodyType: number;- gravityScale: number;- linearDamping: number;- angularDamping: number;- fixedRotation: boolean;- bullet: boolean;+export interface UIMask {enabled: boolean;+ mode: number;}-export interface BitmapText {- text: string;- color: Vec4;- fontSize: number;- align: number;- spacing: number;- layer: number;- font: number;- enabled: boolean;+export interface UIRect {+ anchorMin: Vec2;+ anchorMax: Vec2;+ offsetMin: Vec2;+ offsetMax: Vec2;+ size: Vec2;+ pivot: Vec2;}-export interface Sprite {+export interface UIRenderer {+ visualType: number;texture: number;color: Vec4;- size: Vec2;- pivot: Vec2;uvOffset: Vec2;uvScale: Vec2;- layer: number;- flipX: boolean;- flipY: boolean;- tileSize: Vec2;- tileSpacing: Vec2;+ sliceBorder: Vec4;material: number;enabled: boolean;}-export interface UIMask {- enabled: boolean;- mode: number;-}--export interface FlexContainer {- direction: number;- wrap: number;- justifyContent: number;- alignItems: number;- alignContent: number;- gap: Vec2;- padding: Padding;-}--export interface Parent {- entity: number;-}--export interface Children {- entities: VectorEntity;-}--export interface ShapeRenderer {- shapeType: number;- color: Vec4;- size: Vec2;- cornerRadius: number;- layer: number;- enabled: boolean;-}--export interface Selectable {- selected: boolean;- group: number;-}--export interface LayoutGroup {- direction: number;- spacing: number;- padding: Padding;- childAlignment: number;- reverseOrder: boolean;-}--export interface ScreenSpace {-}--export interface Canvas {- designResolution: UVec2;- pixelsPerUnit: number;- scaleMode: number;- matchWidthOrHeight: number;- backgroundColor: Vec4;-}--export interface Camera {- projectionType: number;- fov: number;- orthoSize: number;- nearPlane: number;- farPlane: number;- aspectRatio: number;- isActive: boolean;- priority: number;- viewportX: number;- viewportY: number;- viewportW: number;- viewportH: number;- clearFlags: number;+export interface Velocity {+ linear: Vec3;+ angular: Vec3;}// Registry@@ -433,14 +433,18 @@ export interface Registry {valid(entity: Entity): boolean;entityCount(): number;- hasUIRect(entity: Entity): boolean;- getUIRect(entity: Entity): UIRect;- addUIRect(entity: Entity, component: UIRect): void;- removeUIRect(entity: Entity): void;- hasFlexItem(entity: Entity): boolean;- getFlexItem(entity: Entity): FlexItem;- addFlexItem(entity: Entity, component: FlexItem): void;- removeFlexItem(entity: Entity): void;+ hasBitmapText(entity: Entity): boolean;+ getBitmapText(entity: Entity): BitmapText;+ addBitmapText(entity: Entity, component: BitmapText): void;+ removeBitmapText(entity: Entity): void;+ hasCamera(entity: Entity): boolean;+ getCamera(entity: Entity): Camera;+ addCamera(entity: Entity, component: Camera): void;+ removeCamera(entity: Entity): void;+ hasCanvas(entity: Entity): boolean;+ getCanvas(entity: Entity): Canvas;+ addCanvas(entity: Entity, component: Canvas): void;+ removeCanvas(entity: Entity): void;hasBoxCollider(entity: Entity): boolean;getBoxCollider(entity: Entity): BoxCollider;addBoxCollider(entity: Entity, component: BoxCollider): void;@@ -461,58 +465,18 @@ export interface Registry {getFanLayout(entity: Entity): FanLayout;addFanLayout(entity: Entity, component: FanLayout): void;removeFanLayout(entity: Entity): void;- hasParticleEmitter(entity: Entity): boolean;- getParticleEmitter(entity: Entity): ParticleEmitter;- addParticleEmitter(entity: Entity, component: ParticleEmitter): void;- removeParticleEmitter(entity: Entity): void;- hasTransform(entity: Entity): boolean;- getTransform(entity: Entity): Transform;- addTransform(entity: Entity, component: Transform): void;- removeTransform(entity: Entity): void;- hasUIRenderer(entity: Entity): boolean;- getUIRenderer(entity: Entity): UIRenderer;- addUIRenderer(entity: Entity, component: UIRenderer): void;- removeUIRenderer(entity: Entity): void;- hasGridLayout(entity: Entity): boolean;- getGridLayout(entity: Entity): GridLayout;- addGridLayout(entity: Entity, component: GridLayout): void;- removeGridLayout(entity: Entity): void;- hasVelocity(entity: Entity): boolean;- getVelocity(entity: Entity): Velocity;- addVelocity(entity: Entity, component: Velocity): void;- removeVelocity(entity: Entity): void;- hasSpineAnimation(entity: Entity): boolean;- getSpineAnimation(entity: Entity): SpineAnimation;- addSpineAnimation(entity: Entity, component: SpineAnimation): void;- removeSpineAnimation(entity: Entity): void;- hasInteractable(entity: Entity): boolean;- getInteractable(entity: Entity): Interactable;- addInteractable(entity: Entity, component: Interactable): void;- removeInteractable(entity: Entity): void;- hasUIInteraction(entity: Entity): boolean;- getUIInteraction(entity: Entity): UIInteraction;- addUIInteraction(entity: Entity, component: UIInteraction): void;- removeUIInteraction(entity: Entity): void;- hasRigidBody(entity: Entity): boolean;- getRigidBody(entity: Entity): RigidBody;- addRigidBody(entity: Entity, component: RigidBody): void;- removeRigidBody(entity: Entity): void;- hasBitmapText(entity: Entity): boolean;- getBitmapText(entity: Entity): BitmapText;- addBitmapText(entity: Entity, component: BitmapText): void;- removeBitmapText(entity: Entity): void;- hasSprite(entity: Entity): boolean;- getSprite(entity: Entity): Sprite;- addSprite(entity: Entity, component: Sprite): void;- removeSprite(entity: Entity): void;- hasUIMask(entity: Entity): boolean;- getUIMask(entity: Entity): UIMask;- addUIMask(entity: Entity, component: UIMask): void;- removeUIMask(entity: Entity): void;hasFlexContainer(entity: Entity): boolean;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;hasParent(entity: Entity): boolean;getParent(entity: Entity): Parent;addParent(entity: Entity, component: Parent): void;@@ -521,30 +485,66 @@ export interface Registry {getChildren(entity: Entity): Children;addChildren(entity: Entity, component: Children): void;removeChildren(entity: Entity): void;- hasShapeRenderer(entity: Entity): boolean;- getShapeRenderer(entity: Entity): ShapeRenderer;- addShapeRenderer(entity: Entity, component: ShapeRenderer): void;- removeShapeRenderer(entity: Entity): void;- hasSelectable(entity: Entity): boolean;- getSelectable(entity: Entity): Selectable;- addSelectable(entity: Entity, component: Selectable): void;- removeSelectable(entity: Entity): void;+ hasInteractable(entity: Entity): boolean;+ 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;+ removeParticleEmitter(entity: Entity): void;+ hasRigidBody(entity: Entity): boolean;+ 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;- hasCanvas(entity: Entity): boolean;- getCanvas(entity: Entity): Canvas;- addCanvas(entity: Entity, component: Canvas): void;- removeCanvas(entity: Entity): void;- hasCamera(entity: Entity): boolean;- getCamera(entity: Entity): Camera;- addCamera(entity: Entity, component: Camera): void;- removeCamera(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;+ removeShapeRenderer(entity: Entity): void;+ hasSpineAnimation(entity: Entity): boolean;+ getSpineAnimation(entity: Entity): SpineAnimation;+ addSpineAnimation(entity: Entity, component: SpineAnimation): void;+ removeSpineAnimation(entity: Entity): void;+ hasSprite(entity: Entity): boolean;+ getSprite(entity: Entity): Sprite;+ addSprite(entity: Entity, component: Sprite): void;+ removeSprite(entity: Entity): void;+ hasTransform(entity: Entity): boolean;+ getTransform(entity: Entity): Transform;+ addTransform(entity: Entity, component: Transform): void;+ removeTransform(entity: Entity): void;+ hasUIInteraction(entity: Entity): boolean;+ getUIInteraction(entity: Entity): UIInteraction;+ addUIInteraction(entity: Entity, component: UIInteraction): void;+ removeUIInteraction(entity: Entity): void;+ hasUIMask(entity: Entity): boolean;+ getUIMask(entity: Entity): UIMask;+ addUIMask(entity: Entity, component: UIMask): void;+ removeUIMask(entity: Entity): void;+ hasUIRect(entity: Entity): boolean;+ getUIRect(entity: Entity): UIRect;+ addUIRect(entity: Entity, component: UIRect): void;+ removeUIRect(entity: Entity): void;+ hasUIRenderer(entity: Entity): boolean;+ getUIRenderer(entity: Entity): UIRenderer;+ addUIRenderer(entity: Entity, component: UIRenderer): void;+ removeUIRenderer(entity: Entity): void;+ hasVelocity(entity: Entity): boolean;+ getVelocity(entity: Entity): Velocity;+ addVelocity(entity: Entity, component: Velocity): void;+ removeVelocity(entity: Entity): void;// Hierarchy UtilitiessetParent(child: Entity, parent: Entity): void;@@ -553,32 +553,32 @@ export interface Registry {// Moduleexport interface ESEngineModule {Registry: new () => Registry;- UIRect: new () => UIRect;- FlexItem: new () => FlexItem;+ BitmapText: new () => BitmapText;+ Camera: new () => Camera;+ Canvas: new () => Canvas;BoxCollider: new () => BoxCollider;CircleCollider: new () => CircleCollider;CapsuleCollider: new () => CapsuleCollider;SegmentCollider: new () => SegmentCollider;FanLayout: new () => FanLayout;- ParticleEmitter: new () => ParticleEmitter;- Transform: new () => Transform;- UIRenderer: new () => UIRenderer;- GridLayout: new () => GridLayout;- Velocity: new () => Velocity;- SpineAnimation: new () => SpineAnimation;- Interactable: new () => Interactable;- UIInteraction: new () => UIInteraction;- RigidBody: new () => RigidBody;- BitmapText: new () => BitmapText;- Sprite: new () => Sprite;- UIMask: new () => UIMask;FlexContainer: new () => FlexContainer;+ FlexItem: new () => FlexItem;+ GridLayout: new () => GridLayout;Parent: new () => Parent;Children: new () => Children;- ShapeRenderer: new () => ShapeRenderer;- Selectable: new () => Selectable;+ Interactable: new () => Interactable;LayoutGroup: new () => LayoutGroup;+ ParticleEmitter: new () => ParticleEmitter;+ RigidBody: new () => RigidBody;ScreenSpace: new () => ScreenSpace;- Canvas: new () => Canvas;- Camera: new () => Camera;+ Selectable: new () => Selectable;+ ShapeRenderer: new () => ShapeRenderer;+ SpineAnimation: new () => SpineAnimation;+ Sprite: new () => Sprite;+ Transform: new () => Transform;+ UIInteraction: new () => UIInteraction;+ UIMask: new () => UIMask;+ UIRect: new () => UIRect;+ UIRenderer: new () => UIRenderer;+ Velocity: new () => Velocity;}diff --git a/src/esengine/ESEngine.hpp b/src/esengine/ESEngine.hppindex 1a82a15db..77df86d88 100644--- a/src/esengine/ESEngine.hpp+++ b/src/esengine/ESEngine.hpp@@ -21,9 +21,7 @@#include "core/Types.hpp"#include "core/Log.hpp"#include "core/Engine.hpp"--// App Framework-#include "app/App.hpp"+#include "core/EstellaContext.hpp"// Math#include "math/Math.hpp"@@ -63,41 +61,3 @@/** @brief Full version string */#define ESENGINE_VERSION_STRING "0.1.0"-// =============================================================================-// Entry Point Macro-// =============================================================================--/**- * @brief Entry point macro for App-based applications- *- * @param SetupFunc A function void(esengine::App&) that configures the App- *- * @code- * void setup(esengine::App& app) {- * app.setConfig({.title = "My Game", .width = 1280, .height = 720});- * app.addPlugin<MyPlugin>();- * app.addSystem(esengine::Schedule::Update, myUpdateSystem);- * }- * ES_APP_MAIN(setup)- * @endcode- */-#ifdef ES_PLATFORM_WEB- #include <emscripten.h>- #define ES_APP_MAIN(SetupFunc) \- extern "C" { \- EMSCRIPTEN_KEEPALIVE void es_app_init() { \- static esengine::App app; \- SetupFunc(app); \- app.run(); \- } \- }-#else- #define ES_APP_MAIN(SetupFunc) \- int main(int argc, char** argv) { \- (void)argc; (void)argv; \- esengine::App app; \- SetupFunc(app); \- app.run(); \- return 0; \- }-#endifdiff --git a/src/esengine/animation/animTargets.generated.hpp b/src/esengine/animation/animTargets.generated.hppindex 6ad014b3c..8fd2fb363 100644--- a/src/esengine/animation/animTargets.generated.hpp+++ b/src/esengine/animation/animTargets.generated.hpp@@ -2,12 +2,12 @@#include "../core/Types.hpp"#include "../ecs/Registry.hpp"-#include "../ecs/components/UIRect.hpp"-#include "../ecs/components/Transform.hpp"-#include "../ecs/components/UIRenderer.hpp"#include "../ecs/components/BitmapText.hpp"-#include "../ecs/components/Sprite.hpp"#include "../ecs/components/Camera.hpp"+#include "../ecs/components/Sprite.hpp"+#include "../ecs/components/Transform.hpp"+#include "../ecs/components/UIRect.hpp"+#include "../ecs/components/UIRenderer.hpp"#include "../ecs/components/UIRect.hpp"#include <glm/glm.hpp>@@ -16,49 +16,49 @@namespace esengine::animation {enum class AnimTargetComponent : u8 {- UIRect = 0,- Transform = 1,- UIRenderer = 2,- BitmapText = 3,- Sprite = 4,- Camera = 5,+ BitmapText = 0,+ Camera = 1,+ Sprite = 2,+ Transform = 3,+ UIRect = 4,+ UIRenderer = 5,Custom = 6,COUNT};enum class AnimTargetField : u8 {- UIRectAnchorMinX = 0,- UIRectAnchorMinY = 1,- UIRectAnchorMaxX = 2,- UIRectAnchorMaxY = 3,- UIRectOffsetMinX = 4,- UIRectOffsetMinY = 5,- UIRectOffsetMaxX = 6,- UIRectOffsetMaxY = 7,- UIRectPivotX = 8,- UIRectPivotY = 9,- TransformPositionX = 10,- TransformPositionY = 11,- TransformPositionZ = 12,- TransformRotationZ = 13,- TransformScaleX = 14,- TransformScaleY = 15,- TransformScaleZ = 16,- UIRendererColorR = 17,- UIRendererColorG = 18,- UIRendererColorB = 19,- UIRendererColorA = 20,- BitmapTextColorR = 21,- BitmapTextColorG = 22,- BitmapTextColorB = 23,- BitmapTextColorA = 24,- SpriteColorR = 25,- SpriteColorG = 26,- SpriteColorB = 27,- SpriteColorA = 28,- SpriteSizeX = 29,- SpriteSizeY = 30,- CameraOrthoSize = 31,+ BitmapTextColorR = 0,+ BitmapTextColorG = 1,+ BitmapTextColorB = 2,+ BitmapTextColorA = 3,+ CameraOrthoSize = 4,+ SpriteColorR = 5,+ SpriteColorG = 6,+ SpriteColorB = 7,+ SpriteColorA = 8,+ SpriteSizeX = 9,+ SpriteSizeY = 10,+ TransformPositionX = 11,+ TransformPositionY = 12,+ TransformPositionZ = 13,+ TransformRotationZ = 14,+ TransformScaleX = 15,+ TransformScaleY = 16,+ TransformScaleZ = 17,+ UIRectAnchorMinX = 18,+ UIRectAnchorMinY = 19,+ UIRectAnchorMaxX = 20,+ UIRectAnchorMaxY = 21,+ UIRectOffsetMinX = 22,+ UIRectOffsetMinY = 23,+ UIRectOffsetMaxX = 24,+ UIRectOffsetMaxY = 25,+ UIRectPivotX = 26,+ UIRectPivotY = 27,+ UIRendererColorR = 28,+ UIRendererColorG = 29,+ UIRendererColorB = 30,+ UIRendererColorA = 31,CustomField = 32,COUNT};@@ -68,54 +68,59 @@ inline void applyAnimatedValue(AnimTargetField field, f32 value){switch (field) {- case AnimTargetField::UIRectAnchorMinX:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->anchorMin.x = value;+ case AnimTargetField::BitmapTextColorR:+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {+ c->color.r = value;}break;- case AnimTargetField::UIRectAnchorMinY:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->anchorMin.y = value;+ case AnimTargetField::BitmapTextColorG:+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {+ c->color.g = value;}break;- case AnimTargetField::UIRectAnchorMaxX:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->anchorMax.x = value;+ case AnimTargetField::BitmapTextColorB:+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {+ c->color.b = value;}break;- case AnimTargetField::UIRectAnchorMaxY:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->anchorMax.y = value;+ case AnimTargetField::BitmapTextColorA:+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {+ c->color.a = value;}break;- case AnimTargetField::UIRectOffsetMinX:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->offsetMin.x = value;+ case AnimTargetField::CameraOrthoSize:+ if (auto* c = registry.tryGet<ecs::Camera>(entity)) {+ c->orthoSize = value;}break;- case AnimTargetField::UIRectOffsetMinY:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->offsetMin.y = value;+ case AnimTargetField::SpriteColorR:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {+ c->color.r = value;}break;- case AnimTargetField::UIRectOffsetMaxX:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->offsetMax.x = value;+ case AnimTargetField::SpriteColorG:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {+ c->color.g = value;}break;- case AnimTargetField::UIRectOffsetMaxY:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->offsetMax.y = value;+ case AnimTargetField::SpriteColorB:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {+ c->color.b = value;}break;- case AnimTargetField::UIRectPivotX:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->pivot.x = value;+ case AnimTargetField::SpriteColorA:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {+ c->color.a = value;}break;- case AnimTargetField::UIRectPivotY:- if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {- c->pivot.y = value;+ case AnimTargetField::SpriteSizeX:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {+ c->size.x = value;+ }+ break;+ case AnimTargetField::SpriteSizeY:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {+ c->size.y = value;}break;case AnimTargetField::TransformPositionX:@@ -159,79 +164,74 @@ inline void applyAnimatedValue(c->scale.z = value;}break;- case AnimTargetField::UIRendererColorR:- if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {- c->color.r = value;- }- break;- case AnimTargetField::UIRendererColorG:- if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {- c->color.g = value;+ case AnimTargetField::UIRectAnchorMinX:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->anchorMin.x = value;}break;- case AnimTargetField::UIRendererColorB:- if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {- c->color.b = value;+ case AnimTargetField::UIRectAnchorMinY:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->anchorMin.y = value;}break;- case AnimTargetField::UIRendererColorA:- if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {- c->color.a = value;+ case AnimTargetField::UIRectAnchorMaxX:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->anchorMax.x = value;}break;- case AnimTargetField::BitmapTextColorR:- if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {- c->color.r = value;+ case AnimTargetField::UIRectAnchorMaxY:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->anchorMax.y = value;}break;- case AnimTargetField::BitmapTextColorG:- if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {- c->color.g = value;+ case AnimTargetField::UIRectOffsetMinX:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->offsetMin.x = value;}break;- case AnimTargetField::BitmapTextColorB:- if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {- c->color.b = value;+ case AnimTargetField::UIRectOffsetMinY:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->offsetMin.y = value;}break;- case AnimTargetField::BitmapTextColorA:- if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {- c->color.a = value;+ case AnimTargetField::UIRectOffsetMaxX:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->offsetMax.x = value;}break;- case AnimTargetField::SpriteColorR:- if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {- c->color.r = value;+ case AnimTargetField::UIRectOffsetMaxY:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->offsetMax.y = value;}break;- case AnimTargetField::SpriteColorG:- if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {- c->color.g = value;+ case AnimTargetField::UIRectPivotX:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->pivot.x = value;}break;- case AnimTargetField::SpriteColorB:- if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {- c->color.b = value;+ case AnimTargetField::UIRectPivotY:+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {+ c->pivot.y = value;}break;- case AnimTargetField::SpriteColorA:- if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {- c->color.a = value;+ case AnimTargetField::UIRendererColorR:+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {+ c->color.r = value;}break;- case AnimTargetField::SpriteSizeX:- if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {- c->size.x = value;+ case AnimTargetField::UIRendererColorG:+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {+ c->color.g = value;}break;- case AnimTargetField::SpriteSizeY:- if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {- c->size.y = value;+ case AnimTargetField::UIRendererColorB:+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {+ c->color.b = value;}break;- case AnimTargetField::CameraOrthoSize:- if (auto* c = registry.tryGet<ecs::Camera>(entity)) {- c->orthoSize = value;+ case AnimTargetField::UIRendererColorA:+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {+ c->color.a = value;}break;case AnimTargetField::CustomField:diff --git a/src/esengine/app/App.cpp b/src/esengine/app/App.cppdeleted file mode 100644index 9782ca860..000000000--- a/src/esengine/app/App.cpp+++ /dev/null@@ -1,275 +0,0 @@-/**- * @file App.cpp- * @brief ECS-style application framework implementation- *- * @author ESEngine Team- * @date 2026- *- * @copyright Copyright (c) 2026 ESEngine Team- * Licensed under the MIT License.- */--#include "App.hpp"-#include "../core/Log.hpp"-#include "../platform/FileSystem.hpp"-#include "../ecs/components/Canvas.hpp"-#include "../renderer/GLDevice.hpp"-#include "../renderer/GfxDevice.hpp"--#include <glm/gtc/matrix_transform.hpp>--#ifdef ES_PLATFORM_WEB-#include <emscripten.h>-#include <emscripten/html5.h>-#include <emscripten/val.h>-#endif--namespace esengine {--// =============================================================================-// Constructor / Destructor-// =============================================================================--App::App() : App(AppConfig{}) {}--App::App(const AppConfig& config) : config_(config) {}--App::~App() {- if (initialized_) {- shutdown();- }-}--// =============================================================================-// Builder Methods-// =============================================================================--App& App::setConfig(const AppConfig& config) {- config_ = config;- return *this;-}--App& App::addPlugin(Unique<Plugin> plugin) {- plugins_.push_back(std::move(plugin));- return *this;-}--App& App::addSystem(Schedule schedule, SystemFn system, i32 priority) {- auto lambdaSys = makeUnique<LambdaSystem>(std::move(system));- lambdaSys->setPriority(priority);- system_groups_[static_cast<usize>(schedule)].addSystem(std::move(lambdaSys));- return *this;-}--App& App::addStartupSystem(SystemFn system) {- return addSystem(Schedule::Startup, std::move(system));-}--// =============================================================================-// Lifecycle-// =============================================================================--void App::init() {- if (initialized_) return;-- Log::init();- ES_LOG_INFO("App initializing...");-- FileSystem::init();-- platform_ = Platform::create();- if (!platform_->initialize(config_.width, config_.height)) {- ES_LOG_FATAL("Failed to initialize platform");- return;- }-- platform_->setTouchCallback([this](TouchType type, const TouchPoint& point) {- input_.onTouchEvent(type, point);- });-- platform_->setKeyCallback([this](KeyCode key, bool pressed) {- input_.onKeyEvent(key, pressed);- });-- platform_->setScrollCallback([this](f32 deltaX, f32 deltaY, f32 x, f32 y) {- input_.onScrollEvent(deltaX, deltaY);- (void)x; (void)y;- });-- platform_->setResizeCallback([this](u32 width, u32 height) {- config_.width = width;- config_.height = height;- if (renderer_) {- renderer_->setViewport(0, 0, width, height);- }- });-- input_.init();-- resourceManager_.init();-- gfxDevice_ = makeUnique<GLDevice>();-- renderContext_ = makeUnique<RenderContext>(*gfxDevice_);- renderContext_->init();-- renderer_ = makeUnique<Renderer>(*gfxDevice_, *renderContext_);- renderer_->setViewport(0, 0, config_.width, config_.height);-- services_.registerService<Platform>(platform_.get());- services_.registerService<ecs::Registry>(®istry_);- services_.registerService<resource::ResourceManager>(&resourceManager_);- services_.registerService<Input>(&input_);- services_.registerService<GfxDevice>(gfxDevice_.get());- services_.registerService<RenderContext>(renderContext_.get());- services_.registerService<Renderer>(renderer_.get());-- for (auto& plugin : plugins_) {- plugin->build(*this);- }-- for (auto& group : system_groups_) {- group.init(registry_);- }-- last_frame_time_ = platform_->getTime();- initialized_ = true;- ES_LOG_INFO("App initialized");-}--void App::shutdown() {- if (!initialized_) return;-- ES_LOG_INFO("App shutting down...");-- for (auto& group : system_groups_) {- group.shutdown(registry_);- }-- renderer_.reset();-- renderContext_->shutdown();- renderContext_.reset();-- gfxDevice_.reset();-- resourceManager_.shutdown();-- registry_.clear();-- input_.shutdown();-- platform_->shutdown();- platform_.reset();-- services_.clear();-- FileSystem::shutdown();-- initialized_ = false;- ES_LOG_INFO("App shutdown complete");- Log::shutdown();-}--void App::run() {- init();- running_ = true;--#ifdef ES_PLATFORM_WEB- emscripten_set_main_loop_arg(- [](void* arg) {- static_cast<App*>(arg)->runFrame();- },- this, 0, 1);-#else- while (running_) {- runFrame();- }- shutdown();-#endif-}--void App::quit() {- running_ = false;-#ifdef ES_PLATFORM_WEB- emscripten_cancel_main_loop();-#endif-}--void App::runFrame() {- f64 currentTime = platform_->getTime();- f32 dt = static_cast<f32>(currentTime - last_frame_time_);- last_frame_time_ = currentTime;-- if (dt > 0.1f) dt = 0.1f;-- time_.delta = dt;- time_.elapsed += dt;- time_.frameCount++;-- platform_->pollEvents();- input_.update();-- if (!startupRan_) {- runSystems(Schedule::Startup);-#ifdef ES_PLATFORM_WEB- runJSSystems(Schedule::Startup, dt);-#endif- startupRan_ = true;- }-- runSystems(Schedule::PreUpdate);--#ifdef ES_PLATFORM_WEB- runJSSystems(Schedule::Update, dt);-#endif-- runSystems(Schedule::Update);- runSystems(Schedule::PostUpdate);-- auto canvasView = registry_.view<ecs::Canvas>();- if (!canvasView.empty()) {- auto entity = *canvasView.begin();- auto& canvas = registry_.get<ecs::Canvas>(entity);- renderer_->setClearColor(canvas.backgroundColor);- }-- renderer_->beginFrame();- renderer_->clear();-- f32 w = static_cast<f32>(config_.width);- f32 h = static_cast<f32>(config_.height);- glm::mat4 projection = glm::ortho(0.0f, w, h, 0.0f, -1.0f, 1.0f);- renderer_->beginScene(projection);-- runSystems(Schedule::PreRender);- runSystems(Schedule::Render);- runSystems(Schedule::PostRender);-- renderer_->endScene();- renderer_->endFrame();-- platform_->swapBuffers();-}--void App::runSystems(Schedule schedule) {- World world{registry_, services_, time_.delta};- system_groups_[static_cast<usize>(schedule)].update(world);-}--#ifdef ES_PLATFORM_WEB-void* App::jsSystemsCallback_ = nullptr;--void App::setJSSystemsCallback(void* callback) {- jsSystemsCallback_ = callback;-}--void App::runJSSystems(Schedule schedule, f32 dt) {- if (jsSystemsCallback_) {- auto& callback = *static_cast<emscripten::val*>(jsSystemsCallback_);- callback(static_cast<int>(schedule), dt);- }-}-#endif--} // namespace esenginediff --git a/src/esengine/app/App.hpp b/src/esengine/app/App.hppdeleted file mode 100644index e44897848..000000000--- a/src/esengine/app/App.hpp+++ /dev/null@@ -1,177 +0,0 @@-/**- * @file App.hpp- * @brief ECS-style application framework- *- * @author ESEngine Team- * @date 2026- *- * @copyright Copyright (c) 2026 ESEngine Team- * Licensed under the MIT License.- */-#pragma once--#include "Schedule.hpp"-#include "../core/Types.hpp"-#include "../core/World.hpp"-#include "../core/ServiceRegistry.hpp"-#include "../ecs/Registry.hpp"-#include "../ecs/System.hpp"-#include "../platform/Platform.hpp"-#include "../platform/input/Input.hpp"-#include "../resource/ResourceManager.hpp"-#include "../renderer/GfxDevice.hpp"-#include "../renderer/RenderContext.hpp"-#include "../renderer/Renderer.hpp"--#include <functional>-#include <string>-#include <vector>--namespace esengine {--// =============================================================================-// Forward Declarations-// =============================================================================--class App;-class Plugin;--// =============================================================================-// Type Aliases-// =============================================================================--using SystemFn = std::function<void(World&)>;--// =============================================================================-// App Configuration-// =============================================================================--struct AppConfig {- std::string title = "ESEngine";- u32 width = 800;- u32 height = 600;- bool vsync = true;-};--// =============================================================================-// Resources-// =============================================================================--struct Time {- f32 delta = 0.0f;- f32 elapsed = 0.0f;- u64 frameCount = 0;-};--// =============================================================================-// Plugin Interface-// =============================================================================--class Plugin {-public:- virtual ~Plugin() = default;- virtual void build(App& app) = 0;-};--// =============================================================================-// App Class-// =============================================================================--class App {-public:- App();- explicit App(const AppConfig& config);- ~App();-- App(const App&) = delete;- App& operator=(const App&) = delete;-- // =========================================================================- // Builder Pattern- // =========================================================================-- App& setConfig(const AppConfig& config);- App& addPlugin(Unique<Plugin> plugin);-- template<typename T, typename... Args>- App& addPlugin(Args&&... args) {- return addPlugin(makeUnique<T>(std::forward<Args>(args)...));- }-- App& addSystem(Schedule schedule, SystemFn system, i32 priority = 0);- App& addStartupSystem(SystemFn system);-- // =========================================================================- // Lifecycle- // =========================================================================-- void run();- void quit();-- // =========================================================================- // Accessors- // =========================================================================-- /**- * @brief Convenience accessor via ServiceRegistry- * @tparam T The service type- * @return Reference to the service- */- template<typename T>- T& require() { return services_.require<T>(); }-- ServiceRegistry& services() { return services_; }- const Time& time() const { return time_; }-- u32 width() const { return config_.width; }- u32 height() const { return config_.height; }-- // =========================================================================- // JS Interop- // =========================================================================--#ifdef ES_PLATFORM_WEB- void runJSSystems(Schedule schedule, f32 dt);- static void setJSSystemsCallback(void* callback);- static void* jsSystemsCallback_;-#endif--private:- void init();- void runFrame();- void shutdown();-- void runSystems(Schedule schedule);-- /** @brief Wraps a SystemFn lambda as a System for unified scheduling */- class LambdaSystem : public ecs::System {- public:- explicit LambdaSystem(SystemFn fn) : fn_(std::move(fn)) {}- void update(World& world) override { fn_(world); }- private:- SystemFn fn_;- };-- AppConfig config_;- ServiceRegistry services_;-- Unique<Platform> platform_;- Input input_;- ecs::Registry registry_;- resource::ResourceManager resourceManager_;- Unique<GfxDevice> gfxDevice_;- Unique<RenderContext> renderContext_;- Unique<Renderer> renderer_;-- Time time_;-- std::vector<Unique<Plugin>> plugins_;- ecs::SystemGroup system_groups_[SCHEDULE_COUNT];-- bool running_ = false;- bool initialized_ = false;- bool startupRan_ = false;- f64 last_frame_time_ = 0.0;-};--} // namespace esenginediff --git a/src/esengine/app/Schedule.hpp b/src/esengine/app/Schedule.hppdeleted file mode 100644index 902a800b2..000000000--- a/src/esengine/app/Schedule.hpp+++ /dev/null@@ -1,34 +0,0 @@-/**- * @file Schedule.hpp- * @brief System execution schedule phases- *- * @author ESEngine Team- * @date 2026- *- * @copyright Copyright (c) 2026 ESEngine Team- * Licensed under the MIT License.- */-#pragma once--#include "../core/Types.hpp"--namespace esengine {--/**- * @brief Execution phases for systems- */-enum class Schedule : u8 {- Startup, ///< Run once at application start- PreUpdate, ///< Before main update (input processing)- Update, ///< Main game logic- PostUpdate, ///< After update (physics, collision response)- PreRender, ///< Before rendering (culling, sorting)- Render, ///< Rendering- PostRender, ///< After rendering (debug overlays)-- Count-};--constexpr usize SCHEDULE_COUNT = static_cast<usize>(Schedule::Count);--} // namespace esenginediff --git a/src/esengine/bindings/TilemapBindings.cpp b/src/esengine/bindings/TilemapBindings.cppindex 74cfaaac5..ba9b70657 100644--- a/src/esengine/bindings/TilemapBindings.cpp+++ b/src/esengine/bindings/TilemapBindings.cpp@@ -22,56 +22,57 @@namespace esengine {-static tilemap::TilemapSystem s_tilemapSystem;+static EstellaContext& ctx() { return activeCtx(); }-tilemap::TilemapSystem& getTilemapSystem() {- return s_tilemapSystem;+static tilemap::TilemapSystem& getTilemapSystem() {+ return ctx().require<tilemap::TilemapSystem>();}-static tilemap::TiledMapLoader s_tiledLoader;-static EstellaContext& ctx() { return activeCtx(); }+static tilemap::TiledMapLoader& getTiledLoader() {+ return ctx().require<tilemap::TiledMapLoader>();+}void tilemap_initLayer(u32 entity, u32 width, u32 height,f32 tileWidth, f32 tileHeight) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.initLayer(e, width, height, tileWidth, tileHeight);+ getTilemapSystem().initLayer(e, width, height, tileWidth, tileHeight);}void tilemap_destroyLayer(u32 entity) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.destroyLayer(e);+ getTilemapSystem().destroyLayer(e);}void tilemap_setTile(u32 entity, i32 x, i32 y, u32 tileId) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return;- s_tilemapSystem.setTile(e, x, y, static_cast<u16>(tileId));+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return;+ getTilemapSystem().setTile(e, x, y, static_cast<u16>(tileId));}u32 tilemap_getTile(u32 entity, i32 x, i32 y) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return 0;- return s_tilemapSystem.getTile(e, x, y);+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return 0;+ return getTilemapSystem().getTile(e, x, y);}void tilemap_fillRect(u32 entity, i32 x, i32 y,u32 w, u32 h, u32 tileId) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return;- s_tilemapSystem.fillRect(e, x, y, w, h, static_cast<u16>(tileId));+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return;+ getTilemapSystem().fillRect(e, x, y, w, h, static_cast<u16>(tileId));}void tilemap_setTiles(u32 entity, uintptr_t tilesPtr, u32 count) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return;+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return;const auto* tiles = reinterpret_cast<const u16*>(tilesPtr);- s_tilemapSystem.setTiles(e, tiles, count);+ getTilemapSystem().setTiles(e, tiles, count);}bool tilemap_hasLayer(u32 entity) {- return s_tilemapSystem.hasLayer(Entity::fromRaw(entity));+ return getTilemapSystem().hasLayer(Entity::fromRaw(entity));}void tilemap_submitLayer(u32 entity, u32 textureId,@@ -95,7 +96,7 @@ void tilemap_submitLayer(u32 entity, u32 textureId,u32 glTextureId = tex->getId();auto layerEntity = Entity::fromRaw(entity);- const auto* layerData = s_tilemapSystem.getLayerData(layerEntity);+ const auto* layerData = getTilemapSystem().getLayerData(layerEntity);if (!layerData) return;glm::vec4 finalColor(tintR, tintG, tintB, tintA * opacity);@@ -157,21 +158,21 @@ void tilemap_setRenderProps(u32 entity, u32 textureHandle, u32 tilesetColumns,f32 uvTileW, f32 uvTileH,i32 sortLayer, f32 depth,f32 parallaxX, f32 parallaxY) {- s_tilemapSystem.setRenderProps(Entity::fromRaw(entity),+ getTilemapSystem().setRenderProps(Entity::fromRaw(entity),textureHandle, tilesetColumns, uvTileW, uvTileH,sortLayer, depth, parallaxX, parallaxY);}void tilemap_setTint(u32 entity, f32 r, f32 g, f32 b, f32 a, f32 opacity) {- s_tilemapSystem.setTint(Entity::fromRaw(entity), r, g, b, a, opacity);+ getTilemapSystem().setTint(Entity::fromRaw(entity), r, g, b, a, opacity);}void tilemap_setVisible(u32 entity, bool visible) {- s_tilemapSystem.setVisible(Entity::fromRaw(entity), visible);+ getTilemapSystem().setVisible(Entity::fromRaw(entity), visible);}void tilemap_setOriginEntity(u32 layerKey, u32 originEntity) {- s_tilemapSystem.setOriginEntity(Entity::fromRaw(layerKey),+ getTilemapSystem().setOriginEntity(Entity::fromRaw(layerKey),Entity::fromRaw(originEntity));}@@ -179,83 +180,83 @@ void tilemap_setOriginEntity(u32 layerKey, u32 originEntity) {u32 tiled_loadMap(uintptr_t dataPtr, u32 dataSize) {const auto* data = reinterpret_cast<const char*>(dataPtr);- return s_tiledLoader.loadFromMemory(data, dataSize);+ return getTiledLoader().loadFromMemory(data, dataSize);}void tiled_freeMap(u32 handle) {- s_tiledLoader.freeMap(handle);+ getTiledLoader().freeMap(handle);}u32 tiled_getExternalTilesetCount(u32 handle) {- return s_tiledLoader.getExternalTilesetCount(handle);+ return getTiledLoader().getExternalTilesetCount(handle);}std::string tiled_getExternalTilesetSource(u32 handle, u32 index) {- return s_tiledLoader.getExternalTilesetSource(handle, index);+ return getTiledLoader().getExternalTilesetSource(handle, index);}bool tiled_loadExternalTileset(u32 handle, u32 index,uintptr_t dataPtr, u32 dataSize) {const auto* data = reinterpret_cast<const char*>(dataPtr);- return s_tiledLoader.loadExternalTileset(handle, index, data, dataSize);+ return getTiledLoader().loadExternalTileset(handle, index, data, dataSize);}bool tiled_finalize(u32 handle) {- return s_tiledLoader.finalize(handle);+ return getTiledLoader().finalize(handle);}u32 tiled_getMapWidth(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? map->width : 0;}u32 tiled_getMapHeight(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? map->height : 0;}u32 tiled_getMapTileWidth(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? map->tile_width : 0;}u32 tiled_getMapTileHeight(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? map->tile_height : 0;}u32 tiled_getLayerCount(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? static_cast<u32>(map->layers.size()) : 0;}std::string tiled_getLayerName(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return "";return map->layers[index].name;}u32 tiled_getLayerWidth(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 0;return map->layers[index].width;}u32 tiled_getLayerHeight(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 0;return map->layers[index].height;}bool tiled_getLayerVisible(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return false;return map->layers[index].visible;}u32 tiled_getLayerTiles(u32 handle, u32 index,uintptr_t outPtr, u32 maxCount) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 0;const auto& tiles = map->layers[index].tiles;@@ -266,65 +267,65 @@ u32 tiled_getLayerTiles(u32 handle, u32 index,}u32 tiled_getTilesetCount(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? static_cast<u32>(map->tilesets.size()) : 0;}std::string tiled_getTilesetName(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->tilesets.size()) return "";return map->tilesets[index].name;}std::string tiled_getTilesetImage(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->tilesets.size()) return "";return map->tilesets[index].image;}u32 tiled_getTilesetTileWidth(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->tilesets.size()) return 0;return map->tilesets[index].tile_width;}u32 tiled_getTilesetTileHeight(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->tilesets.size()) return 0;return map->tilesets[index].tile_height;}u32 tiled_getTilesetColumns(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->tilesets.size()) return 0;return map->tilesets[index].columns;}u32 tiled_getTilesetTileCount(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->tilesets.size()) return 0;return map->tilesets[index].tile_count;}u32 tiled_getObjectGroupCount(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? static_cast<u32>(map->object_groups.size()) : 0;}std::string tiled_getObjectGroupName(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->object_groups.size()) return "";return map->object_groups[index].name;}u32 tiled_getObjectCount(u32 handle, u32 groupIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;return static_cast<u32>(map->object_groups[groupIndex].objects.size());}f32 tiled_getObjectX(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -332,7 +333,7 @@ f32 tiled_getObjectX(u32 handle, u32 groupIndex, u32 objIndex) {}f32 tiled_getObjectY(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -340,7 +341,7 @@ f32 tiled_getObjectY(u32 handle, u32 groupIndex, u32 objIndex) {}f32 tiled_getObjectWidth(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -348,7 +349,7 @@ f32 tiled_getObjectWidth(u32 handle, u32 groupIndex, u32 objIndex) {}f32 tiled_getObjectHeight(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -356,7 +357,7 @@ f32 tiled_getObjectHeight(u32 handle, u32 groupIndex, u32 objIndex) {}f32 tiled_getObjectRotation(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -364,7 +365,7 @@ f32 tiled_getObjectRotation(u32 handle, u32 groupIndex, u32 objIndex) {}bool tiled_getObjectEllipse(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return false;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return false;@@ -372,7 +373,7 @@ bool tiled_getObjectEllipse(u32 handle, u32 groupIndex, u32 objIndex) {}bool tiled_getObjectPoint(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return false;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return false;@@ -380,7 +381,7 @@ bool tiled_getObjectPoint(u32 handle, u32 groupIndex, u32 objIndex) {}u32 tiled_getObjectVertexCount(u32 handle, u32 groupIndex, u32 objIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -389,7 +390,7 @@ u32 tiled_getObjectVertexCount(u32 handle, u32 groupIndex, u32 objIndex) {u32 tiled_getObjectVertices(u32 handle, u32 groupIndex, u32 objIndex,uintptr_t outPtr, u32 maxFloats) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || groupIndex >= map->object_groups.size()) return 0;const auto& grp = map->object_groups[groupIndex];if (objIndex >= grp.objects.size()) return 0;@@ -401,25 +402,25 @@ u32 tiled_getObjectVertices(u32 handle, u32 groupIndex, u32 objIndex,}f32 tiled_getLayerOpacity(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 1.0f;return map->layers[index].opacity;}u32 tiled_getLayerTintColor(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 0;return map->layers[index].tint_color;}f32 tiled_getLayerParallaxX(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 1.0f;return map->layers[index].parallax_x;}f32 tiled_getLayerParallaxY(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 1.0f;return map->layers[index].parallax_y;}@@ -427,36 +428,36 @@ f32 tiled_getLayerParallaxY(u32 handle, u32 index) {void tilemap_initInfiniteLayer(u32 entity, f32 tileWidth, f32 tileHeight) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.initInfiniteLayer(e, tileWidth, tileHeight);+ getTilemapSystem().initInfiniteLayer(e, tileWidth, tileHeight);}void tilemap_setChunkTiles(u32 entity, i32 chunkX, i32 chunkY,uintptr_t tilesPtr, u32 width, u32 height) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return;+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return;const auto* tiles = reinterpret_cast<const u16*>(tilesPtr);- s_tilemapSystem.setChunkTiles(e, chunkX, chunkY, tiles, width, height);+ getTilemapSystem().setChunkTiles(e, chunkX, chunkY, tiles, width, height);}bool tiled_isMapInfinite(u32 handle) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);return map ? map->infinite : false;}bool tiled_isLayerInfinite(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return false;return map->layers[index].infinite;}u32 tiled_getLayerChunkCount(u32 handle, u32 index) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || index >= map->layers.size()) return 0;return static_cast<u32>(map->layers[index].chunks.size());}i32 tiled_getLayerChunkX(u32 handle, u32 layerIndex, u32 chunkIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || layerIndex >= map->layers.size()) return 0;const auto& chunks = map->layers[layerIndex].chunks;if (chunkIndex >= chunks.size()) return 0;@@ -464,7 +465,7 @@ i32 tiled_getLayerChunkX(u32 handle, u32 layerIndex, u32 chunkIndex) {}i32 tiled_getLayerChunkY(u32 handle, u32 layerIndex, u32 chunkIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || layerIndex >= map->layers.size()) return 0;const auto& chunks = map->layers[layerIndex].chunks;if (chunkIndex >= chunks.size()) return 0;@@ -472,7 +473,7 @@ i32 tiled_getLayerChunkY(u32 handle, u32 layerIndex, u32 chunkIndex) {}u32 tiled_getLayerChunkWidth(u32 handle, u32 layerIndex, u32 chunkIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || layerIndex >= map->layers.size()) return 0;const auto& chunks = map->layers[layerIndex].chunks;if (chunkIndex >= chunks.size()) return 0;@@ -480,7 +481,7 @@ u32 tiled_getLayerChunkWidth(u32 handle, u32 layerIndex, u32 chunkIndex) {}u32 tiled_getLayerChunkHeight(u32 handle, u32 layerIndex, u32 chunkIndex) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || layerIndex >= map->layers.size()) return 0;const auto& chunks = map->layers[layerIndex].chunks;if (chunkIndex >= chunks.size()) return 0;@@ -489,7 +490,7 @@ u32 tiled_getLayerChunkHeight(u32 handle, u32 layerIndex, u32 chunkIndex) {u32 tiled_getLayerChunkTiles(u32 handle, u32 layerIndex, u32 chunkIndex,uintptr_t outPtr, u32 maxCount) {- const auto* map = s_tiledLoader.getMap(handle);+ const auto* map = getTiledLoader().getMap(handle);if (!map || layerIndex >= map->layers.size()) return 0;const auto& chunks = map->layers[layerIndex].chunks;if (chunkIndex >= chunks.size()) return 0;@@ -503,38 +504,38 @@ u32 tiled_getLayerChunkTiles(u32 handle, u32 layerIndex, u32 chunkIndex,void tilemap_setTileAnimation(u32 entity, u32 tileId,uintptr_t framesPtr, u32 frameCount) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return;+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return;const auto* data = reinterpret_cast<const u32*>(framesPtr);std::vector<tilemap::AnimFrame> frames(frameCount);for (u32 i = 0; i < frameCount; i++) {frames[i].tile_id = static_cast<u16>(data[i * 2]);frames[i].duration_ms = static_cast<u16>(data[i * 2 + 1]);}- s_tilemapSystem.setTileAnimation(e, static_cast<u16>(tileId),+ getTilemapSystem().setTileAnimation(e, static_cast<u16>(tileId),frames.data(), frameCount);}void tilemap_advanceAnimations(u32 entity, f32 dtMs) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.advanceAnimations(e, dtMs);+ getTilemapSystem().advanceAnimations(e, dtMs);}void tilemap_setTileProperty(u32 entity, u32 tileId,const std::string& key, const std::string& value) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return;- s_tilemapSystem.setTileProperty(e, static_cast<u16>(tileId), key, value);+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return;+ getTilemapSystem().setTileProperty(e, static_cast<u16>(tileId), key, value);}std::string tilemap_getTileProperty(u32 entity, i32 x, i32 y,const std::string& key) {auto e = Entity::fromRaw(entity);- if (e == INVALID_ENTITY || !s_tilemapSystem.hasLayer(e)) return "";- u16 raw = s_tilemapSystem.getTile(e, x, y);+ if (e == INVALID_ENTITY || !getTilemapSystem().hasLayer(e)) return "";+ u16 raw = getTilemapSystem().getTile(e, x, y);u16 tileId = raw & tilemap::TILE_ID_MASK;if (tileId == tilemap::EMPTY_TILE) return "";- const char* val = s_tilemapSystem.getTileProperty(e, tileId, key);+ const char* val = getTilemapSystem().getTileProperty(e, tileId, key);return val ? std::string(val) : "";}@@ -542,19 +543,19 @@ void tilemap_flipTile(u32 entity, i32 x, i32 y,bool flipH, bool flipV, bool flipD) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.flipTile(e, x, y, flipH, flipV, flipD);+ getTilemapSystem().flipTile(e, x, y, flipH, flipV, flipD);}void tilemap_rotateTile(u32 entity, i32 x, i32 y, i32 degrees) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.rotateTile(e, x, y, degrees);+ getTilemapSystem().rotateTile(e, x, y, degrees);}void tilemap_setGridType(u32 entity, u32 type) {auto e = Entity::fromRaw(entity);if (e == INVALID_ENTITY) return;- s_tilemapSystem.setGridType(e, static_cast<tilemap::GridType>(type));+ getTilemapSystem().setGridType(e, static_cast<tilemap::GridType>(type));}static f32 s_coordBuffer[2] = {};@@ -562,7 +563,7 @@ static f32 s_coordBuffer[2] = {};uintptr_t tilemap_tileToWorld(u32 entity, i32 tx, i32 ty,f32 originX, f32 originY) {auto e = Entity::fromRaw(entity);- s_tilemapSystem.tileToWorld(e, tx, ty, originX, originY,+ getTilemapSystem().tileToWorld(e, tx, ty, originX, originY,s_coordBuffer[0], s_coordBuffer[1]);return reinterpret_cast<uintptr_t>(s_coordBuffer);}@@ -571,7 +572,7 @@ uintptr_t tilemap_worldToTile(u32 entity, f32 wx, f32 wy,f32 originX, f32 originY) {auto e = Entity::fromRaw(entity);i32 tx, ty;- s_tilemapSystem.worldToTile(e, wx, wy, originX, originY, tx, ty);+ getTilemapSystem().worldToTile(e, wx, wy, originX, originY, tx, ty);s_coordBuffer[0] = static_cast<f32>(tx);s_coordBuffer[1] = static_cast<f32>(ty);return reinterpret_cast<uintptr_t>(s_coordBuffer);diff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cppindex d55cc1f3f..efe4403ed 100644--- a/src/esengine/bindings/WebBindings.generated.cpp+++ b/src/esengine/bindings/WebBindings.generated.cpp@@ -84,42 +84,21 @@ EMSCRIPTEN_BINDINGS(esengine_math) {// =============================================================================EMSCRIPTEN_BINDINGS(esengine_enums) {- enum_<esengine::ecs::AlignSelf>("AlignSelf")- .value("Auto", esengine::ecs::AlignSelf::Auto)- .value("Start", esengine::ecs::AlignSelf::Start)- .value("Center", esengine::ecs::AlignSelf::Center)- .value("End", esengine::ecs::AlignSelf::End)- .value("Stretch", esengine::ecs::AlignSelf::Stretch);-- enum_<esengine::ecs::EmitterShape>("EmitterShape")- .value("Point", esengine::ecs::EmitterShape::Point)- .value("Circle", esengine::ecs::EmitterShape::Circle)- .value("Rectangle", esengine::ecs::EmitterShape::Rectangle)- .value("Cone", esengine::ecs::EmitterShape::Cone);-- enum_<esengine::ecs::SimulationSpace>("SimulationSpace")- .value("World", esengine::ecs::SimulationSpace::World)- .value("Local", esengine::ecs::SimulationSpace::Local);-- enum_<esengine::ecs::UIVisualType>("UIVisualType")- .value("None", esengine::ecs::UIVisualType::None)- .value("SolidColor", esengine::ecs::UIVisualType::SolidColor)- .value("Image", esengine::ecs::UIVisualType::Image)- .value("NineSlice", esengine::ecs::UIVisualType::NineSlice);-- enum_<esengine::ecs::BodyType>("BodyType")- .value("Static", esengine::ecs::BodyType::Static)- .value("Kinematic", esengine::ecs::BodyType::Kinematic)- .value("Dynamic", esengine::ecs::BodyType::Dynamic);-enum_<esengine::ecs::TextAlign>("TextAlign").value("Left", esengine::ecs::TextAlign::Left).value("Center", esengine::ecs::TextAlign::Center).value("Right", esengine::ecs::TextAlign::Right);- enum_<esengine::ecs::MaskMode>("MaskMode")- .value("Scissor", esengine::ecs::MaskMode::Scissor)- .value("Stencil", esengine::ecs::MaskMode::Stencil);+ enum_<esengine::ecs::ProjectionType>("ProjectionType")+ .value("Perspective", esengine::ecs::ProjectionType::Perspective)+ .value("Orthographic", esengine::ecs::ProjectionType::Orthographic);++ enum_<esengine::ecs::CanvasScaleMode>("CanvasScaleMode")+ .value("FixedWidth", esengine::ecs::CanvasScaleMode::FixedWidth)+ .value("FixedHeight", esengine::ecs::CanvasScaleMode::FixedHeight)+ .value("Expand", esengine::ecs::CanvasScaleMode::Expand)+ .value("Shrink", esengine::ecs::CanvasScaleMode::Shrink)+ .value("Match", esengine::ecs::CanvasScaleMode::Match);enum_<esengine::ecs::FlexDirection>("FlexDirection").value("Row", esengine::ecs::FlexDirection::Row)@@ -153,6 +132,13 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {.value("SpaceBetween", esengine::ecs::AlignContent::SpaceBetween).value("SpaceAround", esengine::ecs::AlignContent::SpaceAround);+ enum_<esengine::ecs::AlignSelf>("AlignSelf")+ .value("Auto", esengine::ecs::AlignSelf::Auto)+ .value("Start", esengine::ecs::AlignSelf::Start)+ .value("Center", esengine::ecs::AlignSelf::Center)+ .value("End", esengine::ecs::AlignSelf::End)+ .value("Stretch", esengine::ecs::AlignSelf::Stretch);+enum_<esengine::ecs::LayoutDirection>("LayoutDirection").value("Horizontal", esengine::ecs::LayoutDirection::Horizontal).value("Vertical", esengine::ecs::LayoutDirection::Vertical);@@ -162,16 +148,30 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {.value("Center", esengine::ecs::ChildAlignment::Center).value("End", esengine::ecs::ChildAlignment::End);- enum_<esengine::ecs::CanvasScaleMode>("CanvasScaleMode")- .value("FixedWidth", esengine::ecs::CanvasScaleMode::FixedWidth)- .value("FixedHeight", esengine::ecs::CanvasScaleMode::FixedHeight)- .value("Expand", esengine::ecs::CanvasScaleMode::Expand)- .value("Shrink", esengine::ecs::CanvasScaleMode::Shrink)- .value("Match", esengine::ecs::CanvasScaleMode::Match);+ enum_<esengine::ecs::EmitterShape>("EmitterShape")+ .value("Point", esengine::ecs::EmitterShape::Point)+ .value("Circle", esengine::ecs::EmitterShape::Circle)+ .value("Rectangle", esengine::ecs::EmitterShape::Rectangle)+ .value("Cone", esengine::ecs::EmitterShape::Cone);- enum_<esengine::ecs::ProjectionType>("ProjectionType")- .value("Perspective", esengine::ecs::ProjectionType::Perspective)- .value("Orthographic", esengine::ecs::ProjectionType::Orthographic);+ enum_<esengine::ecs::SimulationSpace>("SimulationSpace")+ .value("World", esengine::ecs::SimulationSpace::World)+ .value("Local", esengine::ecs::SimulationSpace::Local);++ enum_<esengine::ecs::BodyType>("BodyType")+ .value("Static", esengine::ecs::BodyType::Static)+ .value("Kinematic", esengine::ecs::BodyType::Kinematic)+ .value("Dynamic", esengine::ecs::BodyType::Dynamic);++ enum_<esengine::ecs::MaskMode>("MaskMode")+ .value("Scissor", esengine::ecs::MaskMode::Scissor)+ .value("Stencil", esengine::ecs::MaskMode::Stencil);++ enum_<esengine::ecs::UIVisualType>("UIVisualType")+ .value("None", esengine::ecs::UIVisualType::None)+ .value("SolidColor", esengine::ecs::UIVisualType::SolidColor)+ .value("Image", esengine::ecs::UIVisualType::Image)+ .value("NineSlice", esengine::ecs::UIVisualType::NineSlice);}@@ -179,6 +179,157 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {// Components// =============================================================================+struct BitmapTextJS {+ std::string text;+ glm::vec4 color;+ f32 fontSize;+ i32 align;+ f32 spacing;+ i32 layer;+ u32 font;+ bool enabled;+};++esengine::ecs::BitmapText bitmaptextFromJS(const BitmapTextJS& js) {+ esengine::ecs::BitmapText c;+ c.text = js.text;+ c.color = js.color;+ c.fontSize = js.fontSize;+ c.align = static_cast<TextAlign>(js.align);+ c.spacing = js.spacing;+ c.layer = js.layer;+ c.font = resource::BitmapFontHandle(js.font);+ c.enabled = js.enabled;+ return c;+}++BitmapTextJS bitmaptextToJS(const esengine::ecs::BitmapText& c) {+ BitmapTextJS js;+ js.text = c.text;+ js.color = c.color;+ js.fontSize = c.fontSize;+ js.align = static_cast<i32>(c.align);+ js.spacing = c.spacing;+ js.layer = c.layer;+ js.font = c.font.id();+ js.enabled = c.enabled;+ return js;+}++struct CameraJS {+ i32 projectionType;+ f32 fov;+ f32 orthoSize;+ f32 nearPlane;+ f32 farPlane;+ f32 aspectRatio;+ bool isActive;+ i32 priority;+ f32 viewportX;+ f32 viewportY;+ f32 viewportW;+ f32 viewportH;+ i32 clearFlags;+};++esengine::ecs::Camera cameraFromJS(const CameraJS& js) {+ esengine::ecs::Camera c;+ c.projectionType = static_cast<ProjectionType>(js.projectionType);+ c.fov = js.fov;+ c.orthoSize = js.orthoSize;+ c.nearPlane = js.nearPlane;+ c.farPlane = js.farPlane;+ c.aspectRatio = js.aspectRatio;+ c.isActive = js.isActive;+ c.priority = js.priority;+ c.viewportX = js.viewportX;+ c.viewportY = js.viewportY;+ c.viewportW = js.viewportW;+ c.viewportH = js.viewportH;+ c.clearFlags = js.clearFlags;+ return c;+}++CameraJS cameraToJS(const esengine::ecs::Camera& c) {+ CameraJS js;+ js.projectionType = static_cast<i32>(c.projectionType);+ js.fov = c.fov;+ js.orthoSize = c.orthoSize;+ js.nearPlane = c.nearPlane;+ js.farPlane = c.farPlane;+ js.aspectRatio = c.aspectRatio;+ js.isActive = c.isActive;+ js.priority = c.priority;+ js.viewportX = c.viewportX;+ js.viewportY = c.viewportY;+ js.viewportW = c.viewportW;+ js.viewportH = c.viewportH;+ js.clearFlags = c.clearFlags;+ return js;+}++struct CanvasJS {+ glm::uvec2 designResolution;+ f32 pixelsPerUnit;+ i32 scaleMode;+ f32 matchWidthOrHeight;+ glm::vec4 backgroundColor;+};++esengine::ecs::Canvas canvasFromJS(const CanvasJS& js) {+ esengine::ecs::Canvas c;+ c.designResolution = js.designResolution;+ c.pixelsPerUnit = js.pixelsPerUnit;+ c.scaleMode = static_cast<CanvasScaleMode>(js.scaleMode);+ c.matchWidthOrHeight = js.matchWidthOrHeight;+ c.backgroundColor = js.backgroundColor;+ return c;+}++CanvasJS canvasToJS(const esengine::ecs::Canvas& c) {+ CanvasJS js;+ js.designResolution = c.designResolution;+ js.pixelsPerUnit = c.pixelsPerUnit;+ js.scaleMode = static_cast<i32>(c.scaleMode);+ js.matchWidthOrHeight = c.matchWidthOrHeight;+ js.backgroundColor = c.backgroundColor;+ return js;+}++struct FlexContainerJS {+ i32 direction;+ i32 wrap;+ i32 justifyContent;+ i32 alignItems;+ i32 alignContent;+ glm::vec2 gap;+ Padding padding;+};++esengine::ecs::FlexContainer flexcontainerFromJS(const FlexContainerJS& js) {+ esengine::ecs::FlexContainer c;+ c.direction = static_cast<FlexDirection>(js.direction);+ c.wrap = static_cast<FlexWrap>(js.wrap);+ c.justifyContent = static_cast<JustifyContent>(js.justifyContent);+ c.alignItems = static_cast<AlignItems>(js.alignItems);+ c.alignContent = static_cast<AlignContent>(js.alignContent);+ c.gap = js.gap;+ c.padding = js.padding;+ return c;+}++FlexContainerJS flexcontainerToJS(const esengine::ecs::FlexContainer& c) {+ FlexContainerJS js;+ js.direction = static_cast<i32>(c.direction);+ js.wrap = static_cast<i32>(c.wrap);+ js.justifyContent = static_cast<i32>(c.justifyContent);+ js.alignItems = static_cast<i32>(c.alignItems);+ js.alignContent = static_cast<i32>(c.alignContent);+ js.gap = c.gap;+ js.padding = c.padding;+ return js;+}+struct FlexItemJS {f32 flexGrow;f32 flexShrink;@@ -228,31 +379,93 @@ FlexItemJS flexitemToJS(const esengine::ecs::FlexItem& c) {return js;}-struct ParticleEmitterJS {- f32 rate;- i32 burstCount;- f32 burstInterval;- f32 duration;- bool looping;- bool playOnStart;- i32 maxParticles;- f32 lifetimeMin;- f32 lifetimeMax;- i32 shape;- f32 shapeRadius;- glm::vec2 shapeSize;- f32 shapeAngle;- f32 speedMin;- f32 speedMax;- f32 angleSpreadMin;- f32 angleSpreadMax;- f32 startSizeMin;- f32 startSizeMax;- f32 endSizeMin;- f32 endSizeMax;- i32 sizeEasing;- glm::vec4 startColor;- glm::vec4 endColor;+struct ParentJS {+ u32 entity;+};++esengine::ecs::Parent parentFromJS(const ParentJS& js) {+ esengine::ecs::Parent c;+ c.entity = Entity(js.entity);+ return c;+}++ParentJS parentToJS(const esengine::ecs::Parent& c) {+ ParentJS js;+ js.entity = static_cast<u32>(c.entity);+ return js;+}++struct ChildrenJS {+ std::vector<u32> entities;+};++esengine::ecs::Children childrenFromJS(const ChildrenJS& js) {+ esengine::ecs::Children c;+ c.entities.reserve(js.entities.size());+ for (auto v : js.entities) c.entities.push_back(Entity(v));+ return c;+}++ChildrenJS childrenToJS(const esengine::ecs::Children& c) {+ ChildrenJS js;+ js.entities.reserve(c.entities.size());+ for (auto e : c.entities) js.entities.push_back(static_cast<u32>(e));+ 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;+ f32 burstInterval;+ f32 duration;+ bool looping;+ bool playOnStart;+ i32 maxParticles;+ f32 lifetimeMin;+ f32 lifetimeMax;+ i32 shape;+ f32 shapeRadius;+ glm::vec2 shapeSize;+ f32 shapeAngle;+ f32 speedMin;+ f32 speedMax;+ f32 angleSpreadMin;+ f32 angleSpreadMax;+ f32 startSizeMin;+ f32 startSizeMax;+ f32 endSizeMin;+ f32 endSizeMax;+ i32 sizeEasing;+ glm::vec4 startColor;+ glm::vec4 endColor;i32 colorEasing;f32 rotationMin;f32 rotationMax;@@ -364,43 +577,6 @@ ParticleEmitterJS particleemitterToJS(const esengine::ecs::ParticleEmitter& c) {return js;}-struct UIRendererJS {- i32 visualType;- u32 texture;- glm::vec4 color;- glm::vec2 uvOffset;- glm::vec2 uvScale;- glm::vec4 sliceBorder;- u32 material;- bool enabled;-};--esengine::ecs::UIRenderer uirendererFromJS(const UIRendererJS& js) {- esengine::ecs::UIRenderer c;- c.visualType = static_cast<UIVisualType>(js.visualType);- c.texture = resource::TextureHandle(js.texture);- c.color = js.color;- c.uvOffset = js.uvOffset;- c.uvScale = js.uvScale;- c.sliceBorder = js.sliceBorder;- c.material = js.material;- c.enabled = js.enabled;- return c;-}--UIRendererJS uirendererToJS(const esengine::ecs::UIRenderer& c) {- UIRendererJS js;- js.visualType = static_cast<i32>(c.visualType);- js.texture = c.texture.id();- js.color = c.color;- js.uvOffset = c.uvOffset;- js.uvScale = c.uvScale;- js.sliceBorder = c.sliceBorder;- js.material = c.material;- js.enabled = c.enabled;- return js;-}-struct RigidBodyJS {i32 bodyType;f32 gravityScale;@@ -435,43 +611,6 @@ RigidBodyJS rigidbodyToJS(const esengine::ecs::RigidBody& c) {return js;}-struct BitmapTextJS {- std::string text;- glm::vec4 color;- f32 fontSize;- i32 align;- f32 spacing;- i32 layer;- u32 font;- bool enabled;-};--esengine::ecs::BitmapText bitmaptextFromJS(const BitmapTextJS& js) {- esengine::ecs::BitmapText c;- c.text = js.text;- c.color = js.color;- c.fontSize = js.fontSize;- c.align = static_cast<TextAlign>(js.align);- c.spacing = js.spacing;- c.layer = js.layer;- c.font = resource::BitmapFontHandle(js.font);- c.enabled = js.enabled;- return c;-}--BitmapTextJS bitmaptextToJS(const esengine::ecs::BitmapText& c) {- BitmapTextJS js;- js.text = c.text;- js.color = c.color;- js.fontSize = c.fontSize;- js.align = static_cast<i32>(c.align);- js.spacing = c.spacing;- js.layer = c.layer;- js.font = c.font.id();- js.enabled = c.enabled;- return js;-}-struct SpriteJS {u32 texture;glm::vec4 color;@@ -543,206 +682,77 @@ UIMaskJS uimaskToJS(const esengine::ecs::UIMask& c) {return js;}-struct FlexContainerJS {- i32 direction;- i32 wrap;- i32 justifyContent;- i32 alignItems;- i32 alignContent;- glm::vec2 gap;- Padding padding;+struct UIRendererJS {+ i32 visualType;+ u32 texture;+ glm::vec4 color;+ glm::vec2 uvOffset;+ glm::vec2 uvScale;+ glm::vec4 sliceBorder;+ u32 material;+ bool enabled;};-esengine::ecs::FlexContainer flexcontainerFromJS(const FlexContainerJS& js) {- esengine::ecs::FlexContainer c;- c.direction = static_cast<FlexDirection>(js.direction);- c.wrap = static_cast<FlexWrap>(js.wrap);- c.justifyContent = static_cast<JustifyContent>(js.justifyContent);- c.alignItems = static_cast<AlignItems>(js.alignItems);- c.alignContent = static_cast<AlignContent>(js.alignContent);- c.gap = js.gap;- c.padding = js.padding;+esengine::ecs::UIRenderer uirendererFromJS(const UIRendererJS& js) {+ esengine::ecs::UIRenderer c;+ c.visualType = static_cast<UIVisualType>(js.visualType);+ c.texture = resource::TextureHandle(js.texture);+ c.color = js.color;+ c.uvOffset = js.uvOffset;+ c.uvScale = js.uvScale;+ c.sliceBorder = js.sliceBorder;+ c.material = js.material;+ c.enabled = js.enabled;return c;}-FlexContainerJS flexcontainerToJS(const esengine::ecs::FlexContainer& c) {- FlexContainerJS js;- js.direction = static_cast<i32>(c.direction);- js.wrap = static_cast<i32>(c.wrap);- js.justifyContent = static_cast<i32>(c.justifyContent);- js.alignItems = static_cast<i32>(c.alignItems);- js.alignContent = static_cast<i32>(c.alignContent);- js.gap = c.gap;- js.padding = c.padding;+UIRendererJS uirendererToJS(const esengine::ecs::UIRenderer& c) {+ UIRendererJS js;+ js.visualType = static_cast<i32>(c.visualType);+ js.texture = c.texture.id();+ js.color = c.color;+ js.uvOffset = c.uvOffset;+ js.uvScale = c.uvScale;+ js.sliceBorder = c.sliceBorder;+ js.material = c.material;+ js.enabled = c.enabled;return js;}-struct ParentJS {- u32 entity;-};+EMSCRIPTEN_BINDINGS(esengine_components) {+ register_vector<u32>("VectorEntity");-esengine::ecs::Parent parentFromJS(const ParentJS& js) {- esengine::ecs::Parent c;- c.entity = Entity(js.entity);- return c;-}+ value_object<BitmapTextJS>("BitmapText")+ .field("text", &BitmapTextJS::text)+ .field("color", &BitmapTextJS::color)+ .field("fontSize", &BitmapTextJS::fontSize)+ .field("align", &BitmapTextJS::align)+ .field("spacing", &BitmapTextJS::spacing)+ .field("layer", &BitmapTextJS::layer)+ .field("font", &BitmapTextJS::font)+ .field("enabled", &BitmapTextJS::enabled);-ParentJS parentToJS(const esengine::ecs::Parent& c) {- ParentJS js;- js.entity = static_cast<u32>(c.entity);- return js;-}+ value_object<CameraJS>("Camera")+ .field("projectionType", &CameraJS::projectionType)+ .field("fov", &CameraJS::fov)+ .field("orthoSize", &CameraJS::orthoSize)+ .field("nearPlane", &CameraJS::nearPlane)+ .field("farPlane", &CameraJS::farPlane)+ .field("aspectRatio", &CameraJS::aspectRatio)+ .field("isActive", &CameraJS::isActive)+ .field("priority", &CameraJS::priority)+ .field("viewportX", &CameraJS::viewportX)+ .field("viewportY", &CameraJS::viewportY)+ .field("viewportW", &CameraJS::viewportW)+ .field("viewportH", &CameraJS::viewportH)+ .field("clearFlags", &CameraJS::clearFlags);-struct ChildrenJS {- std::vector<u32> entities;-};--esengine::ecs::Children childrenFromJS(const ChildrenJS& js) {- esengine::ecs::Children c;- c.entities.reserve(js.entities.size());- for (auto v : js.entities) c.entities.push_back(Entity(v));- return c;-}--ChildrenJS childrenToJS(const esengine::ecs::Children& c) {- ChildrenJS js;- js.entities.reserve(c.entities.size());- for (auto e : c.entities) js.entities.push_back(static_cast<u32>(e));- 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 CanvasJS {- glm::uvec2 designResolution;- f32 pixelsPerUnit;- i32 scaleMode;- f32 matchWidthOrHeight;- glm::vec4 backgroundColor;-};--esengine::ecs::Canvas canvasFromJS(const CanvasJS& js) {- esengine::ecs::Canvas c;- c.designResolution = js.designResolution;- c.pixelsPerUnit = js.pixelsPerUnit;- c.scaleMode = static_cast<CanvasScaleMode>(js.scaleMode);- c.matchWidthOrHeight = js.matchWidthOrHeight;- c.backgroundColor = js.backgroundColor;- return c;-}--CanvasJS canvasToJS(const esengine::ecs::Canvas& c) {- CanvasJS js;- js.designResolution = c.designResolution;- js.pixelsPerUnit = c.pixelsPerUnit;- js.scaleMode = static_cast<i32>(c.scaleMode);- js.matchWidthOrHeight = c.matchWidthOrHeight;- js.backgroundColor = c.backgroundColor;- return js;-}--struct CameraJS {- i32 projectionType;- f32 fov;- f32 orthoSize;- f32 nearPlane;- f32 farPlane;- f32 aspectRatio;- bool isActive;- i32 priority;- f32 viewportX;- f32 viewportY;- f32 viewportW;- f32 viewportH;- i32 clearFlags;-};--esengine::ecs::Camera cameraFromJS(const CameraJS& js) {- esengine::ecs::Camera c;- c.projectionType = static_cast<ProjectionType>(js.projectionType);- c.fov = js.fov;- c.orthoSize = js.orthoSize;- c.nearPlane = js.nearPlane;- c.farPlane = js.farPlane;- c.aspectRatio = js.aspectRatio;- c.isActive = js.isActive;- c.priority = js.priority;- c.viewportX = js.viewportX;- c.viewportY = js.viewportY;- c.viewportW = js.viewportW;- c.viewportH = js.viewportH;- c.clearFlags = js.clearFlags;- return c;-}--CameraJS cameraToJS(const esengine::ecs::Camera& c) {- CameraJS js;- js.projectionType = static_cast<i32>(c.projectionType);- js.fov = c.fov;- js.orthoSize = c.orthoSize;- js.nearPlane = c.nearPlane;- js.farPlane = c.farPlane;- js.aspectRatio = c.aspectRatio;- js.isActive = c.isActive;- js.priority = c.priority;- js.viewportX = c.viewportX;- js.viewportY = c.viewportY;- js.viewportW = c.viewportW;- js.viewportH = c.viewportH;- js.clearFlags = c.clearFlags;- return js;-}--EMSCRIPTEN_BINDINGS(esengine_components) {- register_vector<u32>("VectorEntity");-- value_object<esengine::ecs::UIRect>("UIRect")- .field("anchorMin", &esengine::ecs::UIRect::anchorMin)- .field("anchorMax", &esengine::ecs::UIRect::anchorMax)- .field("offsetMin", &esengine::ecs::UIRect::offsetMin)- .field("offsetMax", &esengine::ecs::UIRect::offsetMax)- .field("size", &esengine::ecs::UIRect::size)- .field("pivot", &esengine::ecs::UIRect::pivot);-- 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<CanvasJS>("Canvas")+ .field("designResolution", &CanvasJS::designResolution)+ .field("pixelsPerUnit", &CanvasJS::pixelsPerUnit)+ .field("scaleMode", &CanvasJS::scaleMode)+ .field("matchWidthOrHeight", &CanvasJS::matchWidthOrHeight)+ .field("backgroundColor", &CanvasJS::backgroundColor);value_object<esengine::ecs::BoxCollider>("BoxCollider").field("halfExtents", &esengine::ecs::BoxCollider::halfExtents)@@ -797,6 +807,53 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("cardSpacing", &esengine::ecs::FanLayout::cardSpacing).field("direction", &esengine::ecs::FanLayout::direction);+ value_object<FlexContainerJS>("FlexContainer")+ .field("direction", &FlexContainerJS::direction)+ .field("wrap", &FlexContainerJS::wrap)+ .field("justifyContent", &FlexContainerJS::justifyContent)+ .field("alignItems", &FlexContainerJS::alignItems)+ .field("alignContent", &FlexContainerJS::alignContent)+ .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<esengine::ecs::GridLayout>("GridLayout")+ .field("direction", &esengine::ecs::GridLayout::direction)+ .field("crossAxisCount", &esengine::ecs::GridLayout::crossAxisCount)+ .field("itemSize", &esengine::ecs::GridLayout::itemSize)+ .field("spacing", &esengine::ecs::GridLayout::spacing);++ value_object<ParentJS>("Parent")+ .field("entity", &ParentJS::entity);++ value_object<ChildrenJS>("Children")+ .field("entities", &ChildrenJS::entities);++ value_object<esengine::ecs::Interactable>("Interactable")+ .field("enabled", &esengine::ecs::Interactable::enabled)+ .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)@@ -840,33 +897,28 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("simulationSpace", &ParticleEmitterJS::simulationSpace).field("enabled", &ParticleEmitterJS::enabled);- value_object<esengine::ecs::Transform>("Transform")- .field("position", &esengine::ecs::Transform::position)- .field("rotation", &esengine::ecs::Transform::rotation)- .field("scale", &esengine::ecs::Transform::scale)- .field("worldPosition", &esengine::ecs::Transform::worldPosition)- .field("worldRotation", &esengine::ecs::Transform::worldRotation)- .field("worldScale", &esengine::ecs::Transform::worldScale);+ value_object<RigidBodyJS>("RigidBody")+ .field("bodyType", &RigidBodyJS::bodyType)+ .field("gravityScale", &RigidBodyJS::gravityScale)+ .field("linearDamping", &RigidBodyJS::linearDamping)+ .field("angularDamping", &RigidBodyJS::angularDamping)+ .field("fixedRotation", &RigidBodyJS::fixedRotation)+ .field("bullet", &RigidBodyJS::bullet)+ .field("enabled", &RigidBodyJS::enabled);- value_object<UIRendererJS>("UIRenderer")- .field("visualType", &UIRendererJS::visualType)- .field("texture", &UIRendererJS::texture)- .field("color", &UIRendererJS::color)- .field("uvOffset", &UIRendererJS::uvOffset)- .field("uvScale", &UIRendererJS::uvScale)- .field("sliceBorder", &UIRendererJS::sliceBorder)- .field("material", &UIRendererJS::material)- .field("enabled", &UIRendererJS::enabled);+ value_object<esengine::ecs::ScreenSpace>("ScreenSpace");- value_object<esengine::ecs::GridLayout>("GridLayout")- .field("direction", &esengine::ecs::GridLayout::direction)- .field("crossAxisCount", &esengine::ecs::GridLayout::crossAxisCount)- .field("itemSize", &esengine::ecs::GridLayout::itemSize)- .field("spacing", &esengine::ecs::GridLayout::spacing);+ value_object<esengine::ecs::Selectable>("Selectable")+ .field("selected", &esengine::ecs::Selectable::selected)+ .field("group", &esengine::ecs::Selectable::group);- value_object<esengine::ecs::Velocity>("Velocity")- .field("linear", &esengine::ecs::Velocity::linear)- .field("angular", &esengine::ecs::Velocity::angular);+ value_object<esengine::ecs::ShapeRenderer>("ShapeRenderer")+ .field("shapeType", &esengine::ecs::ShapeRenderer::shapeType)+ .field("color", &esengine::ecs::ShapeRenderer::color)+ .field("size", &esengine::ecs::ShapeRenderer::size)+ .field("cornerRadius", &esengine::ecs::ShapeRenderer::cornerRadius)+ .field("layer", &esengine::ecs::ShapeRenderer::layer)+ .field("enabled", &esengine::ecs::ShapeRenderer::enabled);value_object<esengine::ecs::SpineAnimation>("SpineAnimation").field("skeletonPath", &esengine::ecs::SpineAnimation::skeletonPath)@@ -884,36 +936,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("material", &esengine::ecs::SpineAnimation::material).field("enabled", &esengine::ecs::SpineAnimation::enabled);- value_object<esengine::ecs::Interactable>("Interactable")- .field("enabled", &esengine::ecs::Interactable::enabled)- .field("blockRaycast", &esengine::ecs::Interactable::blockRaycast)- .field("raycastTarget", &esengine::ecs::Interactable::raycastTarget);-- value_object<esengine::ecs::UIInteraction>("UIInteraction")- .field("hovered", &esengine::ecs::UIInteraction::hovered)- .field("pressed", &esengine::ecs::UIInteraction::pressed)- .field("justPressed", &esengine::ecs::UIInteraction::justPressed)- .field("justReleased", &esengine::ecs::UIInteraction::justReleased);-- value_object<RigidBodyJS>("RigidBody")- .field("bodyType", &RigidBodyJS::bodyType)- .field("gravityScale", &RigidBodyJS::gravityScale)- .field("linearDamping", &RigidBodyJS::linearDamping)- .field("angularDamping", &RigidBodyJS::angularDamping)- .field("fixedRotation", &RigidBodyJS::fixedRotation)- .field("bullet", &RigidBodyJS::bullet)- .field("enabled", &RigidBodyJS::enabled);-- value_object<BitmapTextJS>("BitmapText")- .field("text", &BitmapTextJS::text)- .field("color", &BitmapTextJS::color)- .field("fontSize", &BitmapTextJS::fontSize)- .field("align", &BitmapTextJS::align)- .field("spacing", &BitmapTextJS::spacing)- .field("layer", &BitmapTextJS::layer)- .field("font", &BitmapTextJS::font)- .field("enabled", &BitmapTextJS::enabled);-value_object<SpriteJS>("Sprite").field("texture", &SpriteJS::texture).field("color", &SpriteJS::color)@@ -929,67 +951,45 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("material", &SpriteJS::material).field("enabled", &SpriteJS::enabled);+ value_object<esengine::ecs::Transform>("Transform")+ .field("position", &esengine::ecs::Transform::position)+ .field("rotation", &esengine::ecs::Transform::rotation)+ .field("scale", &esengine::ecs::Transform::scale)+ .field("worldPosition", &esengine::ecs::Transform::worldPosition)+ .field("worldRotation", &esengine::ecs::Transform::worldRotation)+ .field("worldScale", &esengine::ecs::Transform::worldScale);++ value_object<esengine::ecs::UIInteraction>("UIInteraction")+ .field("hovered", &esengine::ecs::UIInteraction::hovered)+ .field("pressed", &esengine::ecs::UIInteraction::pressed)+ .field("justPressed", &esengine::ecs::UIInteraction::justPressed)+ .field("justReleased", &esengine::ecs::UIInteraction::justReleased);+value_object<UIMaskJS>("UIMask").field("enabled", &UIMaskJS::enabled).field("mode", &UIMaskJS::mode);- value_object<FlexContainerJS>("FlexContainer")- .field("direction", &FlexContainerJS::direction)- .field("wrap", &FlexContainerJS::wrap)- .field("justifyContent", &FlexContainerJS::justifyContent)- .field("alignItems", &FlexContainerJS::alignItems)- .field("alignContent", &FlexContainerJS::alignContent)- .field("gap", &FlexContainerJS::gap)- .field("padding", &FlexContainerJS::padding);-- value_object<ParentJS>("Parent")- .field("entity", &ParentJS::entity);-- value_object<ChildrenJS>("Children")- .field("entities", &ChildrenJS::entities);-- value_object<esengine::ecs::ShapeRenderer>("ShapeRenderer")- .field("shapeType", &esengine::ecs::ShapeRenderer::shapeType)- .field("color", &esengine::ecs::ShapeRenderer::color)- .field("size", &esengine::ecs::ShapeRenderer::size)- .field("cornerRadius", &esengine::ecs::ShapeRenderer::cornerRadius)- .field("layer", &esengine::ecs::ShapeRenderer::layer)- .field("enabled", &esengine::ecs::ShapeRenderer::enabled);-- value_object<esengine::ecs::Selectable>("Selectable")- .field("selected", &esengine::ecs::Selectable::selected)- .field("group", &esengine::ecs::Selectable::group);-- 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<esengine::ecs::ScreenSpace>("ScreenSpace");+ value_object<esengine::ecs::UIRect>("UIRect")+ .field("anchorMin", &esengine::ecs::UIRect::anchorMin)+ .field("anchorMax", &esengine::ecs::UIRect::anchorMax)+ .field("offsetMin", &esengine::ecs::UIRect::offsetMin)+ .field("offsetMax", &esengine::ecs::UIRect::offsetMax)+ .field("size", &esengine::ecs::UIRect::size)+ .field("pivot", &esengine::ecs::UIRect::pivot);- value_object<CanvasJS>("Canvas")- .field("designResolution", &CanvasJS::designResolution)- .field("pixelsPerUnit", &CanvasJS::pixelsPerUnit)- .field("scaleMode", &CanvasJS::scaleMode)- .field("matchWidthOrHeight", &CanvasJS::matchWidthOrHeight)- .field("backgroundColor", &CanvasJS::backgroundColor);+ value_object<UIRendererJS>("UIRenderer")+ .field("visualType", &UIRendererJS::visualType)+ .field("texture", &UIRendererJS::texture)+ .field("color", &UIRendererJS::color)+ .field("uvOffset", &UIRendererJS::uvOffset)+ .field("uvScale", &UIRendererJS::uvScale)+ .field("sliceBorder", &UIRendererJS::sliceBorder)+ .field("material", &UIRendererJS::material)+ .field("enabled", &UIRendererJS::enabled);- value_object<CameraJS>("Camera")- .field("projectionType", &CameraJS::projectionType)- .field("fov", &CameraJS::fov)- .field("orthoSize", &CameraJS::orthoSize)- .field("nearPlane", &CameraJS::nearPlane)- .field("farPlane", &CameraJS::farPlane)- .field("aspectRatio", &CameraJS::aspectRatio)- .field("isActive", &CameraJS::isActive)- .field("priority", &CameraJS::priority)- .field("viewportX", &CameraJS::viewportX)- .field("viewportY", &CameraJS::viewportY)- .field("viewportW", &CameraJS::viewportW)- .field("viewportH", &CameraJS::viewportH)- .field("clearFlags", &CameraJS::clearFlags);+ value_object<esengine::ecs::Velocity>("Velocity")+ .field("linear", &esengine::ecs::Velocity::linear)+ .field("angular", &esengine::ecs::Velocity::angular);}@@ -1011,45 +1011,64 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {})).function("entityCount", &Registry::entityCount)- // UIRect- .function("hasUIRect", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::UIRect>(static_cast<Entity>(e));+ // BitmapText+ .function("hasBitmapText", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::BitmapText>(static_cast<Entity>(e));}))- .function("getUIRect", optional_override([](Registry& r, u32 e) -> esengine::ecs::UIRect& {+ .function("getBitmapText", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- static esengine::ecs::UIRect s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::UIRect>(entity)) return s_dummy;- return r.get<esengine::ecs::UIRect>(entity);- }), allow_raw_pointers())- .function("addUIRect", optional_override([](Registry& r, u32 e, const esengine::ecs::UIRect& c) {+ if (!r.valid(entity) || !r.has<esengine::ecs::BitmapText>(entity)) return BitmapTextJS{};+ return bitmaptextToJS(r.get<esengine::ecs::BitmapText>(entity));+ }))+ .function("addBitmapText", optional_override([](Registry& r, u32 e, const BitmapTextJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::UIRect>(entity, c);+ r.emplaceOrReplace<esengine::ecs::BitmapText>(entity, bitmaptextFromJS(js));}))- .function("removeUIRect", optional_override([](Registry& r, u32 e) {+ .function("removeBitmapText", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIRect>(entity)) return;- r.remove<esengine::ecs::UIRect>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::BitmapText>(entity)) return;+ r.remove<esengine::ecs::BitmapText>(entity);}))- // FlexItem- .function("hasFlexItem", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::FlexItem>(static_cast<Entity>(e));+ // Camera+ .function("hasCamera", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Camera>(static_cast<Entity>(e));}))- .function("getFlexItem", optional_override([](Registry& r, u32 e) {+ .function("getCamera", 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));+ if (!r.valid(entity) || !r.has<esengine::ecs::Camera>(entity)) return CameraJS{};+ return cameraToJS(r.get<esengine::ecs::Camera>(entity));}))- .function("addFlexItem", optional_override([](Registry& r, u32 e, const FlexItemJS& js) {+ .function("addCamera", optional_override([](Registry& r, u32 e, const CameraJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::FlexItem>(entity, flexitemFromJS(js));+ r.emplaceOrReplace<esengine::ecs::Camera>(entity, cameraFromJS(js));}))- .function("removeFlexItem", optional_override([](Registry& r, u32 e) {+ .function("removeCamera", 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);+ if (!r.valid(entity) || !r.has<esengine::ecs::Camera>(entity)) return;+ r.remove<esengine::ecs::Camera>(entity);+ }))++ // Canvas+ .function("hasCanvas", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Canvas>(static_cast<Entity>(e));+ }))+ .function("getCanvas", optional_override([](Registry& r, u32 e) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity) || !r.has<esengine::ecs::Canvas>(entity)) return CanvasJS{};+ return canvasToJS(r.get<esengine::ecs::Canvas>(entity));+ }))+ .function("addCanvas", optional_override([](Registry& r, u32 e, const CanvasJS& js) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity)) return;+ r.emplaceOrReplace<esengine::ecs::Canvas>(entity, canvasFromJS(js));+ }))+ .function("removeCanvas", optional_override([](Registry& r, u32 e) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity) || !r.has<esengine::ecs::Canvas>(entity)) return;+ r.remove<esengine::ecs::Canvas>(entity);}))// BoxCollider@@ -1157,67 +1176,44 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::FanLayout>(entity);}))- // ParticleEmitter- .function("hasParticleEmitter", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::ParticleEmitter>(static_cast<Entity>(e));- }))- .function("getParticleEmitter", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::ParticleEmitter>(entity)) return ParticleEmitterJS{};- return particleemitterToJS(r.get<esengine::ecs::ParticleEmitter>(entity));- }))- .function("addParticleEmitter", optional_override([](Registry& r, u32 e, const ParticleEmitterJS& js) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::ParticleEmitter>(entity, particleemitterFromJS(js));+ // FlexContainer+ .function("hasFlexContainer", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::FlexContainer>(static_cast<Entity>(e));}))- .function("removeParticleEmitter", optional_override([](Registry& r, u32 e) {+ .function("getFlexContainer", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::ParticleEmitter>(entity)) return;- r.remove<esengine::ecs::ParticleEmitter>(entity);- }))-- // Transform- .function("hasTransform", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Transform>(static_cast<Entity>(e));+ if (!r.valid(entity) || !r.has<esengine::ecs::FlexContainer>(entity)) return FlexContainerJS{};+ return flexcontainerToJS(r.get<esengine::ecs::FlexContainer>(entity));}))- .function("getTransform", optional_override([](Registry& r, u32 e) -> esengine::ecs::Transform& {- auto entity = static_cast<Entity>(e);- static esengine::ecs::Transform s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::Transform>(entity)) return s_dummy;- auto& t = r.get<esengine::ecs::Transform>(entity);- t.ensureDecomposed();- return t;- }), allow_raw_pointers())- .function("addTransform", optional_override([](Registry& r, u32 e, const esengine::ecs::Transform& c) {+ .function("addFlexContainer", optional_override([](Registry& r, u32 e, const FlexContainerJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Transform>(entity, c);+ r.emplaceOrReplace<esengine::ecs::FlexContainer>(entity, flexcontainerFromJS(js));}))- .function("removeTransform", optional_override([](Registry& r, u32 e) {+ .function("removeFlexContainer", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Transform>(entity)) return;- r.remove<esengine::ecs::Transform>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::FlexContainer>(entity)) return;+ r.remove<esengine::ecs::FlexContainer>(entity);}))- // UIRenderer- .function("hasUIRenderer", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::UIRenderer>(static_cast<Entity>(e));+ // FlexItem+ .function("hasFlexItem", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::FlexItem>(static_cast<Entity>(e));}))- .function("getUIRenderer", optional_override([](Registry& r, u32 e) {+ .function("getFlexItem", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIRenderer>(entity)) return UIRendererJS{};- return uirendererToJS(r.get<esengine::ecs::UIRenderer>(entity));+ if (!r.valid(entity) || !r.has<esengine::ecs::FlexItem>(entity)) return FlexItemJS{};+ return flexitemToJS(r.get<esengine::ecs::FlexItem>(entity));}))- .function("addUIRenderer", optional_override([](Registry& r, u32 e, const UIRendererJS& js) {+ .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::UIRenderer>(entity, uirendererFromJS(js));+ r.emplaceOrReplace<esengine::ecs::FlexItem>(entity, flexitemFromJS(js));}))- .function("removeUIRenderer", optional_override([](Registry& r, u32 e) {+ .function("removeFlexItem", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIRenderer>(entity)) return;- r.remove<esengine::ecs::UIRenderer>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::FlexItem>(entity)) return;+ r.remove<esengine::ecs::FlexItem>(entity);}))// GridLayout@@ -1241,46 +1237,44 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::GridLayout>(entity);}))- // Velocity- .function("hasVelocity", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Velocity>(static_cast<Entity>(e));+ // Parent+ .function("hasParent", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Parent>(static_cast<Entity>(e));}))- .function("getVelocity", optional_override([](Registry& r, u32 e) -> esengine::ecs::Velocity& {- auto entity = static_cast<Entity>(e);- static esengine::ecs::Velocity s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::Velocity>(entity)) return s_dummy;- return r.get<esengine::ecs::Velocity>(entity);- }), allow_raw_pointers())- .function("addVelocity", optional_override([](Registry& r, u32 e, const esengine::ecs::Velocity& c) {+ .function("getParent", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Velocity>(entity, c);+ if (!r.valid(entity) || !r.has<esengine::ecs::Parent>(entity)) return ParentJS{};+ return parentToJS(r.get<esengine::ecs::Parent>(entity));}))- .function("removeVelocity", optional_override([](Registry& r, u32 e) {+ .function("addParent", optional_override([](Registry& r, u32 e, const ParentJS& js) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Velocity>(entity)) return;- r.remove<esengine::ecs::Velocity>(entity);+ if (!r.valid(entity)) return;+ r.emplaceOrReplace<esengine::ecs::Parent>(entity, parentFromJS(js));+ }))+ .function("removeParent", optional_override([](Registry& r, u32 e) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity) || !r.has<esengine::ecs::Parent>(entity)) return;+ r.remove<esengine::ecs::Parent>(entity);}))- // SpineAnimation- .function("hasSpineAnimation", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::SpineAnimation>(static_cast<Entity>(e));+ // Children+ .function("hasChildren", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Children>(static_cast<Entity>(e));}))- .function("getSpineAnimation", optional_override([](Registry& r, u32 e) -> esengine::ecs::SpineAnimation& {+ .function("getChildren", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- static esengine::ecs::SpineAnimation s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::SpineAnimation>(entity)) return s_dummy;- return r.get<esengine::ecs::SpineAnimation>(entity);- }), allow_raw_pointers())- .function("addSpineAnimation", optional_override([](Registry& r, u32 e, const esengine::ecs::SpineAnimation& c) {+ if (!r.valid(entity) || !r.has<esengine::ecs::Children>(entity)) return ChildrenJS{};+ return childrenToJS(r.get<esengine::ecs::Children>(entity));+ }))+ .function("addChildren", optional_override([](Registry& r, u32 e, const ChildrenJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::SpineAnimation>(entity, c);+ r.emplaceOrReplace<esengine::ecs::Children>(entity, childrenFromJS(js));}))- .function("removeSpineAnimation", optional_override([](Registry& r, u32 e) {+ .function("removeChildren", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::SpineAnimation>(entity)) return;- r.remove<esengine::ecs::SpineAnimation>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::Children>(entity)) return;+ r.remove<esengine::ecs::Children>(entity);}))// Interactable@@ -1304,25 +1298,44 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::Interactable>(entity);}))- // UIInteraction- .function("hasUIInteraction", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::UIInteraction>(static_cast<Entity>(e));+ // LayoutGroup+ .function("hasLayoutGroup", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::LayoutGroup>(static_cast<Entity>(e));}))- .function("getUIInteraction", optional_override([](Registry& r, u32 e) -> esengine::ecs::UIInteraction& {+ .function("getLayoutGroup", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- static esengine::ecs::UIInteraction s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::UIInteraction>(entity)) return s_dummy;- return r.get<esengine::ecs::UIInteraction>(entity);- }), allow_raw_pointers())- .function("addUIInteraction", optional_override([](Registry& r, u32 e, const esengine::ecs::UIInteraction& c) {+ 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::UIInteraction>(entity, c);+ r.emplaceOrReplace<esengine::ecs::LayoutGroup>(entity, layoutgroupFromJS(js));}))- .function("removeUIInteraction", optional_override([](Registry& r, u32 e) {+ .function("removeLayoutGroup", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIInteraction>(entity)) return;- r.remove<esengine::ecs::UIInteraction>(entity);+ 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));+ }))+ .function("getParticleEmitter", optional_override([](Registry& r, u32 e) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity) || !r.has<esengine::ecs::ParticleEmitter>(entity)) return ParticleEmitterJS{};+ return particleemitterToJS(r.get<esengine::ecs::ParticleEmitter>(entity));+ }))+ .function("addParticleEmitter", optional_override([](Registry& r, u32 e, const ParticleEmitterJS& js) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity)) return;+ r.emplaceOrReplace<esengine::ecs::ParticleEmitter>(entity, particleemitterFromJS(js));+ }))+ .function("removeParticleEmitter", optional_override([](Registry& r, u32 e) {+ auto entity = static_cast<Entity>(e);+ if (!r.valid(entity) || !r.has<esengine::ecs::ParticleEmitter>(entity)) return;+ r.remove<esengine::ecs::ParticleEmitter>(entity);}))// RigidBody@@ -1345,247 +1358,234 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {r.remove<esengine::ecs::RigidBody>(entity);}))- // BitmapText- .function("hasBitmapText", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::BitmapText>(static_cast<Entity>(e));- }))- .function("getBitmapText", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::BitmapText>(entity)) return BitmapTextJS{};- return bitmaptextToJS(r.get<esengine::ecs::BitmapText>(entity));- }))- .function("addBitmapText", optional_override([](Registry& r, u32 e, const BitmapTextJS& js) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::BitmapText>(entity, bitmaptextFromJS(js));- }))- .function("removeBitmapText", optional_override([](Registry& r, u32 e) {- auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::BitmapText>(entity)) return;- r.remove<esengine::ecs::BitmapText>(entity);- }))-- // Sprite- .function("hasSprite", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Sprite>(static_cast<Entity>(e));+ // ScreenSpace+ .function("hasScreenSpace", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::ScreenSpace>(static_cast<Entity>(e));}))- .function("getSprite", optional_override([](Registry& r, u32 e) {+ .function("getScreenSpace", optional_override([](Registry& r, u32 e) -> esengine::ecs::ScreenSpace& {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Sprite>(entity)) return SpriteJS{};- return spriteToJS(r.get<esengine::ecs::Sprite>(entity));- }))- .function("addSprite", optional_override([](Registry& r, u32 e, const SpriteJS& js) {+ 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::Sprite>(entity, spriteFromJS(js));+ r.emplaceOrReplace<esengine::ecs::ScreenSpace>(entity, c);}))- .function("removeSprite", optional_override([](Registry& r, u32 e) {+ .function("removeScreenSpace", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Sprite>(entity)) return;- r.remove<esengine::ecs::Sprite>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::ScreenSpace>(entity)) return;+ r.remove<esengine::ecs::ScreenSpace>(entity);}))- // UIMask- .function("hasUIMask", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::UIMask>(static_cast<Entity>(e));+ // Selectable+ .function("hasSelectable", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Selectable>(static_cast<Entity>(e));}))- .function("getUIMask", optional_override([](Registry& r, u32 e) {+ .function("getSelectable", optional_override([](Registry& r, u32 e) -> esengine::ecs::Selectable& {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIMask>(entity)) return UIMaskJS{};- return uimaskToJS(r.get<esengine::ecs::UIMask>(entity));- }))- .function("addUIMask", optional_override([](Registry& r, u32 e, const UIMaskJS& js) {+ 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::UIMask>(entity, uimaskFromJS(js));+ r.emplaceOrReplace<esengine::ecs::Selectable>(entity, c);}))- .function("removeUIMask", optional_override([](Registry& r, u32 e) {+ .function("removeSelectable", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::UIMask>(entity)) return;- r.remove<esengine::ecs::UIMask>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::Selectable>(entity)) return;+ r.remove<esengine::ecs::Selectable>(entity);}))- // FlexContainer- .function("hasFlexContainer", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::FlexContainer>(static_cast<Entity>(e));+ // ShapeRenderer+ .function("hasShapeRenderer", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::ShapeRenderer>(static_cast<Entity>(e));}))- .function("getFlexContainer", optional_override([](Registry& r, u32 e) {+ .function("getShapeRenderer", optional_override([](Registry& r, u32 e) -> esengine::ecs::ShapeRenderer& {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::FlexContainer>(entity)) return FlexContainerJS{};- return flexcontainerToJS(r.get<esengine::ecs::FlexContainer>(entity));- }))- .function("addFlexContainer", optional_override([](Registry& r, u32 e, const FlexContainerJS& js) {+ static esengine::ecs::ShapeRenderer s_dummy{};+ if (!r.valid(entity) || !r.has<esengine::ecs::ShapeRenderer>(entity)) return s_dummy;+ return r.get<esengine::ecs::ShapeRenderer>(entity);+ }), allow_raw_pointers())+ .function("addShapeRenderer", optional_override([](Registry& r, u32 e, const esengine::ecs::ShapeRenderer& c) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::FlexContainer>(entity, flexcontainerFromJS(js));+ r.emplaceOrReplace<esengine::ecs::ShapeRenderer>(entity, c);}))- .function("removeFlexContainer", optional_override([](Registry& r, u32 e) {+ .function("removeShapeRenderer", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::FlexContainer>(entity)) return;- r.remove<esengine::ecs::FlexContainer>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::ShapeRenderer>(entity)) return;+ r.remove<esengine::ecs::ShapeRenderer>(entity);}))- // Parent- .function("hasParent", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Parent>(static_cast<Entity>(e));+ // SpineAnimation+ .function("hasSpineAnimation", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::SpineAnimation>(static_cast<Entity>(e));}))- .function("getParent", optional_override([](Registry& r, u32 e) {+ .function("getSpineAnimation", optional_override([](Registry& r, u32 e) -> esengine::ecs::SpineAnimation& {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Parent>(entity)) return ParentJS{};- return parentToJS(r.get<esengine::ecs::Parent>(entity));- }))- .function("addParent", optional_override([](Registry& r, u32 e, const ParentJS& js) {+ static esengine::ecs::SpineAnimation s_dummy{};+ if (!r.valid(entity) || !r.has<esengine::ecs::SpineAnimation>(entity)) return s_dummy;+ return r.get<esengine::ecs::SpineAnimation>(entity);+ }), allow_raw_pointers())+ .function("addSpineAnimation", optional_override([](Registry& r, u32 e, const esengine::ecs::SpineAnimation& c) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Parent>(entity, parentFromJS(js));+ r.emplaceOrReplace<esengine::ecs::SpineAnimation>(entity, c);}))- .function("removeParent", optional_override([](Registry& r, u32 e) {+ .function("removeSpineAnimation", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Parent>(entity)) return;- r.remove<esengine::ecs::Parent>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::SpineAnimation>(entity)) return;+ r.remove<esengine::ecs::SpineAnimation>(entity);}))- // Children- .function("hasChildren", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Children>(static_cast<Entity>(e));+ // Sprite+ .function("hasSprite", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Sprite>(static_cast<Entity>(e));}))- .function("getChildren", optional_override([](Registry& r, u32 e) {+ .function("getSprite", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Children>(entity)) return ChildrenJS{};- return childrenToJS(r.get<esengine::ecs::Children>(entity));+ if (!r.valid(entity) || !r.has<esengine::ecs::Sprite>(entity)) return SpriteJS{};+ return spriteToJS(r.get<esengine::ecs::Sprite>(entity));}))- .function("addChildren", optional_override([](Registry& r, u32 e, const ChildrenJS& js) {+ .function("addSprite", optional_override([](Registry& r, u32 e, const SpriteJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Children>(entity, childrenFromJS(js));+ r.emplaceOrReplace<esengine::ecs::Sprite>(entity, spriteFromJS(js));}))- .function("removeChildren", optional_override([](Registry& r, u32 e) {+ .function("removeSprite", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Children>(entity)) return;- r.remove<esengine::ecs::Children>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::Sprite>(entity)) return;+ r.remove<esengine::ecs::Sprite>(entity);}))- // ShapeRenderer- .function("hasShapeRenderer", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::ShapeRenderer>(static_cast<Entity>(e));+ // Transform+ .function("hasTransform", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Transform>(static_cast<Entity>(e));}))- .function("getShapeRenderer", optional_override([](Registry& r, u32 e) -> esengine::ecs::ShapeRenderer& {+ .function("getTransform", optional_override([](Registry& r, u32 e) -> esengine::ecs::Transform& {auto entity = static_cast<Entity>(e);- static esengine::ecs::ShapeRenderer s_dummy{};- if (!r.valid(entity) || !r.has<esengine::ecs::ShapeRenderer>(entity)) return s_dummy;- return r.get<esengine::ecs::ShapeRenderer>(entity);+ static esengine::ecs::Transform s_dummy{};+ if (!r.valid(entity) || !r.has<esengine::ecs::Transform>(entity)) return s_dummy;+ auto& t = r.get<esengine::ecs::Transform>(entity);+ t.ensureDecomposed();+ return t;}), allow_raw_pointers())- .function("addShapeRenderer", optional_override([](Registry& r, u32 e, const esengine::ecs::ShapeRenderer& c) {+ .function("addTransform", optional_override([](Registry& r, u32 e, const esengine::ecs::Transform& c) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::ShapeRenderer>(entity, c);+ r.emplaceOrReplace<esengine::ecs::Transform>(entity, c);}))- .function("removeShapeRenderer", optional_override([](Registry& r, u32 e) {+ .function("removeTransform", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::ShapeRenderer>(entity)) return;- r.remove<esengine::ecs::ShapeRenderer>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::Transform>(entity)) return;+ r.remove<esengine::ecs::Transform>(entity);}))- // Selectable- .function("hasSelectable", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Selectable>(static_cast<Entity>(e));+ // UIInteraction+ .function("hasUIInteraction", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::UIInteraction>(static_cast<Entity>(e));}))- .function("getSelectable", optional_override([](Registry& r, u32 e) -> esengine::ecs::Selectable& {+ .function("getUIInteraction", optional_override([](Registry& r, u32 e) -> esengine::ecs::UIInteraction& {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);+ static esengine::ecs::UIInteraction s_dummy{};+ if (!r.valid(entity) || !r.has<esengine::ecs::UIInteraction>(entity)) return s_dummy;+ return r.get<esengine::ecs::UIInteraction>(entity);}), allow_raw_pointers())- .function("addSelectable", optional_override([](Registry& r, u32 e, const esengine::ecs::Selectable& c) {+ .function("addUIInteraction", optional_override([](Registry& r, u32 e, const esengine::ecs::UIInteraction& c) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Selectable>(entity, c);+ r.emplaceOrReplace<esengine::ecs::UIInteraction>(entity, c);}))- .function("removeSelectable", optional_override([](Registry& r, u32 e) {+ .function("removeUIInteraction", 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);+ if (!r.valid(entity) || !r.has<esengine::ecs::UIInteraction>(entity)) return;+ r.remove<esengine::ecs::UIInteraction>(entity);}))- // LayoutGroup- .function("hasLayoutGroup", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::LayoutGroup>(static_cast<Entity>(e));+ // UIMask+ .function("hasUIMask", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::UIMask>(static_cast<Entity>(e));}))- .function("getLayoutGroup", optional_override([](Registry& r, u32 e) {+ .function("getUIMask", 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));+ if (!r.valid(entity) || !r.has<esengine::ecs::UIMask>(entity)) return UIMaskJS{};+ return uimaskToJS(r.get<esengine::ecs::UIMask>(entity));}))- .function("addLayoutGroup", optional_override([](Registry& r, u32 e, const LayoutGroupJS& js) {+ .function("addUIMask", optional_override([](Registry& r, u32 e, const UIMaskJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::LayoutGroup>(entity, layoutgroupFromJS(js));+ r.emplaceOrReplace<esengine::ecs::UIMask>(entity, uimaskFromJS(js));}))- .function("removeLayoutGroup", optional_override([](Registry& r, u32 e) {+ .function("removeUIMask", 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);+ if (!r.valid(entity) || !r.has<esengine::ecs::UIMask>(entity)) return;+ r.remove<esengine::ecs::UIMask>(entity);}))- // ScreenSpace- .function("hasScreenSpace", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::ScreenSpace>(static_cast<Entity>(e));+ // UIRect+ .function("hasUIRect", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::UIRect>(static_cast<Entity>(e));}))- .function("getScreenSpace", optional_override([](Registry& r, u32 e) -> esengine::ecs::ScreenSpace& {+ .function("getUIRect", optional_override([](Registry& r, u32 e) -> esengine::ecs::UIRect& {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);+ static esengine::ecs::UIRect s_dummy{};+ if (!r.valid(entity) || !r.has<esengine::ecs::UIRect>(entity)) return s_dummy;+ return r.get<esengine::ecs::UIRect>(entity);}), allow_raw_pointers())- .function("addScreenSpace", optional_override([](Registry& r, u32 e, const esengine::ecs::ScreenSpace& c) {+ .function("addUIRect", optional_override([](Registry& r, u32 e, const esengine::ecs::UIRect& c) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::ScreenSpace>(entity, c);+ r.emplaceOrReplace<esengine::ecs::UIRect>(entity, c);}))- .function("removeScreenSpace", optional_override([](Registry& r, u32 e) {+ .function("removeUIRect", 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);+ if (!r.valid(entity) || !r.has<esengine::ecs::UIRect>(entity)) return;+ r.remove<esengine::ecs::UIRect>(entity);}))- // Canvas- .function("hasCanvas", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Canvas>(static_cast<Entity>(e));+ // UIRenderer+ .function("hasUIRenderer", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::UIRenderer>(static_cast<Entity>(e));}))- .function("getCanvas", optional_override([](Registry& r, u32 e) {+ .function("getUIRenderer", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Canvas>(entity)) return CanvasJS{};- return canvasToJS(r.get<esengine::ecs::Canvas>(entity));+ if (!r.valid(entity) || !r.has<esengine::ecs::UIRenderer>(entity)) return UIRendererJS{};+ return uirendererToJS(r.get<esengine::ecs::UIRenderer>(entity));}))- .function("addCanvas", optional_override([](Registry& r, u32 e, const CanvasJS& js) {+ .function("addUIRenderer", optional_override([](Registry& r, u32 e, const UIRendererJS& js) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Canvas>(entity, canvasFromJS(js));+ r.emplaceOrReplace<esengine::ecs::UIRenderer>(entity, uirendererFromJS(js));}))- .function("removeCanvas", optional_override([](Registry& r, u32 e) {+ .function("removeUIRenderer", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Canvas>(entity)) return;- r.remove<esengine::ecs::Canvas>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::UIRenderer>(entity)) return;+ r.remove<esengine::ecs::UIRenderer>(entity);}))- // Camera- .function("hasCamera", optional_override([](Registry& r, u32 e) {- return r.has<esengine::ecs::Camera>(static_cast<Entity>(e));+ // Velocity+ .function("hasVelocity", optional_override([](Registry& r, u32 e) {+ return r.has<esengine::ecs::Velocity>(static_cast<Entity>(e));}))- .function("getCamera", optional_override([](Registry& r, u32 e) {+ .function("getVelocity", optional_override([](Registry& r, u32 e) -> esengine::ecs::Velocity& {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Camera>(entity)) return CameraJS{};- return cameraToJS(r.get<esengine::ecs::Camera>(entity));- }))- .function("addCamera", optional_override([](Registry& r, u32 e, const CameraJS& js) {+ static esengine::ecs::Velocity s_dummy{};+ if (!r.valid(entity) || !r.has<esengine::ecs::Velocity>(entity)) return s_dummy;+ return r.get<esengine::ecs::Velocity>(entity);+ }), allow_raw_pointers())+ .function("addVelocity", optional_override([](Registry& r, u32 e, const esengine::ecs::Velocity& c) {auto entity = static_cast<Entity>(e);if (!r.valid(entity)) return;- r.emplaceOrReplace<esengine::ecs::Camera>(entity, cameraFromJS(js));+ r.emplaceOrReplace<esengine::ecs::Velocity>(entity, c);}))- .function("removeCamera", optional_override([](Registry& r, u32 e) {+ .function("removeVelocity", optional_override([](Registry& r, u32 e) {auto entity = static_cast<Entity>(e);- if (!r.valid(entity) || !r.has<esengine::ecs::Camera>(entity)) return;- r.remove<esengine::ecs::Camera>(entity);+ if (!r.valid(entity) || !r.has<esengine::ecs::Velocity>(entity)) return;+ r.remove<esengine::ecs::Velocity>(entity);}))// Hierarchy Utilitiesdiff --git a/src/esengine/core/EstellaContext.cpp b/src/esengine/core/EstellaContext.cppindex a73e150aa..bd1c59f81 100644--- a/src/esengine/core/EstellaContext.cpp+++ b/src/esengine/core/EstellaContext.cpp@@ -25,6 +25,7 @@#ifdef ES_ENABLE_TILEMAP#include "../renderer/plugins/TilemapRenderPlugin.hpp"#include "../tilemap/TilemapSystem.hpp"+#include "../tilemap/TiledMapLoader.hpp"#endif#ifdef ES_ENABLE_SPINE#include "../renderer/plugins/SpinePlugin.hpp"@@ -120,6 +121,11 @@ void EstellaContext::initSubsystems() {services_.registerOwned<GeometryManager>(makeUnique<GeometryManager>());+#ifdef ES_ENABLE_TILEMAP+ services_.registerOwned<tilemap::TilemapSystem>(makeUnique<tilemap::TilemapSystem>());+ services_.registerOwned<tilemap::TiledMapLoader>(makeUnique<tilemap::TiledMapLoader>());+#endif+auto renderFrame = makeUnique<RenderFrame>(*gfxDevicePtr, *rc, *rm);renderFrame->addPlugin(std::make_unique<SpritePlugin>());renderFrame->addPlugin(std::make_unique<UIElementPlugin>());@@ -129,8 +135,7 @@ void EstellaContext::initSubsystems() {#ifdef ES_ENABLE_TILEMAP{auto tilemapPlugin = std::make_unique<TilemapRenderPlugin>();- auto* ts = services_.getService<tilemap::TilemapSystem>();- if (ts) tilemapPlugin->setTilemapSystem(ts);+ tilemapPlugin->setTilemapSystem(services_.getService<tilemap::TilemapSystem>());renderFrame->addPlugin(std::move(tilemapPlugin));}#endifdiff --git a/src/esengine/platform/web/WebPlatform.cpp b/src/esengine/platform/web/WebPlatform.cppindex 8a8e6140b..8d7e1bcbd 100644--- a/src/esengine/platform/web/WebPlatform.cpp+++ b/src/esengine/platform/web/WebPlatform.cpp@@ -13,8 +13,6 @@#include "../Platform.hpp"#include "../../core/Log.hpp"-#include "../../renderer/Renderer.hpp"-#include "../../renderer/RenderContext.hpp"#include "../../math/Math.hpp"#include <cstring>@@ -321,127 +319,3 @@ Unique<Platform> Platform::create() {} // namespace esengine-// ========================================-// C API for JavaScript interop-// ========================================--#ifdef ES_PLATFORM_WEB-#include <emscripten/emscripten.h>--extern "C" {--static esengine::WebPlatform* g_platform = nullptr;-static esengine::Unique<esengine::RenderContext> g_renderContext = nullptr;-static esengine::Unique<esengine::Renderer> g_renderer = nullptr;--EMSCRIPTEN_KEEPALIVE-void es_init(int width, int height) {- esengine::Log::init();- g_platform = static_cast<esengine::WebPlatform*>(- esengine::Platform::create().release()- );- g_platform->initialize(width, height);-- g_renderContext = esengine::makeUnique<esengine::RenderContext>();- g_renderContext->init();- g_renderer = esengine::makeUnique<esengine::Renderer>(*g_renderContext);-}--EMSCRIPTEN_KEEPALIVE-void es_update(float deltaTime) {- if (g_platform) {- g_platform->pollEvents();- }- (void)deltaTime;-}--EMSCRIPTEN_KEEPALIVE-void es_render() {- if (g_renderer) {- g_renderer->beginFrame();- g_renderer->clear();- // Application rendering would go here- g_renderer->endFrame();- }-}--EMSCRIPTEN_KEEPALIVE-void es_shutdown() {- g_renderer.reset();- if (g_renderContext) {- g_renderContext->shutdown();- g_renderContext.reset();- }- if (g_platform) {- g_platform->shutdown();- delete g_platform;- g_platform = nullptr;- }- esengine::Log::shutdown();-}--EMSCRIPTEN_KEEPALIVE-void es_on_touch(int type, float x, float y) {- // Touch handling would be forwarded to the application- (void)type;- (void)x;- (void)y;-}--EMSCRIPTEN_KEEPALIVE-void es_on_key(int keyCode, int pressed) {- // Key handling would be forwarded to the application- (void)keyCode;- (void)pressed;-}--EMSCRIPTEN_KEEPALIVE-void es_renderer_clear(float r, float g, float b, float a) {- if (g_renderer) {- g_renderer->setClearColor(glm::vec4(r, g, b, a));- g_renderer->clear();- }-}--EMSCRIPTEN_KEEPALIVE-void es_renderer_begin_scene(float* vpMatrix) {- if (g_renderer && vpMatrix) {- glm::mat4 vp;- std::memcpy(&vp[0][0], vpMatrix, 16 * sizeof(float));- g_renderer->beginScene(vp);- }-}--EMSCRIPTEN_KEEPALIVE-void es_renderer_end_scene() {- if (g_renderer) {- g_renderer->endScene();- }-}--EMSCRIPTEN_KEEPALIVE-void es_renderer_draw_quad(float x, float y, float w, float h, float r, float g, float b, float a) {- if (g_renderer) {- g_renderer->drawQuad(- glm::vec2(x, y),- glm::vec2(w, h),- glm::vec4(r, g, b, a)- );- }-}--EMSCRIPTEN_KEEPALIVE-void es_renderer_draw_quad_textured(float x, float y, float w, float h, unsigned int texId, float r, float g, float b, float a) {- // TODO: Implement textured quad drawing with texture ID- (void)texId;- if (g_renderer) {- g_renderer->drawQuad(- glm::vec2(x, y),- glm::vec2(w, h),- glm::vec4(r, g, b, a)- );- }-}--} // extern "C"-#endifdiff --git a/src/esengine/renderer/CustomGeometry.hpp b/src/esengine/renderer/CustomGeometry.hppindex 1ff1f801b..b6d5897df 100644--- a/src/esengine/renderer/CustomGeometry.hpp+++ b/src/esengine/renderer/CustomGeometry.hpp@@ -17,6 +17,8 @@namespace esengine {+class GfxDevice;+/*** @brief Custom geometry for user-defined mesh rendering*