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

#23 组件绘制层支持

Browse Source
This commit is contained in:
YHH
2020-08-08 09:43:03 +08:00
parent e7fb9e0d6b
commit 6a3622a5ef
10 changed files with 100 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/libs/framework/framework.d.ts
Vendored
+1
View File
@@ -951,6 +951,7 @@ declare module es {
addToRenderLayerList(component: IRenderable, renderLayer: number): void; addToRenderLayerList(component: IRenderable, renderLayer: number): void;
componentsWithRenderLayer(renderLayer: number): IRenderable[]; componentsWithRenderLayer(renderLayer: number): IRenderable[];
updateList(): void; updateList(): void;
private updateEgretList;
} }
} }
declare class StringUtils { declare class StringUtils {
demo/libs/framework/framework.js
+39 -21
View File
@@ -1694,7 +1694,7 @@ var es;
}; };
Scene.prototype.render = function () { Scene.prototype.render = function () {
if (this._renderers.length == 0) { if (this._renderers.length == 0) {
console.error("there are no renderers in the scene!"); console.error("场景中没有渲染器!");
return; return;
} }
for (var i = 0; i < this._renderers.length; i++) { for (var i = 0; i < this._renderers.length; i++) {
@@ -2575,6 +2575,7 @@ var es;
return this._renderLayer; return this._renderLayer;
}, },
set: function (value) { set: function (value) {
this.setRenderLayer(value);
}, },
enumerable: true, enumerable: true,
configurable: true configurable: true
@@ -4317,7 +4318,7 @@ var es;
RenderableComponentList.prototype.addToRenderLayerList = function (component, renderLayer) { RenderableComponentList.prototype.addToRenderLayerList = function (component, renderLayer) {
var list = this.componentsWithRenderLayer(renderLayer); var list = this.componentsWithRenderLayer(renderLayer);
if (!list.contains(component)) { if (!list.contains(component)) {
console.warn("Component renderLayer list already contains this component"); console.warn("组件呈现层列表已经包含此组件");
return; return;
} }
list.push(component); list.push(component);
@@ -4335,6 +4336,7 @@ var es;
if (this._componentsNeedSort) { if (this._componentsNeedSort) {
this._components.sort(RenderableComponentList.compareUpdatableOrder.compare); this._components.sort(RenderableComponentList.compareUpdatableOrder.compare);
this._componentsNeedSort = false; this._componentsNeedSort = false;
this.updateEgretList();
} }
if (this._unsortedRenderLayers.length > 0) { if (this._unsortedRenderLayers.length > 0) {
for (var i = 0, count = this._unsortedRenderLayers.length; i < count; i++) { for (var i = 0, count = this._unsortedRenderLayers.length; i < count; i++) {
@@ -4346,6 +4348,22 @@ var es;
this._unsortedRenderLayers.length = 0; this._unsortedRenderLayers.length = 0;
} }
}; };
RenderableComponentList.prototype.updateEgretList = function () {
var scene = es.Core._instance._scene;
if (!scene)
return;
var _loop_5 = function (i) {
var component = this_1._components[i];
var egretDisplayObject = scene.$children.find(function (a) { return a.hashCode == component.displayObject.hashCode; });
var displayIndex = scene.getChildIndex(egretDisplayObject);
if (displayIndex != i)
scene.swapChildrenAt(displayIndex, i);
};
var this_1 = this;
for (var i = 0; i < this._components.length; i++) {
_loop_5(i);
}
};
RenderableComponentList.compareUpdatableOrder = new es.RenderableComparer(); RenderableComponentList.compareUpdatableOrder = new es.RenderableComparer();
return RenderableComponentList; return RenderableComponentList;
}()); }());
@@ -5921,26 +5939,26 @@ var es;
for (var i = 0; i < colliders.length; i++) { for (var i = 0; i < colliders.length; i++) {
var collider = colliders[i]; var collider = colliders[i];
var neighbors = es.Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers); var neighbors = es.Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers);
var _loop_5 = function (j) { var _loop_6 = function (j) {
var neighbor = neighbors[j]; var neighbor = neighbors[j];
if (!collider.isTrigger && !neighbor.isTrigger) if (!collider.isTrigger && !neighbor.isTrigger)
return "continue"; return "continue";
if (collider.overlaps(neighbor)) { if (collider.overlaps(neighbor)) {
var pair_1 = new es.Pair(collider, neighbor); var pair_1 = new es.Pair(collider, neighbor);
var shouldReportTriggerEvent = this_1._activeTriggerIntersections.findIndex(function (value) { var shouldReportTriggerEvent = this_2._activeTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second; return value.first == pair_1.first && value.second == pair_1.second;
}) == -1 && this_1._previousTriggerIntersections.findIndex(function (value) { }) == -1 && this_2._previousTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second; return value.first == pair_1.first && value.second == pair_1.second;
}) == -1; }) == -1;
if (shouldReportTriggerEvent) if (shouldReportTriggerEvent)
this_1.notifyTriggerListeners(pair_1, true); this_2.notifyTriggerListeners(pair_1, true);
if (!this_1._activeTriggerIntersections.contains(pair_1)) if (!this_2._activeTriggerIntersections.contains(pair_1))
this_1._activeTriggerIntersections.push(pair_1); this_2._activeTriggerIntersections.push(pair_1);
} }
}; };
var this_1 = this; var this_2 = this;
for (var j = 0; j < neighbors.length; j++) { for (var j = 0; j < neighbors.length; j++) {
_loop_5(j); _loop_6(j);
} }
} }
es.ListPool.free(colliders); es.ListPool.free(colliders);
@@ -5948,18 +5966,18 @@ var es;
}; };
ColliderTriggerHelper.prototype.checkForExitedColliders = function () { ColliderTriggerHelper.prototype.checkForExitedColliders = function () {
var _this = this; var _this = this;
var _loop_6 = function (i) { var _loop_7 = function (i) {
var index = this_2._previousTriggerIntersections.findIndex(function (value) { var index = this_3._previousTriggerIntersections.findIndex(function (value) {
if (value.first == _this._activeTriggerIntersections[i].first && value.second == _this._activeTriggerIntersections[i].second) if (value.first == _this._activeTriggerIntersections[i].first && value.second == _this._activeTriggerIntersections[i].second)
return true; return true;
return false; return false;
}); });
if (index != -1) if (index != -1)
this_2._previousTriggerIntersections.removeAt(index); this_3._previousTriggerIntersections.removeAt(index);
}; };
var this_2 = this; var this_3 = this;
for (var i = 0; i < this._activeTriggerIntersections.length; i++) { for (var i = 0; i < this._activeTriggerIntersections.length; i++) {
_loop_6(i); _loop_7(i);
} }
for (var i = 0; i < this._previousTriggerIntersections.length; i++) { for (var i = 0; i < this._previousTriggerIntersections.length; i++) {
this.notifyTriggerListeners(this._previousTriggerIntersections[i], false); this.notifyTriggerListeners(this._previousTriggerIntersections[i], false);
@@ -6937,7 +6955,7 @@ var es;
for (var y = p1.y; y <= p2.y; y++) { for (var y = p1.y; y <= p2.y; y++) {
var cell = this.cellAtPosition(x, y); var cell = this.cellAtPosition(x, y);
if (!cell) if (!cell)
console.error("removing Collider [" + collider + "] from a cell that it is not present in"); console.log("\u4ECE\u4E0D\u5B58\u5728\u78B0\u649E\u5668\u7684\u5355\u5143\u683C\u4E2D\u79FB\u9664\u78B0\u649E\u5668: [" + collider + "]");
else else
cell.remove(collider); cell.remove(collider);
} }
@@ -6968,18 +6986,18 @@ var es;
var cell = this.cellAtPosition(x, y); var cell = this.cellAtPosition(x, y);
if (!cell) if (!cell)
continue; continue;
var _loop_7 = function (i) { var _loop_8 = function (i) {
var collider = cell[i]; var collider = cell[i];
if (collider == excludeCollider || !es.Flags.isFlagSet(layerMask, collider.physicsLayer)) if (collider == excludeCollider || !es.Flags.isFlagSet(layerMask, collider.physicsLayer))
return "continue"; return "continue";
if (bounds.intersects(collider.bounds)) { if (bounds.intersects(collider.bounds)) {
if (!this_3._tempHashSet.firstOrDefault(function (c) { return c.hashCode == collider.hashCode; })) if (!this_4._tempHashSet.firstOrDefault(function (c) { return c.hashCode == collider.hashCode; }))
this_3._tempHashSet.push(collider); this_4._tempHashSet.push(collider);
} }
}; };
var this_3 = this; var this_4 = this;
for (var i = 0; i < cell.length; i++) { for (var i = 0; i < cell.length; i++) {
_loop_7(i); _loop_8(i);
} }
} }
} }
demo/libs/framework/framework.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
source/bin/framework.d.ts
Vendored
+1
View File
@@ -951,6 +951,7 @@ declare module es {
addToRenderLayerList(component: IRenderable, renderLayer: number): void; addToRenderLayerList(component: IRenderable, renderLayer: number): void;
componentsWithRenderLayer(renderLayer: number): IRenderable[]; componentsWithRenderLayer(renderLayer: number): IRenderable[];
updateList(): void; updateList(): void;
private updateEgretList;
} }
} }
declare class StringUtils { declare class StringUtils {
source/bin/framework.js
+39 -21
View File
@@ -1694,7 +1694,7 @@ var es;
}; };
Scene.prototype.render = function () { Scene.prototype.render = function () {
if (this._renderers.length == 0) { if (this._renderers.length == 0) {
console.error("there are no renderers in the scene!"); console.error("场景中没有渲染器!");
return; return;
} }
for (var i = 0; i < this._renderers.length; i++) { for (var i = 0; i < this._renderers.length; i++) {
@@ -2575,6 +2575,7 @@ var es;
return this._renderLayer; return this._renderLayer;
}, },
set: function (value) { set: function (value) {
this.setRenderLayer(value);
}, },
enumerable: true, enumerable: true,
configurable: true configurable: true
@@ -4317,7 +4318,7 @@ var es;
RenderableComponentList.prototype.addToRenderLayerList = function (component, renderLayer) { RenderableComponentList.prototype.addToRenderLayerList = function (component, renderLayer) {
var list = this.componentsWithRenderLayer(renderLayer); var list = this.componentsWithRenderLayer(renderLayer);
if (!list.contains(component)) { if (!list.contains(component)) {
console.warn("Component renderLayer list already contains this component"); console.warn("组件呈现层列表已经包含此组件");
return; return;
} }
list.push(component); list.push(component);
@@ -4335,6 +4336,7 @@ var es;
if (this._componentsNeedSort) { if (this._componentsNeedSort) {
this._components.sort(RenderableComponentList.compareUpdatableOrder.compare); this._components.sort(RenderableComponentList.compareUpdatableOrder.compare);
this._componentsNeedSort = false; this._componentsNeedSort = false;
this.updateEgretList();
} }
if (this._unsortedRenderLayers.length > 0) { if (this._unsortedRenderLayers.length > 0) {
for (var i = 0, count = this._unsortedRenderLayers.length; i < count; i++) { for (var i = 0, count = this._unsortedRenderLayers.length; i < count; i++) {
@@ -4346,6 +4348,22 @@ var es;
this._unsortedRenderLayers.length = 0; this._unsortedRenderLayers.length = 0;
} }
}; };
RenderableComponentList.prototype.updateEgretList = function () {
var scene = es.Core._instance._scene;
if (!scene)
return;
var _loop_5 = function (i) {
var component = this_1._components[i];
var egretDisplayObject = scene.$children.find(function (a) { return a.hashCode == component.displayObject.hashCode; });
var displayIndex = scene.getChildIndex(egretDisplayObject);
if (displayIndex != i)
scene.swapChildrenAt(displayIndex, i);
};
var this_1 = this;
for (var i = 0; i < this._components.length; i++) {
_loop_5(i);
}
};
RenderableComponentList.compareUpdatableOrder = new es.RenderableComparer(); RenderableComponentList.compareUpdatableOrder = new es.RenderableComparer();
return RenderableComponentList; return RenderableComponentList;
}()); }());
@@ -5921,26 +5939,26 @@ var es;
for (var i = 0; i < colliders.length; i++) { for (var i = 0; i < colliders.length; i++) {
var collider = colliders[i]; var collider = colliders[i];
var neighbors = es.Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers); var neighbors = es.Physics.boxcastBroadphase(collider.bounds, collider.collidesWithLayers);
var _loop_5 = function (j) { var _loop_6 = function (j) {
var neighbor = neighbors[j]; var neighbor = neighbors[j];
if (!collider.isTrigger && !neighbor.isTrigger) if (!collider.isTrigger && !neighbor.isTrigger)
return "continue"; return "continue";
if (collider.overlaps(neighbor)) { if (collider.overlaps(neighbor)) {
var pair_1 = new es.Pair(collider, neighbor); var pair_1 = new es.Pair(collider, neighbor);
var shouldReportTriggerEvent = this_1._activeTriggerIntersections.findIndex(function (value) { var shouldReportTriggerEvent = this_2._activeTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second; return value.first == pair_1.first && value.second == pair_1.second;
}) == -1 && this_1._previousTriggerIntersections.findIndex(function (value) { }) == -1 && this_2._previousTriggerIntersections.findIndex(function (value) {
return value.first == pair_1.first && value.second == pair_1.second; return value.first == pair_1.first && value.second == pair_1.second;
}) == -1; }) == -1;
if (shouldReportTriggerEvent) if (shouldReportTriggerEvent)
this_1.notifyTriggerListeners(pair_1, true); this_2.notifyTriggerListeners(pair_1, true);
if (!this_1._activeTriggerIntersections.contains(pair_1)) if (!this_2._activeTriggerIntersections.contains(pair_1))
this_1._activeTriggerIntersections.push(pair_1); this_2._activeTriggerIntersections.push(pair_1);
} }
}; };
var this_1 = this; var this_2 = this;
for (var j = 0; j < neighbors.length; j++) { for (var j = 0; j < neighbors.length; j++) {
_loop_5(j); _loop_6(j);
} }
} }
es.ListPool.free(colliders); es.ListPool.free(colliders);
@@ -5948,18 +5966,18 @@ var es;
}; };
ColliderTriggerHelper.prototype.checkForExitedColliders = function () { ColliderTriggerHelper.prototype.checkForExitedColliders = function () {
var _this = this; var _this = this;
var _loop_6 = function (i) { var _loop_7 = function (i) {
var index = this_2._previousTriggerIntersections.findIndex(function (value) { var index = this_3._previousTriggerIntersections.findIndex(function (value) {
if (value.first == _this._activeTriggerIntersections[i].first && value.second == _this._activeTriggerIntersections[i].second) if (value.first == _this._activeTriggerIntersections[i].first && value.second == _this._activeTriggerIntersections[i].second)
return true; return true;
return false; return false;
}); });
if (index != -1) if (index != -1)
this_2._previousTriggerIntersections.removeAt(index); this_3._previousTriggerIntersections.removeAt(index);
}; };
var this_2 = this; var this_3 = this;
for (var i = 0; i < this._activeTriggerIntersections.length; i++) { for (var i = 0; i < this._activeTriggerIntersections.length; i++) {
_loop_6(i); _loop_7(i);
} }
for (var i = 0; i < this._previousTriggerIntersections.length; i++) { for (var i = 0; i < this._previousTriggerIntersections.length; i++) {
this.notifyTriggerListeners(this._previousTriggerIntersections[i], false); this.notifyTriggerListeners(this._previousTriggerIntersections[i], false);
@@ -6937,7 +6955,7 @@ var es;
for (var y = p1.y; y <= p2.y; y++) { for (var y = p1.y; y <= p2.y; y++) {
var cell = this.cellAtPosition(x, y); var cell = this.cellAtPosition(x, y);
if (!cell) if (!cell)
console.error("removing Collider [" + collider + "] from a cell that it is not present in"); console.log("\u4ECE\u4E0D\u5B58\u5728\u78B0\u649E\u5668\u7684\u5355\u5143\u683C\u4E2D\u79FB\u9664\u78B0\u649E\u5668: [" + collider + "]");
else else
cell.remove(collider); cell.remove(collider);
} }
@@ -6968,18 +6986,18 @@ var es;
var cell = this.cellAtPosition(x, y); var cell = this.cellAtPosition(x, y);
if (!cell) if (!cell)
continue; continue;
var _loop_7 = function (i) { var _loop_8 = function (i) {
var collider = cell[i]; var collider = cell[i];
if (collider == excludeCollider || !es.Flags.isFlagSet(layerMask, collider.physicsLayer)) if (collider == excludeCollider || !es.Flags.isFlagSet(layerMask, collider.physicsLayer))
return "continue"; return "continue";
if (bounds.intersects(collider.bounds)) { if (bounds.intersects(collider.bounds)) {
if (!this_3._tempHashSet.firstOrDefault(function (c) { return c.hashCode == collider.hashCode; })) if (!this_4._tempHashSet.firstOrDefault(function (c) { return c.hashCode == collider.hashCode; }))
this_3._tempHashSet.push(collider); this_4._tempHashSet.push(collider);
} }
}; };
var this_3 = this; var this_4 = this;
for (var i = 0; i < cell.length; i++) { for (var i = 0; i < cell.length; i++) {
_loop_7(i); _loop_8(i);
} }
} }
} }
source/bin/framework.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
source/src/ECS/Components/RenderableComponent.ts
+1 -1
View File
@@ -57,7 +57,7 @@ module es {
} }
public set renderLayer(value: number) { public set renderLayer(value: number) {
this.setRenderLayer(value);
} }
protected _bounds: Rectangle = new Rectangle(); protected _bounds: Rectangle = new Rectangle();
source/src/ECS/Scene.ts
+1 -1
View File
@@ -152,7 +152,7 @@ module es {
public render() { public render() {
if (this._renderers.length == 0) { if (this._renderers.length == 0) {
console.error("there are no renderers in the scene!"); console.error("场景中没有渲染器!");
return; return;
} }
source/src/ECS/Utils/RenderableComponentList.ts
+15 -1
View File
@@ -59,7 +59,7 @@ module es {
public addToRenderLayerList(component: IRenderable, renderLayer: number) { public addToRenderLayerList(component: IRenderable, renderLayer: number) {
let list = this.componentsWithRenderLayer(renderLayer); let list = this.componentsWithRenderLayer(renderLayer);
if (!list.contains(component)) { if (!list.contains(component)) {
console.warn("Component renderLayer list already contains this component"); console.warn("组件呈现层列表已经包含此组件");
return; return;
} }
@@ -84,6 +84,7 @@ module es {
if (this._componentsNeedSort) { if (this._componentsNeedSort) {
this._components.sort(RenderableComponentList.compareUpdatableOrder.compare); this._components.sort(RenderableComponentList.compareUpdatableOrder.compare);
this._componentsNeedSort = false; this._componentsNeedSort = false;
this.updateEgretList();
} }
if (this._unsortedRenderLayers.length > 0) { if (this._unsortedRenderLayers.length > 0) {
@@ -97,5 +98,18 @@ module es {
this._unsortedRenderLayers.length = 0; this._unsortedRenderLayers.length = 0;
} }
} }
private updateEgretList(){
let scene = Core._instance._scene;
if (!scene)
return;
for (let i = 0 ; i < this._components.length; i ++){
let component = this._components[i] as RenderableComponent;
let egretDisplayObject = scene.$children.find(a => {return a.hashCode == component.displayObject.hashCode});
let displayIndex = scene.getChildIndex(egretDisplayObject);
if (displayIndex != i) scene.swapChildrenAt(displayIndex, i);
}
}
} }
} }
source/src/Physics/Verlet/SpatialHash.ts
+1 -1
View File
@@ -73,7 +73,7 @@ module es {
// 单元格应该始终存在，因为这个碰撞器应该在所有查询的单元格中 // 单元格应该始终存在，因为这个碰撞器应该在所有查询的单元格中
let cell = this.cellAtPosition(x, y); let cell = this.cellAtPosition(x, y);
if (!cell) if (!cell)
console.error(`removing Collider [${collider}] from a cell that it is not present in`); console.log(`从不存在碰撞器的单元格中移除碰撞器: [${collider}]`);
else else
cell.remove(collider); cell.remove(collider);
} }