OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-08 18:40:55 +03:00
Code Packages Releases Activity

0026033: Coding rules - get rid from _Handle classes

Browse Source
This commit is contained in:
isk 2015-04-10 14:56:03 +03:00 committed by bugmaster
parent 7bb2b8293a
commit 494782f666
44 changed files with 144 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Aspect/Aspect.cdl
View File

@ -133,9 +133,7 @@ is
deferred class ColorScale; deferred class ColorScale;
imported DisplayConnection; imported transient class DisplayConnection;
imported DisplayConnection_Handle;
------------------------- -------------------------
-- Category: Enumerations -- Category: Enumerations

3
src/Aspect/Aspect_DisplayConnection.hxx
View File

@ -15,7 +15,6 @@
#define _Aspect_DisplayConnection_H__ #define _Aspect_DisplayConnection_H__
#include <Standard_Transient.hxx> #include <Standard_Transient.hxx>
#include <Aspect_DisplayConnection_Handle.hxx>
#include <Aspect_XAtom.hxx> #include <Aspect_XAtom.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
@ -81,4 +80,6 @@ public:
}; };
DEFINE_STANDARD_HANDLE (Aspect_DisplayConnection, Standard_Transient)
#endif // _Aspect_DisplayConnection_H__ #endif // _Aspect_DisplayConnection_H__

25
src/Aspect/Aspect_DisplayConnection_Handle.hxx
View File

@ -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 <Standard_Transient.hxx>
// 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__

1
src/Aspect/FILES
View File

@ -14,4 +14,3 @@ Aspect_GradientBackground.cxx
Aspect_Convert.hxx Aspect_Convert.hxx
Aspect_DisplayConnection.hxx Aspect_DisplayConnection.hxx
Aspect_DisplayConnection.cxx Aspect_DisplayConnection.cxx
Aspect_DisplayConnection_Handle.hxx

11
src/Graphic3d/FILES
View File

@ -1,18 +1,14 @@
Graphic3d_BndBox4d.hxx Graphic3d_BndBox4d.hxx
Graphic3d_BndBox4f.hxx Graphic3d_BndBox4f.hxx
Graphic3d_Buffer.hxx Graphic3d_Buffer.hxx
Graphic3d_Buffer_Handle.hxx
Graphic3d_BoundBuffer.hxx Graphic3d_BoundBuffer.hxx
Graphic3d_BoundBuffer_Handle.hxx
Graphic3d_IndexBuffer.hxx Graphic3d_IndexBuffer.hxx
Graphic3d_IndexBuffer_Handle.hxx
Graphic3d_CAspectFillArea.hxx Graphic3d_CAspectFillArea.hxx
Graphic3d_CAspectLine.hxx Graphic3d_CAspectLine.hxx
Graphic3d_CAspectMarker.hxx Graphic3d_CAspectMarker.hxx
Graphic3d_CAspectText.hxx Graphic3d_CAspectText.hxx
Graphic3d_CStructure.cxx Graphic3d_CStructure.cxx
Graphic3d_CStructure.hxx Graphic3d_CStructure.hxx
Graphic3d_CStructure_Handle.hxx
Graphic3d_CBitFields16.hxx Graphic3d_CBitFields16.hxx
Graphic3d_CBitFields20.hxx Graphic3d_CBitFields20.hxx
Graphic3d_CBitFields8.hxx Graphic3d_CBitFields8.hxx
@ -34,9 +30,6 @@ Graphic3d_ShaderProgram.cxx
Graphic3d_ShaderVariable.hxx Graphic3d_ShaderVariable.hxx
Graphic3d_ShaderVariable.cxx Graphic3d_ShaderVariable.cxx
Graphic3d_ShaderVariable.lxx Graphic3d_ShaderVariable.lxx
Graphic3d_ShaderObject_Handle.hxx
Graphic3d_ShaderProgram_Handle.hxx
Graphic3d_ShaderVariable_Handle.hxx
Graphic3d_MapOfStructure.hxx Graphic3d_MapOfStructure.hxx
Graphic3d_MapIteratorOfMapOfStructure.hxx Graphic3d_MapIteratorOfMapOfStructure.hxx
Graphic3d_TypeOfShaderObject.hxx Graphic3d_TypeOfShaderObject.hxx
@ -63,15 +56,11 @@ Graphic3d_Vertex.hxx
Graphic3d_Vertex.cxx Graphic3d_Vertex.cxx
Graphic3d_MarkerImage.hxx Graphic3d_MarkerImage.hxx
Graphic3d_MarkerImage.cxx Graphic3d_MarkerImage.cxx
Graphic3d_MarkerImage_Handle.hxx
Graphic3d_ClipPlane.hxx Graphic3d_ClipPlane.hxx
Graphic3d_ClipPlane.cxx Graphic3d_ClipPlane.cxx
Graphic3d_ClipPlane_Handle.hxx
Graphic3d_SequenceOfGroup.hxx Graphic3d_SequenceOfGroup.hxx
Graphic3d_SequenceOfHClipPlane.hxx Graphic3d_SequenceOfHClipPlane.hxx
Graphic3d_SequenceOfHClipPlane_Handle.hxx
Graphic3d_Camera.cxx Graphic3d_Camera.cxx
Graphic3d_Camera.hxx Graphic3d_Camera.hxx
Graphic3d_Camera_Handle.hxx
Graphic3d_RenderingParams.hxx Graphic3d_RenderingParams.hxx
Graphic3d_NMapOfTransient.hxx Graphic3d_NMapOfTransient.hxx

23
src/Graphic3d/Graphic3d.cdl
View File

