0032143: Visualization - add option excluding transparent object from sorting

Added option Graphic3d_AlphaMode_MaskBlend combining Mask (no sorting)
and Blend (enable blending with background) behavior.

diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_VisMaterialDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_VisMaterialDriver.cxx
index a6c035582f760be471c1d81f3d40e1c9c63200d4..85c756577dab11abe89eb8979deadba8e3fe20d7 100644 (file)
--- a/src/BinMXCAFDoc/BinMXCAFDoc_VisMaterialDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_VisMaterialDriver.cxx
@@ -27,6 +27,7 @@ static Standard_Byte alphaModeToChar (Graphic3d_AlphaMode theMode)
     case Graphic3d_AlphaMode_Opaque:    return 'O';
     case Graphic3d_AlphaMode_Mask:      return 'M';
     case Graphic3d_AlphaMode_Blend:     return 'B';
+    case Graphic3d_AlphaMode_MaskBlend: return 'b';
     case Graphic3d_AlphaMode_BlendAuto: return 'A';
   }
   return 'A';
@@ -40,6 +41,7 @@ static Graphic3d_AlphaMode alphaModeFromChar (Standard_Byte theMode)
     case 'O': return Graphic3d_AlphaMode_Opaque;
     case 'M': return Graphic3d_AlphaMode_Mask;
     case 'B': return Graphic3d_AlphaMode_Blend;
+    case 'b': return Graphic3d_AlphaMode_MaskBlend;
     case 'A': return Graphic3d_AlphaMode_BlendAuto;
   }
   return Graphic3d_AlphaMode_BlendAuto;

diff --git a/src/Graphic3d/Graphic3d_AlphaMode.hxx b/src/Graphic3d/Graphic3d_AlphaMode.hxx
index 4839417e48b8dc4838a3574908c4f1e141fe9d1e..19c142cbf49970aa4c40b0e5f3e11a7bd5e3927c 100644 (file)
--- a/src/Graphic3d/Graphic3d_AlphaMode.hxx
+++ b/src/Graphic3d/Graphic3d_AlphaMode.hxx
@@ -20,6 +20,7 @@ enum Graphic3d_AlphaMode
   Graphic3d_AlphaMode_Opaque = 0,     //!< rendered output is fully opaque and alpha value is ignored
   Graphic3d_AlphaMode_Mask,           //!< rendered output is either fully opaque or fully transparent depending on the alpha value and the alpha cutoff value
   Graphic3d_AlphaMode_Blend,          //!< rendered output is combined with the background
+  Graphic3d_AlphaMode_MaskBlend,      //!< performs in-place blending (without implicit reordering of opaque objects) with alpha-test
 
   Graphic3d_AlphaMode_BlendAuto = -1, //!< special value defined for backward compatibility - it is equal to Graphic3d_AlphaMode_Blend when Material transparency is not zero and Graphic3d_AlphaMode_Opaque otherwise;
                                       //   since this check ignores possible transparency defined by per-vertex colors and textures - NOT recommended to use!

