OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

rebase on CR0-OCCT730 (V7_3_0)

Browse Source
This commit is contained in:
snn
2018-08-23 17:34:33 +03:00
parent ca4b907317
commit 01296da21c
13 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.cxx
View File

@@ -16,7 +16,7 @@
#include <BinMXCAFDoc_AnimationDriver.hxx> #include <BinMXCAFDoc_AnimationDriver.hxx>
#include <BinObjMgt_Persistent.hxx> #include <BinObjMgt_Persistent.hxx>
#include <CDM_MessageDriver.hxx> #include <Message_Messenger.hxx>
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
#include <TDF_Attribute.hxx> #include <TDF_Attribute.hxx>
@@ -56,7 +56,7 @@ static void putByteArray(BinObjMgt_Persistent& theTarget, const Handle(TColStd_H
//purpose : //purpose :
//======================================================================= //=======================================================================
BinMXCAFDoc_AnimationDriver::BinMXCAFDoc_AnimationDriver BinMXCAFDoc_AnimationDriver::BinMXCAFDoc_AnimationDriver
(const Handle(CDM_MessageDriver)& theMsgDriver) (const Handle(Message_Messenger)& theMsgDriver)
: BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Animation)->Name()) : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_Animation)->Name())
{ {
} }
@@ -80,7 +80,6 @@ Standard_Boolean BinMXCAFDoc_AnimationDriver::Paste(const BinObjMgt_Persistent&
BinObjMgt_RRelocationTable& /*theRelocTable*/) const BinObjMgt_RRelocationTable& /*theRelocTable*/) const
{ {
Handle(XCAFDoc_Animation) anAtt = Handle(XCAFDoc_Animation)::DownCast(theTarget); Handle(XCAFDoc_Animation) anAtt = Handle(XCAFDoc_Animation)::DownCast(theTarget);
Standard_Real aDensity;
TCollection_AsciiString aName; TCollection_AsciiString aName;
if (!(theSource >> aName)) if (!(theSource >> aName))

4
src/BinMXCAFDoc/BinMXCAFDoc_AnimationDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <BinObjMgt_RRelocationTable.hxx> #include <BinObjMgt_RRelocationTable.hxx>
#include <BinObjMgt_SRelocationTable.hxx> #include <BinObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver; class Message_Messenger;
class TDF_Attribute; class TDF_Attribute;
class BinObjMgt_Persistent; class BinObjMgt_Persistent;
@@ -38,7 +38,7 @@ class BinMXCAFDoc_AnimationDriver : public BinMDF_ADriver
public: public:
Standard_EXPORT BinMXCAFDoc_AnimationDriver(const Handle(CDM_MessageDriver)& theMsgDriver); Standard_EXPORT BinMXCAFDoc_AnimationDriver(const Handle(Message_Messenger)& theMsgDriver);
Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.cxx
View File

@@ -16,7 +16,7 @@
#include <BinMXCAFDoc_AnimationToolDriver.hxx> #include <BinMXCAFDoc_AnimationToolDriver.hxx>
#include <BinObjMgt_Persistent.hxx> #include <BinObjMgt_Persistent.hxx>
#include <CDM_MessageDriver.hxx> #include <Message_Messenger.hxx>
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <TDF_Attribute.hxx> #include <TDF_Attribute.hxx>
#include <XCAFDoc_AnimationTool.hxx> #include <XCAFDoc_AnimationTool.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_AnimationToolDriver, BinMDF_ADriver)
//purpose : //purpose :
//======================================================================= //=======================================================================
BinMXCAFDoc_AnimationToolDriver::BinMXCAFDoc_AnimationToolDriver BinMXCAFDoc_AnimationToolDriver::BinMXCAFDoc_AnimationToolDriver
(const Handle(CDM_MessageDriver)& theMsgDriver) (const Handle(Message_Messenger)& theMsgDriver)
: BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AnimationTool)->Name()) : BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AnimationTool)->Name())
{ {
} }

