View Issue Details

IDProjectCategoryView StatusLast Update
0032201Open CASCADEOCCT:Visualizationpublic2021-04-03 12:50
Reporterkgv Assigned Tobugmaster  
PrioritynormalSeverityintegration request 
Status closedResolutionfixed 
Target Version7.6.0Fixed in Version7.6.0 
Summary0032201: Visualization, TKOpenGl - unify Phong/PBR material properties getters
DescriptionDeclarations.glsl declares material accessors as separate front/back getters for Common definition (occFrontMaterial_Diffuse/occBackMaterial_Diffuse)
and as unified getter taking Boolean flag for PBR properties (like occPBRMaterial_Color(in bool theIsFront)).

It is proposed following a common approach.
Steps To ReproduceN/A
TagsNo tags attached.
Test case numberNot required

Activities

git

2021-03-06 03:23

administrator   ~0099458

Branch CR32201 has been created by kgv.

SHA-1: 01b9c6fa489e94c45a3a60b51981eb6a3d516bca


No new revisions were added by this update.

kgv

2021-03-06 10:03

developer   ~0099462

Patch is ready for review
- OCCT: branch CR32201.

http://jenkins-test-12.nnov.opencascade.com:8080/view/CR32201-master-KGV/

git

2021-03-06 14:35

administrator   ~0099510

Branch CR32201 has been updated forcibly by kgv.

SHA-1: c0025a6cbdbf6ddddc3f618a6850c3c624e032a2

osa

2021-03-17 14:01

developer   ~0099548

The patch was reviewed

bugmaster

2021-03-20 12:49

administrator   ~0099613

Combination -
OCCT branch : IR-2021-03-19
master SHA - d209b3176e21010e096833052698f1c0da5b04d5
a87b7ddc8cb44606b91e3f37113847c3f5f50fdc
Products branch : IR-2021-03-19 SHA - 6baf3a921c29525981c0ad7881214c9b20ffe3c1
was compiled on Linux, MacOS and Windows platforms and tested in optimize mode.

Number of compiler warnings:
No new/fixed warnings

Regressions/Differences/Improvements:
No regressions/differences

CPU differences:
Debian80-64:
OCCT
Total CPU difference: 17753.85000000016 / 17750.250000000156 [+0.02%]
Products
Total CPU difference: 11481.660000000102 / 11540.5800000001 [-0.51%]
Windows-64-VC14:
OCCT
Total CPU difference: 19361.09375 / 19341.28125 [+0.10%]
Products
Total CPU difference: 12879.75 / 12869.921875 [+0.08%]


Image differences :
No differences that require special attention

Memory differences :
No differences that require special attention

git

2021-04-03 12:50

administrator   ~0100046

Branch CR32201 has been deleted by inv.

SHA-1: c0025a6cbdbf6ddddc3f618a6850c3c624e032a2

Related Changesets

occt: master 941f6cae

2021-03-05 14:26:47

kgv


Committer: bugmaster Details Diff
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.
Affected Issues
0032201
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

Issue History

Date Modified Username Field Change
2021-03-06 03:19 kgv New Issue
2021-03-06 03:19 kgv Assigned To => kgv
2021-03-06 03:19 kgv Description Updated
2021-03-06 03:23 git Note Added: 0099458
2021-03-06 10:03 kgv Note Added: 0099462
2021-03-06 10:03 kgv Assigned To kgv => osa
2021-03-06 10:03 kgv Status new => resolved
2021-03-06 14:35 git Note Added: 0099510
2021-03-17 14:01 osa Note Added: 0099548
2021-03-17 14:01 osa Assigned To osa => bugmaster
2021-03-17 14:01 osa Status resolved => reviewed
2021-03-20 12:49 bugmaster Note Added: 0099613
2021-03-20 12:49 bugmaster Status reviewed => tested
2021-03-20 12:58 bugmaster Test case number => Not required
2021-03-23 21:46 bugmaster Changeset attached => occt master 941f6cae
2021-03-23 21:46 bugmaster Status tested => verified
2021-03-23 21:46 bugmaster Resolution open => fixed
2021-04-03 12:50 git Note Added: 0100046