diff --git a/src/Graphic3d/Graphic3d_AspectText3d.cxx b/src/Graphic3d/Graphic3d_AspectText3d.cxx
index 22ace08ffb3179815cbfba4a2cb7f01b219bfd82..f4b92243a5b51df1440c6b9d0c18c530e6654679 100644 (file)
--- a/src/Graphic3d/Graphic3d_AspectText3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.cxx
@@ -23,10 +23,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectText3d, Graphic3d_Aspects)
 // =======================================================================
 Graphic3d_AspectText3d::Graphic3d_AspectText3d()
 {
-  // actually this should be a special state Graphic3d_AlphaMode_MaskBlend
-  // since text is drawn in usual order with normal opaque objects (thanks to alpha test),
-  // but blending is also enabled to smoothen boundaries
-  SetAlphaMode (Graphic3d_AlphaMode_Mask, 0.285f);
+  SetAlphaMode (Graphic3d_AlphaMode_MaskBlend, 0.285f);
   myShadingModel = Graphic3d_TOSM_UNLIT;
   myInteriorColor.SetRGB (Quantity_NOC_YELLOW);
   myEdgeColor.SetRGB (Quantity_NOC_WHITE);
@@ -43,7 +40,7 @@ Graphic3d_AspectText3d::Graphic3d_AspectText3d (const Quantity_Color& theColor,
                                                 Aspect_TypeOfStyleText   theStyle,
                                                 Aspect_TypeOfDisplayText theDisplayType)
 {
-  SetAlphaMode (Graphic3d_AlphaMode_Mask, 0.285f);
+  SetAlphaMode (Graphic3d_AlphaMode_MaskBlend, 0.285f);
   myShadingModel = Graphic3d_TOSM_UNLIT;
   myTextStyle = theStyle;
   myTextDisplayType = theDisplayType;

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index 15a8c4e271c74e631f2433c431c660116ce8d319..1496f18743fc8732672268b8a821d0a6934955d8 100644 (file)
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -2445,7 +2445,8 @@ void OpenGl_Context::SetShadingMaterial (const OpenGl_Aspects* theAspect,
   // do not update material properties in case of zero reflection mode,
   // because GL lighting will be disabled by OpenGl_PrimitiveArray::DrawArray() anyway.
   const OpenGl_MaterialState& aMatState = myShaderManager->MaterialState();
-  float anAlphaCutoff = anAspect->AlphaMode() == Graphic3d_AlphaMode_Mask
+  float anAlphaCutoff = (anAspect->AlphaMode() == Graphic3d_AlphaMode_Mask
+                      || anAspect->AlphaMode() == Graphic3d_AlphaMode_MaskBlend)
                       ? anAspect->AlphaCutoff()
                       : ShortRealLast();
   if (anAspect->ToDrawEdges())
@@ -2513,6 +2514,7 @@ Standard_Boolean OpenGl_Context::CheckIsTransparent (const OpenGl_Aspects* theAs
     return theAlphaFront < 1.0f
         || theAlphaBack  < 1.0f;
   }
+  // Graphic3d_AlphaMode_Mask and Graphic3d_AlphaMode_MaskBlend are not considered transparent here
   return anAspect->AlphaMode() == Graphic3d_AlphaMode_Blend;
 }
 

diff --git a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx
index 34111b216b6dc1e4bab4b0011588e4b744112bdc..78b4eea5fa9d4247608d7d24b54d0e214eded50e 100755 (executable)
--- a/src/OpenGl/OpenGl_GraduatedTrihedron.cxx
+++ b/src/OpenGl/OpenGl_GraduatedTrihedron.cxx
@@ -109,11 +109,13 @@ void OpenGl_GraduatedTrihedron::initGlResources (const Handle(OpenGl_Context)& t
 
   myLabelValues.SetFontSize (theCtx, myData.ValuesSize());
 
+  myAspectLabels.Aspect()->SetAlphaMode (Graphic3d_AlphaMode_MaskBlend, 0.285f);
   myAspectLabels.Aspect()->SetTextFontAspect (myData.NamesFontAspect());
   myAspectLabels.Aspect()->SetTextFont (!myData.NamesFont().IsEmpty()
                                        ? new TCollection_HAsciiString (myData.NamesFont())
                                        : Handle(TCollection_HAsciiString )());
 
+  myAspectValues.Aspect()->SetAlphaMode (Graphic3d_AlphaMode_MaskBlend, 0.285f);
   myAspectValues.Aspect()->SetTextFontAspect (myData.ValuesFontAspect());
   myAspectValues.Aspect()->SetTextFont (!myData.ValuesFont().IsEmpty()
                                        ? new TCollection_HAsciiString (myData.ValuesFont())

diff --git a/src/OpenGl/OpenGl_PrimitiveArray.cxx b/src/OpenGl/OpenGl_PrimitiveArray.cxx
index 9a1a25559c7620b36832053eaf2fcde2655c5f5e..ac5178909b60276d7db11b597359b3d4e31d983a 100644 (file)
--- a/src/OpenGl/OpenGl_PrimitiveArray.cxx
+++ b/src/OpenGl/OpenGl_PrimitiveArray.cxx
@@ -1009,6 +1009,13 @@ void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace
     }
     aCtx->SetSampleAlphaToCoverage (aCtx->ShaderManager()->MaterialState().HasAlphaCutoff());
 
+    const bool isForcedBlend = anAspectFace->Aspect()->AlphaMode() == Graphic3d_AlphaMode_MaskBlend;
+    if (isForcedBlend)
+    {
+      aCtx->core11fwd->glEnable (GL_BLEND);
+      aCtx->core11fwd->glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    }
+
     const Graphic3d_Vec4* aFaceColors = !myBounds.IsNull() && !toHilight && anAspectFace->Aspect()->InteriorStyle() != Aspect_IS_HIDDENLINE
                                       ?  myBounds->Colors
                                       :  NULL;
@@ -1024,6 +1031,10 @@ void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace
       }
 
       drawArray (theWorkspace, aFaceColors, hasColorAttrib);
+      if (isForcedBlend)
+      {
+        aCtx->core11fwd->glDisable (GL_BLEND);
+      }
       return;
     }
 
@@ -1049,6 +1060,11 @@ void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace
 
       aCtx->core11fwd->glCullFace (GL_BACK);
     }
