#include <OpenGl_Workspace.hxx>
-#include <InterfaceGraphic.hxx>
-
#include <OpenGl_ArbFBO.hxx>
#include <OpenGl_AspectLine.hxx>
#include <OpenGl_AspectFace.hxx>
namespace
{
- static const TEL_COLOUR THE_WHITE_COLOR = { { 1.0f, 1.0f, 1.0f, 1.0f } };
- static const OpenGl_Vec4 THE_BLACK_COLOR (0.0f, 0.0f, 0.0f, 1.0f);
+ static const OpenGl_Vec4 THE_WHITE_COLOR (1.0f, 1.0f, 1.0f, 1.0f);
+ static const OpenGl_Vec4 THE_BLACK_COLOR (0.0f, 0.0f, 0.0f, 1.0f);
static const OpenGl_AspectLine myDefaultAspectLine;
static const OpenGl_AspectFace myDefaultAspectFace;
static const OpenGl_AspectMarker myDefaultAspectMarker;
+ static const OpenGl_AspectText myDefaultAspectText;
static const OpenGl_Matrix myDefaultMatrix =
{
{ 0.0F, 0.0F, 0.0F, 1.0F }}
};
-};
+}
// =======================================================================
// function : Init
// purpose :
// =======================================================================
-void OpenGl_Material::Init (const OPENGL_SURF_PROP& theProp)
+void OpenGl_Material::Init (const Graphic3d_MaterialAspect& theMat,
+ const Quantity_Color& theInteriorColor)
{
+ const bool isPhysic = theMat.MaterialType (Graphic3d_MATERIAL_PHYSIC) == Standard_True;
+
// ambient component
- if (theProp.color_mask & OPENGL_AMBIENT_MASK)
+ if (theMat.ReflectionMode (Graphic3d_TOR_AMBIENT))
{
- const float* aSrcAmb = theProp.isphysic ? theProp.ambcol.rgb : theProp.matcol.rgb;
- Ambient = OpenGl_Vec4 (aSrcAmb[0] * theProp.amb,
- aSrcAmb[1] * theProp.amb,
- aSrcAmb[2] * theProp.amb,
- 1.0f);
+ const OpenGl_Vec3& aSrcAmb = isPhysic ? theMat.AmbientColor() : theInteriorColor;
+ Ambient = OpenGl_Vec4 (aSrcAmb * (float )theMat.Ambient(), 1.0f);
}
else
{
}
// diffusion component
- if (theProp.color_mask & OPENGL_DIFFUSE_MASK)
+ if (theMat.ReflectionMode (Graphic3d_TOR_DIFFUSE))
{
- const float* aSrcDif = theProp.isphysic ? theProp.difcol.rgb : theProp.matcol.rgb;
- Diffuse = OpenGl_Vec4 (aSrcDif[0] * theProp.diff,
- aSrcDif[1] * theProp.diff,
- aSrcDif[2] * theProp.diff,
- 1.0f);
+ const OpenGl_Vec3& aSrcDif = isPhysic ? theMat.DiffuseColor() : theInteriorColor;
+ Diffuse = OpenGl_Vec4 (aSrcDif * (float )theMat.Diffuse(), 1.0f);
}
else
{
}
// specular component
- if (theProp.color_mask & OPENGL_SPECULAR_MASK)
+ if (theMat.ReflectionMode (Graphic3d_TOR_SPECULAR))
{
- const float* aSrcSpe = theProp.isphysic ? theProp.speccol.rgb : THE_WHITE_COLOR.rgb;
- Specular = OpenGl_Vec4 (aSrcSpe[0] * theProp.spec,
- aSrcSpe[1] * theProp.spec,
- aSrcSpe[2] * theProp.spec,
- 1.0f);
+ const OpenGl_Vec3& aSrcSpe = isPhysic ? (const OpenGl_Vec3& )theMat.SpecularColor() : THE_WHITE_COLOR.rgb();
+ Specular = OpenGl_Vec4 (aSrcSpe * (float )theMat.Specular(), 1.0f);
}
else
{
}
// emission component
- if (theProp.color_mask & OPENGL_EMISSIVE_MASK)
+ if (theMat.ReflectionMode (Graphic3d_TOR_EMISSION))
{
- const float* aSrcEms = theProp.isphysic ? theProp.emscol.rgb : theProp.matcol.rgb;
- Emission = OpenGl_Vec4 (aSrcEms[0] * theProp.emsv,
- aSrcEms[1] * theProp.emsv,
- aSrcEms[2] * theProp.emsv,
- 1.0f);
+ const OpenGl_Vec3& aSrcEms = isPhysic ? theMat.EmissiveColor() : theInteriorColor;
+ Emission = OpenGl_Vec4 (aSrcEms * (float )theMat.Emissive(), 1.0f);
}
else
{
Emission = THE_BLACK_COLOR;
}
- ChangeShine() = theProp.shine;
- ChangeTransparency() = theProp.trans;
+ ChangeShine() = 128.0f * float(theMat.Shininess());
+ ChangeTransparency() = 1.0f - (float )theMat.Transparency();
}
// =======================================================================
myUseDepthWrite (Standard_True),
myUseGLLight (Standard_True),
//
- AspectLine_set (&myDefaultAspectLine),
- AspectLine_applied (NULL),
- AspectFace_set (&myDefaultAspectFace),
- AspectFace_applied (NULL),
- AspectMarker_set (&myDefaultAspectMarker),
- AspectMarker_applied (NULL),
+ myAspectLineSet (&myDefaultAspectLine),
+ myAspectFaceSet (&myDefaultAspectFace),
+ myAspectMarkerSet (&myDefaultAspectMarker),
+ myAspectTextSet (&myDefaultAspectText),
+ myAspectFaceAppliedWithHL (false),
+ //
ViewMatrix_applied (&myDefaultMatrix),
StructureMatrix_applied (&myDefaultMatrix),
- myCullingMode (TelCullUndefined),
- myModelViewMatrix (myDefaultMatrix),
- PolygonOffset_applied (THE_DEFAULT_POFFSET)
+ myToAllowFaceCulling (false),
+ myToHighlight (false),
+ myModelViewMatrix (myDefaultMatrix)
{
if (!myGlContext.IsNull() && myGlContext->MakeCurrent())
{
myGlContext->core11fwd->glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
- if (!myGlContext->GetResource ("OpenGl_LineAttributes", myLineAttribs))
- {
- // share and register for release once the resource is no longer used
- myLineAttribs = new OpenGl_LineAttributes();
- myGlContext->ShareResource ("OpenGl_LineAttributes", myLineAttribs);
- myLineAttribs->Init (myGlContext);
- }
-
// General initialization of the context
-
#if !defined(GL_ES_VERSION_2_0)
if (myGlContext->core11 != NULL)
{
#endif
}
- myDefaultCappingAlgoFilter = new OpenGl_CappingAlgoFilter();
- myNoneCulling.ChangeCullingMode() = TelCullNone;
- myNoneCulling.ChangeEdge() = 0;
- myFrontCulling.ChangeCullingMode() = TelCullBack;
- myFrontCulling.ChangeEdge() = 0;
-}
+ myDefaultCappingAlgoFilter = new OpenGl_CappingAlgoFilter();
-// =======================================================================
-// function : ~OpenGl_Workspace
-// purpose :
-// =======================================================================
-OpenGl_Workspace::~OpenGl_Workspace()
-{
- if (!myLineAttribs.IsNull())
- {
- myLineAttribs.Nullify();
- myGlContext->ReleaseResource ("OpenGl_LineAttributes", Standard_True);
- }
+ myNoneCulling .Aspect()->SetSuppressBackFaces (false);
+ myNoneCulling .Aspect()->SetDrawEdges (false);
+ myFrontCulling.Aspect()->SetSuppressBackFaces (true);
+ myFrontCulling.Aspect()->SetDrawEdges (false);
}
// =======================================================================
NamedStatus = !myTextureBound.IsNull() ? OPENGL_NS_TEXTURE : 0;
HighlightColor = &THE_WHITE_COLOR;
- AspectLine_set = &myDefaultAspectLine;
- AspectLine_applied = NULL;
- AspectFace_set = &myDefaultAspectFace;
- AspectFace_applied = NULL;
- AspectMarker_set = &myDefaultAspectMarker;
- AspectMarker_applied = NULL;
- PolygonOffset_applied = THE_DEFAULT_POFFSET;
- myCullingMode = TelCullUndefined;
-
- AspectLine(Standard_True);
- AspectFace(Standard_True);
- AspectMarker(Standard_True);
- AspectText(Standard_True);
-
- myGlContext->SetTypeOfLine (myDefaultAspectLine.Type());
- myGlContext->SetLineWidth (myDefaultAspectLine.Width());
+ myToAllowFaceCulling = false;
+ myAspectLineSet = &myDefaultAspectLine;
+ myAspectFaceSet = &myDefaultAspectFace;
+ myAspectFaceApplied.Nullify();
+ myAspectMarkerSet = &myDefaultAspectMarker;
+ myAspectMarkerApplied.Nullify();
+ myAspectTextSet = &myDefaultAspectText;
+ myPolygonOffsetApplied= Graphic3d_PolygonOffset();
+
+ ApplyAspectLine();
+ ApplyAspectFace();
+ ApplyAspectMarker();
+ ApplyAspectText();
+
+ myGlContext->SetTypeOfLine (myDefaultAspectLine.Aspect()->Type());
+ myGlContext->SetLineWidth (myDefaultAspectLine.Aspect()->Width());
}
// =======================================================================
glEnable (GL_POINT_SPRITE);
glTexEnvi (GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE);
anEnvMode = GL_REPLACE;
- myGlContext->core15->glPointParameteri (GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT);
}
break;
}
return aPrevTexture;
}
-// =======================================================================
-// function : TelUpdatePolygonOffsets
-// purpose :
-// =======================================================================
-static void TelUpdatePolygonOffsets (const TEL_POFFSET_PARAM& theOffsetData)
-{
- if ((theOffsetData.mode & Aspect_POM_Fill) == Aspect_POM_Fill)
- {
- glEnable (GL_POLYGON_OFFSET_FILL);
- }
- else
- {
- glDisable (GL_POLYGON_OFFSET_FILL);
- }
-
-#if !defined(GL_ES_VERSION_2_0)
- if ((theOffsetData.mode & Aspect_POM_Line) == Aspect_POM_Line)
- {
- glEnable (GL_POLYGON_OFFSET_LINE);
- }
- else
- {
- glDisable (GL_POLYGON_OFFSET_LINE);
- }
-
- if ((theOffsetData.mode & Aspect_POM_Point) == Aspect_POM_Point)
- {
- glEnable (GL_POLYGON_OFFSET_POINT);
- }
- else
- {
- glDisable (GL_POLYGON_OFFSET_POINT);
- }
-#endif
-
- glPolygonOffset (theOffsetData.factor, theOffsetData.units);
-}
-
// =======================================================================
// function : updateMaterial
// purpose :
void OpenGl_Workspace::updateMaterial (const int theFlag)
{
// Case of hidden line
- if (AspectFace_set->InteriorStyle() == Aspect_IS_HIDDENLINE)
- {
- myAspectFaceHl = *AspectFace_set; // copy all values including line edge aspect
- myAspectFaceHl.ChangeIntFront().matcol = myView->BackgroundColor();
- myAspectFaceHl.ChangeIntFront().color_mask = 0;
- myAspectFaceHl.ChangeIntFront().color_mask = 0;
-
- AspectFace_set = &myAspectFaceHl;
+ if (myAspectFaceSet->Aspect()->InteriorStyle() == Aspect_IS_HIDDENLINE)
+ {
+ // copy all values including line edge aspect
+ *myAspectFaceHl.Aspect().operator->() = *myAspectFaceSet->Aspect();
+ myAspectFaceHl.SetAspectEdge (myAspectFaceSet->AspectEdge());
+ myAspectFaceHl.Aspect()->SetInteriorColor (myView->BackgroundColor().GetRGB());
+ myAspectFaceHl.SetNoLighting (true);
+ myAspectFaceSet = &myAspectFaceHl;
return;
}
- const OPENGL_SURF_PROP* aProps = &AspectFace_set->IntFront();
+ const Graphic3d_MaterialAspect* aSrcMat = &myAspectFaceSet->Aspect()->FrontMaterial();
+ const Quantity_Color* aSrcIntColor = &myAspectFaceSet->Aspect()->InteriorColor();
GLenum aFace = GL_FRONT_AND_BACK;
if (theFlag == TEL_BACK_MATERIAL)
{
- aFace = GL_BACK;
- aProps = &AspectFace_set->IntBack();
+ aFace = GL_BACK;
+ aSrcMat = &myAspectFaceSet->Aspect()->BackMaterial();
+ aSrcIntColor = &myAspectFaceSet->Aspect()->BackInteriorColor();
}
- else if (AspectFace_set->DistinguishingMode() == TOn
+ else if (myAspectFaceSet->Aspect()->Distinguish()
&& !(NamedStatus & OPENGL_NS_RESMAT))
{
aFace = GL_FRONT;
}
- myMatTmp.Init (*aProps);
+ myMatTmp.Init (*aSrcMat, *aSrcIntColor);
+ if (myToHighlight)
+ {
+ myMatTmp.SetColor (*HighlightColor);
+ }
// handling transparency
if (NamedStatus & OPENGL_NS_2NDPASSDO)
{
// second pass
- myMatTmp.Diffuse.a() = aProps->env_reflexion;
+ myMatTmp.Diffuse.a() = aSrcMat->EnvReflexion();
}
else
{
- if (aProps->env_reflexion != 0.0f)
+ if (aSrcMat->EnvReflexion() != 0.0f)
{
// if the material reflects the environment scene, the second pass is needed
NamedStatus |= OPENGL_NS_2NDPASSNEED;
}
- if (aProps->trans != 1.0f)
+ const float aTransp = (float )aSrcMat->Transparency();
+ if (aTransp != 0.0f)
{
// render transparent
- myMatTmp.Diffuse.a() = aProps->trans;
+ myMatTmp.Diffuse.a() = 1.0f - aTransp;
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_BLEND);
if (myUseDepthWrite)
else
{
// render opaque
- if ((NamedStatus & OPENGL_NS_ANTIALIASING) == 0)
- {
- glBlendFunc (GL_ONE, GL_ZERO);
- glDisable (GL_BLEND);
- }
+ glBlendFunc (GL_ONE, GL_ZERO);
+ glDisable (GL_BLEND);
if (myUseDepthWrite)
{
glDepthMask (GL_TRUE);
// do not update material properties in case of zero reflection mode,
// because GL lighting will be disabled by OpenGl_PrimitiveArray::DrawArray() anyway.
- if (aProps->color_mask == 0)
+ if (myAspectFaceSet->IsNoLighting())
{
return;
}
// function : SetAspectLine
// purpose :
// =======================================================================
-const OpenGl_AspectLine * OpenGl_Workspace::SetAspectLine(const OpenGl_AspectLine *AnAspect)
+const OpenGl_AspectLine* OpenGl_Workspace::SetAspectLine (const OpenGl_AspectLine* theAspect)
{
- const OpenGl_AspectLine *AspectLine_old = AspectLine_set;
- AspectLine_set = AnAspect;
- return AspectLine_old;
+ const OpenGl_AspectLine* aPrevAspectLine = myAspectLineSet;
+ myAspectLineSet = theAspect;
+ return aPrevAspectLine;
}
// =======================================================================
// function : SetAspectFace
// purpose :
// =======================================================================
-const OpenGl_AspectFace * OpenGl_Workspace::SetAspectFace(const OpenGl_AspectFace *AnAspect)
+const OpenGl_AspectFace * OpenGl_Workspace::SetAspectFace (const OpenGl_AspectFace* theAspect)
{
- const OpenGl_AspectFace *AspectFace_old = AspectFace_set;
- AspectFace_set = AnAspect;
- return AspectFace_old;
+ const OpenGl_AspectFace* aPrevAspectFace = myAspectFaceSet;
+ myAspectFaceSet = theAspect;
+ return aPrevAspectFace;
}
// =======================================================================
// function : SetAspectMarker
// purpose :
// =======================================================================
-const OpenGl_AspectMarker * OpenGl_Workspace::SetAspectMarker(const OpenGl_AspectMarker *AnAspect)
+const OpenGl_AspectMarker* OpenGl_Workspace::SetAspectMarker (const OpenGl_AspectMarker* theAspect)
{
- const OpenGl_AspectMarker *AspectMarker_old = AspectMarker_set;
- AspectMarker_set = AnAspect;
- return AspectMarker_old;
+ const OpenGl_AspectMarker* aPrevAspectMarker = myAspectMarkerSet;
+ myAspectMarkerSet = theAspect;
+ return aPrevAspectMarker;
}
// =======================================================================
// function : SetAspectText
// purpose :
// =======================================================================
-const OpenGl_AspectText * OpenGl_Workspace::SetAspectText(const OpenGl_AspectText *AnAspect)
+const OpenGl_AspectText * OpenGl_Workspace::SetAspectText (const OpenGl_AspectText* theAspect)
{
- const OpenGl_AspectText *AspectText_old = AspectText_set;
- AspectText_set = AnAspect;
- return AspectText_old;
+ const OpenGl_AspectText* aPrevAspectText = myAspectTextSet;
+ myAspectTextSet = theAspect;
+ return aPrevAspectText;
}
// =======================================================================
-// function : AspectLine
+// function : ApplyAspectFace
// purpose :
// =======================================================================
-const OpenGl_AspectLine * OpenGl_Workspace::AspectLine(const Standard_Boolean theWithApply)
+const OpenGl_AspectFace* OpenGl_Workspace::ApplyAspectFace()
{
- if (theWithApply)
- {
- AspectLine_applied = AspectLine_set;
- }
-
- return AspectLine_set;
-}
-
-// =======================================================================
-// function : AspectFace
-// purpose :
-// =======================================================================
-const OpenGl_AspectFace* OpenGl_Workspace::AspectFace (const Standard_Boolean theToApply)
-{
- if (!theToApply)
- {
- return AspectFace_set;
- }
-
if (myView->BackfacingModel() == Graphic3d_TOBM_AUTOMATIC)
{
// manage back face culling mode, disable culling when clipping is enabled
- TelCullMode aCullingMode = (myGlContext->Clipping().IsClippingOrCappingOn()
- || AspectFace_set->InteriorStyle() == Aspect_IS_HATCH)
- ? TelCullNone
- : (TelCullMode )AspectFace_set->CullingMode();
- if (aCullingMode != TelCullNone
- && !(NamedStatus & OPENGL_NS_2NDPASSDO))
+ bool toSuppressBackFaces = myToAllowFaceCulling
+ && myAspectFaceSet->Aspect()->ToSuppressBackFaces();
+ if (toSuppressBackFaces)
{
- // disable culling in case of translucent shading aspect
- if (AspectFace_set->IntFront().trans != 1.0f)
+ if (myGlContext->Clipping().IsClippingOrCappingOn()
+ || myAspectFaceSet->Aspect()->InteriorStyle() == Aspect_IS_HATCH)
{
- aCullingMode = TelCullNone;
+ toSuppressBackFaces = false;
}
}
- if (myCullingMode != aCullingMode)
+ if (toSuppressBackFaces)
{
- myCullingMode = aCullingMode;
- switch (myCullingMode)
+ if (!(NamedStatus & OPENGL_NS_2NDPASSDO)
+ && (float )myAspectFaceSet->Aspect()->FrontMaterial().Transparency() != 0.0f)
{
- case TelCullNone:
- case TelCullUndefined:
- {
- glDisable (GL_CULL_FACE);
- break;
- }
- case TelCullFront:
- {
- glCullFace (GL_FRONT);
- glEnable (GL_CULL_FACE);
- break;
- }
- case TelCullBack:
- {
- glCullFace (GL_BACK);
- glEnable (GL_CULL_FACE);
- break;
- }
+ // disable culling in case of translucent shading aspect
+ toSuppressBackFaces = false;
}
}
+ myGlContext->SetCullBackFaces (toSuppressBackFaces);
}
- if (AspectFace_set == AspectFace_applied)
+ if (myAspectFaceSet->Aspect() == myAspectFaceApplied
+ && myToHighlight == myAspectFaceAppliedWithHL)
{
- return AspectFace_set;
+ return myAspectFaceSet;
}
+ myAspectFaceAppliedWithHL = myToHighlight;
#if !defined(GL_ES_VERSION_2_0)
- const Aspect_InteriorStyle anIntstyle = AspectFace_set->InteriorStyle();
- if (AspectFace_applied == NULL || AspectFace_applied->InteriorStyle() != anIntstyle)
+ const Aspect_InteriorStyle anIntstyle = myAspectFaceSet->Aspect()->InteriorStyle();
+ if (myAspectFaceApplied.IsNull()
+ || myAspectFaceApplied->InteriorStyle() != anIntstyle)
{
switch (anIntstyle)
{
case Aspect_IS_EMPTY:
case Aspect_IS_HOLLOW:
{
- glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
+ myGlContext->SetPolygonMode (GL_LINE);
break;
}
case Aspect_IS_HATCH:
{
- glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- myLineAttribs->SetTypeOfHatch (AspectFace_applied != NULL ? AspectFace_applied->Hatch() : TEL_HS_SOLID);
+ myGlContext->SetPolygonMode (GL_FILL);
+ myGlContext->SetPolygonHatchEnabled (true);
break;
}
case Aspect_IS_SOLID:
case Aspect_IS_HIDDENLINE:
{
- glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- if (myGlContext->core11 != NULL)
- {
- glDisable (GL_POLYGON_STIPPLE);
- }
+ myGlContext->SetPolygonMode (GL_FILL);
+ myGlContext->SetPolygonHatchEnabled (false);
break;
}
case Aspect_IS_POINT:
{
- glPolygonMode (GL_FRONT_AND_BACK, GL_POINT);
+ myGlContext->SetPolygonMode (GL_POINT);
break;
}
}
if (anIntstyle == Aspect_IS_HATCH)
{
- const Tint hatchstyle = AspectFace_set->Hatch();
- if (AspectFace_applied == NULL || AspectFace_applied->Hatch() != hatchstyle)
- {
- myLineAttribs->SetTypeOfHatch (hatchstyle);
- }
+ myGlContext->SetPolygonHatchStyle (myAspectFaceSet->Aspect()->HatchStyle());
}
#endif
// Aspect_POM_None means: do not change current settings
- if ((AspectFace_set->PolygonOffset().mode & Aspect_POM_None) != Aspect_POM_None)
+ if ((myAspectFaceSet->Aspect()->PolygonOffset().Mode & Aspect_POM_None) != Aspect_POM_None)
{
- if (PolygonOffset_applied.mode != AspectFace_set->PolygonOffset().mode
- || PolygonOffset_applied.factor != AspectFace_set->PolygonOffset().factor
- || PolygonOffset_applied.units != AspectFace_set->PolygonOffset().units)
+ if (myPolygonOffsetApplied.Mode != myAspectFaceSet->Aspect()->PolygonOffset().Mode
+ || myPolygonOffsetApplied.Factor != myAspectFaceSet->Aspect()->PolygonOffset().Factor
+ || myPolygonOffsetApplied.Units != myAspectFaceSet->Aspect()->PolygonOffset().Units)
{
- SetPolygonOffset (AspectFace_set->PolygonOffset().mode,
- AspectFace_set->PolygonOffset().factor,
- AspectFace_set->PolygonOffset().units);
+ SetPolygonOffset (myAspectFaceSet->Aspect()->PolygonOffset());
}
}
updateMaterial (TEL_FRONT_MATERIAL);
- if (AspectFace_set->DistinguishingMode() == TOn)
+ if (myAspectFaceSet->Aspect()->Distinguish())
{
updateMaterial (TEL_BACK_MATERIAL);
}
- if ((NamedStatus & OPENGL_NS_FORBIDSETTEX) == 0)
+ if (myAspectFaceSet->Aspect()->ToMapTexture())
{
- if (AspectFace_set->DoTextureMap())
+ EnableTexture (myAspectFaceSet->TextureRes (myGlContext),
+ myAspectFaceSet->TextureParams());
+ }
+ else
+ {
+ if (!myEnvironmentTexture.IsNull())
{
- EnableTexture (AspectFace_set->TextureRes (myGlContext),
- AspectFace_set->TextureParams());
+ EnableTexture (myEnvironmentTexture,
+ myEnvironmentTexture->GetParams());
}
else
{
}
}
- AspectFace_applied = AspectFace_set;
- return AspectFace_set;
+ myAspectFaceApplied = myAspectFaceSet->Aspect();
+ return myAspectFaceSet;
}
//=======================================================================
//function : SetPolygonOffset
//purpose :
//=======================================================================
-void OpenGl_Workspace::SetPolygonOffset (int theMode,
- Standard_ShortReal theFactor,
- Standard_ShortReal theUnits)
+void OpenGl_Workspace::SetPolygonOffset (const Graphic3d_PolygonOffset& theParams)
{
- PolygonOffset_applied.mode = theMode;
- PolygonOffset_applied.factor = theFactor;
- PolygonOffset_applied.units = theUnits;
+ myPolygonOffsetApplied = theParams;
- TelUpdatePolygonOffsets (PolygonOffset_applied);
+ if ((theParams.Mode & Aspect_POM_Fill) == Aspect_POM_Fill)
+ {
+ glEnable (GL_POLYGON_OFFSET_FILL);
+ }
+ else
+ {
+ glDisable (GL_POLYGON_OFFSET_FILL);
+ }
+
+#if !defined(GL_ES_VERSION_2_0)
+ if ((theParams.Mode & Aspect_POM_Line) == Aspect_POM_Line)
+ {
+ glEnable (GL_POLYGON_OFFSET_LINE);
+ }
+ else
+ {
+ glDisable (GL_POLYGON_OFFSET_LINE);
+ }
+
+ if ((theParams.Mode & Aspect_POM_Point) == Aspect_POM_Point)
+ {
+ glEnable (GL_POLYGON_OFFSET_POINT);
+ }
+ else
+ {
+ glDisable (GL_POLYGON_OFFSET_POINT);
+ }
+#endif
+ glPolygonOffset (theParams.Factor, theParams.Units);
}
// =======================================================================
-// function : AspectMarker
+// function : ApplyAspectMarker
// purpose :
// =======================================================================
-const OpenGl_AspectMarker* OpenGl_Workspace::AspectMarker (const Standard_Boolean theToApply)
+const OpenGl_AspectMarker* OpenGl_Workspace::ApplyAspectMarker()
{
- if (theToApply && (AspectMarker_set != AspectMarker_applied))
+ if (myAspectMarkerSet->Aspect() != myAspectMarkerApplied)
{
- if (!AspectMarker_applied || (AspectMarker_set->Scale() != AspectMarker_applied->Scale()))
+ if (myAspectMarkerApplied.IsNull()
+ || (myAspectMarkerSet->Aspect()->Scale() != myAspectMarkerApplied->Scale()))
{
#if !defined(GL_ES_VERSION_2_0)
- glPointSize (AspectMarker_set->Scale());
+ glPointSize (myAspectMarkerSet->Aspect()->Scale());
#ifdef HAVE_GL2PS
- gl2psPointSize (AspectMarker_set->Scale());
+ gl2psPointSize (myAspectMarkerSet->Aspect()->Scale());
#endif
#endif
}
- AspectMarker_applied = AspectMarker_set;
+ myAspectMarkerApplied = myAspectMarkerSet->Aspect();
}
- return AspectMarker_set;
-}
-
-// =======================================================================
-// function : AspectText
-// purpose :
-// =======================================================================
-const OpenGl_AspectText* OpenGl_Workspace::AspectText (const Standard_Boolean theWithApply)
-{
- if (theWithApply)
- {
- AspectText_applied = AspectText_set;
- }
-
- return AspectText_set;
+ return myAspectMarkerSet;
}
// =======================================================================
return myView->IsGLLightEnabled();
}
-// =======================================================================
-// function : AntiAliasingMode
-// purpose :
-// =======================================================================
-Standard_Integer OpenGl_Workspace::AntiAliasingMode() const
-{
- return myView->IsAntialiasingEnabled();
-}
-
// =======================================================================
// function : IsCullingEnabled
// purpose :
if (!Activate())
return Handle(OpenGl_FrameBuffer)();
+ DisableTexture();
+
// create the FBO
const Handle(OpenGl_Context)& aCtx = GetGlContext();
Handle(OpenGl_FrameBuffer) aFrameBuffer = new OpenGl_FrameBuffer();
projects / occt.git / blobdiff