refactor material instance #5910
Conversation
|
cocos-creator/editor-3d#2807 |
|
cocos-creator/3d-tasks#623 |
|
请修复 ci |
|
这个ci报错不是我的改动引起的 |
|
rebase 一下就可以了 |
| * @param index 材质序号 | ||
| * @param material 材质对象 | ||
| */ | ||
| public setMaterial (index: number, material: Material | null) { |
There was a problem hiding this comment.
这么改有兼容问题啊，参数顺序变了原来代码都跑不了了
There was a problem hiding this comment.
编辑器支持api升级吗？ @pandamicro
There was a problem hiding this comment.
不支持用户层 API 升级，引擎侧需要做兼容，保留原有 API
|
还需要再 rebase 一下 |
| const source = parent.blocks[binding].view; | ||
| const dest = this._blocks[binding].view; | ||
| for (let j = 0; j < source.length; j++) { | ||
| dest[j] = source[j]; |
There was a problem hiding this comment.
为啥要直接把 view 赋值过来？这样父子 pass UBO 就分不开了啊
There was a problem hiding this comment.
这是复制Float32Array里的元素，不是赋引用
cocos/core/renderer/core/pass.ts
Outdated
| else { Object.assign(defineOverrides, this._defines); defines = defineOverrides; } | ||
| } | ||
| const res = programLib.getGFXShader(this._device, this._programName, defines, pipeline); | ||
| const res = programLib.getGFXShader(this._device, this._programName, this._defines, pipeline); | ||
| if (!res.shader) { console.warn(`create shader ${this._programName} failed`); return null; } | ||
| if (saveOverrides) { this._shader = res.shader; this._bindings = res.bindings; } |
| import { IDefineMap, PassOverrides } from './pass'; | ||
| import { PassInstance } from './pass-instance'; | ||
|
|
||
| export class MaterialInstance implements IMaterial { |
There was a problem hiding this comment.
这个类其实可以直接继承 Material，不然实在太多重复代码了
There was a problem hiding this comment.
不直接继承Material的原因：
MaterialInstance不是一个Asset
MaterialInstance一部分属性是引用Material的，一部分属性是新建的
There was a problem hiding this comment.
Asset 那头只要不走基类的生命周函数，应该是没啥消耗的，只是一个概念上的问题
我看了，material-instance 引用父类的只有一个 effect asset，这个只是个引用，再生成一份也完全没问题，其他新建的属性如果继承的话可以完全沿用父类的机制
| @@ -251,7 +234,6 @@ export class Material extends Asset { | |||
| this._states[passIdx] = overrides; | |||
| this._passes[passIdx].overridePipelineStates(passInfos[passIdx], overrides); | |||
| } | |||
| this._onPassesChange(); | |||
| @@ -229,7 +213,6 @@ export class Material extends Asset { | |||
| } else { | |||
| this._passes[passIdx].tryCompile(overrides); | |||
| } | |||
| this._onPassesChange(); | |||
|
又看了下，其实 pass-instance 里也没复用多少数据，基本都是重建的，不如干脆都改继承了 |
|
不行就我来改这俩类，你改其他地方的引用 |
|
model里面createPSO调用tryCompile的地方我用注释// warning:标注了，这个你回头改下 @YunHsiao |
* material instance using inheritance * renderable component
* more fixes * minor
| */ | ||
| // @property | ||
| get receiveShadows () { |
There was a problem hiding this comment.
涉及到对外 API 改动，必须写 deprecated 代码来确保兼容性，并做好必要的数据迁移
| @property({ | ||
| tooltip: '是否启用动态合批', | ||
| }) | ||
| set enableDynamicBatching (enable: boolean) { |
Re: cocos-creator/2d-tasks#
Changes:
*