ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-27 19:38:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Compilation with DEV version of OCCT

Browse Source
This commit is contained in:
rnv 2019-04-12 15:02:39 +03:00
parent 485d7cea0a
commit 2940ca79a8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/OBJECT/GEOM_Annotation.cxx
View File

@ -52,6 +52,8 @@
#include <V3d_Viewer.hxx> #include <V3d_Viewer.hxx>
#include <V3d_View.hxx> #include <V3d_View.hxx>
#include <Basics_OCCTVersion.hxx>
IMPLEMENT_STANDARD_RTTIEXT( GEOM_Annotation, AIS_InteractiveObject ) IMPLEMENT_STANDARD_RTTIEXT( GEOM_Annotation, AIS_InteractiveObject )
// ======================================================================= // =======================================================================
@ -689,7 +691,11 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)&
const unsigned int aDPI = theWorkspace->View()->RenderingParams().Resolution; const unsigned int aDPI = theWorkspace->View()->RenderingParams().Resolution;
if (myTextDPI != aDPI) if (myTextDPI != aDPI)
{ {
#if OCC_VERSION_LARGE <= 0x07030000
const OpenGl_AspectText* anAspect = theWorkspace->AspectText(); const OpenGl_AspectText* anAspect = theWorkspace->AspectText();
#else
const OpenGl_Aspects* anAspect = theWorkspace->Aspects();
#endif
// getting string size will also initialize font library // getting string size will also initialize font library
myTextDraw->StringSize( aContext, myTextDraw->StringSize( aContext,
@ -751,7 +757,11 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)&
{ {
Handle(Graphic3d_PresentationAttributes) empty; Handle(Graphic3d_PresentationAttributes) empty;
theWorkspace->SetHighlightStyle(empty); theWorkspace->SetHighlightStyle(empty);
#if OCC_VERSION_LARGE <= 0x07030000
theWorkspace->ApplyAspectLine(); theWorkspace->ApplyAspectLine();
#else
theWorkspace->ApplyAspects();
#endif
} }
GLint myOldDepthMode = 0; GLint myOldDepthMode = 0;