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

新增entitySystemsEnabled用于控制是否开启系统

Browse Source
This commit is contained in:
yhh
2020-11-26 10:44:28 +08:00
parent 1bb1b8704b
commit 97dfcb4c04
6 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/bin/framework.js
View File

@@ -538,7 +538,8 @@ var es;
this.transform = new es.Transform(this); this.transform = new es.Transform(this);
this.name = name; this.name = name;
this.id = Entity._idGenerator++; this.id = Entity._idGenerator++;
this.componentBits = new es.BitSet(); if (es.Core.entitySystemsEnabled)
this.componentBits = new es.BitSet();
} }
Object.defineProperty(Entity.prototype, "isDestroyed", { Object.defineProperty(Entity.prototype, "isDestroyed", {
get: function () { get: function () {
@@ -820,7 +821,8 @@ var es;
this._renderers = []; this._renderers = [];
this.entities = new es.EntityList(this); this.entities = new es.EntityList(this);
this.renderableComponents = new es.RenderableComponentList(); this.renderableComponents = new es.RenderableComponentList();
this.entityProcessors = new es.EntityProcessorList(); if (es.Core.entitySystemsEnabled)
this.entityProcessors = new es.EntityProcessorList();
this.initialize(); this.initialize();
} }
Scene.prototype.initialize = function () { Scene.prototype.initialize = function () {
@@ -2058,8 +2060,10 @@ var es;
continue; continue;
if (es.isIUpdatable(component)) if (es.isIUpdatable(component))
this._updatableComponents.remove(component); this._updatableComponents.remove(component);
this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false); if (es.Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentRemoved(this._entity); this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false);
this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
}
} }
}; };
ComponentList.prototype.registerAllComponents = function () { ComponentList.prototype.registerAllComponents = function () {
@@ -2067,8 +2071,10 @@ var es;
var component = this._components.buffer[i]; var component = this._components.buffer[i];
if (es.isIUpdatable(component)) if (es.isIUpdatable(component))
this._updatableComponents.add(component); this._updatableComponents.add(component);
this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"])); if (es.Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentAdded(this._entity); this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]));
this._entity.scene.entityProcessors.onComponentAdded(this._entity);
}
} }
}; };
ComponentList.prototype.updateLists = function () { ComponentList.prototype.updateLists = function () {
@@ -2084,8 +2090,10 @@ var es;
var component = this._componentsToAdd[i]; var component = this._componentsToAdd[i];
if (es.isIUpdatable(component)) if (es.isIUpdatable(component))
this._updatableComponents.add(component); this._updatableComponents.add(component);
this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"])); if (es.Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentAdded(this._entity); this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]));
this._entity.scene.entityProcessors.onComponentAdded(this._entity);
}
this._components.add(component); this._components.add(component);
this._tempBufferList.push(component); this._tempBufferList.push(component);
} }
@@ -2110,8 +2118,10 @@ var es;
return; return;
if (es.isIUpdatable(component)) if (es.isIUpdatable(component))
this._updatableComponents.remove(component); this._updatableComponents.remove(component);
this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false); if (es.Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentRemoved(this._entity); this._entity.componentBits.set(es.ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false);
this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
}
component.onRemovedFromEntity(); component.onRemovedFromEntity();
component.entity = null; component.entity = null;
}; };
@@ -2306,7 +2316,8 @@ var es;
this._entities.remove(entity); this._entities.remove(entity);
entity.onRemovedFromScene(); entity.onRemovedFromScene();
entity.scene = null; entity.scene = null;
this.scene.entityProcessors.onEntityRemoved(entity); if (es.Core.entitySystemsEnabled)
this.scene.entityProcessors.onEntityRemoved(entity);
} }
this._entitiesToRemove.length = 0; this._entitiesToRemove.length = 0;
} }
@@ -2351,7 +2362,8 @@ var es;
this._entities.push(entity); this._entities.push(entity);
entity.scene = this.scene; entity.scene = this.scene;
this.addToTagList(entity); this.addToTagList(entity);
this.scene.entityProcessors.onEntityAdded(entity); if (es.Core.entitySystemsEnabled)
this.scene.entityProcessors.onEntityAdded(entity);
} }
}; };
EntityList.prototype.findEntity = function (name) { EntityList.prototype.findEntity = function (name) {

2
source/bin/framework.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -34,7 +34,8 @@ module es {
this.name = name; this.name = name;
this.id = Entity._idGenerator++; this.id = Entity._idGenerator++;
this.componentBits = new BitSet(); if (Core.entitySystemsEnabled)
this.componentBits = new BitSet();
} }
public _isDestroyed: boolean; public _isDestroyed: boolean;

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

@@ -22,7 +22,8 @@ module es {
this.entities = new EntityList(this); this.entities = new EntityList(this);
this.renderableComponents = new RenderableComponentList(); this.renderableComponents = new RenderableComponentList();
this.entityProcessors = new EntityProcessorList(); if (Core.entitySystemsEnabled)
this.entityProcessors = new EntityProcessorList();
this.initialize(); this.initialize();
} }
@@ -136,7 +137,7 @@ module es {
* 只有在SceneTransition请求渲染时，它才会有一个值。 * 只有在SceneTransition请求渲染时，它才会有一个值。
*/ */
public postRender() { public postRender() {
} }
/** /**

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

@@ -86,8 +86,10 @@ module es {
if (isIUpdatable(component)) if (isIUpdatable(component))
this._updatableComponents.remove(component); this._updatableComponents.remove(component);
this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false); if (Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentRemoved(this._entity); this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false);
this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
}
} }
} }
@@ -98,8 +100,10 @@ module es {
if (isIUpdatable(component)) if (isIUpdatable(component))
this._updatableComponents.add(component); this._updatableComponents.add(component);
this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"])); if (Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentAdded(this._entity); this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]));
this._entity.scene.entityProcessors.onComponentAdded(this._entity);
}
} }
} }
@@ -123,8 +127,10 @@ module es {
if (isIUpdatable(component)) if (isIUpdatable(component))
this._updatableComponents.add(component); this._updatableComponents.add(component);
this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"])); if (Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentAdded(this._entity); this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]));
this._entity.scene.entityProcessors.onComponentAdded(this._entity);
}
this._components.add(component); this._components.add(component);
this._tempBufferList.push(component); this._tempBufferList.push(component);
@@ -160,8 +166,10 @@ module es {
if (isIUpdatable(component)) if (isIUpdatable(component))
this._updatableComponents.remove(component); this._updatableComponents.remove(component);
this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false); if (Core.entitySystemsEnabled) {
this._entity.scene.entityProcessors.onComponentRemoved(this._entity); this._entity.componentBits.set(ComponentTypeManager.getIndexFor(component["__proto__"]["constructor"]), false);
this._entity.scene.entityProcessors.onComponentRemoved(this._entity);
}
component.onRemovedFromEntity(); component.onRemovedFromEntity();
component.entity = null; component.entity = null;

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

@@ -144,13 +144,16 @@ module es {
public updateLists() { public updateLists() {
if (this._entitiesToRemove.length > 0) { if (this._entitiesToRemove.length > 0) {
for (const entity of this._entitiesToRemove) { for (const entity of this._entitiesToRemove) {
// 处理标签列表
this.removeFromTagList(entity); this.removeFromTagList(entity);
// 处理常规实体列表
this._entities.remove(entity); this._entities.remove(entity);
entity.onRemovedFromScene(); entity.onRemovedFromScene();
entity.scene = null; entity.scene = null;
this.scene.entityProcessors.onEntityRemoved(entity); if (Core.entitySystemsEnabled)
this.scene.entityProcessors.onEntityRemoved(entity);
} }
this._entitiesToRemove.length = 0; this._entitiesToRemove.length = 0;
@@ -208,8 +211,9 @@ module es {
entity.scene = this.scene; entity.scene = this.scene;
this.addToTagList(entity); this.addToTagList(entity);
this.scene.entityProcessors.onEntityAdded(entity); if (Core.entitySystemsEnabled)
this.scene.entityProcessors.onEntityAdded(entity);
} }
} }