Resolving merge errors.

diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx
index 1f740b08abc83dfb0d68c7e6fab6fec1700b3e74..4905c4505b930c4988f521c12b0f589b5d21c2c0 100644 (file)
--- a/src/Graphic3d/Graphic3d_Camera.cxx
+++ b/src/Graphic3d/Graphic3d_Camera.cxx
@@ -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();

diff --git a/src/Graphic3d/Graphic3d_Group.hxx b/src/Graphic3d/Graphic3d_Group.hxx
index 7e48241564ac4796483dc33bc5fd502277edb1b3..93e16ac1c082001e07e8ff08a7164173c5cc081b 100644 (file)
--- a/src/Graphic3d/Graphic3d_Group.hxx
+++ b/src/Graphic3d/Graphic3d_Group.hxx
@@ -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;
 
 

diff --git a/src/Graphic3d/Graphic3d_TransferFunction.cxx b/src/Graphic3d/Graphic3d_TransferFunction.cxx
index bc1639e054214c9193c4e8b966db214f09050c9b..9bacbdfd087b2e926a86aaec254c267be4453668 100644 (file)
--- a/src/Graphic3d/Graphic3d_TransferFunction.cxx
+++ b/src/Graphic3d/Graphic3d_TransferFunction.cxx
@@ -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)

diff --git a/src/Graphic3d/Graphic3d_TransferFunction.hxx b/src/Graphic3d/Graphic3d_TransferFunction.hxx
index 2daefe1462fb946db460c42c9cfd001dc976e40d..c5a626e83c6d277a74d4c0280b3dc0f795d29b90 100644 (file)
--- a/src/Graphic3d/Graphic3d_TransferFunction.hxx
+++ b/src/Graphic3d/Graphic3d_TransferFunction.hxx
@@ -65,7 +65,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_TransferFunction)
+  DEFINE_STANDARD_RTTI (Graphic3d_TransferFunction, Standard_Transient)
 
 };
 

diff --git a/src/Graphic3d/Graphic3d_Volume.cxx b/src/Graphic3d/Graphic3d_Volume.cxx
index ba0ea3adbf041c45a8a9ea15a3ef62308cdf768f..75186fde952ccc5909b3499de12ba91fd4f672c9 100644 (file)
--- a/src/Graphic3d/Graphic3d_Volume.cxx
+++ b/src/Graphic3d/Graphic3d_Volume.cxx
@@ -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

diff --git a/src/Graphic3d/Graphic3d_Volume.hxx b/src/Graphic3d/Graphic3d_Volume.hxx
index c28556f5ac66d13d6c617a1d7dabea8e2c6521f1..3e2f499fe35289335532e9dfe6311c68a120a0dd 100644 (file)
--- a/src/Graphic3d/Graphic3d_Volume.hxx
+++ b/src/Graphic3d/Graphic3d_Volume.hxx
@@ -230,7 +230,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_Volume)
+  DEFINE_STANDARD_RTTI (Graphic3d_Volume, Standard_Transient)
 
 };
 

diff --git a/src/Graphic3d/Graphic3d_VolumeData.cxx b/src/Graphic3d/Graphic3d_VolumeData.cxx
index 2114b1ae139999d99b0f4d659792470958b71519..a51ca1cf30bf6fb4bbdf44c8cee374d7d67183a9 100644 (file)
--- a/src/Graphic3d/Graphic3d_VolumeData.cxx
+++ b/src/Graphic3d/Graphic3d_VolumeData.cxx
@@ -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

diff --git a/src/Graphic3d/Graphic3d_VolumeData.hxx b/src/Graphic3d/Graphic3d_VolumeData.hxx
index 49310fd44a8e0f5d1f4fa4602b9f68272a3b7ac0..21e544238204ccad9e383a6ff0d7360095ed5df0 100644 (file)
--- a/src/Graphic3d/Graphic3d_VolumeData.hxx
+++ b/src/Graphic3d/Graphic3d_VolumeData.hxx
@@ -138,7 +138,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_VolumeData)
+  DEFINE_STANDARD_RTTI (Graphic3d_VolumeData, Standard_Transient)
 
 };
 

diff --git a/src/OpenGl/FILES b/src/OpenGl/FILES
index 511b1f2a98c7ef30deffb207d22f74f8e958269d..478ccee20c22d727ff0ec70da440eaef9c5737f1 100755 (executable)
--- a/src/OpenGl/FILES
+++ b/src/OpenGl/FILES
@@ -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

diff --git a/src/Voxel/Handle_Voxel_Prs.hxx b/src/Voxel/Handle_Voxel_Prs.hxx
index 52362fa04c48a2c2c597a6fef01e8f576c4aa6ea..05bb8bf75c71cdd94b7d58fd40b651a98402323a 100644 (file)
--- a/src/Voxel/Handle_Voxel_Prs.hxx
+++ b/src/Voxel/Handle_Voxel_Prs.hxx
@@ -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)

diff --git a/src/Voxel/Voxel_Prs.cxx b/src/Voxel/Voxel_Prs.cxx
index e0cde80e77ed00caa67f2d1d80171f1fd4d34706..f646ae3cb937681b3635bd1ca5dee3ad7c9227ed 100644 (file)
--- a/src/Voxel/Voxel_Prs.cxx
+++ b/src/Voxel/Voxel_Prs.cxx
@@ -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)

diff --git a/src/Voxel/Voxel_Prs.hxx b/src/Voxel/Voxel_Prs.hxx
index 6e423bdc59664a1e583b879dc4b2ab7758704d9e..2ab4cf42cc79a565485d26097e8c95aaf20f8dbe 100644 (file)
--- a/src/Voxel/Voxel_Prs.hxx
+++ b/src/Voxel/Voxel_Prs.hxx
@@ -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