+
+    if (isForcedBlend)
+    {
+      aCtx->core11fwd->glDisable (GL_BLEND);
+    }
   }
 
 #if !defined(GL_ES_VERSION_2_0)

diff --git a/src/OpenGl/OpenGl_ShaderManager.hxx b/src/OpenGl/OpenGl_ShaderManager.hxx
index 4350e8fadd4a66ce968302594f309b07eb4363b7..ec4871780038cadddba91a188e5a161b621ae368 100644 (file)
--- a/src/OpenGl/OpenGl_ShaderManager.hxx
+++ b/src/OpenGl/OpenGl_ShaderManager.hxx
@@ -578,7 +578,8 @@ protected:
                                    Standard_Boolean theEnableMeshEdges) const
   {
     Standard_Integer aBits = 0;
-    if (theAlphaMode == Graphic3d_AlphaMode_Mask)
+    if (theAlphaMode == Graphic3d_AlphaMode_Mask
+     || theAlphaMode == Graphic3d_AlphaMode_MaskBlend)
     {
       aBits |= Graphic3d_ShaderFlags_AlphaTest;
     }

diff --git a/src/OpenGl/OpenGl_Text.cxx b/src/OpenGl/OpenGl_Text.cxx
index bbdb8505ae999e89bf99c8d5946e44d6d38da1a6..589095afb1351ee930373d28b53c02e144f2d837 100644 (file)
--- a/src/OpenGl/OpenGl_Text.cxx
+++ b/src/OpenGl/OpenGl_Text.cxx
@@ -759,7 +759,7 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
                          && theTextAspect.Aspect()->TextStyle() != Aspect_TOST_ANNOTATION;
   if (!hasDepthTest)
   {
-    glDisable (GL_DEPTH_TEST);
+    theCtx->core11fwd->glDisable (GL_DEPTH_TEST);
   }
 
   if (theCtx->core15fwd != NULL)
@@ -782,8 +782,11 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
 #endif
 
   // setup blending
-  glEnable (GL_BLEND);
-  glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  if (theTextAspect.Aspect()->AlphaMode() == Graphic3d_AlphaMode_MaskBlend)
+  {
+    theCtx->core11fwd->glEnable (GL_BLEND);
+    theCtx->core11fwd->glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  }
 
   // alpha to coverage makes text too thin
   theCtx->SetSampleAlphaToCoverage (false);
@@ -854,7 +857,10 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
 
   if (theTextAspect.Aspect()->TextDisplayType() == Aspect_TODT_DIMENSION)
   {
-    glDisable (GL_BLEND);
+    if (theTextAspect.Aspect()->AlphaMode() == Graphic3d_AlphaMode_MaskBlend)
+    {
+      glDisable (GL_BLEND);
+    }
     if (!myIs2d)
     {
       glDisable (GL_DEPTH_TEST);
@@ -880,7 +886,10 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
   }
 
   // reset OpenGL state
-  glDisable (GL_BLEND);
+  if (theTextAspect.Aspect()->AlphaMode() == Graphic3d_AlphaMode_MaskBlend)
+  {
+    theCtx->core11fwd->glDisable (GL_BLEND);
+  }
   glDisable (GL_STENCIL_TEST);
 #if !defined(GL_ES_VERSION_2_0)
   glDisable (GL_COLOR_LOGIC_OP);

diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx
index 8ef92f85b1059268c5228aaadb462533f9166850..c39c76c4e84a1a4dc1cc511e6feb0a351123d72d 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace.cxx
+++ b/src/OpenGl/OpenGl_Workspace.cxx
@@ -261,6 +261,7 @@ const OpenGl_Aspects* OpenGl_Workspace::ApplyAspects (bool theToBindTextures)
       if (myAspectsSet->Aspect()->InteriorStyle() == Aspect_IS_HATCH
        || myAspectsSet->Aspect()->AlphaMode() == Graphic3d_AlphaMode_Blend
        || myAspectsSet->Aspect()->AlphaMode() == Graphic3d_AlphaMode_Mask
+       || myAspectsSet->Aspect()->AlphaMode() == Graphic3d_AlphaMode_MaskBlend
        || (myAspectsSet->Aspect()->AlphaMode() == Graphic3d_AlphaMode_BlendAuto
         && myAspectsSet->Aspect()->FrontMaterial().Transparency() != 0.0f))
       {

diff --git a/src/RWGltf/RWGltf_GltfMaterialMap.cxx b/src/RWGltf/RWGltf_GltfMaterialMap.cxx
index b143e5b554b4c2b79d09139ba09c23459dfceb8d..e541e6f15061f41225dda50faab076d826ab89e4 100644 (file)
--- a/src/RWGltf/RWGltf_GltfMaterialMap.cxx
+++ b/src/RWGltf/RWGltf_GltfMaterialMap.cxx
@@ -516,6 +516,7 @@ void RWGltf_GltfMaterialMap::DefineMaterial (const XCAFPrs_Style& theStyle,
         break;
       }
       case Graphic3d_AlphaMode_Blend:
+      case Graphic3d_AlphaMode_MaskBlend:
       {
         myWriter->Key ("alphaMode");
         myWriter->String ("BLEND");

diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx
index adf3114777ae62300883fbacc1988b6a5f6a6c4a..3a3ed1c91bab9a0ff6a240f5f123cf917b486cdc 100644 (file)
--- a/src/ViewerTest/ViewerTest.cxx
+++ b/src/ViewerTest/ViewerTest.cxx
@@ -2552,6 +2552,11 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
         {
           aChangeSet->AlphaMode = Graphic3d_AlphaMode_Blend;
         }
+        else if (aParam == "maskblend"
+              || aParam == "blendmask")
+        {
+          aChangeSet->AlphaMode = Graphic3d_AlphaMode_MaskBlend;
+        }
         else if (aParam == "blendauto"
               || aParam == "auto")
         {
@@ -6689,7 +6694,7 @@ void ViewerTest::Commands(Draw_Interpretor& theCommands)
       "\n\t\t:          [-faceBoundaryWidth LineWidth] [-faceBoundaryColor R G B] [-faceBoundaryType LineType]"
       "\n\t\t:          [-drawEdges {0|1}] [-edgeType LineType] [-edgeColor R G B] [-quadEdges {0|1}]"
       "\n\t\t:          [-drawSilhouette {0|1}]"
-      "\n\t\t:          [-alphaMode {opaque|mask|blend|blendauto} [alphaCutOff=0.5]]"
+      "\n\t\t:          [-alphaMode {opaque|mask|blend|maskblend|blendauto} [alphaCutOff=0.5]]"
       "\n\t\t:          [-dumpJson]"
       "\n\t\t:          [-dumpCompact {0|1}]"
       "\n\t\t:          [-dumpDepth depth]"

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 5e37d27fe5a106cc4e1e2b878d4df099aa9c94db..1ddf7651ef4d76ab57497ad5ee975292e9c2ef6e 100644 (file)
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -9640,6 +9640,11 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
         {
           aMode = Graphic3d_AlphaMode_Blend;
         }
+        else if (aValStr == "maskblend"
+              || aValStr == "blendmask")
+        {
+          aMode = Graphic3d_AlphaMode_MaskBlend;
+        }
         else if (aValStr == "blendauto")
         {
           aMode = Graphic3d_AlphaMode_BlendAuto;

diff --git a/src/XDEDRAW/XDEDRAW_Colors.cxx b/src/XDEDRAW/XDEDRAW_Colors.cxx
index 1baa41b13d67944f6ab0621c86774877ac3767de..a74a0d9c34806cef23a5123b98e6e83fecfd204b 100644 (file)
--- a/src/XDEDRAW/XDEDRAW_Colors.cxx
+++ b/src/XDEDRAW/XDEDRAW_Colors.cxx
@@ -87,6 +87,7 @@ static const char* alphaModeToString (Graphic3d_AlphaMode theMode)
     case Graphic3d_AlphaMode_Opaque:    return "Opaque";
     case Graphic3d_AlphaMode_Mask:      return "Mask";
     case Graphic3d_AlphaMode_Blend:     return "Blend";
+    case Graphic3d_AlphaMode_MaskBlend: return "MaskBlend";
     case Graphic3d_AlphaMode_BlendAuto: return "BlendAuto";
   }
   return "";
@@ -986,6 +987,11 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th
       {
         anAlphaMode = Graphic3d_AlphaMode_Blend;
       }
+      else if (aModeStr == "maskblend"
+            || aModeStr == "blendmask")
+      {
+        anAlphaMode = Graphic3d_AlphaMode_MaskBlend;
+      }
       else if (aModeStr == "blendauto")
       {
         anAlphaMode = Graphic3d_AlphaMode_BlendAuto;

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_VisMaterialDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_VisMaterialDriver.cxx
index 1656fe7389778af702cedb20596c042ac705c956..cc000c8e9b42a5d4383779d40c69250a1ecf8f49 100644 (file)
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_VisMaterialDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_VisMaterialDriver.cxx
@@ -51,6 +51,7 @@ static const char* alphaModeToString (Graphic3d_AlphaMode theMode)
     case Graphic3d_AlphaMode_Opaque:    return "Opaque";
     case Graphic3d_AlphaMode_Mask:      return "Mask";
     case Graphic3d_AlphaMode_Blend:     return "Blend";
+    case Graphic3d_AlphaMode_MaskBlend: return "MaskBlend";
     case Graphic3d_AlphaMode_BlendAuto: return "Auto";
   }
   return "Auto";
@@ -59,12 +60,25 @@ static const char* alphaModeToString (Graphic3d_AlphaMode theMode)
 //! Decode alpha mode from string.
 static Graphic3d_AlphaMode alphaModeFromString (const char* theMode)
 {
-  switch (*theMode)
+  if (strcasecmp (theMode, "Opaque") == 0)
   {
-    case 'O': return Graphic3d_AlphaMode_Opaque;
-    case 'M': return Graphic3d_AlphaMode_Mask;
-    case 'B': return Graphic3d_AlphaMode_Blend;
-    case 'A': return Graphic3d_AlphaMode_BlendAuto;
+    return Graphic3d_AlphaMode_Opaque;
+  }
+  else if (strcasecmp (theMode, "Mask") == 0)
+  {
+    return Graphic3d_AlphaMode_Mask;
+  }
+  else if (strcasecmp (theMode, "Blend") == 0)
+  {
+    return Graphic3d_AlphaMode_Blend;
+  }
+  else if (strcasecmp (theMode, "MaskBlend") == 0)
+  {
+    return Graphic3d_AlphaMode_MaskBlend;
+  }
+  else if (strcasecmp (theMode, "Auto") == 0)
+  {
+    return Graphic3d_AlphaMode_BlendAuto;
   }
   return Graphic3d_AlphaMode_BlendAuto;
 }

diff --git a/tests/bugs/vis/bug32143 b/tests/bugs/vis/bug32143
new file mode 100644 (file)
index 0000000..d37fcfa
--- /dev/null
+++ b/tests/bugs/vis/bug32143
@@ -0,0 +1,25 @@
+puts "============"
+puts "0032143: Visualization - add option excluding transparent object from sorting"
+puts "============"
+puts ""
+
+pload MODELING VISUALIZATION
+vclear
+vinit View1 -width 512 -height 512
+vbackground -gradient GRAY20 GRAY80
+restore [locate_data_file Ball.brep] b
+vdisplay -dispMode 1 b
+vfit
+
+set dx 220; set dy 74
+set logoPath "$::env(CSF_OCCTResourcePath)/DrawResources/OCC_logo.png"
+box logo $dx $dy 0 -preview
+vdisplay -dispMode 1 logo -topmost -2d bottomRight [expr $dx+25] 25
+vtexture logo "$logoPath"
+vaspects logo -alphaMode BLEND -shadingModel UNLIT
+vdisplay logo -underlay
+if { [vreadpixel 320 440 -rgb -name] != "DEEPSKYBLUE3" } { puts "Error: Unexpected color for BLEND" }
+vaspects logo -alphaMode MASKBLEND 0.001 -shadingModel UNLIT
+if { [vreadpixel 320 440 -rgb -name] != "DARKGOLDENROD" } { puts "Error: Unexpected color for MASKBLEND" }
+
+vdump ${imagedir}/${casename}.png