occt: master 941f6cae

Diff Back to Repository
Author Committer Branch Timestamp Parent
kgv bugmaster master 2021-03-05 14:26:47 master a6049685
Affected Issues  0032201: Visualization, TKOpenGl - unify Phong/PBR material properties getters
Changeset 0032201: Visualization, TKOpenGl - unify Phong/PBR material properties getters

Graphic3d_ShaderManager::stdComputeLighting() - implementation has been adjusted
for better consistency between PBR / non-PBR.

OpenGl_Material definition has been modified to join Front/Back pair into a single uniform variable.
Common material definition now occupies 4x2 vec4 instead of 5x2 vec4.

Getters of Common material properties within Declarations.glsl
have been renamed to match PBR material syntax (e.g. take IsFront flag as function argument).
Auxliary macros (like occTextureColor()) has been renamed (like occMaterialBaseColor())
and adjusted to return material property directly instead of taking it as argument.
mod - dox/upgrade/upgrade.md Diff File
mod - src/Graphic3d/Graphic3d_ShaderManager.cxx Diff File
mod - src/Graphic3d/Graphic3d_ShaderManager.hxx Diff File
mod - src/OpenGl/OpenGl_Context.cxx Diff File
mod - src/OpenGl/OpenGl_Context.hxx Diff File
mod - src/OpenGl/OpenGl_Material.hxx Diff File
mod - src/OpenGl/OpenGl_MaterialState.hxx Diff File
mod - src/OpenGl/OpenGl_ShaderManager.cxx Diff File
mod - src/OpenGl/OpenGl_ShaderManager.hxx Diff File
mod - src/OpenGl/OpenGl_ShaderProgram.cxx Diff File
mod - src/OpenGl/OpenGl_ShaderProgram.hxx Diff File
mod - src/OpenGl/OpenGl_Workspace.cxx Diff File
mod - src/Shaders/Declarations.glsl Diff File
mod - src/Shaders/DeclarationsImpl.glsl Diff File
mod - src/Shaders/PhongDirectionalLight.glsl Diff File
mod - src/Shaders/PhongPointLight.glsl Diff File
mod - src/Shaders/PhongShading.fs Diff File
mod - src/Shaders/PhongSpotLight.glsl Diff File
mod - src/Shaders/Shaders_DeclarationsImpl_glsl.pxx Diff File
mod - src/Shaders/Shaders_Declarations_glsl.pxx Diff File
mod - src/Shaders/Shaders_PhongDirectionalLight_glsl.pxx Diff File
mod - src/Shaders/Shaders_PhongPointLight_glsl.pxx Diff File
mod - src/Shaders/Shaders_PhongSpotLight_glsl.pxx Diff File