Import OCCT 6.8.0-beta

 Remove unneeded folders, they are very large:
   data samples/mfc doc dox

 # Remove useless WOK folders
 rm -rf drv/*/.adm

 # Fix permissions (on Unix):
 find * -type f -exec chmod a-x {} \;

 # Autotools scripts
 chmod a+x build_configure

 # Windows scripts
 find adm/msvc  -type f -exec chmod a+x {} \;

 # Shell and bat scripts
 chmod a+x \
    adm/templates/draw.sh  \
    adm/templates/draw.bat  \
    adm/templates/env.sh.in  \
    adm/templates/env.bat.in  \
    adm/templates/sample.bat  \
    codeblocks.sh  \
    custom.bat  \
    custom.sh.in  \
    draw.bat  \
    draw.sh  \
    env.bat  \
    env.sh  \
    gendoc.bat  \
    gendoc  \
    msvc.bat  \
    xcode.sh

Author: dbarbier

CMakeLists.txt

@@ -37,8 +37,7 @@ endif
 ModelingAlgorithms:
 	cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) ModelingAlgorithms
 
-Visualization_PKGS = Textures
-
+Visualization_PKGS = Textures Shaders
 if ENABLE_VIS
   Visualization_DIRS = $(Visualization_PKGS)
 else
@@ -103,8 +102,6 @@ install-exec-local:
 		rm -f $(prefix)/inc/config.h; \
 	fi
 	cd $(prefix)/inc && ln -s ../config.h config.h
-	cd $(top_srcdir) && cp draw.sh $(prefix)
-	cd $(top_srcdir) && cp custom.sh $(prefix)
-	cd $(top_srcdir) && cp env.sh $(prefix)
+	cd $(top_srcdir) && cp *.sh $(prefix)
 
 .PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw

Makefile.am

@@ -1,22 +1,18 @@
-n IncludeLibrary
 n NCollection
 p BSplCLib
 p BSplSLib
 p Bnd
+p BVH
 p CSLib
 p Convert
 p Dico
-p Dynamic
 p ElCLib
 p ElSLib
 p Expr
 p ExprIntrp
 p FSD
 p GeomAbs
-p GraphDS
-p GraphTools
 p MMgt
-p Materials
 p Message
 p OSD
 p PLib
@@ -39,7 +35,6 @@ p UnitsAPI
 p gp
 p math
 r OS
-t TKAdvTools
 t TKMath
 t TKernel
 p Adaptor2d
@@ -110,7 +105,7 @@ p BRepGProp
 p BRepIntCurveSurface
 p BRepLib
 p BRepMAT2d
-p BRepMesh
+n BRepMesh
 p BRepOffset
 p BRepOffsetAPI
 p BRepPrim
@@ -132,9 +127,7 @@ p FairCurve
 p FilletSurf
 p GccAna
 p GccEnt
-p GccGeo
 p GccInt
-p GccIter
 p Geom2dAPI
 p Geom2dGcc
 p Geom2dHatch
@@ -170,7 +163,6 @@ p MAT
 p MAT2d
 p NLPlate
 p Plate
-p Primitives
 p ShapeAlgo
 p ShapeAnalysis
 p ShapeBuild
@@ -190,7 +182,7 @@ p TopOpeBRepBuild
 p TopOpeBRepDS
 p TopOpeBRepTool
 p TopTrans
-p XBRepMesh
+n XBRepMesh
 t TKBO
 t TKBool
 t TKFeat
@@ -272,8 +264,6 @@ p ObjMgt
 p PBRep
 p PCDM
 p PCDMShape
-p PColPGeom
-p PColPGeom2d
 p PColStd
 p PColgp
 p PCollection
@@ -485,4 +475,10 @@ p Font
 p BOPAlgo
 p BOPDS
 p BOPCol
-p BOPInt
+p IVtk
+p IVtkOCC
+p IVtkVTK
+p IVtkTools
+t TKIVtk
+p IVtkDraw
+t TKIVtkDraw

adm/UDLIST

@@ -3,15 +3,14 @@
 
 set(TKernel_DEPS "")
 set(TKMath_DEPS "TKernel")
-set(TKAdvTools_DEPS "TKernel")
 set(TKG2d_DEPS "TKernel;TKMath")
 set(TKG3d_DEPS "TKMath;TKernel;TKG2d")
 set(TKGeomBase_DEPS "TKernel;TKMath;TKG2d;TKG3d")
 set(TKBRep_DEPS "TKMath;TKernel;TKG2d;TKG3d;TKGeomBase")
 set(TKGeomAlgo_DEPS "TKernel;TKMath;TKG3d;TKG2d;TKGeomBase;TKBRep")
 set(TKTopAlgo_DEPS "TKMath;TKernel;TKG2d;TKG3d;TKGeomBase;TKBRep;TKGeomAlgo")
 set(TKPrim_DEPS "TKBRep;TKernel;TKMath;TKG2d;TKGeomBase;TKG3d;TKTopAlgo")
-set(TKBO_DEPS "TKBRep;TKTopAlgo;TKMath;TKernel;TKG2d;TKG3d;TKGeomAlgo;TKGeomBase")
+set(TKBO_DEPS "TKBRep;TKTopAlgo;TKMath;TKernel;TKG2d;TKG3d;TKGeomAlgo;TKGeomBase;TKPrim")
 set(TKBool_DEPS "TKBRep;TKTopAlgo;TKMath;TKernel;TKPrim;TKG2d;TKG3d;TKShHealing;TKGeomBase;TKGeomAlgo;TKBO")
 set(TKHLR_DEPS "TKBRep;TKernel;TKMath;TKGeomBase;TKG2d;TKG3d;TKGeomAlgo;TKTopAlgo")
 set(TKFillet_DEPS "TKBRep;TKernel;TKMath;TKGeomBase;TKGeomAlgo;TKG2d;TKTopAlgo;TKG3d;TKBool;TKShHealing")
@@ -26,6 +25,7 @@ set(TKOpenGl_DEPS "TKernel;TKService;TKMath;TKV3d")
 set(TKMeshVS_DEPS "TKV3d;TKMath;TKService;TKernel;TKG3d;TKG2d")
 set(TKNIS_DEPS "TKBRep;TKV3d;TKMath;TKernel;TKService;TKG2d;TKG3d;TKMesh")
 set(TKVoxel_DEPS "TKBRep;TKernel;TKV3d;TKMath;TKService;TKGeomBase;TKG2d;TKTopAlgo;TKG3d;TKMesh")
+set(TKIVtk_DEPS "TKernel;TKBRep;TKG2d;TKG3d;TKGeomAlgo;TKGeomBase;TKMath;TKMesh;TKService;TKTopAlgo;TKV3d")
 set(PTKernel_DEPS "TKernel")
 set(TKPShape_DEPS "TKMath;TKernel;TKG2d;TKG3d;PTKernel;TKBRep")
 set(TKCDF_DEPS "TKernel")
@@ -59,13 +59,14 @@ set(TKVRML_DEPS "TKBRep;TKTopAlgo;TKMath;TKGeomBase;TKernel;TKPrim;TKG2d;TKG3d;T
 set(TKXmlXCAF_DEPS "TKXmlL;TKBRep;TKCDF;TKMath;TKernel;TKG2d;TKGeomBase;TKCAF;TKG3d;TKLCAF;TKXCAF;TKXml")
 set(TKBinXCAF_DEPS "TKBRep;TKXCAF;TKMath;TKernel;TKBinL;TKG2d;TKCAF;TKCDF;TKG3d;TKLCAF;TKBin")
 set(TKDraw_DEPS "TKernel;TKG2d;TKGeomBase;TKG3d;TKMath;TKBRep;TKGeomAlgo;TKTopAlgo;TKMesh;TKService;TKHLR")
-set(TKTopTest_DEPS "TKBRep;TKGeomAlgo;TKTopAlgo;TKernel;TKMath;TKBO;TKG2d;TKG3d;TKDraw;TKHLR;TKGeomBase;TKMesh;TKService;TKV3d;TKFillet;TKPrim;TKBool;TKOffset;TKFeat")
+set(TKTopTest_DEPS "TKBRep;TKGeomAlgo;TKTopAlgo;TKernel;TKMath;TKBO;TKG2d;TKG3d;TKDraw;TKHLR;TKGeomBase;TKMesh;TKService;TKV3d;TKFillet;TKPrim;TKBool;TKOffset;TKFeat;TKShHealing")
 set(TKViewerTest_DEPS "TKGeomBase;TKFillet;TKBRep;TKTopAlgo;TKHLR;TKernel;TKMath;TKNIS;TKService;TKShHealing;TKBool;TKPrim;TKGeomAlgo;TKG2d;TKTopTest;TKG3d;TKOffset;TKVoxel;TKMesh;TKV3d;TKDraw;TKOpenGl")
-set(TKXSDRAW_DEPS "TKBRep;TKV3d;TKMath;TKNIS;TKernel;TKService;TKXSBase;TKMeshVS;TKG3d;TKViewerTest;TKG2d;TKSTEPBase;TKTopAlgo;TKShHealing;TKGeomBase;TKGeomAlgo;TKMesh;TKDraw;TKSTEP;TKIGES;TKSTL;TKVRML")
+set(TKXSDRAW_DEPS "TKBRep;TKV3d;TKMath;TKNIS;TKernel;TKService;TKXSBase;TKMeshVS;TKG3d;TKViewerTest;TKG2d;TKSTEPBase;TKTopAlgo;TKGeomBase;TKGeomAlgo;TKMesh;TKDraw;TKSTEP;TKIGES;TKSTL;TKVRML")
 set(TKDCAF_DEPS "TKGeomBase;TKBRep;TKGeomAlgo;TKernel;TKMath;TKG2d;TKG3d;TKDraw;TKCDF;TKV3d;TKNIS;TKService;TKLCAF;TKFillet;TKTopAlgo;TKPrim;TKBool;TKBO;TKCAF;TKViewerTest")
 set(TKXDEDRAW_DEPS "TKCDF;TKBRep;TKXCAF;TKernel;TKIGES;TKV3d;TKMath;TKNIS;TKService;TKXSBase;TKG2d;TKCAF;TKDraw;TKTopAlgo;TKLCAF;TKG3d;TKSTEPBase;TKSTEP;TKMesh;TKXSDRAW;TKXDEIGES;TKXDESTEP;TKDCAF;TKViewerTest")
 set(TKTObjDRAW_DEPS "TKernel;TKCDF;TKLCAF;TKTObj;TKMath;TKDraw;TKDCAF")
-set(TKQADraw_DEPS "TKBRep;TKNIS;TKMath;TKernel;TKService;TKG2d;TKDraw;PTKernel;TKV3d;TKGeomBase;TKG3d;TKViewerTest;TKCDF;TKDCAF;TKLCAF;TKFillet;TKTopAlgo;TKHLR;TKBool;TKGeomAlgo;TKPrim;TKBO;TKShHealing;TKOffset;TKFeat;TKCAF;TKIGES;TKXSBase;TKMesh;TKXCAF;TKSTEP;TKXDESTEP;TKXSDRAW;TKSTL;TKAdvTools;TKVoxel;TKShapeSchema;TKPShape")
+set(TKQADraw_DEPS "TKBRep;TKNIS;TKMath;TKernel;TKService;TKG2d;TKDraw;PTKernel;TKV3d;TKGeomBase;TKG3d;TKViewerTest;TKCDF;TKDCAF;TKLCAF;TKFillet;TKTopAlgo;TKHLR;TKBool;TKGeomAlgo;TKPrim;TKBO;TKShHealing;TKOffset;TKFeat;TKCAF;TKIGES;TKXSBase;TKMesh;TKXCAF;TKSTEP;TKXDESTEP;TKXSDRAW;TKSTL;TKVoxel;TKShapeSchema;TKPShape")
+set(TKIVtkDraw_DEPS "TKernel;TKBRep;TKDraw;TKG2d;TKG3d;TKGeomAlgo;TKGeomBase;TKMath;TKMesh;TKService;TKTopAlgo;TKV3d;TKOpenGl;TKIVtk")
 set(DRAWEXE_DEPS "TKDraw;TKMesh;TKTopAlgo;TKHLR;TKGeomAlgo;TKGeomBase;TKG2d;TKBRep;TKMath;TKG3d;TKernel;TKService")
 
 
@@ -78,10 +79,6 @@ if (BUILD_FoundationClasses)
  foreach( TK ${TKMath_DEPS})
     LIST(APPEND USED_TOOLKITS ${TK} )
  endforeach()
- LIST(APPEND USED_TOOLKITS TKAdvTools )
- foreach( TK ${TKAdvTools_DEPS})
-    LIST(APPEND USED_TOOLKITS ${TK} )
- endforeach()
 endif()
 
 if (BUILD_ModelingData)
@@ -179,6 +176,10 @@ if (BUILD_Visualization)
  foreach( TK ${TKVoxel_DEPS})
     LIST(APPEND USED_TOOLKITS ${TK} )
  endforeach()
+ LIST(APPEND USED_TOOLKITS TKIVtk )
+ foreach( TK ${TKIVtk_DEPS})
+    LIST(APPEND USED_TOOLKITS ${TK} )
+ endforeach()
 endif()
 
 if (BUILD_ApplicationFramework)
@@ -348,6 +349,10 @@ if (BUILD_Draw)
  foreach( TK ${TKQADraw_DEPS})
     LIST(APPEND USED_TOOLKITS ${TK} )
  endforeach()
+ LIST(APPEND USED_TOOLKITS TKIVtkDraw )
+ foreach( TK ${TKIVtkDraw_DEPS})
+    LIST(APPEND USED_TOOLKITS ${TK} )
+ endforeach()
  LIST(APPEND USED_TOOLKITS DRAWEXE )
  foreach( TK ${DRAWEXE_DEPS})
     LIST(APPEND USED_TOOLKITS ${TK} )
@@ -373,11 +378,6 @@ IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKMath")
 ELSE()
   LIST(APPEND UNSUBDIRS "adm/cmake/TKMath")
 ENDIF()
-IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKAdvTools")
-  subdirs(${TK_ROOT_DIR}/adm/cmake/TKAdvTools)
-ELSE()
-  LIST(APPEND UNSUBDIRS "adm/cmake/TKAdvTools")
-ENDIF()
 IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKG2d")
   subdirs(${TK_ROOT_DIR}/adm/cmake/TKG2d)
 ELSE()
@@ -488,6 +488,11 @@ IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKVoxel")
 ELSE()
   LIST(APPEND UNSUBDIRS "adm/cmake/TKVoxel")
 ENDIF()
+IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKIVtk")
+  subdirs(${TK_ROOT_DIR}/adm/cmake/TKIVtk)
+ELSE()
+  LIST(APPEND UNSUBDIRS "adm/cmake/TKIVtk")
+ENDIF()
 IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/PTKernel")
   subdirs(${TK_ROOT_DIR}/adm/cmake/PTKernel)
 ELSE()
@@ -688,6 +693,11 @@ IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKQADraw")
 ELSE()
   LIST(APPEND UNSUBDIRS "adm/cmake/TKQADraw")
 ENDIF()
+IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/TKIVtkDraw")
+  subdirs(${TK_ROOT_DIR}/adm/cmake/TKIVtkDraw)
+ELSE()
+  LIST(APPEND UNSUBDIRS "adm/cmake/TKIVtkDraw")
+ENDIF()
 IF(EXISTS "${TK_ROOT_DIR}/adm/cmake/DRAWEXE")
   subdirs(${TK_ROOT_DIR}/adm/cmake/DRAWEXE)
 ELSE()

adm/cmake/CMakeToolKitsDeps.txt

@@ -58,16 +58,6 @@ endif()
     ENDIF()
   ENDIF()
 
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/FWOSDriver/FWOSDriver_Driver.cxx")
-    list( APPEND FWOSPlugin_USED_SRCFILES "${BUILD_PATCH_DIR}//src/FWOSDriver/FWOSDriver_Driver.cxx" )
-    SOURCE_GROUP (FWOSDriver FILES "${BUILD_PATCH_DIR}//src/FWOSDriver/FWOSDriver_Driver.cxx")
-  ELSE()
-    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/FWOSDriver/FWOSDriver_Driver.cxx")
-      list( APPEND FWOSPlugin_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/FWOSDriver/FWOSDriver_Driver.cxx" )
-      SOURCE_GROUP (FWOSDriver FILES "${CMAKE_SOURCE_DIR}//src/FWOSDriver/FWOSDriver_Driver.cxx")
-    ENDIF()
-  ENDIF()
-
   IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/FWOSDriver/FWOSDriver_DriverFactory.cxx")
     list( APPEND FWOSPlugin_USED_SRCFILES "${BUILD_PATCH_DIR}//src/FWOSDriver/FWOSDriver_DriverFactory.cxx" )
     SOURCE_GROUP (FWOSDriver FILES "${BUILD_PATCH_DIR}//src/FWOSDriver/FWOSDriver_DriverFactory.cxx")