mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
b647266461
Quantity_ColorRGBA has been introduced as convenient structure holding Vec4 for OpenGL. Graphic3d_PolygonOffset has been added as replacement for TEL_POFFSET_PARAM. Duplicating definition of Hatch Styles TEL_HS_*** has been removed; Aspect_HatchStyle enum now follows values of TEL_HS_*** for compatibility. TelCullMode enum has been removed. Aspect_AspectLine has been merged into Graphic3d_AspectLine3d. Aspect_AspectMarker has been merged into Graphic3d_AspectMarker3d. Aspect_AspectFillArea has been merged into Graphic3d_AspectFillArea3d. Graphic3d_CAspectFillArea have been removed. OpenGl_AspectLine now stores Graphic3d_AspectLine3d as class field. OpenGl_AspectMarker now stores Graphic3d_AspectMarker3d as class field. OpenGl_AspectText now stores Graphic3d_AspectText3d as class field. OpenGl_AspectFace now stores Graphic3d_AspectFillArea3d as class field. Graphic3d_AspectFillArea3d - back face culling is now enabled by default. TKOpenGl now relies on Graphic3d_Group::IsClosed() flag to disable face culling. StdPrs_ShadedShape now does not modify aspect for different culling modes. Headers InterfaceGraphic_Graphic3d.hxx, InterfaceGraphic_telem.hxx, InterfaceGraphic_tgl_all.hxx defining obsolete structures CALL_DEF_COLOR, CALL_DEF_POINT, CALL_DEF_MATERIAL, CALL_DEF_TRANSFORM_PERSISTENCE, TEL_POINT, TEL_COLOUR have been removed. Useless and broken test case bugs/vis/buc60821 has been removed. OpenGl_Workspace::myAspectFaceApplied and myAspectMarkerApplied have been replaced from OpenGl_AspectFace*/OpenGl_AspectMarker* to Handle(Graphic3d_AspectFillArea3d)/Handle(Graphic3d_AspectMarker3d). This eliminates reading from freed memory (e.g. when OpenGl_AspectFace is allocated on stack like in OpenGl_Trihedron). OpenGl_PrimitiveArray::drawEdges() - fix drawing non-indexed array from VBO (access violation due to NULL handle). AIS_Dimension::DrawArrow() - added missing initialization of 3D arrow aspect. AIS_Manipulator::Compute() now creates dedicated Face Aspect for each axis. V3d_CircularGrid, V3d_RectangularGrid now create dedicated line aspects with different color. AIS_InteractiveObject::SetMaterial() - do not modify global ShadingAspect.
70 lines
3.0 KiB
C++
70 lines
3.0 KiB
C++
// Created by: NW,JPB,CAL
|
|
// Copyright (c) 1991-1999 Matra Datavision
|
|
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
|
//
|
|
// 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 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.
|
|
|
|
#include <Graphic3d_AspectFillArea3d.hxx>
|
|
|
|
IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectFillArea3d, Standard_Transient)
|
|
|
|
// =======================================================================
|
|
// function : Graphic3d_AspectFillArea3d
|
|
// purpose :
|
|
// =======================================================================
|
|
Graphic3d_AspectFillArea3d::Graphic3d_AspectFillArea3d()
|
|
: myInteriorColor (Quantity_NOC_CYAN1),
|
|
myBackInteriorColor (Quantity_NOC_CYAN1),
|
|
myEdgeColor (Quantity_NOC_WHITE),
|
|
myInteriorStyle (Aspect_IS_EMPTY),
|
|
myEdgeType (Aspect_TOL_SOLID),
|
|
myEdgeWidth (1.0f),
|
|
myHatchStyle (Aspect_HS_VERTICAL),
|
|
myToDistinguishMaterials (false),
|
|
myToDrawEdges (false),
|
|
myToSuppressBackFaces (true),
|
|
myToMapTexture (false)
|
|
{
|
|
//
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : Graphic3d_AspectFillArea3d
|
|
// purpose :
|
|
// =======================================================================
|
|
Graphic3d_AspectFillArea3d::Graphic3d_AspectFillArea3d (const Aspect_InteriorStyle theInteriorStyle,
|
|
const Quantity_Color& theInteriorColor,
|
|
const Quantity_Color& theEdgeColor,
|
|
const Aspect_TypeOfLine theEdgeLineType,
|
|
const Standard_Real theEdgeLineWidth,
|
|
const Graphic3d_MaterialAspect& theFrontMaterial,
|
|
const Graphic3d_MaterialAspect& theBackMaterial)
|
|
: myFrontMaterial (theFrontMaterial),
|
|
myBackMaterial (theBackMaterial),
|
|
myInteriorColor (theInteriorColor),
|
|
myBackInteriorColor (theInteriorColor),
|
|
myEdgeColor (theEdgeColor),
|
|
myInteriorStyle (theInteriorStyle),
|
|
myEdgeType (theEdgeLineType),
|
|
myEdgeWidth ((float )theEdgeLineWidth),
|
|
myHatchStyle (Aspect_HS_VERTICAL),
|
|
myToDistinguishMaterials (false),
|
|
myToDrawEdges (false),
|
|
myToSuppressBackFaces (true),
|
|
myToMapTexture (false)
|
|
{
|
|
if (theEdgeLineWidth <= 0.0)
|
|
{
|
|
Aspect_AspectFillAreaDefinitionError::Raise ("Bad value for EdgeLineWidth");
|
|
}
|
|
}
|