4
src/BinMXCAFDoc/BinMXCAFDoc_AnimationToolDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <BinObjMgt_RRelocationTable.hxx> #include <BinObjMgt_RRelocationTable.hxx>
#include <BinObjMgt_SRelocationTable.hxx> #include <BinObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver; class Message_Messenger;
class TDF_Attribute; class TDF_Attribute;
class BinObjMgt_Persistent; class BinObjMgt_Persistent;
@@ -36,7 +36,7 @@ class BinMXCAFDoc_AnimationToolDriver : public BinMDF_ADriver
{ {
public: public:
Standard_EXPORT BinMXCAFDoc_AnimationToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver); Standard_EXPORT BinMXCAFDoc_AnimationToolDriver(const Handle(Message_Messenger)& theMsgDriver);
Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/Graphic3d/Graphic3d_Group.hxx
View File

@@ -75,10 +75,10 @@ class Graphic3d_ArrayOfPrimitives;
//! with aspects and primitives and choose the group usage model beforehand out of application needs. //! with aspects and primitives and choose the group usage model beforehand out of application needs.
//! Note that some Graphic3d_Group class virtual methods contain only base implementation //! Note that some Graphic3d_Group class virtual methods contain only base implementation
//! that is extended by the descendant class in OpenGl package. //! that is extended by the descendant class in OpenGl package.
class Graphic3d_Group : public MMgt_TShared class Graphic3d_Group : public Standard_Transient
{ {
friend class Graphic3d_Structure; friend class Graphic3d_Structure;
DEFINE_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared) DEFINE_STANDARD_RTTIEXT(Graphic3d_Group, Standard_Transient)
public: public:

3
src/OpenGl/OpenGl_AspectFillCapping.hxx
View File

@@ -55,6 +55,9 @@ public:
//! Returns the shading aspect for drawing hatch layer of a section. //! Returns the shading aspect for drawing hatch layer of a section.
Standard_EXPORT const OpenGl_AspectFace* HatchingFaceAspect() const; Standard_EXPORT const OpenGl_AspectFace* HatchingFaceAspect() const;
//! Returns estimated GPU memory usage for holding data without considering overheads and allocation alignment rules.
Standard_Size EstimatedDataSize() const Standard_OVERRIDE{ return 0; }
protected: protected:
Handle(Graphic3d_AspectFillCapping) myAspect; //!< Section style settings from application's level. Handle(Graphic3d_AspectFillCapping) myAspect; //!< Section style settings from application's level.

14
src/OpenGl/OpenGl_CappingRenderer.cxx
View File

@@ -68,6 +68,9 @@ namespace
} }
OpenGl_Element* GlElement() const { return myGlElement; } OpenGl_Element* GlElement() const { return myGlElement; }
//! Returns estimated GPU memory usage for holding data without considering overheads and allocation alignment rules.
Standard_Size EstimatedDataSize() const Standard_OVERRIDE { return 0; }
private: private:
OpenGl_Element* myGlElement; OpenGl_Element* myGlElement;
@@ -203,7 +206,7 @@ void OpenGl_CappingRenderer::renderOne (const Handle(OpenGl_Workspace)& theWo
aContext->ShaderManager()->UpdateClippingState(); aContext->ShaderManager()->UpdateClippingState();
glClear (GL_STENCIL_BUFFER_BIT); glClear (GL_STENCIL_BUFFER_BIT);
glColorMask (GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); const bool aColorMaskBack = aContext->SetColorMask(false);
// override aspects, disable culling // override aspects, disable culling
theWorkspace->SetAspectFace (&theWorkspace->NoneCulling()); theWorkspace->SetAspectFace (&theWorkspace->NoneCulling());
@@ -232,7 +235,7 @@ void OpenGl_CappingRenderer::renderOne (const Handle(OpenGl_Workspace)& theWo
aContext->ShaderManager()->UpdateClippingState(); aContext->ShaderManager()->UpdateClippingState();
// render capping plane using the generated stencil mask // render capping plane using the generated stencil mask
glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); aContext->SetColorMask(aColorMaskBack);
if (theWorkspace->UseDepthWrite()) if (theWorkspace->UseDepthWrite())
{ {
glDepthMask (GL_TRUE); glDepthMask (GL_TRUE);
@@ -298,7 +301,7 @@ void OpenGl_CappingRenderer::renderOne (const Handle(OpenGl_Workspace)& theWo
aViewScale = static_cast<Standard_ShortReal> (aViewDim.Y() / aContext->Viewport()[3]); aViewScale = static_cast<Standard_ShortReal> (aViewDim.Y() / aContext->Viewport()[3]);
} }
aHatchScale = 1.0f / (aViewScale * anAspectHatching->TextureSet (aContext)->First()->SizeY()); aHatchScale = 1.0f / (aViewScale * anAspectHatching->TextureSet(aContext)->First()->SizeY());
} }
} }
@@ -440,8 +443,5 @@ Standard_Boolean OpenGl_CappingRenderFilter::ShouldRender (const Handle(OpenGl_W
return Standard_False; return Standard_False;
} }
const OpenGl_PrimitiveArray* aPArray = dynamic_cast<const OpenGl_PrimitiveArray*> (theGlElement); return theGlElement->IsFillDrawMode();
return aPArray != NULL
&& aPArray->DrawMode() >= OpenGl_PrimitiveArray::THE_FILLPRIM_FROM
&& aPArray->DrawMode() <= OpenGl_PrimitiveArray::THE_FILLPRIM_TO;
} }

