OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
Code Activity

Resolving merge errors.

Browse Source
This commit is contained in:
omy
2015-08-31 17:23:35 +03:00
parent cccf89f361
commit a1873a98ec
12 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Graphic3d/Graphic3d_Camera.cxx
View File

@@ -1114,8 +1114,8 @@ void Graphic3d_Camera::ZFitAll (const Standard_Real theScaleFactor, const Bnd_Bo
// To avoid numeric errors... (See comments in the beginning of the method).
// Choose between model distance and graphical distance, as the model boundaries
// might be infinite if all structures have infinite flag.
const Standard_Real aGraphicDepth = aGraphicMaxDist >= aGraphicMinDist
? aGraphicMaxDist - aGraphicMinDist : RealLast();
const Standard_Real aGraphicDepth = aGraphMaxDist >= aGraphMinDist
? aGraphMaxDist - aGraphMinDist : RealLast();
const Standard_Real aModelDepth = aModelMaxDist >= aModelMinDist
? aModelMaxDist - aModelMinDist : RealLast();

5
src/Graphic3d/Graphic3d_Group.hxx
View File

@@ -44,6 +44,7 @@
#include <Graphic3d_IndexBuffer.hxx>
#include <Graphic3d_Buffer.hxx>
#include <Graphic3d_BoundBuffer.hxx>
#include <Graphic3d_Volume.hxx>
#include <Standard_Address.hxx>
#include <Graphic3d_GroupAspect.hxx>
@@ -275,6 +276,10 @@ public:
//! Return true if primitive arrays within this graphic group form closed volume (do no contain open shells).
Standard_EXPORT Standard_Boolean IsClosed() const;
//! Adds a volume.
Standard_EXPORT void AddVolume (const Handle(Graphic3d_Volume)& theVolume,
const Standard_Boolean theToEvalMinMax = Standard_False);
friend class Graphic3d_Structure;

3
src/Graphic3d/Graphic3d_TransferFunction.cxx
View File

@@ -14,6 +14,7 @@
// commercial license or contractual agreement.
#include <Graphic3d_TransferFunction.hxx>
#include <Standard_DefineHandle.hxx>
IMPLEMENT_STANDARD_HANDLE (Graphic3d_TransferFunction, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TransferFunction, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_TransferFunction, Standard_Transient)

2
src/Graphic3d/Graphic3d_TransferFunction.hxx
View File

@@ -65,7 +65,7 @@ protected:
public:
DEFINE_STANDARD_RTTI (Graphic3d_TransferFunction)
DEFINE_STANDARD_RTTI (Graphic3d_TransferFunction, Standard_Transient)
};

3
src/Graphic3d/Graphic3d_Volume.cxx
View File

@@ -15,9 +15,10 @@
#include <Graphic3d_Volume.hxx>
#include <Graphic3d_ShaderObject.hxx>
#include <Standard_DefineHandle.hxx>
IMPLEMENT_STANDARD_HANDLE (Graphic3d_Volume, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Volume, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_Volume)
//=================================================
//function : Graphic3d_Volume

2
src/Graphic3d/Graphic3d_Volume.hxx
View File

@@ -230,7 +230,7 @@ protected:
public:
DEFINE_STANDARD_RTTI (Graphic3d_Volume)
DEFINE_STANDARD_RTTI (Graphic3d_Volume, Standard_Transient)
};

3
src/Graphic3d/Graphic3d_VolumeData.cxx
View File

@@ -14,9 +14,10 @@
// commercial license or contractual agreement.
#include <Graphic3d_VolumeData.hxx>
#include <Standard_DefineHandle.hxx>
IMPLEMENT_STANDARD_HANDLE (Graphic3d_VolumeData, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_VolumeData, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT (Graphic3d_VolumeData)
//========================================================================
//function : Graphic3d_VolumeData

2
src/Graphic3d/Graphic3d_VolumeData.hxx
View File

@@ -138,7 +138,7 @@ private:
public:
DEFINE_STANDARD_RTTI (Graphic3d_VolumeData)
DEFINE_STANDARD_RTTI (Graphic3d_VolumeData, Standard_Transient)
};

4
src/OpenGl/FILES
View File

@@ -160,10 +160,8 @@ OpenGl_BVHTreeSelector.cxx
OpenGl_BVHClipPrimitiveSet.cxx
OpenGl_BVHClipPrimitiveSet.hxx
OpenGl_ArbTexBindless.hxx
Handle_OpenGl_Sampler.hxx
OpenGl_Sampler.hxx
OpenGl_Sampler.cxx
OpenGl_Utils.hxx
OpenGl_Quadric.hxx
OpenGl_Quadric.cxx
OpenGl_Cylinder.hxx
@@ -176,3 +174,5 @@ OpenGl_BackgroundArray.hxx
OpenGl_BackgroundArray.cxx
OpenGl_Volume.hxx
OpenGl_Volume.cxx
OpenGl_TextBuilder.hxx
OpenGl_TextBuilder.cxx

4
src/Voxel/Handle_Voxel_Prs.hxx
View File

@@ -18,11 +18,9 @@
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
#include <Handle_AIS_InteractiveObject.hxx>
#include <AIS_InteractiveObject.hxx>
class Standard_Transient;
class Handle(Standard_Type);
class Handle(AIS_InteractiveObject);
class Voxel_Prs;
DEFINE_STANDARD_HANDLE(Voxel_Prs, AIS_InteractiveObject)

2
src/Voxel/Voxel_Prs.cxx
View File

@@ -16,6 +16,8 @@
#include <Voxel_Prs.hxx>
#include <Graphic3d_AspectFillArea3d.hxx>
#include <Graphic3d_Group.hxx>
#include <Prs3d_Root.hxx>
#include <Standard_DefineHandle.hxx>
IMPLEMENT_STANDARD_HANDLE (Voxel_Prs, AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(Voxel_Prs, AIS_InteractiveObject)

5
src/Voxel/Voxel_Prs.hxx
View File

@@ -21,6 +21,7 @@
#include <PrsMgr_PresentationManager3d.hxx>
#include <Prs3d_Presentation.hxx>
#include <SelectMgr_Selection.hxx>
#include <Graphic3d_Volume.hxx>
#include <Graphic3d_VolumeData.hxx>
#include <Graphic3d_TransferFunction.hxx>
@@ -46,7 +47,7 @@ public:
//! Sets 3D volume object.
void SetVolume (const Handle(Graphic3d_Volume)& theVolume)
{
myVolume = theVolume;
myVolume = theVolume;
}
protected:
@@ -67,7 +68,7 @@ protected:
public:
DEFINE_STANDARD_RTTI (Voxel_Prs)
DEFINE_STANDARD_RTTI (Voxel_Prs, AIS_InteractiveObject)
};
#endif // _Voxel_Prs_HeaderFile