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

GLSL and Ray Tracing - take into account non-physical materials.
Move Ray Tracing test cases to v3d/raytrace grid.

diff --git a/src/OpenGl/OpenGl_SceneGeometry.cxx b/src/OpenGl/OpenGl_SceneGeometry.cxx
index 5184e8dba9152296b5bc3ccf75258fc09c8b3dda..472687e155136b8af87d40ee91a16d91cc72da8b 100644 (file)
--- a/src/OpenGl/OpenGl_SceneGeometry.cxx
+++ b/src/OpenGl/OpenGl_SceneGeometry.cxx
@@ -45,7 +45,7 @@ namespace
 };
 
 // =======================================================================
-// function : OpenGl_Material
+// function : OpenGl_RaytraceMaterial
 // purpose  : Creates new default material
 // =======================================================================
 OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial()
@@ -59,7 +59,7 @@ OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial()
 { }
 
 // =======================================================================
-// function : OpenGl_Material
+// function : OpenGl_RaytraceMaterial
 // purpose  : Creates new material with specified properties
 // =======================================================================
 OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial (const OpenGl_RTVec4f& theAmbient,
@@ -77,7 +77,7 @@ OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial (const OpenGl_RTVec4f& theAmbie
 }
 
 // =======================================================================
-// function : OpenGl_Material
+// function : OpenGl_RaytraceMaterial
 // purpose  : Creates new material with specified properties
 // =======================================================================
 OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial (const OpenGl_RTVec4f& theAmbient,
@@ -97,7 +97,7 @@ OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial (const OpenGl_RTVec4f& theAmbie
 }
 
 // =======================================================================
-// function : OpenGl_Material
+// function : OpenGl_RaytraceMaterial
 // purpose  : Creates new material with specified properties
 // =======================================================================
 OpenGl_RaytraceMaterial::OpenGl_RaytraceMaterial (const OpenGl_RTVec4f& theAmbient,

diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx
index 409276981864e596831a8dd07316b02a51aa98ac..3c50e2e9a03ebdad0220914ee14bf3954aff0afb 100644 (file)
--- a/src/OpenGl/OpenGl_ShaderManager.cxx
+++ b/src/OpenGl/OpenGl_ShaderManager.cxx
@@ -612,6 +612,7 @@ static void PushAspectFace (const Handle(OpenGl_Context)&       theCtx,
                           theProgram->GetStateLocation (OpenGl_OCCT_DISTINGUISH_MODE),
                           theAspect->DistinguishingMode());
 
+  const float aDefSpecCol[4] = {1.0f, 1.0f, 1.0f, 1.0f};
   OpenGl_Vec4 aParams[5];
   for (Standard_Integer anIndex = 0; anIndex < 2; ++anIndex)
   {
@@ -624,22 +625,27 @@ static void PushAspectFace (const Handle(OpenGl_Context)&       theCtx,
     }
 
     const OPENGL_SURF_PROP& aProps = (anIndex == 0) ? theAspect->IntFront() : theAspect->IntBack();
-    const OpenGl_Vec4 anEmission (aProps.emscol.rgb[0] * aProps.emsv,
-                                  aProps.emscol.rgb[1] * aProps.emsv,
-                                  aProps.emscol.rgb[2] * aProps.emsv,
-                                  aProps.emscol.rgb[3] * aProps.emsv);
-    const OpenGl_Vec4 anAmbient  (aProps.ambcol.rgb[0] * aProps.amb,
-                                  aProps.ambcol.rgb[1] * aProps.amb,
-                                  aProps.ambcol.rgb[2] * aProps.amb,
-                                  aProps.ambcol.rgb[3] * aProps.amb);
-    const OpenGl_Vec4 aDiffuse   (aProps.difcol.rgb[0] * aProps.diff,
-                                  aProps.difcol.rgb[1] * aProps.diff,
-                                  aProps.difcol.rgb[2] * aProps.diff,
-                                  aProps.difcol.rgb[3] * aProps.diff);
-    const OpenGl_Vec4 aSpecular  (aProps.speccol.rgb[0] * aProps.spec,
-                                  aProps.speccol.rgb[1] * aProps.spec,
-                                  aProps.speccol.rgb[2] * aProps.spec,
-                                  aProps.speccol.rgb[3] * aProps.spec);
+    const float* aSrcEms = aProps.isphysic ? aProps.emscol.rgb : aProps.matcol.rgb;
+    const OpenGl_Vec4 anEmission (aSrcEms[0] * aProps.emsv,
+                                  aSrcEms[1] * aProps.emsv,
+                                  aSrcEms[2] * aProps.emsv,
+                                  1.0f);
+    const float* aSrcAmb = aProps.isphysic ? aProps.ambcol.rgb : aProps.matcol.rgb;
+    const OpenGl_Vec4 anAmbient  (aSrcAmb[0] * aProps.amb,
+                                  aSrcAmb[1] * aProps.amb,
+                                  aSrcAmb[2] * aProps.amb,
+                                  1.0f);
+    const float* aSrcDif = aProps.isphysic ? aProps.difcol.rgb : aProps.matcol.rgb;
+    const OpenGl_Vec4 aDiffuse   (aSrcDif[0] * aProps.diff,
+                                  aSrcDif[1] * aProps.diff,
+                                  aSrcDif[2] * aProps.diff,
+                                  1.0f);
+    const float* aSrcSpe = aProps.isphysic ? aProps.speccol.rgb : aDefSpecCol;
+    const OpenGl_Vec4 aSpecular  (aSrcSpe[0] * aProps.spec,
+                                  aSrcSpe[1] * aProps.spec,
+                                  aSrcSpe[2] * aProps.spec,
+                                  1.0f);
+
     aParams[0] = anEmission;
     aParams[1] = anAmbient;
     aParams[2] = aDiffuse;

diff --git a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
index 6a181fc79683a715b91bc64adc9872eee3aa8db2..192b21e341d2d8947607d4f113861cae74d28081 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
+++ b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx
@@ -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);
-
-  theMaterial.Diffuse = OpenGl_RTVec4f (theProp.difcol.rgb[0] * theProp.diff,
-                                        theProp.difcol.rgb[1] * theProp.diff,
-                                        theProp.difcol.rgb[2] * theProp.diff,
-                                        1.f);
-
-  theMaterial.Specular = OpenGl_RTVec4f (theProp.speccol.rgb[0] * theProp.spec,
-                                         theProp.speccol.rgb[1] * theProp.spec,
-                                         theProp.speccol.rgb[2] * theProp.spec,
+  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);
+
+  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);
+
+  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

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 519f3436d8bbe63f123fd9925808d54224d5f1aa..9bb9c7e24f42ff426ee52e128d88e291373a5d7a 100755 (executable)
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -4122,11 +4122,11 @@ static int VReadPixel (Draw_Interpretor& theDI,
   {
     if (aBufferType == Graphic3d_BT_RGBA)
     {
-      theDI << Quantity_Color::StringName (aColor.Name()) << " " << anAlpha << "\n";
+      theDI << Quantity_Color::StringName (aColor.Name()) << " " << anAlpha;
     }
     else
     {
-      theDI << Quantity_Color::StringName (aColor.Name()) << "\n";
+      theDI << Quantity_Color::StringName (aColor.Name());
     }
   }
   else
@@ -4138,22 +4138,22 @@ static int VReadPixel (Draw_Interpretor& theDI,
       {
         if (toShowHls)
         {
-          theDI << aColor.Hue() << " " << aColor.Light() << " " << aColor.Saturation() << "\n";
+          theDI << aColor.Hue() << " " << aColor.Light() << " " << aColor.Saturation();
         }
         else
         {
-          theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue() << "\n";
+          theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue();
         }
         break;
       }
       case Graphic3d_BT_RGBA:
       {
-        theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue() << " " << anAlpha << "\n";
+        theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue() << " " << anAlpha;
         break;
       }
       case Graphic3d_BT_Depth:
       {
-        theDI << aColor.Red() << "\n";
+        theDI << aColor.Red();
         break;
       }
     }

diff --git a/tests/bugs/parse.rules b/tests/bugs/parse.rules
index 466a2c0b2516df0a4c32cfe3abc6e514cca5be01..eab3eb50266d6c87b4cab5216f62729368e34913 100755 (executable)
--- a/tests/bugs/parse.rules
+++ b/tests/bugs/parse.rules
@@ -1,5 +1,4 @@
 FAILED /\bFaulty\b/ bad shape
 IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
 SKIPPED /Error: unsupported locale specification/ locale is unavailable on tested system
-SKIPPED /OCCT was compiled without OpenCL support!/
 OK /Relative error of mass computation/ message from vprops

diff --git a/tests/bugs/vis/bug24130 b/tests/bugs/vis/bug24130
deleted file mode 100644 (file)
index f5cb0a2..0000000
--- a/tests/bugs/vis/bug24130
+++ /dev/null
@@ -1,48 +0,0 @@
-puts "TODO ?OCC24130 Debian60-64: OCCT was compiled without OpenCL support!"
-puts "TODO ?OCC24130 Windows: TKOpenGl | Type\: Error | ID\: 0 | Severity\: High | Message\:"
-
-puts "========"
-puts "OCC24130 Implementing ray tracing visualization core"
-puts "========"
-
-# custom shapes
-set aShape1 [locate_data_file occ/Top.brep]
-set aShape2 [locate_data_file occ/Bottom.brep]
-
-# setup 3D viewer content
-vinit name=View1 w=512 h=512
-vglinfo
-
-vvbo 0
-vsetdispmode 1
-vsetgradientbg 180 200 255 180 180 180 2
-restore $aShape1 s1
-restore $aShape2 s2
-vdisplay s1 s2
-vsetmaterial s1 Silver
-vsetmaterial s2 Pewter
-vfit
-
-# activate ray-tracing
-vraytrace 1
-vclinfo
-
-set aModeNum 0
-for { set aAAMode 0 } { $aAAMode <= 1 } { incr aAAMode } {
-  for { set aReflMode 0 } { $aReflMode <= 1 } { incr aReflMode } {
-    for { set aShadMode 0 } { $aShadMode <= 1 } { incr aShadMode } {
-      vsetraytracemode shad=$aShadMode refl=$aReflMode aa=$aAAMode
-      vdump $imagedir/${casename}_${aModeNum}.png
-      incr aModeNum
-    }
-  }
-}
-
-vtextureenv on 5
-for { set aAAMode 0 } { $aAAMode <= 1 } { incr aAAMode } {
-  for { set aShadMode 0 } { $aShadMode <= 1 } { incr aShadMode } {
-    vsetraytracemode shad=$aShadMode refl=1 aa=$aAAMode
-    vdump $imagedir/${casename}_${aModeNum}.png
-    incr aModeNum
-  }
-}

diff --git a/tests/v3d/glsl/light_off b/tests/v3d/glsl/light_off
index 8a9c9f771fdfa5435c7f9cbfcc980e447f8c906e..e5a2c6b0e57a85f3bfed4670532f7f6f7cdd90c1 100644 (file)
--- a/tests/v3d/glsl/light_off
+++ b/tests/v3d/glsl/light_off
@@ -15,5 +15,5 @@ vfit
 vlight clear
 
 set color [vreadpixel 100 100 rgb]
-set black "0 0 0\n"
+set black "0 0 0"
 if {[string equal $color $black] != 1} {error "Lights do not seems to be cleared!"}

diff --git a/tests/v3d/glsl/phong_plastic b/tests/v3d/glsl/phong_plastic
new file mode 100644 (file)
index 0000000..c03aef2
--- /dev/null
+++ b/tests/v3d/glsl/phong_plastic
@@ -0,0 +1,32 @@
+puts "========"
+puts "Per-pixel lighting using GLSL program (Phong shading), check plastic material"
+puts "========"
+
+# create box
+box b 1 2 3
+
+# draw box
+vinit View1
+vclear
+vsetdispmode 1
+vaxo
+vdisplay     b
+vsetmaterial b PLASTIC
+vsetcolor    b GREEN
+vfit
+vrotate 0.2 0.0 0.0
+
+# take snapshot with fixed pipeline
+vdump $::imagedir/${::casename}_OFF.png
+set aColorL [vreadpixel 150 250 rgb name]
+set aColorR [vreadpixel 250 250 rgb name]
+if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
+  puts "Error: wrong color (fixed pipeline)!"
+}
+
+vshaderprog b phong
+set aColorL [vreadpixel 150 250 rgb name]
+set aColorR [vreadpixel 250 250 rgb name]
+if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
+  puts "Error: wrong color (Phong shader)!"
+}

diff --git a/tests/v3d/grids.list b/tests/v3d/grids.list
index 626997505d68531b97422983684c27d9459cd814..972d6582982855ece46fdb0c89aa840660af2077 100644 (file)
--- a/tests/v3d/grids.list
+++ b/tests/v3d/grids.list
@@ -11,3 +11,4 @@
 011 wire_solid
 012 voxel
 013 glsl
+014 raytrace

diff --git a/tests/v3d/parse.rules b/tests/v3d/parse.rules
index b1d8fe84dfda594a871161305559a83c48209621..4546f28fdf056e899e34760e899871da125591ea 100644 (file)
--- a/tests/v3d/parse.rules
+++ b/tests/v3d/parse.rules
@@ -1,2 +1,3 @@
 FAILED /\bFaulty\b/ error
-
+SKIPPED /OCCT was compiled without OpenCL support!/
+SKIPPED /OpenCL device info is unavailable!/

diff --git a/tests/v3d/raytrace/bug24130 b/tests/v3d/raytrace/bug24130
new file mode 100644 (file)
index 0000000..f5cb0a2
--- /dev/null
+++ b/tests/v3d/raytrace/bug24130
@@ -0,0 +1,48 @@
+puts "TODO ?OCC24130 Debian60-64: OCCT was compiled without OpenCL support!"
+puts "TODO ?OCC24130 Windows: TKOpenGl | Type\: Error | ID\: 0 | Severity\: High | Message\:"
+
+puts "========"
+puts "OCC24130 Implementing ray tracing visualization core"
+puts "========"
+
+# custom shapes
+set aShape1 [locate_data_file occ/Top.brep]
+set aShape2 [locate_data_file occ/Bottom.brep]
+
+# setup 3D viewer content
+vinit name=View1 w=512 h=512
+vglinfo
+
+vvbo 0
+vsetdispmode 1
+vsetgradientbg 180 200 255 180 180 180 2
+restore $aShape1 s1
+restore $aShape2 s2
+vdisplay s1 s2
+vsetmaterial s1 Silver
+vsetmaterial s2 Pewter
+vfit
+
+# activate ray-tracing
+vraytrace 1
+vclinfo
+
+set aModeNum 0
+for { set aAAMode 0 } { $aAAMode <= 1 } { incr aAAMode } {
+  for { set aReflMode 0 } { $aReflMode <= 1 } { incr aReflMode } {
+    for { set aShadMode 0 } { $aShadMode <= 1 } { incr aShadMode } {
+      vsetraytracemode shad=$aShadMode refl=$aReflMode aa=$aAAMode
+      vdump $imagedir/${casename}_${aModeNum}.png
+      incr aModeNum
+    }
+  }
+}
+
+vtextureenv on 5
+for { set aAAMode 0 } { $aAAMode <= 1 } { incr aAAMode } {
+  for { set aShadMode 0 } { $aShadMode <= 1 } { incr aShadMode } {
+    vsetraytracemode shad=$aShadMode refl=1 aa=$aAAMode
+    vdump $imagedir/${casename}_${aModeNum}.png
+    incr aModeNum
+  }
+}

diff --git a/tests/v3d/raytrace/plastic b/tests/v3d/raytrace/plastic
new file mode 100644 (file)
index 0000000..54c08d0
--- /dev/null
+++ b/tests/v3d/raytrace/plastic
@@ -0,0 +1,33 @@
+puts "========"
+puts "Ray Tracing - check lighting on Plastic material"
+puts "========"
+
+# create box
+box b 1 2 3
+
+# draw box
+vinit View1
+vclear
+vsetdispmode 1
+vaxo
+vdisplay     b
+vsetmaterial b PLASTIC
+vsetcolor    b GREEN
+vfit
+vrotate 0.2 0.0 0.0
+
+# take snapshot with fixed pipeline
+vdump $::imagedir/${::casename}_OFF.png
+set aColorL [vreadpixel 150 250 rgb name]
+set aColorR [vreadpixel 250 250 rgb name]
+if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
+  puts "Error: wrong color (fixed pipeline)!"
+}
+
+vraytrace 1
+vclinfo
+set aColorL [vreadpixel 150 250 rgb name]
+set aColorR [vreadpixel 250 250 rgb name]
+#if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
+#  puts "Error: wrong color (Ray Tracing)!"
+#}