]> OCCT Git - occt.git/commitdiff
Coding - Non-dependency include update #89
authordpasukhi <dpasukhi@opencascade.com>
Mon, 7 Oct 2024 21:55:58 +0000 (21:55 +0000)
committerdpasukhi <dpasukhi@opencascade.com>
Mon, 7 Oct 2024 21:57:14 +0000 (21:57 +0000)
Removed or reorganized include that are not a part of the project dependency.
The new file for typedef is added because Select is not direct dependency.

20 files changed:
src/BVH/BVH_Builder3d.hxx [new file with mode: 0644]
src/BVH/FILES
src/DEBRepCascade/DEBRepCascade_Provider.cxx
src/Geom2d/Geom2d_Ellipse.cxx
src/GeomConvert/GeomConvert_SurfToAnaSurf.cxx
src/Graphic3d/Graphic3d_BvhCStructureSetTrsfPers.cxx
src/Graphic3d/Graphic3d_BvhCStructureSetTrsfPers.hxx
src/Graphic3d/Graphic3d_GraphicDriver.cxx
src/Graphic3d/Graphic3d_Layer.cxx
src/Graphic3d/Graphic3d_Layer.hxx
src/IGESCAFControl/IGESCAFControl_Provider.cxx
src/OpenGl/OpenGl_LayerList.cxx
src/OpenGl/OpenGl_LayerList.hxx
src/RWGltf/RWGltf_Provider.cxx
src/RWObj/RWObj_Provider.cxx
src/RWStl/RWStl_Provider.cxx
src/STEPCAFControl/STEPCAFControl_Provider.cxx
src/TKDE/EXTERNLIB
src/Vrml/Vrml_Provider.cxx
src/XDEDRAW/XDEDRAW.cxx

diff --git a/src/BVH/BVH_Builder3d.hxx b/src/BVH/BVH_Builder3d.hxx
new file mode 100644 (file)
index 0000000..d457cc7
--- /dev/null
@@ -0,0 +1,21 @@
+// Copyright (c) 2024 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 _BVH_Builder3d_Header
+#define _BVH_Builder3d_Header
+
+#include <BVH_Builder.hxx>
+
+typedef BVH_Builder<Standard_Real, 3> BVH_Builder3d;
+
+#endif // _BVH_Builder3d_Header
\ No newline at end of file
index dd7b34e83708ea75142ce605da4790c847d36901..df24705741e9bab2c8da0de8abdebad795541b8a 100644 (file)
@@ -3,6 +3,7 @@ BVH_BinnedBuilder.hxx
 BVH_Box.hxx
 BVH_BoxSet.hxx
 BVH_Builder.hxx
+BVH_Builder3d.hxx
 BVH_BuildQueue.hxx
 BVH_BuildQueue.cxx
 BVH_BuildThread.hxx
index 6af321edc972916cd55d8502e8c6deffa3641346..a9a663ab460d5d0d9f4a8c2af1626ce160aec936 100644 (file)
@@ -14,7 +14,6 @@
 #include <DEBRepCascade_Provider.hxx>
 
 #include <BinTools.hxx>
-#include <BinXCAFDrivers.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 #include <DEBRepCascade_ConfigurationNode.hxx>
index 3ea205600db295347ec4aa83bd5ffa87613cbfab..668a447863b8abe291aa5966111c32215d5f81bb 100644 (file)
@@ -32,7 +32,6 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Ellipse,Geom2d_Conic)
 
-typedef Geom2d_Ellipse         Ellipse;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Dir2d  Dir2d;
 typedef gp_Pnt2d  Pnt2d;
@@ -48,7 +47,7 @@ typedef gp_XY     XY;
 Handle(Geom2d_Geometry) Geom2d_Ellipse::Copy() const 
 {
   Handle(Geom2d_Ellipse) E;
-  E = new Ellipse (pos, majorRadius, minorRadius);
+  E = new Geom2d_Ellipse (pos, majorRadius, minorRadius);
   return E;
 }
 