21
src/OpenGl/OpenGl_Workspace.hxx
View File

@@ -17,9 +17,13 @@
#define _OpenGl_Workspace_Header #define _OpenGl_Workspace_Header
#include <Graphic3d_BufferType.hxx> #include <Graphic3d_BufferType.hxx>
#include <Graphic3d_PresentationAttributes.hxx>
#include <OpenGl_AspectFace.hxx> #include <OpenGl_AspectFace.hxx>
#include <OpenGl_CappingAlgo.hxx> #include <OpenGl_AspectMarker.hxx>
#include <OpenGl_AspectLine.hxx>
#include <OpenGl_AspectText.hxx>
#include <OpenGl_CappingRenderer.hxx>
#include <OpenGl_FrameBuffer.hxx> #include <OpenGl_FrameBuffer.hxx>
#include <OpenGl_Material.hxx> #include <OpenGl_Material.hxx>
#include <OpenGl_Matrix.hxx> #include <OpenGl_Matrix.hxx>
@@ -260,8 +264,17 @@ public:
//! Returns face aspect for textured font rendering. //! Returns face aspect for textured font rendering.
const OpenGl_AspectFace& FontFaceAspect() const { return myFontFaceAspect; } const OpenGl_AspectFace& FontFaceAspect() const { return myFontFaceAspect; }
//! Sets and applies current polygon offset.
void SetPolygonOffset (const Graphic3d_PolygonOffset& theParams);
//! Returns currently applied polygon offset parameters.
const Graphic3d_PolygonOffset& AppliedPolygonOffset() { return myPolygonOffsetApplied; }
//! Returns capping algorithm rendering filter. //! Returns capping algorithm rendering filter.
const Handle(OpenGl_CappingAlgoFilter)& DefaultCappingAlgoFilter() const { return myDefaultCappingAlgoFilter; } const Handle(OpenGl_CappingRenderFilter)& CappingRenderFilter() const
{
return myCappingRenderFilter;
}
//! Returns face aspect for none culling mode. //! Returns face aspect for none culling mode.
const OpenGl_AspectFace& NoneCulling() const { return myNoneCulling; } const OpenGl_AspectFace& NoneCulling() const { return myNoneCulling; }
@@ -282,7 +295,7 @@ protected: //! @name protected fields
Handle(OpenGl_Context) myGlContext; Handle(OpenGl_Context) myGlContext;
Standard_Boolean myUseZBuffer; Standard_Boolean myUseZBuffer;
Standard_Boolean myUseDepthWrite; Standard_Boolean myUseDepthWrite;
Handle(OpenGl_CappingAlgoFilter) myDefaultCappingAlgoFilter; Handle(OpenGl_CappingRenderFilter) myCappingRenderFilter;
OpenGl_AspectFace myNoneCulling; OpenGl_AspectFace myNoneCulling;
OpenGl_AspectFace myFrontCulling; OpenGl_AspectFace myFrontCulling;
OpenGl_AspectFace myFontFaceAspect; OpenGl_AspectFace myFontFaceAspect;
@@ -306,6 +319,8 @@ protected: //! @name fields related to status
OpenGl_Matrix myModelViewMatrix; //!< Model matrix with applied structure transformations OpenGl_Matrix myModelViewMatrix; //!< Model matrix with applied structure transformations
Graphic3d_PolygonOffset myPolygonOffsetApplied; //!< currently applied polygon offset
OpenGl_AspectFace myAspectFaceHl; //!< Hiddenline aspect OpenGl_AspectFace myAspectFaceHl; //!< Hiddenline aspect
Handle(OpenGl_TextureSet) myEnvironmentTexture; Handle(OpenGl_TextureSet) myEnvironmentTexture;

