0027728: Visualization, OpenGl_Text - handle correctly object local transformation

OpenGl_Context::ApplyWorldViewMatrix() - reset ModelWorld matrix to identity for consistency with FFP.

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index 1c6e41095ec126490d791dba5b2169956b078038..0e5432b5cecf24a309a97b411a053733f0b52494 100644 (file)
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -70,6 +70,7 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Context,Standard_Transient)
 namespace
 {
   static const Handle(OpenGl_Resource) NULL_GL_RESOURCE;
+  static const OpenGl_Mat4 THE_IDENTITY_MATRIX;
 }
 
 // =======================================================================
@@ -2879,6 +2880,7 @@ void OpenGl_Context::ApplyWorldViewMatrix()
 
   if (!myShaderManager->IsEmpty())
   {
+    myShaderManager->UpdateModelWorldStateTo (THE_IDENTITY_MATRIX);
     myShaderManager->UpdateWorldViewStateTo (WorldViewState.Current());
   }
 }

diff --git a/tests/bugs/vis/bug22368 b/tests/bugs/vis/bug22368
index dbd3538f1698a096702cf0004097cdce839f4b7e..98cd8698d05eac9c2fa68fb4e86eae66f31e366e 100755 (executable)
--- a/tests/bugs/vis/bug22368
+++ b/tests/bugs/vis/bug22368
@@ -8,10 +8,8 @@ puts ""
 
 set BugNumber OCC22368
 
-# enable FFP until bug-fix for GLSL
-vcaps -ffp 1
-
-vinit
+vclear
+vinit View1
 vtrihedron trihedron
 OCC74_set trihedron 3
 
@@ -23,11 +21,7 @@ set y 190
 
 vselect ${x3} ${y}
 
-set new_x 100
-set new_y 100
-set new_z 100
-
-vsetlocation trihedron ${new_x} ${new_y} ${new_z}
+vsetlocation trihedron 100 100 100
 
 set status 0
 for {set i ${x1} } {$i <= ${x2} } {incr i} {