index 00296f8d150f2d3ccec205628c856cc9a4df3feb..a6e55d8b0d8f1ee83fa18c4bf49931f7fc5deddf 100644 (file)
@@ -17,7 +17,6 @@
 //abv 06.01.99 fix of misprint
 //:p6 abv 26.02.99: make ConvertToPeriodic() return Null if nothing done
 
-#include <BRepTopAdaptor_TopolTool.hxx>
 #include <ElSLib.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_BezierSurface.hxx>
index 95b0ff7322fa3d3cfa60abb37889cdc99ce9dc79..bbd3bdbc1b7b5ff651ee826159906b5d5adbec16 100644 (file)
@@ -21,7 +21,7 @@
 // function : Graphic3d_BvhCStructureSetTrsfPers
 // purpose  :
 // =======================================================================
-Graphic3d_BvhCStructureSetTrsfPers::Graphic3d_BvhCStructureSetTrsfPers (const Handle(Select3D_BVHBuilder3d)& theBuilder)
+Graphic3d_BvhCStructureSetTrsfPers::Graphic3d_BvhCStructureSetTrsfPers (const Handle(BVH_Builder3d)& theBuilder)
 : myIsDirty (Standard_False),
   myBVH (new BVH_Tree<Standard_Real, 3>()),
   myBuilder (theBuilder)
index 8af7ba5e18a30c3a12c6302a56749212a424ae55..be19c83c098c02b62777a8d93ca41ffc6762bd2f 100644 (file)
@@ -21,7 +21,7 @@
 #include <Graphic3d_WorldViewProjState.hxx>
 #include <NCollection_Shared.hxx>
 #include <NCollection_IndexedMap.hxx>
-#include <Select3D_BVHBuilder3d.hxx>
+#include <BVH_Builder3d.hxx>
 
 class Graphic3d_Camera;
 class Graphic3d_CStructure;
@@ -39,7 +39,7 @@ private:
 public:
 
   //! Creates an empty primitive set for BVH clipping.
-  Standard_EXPORT Graphic3d_BvhCStructureSetTrsfPers (const Handle(Select3D_BVHBuilder3d)& theBuilder);
+  Standard_EXPORT Graphic3d_BvhCStructureSetTrsfPers (const Handle(BVH_Builder3d)& theBuilder);
 
   //! Returns total number of structures.
   Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE;
@@ -87,10 +87,10 @@ public:
                                                                                const Graphic3d_WorldViewProjState& theWVPState);
 
   //! Returns builder for bottom-level BVH.
-  const Handle(Select3D_BVHBuilder3d)& Builder() const { return myBuilder; }
+  const Handle(BVH_Builder3d)& Builder() const { return myBuilder; }
 
   //! Assigns builder for bottom-level BVH.
-  void SetBuilder (const Handle(Select3D_BVHBuilder3d)& theBuilder) { myBuilder = theBuilder; }
+  void SetBuilder (const Handle(BVH_Builder3d)& theBuilder) { myBuilder = theBuilder; }
 
 private:
 
@@ -101,7 +101,7 @@ private:
   opencascade::handle<BVH_Tree<Standard_Real, 3> > myBVH;
 
   //! Builder for bottom-level BVH.
-  Handle(Select3D_BVHBuilder3d) myBuilder;
+  Handle(BVH_Builder3d) myBuilder;
 
   //! Indexed map of structures.
   NCollection_IndexedMap<const Graphic3d_CStructure*> myStructs;
index 3717f05d65f96d592c33e475bbc34bb23fec40cf..eb5bc5f40c4f257d7f02e4aac3f01cab02fbee99 100644 (file)
@@ -38,7 +38,7 @@ Graphic3d_GraphicDriver::Graphic3d_GraphicDriver (const Handle(Aspect_DisplayCon
     aSettings.SetEnableDepthWrite   (Standard_False);
     aSettings.SetClearDepth         (Standard_False);
     aSettings.SetPolygonOffset (Graphic3d_PolygonOffset());
-    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_BotOSD, Handle(Select3D_BVHBuilder3d)());
+    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_BotOSD, Handle(BVH_Builder3d)());
     aLayer->SetLayerSettings (aSettings);
     myLayers.Append (aLayer);
     myLayerIds.Bind (aLayer->LayerId(), aLayer);
