新增componentlist管理组件列表

source/src/ECS/Component.ts

@@ -20,6 +20,26 @@ abstract class Component {
 
     public abstract initialize();
 
+    public onAddedToEntity(){
+
+    }
+
+    public onRemovedFromEntity(){
+
+    }
+
+    public onEnabled(){
+
+    }
+
+    public onDisabled(){
+
+    }
+
+    public onEntityTransformChanged(comp: ComponentTransform){
+        
+    }
+
     public update(){
 
     }

source/src/ECS/Components/Camera.ts

@@ -20,7 +20,7 @@ class Camera extends Component {
     }
 
     public update(){
-        SceneManager.getActiveScene().entities.buffer.forEach(entity => entity.components.forEach(component => {
+        SceneManager.getActiveScene().entities.buffer.forEach(entity => entity.components.buffer.forEach(component => {
             if (component.displayRender){
                 let has = this.entity.scene.$children.indexOf(component.displayRender)
                 if (has == -1){

source/src/ECS/Entity.ts

@@ -5,12 +5,17 @@ class Entity {
     /** 封装实体的位置/旋转/缩放，并允许设置一个高层结构 */
     public readonly transform: Transform;
     /** 当前附加到此实体的所有组件的列表 */
-    public readonly components: Component[];
+    public readonly components: ComponentList;
     private _updateOrder: number = 0;
     private _enabled: boolean = true;
+    private _isDestoryed: boolean;
 
     public componentBits: BitSet;
 
+    public get isDestoryed(){
+        return this._isDestoryed;
+    }
+
     public get enabled(){
         return this._enabled;
     }
@@ -30,7 +35,7 @@ class Entity {
     constructor(name: string){
         this.name = name;
         this.transform = new Transform(this);
-        this.components = [];
+        this.components = new ComponentList(this);
         this.componentBits = new BitSet();
     }
 
@@ -56,30 +61,52 @@ class Entity {
     public attachToScene(newScene: Scene){
         this.scene = newScene;
         newScene.entities.add(this);
-        this.components.forEach(component => component.registerComponent());
+        this.components.registerAllComponents();
 
         for (let i = 0; i < this.transform.childCount; i ++){
             this.transform.getChild(i).entity.attachToScene(newScene);
         }
     }
 
+    public detachFromScene(){
+        this.scene.entities.remove(this);
+        this.components.deregisterAllComponents();
+
+        for (let i = 0; i < this.transform.childCount; i ++)
+            this.transform.getChild(i).entity.detachFromScene();
+    }
+
     public addComponent<T extends Component>(component: T): T{
         component.entity = this;
-        this.components.push(component);
+        this.components.add(component);
         component.initialize();
         return component;
     }
 
     public getComponent<T extends Component>(type): T{
-        return this.components.firstOrDefault(component => component instanceof type) as T;
+        return this.components.getComponent(type, false) as T;
     }
 
     public update(){
-        this.components.forEach(component => component.update());
+        this.components.update();
         this.transform.updateTransform();
     }
 
+    public onAddedToScene(){
+
+    }
+
+    public onRemovedFromScene(){
+        if (this._isDestoryed)
+            this.components.remove
+    }
+
+    public onTransformChanged(comp: ComponentTransform){
+        this.components.onEntityTransformChanged(comp);
+    }
+
     public destory(){
+        this._isDestoryed = true;
         this.scene.entities.remove(this);
         this.transform.parent = null;
 

source/src/ECS/Transform.ts

@@ -5,6 +5,12 @@ enum DirtyType{
     rotationDirty,
 }
 
+enum ComponentTransform{
+    position,
+    scale,
+    rotation
+}
+
 class Transform {
     /** 相关联的实体 */
     public readonly entity: Entity;
@@ -105,6 +111,7 @@ class Transform {
 
         this._localPosition = localPosition;
         this._localDirty = this._positionDirty = this._localPositionDirty = this._localRotationDirty = this._localScaleDirty = true;
+        this.setDirty(DirtyType.positionDirty);
 
         return this;
     }
@@ -120,8 +127,8 @@ class Transform {
             this.localPosition = position;
         }
 
-        for (let i = 0; i < this.entity.components.length; i ++){
-            let component = this.entity.components[i];
+        for (let i = 0; i < this.entity.components.buffer.length; i ++){
+            let component = this.entity.components.buffer[i];
             if (component.displayRender){
                 component.displayRender.x = this.entity.scene.camera.transformMatrix.m31 + this.position.x;
                 component.displayRender.y = this.entity.scene.camera.transformMatrix.m32 + this.position.y;
@@ -131,6 +138,31 @@ class Transform {
         return this;
     }
 
+    public setDirty(dirtyFlagType: DirtyType){
+        if ((this._hierachyDirty & dirtyFlagType) == 0){
+            this._hierachyDirty |= dirtyFlagType;
+
+            switch (dirtyFlagType){
+                case DirtyType.positionDirty:
+                    this.entity.onTransformChanged(ComponentTransform.position);
+                    break;
+                case DirtyType.rotationDirty:
+                    this.entity.onTransformChanged(ComponentTransform.rotation);
+                    break;
+                case DirtyType.scaleDirty:
+                    this.entity.onTransformChanged(ComponentTransform.scale);
+                    break;
+            }
+
+            if (this._children == null)
+                this._children = [];
+
+            for (let i = 0; i < this._children.length; i ++){
+                this._children[i].setDirty(dirtyFlagType);
+            }
+        }
+    }
+
     public updateTransform(){
         if (this._hierachyDirty != DirtyType.clean){
             if (this.parent)

source/src/ECS/Utils/ComponentList.ts

@@ -0,0 +1,134 @@
+class ComponentList {
+    private _entity: Entity;
+    private _components: Component[] = [];
+    private _componentsToAdd: Component[] = [];
+    private _componentsToRemove: Component[] = [];
+    private _tempBufferList: Component[] = [];
+
+    constructor(entity: Entity){
+        this._entity = entity;
+    }
+
+    public get buffer(){
+        return this._components;
+    }
+
+    public add(component: Component){
+        this._componentsToAdd.push(component);
+    }
+
+    public remove(component: Component){
+        if (this._componentsToAdd.contains(component)){
+            this._componentsToAdd.remove(component);
+            return;
+        }
+
+        this._componentsToRemove.push(component);
+    }
+
+    public removeAllComponents(){
+        for (let i = 0; i < this._components.length; i ++){
+            this.handleRemove(this._components[i]);
+        }
+
+        this._components.length = 0;
+        this._componentsToAdd.length = 0;
+        this._componentsToRemove.length = 0;
+    }
+
+    public deregisterAllComponents(){
+        for (let i = 0; i < this._components.length; i ++){
+            let component = this._components[i];
+
+            this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component), false);
+            this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
+        }
+    }
+
+    public registerAllComponents(){
+        for (let i = 0; i < this._components.length; i ++){
+            let component = this._components[i];
+
+            this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component));
+            this._entity.scene.entityProcessors.onComponentAdded(this._entity);
+        }
+    }
+
+    public updateLists(){
+        if (this._componentsToRemove.length > 0){
+            for (let i = 0; i < this._componentsToRemove.length; i ++){
+                this.handleRemove(this._componentsToRemove[i]);
+                this._components.remove(this._componentsToRemove[i]);
+            }
+
+            this._componentsToRemove.length = 0;
+        }
+
+        if (this._componentsToAdd.length > 0){
+            for (let i = 0, count = this._componentsToAdd.length; i < count; i ++){
+                let component = this._componentsToAdd[i];
+
+                this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component));
+                this._entity.scene.entityProcessors.onComponentAdded(this._entity);
+
+                this._components.push(component);
+                this._tempBufferList.push(component);
+            }
+
+            this._componentsToAdd.length = 0;
+
+            for (let i = 0; i < this._tempBufferList.length; i++){
+                let component = this._tempBufferList[i];
+                component.onAddedToEntity();
+
+                if (component.enabled){
+                    component.onEnabled();
+                }
+            }
+
+            this._tempBufferList.length = 0;
+        }
+    }
+
+    private handleRemove(component: Component){
+        this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component), false);
+        this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
+
+        component.onRemovedFromEntity();
+        component.entity = null;
+    }
+
+    public getComponent<T extends Component>(type, onlyReturnInitializedComponents: boolean): T{
+        for (let i = 0; i < this._components.length; i ++){
+            let component = this._components[i];
+            if (component instanceof type)
+                return component as T;
+        }
+
+        if (!onlyReturnInitializedComponents){
+            for (let i = 0; i < this._componentsToAdd.length; i ++){
+                let component = this._componentsToAdd[i];
+                if (component instanceof type)
+                    return component as T;
+            }
+        }
+
+        return null;
+    }
+
+    public update(){
+        this.updateLists();
+    }
+
+    public onEntityTransformChanged(comp){
+        for (let i = 0; i < this._components.length; i++){
+            if (this._components[i].enabled)
+                this._components[i].onEntityTransformChanged(comp);
+        }
+
+        for (let i = 0; i < this._componentsToAdd.length; i ++){
+            if (this._componentsToAdd[i].enabled)
+                this._componentsToAdd[i].onEntityTransformChanged(comp);
+        }
+    }
+}

source/src/ECS/Utils/EntityList.ts

@@ -86,6 +86,7 @@ class EntityList{
                 this.scene.entityProcessors.onEntityAdded(entity)
             });
 
+            this._tempEntityList.forEach(entity => entity.onAddedToScene());
             this._tempEntityList.length = 0;
         }
     }