@ -355,12 +355,9 @@ is
imported BndBox4f; imported BndBox4f;
---Purpose: Redefines BVH_Box<Standard_ShortReal, 4> for AABB representation ---Purpose: Redefines BVH_Box<Standard_ShortReal, 4> for AABB representation
---Category: Imported types ---Category: Imported types
imported Buffer; imported transient class Buffer;
imported Buffer_Handle; imported transient class BoundBuffer;
imported BoundBuffer; imported transient class IndexBuffer;
imported BoundBuffer_Handle;
imported IndexBuffer;
imported IndexBuffer_Handle;
imported BndBox4d; imported BndBox4d;
imported BufferType; imported BufferType;
@ -382,13 +379,11 @@ is
imported CAspectLine; imported CAspectLine;
imported CAspectText; imported CAspectText;
imported CStructure; imported transient class CStructure;
---Category: Imported types ---Category: Imported types
pointer CStructurePtr to CStructure from Graphic3d; pointer CStructurePtr to CStructure from Graphic3d;
imported CStructure_Handle;
imported CLight; imported CLight;
---Category: Imported types ---Category: Imported types
@ -408,19 +403,17 @@ is
imported GraduatedTrihedron; imported GraduatedTrihedron;
---Category: Imported types ---Category: Imported types
imported ClipPlane; imported transient class ClipPlane;
---Category: Imported types ---Category: Imported types
imported ClipPlane_Handle;
imported CTexture; imported CTexture;
imported CTransPersStruct; imported CTransPersStruct;
imported TransModeFlags; imported TransModeFlags;
imported MarkerImage; imported transient class MarkerImage;
imported MarkerImage_Handle; imported transient class Camera;
imported Camera_Handle;
primitive PtrFrameBuffer; primitive PtrFrameBuffer;
primitive Vec2; primitive Vec2;
@ -538,7 +531,7 @@ is
imported NListOfHAsciiString; imported NListOfHAsciiString;
---Category: Instantiated classes ---Category: Instantiated classes
imported ShaderProgram_Handle; imported transient class ShaderProgram;
---Category: Instantiated classes ---Category: Instantiated classes
imported SequenceOfHClipPlane; imported SequenceOfHClipPlane;

18
src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl
View File

@ -35,9 +35,9 @@ deferred class ArrayOfPrimitives from Graphic3d inherits TShared
uses uses
TypeOfPrimitiveArray from Graphic3d, TypeOfPrimitiveArray from Graphic3d,
Buffer_Handle from Graphic3d, Buffer from Graphic3d,
BoundBuffer_Handle from Graphic3d, BoundBuffer from Graphic3d,
IndexBuffer_Handle from Graphic3d, IndexBuffer from Graphic3d,
Vec3 from Graphic3d, Vec3 from Graphic3d,
Color from Quantity, Color from Quantity,
Pnt from gp, Pnt from gp,
@ -442,19 +442,19 @@ is
------------------------------------------------------------------- -------------------------------------------------------------------
Indices (me) Indices (me)
returns IndexBuffer_Handle from Graphic3d; returns IndexBuffer from Graphic3d;
---Purpose: Returns optional index buffer. ---Purpose: Returns optional index buffer.
---C++: inline ---C++: inline
---C++: return const & ---C++: return const &
Attributes (me) Attributes (me)
returns Buffer_Handle from Graphic3d; returns Buffer from Graphic3d;
---Purpose: Returns vertex attributes buffer (colors, normals, texture coordinates). ---Purpose: Returns vertex attributes buffer (colors, normals, texture coordinates).
---C++: inline ---C++: inline
---C++: return const & ---C++: return const &
Bounds (me) Bounds (me)
returns BoundBuffer_Handle from Graphic3d; returns BoundBuffer from Graphic3d;
---Purpose: Returns optional bounds buffer. ---Purpose: Returns optional bounds buffer.
---C++: inline ---C++: inline
---C++: return const & ---C++: return const &
@ -644,9 +644,9 @@ is
fields fields
myIndices : IndexBuffer_Handle from Graphic3d; -- optional index buffer myIndices : IndexBuffer from Graphic3d; -- optional index buffer
myAttribs : Buffer_Handle from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates) myAttribs : Buffer from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates)
myBounds : BoundBuffer_Handle from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates) myBounds : BoundBuffer from Graphic3d; -- vertex attributes buffer (colors, normals, texture coordinates)
myType : TypeOfPrimitiveArray from Graphic3d; myType : TypeOfPrimitiveArray from Graphic3d;

20
src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
View File

@ -38,16 +38,16 @@ class AspectFillArea3d from Graphic3d inherits AspectFillArea from Aspect
uses uses
Color from Quantity, Color from Quantity,
Ratio from Quantity, Ratio from Quantity,
TypeOfLine from Aspect, TypeOfLine from Aspect,
InteriorStyle from Aspect, InteriorStyle from Aspect,
MaterialAspect from Graphic3d, MaterialAspect from Graphic3d,
TextureMap from Graphic3d, TextureMap from Graphic3d,
ShaderProgram_Handle from Graphic3d ShaderProgram from Graphic3d
is is
@ -188,7 +188,7 @@ is
---Category: Methods to modify the class definition ---Category: Methods to modify the class definition
SetShaderProgram ( me : mutable; SetShaderProgram ( me : mutable;
theProgram : ShaderProgram_Handle from Graphic3d ); theProgram : ShaderProgram from Graphic3d );
---Level: Public ---Level: Public
---Purpose: Sets up OpenGL/GLSL shader program. ---Purpose: Sets up OpenGL/GLSL shader program.
---Category: Methods to modify the class definition ---Category: Methods to modify the class definition
@ -253,7 +253,7 @@ is
---Category: Inquire methods ---Category: Inquire methods
ShaderProgram ( me ) ShaderProgram ( me )
returns ShaderProgram_Handle from Graphic3d; returns ShaderProgram from Graphic3d;
---C++: return const & ---C++: return const &
-- --
@ -299,6 +299,6 @@ fields
MyPolygonOffsetFactor : ShortReal from Standard; MyPolygonOffsetFactor : ShortReal from Standard;
MyPolygonOffsetUnits : ShortReal from Standard; MyPolygonOffsetUnits : ShortReal from Standard;
MyShaderProgram : ShaderProgram_Handle from Graphic3d; MyShaderProgram : ShaderProgram from Graphic3d;
end AspectFillArea3d; end AspectFillArea3d;

12
src/Graphic3d/Graphic3d_AspectLine3d.cdl
View File

@ -24,9 +24,9 @@ class AspectLine3d from Graphic3d inherits AspectLine from Aspect
uses uses
Color from Quantity, Color from Quantity,
TypeOfLine from Aspect, TypeOfLine from Aspect,
ShaderProgram_Handle from Graphic3d ShaderProgram from Graphic3d
is is
@ -54,12 +54,12 @@ is
-- The supported linewidths vary by 1-pixel units. -- The supported linewidths vary by 1-pixel units.
SetShaderProgram ( me : mutable; SetShaderProgram ( me : mutable;
theProgram : ShaderProgram_Handle from Graphic3d ); theProgram : ShaderProgram from Graphic3d );
---Level: Public ---Level: Public
---Purpose: Sets up OpenGL/GLSL shader program. ---Purpose: Sets up OpenGL/GLSL shader program.
ShaderProgram ( me ) ShaderProgram ( me )
returns ShaderProgram_Handle from Graphic3d; returns ShaderProgram from Graphic3d;
---C++: return const & ---C++: return const &
fields fields
@ -77,6 +77,6 @@ fields
-- defined by AspectLine. -- defined by AspectLine.
-- --
MyShaderProgram : ShaderProgram_Handle from Graphic3d; MyShaderProgram : ShaderProgram from Graphic3d;
end AspectLine3d; end AspectLine3d;