@@ -54,7 +54,7 @@ Graphic3d_GraphicDriver::Graphic3d_GraphicDriver (const Handle(Aspect_DisplayCon
     aSettings.SetEnableDepthWrite   (Standard_True);
     aSettings.SetClearDepth         (Standard_False);
     aSettings.SetPolygonOffset (Graphic3d_PolygonOffset());
-    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_Default, Handle(Select3D_BVHBuilder3d)());
+    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_Default, Handle(BVH_Builder3d)());
     aLayer->SetLayerSettings (aSettings);
     myLayers.Append (aLayer);
     myLayerIds.Bind (aLayer->LayerId(), aLayer);
@@ -70,7 +70,7 @@ Graphic3d_GraphicDriver::Graphic3d_GraphicDriver (const Handle(Aspect_DisplayCon
     aSettings.SetEnableDepthWrite   (Standard_True);
     aSettings.SetClearDepth         (Standard_False);
     aSettings.SetPolygonOffset (Graphic3d_PolygonOffset());
-    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_Top, Handle(Select3D_BVHBuilder3d)());
+    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_Top, Handle(BVH_Builder3d)());
     aLayer->SetLayerSettings (aSettings);
     myLayers.Append (aLayer);
     myLayerIds.Bind (aLayer->LayerId(), aLayer);
@@ -86,7 +86,7 @@ Graphic3d_GraphicDriver::Graphic3d_GraphicDriver (const Handle(Aspect_DisplayCon
     aSettings.SetEnableDepthWrite   (Standard_True);
     aSettings.SetClearDepth         (Standard_True);
     aSettings.SetPolygonOffset (Graphic3d_PolygonOffset());
-    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_Topmost, Handle(Select3D_BVHBuilder3d)());
+    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_Topmost, Handle(BVH_Builder3d)());
     aLayer->SetLayerSettings (aSettings);
     myLayers.Append (aLayer);
     myLayerIds.Bind (aLayer->LayerId(), aLayer);
@@ -102,7 +102,7 @@ Graphic3d_GraphicDriver::Graphic3d_GraphicDriver (const Handle(Aspect_DisplayCon
     aSettings.SetEnableDepthWrite   (Standard_False);
     aSettings.SetClearDepth         (Standard_False);
     aSettings.SetPolygonOffset (Graphic3d_PolygonOffset());
-    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_TopOSD, Handle(Select3D_BVHBuilder3d)());
+    Handle(Graphic3d_Layer) aLayer = new Graphic3d_Layer (Graphic3d_ZLayerId_TopOSD, Handle(BVH_Builder3d)());
     aLayer->SetLayerSettings (aSettings);
     myLayers.Append (aLayer);
     myLayerIds.Bind (aLayer->LayerId(), aLayer);
@@ -192,7 +192,7 @@ void Graphic3d_GraphicDriver::InsertLayerBefore (const Graphic3d_ZLayerId theNew
   Standard_ASSERT_RAISE (!myLayerIds.IsBound (theNewLayerId),
                          "Graphic3d_GraphicDriver::InsertLayerBefore, Layer with theLayerId already exists");
 
-  Handle(Graphic3d_Layer) aNewLayer = new Graphic3d_Layer (theNewLayerId, Handle(Select3D_BVHBuilder3d)());
+  Handle(Graphic3d_Layer) aNewLayer = new Graphic3d_Layer (theNewLayerId, Handle(BVH_Builder3d)());
   aNewLayer->SetLayerSettings (theSettings);
 
   Handle(Graphic3d_Layer) anOtherLayer;
@@ -228,7 +228,7 @@ void Graphic3d_GraphicDriver::InsertLayerAfter (const Graphic3d_ZLayerId theNewL
   Standard_ASSERT_RAISE (!myLayerIds.IsBound (theNewLayerId),
                          "Graphic3d_GraphicDriver::InsertLayerAfter, Layer with theLayerId already exists");
 
-  Handle(Graphic3d_Layer) aNewLayer = new Graphic3d_Layer (theNewLayerId, Handle(Select3D_BVHBuilder3d)());
+  Handle(Graphic3d_Layer) aNewLayer = new Graphic3d_Layer (theNewLayerId, Handle(BVH_Builder3d)());
   aNewLayer->SetLayerSettings (theSettings);
 
   Handle(Graphic3d_Layer) anOtherLayer;
index b6e2d6279c232831677ea94afe99bfd08811a9e2..bf82b2fdb57a14e60bafe0cfa088fe5942aa9bdc 100644 (file)
@@ -23,7 +23,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Layer, Standard_Transient)
 // purpose  :
 // =======================================================================
 Graphic3d_Layer::Graphic3d_Layer (Graphic3d_ZLayerId theId,
-                                  const Handle(Select3D_BVHBuilder3d)& theBuilder)
+                                  const Handle(BVH_Builder3d)& theBuilder)
 : myNbStructures              (0),
   myNbStructuresNotCulled     (0),
   myLayerId                   (theId),
index c73419b977cce8d478d5313fa679e6a14ca45124..934a18510e50d858dfe20919a6ed7b9f9f7fc7ea 100644 (file)
@@ -41,7 +41,7 @@ public:
 
   //! Initializes associated priority list and layer properties
   Standard_EXPORT Graphic3d_Layer (Graphic3d_ZLayerId theId,
-                                   const Handle(Select3D_BVHBuilder3d)& theBuilder);
+                                   const Handle(BVH_Builder3d)& theBuilder);
 
   //! Destructor.
   Standard_EXPORT virtual ~Graphic3d_Layer();
