OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-05-16 10:54:53 +03:00
Code

0027728: Visualization, OpenGl_Text - handle correctly object local transformation

Browse Source 
OpenGl_Context::ApplyWorldViewMatrix() - reset ModelWorld matrix to identity for consistency with FFP.
This commit is contained in:
kgv 2016-07-30 15:06:23 +03:00 committed by bugmaster
parent c6f530b8d9
commit 458e3c0deb
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenGl/OpenGl_Context.cxx
View File

@ -70,6 +70,7 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Context,Standard_Transient)
namespace namespace
{ {
static const Handle(OpenGl_Resource) NULL_GL_RESOURCE; 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()) if (!myShaderManager->IsEmpty())
{ {
myShaderManager->UpdateModelWorldStateTo (THE_IDENTITY_MATRIX);
myShaderManager->UpdateWorldViewStateTo (WorldViewState.Current()); myShaderManager->UpdateWorldViewStateTo (WorldViewState.Current());
} }
} }

12
tests/bugs/vis/bug22368
View File

@ -8,10 +8,8 @@ puts ""
set BugNumber OCC22368 set BugNumber OCC22368
# enable FFP until bug-fix for GLSL vclear
vcaps -ffp 1 vinit View1
vinit
vtrihedron trihedron vtrihedron trihedron
OCC74_set trihedron 3 OCC74_set trihedron 3
@ -23,11 +21,7 @@ set y 190
vselect ${x3} ${y} vselect ${x3} ${y}
set new_x 100 vsetlocation trihedron 100 100 100
set new_y 100
set new_z 100
vsetlocation trihedron ${new_x} ${new_y} ${new_z}
set status 0 set status 0
for {set i ${x1} } {$i <= ${x2} } {incr i} { for {set i ${x1} } {$i <= ${x2} } {incr i} {