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

优化实体列表add/remove效率。性能大幅度提高

Browse Source
This commit is contained in:
yhh
2021-04-16 17:48:13 +08:00
parent 5a6d1c72fe
commit 17b36f01b0
14 changed files with 1494 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/src/ECS/ComponentType.ts Normal file
View File

@@ -0,0 +1,30 @@
module es {
export class ComponentType {
public static INDEX = 0;
private index_ = 0;
private type_: Class;
constructor(type: Class, index?: number) {
if (index !== undefined) {
this.index_ = ComponentType.INDEX++;
} else {
this.index_ = index;
}
this.type_ = type;
}
public getName(): string {
return getClassName(this.type_);
}
public getIndex(): number {
return this.index_;
}
public toString(): string {
return "ComponentType[" + getClassName(ComponentType) + "] (" + this.index_ + ")";
}
}
}

6
source/src/ECS/Entity.ts
View File

@@ -39,6 +39,7 @@ module es {
* 返回一个BitSet实例，包含实体拥有的组件的位
*/
public componentBits: BitSet;
private systemBits_: BitSet;
constructor(name: string) {
this.components = new ComponentList(this);
@@ -46,6 +47,7 @@ module es {
this.name = name;
this.id = Entity._idGenerator++;
this.systemBits_ = new BitSet();
this.componentBits = new BitSet();
}
@@ -109,6 +111,10 @@ module es {
this.setUpdateOrder(value);
}
public getSystemBits(): BitSet {
return this.systemBits_;
}
public get parent(): Transform {
return this.transform.parent;
}

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

@@ -1,16 +1,5 @@
///<reference path="../Math/Vector2.ts" />
module es {
export enum SceneResolutionPolicy {
/**
* 默认情况下，RenderTarget与屏幕大小匹配。RenderTarget与屏幕大小相匹配
*/
none,
/**
* 该应用程序采用最适合设计分辨率的宽度和高度
*/
bestFit
}
/** 场景 */
export class Scene {
/**
@@ -208,14 +197,6 @@ module es {
public findEntityWithTag(tag: number): Entity {
return this.entities.entityWithTag(tag);
}
/**
* 返回类型为T的所有实体
* @param type
*/
public entitiesOfType<T extends Entity>(type): T[] {
return this.entities.entitiesOfType<T>(type);
}
/**
* 返回第一个启用加载的类型为T的组件

21
source/src/ECS/Systems/EntitySystem.ts
View File

@@ -1,12 +1,29 @@
///<reference path="../../Utils/Collections/HashMap.ts"/>
module es {
export class SystemIndexManager {
public static INDEX = 0;
private static indices: HashMap<Function, number> = new HashMap<Function, number>();
public static getIndexFor(es: Class): number {
let index: number = SystemIndexManager.indices.get(es);
if (index === undefined) {
index = SystemIndexManager.INDEX++;
SystemIndexManager.indices.put(es, index);
}
return index;
}
}
/**
* 追踪实体的子集，但不实现任何排序或迭代。
*/
export abstract class EntitySystem {
private _entities: Entity[] = [];
private systemIndex_: number;
constructor(matcher?: Matcher) {
this._matcher = matcher ? matcher : Matcher.empty();
this.systemIndex_ = SystemIndexManager.getIndexFor(this.constructor);
this.initialize();
}
@@ -43,7 +60,7 @@ module es {
}
public onChanged(entity: Entity) {
let contains = new es.List(this._entities).contains(entity);
let contains = entity.getSystemBits().get(this.systemIndex_);
let interest = this._matcher.isInterestedEntity(entity);
if (interest && !contains)
@@ -54,6 +71,7 @@ module es {
public add(entity: Entity) {
this._entities.push(entity);
entity.getSystemBits().set(this.systemIndex_);
this.onAdded(entity);
}
@@ -61,6 +79,7 @@ module es {
public remove(entity: Entity) {
new es.List(this._entities).remove(entity);
entity.getSystemBits().clear(this.systemIndex_);
this.onRemoved(entity);
}

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

@@ -145,10 +145,10 @@ module es {
this._tempBufferList.length = 0;
}
if (this._isComponentListUnsorted) {
this._updatableComponents.sort(ComponentList.compareUpdatableOrder.compare);
this._isComponentListUnsorted = false;
}
// if (this._isComponentListUnsorted) {
// this._updatableComponents.sort(ComponentList.compareUpdatableOrder.compare);
// this._isComponentListUnsorted = false;
// }
}
public handleRemove(component: Component) {

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

@@ -8,11 +8,12 @@ module es {
/**
* 本帧添加的实体列表。用于对实体进行分组，以便我们可以同时处理它们
*/
public _entitiesToAdded: HashSet<Entity> = new HashSet<Entity>();
// public _entitiesToAdded: Entity[] = [];
public _entitiesToAdded: {[index: number]: Entity} = {};
/**
* 本帧被标记为删除的实体列表。用于对实体进行分组，以便我们可以同时处理它们
*/
public _entitiesToRemove: HashSet<Entity> = new HashSet<Entity>();
public _entitiesToRemove: {[index: number]: Entity} = {};
/**
* 标志，用于确定我们是否需要在这一帧中对实体进行排序
*/
@@ -48,7 +49,7 @@ module es {
* @param entity
*/
public add(entity: Entity) {
this._entitiesToAdded.add(entity);
this._entitiesToAdded[entity.id] = entity;
}
/**
@@ -56,16 +57,14 @@ module es {
* @param entity
*/
public remove(entity: Entity) {
Debug.warnIf(this._entitiesToRemove.contains(entity), `您正在尝试删除已经删除的实体(${entity.name})`);
// 防止在同一帧中添加或删除实体
if (this._entitiesToAdded.contains(entity)) {
this._entitiesToAdded.remove(entity);
if (this._entitiesToAdded[entity.id]) {
delete this._entitiesToAdded[entity.id];
return;
}
if (!this._entitiesToRemove.contains(entity))
this._entitiesToRemove.add(entity);
if (!this._entitiesToRemove[entity.id])
this._entitiesToRemove[entity.id] = entity;
}
/**
@@ -73,7 +72,7 @@ module es {
*/
public removeAllEntities() {
this._unsortedTags.clear();
this._entitiesToAdded.clear();
this._entitiesToAdded = {};
this._isEntityListUnsorted = false;
// 为什么我们要在这里更新列表？主要是为了处理在场景切换前被分离的实体。
@@ -95,7 +94,7 @@ module es {
* @param entity
*/
public contains(entity: Entity): boolean {
return new es.List(this._entities).contains(entity) || this._entitiesToAdded.contains(entity);
return !!this._entitiesToAdded[entity.id];
}
public getTagList(tag: number) {
@@ -127,43 +126,40 @@ module es {
}
public updateLists() {
if (this._entitiesToRemove.getCount() > 0) {
this._entitiesToRemove.toArray().forEach(entity => {
// 处理标签列表
this.removeFromTagList(entity);
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;
// 处理常规实体列表
new es.List(this._entities).remove(entity);
entity.onRemovedFromScene();
entity.scene = null;
this.scene.entityProcessors.onEntityRemoved(entity);
});
this._entitiesToRemove.clear();
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._entitiesToAdded.getCount() > 0) {
this._entitiesToAdded.toArray().forEach(entity => {
this._entities.push(entity);
entity.scene = this.scene;
this.addToTagList(entity);
this.scene.entityProcessors.onEntityAdded(entity);
});
this._entitiesToAdded.toArray().forEach(entity => {
entity.onAddedToScene();
})
this._entitiesToAdded.clear();
this._isEntityListUnsorted = true;
for (let i in this._entitiesToAdded) {
this._entitiesToAdded[i].onAddedToScene();
}
if (this._isEntityListUnsorted) {
this._entities.sort(Entity.entityComparer.compare);
this._isEntityListUnsorted = false;
}
this._entitiesToAdded = {};
// this._isEntityListUnsorted = true;
// if (this._isEntityListUnsorted) {
// this._entities.sort(Entity.entityComparer.compare);
// this._isEntityListUnsorted = false;
// }
}
/**
@@ -176,8 +172,13 @@ module es {
return this._entities[i];
}
for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
let entity = this._entitiesToAdded.toArray()[i];
// for (let i = 0; i < this._entitiesToAdded.size; i++) {
// let entity = this._entitiesToAdded.values;
// if (entity.name == name)
// return entity;
// }
for (let i in this._entitiesToAdded) {
let entity = this._entitiesToAdded[i];
if (entity.name == name)
return entity;
}
@@ -216,28 +217,6 @@ module es {
return null;
}
/**
* 返回一个T类型的所有实体的列表。
* 返回的List可以通过ListPool.free放回池中。
* @param type
*/
public entitiesOfType<T extends Entity>(type): T[] {
let list = ListPool.obtain<T>();
for (let i = 0; i < this._entities.length; i++) {
if (this._entities[i] instanceof type)
list.push(this._entities[i] as T);
}
for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
let entity = this._entitiesToAdded.toArray()[i];
if (TypeUtils.getType(entity) instanceof type) {
list.push(entity as T);
}
}
return list;
}
/**
* 返回在场景中找到的第一个T类型的组件。
* @param type
@@ -251,8 +230,17 @@ module es {
}
}
for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
let entity: Entity = this._entitiesToAdded.toArray()[i];
// 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];
if (entity.enabled) {
let comp = entity.getComponent<T>(type);
if (comp)
@@ -275,8 +263,14 @@ module es {
this._entities[i].getComponents(type, comps);
}
for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
let entity = this._entitiesToAdded.toArray()[i];
// 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];
if (entity.enabled)
entity.getComponents(type, comps);
}
@@ -308,8 +302,26 @@ module es {
}
}
for (let i = 0; i < this._entitiesToAdded.getCount(); i++) {
let entity: Entity = this._entitiesToAdded.toArray()[i];
// 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];
if (entity.enabled) {
let meet = true;
for (let type of types) {