From 9fa515b5bcdd2e57c33a4e9f9c90d046531d3ff2 Mon Sep 17 00:00:00 2001 From: JoneLau <32630749+JoneLau@users.noreply.github.com> Date: Mon, 18 Mar 2019 16:21:19 +0800 Subject: [PATCH] change the material of the render component to built-in (#4058) --- cocos/3d/builtin/effects.js | 24 +++++++++++++++++++ cocos/3d/ui/components/label-component.ts | 18 ++++++++++++++ cocos/3d/ui/components/mask-component.ts | 16 +++++++++++++ cocos/3d/ui/components/sprite-component.ts | 22 ++++++++++++++++- cocos/3d/ui/components/ui-render-component.ts | 23 +++++++++++------- 5 files changed, 94 insertions(+), 9 deletions(-) diff --git a/cocos/3d/builtin/effects.js b/cocos/3d/builtin/effects.js index e6c56e04b1..5991c342f2 100644 --- a/cocos/3d/builtin/effects.js +++ b/cocos/3d/builtin/effects.js @@ -98,6 +98,30 @@ export default [ } ] }, + { + "name": "builtin-base", + "techniques": [ + { "passes": [{ "depthStencilState": { "depthTest": true, "depthWrite": false }, "blendState": { "targets": [{ "blend": true, "blendSrc": 2, "blendDst": 4, "blendDstAlpha": 4 }] }, "program": "builtin-base|base-vs:vert|base-fs:frag", "priority": 244 }] } + ], + "shaders": [ + { + "name": "builtin-base|base-vs:vert|base-fs:frag", + "glsl3": { + "vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time; \n vec4 cc_screenSize; \n vec4 cc_screenScale; \n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos; \n vec4 cc_exposure; \n vec4 cc_mainLitDir; \n vec4 cc_mainLitColor; \n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nin vec3 a_position;\nin vec4 a_color;\nout vec4 color;\nvec4 vert () {\n vec4 pos = vec4(a_position, 1);\n pos = cc_matViewProj * pos;\n color = a_color;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`, + "frag": `\nprecision mediump float;\nin vec4 color;\nvec4 frag () {\n vec4 o = vec4(1, 1, 1, 1);\n o *= color;\n return o;\n}\nout vec4 cc_FragColor;\nvoid main() { cc_FragColor = frag(); }\n` + }, + "glsl1": { + "vert": `\nprecision mediump float;\nuniform vec4 cc_time;\nuniform vec4 cc_screenSize;\nuniform vec4 cc_screenScale;\nuniform mat4 cc_matView;\nuniform mat4 cc_matViewInv;\nuniform mat4 cc_matProj;\nuniform mat4 cc_matProjInv;\nuniform mat4 cc_matViewProj;\nuniform mat4 cc_matViewProjInv;\nuniform vec4 cc_cameraPos;\nuniform vec4 cc_exposure;\nuniform vec4 cc_mainLitDir;\nuniform vec4 cc_mainLitColor;\nuniform vec4 cc_ambientSky;\nuniform vec4 cc_ambientGround;\nattribute vec3 a_position;\nattribute vec4 a_color;\nvarying vec4 color;\nvec4 vert () {\n vec4 pos = vec4(a_position, 1);\n pos = cc_matViewProj * pos;\n color = a_color;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`, + "frag": `\nprecision mediump float;\nvarying vec4 color;\nvec4 frag () {\n vec4 o = vec4(1, 1, 1, 1);\n o *= color;\n return o;\n}\nvoid main() { gl_FragColor = frag(); }\n` + }, + "builtins": { "globals": { "blocks": ["CCGlobal"], "samplers": [] }, "locals": { "blocks": [], "samplers": [] } }, + "defines": [], + "blocks": [], + "samplers": [], + "dependencies": {} + } + ] + }, { "name": "builtin-standard", "techniques": [ diff --git a/cocos/3d/ui/components/label-component.ts b/cocos/3d/ui/components/label-component.ts index 67999365b0..fd4469ae07 100644 --- a/cocos/3d/ui/components/label-component.ts +++ b/cocos/3d/ui/components/label-component.ts @@ -31,6 +31,8 @@ import { ImageAsset } from '../../../assets/image-asset'; import { ccclass, executionOrder, menu, property } from '../../../core/data/class-decorator'; import { ccenum } from '../../../core/value-types/enum'; import { UI } from '../../../renderer/ui/ui'; +import { Material } from '../../assets'; +import { RenderableComponent } from '../../framework/renderable-component'; import { FontAtlas } from '../assembler/label/bmfontUtils'; import { ISharedLabelData } from '../assembler/label/ttfUtils'; import { UIRenderComponent } from './ui-render-component'; @@ -618,6 +620,22 @@ export class LabelComponent extends UIRenderComponent { return result; } + protected _instanceMaterial () { + if (this._sharedMaterial) { + this._updateMaterial( + Material.getInstantiatedMaterial(this._sharedMaterial, + new RenderableComponent(), + CC_EDITOR ? true : false, + )); + } else { + this._updateMaterial( + Material.getInstantiatedMaterial(cc.builtinResMgr.get('sprite-material'), + new RenderableComponent(), + CC_EDITOR ? true : false, + )); + } + } + private _checkStringEmpty () { this._renderPermit = !!this.string; } diff --git a/cocos/3d/ui/components/mask-component.ts b/cocos/3d/ui/components/mask-component.ts index 44feb29ce4..f444a963c8 100644 --- a/cocos/3d/ui/components/mask-component.ts +++ b/cocos/3d/ui/components/mask-component.ts @@ -270,6 +270,22 @@ export class MaskComponent extends UIRenderComponent { return this._maskMaterial !== null && this._clearMaskMaterial !== null && this._renderPermit; } + protected _instanceMaterial () { + if (this._sharedMaterial) { + this._updateMaterial( + Material.getInstantiatedMaterial(this._sharedMaterial, + new RenderableComponent(), + CC_EDITOR ? true : false, + )); + } else { + this._updateMaterial( + Material.getInstantiatedMaterial(cc.builtinResMgr.get('sprite-base'), + new RenderableComponent(), + CC_EDITOR ? true : false, + )); + } + } + // _resizeNodeToTargetNode: CC_EDITOR && function () { // if (this.spriteFrame) { // const rect = this.spriteFrame.getRect(); diff --git a/cocos/3d/ui/components/sprite-component.ts b/cocos/3d/ui/components/sprite-component.ts index 4cdfe10c52..767e7cbcff 100644 --- a/cocos/3d/ui/components/sprite-component.ts +++ b/cocos/3d/ui/components/sprite-component.ts @@ -32,6 +32,8 @@ import { clampf } from '../../../core/utils/misc'; import { Vec2 } from '../../../core/value-types'; import { ccenum } from '../../../core/value-types/enum'; import { UI } from '../../../renderer/ui/ui'; +import { Material } from '../../assets'; +import { RenderableComponent } from '../../framework/renderable-component'; import { UIRenderComponent } from './ui-render-component'; /** @@ -353,7 +355,9 @@ export class SpriteComponent extends UIRenderComponent { * @example * sprite.sizeMode = cc.Sprite.SizeMode.CUSTOM; */ - @property() + @property({ + type: SizeMode, + }) get sizeMode () { return this._sizeMode; } @@ -514,6 +518,22 @@ export class SpriteComponent extends UIRenderComponent { return canRender; } + protected _instanceMaterial () { + if (this._sharedMaterial) { + this._updateMaterial( + Material.getInstantiatedMaterial(this._sharedMaterial, + new RenderableComponent(), + CC_EDITOR ? true : false, + )); + } else { + this._updateMaterial( + Material.getInstantiatedMaterial(cc.builtinResMgr.get('sprite-material'), + new RenderableComponent(), + CC_EDITOR ? true : false, + )); + } + } + private _flushAssembler () { const assembler = SpriteComponent.Assembler!.getAssembler(this); diff --git a/cocos/3d/ui/components/ui-render-component.ts b/cocos/3d/ui/components/ui-render-component.ts index 467b05eb03..fb66a64131 100644 --- a/cocos/3d/ui/components/ui-render-component.ts +++ b/cocos/3d/ui/components/ui-render-component.ts @@ -38,7 +38,6 @@ import { GFXBlendFactor } from '../../../gfx/define'; import { RenderData } from '../../../renderer/ui/renderData'; import { UI } from '../../../renderer/ui/ui'; import { Material } from '../../assets/material'; -import { RenderableComponent } from '../../framework/renderable-component'; import { IAssembler, IAssemblerManager } from '../assembler/assembler'; import { CanvasComponent } from './canvas-component'; import { UITransformComponent } from './ui-transfrom-component'; @@ -120,6 +119,10 @@ export class UIRenderComponent extends Component { } set priority (value) { + if (this._priority === value) { + return; + } + this._priority = value; } @@ -160,7 +163,9 @@ export class UIRenderComponent extends Component { } this._sharedMaterial = value; - this._instanceMaterial(); + if (this._instanceMaterial) { + this._instanceMaterial(); + } } get material () { @@ -226,7 +231,9 @@ export class UIRenderComponent extends Component { } public __preload (){ - this._instanceMaterial(); + if (this._instanceMaterial) { + this._instanceMaterial(); + } } public onEnable () { @@ -271,6 +278,10 @@ export class UIRenderComponent extends Component { // } // this._allocedDatas.length = 0; this.destroyRenderData(); + if (this._material){ + this._material.destroy(); + } + this._updateMaterial(null); this._renderData = null; } @@ -381,11 +392,7 @@ export class UIRenderComponent extends Component { } } - private _instanceMaterial (){ - if (this._sharedMaterial) { - this._updateMaterial(Material.getInstantiatedMaterial(this._sharedMaterial, new RenderableComponent(), CC_EDITOR ? true : false)); - } - } + protected _instanceMaterial? (): void; } cc.UIRenderComponent = UIRenderComponent;