CocosPlugin/esengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化实体更新效率

Browse Source
This commit is contained in:
yhh
2021-05-12 13:08:47 +08:00
parent 63d307b95a
commit fd62aa469a
7 changed files with 455 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/src/ECS/Scene.ts
View File

@@ -88,7 +88,7 @@ module es {
// 更新我们的实体组
this.entities.update();
if (this.entityProcessors != null)
this.entityProcessors.lateUpdate();
}

134
source/src/ECS/Utils/ComponentList.ts
View File

@@ -23,6 +23,8 @@ module es {
* 标记要删除此框架的组件列表。用来对组件进行分组，这样我们就可以同时进行加工
*/
public _componentsToRemove: { [index: number]: Component } = {};
public _componentsToAddList: Component[] = [];
public _componentsToRemoveList: Component[] = [];
public _tempBufferList: Component[] = [];
/**
* 用于确定是否需要对该框架中的组件进行排序的标志
@@ -49,25 +51,30 @@ module es {
public add(component: Component) {
this._componentsToAdd[component.id] = component;
this._componentsToAddList.push(component);
this.addComponentsToAddByType(component);
}
public remove(component: Component) {
if (this._componentsToAdd[component.id]) {
let index = this._componentsToAddList.findIndex(c => c.id == component.id);
if (index != -1)
this._componentsToAddList.splice(index, 1);
delete this._componentsToAdd[component.id];
this.removeComponentsToAddByType(component);
return;
}
this._componentsToRemove[component.id] = component;
this._componentsToRemoveList.push(component);
}
/**
* 立即从组件列表中删除所有组件
*/
public removeAllComponents() {
for (let i = 0; i < this._components.length; i++) {
this.handleRemove(this._components[i]);
for (let component of this._components) {
this.handleRemove(component);
}
this.componentsByType.clear();
@@ -76,6 +83,8 @@ module es {
this._updatableComponents.length = 0;
this._componentsToAdd = {};
this._componentsToRemove = {};
this._componentsToAddList.length = 0;
this._componentsToRemoveList.length = 0;
}
public deregisterAllComponents() {
@@ -117,58 +126,64 @@ module es {
* 处理任何需要删除或添加的组件
*/
public updateLists() {
for (let i in this._componentsToRemove) {
let component = this._componentsToRemove[i];
this.handleRemove(component);
for (let index = 0; index < this._components.length; index++) {
let searchComponent = this._components[index];
if (searchComponent.id == component.id) {
if (this._componentsToRemoveList.length > 0) {
for (let i = 0, l = this._componentsToRemoveList.length; i < l; ++ i) {
let component = this._componentsToRemoveList[i];
this.handleRemove(component);
let index = this._components.findIndex(c => c.id == component.id);
if (index != -1)
this._components.splice(index, 1);
break;
this.removeComponentsByType(component);
}
this._componentsToRemove = {};
this._componentsToRemoveList.length = 0;
}
if (this._componentsToAddList.length > 0) {
for (let i = 0, l = this._componentsToAddList.length; i < l; ++ i) {
let component = this._componentsToAddList[i];
if (isIUpdatable(component))
this._updatableComponents.push(component);
this.addBits(component);
this._entity.scene.entityProcessors.onComponentAdded(this._entity);
this.addComponentsByType(component);
this._components.push(component);
this._tempBufferList.push(component);
}
// 在调用onAddedToEntity之前清除，以防添加更多组件
this._componentsToAdd = {};
this._componentsToAddList.length = 0;
this.componentsToAddByType.clear();
this._isComponentListUnsorted = true;
}
if (this._tempBufferList.length > 0) {
// 现在所有的组件都添加到了场景中，我们再次循环并调用onAddedToEntity/onEnabled
for (let i = 0, l = this._tempBufferList.length; i < l; ++ i) {
let component = this._tempBufferList[i];
component.onAddedToEntity();
// enabled检查实体和组件
if (component.enabled) {
component.onEnabled();
}
}
this.removeComponentsByType(component);
this._tempBufferList.length = 0;
}
this._componentsToRemove = {};
for (let i in this._componentsToAdd) {
let component = this._componentsToAdd[i];
if (isIUpdatable(component))
this._updatableComponents.push(component);
this.addBits(component);
this._entity.scene.entityProcessors.onComponentAdded(this._entity);
this.addComponentsByType(component);
this._components.push(component);
this._tempBufferList.push(component);
}
// 在调用onAddedToEntity之前清除，以防添加更多组件
this._componentsToAdd = {};
this.componentsToAddByType.clear();
this._isComponentListUnsorted = true;
// 现在所有的组件都添加到了场景中，我们再次循环并调用onAddedToEntity/onEnabled
for (let i = 0; i < this._tempBufferList.length; i++) {
let component = this._tempBufferList[i];
component.onAddedToEntity();
// enabled检查实体和组件
if (component.enabled) {
component.onEnabled();
}
}
this._tempBufferList.length = 0;
}
public handleRemove(component: Component) {
if (isIUpdatable(component))
new es.List(this._updatableComponents).remove(component);
if (isIUpdatable(component) && this._updatableComponents.length > 0) {
let index = this._updatableComponents.findIndex((c) => (<any>c as Component).id == component.id);
if (index != -1)
this._updatableComponents.splice(index, 1);
}
this.decreaseBits(component);
this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
@@ -250,33 +265,32 @@ module es {
public update() {
this.updateLists();
for (let i = 0; i < this._updatableComponents.length; i++) {
if (this._updatableComponents[i].enabled)
this._updatableComponents[i].update();
}
// for (let updateComponent of this._updatableComponents) {
// if (updateComponent.enabled)
// updateComponent.update();
// }
}
public onEntityTransformChanged(comp: transform.Component) {
for (let i = 0; i < this._components.length; i++) {
if (this._components[i].enabled)
this._components[i].onEntityTransformChanged(comp);
for (let component of this._components) {
if (component.enabled)
component.onEntityTransformChanged(comp);
}
for (let i in this._componentsToAdd) {
let component = this._componentsToAdd[i];
for (let component of this._componentsToAddList) {
if (component.enabled)
component.onEntityTransformChanged(comp);
}
}
public onEntityEnabled() {
for (let i = 0; i < this._components.length; i++)
this._components[i].onEnabled();
for (let component of this._components)
component.onEnabled();
}
public onEntityDisabled() {
for (let i = 0; i < this._components.length; i++)
this._components[i].onDisabled();
for (let component of this._components)
component.onDisabled();
}
}
}

140
source/src/ECS/Utils/EntityList.ts
View File

@@ -8,12 +8,13 @@ module es {
/**
* 本帧添加的实体列表。用于对实体进行分组，以便我们可以同时处理它们
*/
// public _entitiesToAdded: Entity[] = [];
public _entitiesToAdded: {[index: number]: Entity} = {};
/**
* 本帧被标记为删除的实体列表。用于对实体进行分组，以便我们可以同时处理它们
*/
public _entitiesToRemove: {[index: number]: Entity} = {};
public _entitiesToAddedList: Entity[] = [];
public _entitiesToRemoveList: Entity[] = [];
/**
* 标志，用于确定我们是否需要在这一帧中对实体进行排序
*/
@@ -50,6 +51,7 @@ module es {
*/
public add(entity: Entity) {
this._entitiesToAdded[entity.id] = entity;
this._entitiesToAddedList.push(entity);
}
/**
@@ -59,10 +61,14 @@ module es {
public remove(entity: Entity) {
// 防止在同一帧中添加或删除实体
if (this._entitiesToAdded[entity.id]) {
let index = this._entitiesToAddedList.findIndex(e => e.id == entity.id);
if (index != -1)
this._entitiesToAddedList.splice(index, 1);
delete this._entitiesToAdded[entity.id];
return;
}
this._entitiesToRemoveList.push(entity);
if (!this._entitiesToRemove[entity.id])
this._entitiesToRemove[entity.id] = entity;
}
@@ -73,6 +79,7 @@ module es {
public removeAllEntities() {
this._unsortedTags.clear();
this._entitiesToAdded = {};
this._entitiesToAddedList.length = 0;
this._isEntityListUnsorted = false;
// 为什么我们要在这里更新列表？主要是为了处理在场景切换前被分离的实体。
@@ -119,41 +126,52 @@ module es {
}
public update() {
for (let entity of this._entities) {
for (let i = 0, s = this._entities.length; i < s; ++ i) {
let entity = this._entities[i];
if (entity.enabled && (entity.updateInterval == 1 || Time.frameCount % entity.updateInterval == 0))
entity.update();
}
}
public updateLists() {
for (let i in this._entitiesToRemove) {
let entity = this._entitiesToRemove[i];
this.removeFromTagList(entity);
// 处理常规实体列表
new es.List(this._entities).remove(entity);
entity.onRemovedFromScene();
entity.scene = null;
this.scene.entityProcessors.onEntityRemoved(entity);
}
this._entitiesToRemove = {};
for (let i in this._entitiesToAdded) {
let entity = this._entitiesToAdded[i];
this._entities.push(entity);
entity.scene = this.scene;
this.addToTagList(entity);
this.scene.entityProcessors.onEntityAdded(entity);
if (this._entitiesToRemoveList.length > 0) {
for (let i = 0, s = this._entitiesToRemoveList.length; i < s; ++ i) {
let entity = this._entitiesToRemoveList[i];
this.removeFromTagList(entity);
// 处理常规实体列表
let index = this._entities.findIndex(e => e.id == entity.id);
if (index != -1)
this._entities.splice(index, 1);
entity.onRemovedFromScene();
entity.scene = null;
this.scene.entityProcessors.onEntityRemoved(entity);
}
this._entitiesToRemove = {};
this._entitiesToRemoveList.length = 0;
}
for (let i in this._entitiesToAdded) {
this._entitiesToAdded[i].onAddedToScene();
}
if (this._entitiesToAddedList.length > 0) {
for (let i = 0, s = this._entitiesToAddedList.length; i < s; ++ i) {
let entity = this._entitiesToAddedList[i];
this._entities.push(entity);
entity.scene = this.scene;
this.addToTagList(entity);
this.scene.entityProcessors.onEntityAdded(entity);
}
for (let i = 0, s = this._entitiesToAddedList.length; i < s; ++ i) {
let entity = this._entitiesToAddedList[i];
entity.onAddedToScene();
}
this._entitiesToAdded = {};
this._entitiesToAdded = {};
this._entitiesToAddedList.length = 0;
}
}
/**
@@ -161,13 +179,14 @@ module es {
* @param name
*/
public findEntity(name: string) {
for (let i = 0; i < this._entities.length; i++) {
if (this._entities[i].name == name)
return this._entities[i];
for (let i = 0, s = this._entities.length; i < s; ++ i) {
let entity = this._entities[i];
if (entity[i].name == name)
return entity;
}
for (let i in this._entitiesToAdded) {
let entity = this._entitiesToAdded[i];
for (let i = 0, s = this._entitiesToAddedList.length; i < s; ++ i) {
let entity = this._entitiesToAddedList[i];
if (entity.name == name)
return entity;
}
@@ -181,9 +200,10 @@ module es {
* @returns
*/
public findEntityById(id: number) {
for (let i = 0; i < this._entities.length; i ++) {
if (this._entities[i].id == id)
return this._entities[i];
for (let i = 0, s = this._entities.length; i < s; ++ i) {
let entity = this._entities[i];
if (entity.id == id)
return entity;
}
return this._entitiesToAdded[id];
@@ -225,25 +245,17 @@ module es {
* @param type
*/
public findComponentOfType<T extends Component>(type): T {
for (let i = 0; i < this._entities.length; i++) {
if (this._entities[i].enabled) {
let comp = this._entities[i].getComponent<T>(type);
for (let i = 0, s = this._entities.length; i < s; i++) {
let entity = this._entities[i];
if (entity.enabled) {
let comp = entity.getComponent<T>(type);
if (comp)
return comp;
}
}
// for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
// let entity: Entity = this._entitiesToAdded.toArray()[i];
// if (entity.enabled) {
// let comp = entity.getComponent<T>(type);
// if (comp)
// return comp;
// }
// }
for (let i in this._entitiesToAdded) {
let entity = this._entitiesToAdded[i];
for (let i = 0; i < this._entitiesToAddedList.length; i++) {
let entity = this._entitiesToAddedList[i];
if (entity.enabled) {
let comp = entity.getComponent<T>(type);
if (comp)
@@ -266,14 +278,7 @@ module es {
this._entities[i].getComponents(type, comps);
}
// for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
// let entity = this._entitiesToAdded.toArray()[i];
// if (entity.enabled)
// entity.getComponents(type, comps);
// }
for (let i in this._entitiesToAdded) {
let entity = this._entitiesToAdded[i];
for (let entity of this._entitiesToAddedList) {
if (entity.enabled)
entity.getComponents(type, comps);
}
@@ -305,26 +310,7 @@ module es {
}
}
// for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
// let entity: Entity = this._entitiesToAdded.toArray()[i];
// if (entity.enabled) {
// let meet = true;
// for (let type of types) {
// let hasComp = entity.hasComponent(type);
// if (!hasComp) {
// meet = false;
// break;
// }
// }
// if (meet) {
// entities.push(entity);
// }
// }
// }
for (let i in this._entitiesToAdded) {
let entity = this._entitiesToAdded[i];
for (let entity of this._entitiesToAddedList) {
if (entity.enabled) {
let meet = true;
for (let type of types) {

25
source/src/ECS/Utils/EntityProcessorList.ts
View File

@@ -31,13 +31,19 @@ module es {
}
public update() {
for (let i = 0; i < this._processors.length; i++) {
if (this._processors.length == 0)
return;
for (let i = 0, s = this._processors.length; i < s; ++ i) {
this._processors[i].update();
}
}
public lateUpdate() {
for (let i = 0; i < this._processors.length; i++) {
if (this._processors.length == 0)
return;
for (let i = 0, s = this._processors.length; i < s; ++ i) {
this._processors[i].lateUpdate();
}
}
@@ -47,7 +53,10 @@ module es {
}
public getProcessor<T extends EntitySystem>(): T {
for (let i = 0; i < this._processors.length; i++) {
if (this._processors.length == 0)
return null;
for (let i = 0, s = this._processors.length; i < s; ++ i) {
let processor = this._processors[i];
if (processor instanceof EntitySystem)
return processor as T;
@@ -57,13 +66,19 @@ module es {
}
protected notifyEntityChanged(entity: Entity) {
for (let i = 0; i < this._processors.length; i++) {
if (this._processors.length == 0)
return;
for (let i = 0, s = this._processors.length; i < s; ++ i) {
this._processors[i].onChanged(entity);
}
}
protected removeFromProcessors(entity: Entity) {
for (let i = 0; i < this._processors.length; i++) {
if (this._processors.length == 0)
return;
for (let i = 0, s = this._processors.length; i < s; ++ i) {
this._processors[i].remove(entity);
}
}