@flashist/appframework 0.0.52 → 0.0.54

package/ecs-rendermodule/ecs/components/RenderComponent.d.ts

@@ -3,5 +3,6 @@ export declare const RenderComponentType = "render";
 export declare const RenderComponentDefaultValue: {
     type: "render";
     view: DisplayObject;
+    containerId: string;
 };
 export declare type RenderComponent = typeof RenderComponentDefaultValue;

package/ecs-rendermodule/ecs/components/RenderComponent.js

@@ -1,6 +1,7 @@
 export var RenderComponentType = "render";
 export var RenderComponentDefaultValue = {
     type: RenderComponentType,
-    view: null
+    view: null,
+    containerId: null
 };
 //# sourceMappingURL=RenderComponent.js.map

package/ecs-rendermodule/ecs/components/RenderComponent.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenderComponent.js","sourceRoot":"","sources":["../../../../src/ecs-rendermodule/ecs/components/RenderComponent.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,mBAAmB,GAAG,QAAQ,CAAC;AAE5C,MAAM,CAAC,IAAM,2BAA2B,GAAG;IACvC,IAAI,EAAE,mBAAiD;IACvD,IAAI,EAAE,IAAqB;CAC9B,CAAA"}
+{"version":3,"file":"RenderComponent.js","sourceRoot":"","sources":["../../../../src/ecs-rendermodule/ecs/components/RenderComponent.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,mBAAmB,GAAG,QAAQ,CAAC;AAE5C,MAAM,CAAC,IAAM,2BAA2B,GAAG;IACvC,IAAI,EAAE,mBAAiD;IACvD,IAAI,EAAE,IAAqB;IAC3B,WAAW,EAAE,IAAc;CAC9B,CAAA"}

package/ecs-rendermodule/ecs/systems/RenderSystem.d.ts

@@ -1,11 +1,14 @@
-import { DisplayObjectContainer } from "@flashist/flibs";
+import { FContainer } from "@flashist/flibs";
+import { ContainersManager } from "../../../containers/managers/ContainersManager";
 import { IEntity } from "../../../ecs/ecs/entities/IEntity";
 import { System } from "../../../ecs/ecs/systems/System";
 import { RenderComponent } from "../components/RenderComponent";
 export declare class RenderSystem<EntityType extends IEntity<RenderComponent>> extends System<EntityType> {
-    protected rootContainer: DisplayObjectContainer;
+    protected containersManager: ContainersManager;
+    protected rootContainer: FContainer;
     constructor();
     protected construction(includeTypes: string[], excludeTypes?: string[]): void;
     protected onEntityAdded(entity: EntityType): void;
     protected onEntityRemoved(entity: EntityType): void;
+    protected getContainer(containerId: string): FContainer;
 }

package/ecs-rendermodule/ecs/systems/RenderSystem.js

@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { FContainer, getInstance } from "@flashist/flibs";
+import { DisplayTools, FContainer, getInstance } from "@flashist/flibs";
 import { ContainersManager } from "../../../containers/managers/ContainersManager";
 import { System } from "../../../ecs/ecs/systems/System";
 import { RenderModuleRootContainerId } from "../../data/RenderModuleRootContainerId";
@@ -26,17 +26,29 @@ var RenderSystem = /** @class */ (function (_super) {
     RenderSystem.prototype.construction = function (includeTypes, excludeTypes) {
         _super.prototype.construction.call(this, includeTypes, excludeTypes);
         this.rootContainer = new FContainer();
-        var containersManager = getInstance(ContainersManager);
+        this.containersManager = getInstance(ContainersManager);
         // as any - to solve some type-related problems between modules
-        containersManager.addContainer(this.rootContainer, RenderModuleRootContainerId);
+        this.containersManager.addContainer(this.rootContainer, RenderModuleRootContainerId);
     };
     RenderSystem.prototype.onEntityAdded = function (entity) {
         _super.prototype.onEntityAdded.call(this, entity);
-        this.rootContainer.addChild(entity.components.render.view);
+        var tempCont = this.getContainer(entity.components.render.containerId);
+        tempCont.addChild(entity.components.render.view);
     };
     RenderSystem.prototype.onEntityRemoved = function (entity) {
         _super.prototype.onEntityAdded.call(this, entity);
-        this.rootContainer.removeChild(entity.components.render.view);
+        DisplayTools.childRemoveItselfFromParent(entity.components.render.view);
+        // this.rootContainer.removeChild(entity.components.render.view);
+    };
+    RenderSystem.prototype.getContainer = function (containerId) {
+        var result;
+        if (containerId) {
+            result = this.containersManager.getContainer(containerId);
+        }
+        if (!result) {
+            result = this.rootContainer;
+        }
+        return result;
     };
     return RenderSystem;
 }(System));

package/ecs-rendermodule/ecs/systems/RenderSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenderSystem.js","sourceRoot":"","sources":["../../../../src/ecs-rendermodule/ecs/systems/RenderSystem.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAA0B,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAmB,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGrF;IAA+E,gCAAkB;IAI7F;eACI,kBAAM,CAAC,mBAAmB,CAAC,CAAC;IAChC,CAAC;IAES,mCAAY,GAAtB,UAAuB,YAAsB,EAAE,YAAuB;QAClE,iBAAM,YAAY,YAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAE/C,IAAI,CAAC,aAAa,GAAG,IAAI,UAAU,EAAE,CAAC;QAEtC,IAAM,iBAAiB,GAAsB,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAC5E,+DAA+D;QAC/D,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,aAAoB,EAAE,2BAA2B,CAAC,CAAC;IAC3F,CAAC;IAES,oCAAa,GAAvB,UAAwB,MAAkB;QACtC,iBAAM,aAAa,YAAC,MAAM,CAAC,CAAC;QAE5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAES,sCAAe,GAAzB,UAA0B,MAAkB;QACxC,iBAAM,aAAa,YAAC,MAAM,CAAC,CAAC;QAE5B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IACL,mBAAC;AAAD,CAAC,AA7BD,CAA+E,MAAM,GA6BpF"}
+{"version":3,"file":"RenderSystem.js","sourceRoot":"","sources":["../../../../src/ecs-rendermodule/ecs/systems/RenderSystem.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAA0B,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAmB,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGrF;IAA+E,gCAAkB;IAM7F;eACI,kBAAM,CAAC,mBAAmB,CAAC,CAAC;IAChC,CAAC;IAES,mCAAY,GAAtB,UAAuB,YAAsB,EAAE,YAAuB;QAClE,iBAAM,YAAY,YAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAE/C,IAAI,CAAC,aAAa,GAAG,IAAI,UAAU,EAAE,CAAC;QAEtC,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACxD,+DAA+D;QAC/D,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,aAAoB,EAAE,2BAA2B,CAAC,CAAC;IAChG,CAAC;IAES,oCAAa,GAAvB,UAAwB,MAAkB;QACtC,iBAAM,aAAa,YAAC,MAAM,CAAC,CAAC;QAE5B,IAAM,QAAQ,GAAe,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACrF,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAES,sCAAe,GAAzB,UAA0B,MAAkB;QACxC,iBAAM,aAAa,YAAC,MAAM,CAAC,CAAC;QAE5B,YAAY,CAAC,2BAA2B,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxE,iEAAiE;IACrE,CAAC;IAES,mCAAY,GAAtB,UAAuB,WAAmB;QACtC,IAAI,MAAkB,CAAC;QACvB,IAAI,WAAW,EAAE;YACb,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;SAC5D;QAED,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;SAC/B;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IACL,mBAAC;AAAD,CAAC,AA9CD,CAA+E,MAAM,GA8CpF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashist/appframework",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "scripts": {
     "build": "gulp",
     "publish:patch": "npm version patch && npm run build && cd ./dist && npm publish",