24
src/Graphic3d/Graphic3d_AspectMarker3d.cdl
View File

@ -27,12 +27,12 @@ class AspectMarker3d from Graphic3d inherits AspectMarker from Aspect
uses uses
Color from Quantity, Color from Quantity,
TypeOfMarker from Aspect, TypeOfMarker from Aspect,
HArray1OfByte from TColStd, HArray1OfByte from TColStd,
PixMap_Handle from Image, PixMap_Handle from Image,
MarkerImage_Handle from Graphic3d, MarkerImage from Graphic3d,
ShaderProgram_Handle from Graphic3d ShaderProgram from Graphic3d
is is
@ -73,7 +73,7 @@ is
---Purpose: Returns marker's texture size. ---Purpose: Returns marker's texture size.
GetMarkerImage (me) GetMarkerImage (me)
returns MarkerImage_Handle from Graphic3d; returns MarkerImage from Graphic3d;
---Level: Public ---Level: Public
---Purpose: Returns marker's image texture. ---Purpose: Returns marker's image texture.
--- Could be null handle if marker aspect has been initialized as --- Could be null handle if marker aspect has been initialized as
@ -81,7 +81,7 @@ is
---C++: return const & ---C++: return const &
SetMarkerImage (me : mutable; SetMarkerImage (me : mutable;
theImage : MarkerImage_Handle from Graphic3d); theImage : MarkerImage from Graphic3d);
---Level: Public ---Level: Public
---Purpose: Set marker's image texture. ---Purpose: Set marker's image texture.
@ -91,12 +91,12 @@ is
theTexture: HArray1OfByte from TColStd ) is static; theTexture: HArray1OfByte from TColStd ) is static;
SetShaderProgram ( me : mutable; SetShaderProgram ( me : mutable;
theProgram : ShaderProgram_Handle from Graphic3d ); theProgram : ShaderProgram from Graphic3d );
---Level: Public ---Level: Public
---Purpose: Sets up OpenGL/GLSL shader program. ---Purpose: Sets up OpenGL/GLSL shader program.
ShaderProgram ( me ) ShaderProgram ( me )
returns ShaderProgram_Handle from Graphic3d; returns ShaderProgram from Graphic3d;
---C++: return const & ---C++: return const &
fields fields
@ -113,8 +113,8 @@ fields
-- - the scale factor -- - the scale factor
-- defined by AspectMarker. -- 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; end AspectMarker3d;

18
src/Graphic3d/Graphic3d_AspectText3d.cdl
View File

@ -32,12 +32,12 @@ class AspectText3d from Graphic3d inherits TShared
uses uses
Color from Quantity, Color from Quantity,
TypeOfStyleText from Aspect, TypeOfStyleText from Aspect,
TypeOfDisplayText from Aspect, TypeOfDisplayText from Aspect,
AsciiString from TCollection, AsciiString from TCollection,
FontAspect from Font, FontAspect from Font,
ShaderProgram_Handle from Graphic3d ShaderProgram from Graphic3d
raises raises
@ -177,7 +177,7 @@ is
---Purpose: Returns text FontAspect ---Purpose: Returns text FontAspect
SetShaderProgram ( me : mutable; SetShaderProgram ( me : mutable;
theProgram : ShaderProgram_Handle from Graphic3d ); theProgram : ShaderProgram from Graphic3d );
---Level: Public ---Level: Public
---Purpose: Sets up OpenGL/GLSL shader program. ---Purpose: Sets up OpenGL/GLSL shader program.
@ -243,7 +243,7 @@ is
---Category: Inquire methods ---Category: Inquire methods
ShaderProgram ( me ) ShaderProgram ( me )
returns ShaderProgram_Handle from Graphic3d; returns ShaderProgram from Graphic3d;
---C++: return const & ---C++: return const &
-- --
@ -293,6 +293,6 @@ fields
-- the variable turning FontAspect of the text -- the variable turning FontAspect of the text
MyTextFontAspect : FontAspect from Font; MyTextFontAspect : FontAspect from Font;
MyShaderProgram : ShaderProgram_Handle from Graphic3d; MyShaderProgram : ShaderProgram from Graphic3d;
end AspectText3d; end AspectText3d;

20
src/Graphic3d/Graphic3d_BoundBuffer_Handle.hxx
View File

@ -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 <Graphic3d_BoundBuffer.hxx>
typedef Handle(Graphic3d_BoundBuffer) Graphic3d_BoundBuffer_Handle;
#endif // _Graphic3d_BoundBuffer_Handle_HeaderFile

20
src/Graphic3d/Graphic3d_Buffer_Handle.hxx
View File

@ -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 <Graphic3d_Buffer.hxx>
typedef Handle(Graphic3d_Buffer) Graphic3d_Buffer_Handle;
#endif // _Graphic3d_Buffer_Handle_HeaderFile

2
src/Graphic3d/Graphic3d_CAspectFillArea.hxx
View File