@@ -50,10 +50,10 @@ public:
   Graphic3d_ZLayerId LayerId() const { return myLayerId; }
 
   //! Returns BVH tree builder for frustum culling.
-  const Handle(Select3D_BVHBuilder3d)& FrustumCullingBVHBuilder() const { return myBVHPrimitivesTrsfPers.Builder(); }
+  const Handle(BVH_Builder3d)& FrustumCullingBVHBuilder() const { return myBVHPrimitivesTrsfPers.Builder(); }
 
   //! Assigns BVH tree builder for frustum culling.
-  void SetFrustumCullingBVHBuilder (const Handle(Select3D_BVHBuilder3d)& theBuilder) { myBVHPrimitivesTrsfPers.SetBuilder (theBuilder); }
+  void SetFrustumCullingBVHBuilder (const Handle(BVH_Builder3d)& theBuilder) { myBVHPrimitivesTrsfPers.SetBuilder (theBuilder); }
 
   //! Return true if layer was marked with immediate flag.
   Standard_Boolean IsImmediate() const  { return myLayerSettings.IsImmediate(); }
index a766f73c99363e28bff0543c81b04cccac8f29df..9ca7a987c35ca7986b73b605ba5028c672aa7bd1 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <IGESCAFControl_Provider.hxx>
 
-#include <BinXCAFDrivers.hxx>
 #include <IGESCAFControl_ConfigurationNode.hxx>
 #include <IGESCAFControl_Reader.hxx>
 #include <IGESCAFControl_Writer.hxx>
index 4cceccfdb5ebd56b180e1f57fd9d06e71e628eae..845fdeb9336c6bb67161c356d1285aa4456eb05e 100644 (file)
@@ -191,7 +191,7 @@ OpenGl_LayerList::~OpenGl_LayerList()
 //function : SetFrustumCullingBVHBuilder
 //purpose  :
 //=======================================================================
