From 458e3c0debf4b8c4941d3fac0f131dd41554136b Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Sat, 30 Jul 2016 15:06:23 +0300
Subject: [PATCH] 0027728: Visualization, OpenGl_Text - handle correctly object
 local transformation

OpenGl_Context::ApplyWorldViewMatrix() - reset ModelWorld matrix to identity for consistency with FFP.
---
 src/OpenGl/OpenGl_Context.cxx |  2 ++
 tests/bugs/vis/bug22368       | 12 +++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index 1c6e41095e..0e5432b5ce 100644
--- 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 dbd3538f16..98cd8698d0 100755
--- 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} {