16
src/XCAFDoc/XCAFDoc_NotesTool.hxx
View File

@@ -127,10 +127,6 @@ public:
//! \param [in] theItemId - assembly item ID. //! \param [in] theItemId - assembly item ID.
//! \return annotated item label if it is found, otherwise - null label. //! \return annotated item label if it is found, otherwise - null label.
Standard_EXPORT TDF_Label FindAnnotatedItem(const XCAFDoc_AssemblyItemId& theItemId) const; Standard_EXPORT TDF_Label FindAnnotatedItem(const XCAFDoc_AssemblyItemId& theItemId) const;
Standard_EXPORT TDF_Label FindAnnotatedItemAttr(const XCAFDoc_AssemblyItemId& theItemId,
const Standard_GUID& theGUID) const;
Standard_EXPORT TDF_Label FindAnnotatedItemSubshape(const XCAFDoc_AssemblyItemId& theItemId,
Standard_Integer theSubshapeIndex) const;
//! Finds a label of the given labeled item in the annotated items hive. //! Finds a label of the given labeled item in the annotated items hive.
//! \param [in] theItemLabel - item label. //! \param [in] theItemLabel - item label.
@@ -235,12 +231,6 @@ public:
//! \return number of added labels. //! \return number of added labels.
Standard_EXPORT Standard_Integer GetNotes(const XCAFDoc_AssemblyItemId& theItemId, Standard_EXPORT Standard_Integer GetNotes(const XCAFDoc_AssemblyItemId& theItemId,
TDF_LabelSequence& theNoteLabels) const; TDF_LabelSequence& theNoteLabels) const;
Standard_EXPORT Standard_Integer GetAttrNotes(const XCAFDoc_AssemblyItemId& theItemId,
const Standard_GUID& theGUID,
TDF_LabelSequence& theNoteLabels) const;
Standard_EXPORT Standard_Integer GetSubshapeNotes(const XCAFDoc_AssemblyItemId& theItemId,
Standard_Integer theSubshapeIndex,
TDF_LabelSequence& theNoteLabels) const;
//! Gets all note labels of the labeled item. //! Gets all note labels of the labeled item.
//! Notes linked to item's attributes aren't //! Notes linked to item's attributes aren't
@@ -295,12 +285,6 @@ public:
//! \return a handle to the assembly reference attribute. //! \return a handle to the assembly reference attribute.
Standard_EXPORT Handle(XCAFDoc_AssemblyItemRef) AddNote(const TDF_Label& theNoteLabel, Standard_EXPORT Handle(XCAFDoc_AssemblyItemRef) AddNote(const TDF_Label& theNoteLabel,
const XCAFDoc_AssemblyItemId& theItemId); const XCAFDoc_AssemblyItemId& theItemId);
Standard_EXPORT Handle(XCAFDoc_AssemblyItemRef) AddNoteToAttr(const TDF_Label& theNoteLabel,
const XCAFDoc_AssemblyItemId& theItemId,
const Standard_GUID& theGUID);
Standard_EXPORT Handle(XCAFDoc_AssemblyItemRef) AddNoteToSubshape(const TDF_Label& theNoteLabel,
const XCAFDoc_AssemblyItemId& theItemId,
Standard_Integer theSubshapeIndex);
//! Adds the given note to the labeled item. //! Adds the given note to the labeled item.
//! \param [in] theNoteLabel - note label. //! \param [in] theNoteLabel - note label.

