OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0027629: Visualization - apply a correct model-world matrix to normals in fixed function pipeline with enabled zoom persistence.

Browse Source 
Small correction of test case for issue CR27629
This commit is contained in:
isk
2016-06-23 15:01:34 +03:00
committed by bugmaster
parent 8009d0702c
commit 04be500328
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenGl/OpenGl_Structure.cxx
View File

@@ -474,14 +474,6 @@ void OpenGl_Structure::Render (const Handle(OpenGl_Workspace) &theWorkspace) con
aCtx->ModelWorldState.Push();
aCtx->ModelWorldState.SetCurrent (Transformation);
// detect scale transform
const Standard_Boolean anOldGlNormalize = aCtx->IsGlNormalizeEnabled();
const Standard_ShortReal aScaleX = Transformation.GetRow (0).xyz().SquareModulus();
if (Abs (aScaleX - 1.f) > Precision::Confusion())
{
aCtx->SetGlNormalizeEnabled (Standard_True);
}
if (TransformPersistence.Flags)
{
OpenGl_Mat4 aProjection = aCtx->ProjectionState.Current();
@@ -495,6 +487,14 @@ void OpenGl_Structure::Render (const Handle(OpenGl_Workspace) &theWorkspace) con
aCtx->ApplyProjectionMatrix();
}
// detect scale transform
const Standard_Boolean anOldGlNormalize = aCtx->IsGlNormalizeEnabled();
const Standard_ShortReal aScaleX = aCtx->ModelWorldState.Current().GetRow (0).xyz().SquareModulus();
if (Abs (aScaleX - 1.f) > Precision::Confusion())
{
aCtx->SetGlNormalizeEnabled (Standard_True);
}
// Take into account transform persistence
aCtx->ApplyModelViewMatrix();