Small internal refactor of shader variants handling by renderer #4394
Conversation
|
Why not call the function |
Why not indeed. I'll make it change. |
Co-authored-by: Will Eastcott <will@playcanvas.com>
…nvas/engine into mvaligursky-getPassShader
| if (!drawCall.isStatic) { | ||
| const variantKey = pass + '_' + objDefs + '_' + lightHash; | ||
| drawCall._shader[pass] = material.variants[variantKey]; | ||
| if (!drawCall._shader[pass]) { | ||
| this.updateShader(drawCall, objDefs, null, pass, sortedLights); | ||
| drawCall.updatePassShader(scene, pass, null, sortedLights); | ||
| material.variants[variantKey] = drawCall._shader[pass]; | ||
| } | ||
| } else { | ||
| this.updateShader(drawCall, objDefs, drawCall._staticLightList, pass, sortedLights); | ||
| drawCall.updatePassShader(scene, pass, drawCall._staticLightList, sortedLights); | ||
| } |
There was a problem hiding this comment.
Non-clarity of this blocks also still bothers be, and I'll refactor it later, probably soon as I might need it. I don't like that the caller of updateShader needs to calculate the variant key, and add the shader to material.variants. This should be completely internal ideally, the key computed from shader options generated, and not on some very few variables. I suspect that at the moment, this does not allow us to have all the variations we need, as the keys are the same for them.
Co-authored-by: Donovan Hutchence <slimbuck7@gmail.com>
Co-authored-by: Donovan Hutchence <slimbuck7@gmail.com>
It's used to assign a user defined shader to the instance of Material class. |
| @@ -879,8 +879,9 @@ class ParticleEmitter { | |||
| customFace: this.emitter.orientation !== PARTICLEORIENTATION_SCREEN | |||
| }); | |||
| this.shader = shader; | |||
| return shader; | |||
There was a problem hiding this comment.
previous line can (should) be deleted?
There was a problem hiding this comment.
yep, I moved it outside of this function, as that's the consistent way to do it.
updateShadertogetShaderVariant, and instead of updating Material.shader, it returns the generated shader variant, and only updates its internal variants cache.