使用zIndex代替swapChildIndex
This commit is contained in:
@@ -159,9 +159,10 @@ module es {
|
||||
*/
|
||||
public setRenderLayer(renderLayer: number): RenderableComponent {
|
||||
if (renderLayer != this._renderLayer) {
|
||||
this.displayObject.zIndex = renderLayer;
|
||||
|
||||
let oldRenderLayer = this._renderLayer;
|
||||
this._renderLayer = renderLayer;
|
||||
|
||||
// 如果该组件拥有一个实体,那么是由ComponentList管理,需要通知它改变了渲染层
|
||||
if (this.entity && this.entity.scene)
|
||||
this.entity.scene.renderableComponents.updateRenderableRenderLayer(this, oldRenderLayer, this._renderLayer);
|
||||
|
||||
@@ -39,10 +39,6 @@ module es {
|
||||
* 动态合批
|
||||
*/
|
||||
public dynamicBatch: boolean = false;
|
||||
/**
|
||||
* 极致优化cost 会失去所有的事件(触摸、点击) 慎重开启
|
||||
*/
|
||||
public optimizeCost: boolean = false;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
@@ -212,7 +208,6 @@ module es {
|
||||
this.addChild(component.displayObject);
|
||||
this.addChild(component.debugDisplayObject);
|
||||
batching = false;
|
||||
if (this.optimizeCost && displayContainer) this.optimizeCombine(displayContainer);
|
||||
displayContainer = null;
|
||||
} else if (component instanceof RenderableComponent) {
|
||||
// 静态
|
||||
@@ -229,18 +224,6 @@ module es {
|
||||
displayContainer.addChild(component.debugDisplayObject);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.optimizeCost && displayContainer) this.optimizeCombine(displayContainer);
|
||||
}
|
||||
|
||||
private optimizeCombine(container: egret.DisplayObjectContainer){
|
||||
let renderTexture = new egret.RenderTexture();
|
||||
renderTexture.drawToTexture(container, new Rectangle(0, 0, container.width, container.height));
|
||||
let parent = container.parent;
|
||||
let index = this.getChildIndex(container);
|
||||
parent.addChildAt(new Bitmap(renderTexture), index);
|
||||
parent.removeChild(container);
|
||||
container.removeChildren();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -14,7 +14,14 @@ module es {
|
||||
*/
|
||||
public _componentsByRenderLayer: Map<number, IRenderable[]> = new Map<number, IRenderable[]>();
|
||||
public _unsortedRenderLayers: number[] = [];
|
||||
public _componentsNeedSort: boolean = true;
|
||||
private _componentsNeedSort: boolean = true;
|
||||
public get componentsNeedSort(): boolean {
|
||||
return this._componentsNeedSort;
|
||||
}
|
||||
public set componentsNeedSort(value: boolean) {
|
||||
this._componentsNeedSort = value;
|
||||
Core.scene.sortableChildren = value;
|
||||
}
|
||||
|
||||
public get count() {
|
||||
return this._components.length;
|
||||
@@ -49,11 +56,11 @@ module es {
|
||||
public setRenderLayerNeedsComponentSort(renderLayer: number) {
|
||||
if (!this._unsortedRenderLayers.contains(renderLayer))
|
||||
this._unsortedRenderLayers.push(renderLayer);
|
||||
this._componentsNeedSort = true;
|
||||
this.componentsNeedSort = true;
|
||||
}
|
||||
|
||||
public setNeedsComponentSort() {
|
||||
this._componentsNeedSort = true;
|
||||
this.componentsNeedSort = true;
|
||||
}
|
||||
|
||||
public addToRenderLayerList(component: IRenderable, renderLayer: number) {
|
||||
@@ -66,7 +73,7 @@ module es {
|
||||
list.push(component);
|
||||
if (!this._unsortedRenderLayers.contains(renderLayer))
|
||||
this._unsortedRenderLayers.push(renderLayer);
|
||||
this._componentsNeedSort = true;
|
||||
this.componentsNeedSort = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,10 +88,9 @@ module es {
|
||||
}
|
||||
|
||||
public updateList() {
|
||||
if (this._componentsNeedSort) {
|
||||
if (this.componentsNeedSort) {
|
||||
this._components.sort(RenderableComponentList.compareUpdatableOrder.compare);
|
||||
this._componentsNeedSort = false;
|
||||
this.updateEgretList();
|
||||
this.componentsNeedSort = false;
|
||||
}
|
||||
|
||||
if (this._unsortedRenderLayers.length > 0) {
|
||||
@@ -96,20 +102,6 @@ module es {
|
||||
}
|
||||
|
||||
this._unsortedRenderLayers.length = 0;
|
||||
this.updateEgretList();
|
||||
}
|
||||
}
|
||||
|
||||
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 != -1 && displayIndex != i) scene.swapChildrenAt(displayIndex, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user