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.
113 lines
3.7 KiB
C++
113 lines
3.7 KiB
C++
// Created on: 2011-07-13
|
|
// Created by: Sergey ZERCHANINOV
|
|
// Copyright (c) 2011-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_ShaderProgram.hxx>
|
|
|
|
#include <OpenGl_AspectLine.hxx>
|
|
#include <OpenGl_Context.hxx>
|
|
#include <OpenGl_ShaderManager.hxx>
|
|
#include <OpenGl_ShaderProgram.hxx>
|
|
#include <OpenGl_Workspace.hxx>
|
|
|
|
namespace
|
|
{
|
|
static const TCollection_AsciiString THE_EMPTY_KEY;
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : OpenGl_AspectLine
|
|
// purpose :
|
|
// =======================================================================
|
|
OpenGl_AspectLine::OpenGl_AspectLine()
|
|
: myAspect (new Graphic3d_AspectLine3d (Quantity_NOC_WHITE, Aspect_TOL_SOLID, 1.0))
|
|
{
|
|
//
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : OpenGl_AspectLine
|
|
// purpose :
|
|
// =======================================================================
|
|
OpenGl_AspectLine::OpenGl_AspectLine (const Handle(Graphic3d_AspectLine3d)& theAspect)
|
|
{
|
|
SetAspect (theAspect);
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : SetAspect
|
|
// purpose :
|
|
// =======================================================================
|
|
void OpenGl_AspectLine::SetAspect (const Handle(Graphic3d_AspectLine3d)& theAspect)
|
|
{
|
|
myAspect = theAspect;
|
|
const TCollection_AsciiString& aShaderKey = myAspect->ShaderProgram().IsNull() ? THE_EMPTY_KEY : myAspect->ShaderProgram()->GetId();
|
|
if (aShaderKey.IsEmpty() || myResources.ShaderProgramId != aShaderKey)
|
|
{
|
|
myResources.ResetShaderReadiness();
|
|
}
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : Render
|
|
// purpose :
|
|
// =======================================================================
|
|
void OpenGl_AspectLine::Render (const Handle(OpenGl_Workspace) &theWorkspace) const
|
|
{
|
|
theWorkspace->SetAspectLine (this);
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : Release
|
|
// purpose :
|
|
// =======================================================================
|
|
void OpenGl_AspectLine::Release (OpenGl_Context* theContext)
|
|
{
|
|
if (!myResources.ShaderProgram.IsNull()
|
|
&& theContext)
|
|
{
|
|
theContext->ShaderManager()->Unregister (myResources.ShaderProgramId,
|
|
myResources.ShaderProgram);
|
|
}
|
|
myResources.ShaderProgramId.Clear();
|
|
myResources.ResetShaderReadiness();
|
|
}
|
|
|
|
// =======================================================================
|
|
// function : BuildShader
|
|
// purpose :
|
|
// =======================================================================
|
|
void OpenGl_AspectLine::Resources::BuildShader (const Handle(OpenGl_Context)& theCtx,
|
|
const Handle(Graphic3d_ShaderProgram)& theShader)
|
|
{
|
|
if (theCtx->core20fwd == NULL)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// release old shader program resources
|
|
if (!ShaderProgram.IsNull())
|
|
{
|
|
theCtx->ShaderManager()->Unregister (ShaderProgramId, ShaderProgram);
|
|
ShaderProgramId.Clear();
|
|
ShaderProgram.Nullify();
|
|
}
|
|
if (theShader.IsNull())
|
|
{
|
|
return;
|
|
}
|
|
|
|
theCtx->ShaderManager()->Create (theShader, ShaderProgramId, ShaderProgram);
|
|
}
|