//
// This file is part of Open CASCADE Technology software library.
//
-// This library is free software; you can redistribute it and / or modify it
-// under the terms of the GNU Lesser General Public version 2.1 as published
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
-#ifdef HAVE_CONFIG_H
- #include <config.h>
-#endif
-
#include <NCollection_Mat4.hxx>
#include <OpenGl_Context.hxx>
-#include <OpenGl_Display.hxx>
#include <OpenGl_GlCore11.hxx>
#include <OpenGl_GraduatedTrihedron.hxx>
#include <OpenGl_GraphicDriver.hxx>
#include <OpenGl_Trihedron.hxx>
#include <OpenGl_transform_persistence.hxx>
#include <OpenGl_View.hxx>
+#include <OpenGl_Utils.hxx>
#include <OpenGl_Workspace.hxx>
#include <Graphic3d_TextureEnv.hxx>
+#include <Graphic3d_Mat4d.hxx>
IMPLEMENT_STANDARD_HANDLE(OpenGl_View,MMgt_TShared)
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_View,MMgt_TShared)
/*----------------------------------------------------------------------*/
-static const OPENGL_BG_TEXTURE myDefaultBgTexture = { 0, 0, 0, Aspect_FM_CENTERED };
-static const OPENGL_BG_GRADIENT myDefaultBgGradient = { {{ 0.F, 0.F, 0.F, 1.F }}, {{ 0.F, 0.F, 0.F, 1.F }}, Aspect_GFM_NONE };
static const Tmatrix3 myDefaultMatrix = { { 1.F, 0.F, 0.F, 0.F }, { 0.F, 1.F, 0.F, 0.F }, { 0.F, 0.F, 1.F, 0.F }, { 0.F, 0.F, 0.F, 1.F } };
static const OPENGL_ZCLIP myDefaultZClip = { { Standard_True, 0.F }, { Standard_True, 1.F } };
-static const OPENGL_EXTRA_REP myDefaultExtra =
-{
- //vrp
- { 0.F, 0.F, 0.F },
- //vpn
- { 0.F, 0.F, 1.F },
- //vup
- { 0.F, 1.F, 0.F },
- //map
- {
- //window
- { 0.F, 0.F, 1.F, 1.F },
- //viewport
- { 0.F, 0.F, 0.F, 1.F, 1.F, 1.F },
- //proj
- TelParallel,
- //prp
- { 0.F, 0.F, 0.F },
- //vpd
- 0.F,
- //fpd
- 0.F,
- //bpd
- -1.F
- },
- //scaleFactors
- { 1.F, 1.F, 1.F }
-};
static const OPENGL_FOG myDefaultFog = { Standard_False, 0.F, 1.F, { { 0.F, 0.F, 0.F, 1.F } } };
static const TEL_TRANSFORM_PERSISTENCE myDefaultTransPers = { 0, 0.F, 0.F, 0.F };
OpenGl_View::OpenGl_View (const CALL_DEF_VIEWCONTEXT &AContext,
OpenGl_StateCounter* theCounter)
-: mySurfaceDetail(Visual3d_TOD_NONE),
+: mySurfaceDetail(Visual3d_TOD_ALL),
myBackfacing(0),
- myBgTexture(myDefaultBgTexture),
- myBgGradient(myDefaultBgGradient),
- //myOrientationMatrix(myDefaultMatrix),
- //myMappingMatrix(myDefaultMatrix),
//shield_indicator = TOn,
//shield_colour = { { 0.F, 0.F, 0.F, 1.F } },
//border_indicator = TOff,
//border_colour = { { 0.F, 0.F, 0.F, 1.F } },
//active_status = TOn,
myZClip(myDefaultZClip),
- myExtra(myDefaultExtra),
+ myCamera(AContext.Camera),
myFog(myDefaultFog),
myTrihedron(NULL),
myGraduatedTrihedron(NULL),
myVisualization(AContext.Visualization),
- myIntShadingMethod(TEL_SM_GOURAUD),
+ myShadingModel ((Visual3d_TypeOfModel )AContext.Model),
myAntiAliasing(Standard_False),
myTransPers(&myDefaultTransPers),
myIsTransPers(Standard_False),
+ myProjectionState (0),
+ myModelViewState (0),
myStateCounter (theCounter),
- myLastOrientationState (0, 0),
- myLastViewMappingState (0, 0),
- myLastLightSourceState (0, 0)
+ myLastLightSourceState (0, 0),
+ myModificationState (1), // initial state
+ myTextureParams (new OpenGl_AspectFace()),
+ myBgGradientArray (new OpenGl_BackgroundArray (Graphic3d_TOB_GRADIENT)),
+ myBgTextureArray (new OpenGl_BackgroundArray (Graphic3d_TOB_TEXTURE))
{
- // Initialize matrices
- memcpy(myOrientationMatrix,myDefaultMatrix,sizeof(Tmatrix3));
- memcpy(myMappingMatrix,myDefaultMatrix,sizeof(Tmatrix3));
-
- // Shading method
- switch (AContext.Model)
- {
- case 1 : /* VISUAL3D_TOM_INTERP_COLOR */
- case 3 : /* VISUAL3D_TOM_VERTEX */
- myIntShadingMethod = TEL_SM_GOURAUD;
- break;
- default :
- myIntShadingMethod = TEL_SM_FLAT;
- break;
- }
-
- myCurrOrientationState = myStateCounter->Increment(); // <-- delete after merge with camera
- myCurrViewMappingState = myStateCounter->Increment(); // <-- delete after merge with camera
myCurrLightSourceState = myStateCounter->Increment();
-
-#ifdef HAVE_OPENCL
- myModificationState = 1; // initial state
-#endif
}
/*----------------------------------------------------------------------*/
-OpenGl_View::~OpenGl_View ()
+OpenGl_View::~OpenGl_View()
{
ReleaseGlResources (NULL); // ensure ReleaseGlResources() was called within valid context
+ OpenGl_Element::Destroy (NULL, myTrihedron);
+ OpenGl_Element::Destroy (NULL, myGraduatedTrihedron);
+ OpenGl_Element::Destroy (NULL, myBgGradientArray);
+ OpenGl_Element::Destroy (NULL, myBgTextureArray);
+ OpenGl_Element::Destroy (NULL, myTextureParams);
}
void OpenGl_View::ReleaseGlResources (const Handle(OpenGl_Context)& theCtx)
{
- OpenGl_Element::Destroy (theCtx, myTrihedron);
- OpenGl_Element::Destroy (theCtx, myGraduatedTrihedron);
+ if (myTrihedron != NULL)
+ {
+ myTrihedron->Release (theCtx.operator->());
+ }
+ if (myGraduatedTrihedron != NULL)
+ {
+ myGraduatedTrihedron->Release (theCtx.operator->());
+ }
if (!myTextureEnv.IsNull())
{
theCtx->DelayedRelease (myTextureEnv);
myTextureEnv.Nullify();
}
- if (myBgTexture.TexId != 0)
+
+ if (myTextureParams != NULL)
+ {
+ myTextureParams->Release (theCtx.operator->());
+ }
+ if (myBgGradientArray != NULL)
+ {
+ myBgGradientArray->Release (theCtx.operator->());
+ }
+ if (myBgTextureArray != NULL)
{
- glDeleteTextures (1, (GLuint*)&(myBgTexture.TexId));
- myBgTexture.TexId = 0;
+ myBgTextureArray->Release (theCtx.operator->());
}
}
if (!anImage.IsNull())
myTextureEnv->Init (theCtx, *anImage.operator->(), theTexture->Type());
-#ifdef HAVE_OPENCL
myModificationState++;
-#endif
}
void OpenGl_View::SetSurfaceDetail (const Visual3d_TypeOfSurfaceDetail theMode)
{
mySurfaceDetail = theMode;
-#ifdef HAVE_OPENCL
myModificationState++;
-#endif
}
// =======================================================================
void OpenGl_View::SetVisualisation (const CALL_DEF_VIEWCONTEXT &AContext)
{
myVisualization = AContext.Visualization;
- // Shading method
- switch (AContext.Model)
- {
- case 1 : /* VISUAL3D_TOM_INTERP_COLOR */
- case 3 : /* VISUAL3D_TOM_VERTEX */
- myIntShadingMethod = TEL_SM_GOURAUD;
- break;
- default :
- myIntShadingMethod = TEL_SM_FLAT;
- break;
- }
+ myShadingModel = (Visual3d_TypeOfModel )AContext.Model;
}
/*----------------------------------------------------------------------*/
//call_togl_cliplimit
void OpenGl_View::SetClipLimit (const Graphic3d_CView& theCView)
{
- myZClip.Back.Limit =
- (theCView.Context.ZClipBackPlane - theCView.Mapping.BackPlaneDistance) /
- (theCView.Mapping.FrontPlaneDistance - theCView.Mapping.BackPlaneDistance);
- myZClip.Front.Limit =
- (theCView.Context.ZClipFrontPlane - theCView.Mapping.BackPlaneDistance) /
- (theCView.Mapping.FrontPlaneDistance - theCView.Mapping.BackPlaneDistance);
- if (myZClip.Back.Limit < 0.0f)
- myZClip.Back.Limit = 0.0f;
- if (myZClip.Front.Limit > 1.0f)
- myZClip.Front.Limit = 1.0f;
- if (myZClip.Back.Limit > myZClip.Front.Limit)
- {
- myZClip.Back.Limit = 0.0f;
- myZClip.Front.Limit = 1.0f;
- }
+ myZClip.Back.Limit = theCView.Context.ZClipBackPlane;
+ myZClip.Front.Limit = theCView.Context.ZClipFrontPlane;
myZClip.Back.IsOn = (theCView.Context.BackZClipping != 0);
myZClip.Front.IsOn = (theCView.Context.FrontZClipping != 0);
/*----------------------------------------------------------------------*/
-//call_togl_viewmapping
-void OpenGl_View::SetMapping (const Handle(OpenGl_Display)& theGlDisplay,
- const Graphic3d_CView& theCView)
-{
- const float ratio = theCView.DefWindow.dy / theCView.DefWindow.dx;
- const float r_ratio = theCView.DefWindow.dx / theCView.DefWindow.dy;
-
- TEL_VIEW_MAPPING Map;
-
- Map.window.xmin = theCView.Mapping.WindowLimit.um;
- Map.window.ymin = theCView.Mapping.WindowLimit.vm;
- Map.window.xmax = theCView.Mapping.WindowLimit.uM;
- Map.window.ymax = theCView.Mapping.WindowLimit.vM;
-
- Map.viewport.xmin = 0.F;
- Map.viewport.xmax = ( 1.F < r_ratio ? 1.F : r_ratio );
- Map.viewport.ymin = 0.F;
- Map.viewport.ymax = ( 1.F < ratio ? 1.F : ratio );
- Map.viewport.zmin = 0.F;
- Map.viewport.zmax = 1.F;
-
- // projection type
- switch (theCView.Mapping.Projection)
- {
- case 0 :
- Map.proj = TelPerspective;
- break;
- case 1 :
- Map.proj = TelParallel;
- break;
- }
-
- // projection reference point
- Map.prp[0] = theCView.Mapping.ProjectionReferencePoint.x;
- Map.prp[1] = theCView.Mapping.ProjectionReferencePoint.y;
- Map.prp[2] = theCView.Mapping.ProjectionReferencePoint.z;
- if (!theGlDisplay.IsNull() && !theGlDisplay->Walkthrough())
- Map.prp[2] += theCView.Mapping.FrontPlaneDistance;
-
- // view plane distance
- Map.vpd = theCView.Mapping.ViewPlaneDistance;
-
- // back plane distance
- Map.bpd = theCView.Mapping.BackPlaneDistance;
-
- // front plane distance
- Map.fpd = theCView.Mapping.FrontPlaneDistance;
-
- Tint err_ind = 0;
-
- // use user-defined matrix
- if (theCView.Mapping.IsCustomMatrix)
- {
- int i, j;
- for( i = 0; i < 4; i++ )
- for( j = 0; j < 4; j++ )
- myMappingMatrix[i][j] = theCView.Mapping.ProjectionMatrix[i][j];
- }
- else
- TelEvalViewMappingMatrix (theGlDisplay, &Map, &err_ind, myMappingMatrix);
-
- if (!err_ind)
- myExtra.map = Map;
-
- myCurrViewMappingState = myStateCounter->Increment();
-}
-
-/*----------------------------------------------------------------------*/
-
-//call_togl_vieworientation
-void OpenGl_View::SetOrientation (const Graphic3d_CView& theCView)
-{
- Tfloat Vrp[3];
- Tfloat Vpn[3];
- Tfloat Vup[3];
- Tfloat ScaleFactors[3];
-
- Vrp[0] = theCView.Orientation.ViewReferencePoint.x;
- Vrp[1] = theCView.Orientation.ViewReferencePoint.y;
- Vrp[2] = theCView.Orientation.ViewReferencePoint.z;
-
- Vpn[0] = theCView.Orientation.ViewReferencePlane.x;
- Vpn[1] = theCView.Orientation.ViewReferencePlane.y;
- Vpn[2] = theCView.Orientation.ViewReferencePlane.z;
-
- Vup[0] = theCView.Orientation.ViewReferenceUp.x;
- Vup[1] = theCView.Orientation.ViewReferenceUp.y;
- Vup[2] = theCView.Orientation.ViewReferenceUp.z;
-
- ScaleFactors[0] = theCView.Orientation.ViewScaleX;
- ScaleFactors[1] = theCView.Orientation.ViewScaleY;
- ScaleFactors[2] = theCView.Orientation.ViewScaleZ;
-
- Tint err_ind = 0;
-
- // use user-defined matrix
- if (theCView.Orientation.IsCustomMatrix)
- {
- int i, j;
- for( i = 0; i < 4; i++ )
- for( j = 0; j < 4; j++ )
- myOrientationMatrix[i][j] = theCView.Orientation.ModelViewMatrix[i][j];
- }
- else
- {
- TelEvalViewOrientationMatrix (Vrp, Vpn, Vup, ScaleFactors, &err_ind, myOrientationMatrix);
- }
-
- if (!err_ind)
- {
- myExtra.vrp[0] = Vrp[0];
- myExtra.vrp[1] = Vrp[1];
- myExtra.vrp[2] = Vrp[2];
-
- myExtra.vpn[0] = Vpn[0];
- myExtra.vpn[1] = Vpn[1];
- myExtra.vpn[2] = Vpn[2];
-
- myExtra.vup[0] = Vup[0];
- myExtra.vup[1] = Vup[1];
- myExtra.vup[2] = Vup[2];
-
- myExtra.scaleFactors[0] = ScaleFactors[0],
- myExtra.scaleFactors[1] = ScaleFactors[1],
- myExtra.scaleFactors[2] = ScaleFactors[2];
- }
-
- myCurrOrientationState = myStateCounter->Increment();
-}
-
-/*----------------------------------------------------------------------*/
-
void OpenGl_View::SetFog (const Graphic3d_CView& theCView,
const Standard_Boolean theFlag)
{
{
myFog.IsOn = Standard_True;
- myFog.Front =
- (theCView.Context.DepthFrontPlane - theCView.Mapping.BackPlaneDistance) /
- (theCView.Mapping.FrontPlaneDistance - theCView.Mapping.BackPlaneDistance);
-
- myFog.Back =
- (theCView.Context.DepthBackPlane - theCView.Mapping.BackPlaneDistance) /
- (theCView.Mapping.FrontPlaneDistance - theCView.Mapping.BackPlaneDistance);
-
- if (myFog.Front < 0.F)
- myFog.Front = 0.F;
- else if (myFog.Front > 1.F)
- myFog.Front = 1.F;
-
- if (myFog.Back < 0.F)
- myFog.Back = 0.F;
- else if (myFog.Back > 1.F)
- myFog.Back = 1.F;
-
- if (myFog.Back > myFog.Front)
- {
- myFog.Front = 1.F;
- myFog.Back = 0.F;
- }
+ myFog.Front = theCView.Context.DepthFrontPlane;
+ myFog.Back = theCView.Context.DepthBackPlane;
myFog.Color.rgb[0] = theCView.DefWindow.Background.r;
myFog.Color.rgb[1] = theCView.DefWindow.Background.g;
const Standard_Real theScale,
const Standard_Boolean theAsWireframe)
{
- OpenGl_Element::Destroy (theCtx, myTrihedron);
+ OpenGl_Element::Destroy (theCtx.operator->(), myTrihedron);
myTrihedron = new OpenGl_Trihedron (thePosition, theColor, theScale, theAsWireframe);
}
void OpenGl_View::TriedronErase (const Handle(OpenGl_Context)& theCtx)
{
- OpenGl_Element::Destroy (theCtx, myTrihedron);
+ OpenGl_Element::Destroy (theCtx.operator->(), myTrihedron);
}
/*----------------------------------------------------------------------*/
void OpenGl_View::GraduatedTrihedronDisplay (const Handle(OpenGl_Context)& theCtx,
const Graphic3d_CGraduatedTrihedron& theData)
{
- OpenGl_Element::Destroy (theCtx, myGraduatedTrihedron);
+ OpenGl_Element::Destroy (theCtx.operator->(), myGraduatedTrihedron);
myGraduatedTrihedron = new OpenGl_GraduatedTrihedron (theData);
}
void OpenGl_View::GraduatedTrihedronErase (const Handle(OpenGl_Context)& theCtx)
{
- OpenGl_Element::Destroy (theCtx, myGraduatedTrihedron);
+ OpenGl_Element::Destroy (theCtx.operator->(), myGraduatedTrihedron);
}
/*----------------------------------------------------------------------*/
{
if (myIsTransPers)
{
- // restore matrix
- glMatrixMode (GL_PROJECTION);
- glPopMatrix();
- glMatrixMode (GL_MODELVIEW);
- glPopMatrix();
- myIsTransPers = Standard_False;
-
- // Note: the approach of accessing OpenGl matrices is used now since the matrix
- // manipulation are made with help of OpenGl methods. This might be replaced by
- // direct computation of matrices by OCC subroutines.
- Tmatrix3 aResultWorldView;
- glGetFloatv (GL_MODELVIEW_MATRIX, *aResultWorldView);
+ theCtx->WorldViewState.Pop();
+ theCtx->ProjectionState.Pop();
- Tmatrix3 aResultProjection;
- glGetFloatv (GL_PROJECTION_MATRIX, *aResultProjection);
+ theCtx->ApplyProjectionMatrix();
- // Set OCCT state uniform variables
- theCtx->ShaderManager()->RevertWorldViewStateTo (aResultWorldView);
- theCtx->ShaderManager()->RevertProjectionStateTo (aResultProjection);
+ myIsTransPers = Standard_False;
}
}
}
GLint aViewport[4];
- GLdouble aModelMatrix[4][4];
- GLdouble aProjMatrix[4][4];
- glGetIntegerv (GL_VIEWPORT, aViewport);
- glGetDoublev (GL_MODELVIEW_MATRIX, (GLdouble* )aModelMatrix);
- glGetDoublev (GL_PROJECTION_MATRIX, (GLdouble *)aProjMatrix);
+ OpenGl_Mat4d aModelMatrix, aProjMatrix;
+ theCtx->core11fwd->glGetIntegerv (GL_VIEWPORT, aViewport);
+ aModelMatrix.Convert (theCtx->ModelWorldState.Current() * theCtx->WorldViewState.Current());
+ aProjMatrix .Convert (theCtx->ProjectionState.Current());
+
const GLdouble aViewportW = (GLdouble )aViewport[2];
const GLdouble aViewportH = (GLdouble )aViewport[3];
-
if (myIsTransPers)
{
// pop matrix stack - it will be overridden later
- glMatrixMode (GL_PROJECTION);
- glPopMatrix();
- glMatrixMode (GL_MODELVIEW);
- glPopMatrix();
+ theCtx->WorldViewState.Pop();
+ theCtx->ProjectionState.Pop();
}
else
{
}
// push matrices into stack and reset them
- glMatrixMode (GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
-
- glMatrixMode (GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
+ theCtx->WorldViewState.Push();
+ theCtx->ProjectionState.Push();
// get the window's (fixed) coordinates for theTransPers->point before matrixes modifications
GLdouble aWinX = 0.0, aWinY = 0.0, aWinZ = 0.0;
if ((theTransPers->mode & TPF_PAN) != TPF_PAN)
{
- gluProject (theTransPers->pointX, theTransPers->pointY, theTransPers->pointZ,
- (GLdouble* )aModelMatrix, (GLdouble* )aProjMatrix, aViewport,
- &aWinX, &aWinY, &aWinZ);
+ OpenGl_Utils::Project<Standard_Real> (theTransPers->pointX,
+ theTransPers->pointY,
+ theTransPers->pointZ,
+ aModelMatrix,
+ aProjMatrix,
+ aViewport,
+ aWinX,
+ aWinY,
+ aWinZ);
}
// prevent zooming
{
// compute fixed-zoom multiplier
// actually function works ugly with TelPerspective!
- const GLdouble aDet2 = 0.002 / (aViewportW > aViewportH ? aProjMatrix[1][1] : aProjMatrix[0][0]);
- aProjMatrix[0][0] *= aDet2;
- aProjMatrix[1][1] *= aDet2;
- aProjMatrix[2][2] *= aDet2;
+ const GLdouble aDet2 = 0.002 / (aViewportW > aViewportH ? aProjMatrix.GetValue (1, 1) : aProjMatrix.GetValue (0, 0));
+ aProjMatrix.ChangeValue (0, 0) *= aDet2;
+ aProjMatrix.ChangeValue (1, 1) *= aDet2;
+ aProjMatrix.ChangeValue (2, 2) *= aDet2;
}
// prevent translation - annulate translate matrix
if ((theTransPers->mode & TPF_PAN)
|| (theTransPers->mode == TPF_TRIEDRON))
{
- aModelMatrix[3][0] = 0.0;
- aModelMatrix[3][1] = 0.0;
- aModelMatrix[3][2] = 0.0;
- aProjMatrix [3][0] = 0.0;
- aProjMatrix [3][1] = 0.0;
- aProjMatrix [3][2] = 0.0;
+ aModelMatrix.SetValue (0, 3, 0.0);
+ aModelMatrix.SetValue (1, 3, 0.0);
+ aModelMatrix.SetValue (2, 3, 0.0);
+ aProjMatrix .SetValue (0, 3, 0.0);
+ aProjMatrix .SetValue (1, 3, 0.0);
+ aProjMatrix .SetValue (2, 3, 0.0);
}
// prevent scaling-on-axis
if (theTransPers->mode & TPF_ZOOM)
{
- const double aScaleX = myExtra.scaleFactors[0];
- const double aScaleY = myExtra.scaleFactors[1];
- const double aScaleZ = myExtra.scaleFactors[2];
+ const gp_Pnt anAxialScale = myCamera->AxialScale();
+ const double aScaleX = anAxialScale.X();
+ const double aScaleY = anAxialScale.Y();
+ const double aScaleZ = anAxialScale.Z();
for (int i = 0; i < 3; ++i)
{
- aModelMatrix[0][i] /= aScaleX;
- aModelMatrix[1][i] /= aScaleY;
- aModelMatrix[2][i] /= aScaleZ;
+ aModelMatrix.ChangeValue (0, i) /= aScaleX;
+ aModelMatrix.ChangeValue (1, i) /= aScaleY;
+ aModelMatrix.ChangeValue (2, i) /= aScaleZ;
}
}
// prevent rotating - annulate rotate matrix
if (theTransPers->mode & TPF_ROTATE)
{
- aModelMatrix[0][0] = 1.0;
- aModelMatrix[1][1] = 1.0;
- aModelMatrix[2][2] = 1.0;
-
- aModelMatrix[1][0] = 0.0;
- aModelMatrix[2][0] = 0.0;
- aModelMatrix[0][1] = 0.0;
- aModelMatrix[2][1] = 0.0;
- aModelMatrix[0][2] = 0.0;
- aModelMatrix[1][2] = 0.0;
+ aModelMatrix.SetValue (0, 0, 1.0);
+ aModelMatrix.SetValue (1, 1, 1.0);
+ aModelMatrix.SetValue (2, 2, 1.0);
+
+ aModelMatrix.SetValue (1, 0, 0.0);
+ aModelMatrix.SetValue (2, 0, 0.0);
+ aModelMatrix.SetValue (0, 1, 0.0);
+ aModelMatrix.SetValue (2, 1, 0.0);
+ aModelMatrix.SetValue (0, 2, 0.0);
+ aModelMatrix.SetValue (1, 2, 0.0);
}
// load computed matrices
- glMatrixMode (GL_MODELVIEW);
- glMultMatrixd ((GLdouble* )aModelMatrix);
-
- glMatrixMode (GL_PROJECTION);
- glMultMatrixd ((GLdouble* )aProjMatrix);
+ theCtx->ModelWorldState.SetIdentity();
+ theCtx->WorldViewState.SetCurrent<Standard_Real> (aModelMatrix);
+ theCtx->ProjectionState.SetCurrent<Standard_Real> (aProjMatrix);
if (theTransPers->mode == TPF_TRIEDRON)
{
&& theTransPers->pointY != 0.0)
{
GLdouble aW1, aH1, aW2, aH2, aDummy;
- glMatrixMode (GL_PROJECTION);
- gluUnProject ( 0.5 * aViewportW, 0.5 * aViewportH, 0.0,
- (GLdouble* )THE_IDENTITY_MATRIX, (GLdouble* )aProjMatrix, aViewport,
- &aW1, &aH1, &aDummy);
- gluUnProject (-0.5 * aViewportW, -0.5 * aViewportH, 0.0,
- (GLdouble* )THE_IDENTITY_MATRIX, (GLdouble* )aProjMatrix, aViewport,
- &aW2, &aH2, &aDummy);
+
+ OpenGl_Mat4d anIdentity;
+
+ OpenGl_Utils::UnProject<Standard_Real> (0.5 * aViewportW,
+ 0.5 * aViewportH,
+ 0.0,
+ anIdentity,
+ aProjMatrix,
+ aViewport,
+ aW1,
+ aH1,
+ aDummy);
+
+ OpenGl_Utils::UnProject<Standard_Real> (-0.5 * aViewportW,
+ -0.5 * aViewportH,
+ 0.0,
+ anIdentity,
+ aProjMatrix,
+ aViewport,
+ aW2,
+ aH2,
+ aDummy);
+
GLdouble aMoveX = 0.5 * (aW1 - aW2 - theTransPers->pointZ);
GLdouble aMoveY = 0.5 * (aH1 - aH2 - theTransPers->pointZ);
aMoveX = (theTransPers->pointX > 0.0) ? aMoveX : -aMoveX;
aMoveY = (theTransPers->pointY > 0.0) ? aMoveY : -aMoveY;
- glTranslated (aMoveX, aMoveY, 0.0);
+
+ OpenGl_Utils::Translate<Standard_Real> (aProjMatrix, aMoveX, aMoveY, 0.0);
+ theCtx->ProjectionState.SetCurrent<Standard_Real> (aProjMatrix);
}
}
else if ((theTransPers->mode & TPF_PAN) != TPF_PAN)
{
// move to thePoint using saved win-coordinates ('marker-behaviour')
GLdouble aMoveX, aMoveY, aMoveZ;
- glGetDoublev (GL_MODELVIEW_MATRIX, (GLdouble* )aModelMatrix);
- glGetDoublev (GL_PROJECTION_MATRIX, (GLdouble* )aProjMatrix);
- gluUnProject (aWinX, aWinY, aWinZ,
- (GLdouble* )aModelMatrix, (GLdouble* )aProjMatrix, aViewport,
- &aMoveX, &aMoveY, &aMoveZ);
-
- glMatrixMode (GL_MODELVIEW);
- glTranslated (aMoveX, aMoveY, aMoveZ);
- }
- // Note: the approach of accessing OpenGl matrices is used now since the matrix
- // manipulation are made with help of OpenGl methods. This might be replaced by
- // direct computation of matrices by OCC subroutines.
- Tmatrix3 aResultWorldView;
- glGetFloatv (GL_MODELVIEW_MATRIX, *aResultWorldView);
+ OpenGl_Utils::UnProject<Standard_Real> (aWinX,
+ aWinY,
+ aWinZ,
+ aModelMatrix,
+ aProjMatrix,
+ aViewport,
+ aMoveX,
+ aMoveY,
+ aMoveZ);
+
+ OpenGl_Utils::Translate<Standard_Real> (aModelMatrix, aMoveX, aMoveY, aMoveZ);
+ theCtx->WorldViewState.SetCurrent<Standard_Real> (aModelMatrix);
+ }
- Tmatrix3 aResultProjection;
- glGetFloatv (GL_PROJECTION_MATRIX, *aResultProjection);
+ theCtx->ApplyProjectionMatrix();
+ return aTransPersPrev;
+}
- // Set OCCT state uniform variables
- theCtx->ShaderManager()->UpdateWorldViewStateTo (aResultWorldView);
- theCtx->ShaderManager()->UpdateProjectionStateTo (aResultProjection);
+/*----------------------------------------------------------------------*/
- return aTransPersPrev;
+void OpenGl_View::GetMatrices (OpenGl_Mat4& theOrientation,
+ OpenGl_Mat4& theViewMapping) const
+{
+ theViewMapping = myCamera->ProjectionMatrixF();
+ theOrientation = myCamera->OrientationMatrixF();
}
+/*----------------------------------------------------------------------*/
projects / occt.git / blobdiff