6
src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx> #include <Message_Messenger.hxx>
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
#include <TColStd_HArray1OfByte.hxx> #include <TColStd_HArray1OfByte.hxx>
@@ -37,7 +37,7 @@ IMPLEMENT_DOMSTRING(AnimationLastIdx, "animation_last_idx")
//purpose : Constructor //purpose : Constructor
//======================================================================= //=======================================================================
XmlMXCAFDoc_AnimationDriver::XmlMXCAFDoc_AnimationDriver XmlMXCAFDoc_AnimationDriver::XmlMXCAFDoc_AnimationDriver
(const Handle(CDM_MessageDriver)& theMsgDriver) (const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, "xcaf", "Animation") : XmlMDF_ADriver (theMsgDriver, "xcaf", "Animation")
{} {}
@@ -85,8 +85,6 @@ Standard_Boolean XmlMXCAFDoc_AnimationDriver::Paste
return Standard_False; return Standard_False;
Handle(TColStd_HArray1OfByte) anAnim = new TColStd_HArray1OfByte(anAnimFirstIdx, anAnimLastIdx); Handle(TColStd_HArray1OfByte) anAnim = new TColStd_HArray1OfByte(anAnimFirstIdx, anAnimLastIdx);
const Standard_Integer aMaxSize = anImageLastIdx - anImageFirstIdx + anAnimLastIdx - anAnimFirstIdx + 2;
XmlObjMgt_DOMString aDataStr = XmlObjMgt::GetStringValue(theSource); XmlObjMgt_DOMString aDataStr = XmlObjMgt::GetStringValue(theSource);
Standard_SStream anSS(aDataStr.GetString()); Standard_SStream anSS(aDataStr.GetString());

4
src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx> #include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx> #include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver; class Message_Messenger;
class TDF_Attribute; class TDF_Attribute;
class XmlObjMgt_Persistent; class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMXCAFDoc_AnimationDriver : public XmlMDF_ADriver
public: public:
Standard_EXPORT XmlMXCAFDoc_AnimationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); Standard_EXPORT XmlMXCAFDoc_AnimationDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.cxx
View File

@@ -13,7 +13,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx> #include <Message_Messenger.hxx>
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <TDF_Attribute.hxx> #include <TDF_Attribute.hxx>
#include <XCAFDoc_AnimationTool.hxx> #include <XCAFDoc_AnimationTool.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AnimationToolDriver,XmlMDF_ADriver)
//purpose : //purpose :
//======================================================================= //=======================================================================
XmlMXCAFDoc_AnimationToolDriver::XmlMXCAFDoc_AnimationToolDriver XmlMXCAFDoc_AnimationToolDriver::XmlMXCAFDoc_AnimationToolDriver
(const Handle(CDM_MessageDriver)& theMsgDriver) (const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, "xcaf", "AnimationTool") : XmlMDF_ADriver (theMsgDriver, "xcaf", "AnimationTool")
{ {
} }

4
src/XmlMXCAFDoc/XmlMXCAFDoc_AnimationToolDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx> #include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx> #include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver; class Message_Messenger;
class TDF_Attribute; class TDF_Attribute;
class XmlObjMgt_Persistent; class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMXCAFDoc_AnimationToolDriver : public XmlMDF_ADriver
public: public:
Standard_EXPORT XmlMXCAFDoc_AnimationToolDriver(const Handle(CDM_MessageDriver)& theMsgDriver); Standard_EXPORT XmlMXCAFDoc_AnimationToolDriver(const Handle(Message_Messenger)& theMsgDriver);
Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;