diff --git a/EngineErrorMap.md b/EngineErrorMap.md index 0bae9b65ef..c9ea7d637c 100644 --- a/EngineErrorMap.md +++ b/EngineErrorMap.md @@ -2952,3 +2952,7 @@ Sub-mesh may include at most %d morph targets, but you specified %d. ### 11000 WebGL context lost. + +### 12001 + +BlendFactors are disabled when using custom material, please modify the blend state in the material instead. diff --git a/cocos/core/components/ui-base/ui-renderable.ts b/cocos/core/components/ui-base/ui-renderable.ts index 0c8181a422..15c42beeb6 100644 --- a/cocos/core/components/ui-base/ui-renderable.ts +++ b/cocos/core/components/ui-base/ui-renderable.ts @@ -28,14 +28,13 @@ * @module ui */ -import { ccclass, executeInEditMode, requireComponent, disallowMultiple, tooltip, type, displayOrder, serializable } from 'cc.decorator'; +import { ccclass, executeInEditMode, requireComponent, disallowMultiple, tooltip, type, displayOrder, serializable, override, visible, displayName } from 'cc.decorator'; import { Color } from '../../math'; import { SystemEventType } from '../../platform/event-manager/event-enum'; import { ccenum } from '../../value-types/enum'; import { builtinResMgr } from '../../3d/builtin/init'; import { Material } from '../../assets'; import { GFXBlendFactor } from '../../gfx/define'; -import { MaterialInstance } from '../../renderer'; import { IMaterialInstanceInfo } from '../../renderer/core/material-instance'; import { IAssembler, IAssemblerManager } from '../../renderer/ui/base'; import { RenderData } from '../../renderer/ui/render-data'; @@ -46,6 +45,8 @@ import { UITransform } from './ui-transform'; import { RenderableComponent } from '../../3d/framework/renderable-component'; import { EDITOR } from 'internal:constants'; import { Stage } from '../../renderer/ui/stencil-manager'; +import { warnID } from '../../platform'; +import { murmurhash2_32_gc } from '../../utils'; // hack ccenum(GFXBlendFactor); @@ -123,6 +124,59 @@ const _matInsInfo: IMaterialInstanceInfo = { @executeInEditMode export class UIRenderable extends RenderableComponent { + @override + protected _materials: (Material | null)[] = []; + + @override + @visible(false) + get sharedMaterials () { + // if we don't create an array copy, the editor will modify the original array directly. + return EDITOR && this._materials.slice() || this._materials; + } + + set sharedMaterials (val) { + for (let i = 0; i < val.length; i++) { + if (val[i] !== this._materials[i]) { + this.setMaterial(val[i], i); + } + } + if (val.length < this._materials.length) { + for (let i = val.length; i < this._materials.length; i++) { + this.setMaterial(null, i); + } + this._materials.splice(val.length); + } + } + + @type({Material}) + protected _customMaterial: Material| null = null; + + /** + * @en The customMaterial + * @zh 用户自定材质 + */ + @type(Material) + @displayOrder(0) + @displayName('CustomMaterial') + get customMaterial () { + return this._customMaterial; + } + + set customMaterial (val) { + this._customMaterial = val; + this.updateMaterial(); + } + + protected updateMaterial () { + if (this._customMaterial) { + this.setMaterial(this._customMaterial, 0); + return; + } + const mat = this._updateBuiltinMaterial(); + this.setMaterial(mat, 0); + this._updateBlendFunc(); + } + /** * @en Specifies the source blend mode, it will clone a new material object. * @zh 指定源的混合模式,这会克隆一个新的材质对象,注意这带来的性能和内存损耗。 @@ -131,14 +185,22 @@ export class UIRenderable extends RenderableComponent { * sprite.srcBlendFactor = GFXBlendFactor.ONE; * ``` */ + @visible(function (this: UIRenderable) { if (this._customMaterial) {return false;} return true; }) @type(GFXBlendFactor) @displayOrder(0) @tooltip('Source blend factor') get srcBlendFactor () { + if (!EDITOR && this._customMaterial) { + warnID(12001); + } return this._srcBlendFactor; } set srcBlendFactor (value: GFXBlendFactor) { + if (this._customMaterial) { + warnID(12001); + return; + } if (this._srcBlendFactor === value) { return; } @@ -155,14 +217,22 @@ export class UIRenderable extends RenderableComponent { * sprite.dstBlendFactor = GFXBlendFactor.ONE_MINUS_SRC_ALPHA; * ``` */ + @visible(function (this: UIRenderable) { if (this._customMaterial) {return false;} return true; }) @type(GFXBlendFactor) @displayOrder(1) @tooltip('destination blend factor') get dstBlendFactor () { + if (!EDITOR && this._customMaterial) { + warnID(12001); + } return this._dstBlendFactor; } set dstBlendFactor (value: GFXBlendFactor) { + if (this._customMaterial) { + warnID(12001); + return; + } if (this._dstBlendFactor === value) { return; } @@ -195,78 +265,6 @@ export class UIRenderable extends RenderableComponent { } } - // hack for builtinMaterial - protected _uiMaterial: Material | null = null; - protected _uiMaterialIns: MaterialInstance | null = null; - - public getUIRenderMaterial () { - return this._uiMaterialIns || this._uiMaterial; - } - - public getUIMaterialInstance () { - if (!this._uiMaterialIns || this._uiMatInsDirty) { - _matInsInfo.owner = this; - _matInsInfo.parent = this._uiMaterial!; - this._uiMaterialIns = new MaterialInstance(_matInsInfo); - this._uiMatInsDirty = false; - } - return this._uiMaterialIns; - } - - protected _uiMaterialDirty = false; - protected _uiMatInsDirty = false; - - // materialInstance only for Stencil // Will remove at v3.0 - public _materialInstanceForStencil; - public getMaterialInstanceForStencil () { - if (!this._materialInstanceForStencil) { - let patentMaterial; - if (this.getRenderMaterial(0)) { - patentMaterial = this.getMaterial(0); - } else { - patentMaterial = this._uiMaterial; - } - _matInsInfo.owner = this; - _matInsInfo.parent = patentMaterial; - this._materialInstanceForStencil = new MaterialInstance(_matInsInfo); - } - return this._materialInstanceForStencil; - } - - protected _onMaterialModified (idx: number, material: Material | null) { - if (this._materialInstanceForStencil) { - const inst = this._materialInstanceForStencil; - inst.destroy(); - this._materialInstanceForStencil = null; - } - } - - /** - * @en The user customized material, if not set, it will use builtin material resources, and will show nothing on inspector field. - * @zh 用户自定义材质,如果没有设置过,那么将使用引擎内置的材质资源,在面板上也不会显示。 - */ - get uiMaterial () { - return this._uiMaterial; - } - set uiMaterial (val) { - if (this._uiMaterial === val) { - return; - } - - this.stencilStage = Stage.DISABLED; - if (this._uiMaterialIns) { - this._uiMaterialIns.destroy(); - this._uiMaterialIns = null; - } - - if (this._materialInstanceForStencil){ - this._materialInstanceForStencil.destroy(); - this._materialInstanceForStencil = null; - } - - this._uiMaterial = val; - } - get renderData () { return this._renderData; } @@ -327,6 +325,46 @@ export class UIRenderable extends RenderableComponent { protected _lastParent: Node | null = null; + // The material hash include uniform + protected _materialUniformHash = 0; + + /** + * @en The hash for material uniforms + * @zh 材质 uniform 的哈希值 + */ + get materialUniformHash () { + return this._materialUniformHash; + } + + /** + * @en update the hash for material uniforms, and return it + * @zh 更新并返回材质 uniform 的哈希值 + */ + public updateMaterialUniformHash (mat: Material) { + const passes = mat.passes; + let pass; + let block; + let hashData = ''; + let dirty = false; + for (let i = 0; i < passes.length; i++) { + pass = passes[i]; + if (pass.rootBufferDirty) { + dirty = true; + const blocks = pass.blocks; + for (let j = 0; j < pass.blocks.length; j++) { + block = blocks[j]; + for (let k = 0; k < block.length; k++) { + hashData += block[k] + ','; + } + } + } + } + if (dirty) { + this._materialUniformHash = murmurhash2_32_gc(hashData,666); + } + return this._materialUniformHash; + } + public __preload (){ this.node._uiProps.uiComp = this; if (this._flushAssembler){ @@ -337,7 +375,9 @@ export class UIRenderable extends RenderableComponent { public onEnable () { this.node.on(SystemEventType.ANCHOR_CHANGED, this._nodeStateChange, this); this.node.on(SystemEventType.SIZE_CHANGED, this._nodeStateChange, this); + this.updateMaterial(); this._renderFlag = this._canRender(); + this._materialUniformHash = this.getMaterial(0)!.hash!; } public onDisable () { @@ -356,9 +396,6 @@ export class UIRenderable extends RenderableComponent { this._materialInstances[i]!.destroy(); } } - if (this._uiMaterialIns) { - this._uiMaterialIns.destroy(); - } this._renderData = null; } @@ -446,8 +483,8 @@ export class UIRenderable extends RenderableComponent { } protected _canRender () { - // this.getMaterial(0) !== null still can render is hack for builtin Material - return this.enabled && (this._delegateSrc ? this._delegateSrc.activeInHierarchy : this.enabledInHierarchy) && this._color.a > 0; + return this.getMaterial(0) !== null && this.enabled + && (this._delegateSrc ? this._delegateSrc.activeInHierarchy : this.enabledInHierarchy) && this._color.a > 0; } protected _postCanRender () {} @@ -471,16 +508,6 @@ export class UIRenderable extends RenderableComponent { } return mat; } - - if (this._uiMaterialIns !== null && (this._uiMatInsDirty || - target.blendDst !== this._dstBlendFactor || target.blendSrc !== this._srcBlendFactor)) { - mat = this.getUIMaterialInstance(); - target.blendDst = this._dstBlendFactor; - target.blendSrc = this._srcBlendFactor; - mat.overridePipelineStates(this._blendTemplate, 0); - } - - return mat || this.getUIRenderMaterial(); } // pos, rot, scale changed @@ -498,41 +525,26 @@ export class UIRenderable extends RenderableComponent { } } - public _updateBuiltinMaterial () : Material { - // not need _uiMaterialDirty at firstTime - let init = false; - if (!this._uiMaterial) { init = true; } - - if (this._uiMaterial && !this._uiMaterialDirty) { - return this._uiMaterial; - } else { - switch (this._instanceMaterialType) { - case InstanceMaterialType.ADD_COLOR: - this._uiMaterial = builtinResMgr.get('ui-base-material') as Material; - break; - case InstanceMaterialType.GRAYSCALE: - this._uiMaterial = builtinResMgr.get('ui-sprite-gray-material') as Material; - break; - case InstanceMaterialType.USE_ALPHA_SEPARATED: - this._uiMaterial = builtinResMgr.get('ui-sprite-alpha-sep-material') as Material; - break; - case InstanceMaterialType.USE_ALPHA_SEPARATED_AND_GRAY: - this._uiMaterial = builtinResMgr.get('ui-sprite-gray-alpha-sep-material') as Material; - break; - default: - this._uiMaterial = builtinResMgr.get('ui-sprite-material') as Material; - break; - } - this._uiMaterialDirty = false; - if(!init) {this._uiMatInsDirty = true;} - // materialInstance only for Stencil // Will remove at v3.0 - if(this._materialInstanceForStencil) { - const inst = this._materialInstanceForStencil; - inst.destroy(); - this._materialInstanceForStencil = null; - } - return this._uiMaterial; + private _updateBuiltinMaterial () : Material { + let mat; + switch (this._instanceMaterialType) { + case InstanceMaterialType.ADD_COLOR: + mat = builtinResMgr.get('ui-base-material') as Material; + break; + case InstanceMaterialType.GRAYSCALE: + mat = builtinResMgr.get('ui-sprite-gray-material') as Material; + break; + case InstanceMaterialType.USE_ALPHA_SEPARATED: + mat = builtinResMgr.get('ui-sprite-alpha-sep-material') as Material; + break; + case InstanceMaterialType.USE_ALPHA_SEPARATED_AND_GRAY: + mat = builtinResMgr.get('ui-sprite-gray-alpha-sep-material') as Material; + break; + default: + mat = builtinResMgr.get('ui-sprite-material') as Material; + break; } + return mat; } protected _flushAssembler? (): void; diff --git a/cocos/core/renderer/core/pass.ts b/cocos/core/renderer/core/pass.ts index ba0675fbf0..2c2f9639a1 100644 --- a/cocos/core/renderer/core/pass.ts +++ b/cocos/core/renderer/core/pass.ts @@ -627,6 +627,8 @@ export class Pass { get batchingScheme () { return PassPool.get(this._handle, PassView.BATCHING_SCHEME); } get descriptorSet () { return this._descriptorSet; } get hash () { return PassPool.get(this._handle, PassView.HASH); } + + get rootBufferDirty () { return this._rootBufferDirty; } } function serializeBlendState (bs: GFXBlendState) { diff --git a/cocos/core/renderer/ui/ui.ts b/cocos/core/renderer/ui/ui.ts index 35cf2f773d..aa8f70af47 100644 --- a/cocos/core/renderer/ui/ui.ts +++ b/cocos/core/renderer/ui/ui.ts @@ -105,6 +105,8 @@ export class UI { private _currComponent: UIRenderable | null = null; private _currTextureHash: number = 0; private _currSamplerHash: number = 0; + private _currMaterialHash: number = 0; + private _currMaterialUniformHash: number = 0; private _parentOpacity = 1; // DescriptorSet Cache Map private _descriptorSetCacheMap: Map> = new Map>(); @@ -404,6 +406,8 @@ export class UI { this._currSampler = null; this._currComponent = null; this._meshBufferUseCount = 0; + this._currMaterialHash = 0; + this._currMaterialUniformHash = 0; this._requireBufferBatch(); StencilManager.sharedManager!.reset(); } @@ -438,14 +442,12 @@ export class UI { samp = null; } - let mat = renderComp.getRenderMaterial(0); - if (!mat) { - mat = renderComp._updateBuiltinMaterial(); - mat = renderComp._updateBlendFunc(); - } + const mat = renderComp.getRenderMaterial(0); + const matHash = mat!.hash; + const matUniformHash = renderComp.updateMaterialUniformHash(mat!); // use material judgment merge is increasingly impossible, change to hash is more possible - if (this._currMaterial !== mat || + if (this._currMaterialHash !== matHash || this._currMaterialUniformHash !== matUniformHash || this._currTextureHash !== textureHash || this._currSamplerHash !== samplerHash ) { this.autoMergeBatches(this._currComponent!); @@ -455,6 +457,8 @@ export class UI { this._currSampler = samp; this._currTextureHash = textureHash; this._currSamplerHash = samplerHash; + this._currMaterialHash = renderComp.getRenderMaterial(0)!.hash; + this._currMaterialUniformHash = renderComp.materialUniformHash; } if (assembler) { @@ -516,6 +520,8 @@ export class UI { this._currSampler = null; this._currTextureHash = 0; this._currSamplerHash = 0; + this._currMaterialHash = 0; + this._currMaterialUniformHash = 0; this._batches.push(curDrawBatch); } @@ -550,16 +556,13 @@ export class UI { if (!hIA || !mat) { return; } - - // bug fix: check stencil from material actual use - // Need to remove when use hash to check MergeBatches - if (renderComp && renderComp._materialInstanceForStencil) { - this._currMaterial = mat = renderComp._materialInstanceForStencil; - } - if (renderComp && StencilManager.sharedManager!.handleMaterial(mat, renderComp)) { - this._currMaterial = mat = renderComp.getMaterialInstanceForStencil(); - const state = StencilManager.sharedManager!.pattern; - StencilManager.sharedManager!.applyStencil(mat, state); + if (renderComp) { + if(StencilManager.sharedManager!.handleMaterial(mat, renderComp)) { + this._currMaterial = mat = renderComp.material!; + const state = StencilManager.sharedManager!.pattern; + StencilManager.sharedManager!.applyStencil(mat, state); + } + renderComp.updateMaterialUniformHash(mat); } const curDrawBatch = this._currStaticRoot ? this._currStaticRoot._requireDrawBatch() : this._drawBatchPool.alloc(); @@ -620,6 +623,8 @@ export class UI { this._currComponent = null; this._currTextureHash = 0; this._currSamplerHash = 0; + this._currMaterialHash = 0; + this._currMaterialUniformHash = 0; } /** diff --git a/cocos/particle-2d/particle-system-2d.ts b/cocos/particle-2d/particle-system-2d.ts index 6132b9274f..17564d3b5b 100644 --- a/cocos/particle-2d/particle-system-2d.ts +++ b/cocos/particle-2d/particle-system-2d.ts @@ -1114,10 +1114,6 @@ bv public _updateMaterial () { let mat = this.getRenderMaterial(0); - if (!mat) { - this._updateBuiltinMaterial(); - mat = this.getUIMaterialInstance(); - } if (!mat) return; // mat.recompileShaders({USE_LOCAL:this._positionType !== PositionType.FREE}); } diff --git a/cocos/ui/assembler/mask/mask-assembler.ts b/cocos/ui/assembler/mask/mask-assembler.ts index 59d367ebf5..09879d6360 100644 --- a/cocos/ui/assembler/mask/mask-assembler.ts +++ b/cocos/ui/assembler/mask/mask-assembler.ts @@ -46,10 +46,10 @@ function applyAreaMask (mask: Mask, renderer: UI) { _stencilManager.enterLevel(); if (mask.type === MaskType.IMAGE_STENCIL) { simple.fillBuffers(mask, renderer); - const mat = mask.graphics!.getMaterialInstanceForStencil(); + const mat = mask.graphics!.getMaterialInstance(0)!; renderer.forceMergeBatches(mat, mask.spriteFrame, mask.graphics!); } else { - const mat = mask.graphics!.getMaterialInstanceForStencil(); + const mat = mask.graphics!.getMaterialInstance(0); renderer.commitModel(mask.graphics!, mask.graphics!.model, mat); } } diff --git a/cocos/ui/components/graphics.ts b/cocos/ui/components/graphics.ts index 1ac4c54901..8045d3782f 100644 --- a/cocos/ui/components/graphics.ts +++ b/cocos/ui/components/graphics.ts @@ -209,6 +209,24 @@ export class Graphics extends UIRenderable { this.markForUpdateRenderData(); } + @override + @visible(false) + get srcBlendFactor () { + return this._srcBlendFactor; + } + + set srcBlendFactor (value) { + } + + @override + @visible(false) + get dstBlendFactor () { + return this._dstBlendFactor; + } + + set dstBlendFactor (value) { + } + public static LineJoin = LineJoin; public static LineCap = LineCap; public impl: Impl | null = null; @@ -231,7 +249,6 @@ export class Graphics extends UIRenderable { constructor (){ super(); this._instanceMaterialType = InstanceMaterialType.ADD_COLOR; - this._uiMaterialDirty = true; } public onRestore () { @@ -252,10 +269,19 @@ export class Graphics extends UIRenderable { this.model = director.root!.createModel(scene.Model); this.model.node = this.model.transform = this.node; - this.helpInstanceMaterial(); + if (!this.impl){ + this._flushAssembler(); + this.impl = this._assembler && (this._assembler as IAssembler).createImpl!(this); + } + } + + public onEnable () { + super.onEnable(); + this._updateMtlForGraphics(); } public onDisable (){ + super.onDisable(); this._detachFromScene(); } @@ -550,32 +576,17 @@ export class Graphics extends UIRenderable { this._attachToScene(); } - /** - * @en - * Manual instance material. - * - * @zh - * 辅助材质实例化。可用于只取数据而无实体情况下渲染使用。特殊情况可参考:[[instanceMaterial]] - */ - public helpInstanceMaterial () { - let mat: MaterialInstance | null = null; + private _updateMtlForGraphics () { + let mat; _matInsInfo.owner = this; - if (this.sharedMaterial) { - _matInsInfo.parent = this.sharedMaterial[0]; - mat = new MaterialInstance(_matInsInfo); + if (this._customMaterial) { + mat = this.getMaterialInstance(0); } else { - _matInsInfo.parent = builtinResMgr.get('ui-graphics-material'); - mat = new MaterialInstance(_matInsInfo); + mat = builtinResMgr.get('ui-graphics-material'); + this.setMaterial(mat, 0); + mat = this.getMaterialInstance(0); mat.recompileShaders({ USE_LOCAL: true }); } - - this._uiMaterial = _matInsInfo.parent; - this._uiMaterialIns = mat; - - if (!this.impl){ - this._flushAssembler(); - this.impl = this._assembler && (this._assembler as IAssembler).createImpl!(this); - } } public activeSubModel (idx: number) { @@ -603,12 +614,12 @@ export class Graphics extends UIRenderable { renderMesh = new RenderingSubMesh([vertexBuffer], attributes, GFXPrimitiveMode.TRIANGLE_LIST, indexBuffer); renderMesh.subMeshIdx = 0; - this.model.initSubModel(idx, renderMesh, this.getUIMaterialInstance()); + this.model.initSubModel(idx, renderMesh, this.getMaterialInstance(0)!); } } protected _render (render: UI) { - render.commitModel(this, this.model, this._uiMaterialIns); + render.commitModel(this, this.model, this.getMaterialInstance(0)); } protected _flushAssembler (){ diff --git a/cocos/ui/components/label.ts b/cocos/ui/components/label.ts index 60e16d7ba0..0def03f022 100644 --- a/cocos/ui/components/label.ts +++ b/cocos/ui/components/label.ts @@ -586,18 +586,6 @@ export class Label extends UIRenderable { this.updateRenderData(); } - @type(Material) - @override - @displayName('Materials') - @visible(false) - get sharedMaterials () { - return super.sharedMaterials; - } - - set sharedMaterials (val) { - super.sharedMaterials = val; - } - get assemblerData (){ return this._assemblerData; } diff --git a/cocos/ui/components/mask.ts b/cocos/ui/components/mask.ts index 91ae053b79..8c2d7763b0 100644 --- a/cocos/ui/components/mask.ts +++ b/cocos/ui/components/mask.ts @@ -146,7 +146,6 @@ export class Mask extends UIRenderable { if (this._type !== MaskType.IMAGE_STENCIL) { this._spriteFrame = null; - this._alphaThreshold = 0; this._updateGraphics(); if (this._renderData) { this.destroyRenderData(); @@ -270,7 +269,9 @@ export class Mask extends UIRenderable { } this._alphaThreshold = value; - this._updateMaterial(); + if(this.type === MaskType.IMAGE_STENCIL) { + this._graphics?.getMaterialInstance(0)?.setProperty('alphaThreshold', this._alphaThreshold); + } } get graphics () { @@ -325,23 +326,12 @@ export class Mask extends UIRenderable { @override @visible(false) - get sharedMaterials () { - // if we don't create an array copy, the editor will modify the original array directly. - return EDITOR && this._materials.slice() || this._materials; + get customMaterial () { + return this._customMaterial; } - set sharedMaterials (val) { - for (let i = 0; i < val.length; i++) { - if (val[i] !== this._materials[i]) { - this.setMaterial(val[i], i); - } - } - if (val.length < this._materials.length) { - for (let i = val.length; i < this._materials.length; i++) { - this.setMaterial(null, i); - } - this._materials.splice(val.length); - } + set customMaterial (val) { + // mask don`t support customMaterial } public static Type = MaskType; @@ -593,12 +583,17 @@ export class Mask extends UIRenderable { protected _updateMaterial () { if (this._graphics) { const target = this._graphics; + target.stencilStage = Stage.DISABLED; + let mat; if (this._type === MaskType.IMAGE_STENCIL) { - target.uiMaterial = builtinResMgr.get('ui-alpha-test-material'); - const mat = target.getMaterialInstanceForStencil(); + mat = builtinResMgr.get('ui-alpha-test-material'); + target.setMaterial(mat, 0); + mat = target.getMaterialInstance(0); mat.setProperty('alphaThreshold', this._alphaThreshold); } else { - target.uiMaterial = builtinResMgr.get('ui-graphics-material'); + mat = builtinResMgr.get('ui-graphics-material'); + target.setMaterial(mat, 0); + target.getMaterialInstance(0); } } } diff --git a/cocos/ui/components/sprite.ts b/cocos/ui/components/sprite.ts index d4a7e8b874..6436368e70 100644 --- a/cocos/ui/components/sprite.ts +++ b/cocos/ui/components/sprite.ts @@ -416,7 +416,7 @@ export class Sprite extends UIRenderable { } else { this._instanceMaterialType = InstanceMaterialType.ADD_COLOR_AND_TEXTURE; } - this._uiMaterialDirty = true; + this.updateMaterial(); } /** @@ -516,10 +516,6 @@ export class Sprite extends UIRenderable { // this._flushAssembler(); this._activateMaterial(); - // updateBlendFunc for custom material - if (this.getMaterial(0)) { - this._updateBlendFunc(); - } } public onDestroy () { @@ -573,7 +569,7 @@ export class Sprite extends UIRenderable { } else { this._instanceMaterialType = InstanceMaterialType.ADD_COLOR_AND_TEXTURE; } - this._uiMaterialDirty = true; + this.updateMaterial(); } protected _render (render: UI) { diff --git a/cocos/ui/components/ui-static-batch.ts b/cocos/ui/components/ui-static-batch.ts index b3046d7776..297d99c142 100644 --- a/cocos/ui/components/ui-static-batch.ts +++ b/cocos/ui/components/ui-static-batch.ts @@ -104,18 +104,6 @@ export class UIStaticBatch extends UIRenderable { this.markForUpdateRenderData(); } - @override - @type(Material) - @displayName('Materials') - @visible(false) - get sharedMaterials () { - return super.sharedMaterials; - } - - set sharedMaterials (val) { - super.sharedMaterials = val; - } - get drawBatchList () { return this._uiDrawBatchList; } diff --git a/editor/assets/default_prefab/3d/Capsule.prefab.meta b/editor/assets/default_prefab/3d/Capsule.prefab.meta index 36dcca8a38..15cfa36ed4 100644 --- a/editor/assets/default_prefab/3d/Capsule.prefab.meta +++ b/editor/assets/default_prefab/3d/Capsule.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "73ce1f7f-d1f4-4942-ad93-66ca3b3041ab", diff --git a/editor/assets/default_prefab/3d/Cone.prefab.meta b/editor/assets/default_prefab/3d/Cone.prefab.meta index 4d8bf31beb..ac7e194256 100644 --- a/editor/assets/default_prefab/3d/Cone.prefab.meta +++ b/editor/assets/default_prefab/3d/Cone.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "6350d660-e888-4acf-a552-f3b719ae9110", diff --git a/editor/assets/default_prefab/3d/Cube.prefab.meta b/editor/assets/default_prefab/3d/Cube.prefab.meta index bde9a1d55b..73eb89bb8e 100644 --- a/editor/assets/default_prefab/3d/Cube.prefab.meta +++ b/editor/assets/default_prefab/3d/Cube.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "30da77a1-f02d-4ede-aa56-403452ee7fde", diff --git a/editor/assets/default_prefab/3d/Cylinder.prefab.meta b/editor/assets/default_prefab/3d/Cylinder.prefab.meta index 2e18ac4749..140fb29d24 100644 --- a/editor/assets/default_prefab/3d/Cylinder.prefab.meta +++ b/editor/assets/default_prefab/3d/Cylinder.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "ab3e16f9-671e-48a7-90b7-d0884d9cbb85", diff --git a/editor/assets/default_prefab/3d/Plane.prefab.meta b/editor/assets/default_prefab/3d/Plane.prefab.meta index df1c71e9bc..10d7364c7e 100644 --- a/editor/assets/default_prefab/3d/Plane.prefab.meta +++ b/editor/assets/default_prefab/3d/Plane.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "40563723-f8fc-4216-99ea-a81636435c10", diff --git a/editor/assets/default_prefab/3d/Quad.prefab.meta b/editor/assets/default_prefab/3d/Quad.prefab.meta index 5d8c2c99f4..eab5012dee 100644 --- a/editor/assets/default_prefab/3d/Quad.prefab.meta +++ b/editor/assets/default_prefab/3d/Quad.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "34a07346-9f62-4a84-90ae-cb83f7a426c1", diff --git a/editor/assets/default_prefab/3d/Sphere.prefab.meta b/editor/assets/default_prefab/3d/Sphere.prefab.meta index 013b07c876..c91470310b 100644 --- a/editor/assets/default_prefab/3d/Sphere.prefab.meta +++ b/editor/assets/default_prefab/3d/Sphere.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "655c9519-1a37-472b-bae6-29fefac0b550", diff --git a/editor/assets/default_prefab/3d/Torus.prefab.meta b/editor/assets/default_prefab/3d/Torus.prefab.meta index c0a07ec477..e29e6256c0 100644 --- a/editor/assets/default_prefab/3d/Torus.prefab.meta +++ b/editor/assets/default_prefab/3d/Torus.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "d47f5d5e-c931-4ff4-987b-cc818a728b82", diff --git a/editor/assets/default_prefab/Camera.prefab.meta b/editor/assets/default_prefab/Camera.prefab.meta index d4c8f7acfa..49e94a3e10 100644 --- a/editor/assets/default_prefab/Camera.prefab.meta +++ b/editor/assets/default_prefab/Camera.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "bb0a6472-cd67-4afb-a031-94fca8f4cc92", diff --git a/editor/assets/default_prefab/Terrain.prefab.meta b/editor/assets/default_prefab/Terrain.prefab.meta index 566015a77d..f0b1efb708 100644 --- a/editor/assets/default_prefab/Terrain.prefab.meta +++ b/editor/assets/default_prefab/Terrain.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "90e8b0d4-12dc-412d-9156-ea1fdb18c15b", diff --git a/editor/assets/default_prefab/effects/Particle System.prefab.meta b/editor/assets/default_prefab/effects/Particle System.prefab.meta index 6e3a73af7a..12dfa3874c 100644 --- a/editor/assets/default_prefab/effects/Particle System.prefab.meta +++ b/editor/assets/default_prefab/effects/Particle System.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "f09a0597-10e6-49e5-8759-a148b5e85395", diff --git a/editor/assets/default_prefab/light/Directional Light.prefab.meta b/editor/assets/default_prefab/light/Directional Light.prefab.meta index fac8c6086c..3a2de52942 100644 --- a/editor/assets/default_prefab/light/Directional Light.prefab.meta +++ b/editor/assets/default_prefab/light/Directional Light.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "a0e9756d-9128-4f49-8097-e041c8b733b8", diff --git a/editor/assets/default_prefab/light/Sphere Light.prefab.meta b/editor/assets/default_prefab/light/Sphere Light.prefab.meta index e5e0c3ce2f..7b4eb91d0b 100644 --- a/editor/assets/default_prefab/light/Sphere Light.prefab.meta +++ b/editor/assets/default_prefab/light/Sphere Light.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "4182ee46-ffa0-4de2-b66b-c93cc6c7e9b8", diff --git a/editor/assets/default_prefab/light/Spot Light.prefab.meta b/editor/assets/default_prefab/light/Spot Light.prefab.meta index f4271df589..faaeb91324 100644 --- a/editor/assets/default_prefab/light/Spot Light.prefab.meta +++ b/editor/assets/default_prefab/light/Spot Light.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "7a49aa24-bd7a-40a8-b31a-b2a9da85abcd", diff --git a/editor/assets/default_prefab/ui/Button.prefab.meta b/editor/assets/default_prefab/ui/Button.prefab.meta index 08b85deff8..b18c1173d3 100644 --- a/editor/assets/default_prefab/ui/Button.prefab.meta +++ b/editor/assets/default_prefab/ui/Button.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "90bdd2a9-2838-4888-b66c-e94c8b7a5169", diff --git a/editor/assets/default_prefab/ui/Canvas.prefab.meta b/editor/assets/default_prefab/ui/Canvas.prefab.meta index 80a5257eb0..c4dae28da5 100644 --- a/editor/assets/default_prefab/ui/Canvas.prefab.meta +++ b/editor/assets/default_prefab/ui/Canvas.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "f773db21-62b8-4540-956a-29bacf5ddbf5", diff --git a/editor/assets/default_prefab/ui/EditBox.prefab.meta b/editor/assets/default_prefab/ui/EditBox.prefab.meta index a8f3a95f9e..53fe8388a8 100644 --- a/editor/assets/default_prefab/ui/EditBox.prefab.meta +++ b/editor/assets/default_prefab/ui/EditBox.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "05e79121-8675-4551-9ad7-1b901a4025db", diff --git a/editor/assets/default_prefab/ui/Label.prefab.meta b/editor/assets/default_prefab/ui/Label.prefab.meta index 4d3b3cf620..4d710a59ae 100644 --- a/editor/assets/default_prefab/ui/Label.prefab.meta +++ b/editor/assets/default_prefab/ui/Label.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "36008810-7ad3-47c0-8112-e30aee089e45", diff --git a/editor/assets/default_prefab/ui/Layout.prefab.meta b/editor/assets/default_prefab/ui/Layout.prefab.meta index 913e564f9f..1c9e80e6db 100644 --- a/editor/assets/default_prefab/ui/Layout.prefab.meta +++ b/editor/assets/default_prefab/ui/Layout.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "a9ef7dfc-ea8b-4cf8-918e-36da948c4de0", diff --git a/editor/assets/default_prefab/ui/Mask.prefab.meta b/editor/assets/default_prefab/ui/Mask.prefab.meta index 12c8653431..368d4d272f 100644 --- a/editor/assets/default_prefab/ui/Mask.prefab.meta +++ b/editor/assets/default_prefab/ui/Mask.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "7fa63aed-f3e2-46a5-8a7c-c1a1adf6cea6", diff --git a/editor/assets/default_prefab/ui/ProgressBar.prefab.meta b/editor/assets/default_prefab/ui/ProgressBar.prefab.meta index 617049c734..45160cfd72 100644 --- a/editor/assets/default_prefab/ui/ProgressBar.prefab.meta +++ b/editor/assets/default_prefab/ui/ProgressBar.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "0d9353c4-6fb9-49bb-bc62-77f1750078c2", diff --git a/editor/assets/default_prefab/ui/ScrollView.prefab b/editor/assets/default_prefab/ui/ScrollView.prefab index 677e787f9f..4388359a78 100644 --- a/editor/assets/default_prefab/ui/ScrollView.prefab +++ b/editor/assets/default_prefab/ui/ScrollView.prefab @@ -203,7 +203,6 @@ }, "_enabled": true, "__prefab": null, - "_materials": [], "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -278,7 +277,6 @@ }, "_enabled": true, "__prefab": null, - "_materials": [], "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -514,7 +512,6 @@ }, "_enabled": true, "__prefab": null, - "_materials": [], "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -624,7 +621,6 @@ }, "_enabled": true, "__prefab": null, - "_materials": [], "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, @@ -751,7 +747,6 @@ }, "_enabled": true, "__prefab": null, - "_materials": [], "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, diff --git a/editor/assets/default_prefab/ui/ScrollView.prefab.meta b/editor/assets/default_prefab/ui/ScrollView.prefab.meta index 02ae535ecd..199442a35c 100644 --- a/editor/assets/default_prefab/ui/ScrollView.prefab.meta +++ b/editor/assets/default_prefab/ui/ScrollView.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "c1baa707-78d6-4b89-8d5d-0b7fdf0c39bc", diff --git a/editor/assets/default_prefab/ui/Slider.prefab.meta b/editor/assets/default_prefab/ui/Slider.prefab.meta index e8c942fa9c..7a22709aee 100644 --- a/editor/assets/default_prefab/ui/Slider.prefab.meta +++ b/editor/assets/default_prefab/ui/Slider.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "2bd7e5b6-cd8c-41a1-8136-ddb8efbf6326", diff --git a/editor/assets/default_prefab/ui/Sprite.prefab.meta b/editor/assets/default_prefab/ui/Sprite.prefab.meta index 725237064b..df209fe199 100644 --- a/editor/assets/default_prefab/ui/Sprite.prefab.meta +++ b/editor/assets/default_prefab/ui/Sprite.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "9db8cd0b-cbe4-42e7-96a9-a239620c0a9d", diff --git a/editor/assets/default_prefab/ui/Toggle.prefab.meta b/editor/assets/default_prefab/ui/Toggle.prefab.meta index cf98baf175..d57b285272 100644 --- a/editor/assets/default_prefab/ui/Toggle.prefab.meta +++ b/editor/assets/default_prefab/ui/Toggle.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "0e89afe7-56de-4f99-96a1-cba8a75bedd2", diff --git a/editor/assets/default_prefab/ui/ToggleContainer.prefab.meta b/editor/assets/default_prefab/ui/ToggleContainer.prefab.meta index 4b7de08780..327a2a8aa5 100644 --- a/editor/assets/default_prefab/ui/ToggleContainer.prefab.meta +++ b/editor/assets/default_prefab/ui/ToggleContainer.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "2af73429-41d1-4346-9062-7798e42945dd", diff --git a/editor/assets/default_prefab/ui/Widget.prefab.meta b/editor/assets/default_prefab/ui/Widget.prefab.meta index b176059062..ee7407e06c 100644 --- a/editor/assets/default_prefab/ui/Widget.prefab.meta +++ b/editor/assets/default_prefab/ui/Widget.prefab.meta @@ -1,5 +1,5 @@ { - "ver": "1.1.22", + "ver": "1.1.23", "importer": "prefab", "imported": true, "uuid": "36ed4422-3542-4cc4-bf02-dc4bfc590836",