Skip to content

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

refactor(eht): generalize codegen for POD nested structs + deterministic output (REARCH_GUI F1)

esengine453022af37e5
diff --git a/sdk/src/component.generated.ts b/sdk/src/component.generated.ts
index 38a52eb6c..8329b6e8f 100644
--- a/sdk/src/component.generated.ts
+++ b/sdk/src/component.generated.ts
@@ -50,6 +50,23 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: ['color'],
animatableFields: ['color.r', 'color.g', 'color.b', 'color.a'],
},
+ BoxCollider: {
+ defaults: {
+ halfExtents: { x: 0.5, y: 0.5 },
+ offset: { x: 0, y: 0 },
+ density: 1,
+ friction: 0.3,
+ restitution: 0,
+ isSensor: false,
+ enabled: true,
+ categoryBits: 0,
+ maskBits: 0,
+ },
+ assetFields: [],
+ entityFields: [],
+ colorFields: [],
+ animatableFields: [],
+ },
Camera: {
defaults: {
projectionType: 0,
@@ -81,9 +98,10 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: ['backgroundColor'],
animatableFields: [],
},
- BoxCollider: {
+ CapsuleCollider: {
defaults: {
- halfExtents: { x: 0.5, y: 0.5 },
+ radius: 0.25,
+ halfHeight: 0.5,
offset: { x: 0, y: 0 },
density: 1,
friction: 0.3,
@@ -98,27 +116,18 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: [],
animatableFields: [],
},
- CircleCollider: {
+ Children: {
defaults: {
- radius: 0.5,
- offset: { x: 0, y: 0 },
- density: 1,
- friction: 0.3,
- restitution: 0,
- isSensor: false,
- enabled: true,
- categoryBits: 0,
- maskBits: 0,
+ entities: [],
},
assetFields: [],
- entityFields: [],
+ entityFields: ['entities'],
colorFields: [],
animatableFields: [],
},
- CapsuleCollider: {
+ CircleCollider: {
defaults: {
- radius: 0.25,
- halfHeight: 0.5,
+ radius: 0.5,
offset: { x: 0, y: 0 },
density: 1,
friction: 0.3,
@@ -133,23 +142,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: [],
animatableFields: [],
},
- SegmentCollider: {
- defaults: {
- point1: { x: -0.5, y: 0 },
- point2: { x: 0.5, y: 0 },
- density: 1,
- friction: 0.3,
- restitution: 0,
- isSensor: false,
- enabled: true,
- categoryBits: 0,
- maskBits: 0,
- },
- assetFields: [],
- entityFields: [],
- colorFields: [],
- animatableFields: [],
- },
FlexContainer: {
defaults: {
direction: 0,
@@ -197,32 +189,23 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: [],
animatableFields: [],
},
- Parent: {
- defaults: {
- entity: 0,
- },
- assetFields: [],
- entityFields: ['entity'],
- colorFields: [],
- animatableFields: [],
- },
- Children: {
+ Interactable: {
defaults: {
- entities: [],
+ enabled: true,
+ blockRaycast: true,
+ raycastTarget: true,
},
assetFields: [],
- entityFields: ['entities'],
+ entityFields: [],
colorFields: [],
animatableFields: [],
},
- Interactable: {
+ Parent: {
defaults: {
- enabled: true,
- blockRaycast: true,
- raycastTarget: true,
+ entity: 0,
},
assetFields: [],
- entityFields: [],
+ entityFields: ['entity'],
colorFields: [],
animatableFields: [],
},
@@ -290,6 +273,23 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {
colorFields: [],
animatableFields: [],
},
+ SegmentCollider: {
+ defaults: {
+ point1: { x: -0.5, y: 0 },
+ point2: { x: 0.5, y: 0 },
+ density: 1,
+ friction: 0.3,
+ restitution: 0,
+ isSensor: false,
+ enabled: true,
+ categoryBits: 0,
+ maskBits: 0,
+ },
+ assetFields: [],
+ entityFields: [],
+ colorFields: [],
+ animatableFields: [],
+ },
ShapeRenderer: {
defaults: {
shapeType: 0,
diff --git a/sdk/src/ecs/ptrAccessors.generated.ts b/sdk/src/ecs/ptrAccessors.generated.ts
index ca089a115..1bb91a57e 100644
--- a/sdk/src/ecs/ptrAccessors.generated.ts
+++ b/sdk/src/ecs/ptrAccessors.generated.ts
@@ -57,6 +57,62 @@ export function createBitmapTextData(): BitmapTextPtrData {
};
}
+export interface BoxColliderPtrData {
+ halfExtents: Vec2;
+ offset: Vec2;
+ density: number;
+ friction: number;
+ restitution: number;
+ isSensor: boolean;
+ enabled: boolean;
+ categoryBits: number;
+ maskBits: number;
+}
+
+export function fillBoxCollider(
+ f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
+ ptr: number, out: BoxColliderPtrData,
+): void {
+ const halfExtents_ = out.halfExtents; halfExtents_.x = f32[ptr >> 2]; halfExtents_.y = f32[(ptr >> 2) + 1];
+ const offset_ = out.offset; offset_.x = f32[(ptr + 8) >> 2]; offset_.y = f32[((ptr + 8) >> 2) + 1];
+ out.density = f32[(ptr + 16) >> 2];
+ out.friction = f32[(ptr + 20) >> 2];
+ out.restitution = f32[(ptr + 24) >> 2];
+ out.isSensor = u8[ptr + 28] !== 0;
+ out.enabled = u8[ptr + 29] !== 0;
+ out.categoryBits = u32[(ptr + 32) >> 2];
+ out.maskBits = u32[(ptr + 36) >> 2];
+}
+
+export function writeBoxCollider(
+ f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
+ ptr: number, data: BoxColliderPtrData,
+): void {
+ f32[ptr >> 2] = data.halfExtents.x; f32[(ptr >> 2) + 1] = data.halfExtents.y;
+ f32[(ptr + 8) >> 2] = data.offset.x; f32[((ptr + 8) >> 2) + 1] = data.offset.y;
+ f32[(ptr + 16) >> 2] = data.density;
+ f32[(ptr + 20) >> 2] = data.friction;
+ f32[(ptr + 24) >> 2] = data.restitution;
+ u8[ptr + 28] = data.isSensor ? 1 : 0;
+ u8[ptr + 29] = data.enabled ? 1 : 0;
+ u32[(ptr + 32) >> 2] = data.categoryBits;
+ u32[(ptr + 36) >> 2] = data.maskBits;
+}
+
+export function createBoxColliderData(): BoxColliderPtrData {
+ return {
+ halfExtents: { x: 0, y: 0 },
+ offset: { x: 0, y: 0 },
+ density: 0,
+ friction: 0,
+ restitution: 0,
+ isSensor: false,
+ enabled: false,
+ categoryBits: 0,
+ maskBits: 0,
+ };
+}
+
export interface CameraPtrData {
projectionType: number;
fov: number;
@@ -157,8 +213,9 @@ export function createCanvasData(): CanvasPtrData {
};
}
-export interface BoxColliderPtrData {
- halfExtents: Vec2;
+export interface CapsuleColliderPtrData {
+ radius: number;
+ halfHeight: number;
offset: Vec2;
density: number;
friction: number;
@@ -169,11 +226,12 @@ export interface BoxColliderPtrData {
maskBits: number;
}
-export function fillBoxCollider(
+export function fillCapsuleCollider(
f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, out: BoxColliderPtrData,
+ ptr: number, out: CapsuleColliderPtrData,
): void {
- const halfExtents_ = out.halfExtents; halfExtents_.x = f32[ptr >> 2]; halfExtents_.y = f32[(ptr >> 2) + 1];
+ out.radius = f32[ptr >> 2];
+ out.halfHeight = f32[(ptr + 4) >> 2];
const offset_ = out.offset; offset_.x = f32[(ptr + 8) >> 2]; offset_.y = f32[((ptr + 8) >> 2) + 1];
out.density = f32[(ptr + 16) >> 2];
out.friction = f32[(ptr + 20) >> 2];
@@ -184,11 +242,12 @@ export function fillBoxCollider(
out.maskBits = u32[(ptr + 36) >> 2];
}
-export function writeBoxCollider(
+export function writeCapsuleCollider(
f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, data: BoxColliderPtrData,
+ ptr: number, data: CapsuleColliderPtrData,
): void {
- f32[ptr >> 2] = data.halfExtents.x; f32[(ptr >> 2) + 1] = data.halfExtents.y;
+ f32[ptr >> 2] = data.radius;
+ f32[(ptr + 4) >> 2] = data.halfHeight;
f32[(ptr + 8) >> 2] = data.offset.x; f32[((ptr + 8) >> 2) + 1] = data.offset.y;
f32[(ptr + 16) >> 2] = data.density;
f32[(ptr + 20) >> 2] = data.friction;
@@ -199,9 +258,10 @@ export function writeBoxCollider(
u32[(ptr + 36) >> 2] = data.maskBits;
}
-export function createBoxColliderData(): BoxColliderPtrData {
+export function createCapsuleColliderData(): CapsuleColliderPtrData {
return {
- halfExtents: { x: 0, y: 0 },
+ radius: 0,
+ halfHeight: 0,
offset: { x: 0, y: 0 },
density: 0,
friction: 0,
@@ -269,122 +329,6 @@ export function createCircleColliderData(): CircleColliderPtrData {
};
}
-export interface CapsuleColliderPtrData {
- radius: number;
- halfHeight: number;
- offset: Vec2;
- density: number;
- friction: number;
- restitution: number;
- isSensor: boolean;
- enabled: boolean;
- categoryBits: number;
- maskBits: number;
-}
-
-export function fillCapsuleCollider(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, out: CapsuleColliderPtrData,
-): void {
- out.radius = f32[ptr >> 2];
- out.halfHeight = f32[(ptr + 4) >> 2];
- const offset_ = out.offset; offset_.x = f32[(ptr + 8) >> 2]; offset_.y = f32[((ptr + 8) >> 2) + 1];
- out.density = f32[(ptr + 16) >> 2];
- out.friction = f32[(ptr + 20) >> 2];
- out.restitution = f32[(ptr + 24) >> 2];
- out.isSensor = u8[ptr + 28] !== 0;
- out.enabled = u8[ptr + 29] !== 0;
- out.categoryBits = u32[(ptr + 32) >> 2];
- out.maskBits = u32[(ptr + 36) >> 2];
-}
-
-export function writeCapsuleCollider(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, data: CapsuleColliderPtrData,
-): void {
- f32[ptr >> 2] = data.radius;
- f32[(ptr + 4) >> 2] = data.halfHeight;
- f32[(ptr + 8) >> 2] = data.offset.x; f32[((ptr + 8) >> 2) + 1] = data.offset.y;
- f32[(ptr + 16) >> 2] = data.density;
- f32[(ptr + 20) >> 2] = data.friction;
- f32[(ptr + 24) >> 2] = data.restitution;
- u8[ptr + 28] = data.isSensor ? 1 : 0;
- u8[ptr + 29] = data.enabled ? 1 : 0;
- u32[(ptr + 32) >> 2] = data.categoryBits;
- u32[(ptr + 36) >> 2] = data.maskBits;
-}
-
-export function createCapsuleColliderData(): CapsuleColliderPtrData {
- return {
- radius: 0,
- halfHeight: 0,
- offset: { x: 0, y: 0 },
- density: 0,
- friction: 0,
- restitution: 0,
- isSensor: false,
- enabled: false,
- categoryBits: 0,
- maskBits: 0,
- };
-}
-
-export interface SegmentColliderPtrData {
- point1: Vec2;
- point2: Vec2;
- density: number;
- friction: number;
- restitution: number;
- isSensor: boolean;
- enabled: boolean;
- categoryBits: number;
- maskBits: number;
-}
-
-export function fillSegmentCollider(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, out: SegmentColliderPtrData,
-): void {
- const point1_ = out.point1; point1_.x = f32[ptr >> 2]; point1_.y = f32[(ptr >> 2) + 1];
- const point2_ = out.point2; point2_.x = f32[(ptr + 8) >> 2]; point2_.y = f32[((ptr + 8) >> 2) + 1];
- out.density = f32[(ptr + 16) >> 2];
- out.friction = f32[(ptr + 20) >> 2];
- out.restitution = f32[(ptr + 24) >> 2];
- out.isSensor = u8[ptr + 28] !== 0;
- out.enabled = u8[ptr + 29] !== 0;
- out.categoryBits = u32[(ptr + 32) >> 2];
- out.maskBits = u32[(ptr + 36) >> 2];
-}
-
-export function writeSegmentCollider(
- f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
- ptr: number, data: SegmentColliderPtrData,
-): void {
- f32[ptr >> 2] = data.point1.x; f32[(ptr >> 2) + 1] = data.point1.y;
- f32[(ptr + 8) >> 2] = data.point2.x; f32[((ptr + 8) >> 2) + 1] = data.point2.y;
- f32[(ptr + 16) >> 2] = data.density;
- f32[(ptr + 20) >> 2] = data.friction;
- f32[(ptr + 24) >> 2] = data.restitution;
- u8[ptr + 28] = data.isSensor ? 1 : 0;
- u8[ptr + 29] = data.enabled ? 1 : 0;
- u32[(ptr + 32) >> 2] = data.categoryBits;
- u32[(ptr + 36) >> 2] = data.maskBits;
-}
-
-export function createSegmentColliderData(): SegmentColliderPtrData {
- return {
- point1: { x: 0, y: 0 },
- point2: { x: 0, y: 0 },
- density: 0,
- friction: 0,
- restitution: 0,
- isSensor: false,
- enabled: false,
- categoryBits: 0,
- maskBits: 0,
- };
-}
-
export interface FlexContainerPtrData {
direction: number;
wrap: number;
@@ -793,6 +737,62 @@ export function createRigidBodyData(): RigidBodyPtrData {
};
}
+export interface SegmentColliderPtrData {
+ point1: Vec2;
+ point2: Vec2;
+ density: number;
+ friction: number;
+ restitution: number;
+ isSensor: boolean;
+ enabled: boolean;
+ categoryBits: number;
+ maskBits: number;
+}
+
+export function fillSegmentCollider(
+ f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
+ ptr: number, out: SegmentColliderPtrData,
+): void {
+ const point1_ = out.point1; point1_.x = f32[ptr >> 2]; point1_.y = f32[(ptr >> 2) + 1];
+ const point2_ = out.point2; point2_.x = f32[(ptr + 8) >> 2]; point2_.y = f32[((ptr + 8) >> 2) + 1];
+ out.density = f32[(ptr + 16) >> 2];
+ out.friction = f32[(ptr + 20) >> 2];
+ out.restitution = f32[(ptr + 24) >> 2];
+ out.isSensor = u8[ptr + 28] !== 0;
+ out.enabled = u8[ptr + 29] !== 0;
+ out.categoryBits = u32[(ptr + 32) >> 2];
+ out.maskBits = u32[(ptr + 36) >> 2];
+}
+
+export function writeSegmentCollider(
+ f32: Float32Array, u32: Uint32Array, u8: Uint8Array,
+ ptr: number, data: SegmentColliderPtrData,
+): void {
+ f32[ptr >> 2] = data.point1.x; f32[(ptr >> 2) + 1] = data.point1.y;
+ f32[(ptr + 8) >> 2] = data.point2.x; f32[((ptr + 8) >> 2) + 1] = data.point2.y;
+ f32[(ptr + 16) >> 2] = data.density;
+ f32[(ptr + 20) >> 2] = data.friction;
+ f32[(ptr + 24) >> 2] = data.restitution;
+ u8[ptr + 28] = data.isSensor ? 1 : 0;
+ u8[ptr + 29] = data.enabled ? 1 : 0;
+ u32[(ptr + 32) >> 2] = data.categoryBits;
+ u32[(ptr + 36) >> 2] = data.maskBits;
+}
+
+export function createSegmentColliderData(): SegmentColliderPtrData {
+ return {
+ point1: { x: 0, y: 0 },
+ point2: { x: 0, y: 0 },
+ density: 0,
+ friction: 0,
+ restitution: 0,
+ isSensor: false,
+ enabled: false,
+ categoryBits: 0,
+ maskBits: 0,
+ };
+}
+
export interface ShapeRendererPtrData {
shapeType: number;
color: Color;
@@ -1269,18 +1269,18 @@ export interface PtrAccessor<T> {
export const PTR_ACCESSORS: Record<string, PtrAccessor<any>> = {
BitmapText: { fill: fillBitmapText, write: writeBitmapText, create: createBitmapTextData },
+ BoxCollider: { fill: fillBoxCollider, write: writeBoxCollider, create: createBoxColliderData },
Camera: { fill: fillCamera, write: writeCamera, create: createCameraData },
Canvas: { fill: fillCanvas, write: writeCanvas, create: createCanvasData },
- BoxCollider: { fill: fillBoxCollider, write: writeBoxCollider, create: createBoxColliderData },
- CircleCollider: { fill: fillCircleCollider, write: writeCircleCollider, create: createCircleColliderData },
CapsuleCollider: { fill: fillCapsuleCollider, write: writeCapsuleCollider, create: createCapsuleColliderData },
- SegmentCollider: { fill: fillSegmentCollider, write: writeSegmentCollider, create: createSegmentColliderData },
+ CircleCollider: { fill: fillCircleCollider, write: writeCircleCollider, create: createCircleColliderData },
FlexContainer: { fill: fillFlexContainer, write: writeFlexContainer, create: createFlexContainerData },
FlexItem: { fill: fillFlexItem, write: writeFlexItem, create: createFlexItemData },
GridLayout: { fill: fillGridLayout, write: writeGridLayout, create: createGridLayoutData },
Interactable: { fill: fillInteractable, write: writeInteractable, create: createInteractableData },
ParticleEmitter: { fill: fillParticleEmitter, write: writeParticleEmitter, create: createParticleEmitterData },
RigidBody: { fill: fillRigidBody, write: writeRigidBody, create: createRigidBodyData },
+ SegmentCollider: { fill: fillSegmentCollider, write: writeSegmentCollider, create: createSegmentColliderData },
ShapeRenderer: { fill: fillShapeRenderer, write: writeShapeRenderer, create: createShapeRendererData },
SpineAnimation: { fill: fillSpineAnimation, write: writeSpineAnimation, create: createSpineAnimationData },
Sprite: { fill: fillSprite, write: writeSprite, create: createSpriteData },
diff --git a/sdk/src/ptrLayouts.generated.ts b/sdk/src/ptrLayouts.generated.ts
index 47c23a4f1..0899a6580 100644
--- a/sdk/src/ptrLayouts.generated.ts
+++ b/sdk/src/ptrLayouts.generated.ts
@@ -30,6 +30,20 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {
{ name: 'enabled', type: 'bool', offset: 48 },
],
},
+ BoxCollider: {
+ ptrFn: 'getBoxColliderPtr',
+ fields: [
+ { name: 'halfExtents', type: 'vec2', offset: 0 },
+ { name: 'offset', type: 'vec2', offset: 8 },
+ { name: 'density', type: 'f32', offset: 16 },
+ { name: 'friction', type: 'f32', offset: 20 },
+ { name: 'restitution', type: 'f32', offset: 24 },
+ { name: 'isSensor', type: 'bool', offset: 28 },
+ { name: 'enabled', type: 'bool', offset: 29 },
+ { name: 'categoryBits', type: 'u32', offset: 32 },
+ { name: 'maskBits', type: 'u32', offset: 36 },
+ ],
+ },
Camera: {
ptrFn: 'getCameraPtr',
fields: [
@@ -55,10 +69,11 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {
{ name: 'backgroundColor', type: 'color', offset: 20 },
],
},
- BoxCollider: {
- ptrFn: 'getBoxColliderPtr',
+ CapsuleCollider: {
+ ptrFn: 'getCapsuleColliderPtr',
fields: [
- { name: 'halfExtents', type: 'vec2', offset: 0 },
+ { name: 'radius', type: 'f32', offset: 0 },
+ { name: 'halfHeight', type: 'f32', offset: 4 },
{ name: 'offset', type: 'vec2', offset: 8 },
{ name: 'density', type: 'f32', offset: 16 },
{ name: 'friction', type: 'f32', offset: 20 },
@@ -83,35 +98,6 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {
{ name: 'maskBits', type: 'u32', offset: 32 },
],
},
- CapsuleCollider: {
- ptrFn: 'getCapsuleColliderPtr',
- fields: [
- { name: 'radius', type: 'f32', offset: 0 },
- { name: 'halfHeight', type: 'f32', offset: 4 },
- { name: 'offset', type: 'vec2', offset: 8 },
- { name: 'density', type: 'f32', offset: 16 },
- { name: 'friction', type: 'f32', offset: 20 },
- { name: 'restitution', type: 'f32', offset: 24 },
- { name: 'isSensor', type: 'bool', offset: 28 },
- { name: 'enabled', type: 'bool', offset: 29 },
- { name: 'categoryBits', type: 'u32', offset: 32 },
- { name: 'maskBits', type: 'u32', offset: 36 },
- ],
- },
- SegmentCollider: {
- ptrFn: 'getSegmentColliderPtr',
- fields: [
- { name: 'point1', type: 'vec2', offset: 0 },
- { name: 'point2', type: 'vec2', offset: 8 },
- { name: 'density', type: 'f32', offset: 16 },
- { name: 'friction', type: 'f32', offset: 20 },
- { name: 'restitution', type: 'f32', offset: 24 },
- { name: 'isSensor', type: 'bool', offset: 28 },
- { name: 'enabled', type: 'bool', offset: 29 },
- { name: 'categoryBits', type: 'u32', offset: 32 },
- { name: 'maskBits', type: 'u32', offset: 36 },
- ],
- },
FlexContainer: {
ptrFn: 'getFlexContainerPtr',
fields: [
@@ -214,6 +200,20 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {
{ name: 'enabled', type: 'bool', offset: 18 },
],
},
+ SegmentCollider: {
+ ptrFn: 'getSegmentColliderPtr',
+ fields: [
+ { name: 'point1', type: 'vec2', offset: 0 },
+ { name: 'point2', type: 'vec2', offset: 8 },
+ { name: 'density', type: 'f32', offset: 16 },
+ { name: 'friction', type: 'f32', offset: 20 },
+ { name: 'restitution', type: 'f32', offset: 24 },
+ { name: 'isSensor', type: 'bool', offset: 28 },
+ { name: 'enabled', type: 'bool', offset: 29 },
+ { name: 'categoryBits', type: 'u32', offset: 32 },
+ { name: 'maskBits', type: 'u32', offset: 36 },
+ ],
+ },
ShapeRenderer: {
ptrFn: 'getShapeRendererPtr',
fields: [
diff --git a/sdk/src/wasm.generated.ts b/sdk/src/wasm.generated.ts
index 93f22af1d..728118529 100644
--- a/sdk/src/wasm.generated.ts
+++ b/sdk/src/wasm.generated.ts
@@ -9,6 +9,7 @@ import type { Entity, Vec2, Vec3, Vec4, Quat } from './types';
// Additional Math Types
export interface UVec2 { x: number; y: number; }
export interface Padding { left: number; top: number; right: number; bottom: number; }
+export interface Dimension { value: number; unit: number; }
export type Mat4 = number[];
// Emscripten Vector Types
@@ -22,22 +23,34 @@ export interface VectorEntity {
// Enums
-export enum TextAlign {
- Left = 0,
+export enum AlignContent {
+ Start = 0,
Center = 1,
- Right = 2,
+ End = 2,
+ Stretch = 3,
+ SpaceBetween = 4,
+ SpaceAround = 5,
}
-export enum ProjectionType {
- Perspective = 0,
- Orthographic = 1,
+export enum AlignItems {
+ Start = 0,
+ Center = 1,
+ End = 2,
+ Stretch = 3,
}
-export enum ClearFlags {
- Nothing = 0,
- Color = 1,
- Depth = 2,
- ColorAndDepth = 3,
+export enum AlignSelf {
+ Auto = 0,
+ Start = 1,
+ Center = 2,
+ End = 3,
+ Stretch = 4,
+}
+
+export enum BodyType {
+ Static = 0,
+ Kinematic = 1,
+ Dynamic = 2,
}
export enum CanvasScaleMode {
@@ -48,6 +61,20 @@ export enum CanvasScaleMode {
Match = 4,
}
+export enum ClearFlags {
+ Nothing = 0,
+ Color = 1,
+ Depth = 2,
+ ColorAndDepth = 3,
+}
+
+export enum EmitterShape {
+ Point = 0,
+ Circle = 1,
+ Rectangle = 2,
+ Cone = 3,
+}
+
export enum FlexDirection {
Row = 0,
Column = 1,
@@ -60,6 +87,11 @@ export enum FlexWrap {
Wrap = 1,
}
+export enum GridDirection {
+ Vertical = 0,
+ Horizontal = 1,
+}
+
export enum JustifyContent {
Start = 0,
Center = 1,
@@ -69,40 +101,14 @@ export enum JustifyContent {
SpaceEvenly = 5,
}
-export enum AlignItems {
- Start = 0,
- Center = 1,
- End = 2,
- Stretch = 3,
-}
-
-export enum AlignContent {
- Start = 0,
- Center = 1,
- End = 2,
- Stretch = 3,
- SpaceBetween = 4,
- SpaceAround = 5,
-}
-
-export enum AlignSelf {
- Auto = 0,
- Start = 1,
- Center = 2,
- End = 3,
- Stretch = 4,
-}
-
-export enum GridDirection {
- Vertical = 0,
- Horizontal = 1,
+export enum MaskMode {
+ Scissor = 0,
+ Stencil = 1,
}
-export enum EmitterShape {
- Point = 0,
- Circle = 1,
- Rectangle = 2,
- Cone = 3,
+export enum ProjectionType {
+ Perspective = 0,
+ Orthographic = 1,
}
export enum SimulationSpace {
@@ -110,15 +116,10 @@ export enum SimulationSpace {
Local = 1,
}
-export enum BodyType {
- Static = 0,
- Kinematic = 1,
- Dynamic = 2,
-}
-
-export enum MaskMode {
- Scissor = 0,
- Stencil = 1,
+export enum TextAlign {
+ Left = 0,
+ Center = 1,
+ Right = 2,
}
export enum UIVisualType {
@@ -141,6 +142,18 @@ export interface BitmapText {
enabled: boolean;
}
+export interface BoxCollider {
+ halfExtents: Vec2;
+ offset: Vec2;
+ density: number;
+ friction: number;
+ restitution: number;
+ isSensor: boolean;
+ enabled: boolean;
+ categoryBits: number;
+ maskBits: number;
+}
+
export interface Camera {
projectionType: number;
fov: number;
@@ -162,8 +175,9 @@ export interface Canvas {
backgroundColor: Vec4;
}
-export interface BoxCollider {
- halfExtents: Vec2;
+export interface CapsuleCollider {
+ radius: number;
+ halfHeight: number;
offset: Vec2;
density: number;
friction: number;
@@ -174,21 +188,12 @@ export interface BoxCollider {
maskBits: number;
}
-export interface CircleCollider {
- radius: number;
- offset: Vec2;
- density: number;
- friction: number;
- restitution: number;
- isSensor: boolean;
- enabled: boolean;
- categoryBits: number;
- maskBits: number;
+export interface Children {
+ entities: VectorEntity;
}
-export interface CapsuleCollider {
+export interface CircleCollider {
radius: number;
- halfHeight: number;
offset: Vec2;
density: number;
friction: number;
@@ -199,18 +204,6 @@ export interface CapsuleCollider {
maskBits: number;
}
-export interface SegmentCollider {
- point1: Vec2;
- point2: Vec2;
- density: number;
- friction: number;
- restitution: number;
- isSensor: boolean;
- enabled: boolean;
- categoryBits: number;
- maskBits: number;
-}
-
export interface FlexContainer {
direction: number;
wrap: number;
@@ -243,20 +236,16 @@ export interface GridLayout {
spacing: Vec2;
}
-export interface Parent {
- entity: number;
-}
-
-export interface Children {
- entities: VectorEntity;
-}
-
export interface Interactable {
enabled: boolean;
blockRaycast: boolean;
raycastTarget: boolean;
}
+export interface Parent {
+ entity: number;
+}
+
export interface ParticleEmitter {
rate: number;
burstCount: number;
@@ -311,6 +300,18 @@ export interface RigidBody {
enabled: boolean;
}
+export interface SegmentCollider {
+ point1: Vec2;
+ point2: Vec2;
+ density: number;
+ friction: number;
+ restitution: number;
+ isSensor: boolean;
+ enabled: boolean;
+ categoryBits: number;
+ maskBits: number;
+}
+
export interface ShapeRenderer {
shapeType: number;
color: Vec4;
@@ -466,6 +467,10 @@ export interface Registry {
getBitmapText(entity: Entity): BitmapText;
addBitmapText(entity: Entity, component: BitmapText): void;
removeBitmapText(entity: Entity): void;
+ hasBoxCollider(entity: Entity): boolean;
+ getBoxCollider(entity: Entity): BoxCollider;
+ addBoxCollider(entity: Entity, component: BoxCollider): void;
+ removeBoxCollider(entity: Entity): void;
hasCamera(entity: Entity): boolean;
getCamera(entity: Entity): Camera;
addCamera(entity: Entity, component: Camera): void;
@@ -474,22 +479,18 @@ export interface Registry {
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;
- removeBoxCollider(entity: Entity): void;
- hasCircleCollider(entity: Entity): boolean;
- getCircleCollider(entity: Entity): CircleCollider;
- addCircleCollider(entity: Entity, component: CircleCollider): void;
- removeCircleCollider(entity: Entity): void;
hasCapsuleCollider(entity: Entity): boolean;
getCapsuleCollider(entity: Entity): CapsuleCollider;
addCapsuleCollider(entity: Entity, component: CapsuleCollider): void;
removeCapsuleCollider(entity: Entity): void;
- hasSegmentCollider(entity: Entity): boolean;
- getSegmentCollider(entity: Entity): SegmentCollider;
- addSegmentCollider(entity: Entity, component: SegmentCollider): void;
- removeSegmentCollider(entity: Entity): void;
+ hasChildren(entity: Entity): boolean;
+ getChildren(entity: Entity): Children;
+ addChildren(entity: Entity, component: Children): void;
+ removeChildren(entity: Entity): void;
+ hasCircleCollider(entity: Entity): boolean;
+ getCircleCollider(entity: Entity): CircleCollider;
+ addCircleCollider(entity: Entity, component: CircleCollider): void;
+ removeCircleCollider(entity: Entity): void;
hasFlexContainer(entity: Entity): boolean;
getFlexContainer(entity: Entity): FlexContainer;
addFlexContainer(entity: Entity, component: FlexContainer): void;
@@ -502,18 +503,14 @@ export interface Registry {
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;
- removeParent(entity: Entity): void;
- hasChildren(entity: Entity): boolean;
- getChildren(entity: Entity): Children;
- addChildren(entity: Entity, component: Children): void;
- removeChildren(entity: Entity): void;
hasInteractable(entity: Entity): boolean;
getInteractable(entity: Entity): Interactable;
addInteractable(entity: Entity, component: Interactable): void;
removeInteractable(entity: Entity): void;
+ hasParent(entity: Entity): boolean;
+ getParent(entity: Entity): Parent;
+ addParent(entity: Entity, component: Parent): void;
+ removeParent(entity: Entity): void;
hasParticleEmitter(entity: Entity): boolean;
getParticleEmitter(entity: Entity): ParticleEmitter;
addParticleEmitter(entity: Entity, component: ParticleEmitter): void;
@@ -522,6 +519,10 @@ export interface Registry {
getRigidBody(entity: Entity): RigidBody;
addRigidBody(entity: Entity, component: RigidBody): void;
removeRigidBody(entity: Entity): void;
+ hasSegmentCollider(entity: Entity): boolean;
+ getSegmentCollider(entity: Entity): SegmentCollider;
+ addSegmentCollider(entity: Entity, component: SegmentCollider): void;
+ removeSegmentCollider(entity: Entity): void;
hasShapeRenderer(entity: Entity): boolean;
getShapeRenderer(entity: Entity): ShapeRenderer;
addShapeRenderer(entity: Entity, component: ShapeRenderer): void;
@@ -585,20 +586,20 @@ export interface ESEngineModule {
*/
getBuiltinComponentNames(): string[];
BitmapText: new () => BitmapText;
+ BoxCollider: new () => BoxCollider;
Camera: new () => Camera;
Canvas: new () => Canvas;
- BoxCollider: new () => BoxCollider;
- CircleCollider: new () => CircleCollider;
CapsuleCollider: new () => CapsuleCollider;
- SegmentCollider: new () => SegmentCollider;
+ Children: new () => Children;
+ CircleCollider: new () => CircleCollider;
FlexContainer: new () => FlexContainer;
FlexItem: new () => FlexItem;
GridLayout: new () => GridLayout;
- Parent: new () => Parent;
- Children: new () => Children;
Interactable: new () => Interactable;
+ Parent: new () => Parent;
ParticleEmitter: new () => ParticleEmitter;
RigidBody: new () => RigidBody;
+ SegmentCollider: new () => SegmentCollider;
ShapeRenderer: new () => ShapeRenderer;
SpineAnimation: new () => SpineAnimation;
Sprite: new () => Sprite;
diff --git a/src/esengine/bindings/EditorAPI.generated.cpp b/src/esengine/bindings/EditorAPI.generated.cpp
index 7f0318cfb..c29e4cac3 100644
--- a/src/esengine/bindings/EditorAPI.generated.cpp
+++ b/src/esengine/bindings/EditorAPI.generated.cpp
@@ -54,20 +54,20 @@ inline glm::quat eulerDegToQuat(const glm::vec3& deg) {
std::vector<std::string> editor_getComponentNames() {
return {
"BitmapText",
+ "BoxCollider",
"Camera",
"Canvas",
- "BoxCollider",
- "CircleCollider",
"CapsuleCollider",
- "SegmentCollider",
+ "Children",
+ "CircleCollider",
"FlexContainer",
"FlexItem",
"GridLayout",
- "Parent",
- "Children",
"Interactable",
+ "Parent",
"ParticleEmitter",
"RigidBody",
+ "SegmentCollider",
"ShapeRenderer",
"SpineAnimation",
"Sprite",
@@ -100,6 +100,20 @@ std::string editor_getComponentSchema(const std::string& name) {
{"key":"font","type":"asset","group":"BitmapText"},
{"key":"enabled","type":"bool","group":"BitmapText"}
])JSON";
+ } else if (name == "BoxCollider") {
+ return R"JSON([
+ {"key":"halfExtents.x","type":"float","group":"BoxCollider"},
+ {"key":"halfExtents.y","type":"float","group":"BoxCollider"},
+ {"key":"offset.x","type":"float","group":"BoxCollider"},
+ {"key":"offset.y","type":"float","group":"BoxCollider"},
+ {"key":"density","type":"float","group":"BoxCollider"},
+ {"key":"friction","type":"float","group":"BoxCollider"},
+ {"key":"restitution","type":"float","group":"BoxCollider"},
+ {"key":"isSensor","type":"bool","group":"BoxCollider"},
+ {"key":"enabled","type":"bool","group":"BoxCollider"},
+ {"key":"categoryBits","type":"int","group":"BoxCollider"},
+ {"key":"maskBits","type":"int","group":"BoxCollider"}
+ ])JSON";
} else if (name == "Camera") {
return R"JSON([
{"key":"projectionType","type":"enum","group":"Camera","values":["Perspective","Orthographic"]},
@@ -128,33 +142,6 @@ std::string editor_getComponentSchema(const std::string& name) {
{"key":"backgroundColor.b","type":"color","group":"Canvas"},
{"key":"backgroundColor.a","type":"color","group":"Canvas"}
])JSON";
- } else if (name == "BoxCollider") {
- return R"JSON([
- {"key":"halfExtents.x","type":"float","group":"BoxCollider"},
- {"key":"halfExtents.y","type":"float","group":"BoxCollider"},
- {"key":"offset.x","type":"float","group":"BoxCollider"},
- {"key":"offset.y","type":"float","group":"BoxCollider"},
- {"key":"density","type":"float","group":"BoxCollider"},
- {"key":"friction","type":"float","group":"BoxCollider"},
- {"key":"restitution","type":"float","group":"BoxCollider"},
- {"key":"isSensor","type":"bool","group":"BoxCollider"},
- {"key":"enabled","type":"bool","group":"BoxCollider"},
- {"key":"categoryBits","type":"int","group":"BoxCollider"},
- {"key":"maskBits","type":"int","group":"BoxCollider"}
- ])JSON";
- } else if (name == "CircleCollider") {
- return R"JSON([
- {"key":"radius","type":"float","group":"CircleCollider"},
- {"key":"offset.x","type":"float","group":"CircleCollider"},
- {"key":"offset.y","type":"float","group":"CircleCollider"},
- {"key":"density","type":"float","group":"CircleCollider"},
- {"key":"friction","type":"float","group":"CircleCollider"},
- {"key":"restitution","type":"float","group":"CircleCollider"},
- {"key":"isSensor","type":"bool","group":"CircleCollider"},
- {"key":"enabled","type":"bool","group":"CircleCollider"},
- {"key":"categoryBits","type":"int","group":"CircleCollider"},
- {"key":"maskBits","type":"int","group":"CircleCollider"}
- ])JSON";
} else if (name == "CapsuleCollider") {
return R"JSON([
{"key":"radius","type":"float","group":"CapsuleCollider"},
@@ -169,19 +156,22 @@ std::string editor_getComponentSchema(const std::string& name) {
{"key":"categoryBits","type":"int","group":"CapsuleCollider"},
{"key":"maskBits","type":"int","group":"CapsuleCollider"}
])JSON";
- } else if (name == "SegmentCollider") {
+ } else if (name == "Children") {
return R"JSON([
- {"key":"point1.x","type":"float","group":"SegmentCollider"},
- {"key":"point1.y","type":"float","group":"SegmentCollider"},
- {"key":"point2.x","type":"float","group":"SegmentCollider"},
- {"key":"point2.y","type":"float","group":"SegmentCollider"},
- {"key":"density","type":"float","group":"SegmentCollider"},
- {"key":"friction","type":"float","group":"SegmentCollider"},
- {"key":"restitution","type":"float","group":"SegmentCollider"},
- {"key":"isSensor","type":"bool","group":"SegmentCollider"},
- {"key":"enabled","type":"bool","group":"SegmentCollider"},
- {"key":"categoryBits","type":"int","group":"SegmentCollider"},
- {"key":"maskBits","type":"int","group":"SegmentCollider"}
+ {"key":"entities","type":"entity","group":"Children"}
+ ])JSON";
+ } else if (name == "CircleCollider") {
+ return R"JSON([
+ {"key":"radius","type":"float","group":"CircleCollider"},
+ {"key":"offset.x","type":"float","group":"CircleCollider"},
+ {"key":"offset.y","type":"float","group":"CircleCollider"},
+ {"key":"density","type":"float","group":"CircleCollider"},
+ {"key":"friction","type":"float","group":"CircleCollider"},
+ {"key":"restitution","type":"float","group":"CircleCollider"},
+ {"key":"isSensor","type":"bool","group":"CircleCollider"},
+ {"key":"enabled","type":"bool","group":"CircleCollider"},
+ {"key":"categoryBits","type":"int","group":"CircleCollider"},
+ {"key":"maskBits","type":"int","group":"CircleCollider"}
])JSON";
} else if (name == "FlexContainer") {
return R"JSON([
@@ -224,20 +214,16 @@ std::string editor_getComponentSchema(const std::string& name) {
{"key":"spacing.x","type":"float","group":"GridLayout"},
{"key":"spacing.y","type":"float","group":"GridLayout"}
])JSON";
- } else if (name == "Parent") {
- return R"JSON([
- {"key":"entity","type":"entity","group":"Parent"}
- ])JSON";
- } else if (name == "Children") {
- return R"JSON([
- {"key":"entities","type":"entity","group":"Children"}
- ])JSON";
} else if (name == "Interactable") {
return R"JSON([
{"key":"enabled","type":"bool","group":"Interactable"},
{"key":"blockRaycast","type":"bool","group":"Interactable"},
{"key":"raycastTarget","type":"bool","group":"Interactable"}
])JSON";
+ } else if (name == "Parent") {
+ return R"JSON([
+ {"key":"entity","type":"entity","group":"Parent"}
+ ])JSON";
} else if (name == "ParticleEmitter") {
return R"JSON([
{"key":"rate","type":"float","group":"ParticleEmitter"},
@@ -300,6 +286,20 @@ std::string editor_getComponentSchema(const std::string& name) {
{"key":"bullet","type":"bool","group":"RigidBody"},
{"key":"enabled","type":"bool","group":"RigidBody"}
])JSON";
+ } else if (name == "SegmentCollider") {
+ return R"JSON([
+ {"key":"point1.x","type":"float","group":"SegmentCollider"},
+ {"key":"point1.y","type":"float","group":"SegmentCollider"},
+ {"key":"point2.x","type":"float","group":"SegmentCollider"},
+ {"key":"point2.y","type":"float","group":"SegmentCollider"},
+ {"key":"density","type":"float","group":"SegmentCollider"},
+ {"key":"friction","type":"float","group":"SegmentCollider"},
+ {"key":"restitution","type":"float","group":"SegmentCollider"},
+ {"key":"isSensor","type":"bool","group":"SegmentCollider"},
+ {"key":"enabled","type":"bool","group":"SegmentCollider"},
+ {"key":"categoryBits","type":"int","group":"SegmentCollider"},
+ {"key":"maskBits","type":"int","group":"SegmentCollider"}
+ ])JSON";
} else if (name == "ShapeRenderer") {
return R"JSON([
{"key":"shapeType","type":"int","group":"ShapeRenderer"},
@@ -523,23 +523,23 @@ bool editor_addComponent(Registry& reg, u32 e, const std::string& name) {
if (name == "BitmapText") {
if (!reg.has<esengine::ecs::BitmapText>(entity)) reg.emplace<esengine::ecs::BitmapText>(entity);
return true;
+ } else if (name == "BoxCollider") {
+ if (!reg.has<esengine::ecs::BoxCollider>(entity)) reg.emplace<esengine::ecs::BoxCollider>(entity);
+ return true;
} else if (name == "Camera") {
if (!reg.has<esengine::ecs::Camera>(entity)) reg.emplace<esengine::ecs::Camera>(entity);
return true;
} else if (name == "Canvas") {
if (!reg.has<esengine::ecs::Canvas>(entity)) reg.emplace<esengine::ecs::Canvas>(entity);
return true;
- } else if (name == "BoxCollider") {
- if (!reg.has<esengine::ecs::BoxCollider>(entity)) reg.emplace<esengine::ecs::BoxCollider>(entity);
- return true;
- } else if (name == "CircleCollider") {
- if (!reg.has<esengine::ecs::CircleCollider>(entity)) reg.emplace<esengine::ecs::CircleCollider>(entity);
- return true;
} else if (name == "CapsuleCollider") {
if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) reg.emplace<esengine::ecs::CapsuleCollider>(entity);
return true;
- } else if (name == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) reg.emplace<esengine::ecs::SegmentCollider>(entity);
+ } else if (name == "Children") {
+ if (!reg.has<esengine::ecs::Children>(entity)) reg.emplace<esengine::ecs::Children>(entity);
+ return true;
+ } else if (name == "CircleCollider") {
+ if (!reg.has<esengine::ecs::CircleCollider>(entity)) reg.emplace<esengine::ecs::CircleCollider>(entity);
return true;
} else if (name == "FlexContainer") {
if (!reg.has<esengine::ecs::FlexContainer>(entity)) reg.emplace<esengine::ecs::FlexContainer>(entity);
@@ -550,21 +550,21 @@ bool editor_addComponent(Registry& reg, u32 e, const std::string& name) {
} else if (name == "GridLayout") {
if (!reg.has<esengine::ecs::GridLayout>(entity)) reg.emplace<esengine::ecs::GridLayout>(entity);
return true;
- } else if (name == "Parent") {
- if (!reg.has<esengine::ecs::Parent>(entity)) reg.emplace<esengine::ecs::Parent>(entity);
- return true;
- } else if (name == "Children") {
- if (!reg.has<esengine::ecs::Children>(entity)) reg.emplace<esengine::ecs::Children>(entity);
- return true;
} else if (name == "Interactable") {
if (!reg.has<esengine::ecs::Interactable>(entity)) reg.emplace<esengine::ecs::Interactable>(entity);
return true;
+ } else if (name == "Parent") {
+ if (!reg.has<esengine::ecs::Parent>(entity)) reg.emplace<esengine::ecs::Parent>(entity);
+ return true;
} else if (name == "ParticleEmitter") {
if (!reg.has<esengine::ecs::ParticleEmitter>(entity)) reg.emplace<esengine::ecs::ParticleEmitter>(entity);
return true;
} else if (name == "RigidBody") {
if (!reg.has<esengine::ecs::RigidBody>(entity)) reg.emplace<esengine::ecs::RigidBody>(entity);
return true;
+ } else if (name == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) reg.emplace<esengine::ecs::SegmentCollider>(entity);
+ return true;
} else if (name == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) reg.emplace<esengine::ecs::ShapeRenderer>(entity);
return true;
@@ -610,34 +610,34 @@ bool editor_removeComponent(Registry& reg, u32 e, const std::string& name) {
if (!reg.valid(entity)) return false;
if (name == "BitmapText") {
if (reg.has<esengine::ecs::BitmapText>(entity)) { reg.remove<esengine::ecs::BitmapText>(entity); return true; }
+ } else if (name == "BoxCollider") {
+ if (reg.has<esengine::ecs::BoxCollider>(entity)) { reg.remove<esengine::ecs::BoxCollider>(entity); return true; }
} else if (name == "Camera") {
if (reg.has<esengine::ecs::Camera>(entity)) { reg.remove<esengine::ecs::Camera>(entity); return true; }
} else if (name == "Canvas") {
if (reg.has<esengine::ecs::Canvas>(entity)) { reg.remove<esengine::ecs::Canvas>(entity); return true; }
- } else if (name == "BoxCollider") {
- if (reg.has<esengine::ecs::BoxCollider>(entity)) { reg.remove<esengine::ecs::BoxCollider>(entity); return true; }
- } else if (name == "CircleCollider") {
- if (reg.has<esengine::ecs::CircleCollider>(entity)) { reg.remove<esengine::ecs::CircleCollider>(entity); return true; }
} else if (name == "CapsuleCollider") {
if (reg.has<esengine::ecs::CapsuleCollider>(entity)) { reg.remove<esengine::ecs::CapsuleCollider>(entity); return true; }
- } else if (name == "SegmentCollider") {
- if (reg.has<esengine::ecs::SegmentCollider>(entity)) { reg.remove<esengine::ecs::SegmentCollider>(entity); return true; }
+ } else if (name == "Children") {
+ if (reg.has<esengine::ecs::Children>(entity)) { reg.remove<esengine::ecs::Children>(entity); return true; }
+ } else if (name == "CircleCollider") {
+ if (reg.has<esengine::ecs::CircleCollider>(entity)) { reg.remove<esengine::ecs::CircleCollider>(entity); return true; }
} else if (name == "FlexContainer") {
if (reg.has<esengine::ecs::FlexContainer>(entity)) { reg.remove<esengine::ecs::FlexContainer>(entity); return true; }
} else if (name == "FlexItem") {
if (reg.has<esengine::ecs::FlexItem>(entity)) { reg.remove<esengine::ecs::FlexItem>(entity); return true; }
} else if (name == "GridLayout") {
if (reg.has<esengine::ecs::GridLayout>(entity)) { reg.remove<esengine::ecs::GridLayout>(entity); return true; }
- } else if (name == "Parent") {
- if (reg.has<esengine::ecs::Parent>(entity)) { reg.remove<esengine::ecs::Parent>(entity); return true; }
- } else if (name == "Children") {
- if (reg.has<esengine::ecs::Children>(entity)) { reg.remove<esengine::ecs::Children>(entity); return true; }
} else if (name == "Interactable") {
if (reg.has<esengine::ecs::Interactable>(entity)) { reg.remove<esengine::ecs::Interactable>(entity); return true; }
+ } else if (name == "Parent") {
+ if (reg.has<esengine::ecs::Parent>(entity)) { reg.remove<esengine::ecs::Parent>(entity); return true; }
} else if (name == "ParticleEmitter") {
if (reg.has<esengine::ecs::ParticleEmitter>(entity)) { reg.remove<esengine::ecs::ParticleEmitter>(entity); return true; }
} else if (name == "RigidBody") {
if (reg.has<esengine::ecs::RigidBody>(entity)) { reg.remove<esengine::ecs::RigidBody>(entity); return true; }
+ } else if (name == "SegmentCollider") {
+ if (reg.has<esengine::ecs::SegmentCollider>(entity)) { reg.remove<esengine::ecs::SegmentCollider>(entity); return true; }
} else if (name == "ShapeRenderer") {
if (reg.has<esengine::ecs::ShapeRenderer>(entity)) { reg.remove<esengine::ecs::ShapeRenderer>(entity); return true; }
} else if (name == "SpineAnimation") {
@@ -670,20 +670,20 @@ bool editor_hasComponent(Registry& reg, u32 e, const std::string& name) {
auto entity = static_cast<Entity>(e);
if (!reg.valid(entity)) return false;
if (name == "BitmapText") return reg.has<esengine::ecs::BitmapText>(entity);
+ if (name == "BoxCollider") return reg.has<esengine::ecs::BoxCollider>(entity);
if (name == "Camera") return reg.has<esengine::ecs::Camera>(entity);
if (name == "Canvas") return reg.has<esengine::ecs::Canvas>(entity);
- if (name == "BoxCollider") return reg.has<esengine::ecs::BoxCollider>(entity);
- if (name == "CircleCollider") return reg.has<esengine::ecs::CircleCollider>(entity);
if (name == "CapsuleCollider") return reg.has<esengine::ecs::CapsuleCollider>(entity);
- if (name == "SegmentCollider") return reg.has<esengine::ecs::SegmentCollider>(entity);
+ if (name == "Children") return reg.has<esengine::ecs::Children>(entity);
+ if (name == "CircleCollider") return reg.has<esengine::ecs::CircleCollider>(entity);
if (name == "FlexContainer") return reg.has<esengine::ecs::FlexContainer>(entity);
if (name == "FlexItem") return reg.has<esengine::ecs::FlexItem>(entity);
if (name == "GridLayout") return reg.has<esengine::ecs::GridLayout>(entity);
- if (name == "Parent") return reg.has<esengine::ecs::Parent>(entity);
- if (name == "Children") return reg.has<esengine::ecs::Children>(entity);
if (name == "Interactable") return reg.has<esengine::ecs::Interactable>(entity);
+ if (name == "Parent") return reg.has<esengine::ecs::Parent>(entity);
if (name == "ParticleEmitter") return reg.has<esengine::ecs::ParticleEmitter>(entity);
if (name == "RigidBody") return reg.has<esengine::ecs::RigidBody>(entity);
+ if (name == "SegmentCollider") return reg.has<esengine::ecs::SegmentCollider>(entity);
if (name == "ShapeRenderer") return reg.has<esengine::ecs::ShapeRenderer>(entity);
if (name == "SpineAnimation") return reg.has<esengine::ecs::SpineAnimation>(entity);
if (name == "Sprite") return reg.has<esengine::ecs::Sprite>(entity);
@@ -706,20 +706,20 @@ std::vector<std::string> editor_getComponents(Registry& reg, u32 e) {
std::vector<std::string> result;
if (!reg.valid(entity)) return result;
if (reg.has<esengine::ecs::BitmapText>(entity)) result.push_back("BitmapText");
+ if (reg.has<esengine::ecs::BoxCollider>(entity)) result.push_back("BoxCollider");
if (reg.has<esengine::ecs::Camera>(entity)) result.push_back("Camera");
if (reg.has<esengine::ecs::Canvas>(entity)) result.push_back("Canvas");
- if (reg.has<esengine::ecs::BoxCollider>(entity)) result.push_back("BoxCollider");
- if (reg.has<esengine::ecs::CircleCollider>(entity)) result.push_back("CircleCollider");
if (reg.has<esengine::ecs::CapsuleCollider>(entity)) result.push_back("CapsuleCollider");
- if (reg.has<esengine::ecs::SegmentCollider>(entity)) result.push_back("SegmentCollider");
+ if (reg.has<esengine::ecs::Children>(entity)) result.push_back("Children");
+ if (reg.has<esengine::ecs::CircleCollider>(entity)) result.push_back("CircleCollider");
if (reg.has<esengine::ecs::FlexContainer>(entity)) result.push_back("FlexContainer");
if (reg.has<esengine::ecs::FlexItem>(entity)) result.push_back("FlexItem");
if (reg.has<esengine::ecs::GridLayout>(entity)) result.push_back("GridLayout");
- if (reg.has<esengine::ecs::Parent>(entity)) result.push_back("Parent");
- if (reg.has<esengine::ecs::Children>(entity)) result.push_back("Children");
if (reg.has<esengine::ecs::Interactable>(entity)) result.push_back("Interactable");
+ if (reg.has<esengine::ecs::Parent>(entity)) result.push_back("Parent");
if (reg.has<esengine::ecs::ParticleEmitter>(entity)) result.push_back("ParticleEmitter");
if (reg.has<esengine::ecs::RigidBody>(entity)) result.push_back("RigidBody");
+ if (reg.has<esengine::ecs::SegmentCollider>(entity)) result.push_back("SegmentCollider");
if (reg.has<esengine::ecs::ShapeRenderer>(entity)) result.push_back("ShapeRenderer");
if (reg.has<esengine::ecs::SpineAnimation>(entity)) result.push_back("SpineAnimation");
if (reg.has<esengine::ecs::Sprite>(entity)) result.push_back("Sprite");
@@ -751,6 +751,18 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::s
else if (field == "spacing") { c.spacing = value; }
else { return false; }
return true;
+ } else if (comp == "BoxCollider") {
+ if (!reg.has<esengine::ecs::BoxCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
+ if (field == "halfExtents.x") { c.halfExtents.x = value; }
+ else if (field == "halfExtents.y") { c.halfExtents.y = value; }
+ else if (field == "offset.x") { c.offset.x = value; }
+ else if (field == "offset.y") { c.offset.y = value; }
+ else if (field == "density") { c.density = value; }
+ else if (field == "friction") { c.friction = value; }
+ else if (field == "restitution") { c.restitution = value; }
+ else { return false; }
+ return true;
} else if (comp == "Camera") {
if (!reg.has<esengine::ecs::Camera>(entity)) return false;
auto& c = reg.get<esengine::ecs::Camera>(entity);
@@ -776,11 +788,11 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::s
else if (field == "backgroundColor.a") { c.backgroundColor.a = value; }
else { return false; }
return true;
- } else if (comp == "BoxCollider") {
- if (!reg.has<esengine::ecs::BoxCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
- if (field == "halfExtents.x") { c.halfExtents.x = value; }
- else if (field == "halfExtents.y") { c.halfExtents.y = value; }
+ } else if (comp == "CapsuleCollider") {
+ if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
+ if (field == "radius") { c.radius = value; }
+ else if (field == "halfHeight") { c.halfHeight = value; }
else if (field == "offset.x") { c.offset.x = value; }
else if (field == "offset.y") { c.offset.y = value; }
else if (field == "density") { c.density = value; }
@@ -799,30 +811,6 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::s
else if (field == "restitution") { c.restitution = value; }
else { return false; }
return true;
- } else if (comp == "CapsuleCollider") {
- if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
- if (field == "radius") { c.radius = value; }
- else if (field == "halfHeight") { c.halfHeight = value; }
- else if (field == "offset.x") { c.offset.x = value; }
- else if (field == "offset.y") { c.offset.y = value; }
- else if (field == "density") { c.density = value; }
- else if (field == "friction") { c.friction = value; }
- else if (field == "restitution") { c.restitution = value; }
- else { return false; }
- return true;
- } else if (comp == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
- if (field == "point1.x") { c.point1.x = value; }
- else if (field == "point1.y") { c.point1.y = value; }
- else if (field == "point2.x") { c.point2.x = value; }
- else if (field == "point2.y") { c.point2.y = value; }
- else if (field == "density") { c.density = value; }
- else if (field == "friction") { c.friction = value; }
- else if (field == "restitution") { c.restitution = value; }
- else { return false; }
- return true;
} else if (comp == "FlexContainer") {
if (!reg.has<esengine::ecs::FlexContainer>(entity)) return false;
auto& c = reg.get<esengine::ecs::FlexContainer>(entity);
@@ -907,6 +895,18 @@ bool editor_setFloat(Registry& reg, u32 e, const std::string& comp, const std::s
else if (field == "angularDamping") { c.angularDamping = value; }
else { return false; }
return true;
+ } else if (comp == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ if (field == "point1.x") { c.point1.x = value; }
+ else if (field == "point1.y") { c.point1.y = value; }
+ else if (field == "point2.x") { c.point2.x = value; }
+ else if (field == "point2.y") { c.point2.y = value; }
+ else if (field == "density") { c.density = value; }
+ else if (field == "friction") { c.friction = value; }
+ else if (field == "restitution") { c.restitution = value; }
+ else { return false; }
+ return true;
} else if (comp == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;
auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);
@@ -1102,6 +1102,16 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "color.a") { return c.color.a; }
else if (field == "fontSize") { return c.fontSize; }
else if (field == "spacing") { return c.spacing; }
+ } else if (comp == "BoxCollider") {
+ if (!reg.has<esengine::ecs::BoxCollider>(entity)) return 0.0f;
+ const auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
+ if (field == "halfExtents.x") { return c.halfExtents.x; }
+ else if (field == "halfExtents.y") { return c.halfExtents.y; }
+ else if (field == "offset.x") { return c.offset.x; }
+ else if (field == "offset.y") { return c.offset.y; }
+ else if (field == "density") { return c.density; }
+ else if (field == "friction") { return c.friction; }
+ else if (field == "restitution") { return c.restitution; }
} else if (comp == "Camera") {
if (!reg.has<esengine::ecs::Camera>(entity)) return 0.0f;
const auto& c = reg.get<esengine::ecs::Camera>(entity);
@@ -1123,11 +1133,11 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "backgroundColor.g") { return c.backgroundColor.g; }
else if (field == "backgroundColor.b") { return c.backgroundColor.b; }
else if (field == "backgroundColor.a") { return c.backgroundColor.a; }
- } else if (comp == "BoxCollider") {
- if (!reg.has<esengine::ecs::BoxCollider>(entity)) return 0.0f;
- const auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
- if (field == "halfExtents.x") { return c.halfExtents.x; }
- else if (field == "halfExtents.y") { return c.halfExtents.y; }
+ } else if (comp == "CapsuleCollider") {
+ if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return 0.0f;
+ const auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
+ if (field == "radius") { return c.radius; }
+ else if (field == "halfHeight") { return c.halfHeight; }
else if (field == "offset.x") { return c.offset.x; }
else if (field == "offset.y") { return c.offset.y; }
else if (field == "density") { return c.density; }
@@ -1142,26 +1152,6 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "density") { return c.density; }
else if (field == "friction") { return c.friction; }
else if (field == "restitution") { return c.restitution; }
- } else if (comp == "CapsuleCollider") {
- if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return 0.0f;
- const auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
- if (field == "radius") { return c.radius; }
- else if (field == "halfHeight") { return c.halfHeight; }
- else if (field == "offset.x") { return c.offset.x; }
- else if (field == "offset.y") { return c.offset.y; }
- else if (field == "density") { return c.density; }
- else if (field == "friction") { return c.friction; }
- else if (field == "restitution") { return c.restitution; }
- } else if (comp == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return 0.0f;
- const auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
- if (field == "point1.x") { return c.point1.x; }
- else if (field == "point1.y") { return c.point1.y; }
- else if (field == "point2.x") { return c.point2.x; }
- else if (field == "point2.y") { return c.point2.y; }
- else if (field == "density") { return c.density; }
- else if (field == "friction") { return c.friction; }
- else if (field == "restitution") { return c.restitution; }
} else if (comp == "FlexContainer") {
if (!reg.has<esengine::ecs::FlexContainer>(entity)) return 0.0f;
const auto& c = reg.get<esengine::ecs::FlexContainer>(entity);
@@ -1236,6 +1226,16 @@ f32 editor_getFloat(Registry& reg, u32 e, const std::string& comp, const std::st
if (field == "gravityScale") { return c.gravityScale; }
else if (field == "linearDamping") { return c.linearDamping; }
else if (field == "angularDamping") { return c.angularDamping; }
+ } else if (comp == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return 0.0f;
+ const auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ if (field == "point1.x") { return c.point1.x; }
+ else if (field == "point1.y") { return c.point1.y; }
+ else if (field == "point2.x") { return c.point2.x; }
+ else if (field == "point2.y") { return c.point2.y; }
+ else if (field == "density") { return c.density; }
+ else if (field == "friction") { return c.friction; }
+ else if (field == "restitution") { return c.restitution; }
} else if (comp == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return 0.0f;
const auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);
@@ -1400,6 +1400,13 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::str
else if (field == "font") { c.font = resource::BitmapFontHandle(static_cast<u32>(value)); }
else { return false; }
return true;
+ } else if (comp == "BoxCollider") {
+ if (!reg.has<esengine::ecs::BoxCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
+ if (field == "categoryBits") { c.categoryBits = static_cast<u32>(value); }
+ else if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }
+ else { return false; }
+ return true;
} else if (comp == "Camera") {
if (!reg.has<esengine::ecs::Camera>(entity)) return false;
auto& c = reg.get<esengine::ecs::Camera>(entity);
@@ -1414,20 +1421,6 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::str
if (field == "scaleMode") { c.scaleMode = static_cast<CanvasScaleMode>(value); }
else { return false; }
return true;
- } else if (comp == "BoxCollider") {
- if (!reg.has<esengine::ecs::BoxCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
- if (field == "categoryBits") { c.categoryBits = static_cast<u32>(value); }
- else if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }
- else { return false; }
- return true;
- } else if (comp == "CircleCollider") {
- if (!reg.has<esengine::ecs::CircleCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
- if (field == "categoryBits") { c.categoryBits = static_cast<u32>(value); }
- else if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }
- else { return false; }
- return true;
} else if (comp == "CapsuleCollider") {
if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return false;
auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
@@ -1435,9 +1428,9 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::str
else if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }
else { return false; }
return true;
- } else if (comp == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ } else if (comp == "CircleCollider") {
+ if (!reg.has<esengine::ecs::CircleCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
if (field == "categoryBits") { c.categoryBits = static_cast<u32>(value); }
else if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }
else { return false; }
@@ -1495,6 +1488,13 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::str
if (field == "bodyType") { c.bodyType = static_cast<BodyType>(value); }
else { return false; }
return true;
+ } else if (comp == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ if (field == "categoryBits") { c.categoryBits = static_cast<u32>(value); }
+ else if (field == "maskBits") { c.maskBits = static_cast<u32>(value); }
+ else { return false; }
+ return true;
} else if (comp == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;
auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);
@@ -1570,6 +1570,11 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::stri
if (field == "align") { return static_cast<i32>(c.align); }
else if (field == "layer") { return static_cast<i32>(c.layer); }
else if (field == "font") { return static_cast<i32>(c.font.id()); }
+ } else if (comp == "BoxCollider") {
+ if (!reg.has<esengine::ecs::BoxCollider>(entity)) return 0;
+ const auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
+ if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }
+ else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }
} else if (comp == "Camera") {
if (!reg.has<esengine::ecs::Camera>(entity)) return 0;
const auto& c = reg.get<esengine::ecs::Camera>(entity);
@@ -1580,24 +1585,14 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::stri
if (!reg.has<esengine::ecs::Canvas>(entity)) return 0;
const auto& c = reg.get<esengine::ecs::Canvas>(entity);
if (field == "scaleMode") { return static_cast<i32>(c.scaleMode); }
- } else if (comp == "BoxCollider") {
- if (!reg.has<esengine::ecs::BoxCollider>(entity)) return 0;
- const auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
- if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }
- else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }
- } else if (comp == "CircleCollider") {
- if (!reg.has<esengine::ecs::CircleCollider>(entity)) return 0;
- const auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
- if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }
- else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }
} else if (comp == "CapsuleCollider") {
if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return 0;
const auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }
else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }
- } else if (comp == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return 0;
- const auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ } else if (comp == "CircleCollider") {
+ if (!reg.has<esengine::ecs::CircleCollider>(entity)) return 0;
+ const auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }
else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }
} else if (comp == "FlexContainer") {
@@ -1641,6 +1636,11 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::stri
if (!reg.has<esengine::ecs::RigidBody>(entity)) return 0;
const auto& c = reg.get<esengine::ecs::RigidBody>(entity);
if (field == "bodyType") { return static_cast<i32>(c.bodyType); }
+ } else if (comp == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return 0;
+ const auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ if (field == "categoryBits") { return static_cast<i32>(c.categoryBits); }
+ else if (field == "maskBits") { return static_cast<i32>(c.maskBits); }
} else if (comp == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return 0;
const auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);
@@ -1702,12 +1702,6 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::st
if (field == "enabled") { c.enabled = value; }
else { return false; }
return true;
- } else if (comp == "Camera") {
- if (!reg.has<esengine::ecs::Camera>(entity)) return false;
- auto& c = reg.get<esengine::ecs::Camera>(entity);
- if (field == "isActive") { c.isActive = value; }
- else { return false; }
- return true;
} else if (comp == "BoxCollider") {
if (!reg.has<esengine::ecs::BoxCollider>(entity)) return false;
auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
@@ -1715,11 +1709,10 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "enabled") { c.enabled = value; }
else { return false; }
return true;
- } else if (comp == "CircleCollider") {
- if (!reg.has<esengine::ecs::CircleCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
- if (field == "isSensor") { c.isSensor = value; }
- else if (field == "enabled") { c.enabled = value; }
+ } else if (comp == "Camera") {
+ if (!reg.has<esengine::ecs::Camera>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::Camera>(entity);
+ if (field == "isActive") { c.isActive = value; }
else { return false; }
return true;
} else if (comp == "CapsuleCollider") {
@@ -1729,9 +1722,9 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "enabled") { c.enabled = value; }
else { return false; }
return true;
- } else if (comp == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
- auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ } else if (comp == "CircleCollider") {
+ if (!reg.has<esengine::ecs::CircleCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
if (field == "isSensor") { c.isSensor = value; }
else if (field == "enabled") { c.enabled = value; }
else { return false; }
@@ -1761,6 +1754,13 @@ bool editor_setBool(Registry& reg, u32 e, const std::string& comp, const std::st
else if (field == "enabled") { c.enabled = value; }
else { return false; }
return true;
+ } else if (comp == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
+ auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ if (field == "isSensor") { c.isSensor = value; }
+ else if (field == "enabled") { c.enabled = value; }
+ else { return false; }
+ return true;
} else if (comp == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;
auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);
@@ -1825,28 +1825,23 @@ bool editor_getBool(Registry& reg, u32 e, const std::string& comp, const std::st
if (!reg.has<esengine::ecs::BitmapText>(entity)) return false;
const auto& c = reg.get<esengine::ecs::BitmapText>(entity);
if (field == "enabled") { return c.enabled; }
- } else if (comp == "Camera") {
- if (!reg.has<esengine::ecs::Camera>(entity)) return false;
- const auto& c = reg.get<esengine::ecs::Camera>(entity);
- if (field == "isActive") { return c.isActive; }
} else if (comp == "BoxCollider") {
if (!reg.has<esengine::ecs::BoxCollider>(entity)) return false;
const auto& c = reg.get<esengine::ecs::BoxCollider>(entity);
if (field == "isSensor") { return c.isSensor; }
else if (field == "enabled") { return c.enabled; }
- } else if (comp == "CircleCollider") {
- if (!reg.has<esengine::ecs::CircleCollider>(entity)) return false;
- const auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
- if (field == "isSensor") { return c.isSensor; }
- else if (field == "enabled") { return c.enabled; }
+ } else if (comp == "Camera") {
+ if (!reg.has<esengine::ecs::Camera>(entity)) return false;
+ const auto& c = reg.get<esengine::ecs::Camera>(entity);
+ if (field == "isActive") { return c.isActive; }
} else if (comp == "CapsuleCollider") {
if (!reg.has<esengine::ecs::CapsuleCollider>(entity)) return false;
const auto& c = reg.get<esengine::ecs::CapsuleCollider>(entity);
if (field == "isSensor") { return c.isSensor; }
else if (field == "enabled") { return c.enabled; }
- } else if (comp == "SegmentCollider") {
- if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
- const auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ } else if (comp == "CircleCollider") {
+ if (!reg.has<esengine::ecs::CircleCollider>(entity)) return false;
+ const auto& c = reg.get<esengine::ecs::CircleCollider>(entity);
if (field == "isSensor") { return c.isSensor; }
else if (field == "enabled") { return c.enabled; }
} else if (comp == "Interactable") {
@@ -1868,6 +1863,11 @@ bool editor_getBool(Registry& reg, u32 e, const std::string& comp, const std::st
if (field == "fixedRotation") { return c.fixedRotation; }
else if (field == "bullet") { return c.bullet; }
else if (field == "enabled") { return c.enabled; }
+ } else if (comp == "SegmentCollider") {
+ if (!reg.has<esengine::ecs::SegmentCollider>(entity)) return false;
+ const auto& c = reg.get<esengine::ecs::SegmentCollider>(entity);
+ if (field == "isSensor") { return c.isSensor; }
+ else if (field == "enabled") { return c.enabled; }
} else if (comp == "ShapeRenderer") {
if (!reg.has<esengine::ecs::ShapeRenderer>(entity)) return false;
const auto& c = reg.get<esengine::ecs::ShapeRenderer>(entity);
diff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cpp
index d9473799b..a0a4f2b18 100644
--- a/src/esengine/bindings/WebBindings.generated.cpp
+++ b/src/esengine/bindings/WebBindings.generated.cpp
@@ -74,6 +74,10 @@ EMSCRIPTEN_BINDINGS(esengine_math) {
.field("top", &esengine::Padding::top)
.field("right", &esengine::Padding::right)
.field("bottom", &esengine::Padding::bottom);
+
+ value_object<esengine::Dimension>("Dimension")
+ .field("value", &esengine::Dimension::value)
+ .field("unit", &esengine::Dimension::unit);
}
// =============================================================================
@@ -81,20 +85,31 @@ EMSCRIPTEN_BINDINGS(esengine_math) {
// =============================================================================
EMSCRIPTEN_BINDINGS(esengine_enums) {
- 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::AlignContent>("AlignContent")
+ .value("Start", esengine::ecs::AlignContent::Start)
+ .value("Center", esengine::ecs::AlignContent::Center)
+ .value("End", esengine::ecs::AlignContent::End)
+ .value("Stretch", esengine::ecs::AlignContent::Stretch)
+ .value("SpaceBetween", esengine::ecs::AlignContent::SpaceBetween)
+ .value("SpaceAround", esengine::ecs::AlignContent::SpaceAround);
- enum_<esengine::ecs::ProjectionType>("ProjectionType")
- .value("Perspective", esengine::ecs::ProjectionType::Perspective)
- .value("Orthographic", esengine::ecs::ProjectionType::Orthographic);
+ enum_<esengine::ecs::AlignItems>("AlignItems")
+ .value("Start", esengine::ecs::AlignItems::Start)
+ .value("Center", esengine::ecs::AlignItems::Center)
+ .value("End", esengine::ecs::AlignItems::End)
+ .value("Stretch", esengine::ecs::AlignItems::Stretch);
- enum_<esengine::ecs::ClearFlags>("ClearFlags")
- .value("Nothing", esengine::ecs::ClearFlags::Nothing)
- .value("Color", esengine::ecs::ClearFlags::Color)
- .value("Depth", esengine::ecs::ClearFlags::Depth)
- .value("ColorAndDepth", esengine::ecs::ClearFlags::ColorAndDepth);
+ 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::BodyType>("BodyType")
+ .value("Static", esengine::ecs::BodyType::Static)
+ .value("Kinematic", esengine::ecs::BodyType::Kinematic)
+ .value("Dynamic", esengine::ecs::BodyType::Dynamic);
enum_<esengine::ecs::CanvasScaleMode>("CanvasScaleMode")
.value("FixedWidth", esengine::ecs::CanvasScaleMode::FixedWidth)
@@ -103,6 +118,18 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {
.value("Shrink", esengine::ecs::CanvasScaleMode::Shrink)
.value("Match", esengine::ecs::CanvasScaleMode::Match);
+ enum_<esengine::ecs::ClearFlags>("ClearFlags")
+ .value("Nothing", esengine::ecs::ClearFlags::Nothing)
+ .value("Color", esengine::ecs::ClearFlags::Color)
+ .value("Depth", esengine::ecs::ClearFlags::Depth)
+ .value("ColorAndDepth", esengine::ecs::ClearFlags::ColorAndDepth);
+
+ 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::FlexDirection>("FlexDirection")
.value("Row", esengine::ecs::FlexDirection::Row)
.value("Column", esengine::ecs::FlexDirection::Column)
@@ -113,6 +140,10 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {
.value("NoWrap", esengine::ecs::FlexWrap::NoWrap)
.value("Wrap", esengine::ecs::FlexWrap::Wrap);
+ enum_<esengine::ecs::GridDirection>("GridDirection")
+ .value("Vertical", esengine::ecs::GridDirection::Vertical)
+ .value("Horizontal", esengine::ecs::GridDirection::Horizontal);
+
enum_<esengine::ecs::JustifyContent>("JustifyContent")
.value("Start", esengine::ecs::JustifyContent::Start)
.value("Center", esengine::ecs::JustifyContent::Center)
@@ -121,49 +152,22 @@ EMSCRIPTEN_BINDINGS(esengine_enums) {
.value("SpaceAround", esengine::ecs::JustifyContent::SpaceAround)
.value("SpaceEvenly", esengine::ecs::JustifyContent::SpaceEvenly);
- enum_<esengine::ecs::AlignItems>("AlignItems")
- .value("Start", esengine::ecs::AlignItems::Start)
- .value("Center", esengine::ecs::AlignItems::Center)
- .value("End", esengine::ecs::AlignItems::End)
- .value("Stretch", esengine::ecs::AlignItems::Stretch);
-
- enum_<esengine::ecs::AlignContent>("AlignContent")
- .value("Start", esengine::ecs::AlignContent::Start)
- .value("Center", esengine::ecs::AlignContent::Center)
- .value("End", esengine::ecs::AlignContent::End)
- .value("Stretch", esengine::ecs::AlignContent::Stretch)
- .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::GridDirection>("GridDirection")
- .value("Vertical", esengine::ecs::GridDirection::Vertical)
- .value("Horizontal", esengine::ecs::GridDirection::Horizontal);
+ enum_<esengine::ecs::MaskMode>("MaskMode")
+ .value("Scissor", esengine::ecs::MaskMode::Scissor)
+ .value("Stencil", esengine::ecs::MaskMode::Stencil);
- 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::TextAlign>("TextAlign")
+ .value("Left", esengine::ecs::TextAlign::Left)
+ .value("Center", esengine::ecs::TextAlign::Center)
+ .value("Right", esengine::ecs::TextAlign::Right);
enum_<esengine::ecs::UIVisualType>("UIVisualType")
.value("None", esengine::ecs::UIVisualType::None)
@@ -285,6 +289,24 @@ CanvasJS canvasToJS(const esengine::ecs::Canvas& c) {
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 FlexContainerJS {
i32 direction;
i32 wrap;
@@ -409,24 +431,6 @@ ParentJS parentToJS(const esengine::ecs::Parent& c) {
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 ParticleEmitterJS {
f32 rate;
i32 burstCount;
@@ -879,6 +883,17 @@ EMSCRIPTEN_BINDINGS(esengine_components) {
.field("font", &BitmapTextJS::font)
.field("enabled", &BitmapTextJS::enabled);
+ value_object<esengine::ecs::BoxCollider>("BoxCollider")
+ .field("halfExtents", &esengine::ecs::BoxCollider::halfExtents)
+ .field("offset", &esengine::ecs::BoxCollider::offset)
+ .field("density", &esengine::ecs::BoxCollider::density)
+ .field("friction", &esengine::ecs::BoxCollider::friction)
+ .field("restitution", &esengine::ecs::BoxCollider::restitution)
+ .field("isSensor", &esengine::ecs::BoxCollider::isSensor)
+ .field("enabled", &esengine::ecs::BoxCollider::enabled)
+ .field("categoryBits", &esengine::ecs::BoxCollider::categoryBits)
+ .field("maskBits", &esengine::ecs::BoxCollider::maskBits);
+
value_object<CameraJS>("Camera")
.field("projectionType", &CameraJS::projectionType)
.field("fov", &CameraJS::fov)
@@ -898,28 +913,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {
.field("matchWidthOrHeight", &CanvasJS::matchWidthOrHeight)
.field("backgroundColor", &CanvasJS::backgroundColor);
- value_object<esengine::ecs::BoxCollider>("BoxCollider")
- .field("halfExtents", &esengine::ecs::BoxCollider::halfExtents)
- .field("offset", &esengine::ecs::BoxCollider::offset)
- .field("density", &esengine::ecs::BoxCollider::density)
- .field("friction", &esengine::ecs::BoxCollider::friction)
- .field("restitution", &esengine::ecs::BoxCollider::restitution)
- .field("isSensor", &esengine::ecs::BoxCollider::isSensor)
- .field("enabled", &esengine::ecs::BoxCollider::enabled)
- .field("categoryBits", &esengine::ecs::BoxCollider::categoryBits)
- .field("maskBits", &esengine::ecs::BoxCollider::maskBits);
-
- value_object<esengine::ecs::CircleCollider>("CircleCollider")
- .field("radius", &esengine::ecs::CircleCollider::radius)
- .field("offset", &esengine::ecs::CircleCollider::offset)
- .field("density", &esengine::ecs::CircleCollider::density)
- .field("friction", &esengine::ecs::CircleCollider::friction)
- .field("restitution", &esengine::ecs::CircleCollider::restitution)
- .field("isSensor", &esengine::ecs::CircleCollider::isSensor)
- .field("enabled", &esengine::ecs::CircleCollider::enabled)
- .field("categoryBits", &esengine::ecs::CircleCollider::categoryBits)
- .field("maskBits", &esengine::ecs::CircleCollider::maskBits);
-
value_object<esengine::ecs::CapsuleCollider>("CapsuleCollider")
.field("radius", &esengine::ecs::CapsuleCollider::radius)
.field("halfHeight", &esengine::ecs::CapsuleCollider::halfHeight)
@@ -932,16 +925,19 @@ EMSCRIPTEN_BINDINGS(esengine_components) {
.field("categoryBits", &esengine::ecs::CapsuleCollider::categoryBits)
.field("maskBits", &esengine::ecs::CapsuleCollider::maskBits);
- value_object<esengine::ecs::SegmentCollider>("SegmentCollider")
- .field("point1", &esengine::ecs::SegmentCollider::point1)
- .field("point2", &esengine::ecs::SegmentCollider::point2)
- .field("density", &esengine::ecs::SegmentCollider::density)
- .field("friction", &esengine::ecs::SegmentCollider::friction)
- .field("restitution", &esengine::ecs::SegmentCollider::restitution)
- .field("isSensor", &esengine::ecs::SegmentCollider::isSensor)
- .field("enabled", &esengine::ecs::SegmentCollider::enabled)
- .field("categoryBits", &esengine::ecs::SegmentCollider::categoryBits)
- .field("maskBits", &esengine::ecs::SegmentCollider::maskBits);
+ value_object<ChildrenJS>("Children")
+ .field("entities", &ChildrenJS::entities);
+
+ value_object<esengine::ecs::CircleCollider>("CircleCollider")
+ .field("radius", &esengine::ecs::CircleCollider::radius)
+ .field("offset", &esengine::ecs::CircleCollider::offset)
+ .field("density", &esengine::ecs::CircleCollider::density)
+ .field("friction", &esengine::ecs::CircleCollider::friction)
+ .field("restitution", &esengine::ecs::CircleCollider::restitution)
+ .field("isSensor", &esengine::ecs::CircleCollider::isSensor)
+ .field("enabled", &esengine::ecs::CircleCollider::enabled)
+ .field("categoryBits", &esengine::ecs::CircleCollider::categoryBits)
+ .field("maskBits", &esengine::ecs::CircleCollider::maskBits);
value_object<FlexContainerJS>("FlexContainer")
.field("direction", &FlexContainerJS::direction)
@@ -972,17 +968,14 @@ EMSCRIPTEN_BINDINGS(esengine_components) {
.field("itemSize", &GridLayoutJS::itemSize)
.field("spacing", &GridLayoutJS::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<ParentJS>("Parent")
+ .field("entity", &ParentJS::entity);
+
value_object<ParticleEmitterJS>("ParticleEmitter")
.field("rate", &ParticleEmitterJS::rate)
.field("burstCount", &ParticleEmitterJS::burstCount)
@@ -1035,6 +1028,17 @@ EMSCRIPTEN_BINDINGS(esengine_components) {
.field("bullet", &RigidBodyJS::bullet)
.field("enabled", &RigidBodyJS::enabled);
+ value_object<esengine::ecs::SegmentCollider>("SegmentCollider")
+ .field("point1", &esengine::ecs::SegmentCollider::point1)
+ .field("point2", &esengine::ecs::SegmentCollider::point2)
+ .field("density", &esengine::ecs::SegmentCollider::density)
+ .field("friction", &esengine::ecs::SegmentCollider::friction)
+ .field("restitution", &esengine::ecs::SegmentCollider::restitution)
+ .field("isSensor", &esengine::ecs::SegmentCollider::isSensor)
+ .field("enabled", &esengine::ecs::SegmentCollider::enabled)
+ .field("categoryBits", &esengine::ecs::SegmentCollider::categoryBits)
+ .field("maskBits", &esengine::ecs::SegmentCollider::maskBits);
+
value_object<esengine::ecs::ShapeRenderer>("ShapeRenderer")
.field("shapeType", &esengine::ecs::ShapeRenderer::shapeType)
.field("color", &esengine::ecs::ShapeRenderer::color)
@@ -1207,6 +1211,27 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::BitmapText>(entity);
}))
+ // BoxCollider
+ .function("hasBoxCollider", optional_override([](Registry& r, u32 e) {
+ return r.has<esengine::ecs::BoxCollider>(static_cast<Entity>(e));
+ }))
+ .function("getBoxCollider", optional_override([](Registry& r, u32 e) -> esengine::ecs::BoxCollider& {
+ auto entity = static_cast<Entity>(e);
+ static esengine::ecs::BoxCollider s_dummy{};
+ if (!r.valid(entity) || !r.has<esengine::ecs::BoxCollider>(entity)) return s_dummy;
+ return r.get<esengine::ecs::BoxCollider>(entity);
+ }), allow_raw_pointers())
+ .function("addBoxCollider", optional_override([](Registry& r, u32 e, const esengine::ecs::BoxCollider& c) {
+ auto entity = static_cast<Entity>(e);
+ if (!r.valid(entity)) return;
+ r.emplaceOrReplace<esengine::ecs::BoxCollider>(entity, c);
+ }))
+ .function("removeBoxCollider", optional_override([](Registry& r, u32 e) {
+ auto entity = static_cast<Entity>(e);
+ if (!r.valid(entity) || !r.has<esengine::ecs::BoxCollider>(entity)) return;
+ r.remove<esengine::ecs::BoxCollider>(entity);
+ }))
+
// Camera
.function("hasCamera", optional_override([](Registry& r, u32 e) {
return r.has<esengine::ecs::Camera>(static_cast<Entity>(e));
@@ -1247,48 +1272,6 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::Canvas>(entity);
}))
- // BoxCollider
- .function("hasBoxCollider", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::BoxCollider>(static_cast<Entity>(e));
- }))
- .function("getBoxCollider", optional_override([](Registry& r, u32 e) -> esengine::ecs::BoxCollider& {
- auto entity = static_cast<Entity>(e);
- static esengine::ecs::BoxCollider s_dummy{};
- if (!r.valid(entity) || !r.has<esengine::ecs::BoxCollider>(entity)) return s_dummy;
- return r.get<esengine::ecs::BoxCollider>(entity);
- }), allow_raw_pointers())
- .function("addBoxCollider", optional_override([](Registry& r, u32 e, const esengine::ecs::BoxCollider& c) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity)) return;
- r.emplaceOrReplace<esengine::ecs::BoxCollider>(entity, c);
- }))
- .function("removeBoxCollider", optional_override([](Registry& r, u32 e) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::BoxCollider>(entity)) return;
- r.remove<esengine::ecs::BoxCollider>(entity);
- }))
-
- // CircleCollider
- .function("hasCircleCollider", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::CircleCollider>(static_cast<Entity>(e));
- }))
- .function("getCircleCollider", optional_override([](Registry& r, u32 e) -> esengine::ecs::CircleCollider& {
- auto entity = static_cast<Entity>(e);
- static esengine::ecs::CircleCollider s_dummy{};
- if (!r.valid(entity) || !r.has<esengine::ecs::CircleCollider>(entity)) return s_dummy;
- return r.get<esengine::ecs::CircleCollider>(entity);
- }), allow_raw_pointers())
- .function("addCircleCollider", optional_override([](Registry& r, u32 e, const esengine::ecs::CircleCollider& c) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity)) return;
- r.emplaceOrReplace<esengine::ecs::CircleCollider>(entity, c);
- }))
- .function("removeCircleCollider", optional_override([](Registry& r, u32 e) {
- auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::CircleCollider>(entity)) return;
- r.remove<esengine::ecs::CircleCollider>(entity);
- }))
-
// CapsuleCollider
.function("hasCapsuleCollider", optional_override([](Registry& r, u32 e) {
return r.has<esengine::ecs::CapsuleCollider>(static_cast<Entity>(e));
@@ -1310,25 +1293,45 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::CapsuleCollider>(entity);
}))
- // SegmentCollider
- .function("hasSegmentCollider", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::SegmentCollider>(static_cast<Entity>(e));
+ // Children
+ .function("hasChildren", optional_override([](Registry& r, u32 e) {
+ return r.has<esengine::ecs::Children>(static_cast<Entity>(e));
}))
- .function("getSegmentCollider", optional_override([](Registry& r, u32 e) -> esengine::ecs::SegmentCollider& {
+ .function("getChildren", optional_override([](Registry& r, u32 e) {
auto entity = static_cast<Entity>(e);
- static esengine::ecs::SegmentCollider s_dummy{};
- if (!r.valid(entity) || !r.has<esengine::ecs::SegmentCollider>(entity)) return s_dummy;
- return r.get<esengine::ecs::SegmentCollider>(entity);
+ 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::Children>(entity, childrenFromJS(js));
+ }))
+ .function("removeChildren", 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);
+ }))
+
+ // CircleCollider
+ .function("hasCircleCollider", optional_override([](Registry& r, u32 e) {
+ return r.has<esengine::ecs::CircleCollider>(static_cast<Entity>(e));
+ }))
+ .function("getCircleCollider", optional_override([](Registry& r, u32 e) -> esengine::ecs::CircleCollider& {
+ auto entity = static_cast<Entity>(e);
+ static esengine::ecs::CircleCollider s_dummy{};
+ if (!r.valid(entity) || !r.has<esengine::ecs::CircleCollider>(entity)) return s_dummy;
+ return r.get<esengine::ecs::CircleCollider>(entity);
}), allow_raw_pointers())
- .function("addSegmentCollider", optional_override([](Registry& r, u32 e, const esengine::ecs::SegmentCollider& c) {
+ .function("addCircleCollider", optional_override([](Registry& r, u32 e, const esengine::ecs::CircleCollider& c) {
auto entity = static_cast<Entity>(e);
if (!r.valid(entity)) return;
- r.emplaceOrReplace<esengine::ecs::SegmentCollider>(entity, c);
+ r.emplaceOrReplace<esengine::ecs::CircleCollider>(entity, c);
}))
- .function("removeSegmentCollider", optional_override([](Registry& r, u32 e) {
+ .function("removeCircleCollider", optional_override([](Registry& r, u32 e) {
auto entity = static_cast<Entity>(e);
- if (!r.valid(entity) || !r.has<esengine::ecs::SegmentCollider>(entity)) return;
- r.remove<esengine::ecs::SegmentCollider>(entity);
+ if (!r.valid(entity) || !r.has<esengine::ecs::CircleCollider>(entity)) return;
+ r.remove<esengine::ecs::CircleCollider>(entity);
}))
// FlexContainer
@@ -1391,46 +1394,6 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::GridLayout>(entity);
}))
- // Parent
- .function("hasParent", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::Parent>(static_cast<Entity>(e));
- }))
- .function("getParent", optional_override([](Registry& r, u32 e) {
- 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) {
- auto entity = static_cast<Entity>(e);
- 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);
- }))
-
- // Children
- .function("hasChildren", optional_override([](Registry& r, u32 e) {
- return r.has<esengine::ecs::Children>(static_cast<Entity>(e));
- }))
- .function("getChildren", 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));
- }))
- .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::Children>(entity, childrenFromJS(js));
- }))
- .function("removeChildren", 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);
- }))
-
// Interactable
.function("hasInteractable", optional_override([](Registry& r, u32 e) {
return r.has<esengine::ecs::Interactable>(static_cast<Entity>(e));
@@ -1452,6 +1415,26 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::Interactable>(entity);
}))
+ // Parent
+ .function("hasParent", optional_override([](Registry& r, u32 e) {
+ return r.has<esengine::ecs::Parent>(static_cast<Entity>(e));
+ }))
+ .function("getParent", optional_override([](Registry& r, u32 e) {
+ 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) {
+ auto entity = static_cast<Entity>(e);
+ 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);
+ }))
+
// ParticleEmitter
.function("hasParticleEmitter", optional_override([](Registry& r, u32 e) {
return r.has<esengine::ecs::ParticleEmitter>(static_cast<Entity>(e));
@@ -1492,6 +1475,27 @@ EMSCRIPTEN_BINDINGS(esengine_registry) {
r.remove<esengine::ecs::RigidBody>(entity);
}))
+ // SegmentCollider
+ .function("hasSegmentCollider", optional_override([](Registry& r, u32 e) {
+ return r.has<esengine::ecs::SegmentCollider>(static_cast<Entity>(e));
+ }))
+ .function("getSegmentCollider", optional_override([](Registry& r, u32 e) -> esengine::ecs::SegmentCollider& {
+ auto entity = static_cast<Entity>(e);
+ static esengine::ecs::SegmentCollider s_dummy{};
+ if (!r.valid(entity) || !r.has<esengine::ecs::SegmentCollider>(entity)) return s_dummy;
+ return r.get<esengine::ecs::SegmentCollider>(entity);
+ }), allow_raw_pointers())
+ .function("addSegmentCollider", optional_override([](Registry& r, u32 e, const esengine::ecs::SegmentCollider& c) {
+ auto entity = static_cast<Entity>(e);
+ if (!r.valid(entity)) return;
+ r.emplaceOrReplace<esengine::ecs::SegmentCollider>(entity, c);
+ }))
+ .function("removeSegmentCollider", optional_override([](Registry& r, u32 e) {
+ auto entity = static_cast<Entity>(e);
+ if (!r.valid(entity) || !r.has<esengine::ecs::SegmentCollider>(entity)) return;
+ r.remove<esengine::ecs::SegmentCollider>(entity);
+ }))
+
// ShapeRenderer
.function("hasShapeRenderer", optional_override([](Registry& r, u32 e) {
return r.has<esengine::ecs::ShapeRenderer>(static_cast<Entity>(e));
@@ -1758,20 +1762,20 @@ emscripten::val esengineGetBuiltinComponentNames() {
auto arr = val::array();
size_t i = 0;
arr.set(i++, val(std::string("BitmapText")));
+ arr.set(i++, val(std::string("BoxCollider")));
arr.set(i++, val(std::string("Camera")));
arr.set(i++, val(std::string("Canvas")));
- arr.set(i++, val(std::string("BoxCollider")));
- arr.set(i++, val(std::string("CircleCollider")));
arr.set(i++, val(std::string("CapsuleCollider")));
- arr.set(i++, val(std::string("SegmentCollider")));
+ arr.set(i++, val(std::string("Children")));
+ arr.set(i++, val(std::string("CircleCollider")));
arr.set(i++, val(std::string("FlexContainer")));
arr.set(i++, val(std::string("FlexItem")));
arr.set(i++, val(std::string("GridLayout")));
- arr.set(i++, val(std::string("Parent")));
- arr.set(i++, val(std::string("Children")));
arr.set(i++, val(std::string("Interactable")));
+ arr.set(i++, val(std::string("Parent")));
arr.set(i++, val(std::string("ParticleEmitter")));
arr.set(i++, val(std::string("RigidBody")));
+ arr.set(i++, val(std::string("SegmentCollider")));
arr.set(i++, val(std::string("ShapeRenderer")));
arr.set(i++, val(std::string("SpineAnimation")));
arr.set(i++, val(std::string("Sprite")));
@@ -1805,6 +1809,15 @@ static_assert(offsetof(esengine::ecs::BitmapText, spacing) == 36, "ABI offset dr
static_assert(offsetof(esengine::ecs::BitmapText, layer) == 40, "ABI offset drift: esengine::ecs::BitmapText.layer (EHT expected 40)");
static_assert(offsetof(esengine::ecs::BitmapText, font) == 44, "ABI offset drift: esengine::ecs::BitmapText.font (EHT expected 44)");
static_assert(offsetof(esengine::ecs::BitmapText, enabled) == 48, "ABI offset drift: esengine::ecs::BitmapText.enabled (EHT expected 48)");
+static_assert(offsetof(esengine::ecs::BoxCollider, halfExtents) == 0, "ABI offset drift: esengine::ecs::BoxCollider.halfExtents (EHT expected 0)");
+static_assert(offsetof(esengine::ecs::BoxCollider, offset) == 8, "ABI offset drift: esengine::ecs::BoxCollider.offset (EHT expected 8)");
+static_assert(offsetof(esengine::ecs::BoxCollider, density) == 16, "ABI offset drift: esengine::ecs::BoxCollider.density (EHT expected 16)");
+static_assert(offsetof(esengine::ecs::BoxCollider, friction) == 20, "ABI offset drift: esengine::ecs::BoxCollider.friction (EHT expected 20)");
+static_assert(offsetof(esengine::ecs::BoxCollider, restitution) == 24, "ABI offset drift: esengine::ecs::BoxCollider.restitution (EHT expected 24)");
+static_assert(offsetof(esengine::ecs::BoxCollider, isSensor) == 28, "ABI offset drift: esengine::ecs::BoxCollider.isSensor (EHT expected 28)");
+static_assert(offsetof(esengine::ecs::BoxCollider, enabled) == 29, "ABI offset drift: esengine::ecs::BoxCollider.enabled (EHT expected 29)");
+static_assert(offsetof(esengine::ecs::BoxCollider, categoryBits) == 32, "ABI offset drift: esengine::ecs::BoxCollider.categoryBits (EHT expected 32)");
+static_assert(offsetof(esengine::ecs::BoxCollider, maskBits) == 36, "ABI offset drift: esengine::ecs::BoxCollider.maskBits (EHT expected 36)");
static_assert(offsetof(esengine::ecs::Camera, projectionType) == 0, "ABI offset drift: esengine::ecs::Camera.projectionType (EHT expected 0)");
static_assert(offsetof(esengine::ecs::Camera, fov) == 4, "ABI offset drift: esengine::ecs::Camera.fov (EHT expected 4)");
static_assert(offsetof(esengine::ecs::Camera, orthoSize) == 8, "ABI offset drift: esengine::ecs::Camera.orthoSize (EHT expected 8)");
@@ -1820,24 +1833,6 @@ static_assert(offsetof(esengine::ecs::Canvas, pixelsPerUnit) == 8, "ABI offset d
static_assert(offsetof(esengine::ecs::Canvas, scaleMode) == 12, "ABI offset drift: esengine::ecs::Canvas.scaleMode (EHT expected 12)");
static_assert(offsetof(esengine::ecs::Canvas, matchWidthOrHeight) == 16, "ABI offset drift: esengine::ecs::Canvas.matchWidthOrHeight (EHT expected 16)");
static_assert(offsetof(esengine::ecs::Canvas, backgroundColor) == 20, "ABI offset drift: esengine::ecs::Canvas.backgroundColor (EHT expected 20)");
-static_assert(offsetof(esengine::ecs::BoxCollider, halfExtents) == 0, "ABI offset drift: esengine::ecs::BoxCollider.halfExtents (EHT expected 0)");
-static_assert(offsetof(esengine::ecs::BoxCollider, offset) == 8, "ABI offset drift: esengine::ecs::BoxCollider.offset (EHT expected 8)");
-static_assert(offsetof(esengine::ecs::BoxCollider, density) == 16, "ABI offset drift: esengine::ecs::BoxCollider.density (EHT expected 16)");
-static_assert(offsetof(esengine::ecs::BoxCollider, friction) == 20, "ABI offset drift: esengine::ecs::BoxCollider.friction (EHT expected 20)");
-static_assert(offsetof(esengine::ecs::BoxCollider, restitution) == 24, "ABI offset drift: esengine::ecs::BoxCollider.restitution (EHT expected 24)");
-static_assert(offsetof(esengine::ecs::BoxCollider, isSensor) == 28, "ABI offset drift: esengine::ecs::BoxCollider.isSensor (EHT expected 28)");
-static_assert(offsetof(esengine::ecs::BoxCollider, enabled) == 29, "ABI offset drift: esengine::ecs::BoxCollider.enabled (EHT expected 29)");
-static_assert(offsetof(esengine::ecs::BoxCollider, categoryBits) == 32, "ABI offset drift: esengine::ecs::BoxCollider.categoryBits (EHT expected 32)");
-static_assert(offsetof(esengine::ecs::BoxCollider, maskBits) == 36, "ABI offset drift: esengine::ecs::BoxCollider.maskBits (EHT expected 36)");
-static_assert(offsetof(esengine::ecs::CircleCollider, radius) == 0, "ABI offset drift: esengine::ecs::CircleCollider.radius (EHT expected 0)");
-static_assert(offsetof(esengine::ecs::CircleCollider, offset) == 4, "ABI offset drift: esengine::ecs::CircleCollider.offset (EHT expected 4)");
-static_assert(offsetof(esengine::ecs::CircleCollider, density) == 12, "ABI offset drift: esengine::ecs::CircleCollider.density (EHT expected 12)");
-static_assert(offsetof(esengine::ecs::CircleCollider, friction) == 16, "ABI offset drift: esengine::ecs::CircleCollider.friction (EHT expected 16)");
-static_assert(offsetof(esengine::ecs::CircleCollider, restitution) == 20, "ABI offset drift: esengine::ecs::CircleCollider.restitution (EHT expected 20)");
-static_assert(offsetof(esengine::ecs::CircleCollider, isSensor) == 24, "ABI offset drift: esengine::ecs::CircleCollider.isSensor (EHT expected 24)");
-static_assert(offsetof(esengine::ecs::CircleCollider, enabled) == 25, "ABI offset drift: esengine::ecs::CircleCollider.enabled (EHT expected 25)");
-static_assert(offsetof(esengine::ecs::CircleCollider, categoryBits) == 28, "ABI offset drift: esengine::ecs::CircleCollider.categoryBits (EHT expected 28)");
-static_assert(offsetof(esengine::ecs::CircleCollider, maskBits) == 32, "ABI offset drift: esengine::ecs::CircleCollider.maskBits (EHT expected 32)");
static_assert(offsetof(esengine::ecs::CapsuleCollider, radius) == 0, "ABI offset drift: esengine::ecs::CapsuleCollider.radius (EHT expected 0)");
static_assert(offsetof(esengine::ecs::CapsuleCollider, halfHeight) == 4, "ABI offset drift: esengine::ecs::CapsuleCollider.halfHeight (EHT expected 4)");
static_assert(offsetof(esengine::ecs::CapsuleCollider, offset) == 8, "ABI offset drift: esengine::ecs::CapsuleCollider.offset (EHT expected 8)");
@@ -1848,15 +1843,15 @@ static_assert(offsetof(esengine::ecs::CapsuleCollider, isSensor) == 28, "ABI off
static_assert(offsetof(esengine::ecs::CapsuleCollider, enabled) == 29, "ABI offset drift: esengine::ecs::CapsuleCollider.enabled (EHT expected 29)");
static_assert(offsetof(esengine::ecs::CapsuleCollider, categoryBits) == 32, "ABI offset drift: esengine::ecs::CapsuleCollider.categoryBits (EHT expected 32)");
static_assert(offsetof(esengine::ecs::CapsuleCollider, maskBits) == 36, "ABI offset drift: esengine::ecs::CapsuleCollider.maskBits (EHT expected 36)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, point1) == 0, "ABI offset drift: esengine::ecs::SegmentCollider.point1 (EHT expected 0)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, point2) == 8, "ABI offset drift: esengine::ecs::SegmentCollider.point2 (EHT expected 8)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, density) == 16, "ABI offset drift: esengine::ecs::SegmentCollider.density (EHT expected 16)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, friction) == 20, "ABI offset drift: esengine::ecs::SegmentCollider.friction (EHT expected 20)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, restitution) == 24, "ABI offset drift: esengine::ecs::SegmentCollider.restitution (EHT expected 24)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, isSensor) == 28, "ABI offset drift: esengine::ecs::SegmentCollider.isSensor (EHT expected 28)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, enabled) == 29, "ABI offset drift: esengine::ecs::SegmentCollider.enabled (EHT expected 29)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, categoryBits) == 32, "ABI offset drift: esengine::ecs::SegmentCollider.categoryBits (EHT expected 32)");
-static_assert(offsetof(esengine::ecs::SegmentCollider, maskBits) == 36, "ABI offset drift: esengine::ecs::SegmentCollider.maskBits (EHT expected 36)");
+static_assert(offsetof(esengine::ecs::CircleCollider, radius) == 0, "ABI offset drift: esengine::ecs::CircleCollider.radius (EHT expected 0)");
+static_assert(offsetof(esengine::ecs::CircleCollider, offset) == 4, "ABI offset drift: esengine::ecs::CircleCollider.offset (EHT expected 4)");
+static_assert(offsetof(esengine::ecs::CircleCollider, density) == 12, "ABI offset drift: esengine::ecs::CircleCollider.density (EHT expected 12)");
+static_assert(offsetof(esengine::ecs::CircleCollider, friction) == 16, "ABI offset drift: esengine::ecs::CircleCollider.friction (EHT expected 16)");
+static_assert(offsetof(esengine::ecs::CircleCollider, restitution) == 20, "ABI offset drift: esengine::ecs::CircleCollider.restitution (EHT expected 20)");
+static_assert(offsetof(esengine::ecs::CircleCollider, isSensor) == 24, "ABI offset drift: esengine::ecs::CircleCollider.isSensor (EHT expected 24)");
+static_assert(offsetof(esengine::ecs::CircleCollider, enabled) == 25, "ABI offset drift: esengine::ecs::CircleCollider.enabled (EHT expected 25)");
+static_assert(offsetof(esengine::ecs::CircleCollider, categoryBits) == 28, "ABI offset drift: esengine::ecs::CircleCollider.categoryBits (EHT expected 28)");
+static_assert(offsetof(esengine::ecs::CircleCollider, maskBits) == 32, "ABI offset drift: esengine::ecs::CircleCollider.maskBits (EHT expected 32)");
static_assert(offsetof(esengine::ecs::FlexContainer, direction) == 0, "ABI offset drift: esengine::ecs::FlexContainer.direction (EHT expected 0)");
static_assert(offsetof(esengine::ecs::FlexContainer, wrap) == 1, "ABI offset drift: esengine::ecs::FlexContainer.wrap (EHT expected 1)");
static_assert(offsetof(esengine::ecs::FlexContainer, justifyContent) == 2, "ABI offset drift: esengine::ecs::FlexContainer.justifyContent (EHT expected 2)");
@@ -1929,6 +1924,15 @@ static_assert(offsetof(esengine::ecs::RigidBody, angularDamping) == 12, "ABI off
static_assert(offsetof(esengine::ecs::RigidBody, fixedRotation) == 16, "ABI offset drift: esengine::ecs::RigidBody.fixedRotation (EHT expected 16)");
static_assert(offsetof(esengine::ecs::RigidBody, bullet) == 17, "ABI offset drift: esengine::ecs::RigidBody.bullet (EHT expected 17)");
static_assert(offsetof(esengine::ecs::RigidBody, enabled) == 18, "ABI offset drift: esengine::ecs::RigidBody.enabled (EHT expected 18)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, point1) == 0, "ABI offset drift: esengine::ecs::SegmentCollider.point1 (EHT expected 0)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, point2) == 8, "ABI offset drift: esengine::ecs::SegmentCollider.point2 (EHT expected 8)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, density) == 16, "ABI offset drift: esengine::ecs::SegmentCollider.density (EHT expected 16)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, friction) == 20, "ABI offset drift: esengine::ecs::SegmentCollider.friction (EHT expected 20)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, restitution) == 24, "ABI offset drift: esengine::ecs::SegmentCollider.restitution (EHT expected 24)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, isSensor) == 28, "ABI offset drift: esengine::ecs::SegmentCollider.isSensor (EHT expected 28)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, enabled) == 29, "ABI offset drift: esengine::ecs::SegmentCollider.enabled (EHT expected 29)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, categoryBits) == 32, "ABI offset drift: esengine::ecs::SegmentCollider.categoryBits (EHT expected 32)");
+static_assert(offsetof(esengine::ecs::SegmentCollider, maskBits) == 36, "ABI offset drift: esengine::ecs::SegmentCollider.maskBits (EHT expected 36)");
static_assert(offsetof(esengine::ecs::ShapeRenderer, shapeType) == 0, "ABI offset drift: esengine::ecs::ShapeRenderer.shapeType (EHT expected 0)");
static_assert(offsetof(esengine::ecs::ShapeRenderer, color) == 4, "ABI offset drift: esengine::ecs::ShapeRenderer.color (EHT expected 4)");
static_assert(offsetof(esengine::ecs::ShapeRenderer, size) == 20, "ABI offset drift: esengine::ecs::ShapeRenderer.size (EHT expected 20)");
diff --git a/tools/eht/__main__.py b/tools/eht/__main__.py
index c15e50ac3..7797983cb 100644
--- a/tools/eht/__main__.py
+++ b/tools/eht/__main__.py
@@ -35,6 +35,13 @@ def main() -> int:
if cpp_parser.warnings:
cpp_parser.print_warnings()
+ # Emit components/enums in a stable alphabetical order so the generated files
+ # are byte-reproducible across machines — Path.rglob order is filesystem-
+ # dependent, which otherwise churns every committed *.generated.* file when a
+ # different dev regenerates. (The ABI hash already canonicalizes by sorting.)
+ cpp_parser.components.sort(key=lambda c: c.name)
+ cpp_parser.enums.sort(key=lambda e: e.name)
+
if args.verbose:
print(f" Found {len(cpp_parser.enums)} enums")
print(f" Found {len(cpp_parser.components)} components")
diff --git a/tools/eht/field_utils.py b/tools/eht/field_utils.py
index ecc058377..021b2ca90 100644
--- a/tools/eht/field_utils.py
+++ b/tools/eht/field_utils.py
@@ -19,7 +19,6 @@ VEC3_SUBS = [('x', 'x'), ('y', 'y'), ('z', 'z')]
VEC4_SUBS = [('x', 'x'), ('y', 'y'), ('z', 'z'), ('w', 'w')]
VEC4_COLOR_SUBS = [('r', 'r'), ('g', 'g'), ('b', 'b'), ('a', 'a')]
QUAT_SUBS = [('w', 'w'), ('x', 'x'), ('y', 'y'), ('z', 'z')]
-PADDING_SUBS = [('left', 'left'), ('top', 'top'), ('right', 'right'), ('bottom', 'bottom')]
def is_color_field(prop: Property, types: TypeSystem) -> bool:
@@ -49,8 +48,8 @@ def get_sub_components(prop: Property, types: TypeSystem) -> List[Tuple[str, str
return QUAT_SUBS
if t == 'glm::uvec2':
return VEC2_SUBS
- if t == 'Padding':
- return PADDING_SUBS
+ if t in TypeSystem.CUSTOM_STRUCTS:
+ return [(m, m) for m, _ in TypeSystem.CUSTOM_STRUCTS[t]]
# Scalar
return [('', '')]
@@ -84,7 +83,7 @@ def get_editor_type(prop: Property, types: TypeSystem) -> str:
return 'float'
if t in TypeSystem.PRIMITIVE_TYPES:
return 'int'
- if t in TypeSystem.GLM_TYPES or t in TypeSystem.CUSTOM_STRUCT_TYPES:
+ if t in TypeSystem.GLM_TYPES or t in TypeSystem.CUSTOM_STRUCTS:
return 'float' # Sub-components are all floats (or ints for uvec2)
if t in TypeSystem.VECTOR_TYPES:
return 'skip' # Vector types not editable as simple fields
@@ -156,8 +155,28 @@ def convert_default_ts(prop: Property, types: TypeSystem,
return "''"
if t in types.VECTOR_TYPES:
return '[]'
- if t == 'Padding':
- return '{ left: 0, top: 0, right: 0, bottom: 0 }'
+ if t in types.CUSTOM_STRUCTS:
+ members = types.CUSTOM_STRUCTS[t]
+ inner = raw.strip() if raw else ''
+ if inner.startswith('{') and inner.endswith('}'):
+ inner = inner[1:-1]
+ parts = [p.strip() for p in inner.split(',')] if inner.strip() else []
+ out = []
+ for i, (m, _mcpp) in enumerate(members):
+ p = parts[i] if i < len(parts) else None
+ if not p:
+ out.append(f'{m}: 0')
+ elif '::' in p: # enum-valued member, e.g. DimensionUnit::Auto
+ val_name = p.split('::')[-1].strip()
+ resolved = '0'
+ for _key, vmap in enum_values.items():
+ if val_name in vmap:
+ resolved = str(vmap[val_name])
+ break
+ out.append(f'{m}: {resolved}')
+ else:
+ out.append(f'{m}: {format_number(p)}')
+ return '{ ' + ', '.join(out) + ' }'
if raw and 'static_cast' in raw:
m = re.search(r'(\w+)::(\w+)', raw)
if m:
diff --git a/tools/eht/generators/embind.py b/tools/eht/generators/embind.py
index aedc9e105..db9271e20 100644
--- a/tools/eht/generators/embind.py
+++ b/tools/eht/generators/embind.py
@@ -91,7 +91,7 @@ class EmbindGenerator:
return lines
def _gen_math_types(self) -> List[str]:
- return [
+ lines = [
'// =============================================================================',
'// Math Types',
'// =============================================================================',
diff --git a/tools/eht/generators/typescript.py b/tools/eht/generators/typescript.py
index cd7b8ad7b..abdc6a357 100644
--- a/tools/eht/generators/typescript.py
+++ b/tools/eht/generators/typescript.py
@@ -49,7 +49,8 @@ class TypeScriptGenerator:
' delete(): void;',
'}',
'',
- ]
+ ])
+ return lines
def _gen_enums(self) -> List[str]:
if not self.enums: