OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-08 14:17:06 +03:00
Code Activity

0024350: TKOpenGl - non-physical materials are ignored by GLSL program manager

Browse Source 
GLSL and Ray Tracing - take into account non-physical materials.
Move Ray Tracing test cases to v3d/raytrace grid.
This commit is contained in:
kgv
2013-11-13 21:44:24 +04:00
committed by bugmaster
parent f85399e5df
commit 64c759f898
11 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/OpenGl/OpenGl_Workspace_Raytrace.cxx
View File

@@ -321,27 +321,33 @@ Standard_Boolean OpenGl_Workspace::CheckRaytraceStructure (const OpenGl_Structur
// function : CreateMaterial
// purpose : Creates ray-tracing material properties
// =======================================================================
void CreateMaterial (const OPENGL_SURF_PROP& theProp, OpenGl_RaytraceMaterial& theMaterial)
void CreateMaterial (const OPENGL_SURF_PROP& theProp,
OpenGl_RaytraceMaterial& theMaterial)
{
theMaterial.Ambient = OpenGl_RTVec4f (theProp.ambcol.rgb[0] * theProp.amb,
theProp.ambcol.rgb[1] * theProp.amb,
theProp.ambcol.rgb[2] * theProp.amb,
1.f);
const float* aSrcAmb = theProp.isphysic ? theProp.ambcol.rgb : theProp.matcol.rgb;
theMaterial.Ambient = OpenGl_RTVec4f (aSrcAmb[0] * theProp.amb,
aSrcAmb[1] * theProp.amb,
aSrcAmb[2] * theProp.amb,
1.0f);
theMaterial.Diffuse = OpenGl_RTVec4f (theProp.difcol.rgb[0] * theProp.diff,
theProp.difcol.rgb[1] * theProp.diff,
theProp.difcol.rgb[2] * theProp.diff,
1.f);
const float* aSrcDif = theProp.isphysic ? theProp.difcol.rgb : theProp.matcol.rgb;
theMaterial.Diffuse = OpenGl_RTVec4f (aSrcDif[0] * theProp.diff,
aSrcDif[1] * theProp.diff,
aSrcDif[2] * theProp.diff,
1.0f);
theMaterial.Specular = OpenGl_RTVec4f (theProp.speccol.rgb[0] * theProp.spec,
theProp.speccol.rgb[1] * theProp.spec,
theProp.speccol.rgb[2] * theProp.spec,
const float aDefSpecCol[4] = {1.0f, 1.0f, 1.0f, 1.0f};
const float* aSrcSpe = theProp.isphysic ? theProp.speccol.rgb : aDefSpecCol;
theMaterial.Specular = OpenGl_RTVec4f (aSrcSpe[0] * theProp.spec,
aSrcSpe[1] * theProp.spec,
aSrcSpe[2] * theProp.spec,
theProp.shine);
theMaterial.Emission = OpenGl_RTVec4f (theProp.emscol.rgb[0] * theProp.emsv,
theProp.emscol.rgb[1] * theProp.emsv,
theProp.emscol.rgb[2] * theProp.emsv,
1.f);
const float* aSrcEms = theProp.isphysic ? theProp.emscol.rgb : theProp.matcol.rgb;
theMaterial.Emission = OpenGl_RTVec4f (aSrcEms[0] * theProp.emsv,
aSrcEms[1] * theProp.emsv,
aSrcEms[2] * theProp.emsv,
1.0f);
// Note: Here we use sub-linear transparency function
// to produce realistic-looking transparency effect