From: san <san@opencascade.com>
Date: Mon, 17 Jun 2013 13:09:59 +0000 (+0400)
Subject: 0024031: Depth buffer writes not enabled after rendering a transparent object
X-Git-Tag: V6_7_0_beta~232
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=3f65725b8b05edc8c392e39db183748da13ef4d3;p=occt-copy.git

0024031: Depth buffer writes not enabled after rendering a transparent object

Depth buffer writes manipulation made independent from the reflection mode flags
to ensure correct depth buffer operation after rendering transparent object(s).
Coding style improved slightly by using more human-readable variable name for
the reflection mode.
---

diff --git a/src/OpenGl/OpenGl_Workspace_5.cxx b/src/OpenGl/OpenGl_Workspace_5.cxx
index 0126a31842..d359d478db 100644
--- a/src/OpenGl/OpenGl_Workspace_5.cxx
+++ b/src/OpenGl/OpenGl_Workspace_5.cxx
@@ -95,10 +95,6 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     face = GL_BACK;
   }
 
-  const unsigned int rm = prop->color_mask;
-
-  if ( !rm ) return;
-
   // Handling transparency
   if ( (NamedStatus & OPENGL_NS_2NDPASSDO) == 0 )
   {
@@ -121,6 +117,14 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     }
   }
 
+  // Obtaining reflection mode flags to update GL material properties
+  const unsigned int aReflectionMode = prop->color_mask;
+
+  // Do not update material properties in case of zero reflection mode, 
+  // because GL lighting will be disabled by OpenGl_PrimitiveArray::DrawArray()
+  // anyway.
+  if ( !aReflectionMode ) return;
+
   static float  mAmb[4];
   static float  mDiff[4];
   static float  mSpec[4];
@@ -133,7 +137,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
   if ( NamedStatus & OPENGL_NS_RESMAT )
   {
     // Ambient component
-    if( rm & OPENGL_AMBIENT_MASK )
+    if( aReflectionMode & OPENGL_AMBIENT_MASK )
     {
       const float *c = prop->isphysic? prop->ambcol.rgb : prop->matcol.rgb;
 
@@ -150,7 +154,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     mAmb[3] = 1.F;
 
     // Diffusion component
-    if( rm & OPENGL_DIFFUSE_MASK )
+    if( aReflectionMode & OPENGL_DIFFUSE_MASK )
     {
       const float *c = prop->isphysic? prop->difcol.rgb : prop->matcol.rgb;
 
@@ -178,7 +182,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     }
 
     // Specular component
-    if( rm & OPENGL_SPECULAR_MASK )
+    if( aReflectionMode & OPENGL_SPECULAR_MASK )
     {
       const float *c = prop->isphysic? prop->speccol.rgb : defspeccol;
 
@@ -194,7 +198,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     mSpec[3] = 1.F;
 
     // Emissive component
-    if( rm & OPENGL_EMISSIVE_MASK )
+    if( aReflectionMode & OPENGL_EMISSIVE_MASK )
     {
       const float *c = prop->isphysic? prop->emscol.rgb : prop->matcol.rgb;
 
@@ -225,7 +229,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
   else
   {
     // Ambient component
-    if( rm & OPENGL_AMBIENT_MASK )
+    if( aReflectionMode & OPENGL_AMBIENT_MASK )
     {
       const float *c = prop->isphysic? prop->ambcol.rgb : prop->matcol.rgb;
 
@@ -255,7 +259,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     }
 
     // Diffusion component
-    if( rm & OPENGL_DIFFUSE_MASK )
+    if( aReflectionMode & OPENGL_DIFFUSE_MASK )
     {
       const float *c = prop->isphysic? prop->difcol.rgb : prop->matcol.rgb;
 
@@ -313,7 +317,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     }
 
     // Specular component
-    if( rm & OPENGL_SPECULAR_MASK )
+    if( aReflectionMode & OPENGL_SPECULAR_MASK )
     {
       const float *c = prop->isphysic? prop->speccol.rgb : defspeccol;
 
@@ -343,7 +347,7 @@ void OpenGl_Workspace::UpdateMaterial( const int flag )
     }
 
     // Emissive component
-    if( rm & OPENGL_EMISSIVE_MASK )
+    if( aReflectionMode & OPENGL_EMISSIVE_MASK )
     {
       const float *c = prop->isphysic? prop->emscol.rgb : prop->matcol.rgb;