@ -17,7 +17,7 @@
#include <InterfaceGraphic_Visual3d.hxx> #include <InterfaceGraphic_Visual3d.hxx>
#include <Graphic3d_CTexture.hxx> #include <Graphic3d_CTexture.hxx>
#include <Graphic3d_ShaderProgram_Handle.hxx> #include <Graphic3d_ShaderProgram.hxx>
class Graphic3d_CAspectFillArea class Graphic3d_CAspectFillArea
{ {

2
src/Graphic3d/Graphic3d_CAspectLine.hxx
View File

@ -17,7 +17,7 @@
#include <InterfaceGraphic_Visual3d.hxx> #include <InterfaceGraphic_Visual3d.hxx>
#include <Graphic3d_CTexture.hxx> #include <Graphic3d_CTexture.hxx>
#include <Graphic3d_ShaderProgram_Handle.hxx> #include <Graphic3d_ShaderProgram.hxx>
class Graphic3d_CAspectLine class Graphic3d_CAspectLine
{ {

4
src/Graphic3d/Graphic3d_CAspectMarker.hxx
View File

@ -18,8 +18,8 @@
#include <Aspect_TypeOfMarker.hxx> #include <Aspect_TypeOfMarker.hxx>
#include <InterfaceGraphic_Visual3d.hxx> #include <InterfaceGraphic_Visual3d.hxx>
#include <Graphic3d_CTexture.hxx> #include <Graphic3d_CTexture.hxx>
#include <Graphic3d_MarkerImage_Handle.hxx> #include <Graphic3d_MarkerImage.hxx>
#include <Graphic3d_ShaderProgram_Handle.hxx> #include <Graphic3d_ShaderProgram.hxx>
class Graphic3d_CAspectMarker class Graphic3d_CAspectMarker
{ {

2
src/Graphic3d/Graphic3d_CAspectText.hxx
View File

@ -17,7 +17,7 @@
#include <InterfaceGraphic_Visual3d.hxx> #include <InterfaceGraphic_Visual3d.hxx>
#include <Graphic3d_CTexture.hxx> #include <Graphic3d_CTexture.hxx>
#include <Graphic3d_ShaderProgram_Handle.hxx> #include <Graphic3d_ShaderProgram.hxx>
class Graphic3d_CAspectText class Graphic3d_CAspectText
{ {

6
src/Graphic3d/Graphic3d_CStructure.hxx
View File

@ -16,18 +16,20 @@
#define _Graphic3d_CStructure_HeaderFile #define _Graphic3d_CStructure_HeaderFile
#include <Graphic3d_BndBox4f.hxx> #include <Graphic3d_BndBox4f.hxx>
#include <Graphic3d_CStructure_Handle.hxx>
#include <Graphic3d_Group.hxx> #include <Graphic3d_Group.hxx>
#include <Graphic3d_SequenceOfGroup.hxx> #include <Graphic3d_SequenceOfGroup.hxx>
#include <Graphic3d_SequenceOfHClipPlane.hxx> #include <Graphic3d_SequenceOfHClipPlane.hxx>
#include <Graphic3d_TypeOfComposition.hxx> #include <Graphic3d_TypeOfComposition.hxx>
#include <Graphic3d_ViewAffinity.hxx> #include <Graphic3d_ViewAffinity.hxx>
#include <Graphic3d_StructureManager.hxx>
#include <Graphic3d_Vec3.hxx> #include <Graphic3d_Vec3.hxx>
#include <Graphic3d_ZLayerId.hxx> #include <Graphic3d_ZLayerId.hxx>
#include <Standard_Transient.hxx> #include <Standard_Transient.hxx>
#include <Handle_Graphic3d_GraphicDriver.hxx> #include <Handle_Graphic3d_GraphicDriver.hxx>
//! Forward declaration.
class Handle(Graphic3d_StructureManager); class Handle(Graphic3d_StructureManager);
class Handle(Graphic3d_CStructure);
//! Low-level graphic structure interface //! Low-level graphic structure interface
class Graphic3d_CStructure : public Standard_Transient class Graphic3d_CStructure : public Standard_Transient
@ -165,4 +167,6 @@ public:
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_CStructure, Standard_Transient)
#endif // _Graphic3d_CStructure_HeaderFile #endif // _Graphic3d_CStructure_HeaderFile

24
src/Graphic3d/Graphic3d_CStructure_Handle.hxx
View File

@ -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 <Standard_DefineHandle.hxx>
#include <Handle_Standard_Transient.hxx>
class Graphic3d_CStructure;
DEFINE_STANDARD_HANDLE(Graphic3d_CStructure, Standard_Transient)
typedef Handle(Graphic3d_CStructure) Graphic3d_CStructure_Handle;
#endif // _Graphic3d_CStructure_Handle_H__

5
src/Graphic3d/Graphic3d_Camera.hxx
View File

@ -30,7 +30,8 @@
#include <Bnd_Box.hxx> #include <Bnd_Box.hxx>
DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient) //! Forward declaration
class Handle(Graphic3d_Camera);
//! Camera class provides object-oriented approach to setting up projection //! Camera class provides object-oriented approach to setting up projection
//! and orientation properties of 3D view. //! and orientation properties of 3D view.
@ -622,4 +623,6 @@ public:
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient)
#endif #endif

22
src/Graphic3d/Graphic3d_Camera_Handle.hxx
View File

@ -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 <Graphic3d_Camera.hxx>
typedef Handle(Graphic3d_Camera) Graphic3d_Camera_Handle;
#endif

5
src/Graphic3d/Graphic3d_ClipPlane.hxx
View File

@ -24,11 +24,10 @@
#include <Graphic3d_TextureMap.hxx> #include <Graphic3d_TextureMap.hxx>
#include <Aspect_HatchStyle.hxx> #include <Aspect_HatchStyle.hxx>
DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient)
class gp_Pln; class gp_Pln;
class Graphic3d_AspectFillArea3d; class Graphic3d_AspectFillArea3d;
class Handle(Graphic3d_AspectFillArea3d); class Handle(Graphic3d_AspectFillArea3d);
class Handle(Graphic3d_ClipPlane);
//! Container for properties describing graphic driver clipping planes. //! Container for properties describing graphic driver clipping planes.
//! It is up to application to create instances of this class and specify its //! 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_RTTI(Graphic3d_ClipPlane);
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient)
#endif #endif

23
src/Graphic3d/Graphic3d_ClipPlane_Handle.hxx
View File

@ -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 <Graphic3d_ClipPlane.hxx>
//! CDL-compatibility handle type definition for clip plane objects.
typedef Handle(Graphic3d_ClipPlane) Graphic3d_ClipPlane_Handle;
#endif

45
src/Graphic3d/Graphic3d_GraphicDriver.cdl
View File

@ -48,7 +48,7 @@ uses
Handle from Aspect, Handle from Aspect,
Display from Aspect, Display from Aspect,
PrintAlgo from Aspect, PrintAlgo from Aspect,
DisplayConnection_Handle from Aspect, DisplayConnection from Aspect,
ZLayerId from Graphic3d, ZLayerId from Graphic3d,
ZLayerSettings from Graphic3d, ZLayerSettings from Graphic3d,
@ -63,7 +63,6 @@ uses
CLight from Graphic3d, CLight from Graphic3d,
CPlane from Graphic3d, CPlane from Graphic3d,
CStructure from Graphic3d, CStructure from Graphic3d,
CStructure_Handle from Graphic3d,
CView from Graphic3d, CView from Graphic3d,
BufferType from Graphic3d, BufferType from Graphic3d,
Structure from Graphic3d, Structure from Graphic3d,
@ -96,7 +95,7 @@ raises
TransformError from Graphic3d TransformError from Graphic3d
is is
Initialize (theDisp : DisplayConnection_Handle from Aspect) Initialize (theDisp : DisplayConnection from Aspect)
returns GraphicDriver from Graphic3d; returns GraphicDriver from Graphic3d;
---Level: Public ---Level: Public
---Purpose: Initialises the Driver ---Purpose: Initialises the Driver
@ -138,13 +137,13 @@ is
---Purpose: call_togl_erasestructure ---Purpose: call_togl_erasestructure
RemoveStructure ( me : mutable; RemoveStructure ( me : mutable;
theCStructure : in out CStructure_Handle from Graphic3d ) theCStructure : in out CStructure from Graphic3d )
is deferred; is deferred;
---Purpose: call_togl_removestructure ---Purpose: call_togl_removestructure
Structure (me : mutable; Structure (me : mutable;
theManager : StructureManager from Graphic3d) theManager : StructureManager from Graphic3d)
returns CStructure_Handle from Graphic3d returns CStructure from Graphic3d
is deferred; is deferred;
---Purpose: Creates new empty graphic structure ---Purpose: Creates new empty graphic structure
@ -379,11 +378,9 @@ is
is deferred; is deferred;
---Purpose: Display structure in immediate mode on top of general presentation ---Purpose: Display structure in immediate mode on top of general presentation
EraseImmediateStructure ( me : mutable; ---C++: alias "
theCView : CView from Graphic3d; //! Erases immediate structure
theCStructure : CStructure from Graphic3d ) Standard_EXPORT virtual void EraseImmediateStructure (const Graphic3d_CView& theCView, const Graphic3d_CStructure& theCStructure) = 0;"
is deferred;
---Purpose: Erases immediate structure
------------------------------- -------------------------------
-- Category: Layer mode methods -- Category: Layer mode methods
@ -657,12 +654,9 @@ is
-- indexes will be set to default layer ( the bottom-level z layer -- indexes will be set to default layer ( the bottom-level z layer
-- with ID = 0 ). -- with ID = 0 ).
ChangeZLayer( me : mutable; ---C++: alias "
theCStructure : CStructure from Graphic3d; //! Change Z layer of a structure already presented in view.
theCView : CView from Graphic3d; Standard_EXPORT virtual void ChangeZLayer (const Graphic3d_CStructure& theCStructure, const Graphic3d_CView& theCView, const Graphic3d_ZLayerId theNewLayerId) = 0;"
theNewLayerId : ZLayerId from Graphic3d )
is deferred;
---Purpose: Change Z layer of a structure already presented in view.
SetZLayerSettings( me : mutable; SetZLayerSettings( me : mutable;
theCView : CView from Graphic3d; theCView : CView from Graphic3d;
@ -671,13 +665,9 @@ is
is deferred; is deferred;
---Purpose: Sets the settings for a single Z layer of specified view. ---Purpose: Sets the settings for a single Z layer of specified view.
ChangePriority( me : mutable; ---C++: alias "
theCStructure : CStructure from Graphic3d; //! Changes the priority of a structure within its Z layer in the specified view.
theCView : CView from Graphic3d; Standard_EXPORT virtual void ChangePriority (const Graphic3d_CStructure& theCStructure, const Graphic3d_CView& theCView, const Standard_Integer theNewPriority) = 0;"
theNewPriority : Integer from Standard )
is deferred;
---Purpose: Changes the priority of a structure within its Z layer
-- in the specified view.
----------------------------- -----------------------------
-- Category: Internal methods -- Category: Internal methods
@ -691,9 +681,8 @@ is
ACLight : CLight from Graphic3d; ACLight : CLight from Graphic3d;
AField : Integer from Standard ); AField : Integer from Standard );
PrintCStructure ( me; ---C++: alias "
ACStructure : CStructure from Graphic3d; Standard_EXPORT void PrintCStructure (const Graphic3d_CStructure& ACStructure, const Standard_Integer AField) const;"
AField : Integer from Standard );
PrintCView ( me; PrintCView ( me;
ACView : CView from Graphic3d; ACView : CView from Graphic3d;
@ -732,7 +721,7 @@ is
is static; is static;
GetDisplayConnection (me) GetDisplayConnection (me)
returns DisplayConnection_Handle from Aspect; returns DisplayConnection from Aspect;
---C++: return const & ---C++: return const &
---Purpose: returns Handle to display connection ---Purpose: returns Handle to display connection
@ -747,7 +736,7 @@ is
fields fields
MyTraceLevel : Integer from Standard is protected; 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; myDeviceLostFlag : Boolean from Standard is protected;
end GraphicDriver from Graphic3d; end GraphicDriver from Graphic3d;

12
src/Graphic3d/Graphic3d_Group.cdl
View File

@ -83,9 +83,9 @@ deferred class Group from Graphic3d inherits TShared
VerticalTextAlignment from Graphic3d, VerticalTextAlignment from Graphic3d,
ArrayOfPrimitives from Graphic3d, ArrayOfPrimitives from Graphic3d,
TypeOfPrimitiveArray from Graphic3d, TypeOfPrimitiveArray from Graphic3d,
IndexBuffer_Handle from Graphic3d, IndexBuffer from Graphic3d,
Buffer_Handle from Graphic3d, Buffer from Graphic3d,
BoundBuffer_Handle from Graphic3d, BoundBuffer from Graphic3d,
TransModeFlags from Graphic3d, TransModeFlags from Graphic3d,
BndBox4f from Graphic3d, BndBox4f from Graphic3d,
Ax2 from gp Ax2 from gp
@ -360,9 +360,9 @@ deferred class Group from Graphic3d inherits TShared
AddPrimitiveArray (me : mutable; AddPrimitiveArray (me : mutable;
theType : TypeOfPrimitiveArray from Graphic3d; theType : TypeOfPrimitiveArray from Graphic3d;
theIndices : IndexBuffer_Handle from Graphic3d; theIndices : IndexBuffer from Graphic3d;
theAttribs : Buffer_Handle from Graphic3d; theAttribs : Buffer from Graphic3d;
theBounds : BoundBuffer_Handle from Graphic3d; theBounds : BoundBuffer from Graphic3d;
theToEvalMinMax : Boolean from Standard = Standard_True) is virtual; theToEvalMinMax : Boolean from Standard = Standard_True) is virtual;
---Level: Public ---Level: Public
---Purpose: Adds an array of primitives for display ---Purpose: Adds an array of primitives for display

20
src/Graphic3d/Graphic3d_IndexBuffer_Handle.hxx
View File

@ -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 <Graphic3d_IndexBuffer.hxx>
typedef Handle(Graphic3d_IndexBuffer) Graphic3d_IndexBuffer_Handle;
#endif // _Graphic3d_IndexBuffer_Handle_HeaderFile

4
src/Graphic3d/Graphic3d_MarkerImage.hxx
View File

@ -16,8 +16,6 @@
#ifndef _Graphic3d_MarkerImage_H__ #ifndef _Graphic3d_MarkerImage_H__
#define _Graphic3d_MarkerImage_H__ #define _Graphic3d_MarkerImage_H__
#include <Graphic3d_MarkerImage_Handle.hxx>
#include <TColStd_HArray1OfByte.hxx> #include <TColStd_HArray1OfByte.hxx>
#include <Image_PixMap_Handle.hxx> #include <Image_PixMap_Handle.hxx>
#include <Quantity_Parameter.hxx> #include <Quantity_Parameter.hxx>
@ -83,4 +81,6 @@ public:
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_MarkerImage, Standard_Transient)
#endif // _Graphic3d_MarkerImage_H__ #endif // _Graphic3d_MarkerImage_H__

26
src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
View File

@ -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 <Standard_DefineHandle.hxx>
#include <Standard_Transient.hxx>
class Graphic3d_TextureBitMap;
DEFINE_STANDARD_HANDLE(Graphic3d_MarkerImage, Standard_Transient)
typedef Handle(Graphic3d_MarkerImage) Graphic3d_MarkerImage_Handle;
#endif // _Graphic3d_TextureBitMap_Handle_H__

24
src/Graphic3d/Graphic3d_SequenceOfHClipPlane_Handle.hxx
View File

@ -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 <NCollection_Handle.hxx>
#include <Graphic3d_SequenceOfHClipPlane.hxx>
typedef NCollection_Handle<Graphic3d_SequenceOfHClipPlane> Handle(Graphic3d_SequenceOfHClipPlane);
#endif

6
src/Graphic3d/Graphic3d_ShaderObject.hxx
View File

@ -19,7 +19,9 @@
#include <OSD_Path.hxx> #include <OSD_Path.hxx>
#include <Graphic3d_TypeOfShaderObject.hxx> #include <Graphic3d_TypeOfShaderObject.hxx>
#include <Graphic3d_ShaderObject_Handle.hxx>
//! Forward declaration
class Handle(Graphic3d_ShaderObject);
//! This class is responsible for managing shader objects. //! This class is responsible for managing shader objects.
class Graphic3d_ShaderObject : public Standard_Transient class Graphic3d_ShaderObject : public Standard_Transient
@ -73,4 +75,6 @@ private:
Graphic3d_TypeOfShaderObject myType; Graphic3d_TypeOfShaderObject myType;
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_ShaderObject, Standard_Transient)
#endif #endif

26
src/Graphic3d/Graphic3d_ShaderObject_Handle.hxx
View File

@ -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 <Standard_Transient.hxx>
class Graphic3d_ShaderObject;
DEFINE_STANDARD_HANDLE (Graphic3d_ShaderObject, Standard_Transient)
typedef Handle(Graphic3d_ShaderObject) Graphic3d_ShaderObject_Handle;
#endif

5
src/Graphic3d/Graphic3d_ShaderProgram.hxx
View File

@ -16,8 +16,7 @@
#ifndef _Graphic3d_ShaderProgram_HeaderFile #ifndef _Graphic3d_ShaderProgram_HeaderFile
#define _Graphic3d_ShaderProgram_HeaderFile #define _Graphic3d_ShaderProgram_HeaderFile
#include <Graphic3d_ShaderObject_Handle.hxx> #include <Graphic3d_ShaderObject.hxx>
#include <Graphic3d_ShaderProgram_Handle.hxx>
#include <Graphic3d_ShaderVariable.hxx> #include <Graphic3d_ShaderVariable.hxx>
#include <NCollection_Sequence.hxx> #include <NCollection_Sequence.hxx>
@ -112,6 +111,8 @@ private:
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_ShaderProgram, Standard_Transient)
// ======================================================================= // =======================================================================
// function : PushVariable // function : PushVariable
// purpose : Pushes custom uniform variable to the program // purpose : Pushes custom uniform variable to the program

26
src/Graphic3d/Graphic3d_ShaderProgram_Handle.hxx
View File

@ -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 <Standard_Transient.hxx>
class Graphic3d_ShaderProgram;
DEFINE_STANDARD_HANDLE (Graphic3d_ShaderProgram, Standard_Transient)
typedef Handle(Graphic3d_ShaderProgram) Graphic3d_ShaderProgram_Handle;
#endif

4
src/Graphic3d/Graphic3d_ShaderVariable.hxx
View File

@ -20,8 +20,6 @@
#include <Standard_Transient.hxx> #include <Standard_Transient.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <Graphic3d_ShaderVariable_Handle.hxx>
//! Interface for generic variable value. //! Interface for generic variable value.
struct Graphic3d_ValueInterface struct Graphic3d_ValueInterface
{ {
@ -162,6 +160,8 @@ protected:
Graphic3d_ValueInterface* myValue; Graphic3d_ValueInterface* myValue;
}; };
DEFINE_STANDARD_HANDLE (Graphic3d_ShaderVariable, Standard_Transient)
#include <Graphic3d_ShaderVariable.lxx> #include <Graphic3d_ShaderVariable.lxx>
#endif // _Graphic3d_ShaderVariable_HeaderFile #endif // _Graphic3d_ShaderVariable_HeaderFile

24
src/Graphic3d/Graphic3d_ShaderVariable_Handle.hxx
View File

@ -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 <Standard_Transient.hxx>
class Graphic3d_ShaderVariable;
DEFINE_STANDARD_HANDLE (Graphic3d_ShaderVariable, Standard_Transient)
#endif

6
src/Graphic3d/Graphic3d_Structure.cdl
View File

@ -54,7 +54,7 @@ uses
AspectMarker3d from Graphic3d, AspectMarker3d from Graphic3d,
AspectText3d from Graphic3d, AspectText3d from Graphic3d,
CStructure from Graphic3d, CStructure from Graphic3d,
CStructure_Handle from Graphic3d, CStructure from Graphic3d,
GraphicDriver from Graphic3d, GraphicDriver from Graphic3d,
Group from Graphic3d, Group from Graphic3d,
SequenceOfGroup from Graphic3d, SequenceOfGroup from Graphic3d,
@ -951,7 +951,7 @@ is
---Category: Private methods ---Category: Private methods
CStructure (me) CStructure (me)
returns CStructure_Handle from Graphic3d returns CStructure from Graphic3d
is static; is static;
---Purpose: Returns the low-level structure ---Purpose: Returns the low-level structure
---C++: return const & ---C++: return const &
@ -969,7 +969,7 @@ fields
-- --
-- the associated low-level structure -- the associated low-level structure
myCStructure : CStructure_Handle from Graphic3d; myCStructure : CStructure from Graphic3d;
-- the structures to which the structure is attached -- the structures to which the structure is attached
myAncestors : SequenceOfAddress from TColStd; myAncestors : SequenceOfAddress from TColStd;

4
src/Graphic3d/Graphic3d_ViewAffinity.hxx
View File

@ -16,7 +16,9 @@
#ifndef _Graphic3d_ViewAffinity_HeaderFile #ifndef _Graphic3d_ViewAffinity_HeaderFile
#define _Graphic3d_ViewAffinity_HeaderFile #define _Graphic3d_ViewAffinity_HeaderFile
#include <Graphic3d_Structure.hxx> #include <Standard.hxx>
#include <Standard_Transient.hxx>
#include <Standard_DefineHandle.hxx>
//! Structure display state. //! Structure display state.
class Graphic3d_ViewAffinity : public Standard_Transient class Graphic3d_ViewAffinity : public Standard_Transient

2
src/OpenGl/OpenGl_AspectFace.hxx
View File

@ -29,7 +29,7 @@
#include <Graphic3d_AspectFillArea3d.hxx> #include <Graphic3d_AspectFillArea3d.hxx>
#include <Graphic3d_CAspectFillArea.hxx> #include <Graphic3d_CAspectFillArea.hxx>
#include <Graphic3d_ShaderProgram_Handle.hxx> #include <Graphic3d_ShaderProgram.hxx>
#include <Graphic3d_TextureMap.hxx> #include <Graphic3d_TextureMap.hxx>
#define OPENGL_AMBIENT_MASK (1<<0) #define OPENGL_AMBIENT_MASK (1<<0)

2
src/OpenGl/OpenGl_ShaderManager.hxx
View File

@ -16,7 +16,7 @@
#ifndef _OpenGl_ShaderManager_HeaderFile #ifndef _OpenGl_ShaderManager_HeaderFile
#define _OpenGl_ShaderManager_HeaderFile #define _OpenGl_ShaderManager_HeaderFile
#include <Graphic3d_ShaderProgram_Handle.hxx> #include <Graphic3d_ShaderProgram.hxx>
#include <NCollection_DataMap.hxx> #include <NCollection_DataMap.hxx>
#include <NCollection_Sequence.hxx> #include <NCollection_Sequence.hxx>

4
src/OpenGl/OpenGl_Structure.cxx
View File

@ -25,7 +25,7 @@
#include <OpenGl_View.hxx> #include <OpenGl_View.hxx>
#include <OpenGl_Workspace.hxx> #include <OpenGl_Workspace.hxx>
#include <Graphic3d_SequenceOfHClipPlane_Handle.hxx> #include <Graphic3d_SequenceOfHClipPlane.hxx>
IMPLEMENT_STANDARD_HANDLE (OpenGl_Structure, Graphic3d_CStructure) IMPLEMENT_STANDARD_HANDLE (OpenGl_Structure, Graphic3d_CStructure)
IMPLEMENT_STANDARD_RTTIEXT(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 // Set up plane equations for non-structure transformed global model-view matrix
// List of planes to be applied to context state // List of planes to be applied to context state
Handle(Graphic3d_SequenceOfHClipPlane) aUserPlanes; NCollection_Handle<Graphic3d_SequenceOfHClipPlane> aUserPlanes;
// Collect clipping planes of structure scope // Collect clipping planes of structure scope
if (!myClipPlanes.IsEmpty()) if (!myClipPlanes.IsEmpty())

14
src/Prs3d/Prs3d_PointAspect.cdl
View File

@ -22,12 +22,12 @@ class PointAspect from Prs3d inherits BasicAspect from Prs3d
uses uses
AspectMarker3d from Graphic3d, AspectMarker3d from Graphic3d,
NameOfColor from Quantity, NameOfColor from Quantity,
Color from Quantity, Color from Quantity,
TypeOfMarker from Aspect, TypeOfMarker from Aspect,
HArray1OfByte from TColStd, HArray1OfByte from TColStd,
MarkerImage_Handle from Graphic3d MarkerImage from Graphic3d
is is
@ -81,7 +81,7 @@ is
---Purpose: Returns marker's texture size. ---Purpose: Returns marker's texture size.
GetTexture (me:mutable) GetTexture (me:mutable)
returns MarkerImage_Handle from Graphic3d; returns MarkerImage from Graphic3d;
---Level: Public ---Level: Public
---Purpose: Returns marker's texture. ---Purpose: Returns marker's texture.
---C++: return const & ---C++: return const &

6
src/PrsMgr/PrsMgr_PresentableObject.cdl
View File

@ -57,7 +57,7 @@ uses
Transformation from Geom, Transformation from Geom,
ListOfInteger from TColStd, ListOfInteger from TColStd,
Location from TopLoc, Location from TopLoc,
ClipPlane_Handle from Graphic3d, ClipPlane from Graphic3d,
SequenceOfHClipPlane from Graphic3d, SequenceOfHClipPlane from Graphic3d,
TransModeFlags from Graphic3d, TransModeFlags from Graphic3d,
Pnt from gp, Pnt from gp,
@ -256,7 +256,7 @@ is
returns ZLayerId from Graphic3d is static; returns ZLayerId from Graphic3d is static;
---Purpose: Get ID of Z layer. ---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 ---Purpose: Adds clip plane for graphical clipping for all display mode
-- presentations. The composition of clip planes truncates the rendering -- presentations. The composition of clip planes truncates the rendering
-- space to convex volume. Please be aware that number of supported -- 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. -- to predict the maximum possible number of object clipping planes.
-- @param thePlane [in] the clip plane to be appended to map of clip 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. ---Purpose: Removes previously added clip plane.
-- @param thePlane [in] the clip plane to be removed from map of clip planes. -- @param thePlane [in] the clip plane to be removed from map of clip planes.

20
src/V3d/V3d_View.cdl
View File

@ -93,7 +93,7 @@ uses
ContextView from Visual3d, ContextView from Visual3d,
Vector from Graphic3d, Vector from Graphic3d,
Vertex from Graphic3d, Vertex from Graphic3d,
Camera_Handle from Graphic3d, Camera from Graphic3d,
Window from Aspect, Window from Aspect,
PixMap from Image, PixMap from Image,
BufferType from Graphic3d, BufferType from Graphic3d,
@ -121,7 +121,7 @@ uses
AsciiString from TCollection, AsciiString from TCollection,
ExtendedString from TCollection, ExtendedString from TCollection,
PrintAlgo from Aspect, PrintAlgo from Aspect,
ClipPlane_Handle from Graphic3d, ClipPlane from Graphic3d,
GraduatedTrihedron from Graphic3d, GraduatedTrihedron from Graphic3d,
SequenceOfHClipPlane from Graphic3d, SequenceOfHClipPlane from Graphic3d,
RenderingMode from Graphic3d, RenderingMode from Graphic3d,
@ -1379,14 +1379,14 @@ is
---Purpose: returns the current state of the gl lighting ---Purpose: returns the current state of the gl lighting
-- currently used in triedron displaying -- 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 ---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 -- 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 -- by PlaneLimit method of associated Visual3d_View. Please be aware that the planes
-- which exceed the limit are ignored during rendering. -- which exceed the limit are ignored during rendering.
-- @param thePlane [in] the clip plane to be added to view. -- @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. ---Purpose: Removes clip plane from the view.
-- @param thePlane [in] the clip plane to be removed from view. -- @param thePlane [in] the clip plane to be removed from view.
@ -1404,11 +1404,11 @@ is
---Purpose: Get clip planes. ---Purpose: Get clip planes.
-- @return sequence clip planes that have been set for the view -- @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 ---Level: Public
---Purpose: Change camera used by view. ---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 ---Level: Public
---C++: return const& ---C++: return const&
---Purpose: Returns camera object of the view. ---Purpose: Returns camera object of the view.
@ -1416,7 +1416,7 @@ is
-- the camera approach. -- the camera approach.
FitMinMax (me; FitMinMax (me;
theCamera : Camera_Handle from Graphic3d; theCamera : Camera from Graphic3d;
theBox : Box from Bnd; theBox : Box from Bnd;
theMargin : Real from Standard; theMargin : Real from Standard;
theResolution : Real from Standard = 0.0; theResolution : Real from Standard = 0.0;
@ -1440,7 +1440,7 @@ is
-- @return TRUE if the fit all operation can be done. -- @return TRUE if the fit all operation can be done.
Scale (me; Scale (me;
theCamera : Camera_Handle from Graphic3d; theCamera : Camera from Graphic3d;
theSizeXv : Real from Standard; theSizeXv : Real from Standard;
theSizeYv : Real from Standard) is protected; theSizeYv : Real from Standard) is protected;
---Level: Protected ---Level: Protected
@ -1451,7 +1451,7 @@ is
-- @param theSizeYv [in] size of viewport frame on "y" axis. -- @param theSizeYv [in] size of viewport frame on "y" axis.
Translate (me; Translate (me;
theCamera : Camera_Handle from Graphic3d; theCamera : Camera from Graphic3d;
theDXv : Real from Standard; theDXv : Real from Standard;
theDYv : Real from Standard) is protected; theDYv : Real from Standard) is protected;
---Level: Protected ---Level: Protected
@ -1486,7 +1486,7 @@ fields
myCamStartOpEye : Pnt from gp is protected; myCamStartOpEye : Pnt from gp is protected;
myCamStartOpBnd : Real[6] is protected; myCamStartOpBnd : Real[6] is protected;
myCamStartOpCenter : Pnt from gp 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 ; MyViewer : ViewerPointer from V3d ;
MyActiveLights: ListOfTransient from V3d; MyActiveLights: ListOfTransient from V3d;

10
src/Visual3d/Visual3d_View.cdl
View File

@ -80,7 +80,7 @@ uses
Structure from Graphic3d, Structure from Graphic3d,
SequenceOfStructure from Graphic3d, SequenceOfStructure from Graphic3d,
MapOfStructure from Graphic3d, MapOfStructure from Graphic3d,
Camera_Handle from Graphic3d, Camera from Graphic3d,
ZLayerId from Graphic3d, ZLayerId from Graphic3d,
ZLayerSettings from Graphic3d, ZLayerSettings from Graphic3d,
@ -635,20 +635,20 @@ is
-- 3d coordinates <AX>, <AY>, <AZ>. -- 3d coordinates <AX>, <AY>, <AZ>.
DefaultCamera (me) DefaultCamera (me)
returns Camera_Handle from Graphic3d returns Camera from Graphic3d
is static; is static;
---Level: Public ---Level: Public
---Purpose: @return the default camera of <me>. ---Purpose: @return the default camera of <me>.
---C++: return const & ---C++: return const &
Camera (me) Camera (me)
returns Camera_Handle from Graphic3d returns Camera from Graphic3d
is static; is static;
---Level: Public ---Level: Public
---Purpose: @return the camera of <me>. ---Purpose: @return the camera of <me>.
---C++: return const & ---C++: return const &
SetCamera (me : mutable; theCamera : Camera_Handle from Graphic3d) is static; SetCamera (me : mutable; theCamera : Camera from Graphic3d) is static;
---Level: Public ---Level: Public
---Purpose: Set camera object to provide orientation and projection matrices ---Purpose: Set camera object to provide orientation and projection matrices
-- for graphic driver. -- for graphic driver.
@ -1123,7 +1123,7 @@ fields
myGTrihedron : GraduatedTrihedron from Graphic3d; myGTrihedron : GraduatedTrihedron from Graphic3d;
myDefaultCamera : Camera_Handle from Graphic3d; myDefaultCamera : Camera from Graphic3d;
myAutoZFitIsOn : Boolean from Standard; myAutoZFitIsOn : Boolean from Standard;
myAutoZFitScaleFactor : Real from Standard; myAutoZFitScaleFactor : Real from Standard;