From 494782f666f3b2cf3e3a8aa80bf585ef952a5e2f Mon Sep 17 00:00:00 2001 From: isk Date: Fri, 10 Apr 2015 14:56:03 +0300 Subject: [PATCH] 0026033: Coding rules - get rid from _Handle classes --- src/Aspect/Aspect.cdl | 4 +- src/Aspect/Aspect_DisplayConnection.hxx | 3 +- .../Aspect_DisplayConnection_Handle.hxx | 25 ----------- src/Aspect/FILES | 1 - src/Graphic3d/FILES | 11 ----- src/Graphic3d/Graphic3d.cdl | 23 ++++------ src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl | 18 ++++---- src/Graphic3d/Graphic3d_AspectFillArea3d.cdl | 20 ++++----- src/Graphic3d/Graphic3d_AspectLine3d.cdl | 12 ++--- src/Graphic3d/Graphic3d_AspectMarker3d.cdl | 24 +++++----- src/Graphic3d/Graphic3d_AspectText3d.cdl | 18 ++++---- .../Graphic3d_BoundBuffer_Handle.hxx | 20 --------- src/Graphic3d/Graphic3d_Buffer_Handle.hxx | 20 --------- src/Graphic3d/Graphic3d_CAspectFillArea.hxx | 2 +- src/Graphic3d/Graphic3d_CAspectLine.hxx | 2 +- src/Graphic3d/Graphic3d_CAspectMarker.hxx | 4 +- src/Graphic3d/Graphic3d_CAspectText.hxx | 2 +- src/Graphic3d/Graphic3d_CStructure.hxx | 6 ++- src/Graphic3d/Graphic3d_CStructure_Handle.hxx | 24 ---------- src/Graphic3d/Graphic3d_Camera.hxx | 5 ++- src/Graphic3d/Graphic3d_Camera_Handle.hxx | 22 --------- src/Graphic3d/Graphic3d_ClipPlane.hxx | 5 ++- src/Graphic3d/Graphic3d_ClipPlane_Handle.hxx | 23 ---------- src/Graphic3d/Graphic3d_GraphicDriver.cdl | 45 +++++++------------ src/Graphic3d/Graphic3d_Group.cdl | 12 ++--- .../Graphic3d_IndexBuffer_Handle.hxx | 20 --------- src/Graphic3d/Graphic3d_MarkerImage.hxx | 4 +- .../Graphic3d_MarkerImage_Handle.hxx | 26 ----------- .../Graphic3d_SequenceOfHClipPlane_Handle.hxx | 24 ---------- src/Graphic3d/Graphic3d_ShaderObject.hxx | 6 ++- .../Graphic3d_ShaderObject_Handle.hxx | 26 ----------- src/Graphic3d/Graphic3d_ShaderProgram.hxx | 5 ++- .../Graphic3d_ShaderProgram_Handle.hxx | 26 ----------- src/Graphic3d/Graphic3d_ShaderVariable.hxx | 4 +- .../Graphic3d_ShaderVariable_Handle.hxx | 24 ---------- src/Graphic3d/Graphic3d_Structure.cdl | 6 +-- src/Graphic3d/Graphic3d_ViewAffinity.hxx | 4 +- src/OpenGl/OpenGl_AspectFace.hxx | 2 +- src/OpenGl/OpenGl_ShaderManager.hxx | 2 +- src/OpenGl/OpenGl_Structure.cxx | 4 +- src/Prs3d/Prs3d_PointAspect.cdl | 14 +++--- src/PrsMgr/PrsMgr_PresentableObject.cdl | 6 +-- src/V3d/V3d_View.cdl | 20 ++++----- src/Visual3d/Visual3d_View.cdl | 10 ++--- 44 files changed, 144 insertions(+), 440 deletions(-) delete mode 100755 src/Aspect/Aspect_DisplayConnection_Handle.hxx delete mode 100644 src/Graphic3d/Graphic3d_BoundBuffer_Handle.hxx delete mode 100644 src/Graphic3d/Graphic3d_Buffer_Handle.hxx delete mode 100644 src/Graphic3d/Graphic3d_CStructure_Handle.hxx delete mode 100644 src/Graphic3d/Graphic3d_Camera_Handle.hxx delete mode 100755 src/Graphic3d/Graphic3d_ClipPlane_Handle.hxx delete mode 100644 src/Graphic3d/Graphic3d_IndexBuffer_Handle.hxx delete mode 100755 src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx delete mode 100755 src/Graphic3d/Graphic3d_SequenceOfHClipPlane_Handle.hxx delete mode 100755 src/Graphic3d/Graphic3d_ShaderObject_Handle.hxx delete mode 100755 src/Graphic3d/Graphic3d_ShaderProgram_Handle.hxx delete mode 100755 src/Graphic3d/Graphic3d_ShaderVariable_Handle.hxx diff --git a/src/Aspect/Aspect.cdl b/src/Aspect/Aspect.cdl index a199905619..9281580243 100644 --- a/src/Aspect/Aspect.cdl +++ b/src/Aspect/Aspect.cdl @@ -133,9 +133,7 @@ is deferred class ColorScale; - imported DisplayConnection; - - imported DisplayConnection_Handle; + imported transient class DisplayConnection; ------------------------- -- Category: Enumerations diff --git a/src/Aspect/Aspect_DisplayConnection.hxx b/src/Aspect/Aspect_DisplayConnection.hxx index bfbd7a6ab0..624cbaf0db 100755 --- a/src/Aspect/Aspect_DisplayConnection.hxx +++ b/src/Aspect/Aspect_DisplayConnection.hxx @@ -15,7 +15,6 @@ #define _Aspect_DisplayConnection_H__ #include -#include #include #include @@ -81,4 +80,6 @@ public: }; +DEFINE_STANDARD_HANDLE (Aspect_DisplayConnection, Standard_Transient) + #endif // _Aspect_DisplayConnection_H__ diff --git a/src/Aspect/Aspect_DisplayConnection_Handle.hxx b/src/Aspect/Aspect_DisplayConnection_Handle.hxx deleted file mode 100755 index aa2a72c7f1..0000000000 --- a/src/Aspect/Aspect_DisplayConnection_Handle.hxx +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2013-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. - -#ifndef _Aspect_DisplayConnection_Handle_H__ -#define _Aspect_DisplayConnection_Handle_H__ - -#include - -// Handle for DisplayConnection; - -class Aspect_DisplayConnection; -DEFINE_STANDARD_HANDLE(Aspect_DisplayConnection, Standard_Transient) -typedef Handle(Aspect_DisplayConnection) Aspect_DisplayConnection_Handle; - -#endif // _Aspect_DisplayConnection_Handle_H__ diff --git a/src/Aspect/FILES b/src/Aspect/FILES index b7b6c87c9b..e4141107d5 100755 --- a/src/Aspect/FILES +++ b/src/Aspect/FILES @@ -14,4 +14,3 @@ Aspect_GradientBackground.cxx Aspect_Convert.hxx Aspect_DisplayConnection.hxx Aspect_DisplayConnection.cxx -Aspect_DisplayConnection_Handle.hxx diff --git a/src/Graphic3d/FILES b/src/Graphic3d/FILES index 716a5f76e8..f396243fc2 100755 --- a/src/Graphic3d/FILES +++ b/src/Graphic3d/FILES @@ -1,18 +1,14 @@ Graphic3d_BndBox4d.hxx Graphic3d_BndBox4f.hxx Graphic3d_Buffer.hxx -Graphic3d_Buffer_Handle.hxx Graphic3d_BoundBuffer.hxx -Graphic3d_BoundBuffer_Handle.hxx Graphic3d_IndexBuffer.hxx -Graphic3d_IndexBuffer_Handle.hxx Graphic3d_CAspectFillArea.hxx Graphic3d_CAspectLine.hxx Graphic3d_CAspectMarker.hxx Graphic3d_CAspectText.hxx Graphic3d_CStructure.cxx Graphic3d_CStructure.hxx -Graphic3d_CStructure_Handle.hxx Graphic3d_CBitFields16.hxx Graphic3d_CBitFields20.hxx Graphic3d_CBitFields8.hxx @@ -34,9 +30,6 @@ Graphic3d_ShaderProgram.cxx Graphic3d_ShaderVariable.hxx Graphic3d_ShaderVariable.cxx Graphic3d_ShaderVariable.lxx -Graphic3d_ShaderObject_Handle.hxx -Graphic3d_ShaderProgram_Handle.hxx -Graphic3d_ShaderVariable_Handle.hxx Graphic3d_MapOfStructure.hxx Graphic3d_MapIteratorOfMapOfStructure.hxx Graphic3d_TypeOfShaderObject.hxx @@ -63,15 +56,11 @@ Graphic3d_Vertex.hxx Graphic3d_Vertex.cxx Graphic3d_MarkerImage.hxx Graphic3d_MarkerImage.cxx -Graphic3d_MarkerImage_Handle.hxx Graphic3d_ClipPlane.hxx Graphic3d_ClipPlane.cxx -Graphic3d_ClipPlane_Handle.hxx Graphic3d_SequenceOfGroup.hxx Graphic3d_SequenceOfHClipPlane.hxx -Graphic3d_SequenceOfHClipPlane_Handle.hxx Graphic3d_Camera.cxx Graphic3d_Camera.hxx -Graphic3d_Camera_Handle.hxx Graphic3d_RenderingParams.hxx Graphic3d_NMapOfTransient.hxx diff --git a/src/Graphic3d/Graphic3d.cdl b/src/Graphic3d/Graphic3d.cdl index aa020313be..05c54518f0 100644 --- a/src/Graphic3d/Graphic3d.cdl +++ b/src/Graphic3d/Graphic3d.cdl @@ -355,12 +355,9 @@ is imported BndBox4f; ---Purpose: Redefines BVH_Box for AABB representation ---Category: Imported types - imported Buffer; - imported Buffer_Handle; - imported BoundBuffer; - imported BoundBuffer_Handle; - imported IndexBuffer; - imported IndexBuffer_Handle; + imported transient class Buffer; + imported transient class BoundBuffer; + imported transient class IndexBuffer; imported BndBox4d; imported BufferType; @@ -382,13 +379,11 @@ is imported CAspectLine; imported CAspectText; - imported CStructure; + imported transient class CStructure; ---Category: Imported types pointer CStructurePtr to CStructure from Graphic3d; - imported CStructure_Handle; - imported CLight; ---Category: Imported types @@ -408,19 +403,17 @@ is imported GraduatedTrihedron; ---Category: Imported types - imported ClipPlane; + imported transient class ClipPlane; ---Category: Imported types - imported ClipPlane_Handle; imported CTexture; imported CTransPersStruct; imported TransModeFlags; - imported MarkerImage; - imported MarkerImage_Handle; - imported Camera_Handle; + imported transient class MarkerImage; + imported transient class Camera; primitive PtrFrameBuffer; primitive Vec2; @@ -538,7 +531,7 @@ is imported NListOfHAsciiString; ---Category: Instantiated classes - imported ShaderProgram_Handle; + imported transient class ShaderProgram; ---Category: Instantiated classes imported SequenceOfHClipPlane; diff --git a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl index 5273bb6af5..930d163b0a 100644 --- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl +++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl @@ -35,9 +35,9 @@ deferred class ArrayOfPrimitives from Graphic3d inherits TShared uses TypeOfPrimitiveArray from Graphic3d, - Buffer_Handle from Graphic3d, - BoundBuffer_Handle from Graphic3d, - IndexBuffer_Handle from Graphic3d, + Buffer from Graphic3d, + BoundBuffer from Graphic3d, + IndexBuffer from Graphic3d, Vec3 from Graphic3d, Color from Quantity, Pnt from gp, @@ -442,19 +442,19 @@ is ------------------------------------------------------------------- Indices (me) - returns IndexBuffer_Handle from Graphic3d; + returns IndexBuffer from Graphic3d; ---Purpose: Returns optional index buffer. ---C++: inline ---C++: return const & Attributes (me) - returns Buffer_Handle from Graphic3d; + returns Buffer from Graphic3d; ---Purpose: Returns vertex attributes buffer (colors, normals, texture coordinates). ---C++: inline ---C++: return const & Bounds (me) - returns BoundBuffer_Handle from Graphic3d; + returns BoundBuffer from Graphic3d; ---Purpose: Returns optional bounds buffer. ---C++: inline ---C++: return const & @@ -644,9 +644,9 @@ is fields - myIndices : IndexBuffer_Handle from Graphic3d; -- optional index buffer - myAttribs : Buffer_Handle from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates) - myBounds : BoundBuffer_Handle from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates) + myIndices : IndexBuffer from Graphic3d; -- optional index buffer + myAttribs : Buffer from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates) + myBounds : BoundBuffer from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates) myType : TypeOfPrimitiveArray from Graphic3d; diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl index 09ee7eb582..1695d77a6a 100644 --- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl +++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl @@ -38,16 +38,16 @@ class AspectFillArea3d from Graphic3d inherits AspectFillArea from Aspect uses - Color from Quantity, - Ratio from Quantity, + Color from Quantity, + Ratio from Quantity, - TypeOfLine from Aspect, - InteriorStyle from Aspect, + TypeOfLine from Aspect, + InteriorStyle from Aspect, - MaterialAspect from Graphic3d, - TextureMap from Graphic3d, + MaterialAspect from Graphic3d, + TextureMap from Graphic3d, - ShaderProgram_Handle from Graphic3d + ShaderProgram from Graphic3d is @@ -188,7 +188,7 @@ is ---Category: Methods to modify the class definition SetShaderProgram ( me : mutable; - theProgram : ShaderProgram_Handle from Graphic3d ); + theProgram : ShaderProgram from Graphic3d ); ---Level: Public ---Purpose: Sets up OpenGL/GLSL shader program. ---Category: Methods to modify the class definition @@ -253,7 +253,7 @@ is ---Category: Inquire methods ShaderProgram ( me ) - returns ShaderProgram_Handle from Graphic3d; + returns ShaderProgram from Graphic3d; ---C++: return const & -- @@ -299,6 +299,6 @@ fields MyPolygonOffsetFactor : ShortReal from Standard; MyPolygonOffsetUnits : ShortReal from Standard; - MyShaderProgram : ShaderProgram_Handle from Graphic3d; + MyShaderProgram : ShaderProgram from Graphic3d; end AspectFillArea3d; diff --git a/src/Graphic3d/Graphic3d_AspectLine3d.cdl b/src/Graphic3d/Graphic3d_AspectLine3d.cdl index b321d10eb9..ba864bb10f 100644 --- a/src/Graphic3d/Graphic3d_AspectLine3d.cdl +++ b/src/Graphic3d/Graphic3d_AspectLine3d.cdl @@ -24,9 +24,9 @@ class AspectLine3d from Graphic3d inherits AspectLine from Aspect uses - Color from Quantity, - TypeOfLine from Aspect, - ShaderProgram_Handle from Graphic3d + Color from Quantity, + TypeOfLine from Aspect, + ShaderProgram from Graphic3d is @@ -54,12 +54,12 @@ is -- The supported linewidths vary by 1-pixel units. SetShaderProgram ( me : mutable; - theProgram : ShaderProgram_Handle from Graphic3d ); + theProgram : ShaderProgram from Graphic3d ); ---Level: Public ---Purpose: Sets up OpenGL/GLSL shader program. ShaderProgram ( me ) - returns ShaderProgram_Handle from Graphic3d; + returns ShaderProgram from Graphic3d; ---C++: return const & fields @@ -77,6 +77,6 @@ fields -- defined by AspectLine. -- - MyShaderProgram : ShaderProgram_Handle from Graphic3d; + MyShaderProgram : ShaderProgram from Graphic3d; end AspectLine3d; diff --git a/src/Graphic3d/Graphic3d_AspectMarker3d.cdl b/src/Graphic3d/Graphic3d_AspectMarker3d.cdl index a5c5565749..a4a50fc562 100644 --- a/src/Graphic3d/Graphic3d_AspectMarker3d.cdl +++ b/src/Graphic3d/Graphic3d_AspectMarker3d.cdl @@ -27,12 +27,12 @@ class AspectMarker3d from Graphic3d inherits AspectMarker from Aspect uses - Color from Quantity, - TypeOfMarker from Aspect, - HArray1OfByte from TColStd, - PixMap_Handle from Image, - MarkerImage_Handle from Graphic3d, - ShaderProgram_Handle from Graphic3d + Color from Quantity, + TypeOfMarker from Aspect, + HArray1OfByte from TColStd, + PixMap_Handle from Image, + MarkerImage from Graphic3d, + ShaderProgram from Graphic3d is @@ -73,7 +73,7 @@ is ---Purpose: Returns marker's texture size. GetMarkerImage (me) - returns MarkerImage_Handle from Graphic3d; + returns MarkerImage from Graphic3d; ---Level: Public ---Purpose: Returns marker's image texture. --- Could be null handle if marker aspect has been initialized as @@ -81,7 +81,7 @@ is ---C++: return const & SetMarkerImage (me : mutable; - theImage : MarkerImage_Handle from Graphic3d); + theImage : MarkerImage from Graphic3d); ---Level: Public ---Purpose: Set marker's image texture. @@ -91,12 +91,12 @@ is theTexture: HArray1OfByte from TColStd ) is static; SetShaderProgram ( me : mutable; - theProgram : ShaderProgram_Handle from Graphic3d ); + theProgram : ShaderProgram from Graphic3d ); ---Level: Public ---Purpose: Sets up OpenGL/GLSL shader program. ShaderProgram ( me ) - returns ShaderProgram_Handle from Graphic3d; + returns ShaderProgram from Graphic3d; ---C++: return const & fields @@ -113,8 +113,8 @@ fields -- - the scale factor -- defined by AspectMarker. -myMarkerImage : MarkerImage_Handle from Graphic3d is protected; +myMarkerImage : MarkerImage from Graphic3d is protected; -MyShaderProgram : ShaderProgram_Handle from Graphic3d; +MyShaderProgram : ShaderProgram from Graphic3d; end AspectMarker3d; diff --git a/src/Graphic3d/Graphic3d_AspectText3d.cdl b/src/Graphic3d/Graphic3d_AspectText3d.cdl index 3923253a70..5e54cf1b92 100644 --- a/src/Graphic3d/Graphic3d_AspectText3d.cdl +++ b/src/Graphic3d/Graphic3d_AspectText3d.cdl @@ -32,12 +32,12 @@ class AspectText3d from Graphic3d inherits TShared uses - Color from Quantity, - TypeOfStyleText from Aspect, - TypeOfDisplayText from Aspect, - AsciiString from TCollection, - FontAspect from Font, - ShaderProgram_Handle from Graphic3d + Color from Quantity, + TypeOfStyleText from Aspect, + TypeOfDisplayText from Aspect, + AsciiString from TCollection, + FontAspect from Font, + ShaderProgram from Graphic3d raises @@ -177,7 +177,7 @@ is ---Purpose: Returns text FontAspect SetShaderProgram ( me : mutable; - theProgram : ShaderProgram_Handle from Graphic3d ); + theProgram : ShaderProgram from Graphic3d ); ---Level: Public ---Purpose: Sets up OpenGL/GLSL shader program. @@ -243,7 +243,7 @@ is ---Category: Inquire methods ShaderProgram ( me ) - returns ShaderProgram_Handle from Graphic3d; + returns ShaderProgram from Graphic3d; ---C++: return const & -- @@ -293,6 +293,6 @@ fields -- the variable turning FontAspect of the text MyTextFontAspect : FontAspect from Font; - MyShaderProgram : ShaderProgram_Handle from Graphic3d; + MyShaderProgram : ShaderProgram from Graphic3d; end AspectText3d; diff --git a/src/Graphic3d/Graphic3d_BoundBuffer_Handle.hxx b/src/Graphic3d/Graphic3d_BoundBuffer_Handle.hxx deleted file mode 100644 index 0084bdf926..0000000000 --- a/src/Graphic3d/Graphic3d_BoundBuffer_Handle.hxx +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 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. - -#ifndef _Graphic3d_BoundBuffer_Handle_HeaderFile -#define _Graphic3d_BoundBuffer_Handle_HeaderFile - -#include -typedef Handle(Graphic3d_BoundBuffer) Graphic3d_BoundBuffer_Handle; - -#endif // _Graphic3d_BoundBuffer_Handle_HeaderFile diff --git a/src/Graphic3d/Graphic3d_Buffer_Handle.hxx b/src/Graphic3d/Graphic3d_Buffer_Handle.hxx deleted file mode 100644 index 9e8173e0d6..0000000000 --- a/src/Graphic3d/Graphic3d_Buffer_Handle.hxx +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 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. - -#ifndef _Graphic3d_Buffer_Handle_HeaderFile -#define _Graphic3d_Buffer_Handle_HeaderFile - -#include -typedef Handle(Graphic3d_Buffer) Graphic3d_Buffer_Handle; - -#endif // _Graphic3d_Buffer_Handle_HeaderFile diff --git a/src/Graphic3d/Graphic3d_CAspectFillArea.hxx b/src/Graphic3d/Graphic3d_CAspectFillArea.hxx index 9278f088b4..14956a92b5 100644 --- a/src/Graphic3d/Graphic3d_CAspectFillArea.hxx +++ b/src/Graphic3d/Graphic3d_CAspectFillArea.hxx @@ -17,7 +17,7 @@ #include #include -#include +#include class Graphic3d_CAspectFillArea { diff --git a/src/Graphic3d/Graphic3d_CAspectLine.hxx b/src/Graphic3d/Graphic3d_CAspectLine.hxx index facfa11746..45b97017bc 100644 --- a/src/Graphic3d/Graphic3d_CAspectLine.hxx +++ b/src/Graphic3d/Graphic3d_CAspectLine.hxx @@ -17,7 +17,7 @@ #include #include -#include +#include class Graphic3d_CAspectLine { diff --git a/src/Graphic3d/Graphic3d_CAspectMarker.hxx b/src/Graphic3d/Graphic3d_CAspectMarker.hxx index ce32de0b72..2060bfa143 100644 --- a/src/Graphic3d/Graphic3d_CAspectMarker.hxx +++ b/src/Graphic3d/Graphic3d_CAspectMarker.hxx @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include class Graphic3d_CAspectMarker { diff --git a/src/Graphic3d/Graphic3d_CAspectText.hxx b/src/Graphic3d/Graphic3d_CAspectText.hxx index d9bb7a8a36..036adcabae 100644 --- a/src/Graphic3d/Graphic3d_CAspectText.hxx +++ b/src/Graphic3d/Graphic3d_CAspectText.hxx @@ -17,7 +17,7 @@ #include #include -#include +#include class Graphic3d_CAspectText { diff --git a/src/Graphic3d/Graphic3d_CStructure.hxx b/src/Graphic3d/Graphic3d_CStructure.hxx index 4eb318fdd3..a16b45c9d4 100644 --- a/src/Graphic3d/Graphic3d_CStructure.hxx +++ b/src/Graphic3d/Graphic3d_CStructure.hxx @@ -16,18 +16,20 @@ #define _Graphic3d_CStructure_HeaderFile #include -#include #include #include #include #include #include +#include #include #include #include #include +//! Forward declaration. class Handle(Graphic3d_StructureManager); +class Handle(Graphic3d_CStructure); //! Low-level graphic structure interface class Graphic3d_CStructure : public Standard_Transient @@ -165,4 +167,6 @@ public: }; +DEFINE_STANDARD_HANDLE (Graphic3d_CStructure, Standard_Transient) + #endif // _Graphic3d_CStructure_HeaderFile diff --git a/src/Graphic3d/Graphic3d_CStructure_Handle.hxx b/src/Graphic3d/Graphic3d_CStructure_Handle.hxx deleted file mode 100644 index 8d83324d2f..0000000000 --- a/src/Graphic3d/Graphic3d_CStructure_Handle.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 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. - -#ifndef _Graphic3d_CStructure_Handle_H__ -#define _Graphic3d_CStructure_Handle_H__ - -#include -#include - -class Graphic3d_CStructure; -DEFINE_STANDARD_HANDLE(Graphic3d_CStructure, Standard_Transient) -typedef Handle(Graphic3d_CStructure) Graphic3d_CStructure_Handle; - -#endif // _Graphic3d_CStructure_Handle_H__ diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx index f7346179d5..92e90002bb 100644 --- a/src/Graphic3d/Graphic3d_Camera.hxx +++ b/src/Graphic3d/Graphic3d_Camera.hxx @@ -30,7 +30,8 @@ #include -DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient) +//! Forward declaration +class Handle(Graphic3d_Camera); //! Camera class provides object-oriented approach to setting up projection //! and orientation properties of 3D view. @@ -622,4 +623,6 @@ public: }; +DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient) + #endif diff --git a/src/Graphic3d/Graphic3d_Camera_Handle.hxx b/src/Graphic3d/Graphic3d_Camera_Handle.hxx deleted file mode 100644 index 7ffa0ee214..0000000000 --- a/src/Graphic3d/Graphic3d_Camera_Handle.hxx +++ /dev/null @@ -1,22 +0,0 @@ -// Created on: 2013-05-31 -// Created by: Anton POLETAEV -// 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. - -#ifndef _Graphic3d_Camera_Handle_H__ -#define _Graphic3d_Camera_Handle_H__ - -#include -typedef Handle(Graphic3d_Camera) Graphic3d_Camera_Handle; - -#endif diff --git a/src/Graphic3d/Graphic3d_ClipPlane.hxx b/src/Graphic3d/Graphic3d_ClipPlane.hxx index 6718cc60d2..25632b4102 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.hxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx @@ -24,11 +24,10 @@ #include #include -DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient) - class gp_Pln; class Graphic3d_AspectFillArea3d; class Handle(Graphic3d_AspectFillArea3d); +class Handle(Graphic3d_ClipPlane); //! Container for properties describing graphic driver clipping planes. //! It is up to application to create instances of this class and specify its @@ -224,4 +223,6 @@ public: DEFINE_STANDARD_RTTI(Graphic3d_ClipPlane); }; +DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient) + #endif diff --git a/src/Graphic3d/Graphic3d_ClipPlane_Handle.hxx b/src/Graphic3d/Graphic3d_ClipPlane_Handle.hxx deleted file mode 100755 index f085f57647..0000000000 --- a/src/Graphic3d/Graphic3d_ClipPlane_Handle.hxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 2013-07-12 -// Created by: Anton POLETAEV -// Copyright (c) 2013-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. - -#ifndef _Graphic3d_ClipPlane_Handle_HeaderFile -#define _Graphic3d_ClipPlane_Handle_HeaderFile - -#include -//! CDL-compatibility handle type definition for clip plane objects. -typedef Handle(Graphic3d_ClipPlane) Graphic3d_ClipPlane_Handle; - -#endif diff --git a/src/Graphic3d/Graphic3d_GraphicDriver.cdl b/src/Graphic3d/Graphic3d_GraphicDriver.cdl index 91fe6973a2..8645c08e21 100644 --- a/src/Graphic3d/Graphic3d_GraphicDriver.cdl +++ b/src/Graphic3d/Graphic3d_GraphicDriver.cdl @@ -48,7 +48,7 @@ uses Handle from Aspect, Display from Aspect, PrintAlgo from Aspect, - DisplayConnection_Handle from Aspect, + DisplayConnection from Aspect, ZLayerId from Graphic3d, ZLayerSettings from Graphic3d, @@ -63,7 +63,6 @@ uses CLight from Graphic3d, CPlane from Graphic3d, CStructure from Graphic3d, - CStructure_Handle from Graphic3d, CView from Graphic3d, BufferType from Graphic3d, Structure from Graphic3d, @@ -96,7 +95,7 @@ raises TransformError from Graphic3d is - Initialize (theDisp : DisplayConnection_Handle from Aspect) + Initialize (theDisp : DisplayConnection from Aspect) returns GraphicDriver from Graphic3d; ---Level: Public ---Purpose: Initialises the Driver @@ -138,13 +137,13 @@ is ---Purpose: call_togl_erasestructure RemoveStructure ( me : mutable; - theCStructure : in out CStructure_Handle from Graphic3d ) + theCStructure : in out CStructure from Graphic3d ) is deferred; ---Purpose: call_togl_removestructure Structure (me : mutable; theManager : StructureManager from Graphic3d) - returns CStructure_Handle from Graphic3d + returns CStructure from Graphic3d is deferred; ---Purpose: Creates new empty graphic structure @@ -379,11 +378,9 @@ is is deferred; ---Purpose: Display structure in immediate mode on top of general presentation - EraseImmediateStructure ( me : mutable; - theCView : CView from Graphic3d; - theCStructure : CStructure from Graphic3d ) - is deferred; - ---Purpose: Erases immediate structure + ---C++: alias " + //! Erases immediate structure + Standard_EXPORT virtual void EraseImmediateStructure (const Graphic3d_CView& theCView, const Graphic3d_CStructure& theCStructure) = 0;" ------------------------------- -- Category: Layer mode methods @@ -657,12 +654,9 @@ is -- indexes will be set to default layer ( the bottom-level z layer -- with ID = 0 ). - ChangeZLayer( me : mutable; - theCStructure : CStructure from Graphic3d; - theCView : CView from Graphic3d; - theNewLayerId : ZLayerId from Graphic3d ) - is deferred; - ---Purpose: Change Z layer of a structure already presented in view. + ---C++: alias " + //! Change Z layer of a structure already presented in view. + Standard_EXPORT virtual void ChangeZLayer (const Graphic3d_CStructure& theCStructure, const Graphic3d_CView& theCView, const Graphic3d_ZLayerId theNewLayerId) = 0;" SetZLayerSettings( me : mutable; theCView : CView from Graphic3d; @@ -671,13 +665,9 @@ is is deferred; ---Purpose: Sets the settings for a single Z layer of specified view. - ChangePriority( me : mutable; - theCStructure : CStructure from Graphic3d; - theCView : CView from Graphic3d; - theNewPriority : Integer from Standard ) - is deferred; - ---Purpose: Changes the priority of a structure within its Z layer - -- in the specified view. + ---C++: alias " + //! Changes the priority of a structure within its Z layer in the specified view. + Standard_EXPORT virtual void ChangePriority (const Graphic3d_CStructure& theCStructure, const Graphic3d_CView& theCView, const Standard_Integer theNewPriority) = 0;" ----------------------------- -- Category: Internal methods @@ -691,9 +681,8 @@ is ACLight : CLight from Graphic3d; AField : Integer from Standard ); - PrintCStructure ( me; - ACStructure : CStructure from Graphic3d; - AField : Integer from Standard ); + ---C++: alias " + Standard_EXPORT void PrintCStructure (const Graphic3d_CStructure& ACStructure, const Standard_Integer AField) const;" PrintCView ( me; ACView : CView from Graphic3d; @@ -732,7 +721,7 @@ is is static; GetDisplayConnection (me) - returns DisplayConnection_Handle from Aspect; + returns DisplayConnection from Aspect; ---C++: return const & ---Purpose: returns Handle to display connection @@ -747,7 +736,7 @@ is fields MyTraceLevel : Integer from Standard is protected; - myDisplayConnection: DisplayConnection_Handle from Aspect is protected; + myDisplayConnection: DisplayConnection from Aspect is protected; myDeviceLostFlag : Boolean from Standard is protected; end GraphicDriver from Graphic3d; diff --git a/src/Graphic3d/Graphic3d_Group.cdl b/src/Graphic3d/Graphic3d_Group.cdl index 3c4d230ecc..e22cd5fa6e 100644 --- a/src/Graphic3d/Graphic3d_Group.cdl +++ b/src/Graphic3d/Graphic3d_Group.cdl @@ -83,9 +83,9 @@ deferred class Group from Graphic3d inherits TShared VerticalTextAlignment from Graphic3d, ArrayOfPrimitives from Graphic3d, TypeOfPrimitiveArray from Graphic3d, - IndexBuffer_Handle from Graphic3d, - Buffer_Handle from Graphic3d, - BoundBuffer_Handle from Graphic3d, + IndexBuffer from Graphic3d, + Buffer from Graphic3d, + BoundBuffer from Graphic3d, TransModeFlags from Graphic3d, BndBox4f from Graphic3d, Ax2 from gp @@ -360,9 +360,9 @@ deferred class Group from Graphic3d inherits TShared AddPrimitiveArray (me : mutable; theType : TypeOfPrimitiveArray from Graphic3d; - theIndices : IndexBuffer_Handle from Graphic3d; - theAttribs : Buffer_Handle from Graphic3d; - theBounds : BoundBuffer_Handle from Graphic3d; + theIndices : IndexBuffer from Graphic3d; + theAttribs : Buffer from Graphic3d; + theBounds : BoundBuffer from Graphic3d; theToEvalMinMax : Boolean from Standard = Standard_True) is virtual; ---Level: Public ---Purpose: Adds an array of primitives for display diff --git a/src/Graphic3d/Graphic3d_IndexBuffer_Handle.hxx b/src/Graphic3d/Graphic3d_IndexBuffer_Handle.hxx deleted file mode 100644 index 1d6db7f598..0000000000 --- a/src/Graphic3d/Graphic3d_IndexBuffer_Handle.hxx +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 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. - -#ifndef _Graphic3d_IndexBuffer_Handle_HeaderFile -#define _Graphic3d_IndexBuffer_Handle_HeaderFile - -#include -typedef Handle(Graphic3d_IndexBuffer) Graphic3d_IndexBuffer_Handle; - -#endif // _Graphic3d_IndexBuffer_Handle_HeaderFile diff --git a/src/Graphic3d/Graphic3d_MarkerImage.hxx b/src/Graphic3d/Graphic3d_MarkerImage.hxx index fc68e47ac1..ff91a4daa6 100755 --- a/src/Graphic3d/Graphic3d_MarkerImage.hxx +++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx @@ -16,8 +16,6 @@ #ifndef _Graphic3d_MarkerImage_H__ #define _Graphic3d_MarkerImage_H__ -#include - #include #include #include @@ -83,4 +81,6 @@ public: }; +DEFINE_STANDARD_HANDLE (Graphic3d_MarkerImage, Standard_Transient) + #endif // _Graphic3d_MarkerImage_H__ diff --git a/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx b/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx deleted file mode 100755 index 97a14d2315..0000000000 --- a/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 2013-06-25 -// Created by: Dmitry BOBYLEV -// Copyright (c) 2013-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. - -#ifndef _Graphic3d_TextureBitMap_Handle_H__ -#define _Graphic3d_TextureBitMap_Handle_H__ - -#include -#include - -class Graphic3d_TextureBitMap; -DEFINE_STANDARD_HANDLE(Graphic3d_MarkerImage, Standard_Transient) -typedef Handle(Graphic3d_MarkerImage) Graphic3d_MarkerImage_Handle; - -#endif // _Graphic3d_TextureBitMap_Handle_H__ diff --git a/src/Graphic3d/Graphic3d_SequenceOfHClipPlane_Handle.hxx b/src/Graphic3d/Graphic3d_SequenceOfHClipPlane_Handle.hxx deleted file mode 100755 index 9c1dccfe76..0000000000 --- a/src/Graphic3d/Graphic3d_SequenceOfHClipPlane_Handle.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2013-10-08 -// Created by: Anton POLETAEV -// Copyright (c) 2013-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. - -#ifndef _Graphic3d_SequenceOfHClipPlane_Handle_HeaderFile -#define _Graphic3d_SequenceOfHClipPlane_Handle_HeaderFile - -#include -#include - -typedef NCollection_Handle Handle(Graphic3d_SequenceOfHClipPlane); - -#endif diff --git a/src/Graphic3d/Graphic3d_ShaderObject.hxx b/src/Graphic3d/Graphic3d_ShaderObject.hxx index e8658cd282..c2871cfb59 100755 --- a/src/Graphic3d/Graphic3d_ShaderObject.hxx +++ b/src/Graphic3d/Graphic3d_ShaderObject.hxx @@ -19,7 +19,9 @@ #include #include -#include + +//! Forward declaration +class Handle(Graphic3d_ShaderObject); //! This class is responsible for managing shader objects. class Graphic3d_ShaderObject : public Standard_Transient @@ -73,4 +75,6 @@ private: Graphic3d_TypeOfShaderObject myType; }; +DEFINE_STANDARD_HANDLE (Graphic3d_ShaderObject, Standard_Transient) + #endif diff --git a/src/Graphic3d/Graphic3d_ShaderObject_Handle.hxx b/src/Graphic3d/Graphic3d_ShaderObject_Handle.hxx deleted file mode 100755 index 500fc0b1a4..0000000000 --- a/src/Graphic3d/Graphic3d_ShaderObject_Handle.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 2013-09-20 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-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. - -#ifndef _Handle_Graphic3d_ShaderObject_HeaderFile -#define _Handle_Graphic3d_ShaderObject_HeaderFile - -#include - -class Graphic3d_ShaderObject; -DEFINE_STANDARD_HANDLE (Graphic3d_ShaderObject, Standard_Transient) - -typedef Handle(Graphic3d_ShaderObject) Graphic3d_ShaderObject_Handle; - -#endif diff --git a/src/Graphic3d/Graphic3d_ShaderProgram.hxx b/src/Graphic3d/Graphic3d_ShaderProgram.hxx index 44fc43efba..0809901563 100755 --- a/src/Graphic3d/Graphic3d_ShaderProgram.hxx +++ b/src/Graphic3d/Graphic3d_ShaderProgram.hxx @@ -16,8 +16,7 @@ #ifndef _Graphic3d_ShaderProgram_HeaderFile #define _Graphic3d_ShaderProgram_HeaderFile -#include -#include +#include #include #include @@ -112,6 +111,8 @@ private: }; +DEFINE_STANDARD_HANDLE (Graphic3d_ShaderProgram, Standard_Transient) + // ======================================================================= // function : PushVariable // purpose : Pushes custom uniform variable to the program diff --git a/src/Graphic3d/Graphic3d_ShaderProgram_Handle.hxx b/src/Graphic3d/Graphic3d_ShaderProgram_Handle.hxx deleted file mode 100755 index d45836767a..0000000000 --- a/src/Graphic3d/Graphic3d_ShaderProgram_Handle.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 2013-09-20 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-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. - -#ifndef _Handle_Graphic3d_ShaderProgram_HeaderFile -#define _Handle_Graphic3d_ShaderProgram_HeaderFile - -#include - -class Graphic3d_ShaderProgram; -DEFINE_STANDARD_HANDLE (Graphic3d_ShaderProgram, Standard_Transient) - -typedef Handle(Graphic3d_ShaderProgram) Graphic3d_ShaderProgram_Handle; - -#endif diff --git a/src/Graphic3d/Graphic3d_ShaderVariable.hxx b/src/Graphic3d/Graphic3d_ShaderVariable.hxx index a9981c4560..557dfd6245 100755 --- a/src/Graphic3d/Graphic3d_ShaderVariable.hxx +++ b/src/Graphic3d/Graphic3d_ShaderVariable.hxx @@ -20,8 +20,6 @@ #include #include -#include - //! Interface for generic variable value. struct Graphic3d_ValueInterface { @@ -162,6 +160,8 @@ protected: Graphic3d_ValueInterface* myValue; }; +DEFINE_STANDARD_HANDLE (Graphic3d_ShaderVariable, Standard_Transient) + #include #endif // _Graphic3d_ShaderVariable_HeaderFile diff --git a/src/Graphic3d/Graphic3d_ShaderVariable_Handle.hxx b/src/Graphic3d/Graphic3d_ShaderVariable_Handle.hxx deleted file mode 100755 index 8d87739bbf..0000000000 --- a/src/Graphic3d/Graphic3d_ShaderVariable_Handle.hxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 2013-09-25 -// Created by: Denis BOGOLEPOV -// Copyright (c) 2013-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. - -#ifndef _Handle_Graphic3d_ShaderVariable_HeaderFile -#define _Handle_Graphic3d_ShaderVariable_HeaderFile - -#include - -class Graphic3d_ShaderVariable; -DEFINE_STANDARD_HANDLE (Graphic3d_ShaderVariable, Standard_Transient) - -#endif diff --git a/src/Graphic3d/Graphic3d_Structure.cdl b/src/Graphic3d/Graphic3d_Structure.cdl index c4e94ec62a..263108d668 100644 --- a/src/Graphic3d/Graphic3d_Structure.cdl +++ b/src/Graphic3d/Graphic3d_Structure.cdl @@ -54,7 +54,7 @@ uses AspectMarker3d from Graphic3d, AspectText3d from Graphic3d, CStructure from Graphic3d, - CStructure_Handle from Graphic3d, + CStructure from Graphic3d, GraphicDriver from Graphic3d, Group from Graphic3d, SequenceOfGroup from Graphic3d, @@ -951,7 +951,7 @@ is ---Category: Private methods CStructure (me) - returns CStructure_Handle from Graphic3d + returns CStructure from Graphic3d is static; ---Purpose: Returns the low-level structure ---C++: return const & @@ -969,7 +969,7 @@ fields -- -- the associated low-level structure - myCStructure : CStructure_Handle from Graphic3d; + myCStructure : CStructure from Graphic3d; -- the structures to which the structure is attached myAncestors : SequenceOfAddress from TColStd; diff --git a/src/Graphic3d/Graphic3d_ViewAffinity.hxx b/src/Graphic3d/Graphic3d_ViewAffinity.hxx index f6b0b48ed9..0835726167 100644 --- a/src/Graphic3d/Graphic3d_ViewAffinity.hxx +++ b/src/Graphic3d/Graphic3d_ViewAffinity.hxx @@ -16,7 +16,9 @@ #ifndef _Graphic3d_ViewAffinity_HeaderFile #define _Graphic3d_ViewAffinity_HeaderFile -#include +#include +#include +#include //! Structure display state. class Graphic3d_ViewAffinity : public Standard_Transient diff --git a/src/OpenGl/OpenGl_AspectFace.hxx b/src/OpenGl/OpenGl_AspectFace.hxx index 35aa98e097..45f65fb60a 100644 --- a/src/OpenGl/OpenGl_AspectFace.hxx +++ b/src/OpenGl/OpenGl_AspectFace.hxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include #define OPENGL_AMBIENT_MASK (1<<0) diff --git a/src/OpenGl/OpenGl_ShaderManager.hxx b/src/OpenGl/OpenGl_ShaderManager.hxx index b7842785c9..780b76fb8e 100644 --- a/src/OpenGl/OpenGl_ShaderManager.hxx +++ b/src/OpenGl/OpenGl_ShaderManager.hxx @@ -16,7 +16,7 @@ #ifndef _OpenGl_ShaderManager_HeaderFile #define _OpenGl_ShaderManager_HeaderFile -#include +#include #include #include diff --git a/src/OpenGl/OpenGl_Structure.cxx b/src/OpenGl/OpenGl_Structure.cxx index d621ba5e93..26bea9da5e 100644 --- a/src/OpenGl/OpenGl_Structure.cxx +++ b/src/OpenGl/OpenGl_Structure.cxx @@ -25,7 +25,7 @@ #include #include -#include +#include IMPLEMENT_STANDARD_HANDLE (OpenGl_Structure, Graphic3d_CStructure) IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Structure, Graphic3d_CStructure) @@ -705,7 +705,7 @@ void OpenGl_Structure::Render (const Handle(OpenGl_Workspace) &theWorkspace) con // Set up plane equations for non-structure transformed global model-view matrix // List of planes to be applied to context state - Handle(Graphic3d_SequenceOfHClipPlane) aUserPlanes; + NCollection_Handle aUserPlanes; // Collect clipping planes of structure scope if (!myClipPlanes.IsEmpty()) diff --git a/src/Prs3d/Prs3d_PointAspect.cdl b/src/Prs3d/Prs3d_PointAspect.cdl index b8c0a4c29c..a7bfc3d2d5 100644 --- a/src/Prs3d/Prs3d_PointAspect.cdl +++ b/src/Prs3d/Prs3d_PointAspect.cdl @@ -22,12 +22,12 @@ class PointAspect from Prs3d inherits BasicAspect from Prs3d uses - AspectMarker3d from Graphic3d, - NameOfColor from Quantity, - Color from Quantity, - TypeOfMarker from Aspect, - HArray1OfByte from TColStd, - MarkerImage_Handle from Graphic3d + AspectMarker3d from Graphic3d, + NameOfColor from Quantity, + Color from Quantity, + TypeOfMarker from Aspect, + HArray1OfByte from TColStd, + MarkerImage from Graphic3d is @@ -81,7 +81,7 @@ is ---Purpose: Returns marker's texture size. GetTexture (me:mutable) - returns MarkerImage_Handle from Graphic3d; + returns MarkerImage from Graphic3d; ---Level: Public ---Purpose: Returns marker's texture. ---C++: return const & diff --git a/src/PrsMgr/PrsMgr_PresentableObject.cdl b/src/PrsMgr/PrsMgr_PresentableObject.cdl index 3dbfeb4921..96c0b3520d 100644 --- a/src/PrsMgr/PrsMgr_PresentableObject.cdl +++ b/src/PrsMgr/PrsMgr_PresentableObject.cdl @@ -57,7 +57,7 @@ uses Transformation from Geom, ListOfInteger from TColStd, Location from TopLoc, - ClipPlane_Handle from Graphic3d, + ClipPlane from Graphic3d, SequenceOfHClipPlane from Graphic3d, TransModeFlags from Graphic3d, Pnt from gp, @@ -256,7 +256,7 @@ is returns ZLayerId from Graphic3d is static; ---Purpose: Get ID of Z layer. - AddClipPlane (me : mutable; thePlane : ClipPlane_Handle from Graphic3d) is virtual; + AddClipPlane (me : mutable; thePlane : ClipPlane from Graphic3d) is virtual; ---Purpose: Adds clip plane for graphical clipping for all display mode -- presentations. The composition of clip planes truncates the rendering -- space to convex volume. Please be aware that number of supported @@ -266,7 +266,7 @@ is -- to predict the maximum possible number of object clipping planes. -- @param thePlane [in] the clip plane to be appended to map of clip planes. - RemoveClipPlane (me : mutable; thePlane : ClipPlane_Handle from Graphic3d) is virtual; + RemoveClipPlane (me : mutable; thePlane : ClipPlane from Graphic3d) is virtual; ---Purpose: Removes previously added clip plane. -- @param thePlane [in] the clip plane to be removed from map of clip planes. diff --git a/src/V3d/V3d_View.cdl b/src/V3d/V3d_View.cdl index 794ed0a77e..e9d71c157c 100644 --- a/src/V3d/V3d_View.cdl +++ b/src/V3d/V3d_View.cdl @@ -93,7 +93,7 @@ uses ContextView from Visual3d, Vector from Graphic3d, Vertex from Graphic3d, - Camera_Handle from Graphic3d, + Camera from Graphic3d, Window from Aspect, PixMap from Image, BufferType from Graphic3d, @@ -121,7 +121,7 @@ uses AsciiString from TCollection, ExtendedString from TCollection, PrintAlgo from Aspect, - ClipPlane_Handle from Graphic3d, + ClipPlane from Graphic3d, GraduatedTrihedron from Graphic3d, SequenceOfHClipPlane from Graphic3d, RenderingMode from Graphic3d, @@ -1379,14 +1379,14 @@ is ---Purpose: returns the current state of the gl lighting -- currently used in triedron displaying - AddClipPlane (me : mutable; thePlane : ClipPlane_Handle from Graphic3d) is virtual; + AddClipPlane (me : mutable; thePlane : ClipPlane from Graphic3d) is virtual; ---Purpose: Adds clip plane to the view. The composition of clip planes truncates the -- rendering space to convex volume. Number of supported clip planes can be consulted -- by PlaneLimit method of associated Visual3d_View. Please be aware that the planes -- which exceed the limit are ignored during rendering. -- @param thePlane [in] the clip plane to be added to view. - RemoveClipPlane (me : mutable; thePlane : ClipPlane_Handle from Graphic3d) is virtual; + RemoveClipPlane (me : mutable; thePlane : ClipPlane from Graphic3d) is virtual; ---Purpose: Removes clip plane from the view. -- @param thePlane [in] the clip plane to be removed from view. @@ -1404,11 +1404,11 @@ is ---Purpose: Get clip planes. -- @return sequence clip planes that have been set for the view - SetCamera (me : mutable; theCamera : Camera_Handle from Graphic3d) is static; + SetCamera (me : mutable; theCamera : Camera from Graphic3d) is static; ---Level: Public ---Purpose: Change camera used by view. - Camera (me) returns Camera_Handle from Graphic3d is static; + Camera (me) returns Camera from Graphic3d is static; ---Level: Public ---C++: return const& ---Purpose: Returns camera object of the view. @@ -1416,7 +1416,7 @@ is -- the camera approach. FitMinMax (me; - theCamera : Camera_Handle from Graphic3d; + theCamera : Camera from Graphic3d; theBox : Box from Bnd; theMargin : Real from Standard; theResolution : Real from Standard = 0.0; @@ -1440,7 +1440,7 @@ is -- @return TRUE if the fit all operation can be done. Scale (me; - theCamera : Camera_Handle from Graphic3d; + theCamera : Camera from Graphic3d; theSizeXv : Real from Standard; theSizeYv : Real from Standard) is protected; ---Level: Protected @@ -1451,7 +1451,7 @@ is -- @param theSizeYv [in] size of viewport frame on "y" axis. Translate (me; - theCamera : Camera_Handle from Graphic3d; + theCamera : Camera from Graphic3d; theDXv : Real from Standard; theDYv : Real from Standard) is protected; ---Level: Protected @@ -1486,7 +1486,7 @@ fields myCamStartOpEye : Pnt from gp is protected; myCamStartOpBnd : Real[6] is protected; myCamStartOpCenter : Pnt from gp is protected; - myCamera : Camera_Handle from Graphic3d is protected; + myCamera : Camera from Graphic3d is protected; MyViewer : ViewerPointer from V3d ; MyActiveLights: ListOfTransient from V3d; diff --git a/src/Visual3d/Visual3d_View.cdl b/src/Visual3d/Visual3d_View.cdl index 34f60f09b4..82594e2063 100644 --- a/src/Visual3d/Visual3d_View.cdl +++ b/src/Visual3d/Visual3d_View.cdl @@ -80,7 +80,7 @@ uses Structure from Graphic3d, SequenceOfStructure from Graphic3d, MapOfStructure from Graphic3d, - Camera_Handle from Graphic3d, + Camera from Graphic3d, ZLayerId from Graphic3d, ZLayerSettings from Graphic3d, @@ -635,20 +635,20 @@ is -- 3d coordinates , , . DefaultCamera (me) - returns Camera_Handle from Graphic3d + returns Camera from Graphic3d is static; ---Level: Public ---Purpose: @return the default camera of . ---C++: return const & Camera (me) - returns Camera_Handle from Graphic3d + returns Camera from Graphic3d is static; ---Level: Public ---Purpose: @return the camera of . ---C++: return const & - SetCamera (me : mutable; theCamera : Camera_Handle from Graphic3d) is static; + SetCamera (me : mutable; theCamera : Camera from Graphic3d) is static; ---Level: Public ---Purpose: Set camera object to provide orientation and projection matrices -- for graphic driver. @@ -1123,7 +1123,7 @@ fields myGTrihedron : GraduatedTrihedron from Graphic3d; - myDefaultCamera : Camera_Handle from Graphic3d; + myDefaultCamera : Camera from Graphic3d; myAutoZFitIsOn : Boolean from Standard; myAutoZFitScaleFactor : Real from Standard; -- 2.20.1