-void OpenGl_LayerList::SetFrustumCullingBVHBuilder (const Handle(Select3D_BVHBuilder3d)& theBuilder)
+void OpenGl_LayerList::SetFrustumCullingBVHBuilder (const Handle(BVH_Builder3d)& theBuilder)
 {
   myBVHBuilder = theBuilder;
   for (NCollection_List<Handle(Graphic3d_Layer)>::Iterator aLayerIter (myLayers); aLayerIter.More(); aLayerIter.Next())
index eb614f55afd9e2b7ead75703ad730a7d4307d877..21d8f1719fd009865af9bca33bfabcc56fa7d3be 100644 (file)
@@ -121,10 +121,10 @@ public:
   Standard_Size ModificationStateOfRaytracable() const { return myModifStateOfRaytraceable; }
 
   //! Returns BVH tree builder for frustum culling.
-  const Handle(Select3D_BVHBuilder3d)& FrustumCullingBVHBuilder() const { return myBVHBuilder; }
+  const Handle(BVH_Builder3d)& FrustumCullingBVHBuilder() const { return myBVHBuilder; }
 
   //! Assigns BVH tree builder for frustum culling.
-  Standard_EXPORT void SetFrustumCullingBVHBuilder (const Handle(Select3D_BVHBuilder3d)& theBuilder);
+  Standard_EXPORT void SetFrustumCullingBVHBuilder (const Handle(BVH_Builder3d)& theBuilder);
 
   //! Dumps the content of me into the stream
   Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
@@ -207,7 +207,7 @@ protected:
 
   NCollection_List<Handle(Graphic3d_Layer)> myLayers;
   NCollection_DataMap<Graphic3d_ZLayerId, Handle(Graphic3d_Layer)> myLayerIds;
-  Handle(Select3D_BVHBuilder3d) myBVHBuilder;      //!< BVH tree builder for frustum culling
+  Handle(BVH_Builder3d) myBVHBuilder;      //!< BVH tree builder for frustum culling
 
   Standard_Integer        myNbStructures;
   Standard_Integer        myImmediateNbStructures; //!< number of structures within immediate layers
index eeadfba355e58257e59a7e7bae5dd3b9d7a41ea7..77c527d53cc48cc0db1c8bae5508e6c36555994c 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <RWGltf_Provider.hxx>
 
-#include <BinXCAFDrivers.hxx>
 #include <Message.hxx>
 #include <RWGltf_CafWriter.hxx>
 #include <TDocStd_Document.hxx>
index aa6d9865207c62db4d250b4e6e663f5a93c2410e..8b1885fcb3103e0b2529d12b91b54c39390e4499 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <RWObj_Provider.hxx>
 
-#include <BinXCAFDrivers.hxx>
 #include <BRep_Builder.hxx>
 #include <RWObj_ConfigurationNode.hxx>
 #include <RWObj_CafReader.hxx>
index 302c9b661dd4d4469e312512d8d11de4d32ae535..8fa8dd281e688060f535d2603620b2c48988aacd 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <RWStl_Provider.hxx>
 
-#include <BinXCAFDrivers.hxx>
 #include <BRep_Builder.hxx>
 #include <Message.hxx>
 #include <RWStl.hxx>
index 354212e60cbd2d5982d211c9249ffb29e84fde34..f66a70900a27bff59ef6d5613297161af13876f4 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <STEPCAFControl_Provider.hxx>
 
-#include <BinXCAFDrivers.hxx>
 #include <Interface_Static.hxx>
 #include <Message.hxx>
 #include <StepData_StepModel.hxx>
index 58c24f0d9559c18a8569f46b09b39304558a4407..6d39d0d7efb426083490c48d71e91b30aa6948dc 100644 (file)
@@ -1 +1,3 @@
 TKernel
+TKMath
+TKBRep
index 39527456dc7d4837dfa66f479f06ab5a726d7e2d..c71ec12a48584115098250d20fa4edb99c7dce0e 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <Vrml_Provider.hxx>
 
-#include <BinXCAFDrivers.hxx>
 #include <Message.hxx>
 #include <OSD_Path.hxx>
 #include <TDocStd_Document.hxx>
index f953df03785459d824ae6491eb016188d5dcaa00..5d0773b054cdf096d5ae6e915062510278609490 100644 (file)
 #include <XDEDRAW_GDTs.hxx>
 #include <XDEDRAW_Views.hxx>
 #include <XDEDRAW_Notes.hxx>
-#include <XSDRAWIGES.hxx>
-#include <XSDRAWSTEP.hxx>
 #include <UnitsMethods.hxx>
 
 #include <BinXCAFDrivers.hxx>