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

0024381: Visualization, TKOpenGl - revise matrices stack and usage of temporary matrices

Browse Source 
0025301: Visualization, TKOpenGl - transpose matrix manually before glUniformMatrix4fv()

OpenGl_View::ReleaseGlResources() - release GL resources of trihedron, do not destroy it
This commit is contained in:
duv
2014-11-03 23:18:25 +03:00
committed by bugmaster
parent 00ea319b16
commit c827ea3a68
38 changed files with 1968 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/OpenGl/OpenGl_Clipping.cxx
View File

@@ -55,37 +55,27 @@ void OpenGl_Clipping::Add (Graphic3d_SequenceOfHClipPlane& thePlanes,
const EquationCoords& theCoordSpace,
const Handle(OpenGl_Workspace)& theWS)
{
#if !defined(GL_ES_VERSION_2_0)
GLint aMatrixMode;
glGetIntegerv (GL_MATRIX_MODE, &aMatrixMode);
Handle(OpenGl_Context) aContext = theWS->GetGlContext();
OpenGl_Matrix aCurrentMx;
glGetFloatv (GL_MODELVIEW_MATRIX, (GLfloat*) &aCurrentMx);
if (aMatrixMode != GL_MODELVIEW)
if (EquationCoords_View == theCoordSpace)
{
glMatrixMode (GL_MODELVIEW);
aContext->WorldViewState.Push();
aContext->WorldViewState.SetIdentity();
}
switch (theCoordSpace)
{
case EquationCoords_View: glLoadMatrixf ((const GLfloat*) &OpenGl_IdentityMatrix); break;
case EquationCoords_World: glLoadMatrixf ((const GLfloat*) theWS->ViewMatrix()); break;
}
// Set either identity or pure view matrix.
aContext->ApplyWorldViewMatrix();
Add (thePlanes, theCoordSpace);
// restore model-view matrix
glLoadMatrixf ((GLfloat*) &aCurrentMx);
// restore context matrix state
if (aMatrixMode != GL_MODELVIEW)
if (EquationCoords_View == theCoordSpace)
{
glMatrixMode (aMatrixMode);
aContext->WorldViewState.Pop();
}
#else
Add (thePlanes, theCoordSpace);
#endif
// Restore combined model-view matrix.
aContext->ApplyModelViewMatrix();
}
// =======================================================================