@combos-fun/engine 0.0.54 → 0.2.0

package/dist/engine.esm.js

@@ -1,7 +1,5 @@
 import EventEmitter from 'eventemitter3';
 import { isEqual, isObject } from 'lodash-es';
-import { __decorate } from 'tslib';
-import { Field } from '@combos-fun/inspector-decorator';
 import { ResourceState, ResourceType, Resource as Resource$1, Loader, XhrLoadStrategy, VideoLoadStrategy, MediaElementLoadStrategy, XhrResponseType, ImageLoadStrategy, AudioLoadStrategy, AbstractLoadStrategy } from 'resource-loader';
 
 /**
@@ -10,10 +8,10 @@ import { ResourceState, ResourceType, Resource as Resource$1, Loader, XhrLoadStr
  * @returns component' name
  * @example
  * ```typescript
- * import { Transform } from '@combos-fun/engine'
+ * import { Component } from '@combos-fun/engine'
  *
- * assert(getComponentName(Transform) === 'Transform')
- * assert(getComponentName(new Transform()) === 'Transform')
+ * assert(getComponentName(MyComponent) === 'MyComponent')
+ * assert(getComponentName(new MyComponent()) === 'MyComponent')
  * ```
  */
 function getComponentName(component) {
@@ -108,14 +106,38 @@ function removeObjectCache(component) {
  * @param {pureObserverProp} param0.prop - pure observer prop
  * @param {ObserverType} param0.type - observer type
  */
-function addObserver({ systemName, componentName, component, prop, type }) {
+function addObserver({ systemName, componentName, component, prop, type, gameObject }) {
     systemInstance[systemName]?.componentObserver?.add({
         component,
         prop,
         type,
         componentName,
+        gameObject,
     });
 }
+const GAME_OBJECT_OBSERVER = 'GameObject';
+/**
+ * Push a GameObject field change (parent / inScene) to systems that observe `GameObject`.
+ * Hierarchy is not a Component; callers must notify explicitly from addChild / scene.
+ */
+function notifyGameObjectProp(gameObject, propName, type = ObserverType.CHANGE) {
+    if (!gameObject)
+        return;
+    const prop = { prop: [propName], deep: false };
+    for (const systemName in observerInfos) {
+        const info = observerInfos[systemName]?.[GAME_OBJECT_OBSERVER];
+        if (!info?.some(p => p.prop[0] === propName))
+            continue;
+        addObserver({
+            systemName,
+            componentName: GAME_OBJECT_OBSERVER,
+            component: undefined,
+            gameObject,
+            prop,
+            type,
+        });
+    }
+}
 function pushToQueue({ prop, component, componentName, }) {
     for (const systemName in observerInfos) {
         const observerInfo = observerInfos[systemName] || {};
@@ -291,154 +313,6 @@ function setSystemObserver(system, S) {
     systemInstance[S.systemName] = system;
 }
 
-/** Basic component for gameObject, See {@link TransformParams}  */
-class Transform extends Component {
-    constructor() {
-        super(...arguments);
-        this.name = 'Transform';
-        this._parent = null;
-        /** Whether this transform in a scene object */
-        this.inScene = false;
-        /** Child transform components */
-        this.children = [];
-        this.position = { x: 0, y: 0 };
-        this.size = { width: 0, height: 0 };
-        this.origin = { x: 0, y: 0 };
-        this.anchor = { x: 0, y: 0 };
-        this.scale = { x: 1, y: 1 };
-        this.skew = { x: 0, y: 0 };
-        this.rotation = 0;
-    }
-    /**
-     * component's name
-     * @readonly
-     */
-    static { this.componentName = 'Transform'; }
-    /**
-     * Init component
-     * @param params - Transform init data
-     */
-    init(params = {}) {
-        const props = ['position', 'size', 'origin', 'anchor', 'scale', 'skew'];
-        for (const key of props) {
-            Object.assign(this[key], params[key]);
-        }
-        this.rotation = params.rotation ?? this.rotation;
-    }
-    set parent(val) {
-        if (val) {
-            val.addChild(this);
-        }
-        else if (this.parent) {
-            this.parent.removeChild(this);
-        }
-    }
-    /**
-     * Get parent of this component
-     */
-    get parent() {
-        return this._parent;
-    }
-    /**
-     * Add Child Transform
-     * @remarks
-     * If `child` is already a child of this component, `child` will removed to the last of children list
-     * If `child` is already a child of other component, `child` will removed from its parent first
-     * @param child - child gameObject's transform component
-     */
-    addChild(child) {
-        if (child.parent === this) {
-            const index = this.children.findIndex(item => item === child);
-            this.children.splice(index, 1);
-        }
-        else if (child.parent) {
-            child.parent.removeChild(child);
-        }
-        child._parent = this;
-        this.children.push(child);
-    }
-    /**
-     * Remove child transform
-     * @param child - child gameObject's transform component
-     */
-    removeChild(child) {
-        const index = this.children.findIndex(item => item === child);
-        if (index > -1) {
-            this.children.splice(index, 1);
-            child._parent = null;
-        }
-    }
-    /** Clear all child transform */
-    clearChildren() {
-        this.children.length = 0;
-    }
-}
-__decorate([
-    Field({
-        type: 'vector2',
-        step: 1,
-        group: 'Transform',
-        label: 'Position',
-        description: 'Position on the design canvas (x right, y down).',
-    })
-], Transform.prototype, "position", void 0);
-__decorate([
-    Field({
-        type: 'size',
-        step: 1,
-        min: 0,
-        group: 'Transform',
-        label: 'Size',
-        description: 'Width and height of the object in design pixels.',
-    })
-], Transform.prototype, "size", void 0);
-__decorate([
-    Field({
-        type: 'vector2',
-        step: 0.1,
-        group: 'Transform',
-        label: 'Origin',
-        description: 'Local origin used for layout math.',
-    })
-], Transform.prototype, "origin", void 0);
-__decorate([
-    Field({
-        type: 'vector2',
-        step: 0.1,
-        group: 'Transform',
-        label: 'Anchor',
-        description: 'Anchor point (0–1) used when positioning and scaling.',
-    })
-], Transform.prototype, "anchor", void 0);
-__decorate([
-    Field({
-        type: 'vector2',
-        step: 0.1,
-        group: 'Transform',
-        label: 'Scale',
-        description: 'Scale multipliers on X and Y (1 = original size).',
-    })
-], Transform.prototype, "scale", void 0);
-__decorate([
-    Field({
-        type: 'vector2',
-        step: 0.1,
-        group: 'Transform',
-        label: 'Skew',
-        description: 'Skew amounts on X and Y.',
-    })
-], Transform.prototype, "skew", void 0);
-__decorate([
-    Field({
-        type: 'number',
-        step: 0.1,
-        group: 'Transform',
-        label: 'Rotation',
-        description: 'Rotation in radians.',
-        editor: 'number-stepper',
-    })
-], Transform.prototype, "rotation", void 0);
-
 let _id = 0;
 /** Generate unique id for gameObject */
 function getId() {
@@ -450,28 +324,23 @@ function getId() {
  */
 class GameObject {
     /**
-     * Consruct a new gameObject
+     * Construct a new gameObject
      * @param name - the name of this gameObject
-     * @param obj - optional transform parameters for default Transform component
      */
-    constructor(name, obj) {
+    constructor(name) {
+        this._parent = null;
         /** A key-value map for components on this gameObject */
         this._componentCache = {};
+        /** Child gameObjects in sibling order */
+        this.children = [];
+        /** Whether this gameObject is registered on a scene */
+        this.inScene = false;
         /** Components apply to this gameObject */
         this.components = [];
         /** GameObject has been destroyed */
         this.destroyed = false;
         this._name = name;
         this.id = getId();
-        this.addComponent(Transform, obj);
-    }
-    /**
-     * Get default transform component
-     * @returns transform component on this gameObject
-     * @readonly
-     */
-    get transform() {
-        return this.getComponent(Transform);
     }
     /**
      * Get parent gameObject
@@ -479,7 +348,7 @@ class GameObject {
      * @readonly
      */
     get parent() {
-        return this.transform && this.transform.parent && this.transform.parent.gameObject;
+        return this._parent;
     }
     /**
      * Get the name of this gameObject
@@ -493,10 +362,8 @@ class GameObject {
             return;
         const scene = this._scene;
         this._scene = val;
-        if (this.transform && this.transform.children) {
-            for (const child of this.transform.children) {
-                child.gameObject.scene = val;
-            }
+        for (const child of this.children) {
+            child.scene = val;
         }
         if (val) {
             val.addGameObject(this);
@@ -518,16 +385,28 @@ class GameObject {
      * @param gameObject - child gameobject
      */
     addChild(gameObject) {
-        if (!gameObject || !gameObject.transform || gameObject === this)
+        if (!gameObject || gameObject === this)
             return;
         if (!(gameObject instanceof GameObject)) {
             throw new Error('addChild only receive GameObject');
         }
-        if (!this.transform) {
+        if (this.destroyed) {
             throw new Error(`gameObject '${this.name}' has been destroy`);
         }
-        gameObject.transform.parent = this.transform;
+        if (gameObject.parent === this) {
+            const index = this.children.indexOf(gameObject);
+            if (index > -1)
+                this.children.splice(index, 1);
+            this.children.push(gameObject);
+            return;
+        }
+        if (gameObject.parent) {
+            gameObject.parent.removeChild(gameObject);
+        }
+        gameObject._parent = this;
+        this.children.push(gameObject);
         gameObject.scene = this.scene;
+        notifyGameObjectProp(gameObject, 'parent', ObserverType.CHANGE);
     }
     /**
      * Remove child gameObject
@@ -537,8 +416,12 @@ class GameObject {
         if (!(gameObject instanceof GameObject) || !gameObject.parent || gameObject.parent !== this) {
             return gameObject;
         }
-        gameObject.transform.parent = null;
+        const index = this.children.indexOf(gameObject);
+        if (index > -1)
+            this.children.splice(index, 1);
+        gameObject._parent = null;
         gameObject.scene = null;
+        notifyGameObjectProp(gameObject, 'parent', ObserverType.CHANGE);
         return gameObject;
     }
     addComponent(C, obj) {
@@ -580,9 +463,6 @@ class GameObject {
         else if (c.componentName) {
             componentName = c.componentName;
         }
-        if (componentName === 'Transform') {
-            throw new Error("Transform can't be removed");
-        }
         return this._removeComponent(componentName);
     }
     _removeComponent(componentName) {
@@ -625,15 +505,15 @@ class GameObject {
     }
     /** Destroy this gameObject */
     destroy() {
-        if (!this.transform) {
+        if (this.destroyed) {
             console.error('Cannot destroy gameObject that have already been destroyed.');
             return;
         }
-        Array.from(this.transform.children).forEach(({ gameObject }) => {
-            gameObject.destroy();
+        Array.from(this.children).forEach(child => {
+            child.destroy();
         });
         this.remove();
-        this.transform.clearChildren();
+        this.children.length = 0;
         for (const key in this._componentCache) {
             this._removeComponent(key);
         }
@@ -665,22 +545,30 @@ class ComponentObserver {
      * @param type - change event type
      * @param componentName - `component.name` this parameter will deprecated
      */
-    add({ component, prop, type, componentName }) {
+    add({ component, prop, type, componentName, gameObject }) {
+        const go = gameObject ?? component?.gameObject;
         if (type === ObserverType.REMOVE) {
-            if (this.events.find((changed) => changed.component === component && changed.type === ObserverType.ADD)) {
-                this.events = this.events.filter(changed => changed.component !== component);
+            const sameTarget = (changed) => component
+                ? changed.component === component
+                : changed.gameObject === go && changed.componentName === componentName;
+            if (this.events.find(changed => sameTarget(changed) && changed.type === ObserverType.ADD)) {
+                this.events = this.events.filter(changed => !sameTarget(changed));
                 return;
             }
-            this.events = this.events.filter(changed => changed.component !== component);
+            this.events = this.events.filter(changed => !sameTarget(changed));
         }
-        const index = this.events.findIndex(changed => changed.component === component && isEqual(changed.prop, prop) && changed.type === type);
+        const index = this.events.findIndex(changed => changed.gameObject === go &&
+            changed.component === component &&
+            changed.componentName === componentName &&
+            isEqual(changed.prop, prop) &&
+            changed.type === type);
         if (index > -1) {
             this.events.splice(index, 1);
         }
         this.events.push({
-            gameObject: component.gameObject,
+            gameObject: go,
             component,
-            prop: prop,
+            prop,
             type,
             componentName,
         });
@@ -955,8 +843,8 @@ class Ticker {
  * Scene is a gameObject container
  */
 class Scene extends GameObject {
-    constructor(name, obj) {
-        super(name, obj);
+    constructor(name) {
+        super(name);
         this.gameObjects = [];
         this.scene = this; // gameObject.scene = this
     }
@@ -966,9 +854,10 @@ class Scene extends GameObject {
      */
     addGameObject(gameObject) {
         this.gameObjects.push(gameObject);
-        if (gameObject.transform) {
-            gameObject.transform.inScene = true;
-        }
+        if (gameObject.inScene)
+            return;
+        gameObject.inScene = true;
+        notifyGameObjectProp(gameObject, 'inScene', ObserverType.CHANGE);
     }
     /**
      * Remove gameObject
@@ -978,8 +867,9 @@ class Scene extends GameObject {
         const index = this.gameObjects.indexOf(gameObject);
         if (index === -1)
             return;
-        if (gameObject.transform) {
-            gameObject.transform.inScene = false;
+        if (gameObject.inScene) {
+            gameObject.inScene = false;
+            notifyGameObjectProp(gameObject, 'inScene', ObserverType.CHANGE);
         }
         this.gameObjects.splice(index, 1);
     }
@@ -995,7 +885,7 @@ class Scene extends GameObject {
 }
 
 /** Generated at build from package.json */
-const version = "0.0.54";
+const version = "0.2.0";
 
 /**
  * Sent to `window.parent` after each `System.init` completes during `Game.addSystem`
@@ -2170,5 +2060,5 @@ const decorators = {
 };
 console.log(`@combos-fun/engine version: ${version}`);
 
-export { COMBOS_GAME_PLUGIN_INIT_SUCCESS, COMBOS_GAME_READY, COMBOS_GAME_SET_PLAYING, COMBOS_GAME_STATE_CHANGED, Component, DEFAULT_ALLOWED_MESSAGE_HOST_SUFFIXES, Game, GameObject, IDEProp, LOAD_EVENT, LOAD_SCENE_MODE, ObserverType as OBSERVER_TYPE, RESOURCE_TYPE, RESOURCE_TYPE_STRATEGY, Scene, System, Transform, componentObserver, decorators, isAllowedMessageOrigin, mergeAllowedMessageOrigins, normalizeResourceSrc, normalizeSpritesheetData, parseSetPlayingMessage, postParentGameReady, postParentGameState, postParentPluginInitSuccess, resource, resourceLoader, version };
+export { COMBOS_GAME_PLUGIN_INIT_SUCCESS, COMBOS_GAME_READY, COMBOS_GAME_SET_PLAYING, COMBOS_GAME_STATE_CHANGED, Component, DEFAULT_ALLOWED_MESSAGE_HOST_SUFFIXES, Game, GameObject, IDEProp, LOAD_EVENT, LOAD_SCENE_MODE, ObserverType as OBSERVER_TYPE, RESOURCE_TYPE, RESOURCE_TYPE_STRATEGY, Scene, System, componentObserver, decorators, isAllowedMessageOrigin, mergeAllowedMessageOrigins, normalizeResourceSrc, normalizeSpritesheetData, parseSetPlayingMessage, postParentGameReady, postParentGameState, postParentPluginInitSuccess, resource, resourceLoader, version };
 //# sourceMappingURL=engine.esm.js.map