??????: Fix error of TKernal and TMath compilation.

Error occured if using c++20 standard with new oneTBB 2021.5.0.
The error was:
   Error C2672 'tbb::v1::parallel_for_each': no matching overloaded function found TKernel
   could be 'void tbb::detail::d2::parallel_for_each(Iterator,Iterator,const Body &)' TKernel
   'tbb::detail::d2::parallel_for_each': the associated constraints are not satisfied TKernel
Note, that if we use c++14 or c++17, all ok, error does not occures.
To solve the problem, i have to modify `UniversalIterator` class:
`value_type` instead `UniversalIterator` converted to `IteratorInterface*`
`pointer` = `reference` = `value_type`
Method `DownCast` moved into `FunctorInterface` abstract class.
argument `UniversalIterator& item` of the unary fuctions converted to `IteratorInterface*`.
The proposed solution solved the compilation error.

CMakeLists.txt

@@ -10,22 +10,6 @@ set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FO
 set (BUILD_CPP_STANDARD "C++11" CACHE STRING "Select using c++ standard.")
 set_property(CACHE BUILD_CPP_STANDARD PROPERTY STRINGS "C++11" "C++14" "C++17" "C++20" "C++23")
 
-# Set desired C++ standard
-if     ("${BUILD_CPP_STANDARD}" STREQUAL "C++11")
-  set (CMAKE_CXX_STANDARD 11)
-elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++14")
-  set (CMAKE_CXX_STANDARD 14)
-elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++17")
-  set (CMAKE_CXX_STANDARD 17)
-elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++20")
-  set (CMAKE_CXX_STANDARD 20)
-elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++23")
-  set (CMAKE_CXX_STANDARD 23)
-else ()
-  message (FATAL_ERROR, "misprint in c++ standard name")
-endif()
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
-
 # macro: include patched file if it exists
 macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
   if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake")
@@ -733,14 +717,14 @@ if (NOT DEFINED ANDROID AND CAN_USE_TBB)
     add_definitions (-DHAVE_TBB)
     OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
   else()
-    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
+    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB12")
     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
     OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
   endif()
 else()
   OCCT_CHECK_AND_UNSET ("USE_TBB")
 
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB12")
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
   OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
 endif()
@@ -820,12 +804,6 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
 endif()
 
-# ExpToCasExe
-if (EMSCRIPTEN)
-  list (REMOVE_ITEM BUILD_TOOLKITS TKExpress)
-  list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
-endif()
-
 # bison
 if (BUILD_YACCLEX)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

README-ASRV.txt

@@ -1,31 +0,0 @@
-Instruction for building OCCT for ASRV
-======================================
-
-Build using regular native compiler
------------------------------------
-
-1. Make sure the directory 3rdparty is next to occt. It must contain the following products:
-    freetype
-    tcltk
-2. Change current directory to adm/scripts.
-3. On Windows run the script cmake_gen.bat.
-   On Linux run 'cmake_gen.sh' for release build and 'cmake_gen.sh -d' for debug build.
-4. Go to build directory and build and install OCCT.
-   On Windows run:
-    build.bat
-    build.bat vc14 64 d
-    install.bat
-    install.bat vc14 64 d
-   On Linux run:
-    make -j4 install
-
-Build using Emscripten to generate libs for Web assembly
---------------------------------------------------------
-
-1. Make sure you have installed Emscripten. For that you can make sure occ-web3d directory 
-   is next to occt. It must contain fips\fips-sdks\emsdk.
-2. Make sure the directory 3rdparty is next to occt. It must contain the following products:
-    freetype wasm build
-3. Change current directory to adm/scripts.
-4. Run the script wasm_build.bat (wasm_build.sh on Linux).
-5. Copy installed files from work/wasm to the 3rdparty under occt77-wasm.

adm/MODULES

@@ -3,5 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
 ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade
 Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE

adm/UDLIST

@@ -480,6 +480,3 @@ n TreeModel
 n View
 n ViewControl
 n VInspector
-n Express
-t TKExpress
-x ExpToCasExe

adm/cmake/bison.cmake

@@ -22,4 +22,6 @@ if (3RDPARTY_DIR)
   endforeach()
 endif()
  
-find_package (BISON 3.7.4)
+# bison 3.2 is required because it provides options to avoid generation of redundant header
+# files and embedding of local paths in the generated code
+find_package (BISON 3.2)

adm/cmake/cotire.cmake

@@ -3,7 +3,7 @@
 # See the cotire manual for usage hints.
 #
 #=============================================================================
-# Copyright 2012-2018 Sascha Kratky
+# Copyright 2012-2016 Sascha Kratky
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -32,18 +32,16 @@ if(__COTIRE_INCLUDED)
 endif()
 set(__COTIRE_INCLUDED TRUE)
 
-# call cmake_minimum_required, but prevent modification of the CMake policy stack in include mode
-# cmake_minimum_required also sets the policy version as a side effect, which we have to avoid
-if (NOT CMAKE_SCRIPT_MODE_FILE)
-	cmake_policy(PUSH)
-endif()
-cmake_minimum_required(VERSION 2.8.12)
-if (NOT CMAKE_SCRIPT_MODE_FILE)
-	cmake_policy(POP)
-endif()
+# Caution! Be careful, when increase minimal cmake version:
+# using of newer version may leads (by default) to applying
+# of some new policies. It may break compilation.
+# For canceling of applying new policies use:
+# cmake_policy(PUSH) before `cmake_minimum_required`
+# and cmake_policy(POP) after.
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.8.1")
+set (COTIRE_CMAKE_MODULE_VERSION "1.7.9")
 
 # activate select policies
 if (POLICY CMP0025)
@@ -106,11 +104,6 @@ if (POLICY CMP0054)
 	cmake_policy(SET CMP0054 NEW)
 endif()
 
-if (POLICY CMP0055)
-	# strict checking for break() command
-	cmake_policy(SET CMP0055 NEW)
-endif()
-
 include(CMakeParseArguments)
 include(ProcessorCount)
 
@@ -239,13 +232,7 @@ function (cotire_filter_language_source_files _language _target _sourceFilesVar
 				# add to excluded sources, if file has custom compile flags
 				list (APPEND _excludedSourceFiles "${_sourceFile}")
 			else()
-				get_source_file_property(_sourceCompileOptions "${_sourceFile}" COMPILE_OPTIONS)
-				if (_sourceCompileOptions)
-					# add to excluded sources, if file has list of custom compile options
-					list (APPEND _excludedSourceFiles "${_sourceFile}")
-				else()
-					list (APPEND _sourceFiles "${_sourceFile}")
-				endif()
+				list (APPEND _sourceFiles "${_sourceFile}")
 			endif()
 		endif()
 	endforeach()
@@ -304,7 +291,7 @@ function (cotire_get_source_file_property_values _valuesVar _property)
 	set (${_valuesVar} ${_values} PARENT_SCOPE)
 endfunction()
 
-function (cotire_resolve_config_properties _configurations _propertiesVar)
+function (cotire_resolve_config_properites _configurations _propertiesVar)
 	set (_properties "")
 	foreach (_property ${ARGN})
 		if ("${_property}" MATCHES "<CONFIG>")
@@ -320,8 +307,8 @@ function (cotire_resolve_config_properties _configurations _propertiesVar)
 	set (${_propertiesVar} ${_properties} PARENT_SCOPE)
 endfunction()
 
-function (cotire_copy_set_properties _configurations _type _source _target)
-	cotire_resolve_config_properties("${_configurations}" _properties ${ARGN})
+function (cotire_copy_set_properites _configurations _type _source _target)
+	cotire_resolve_config_properites("${_configurations}" _properties ${ARGN})
 	foreach (_property ${_properties})
 		get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET)
 		if (_isSet)
@@ -331,18 +318,13 @@ function (cotire_copy_set_properties _configurations _type _source _target)
 	endforeach()
 endfunction()
 
-function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar)
+function (cotire_get_target_usage_requirements _target _targetRequirementsVar)
 	set (_targetRequirements "")
 	get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES)
 	while (_librariesToProcess)
 		# remove from head
 		list (GET _librariesToProcess 0 _library)
 		list (REMOVE_AT _librariesToProcess 0)
-		if (_library MATCHES "^\\$<\\$<CONFIG:${_config}>:([A-Za-z0-9_:-]+)>$")
-			set (_library "${CMAKE_MATCH_1}")
-		elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$<CONFIG:>:([A-Za-z0-9_:-]+)>$")
-			set (_library "${CMAKE_MATCH_1}")
-		endif()
 		if (TARGET ${_library})
 			list (FIND _targetRequirements ${_library} _index)
 			if (_index LESS 0)
@@ -457,7 +439,7 @@ function (cotire_get_target_compile_flags _config _language _target _flagsVar)
 	# interface compile options from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS)
 			if (_targetOptions)
@@ -589,7 +571,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	# interface include directories from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_linkedTargetType ${_linkedTarget} TYPE)
 			if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND
@@ -643,7 +625,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
 		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
 	endif()
-	if (WIN32 AND NOT MINGW)
+	if (WIN32)
 		# convert Windows paths in include directories to CMake paths
 		if (_includeDirs)
 			set (_paths "")
@@ -719,7 +701,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin
 	endif()
 	# interface compile definitions from linked library targets
 	set (_linkedTargets "")
-	cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+	cotire_get_target_usage_requirements(${_target} _linkedTargets)
 	foreach (_linkedTarget ${_linkedTargets})
 		get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS)
 		if (_definitions)
@@ -727,7 +709,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin
 		endif()
 	endforeach()
 	# parse additional compile definitions from target compile flags
-	# and do not look at directory compile definitions, which we already handled
+	# and don't look at directory compile definitions, which we already handled
 	set (_targetFlags "")
 	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
 	cotire_filter_compile_flags("${_language}" "D" _definitions _ignore ${_targetFlags})
@@ -875,9 +857,6 @@ macro (cotire_set_cmd_to_prologue _cmdVar)
 		list (APPEND ${_cmdVar} "--warn-uninitialized")
 	endif()
 	list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$<CONFIGURATION>")
-	if (XCODE)
-		list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE")
-	endif()
 	if (COTIRE_VERBOSE)
 		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON")
 	elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles")
@@ -895,9 +874,6 @@ function (cotire_init_compile_cmd _cmdVar _language _compilerLauncher _compilerE
 	if (NOT _compilerArg1)
 		set (_compilerArg1 ${CMAKE_${_language}_COMPILER_ARG1})
 	endif()
-	if (WIN32)
-		file (TO_NATIVE_PATH "${_compilerExe}" _compilerExe)
-	endif()
 	string (STRIP "${_compilerArg1}" _compilerArg1)
 	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
 		# compiler launcher is only supported for Makefile and Ninja
@@ -924,16 +900,16 @@ function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemInclu
 		foreach (_include ${_includeDirs})
 			if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
 				file (TO_NATIVE_PATH "${_include}" _include)
-				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
 			else()
 				set (_index -1)
 				if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+")
 					list (FIND ${_systemIncludesVar} "${_include}" _index)
 				endif()
 				if (_index GREATER -1)
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${_include}")
 				else()
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
 				endif()
 			endif()
 		endforeach()
@@ -1068,10 +1044,10 @@ macro (cotire_check_ignore_header_file_path _headerFile _headerIsIgnoredVar)
 		set (${_headerIsIgnoredVar} TRUE)
 	elseif (IS_DIRECTORY "${_headerFile}")
 		set (${_headerIsIgnoredVar} TRUE)
-	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed")
-		# heuristic: ignore headers with embedded parent directory references or "-fixed" or "_fixed" in path
+	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed" AND "${_headerFile}" MATCHES "\\.h$")
+		# heuristic: ignore C headers with embedded parent directory references or "-fixed" or "_fixed" in path
 		# these often stem from using GCC #include_next tricks, which may break the precompiled header compilation
-		# with the error message "error: no include path in which to search for header"
+		# with the error message "error: no include path in which to search for header.h"
 		set (${_headerIsIgnoredVar} TRUE)
 	else()
 		set (${_headerIsIgnoredVar} FALSE)
@@ -1092,11 +1068,12 @@ endmacro()
 
 macro (cotire_parse_line _line _headerFileVar _headerDepthVar)
 	if (MSVC)
-		# cl.exe /showIncludes produces different output, depending on the language pack used, e.g.:
+		# cl.exe /showIncludes output looks different depending on the language pack used, e.g.:
 		# English: "Note: including file:   C:\directory\file"
 		# German: "Hinweis: Einlesen der Datei:   C:\directory\file"
 		# We use a very general regular expression, relying on the presence of the : characters
 		if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$")
+			# Visual Studio compiler output
 			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
 			get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE)
 		else()
@@ -1254,19 +1231,11 @@ function (cotire_scan_includes _includesVar)
 		set (${_includesVar} "" PARENT_SCOPE)
 		return()
 	endif()
-	# add source files to be scanned
-	if (WIN32)
-		foreach (_sourceFile ${_existingSourceFiles})
-			file (TO_NATIVE_PATH "${_sourceFile}" _sourceFileNative)
-			list (APPEND _cmd "${_sourceFileNative}")
-		endforeach()
-	else()
-		list (APPEND _cmd ${_existingSourceFiles})
-	endif()
+	list (APPEND _cmd ${_existingSourceFiles})
 	if (COTIRE_VERBOSE)
 		message (STATUS "execute_process: ${_cmd}")
 	endif()
-	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
+	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
 	endif()
@@ -1502,16 +1471,11 @@ function (cotire_generate_prefix_header _prefixFile)
 	if (_unparsedLines)
 		if (COTIRE_VERBOSE OR _scanResult OR NOT _selectedHeaders)
 			list (LENGTH _unparsedLines _skippedLineCount)
-			if (WIN32)
-				file (TO_NATIVE_PATH "${_unparsedLinesFile}" _unparsedLinesLogPath)
-			else()
-				set (_unparsedLinesLogPath "${_unparsedLinesFile}")
-			endif()
-			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesLogPath}")
+			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesFile}")
 		endif()
 		string (REPLACE ";" "\n" _unparsedLines "${_unparsedLines}")
 	endif()
-	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}\n")
+	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}")
 endfunction()
 
 function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flagsVar)
@@ -1541,7 +1505,7 @@ function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flags
 			# append to list
 			list (APPEND _flags -H -E)
 			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
-				list (APPEND _flags -fdirectives-only)
+				list (APPEND _flags "-fdirectives-only")
 			endif()
 		else()
 			# return as a flag string
@@ -1551,36 +1515,16 @@ function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flags
 			endif()
 		endif()
 	elseif (_compilerID MATCHES "Clang")
-		if (UNIX)
-			# Clang options used
-			# -H print the name of each header file used
-			# -E invoke preprocessor
-			# -fno-color-diagnostics do not print diagnostics in color
-			# -Eonly just run preprocessor, no output
-			if (_flags)
-				# append to list
-				list (APPEND _flags -H -E -fno-color-diagnostics -Xclang -Eonly)
-			else()
-				# return as a flag string
-				set (_flags "-H -E -fno-color-diagnostics -Xclang -Eonly")
-			endif()
-		elseif (WIN32)
-			# Clang-cl.exe options used
-			# /TC treat all files named on the command line as C source files
-			# /TP treat all files named on the command line as C++ source files
-			# /EP preprocess to stdout without #line directives
-			# -H print the name of each header file used
-			# -fno-color-diagnostics do not print diagnostics in color
-			# -Eonly just run preprocessor, no output
-			set (_sourceFileTypeC "/TC")
-			set (_sourceFileTypeCXX "/TP")
-			if (_flags)
-				# append to list
-				list (APPEND _flags "${_sourceFileType${_language}}" /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly)
-			else()
-				# return as a flag string
-				set (_flags "${_sourceFileType${_language}} /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly")
-			endif()
+		# Clang options used
+		# -H print the name of each header file used
+		# -E invoke preprocessor
+		# -fno-color-diagnostics don't prints diagnostics in color
+		if (_flags)
+			# append to list
+			list (APPEND _flags -H -E -fno-color-diagnostics)
+		else()
+			# return as a flag string
+			set (_flags "-H -E -fno-color-diagnostics")
 		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
@@ -1654,8 +1598,8 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 				set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
 			endif()
 		endif()
-	elseif (_compilerID MATCHES "GNU")
-		# GCC options used
+	elseif (_compilerID MATCHES "GNU|Clang")
+		# GCC / Clang options used
 		# -x specify the source language
 		# -c compile but do not link
 		# -o place output in file
@@ -1665,55 +1609,11 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 		set (_xLanguage_CXX "c++-header")
 		if (_flags)
 			# append to list
-			list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
+			list (APPEND _flags "-x" "${_xLanguage_${_language}}" "-c" "${_prefixFile}" -o "${_pchFile}")
 		else()
 			# return as a flag string
 			set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
 		endif()
-	elseif (_compilerID MATCHES "Clang")
-		if (UNIX)
-			# Clang options used
-			# -x specify the source language
-			# -c compile but do not link
-			# -o place output in file
-			# -fno-pch-timestamp disable inclusion of timestamp in precompiled headers (clang 4.0.0+)
-			set (_xLanguage_C "c-header")
-			set (_xLanguage_CXX "c++-header")
-			if (_flags)
-				# append to list
-				list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
-				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
-					list (APPEND _flags -Xclang -fno-pch-timestamp)
-				endif()
-			else()
-				# return as a flag string
-				set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
-				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
-					set (_flags "${_flags} -Xclang -fno-pch-timestamp")
-				endif()
-			endif()
-		elseif (WIN32)
-			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
-			file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
-			file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative)
-			# Clang-cl.exe options used
-			# /Yc creates a precompiled header file
-			# /Fp specifies precompiled header binary file name
-			# /FI forces inclusion of file
-			# /Zs syntax check only
-			# /TC treat all files named on the command line as C source files
-			# /TP treat all files named on the command line as C++ source files
-			set (_sourceFileTypeC "/TC")
-			set (_sourceFileTypeCXX "/TP")
-			if (_flags)
-				# append to list
-				list (APPEND _flags "${_sourceFileType${_language}}"
-						"/Yc${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}")
-			else()
-				# return as a flag string
-				set (_flags "/Yc\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
-			endif()
-		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
 			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
@@ -1755,28 +1655,20 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 			get_filename_component(_pchName "${_pchFile}" NAME)
 			set (_xLanguage_C "c-header")
 			set (_xLanguage_CXX "c++-header")
-			set (_pchSuppressMessages FALSE)
-			if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
-				set(_pchSuppressMessages TRUE)
-			endif()
 			if (_flags)
 				# append to list
 				if ("${_language}" STREQUAL "CXX")
 					list (APPEND _flags -Kc++)
 				endif()
-				list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-create "${_pchName}" -fsyntax-only "${_hostFile}")
+				list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					if (NOT _pchSuppressMessages)
-						list (APPEND _flags -Wpch-messages)
-					endif()
+					list (APPEND _flags "-Wpch-messages")
 				endif()
 			else()
 				# return as a flag string
 				set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					if (NOT _pchSuppressMessages)
-						set (_flags "${_flags} -Wpch-messages")
-					endif()
+					set (_flags "${_flags} -Wpch-messages")
 				endif()
 			endif()
 		endif()
@@ -1827,48 +1719,23 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
 		if (_flags)
 			# append to list
-			list (APPEND _flags -Winvalid-pch -include "${_prefixFile}")
+			list (APPEND _flags "-Winvalid-pch" "-include" "${_prefixFile}")
 		else()
 			# return as a flag string
 			set (_flags "-Winvalid-pch -include \"${_prefixFile}\"")
 		endif()
 	elseif (_compilerID MATCHES "Clang")
-		if (UNIX)
-			# Clang options used
-			# -include process include file as the first line of the primary source file
-			# note: ccache requires the -include flag to be used in order to process precompiled header correctly
-			if (_flags)
-				# append to list
-				list (APPEND _flags -include "${_prefixFile}")
-			else()
-				# return as a flag string
-				set (_flags "-include \"${_prefixFile}\"")
-			endif()
-		elseif (WIN32)
-			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
-			# Clang-cl.exe options used
-			# /Yu uses a precompiled header file during build
-			# /Fp specifies precompiled header binary file name
-			# /FI forces inclusion of file
-			if (_pchFile)
-				file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
-				if (_flags)
-					# append to list
-					list (APPEND _flags "/Yu${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}")
-				else()
-					# return as a flag string
-					set (_flags "/Yu\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
-				endif()
-			else()
-				# no precompiled header, force inclusion of prefix header
-				if (_flags)
-					# append to list
-					list (APPEND _flags "/FI${_prefixFileNative}")
-				else()
-					# return as a flag string
-					set (_flags "/FI\"${_prefixFileNative}\"")
-				endif()
-			endif()
+		# Clang options used
+		# -include process include file as the first line of the primary source file
+		# -include-pch include precompiled header file
+		# -Qunused-arguments don't emit warning for unused driver arguments
+		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+		if (_flags)
+			# append to list
+			list (APPEND _flags "-Qunused-arguments" "-include" "${_prefixFile}")
+		else()
+			# return as a flag string
+			set (_flags "-Qunused-arguments -include \"${_prefixFile}\"")
 		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
@@ -1912,32 +1779,24 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 			if (_pchFile)
 				get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
 				get_filename_component(_pchName "${_pchFile}" NAME)
-				set (_pchSuppressMessages FALSE)
-				if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
-					set(_pchSuppressMessages TRUE)
-				endif()
 				if (_flags)
 					# append to list
-					list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-use "${_pchName}")
+					list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						if (NOT _pchSuppressMessages)
-							list (APPEND _flags -Wpch-messages)
-						endif()
+						list (APPEND _flags "-Wpch-messages")
 					endif()
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						if (NOT _pchSuppressMessages)
-							set (_flags "${_flags} -Wpch-messages")
-						endif()
+						set (_flags "${_flags} -Wpch-messages")
 					endif()
 				endif()
 			else()
 				# no precompiled header, force inclusion of prefix header
 				if (_flags)
 					# append to list
-					list (APPEND _flags -include "${_prefixFile}")
+					list (APPEND _flags "-include" "${_prefixFile}")
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\"")
@@ -1975,17 +1834,9 @@ function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile)
 	if (COTIRE_VERBOSE)
 		message (STATUS "execute_process: ${_cmd}")
 	endif()
-	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
+	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
-	elseif (_option_COMPILER_ID MATCHES "Clang" AND _option_COMPILER_VERSION VERSION_LESS "4.0.0")
-		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
-			_option_COMPILER_EXECUTABLE MATCHES "ccache")
-			# Newer versions of Clang embed a compilation timestamp into the precompiled header binary,
-			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
-			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
-			set (ENV{CCACHE_DISABLE} "true")
-		endif()
 	endif()
 	execute_process(
 		COMMAND ${_cmd}
@@ -2000,7 +1851,7 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 	set (_unsupportedCompiler
 		"Precompiled headers not supported for ${_language} compiler ${CMAKE_${_language}_COMPILER_ID}")
 	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
-		# PCH supported since Visual Studio C++ 6.0
+		# supported since Visual Studio C++ 6.0
 		# and CMake does not support an earlier version
 		set (${_msgVar} "" PARENT_SCOPE)
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
@@ -2011,16 +1862,8 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 			set (${_msgVar} "" PARENT_SCOPE)
 		endif()
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
-		if (UNIX)
-			# all Unix Clang versions have PCH support
-			set (${_msgVar} "" PARENT_SCOPE)
-		elseif (WIN32)
-			# only clang-cl is supported under Windows
-			get_filename_component(_compilerName "${CMAKE_${_language}_COMPILER}" NAME_WE)
-			if (NOT _compilerName MATCHES "cl$")
-				set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}. Use clang-cl instead." PARENT_SCOPE)
-			endif()
-		endif()
+		# all Clang versions have PCH support
+		set (${_msgVar} "" PARENT_SCOPE)
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
 		# Intel PCH support requires version >= 8.0.0
 		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "8.0.0")
@@ -2031,38 +1874,29 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 	else()
 		set (${_msgVar} "${_unsupportedCompiler}." PARENT_SCOPE)
 	endif()
-	# check if ccache is used as a compiler launcher
 	get_target_property(_launcher ${_target} ${_language}_COMPILER_LAUNCHER)
-	get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" REALPATH)
-	if (_realCompilerExe MATCHES "ccache" OR _launcher MATCHES "ccache")
-		# verify that ccache configuration is compatible with precompiled headers
-		# always check environment variable CCACHE_SLOPPINESS, because earlier versions of ccache
-		# do not report the "sloppiness" setting correctly upon printing ccache configuration
+	if (CMAKE_${_language}_COMPILER MATCHES "ccache" OR _launcher MATCHES "ccache")
 		if (DEFINED ENV{CCACHE_SLOPPINESS})
-			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR
-				NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
+			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
 				set (${_msgVar}
 					"ccache requires the environment variable CCACHE_SLOPPINESS to be set to \"pch_defines,time_macros\"."
 					PARENT_SCOPE)
 			endif()
 		else()
-			if (_realCompilerExe MATCHES "ccache")
-				set (_ccacheExe "${_realCompilerExe}")
+			if (_launcher MATCHES "ccache")
+				get_filename_component(_ccacheExe "${_launcher}" REALPATH)
 			else()
-				set (_ccacheExe "${_launcher}")
+				get_filename_component(_ccacheExe "${CMAKE_${_language}_COMPILER}" REALPATH)
 			endif()
-			# ccache 3.7.0 replaced --print-config with --show-config
-			# use -p instead, which seems to work for all version for now, sigh
 			execute_process(
-				COMMAND "${_ccacheExe}" "-p"
+				COMMAND "${_ccacheExe}" "--print-config"
 				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 				RESULT_VARIABLE _result
 				OUTPUT_VARIABLE _ccacheConfig OUTPUT_STRIP_TRAILING_WHITESPACE
 				ERROR_QUIET)
-			if (_result)
-				set (${_msgVar} "ccache configuration cannot be determined." PARENT_SCOPE)
-			elseif (NOT _ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR
-				NOT _ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
+			if (_result OR NOT
+				_ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR NOT
+				_ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
 				set (${_msgVar}
 					"ccache requires configuration setting \"sloppiness\" to be set to \"pch_defines,time_macros\"."
 					PARENT_SCOPE)
@@ -2355,7 +2189,7 @@ function (cotire_generate_target_script _language _configurations _target _targe
 		XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES
 		CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION
 		CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1
-		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language}
+		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_${_language}_SEP
 		CMAKE_INCLUDE_SYSTEM_FLAG_${_language}
 		CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG
 		CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG
@@ -2388,9 +2222,8 @@ endfunction()
 
 function (cotire_setup_pch_file_compilation _language _target _targetScript _prefixFile _pchFile _hostFile)
 	set (_sourceFiles ${ARGN})
-	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
-		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
-		# for MSVC, Intel and Clang-cl, we attach the precompiled header compilation to the host file
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		# for Visual Studio and Intel, we attach the precompiled header compilation to the host file
 		# the remaining files include the precompiled header, see cotire_setup_pch_file_inclusion
 		if (_sourceFiles)
 			set (_flags "")
@@ -2398,9 +2231,6 @@ function (cotire_setup_pch_file_compilation _language _target _targetScript _pre
 				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 				"${_prefixFile}" "${_pchFile}" "${_hostFile}" _flags)
 			set_property (SOURCE ${_hostFile} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-			if (COTIRE_DEBUG)
-				message (STATUS "set_property: SOURCE ${_hostFile} APPEND_STRING COMPILE_FLAGS ${_flags}")
-			endif()
 			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_OUTPUTS "${_pchFile}")
 			# make object file generated from host file depend on prefix header
 			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}")
@@ -2438,9 +2268,8 @@ function (cotire_setup_pch_file_compilation _language _target _targetScript _pre
 endfunction()
 
 function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefixFile _pchFile _hostFile)
-	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
-		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
-		# for MSVC, Intel and clang-cl, we include the precompiled header in all but the host file
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		# for Visual Studio and Intel, we include the precompiled header in all but the host file
 		# the host file does the precompiled header compilation, see cotire_setup_pch_file_compilation
 		set (_sourceFiles ${ARGN})
 		list (LENGTH _sourceFiles _numberOfSourceFiles)
@@ -2452,9 +2281,6 @@ function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefix
 				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 				"${_prefixFile}" "${_pchFile}" _flags)
 			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-			if (COTIRE_DEBUG)
-				message (STATUS "set_property: SOURCE ${_sourceFiles} APPEND_STRING COMPILE_FLAGS ${_flags}")
-			endif()
 			# make object files generated from source files depend on precompiled header
 			set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}")
 		endif()
@@ -2468,9 +2294,6 @@ function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefix
 				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 				"${_prefixFile}" "${_pchFile}" _flags)
 			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-			if (COTIRE_DEBUG)
-				message (STATUS "set_property: SOURCE ${_sourceFiles} APPEND_STRING COMPILE_FLAGS ${_flags}")
-			endif()
 			# mark sources as cotired to prevent them from being used in another cotired target
 			set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
 		endif()
@@ -2488,9 +2311,6 @@ function (cotire_setup_prefix_file_inclusion _language _target _prefixFile)
 		"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 		"${_prefixFile}" "${_pchFile}" _flags)
 	set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-	if (COTIRE_DEBUG)
-		message (STATUS "set_property: SOURCE ${_sourceFiles} APPEND_STRING COMPILE_FLAGS ${_flags}")
-	endif()
 	# mark sources as cotired to prevent them from being used in another cotired target
 	set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
 	# make object files generated from source files depend on prefix header
@@ -2580,7 +2400,7 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 			message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
 		endif()
 		# because CMake PRE_BUILD command does not support dependencies,
-		# we check dependencies explicity in cotire script mode when the pre-build action is run
+		# we check dependencies explicitly in cotire script mode when the pre-build action is run
 		add_custom_command(
 			TARGET "${_target}"
 			PRE_BUILD ${_cmds}
@@ -2595,10 +2415,9 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 		# if this is a single-language target without any excluded files
 		if (_wholeTarget)
 			set (_language "${_languages}")
-			# for MSVC, Intel and clang-cl, precompiled header inclusion is always done on the source file level
+			# for Visual Studio and Intel, precompiled header inclusion is always done on the source file level
 			# see cotire_setup_pch_file_inclusion
-			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
-				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
 				get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
 				if (_prefixFile)
 					get_property(_pchFile TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER)
@@ -2607,9 +2426,6 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 						"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 						"${_prefixFile}" "${_pchFile}" _options)
 					set_property(TARGET ${_target} APPEND PROPERTY ${_options})
-					if (COTIRE_DEBUG)
-						message (STATUS "set_property: TARGET ${_target} APPEND PROPERTY ${_options}")
-					endif()
 				endif()
 			endif()
 		endif()
@@ -2636,8 +2452,7 @@ function (cotire_setup_unity_generation_commands _language _target _targetScript
 			set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_objectDependsPaths})
 		endif()
 		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
-			# unity file compilation results in potentially huge object file,
-			# thus use /bigobj by default unter cl.exe and Windows Intel
+			# unity file compilation results in potentially huge object file, thus use /bigobj by default unter MSVC and Windows Intel
 			set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
 		endif()
 		cotire_set_cmd_to_prologue(_unityCmd)
@@ -2843,9 +2658,6 @@ function (cotire_make_target_message _target _languages _disableMsg _targetMsgVa
 		else()
 			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build.")
 		endif()
-		if (_disableMsg)
-			set (_targetMsg "${_targetMsg} ${_disableMsg}")
-		endif()
 	else()
 		if (_excludedStr)
 			set (_targetMsg "${_languagesStr} target ${_target} cotired ${_excludedStr}.")
@@ -2935,20 +2747,6 @@ function (cotire_choose_target_languages _target _targetLanguagesVar _wholeTarge
 			set (_targetUsePCH FALSE)
 		endif()
 	endif()
-	if (_targetAddSCU)
-		# disable unity builds if automatic Qt processing is used
-		get_target_property(_targetAutoMoc ${_target} AUTOMOC)
-		get_target_property(_targetAutoUic ${_target} AUTOUIC)
-		get_target_property(_targetAutoRcc ${_target} AUTORCC)
-		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
-			if (_disableMsg)
-				set (_disableMsg "${_disableMsg} Target uses automatic CMake Qt processing.")
-			else()
-				set (_disableMsg "Target uses automatic CMake Qt processing.")
-			endif()
-			set (_targetAddSCU FALSE)
-		endif()
-	endif()
 	set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${_targetUsePCH})
 	set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD ${_targetAddSCU})
 	cotire_make_target_message(${_target} "${_targetLanguages}" "${_disableMsg}" _targetMsg ${_allExcludedSourceFiles})
@@ -2976,11 +2774,7 @@ function (cotire_compute_unity_max_number_of_includes _target _maxIncludesVar)
 	set (_sourceFiles ${ARGN})
 	get_target_property(_maxIncludes ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
 	if (_maxIncludes MATCHES "(-j|--parallel|--jobs) ?([0-9]*)")
-		if (DEFINED CMAKE_MATCH_2)
-			set (_numberOfThreads "${CMAKE_MATCH_2}")
-		else()
-			set (_numberOfThreads "")
-		endif()
+		set (_numberOfThreads "${CMAKE_MATCH_2}")
 		if (NOT _numberOfThreads)
 			# use all available cores
 			ProcessorCount(_numberOfThreads)
@@ -3093,9 +2887,8 @@ function (cotire_setup_pch_target _languages _configurations _target)
 		set (_dependsFiles "")
 		foreach (_language ${_languages})
 			set (_props COTIRE_${_language}_PREFIX_HEADER COTIRE_${_language}_UNITY_SOURCE)
-			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
-				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
-				# MSVC, Intel and clang-cl only create precompiled header as a side effect
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+				# Visual Studio and Intel only create precompiled header as a side effect
 				list (INSERT _props 0 COTIRE_${_language}_PRECOMPILED_HEADER)
 			endif()
 			cotire_get_first_set_property_value(_dependsFile TARGET ${_target} ${_props})
@@ -3143,7 +2936,6 @@ function (cotire_collect_unity_target_sources _target _languages _unityTargetSou
 			list (APPEND _unityTargetSources ${_unityFiles})
 		endif()
 	endforeach()
-	# handle object libraries which are part of the target's sources
 	get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
 	if ("${_linkLibrariesStrategy}" MATCHES "^COPY_UNITY$")
 		cotire_filter_object_libraries(${_target} _objectLibraries ${_targetSourceFiles})
@@ -3188,6 +2980,21 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	# determine unity target sources
 	set (_unityTargetSources "")
 	cotire_collect_unity_target_sources(${_target} "${_languages}" _unityTargetSources)
+	# handle automatic Qt processing
+	get_target_property(_targetAutoMoc ${_target} AUTOMOC)
+	get_target_property(_targetAutoUic ${_target} AUTOUIC)
+	get_target_property(_targetAutoRcc ${_target} AUTORCC)
+	if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+		# if the original target sources are subject to CMake's automatic Qt processing,
+		# also include implicitly generated <targetname>_automoc.cpp file
+		if (CMAKE_VERSION VERSION_LESS "3.8.0")
+			list (APPEND _unityTargetSources "${_target}_automoc.cpp")
+			set_property (SOURCE "${_target}_automoc.cpp" PROPERTY GENERATED TRUE)
+		else()
+			list (APPEND _unityTargetSources "${_target}_autogen/moc_compilation.cpp")
+			set_property (SOURCE "${_target}_autogen/moc_compilation.cpp" PROPERTY GENERATED TRUE)
+		endif()
+	endif()
 	# prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created
 	set (CMAKE_AUTOMOC OFF)
 	set (CMAKE_AUTOUIC OFF)
@@ -3201,6 +3008,21 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	else()
 		add_library(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
 	endif()
+	if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+		# depend on original target's automoc target, if it exists
+		if (TARGET ${_target}_automoc)
+			add_dependencies(${_unityTargetName} ${_target}_automoc)
+		endif()
+	else()
+		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+			# depend on the original target's implicitly generated <targetname>_automoc target
+			if (CMAKE_VERSION VERSION_LESS "3.8.0")
+				add_dependencies(${_unityTargetName} ${_target}_automoc)
+			else()
+				add_dependencies(${_unityTargetName} ${_target}_autogen)
+			endif()
+		endif()
+	endif()
 	# copy output location properties
 	set (_outputDirProperties
 		ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>
@@ -3212,8 +3034,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 			set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
 		else()
 			# append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory
-			cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
-			cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties})
+			cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
+			cotire_resolve_config_properites("${_configurations}" _properties ${_outputDirProperties})
 			foreach (_property ${_properties})
 				get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
 				if (_outputDir)
@@ -3233,11 +3055,11 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 				RUNTIME_OUTPUT_DIRECTORY "${_outputDir}")
 		endif()
 	else()
-		cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 			${_outputDirProperties})
 	endif()
 	# copy output name
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_<CONFIG>
 		LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_<CONFIG>
 		OUTPUT_NAME OUTPUT_NAME_<CONFIG>
@@ -3245,7 +3067,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		PREFIX <CONFIG>_POSTFIX SUFFIX
 		IMPORT_PREFIX IMPORT_SUFFIX)
 	# copy compile stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPILE_DEFINITIONS COMPILE_DEFINITIONS_<CONFIG>
 		COMPILE_FLAGS COMPILE_OPTIONS
 		Fortran_FORMAT Fortran_MODULE_DIRECTORY
@@ -3257,12 +3079,12 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN
 		C_CLANG_TIDY CXX_CLANG_TIDY)
 	# copy compile features
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED
 		CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED
 		COMPILE_FEATURES)
 	# copy interface stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN
 		COMPATIBLE_INTERFACE_STRING
 		INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS
@@ -3270,9 +3092,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
 		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
 	# copy link stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
-		BUILD_WITH_INSTALL_RPATH BUILD_WITH_INSTALL_NAME_DIR
-		INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
 		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
 		LINK_FLAGS LINK_FLAGS_<CONFIG>
 		LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_<CONFIG>
@@ -3280,18 +3101,18 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
 		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
 		NO_SONAME SOVERSION VERSION
-		LINK_WHAT_YOU_USE BUILD_RPATH)
+		LINK_WHAT_YOU_USE)
 	# copy cmake stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
 	# copy Apple platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
 		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
-		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
+		IOS_INSTALL_COMBINED)
 	# copy Windows platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		GNUtoMS
 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
 		COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
@@ -3305,19 +3126,15 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
-		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
+		VS_SDK_REFERENCES)
 	# copy Android platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ANDROID_API ANDROID_API_MIN ANDROID_GUI
 		ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES
 		ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR
 		ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES
 		ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH
 		ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE)
-	# copy CUDA platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
-		CUDA_PTX_COMPILATION CUDA_SEPARABLE_COMPILATION CUDA_RESOLVE_DEVICE_SYMBOLS
-		CUDA_EXTENSIONS CUDA_STANDARD CUDA_STANDARD_REQUIRED)
 	# use output name from original target
 	get_target_property(_targetOutputName ${_unityTargetName} OUTPUT_NAME)
 	if (NOT _targetOutputName)
@@ -3331,13 +3148,6 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 			set_property(TARGET ${_unityTargetName} PROPERTY ENABLE_EXPORTS TRUE)
 		endif()
 	endif()
-	# enable parallel compilation for MSVC
-	if (MSVC AND "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
-		list (LENGTH _unityTargetSources _numberOfUnityTargetSources)
-		if (_numberOfUnityTargetSources GREATER 1)
-			set_property(TARGET ${_unityTargetName} APPEND PROPERTY COMPILE_OPTIONS "/MP")
-		endif()
-	endif()
 	cotire_init_target(${_unityTargetName})
 	cotire_add_to_unity_all_target(${_unityTargetName})
 	set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_TARGET_NAME "${_unityTargetName}")
@@ -3496,13 +3306,6 @@ function (cotire_target_link_libraries _target)
 					message (STATUS "unity target ${_unityTargetName} interface link libraries: ${_unityLinkInterfaceLibraries}")
 				endif()
 			endif()
-			get_target_property(_manualDependencies ${_target} MANUALLY_ADDED_DEPENDENCIES)
-			if (_manualDependencies)
-				cotire_map_libraries("${_linkLibrariesStrategy}" _unityManualDependencies ${_manualDependencies})
-				if (_unityManualDependencies)
-					add_dependencies("${_unityTargetName}" ${_unityManualDependencies})
-				endif()
-			endif()
 		endif()
 	endif()
 endfunction(cotire_target_link_libraries)
@@ -3535,9 +3338,9 @@ function (cotire_init_target _targetName)
 		set_target_properties(${_targetName} PROPERTIES FOLDER "${COTIRE_TARGETS_FOLDER}")
 	endif()
 	set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_ALL TRUE)
-	# if (MSVC_IDE)
-	# 	set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
-	# endif()
+	if (MSVC_IDE)
+		set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
+	endif()
 endfunction()
 
 function (cotire_add_to_pch_all_target _pchTargetName)
@@ -3799,7 +3602,7 @@ else()
 	set (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS "m;mm" CACHE STRING
 		"Ignore sources with the listed file extensions from the generated unity source.")
 
-	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "2" CACHE STRING
+	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "3" CACHE STRING
 		"Minimum number of sources in target required to enable use of precompiled header.")
 
 	if (NOT DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT)
@@ -3898,7 +3701,7 @@ else()
 		FULL_DOCS
 			"The variable can be set to an integer > 0."
 			"If a target contains less than that number of source files, cotire will not enable the use of the precompiled header for the target."
-			"If not defined, defaults to 2."
+			"If not defined, defaults to 3."
 	)
 
 	define_property(

adm/cmake/draco.cmake

@@ -3,6 +3,10 @@
 
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
+if (NOT DEFINED INSTALL_DRACO)
+  set (INSTALL_DRACO OFF CACHE BOOL "${INSTALL_DRACO_DESCR}")
+endif()
+
 if (NOT DEFINED 3RDPARTY_DRACO_DIR)
   set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
 endif()
@@ -11,24 +15,14 @@ if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
   set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
 endif()
 
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY)
-  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library")
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY OR NOT 3RDPARTY_DRACO_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library"  FORCE)
 endif()
 
 if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
   set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
 endif()
 
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "" CACHE FILEPATH "Draco debug library")
-  endif()
-  
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "" CACHE PATH "The directory containing Draco debug library")
-  endif()
-endif()
-
 if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
   if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
     FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
@@ -38,19 +32,20 @@ if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
   endif()
 endif()
 
-# header
-if (NOT 3RDPARTY_DRACO_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  set (HEADER_NAMES draco)
+if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+  set (DRACO_INCLUDE_PATH "${3RDPARTY_DRACO_DIR}/include")
+  set (DRACO_LIBRARY_PATH "${3RDPARTY_DRACO_DIR}/lib")
+endif()
 
-  # set 3RDPARTY_DRACO_INCLUDE_DIR as notfound, otherwise find_path can't assign a new value to 3RDPARTY_DRACO_INCLUDE_DIR
-  set (3RDPARTY_DRACO_INCLUDE_DIR "3RDPARTY_DRACO_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing headers of the Draco" FORCE)
+if (NOT 3RDPARTY_DRACO_INCLUDE_DIR)
+  if (DRACO_INCLUDE_PATH AND EXISTS "${DRACO_INCLUDE_PATH}")
+    set (3RDPARTY_DRACO_INCLUDE_DIR "${DRACO_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of DRACO" FORCE)
+  endif()
+endif()
 
-  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_DRACO_DIR}
-                                                 PATH_SUFFIXES "include"
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
-                                                 NO_DEFAULT_PATH)
+if (NOT 3RDPARTY_DRACO_LIBRARY_DIR)
+  if (DRACO_LIBRARY_PATH AND EXISTS "${DRACO_LIBRARY_PATH}")
+    set (3RDPARTY_DRACO_LIBRARY_DIR "${DRACO_LIBRARY_PATH}" CACHE FILEPATH "The directory containing DRACO library" FORCE)
   endif()
 endif()
 
@@ -62,11 +57,11 @@ endif()
 
 if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
   if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
     set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
 
     find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
+                                         PATHS "${3RDPARTY_DRACO_LIBRARY_DIR}"
                                          PATH_SUFFIXES lib
                                          CMAKE_FIND_ROOT_PATH_BOTH
                                          NO_DEFAULT_PATH)
@@ -75,19 +70,27 @@ if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
       set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
     endif()
   endif()
+endif()
 
-  if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
+if (3RDPARTY_DRACO_LIBRARY_DIR AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+else()
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_DRACO_LIBRARY_DIR)
+endif()
 
-    find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES libd
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
-    endif()
+if (INSTALL_DRACO)
+  get_filename_component(3RDPARTY_DRACO_LIBRARY_REALPATH ${3RDPARTY_DRACO_LIBRARY} REALPATH)
+  if (SINGLE_GENERATOR)
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+  else()
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR_LIB}")
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR_LIB}i")
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR_LIB}d")
   endif()
 endif()

adm/cmake/flex.cmake

@@ -26,7 +26,9 @@ if (3RDPARTY_DIR)
   endforeach()
 endif()
  
-find_package (FLEX 2.6.4)
+# flex 2.5.37 is required because closest known lower version, 2.5.3 from WOK 6.8.0,
+# generates code which is unusable on Windows (includes unistd.h without any way to avoid this)
+find_package (FLEX 2.5.37)
 
 if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
   list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)

adm/cmake/freetype.cmake

@@ -110,19 +110,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
     set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
   endif()
 
-  unset (FREETYPE_LIBRARY_RELEASE)
   find_package(Freetype)
 
-  # Only for UNIX (not APPLE)
-  if ((NOT WIN32) AND (NOT APPLE))
-    # To avoid linker error on Ubuntu 18.04 and others linux distributives we should
-    # link with freetype library, compiled as Position Independent Code (PIC),
-    # for example, with shared object.
-    if ((DEFINED FREETYPE_LIBRARY_RELEASE) AND (NOT "${FREETYPE_LIBRARY_RELEASE}" STREQUAL "") AND (EXISTS "${FREETYPE_LIBRARY_RELEASE}"))
-      string (REPLACE "\.a" "\.so" FREETYPE_LIBRARY_RELEASE "${FREETYPE_LIBRARY_RELEASE}")
-    endif()
-  endif()
-
   # restore ENV{FREETYPE_DIR}
   if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
     set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
@@ -133,7 +122,7 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
     CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
     CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
     if (BUILD_SHARED_LIBS)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY_RELEASE FILEPATH "freetype library")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY FILEPATH "freetype library")
     endif()
   endif()
 
@@ -152,8 +141,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
 
   if (BUILD_SHARED_LIBS)
     if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      if (FREETYPE_LIBRARY_RELEASE AND EXISTS "${FREETYPE_LIBRARY_RELEASE}")
-        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY_RELEASE}" CACHE FILEPATH "The path to freetype library" FORCE)
+      if (FREETYPE_LIBRARY AND EXISTS "${FREETYPE_LIBRARY}")
+        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY}" CACHE FILEPATH "The path to freetype library" FORCE)
       endif()
     endif()
 
@@ -231,7 +220,7 @@ endif()
 # freetype library
 #if (BUILD_SHARED_LIBS)
   if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
 
     set (FREETYPE_PATH_SUFFIXES lib)
     if (ANDROID)
@@ -253,16 +242,6 @@ endif()
                                               CMAKE_FIND_ROOT_PATH_BOTH)
     endif()
 
-    # Only for UNIX (not APPLE)
-    if ((NOT WIN32) AND (NOT APPLE))
-      # To avoid linker error on Ubuntu 18.04 and some others linux distributives we should
-      # link with freetype library, compiled as Position Independent Code (PIC),
-      # for example, with shared object.
-      if ((DEFINED 3RDPARTY_FREETYPE_LIBRARY) AND (NOT "${3RDPARTY_FREETYPE_LIBRARY}" STREQUAL "") AND (EXISTS "${3RDPARTY_FREETYPE_LIBRARY}"))
-        string (REPLACE "\.a" "\.so" 3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY}")
-      endif()
-    endif()
-
     if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
       get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
       set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
@@ -371,7 +350,7 @@ endif()
 # unset all redundant variables
 OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
 OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
-OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
+OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY)
 
 if (BUILD_SHARED_LIBS)
   mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)

adm/cmake/occt_csf.cmake

@@ -12,7 +12,7 @@ endif()
 
 # TBB
 if (USE_TBB)
-  set (CSF_TBB "tbb tbbmalloc")
+  set (CSF_TBB "tbb12 tbbmalloc")
 else()
   set (CSF_TBB)
 endif()

adm/cmake/occt_defs_flags.cmake

@@ -130,6 +130,22 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPIL
   endif()
 endif()
 
+# Set desired C++ standard
+if     ("${BUILD_CPP_STANDARD}" STREQUAL "C++11")
+  set (CMAKE_CXX_STANDARD 11)
+elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++14")
+  set (CMAKE_CXX_STANDARD 14)
+elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++17")
+  set (CMAKE_CXX_STANDARD 17)
+elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++20")
+  set (CMAKE_CXX_STANDARD 20)
+elseif ("${BUILD_CPP_STANDARD}" STREQUAL "C++23")
+  set (CMAKE_CXX_STANDARD 23)
+else ()
+  message (FATAL_ERROR, "misprint in c++ standard name")
+endif()
+set (CMAKE_CXX_STANDARD_REQUIRED ON)
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
   if (APPLE)
     # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.

adm/cmake/occt_macros.cmake

@@ -160,8 +160,6 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
     string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
     list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
-  elseif ("${lower_PRODUCT_NAME}" STREQUAL "tbb")
-    list (APPEND SEARCH_TEMPLATES "^.*${lower_PRODUCT_NAME}.*")
   else()
     list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
     list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")

adm/cmake/occt_toolkit.cmake

@@ -106,12 +106,6 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
               set (BISON_OUTPUT_FILE_EXT "cxx")
             endif()
           endforeach()
-
-          if (EXISTS ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
-            message (STATUS "Info: remove old FLEX header file: ${FLEX_BISON_TARGET_DIR}/FlexLexer.h")
-            file(REMOVE ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
-          endif()
-
           file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
           foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
             string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
@@ -127,19 +121,6 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
           set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
           set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.${FLEX_OUTPUT_FILE_EXT})
 
-          if (EXISTS ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
-            message (STATUS "Info: remove old output BISON file: ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT}")
-            file(REMOVE ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
-          endif()
-          if (EXISTS ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.hxx)
-            message (STATUS "Info: remove old output BISON file: ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.hxx")
-            file(REMOVE ${FLEX_BISON_TARGET_DIR}/${CURRENT_BISON_FILE_NAME}.tab.hxx)
-          endif()
-          if (EXISTS ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE})
-            message (STATUS "Info: remove old output FLEX file: ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}")
-            file(REMOVE ${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE})
-          endif()
-
           BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} "${FLEX_BISON_TARGET_DIR}/${BISON_OUTPUT_FILE}"
                         COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l -M ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/=")
           FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} "${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}"
@@ -245,18 +226,6 @@ endif (USE_QT)
 if (EXECUTABLE_PROJECT)
   add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
 
-  if (DEFINED ${PROJECT_NAME}_DISABLE_COTIRE AND ${PROJECT_NAME}_DISABLE_COTIRE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  else()
-    # To avoid excluding of PROJECT_NAME from cotire tool, we may use cotire
-    # COTIRE_PREFIX_HEADER_IGNORE_PATH instead. But, practically it causes many 'undefined symbols' error.
-    # So, we just exclude PROJECT_NAME from cotire list.
-    # if (DEFINED ${PROJECT_NAME}_COTIRE_IGNORE_PATH)
-    #   set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${${PROJECT_NAME}_COTIRE_IGNORE_PATH}")
-    # endif()
-  endif()
-
   install (TARGETS ${PROJECT_NAME}
            DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
 
@@ -266,18 +235,6 @@ if (EXECUTABLE_PROJECT)
 else()
   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
 
-  if (DEFINED ${PROJECT_NAME}_DISABLE_COTIRE AND ${PROJECT_NAME}_DISABLE_COTIRE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  else()
-    # To avoid excluding of PROJECT_NAME from cotire tool, we may use cotire
-    # COTIRE_PREFIX_HEADER_IGNORE_PATH instead. But, practically it causes many 'undefined symbols' error.
-    # So, we just exclude PROJECT_NAME from cotire list.
-    # if (DEFINED ${PROJECT_NAME}_COTIRE_IGNORE_PATH)
-    #   set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${${PROJECT_NAME}_COTIRE_IGNORE_PATH}")
-    # endif()
-  endif()
-
   if (MSVC)
     if (BUILD_FORCE_RelWithDebInfo)
       set (aReleasePdbConf "Release")
@@ -370,10 +327,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
             add_definitions (-DHAVE_GLES2)
           endif()
 
-          if ("${CURRENT_CSF}" STREQUAL "${CSF_Draco}")
-            set (CURRENT_CSF "")
-            set (USED_DRACO 1)
-          endif()
           set (LIBRARY_FROM_CACHE 0)
           separate_arguments (CURRENT_CSF)
           foreach (CSF_LIBRARY ${CURRENT_CSF})
@@ -401,7 +354,7 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
             endforeach()
           endforeach()
 
-          if (NOT ${LIBRARY_FROM_CACHE} AND NOT "${CURRENT_CSF}" STREQUAL "")
+          if (NOT ${LIBRARY_FROM_CACHE})
             # prepare a list from a string with whitespaces
             separate_arguments (CURRENT_CSF)
             list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
@@ -412,28 +365,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
   endif()
 endforeach()
 
-if (USE_DRACO)
-  if (USED_DRACO)
-    set (USED_LIB_RELEASE ${3RDPARTY_DRACO_LIBRARY})
-    if (WIN32)
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY_DEBUG})
-    else()
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY})
-    endif()
-    set (USED_LIB_CONF)
-    if (EXISTS ${USED_LIB_DEBUG})
-      set (USED_LIB_CONF "$<$<CONFIG:DEBUG>:${USED_LIB_DEBUG}>;${USED_LIB_CONF}")
-    endif()
-    if (EXISTS ${USED_LIB_RELEASE})
-      set (USED_LIB_CONF "$<$<CONFIG:RELEASE>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-      set (USED_LIB_CONF "$<$<CONFIG:RELWITHDEBINFO>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-    endif()
-    if (DEFINED USED_LIB_CONF)
-      set_property (TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_LIBRARIES "${USED_LIB_CONF}")
-    endif()
-  endif()
-endif()
-
 if (APPLE)
   list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
   if (NOT ${IS_X11_FOUND} EQUAL -1)

adm/cmake/tbb.cmake

@@ -1,240 +1,294 @@
 # tbb
 
+if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
+  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
+endif()
+
+# tbb directory
+if (NOT DEFINED 3RDPARTY_TBB_DIR)
+  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
+endif()
+
 if (MSVC AND BUILD_SHARED_LIBS)
   add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
   add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
 endif()
 
-if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
-  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
-endif()
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
-# Initialize tbb directory.
-if (NOT DEFINED 3RDPARTY_TBB_DIR)
-  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
-endif()
+# specify TBB folder in connectin with 3RDPARTY_DIR
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_TBB_DIR PATH "The directory containing tbb")
 
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DIR)
-    message (FATAL_ERROR "3RDPARTY_DIR is not defined.")
-  endif()
-  if ("${3RDPARTY_DIR}" STREQUAL "")
-    message (FATAL_ERROR "3RDPARTY_DIR is empty string.")
-  endif()
-  if (NOT EXISTS "${3RDPARTY_DIR}")
-    message (FATAL_ERROR "3RDPARTY_DIR is not exist.")
-  endif()
-
-  # Below, we have correct 3RDPARTY_DIR.
-
-  # Initialize TBB folder in connectin with 3RDPARTY_DIR.
-  if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
+  if (NOT 3RDPARTY_TBB_DIR OR NOT EXISTS "${3RDPARTY_TBB_DIR}")
     FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
     if (TBB_DIR_NAME)
       set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
     endif()
   endif()
+else()
+  #set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing TBB" FORCE)
+endif()
 
-  # Here we have full path name to installation directory of TBB.
-  # Employ it.
-  if (EXISTS "${3RDPARTY_TBB_DIR}")
-    find_package (
-      TBB 2021.5
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-      REQUIRED
-      CONFIG)
+if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+endif()
 
-    # Achive include directory
-    get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-    if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-      set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+    # check 3RDPARTY_TBB_INCLUDE_DIR for consictency with specified 3RDPARTY_TBB_DIR
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_TBB_INCLUDE_DIR PATH "The directory containing headers of the TBB")
+endif()
+
+# tbb.h
+if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+
+  set (HEADER_NAMES tbb.h tbb/tbb.h)
+
+  # set 3RDPARTY_TBB_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_TBB_INCLUDE_DIR
+  set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to tbb.h" FORCE)
+
+  if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+    find_path (3RDPARTY_TBB_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATHS ${3RDPARTY_TBB_DIR}
+                                              PATH_SUFFIXES include
+                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              NO_DEFAULT_PATH)
+  else()
+    find_path (3RDPARTY_TBB_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATH_SUFFIXES include
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
+  endif()
+endif()
+
+if (3RDPARTY_TBB_INCLUDE_DIR AND EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "the path to tbb.h" FORCE)
+endif()
+
+# common steps for tbb12 and tbbmalloc
+macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
+
+  string (TOUPPER ${PRODUCT_LIBRARY_NAME} upper_PRODUCT_LIBRARY_NAME)
+
+  # define required tbb12/tbbmalloc variables
+  if (NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY OR NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+  endif()
+
+  if (NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library")
+  endif()
+
+  if (WIN32)
+    if (NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL OR NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL "" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
     endif()
-    if (EXISTS "${TBB_INCLUDE_DIR}")
-      set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-      list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  endif()
+
+  if (WIN32 AND NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library")
+  endif()
+
+  # check 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_ paths for consistency with specified 3RDPARTY_TBB_DIR
+  if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY FILEPATH "the path to ${upper_PRODUCT_LIBRARY_NAME} library")
+
+    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}")
+      get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}" PATH)
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
     else()
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library")
     endif()
 
-    separate_arguments (CSF_TBB)
-    foreach (LIB IN LISTS CSF_TBB)
-      string(TOLOWER "${LIB}" LIB_LOWER)
-      string(TOUPPER "${LIB}" LIB_UPPER)
+    if (WIN32)
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL FILEPATH "the path to ${upper_PRODUCT_LIBRARY_NAME} shared library")
 
-      # Achive *.lib files and directory containing it.
-      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
-      # Reserve cache variable for *.lib.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
-      endif()
-      # Reserve cache variable for directory containing *.lib file.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.lib)")
-      endif()
-      if (EXISTS "${TBB_LIB_FILE}")
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY
-             "${TBB_LIB_FILE}"
-             CACHE FILEPATH
-             "${LIB_UPPER} library (*.lib)"
-             FORCE)
-        get_filename_component (TBB_LIB_FILE_DIRECTORY "${TBB_LIB_FILE}" DIRECTORY)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-             "${TBB_LIB_FILE_DIRECTORY}"
-             CACHE PATH
-             "The directory containing ${LIB_UPPER} library (*.lib)"
-             FORCE)
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
+      if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}")
+        get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}" PATH)
+        set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
       else()
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      endif()
 
-      # Achive *.dll files and directory containing it.
-      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-      # Reserve cache variable for *.dll.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
-        set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library")
       endif()
-      # Reserve cache variable for directory containing *.dll file.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL_DIR)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.dll)")
-      endif()
-      if (EXISTS "${TBB_DLL_FILE}")
-        set (3RDPARTY_${LIB_UPPER}_DLL
-             "${TBB_DLL_FILE}"
-             CACHE FILEPATH
-             "${LIB_UPPER} library (*.dll)"
-             FORCE)
-        get_filename_component (TBB_DLL_FILE_DIRECTORY "${TBB_DLL_FILE}" DIRECTORY)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR
-             "${TBB_DLL_FILE_DIRECTORY}"
-             CACHE PATH
-             "The directory containing ${LIB_UPPER} library (*.dll)"
-             FORCE)
-        list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIB_UPPER}_DLL_DIR}")
+    endif()
+  endif()
+
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  if (${COMPILER_BITNESS} EQUAL 32)
+    set (${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME ia32)
+  else()
+    set (${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME intel64)
+  endif()
+
+  # tbb12/tbbmalloc library
+  if (NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}")
+    
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+    set (PRODUCT_PATH_SUFFIXES lib ${PRODUCT_LIBRARY_NAME})
+
+    # set 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+
+    if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+      if (NOT EXISTS "${3RDPARTY_TBB_DIR}/lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER}")
+        if (EXISTS "${3RDPARTY_TBB_DIR}/lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}")
+          file (GLOB ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST "${3RDPARTY_TBB_DIR}/lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/*")
+          if (${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST)
+            list (GET ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST -1 THE_MOST_FRESH_COMPILER_VERSION)
+            if (THE_MOST_FRESH_COMPILER_VERSION)
+              get_filename_component (THE_MOST_FRESH_COMPILER_VERSION_NAME "${THE_MOST_FRESH_COMPILER_VERSION}" NAME)
+              set (PRODUCT_PATH_SUFFIXES lib ${PRODUCT_LIBRARY_NAME} lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${THE_MOST_FRESH_COMPILER_VERSION_NAME})
+            endif()
+          endif()
+        endif()
       else()
-        list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${LIB_UPPER}_DLL_DIR)
+        set (PRODUCT_PATH_SUFFIXES lib ${PRODUCT_LIBRARY_NAME} lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER})
       endif()
 
-      # install *.dll (tbb & tbbmalloc)
-      if (INSTALL_TBB)
-        OCCT_MAKE_OS_WITH_BITNESS()
-        OCCT_MAKE_COMPILER_SHORT_NAME()
+      find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY ${PRODUCT_LIBRARY_NAME}
+                                         PATHS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}" "${3RDPARTY_TBB_DIR}"
+                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
+                                         CMAKE_FIND_ROOT_PATH_BOTH
+                                         NO_DEFAULT_PATH)
+    else()
+      find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY ${PRODUCT_LIBRARY_NAME}
+                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
+                                         CMAKE_FIND_ROOT_PATH_BOTH)
+    endif()
 
-        if (SINGLE_GENERATOR)
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
+    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}")
+      get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}" PATH)
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+    else()
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+    endif()
+  endif()
+
+  if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
+
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+  endif()
+
+  # tbb12/tbbmalloc shared library
+  if (WIN32)
+    if (NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+      set (PRODUCT_PATH_SUFFIXES bin)
+
+      # set 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL "3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
+
+      if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+        if (NOT EXISTS "${3RDPARTY_TBB_DIR}/bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER}")
+          if (EXISTS "${3RDPARTY_TBB_DIR}/bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}")
+            file (GLOB ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST "${3RDPARTY_TBB_DIR}/bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/*")
+            if (${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST)
+              list (GET ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST -1 THE_MOST_FRESH_COMPILER_VERSION)
+              if (THE_MOST_FRESH_COMPILER_VERSION)
+                get_filename_component (THE_MOST_FRESH_COMPILER_VERSION_NAME "${THE_MOST_FRESH_COMPILER_VERSION}" NAME)
+                set (PRODUCT_PATH_SUFFIXES bin bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${THE_MOST_FRESH_COMPILER_VERSION_NAME})
+              endif()
+            endif()
+          endif()
         else()
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_BIN}")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_BIN}i")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_BIN}d")
+          set (PRODUCT_PATH_SUFFIXES bin bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER})
+        endif()
+
+        if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+          find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL ${PRODUCT_LIBRARY_NAME}
+                                         PATHS "${3RDPARTY_TBB_DIR}"
+                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
+                                         NO_DEFAULT_PATH)
+        else()
+          find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL ${PRODUCT_LIBRARY_NAME} PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES})
+        endif()
+
+        if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}")
+          get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}" PATH)
+          set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+        else()
+          set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
+
+          set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL "" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
         endif()
       endif()
-      mark_as_advanced (3RDPARTY_${LIB_UPPER}_LIBRARY 3RDPARTY_${LIB_UPPER}_DLL)
-    endforeach()
-    if (INSTALL_TBB)
-      set (USED_3RDPARTY_TBB_DIR "")
-    else()
-      # the *.dll/*.so* directory for using by the executable
-      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
     endif()
-  else()
-    message (FATAL_ERROR "Installation directory with TBB is not exist.")
+
+    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
+    else()
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
+    endif()
   endif()
-else ()
-  # NOT WIN32 branch
-  if ((DEFINED 3RDPARTY_DIR) AND (NOT "${3RDPARTY_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_DIR}"))
-    # Here, we have correct 3RDPARTY_DIR.
-    # Trying to specify TBB folder in connection with 3RDPARTY_DIR
-    if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-      if (TBB_DIR_NAME)
-        set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+
+  # install tbb12/tbbmalloc
+  if (INSTALL_TBB)
+    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_COMPILER_SHORT_NAME()
+
+    if (WIN32)
+      if (SINGLE_GENERATOR)
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
+      else()
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR_BIN}i")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR_BIN}d")
       endif()
-    endif()
-    if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
-      # Find TBB 2021.5 in existing directory.
-      find_package (
-      TBB 2021.5
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-      REQUIRED
-      CONFIG)
     else()
-      # Find TBB 2021.5 in system directory.
-      find_package (
-      TBB 2021.5
-      REQUIRED
-      CONFIG)
-    endif()
-  else()
-    # Find TBB 2021.5 in system directory.
-    find_package (
-    TBB 2021.5
-    REQUIRED
-    CONFIG)
-  endif()
-  # TBB has been configured (in other case FATAL_ERROR occures).
-
-  # Achive include directory.
-  get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-  if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-    set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-  endif()
-  if (EXISTS "${TBB_INCLUDE_DIR}")
-    set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-  endif()
-
-  separate_arguments (CSF_TBB)
-  foreach (LIB IN LISTS CSF_TBB)
-    string(TOLOWER "${LIB}" LIB_LOWER)
-    string(TOUPPER "${LIB}" LIB_UPPER)
-
-    # Achive *.so files and directory containing it.
-    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-    # Reserve cache variable for *.so.
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
-    endif()
-    # Reserve cache variable for directory containing *.so file.
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.so)")
-    endif()
-    if (EXISTS "${TBB_SO_FILE}")
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY
-           "${TBB_SO_FILE}"
-           CACHE FILEPATH
-           "${LIB_UPPER} library (*.so)"
-           FORCE)
-      get_filename_component (TBB_SO_FILE_DIRECTORY "${TBB_SO_FILE}" DIRECTORY)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-           "${TBB_SO_FILE_DIRECTORY}"
-           CACHE PATH
-           "The directory containing ${LIB_UPPER} library (*.so)"
-           FORCE)
-      list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
-    else()
-      list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-    endif()
-
-    # install *.so* (tbb & tbbmalloc)
-    if (INSTALL_TBB)
-      OCCT_MAKE_OS_WITH_BITNESS()
-      OCCT_MAKE_COMPILER_SHORT_NAME()
+      get_filename_component (PRODUCT_LIBRARY_NAME ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY} NAME)
 
       if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} DESTINATION "${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 DESTINATION "${INSTALL_DIR_LIB}"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
       else()
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_LIB}")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_LIB}i")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_LIB}d")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_LIB}"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR_LIB}i"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR_LIB}d"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
       endif()
     endif()
+  endif()
+  mark_as_advanced (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL)
+endmacro()
+
+#if (BUILD_SHARED_LIBS)
+  separate_arguments (CSF_TBB)
+  foreach (LIB IN LISTS CSF_TBB)
+    TBB_PRODUCT_SEARCH (${LIB})
   endforeach()
+
   if (INSTALL_TBB)
     set (USED_3RDPARTY_TBB_DIR "")
   else()
-    # the *.so* directory for using by the executable
-    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
+    # the library directory for using by the executable
+    if (WIN32)
+      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB12_DLL_DIR})
+    else()
+      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB12_LIBRARY_DIR})
+    endif()
   endif()
-endif()
+#endif()

adm/genconfdeps.tcl

@@ -775,7 +775,7 @@ proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
         lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib/$aSubDir/$aVcLib"
       }
       if { "$aTbbLibPath" == "" } {
-        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}tbb.${::SYS_LIB_SUFFIX}' not found (Intel TBB)"
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}tbb12.${::SYS_LIB_SUFFIX}' not found (Intel TBB)"
         if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
       }
     }

adm/genproj.tcl

@@ -1233,11 +1233,28 @@ proc osutils:convertModules { theModules theSrcDir theSourceDirOther theProjects
       lappend aProjectsInModule($aModule) $aToolKit
       lappend aDependencies [LibToLink $aToolKit $theSrcDir $theSourceDirOther]
     }
-    # executables
+    # executables, assume one project per cxx file...
     foreach aUnit [OS:executable ${aModule}] {
-      lappend aProjects $aUnit
-      lappend aProjectsInModule($aModule) $aUnit
-      lappend aDependencies [LibToLink $aUnit $theSrcDir $theSourceDirOther]
+      set aUnitLoc $aUnit
+      set src_files [_get_used_files $aUnit $theSrcDir false]
+      set aSrcFiles {}
+      foreach s $src_files {
+        regexp {source ([^\s]+)} $s dummy name
+        lappend aSrcFiles $name
+      }
+      foreach aSrcFile $aSrcFiles {
+        set aFileExtension [file extension $aSrcFile]
+        if { $aFileExtension == ".cxx" } {
+          set aPrjName [file rootname $aSrcFile]
+          lappend aProjects $aPrjName
+          lappend aProjectsInModule($aModule) $aPrjName
+          if {[file isdirectory $path/$theSrcDir/$aUnitLoc]} {
+            lappend aDependencies [LibToLinkX $aUnitLoc [file rootname $aSrcFile] $theSrcDir $theSourceDirOther]
+          } else {
+            lappend aDependencies {}
+          }
+        }
+      }
     }
   }
 }
@@ -1420,7 +1437,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
     set aLibsMap(CSF_FFmpeg) "avcodec avformat swscale avutil"
   }
   if { "$::HAVE_TBB" == "true" } {
-    set aLibsMap(CSF_TBB) "tbb tbbmalloc"
+    set aLibsMap(CSF_TBB) "tbb12 tbbmalloc"
   }
   if { "$::HAVE_VTK" == "true" } {
     if { "$theOS" == "wnt" } {
@@ -2093,106 +2110,98 @@ proc osutils:tk:execfiles { theFiles theOutDir theCommand thePrefix theExtension
 # Generate Visual Studio project file for executable
 proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir theSourceDirOther } {
   set aVcFiles {}
-  set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]
+  foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] {
+    set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]
 
-  set aProjName $theToolKit
-  set l_compilable [osutils:compilable wnt]
-  regsub -all -- {__XQTNAM__} $aProjTmpl $aProjName aProjTmpl
+    set aProjName [file rootname [file tail $f]]
+    set l_compilable [osutils:compilable wnt]
+    regsub -all -- {__XQTNAM__} $aProjTmpl $aProjName aProjTmpl
 
-  upvar $theGuidsMap aGuidsMap
-  if { ! [info exists aGuidsMap($aProjName)] } {
-    set aGuidsMap($aProjName) [OS:genGUID]
-  }
-  regsub -all -- {__PROJECT_GUID__} $aProjTmpl $aGuidsMap($aProjName) aProjTmpl
+    upvar $theGuidsMap aGuidsMap
+    if { ! [info exists aGuidsMap($aProjName)] } {
+      set aGuidsMap($aProjName) [OS:genGUID]
+    }
+    regsub -all -- {__PROJECT_GUID__} $aProjTmpl $aGuidsMap($aProjName) aProjTmpl
 
-  set aUsedLibs [list]
-  foreach tkx [osutils:commonUsedTK  $theToolKit $theSrcDir $theSourceDirOther] {
-    lappend aUsedLibs "${tkx}.lib"
-  }
+    set aUsedLibs [list]
+    foreach tkx [osutils:commonUsedTK  $theToolKit $theSrcDir $theSourceDirOther] {
+      lappend aUsedLibs "${tkx}.lib"
+    }
 
-  set anOsReleaseLibs {}
-  set anOsDebugLibs {}
-  osutils:usedOsLibs $theToolKit "wnt" anOsReleaseLibs aFrameworks $theSrcDir true
-  osutils:usedOsLibs $theToolKit "wnt" anOsDebugLibs   aFrameworks $theSrcDir false
+    set anOsReleaseLibs {}
+    set anOsDebugLibs {}
+    osutils:usedOsLibs $theToolKit "wnt" anOsReleaseLibs aFrameworks $theSrcDir true
+    osutils:usedOsLibs $theToolKit "wnt" anOsDebugLibs aFrameworks $theSrcDir false
 
-  set aVCRTVer [string range $theVcVer 0 3]
-  regsub -all -- {__TKDEP__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] aProjTmpl
-  regsub -all -- {__TKDEP_DEBUG__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] aProjTmpl
-  regsub -all -- {__TKDEFINES__} $aProjTmpl "" aProjTmpl
+    set aVCRTVer [string range $theVcVer 0 3]
+    regsub -all -- {__TKDEP__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] aProjTmpl
+    regsub -all -- {__TKDEP_DEBUG__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] aProjTmpl
+    regsub -all -- {__TKDEFINES__} $aProjTmpl "" aProjTmpl
 
-  set aFilesSection ""
-  set aVcFilesCxx(units) ""
-  set aVcFilesHxx(units) ""
+    set aFilesSection ""
+    set aVcFilesCxx(units) ""
+	set aVcFilesHxx(units) ""
 
-  if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-    foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] {
-      if { ![info exists written([file tail $f])] } {
-        set written([file tail $f]) 1
+    if { ![info exists written([file tail $f])] } {
+      set written([file tail $f]) 1
+
+      if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
         append aFilesSection [osutils:vcxproj:cxxfile $f "" 3]
         if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit }
         lappend aVcFilesCxx($theToolKit) $f
       } else {
-        puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
-      }
-    }
-  } else {
-    append aFilesSection "\t\t\t<Filter\n"
-    append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
-    append aFilesSection "\t\t\t\t>\n"
-    foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] {
-      if { ![info exists written([file tail $f])] } {
-        set written([file tail $f]) 1
+        append aFilesSection "\t\t\t<Filter\n"
+        append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
+        append aFilesSection "\t\t\t\t>\n"
         append aFilesSection [osutils:vcproj:file $theVcVer $f ""]
-      } else {
-        puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
+        append aFilesSection "\t\t\t</Filter>"
       }
+    } else {
+      puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
     }
-    append aFilesSection "\t\t\t</Filter>"
-  }
+    #puts "$aProjTmpl $aFilesSection"
+    set anIncPaths "..\\..\\..\\inc"
+    regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
+    regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
+    regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl
 
-  #puts "$aProjTmpl $aFilesSection"
-  set anIncPaths "..\\..\\..\\inc"
-  regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
-  regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
-  regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl
+    regsub -all -- {__XQTEXT__} $aProjTmpl "exe" aProjTmpl
 
-  regsub -all -- {__XQTEXT__} $aProjTmpl "exe" aProjTmpl
-
-  set aFile [open [set aVcFilePath [file join $theOutDir ${aProjName}.[osutils:vcproj:ext $theVcVer]]] w]
-  fconfigure $aFile -translation crlf
-  puts $aFile $aProjTmpl
-  close $aFile
-
-  set aCommonSettingsFile "$aVcFilePath.user"
-  lappend aVcFiles $aVcFilePath
-
-  # write filters file for vc10
-  if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-    lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
-  }
-
-  # write resource file
-  lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
-
-  set aCommonSettingsFileTmpl ""
-  if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
-    # nothing
-  } elseif { "$theVcVer" == "vc9" } {
-    set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcproj.user.vc9x"]
-  } else {
-    set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcxproj.user.vc10x"]
-  }
-  if { "$aCommonSettingsFileTmpl" != "" } {
-    regsub -all -- {__VCVER__} $aCommonSettingsFileTmpl $aVCRTVer aCommonSettingsFileTmpl
-
-    set aFile [open [set aVcFilePath "$aCommonSettingsFile"] w]
+    set aFile [open [set aVcFilePath [file join $theOutDir ${aProjName}.[osutils:vcproj:ext $theVcVer]]] w]
     fconfigure $aFile -translation crlf
-    puts $aFile $aCommonSettingsFileTmpl
+    puts $aFile $aProjTmpl
     close $aFile
 
-    lappend aVcFiles "$aCommonSettingsFile"
-  }
+    set aCommonSettingsFile "$aVcFilePath.user"
+    lappend aVcFiles $aVcFilePath
 
+    # write filters file for vc10
+    if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
+      lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
+    }
+
+    # write resource file
+    lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
+
+    set aCommonSettingsFileTmpl ""
+    if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
+      # nothing
+    } elseif { "$theVcVer" == "vc9" } {
+      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcproj.user.vc9x"]
+    } else {
+      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcxproj.user.vc10x"]
+    }
+    if { "$aCommonSettingsFileTmpl" != "" } {
+      regsub -all -- {__VCVER__} $aCommonSettingsFileTmpl $aVCRTVer aCommonSettingsFileTmpl
+
+      set aFile [open [set aVcFilePath "$aCommonSettingsFile"] w]
+      fconfigure $aFile -translation crlf
+      puts $aFile $aCommonSettingsFileTmpl
+      close $aFile
+
+      lappend aVcFiles "$aCommonSettingsFile"
+    }
+  }
   return $aVcFiles
 }
 

adm/qmake/OccToolkit.pri

@@ -23,7 +23,7 @@ CSF_TclLibs   = -ltcl8.6
 CSF_TclTkLibs = -ltk8.6
 HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
 HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
-HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
+HAVE_TBB       { CSF_TBB = -ltbb12 -ltbbmalloc }
 HAVE_ZLIB      { CSF_ZLIB = -lzlib }
 HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
 HAVE_DRACO     { CSF_Draco = -ldraco }

adm/scripts/.gitignore

@@ -0,0 +1,2 @@
+*custom.bat
+*custom.sh

adm/scripts/cmake_custom.bat

@@ -1,50 +0,0 @@
-rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat)
-
-set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty"
-
-set VS=14
-set VSDATA=2015
-
-rem Leave VSPLATFORM empty to build for x86 platform
-set VSPLATFORM=Win64
-
-rem ------------------------------------
-rem Uncomment to customize building steps
-rem ------------------------------------
-
-rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
-set "INSTALL_DIR=%SrcRoot%\..\3rdparty\occt77-vc14-64"
-
-set BUILD_CPP_STANDARD=C++14
-
-rem set BUILD_DOC_Overview=OFF
-rem set BUILD_Inspector=OFF
-rem set BUILD_LIBRARY_TYPE=Shared
-rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
-rem set BUILD_WITH_DEBUG=OFF
-rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
-rem set BUILD_USE_PCH=OFF
-rem set BUILD_FORCE_RelWithDebInfo=OFF
-
-rem Use semicolon-separated list of toolkits if you want to disable all modules
-rem  and build only some toolkits.
-rem set BUILD_ADDITIONAL_TOOLKITS=
-
-rem Set a directory recognized as a patch for OCCT.
-rem set BUILD_PATCH=
-
-rem set BUILD_MODULE_ApplicationFramework=ON
-rem set BUILD_MODULE_DataExchange=ON
-rem set BUILD_MODULE_Draw=ON
-rem set BUILD_MODULE_ModelingAlgorithms=ON
-rem set BUILD_MODULE_ModelingData=ON
-rem set BUILD_MODULE_Visualization=ON
-
-rem set USE_D3D=OFF
-rem set USE_FFMPEG=OFF
-set USE_FREEIMAGE=ON
-rem set USE_GLES2=OFF
-set USE_RAPIDJSON=ON
-rem set USE_DRACO=OFF
-rem set USE_TBB=OFF
-rem set USE_VTK=OFF

adm/scripts/cmake_custom.sh

@@ -1,45 +0,0 @@
-# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh)
-
-OCCT3RDPARTY="$SrcRoot/../3rdparty"
-FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
-
-# ------------------------------------
-# Uncomment to customize building steps
-# ------------------------------------
-
-#BUILD_DIR=build
-INSTALL_DIR="$SrcRoot/../3rdparty/occt77"
-
-BUILD_CPP_STANDARD=C++14
-
-#BUILD_DOC_Overview=OFF
-#BUILD_Inspector=OFF
-#BUILD_LIBRARY_TYPE=Shared
-#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
-#BUILD_WITH_DEBUG=OFF
-#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
-
-# Use semicolon-separated list of toolkits if you want to disable all modules
-#  and build only some toolkits.
-#BUILD_ADDITIONAL_TOOLKITS=
-
-# Set a directory recognized as a patch for OCCT.
-#BUILD_PATCH=
-
-#BUILD_MODULE_ApplicationFramework=ON
-#BUILD_MODULE_DataExchange=ON
-#BUILD_MODULE_Draw=ON
-#BUILD_MODULE_ModelingAlgorithms=ON
-#BUILD_MODULE_ModelingData=ON
-#BUILD_MODULE_Visualization=ON
-
-#USE_FFMPEG=OFF
-USE_FREEIMAGE=ON
-#USE_GLES2=OFF
-USE_RAPIDJSON=ON
-#USE_DRACO=OFF
-#USE_TBB=OFF
-#USE_VTK=OFF
-
-# This is to add any additional arguments to cmake
-#AUX_ARGS=

adm/scripts/cmake_gen.bat

@@ -15,8 +15,6 @@ set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
 set "OCCT3RDPARTY="
 set "INSTALL_DIR=%SrcRoot%\install"
 
-set BUILD_CPP_STANDARD=C++11
-
 set BUILD_ADDITIONAL_TOOLKITS=
 set BUILD_DOC_Overview=OFF
 set BUILD_Inspector=OFF
@@ -57,7 +55,6 @@ if not exist "%BUILD_DIR%" mkdir "%BUILD_DIR%"
 pushd "%BUILD_DIR%"
  
 cmake -G "%arch_compile%" ^
-  -D BUILD_CPP_STANDARD:STRING="%BUILD_CPP_STANDARD%" ^
   -D 3RDPARTY_DIR:STRING="%OCCT3RDPARTY%" ^
   -D BUILD_ADDITIONAL_TOOLKITS:STRING="%BUILD_ADDITIONAL_TOOLKITS%" ^
   -D BUILD_DOC_Overview:BOOL=%BUILD_DOC_Overview% ^

adm/scripts/cmake_gen.sh

@@ -14,13 +14,12 @@ DEB=
 CMAKE_BUILD_TYPE=Release
 if [ "$1" = "-d" ]; then
   DEB=d
+  BUILD_DIR=${BUILD_DIR}-deb
   CMAKE_BUILD_TYPE=Debug
 fi
 INSTALL_DIR_BIN=lin64/gcc/bin$DEB
 INSTALL_DIR_LIB=lin64/gcc/lib$DEB
 
-BUILD_CPP_STANDARD=C++11
-
 BUILD_ADDITIONAL_TOOLKITS=
 BUILD_DOC_Overview=OFF
 BUILD_Inspector=OFF
@@ -55,7 +54,6 @@ if [ ! -d "$BUILD_DIR" ]; then mkdir -p "$BUILD_DIR"; fi
 pushd "$BUILD_DIR"
  
 cmake -G "Unix Makefiles" \
-  -D BUILD_CPP_STANDARD:STRING="$BUILD_CPP_STANDARD" \
   -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
   -D 3RDPARTY_DIR:PATH="$OCCT3RDPARTY" \
   -D 3RDPARTY_FREETYPE_DIR:PATH="$FREETYPE_DIR" \

adm/scripts/wasm_build.bat

@@ -26,12 +26,6 @@ set "toDebug=0"
 set "toBuildSample=0"
 set "sourceMapBase="
 
-set "aBuildType=Release"
-if /I ["%1"] == ["-d"] (
-  set "toDebug=1"
-  set "aBuildType=Debug"
-)
-
 rem OCCT Modules to build
 set "BUILD_ModelingData=ON"
 set "BUILD_ModelingAlgorithms=ON"
@@ -50,38 +44,9 @@ rem Archive tool
 set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
 set "THE_7Z_PATH=%ProgramW6432%\7-Zip\7z.exe"
 
-set "aPlatformAndCompiler="
-set "aWorkDir="
-set "aDestDir="
-set "aLogFile="
-
-set "aSrcRootSmpl=%aCasSrc%\samples\webgl"
-set "aWorkDirSmpl="
-set "aDestDirSmpl="
-set "aLogFileSmpl="
-
 rem Configuration file
 if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat"
 
-set "aBuildTypePrefix="
-set "anExtraCxxFlags="
-if /I ["%USE_PTHREADS%"] == ["ON"] (
-  set "anExtraCxxFlags=-pthread"
-  set "aBuildTypePrefix=%aBuildTypePrefix%-pthread"
-)
-if ["%toDebug%"] == ["1"] (
-  set "aBuildTypePrefix=%aBuildTypePrefix%-debug"
-)
-
-if ["%aPlatformAndCompiler%"] == [""] ( set "aPlatformAndCompiler=wasm32%aBuildTypePrefix%" )
-if ["%aWorkDir%"] == [""] ( set "aWorkDir=%aBuildRoot%\occt-%aPlatformAndCompiler%-make" )
-if ["%aDestDir%"] == [""] ( set "aDestDir=%aBuildRoot%\occt-%aPlatformAndCompiler%" )
-if ["%aLogFile%"] == [""] ( set "aLogFile=%aBuildRoot%\occt-%aPlatformAndCompiler%-build.log" )
-
-if ["%aWorkDirSmpl%"] == [""] ( set "aWorkDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-make" )
-if ["%aDestDirSmpl%"] == [""] ( set "aDestDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%" )
-if ["%aLogFileSmpl%"] == [""] ( set "aLogFileSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-build.log" )
-
 call "%EMSDK_ROOT%\emsdk_env.bat"
 set "aToolchain=%EMSDK%/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
 if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" )
@@ -93,8 +58,23 @@ for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOP
 for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
 for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
+set "aBuildType=Release"
+set "aBuildTypePrefix="
+set "anExtraCxxFlags="
+if /I ["%USE_PTHREADS%"] == ["ON"] (
+  set "anExtraCxxFlags=-pthread"
+  set "aBuildTypePrefix=%aBuildTypePrefix%-pthread"
+)
+if ["%toDebug%"] == ["1"] (
+  set "aBuildType=Debug"
+  set "aBuildTypePrefix=%aBuildTypePrefix%-debug"
+)
+
 call :cmakeGenerate
 if errorlevel 1 (
+  if not ["%1"] == ["-nopause"] (
+    pause
+  )
   exit /B 1
   goto :eof
 )
@@ -128,10 +108,17 @@ if ["%toPack%"] == ["1"] (
 
   "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%"
 )
+if not ["%1"] == ["-nopause"] (
+  pause
+)
 
 goto :eof
 
 :cmakeGenerate
+set "aPlatformAndCompiler=wasm32%aBuildTypePrefix%"
+set "aWorkDir=%aBuildRoot%\occt-%aPlatformAndCompiler%-make"
+set "aDestDir=%aBuildRoot%\occt-%aPlatformAndCompiler%"
+set "aLogFile=%aBuildRoot%\occt-%aPlatformAndCompiler%-build.log"
 if ["%toCMake%"] == ["1"] (
   if ["%toClean%"] == ["1"] (
     rmdir /S /Q %aWorkDir%"
@@ -141,6 +128,10 @@ if ["%toCMake%"] == ["1"] (
 if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" )
 if     exist "%aLogFile%" ( del   "%aLogFile%" )
 
+set "aSrcRootSmpl=%aCasSrc%\samples\webgl"
+set "aWorkDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-make"
+set "aDestDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%"
+set "aLogFileSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-build.log"
 if ["%toBuildSample%"] == ["1"] (
   if ["%toCMake%"] == ["1"] (
     if ["%toClean%"] == ["1"] (
@@ -281,6 +272,7 @@ if ["%toCMake%"] == ["1"] (
 
   if errorlevel 1 (
     popd
+    pause
     exit /B
     goto :eof
   )
@@ -295,6 +287,7 @@ if ["%toMake%"] == ["1"] (
   if errorlevel 1 (
     type "%aLogFileSmpl%"
     popd
+    pause
     exit /B
     goto :eof
   )
@@ -306,6 +299,7 @@ if ["%toInstall%"] == ["1"] (
   if errorlevel 1 (
     type "%aLogFileSmpl%"
     popd
+    pause
     exit /B
     goto :eof
   )

adm/scripts/wasm_build.sh

@@ -4,11 +4,6 @@
 # wasm_custom.sh should be configured with paths to CMake, 3rd-parties and Emscripten SDK.
 # FreeType should be specified as mandatory dependency.
 
-CMAKE_BUILD_TYPE=Release
-if [ "$1" = "-d" ]; then
-  CMAKE_BUILD_TYPE=Debug
-fi
-
 export aScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export aSrcRoot="${aScriptDir}/../.."
 export aBuildRoot=work
@@ -26,12 +21,6 @@ export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
 
-export aPlatformAndCompiler=wasm
-
-export aWorkDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}-make"
-export aDestDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}"
-export aLogFile="${aSrcRoot}/${aBuildRoot}/build-${aPlatformAndCompiler}.log"
-
 if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then
   . "${aScriptDir}/wasm_custom.sh"
 fi
@@ -44,14 +33,19 @@ export aGitBranch=`git symbolic-ref --short HEAD`
 
 echo "Compilation OCCT branch : $aGitBranch"
 
+export aPlatformAndCompiler=wasm
+
+export aWorkDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}-make"
 if [ ! -d "${aWorkDir}" ]; then
   mkdir -p "${aWorkDir}"
 fi
 
+export aDestDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}"
 if [ ! -d "${aDestDir}" ]; then
   mkdir -p "${aDestDir}"
 fi
 
+export aLogFile="${aSrcRoot}/${aBuildRoot}/build-${aPlatformAndCompiler}.log"
 if [ -f "${aLogFile}" ]; then
   rm "${aLogFile}"
 fi
@@ -66,14 +60,14 @@ if [ "${toCMake}" = "1" ]; then
 
 echo "Configuring OCCT for WASM..."
 echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
--DCMAKE_BUILD_TYPE:STRING="$CMAKE_BUILD_TYPE" \
+-DCMAKE_BUILD_TYPE:STRING="Release" \
 -DBUILD_LIBRARY_TYPE:STRING="Static" \
 -DINSTALL_DIR:PATH="${aDestDir}" \
 -DINSTALL_DIR_INCLUDE:STRING="inc" \
 -DINSTALL_DIR_RESOURCE:STRING="src" \
 -D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
--D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include/freetype2" \
--D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include/freetype2" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
 -DBUILD_MODULE_FoundationClasses:BOOL="ON" \
 -DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \
 -DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \
@@ -84,14 +78,14 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 
 cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
--DCMAKE_BUILD_TYPE:STRING="$CMAKE_BUILD_TYPE" \
+-DCMAKE_BUILD_TYPE:STRING="Release" \
 -DBUILD_LIBRARY_TYPE:STRING="Static" \
 -DINSTALL_DIR:PATH="${aDestDir}" \
 -DINSTALL_DIR_INCLUDE:STRING="inc" \
 -DINSTALL_DIR_RESOURCE:STRING="src" \
 -D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
--D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include/freetype2" \
--D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include/freetype2" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
 -DBUILD_MODULE_FoundationClasses:BOOL="ON" \
 -DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \
 -DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \

adm/scripts/wasm_custom.bat

@@ -1,30 +0,0 @@
-rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat)
-set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm"
-set "EMSDK_ROOT=%aCasSrc%\..\emsdk"
-rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0"
-rem set "aDraco=%aCasSrc%\..\3rdparty\draco-1.4.1-wasm32"
-rem set "aCmakeBin=%ProgramW6432%\CMake\bin"
-
-set "aDestDir=%aCasSrc%\..\3rdparty\occt77-wasm"
-
-rem Uncomment to customize building steps
-rem set "aBuildRoot=work"
-rem set "toCMake=1"
-rem set "toClean=0"
-rem set "toMake=1"
-rem set "toInstall=1"
-set "toPack=0"
-set "toBuildSample=0"
-rem Source map base (should point to server where C++ sources will be copied)
-rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger.
-rem set "sourceMapBase=http://localhost:9090/"
-
-set "BUILD_ModelingData=OFF"
-set "BUILD_ModelingAlgorithms=OFF"
-rem set "BUILD_Visualization=ON"
-set "BUILD_ApplicationFramework=OFF"
-set "BUILD_DataExchange=OFF"
-
-set "USE_RAPIDJSON=OFF"
-set "USE_DRACO=OFF"
-set "USE_PTHREADS=OFF"

adm/scripts/wasm_custom.sh

@@ -1,20 +0,0 @@
-# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh)
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm"
-export EMSDK_ROOT="$aSrcRoot/../emsdk"
-
-export aDestDir="${aSrcRoot}/../3rdparty/occt77-wasm"
-
-# Uncomment to customize building steps
-#export aBuildRoot=work
-#export toCMake=1
-#export toClean=0
-#export toMake=1
-#export toInstall=1
-
-export BUILD_ModelingData=OFF
-export BUILD_ModelingAlgorithms=OFF
-#export BUILD_Visualization=ON
-export BUILD_ApplicationFramework=OFF
-export BUILD_DataExchange=OFF
-
-export aNbJobs=10

adm/templates/custom.build.bat.in

@@ -11,7 +11,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
     set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
     set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
-    set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
+    set "TBB_DIR=@3RDPARTY_TBB12_DLL_DIR@"
     set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
     set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
     set "OPENVR_DIR=@3RDPARTY_OPENVR_DLL_DIRS@"

adm/templates/custom.build.sh.in

@@ -9,7 +9,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
     export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
     export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
-    export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
+    export TBB_DIR="@3RDPARTY_TBB12_LIBRARY_DIR@"
     export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
     export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
 

dox/introduction/introduction.md

@@ -341,7 +341,7 @@ The tables below describe the recommended software configurations for which OCCT
 
 | OS        | Compiler |
 | --------- | ----------- |
-| Windows   | Microsoft Visual Studio: 2015 Update 3, 2017 <sup>1</sup>, 2019, 2022 <br>, LLVM (ClangCL), GCC 4.3+ (Mingw-w64)|
+| Windows   | Microsoft Visual Studio: 2013 Update 5, 2015 Update 3, 2017 <sup>1</sup>, 2019, 2022 <br>, LLVM (ClangCL), GCC 4.3+ (Mingw-w64)|
 | Linux     | GNU gcc 4.3+ <br> LLVM CLang 3.6+ |
 | OS X / macOS | XCode 6 or newer |
 | Android   | NDK r12, GNU gcc 4.9 or newer |
@@ -572,7 +572,8 @@ FreeType 2 is released under two open-source licenses: BSD-like FreeType License
 It is a library that helps you to take advantage of multi-core processor performance without having to be a threading expert. 
 Threading Building Blocks is not just a threads-replacement library. It represents a higher-level, task-based parallelism that 
 abstracts platform details and threading mechanisms for scalability and performance. 
-Intel oneTBB 2021.5.0 is available under Apache 2.0 license (https://www.threadingbuildingblocks.org).
+oneTBB 2021.5.0 is available under Apache 2.0 license, while older versions
+until 4.4 are available under GPLv2 license with the runtime exception (https://www.threadingbuildingblocks.org).
 
 **OpenGL** is an industry standard API for 3D graphics used by OCCT for 
 implementation of 3D viewer. OpenGL specification is developed by the

dox/upgrade/upgrade.md

@@ -2338,8 +2338,3 @@ or to include system OpenGL headers in advance (with help of `OpenGl_GlNative.hx
 
 Method `StdPrs_ToolTriangulatedShape::Normal()` has been removed.
 Please use `BRepLib_ToolTriangulatedShape::ComputeNormals()` to fill in normal attributes in triangulation and fetch them directly using `Poly_Triangulation::Normal()`.
-
-@subsection upgrade_occt770_shapeproximity BRepExtrema_ShapeProximity
-
-A new way of using the `BRepExtrema_ShapeProximity` class was provided for computing a proximity value between two shapes.
-If at initialization of the `BRepExtrema_ShapeProximity` class the *theTolerance* parameter is not defined (Precision::Infinite() by default), the proximity value will be computed.

dox/user_guides/foundation_classes/foundation_classes.md

@@ -1331,7 +1331,7 @@ Therefore if the user of *NCollection* does not specify any allocator as a param
 Nevertheless, it is possible to define a custom *Allocator* type to manage the memory in the most optimal or convenient way for this algorithm.
 
 As one possible choice, the class *NCollection_IncAllocator* is included.
-Unlike *NCollection_BaseAllocator*, the memory is allocated in big blocks (about 12kB) and the allocator keeps track of the amount of occupied memory.
+Unlike *NCollection_BaseAllocator*, the memory is allocated in big blocks (about 20kB) and the allocator keeps track of the amount of occupied memory.
 The method *Allocate* just increments the pointer to non-occupied memory and returns its previous value.
 Memory is only released in the destructor of *NCollection_IncAllocator*, the method *Free* is empty.
 If used properly, this Allocator can greatly improve the performance of specific algorithms.

dox/user_guides/modeling_data/modeling_data.md

@@ -326,8 +326,7 @@ The <i>Geom2dConvert</i> package provides the following:
   * a global function which is used to construct a BSpline curve from a bounded curve based on a 2D curve from the Geom2d package,
   * a splitting algorithm which computes the points at which a 2D BSpline curve should be cut in order to obtain arcs with the same degree of continuity,
   * global functions used to construct the BSpline curves created by this splitting algorithm, or by other types of segmentation of the BSpline curve,
-  * an algorithm which converts a 2D BSpline curve into a series of adjacent Bezier curves,
-  * an algorithm which converts an arbitrary 2D curve into a series of adjacent 2D circular arcs and 2D linear segments.
+  * an algorithm which converts a 2D BSpline curve into a series of adjacent Bezier curves.
 
 The <i>GeomConvert</i> package also provides the following:
 

dox/user_guides/step/step.md

@@ -1653,13 +1653,6 @@ For each Saved View OCCT STEP Reader will retrieve the following attributes:
 - clipping planes (single plane of combination of planes);
 - front and back plane clipping.
 
-### User defined attributes
-Attributes are implemented in accordance with <a href="https://www.mbx-if.org/documents/rec_prac_user_def_attributes_v18.pdf">Recommended practices for User Defined Attributes</a> section 4, 5, 6.1-6.3 and 7.
-Attributes can be read for shapes at levels:
-- Part/Product Level;
-- Component Instances in an Assembly;
-- Geometry Level.
-
 @subsection occt_step_7_3 Writing to STEP
 
 The translation from XDE to STEP can be initialized as follows: 
@@ -1737,8 +1730,5 @@ Interface_Static::SetIVal("write.step.schema", 5));
 ### Saved views
 Saved Views are not exported by OCCT.
 
-### User defined attributes
-Attributes can be imported from STEP.
-
 
 

samples/CSharp/OCCTProxy/OCCTProxy.vcxproj

@@ -91,6 +91,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
@@ -121,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
@@ -145,6 +147,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
@@ -172,6 +175,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>

samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj

@@ -92,6 +92,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
@@ -123,6 +124,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
@@ -147,6 +149,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
@@ -174,6 +177,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ConformanceMode>false</ConformanceMode>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>

samples/qt/IESample/IESample.pro

@@ -51,7 +51,7 @@ unix {
     DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
     !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
     LIBS += -lfreeimageplus
-    LIBS += -ltbb -ltbbmalloc
+    LIBS += -ltbb12 -ltbbmalloc
     QMAKE_CXXFLAGS += -std=gnu++11
 }
 

samples/qt/Interface/src/Translate.cxx

@@ -221,7 +221,7 @@ Handle(TopTools_HSequenceOfShape) Translate::importModel( const int format, cons
             shapes = importSTEP( file );
             break;
         }
-    } catch ( const Standard_Failure& ) {
+    } catch ( Standard_Failure ) {
         shapes.Nullify();
     }
     return shapes;
@@ -256,7 +256,7 @@ bool Translate::exportModel( const int format, const QString& file, const Handle
         case FormatSTL:  return exportSTL ( file, shapes );
         case FormatVRML: return exportVRML( file, shapes );
         }
-    } catch ( const Standard_Failure& ) {
+    } catch ( Standard_Failure ) {
         //
     }
     return false;
@@ -528,26 +528,26 @@ bool Translate::exportSTL( const QString& file, const Handle(TopTools_HSequenceO
     if ( shapes.IsNull() || shapes->IsEmpty() )
         return false;
 
-    TopoDS_Compound res;
-    BRep_Builder builder;
-    builder.MakeCompound( res );
+	TopoDS_Compound res;
+	BRep_Builder builder;
+	builder.MakeCompound( res );
 
-    for ( int i = 1; i <= shapes->Length(); i++ )
-    {
-        TopoDS_Shape shape = shapes->Value( i );
-        if ( shape.IsNull() ) 
-        {
-            myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
-            return false;
+	for ( int i = 1; i <= shapes->Length(); i++ )
+	{
+		TopoDS_Shape shape = shapes->Value( i );
+		if ( shape.IsNull() ) 
+		{
+			myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
+			return false;
         }
-        builder.Add( res, shape );
-    }
+		builder.Add( res, shape );
+	}
 
-    StlAPI_Writer writer;
-
-    const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
-
-    writer.Write( res, anUtf8Path.ToCString() );
+	StlAPI_Writer writer;
+	
+	const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
+	
+	writer.Write( res, anUtf8Path.ToCString() );
 
     return true;
 }
@@ -557,26 +557,26 @@ bool Translate::exportVRML( const QString& file, const Handle(TopTools_HSequence
     if ( shapes.IsNull() || shapes->IsEmpty() )
         return false;
 
-    TopoDS_Compound res;
-    BRep_Builder builder;
-    builder.MakeCompound( res );
+	TopoDS_Compound res;
+	BRep_Builder builder;
+	builder.MakeCompound( res );
 
-    for ( int i = 1; i <= shapes->Length(); i++ )
-    {
-        TopoDS_Shape shape = shapes->Value( i );
-        if ( shape.IsNull() )
-        {
-            myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
-            return false;
+	for ( int i = 1; i <= shapes->Length(); i++ )
+	{
+		TopoDS_Shape shape = shapes->Value( i );
+		if ( shape.IsNull() )
+		{
+			myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
+			return false;
         }
-    builder.Add( res, shape );
-    }
+		builder.Add( res, shape );
+	}
 
-    VrmlAPI_Writer writer;
-
-    const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
-
-    writer.Write( res, anUtf8Path.ToCString() );
+	VrmlAPI_Writer writer;
+	
+	const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
+	
+	writer.Write( res, anUtf8Path.ToCString() );
 
     return true;
 }

src/AIS/AIS_Animation.cxx

@@ -251,9 +251,7 @@ void AIS_Animation::Stop()
   myState = AnimationState_Stopped;
   if (!myTimer.IsNull())
   {
-    const Standard_Real anElapsedTime = ElapsedTime();
     myTimer->Stop();
-    myTimer->Seek (Min (Duration(), anElapsedTime));
   }
 
   for (NCollection_Sequence<Handle(AIS_Animation)>::Iterator anIter (myAnimations); anIter.More(); anIter.Next())

src/AIS/AIS_InteractiveContext.cxx

@@ -1,4 +1,4 @@
-// Created on: 1997-01-17
+// Created on: 1997-01-17
 // Created by: Robert COUBLANC
 // Copyright (c) 1997-1999 Matra Datavision
 // Copyright (c) 1999-2014 OPEN CASCADE SAS
@@ -1001,14 +1001,6 @@ void AIS_InteractiveContext::RecomputeSelectionOnly (const Handle(AIS_Interactiv
     return;
   }
 
-  TColStd_ListOfInteger aModes;
-  ActivatedModes (theIO, aModes);
-
-  for (TColStd_ListIteratorOfListOfInteger aModesIter (aModes); aModesIter.More(); aModesIter.Next())
-  {
-    mgrSelector->Deactivate (theIO, aModesIter.Value());
-  }
-
   mgrSelector->RecomputeSelection (theIO);
 
   const Handle(AIS_GlobalStatus)* aStatus = myObjects.Seek (theIO);
@@ -1018,7 +1010,10 @@ void AIS_InteractiveContext::RecomputeSelectionOnly (const Handle(AIS_Interactiv
     return;
   }
 
-  for (TColStd_ListIteratorOfListOfInteger aModesIter (aModes); aModesIter.More(); aModesIter.Next())
+  TColStd_ListOfInteger aModes;
+  ActivatedModes (theIO, aModes);
+  TColStd_ListIteratorOfListOfInteger aModesIter (aModes);
+  for (; aModesIter.More(); aModesIter.Next())
   {
     mgrSelector->Activate (theIO, aModesIter.Value());
   }

src/Approx/Approx_BSplComputeLine.gxx

@@ -808,11 +808,8 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
   const Standard_Integer aNbp = lastP - firstP + 1;
 
 
-  // The first parameter should always be zero according to all the logic below,
-  // so division by any value will give zero anyway, so it should never be scaled
-  // to avoid case when there is only one parameter in the array thus division by zero happens.
-  TheParameters(firstP) = 0.0;
   if (aNbp == 2) {
+    TheParameters(firstP) = 0.0;
     TheParameters(lastP) = 1.0;
   }
   else if (Par == Approx_ChordLength || Par == Approx_Centripetal)
@@ -823,6 +820,7 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
     if (nbP3d == 0) mynbP3d = 1;
     if (nbP2d == 0) mynbP2d = 1;
 
+    TheParameters(firstP) = 0.0;
     dist = 0.0;
     TColgp_Array1OfPnt tabP(1, mynbP3d);
     TColgp_Array1OfPnt tabPP(1, mynbP3d);
@@ -863,10 +861,10 @@ void Approx_BSplComputeLine::Parameters(const MultiLine& Line,
         TheParameters(i) = TheParameters(i - 1) + Sqrt(dist);
       }
     }
-    for (i = firstP + 1; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
+    for (i = firstP; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP);
   }
   else {
-    for (i = firstP + 1; i <= lastP; i++) {
+    for (i = firstP; i <= lastP; i++) {
       TheParameters(i) = (Standard_Real(i) - firstP) /
         (Standard_Real(lastP - Standard_Real(firstP)));
     }

src/BRepAlgo/BRepAlgo.cxx

@@ -15,13 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAlgo.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
@@ -30,13 +25,10 @@
 #include <ElCLib.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2dConvert_ApproxArcsSegments.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomConvert.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <GeomLProp.hxx>
-#include <NCollection_Vector.hxx>
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
 #include <ShapeFix_Shape.hxx>
@@ -48,7 +40,6 @@
 #include <TColStd_SequenceOfBoolean.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
@@ -56,166 +47,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
-// The minimal tolerance of approximation (edges can be defined with yet smaller tolerance)
-static const Standard_Real MINIMAL_TOLERANCE = 0.0001;
-
-namespace {
-
-struct OrientedCurve
-{
-  Handle(Geom2d_TrimmedCurve) Curve;
-  Standard_Boolean           IsReverse;
-  inline gp_Pnt2d Point (const Standard_Boolean isEnd) const
-  {
-    if (isEnd == IsReverse)
-      return Curve->StartPoint();
-    return Curve->EndPoint();
-  }  
-};
-
-}
-
-//=======================================================================
-//function : ConvertWire
-//purpose  : 
-//=======================================================================
-
-TopoDS_Wire BRepAlgo::ConvertWire(const TopoDS_Wire&          theWire,
-                                  const Standard_Real         theAngleTol,
-                                  const TopoDS_Face&          theFace)
-{
-  TopoDS_Wire aResult;
-  Standard_Real aMaxTol(0.);
-  const Handle(Geom_Surface) aSurf = BRep_Tool::Surface(theFace);
-  NCollection_Vector<OrientedCurve> vecCurve;
-
-  BRepTools_WireExplorer anExpE(theWire, theFace);
-  // Explore the edges in the current wire, in their connection order
-  for (; anExpE.More(); anExpE.Next()) {
-    const TopoDS_Edge& anEdge = anExpE.Current();
-    BRepAdaptor_Curve2d aCurve(anEdge, theFace);
-    Standard_Real aTol = BRep_Tool::Tolerance(anEdge);
-    if (aTol < MINIMAL_TOLERANCE)
-      aTol = MINIMAL_TOLERANCE;
-    if (aTol > aMaxTol)
-      aMaxTol = aTol;
-    Geom2dConvert_ApproxArcsSegments anAlgo(aCurve, aTol, theAngleTol);
-    const TColGeom2d_SequenceOfCurve& aResultApprox = anAlgo.GetResult();
-
-    // Form the array of approximated elementary curves
-    if (anEdge.Orientation() == TopAbs_REVERSED) {
-      for (Standard_Integer iCrv = aResultApprox.Length(); iCrv > 0 ; iCrv--) {
-        const Handle(Geom2d_Curve)& aCrv = aResultApprox(iCrv);
-        if (aCrv.IsNull() == Standard_False) {
-          OrientedCurve& anOCurve = vecCurve.Append(OrientedCurve());
-          anOCurve.Curve = Handle(Geom2d_TrimmedCurve)::DownCast(aCrv);
-          anOCurve.IsReverse = Standard_True;
-        }
-      }
-    } else {
-      for (Standard_Integer iCrv = 1; iCrv <= aResultApprox.Length(); iCrv++) {
-        const Handle(Geom2d_Curve)& aCrv = aResultApprox(iCrv);
-        if (aCrv.IsNull() == Standard_False) {
-          OrientedCurve& anOCurve = vecCurve.Append(OrientedCurve());
-          anOCurve.Curve = Handle(Geom2d_TrimmedCurve)::DownCast(aCrv);
-          anOCurve.IsReverse = Standard_False;
-        }
-      }
-    }
-  }
-
-  if (vecCurve.Length() > 0)
-  {
-    // Build the first vertex
-    BRep_Builder aVBuilder;
-    gp_Pnt2d aPnt[2] = {
-      vecCurve(0).Point(Standard_False),
-      vecCurve(vecCurve.Length() - 1).Point(Standard_True)
-    };
-    Standard_Real aDist = aPnt[0].Distance(aPnt[1]);
-    if (aDist > aMaxTol + Precision::Confusion())
-      aDist = Precision::Confusion();
-    else {
-      aDist = 0.5 * aDist + Precision::Confusion();
-      aPnt[0] = 0.5 * (aPnt[0].XY() + aPnt[1].XY());
-    }
-    gp_Pnt aPnt3d;
-    aSurf->D0(aPnt[0].X(), aPnt[0].Y(), aPnt3d);
-    TopoDS_Vertex aFirstVertex;
-    aVBuilder.MakeVertex(aFirstVertex, aPnt3d, aDist);
-
-    // Loop creating edges
-    BRepBuilderAPI_MakeWire aMkWire;
-    TopoDS_Edge anEdgeRes;
-    TopoDS_Vertex aVertex = aFirstVertex;
-    for (Standard_Integer iCrv = 0; iCrv < vecCurve.Length(); iCrv++) {
-      const OrientedCurve& anOCurve = vecCurve(iCrv);
-      TopoDS_Vertex aNextVertex;
-      aPnt[0] = anOCurve.Point(Standard_True);
-      if (iCrv == vecCurve.Length() - 1) {
-        aPnt[1] = vecCurve(0).Point(Standard_False);
-        aDist = aPnt[0].Distance(aPnt[1]);
-        if (aDist > aMaxTol + Precision::Confusion()) {
-          aSurf->D0(aPnt[0].X(), aPnt[0].Y(), aPnt3d);
-          aVBuilder.MakeVertex(aNextVertex, aPnt3d, Precision::Confusion());
-        } else {
-          aNextVertex = aFirstVertex;
-        }
-      } else {
-        aPnt[1] = vecCurve(iCrv + 1).Point(Standard_False);
-        aDist = 0.5 * (aPnt[0].Distance(aPnt[1])) + Precision::Confusion();
-        aPnt[0] = 0.5 * (aPnt[0].XY() + aPnt[1].XY());
-        aSurf->D0(aPnt[0].X(), aPnt[0].Y(), aPnt3d);
-        aVBuilder.MakeVertex(aNextVertex, aPnt3d, aDist);
-      }
-      const Standard_Real aParam[2] = {
-        anOCurve.Curve->FirstParameter(),
-        anOCurve.Curve->LastParameter()
-      };
-      if (anOCurve.IsReverse) {
-        BRepBuilderAPI_MakeEdge aMkEdge(anOCurve.Curve, aSurf, aNextVertex,
-                                        aVertex, aParam[0], aParam[1]);
-        anEdgeRes = aMkEdge.Edge();
-        anEdgeRes.Orientation(TopAbs_REVERSED);
-      } else {
-        BRepBuilderAPI_MakeEdge aMkEdge(anOCurve.Curve, aSurf, aVertex,
-                                        aNextVertex, aParam[0], aParam[1]);
-        anEdgeRes = aMkEdge.Edge();
-      }
-      aVertex = aNextVertex;
-      aMkWire.Add(anEdgeRes);
-    }
-
-    if (aMkWire.IsDone())
-      aResult = aMkWire.Wire();
-  }
-  return aResult;
-}
-
-//=======================================================================
-//function : ConvertFace
-//purpose  : 
-//=======================================================================
-
-TopoDS_Face BRepAlgo::ConvertFace (const TopoDS_Face&  theFace,
-                                   const Standard_Real theAngleTolerance)
-{
-  TopoDS_Face aResult;
-  const Handle(Geom_Surface) aSurf = BRep_Tool::Surface(theFace);
-  BRepBuilderAPI_MakeFace aMkFace(aSurf,Precision::Confusion());
-
-  TopExp_Explorer anExp(theFace, TopAbs_WIRE);
-  for (; anExp.More(); anExp.Next()) {
-    const TopoDS_Wire& aWire = TopoDS::Wire(anExp.Current());
-    const TopoDS_Wire aNewWire = ConvertWire(aWire, theAngleTolerance, theFace);
-    aMkFace.Add(aNewWire);
-  }
-  if (aMkFace.IsDone()) {
-    aResult = aMkFace.Face();
-  }
-  return aResult;
-}
-
 //=======================================================================
 //function : ConcatenateWire
 //purpose  : 

src/BRepAlgo/BRepAlgo.hxx

@@ -21,7 +21,6 @@
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Wire;
 class TopoDS_Edge;
-class TopoDS_Face;
 class TopoDS_Shape;
 
 
@@ -44,28 +43,6 @@ public:
   //! Junction points between edges of wire may be sharp,
   //! resulting curve of the resulting edge may be C0.
   Standard_EXPORT static TopoDS_Edge ConcatenateWireC0 (const TopoDS_Wire& Wire);
-
-  //! Method of wire conversion, calls BRepAlgo_Approx internally.
-  //! @param theWire
-  //!   Input Wire object.
-  //! @param theAngleTolerance
-  //!   Angle (in radians) defining the continuity of the wire: if two vectors
-  //!   differ by less than this angle, the result will be smooth (zero angle of
-  //!   tangent lines between curve elements).
-  //! @return
-  //!   The new TopoDS_Wire object consisting of edges each representing an arc
-  //!   of circle or a linear segment. The accuracy of conversion is defined
-  //!   as the maximal tolerance of edges in theWire.
-  static Standard_EXPORT TopoDS_Wire ConvertWire
-                                (const TopoDS_Wire&  theWire,
-                                 const Standard_Real theAngleTolerance,
-                                 const TopoDS_Face&  theFace);
-
-  //! Method of face conversion. The API corresponds to the method ConvertWire.
-  //! This is a shortcut for calling ConvertWire() for each wire in theFace.
-  static Standard_EXPORT TopoDS_Face ConvertFace
-                                (const TopoDS_Face&  theFace,
-                                 const Standard_Real theAngleTolerance);
   
   //! Checks if the  shape is "correct". If not, returns
   //! <Standard_False>, else returns <Standard_True>.

src/BRepClass/BRepClass_FaceExplorer.cxx

@@ -96,7 +96,7 @@ Standard_Boolean BRepClass_FaceExplorer::CheckPoint(gp_Pnt2d& thePoint)
   else
   {
     Standard_Real anEpsilon = Epsilon(aDistance);
-    if (anEpsilon > Max (myUMax - myUMin, myVMax - myVMin) && anEpsilon > 1e-100)
+    if (anEpsilon > Max (myUMax - myUMin, myVMax - myVMin))
     {
       gp_Vec2d aLinVec(aCenterPnt, thePoint);
       gp_Dir2d aLinDir(aLinVec);

src/BRepClass/BRepClass_Intersector.cxx

@@ -197,12 +197,10 @@ Standard_Boolean CheckOn(IntRes2d_IntersectionPoint& thePntInter,
     if (aMinDist <= theTolZ) {
       IntRes2d_Transition aTrOnLin(IntRes2d_Head);
       IntRes2d_Position aPosOnCurve = IntRes2d_Middle;
-      if ((Abs(aPar - theDeb) <= Precision::Confusion())
-        || (aPar < theDeb)) {
+      if (Abs(aPar - theDeb) <= Precision::Confusion()) {
         aPosOnCurve = IntRes2d_Head;
       }
-      else if ((Abs(aPar - theFin) <= Precision::Confusion()) 
-        || (aPar > theFin)) {
+      else if (Abs(aPar - theFin) <= Precision::Confusion()) {
         aPosOnCurve = IntRes2d_End;
       }
       //
@@ -383,16 +381,8 @@ void  BRepClass_Intersector::Perform(const gp_Lin2d& L,
   {
     Standard_Boolean aStatusOn = Standard_False;
     IntRes2d_IntersectionPoint aPntInter;
-    Standard_Real aDebTol = deb;
-    Standard_Real aFinTol = fin;
-    if (aTolZ > Precision::Confusion())
-    {
-      aDebTol = deb - aTolZ;
-      aFinTol = fin + aTolZ;
-    }
-    Geom2dAdaptor_Curve aCurAdaptor(aC2D, aDebTol, aFinTol);
 
-    aStatusOn = CheckOn(aPntInter, F, L, aCurAdaptor, aTolZ, fin, deb);
+    aStatusOn = CheckOn(aPntInter, F, L, C, aTolZ, fin, deb);
     if (aStatusOn)
     {
       Append(aPntInter);

src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx

@@ -1,460 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 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.
-
-#include <BRepExtrema_ProximityDistTool.hxx>
-
-#include <BRepAdaptor_Surface.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pln.hxx>
-#include <Precision.hxx>
-#include <Poly_Connect.hxx>
-#include <Standard_NullValue.hxx>
-#include <TopoDS.hxx>
-
-//=======================================================================
-//function : BRepExtrema_ProximityDistTool
-//purpose  : Creates new unitialized tool
-//=======================================================================
-BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool()
-: myMinDistance (std::numeric_limits<Standard_Real>::max()),
-  myProxDist (-1.),
-  myPntStatus1 (ProxPnt_Status_UNKNOWN),
-  myPntStatus2 (ProxPnt_Status_UNKNOWN),
-  myNbSamples1 (0),
-  myProxVtxIdx1 (-1)
-{
-}
-
-//=======================================================================
-//function : BRepExtrema_ProximityDistTool
-//purpose  : Creates new tool for the given element sets
-//=======================================================================
-BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                              const Standard_Integer theNbSamples1,
-                                                              const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                              const BRepExtrema_ShapeList& theShapeList1,
-                                                              const BRepExtrema_ShapeList& theShapeList2)
-: myMinDistance (std::numeric_limits<Standard_Real>::max()),
-  myProxDist (-1.),
-  myPntStatus1 (ProxPnt_Status_UNKNOWN),
-  myPntStatus2 (ProxPnt_Status_UNKNOWN),
-  myNbSamples1 (theNbSamples1),
-  myProxVtxIdx1 (-1)
-{
-  LoadTriangleSets (theSet1, theSet2);
-  LoadShapeLists (theShapeList1, theShapeList2);
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given element sets into the tool
-//=======================================================================
-void BRepExtrema_ProximityDistTool::LoadTriangleSets (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                      const Handle(BRepExtrema_TriangleSet)& theSet2)
-{
-  mySet1 = theSet1;
-  mySet2 = theSet2;
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given list of subshapes into the proximity tool
-//=======================================================================
-void BRepExtrema_ProximityDistTool::LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                                    const BRepExtrema_ShapeList& theShapeList2)
-{
-  myShapeList1 = theShapeList1;
-  myShapeList2 = theShapeList2;
-}
-//=======================================================================
-//function : Perform
-//purpose  : Performs searching of the proximity distance
-//=======================================================================
-void BRepExtrema_ProximityDistTool::Perform()
-{
-  SetBVHSet (mySet2.get());
-
-  const BVH_Array3d& aVertices1 = mySet1->GetVertices();
-  Standard_Integer aVtxSize = (Standard_Integer)aVertices1.size();
-  Standard_Integer aVtxStep = Max (myNbSamples1 <= 0 ? 1 : aVtxSize / myNbSamples1, 1);
-  for (Standard_Integer aVtxIdx = 0; aVtxIdx < aVtxSize; aVtxIdx += aVtxStep)
-  {
-    myDistance = std::numeric_limits<Standard_Real>::max();
-    myMinDistance = std::numeric_limits<Standard_Real>::max();
-    myIsDone = Standard_False;
-    SetObject (aVertices1[aVtxIdx]);
-
-    ComputeDistance();
-
-    if (!IsDone() && myProxDist < 0.) return;
-
-    if (IsDone() && myDistance > myProxDist)
-    {
-      myPnt1 = aVertices1[aVtxIdx];
-      myPnt2 = myExtremaPoint;
-      myProxDist = myDistance;
-      myProxVtxIdx1 = aVtxIdx;
-      myProxPrjState = myExtPrjState;
-    }
-  }
-
-   myIsDone = myProxDist > -1.;
-
-   if (myIsDone)
-   {
-     DefineStatusProxPnt();
-   }
-}
-
-static Standard_Real pointBoxSquareMaxDistance (const BVH_Vec3d& thePoint,
-                                                const BVH_Vec3d& theCMin,
-                                                const BVH_Vec3d& theCMax)
-{
-  Standard_Real aDist = 0;
-  for (int i = 0; i < 3; ++i)
-  {
-    if (thePoint[i] <= 0.5 * (theCMax[i] + theCMin[i])) { Standard_Real d = theCMax[i] - thePoint[i]; d *= d; aDist += d; }
-    else { Standard_Real d = thePoint[i] - theCMin[i]; d *= d; aDist += d; }
-  }
-  return aDist;
-}
-
-//=======================================================================
-//function : Branch rejection
-//purpose  : Defines the rules for node rejection by bounding box
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::RejectNode (const BVH_Vec3d& theCornerMin,
-                                                            const BVH_Vec3d& theCornerMax,
-                                                            Standard_Real& theMetric) const
-{
-  theMetric = sqrt (BVH_Tools<Standard_Real, 3>::PointBoxSquareDistance (myObject,
-                                                                         theCornerMin,
-                                                                         theCornerMax));
-
-  Standard_Real aMaxMetric = sqrt (pointBoxSquareMaxDistance (myObject,
-                                                              theCornerMin,
-                                                              theCornerMax));
-
-  return theMetric > myDistance || aMaxMetric < myProxDist;
-}
-
-//=======================================================================
-//function : Leaf acceptance
-//purpose  : Defines the rules for leaf acceptance
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::Accept (const Standard_Integer theTrgIdx,
-                                                        const Standard_Real&)
-{
-  BVH_Vec3d aTrgVert1;
-  BVH_Vec3d aTrgVert2;
-  BVH_Vec3d aTrgVert3;
-
-  BVH_PrjState aBVH_PrjState;
-  Standard_Integer aNumberOfFirstNode = -1;
-  Standard_Integer aNumberOfLastNode = -1;
-
-  mySet2->GetVertices (theTrgIdx, aTrgVert1, aTrgVert2, aTrgVert3);
-
-  BVH_Vec3d aNearestPnt = BVH_Tools<Standard_Real, 3>::PointTriangleProjection (myObject,
-                                                                                aTrgVert1, aTrgVert2, aTrgVert3,
-                                                                                &aBVH_PrjState,
-                                                                                &aNumberOfFirstNode, &aNumberOfLastNode);
-
-  PrjState aPrjState (theTrgIdx, aBVH_PrjState, aNumberOfFirstNode, aNumberOfLastNode);
-  BVH_Vec3d aDirect = myObject - aNearestPnt;
-  Standard_Real aSqDistance = aDirect.Dot(aDirect);
-
-  if (aSqDistance > Precision::SquareConfusion()) // point belongs to triangle
-  {
-    const BVH_Vec3d aAB = aTrgVert2 - aTrgVert1;
-
-    BVH_Vec3d aNorm;
-    if (aTrgVert2.IsEqual (aTrgVert3)) // is this degenerate triangle (= segment)
-    {
-      const BVH_Vec3d aAP = myObject - aTrgVert1;
-      aNorm = BVH_Vec3d::Cross (BVH_Vec3d::Cross (aAP, aAB), aAB);
-    }
-    else
-    {
-      const BVH_Vec3d aAC = aTrgVert3 - aTrgVert1;
-      aNorm = BVH_Vec3d::Cross (aAB, aAC);
-    }
-
-    Standard_Real aNormSqLen = aNorm.Dot (aNorm);
-
-    // check if the distance is under perpendicular
-    const BVH_Vec3d aCrossCross = BVH_Vec3d::Cross (aDirect, aNorm);
-    Standard_Real aCrossCrossSqLen = aCrossCross.Dot (aCrossCross);
-    if (aCrossCrossSqLen > Precision::SquareConfusion() * aSqDistance * aNormSqLen)
-    {
-      // the distance is not under perpendicular
-      if (myMinDistance - sqrt (aSqDistance) > Precision::Confusion())
-      {
-        myMinDistance = sqrt (aSqDistance);
-        myMinDistPoint = aNearestPnt;
-        myMinPrjState = aPrjState;
-      }
-
-      return Standard_False;
-    }
-  }
-
-  // the distance is under perpendicular
-  if (myDistance - sqrt (aSqDistance) > Precision::Confusion())
-  {
-    myDistance = sqrt (aSqDistance);
-    myExtremaPoint = aNearestPnt;
-    myExtPrjState = aPrjState;
-
-    return Standard_True;
-  }
-
-  return Standard_False;
-}
-
-//=======================================================================
-//function : ComputeDistance
-//purpose  : Computes the distance between object and BVH tree
-//=======================================================================
-Standard_Real BRepExtrema_ProximityDistTool::ComputeDistance()
-{
-  myIsDone = this->Select() > 0;
-
-  if (!myIsDone)
-  {
-    if (myMinDistance < std::numeric_limits<Standard_Real>::max())
-    {
-      myExtremaPoint = myMinDistPoint;
-      myExtPrjState = myMinPrjState;
-      myIsDone = true;
-    }
-
-    myDistance = myMinDistance;
-  }
-
-  return myDistance;
-}
-
-static Standard_Boolean isNodeOnBorder (const Standard_Integer theNodeIdx, const Handle (Poly_Triangulation)& theTr)
-{
-  Poly_Connect aPolyConnect (theTr);
-
-  Standard_Integer aContTrg; //index of triangle containing exploring node
-  for (aPolyConnect.Initialize (theNodeIdx); aPolyConnect.More(); aPolyConnect.Next())
-  {
-    aContTrg = aPolyConnect.Value();
-
-    Standard_Integer aContTrgNodes[3];
-    theTr->Triangle (aContTrg).Get (aContTrgNodes[0], aContTrgNodes[1], aContTrgNodes[2]); //indices of nodes of the triangle
-
-    Standard_Integer aAdjTrg[3];
-    aPolyConnect.Triangles (aContTrg, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
-  
-    for (Standard_Integer j = 0; j < 3; j++)
-    {
-      Standard_Integer k = (j + 1) % 3;
-      if (aAdjTrg[j] == 0) //free segment of triangle
-      {
-        //aContTrgNodes[j], aContTrgNodes[k] are ends of free segment and it is a part of border
-        if (aContTrgNodes[j] == theNodeIdx || aContTrgNodes[k] == theNodeIdx)
-        {
-          return Standard_True;
-        }
-      }
-    }
-  }
-
-  return Standard_False;
-}
-
-//=======================================================================
-//function : defineStatusProxPnt1
-//purpose  : Defines the status of proximity point from 1st BVH
-//=======================================================================
-void BRepExtrema_ProximityDistTool::defineStatusProxPnt1()
-{
-  Standard_Integer aFaceID1 = mySet1->GetShapeIDOfVtx (myProxVtxIdx1);
-
-  if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_EDGE)
-  {
-    const BVH_Array3d& aVertices1 = mySet1->GetVertices();
-    Standard_Integer aVtxSize = (Standard_Integer)aVertices1.size();
-    Standard_Integer aLastIdx = aVtxSize - 1;
-
-    if ((aVertices1[0] - aVertices1[aLastIdx]).Modulus() < Precision::Confusion()) // if closed
-    {
-      myPntStatus1 = ProxPnt_Status_MIDDLE;
-      return;
-    }
-
-    if (myProxVtxIdx1 == 0 || myProxVtxIdx1 == aLastIdx)
-    {
-      myPntStatus1 = ProxPnt_Status_BORDER;
-    }
-    else
-    {
-      myPntStatus1 = ProxPnt_Status_MIDDLE;
-    }
-  }
-  else if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_FACE)
-  {
-    Standard_Integer aNodeIdx = mySet1->GetVtxIdxInShape (myProxVtxIdx1) + 1;
-
-    TopLoc_Location aLocation;
-    const TopoDS_Face& aF = TopoDS::Face (myShapeList1 (aFaceID1));
-    Handle (Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
-
-    if (isNodeOnBorder (aNodeIdx, aTr))
-    {
-      myPntStatus1 = ProxPnt_Status_BORDER;
-    }
-    else
-    {
-      myPntStatus1 = ProxPnt_Status_MIDDLE;
-    }
-  }
-}
-
-//=======================================================================
-//function : defineStatusProxPnt2
-//purpose  : Defines the status of proximity point from 2nd BVH
-//=======================================================================
-void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
-{
-  Standard_Integer aTrgIdx = myProxPrjState.GetTrgIdx();
-  Standard_Integer aFaceID2 = mySet2->GetFaceID (aTrgIdx);
-
-  if (myShapeList2 (aFaceID2).ShapeType() == TopAbs_EDGE)
-  {
-    if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_INNER)
-    {
-      return;
-    }
-    else
-    {
-      const BVH_Array3d& aVertices2 = mySet2->GetVertices();
-      Standard_Integer aVtxSize = (Standard_Integer)aVertices2.size();
-      Standard_Integer aLastIdx = aVtxSize - 1;
-
-      if ((aVertices2[0] - aVertices2[aLastIdx]).Modulus() < Precision::Confusion()) // if closed
-      {
-        myPntStatus2 = ProxPnt_Status_MIDDLE;
-        return;
-      }
-
-      NCollection_Array1<Standard_Integer> aVtxIndicesOfTrg;
-      mySet2->GetVtxIndices (aTrgIdx, aVtxIndicesOfTrg);
-
-      Standard_Integer aFirstNodeNum = myProxPrjState.GetNumberOfFirstNode();
-      Standard_Integer aFirstVtxIdx = aVtxIndicesOfTrg[aFirstNodeNum];
-
-      if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_VERTEX)
-      {
-        if (aFirstVtxIdx == 0 || aFirstVtxIdx == aLastIdx)
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      }
-      else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
-      {
-        Standard_Integer aLastNodeNum = myProxPrjState.GetNumberOfLastNode();
-        Standard_Integer aLastVtxIdx = aVtxIndicesOfTrg[aLastNodeNum];
-
-        // it could be border only in case projection is on a degenerated edge
-        if (aFirstVtxIdx == aLastVtxIdx && (aFirstVtxIdx == 0 || aFirstVtxIdx == aLastIdx))
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      }
-    }
-  }
-  else if (myShapeList2 (aFaceID2).ShapeType() == TopAbs_FACE)
-  {
-    if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_INNER)
-    {
-      myPntStatus2 = ProxPnt_Status_MIDDLE;
-    }
-    else
-    {
-      TopLoc_Location aLocation;
-      const TopoDS_Face& aF = TopoDS::Face (myShapeList2 (aFaceID2));
-      Handle (Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
-
-      NCollection_Array1<Standard_Integer> aVtxIndicesOfTrg;
-      mySet2->GetVtxIndices (aTrgIdx, aVtxIndicesOfTrg);
-
-      if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_VERTEX)
-      {
-        Standard_Integer aNodeNum = myProxPrjState.GetNumberOfFirstNode();
-        Standard_Integer aNodeIdx = mySet2->GetVtxIdxInShape (aVtxIndicesOfTrg[aNodeNum]) + 1;
-
-        if (isNodeOnBorder (aNodeIdx, aTr))
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      }
-      else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
-      {
-        myPntStatus2 = ProxPnt_Status_MIDDLE;
-
-        Poly_Connect aPolyConnect (aTr);
-        Standard_Integer aTrgIdxInShape = mySet2->GetTrgIdxInShape (aTrgIdx) + 1;
-
-        Standard_Integer aAdjTrg[3];
-        aPolyConnect.Triangles (aTrgIdxInShape, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
-
-        for (Standard_Integer j = 0; j < 3; j++)
-        {
-          Standard_Integer k = (j + 1) % 3;
-          if (aAdjTrg[j] == 0) //free segment of triangle
-          {
-            //aVtxIndicesOfTrg[j] and aVtxIndicesOfTrg[k] are ends of free segment and it is a part of border
-            if (j == myProxPrjState.GetNumberOfFirstNode() &&
-                k == myProxPrjState.GetNumberOfLastNode())
-            {
-              myPntStatus2 = ProxPnt_Status_BORDER;
-              break;
-            }
-          }
-        }
-      } //else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
-    }
-  } //else if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_FACE)
-}
-
-//=======================================================================
-//function : DefineStatusProxPnt
-//purpose  : Defines the status of proximity points
-//=======================================================================
-void BRepExtrema_ProximityDistTool::DefineStatusProxPnt()
-{
-  // define the status of proximity point from 1st BVH
-  defineStatusProxPnt1();
-
-  // define the status of proximity point from 2nd BVH
-  defineStatusProxPnt2();
-}

src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx

@@ -1,200 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 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 _BRepExtrema_ProximityDistTool_HeaderFile
-#define _BRepExtrema_ProximityDistTool_HeaderFile
-
-#include <BRepExtrema_ElementFilter.hxx>
-#include <BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx>
-#include <BRepExtrema_TriangleSet.hxx>
-#include <BVH_Distance.hxx>
-#include <BVH_Tools.hxx>
-
-//! Tool class for computation the proximity distance from first 
-//! primitive set to second one that is the maximal from minimum 
-//! perpendicular distances. If no perpendicular distance is found, the 
-//! minimum distance will be returned.
-//! This tool is not intended to be used independently, and is integrated
-//! in other classes, implementing algorithms based on shape tessellation
-//! (BRepExtrema_ProximityValueTool).
-//! 
-//! Please note that algorithm results are approximate and depend greatly
-//! on the quality of input tessellation(s).
-class BRepExtrema_ProximityDistTool : public BVH_Distance <Standard_Real, 3, BVH_Vec3d, 
-                                                           BRepExtrema_TriangleSet>
-{
-public:
-
-  typedef typename BVH_Tools<Standard_Real, 3>::BVH_PrjStateInTriangle BVH_PrjState;
-
-  enum ProxPnt_Status
-  {
-    ProxPnt_Status_BORDER,
-    ProxPnt_Status_MIDDLE,
-    ProxPnt_Status_UNKNOWN
-  };
-
-public:
-
-  //! Struct with information about projection point state from 2nd BVH,
-  //! providing proximity point of 2nd shape
-  struct PrjState
-  {
-    PrjState()
-    : myTrgIdx (0),
-      myPrjState (BVH_PrjState::BVH_PrjStateInTriangle_INNER),
-      myNumberOfFirstNode (0),
-      myNumberOfLastNode (0)
-    {}
-
-    PrjState (const Standard_Integer theTrgIdx,
-              const BVH_PrjState     thePrjState,
-              const Standard_Integer theNumberOfFirstNode,
-              const Standard_Integer theNumberOfLastNode)
-    : myTrgIdx (theTrgIdx),
-      myPrjState (thePrjState),
-      myNumberOfFirstNode (theNumberOfFirstNode),
-      myNumberOfLastNode (theNumberOfLastNode)
-    {}
-
-    Standard_Integer GetTrgIdx() const { return myTrgIdx; }
-
-    BVH_PrjState GetPrjState() const { return myPrjState; }
-
-    Standard_Integer GetNumberOfFirstNode() const { return myNumberOfFirstNode; }
-
-    Standard_Integer GetNumberOfLastNode() const { return myNumberOfLastNode; }
-
-  private:
-
-    Standard_Integer myTrgIdx; //!< Index of triangle on which the projection is located
-    BVH_PrjState myPrjState; //!< Position of a projection on the triangle (vertex, edge, inner)
-    Standard_Integer myNumberOfFirstNode; //!< The 1st vtx of the triangle edge on which the projection is located
-    Standard_Integer myNumberOfLastNode; //!< The 2nd vtx of the triangle edge on which the projection is located
-  };
-
-public:
-
-  //! Creates new unitialized tool.
-  Standard_EXPORT BRepExtrema_ProximityDistTool();
-
-  //! Creates new tool for the given element sets.
-  Standard_EXPORT BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                 const Standard_Integer theNbSamples1,
-                                                 const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                 const BRepExtrema_ShapeList& theShapeList1,
-                                                 const BRepExtrema_ShapeList& theShapeList2);
-
-public:
-
-  //! Loads the given element sets into the tool.
-  Standard_EXPORT void LoadTriangleSets (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                         const Handle(BRepExtrema_TriangleSet)& theSet2);
-
-  //! Loads the given list of subshapes into the tool.
-  Standard_EXPORT void LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                       const BRepExtrema_ShapeList& theShapeList2);
-
-  //! Performs searching of the proximity distance.
-  Standard_EXPORT void Perform();
-
-public: //! @name Reject/Accept implementations
-
-  //! Defines the rules for node rejection by bounding box.
-  Standard_EXPORT virtual Standard_Boolean RejectNode (const BVH_Vec3d& theCornerMin,
-                                                       const BVH_Vec3d& theCornerMax,
-                                                       Standard_Real& theMetric) const Standard_OVERRIDE;
-
-  //! Defines the rules for leaf acceptance.
-  Standard_EXPORT virtual Standard_Boolean Accept (const Standard_Integer theSgmIdx,
-                                                   const Standard_Real&) Standard_OVERRIDE;
-
-  //! Returns points on triangles sets, which provide the proximity distance.
-  void ProximityPoints (BVH_Vec3d& thePoint1, BVH_Vec3d& thePoint2) const
-  {
-    thePoint1 = myPnt1;
-    thePoint2 = myPnt2;
-  }
-
-  //! Returns status of points on triangles sets, which provide the proximity distance.
-  void ProximityPointsStatus (ProxPnt_Status& thePointStatus1, ProxPnt_Status& thePointStatus2) const
-  {
-    thePointStatus1 = myPntStatus1;
-    thePointStatus2 = myPntStatus2;
-  }
-
-  //! Returns the computed distance
-  Standard_Real ProximityDistance() const { return myProxDist; }
-
-protected:
-
-  //! Computes the distance between object and BVH tree.
-  Standard_EXPORT Standard_Real ComputeDistance();
-
-  //! Defines the status of proximity points.
-  Standard_EXPORT void DefineStatusProxPnt();
-
-private:
-
-  //! Defines the status of proximity point from 1st BVH.
-  void defineStatusProxPnt1();
-
-  //! Defines the status of proximity point from 2nd BVH.
-  void defineStatusProxPnt2();
-
-protected:
-
-  Standard_Real myMinDistance; //!< Minimal distance from point to BVH, could be not equal to myDistance
-  BVH_Vec3d myMinDistPoint; //!< Point on BVH providing the minimal distance
-
-  BVH_Vec3d myExtremaPoint; //!< Point on BVH providing the extrema
-
-  Standard_Real myProxDist; //!< Proximity distance
-
-  //! Proximity points
-  BVH_Vec3d myPnt1, myPnt2;
-
-  //! Proximity points' status
-  ProxPnt_Status myPntStatus1, myPntStatus2;
-
-private:
-
-  //! Set of all mesh elements (triangles) of the 1st shape.
-  Handle(BRepExtrema_TriangleSet) mySet1;
-  //! Set of all mesh elements (triangles) of the 2nd shape.
-  Handle(BRepExtrema_TriangleSet) mySet2;
-
-  //! List of subshapes of the 1st shape.
-  BRepExtrema_ShapeList myShapeList1;
-  //! List of subshapes of the 2nd shape.
-  BRepExtrema_ShapeList myShapeList2;
-
-  Standard_Integer myNbSamples1; //!< Number of samples points on the first shape
-
-  //! Vertex index from 1st BVH corresponding to proximity point of 1st shape
-  Standard_Integer myProxVtxIdx1;
-
-  //! Information of projection point state from 2nd BVH providing proximity point of 2nd shape
-  PrjState myProxPrjState;
-
-  //! Information of projection point state from 2nd BVH providing the extrema
-  PrjState myExtPrjState;
-
-  //! Information of projection point state from 2nd BVH providing the minimal distance
-  PrjState myMinPrjState;
-
-};
-
-#endif // _BRepExtrema_ProximityDistTool_HeaderFile

src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx

@@ -1,161 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 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.
-
-#include <BRepExtrema_ProximityValueTool.hxx>
-
-//=======================================================================
-//function : BRepExtrema_ProximityValueTool
-//purpose  : Creates new unitialized proximity tool
-//=======================================================================
-BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool()
-: myDistance (std::numeric_limits<Standard_Real>::max()),
-  myIsDone (Standard_False),
-  myNbSamples1(0),
-  myNbSamples2(0)
-{}
-
-//=======================================================================
-//function : BRepExtrema_ProximityValueTool
-//purpose  : Creates new proximity tool for the given element sets
-//=======================================================================
-BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                                const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                                const BRepExtrema_ShapeList& theShapeList1,
-                                                                const BRepExtrema_ShapeList& theShapeList2)
-: myDistance (std::numeric_limits<Standard_Real>::max()),
-  myIsDone (Standard_False),
-  myNbSamples1(0),
-  myNbSamples2(0)
-{
-  LoadTriangleSets (theSet1, theSet2);
-  LoadShapeLists (theShapeList1, theShapeList2);
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given element sets into the proximity tool
-//=======================================================================
-void BRepExtrema_ProximityValueTool::LoadTriangleSets (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                       const Handle(BRepExtrema_TriangleSet)& theSet2)
-{
-  mySet1 = theSet1;
-  mySet2 = theSet2;
-
-  myIsDone = Standard_False;
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given list of subshapes into the proximity tool
-//=======================================================================
-void BRepExtrema_ProximityValueTool::LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                                     const BRepExtrema_ShapeList& theShapeList2)
-{
-  myShapeList1 = theShapeList1;
-  myShapeList2 = theShapeList2;
-
-  myIsDone = Standard_False;
-}
-
-//=======================================================================
-//function : SetNbSamplePoints
-//purpose  : Sets number of sample points used for proximity calculation for each shape
-//=======================================================================
-void BRepExtrema_ProximityValueTool::SetNbSamplePoints(const Standard_Integer theSamples1,
-                                                       const Standard_Integer theSamples2)
-{
-  myNbSamples1 = theSamples1;
-  myNbSamples2 = theSamples2;
-
-  myIsDone = Standard_False;
-}
-
-//=======================================================================
-//function : computeProximityValue
-//purpose  : Returns the computed proximity value from first BVH to another one
-//=======================================================================
-Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                                    const Standard_Integer theNbSamples1,
-                                                                    const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                                    const BRepExtrema_ShapeList& theShapeList1,
-                                                                    const BRepExtrema_ShapeList& theShapeList2,
-                                                                    BVH_Vec3d& thePoint1,
-                                                                    BVH_Vec3d& thePoint2,
-                                                                    ProxPnt_Status& thePointStatus1,
-                                                                    ProxPnt_Status& thePointStatus2) const
-{
-  BRepExtrema_ProximityDistTool aProxDistTool (theSet1, theNbSamples1, theSet2, theShapeList1, theShapeList2);
-  aProxDistTool.Perform();
-
-  if (!aProxDistTool.IsDone())
-    return -1.;
-
-  aProxDistTool.ProximityPoints (thePoint1, thePoint2);
-  aProxDistTool.ProximityPointsStatus (thePointStatus1, thePointStatus2);
-
-  return aProxDistTool.ProximityDistance();
-}
-
-//=======================================================================
-//function : Perform
-//purpose  : Performs the computation of the proximity value
-//=======================================================================
-void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
-{
-  myIsDone = Standard_False;
-
-  // max(min) dist from the 1st shape to the 2nd one
-  BVH_Vec3d aP1_1, aP1_2;
-  ProxPnt_Status aPointStatus1_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-  ProxPnt_Status aPointStatus1_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-
-  Standard_Real aProximityDist1 = computeProximityDist (mySet1, myNbSamples1, mySet2, myShapeList1, myShapeList2,
-                                                        aP1_1, aP1_2, aPointStatus1_1, aPointStatus1_2);
-
-  if (aProximityDist1 < 0.)
-    return;
-
-  // max(min) dist from the 2nd shape to t he 1st one
-  BVH_Vec3d aP2_1, aP2_2;
-  ProxPnt_Status aPointStatus2_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-  ProxPnt_Status aPointStatus2_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-
-  Standard_Real aProximityDist2 = computeProximityDist (mySet2, myNbSamples2, mySet1, myShapeList2, myShapeList1,
-                                                        aP2_2, aP2_1, aPointStatus2_2, aPointStatus2_1);
-
-  if (aProximityDist2 < 0.)
-    return;
-
-  // min dist of the two max(min) dists
-  if (aProximityDist1 < aProximityDist2)
-  {
-    myDistance = aProximityDist1;
-    myPnt1.SetCoord(aP1_1.x(), aP1_1.y(), aP1_1.z());
-    myPnt2.SetCoord(aP1_2.x(), aP1_2.y(), aP1_2.z());
-    myPntStatus1 = aPointStatus1_1;
-    myPntStatus2 = aPointStatus1_2;
-  }
-  else
-  {
-    myDistance = aProximityDist2;
-    myPnt1.SetCoord(aP2_1.x(), aP2_1.y(), aP2_1.z());
-    myPnt2.SetCoord(aP2_2.x(), aP2_2.y(), aP2_2.z());
-    myPntStatus1 = aPointStatus2_1;
-    myPntStatus2 = aPointStatus2_2;
-  }
-
-  myIsDone = Standard_True;
-  theTolerance = myDistance;
-}

src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx

@@ -1,126 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 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 _BRepExtrema_ProximityValueTool_HeaderFile
-#define _BRepExtrema_ProximityValueTool_HeaderFile
-
-#include <BRepExtrema_ProximityDistTool.hxx>
-#include <BRepExtrema_TriangleSet.hxx>
-
-//! Tool class for computation of the proximity value from one BVH
-//! primitive set to another, solving max(min) problem.
-//! This tool is not intended to be used independently, and is integrated
-//! in other classes, implementing algorithms based on shape tessellation
-//! (BRepExtrema_ShapeProximity and BRepExtrema_SelfIntersection).
-//! 
-//! Please note that algorithm results are approximate and depend greatly
-//! on the quality of input tessellation(s).
-class BRepExtrema_ProximityValueTool
-{
-public:
-  typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
-
-public:
-
-  //! Creates new unitialized proximity tool.
-  Standard_EXPORT BRepExtrema_ProximityValueTool();
-
-  //! Creates new proximity tool for the given element sets.
-  Standard_EXPORT BRepExtrema_ProximityValueTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                  const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                  const BRepExtrema_ShapeList& theShapeList1,
-                                                  const BRepExtrema_ShapeList& theShapeList2);
-
-public:
-
-  //! Loads the given element sets into the proximity tool.
-  Standard_EXPORT void LoadTriangleSets (const Handle (BRepExtrema_TriangleSet)& theSet1,
-                                         const Handle (BRepExtrema_TriangleSet)& theSet2);
-
-  //! Loads the given list of subshapes into the proximity tool.
-  Standard_EXPORT void LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                       const BRepExtrema_ShapeList& theShapeList2);
-
-  //! Sets number of sample points used for proximity calculation for each shape.
-  //! If number is less or equal zero, all triangulation nodes are used.
-  Standard_EXPORT void SetNbSamplePoints (const Standard_Integer theSamples1 = 0,
-                                          const Standard_Integer theSamples2 = 0);
-
-  //! Performs the computation of the proximity value.
-  Standard_EXPORT void Perform (Standard_Real& theTolerance);
-
-  //! Is proximity test completed?
-  Standard_Boolean IsDone() const { return myIsDone; }
-
-  //! Marks test results as outdated.
-  void MarkDirty() { myIsDone = Standard_False; }
-
-  //! Returns the computed distance.
-  Standard_Real Distance() const { return myDistance; }
-
-  //! Returns points on triangles sets, which provide the proximity distance.
-  void ProximityPoints(gp_Pnt& thePoint1, gp_Pnt& thePoint2) const
-  {
-    thePoint1 = myPnt1;
-    thePoint2 = myPnt2;
-  }
-
-  //! Returns status of points on triangles sets, which provide the proximity distance.
-  void ProximityPointsStatus (ProxPnt_Status& thePointStatus1, ProxPnt_Status& thePointStatus2) const
-  {
-    thePointStatus1 = myPntStatus1;
-    thePointStatus2 = myPntStatus2;
-  }
-
-private:
-
-  //! Returns the computed proximity value from first BVH to another one.
-  Standard_Real computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                      const Standard_Integer theNbSamples1,
-                                      const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                      const BRepExtrema_ShapeList& theShapeList1,
-                                      const BRepExtrema_ShapeList& theShapeList2,
-                                      BVH_Vec3d& thePoint1,
-                                      BVH_Vec3d& thePoint2,
-                                      ProxPnt_Status& thePointStatus1,
-                                      ProxPnt_Status& thePointStatus2) const;
-
-private:
-
-  //! Set of all mesh primitives of the 1st shape.
-  Handle(BRepExtrema_TriangleSet) mySet1;
-  //! Set of all mesh primitives of the 2nd shape.
-  Handle(BRepExtrema_TriangleSet) mySet2;
-
-  //! List of subshapes of the 1st shape.
-  BRepExtrema_ShapeList myShapeList1;
-  //! List of subshapes of the 2nd shape.
-  BRepExtrema_ShapeList myShapeList2;
-
-  Standard_Real myDistance;  //!< Distance
-  Standard_Boolean myIsDone; //!< State of the algorithm
-
-  Standard_Integer myNbSamples1; //!< Number of samples points on the first shape
-  Standard_Integer myNbSamples2; //!< Number of samples points on the second shape
-
-  //! Proximity points
-  gp_Pnt myPnt1, myPnt2;
-
-  //! Proximity points' status
-  ProxPnt_Status myPntStatus1, myPntStatus2;
-
-};
-
-#endif // _BRepExtrema_ProximityValueTool_HeaderFile

src/BRepExtrema/BRepExtrema_SelfIntersection.hxx

@@ -18,8 +18,6 @@
 
 #include <BRepExtrema_OverlapTool.hxx>
 
-#include <TopoDS.hxx>
-
 //! Tool class for detection of self-sections in the given shape.
 //! This class is based on BRepExtrema_OverlapTool and thus uses
 //! shape tessellation to detect incorrect mesh fragments (pairs
@@ -78,7 +76,7 @@ public:
   //! Returns sub-shape from the shape for the given index (started from 0).
   const TopoDS_Face& GetSubShape (const Standard_Integer theID) const
   {
-    return TopoDS::Face(myFaceList.Value(theID));
+    return myFaceList.Value (theID);
   }
 
   //! Returns set of all the face triangles of the shape.

src/BRepExtrema/BRepExtrema_ShapeProximity.cxx

@@ -18,28 +18,6 @@
 #include <Precision.hxx>
 #include <TopExp_Explorer.hxx>
 
-// Assign a map of sub-shapes (edges/faces) of a given shape
-static Standard_Boolean initSubShapes(const TopoDS_Shape&              theShape,
-                                      BRepExtrema_ShapeList&           theSubshapesList,
-                                      Handle(BRepExtrema_TriangleSet)& theTriangleSet)
-{
-  theSubshapesList.Clear();
-
-  for (TopExp_Explorer anIter(theShape, TopAbs_FACE); anIter.More(); anIter.Next())
-  {
-    theSubshapesList.Append(anIter.Current());
-  }
-
-  for (TopExp_Explorer anIter(theShape, TopAbs_EDGE); anIter.More(); anIter.Next())
-  {
-    theSubshapesList.Append(anIter.Current());
-  }
-
-  if (theTriangleSet.IsNull())
-    theTriangleSet = new BRepExtrema_TriangleSet;
-  return theTriangleSet->Init(theSubshapesList);
-}
-
 //=======================================================================
 //function : BRepExtrema_ShapeProximity
 //purpose  : Creates uninitialized proximity tool
@@ -47,9 +25,7 @@ static Standard_Boolean initSubShapes(const TopoDS_Shape&              theShape,
 BRepExtrema_ShapeProximity::BRepExtrema_ShapeProximity (const Standard_Real theTolerance)
 : myTolerance   (theTolerance),
   myElementSet1 (new BRepExtrema_TriangleSet),
-  myElementSet2 (new BRepExtrema_TriangleSet),
-  myNbSamples1  (0),
-  myNbSamples2  (0)
+  myElementSet2 (new BRepExtrema_TriangleSet)
 {
   // Should be initialized later
   myIsInitS1 = myIsInitS2 = Standard_False;
@@ -64,9 +40,7 @@ BRepExtrema_ShapeProximity::BRepExtrema_ShapeProximity (const TopoDS_Shape& theS
                                                         const Standard_Real theTolerance)
 : myTolerance   (theTolerance),
   myElementSet1 (new BRepExtrema_TriangleSet),
-  myElementSet2 (new BRepExtrema_TriangleSet),
-  myNbSamples1  (0),
-  myNbSamples2  (0)
+  myElementSet2 (new BRepExtrema_TriangleSet)
 {
   LoadShape1 (theShape1);
   LoadShape2 (theShape2);
@@ -78,18 +52,16 @@ BRepExtrema_ShapeProximity::BRepExtrema_ShapeProximity (const TopoDS_Shape& theS
 //=======================================================================
 Standard_Boolean BRepExtrema_ShapeProximity::LoadShape1 (const TopoDS_Shape& theShape1)
 {
-  myIsInitS1 = initSubShapes(theShape1, myShapeList1, myElementSet1);
+  myFaceList1.Clear();
 
-  if (myTolerance == Precision::Infinite())
+  for (TopExp_Explorer anIter (theShape1, TopAbs_FACE); anIter.More(); anIter.Next())
   {
-    myProxValTool.MarkDirty();
-  }
-  else
-  {
-    myOverlapTool.MarkDirty();
+    myFaceList1.Append (static_cast<const TopoDS_Face&> (anIter.Current()));
   }
 
-  return myIsInitS1;
+  myOverlapTool.MarkDirty();
+
+  return myIsInitS1 = myElementSet1->Init (myFaceList1);
 }
 
 //=======================================================================
@@ -98,18 +70,16 @@ Standard_Boolean BRepExtrema_ShapeProximity::LoadShape1 (const TopoDS_Shape& the
 //=======================================================================
 Standard_Boolean BRepExtrema_ShapeProximity::LoadShape2 (const TopoDS_Shape& theShape2)
 {
-  myIsInitS2 = initSubShapes(theShape2, myShapeList2, myElementSet2);
+  myFaceList2.Clear();
 
-  if (myTolerance == Precision::Infinite())
+  for (TopExp_Explorer anIter (theShape2, TopAbs_FACE); anIter.More(); anIter.Next())
   {
-    myProxValTool.MarkDirty();
-  }
-  else
-  {
-    myOverlapTool.MarkDirty();
+    myFaceList2.Append (static_cast<const TopoDS_Face&> (anIter.Current()));
   }
 
-  return myIsInitS2;
+  myOverlapTool.MarkDirty();
+
+  return myIsInitS2 = myElementSet2->Init (myFaceList2);
 }
 
 //=======================================================================
@@ -118,32 +88,13 @@ Standard_Boolean BRepExtrema_ShapeProximity::LoadShape2 (const TopoDS_Shape& the
 //=======================================================================
 void BRepExtrema_ShapeProximity::Perform()
 {
-  if (myTolerance == Precision::Infinite())
+  if (!myIsInitS1 || !myIsInitS2 || myOverlapTool.IsDone())
   {
-    if (!myIsInitS1 || !myIsInitS2 || myProxValTool.IsDone())
-    {
-      return;
-    }
-
-    myProxValTool.LoadTriangleSets (myElementSet1,
-                                    myElementSet2);
-    myProxValTool.LoadShapeLists (myShapeList1,
-                                  myShapeList2);
-
-    myProxValTool.Perform (myTolerance);
-    myProxValTool.ProximityPoints(myProxPoint1, myProxPoint2);
-    myProxValTool.ProximityPointsStatus (myProxPntStatus1, myProxPntStatus2);
+    return;
   }
-  else
-  {
-    if (!myIsInitS1 || !myIsInitS2 || myOverlapTool.IsDone())
-    {
-      return;
-    }
 
-    myOverlapTool.LoadTriangleSets (myElementSet1,
-                                    myElementSet2);
+  myOverlapTool.LoadTriangleSets (myElementSet1,
+                                  myElementSet2);
 
-    myOverlapTool.Perform (myTolerance);
-  }
+  myOverlapTool.Perform (myTolerance);
 }

src/BRepExtrema/BRepExtrema_ShapeProximity.hxx

@@ -16,48 +16,31 @@
 #ifndef _BRepExtrema_ShapeProximity_HeaderFile
 #define _BRepExtrema_ShapeProximity_HeaderFile
 
-#include <NCollection_DataMap.hxx>
-#include <Precision.hxx>
-#include <TColStd_PackedMapOfInteger.hxx>
-
-#include <BRepExtrema_ProximityValueTool.hxx>
-#include <BRepExtrema_TriangleSet.hxx>
 #include <BRepExtrema_OverlapTool.hxx>
 
-//! @brief Tool class for shape proximity detection.
-//!
-//! First approach:
+//! Tool class for shape proximity detection.
 //! For two given shapes and given tolerance (offset from the mesh) the algorithm allows
 //! to determine whether or not they are overlapped. The algorithm input consists of any
 //! shapes which can be decomposed into individual faces (used as basic shape elements).
+//! High performance is achieved through the use of existing triangulation of faces. So
+//! poly triangulation (with the desired deflection) should already be built. Note that
+//! solution is approximate (and corresponds to the deflection used for triangulation).
 //!
 //! The algorithm can be run in two modes. If tolerance is set to zero, the algorithm
 //! will detect only intersecting faces (containing triangles with common points). If
 //! tolerance is set to positive value, the algorithm will also detect faces located
 //! on distance less than the given tolerance from each other.
-//!
-//! Second approach:
-//! Compute the proximity value between two shapes if the tolerance is not defined (Precision::Infinite()).
-//! In this case the proximity value is a minimal thickness of a layer containing both shapes.
-//!
-//! For the both approaches the high performance is achieved through the use of existing
-//! triangulation of faces. So, poly triangulation (with the desired deflection) should already
-//! be built. Note that solution is approximate (and corresponds to the deflection used for
-//! triangulation).
 class BRepExtrema_ShapeProximity
 {
-public:
-  typedef typename BRepExtrema_ProximityValueTool::ProxPnt_Status ProxPnt_Status;
-
 public:
 
   //! Creates empty proximity tool.
-  Standard_EXPORT BRepExtrema_ShapeProximity (const Standard_Real theTolerance = Precision::Infinite());
+  Standard_EXPORT BRepExtrema_ShapeProximity (const Standard_Real theTolerance = 0.0);
 
   //! Creates proximity tool for the given two shapes.
   Standard_EXPORT BRepExtrema_ShapeProximity (const TopoDS_Shape& theShape1,
                                               const TopoDS_Shape& theShape2,
-                                              const Standard_Real theTolerance = Precision::Infinite());
+                                              const Standard_Real theTolerance = 0.0);
 
 public:
 
@@ -73,33 +56,19 @@ public:
     myTolerance = theTolerance;
   }
 
-  //! Returns proximity value calculated for the whole input shapes.
-  Standard_Real Proximity() const
-  {
-    return Tolerance();
-  }
-
   //! Loads 1st shape into proximity tool.
   Standard_EXPORT Standard_Boolean LoadShape1 (const TopoDS_Shape& theShape1);
 
   //! Loads 2nd shape into proximity tool.
   Standard_EXPORT Standard_Boolean LoadShape2 (const TopoDS_Shape& theShape2);
 
-  //! Set number of sample points on the 1st shape used to compute the proximity value.
-  //! In case of 0, all triangulation nodes will be used.
-  void SetNbSamples1(const Standard_Integer theNbSamples) { myNbSamples1 = theNbSamples; }
-
-  //! Set number of sample points on the 2nd shape used to compute the proximity value.
-  //! In case of 0, all triangulation nodes will be used.
-  void SetNbSamples2(const Standard_Integer theNbSamples) { myNbSamples2 = theNbSamples; }
-
   //! Performs search of overlapped faces.
   Standard_EXPORT void Perform();
 
   //! True if the search is completed.
   Standard_Boolean IsDone() const
   { 
-    return myOverlapTool.IsDone() || myProxValTool.IsDone();
+    return myOverlapTool.IsDone();
   }
 
   //! Returns set of IDs of overlapped faces of 1st shape (started from 0).
@@ -115,15 +84,15 @@ public:
   }
 
   //! Returns sub-shape from 1st shape with the given index (started from 0).
-  const TopoDS_Shape& GetSubShape1 (const Standard_Integer theID) const
+  const TopoDS_Face& GetSubShape1 (const Standard_Integer theID) const
   {
-    return myShapeList1.Value (theID);
+    return myFaceList1.Value (theID);
   }
 
   //! Returns sub-shape from 1st shape with the given index (started from 0).
-  const TopoDS_Shape& GetSubShape2 (const Standard_Integer theID) const
+  const TopoDS_Face& GetSubShape2 (const Standard_Integer theID) const
   {
-    return myShapeList2.Value (theID);
+    return myFaceList2.Value (theID);
   }
 
   //! Returns set of all the face triangles of the 1st shape.
@@ -138,34 +107,6 @@ public:
     return myElementSet2;
   }
 
-  //! Returns the point on the 1st shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const gp_Pnt& ProximityPoint1() const
-  {
-    return myProxPoint1;
-  }
-
-  //! Returns the point on the 2nd shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const gp_Pnt& ProximityPoint2() const
-  {
-    return myProxPoint2;
-  }
-
-  //! Returns the status of point on the 1st shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const ProxPnt_Status& ProxPntStatus1() const
-  {
-    return myProxPntStatus1;
-  }
-
-  //! Returns the status of point on the 2nd shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const ProxPnt_Status& ProxPntStatus2() const
-  {
-    return myProxPntStatus2;
-  }
-
 private:
 
   //! Maximum overlapping distance.
@@ -176,39 +117,19 @@ private:
   //! Is the 2nd shape initialized?
   Standard_Boolean myIsInitS2;
 
-  //! List of subshapes of the 1st shape.
-  BRepExtrema_ShapeList myShapeList1;
-  //! List of subshapes of the 2nd shape.
-  BRepExtrema_ShapeList myShapeList2;
+  //! List of faces of the 1st shape.
+  BRepExtrema_ShapeList myFaceList1;
+  //! List of faces of the 2nd shape.
+  BRepExtrema_ShapeList myFaceList2;
 
   //! Set of all the face triangles of the 1st shape.
   Handle(BRepExtrema_TriangleSet) myElementSet1;
   //! Set of all the face triangles of the 2nd shape.
   Handle(BRepExtrema_TriangleSet) myElementSet2;
 
-  //! Number of sample points on the 1st shape used to compute the proximity value
-  //! (if zero (default), all triangulation nodes will be used).
-  Standard_Integer myNbSamples1;
-  //! Number of sample points on the 2nd shape used to compute the proximity value
-  //! (if zero (default), all triangulation nodes will be used).
-  Standard_Integer myNbSamples2;
-
-  //! Reference point of the proximity value on the 1st shape.
-  gp_Pnt myProxPoint1;
-  //! Reference point of the proximity value on the 2st shape.
-  gp_Pnt myProxPoint2;
-
-  //! Status of reference points of the proximity value.
-  ProxPnt_Status myProxPntStatus1, myProxPntStatus2;
-
   //! Overlap tool used for intersection/overlap test.
   BRepExtrema_OverlapTool myOverlapTool;
 
-  //! Shape-shape proximity tool used for computation of
-  //! the minimal diameter of a tube containing both edges or
-  //! the minimal thickness of a shell containing both faces.
-  BRepExtrema_ProximityValueTool myProxValTool;
-
 };
 
 #endif // _BRepExtrema_ShapeProximity_HeaderFile

src/BRepExtrema/BRepExtrema_TriangleSet.cxx

@@ -18,7 +18,6 @@
 #include <BRep_Tool.hxx>
 #include <BVH_LinearBuilder.hxx>
 #include <Poly_Triangulation.hxx>
-#include <TopoDS.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepExtrema_TriangleSet, BVH_PrimitiveSet3d)
 
@@ -115,65 +114,17 @@ void BRepExtrema_TriangleSet::Swap (const Standard_Integer theIndex1, const Stan
 {
   std::swap (myTriangles[theIndex1],
              myTriangles[theIndex2]);
-
-  std::swap (myTrgIdxMap (theIndex1),
-             myTrgIdxMap (theIndex2));
 }
 
 //=======================================================================
 //function : GetFaceID
-//purpose  : Returns face ID of the given vertex
+//purpose  : Returns face ID of the given triangle
 //=======================================================================
 Standard_Integer BRepExtrema_TriangleSet::GetFaceID (const Standard_Integer theIndex) const
 {
   return myTriangles[theIndex].w();
 }
 
-//=======================================================================
-//function : GetShapeIDOfVtx
-//purpose  : Returns shape ID of the given vertex index
-//=======================================================================
-Standard_Integer BRepExtrema_TriangleSet::GetShapeIDOfVtx (const Standard_Integer theIndex) const
-{
-  return myShapeIdxOfVtxVec.Value (theIndex);
-}
-
-//=======================================================================
-//function : GetVtxIdxInShape
-//purpose  : Returns vertex index in tringulation of the shape, which vertex belongs,
-//           with the given vtx ID in whole set
-//=======================================================================
-Standard_Integer BRepExtrema_TriangleSet::GetVtxIdxInShape (const Standard_Integer theIndex) const
-{
-  Standard_Integer aShID = myShapeIdxOfVtxVec.Value (theIndex);
-  Standard_Integer aNumVertices = 0;
-
-  for (Standard_Integer aSIdx = 0; aSIdx < aShID; aSIdx++)
-  {
-    aNumVertices += myNumVtxInShapeVec.Value (aSIdx);
-  }
-
-  return theIndex - aNumVertices;
-}
-
-//=======================================================================
-//function : GetTrgIdxInShape
-//purpose  :  Returns triangle index (before swapping) in tringulation of the shape, which triangle belongs,
-//            with the given trg ID in whole set (after swapping)
-//=======================================================================
-Standard_Integer BRepExtrema_TriangleSet::GetTrgIdxInShape (const Standard_Integer theIndex) const
-{
-  Standard_Integer aShID = GetFaceID (theIndex);
-  Standard_Integer aNumTriangles = 0;
-
-  for (Standard_Integer aSIdx = 0; aSIdx < aShID; aSIdx++)
-  {
-    aNumTriangles += myNumTrgInShapeVec.Value (aSIdx);
-  }
-
-  return myTrgIdxMap (theIndex) - aNumTriangles;
-}
-
 //=======================================================================
 //function : GetVertices
 //purpose  : Returns vertices of the given triangle
@@ -190,21 +141,6 @@ void BRepExtrema_TriangleSet::GetVertices (const Standard_Integer theIndex,
   theVertex3 = myVertexArray[aTriangle.z()];
 }
 
-//=======================================================================
-//function : GetVertices
-//purpose  : Returns vertices of the given triangle
-//=======================================================================
-void BRepExtrema_TriangleSet::GetVtxIndices (const Standard_Integer theIndex,
-                                             NCollection_Array1<Standard_Integer>& theVtxIndices) const
-{
-  BVH_Vec4i aTriangle = myTriangles[theIndex];
-
-  theVtxIndices = NCollection_Array1<Standard_Integer> (0, 2);
-  theVtxIndices.SetValue (0, aTriangle.x());
-  theVtxIndices.SetValue (1, aTriangle.y());
-  theVtxIndices.SetValue (2, aTriangle.z());
-}
-
 //=======================================================================
 //function : Clear
 //purpose  : Clears triangle set data
@@ -222,26 +158,41 @@ void BRepExtrema_TriangleSet::Clear()
 //function : Init
 //purpose  : Initializes triangle set
 //=======================================================================
-Standard_Boolean BRepExtrema_TriangleSet::Init (const BRepExtrema_ShapeList& theShapes)
+Standard_Boolean BRepExtrema_TriangleSet::Init (const BRepExtrema_ShapeList& theFaces)
 {
   Clear();
 
-  Standard_Boolean isOK = Standard_True;
-  for (Standard_Integer aShapeIdx = 0; aShapeIdx < theShapes.Size() && isOK; ++aShapeIdx)
+  for (Standard_Integer aFaceIdx = 0; aFaceIdx < theFaces.Size(); ++aFaceIdx)
   {
-    if (theShapes (aShapeIdx).ShapeType() == TopAbs_FACE)
-      isOK = initFace (TopoDS::Face (theShapes(aShapeIdx)), aShapeIdx);
-    else if (theShapes (aShapeIdx).ShapeType() == TopAbs_EDGE)
-      isOK = initEdge (TopoDS::Edge (theShapes(aShapeIdx)), aShapeIdx);
-  }
+    TopLoc_Location aLocation;
 
-  Standard_Integer aNumTrg = static_cast<Standard_Integer> (myTriangles.size());
-  myTrgIdxMap.Clear();
-  myTrgIdxMap.ReSize (aNumTrg);
+    Handle(Poly_Triangulation) aTriangulation =
+      BRep_Tool::Triangulation (theFaces (aFaceIdx), aLocation);
 
-  for (Standard_Integer aTrgIdx = 0; aTrgIdx < aNumTrg; ++aTrgIdx)
-  {
-    myTrgIdxMap.Bind (aTrgIdx, aTrgIdx);
+    if (aTriangulation.IsNull())
+    {
+      return Standard_False;
+    }
+
+    const Standard_Integer aVertOffset =
+      static_cast<Standard_Integer> (myVertexArray.size()) - 1;
+
+    for (Standard_Integer aVertIdx = 1; aVertIdx <= aTriangulation->NbNodes(); ++aVertIdx)
+    {
+      gp_Pnt aVertex = aTriangulation->Node (aVertIdx);
+      aVertex.Transform (aLocation.Transformation());
+      myVertexArray.push_back (BVH_Vec3d (aVertex.X(), aVertex.Y(), aVertex.Z()));
+    }
+
+    for (Standard_Integer aTriIdx = 1; aTriIdx <= aTriangulation->NbTriangles(); ++aTriIdx)
+    {
+      Standard_Integer aVertex1, aVertex2, aVertex3;
+      aTriangulation->Triangle (aTriIdx).Get (aVertex1, aVertex2, aVertex3);
+      myTriangles.push_back (BVH_Vec4i (aVertex1 + aVertOffset,
+                                        aVertex2 + aVertOffset,
+                                        aVertex3 + aVertOffset,
+                                        aFaceIdx));
+    }
   }
 
   MarkDirty(); // needs BVH rebuilding
@@ -252,95 +203,3 @@ Standard_Boolean BRepExtrema_TriangleSet::Init (const BRepExtrema_ShapeList& the
   return Standard_True;
 }
 
-//=======================================================================
-//function : initFace
-//purpose  : Initializes triangle set
-//=======================================================================
-Standard_Boolean BRepExtrema_TriangleSet::initFace (const TopoDS_Face& theFace, const Standard_Integer theIndex)
-{
-  TopLoc_Location aLocation;
-
-  Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (theFace, aLocation);
-  if (aTriangulation.IsNull())
-  {
-    return Standard_False;
-  }
-
-  const Standard_Integer aVertOffset =
-    static_cast<Standard_Integer> (myVertexArray.size()) - 1;
-
-  initNodes (aTriangulation->MapNodeArray()->ChangeArray1(), aLocation.Transformation(), theIndex);
-
-  for (Standard_Integer aTriIdx = 1; aTriIdx <= aTriangulation->NbTriangles(); ++aTriIdx)
-  {
-    Standard_Integer aVertex1;
-    Standard_Integer aVertex2;
-    Standard_Integer aVertex3;
-
-    aTriangulation->Triangle (aTriIdx).Get (aVertex1,
-                                            aVertex2,
-                                            aVertex3);
-
-    myTriangles.push_back (BVH_Vec4i (aVertex1 + aVertOffset,
-                                      aVertex2 + aVertOffset,
-                                      aVertex3 + aVertOffset,
-                                      theIndex));
-  }
-
-  myNumTrgInShapeVec.SetValue (theIndex, aTriangulation->NbTriangles());
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : initEdge
-//purpose  : Initializes triangle set
-//=======================================================================
-Standard_Boolean BRepExtrema_TriangleSet::initEdge (const TopoDS_Edge& theEdge, const Standard_Integer theIndex)
-{
-  TopLoc_Location aLocation;
-
-  Handle(Poly_Polygon3D) aPolygon = BRep_Tool::Polygon3D (theEdge, aLocation);
-  if (aPolygon.IsNull())
-  {
-    return Standard_False;
-  }
-
-  const Standard_Integer aVertOffset =
-    static_cast<Standard_Integer> (myVertexArray.size()) - 1;
-
-  initNodes (aPolygon->Nodes(), aLocation.Transformation(), theIndex);
-
-  for (Standard_Integer aVertIdx = 1; aVertIdx < aPolygon->NbNodes(); ++aVertIdx)
-  {
-    // segment as degenerate triangle
-    myTriangles.push_back (BVH_Vec4i (aVertIdx + aVertOffset,
-                                      aVertIdx + aVertOffset + 1,
-                                      aVertIdx + aVertOffset + 1,
-                                      theIndex));
-  }
-  return Standard_True;
-}
-
-//=======================================================================
-//function : initNodes
-//purpose  : Initializes nodes
-//=======================================================================
-void BRepExtrema_TriangleSet::initNodes (const TColgp_Array1OfPnt& theNodes,
-                                         const gp_Trsf& theTrsf,
-                                         const Standard_Integer theIndex)
-{
-  for (Standard_Integer aVertIdx = 1; aVertIdx <= theNodes.Size(); ++aVertIdx)
-  {
-    gp_Pnt aVertex = theNodes.Value (aVertIdx);
-
-    aVertex.Transform (theTrsf);
-
-    myVertexArray.push_back (BVH_Vec3d (aVertex.X(),
-                                        aVertex.Y(),
-                                        aVertex.Z()));
-    myShapeIdxOfVtxVec.Append (theIndex);
-  }
-
-  myNumVtxInShapeVec.SetValue (theIndex, theNodes.Size());
-}

src/BRepExtrema/BRepExtrema_TriangleSet.hxx

@@ -16,14 +16,11 @@
 #ifndef _BRepExtrema_TriangleSet_HeaderFile
 #define _BRepExtrema_TriangleSet_HeaderFile
 
-#include <BVH_PrimitiveSet3d.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColStd_DataMapOfIntegerInteger.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
+#include <BVH_PrimitiveSet3d.hxx>
 
 //! List of shapes and their IDs for collision detection.
-typedef NCollection_Vector<TopoDS_Shape> BRepExtrema_ShapeList;
+typedef NCollection_Vector<TopoDS_Face> BRepExtrema_ShapeList;
 
 //! Triangle set corresponding to specific face.
 class BRepExtrema_TriangleSet : public BVH_PrimitiveSet3d
@@ -62,10 +59,7 @@ public:
   Standard_EXPORT void Clear();
 
   //! Initializes triangle set.
-  Standard_EXPORT Standard_Boolean Init (const BRepExtrema_ShapeList& theShapes);
-
-  //! Returns all vertices.
-  Standard_EXPORT const BVH_Array3d& GetVertices() const { return myVertexArray; }
+  Standard_EXPORT Standard_Boolean Init (const BRepExtrema_ShapeList& theFaces);
 
   //! Returns vertices of the given triangle.
   Standard_EXPORT void GetVertices (const Standard_Integer theIndex,
@@ -73,37 +67,9 @@ public:
                                     BVH_Vec3d&             theVertex2,
                                     BVH_Vec3d&             theVertex3) const;
 
-  //! Returns vertex indices of the given triangle.
-  Standard_EXPORT void GetVtxIndices (const Standard_Integer theIndex,
-                                      NCollection_Array1<Standard_Integer>& theVtxIndices) const;
-
   //! Returns face ID of the given triangle.
   Standard_EXPORT Standard_Integer GetFaceID (const Standard_Integer theIndex) const;
 
-  //! Returns shape ID of the given vertex index.
-  Standard_EXPORT Standard_Integer GetShapeIDOfVtx (const Standard_Integer theIndex) const;
-
-  //! Returns vertex index in tringulation of the shape, which vertex belongs,
-  //! with the given vtx ID in whole set.
-  Standard_EXPORT Standard_Integer GetVtxIdxInShape (const Standard_Integer theIndex) const;
-
-  //! Returns triangle index (before swapping) in tringulation of the shape, which triangle belongs,
-  //! with the given trg ID in whole set (after swapping).
-  Standard_EXPORT Standard_Integer GetTrgIdxInShape (const Standard_Integer theIndex) const;
-
-private:
-
-  //! Initializes triangle set from the face
-  Standard_Boolean initFace (const TopoDS_Face& theFace, const Standard_Integer theIndex);
-
-  //! Initializes polygon from the edge
-  Standard_Boolean initEdge (const TopoDS_Edge& theEdge, const Standard_Integer theIndex);
-
-  //! Initializes nodes
-  void initNodes (const TColgp_Array1OfPnt& theNodes,
-                  const gp_Trsf& theTrsf,
-                  const Standard_Integer theIndex);
-
 protected:
 
   //! Array of vertex indices.
@@ -112,19 +78,6 @@ protected:
   //! Array of vertex coordinates.
   BVH_Array3d myVertexArray;
 
-  //! Vector of shapes' indices where index of item corresponds to index of vertex,
-  //! belonging to this shape.
-  NCollection_Vector<Standard_Integer> myShapeIdxOfVtxVec;
-
-  //! Vector of vertexes' number belonging to shape which index corresponds item's index.
-  NCollection_Vector<Standard_Integer> myNumVtxInShapeVec;
-
-  //! Vector of triangles' number belonging to shape which index corresponds item's index.
-  NCollection_Vector<Standard_Integer> myNumTrgInShapeVec;
-
-  //! Map of triangles' indices after (key) and before (value) swapping.
-  TColStd_DataMapOfIntegerInteger myTrgIdxMap;
-
 public:
 
   DEFINE_STANDARD_RTTIEXT(BRepExtrema_TriangleSet, BVH_PrimitiveSet3d)

src/BRepExtrema/FILES

@@ -18,10 +18,6 @@ BRepExtrema_OverlapTool.cxx
 BRepExtrema_OverlapTool.hxx
 BRepExtrema_Poly.cxx
 BRepExtrema_Poly.hxx
-BRepExtrema_ProximityValueTool.cxx
-BRepExtrema_ProximityValueTool.hxx
-BRepExtrema_ProximityDistTool.cxx
-BRepExtrema_ProximityDistTool.hxx
 BRepExtrema_SelfIntersection.cxx
 BRepExtrema_SelfIntersection.hxx
 BRepExtrema_SeqOfSolution.hxx

src/BRepFill/BRepFill_Sweep.cxx

@@ -3002,7 +3002,7 @@ void BRepFill_Sweep::Build(TopTools_MapOfShape& ReversedEdges,
         }
       }
 
-    if ((NbTrous > 0) ? (aNbFaces < NbLaw) : (aNbFaces == 0))
+    if (aNbFaces == 0)
     {
       isDone = Standard_False;
       return;

src/BRepLib/BRepLib_FindSurface.cxx

@@ -506,14 +506,7 @@ void BRepLib_FindSurface::Init(const TopoDS_Shape&    S,
 
   if (!isSolved)
     return;
-  //Removing very small values
-  Standard_Real aMaxV = Max(Abs(aVec(1)), Max(Abs(aVec(2)), Abs(aVec(3))));
-  Standard_Real eps = Epsilon(aMaxV);
-  for (i = 1; i <= 3; ++i)
-  {
-    if (Abs(aVec(i)) <= eps)
-      aVec(i) = 0.;
-  }
+
   gp_Vec aN (aVec (1), aVec (2), aVec (3));
   Handle(Geom_Plane) aPlane = new Geom_Plane (aBaryCenter, aN);
   myTolReached = Controle (aPoints, aPlane);

src/BRepMesh/BRepMesh_ConeRangeSplitter.cxx

@@ -41,13 +41,10 @@ std::pair<Standard_Real, Standard_Real> BRepMesh_ConeRangeSplitter::GetSplitStep
 
   const Standard_Real aDiffU = aRangeU.second - aRangeU.first;
   const Standard_Real aDiffV = aRangeV.second - aRangeV.first;
-  const Standard_Real aScale = (Du * aRadius);
-  const Standard_Real aRatio = Max(1., Log(aDiffV / aScale));
-  const Standard_Integer nbU = (Standard_Integer)(aDiffU / Du);
-  const Standard_Integer nbV = (Standard_Integer)(aDiffV / aScale / aRatio);
-
+  Standard_Integer nbU = (Standard_Integer) (aDiffU / Du);
+  Standard_Integer nbV = (Standard_Integer) (nbU * (aDiffV) / (aDiffU * aRadius));
   Du = aDiffU / (nbU + 1);
-  Dv = aDiffV / (nbV + static_cast<Standard_Integer>(aRatio));
+  Dv = aDiffV / (nbV + 1);
 
   theStepsNb.first  = nbU;
   theStepsNb.second = nbV;

src/BRepMesh/BRepMesh_CurveTessellator.cxx

@@ -35,13 +35,11 @@ IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_CurveTessellator, IMeshTools_CurveTessellato
 //=======================================================================
 BRepMesh_CurveTessellator::BRepMesh_CurveTessellator(
   const IMeshData::IEdgeHandle& theEdge,
-  const IMeshTools_Parameters&  theParameters,
-  const Standard_Integer        theMinPointsNb)
+  const IMeshTools_Parameters&  theParameters)
   : myDEdge(theEdge),
     myParameters(theParameters),
     myEdge(theEdge->GetEdge()),
-    myCurve(myEdge),
-    myMinPointsNb (theMinPointsNb)
+    myCurve(myEdge)
 {
   init();
 }
@@ -54,13 +52,11 @@ BRepMesh_CurveTessellator::BRepMesh_CurveTessellator (
   const IMeshData::IEdgeHandle& theEdge,
   const TopAbs_Orientation      theOrientation,
   const IMeshData::IFaceHandle& theFace,
-  const IMeshTools_Parameters&  theParameters,
-  const Standard_Integer        theMinPointsNb)
+  const IMeshTools_Parameters&  theParameters)
   : myDEdge(theEdge),
     myParameters(theParameters),
     myEdge(TopoDS::Edge(theEdge->GetEdge().Oriented(theOrientation))),
-    myCurve(myEdge, theFace->GetFace()),
-    myMinPointsNb (theMinPointsNb)
+    myCurve(myEdge, theFace->GetFace())
 {
   init();
 }
@@ -101,8 +97,7 @@ void BRepMesh_CurveTessellator::init()
   myEdgeSqTol  = BRep_Tool::Tolerance (myEdge);
   myEdgeSqTol *= myEdgeSqTol;
 
-  const Standard_Integer aMinPntNb = Max(myMinPointsNb,
-    (myCurve.GetType() == GeomAbs_Circle) ? 4 : 2); //OCC287
+  const Standard_Integer aMinPntNb = (myCurve.GetType() == GeomAbs_Circle) ? 4 : 2; //OCC287
 
   myDiscretTool.Initialize (myCurve,
                             myCurve.FirstParameter(), myCurve.LastParameter(),

src/BRepMesh/BRepMesh_CurveTessellator.hxx

@@ -34,16 +34,14 @@ public:
   //! Constructor.
   Standard_EXPORT BRepMesh_CurveTessellator(
     const IMeshData::IEdgeHandle& theEdge,
-    const IMeshTools_Parameters&  theParameters,
-    const Standard_Integer        theMinPointsNb = 2);
+    const IMeshTools_Parameters&  theParameters);
 
   //! Constructor.
   Standard_EXPORT BRepMesh_CurveTessellator (
     const IMeshData::IEdgeHandle& theEdge,
     const TopAbs_Orientation      theOrientation,
     const IMeshData::IFaceHandle& theFace,
-    const IMeshTools_Parameters&  theParameters,
-    const Standard_Integer        theMinPointsNb = 2);
+    const IMeshTools_Parameters&  theParameters);
 
   //! Destructor.
   Standard_EXPORT virtual ~BRepMesh_CurveTessellator ();
@@ -98,7 +96,6 @@ private:
   const IMeshTools_Parameters&  myParameters;
   TopoDS_Edge                   myEdge;
   BRepAdaptor_Curve             myCurve;
-  Standard_Integer              myMinPointsNb;
   GCPnts_TangentialDeflection   myDiscretTool;
   TopoDS_Vertex                 myFirstVertex;
   TopoDS_Vertex                 myLastVertex;

src/BRepMesh/BRepMesh_EdgeDiscret.cxx

@@ -49,10 +49,9 @@ BRepMesh_EdgeDiscret::~BRepMesh_EdgeDiscret ()
 //=======================================================================
 Handle(IMeshTools_CurveTessellator) BRepMesh_EdgeDiscret::CreateEdgeTessellator(
   const IMeshData::IEdgeHandle& theDEdge,
-  const IMeshTools_Parameters&  theParameters,
-  const Standard_Integer        theMinPointsNb)
+  const IMeshTools_Parameters&  theParameters)
 {
-  return new BRepMesh_CurveTessellator(theDEdge, theParameters, theMinPointsNb);
+  return new BRepMesh_CurveTessellator(theDEdge, theParameters);
 }
 
 //=======================================================================
@@ -63,12 +62,11 @@ Handle(IMeshTools_CurveTessellator) BRepMesh_EdgeDiscret::CreateEdgeTessellator(
   const IMeshData::IEdgeHandle& theDEdge,
   const TopAbs_Orientation      theOrientation,
   const IMeshData::IFaceHandle& theDFace,
-  const IMeshTools_Parameters&  theParameters,
-  const Standard_Integer        theMinPointsNb)
+  const IMeshTools_Parameters&  theParameters)
 {
   return theDEdge->GetSameParam() ? 
-    new BRepMesh_CurveTessellator(theDEdge, theParameters, theMinPointsNb) :
-    new BRepMesh_CurveTessellator(theDEdge, theOrientation, theDFace, theParameters, theMinPointsNb);
+    new BRepMesh_CurveTessellator(theDEdge, theParameters) :
+    new BRepMesh_CurveTessellator(theDEdge, theOrientation, theDFace, theParameters);
 }
 
 //=======================================================================

src/BRepMesh/BRepMesh_EdgeDiscret.hxx

@@ -38,16 +38,14 @@ public:
   //! Creates instance of free edge tessellator.
   Standard_EXPORT static Handle(IMeshTools_CurveTessellator) CreateEdgeTessellator(
     const IMeshData::IEdgeHandle& theDEdge,
-    const IMeshTools_Parameters&  theParameters,
-    const Standard_Integer        theMinPointsNb = 2);
+    const IMeshTools_Parameters&  theParameters);
 
   //! Creates instance of edge tessellator.
   Standard_EXPORT static Handle(IMeshTools_CurveTessellator) CreateEdgeTessellator(
     const IMeshData::IEdgeHandle& theDEdge,
     const TopAbs_Orientation      theOrientation,
     const IMeshData::IFaceHandle& theDFace,
-    const IMeshTools_Parameters&  theParameters,
-    const Standard_Integer        theMinPointsNb = 2);
+    const IMeshTools_Parameters&  theParameters);
 
   //! Creates instance of tessellation extractor.
   Standard_EXPORT static Handle(IMeshTools_CurveTessellator) CreateEdgeTessellationExtractor(

src/BRepMesh/BRepMesh_ExtrusionRangeSplitter.cxx

@@ -1,45 +0,0 @@
-// Created on: 2022-09-07
-// Copyright (c) 2022 OPEN CASCADE SAS
-// Created by: Oleg AGASHIN
-//
-// 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.
-
-#include <BRepMesh_ExtrusionRangeSplitter.hxx>
-
-//=======================================================================
-// Function: getUndefinedIntervalNb
-// Purpose : 
-//=======================================================================
-Standard_Integer BRepMesh_ExtrusionRangeSplitter::getUndefinedIntervalNb(
-  const Handle(Adaptor3d_Surface)& theSurface,
-  const Standard_Boolean           /*isU*/,
-  const GeomAbs_Shape              theContinuity) const
-{
-  // Here we need just a regular grid along dimension with no 
-  // geometrical data regarding intervals like extrusion surface.
-  const Handle(Adaptor3d_Curve) aCurve = theSurface->BasisCurve();
-  Standard_Integer aIntervalsNb = aCurve->NbIntervals(theContinuity);
-  if (aIntervalsNb == 1)
-  {
-    const GeomAbs_CurveType aCurveType = aCurve->GetType();
-    const Standard_Boolean isBSplineCurve =
-      aCurveType == GeomAbs_BezierCurve ||
-      aCurveType == GeomAbs_BSplineCurve;
-
-    if (isBSplineCurve)
-    {
-      aIntervalsNb = aCurve->NbPoles() - 1;
-    }
-  }
-
-  return aIntervalsNb;
-}

src/BRepMesh/BRepMesh_ExtrusionRangeSplitter.hxx

@@ -1,45 +0,0 @@
-// Created on: 2022-09-07
-// Copyright (c) 2022 OPEN CASCADE SAS
-// Created by: Oleg AGASHIN
-//
-// 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 _BRepMesh_ExtrusionRangeSplitter_HeaderFile
-#define _BRepMesh_ExtrusionRangeSplitter_HeaderFile
-
-#include <BRepMesh_NURBSRangeSplitter.hxx>
-
-//! Auxiliary class analysing extrusion surface in order to generate internal nodes.
-class BRepMesh_ExtrusionRangeSplitter : public BRepMesh_NURBSRangeSplitter
-{
-public:
-
-  //! Constructor.
-  BRepMesh_ExtrusionRangeSplitter()
-  {
-  }
-
-  //! Destructor.
-  virtual ~BRepMesh_ExtrusionRangeSplitter()
-  {
-  }
-
-protected:
-
-  //! Returns number of intervals computed using available geometrical parameters.
-  Standard_EXPORT virtual Standard_Integer getUndefinedIntervalNb(
-    const Handle(Adaptor3d_Surface)& theSurface,
-    const Standard_Boolean           isU,
-    const GeomAbs_Shape              theContinuity) const Standard_OVERRIDE;
-};
-
-#endif

src/BRepMesh/BRepMesh_MeshAlgoFactory.cxx

@@ -21,8 +21,6 @@
 #include <BRepMesh_DelaunayBaseMeshAlgo.hxx>
 #include <BRepMesh_DelaunayDeflectionControlMeshAlgo.hxx>
 #include <BRepMesh_BoundaryParamsRangeSplitter.hxx>
-#include <BRepMesh_ExtrusionRangeSplitter.hxx>
-#include <BRepMesh_UndefinedRangeSplitter.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_MeshAlgoFactory, IMeshTools_MeshAlgoFactory)
 
@@ -73,55 +71,34 @@ Handle(IMeshTools_MeshAlgo) BRepMesh_MeshAlgoFactory::GetAlgo(
   switch (theSurfaceType)
   {
   case GeomAbs_Plane:
-    return theParameters.EnableControlSurfaceDeflectionAllSurfaces ?
-      new DeflectionControlMeshAlgo<BRepMesh_DefaultRangeSplitter>::Type :
-        (theParameters.InternalVerticesMode ?
-         new NodeInsertionMeshAlgo<BRepMesh_DefaultRangeSplitter>::Type :
-         new BaseMeshAlgo::Type);
+    return theParameters.InternalVerticesMode ?
+      new NodeInsertionMeshAlgo<BRepMesh_DefaultRangeSplitter>::Type :
+      new BaseMeshAlgo::Type;
     break;
 
   case GeomAbs_Sphere:
-    return theParameters.EnableControlSurfaceDeflectionAllSurfaces ?
-      new DeflectionControlMeshAlgo<BRepMesh_SphereRangeSplitter>::Type :
-      new NodeInsertionMeshAlgo<BRepMesh_SphereRangeSplitter>::Type;
+    return new NodeInsertionMeshAlgo<BRepMesh_SphereRangeSplitter>::Type;
     break;
 
   case GeomAbs_Cylinder:
-    return theParameters.EnableControlSurfaceDeflectionAllSurfaces ?
-      new DeflectionControlMeshAlgo<BRepMesh_CylinderRangeSplitter>::Type :
-        (theParameters.InternalVerticesMode ?
-        new NodeInsertionMeshAlgo<BRepMesh_CylinderRangeSplitter>::Type :
-        new BaseMeshAlgo::Type);
+    return theParameters.InternalVerticesMode ?
+      new NodeInsertionMeshAlgo<BRepMesh_CylinderRangeSplitter>::Type :
+      new BaseMeshAlgo::Type;
     break;
 
   case GeomAbs_Cone:
-    return theParameters.EnableControlSurfaceDeflectionAllSurfaces ? 
-      new DeflectionControlMeshAlgo<BRepMesh_ConeRangeSplitter>::Type :
-      new NodeInsertionMeshAlgo<BRepMesh_ConeRangeSplitter>::Type;
+    return new NodeInsertionMeshAlgo<BRepMesh_ConeRangeSplitter>::Type;
     break;
 
   case GeomAbs_Torus:
-    return theParameters.EnableControlSurfaceDeflectionAllSurfaces ?
-      new DeflectionControlMeshAlgo<BRepMesh_TorusRangeSplitter>::Type :
-      new NodeInsertionMeshAlgo<BRepMesh_TorusRangeSplitter>::Type;
+    return new NodeInsertionMeshAlgo<BRepMesh_TorusRangeSplitter>::Type;
     break;
 
   case GeomAbs_SurfaceOfRevolution:
     return new DeflectionControlMeshAlgo<BRepMesh_BoundaryParamsRangeSplitter>::Type;
     break;
 
-  case GeomAbs_SurfaceOfExtrusion:
-    return new DeflectionControlMeshAlgo<BRepMesh_ExtrusionRangeSplitter>::Type;
-    break;
-
-  case GeomAbs_BezierSurface:
-  case GeomAbs_BSplineSurface:
-    return new DeflectionControlMeshAlgo<BRepMesh_NURBSRangeSplitter>::Type;
-    break;
-
-  case GeomAbs_OffsetSurface:
-  case GeomAbs_OtherSurface:
   default:
-    return new DeflectionControlMeshAlgo<BRepMesh_UndefinedRangeSplitter>::Type;
+    return new DeflectionControlMeshAlgo<BRepMesh_NURBSRangeSplitter>::Type;
   }
 }

src/BRepMesh/BRepMesh_ModelHealer.cxx

@@ -50,32 +50,14 @@ namespace
     void operator()(const IMeshData::IEdgePtr& theDEdge) const
     {
       const IMeshData::IEdgeHandle aDEdge = theDEdge;
-
-      Standard_Integer aPointsNb = aDEdge->GetCurve()->ParametersNb();
-
       aDEdge->Clear(Standard_True);
       aDEdge->SetDeflection(Max(aDEdge->GetDeflection() / 3., Precision::Confusion()));
 
-      for (Standard_Integer aPCurveIt = 0; aPCurveIt < aDEdge->PCurvesNb(); ++aPCurveIt)
-      {
-        const IMeshData::IPCurveHandle& aPCurve = aDEdge->GetPCurve(aPCurveIt);
-        const IMeshData::IFaceHandle    aDFace  = aPCurve->GetFace();
-
-        // Check that outer wire contains 2 edges or less and add an additional point.
-        const IMeshData::IWireHandle&   aDWire  = aDFace->GetWire(0);
-        if (aDWire->EdgesNb() <= 2)
-        {
-          ++aPointsNb;
-          break;
-        }
-      }
-
       const IMeshData::IPCurveHandle& aPCurve = aDEdge->GetPCurve(0);
       const IMeshData::IFaceHandle    aDFace = aPCurve->GetFace();
       Handle(IMeshTools_CurveTessellator) aTessellator =
         BRepMesh_EdgeDiscret::CreateEdgeTessellator(
-          aDEdge, aPCurve->GetOrientation(), aDFace,
-          myParameters, aPointsNb);
+          aDEdge, aPCurve->GetOrientation(), aDFace, myParameters);
 
       BRepMesh_EdgeDiscret::Tessellate3d(aDEdge, aTessellator, Standard_False);
       BRepMesh_EdgeDiscret::Tessellate2d(aDEdge, Standard_False);

src/BRepMesh/BRepMesh_NURBSRangeSplitter.cxx

@@ -392,73 +392,27 @@ Handle(IMeshData::ListOfPnt2d) BRepMesh_NURBSRangeSplitter::GenerateSurfaceNodes
   return aNodes;
 }
 
-//=======================================================================
-// Function: getUndefinedIntervalNb
-// Purpose : 
-//=======================================================================
-Standard_Integer BRepMesh_NURBSRangeSplitter::getUndefinedIntervalNb(
-  const Handle(Adaptor3d_Surface)& theSurface,
-  const Standard_Boolean           isU,
-  const GeomAbs_Shape              /*theContinuity*/) const
-{
-  return (isU ? theSurface->NbUPoles() : theSurface->NbVPoles()) - 1;
-}
-
-//=======================================================================
-// Function: getUndefinedInterval
-// Purpose : 
-//=======================================================================
-void BRepMesh_NURBSRangeSplitter::getUndefinedInterval(
-  const Handle(Adaptor3d_Surface)&               theSurface,
-  const Standard_Boolean                         isU,
-  const GeomAbs_Shape                            theContinuity,
-  const std::pair<Standard_Real, Standard_Real>& theRange,
-  TColStd_Array1OfReal&                          theIntervals) const
-{
-  Standard_Integer aIntervalsNb = isU ? 
-    theSurface->NbUIntervals(theContinuity) :
-    theSurface->NbVIntervals(theContinuity);
-
-  if (aIntervalsNb == 1)
-  {
-    aIntervalsNb = getUndefinedIntervalNb(theSurface, isU, theContinuity);
-    if (aIntervalsNb > 1)
-    {
-      theIntervals = TColStd_Array1OfReal(1, aIntervalsNb - 1);
-      const Standard_Real aDiff = (theRange.second - theRange.first) / aIntervalsNb;
-      for (Standard_Integer i = theIntervals.Lower(); i <= theIntervals.Upper(); ++i)
-      {
-        theIntervals.SetValue(i, theRange.first + i * aDiff);
-      }
-    }
-  }
-
-  if (theIntervals.IsEmpty())
-  {
-    theIntervals = TColStd_Array1OfReal(1, aIntervalsNb + 1);
-    if (isU)
-    {
-      theSurface->UIntervals(theIntervals, theContinuity);
-    }
-    else
-    {
-      theSurface->VIntervals(theIntervals, theContinuity);
-    }
-  }
-}
-
 //=======================================================================
 // Function: initParameters
 // Purpose : 
 //=======================================================================
 Standard_Boolean BRepMesh_NURBSRangeSplitter::initParameters() const
 {
-  const GeomAbs_Shape aContinuity = GeomAbs_CN;
   const Handle(BRepAdaptor_Surface)& aSurface = GetSurface();
 
-  TColStd_Array1OfReal aIntervals[2];
-  getUndefinedInterval(aSurface, Standard_True,  aContinuity, GetRangeU(), aIntervals[0]);
-  getUndefinedInterval(aSurface, Standard_False, aContinuity, GetRangeV(), aIntervals[1]);
+  const GeomAbs_Shape aContinuity = GeomAbs_CN;
+  const std::pair<Standard_Integer, Standard_Integer> aIntervalsNb(
+    aSurface->NbUIntervals(aContinuity),
+    aSurface->NbVIntervals(aContinuity)
+  );
+
+  TColStd_Array1OfReal aIntervals[2] = {
+    TColStd_Array1OfReal(1, aIntervalsNb.first  + 1),
+    TColStd_Array1OfReal(1, aIntervalsNb.second + 1)
+  };
+
+  aSurface->UIntervals(aIntervals[0], aContinuity);
+  aSurface->VIntervals(aIntervals[1], aContinuity);
 
   const Standard_Boolean isSplitIntervals = toSplitIntervals (aSurface->Surface().Surface(), aIntervals);
 
@@ -553,17 +507,12 @@ Handle(IMeshData::SequenceOfReal) BRepMesh_NURBSRangeSplitter::computeGrainAndFi
     aMinDiff /= theDelta;
   }
 
-  const Handle(BRepAdaptor_Surface)& aSurface = GetSurface();
-  const Standard_Real aMinSize2d = Max(
-    aSurface->UResolution(theParameters.MinSize),
-    aSurface->VResolution(theParameters.MinSize));
-
-  aMinDiff = Max(aMinSize2d, aMinDiff);
+  aMinDiff = Max(theParameters.MinSize, aMinDiff);
 
   const Standard_Real aDiffMaxLim = 0.1 * theRangeDiff;
   const Standard_Real aDiffMinLim = Max(0.005 * theRangeDiff,
                                         2. * theTol2d);
-  const Standard_Real aDiff = Max(aMinSize2d,
+  const Standard_Real aDiff = Max(theParameters.MinSize,
                                   Min(aDiffMaxLim, aDiffMinLim));
   return filterParameters(theSourceParams, aMinDiff, aDiff, theAllocator);
 }

src/BRepMesh/BRepMesh_NURBSRangeSplitter.hxx

@@ -49,21 +49,7 @@ protected:
   //! Initializes U and V parameters lists using CN continuity intervals.
   Standard_EXPORT virtual Standard_Boolean initParameters() const;
 
-  //! Returns number of intervals computed using available geometrical parameters.
-  Standard_EXPORT virtual Standard_Integer getUndefinedIntervalNb(
-    const Handle(Adaptor3d_Surface)& theSurface,
-    const Standard_Boolean           isU,
-    const GeomAbs_Shape              theContinuity) const;
-
 private:
-  //! Tries to compute intervals even for cases with no intervals 
-  //! at all using available geometrical parameters.
-  void getUndefinedInterval(
-    const Handle(Adaptor3d_Surface)&               theSurface,
-    const Standard_Boolean                         isU,
-    const GeomAbs_Shape                            theContinuity,
-    const std::pair<Standard_Real, Standard_Real>& theRange,
-    TColStd_Array1OfReal&                          theIntervals) const;
 
   //! Computes parameters of filter and applies it to the source parameters.
   Handle(IMeshData::SequenceOfReal) computeGrainAndFilterParameters(

src/BRepMesh/BRepMesh_UndefinedRangeSplitter.cxx

@@ -1,28 +0,0 @@
-// Created on: 2022-09-07
-// Copyright (c) 2022 OPEN CASCADE SAS
-// Created by: Oleg AGASHIN
-//
-// 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.
-
-#include <BRepMesh_UndefinedRangeSplitter.hxx>
-
-//=======================================================================
-// Function: getUndefinedIntervalNb
-// Purpose : 
-//=======================================================================
-Standard_Integer BRepMesh_UndefinedRangeSplitter::getUndefinedIntervalNb(
-  const Handle(Adaptor3d_Surface)& /*theSurface*/,
-  const Standard_Boolean           /*isU*/,
-  const GeomAbs_Shape              /*theContinuity*/) const
-{
-  return 1;
-}

src/BRepMesh/BRepMesh_UndefinedRangeSplitter.hxx

@@ -1,46 +0,0 @@
-// Created on: 2022-09-07
-// Copyright (c) 2022 OPEN CASCADE SAS
-// Created by: Oleg AGASHIN
-//
-// 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 _BRepMesh_UndefinedRangeSplitter_HeaderFile
-#define _BRepMesh_UndefinedRangeSplitter_HeaderFile
-
-#include <BRepMesh_NURBSRangeSplitter.hxx>
-
-//! Auxiliary class provides safe value for surfaces that looks like NURBS 
-//! but has no poles or other characteristics.
-class BRepMesh_UndefinedRangeSplitter : public BRepMesh_NURBSRangeSplitter
-{
-public:
-
-  //! Constructor.
-  BRepMesh_UndefinedRangeSplitter()
-  {
-  }
-
-  //! Destructor.
-  virtual ~BRepMesh_UndefinedRangeSplitter()
-  {
-  }
-
-protected:
-
-  //! Returns number of intervals computed using available geometrical parameters.
-  Standard_EXPORT virtual Standard_Integer getUndefinedIntervalNb(
-    const Handle(Adaptor3d_Surface)& theSurface,
-    const Standard_Boolean           isU,
-    const GeomAbs_Shape              theContinuity) const Standard_OVERRIDE;
-};
-
-#endif

src/BRepMesh/FILES

@@ -40,8 +40,6 @@ BRepMesh_EdgeDiscret.hxx
 BRepMesh_EdgeParameterProvider.hxx
 BRepMesh_EdgeTessellationExtractor.cxx
 BRepMesh_EdgeTessellationExtractor.hxx
-BRepMesh_ExtrusionRangeSplitter.cxx
-BRepMesh_ExtrusionRangeSplitter.hxx
 BRepMesh_FaceChecker.cxx
 BRepMesh_FaceChecker.hxx
 BRepMesh_FaceDiscret.cxx
@@ -82,8 +80,6 @@ BRepMesh_SphereRangeSplitter.hxx
 BRepMesh_TorusRangeSplitter.cxx
 BRepMesh_TorusRangeSplitter.hxx
 BRepMesh_Triangle.hxx
-BRepMesh_UndefinedRangeSplitter.cxx
-BRepMesh_UndefinedRangeSplitter.hxx
 BRepMesh_UVParamRangeSplitter.hxx
 BRepMesh_Vertex.hxx
 BRepMesh_VertexInspector.hxx

src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx

@@ -17,12 +17,9 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
-#include <BRepAlgo.hxx>
 #include <BRepAlgo_FaceRestrictor.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepLib.hxx>
 #include <BRepOffsetAPI_MakeOffset.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <Extrema_ExtPS.hxx>
@@ -44,50 +41,6 @@
 static Standard_Boolean AffichSpine = Standard_False;
 #endif
 
-static Standard_Boolean NeedsConvertion (const TopoDS_Wire& theWire)
-{
-  TopoDS_Iterator anIter (theWire);
-  for (; anIter.More(); anIter.Next())
-  {
-    const TopoDS_Edge& anEdge = TopoDS::Edge (anIter.Value());
-    BRepAdaptor_Curve aBAcurve (anEdge);
-    GeomAbs_CurveType aType = aBAcurve.GetType();
-    if (aType != GeomAbs_Line &&
-        aType != GeomAbs_Circle)
-      return Standard_True;
-  }
-
-  return Standard_False;
-}
-
-TopoDS_Face BRepOffsetAPI_MakeOffset::ConvertFace (const TopoDS_Face&  theFace,
-                                                   const Standard_Real theAngleTolerance)
-{
-  TopAbs_Orientation anOr = theFace.Orientation();
-  TopoDS_Face aFace = theFace;
-  aFace.Orientation (TopAbs_FORWARD);
-
-  TopoDS_Face aNewFace = TopoDS::Face (aFace.EmptyCopied());
-  BRep_Builder aBB;
-  TopoDS_Iterator anIter (aFace);
-  for (; anIter.More(); anIter.Next())
-  {
-    TopoDS_Wire aWire = TopoDS::Wire (anIter.Value());
-    if (NeedsConvertion (aWire))
-    {
-      TopAbs_Orientation anOrOfWire = aWire.Orientation();
-      aWire.Orientation (TopAbs_FORWARD);
-      aWire = BRepAlgo::ConvertWire (aWire, theAngleTolerance, aFace);
-      BRepLib::BuildCurves3d (aWire);
-      aWire.Orientation (anOrOfWire);
-    }
-    aBB.Add (aNewFace, aWire);
-  }
-  aNewFace.Orientation (anOr);
-
-  return aNewFace;
-}
-
 //=======================================================================
 //function : BRepOffsetAPI_MakeOffset
 //purpose  : 
@@ -96,8 +49,7 @@ TopoDS_Face BRepOffsetAPI_MakeOffset::ConvertFace (const TopoDS_Face&  theFace,
 BRepOffsetAPI_MakeOffset::BRepOffsetAPI_MakeOffset()
   : myIsInitialized( Standard_False),
     myJoin(GeomAbs_Arc),
-    myIsOpenResult(Standard_False),
-    myIsToApprox(Standard_False)
+    myIsOpenResult(Standard_False)
 {
 }
 
@@ -128,7 +80,6 @@ void BRepOffsetAPI_MakeOffset::Init(const TopoDS_Face&     Spine,
   myIsInitialized = Standard_True;
   myJoin          = Join;
   myIsOpenResult  = IsOpenResult;
-  myIsToApprox = Standard_False;
   TopExp_Explorer exp;
   for (exp.Init(myFace,TopAbs_WIRE); exp.More();exp.Next()) {
     myWires.Append(exp.Current());
@@ -148,7 +99,6 @@ BRepOffsetAPI_MakeOffset::BRepOffsetAPI_MakeOffset(const TopoDS_Wire& Spine,
   myIsInitialized = Standard_True;
   myJoin = Join;
   myIsOpenResult  = IsOpenResult;
-  myIsToApprox = Standard_False;
 }
 
 //=======================================================================
@@ -163,18 +113,6 @@ void BRepOffsetAPI_MakeOffset::Init(const GeomAbs_JoinType Join,
   myIsOpenResult  = IsOpenResult;
 }
 
-//=======================================================================
-//function : SetApprox
-//purpose  : Set approximation flag
-//           for convertion input contours into ones consisting of
-//           2D circular arcs and 2D linear segments only
-//=======================================================================
-
-void BRepOffsetAPI_MakeOffset::SetApprox(const Standard_Boolean ToApprox)
-{
-  myIsToApprox = ToApprox;
-}
-
 //=======================================================================
 //function : BRepOffsetAPI_MakeOffset
 //purpose  : 
@@ -351,46 +289,6 @@ void BRepOffsetAPI_MakeOffset::Perform(const Standard_Real Offset,
 
   try
   {
-    if (myIsToApprox)
-    {
-      Standard_Real aTol = 0.1;
-      if (myFace.IsNull())
-      {
-        TopoDS_Face aFace;
-        Standard_Boolean OnlyPlane = Standard_True;
-        TopTools_ListIteratorOfListOfShape anItl (myWires);
-        for (; anItl.More(); anItl.Next())
-        {
-          BRepBuilderAPI_MakeFace aFaceMaker (TopoDS::Wire(anItl.Value()), OnlyPlane);
-          if (aFaceMaker.Error() == BRepBuilderAPI_FaceDone)
-          {
-            aFace = aFaceMaker.Face();
-            break;
-          }
-        }
-        for (anItl.Initialize(myWires); anItl.More(); anItl.Next())
-        {
-          const TopoDS_Wire& aWire = TopoDS::Wire(anItl.Value());
-          if (NeedsConvertion (aWire))
-          {
-            TopoDS_Wire aNewWire = BRepAlgo::ConvertWire (aWire, aTol, aFace);
-            BRepLib::BuildCurves3d (aNewWire);
-            aNewWire.Orientation (aWire.Orientation());
-            anItl.ChangeValue() = aNewWire;
-          }
-        }
-      }
-      else
-      {
-        myFace = ConvertFace (myFace, aTol);
-        BRepLib::BuildCurves3d (myFace);
-        myWires.Clear();
-        TopoDS_Iterator anIter (myFace);
-        for (; anIter.More(); anIter.Next())
-          myWires.Append (anIter.Value());
-      }
-    }
-    
     Standard_Integer i = 1;
     BRepFill_ListIteratorOfListOfOffsetWire itOW;
     TopoDS_Compound Res;

src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.hxx

@@ -63,11 +63,6 @@ public:
   //! Initialize the evaluation of Offsetting.
   Standard_EXPORT void Init (const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean IsOpenResult = Standard_False);
   
-  //! Set approximation flag
-  //! for convertion input contours into ones consisting of
-  //! 2D circular arcs and 2D linear segments only.
-  Standard_EXPORT void SetApprox (const Standard_Boolean ToApprox);
-  
   //! Initializes the algorithm to construct parallels to the wire Spine.
   Standard_EXPORT void AddWire (const TopoDS_Wire& Spine);
   
@@ -84,10 +79,7 @@ public:
   //! from the shape <S>.
   Standard_EXPORT virtual const TopTools_ListOfShape& Generated (const TopoDS_Shape& S) Standard_OVERRIDE;
 
-  //! Converts each wire of the face into contour consisting only of
-  //! arcs and segments. New 3D curves are built too.
-  Standard_EXPORT static TopoDS_Face ConvertFace (const TopoDS_Face& theFace,
-                                                  const Standard_Real theAngleTolerance);
+
 
 
 protected:
@@ -104,7 +96,6 @@ private:
   Standard_Boolean myLastIsLeft;
   GeomAbs_JoinType myJoin;
   Standard_Boolean myIsOpenResult;
-  Standard_Boolean myIsToApprox;
   TopoDS_Face myFace;
   TopTools_ListOfShape myWires;
   BRepFill_ListOfOffsetWire myLeft;

src/BRepTest/BRepTest_CurveCommands.cxx

@@ -1530,23 +1530,10 @@ Standard_Integer mkoffset(Draw_Interpretor& di,
   char name[100];
 
   BRepOffsetAPI_MakeOffset Paral;
-
-  Standard_Boolean ToApprox = Standard_False;
   GeomAbs_JoinType theJoinType = GeomAbs_Arc;
-  
-  Standard_Integer anIndArg = 6;
-  if (n >= 6)
-  {
-    if (strcmp(a[5], "-approx") == 0)
-    {
-      ToApprox = Standard_True;
-      anIndArg++;
-    }
-  
-    if (n >= anIndArg && strcmp(a[anIndArg-1], "i") == 0)
-      theJoinType = GeomAbs_Intersection;
-  }
-  
+  if (n >= 6 && strcmp(a[5], "i") == 0)
+    theJoinType = GeomAbs_Intersection;
+  Paral.Init(theJoinType);
   TopoDS_Shape Base = DBRep::Get(a[2],TopAbs_FACE);
 
   if ( Base.IsNull())
@@ -1566,7 +1553,6 @@ Standard_Integer mkoffset(Draw_Interpretor& di,
     Base.Orientation(TopAbs_FORWARD);
     Paral.Init(TopoDS::Face(Base), theJoinType);
   }
-  Paral.SetApprox (ToApprox);
 
   Standard_Real U, dU;
   Standard_Integer Nb;
@@ -1574,8 +1560,8 @@ Standard_Integer mkoffset(Draw_Interpretor& di,
   Nb = Draw::Atoi(a[3]);
 
   Standard_Real Alt = 0.;
-  if (n > anIndArg)
-    Alt = Draw::Atof(a[anIndArg]);
+  if ( n == 7)
+    Alt = Draw::Atof(a[6]);
 
   Standard_Integer Compt = 1;
 
@@ -1612,30 +1598,16 @@ Standard_Integer openoffset(Draw_Interpretor& di,
   char name[100];
 
   BRepOffsetAPI_MakeOffset Paral;
-  
-  Standard_Boolean ToApprox = Standard_False;
   GeomAbs_JoinType theJoinType = GeomAbs_Arc;
-  
-  Standard_Integer anIndArg = 6;
-  if (n >= 6)
-  {
-    if (strcmp(a[5], "-approx") == 0)
-    {
-      ToApprox = Standard_True;
-      anIndArg++;
-    }
-  
-    if (n >= anIndArg && strcmp(a[anIndArg-1], "i") == 0)
-      theJoinType = GeomAbs_Intersection;
-  }
-  
+  if (n == 6 && strcmp(a[5], "i") == 0)
+    theJoinType = GeomAbs_Intersection;
+  Paral.Init(theJoinType, Standard_True);
   TopoDS_Shape Base = DBRep::Get(a[2] ,TopAbs_FACE);
 
   if ( Base.IsNull())
   {
     Base = DBRep::Get(a[2], TopAbs_WIRE);
     if (Base.IsNull()) return 1;
-    Paral.Init(theJoinType, Standard_True);
     Paral.AddWire(TopoDS::Wire(Base));
   }
   else
@@ -1643,7 +1615,6 @@ Standard_Integer openoffset(Draw_Interpretor& di,
     Base.Orientation(TopAbs_FORWARD);
     Paral.Init(TopoDS::Face(Base), theJoinType, Standard_True);
   }
-  Paral.SetApprox (ToApprox);
 
   Standard_Real U, dU;
   Standard_Integer Nb;
@@ -1784,72 +1755,6 @@ Standard_Integer edgeintersector(Draw_Interpretor& di,
 
 }
 
-//=================================================================================
-//function : arclinconvert
-//purpose  : Convert a single face to a face with contour made of arcs and segments
-//=================================================================================
-
-static Standard_Integer arclinconvert (Draw_Interpretor& /*dout*/, Standard_Integer n, const char** a)
-{
-  // Check the command arguments
-  if (n < 3) {
-    std::cout<<"Error: "<<a[0]<<" - invalid number of arguments"<<std::endl;
-    std::cout<<"Usage: type help "<<a[0]<<std::endl;
-    return 1; //TCL_ERROR
-  }
-
-  //read shape
-  const TopoDS_Shape aShape = DBRep::Get(a[2]);
-  if (aShape.IsNull()) {
-    std::cout<<"Error: "<<a[2]<<" is null"<<std::endl;
-    return 1; //TCL_ERROR
-  }
-
-  TopAbs_ShapeEnum aType = aShape.ShapeType();
-  if (aType != TopAbs_WIRE &&
-      aType != TopAbs_FACE)
-  {
-    std::cout<<"Error: "<<a[2]<<" is neither wire no face"<<std::endl;
-    return 1; //TCL_ERROR
-  }
-
-  //read tolerance
-  Standard_Real aTol = 0.01;
-  if (n > 3)
-    aTol = Draw::Atof(a[3]);
-  std::cout<<"Info: tolerance is set to "<<aTol<<std::endl;
-
-  TopoDS_Shape aResult;
-  
-  if (aType == TopAbs_WIRE)
-  {
-    Standard_Boolean OnlyPlane = Standard_False;
-    BRepBuilderAPI_MakeFace aFaceMaker (TopoDS::Wire(aShape), OnlyPlane);
-    if (aFaceMaker.Error() != BRepBuilderAPI_FaceDone)
-    {
-      std::cout<<"Error: failed to find a face for the wire "<<a[2]<<std::endl;
-      return 1; //TCL_ERROR
-    }
-    TopoDS_Face aFace = aFaceMaker.Face();
-    TopoDS_Iterator anIter (aFace);
-    TopoDS_Wire aWire = TopoDS::Wire (anIter.Value());
-    aResult = BRepAlgo::ConvertWire (aWire, aTol, aFace);
-  }
-  else if (aType == TopAbs_FACE)
-  {
-    TopoDS_Face aFace = TopoDS::Face(aShape);
-    aResult = BRepAlgo::ConvertFace (aFace, aTol);
-  }
-
-  if (aResult.IsNull()) {
-    std::cout<<"Error: could not convert "<<a[2]<<std::endl;
-    return 1; //TCL_ERROR
-  }
-
-  DBRep::Set(a[1], aResult);
-  return 0; //TCL_OK
-}
-
 //=======================================================================
 //function : concatC0wire
 //purpose  : 
@@ -2003,11 +1908,11 @@ void  BRepTest::CurveCommands(Draw_Interpretor& theCommands)
     profile2d,g);
 
   theCommands.Add("mkoffset",
-    "mkoffset result face/compound of wires  nboffset stepoffset [-approx] [jointype(a/i) [alt]]",__FILE__,
+    "mkoffset result face/compound of wires  nboffset stepoffset [jointype(a/i) [alt]]",__FILE__,
     mkoffset,g);
 
   theCommands.Add("openoffset",
-    "openoffset result face/wire nboffset stepoffset [-approx] [jointype(a/i)]",__FILE__,
+    "openoffset result face/wire nboffset stepoffset [jointype(a/i)]",__FILE__,
     openoffset,g);
 
   theCommands.Add("mkedge",
@@ -2063,12 +1968,6 @@ void  BRepTest::CurveCommands(Draw_Interpretor& theCommands)
     "reducepcurves shape1 shape2 ...",__FILE__,
     reducepcurves, g);
 
-  theCommands.Add("arclinconvert",
-    "arclinconvert result wire/face [tol]",
-    __FILE__,
-    arclinconvert,
-    g);
-
   theCommands.Add("concatC0wire",
     "concatC0wire result wire",
     __FILE__,

src/BRepTest/BRepTest_ExtremaCommands.cxx

@@ -173,7 +173,7 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs,
 {
   if (theNbArgs < 3 || theNbArgs > 6)
   {
-    Message::SendFail() << "Usage: " << theArgs[0] << " Shape1 Shape2 [-tol <value> | -value] [-profile]";
+    Message::SendFail() << "Usage: " << theArgs[0] << " Shape1 Shape2 [-tol <value>] [-profile]";
     return 1;
   }
 
@@ -186,11 +186,9 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs,
     return 1;
   }
 
-  BRepExtrema_ShapeProximity aTool(0.0);
+  BRepExtrema_ShapeProximity aTool;
 
   Standard_Boolean aProfile = Standard_False;
-  Standard_Boolean isTolerance = Standard_False;
-  Standard_Boolean isValue = Standard_False;
 
   for (Standard_Integer anArgIdx = 3; anArgIdx < theNbArgs; ++anArgIdx)
   {
@@ -199,7 +197,6 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs,
 
     if (aFlag == "-tol")
     {
-      isTolerance = Standard_True;
       if (++anArgIdx >= theNbArgs)
       {
         Message::SendFail() << "Error: wrong syntax at argument '" << aFlag;
@@ -217,23 +214,13 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs,
         aTool.SetTolerance (aTolerance);
       }
     }
-    else if (aFlag == "-value")
-    {
-      isValue = Standard_True;
-      aTool.SetTolerance(Precision::Infinite());
-    }
-    else if (aFlag == "-profile")
+
+    if (aFlag == "-profile")
     {
       aProfile = Standard_True;
     }
   }
 
-  if (isTolerance && isValue)
-  {
-    Message::SendFail() << "Error: Proximity value could not be computed if the tolerance is set";
-    return 1;
-  }
-
   Standard_Real aInitTime = 0.0;
   Standard_Real aWorkTime = 0.0;
 
@@ -277,74 +264,39 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs,
     theDI << "Executing proximity test: " << aWorkTime << "\n";
   }
 
-  if (isValue)
+  TopoDS_Builder aCompBuilder;
+
+  TopoDS_Compound aFaceCompound1;
+  aCompBuilder.MakeCompound (aFaceCompound1);
+
+  for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt1 (aTool.OverlapSubShapes1()); anIt1.More(); anIt1.Next())
   {
-    theDI << "Proximity value: " << aTool.Proximity() << "\n";
+    TCollection_AsciiString aStr = TCollection_AsciiString (theArgs[1]) + "_" + (anIt1.Key() + 1);
 
-    // proximity points
-    TopoDS_Vertex aProxVtx1 = BRepLib_MakeVertex (aTool.ProximityPoint1());
-    TopoDS_Vertex aProxVtx2 = BRepLib_MakeVertex (aTool.ProximityPoint2());
+    const TopoDS_Face& aFace = aTool.GetSubShape1 (anIt1.Key());
+    aCompBuilder.Add (aFaceCompound1, aFace);
+    DBRep::Set (aStr.ToCString(), aFace);
 
-    DBRep::Set ("ProxPnt1", aProxVtx1);
-    DBRep::Set ("ProxPnt2", aProxVtx2);
-
-    // proximity points' status
-    TCollection_AsciiString ProxPntStatus1;
-    TCollection_AsciiString ProxPntStatus2;
-
-    switch (aTool.ProxPntStatus1()) 
-    {
-      case 0: ProxPntStatus1 = "Border"; break;
-      case 1: ProxPntStatus1 = "Middle"; break;
-      default: ProxPntStatus1 = "Unknown";
-    }
-
-    switch (aTool.ProxPntStatus2())
-    {
-    case 0: ProxPntStatus2 = "Border"; break;
-    case 1: ProxPntStatus2 = "Middle"; break;
-    default: ProxPntStatus2 = "Unknown";
-    }
-
-    theDI << " Status of ProxPnt1 on " << theArgs[1] << " : " << ProxPntStatus1 << "\n";
-    theDI << " Status of ProxPnt2 on " << theArgs[2] << " : " << ProxPntStatus2 << "\n";
+    theDI << aStr << " \n";
   }
-  else
+
+  TopoDS_Compound aFaceCompound2;
+  aCompBuilder.MakeCompound (aFaceCompound2);
+
+  for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt2 (aTool.OverlapSubShapes2()); anIt2.More(); anIt2.Next())
   {
-    TopoDS_Builder aCompBuilder;
+    TCollection_AsciiString aStr = TCollection_AsciiString (theArgs[2]) + "_" + (anIt2.Key() + 1);
 
-    TopoDS_Compound aFaceCompound1;
-    aCompBuilder.MakeCompound(aFaceCompound1);
+    const TopoDS_Face& aFace = aTool.GetSubShape2 (anIt2.Key());
+    aCompBuilder.Add (aFaceCompound2, aFace);
+    DBRep::Set (aStr.ToCString(), aFace);
 
-    for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt1(aTool.OverlapSubShapes1()); anIt1.More(); anIt1.Next())
-    {
-      TCollection_AsciiString aStr = TCollection_AsciiString(theArgs[1]) + "_" + (anIt1.Key() + 1);
-
-      const TopoDS_Shape& aShape = aTool.GetSubShape1(anIt1.Key());
-      aCompBuilder.Add(aFaceCompound1, aShape);
-      DBRep::Set(aStr.ToCString(), aShape);
-
-      theDI << aStr << " \n";
-    }
-
-    TopoDS_Compound aFaceCompound2;
-    aCompBuilder.MakeCompound(aFaceCompound2);
-
-    for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt2(aTool.OverlapSubShapes2()); anIt2.More(); anIt2.Next())
-    {
-      TCollection_AsciiString aStr = TCollection_AsciiString(theArgs[2]) + "_" + (anIt2.Key() + 1);
-
-      const TopoDS_Shape& aShape = aTool.GetSubShape2(anIt2.Key());
-      aCompBuilder.Add(aFaceCompound2, aShape);
-      DBRep::Set(aStr.ToCString(), aShape);
-
-      theDI << aStr << " \n";
-    }
-
-    DBRep::Set((TCollection_AsciiString(theArgs[1]) + "_" + "overlapped").ToCString(), aFaceCompound1);
-    DBRep::Set((TCollection_AsciiString(theArgs[2]) + "_" + "overlapped").ToCString(), aFaceCompound2);
+    theDI << aStr << " \n";
   }
 
+  DBRep::Set ((TCollection_AsciiString (theArgs[1]) + "_" + "overlapped").ToCString(), aFaceCompound1);
+  DBRep::Set ((TCollection_AsciiString (theArgs[2]) + "_" + "overlapped").ToCString(), aFaceCompound2);
+
   return 0;
 }
 
@@ -493,14 +445,12 @@ void BRepTest::ExtremaCommands (Draw_Interpretor& theCommands)
                    aGroup);
 
   theCommands.Add ("proximity",
-                   "proximity Shape1 Shape2 [-tol <value> | -value] [-profile]"
+                   "proximity Shape1 Shape2 [-tol <value>] [-profile]"
                    "\n\t\t: Searches for pairs of overlapping faces of the given shapes."
                    "\n\t\t: The options are:"
                    "\n\t\t:   -tol     : non-negative tolerance value used for overlapping"
                    "\n\t\t:              test (for zero tolerance, the strict intersection"
                    "\n\t\t:              test will be performed)"
-                   "\n\t\t:   -value   : compute the proximity value (minimal value which"
-                   "\n\t\t:              shows both shapes fully overlapped)"
                    "\n\t\t:   -profile : outputs execution time for main algorithm stages",
                    __FILE__,
                    ShapeProximity,

src/BRepTest/BRepTest_MatCommands.cxx

@@ -35,7 +35,6 @@
 #include <Bisector_BisecAna.hxx>
 #include <Precision.hxx>
 
-#include <BRepOffsetAPI_MakeOffset.hxx>
 #include <BRepMAT2d_Explorer.hxx>
 #include <BRepMAT2d_BisectingLocus.hxx>
 #include <BRepMAT2d_LinkTopoBilo.hxx>
@@ -45,7 +44,6 @@
 
 #include <DBRep.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
 
 #ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
@@ -72,16 +70,7 @@ static Standard_Integer topoload (Draw_Interpretor& , Standard_Integer argc, con
 
   if (C1.IsNull()) return 1;
 
-  TopoDS_Face aFace = TopoDS::Face(C1);
-  
-  if (argc >= 3 &&
-      (strcmp(argv[2], "-approx") == 0))
-  {
-    Standard_Real aTol = 0.1;
-    aFace = BRepOffsetAPI_MakeOffset::ConvertFace (aFace, aTol);
-  }
-
-  anExplo.Perform (aFace);
+  anExplo.Perform (TopoDS::Face(C1));
   return 0;
 }
 
@@ -278,7 +267,7 @@ void DrawCurve(const Handle(Geom2d_Curve)& aCurve,
 
 void BRepTest::MatCommands (Draw_Interpretor& theCommands)
 {
-  theCommands.Add("topoload","load face: topoload face [-approx]",__FILE__,topoload);
+  theCommands.Add("topoload","load face",__FILE__,topoload);
   theCommands.Add("drawcont","display current contour",__FILE__,drawcont);
   theCommands.Add("mat","computes the mat: mat [a/i [o]]",__FILE__,mat);
   theCommands.Add("side","side left/right",__FILE__,side);

src/BRepTools/BRepTools_GTrsfModification.cxx

@@ -308,15 +308,10 @@ Standard_Boolean BRepTools_GTrsfModification::NewTriangulation(const TopoDS_Face
   // modify normals
   if (theTriangulation->HasNormals())
   {
-    for (Standard_Integer anInd = 1; anInd <= theTriangulation->NbNodes(); ++anInd)
+    for (Standard_Integer anInd = 1; anInd <= theTriangulation->NbTriangles(); ++anInd)
     {
       gp_Dir aNormal = theTriangulation->Normal(anInd);
-      gp_Mat aMat = aGTrsf.VectorialPart();
-      aMat.SetDiagonal(1., 1., 1.);
-      gp_Trsf aTrsf;
-      aTrsf.SetForm(gp_Rotation);
-      (gp_Mat&)aTrsf.HVectorialPart() = aMat;
-      aNormal.Transform(aTrsf);
+      aNormal.Transform(aGTrsf.Trsf());
       theTriangulation->SetNormal(anInd, aNormal);
     }
   }

src/BSplCLib/BSplCLib_2.cxx

@@ -515,13 +515,8 @@ BSplCLib::EvalBsplineBasis
       //
       // this should be always invertible if ii is correctly computed 
       //
-      const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
-      if (Abs (aScale) < gp::Resolution())
-      {
-        return 2;
-      }
-
-      Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) / aScale;
+      Factor = (Parameter - FlatKnots(ii - qq + pp + 1)) 
+	/ (FlatKnots(ii + pp)   - FlatKnots(ii - qq + pp + 1)) ; 
       Saved = Factor *    BsplineBasis(1,pp) ;
       BsplineBasis(1,pp) *= (1.0e0 - Factor) ;
       BsplineBasis(1,pp) += BsplineBasis(1,qq) ;
@@ -541,13 +536,7 @@ BSplCLib::EvalBsplineBasis
     }
 
     for (pp = 1 ; pp <= qq - 1 ; pp++) {
-      const Standard_Real aScale = (FlatKnots(ii + pp) - FlatKnots(ii - qq + pp + 1));
-      if (Abs (aScale) < gp::Resolution())
-      {
-        return 2;
-      }
-
-      Inverse = 1.0e0 / aScale;
+      Inverse = 1.0e0 / (FlatKnots(ii + pp)  - FlatKnots(ii - qq + pp + 1)) ;
       Factor  =  (Parameter - FlatKnots(ii - qq + pp + 1)) * Inverse ;
       Saved = Factor *                 BsplineBasis(1,pp) ;
       BsplineBasis(1,pp) *= (1.0e0 - Factor) ;

src/BVH/BVH_Box.hxx

@@ -64,18 +64,19 @@ public:
   //! given transformation to this box.
   BVH_Box<T, 3> Transformed (const NCollection_Mat4<T>& theTransform) const
   {
-    const BVH_Box<T, 3> *aThis = static_cast<const BVH_Box<T, 3>*>(this);
+    BVH_Box<T, 3> aResultBox;
+
     if (theTransform.IsIdentity())
     {
-      return *aThis;
+      return aResultBox;
     }
 
+    const BVH_Box<T, 3> *aThis = static_cast<const BVH_Box<T, 3>*>(this);
     if (!aThis->IsValid())
     {
-      return *aThis;
+      return aResultBox;
     }
 
-    BVH_Box<T, 3> aResultBox;
     for (size_t aX = 0; aX <= 1; ++aX)
     {
       for (size_t aY = 0; aY <= 1; ++aY)

src/BVH/BVH_Tools.hxx

@@ -30,15 +30,6 @@ public: //! @name public types
 
   typedef typename BVH::VectorType<T, N>::Type BVH_VecNt;
 
-public:
-
-  enum BVH_PrjStateInTriangle
-  {
-    BVH_PrjStateInTriangle_VERTEX,
-    BVH_PrjStateInTriangle_EDGE,
-    BVH_PrjStateInTriangle_INNER
-  };
-
 public: //! @name Box-Box Square distance
 
   //! Computes Square distance between Axis aligned bounding boxes
@@ -122,14 +113,11 @@ public: //! @name Point-Box projection
 
 public: //! @name Point-Triangle Square distance
 
-  //! Find nearest point on a triangle for the given point
-  static BVH_VecNt PointTriangleProjection (const BVH_VecNt& thePoint,
-                                            const BVH_VecNt& theNode0,
-                                            const BVH_VecNt& theNode1,
-                                            const BVH_VecNt& theNode2,
-                                            BVH_PrjStateInTriangle* thePrjState = nullptr,
-                                            Standard_Integer* theNumberOfFirstNode = nullptr,
-                                            Standard_Integer* theNumberOfLastNode = nullptr)
+  //! Computes square distance between point and triangle
+  static T PointTriangleSquareDistance (const BVH_VecNt& thePoint,
+                                        const BVH_VecNt& theNode0,
+                                        const BVH_VecNt& theNode1,
+                                        const BVH_VecNt& theNode2)
   {
     const BVH_VecNt aAB = theNode1 - theNode0;
     const BVH_VecNt aAC = theNode2 - theNode0;
@@ -140,110 +128,68 @@ public: //! @name Point-Triangle Square distance
   
     if (aABdotAP <= 0. && aACdotAP <= 0.)
     {
-      if (thePrjState != nullptr)
-      {
-        *thePrjState = BVH_PrjStateInTriangle_VERTEX;
-        *theNumberOfFirstNode = 0;
-        *theNumberOfLastNode = 0;
-      }
-      return theNode0;
+      return aAP.Dot(aAP);
     }
-
+  
     const BVH_VecNt aBC = theNode2 - theNode1;
     const BVH_VecNt aBP = thePoint - theNode1;
-
-    T aBAdotBP = -(aAB.Dot (aBP));
-    T aBCdotBP = (aBC.Dot (aBP));
-
+  
+    T aBAdotBP = -(aAB.Dot(aBP));
+    T aBCdotBP =  (aBC.Dot(aBP));
+  
     if (aBAdotBP <= 0. && aBCdotBP <= 0.)
     {
-      if (thePrjState != nullptr)
-      {
-        *thePrjState = BVH_PrjStateInTriangle_VERTEX;
-        *theNumberOfFirstNode = 1;
-        *theNumberOfLastNode = 1;
-      }
-      return theNode1;
+      return (aBP.Dot(aBP));
     }
-
+  
     const BVH_VecNt aCP = thePoint - theNode2;
-
-    T aCBdotCP = -(aBC.Dot (aCP));
-    T aCAdotCP = -(aAC.Dot (aCP));
-
+  
+    T aCBdotCP = -(aBC.Dot(aCP));
+    T aCAdotCP = -(aAC.Dot(aCP));
+  
     if (aCAdotCP <= 0. && aCBdotCP <= 0.)
     {
-      if (thePrjState != nullptr)
-      {
-        *thePrjState = BVH_PrjStateInTriangle_VERTEX;
-        *theNumberOfFirstNode = 2;
-        *theNumberOfLastNode = 2;
-      }
-      return theNode2;
+      return (aCP.Dot(aCP));
     }
-
-    T aACdotBP = (aAC.Dot (aBP));
-
+  
+    T aACdotBP = (aAC.Dot(aBP));
+  
     T aVC = aABdotAP * aACdotBP + aBAdotBP * aACdotAP;
-
+  
     if (aVC <= 0. && aABdotAP > 0. && aBAdotBP > 0.)
     {
-      if (thePrjState != nullptr)
-      {
-        *thePrjState = BVH_PrjStateInTriangle_EDGE;
-        *theNumberOfFirstNode = 0;
-        *theNumberOfLastNode = 1;
-      }
-      return theNode0 + aAB * (aABdotAP / (aABdotAP + aBAdotBP));
+      const BVH_VecNt aDirect = aAP - aAB * (aABdotAP / (aABdotAP + aBAdotBP));
+  
+      return (aDirect.Dot(aDirect));
     }
-
-    T aABdotCP = (aAB.Dot (aCP));
-
+  
+    T aABdotCP = (aAB.Dot(aCP));
+  
     T aVA = aBAdotBP * aCAdotCP - aABdotCP * aACdotBP;
-
+  
     if (aVA <= 0. && aBCdotBP > 0. && aCBdotCP > 0.)
     {
-      if (thePrjState != nullptr)
-      {
-        *thePrjState = BVH_PrjStateInTriangle_EDGE;
-        *theNumberOfFirstNode = 1;
-        *theNumberOfLastNode = 2;
-      }
-      return theNode1 + aBC * (aBCdotBP / (aBCdotBP + aCBdotCP));
+      const BVH_VecNt aDirect = aBP - aBC * (aBCdotBP / (aBCdotBP + aCBdotCP));
+  
+      return (aDirect.Dot(aDirect));
     }
-
+  
     T aVB = aABdotCP * aACdotAP + aABdotAP * aCAdotCP;
-
+  
     if (aVB <= 0. && aACdotAP > 0. && aCAdotCP > 0.)
     {
-      if (thePrjState != nullptr)
-      {
-        *thePrjState = BVH_PrjStateInTriangle_EDGE;
-        *theNumberOfFirstNode = 2;
-        *theNumberOfLastNode = 0;
-      }
-      return theNode0 + aAC * (aACdotAP / (aACdotAP + aCAdotCP));
+      const BVH_VecNt aDirect = aAP - aAC * (aACdotAP / (aACdotAP + aCAdotCP));
+  
+      return (aDirect.Dot(aDirect));
     }
-
+  
     T aNorm = aVA + aVB + aVC;
-
-    if (thePrjState != nullptr)
-    {
-      *thePrjState = BVH_PrjStateInTriangle_INNER;
-    }
-
-    return (theNode0 * aVA + theNode1 * aVB + theNode2 * aVC) / aNorm;
-  }
-
-  //! Computes square distance between point and triangle
-  static T PointTriangleSquareDistance (const BVH_VecNt& thePoint,
-                                        const BVH_VecNt& theNode0,
-                                        const BVH_VecNt& theNode1,
-                                        const BVH_VecNt& theNode2)
-  {
-    const BVH_VecNt aProj = PointTriangleProjection(thePoint, theNode0, theNode1, theNode2);
-    const BVH_VecNt aPP = aProj - thePoint;
-    return aPP.Dot(aPP);
+  
+    const BVH_VecNt& aDirect = thePoint - (theNode0 * aVA +
+                                           theNode1 * aVB +
+                                           theNode2 * aVC) / aNorm;
+  
+    return (aDirect.Dot(aDirect));
   }
 
 public: //! @name Ray-Box Intersection

src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx

@@ -33,7 +33,6 @@
 #include <Storage_Schema.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
-#include <TDataStd_TreeNode.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
@@ -325,16 +324,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
   // read sub-tree of the root label
   if (!theFilter.IsNull())
     theFilter->StartIteration();
-  const auto aStreamStartPosition = theIStream.tellg();
-  Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, Standard_False, aPS.Next());
-  if (!myUnresolvedLinks.IsEmpty())
-  {
-    // In case we have skipped some linked TreeNodes before getting to
-    // their children.
-    theFilter->StartIteration();
-    theIStream.seekg(aStreamStartPosition, std::ios_base::beg);
-    nbRead += ReadSubTree(theIStream, aData->Root(), theFilter, aQuickPart, Standard_True, aPS.Next());
-  }
+  Standard_Integer nbRead = ReadSubTree (theIStream, aData->Root(), theFilter, aQuickPart, aPS.Next());
   if (!aPS.More()) 
   {
     myReaderStatus = PCDM_RS_UserBreak;
@@ -383,7 +373,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
   const TDF_Label& theLabel,
   const Handle(PCDM_ReaderFilter)& theFilter,
   const Standard_Boolean& theQuickPart,
-  const Standard_Boolean theReadMissing,
   const Message_ProgressRange& theRange)
 {
   Standard_Integer nbRead = 0;
@@ -404,7 +393,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     aLabelSize = InverseUint64(aLabelSize);
 #endif
     // no one sub-label is needed, so, skip everything
-    if (aSkipAttrs && !theFilter->IsSubPassed() && myUnresolvedLinks.IsEmpty())
+    if (aSkipAttrs && !theFilter->IsSubPassed())
     {
       aLabelSize -= sizeof (uint64_t);
       theIS.seekg (aLabelSize, std::ios_base::cur);
@@ -414,11 +403,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     }
   }
 
-  if (theReadMissing)
-  {
-    aSkipAttrs = Standard_True;
-  }
-  const auto anAttStartPosition = theIS.tellg();
   // Read attributes:
   for (theIS >> myPAtt;
     theIS && myPAtt.TypeId() > 0 &&             // not an end marker ?
@@ -431,12 +415,6 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
       myReaderStatus = PCDM_RS_UserBreak;
       return -1;
     }
-    if (myUnresolvedLinks.Remove(myPAtt.Id()) && aSkipAttrs)
-    {
-      aSkipAttrs = Standard_False;
-      theIS.seekg(anAttStartPosition, std::ios_base::beg);
-      continue;
-    }
     if (aSkipAttrs)
     {
       if (myPAtt.IsDirect()) // skip direct written stream
@@ -509,17 +487,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
           aDriver->TypeName(), Message_Warning);
       }
       else if (!isBound)
-      {
         myRelocTable.Bind(anID, tAtt);
-        Handle(TDataStd_TreeNode) aNode = Handle(TDataStd_TreeNode)::DownCast(tAtt);
-        if (!theFilter.IsNull() && !aNode.IsNull() && !aNode->Father().IsNull() && aNode->Father()->IsNew())
-        {
-          Standard_Integer anUnresolvedLink;
-          myPAtt.SetPosition(BP_HEADSIZE);
-          myPAtt >> anUnresolvedLink;
-          myUnresolvedLinks.Add(anUnresolvedLink);
-        }
-      }
     }
     else if (!myMapUnsupported.Contains(myPAtt.TypeId()))
       myMsgDriver->Send(aMethStr + "warning: type ID not registered in header: "
@@ -554,7 +522,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
     // read sub-tree
     if (!theFilter.IsNull())
       theFilter->Down (aTag);
-    Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, theReadMissing, aPS.Next());
+    Standard_Integer nbSubRead = ReadSubTree (theIS, aLab, theFilter, theQuickPart, aPS.Next());
     // check for error
     if (nbSubRead == -1)
       return -1;

src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx

@@ -80,7 +80,6 @@ protected:
      const TDF_Label& theData, 
      const Handle(PCDM_ReaderFilter)& theFilter,
      const Standard_Boolean& theQuickPart,
-     const Standard_Boolean theReadMissing,
      const Message_ProgressRange& theRanges = Message_ProgressRange());
   
   
@@ -126,7 +125,6 @@ private:
   BinObjMgt_Persistent myPAtt;
   TColStd_MapOfInteger myMapUnsupported;
   BinLDrivers_VectorOfDocumentSection mySections;
-  NCollection_Map<Standard_Integer> myUnresolvedLinks;
 
 
 };

src/BndLib/BndLib.cxx

@@ -1221,105 +1221,6 @@ static void ComputeSphere (const gp_Sphere& Sphere,
   }
 }
 
-//=======================================================================
-//function : computeDegeneratedTorus
-//purpose  : compute bounding box for degenerated torus
-//=======================================================================
-
-static void computeDegeneratedTorus (const gp_Torus& theTorus, 
-                           const Standard_Real theUMin, const Standard_Real theUMax, 
-                           const Standard_Real theVMin, const Standard_Real theVMax, 
-                           Bnd_Box& theB)
-{
-  gp_Pnt aP = theTorus.Location();
-  Standard_Real aRa = theTorus.MajorRadius();
-  Standard_Real aRi = theTorus.MinorRadius();
-  Standard_Real aXmin,anYmin,aZmin,aXmax,anYmax,aZmax;
-  aXmin = aP.X() - aRa - aRi;
-  aXmax = aP.X() + aRa + aRi;
-  anYmin = aP.Y() - aRa - aRi;
-  anYmax = aP.Y() + aRa + aRi;
-  aZmin = aP.Z() - aRi;
-  aZmax = aP.Z() + aRi;
-
-  Standard_Real aPhi = ACos (-aRa / aRi);
-  
-  Standard_Real anUper = 2. * M_PI - Precision::PConfusion();
-  Standard_Real aVper = 2. * aPhi - Precision::PConfusion();
-  if (theUMax - theUMin >= anUper && theVMax - theVMin >= aVper)
-  {
-    // a whole torus
-    theB.Update(aXmin, anYmin, aZmin, aXmax, anYmax, aZmax);
-    return;
-  }
-  
-  Standard_Real anU,aV;
-  Standard_Real anUmax = theUMin + 2. * M_PI;
-  const gp_Ax3& aPos = theTorus.Position();
-  gp_Pnt aPExt = aP;
-  aPExt.SetX(aXmin);
-  ElSLib::TorusParameters(aPos,aRa,aRi,aPExt,anU,aV);
-  anU = ElCLib::InPeriod(anU,theUMin,anUmax);
-  if(anU >= theUMin && anU <= theUMax && aV >= theVMin && aV <= theVMax)
-  {
-    theB.Add(aPExt);
-  }
-  //
-  aPExt.SetX(aXmax);
-  ElSLib::TorusParameters(aPos,aRa,aRi,aPExt,anU,aV);
-  anU = ElCLib::InPeriod(anU,theUMin,anUmax);
-  if(anU >= theUMin && anU <= theUMax && aV >= theVMin && aV <= theVMax)
-  {
-    theB.Add(aPExt);
-  }
-  aPExt.SetX(aP.X());
-  //
-  aPExt.SetY(anYmin);
-  ElSLib::TorusParameters(aPos,aRa,aRi,aPExt,anU,aV);
-  anU = ElCLib::InPeriod(anU,theUMin,anUmax);
-  if(anU >= theUMin && anU <= theUMax && aV >= theVMin && aV <= theVMax)
-  {
-    theB.Add(aPExt);
-  }
-  //
-  aPExt.SetY(anYmax);
-  ElSLib::TorusParameters(aPos,aRa,aRi,aPExt,anU,aV);
-  anU = ElCLib::InPeriod(anU,theUMin,anUmax);
-  if(anU >= theUMin && anU <= theUMax && aV >= theVMin && aV <= theVMax)
-  {
-    theB.Add(aPExt);
-  }
-  aPExt.SetY(aP.Y());
-  //
-  aPExt.SetZ(aZmin);
-  ElSLib::TorusParameters(aPos,aRa,aRi,aPExt,anU,aV);
-  anU = ElCLib::InPeriod(anU,theUMin,anUmax);
-  if(anU >= theUMin && anU <= theUMax && aV >= theVMin && aV <= theVMax)
-  {
-    theB.Add(aPExt);
-  }
-  //
-  aPExt.SetZ(aZmax);
-  ElSLib::TorusParameters(aPos,aRa,aRi,aPExt,anU,aV);
-  anU = ElCLib::InPeriod(anU,theUMin,anUmax);
-  if(anU >= theUMin && anU <= theUMax && aV >= theVMin && aV <= theVMax)
-  {
-    theB.Add(aPExt);
-  }
-  //
-  // Add boundaries of patch
-  // UMin, UMax
-  gp_Circ aC = ElSLib::TorusUIso(aPos,aRa,aRi,theUMin);
-  BndLib::Add(aC,theVMin,theVMax,0.,theB);
-  aC = ElSLib::TorusUIso(aPos,aRa,aRi,theUMax);
-  BndLib::Add(aC,theVMin,theVMax,0.,theB);
-  // VMin, VMax
-  aC = ElSLib::TorusVIso(aPos,aRa,aRi,theVMin);
-  BndLib::Add(aC,theUMin,theUMax,0.,theB);
-  aC = ElSLib::TorusVIso(aPos,aRa,aRi,theVMax);
-  BndLib::Add(aC,theUMin,theUMax,0.,theB);
-}
-
 void BndLib::Add(const gp_Sphere& S,const Standard_Real UMin,
                  const Standard_Real UMax,const Standard_Real VMin,
                  const Standard_Real VMax,const Standard_Real Tol, Bnd_Box& B) 
@@ -1364,13 +1265,6 @@ void BndLib::Add(const gp_Torus& S,const Standard_Real UMin,
 
   if (Fi2<Fi1) return;
 
-  if (Ra<Ri)
-  {
-    computeDegeneratedTorus(S,UMin,UMax,VMin,VMax,B);
-    B.Enlarge(Tol);
-    return;
-  }
-
 #define SC 0.71
 #define addP0    (Compute(UMin,UMax,Ra+Ri,Ra+Ri,gp_Pnt(S.XAxis().Direction().XYZ()),gp_Pnt(S.YAxis().Direction().XYZ()),S.Location(),B))
 #define addP1    (Compute(UMin,UMax,Ra+Ri*SC,Ra+Ri*SC,gp_Pnt(S.XAxis().Direction().XYZ()),gp_Pnt(S.YAxis().Direction().XYZ()),gp_Pnt(S.Location().XYZ()+(Ri*SC)*S.Axis().Direction().XYZ()),B))

src/DE/DE_ConfigurationNode.cxx

@@ -88,11 +88,8 @@ bool DE_ConfigurationNode::Save(const TCollection_AsciiString& theResourcePath)
 // function : UpdateLoad
 // purpose  :
 //=======================================================================
-bool DE_ConfigurationNode::UpdateLoad(const Standard_Boolean theToImport,
-                                      const Standard_Boolean theToKeep)
+bool DE_ConfigurationNode::UpdateLoad()
 {
-  (void)theToImport;
-  (void)theToKeep;
   return true;
 }
 

src/DE/DE_ConfigurationNode.hxx

@@ -85,12 +85,9 @@ public:
   //! @return new object with the same field values
   Standard_EXPORT virtual Handle(DE_ConfigurationNode) Copy() const = 0;
 
-  //! Update loading status. Checking for the ability to read and write.
-  //! @param[in] theToImport flag to updates for import. Standard_True-import, Standard_False-export
-  //! @param[in] theToKeep flag to save update result
+  //! Update loading status. Checking for the license.
   //! @return Standard_True, if node can be used
-  Standard_EXPORT virtual bool UpdateLoad(const Standard_Boolean theToImport,
-                                          const Standard_Boolean theToKeep);
+  Standard_EXPORT virtual bool UpdateLoad();
 
 public:
 

src/DE/DE_Wrapper.cxx

@@ -34,9 +34,6 @@ namespace
     static const TCollection_AsciiString aScope ("global");
     return aScope;
   }
-
-  //! Global configuration of current DE Session
-  static Handle(DE_Wrapper) THE_GLOBAL_CONFIGURATION;
 }
 
 //=======================================================================
@@ -44,7 +41,6 @@ namespace
 // purpose  :
 //=======================================================================
 DE_Wrapper::DE_Wrapper()
-  :myKeepUpdates(Standard_False)
 {}
 
 //=======================================================================
@@ -68,7 +64,6 @@ DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
       Bind(aVendorIter.Value());
     }
   }
-  theWrapper->myKeepUpdates = myKeepUpdates;
 }
 
 //=======================================================================
@@ -77,23 +72,8 @@ DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
 //=======================================================================
 Handle(DE_Wrapper) DE_Wrapper::GlobalWrapper()
 {
-  if (THE_GLOBAL_CONFIGURATION.IsNull())
-  {
-    THE_GLOBAL_CONFIGURATION = new DE_Wrapper();
-  }
-  return THE_GLOBAL_CONFIGURATION;
-}
-
-//=======================================================================
-// function : SetGlobalWrapper
-// purpose  :
-//=======================================================================
-void DE_Wrapper::SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper)
-{
-  if (!theWrapper.IsNull())
-  {
-    THE_GLOBAL_CONFIGURATION = theWrapper;
-  }
+  static const Handle(DE_Wrapper)& aConfiguration = new DE_Wrapper();
+  return aConfiguration;
 }
 
 //=======================================================================
@@ -101,7 +81,7 @@ void DE_Wrapper::SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper)
 // purpose  :
 //=======================================================================
 Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
-                                  const Handle(TDocStd_Document)& theDocument,
+                                  Handle(TDocStd_Document)& theDocument,
                                   Handle(XSControl_WorkSession)& theWS,
                                   const Message_ProgressRange& theProgress)
 {
@@ -114,7 +94,7 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
     return Read(thePath, theDocument, theProgress);
   }
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_True, aProvider))
+  if (!findProvider(thePath, Standard_True, aProvider))
   {
     return Standard_False;
   }
@@ -139,7 +119,7 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
     return Write(thePath, theDocument, theProgress);
   }
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_False, aProvider))
+  if (!findProvider(thePath, Standard_False, aProvider))
   {
     return Standard_False;
   }
@@ -151,7 +131,7 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
 // purpose  :
 //=======================================================================
 Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
-                                  const Handle(TDocStd_Document)& theDocument,
+                                  Handle(TDocStd_Document)& theDocument,
                                   const Message_ProgressRange& theProgress)
 {
   if (theDocument.IsNull())
@@ -159,7 +139,7 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
     return Standard_False;
   }
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_True, aProvider))
+  if (!findProvider(thePath, Standard_True, aProvider))
   {
     return Standard_False;
   }
@@ -179,7 +159,7 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
     return Standard_False;
   }
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_False, aProvider))
+  if (!findProvider(thePath, Standard_False, aProvider))
   {
     return Standard_False;
   }
@@ -200,7 +180,7 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
     return Read(thePath, theShape, theProgress);
   }
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_True, aProvider))
+  if (!findProvider(thePath, Standard_True, aProvider))
   {
     return Standard_False;
   }
@@ -221,7 +201,7 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
     return Write(thePath, theShape, theProgress);
   }
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_False, aProvider))
+  if (!findProvider(thePath, Standard_False, aProvider))
   {
     return Standard_False;
   }
@@ -238,7 +218,7 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
 {
 
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_True, aProvider))
+  if (!findProvider(thePath, Standard_True, aProvider))
   {
     return Standard_False;
   }
@@ -254,7 +234,7 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
                                    const Message_ProgressRange& theProgress)
 {
   Handle(DE_Provider) aProvider;
-  if (!FindProvider(thePath, Standard_False, aProvider))
+  if (!findProvider(thePath, Standard_False, aProvider))
   {
     return Standard_False;
   }
@@ -447,6 +427,7 @@ void DE_Wrapper::ChangePriority(const TCollection_AsciiString& theFormat,
     if (aVendorMap.FindFromKey(aVendorName, aNode))
     {
       aNode->SetEnabled(Standard_True);
+      aNode->UpdateLoad();
       aNewVendorMap.Add(aVendorName, aNode);
     }
   }
@@ -501,10 +482,10 @@ Handle(DE_Wrapper) DE_Wrapper::Copy() const
 }
 
 //=======================================================================
-// function : FindProvider
+// function : findProvider
 // purpose  :
 //=======================================================================
-Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath,
+Standard_Boolean DE_Wrapper::findProvider(const TCollection_AsciiString& thePath,
                                           const Standard_Boolean theToImport,
                                           Handle(DE_Provider)& theProvider) const
 {
@@ -533,11 +514,11 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
           ((theToImport && aNode->IsImportSupported()) ||
           (!theToImport && aNode->IsExportSupported())) &&
           (aNode->CheckExtension(anExtr) ||
-          (theToImport && aNode->CheckContent(aBuffer))) &&
-          aNode->UpdateLoad(theToImport, myKeepUpdates))
+          (theToImport && aNode->CheckContent(aBuffer))))
       {
         theProvider = aNode->BuildProvider();
         aNode->GlobalParameters = GlobalParameters;
+        theProvider->SetNode(aNode);
         return Standard_True;
       }
     }
@@ -545,28 +526,6 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
   return Standard_False;
 }
 
-//=======================================================================
-// function : ReLoadNodes
-// purpose  :
-//=======================================================================
-Standard_EXPORT void DE_Wrapper::UpdateLoad(const Standard_Boolean theToForceUpdate) const
-{
-  for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration);
-       aFormatIter.More(); aFormatIter.Next())
-  {
-    for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value());
-         aVendorIter.More(); aVendorIter.Next())
-    {
-      const Handle(DE_ConfigurationNode)& aNode = aVendorIter.Value();
-      aNode->UpdateLoad(Standard_True, Standard_True);
-      aNode->UpdateLoad(Standard_False, Standard_True);
-      if (!theToForceUpdate)
-        continue;
-      aNode->SetEnabled(aNode->IsExportSupported() || aNode->IsImportSupported());
-    }
-  }
-}
-
 //=======================================================================
 // function : sort
 // purpose  :

src/DE/DE_Wrapper.hxx

@@ -61,15 +61,10 @@ public:
   //! @param[in] theWrapper object to copy
   Standard_EXPORT DE_Wrapper(const Handle(DE_Wrapper)& theWrapper);
 
-  //! Gets global configuration singleton.
-  //! If wrapper is not set, create it by default as base class object.
+  //! Gets global configuration singleton
   //! @return point to global configuration
   Standard_EXPORT static Handle(DE_Wrapper) GlobalWrapper();
 
-  //! Sets global configuration singleton
-  //! @param[in] theWrapper object to set as global configuration
-  Standard_EXPORT static void SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper);
-
 public:
 
   //! Reads a CAD file, according internal configuration
@@ -79,7 +74,7 @@ public:
   //! @param theProgress[in] progress indicator
   //! @return true if Read operation has ended correctly
   Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath,
-                                        const Handle(TDocStd_Document)& theDocument,
+                                        Handle(TDocStd_Document)& theDocument,
                                         Handle(XSControl_WorkSession)& theWS,
                                         const Message_ProgressRange& theProgress = Message_ProgressRange());
 
@@ -100,7 +95,7 @@ public:
   //! @param theProgress[in] progress indicator
   //! @return true if Read operation has ended correctly
   Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath,
-                                        const Handle(TDocStd_Document)& theDocument,
+                                        Handle(TDocStd_Document)& theDocument,
                                         const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Writes a CAD file, according internal configuration
@@ -216,33 +211,13 @@ public:
   Standard_EXPORT void ChangePriority(const TColStd_ListOfAsciiString& theVendorPriority,
                                       const Standard_Boolean theToDisable = Standard_False);
 
-  //! Find available provider from the configuration.
-  //! If there are several providers, choose the one with the highest priority.
-  //! @param[in] thePath path to the CAD file
-  //! @param[in] theToImport flag to finds for import. Standard_True-import, Standard_False-export
-  //! @param[out] theProvider created new provider
-  //! @return Standard_True if provider found and created
-  Standard_EXPORT virtual Standard_Boolean FindProvider(const TCollection_AsciiString& thePath,
-                                                        const Standard_Boolean theToImport,
-                                                        Handle(DE_Provider)& theProvider) const;
-
-  //! Updates all registered nodes, save all result.
-  //! @param[in] theToForceUpdate flag to turn on/of nodes according opportunity to transfer
-  Standard_EXPORT void UpdateLoad(const Standard_Boolean theToForceUpdate = Standard_False) const;
-
-  //! Gets flag to save updates operation while transfer checks
-  Standard_Boolean KeepUpdates() const { return myKeepUpdates; }
-
-  //! Sets flag to save updates operation while transfer checks
-  void SetKeepUpdates(const Standard_Boolean theToKeepUpdates) { myKeepUpdates = theToKeepUpdates; }
-
   //! Gets format map, contains vendor map with nodes
   //! @return internal map of formats
   Standard_EXPORT const DE_ConfigurationFormatMap& Nodes() const;
 
   //! Copies values of all fields
   //! @return new object with the same field values
-  Standard_EXPORT virtual Handle(DE_Wrapper) Copy() const;
+  Standard_EXPORT Handle(DE_Wrapper) Copy() const;
 
 protected:
 
@@ -252,13 +227,22 @@ protected:
   //! @param[in] theResource resource to get priority
   void sort(const Handle(DE_ConfigurationContext)& theResource);
 
+  //! Find available provider from the configuration.
+  //! If there are several providers, choose the one with the highest priority.
+  //! @param[in] thePath path to the CAD file
+  //! @param[in] theToImport flag to finds for import. Standard_True-import, Standard_False-export
+  //! @param[out] theProvider created new provider
+  //! @return Standard_True if provider found and created
+  Standard_Boolean findProvider(const TCollection_AsciiString& thePath,
+                                const Standard_Boolean theToImport,
+                                Handle(DE_Provider)& theProvider) const;
+
 public:
 
   DE_ConfigurationNode::DE_SectionGlobal GlobalParameters; //!< Internal parameters for the all translators
 
 private:
 
-  Standard_Boolean myKeepUpdates; //!< Flag to save updates operation while transfer checks
   DE_ConfigurationFormatMap myConfiguration; //!< Internal map of formats
 };
 

src/DEBRepCascade/DEBRepCascade_ConfigurationNode.cxx

@@ -34,7 +34,9 @@ namespace
 //=======================================================================
 DEBRepCascade_ConfigurationNode::DEBRepCascade_ConfigurationNode() :
   DE_ConfigurationNode()
-{}
+{
+  UpdateLoad();
+}
 
 //=======================================================================
 // function : DEBRepCascade_ConfigurationNode
@@ -44,6 +46,7 @@ DEBRepCascade_ConfigurationNode::DEBRepCascade_ConfigurationNode(const Handle(DE
   :DE_ConfigurationNode(theNode)
 {
   InternalParameters = theNode->InternalParameters;
+  UpdateLoad();
 }
 
 //=======================================================================

src/DEXCAFCascade/DEXCAFCascade_ConfigurationNode.cxx

@@ -34,7 +34,9 @@ namespace
 //=======================================================================
 DEXCAFCascade_ConfigurationNode::DEXCAFCascade_ConfigurationNode() :
   DE_ConfigurationNode()
-{}
+{
+  UpdateLoad();
+}
 
 //=======================================================================
 // function : DEXCAFCascade_ConfigurationNode
@@ -44,6 +46,7 @@ DEXCAFCascade_ConfigurationNode::DEXCAFCascade_ConfigurationNode(const Handle(DE
   :DE_ConfigurationNode(theNode)
 {
   InternalParameters = theNode->InternalParameters;
+  UpdateLoad();
 }
 
 //=======================================================================
@@ -125,7 +128,7 @@ Handle(DE_ConfigurationNode) DEXCAFCascade_ConfigurationNode::Copy() const
 //=======================================================================
 Handle(DE_Provider) DEXCAFCascade_ConfigurationNode::BuildProvider()
 {
-  return new DEXCAFCascade_Provider (this);
+  return new DEXCAFCascade_Provider();
 }
 
 //=======================================================================

src/ExpToCasExe/CMakeLists.txt

@@ -1,5 +0,0 @@
-project(ExpToCasExe)
-
-set (EXECUTABLE_PROJECT ON)
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
-unset (EXECUTABLE_PROJECT)

src/ExpToCasExe/EXTERNLIB

@@ -1,2 +0,0 @@
-TKernel
-TKExpress

src/ExpToCasExe/ExpToCasExe.cxx

@@ -1,395 +0,0 @@
-// Created:	Mon Nov  1 12:50:27 1999
-// Author:	Andrey BETENEV
-// Copyright (c) 1999-2020 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.
-
-#include <cstring>
-#include <Express_Item.hxx>
-#include <Express_Schema.hxx>
-#include <Message.hxx>
-#include <OSD_File.hxx>
-#include <OSD_FileSystem.hxx>
-#include <OSD_OpenFile.hxx>
-#include <TCollection_HAsciiString.hxx>
-#include "exptocas.tab.hxx"
-
-//=======================================================================
-// function : GetSchema
-// purpose  : interface to parser
-//=======================================================================
-Handle(Express_Schema) GetSchema (const char* theFileName)
-{
-  std::ifstream aFileStream;
-  OSD_OpenStream(aFileStream, theFileName, std::ios_base::in | std::ios_base::binary);
-  exptocas::scanner aScanner(&aFileStream);
-  aScanner.yyrestart(&aFileStream);
-  // uncomment next string for debug of parser
-  //aScanner.set_debug(1);
-  exptocas::parser aParser(&aScanner);
-  aParser.parse();
-  return Express::Schema();
-}
-
-//=======================================================================
-// function : LoadList
-// purpose  : Load list of (class name, package name) from the file
-//            Package names and optional mark flag are set to items in the schema
-//=======================================================================
-static Standard_Boolean LoadList (const char *theFileName,
-                                  const Handle(Express_Schema)& theSchema,
-                                  const Standard_Boolean theMark)
-{
-  const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
-  std::shared_ptr<std::istream> aStreamPtr = aFileSystem->OpenIStream (theFileName, std::ios::in);
-  Standard_IStream& anIS = *aStreamPtr;
-
-  if (aStreamPtr == nullptr)
-  {
-    Message::SendFail() << "Error: cannot open " << theFileName;
-    return Standard_False;
-  }
-
-  Message::SendInfo() << "Loading " << theFileName << "...";
-  char aBuf[512];
-  Standard_Integer aLineNum = 0;
-  // a line entry in file has the next format:
-  // item_name package_name [shortname [check_flag(0 or 1) [fillshared_flag(0 or 1) [category]]]]
-  while (anIS.getline (aBuf, 512))
-  {
-    char* aCurPos = aBuf;
-    char* anItemName;
-    char* aPackageName;
-    char* aShortName;
-    char* aCheckFlag;
-    char* aFillSharedFlag;
-    char* aCategoryName;
-    Standard_Size aSepIdx = 0;
-    aLineNum += 1;
-    // -------------------------------------------------------------
-    // first word is an item name
-    // -------------------------------------------------------------
-    // skip any whitespace character in the line
-    while (*aCurPos && (aSepIdx = strcspn (aCurPos, " \t\r\n")) == 0)
-    {
-      aCurPos++;
-    }
-    // to next line if first word isn't found or comment started
-    if (*aCurPos == '\0' || *aCurPos == '#')
-    {
-      continue;
-    }
-    // get the name of the item
-    anItemName = aCurPos;
-    // shift the position
-    if (aCurPos[aSepIdx] == '\0')
-    {
-      aCurPos += aSepIdx;
-    }
-    else
-    {
-      aCurPos[aSepIdx] = '\0';
-      aCurPos += aSepIdx + 1;
-    }
-    Handle(Express_Item) anItem = theSchema->Item (anItemName, Standard_True);
-    // skip any class name not in schema
-    if (anItem.IsNull())
-    {
-      continue;
-    }
-    // -------------------------------------------------------------
-    // second word is a package name
-    // -------------------------------------------------------------
-    // skip any whitespace character in the rest of the line
-    while (*aCurPos && (aSepIdx = strcspn (aCurPos, " \t\r\n")) == 0)
-    {
-      aCurPos++;
-    }
-    // to next line if second word isn't found or comment started
-    if (*aCurPos == '\0' || *aCurPos == '#')
-    {
-      continue;
-    }
-    // get the name of the package
-    aPackageName = aCurPos;
-    // shift the position
-    if (aCurPos[aSepIdx] == '\0')
-    {
-      aCurPos += aSepIdx;
-    }
-    else
-    {
-      aCurPos[aSepIdx] = '\0';
-      aCurPos += aSepIdx + 1;
-    }
-    // make warning if there is another package for the item
-    if (anItem->IsPackageNameSet() && anItem->GetPackageName().IsDifferent (aPackageName))
-    {
-      Message::SendWarning() << "Warning: Package is redefined for item " << anItemName;
-    }
-    anItem->SetPackageName (aPackageName);
-    anItem->SetGenMode (theMark ? Express_Item::GM_GenByUser : Express_Item::GM_NoGen);
-    // -------------------------------------------------------------
-    // third word is an item short name (optional)
-    // -------------------------------------------------------------
-    // skip any whitespace character in the line
-    while (*aCurPos && (aSepIdx = strcspn (aCurPos, " \t\r\n")) == 0)
-    {
-      aCurPos++;
-    }
-    // to next line if third word isn't found or comment started
-    if (*aCurPos == '\0' || *aCurPos == '#')
-    {
-      continue;
-    }
-    // get the short name
-    aShortName = aCurPos;
-    // shift the position
-    if (aCurPos[aSepIdx] == '\0')
-    {
-      aCurPos += aSepIdx;
-    }
-    else
-    {
-      aCurPos[aSepIdx] = '\0';
-      aCurPos += aSepIdx + 1;
-    }
-    if (!std::isalpha (*aShortName))
-    {
-      Message::SendWarning() << "Warning: Not recognized a shortname at the line " << aLineNum;
-      continue;
-    }
-    // if short name "-" then just do not set it
-    if (*aShortName != '-')
-    {
-      Handle(TCollection_HAsciiString) anItemShortName = new TCollection_HAsciiString(aShortName);
-      if (anItemShortName->Length() > 0)
-      {
-        anItem->SetShortName (anItemShortName);
-      }
-    }
-    // -------------------------------------------------------------
-    // fourth word is an item check flag (optional)
-    // -------------------------------------------------------------
-    // skip any whitespace character in the line
-    while (*aCurPos && (aSepIdx = strcspn (aCurPos, " \t\r\n")) == 0)
-    {
-      aCurPos++;
-    }
-    // to next line if fourth word isn't found or comment started
-    if (*aCurPos == '\0' || *aCurPos == '#')
-    {
-      continue;
-    }
-    // get the check flag
-    aCheckFlag = aCurPos;
-    // shift the position
-    if (aCurPos[aSepIdx] == '\0')
-    {
-      aCurPos += aSepIdx;
-    }
-    else
-    {
-      aCurPos[aSepIdx] = '\0';
-      aCurPos += aSepIdx + 1;
-    }
-    if (!(*aCheckFlag == '0' || *aCheckFlag == '1'))
-    {
-      Message::SendWarning() << "Warning: Not recognized a check flag at the line " << aLineNum;
-      continue;
-    }
-    Standard_Boolean hasCheck = (*aCheckFlag == '0' ? Standard_False : Standard_True);
-    anItem->SetCheckFlag (hasCheck);
-    // -------------------------------------------------------------
-    // fifth word is an item fill share flag (optional)
-    // -------------------------------------------------------------
-    // skip any whitespace character in the line
-    while (*aCurPos && (aSepIdx = strcspn (aCurPos, " \t\r\n")) == 0)
-    {
-      aCurPos++;
-    }
-    // to next line if fifth word isn't found or comment started
-    if (*aCurPos == '\0' || *aCurPos == '#')
-    {
-      continue;
-    }
-    // get the fill share flag
-    aFillSharedFlag = aCurPos;
-    // shift the position
-    if (aCurPos[aSepIdx] == '\0')
-    {
-      aCurPos += aSepIdx;
-    }
-    else
-    {
-      aCurPos[aSepIdx] = '\0';
-      aCurPos += aSepIdx + 1;
-    }
-    if (!(*aFillSharedFlag == '0' || *aFillSharedFlag == '1'))
-    {
-      Message::SendWarning() << "Warning: Not recognized a fill shared flag at the line " << aLineNum;
-      continue;
-    }
-    Standard_Boolean hasFillShared = (*aFillSharedFlag == '0' ? Standard_False : Standard_True);
-    anItem->SetFillSharedFlag (hasFillShared);
-    // -------------------------------------------------------------
-    // sixth word is an item category name (optional)
-    // -------------------------------------------------------------
-    // skip any whitespace character in the line
-    while (*aCurPos && (aSepIdx = strcspn (aCurPos, " \t\r\n")) == 0)
-    {
-      aCurPos++;
-    }
-    // to next line if sixth word isn't found or comment started
-    if (*aCurPos == '\0' || *aCurPos == '#')
-    {
-      continue;
-    }
-    // get the category name
-    aCategoryName = aCurPos;
-    aCurPos[aSepIdx] = '\0';
-    if (!std::isalpha (*aCategoryName))
-    {
-      Message::SendWarning() << "Warning: Not recognized a category name at the line " << aLineNum;
-      continue;
-    }
-    // if category name "-" then just do not set it
-    if (*aCategoryName != '-')
-    {
-      Handle(TCollection_HAsciiString) anItemCategoryName = new TCollection_HAsciiString(aCategoryName);
-      if (anItemCategoryName->Length() > 0)
-      {
-        anItem->SetShortName (anItemCategoryName);
-      }
-    }
-  }
-  Message::SendInfo() << " Done";
-
-  return Standard_True;
-}
-
-//=======================================================================
-// function : main
-// purpose  :
-//=======================================================================
-Standard_Integer main (const Standard_Integer argc, const char* argv[])
-{
-  if (argc < 2)
-  {
-    Message::SendInfo() << "EXPRESS -> CASCADE/XSTEP classes generator 3.0\n"
-                           "Use: ExpToCas <schema.exp> [<create.lst> [<packaging.lst> [start_index]]]\n"
-                           "Where: \n"
-                           "- schema.exp is a file with EXPRESS schema \n"
-                           "- create.lst is a file with list of types to generate (all if none)\n"
-                           "  (or \"-\" for creating all entities in the schema)\n"
-                           "- packaging.lst is a file with classes distribution per package\n"
-                           "  in the form of the list (one item per line) \"<TypeName> <Package>\"\n"
-                           "  If package not defined for some type, \"StepStep\" assumed\n"
-                           "- start_index - a first number for auxiliary generated files with data\n"
-                           "  to copy into StepAP214_Protocol.cxx, RWStepAP214_GeneralModule.cxx and\n"
-                           "  RWStepAP214_ReadWriteModule.cxx";
-    return 0;
-  }
-
-  //=================================
-  // Step 1: parsing EXPRESS file
-  // open schema file
-  OSD_Path aPath (argv[1]);
-  OSD_File aFile (aPath);
-  if (!aFile.IsReadable())
-  {
-    Message::SendFail() << "Error: Cannot open " << argv[1];
-    return -1;
-  }
-
-  // parse
-  Message::SendInfo() << "Starting parsing " << argv[1];
-  Handle(Express_Schema) aSchema = GetSchema (argv[1]);
-
-  if (aSchema.IsNull())
-  {
-    Message::SendFail() << "Error: Parsing finished with no result";
-    return -1;
-  }
-  else
-  {
-    Message::SendInfo() << "Schema " << aSchema->Name()->ToCString() << " successfully parsed";
-  }
-  Message::SendInfo() << "Total " << aSchema->NbItems() << " items";
-
-  //=================================
-  // Step 2: Prepare data for creating classes
-
-  // load packaging information
-  if (argc > 3)
-  {
-    if (!LoadList (argv[3], aSchema, Standard_False))
-    {
-      return -1;
-    }
-  }
-  // load list of classes to generate
-  if (argc > 2)
-  {
-    if (argv[2][0] == '-')
-    {
-      // set mark for all items
-      for (Standard_Integer num = 1; num <= aSchema->NbItems(); num++)
-      {
-        aSchema->Item (num)->SetGenMode (Express_Item::GM_GenByUser);
-      }
-    }
-    else if (!LoadList (argv[2], aSchema, Standard_True))
-    {
-      return -1;
-    }
-  }
-
-  // get starting index
-  Standard_Integer anIndex = -1;
-  if (argc > 4)
-  {
-    char* aStopSymbol;
-    anIndex = (Standard_Integer) strtol (argv[4], &aStopSymbol, 10);
-    if (*aStopSymbol != '\0')
-    {
-      Message::SendFail() << "Error: invalid starting index: " << argv[4];
-      return -1;
-    }
-  }
-
-  //=================================
-  // Step 3: Iterate over new items and set the package name if need
-  const TCollection_AsciiString aUserName("user");
-  for (Standard_Integer aNum = 1; aNum <= aSchema->NbItems(); aNum++)
-  {
-    if (aSchema->Item (aNum)->GetGenMode() == Express_Item::GM_GenByUser)
-    {
-      aSchema->Item (aNum)->Use2(aUserName, Express_Item::GetUnknownPackageName());
-    }
-  }
-
-  //=================================
-  // Step 4: Iterate by items and generate classes
-  Standard_Boolean isDone = Standard_False;
-  Express_Item::SetIndex (anIndex);
-  do
-  {
-    isDone = Standard_False;
-    for (Standard_Integer aNum = 1; aNum <= aSchema->NbItems(); aNum++)
-    {
-      isDone = isDone || aSchema->Item (aNum)->Generate();
-    }
-  } while (isDone);
-
-  return 0;
-}

src/ExpToCasExe/FILES

@@ -1,7 +0,0 @@
-exptocas.lex
-expltocas.yacc
-lex.exptocas.cxx
-exptocas.tab.hxx
-exptocas.tab.cxx
-ExpToCasExe.cxx
-

src/ExpToCasExe/FlexLexer.h

@@ -1,220 +0,0 @@
-// -*-C++-*-
-// FlexLexer.h -- define interfaces for lexical analyzer classes generated
-// by flex
-
-// Copyright (c) 1993 The Regents of the University of California.
-// All rights reserved.
-//
-// This code is derived from software contributed to Berkeley by
-// Kent Williams and Tom Epperly.
-//
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted provided that the following conditions
-//  are met:
-
-//  1. Redistributions of source code must retain the above copyright
-//  notice, this list of conditions and the following disclaimer.
-//  2. Redistributions in binary form must reproduce the above copyright
-//  notice, this list of conditions and the following disclaimer in the
-//  documentation and/or other materials provided with the distribution.
-
-//  Neither the name of the University nor the names of its contributors
-//  may be used to endorse or promote products derived from this software
-//  without specific prior written permission.
-
-//  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-//  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-//  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-//  PURPOSE.
-
-// This file defines FlexLexer, an abstract class which specifies the
-// external interface provided to flex C++ lexer objects, and yyFlexLexer,
-// which defines a particular lexer class.
-//
-// If you want to create multiple lexer classes, you use the -P flag
-// to rename each yyFlexLexer to some other xxFlexLexer.  You then
-// include <FlexLexer.h> in your other sources once per lexer class:
-//
-//      #undef yyFlexLexer
-//      #define yyFlexLexer xxFlexLexer
-//      #include <FlexLexer.h>
-//
-//      #undef yyFlexLexer
-//      #define yyFlexLexer zzFlexLexer
-//      #include <FlexLexer.h>
-//      ...
-
-#ifndef __FLEX_LEXER_H
-// Never included before - need to define base class.
-#define __FLEX_LEXER_H
-
-#include <iostream>
-
-extern "C++" {
-
-struct yy_buffer_state;
-typedef int yy_state_type;
-
-class FlexLexer
-{
-public:
-  virtual ~FlexLexer()        { }
-
-  const char* YYText() const  { return yytext; }
-  int YYLeng()        const   { return yyleng; }
-
-  virtual void
-  yy_switch_to_buffer( yy_buffer_state* new_buffer ) = 0;
-  virtual yy_buffer_state* yy_create_buffer( std::istream* s, int size ) = 0;
-  virtual yy_buffer_state* yy_create_buffer( std::istream& s, int size ) = 0;
-  virtual void yy_delete_buffer( yy_buffer_state* b ) = 0;
-  virtual void yyrestart( std::istream* s ) = 0;
-  virtual void yyrestart( std::istream& s ) = 0;
-
-  virtual int yylex() = 0;
-
-  // Call yylex with new input/output sources.
-  int yylex( std::istream& new_in, std::ostream& new_out )
-  {
-    switch_streams( new_in, new_out );
-    return yylex();
-  }
-
-  int yylex( std::istream* new_in, std::ostream* new_out = 0)
-  {
-    switch_streams( new_in, new_out );
-    return yylex();
-  }
-
-  // Switch to new input/output streams.  A nil stream pointer
-  // indicates "keep the current one".
-  virtual void switch_streams( std::istream* new_in,
-                               std::ostream* new_out ) = 0;
-  virtual void switch_streams( std::istream& new_in,
-                               std::ostream& new_out ) = 0;
-
-  int lineno() const          { return yylineno; }
-
-  int debug() const           { return yy_flex_debug; }
-  void set_debug( int flag )  { yy_flex_debug = flag; }
-
-protected:
-  char* yytext;
-  int yyleng;
-  int yylineno;       // only maintained if you use %option yylineno
-  int yy_flex_debug;  // only has effect with -d or "%option debug"
-};
-
-}
-#endif // FLEXLEXER_H
-
-#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
-// Either this is the first time through (yyFlexLexerOnce not defined),
-// or this is a repeated include to define a different flavor of
-// yyFlexLexer, as discussed in the flex manual.
-# define yyFlexLexerOnce
-
-extern "C++" {
-
-class yyFlexLexer : public FlexLexer {
-public:
-  // arg_yyin and arg_yyout default to the cin and cout, but we
-  // only make that assignment when initializing in yylex().
-  yyFlexLexer( std::istream& arg_yyin, std::ostream& arg_yyout );
-  yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
-private:
-  void ctor_common();
-
-public:
-
-  virtual ~yyFlexLexer();
-
-  void yy_switch_to_buffer( yy_buffer_state* new_buffer );
-  yy_buffer_state* yy_create_buffer( std::istream* s, int size );
-  yy_buffer_state* yy_create_buffer( std::istream& s, int size );
-  void yy_delete_buffer( yy_buffer_state* b );
-  void yyrestart( std::istream* s );
-  void yyrestart( std::istream& s );
-
-  void yypush_buffer_state( yy_buffer_state* new_buffer );
-  void yypop_buffer_state();
-
-  virtual int yylex();
-  virtual void switch_streams( std::istream& new_in, std::ostream& new_out );
-  virtual void switch_streams( std::istream* new_in = 0, std::ostream* new_out = 0 );
-  virtual int yywrap();
-
-protected:
-  virtual int LexerInput( char* buf, int max_size );
-  virtual void LexerOutput( const char* buf, int size );
-  virtual void LexerError( const char* msg );
-
-  void yyunput( int c, char* buf_ptr );
-  int yyinput();
-
-  void yy_load_buffer_state();
-  void yy_init_buffer( yy_buffer_state* b, std::istream& s );
-  void yy_flush_buffer( yy_buffer_state* b );
-
-  int yy_start_stack_ptr;
-  int yy_start_stack_depth;
-  int* yy_start_stack;
-
-  void yy_push_state( int new_state );
-  void yy_pop_state();
-  int yy_top_state();
-
-  yy_state_type yy_get_previous_state();
-  yy_state_type yy_try_NUL_trans( yy_state_type current_state );
-  int yy_get_next_buffer();
-
-  std::istream yyin;  // input source for default LexerInput
-  std::ostream yyout; // output sink for default LexerOutput
-
-  // yy_hold_char holds the character lost when yytext is formed.
-  char yy_hold_char;
-
-  // Number of characters read into yy_ch_buf.
-  int yy_n_chars;
-
-  // Points to current character in buffer.
-  char* yy_c_buf_p;
-
-  int yy_init;                // whether we need to initialize
-  int yy_start;               // start state number
-
-  // Flag which is used to allow yywrap()'s to do buffer switches
-  // instead of setting up a fresh yyin.  A bit of a hack ...
-  int yy_did_buffer_switch_on_eof;
-
-
-  size_t yy_buffer_stack_top; /**< index of top of stack. */
-  size_t yy_buffer_stack_max; /**< capacity of stack. */
-  yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
-  void yyensure_buffer_stack(void);
-
-  // The following are not always needed, but may be depending
-  // on use of certain flex features (like REJECT or yymore()).
-
-  yy_state_type yy_last_accepting_state;
-  char* yy_last_accepting_cpos;
-
-  yy_state_type* yy_state_buf;
-  yy_state_type* yy_state_ptr;
-
-  char* yy_full_match;
-  int* yy_full_state;
-  int yy_full_lp;
-
-  int yy_lp;
-  int yy_looking_for_trail_begin;
-
-  int yy_more_flag;
-  int yy_more_len;
-  int yy_more_offset;
-  int yy_prev_more_offset;
-};
-
-}
-
-#endif // yyFlexLexer || ! yyFlexLexerOnce

src/ExpToCasExe/ReadMe.md

@@ -1,171 +0,0 @@
-# STEP express schema to OCCT classes 
-
-## 1. Introduction
-
-**ExpToCasExe** is an auxiliary tool to generate code for implementation
-of new STEP entities into OCCT.
-This tool consists of two packages: **ExpToCasExe** and **TKExpress**.
-
-*ExpToCasExe* package is the basic package for generation.
-It parses the express schema, makes a list of entities described in the schema, 
-and starts generating classes according to the specified lists.
-This package has the file *occt_existed_step_entities.lst* witch contains list
-of STEP entities implemented in *OCCT* at this moment.
-
-*TKExpress* package generates files with description of the STEP entities
-to use in *OCCT* taking into account their dependencies.
-Below is a set of generated files using the example
-of the *Condition* entity from the *StepAP214* package.
-
-* **StepAP214_Condition.hxx** - contains declaration of the class that describes STEP entity
-* **StepAP214_Condition.cxx** - contains definition of the class that describes STEP entity
-* **RWStepAP214_RWCondition.hxx** - contains declaration of the class that reads (writes) STEP entity from STEP file
-* **RWStepAP214_RWCondition.cxx** - contains definition of the class that reads (writes) STEP entity from STEP file
-* **category.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_GeneralModule.cxx* file
-* **fillshared.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_GeneralModule.cxx* file
-* **inc.txt** - common file for all generated entities with part of code to insert to *StepAP214_Protocol.cxx*
-* **newvoid.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_GeneralModule.cxx* file
-* **protocol.txt** - common file for all generated entities with part of code to insert to *StepAP214_Protocol.cxx* file
-* **readstep.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_ReadWriteModule.cxx* file
-* **reco.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_ReadWriteModule.cxx* file
-* **rwinc.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_ReadWriteModule.cxx* file
-* **steptype.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_ReadWriteModule.cxx* file
-* **typebind.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_ReadWriteModule.cxx* file
-* **writestep.txt** - common file for all generated entities with part of code to insert to *RWStepAP214_ReadWriteModule.cxx* file
-
-## 2. Build
-
-The build process is automated, but has some specifics. *ExpToCasExe* package contains file *exptocas.lex*
-which contains rules for lexical analyzer builder (*FLEX*), and file *exptocas.yacc*
-which contains rules for syntax analyzer builder (*GNU Bison*).
-
-During build process *FLEX* and *Bison* generate the next files:
-
- * FlexLexer.h
- * lex.exptocas.cxx
- * exptocas.tab.cxx
- * exptocas.tab.hxx
-
-These files are placed to the source directory ("*src/ExpToCasExe*") due to *CMAKE* script specific.
-Then standard Visual Studio build process continues.
-
-There is no necessary to include these files to the *git* repository, due to automatic generation.
-To change the behaviour of Express schema parser, the user need to modify original files:
-*exptocas.lex* and *exptocas.yacc*.
-
-## 3. Usage
-
-**ExpToCasExe** program has the following call pattern:
-
-~~~~
-> ExpToCasExe <schema.exp> [<new.lst> [<existed.lst> [start_index]]]
-~~~~
-
-where:
-
- * **schema.exp** - file with STEP Express schema
- * **new.lst** - file with list of new STEP entities which we have to generate
- * **existed.lst** - file with list of already implemented STEP entities
- * **start_index** - a first index for entity registration
-      (value of it you can receive after analyse of *StepAP214_Protocol.cxx* file)
-
-If *new.lst* file is set to "-" then all entities from Express schema are considered as new.
-
-*new.lst* and *existed.lst* are the text files. Line in file describes the class name
-of STEP entity and to witch *OCCT* package it's belong. Line has the following format: 
-
-~~~~
-item_name package_name [shortname [check_flag(0 or 1) [fillshared_flag(0 or 1) [category]]]]
-~~~~
-
-where:
-
- * **item_name** is the class name of the STEP entity (*ProductDefinitionOrReference* for example)
- * **package_name** is the name of the *OCCT* package (*StepBasic* for example)
- * **shortname** is the short name of the STEP entity
- * **check_flag** is the flag to generate the *Check* function in the class
- * **fillshared_flag** is the flag to generate the *FillShared* function in the class
- * **category** is the name of category to witch entity belongs to
-
-These file can include comments after the symbol "#".
-
-The result of generation consists of several folders:
-
-* two folders (*\_package_name\_* and *RW\_package_name\_*) for each package for which new entities were generated.
-* a folder *Registration* with *\*.txt* files with code to copy into common files (see the example in the first section).
-
-For generation, it is easy to copy to separate directory following files:
-
-* **ExpToCasExe.exe**, **TKernel.dll** and **TKExpress.dll** from OCCT
-* STEP Express schema
-* **occt_existed_step_entities.lst** from package *ExpToCasExe*
-
-create a file with needed entities **new.lst** and from this directory execute command:
-
-~~~~
-> ExpToCasExe.exe schema.exp new.lst occt_existed_step_entities.lst 1000
-~~~~
-
-## 4. Disclaimer
-
-**NOTE**:
-Some STEP schemes may be not fully corresponded to the rules which set in our generator.
-If during generation we receive a message about syntax error you can try to edit schema
-file in order to avoid it. Such approach is reasonable if number of errors is small.
-If there are many errors we have to change existed rules (for debug parser process you can
-uncomment string "//aScanner.set_debug(1);" in the file *exptocas.yacc*).
-TIP: remove upper case from name after SCHEMA key word.
-
-**NOTE**:
-Please, take into account that most of existed entities were generated many years ago.
-Some of them can be not corresponded to last versions of schemes.
-
-For example, we don't have classes for entity:
-
-~~~~
-  ENTITY founded_item
-    SUPERTYPE OF ((ONEOF(b_spline_curve_knot_locator, b_spline_curve_segment, b_spline_surface_knot_locator,
-                         b_spline_surface_patch, b_spline_surface_strip,
-                         boundary_curve_of_b_spline_or_rectangular_composite_surface, box_domain,
-                         character_glyph_style_outline, character_glyph_style_stroke, composite_curve_segment,
-                         composite_curve_transition_locator, curve_style, curve_style_font, curve_style_font_and_scaling,
-                         curve_style_font_pattern, externally_defined_style, fill_area_style,
-                         interpolated_configuration_segment, kinematic_path_segment, plane_angle_and_length_pair,
-                         plane_angle_and_ratio_pair, point_style, presentation_style_assignment,
-                         rectangular_composite_surface_transition_locator, surface_patch, surface_side_style,
-                         surface_style_boundary, surface_style_control_grid, surface_style_fill_area,
-                         surface_style_parameter_line, surface_style_segmentation_curve, surface_style_silhouette,
-                         surface_style_usage, symbol_style, text_style, view_volume)) ANDOR
-                  (ONEOF(character_glyph_style_outline, character_glyph_style_stroke, curve_style, curve_style_font,
-                         curve_style_font_and_scaling, curve_style_font_pattern, externally_defined_style,
-                         fill_area_style, point_style, presentation_style_assignment, surface_side_style,
-                         surface_style_boundary, surface_style_control_grid, surface_style_fill_area,
-                         surface_style_parameter_line, surface_style_segmentation_curve, surface_style_silhouette,
-                         surface_style_usage, symbol_style, text_style)));
-  DERIVE
-    users : SET [0 : ?] OF founded_item_select := using_items(SELF, []);
-  WHERE
-    WR1: SIZEOF(users) > 0;
-    WR2: NOT (SELF IN users);
-  END_ENTITY;
-~~~~
-
-But some of existed entities (for example - *composite_curve_segment*) must be inherited from
-this missing entity (at present such existed entities are inherited from *Standard_Transient*):
-
-~~~~
-  ENTITY composite_curve_segment
-  SUBTYPE OF (founded_item);
-    transition : transition_code;
-    same_sense : BOOLEAN;
-    parent_curve : curve;
-  INVERSE
-    using_curves : BAG[1:?] OF composite_curve FOR segments;
-  WHERE
-    wr1 : ('AUTOMOTIVE_DESIGN.BOUNDED_CURVE' IN TYPEOF(parent_curve));
-  END_ENTITY;  -- 10303-42: geometry_schema 
-~~~~
-
-**NOTE**: To facilitate the work of those who will use this program after you,
-it is strongly recommended update the file **occt_existed_step_entities.lst**
-after each generation and not to forget to change update date in the first line of this file.

src/ExpToCasExe/exptocas.lex

@@ -1,203 +0,0 @@
-%{
-
-// Created:	Thu Oct 28 12:21:16 1999
-// Author:	Andrey BETENEV
-// Copyright (c) 1999-2020 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.
-
-/*****************************************************************************
-
-This LEX scanner is performs lexical analysis of EXPRESS schema file   
-for EXPRESS -> CASCADE/XSTEP classes generator                             
-
-On the stage of lexical scanner comments (single- and multi-line),         
-definitions of CONSTANT, FUNCTION, RULE items and clauses WHERE, INVERSE
-and DERIVE of TYPE amd ENTITY items are dismissed (ignored)         
-
-Then, keywords such as ENTITY, SUPERTYPE, SET etc., names of items         
-and special symbols are identified and returned to parser (yacc) as tokens 
-
-Also, error processing and current line number tracking functions are defined
-
-*****************************************************************************/
-
-/************************************/
-/* Section 1                        */
-/* definitions                      */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <TColStd_HSequenceOfHAsciiString.hxx>
-#include <Express_HSequenceOfField.hxx>
-#include <Express_HSequenceOfItem.hxx>
-#include <Express_Field.hxx>
-#include <Express_Item.hxx>
-#include <Express_Type.hxx>
-#include <Express_Schema.hxx>
-#include <Express_Reference.hxx>
-
-#include "exptocas.tab.hxx"       /* define tokens */
-
-/* Auxiliary functions */
-
-static int fun_level=0;
-static int ec_linenum=1;
-static int ec_state = 0;
-
-int yywrap(void) { return 1; }
-
-int ec_curline ( void )
-{
-  return ec_linenum;
-}
-
-int ec_error ( const std::string& s, const std::string& text )
-{
-  printf ( "\nError at line %d: %s \"%s\"\n", ec_curline(), s.c_str(), text.c_str() );
-  return 0;
-}
-
-%}
-
-/*
-    c++                 generate C++ parser class
-*/
-%option c++
-%option noyywrap
-%option yyclass="exptocas::scanner"
-%option nounistd
-
-%s TYP ENT
-%x COMM SKP RULE FUN
-
-%a 4000
-%o 6000
-
-%top{
-// Pre-include stdlib.h to avoid redefinition of integer type macros (INT8_MIN and similar in generated code)
-#if !defined(_MSC_VER) || (_MSC_VER >= 1600) // Visual Studio 2010+
-#include "stdint.h"
-#endif
-}
-
-%{
-
-// Tell flex which function to define
-#ifdef  YY_DECL
-# undef YY_DECL
-#endif
-#define YY_DECL int exptocas::scanner::lex (exptocas::parser::semantic_type* yylval)
-
-typedef exptocas::parser::token token;
-
-/************************************/
-/* Section 2                        */
-/* parsing rules                    */
-%}
-
-%%
-
-"--".*               { /* Eat line comments */ }
-"(*"                 { ec_state = YYSTATE; BEGIN(COMM); }
-<COMM>.              { /* Eat multiline comments */ }
-<COMM>"*)"           { BEGIN(ec_state); }
-
-"SCHEMA"             { return yylval->num = token::KSCHEM; }
-"END_SCHEMA"         { return yylval->num = token::KENDS; }
-
-"TYPE"               { BEGIN(TYP); return yylval->num = token::KTYP; }
-<TYP,SKP>"END_TYPE"  { BEGIN(0);   return yylval->num = token::KENDT; }
-
-"ENTITY"             { BEGIN(ENT); return yylval->num = token::KENT; }
-<ENT,SKP>"END_ENTITY" { BEGIN(0);  return yylval->num = token::KENDE; }
-
-<ENT>"INVERSE"       |
-<ENT>"DERIVE"        |
-<ENT,TYP>"WHERE"     { BEGIN(SKP); }
-<SKP>.               { /* eat contents of WHERE and DERIVE subclauses of ENTITY and TYPE */ }
-
-"SELECT"             { return yylval->num = token::KSEL; }
-"ENUMERATION"        { return yylval->num = token::KENUM; }
-"LIST"               { return yylval->num = token::KLIST; }
-"ARRAY"              { return yylval->num = token::KARR; }
-"SET"                { return yylval->num = token::KSET; }
-"BAG"                { return yylval->num = token::KBAG; }
-"OF"                 { return yylval->num = token::KOF; }
-
-"NUMBER"             { return yylval->num = token::KNUM; }
-"INTEGER"            { return yylval->num = token::KINT; }
-"REAL"               { return yylval->num = token::KDBL; }
-"STRING"             { return yylval->num = token::KSTR; }
-"LOGICAL"            { return yylval->num = token::KLOG; }
-"BOOLEAN"            { return yylval->num = token::KBOOL; }
-
-"OPTIONAL"           { return yylval->num = token::KOPT; }
-"UNIQUE"             { return yylval->num = token::KUNIQ; }
-"SELF"               { return yylval->num = token::KSELF; }
-
-"ABSTRACT"           { return yylval->num = token::KABSTR; }
-"SUBTYPE"            { return yylval->num = token::KSUBT; }
-"SUPERTYPE"          { return yylval->num = token::KSPRT; }
-"ANDOR"              { return yylval->num = token::KANDOR; }
-"ONEOF"              { return yylval->num = token::K1OF; }
-"AND"                { return yylval->num = token::KAND; }
-
-"UR"[0-9]+           { yylval->str = strdup ( yytext ); return token::NAME; }
-
-[a-z_][a-z_0-9]*     { yylval->str = strdup ( yytext ); return token::NAME; }
-
-[0-9]+               { yylval->num = atoi ( yytext ); return token::NUMBER; }
-[,=();?:.\\]|"["|"]" { return yylval->num = yytext[0]; }
-
-<INITIAL,FUN>"FUNCTION"  { BEGIN(FUN); fun_level++; }
-<FUN>"(*"            { ec_state = YYSTATE; BEGIN(COMM); /* eat comments in functions */ }
-<FUN>"--".*          { /* Eat line comments in functions */ }
-<FUN>[A-Za-z_0-9]*   { /* eat FUNCTIONs - skip IDs explicitly */ }
-<FUN>\'[^\']*\'      { /* eat FUNCTIONs - skip strings explicitly */ }
-<FUN>.               { /* eat FUNCTIONs - skip all other symbols in functions */ }
-<FUN>"END_FUNCTION;" { fun_level--; if ( ! fun_level ) BEGIN(0); }
-
-"RULE"               { BEGIN(RULE); /* eat RULEs */ }
-<RULE>.              { /* eat RULEs */ }
-<RULE>"END_RULE;"    { BEGIN(0); }
-
-"CONSTANT"[ \t\na-z_0-9:=;'()|-]+"END_CONSTANT;" { /* eat CONSTANTs */
-                       char *s = yytext; /* but don't forget to count lines.. */
-                       while ( *s ) if ( *(s++) == '\n' ) ec_linenum++;
-                     }
-
-[ \t]+               { /* eat spaces */ }
-[A-Za-z0-9_]+        { ec_error ( "unknown keyword ", yytext ); /* put unrecognized keywords to cerr */ }
-.                    { ec_error ( "unknown symbol ", yytext ); /* put unrecognized data to cerr */ }
-
-<INITIAL,COMM,SKP,RULE,ENT,TYP,FUN>\n  { ec_linenum++; /* count lines */ }
-
-%%
-
-/************************************/
-/* Section 3                        */
-/* auxiliary procedures             */
-
-exptocas::scanner::scanner(std::istream* in, std::ostream* out)
-    : exptocasFlexLexer(in, out)
-{
-}
-
-/*
-int main ( void )
-{
-  yylex();
-}
-*/
-

src/ExpToCasExe/exptocas.tab.hxx

@@ -1,910 +0,0 @@
-// A Bison parser, made by GNU Bison 3.7.4.
-
-// Skeleton interface for Bison LALR(1) parsers in C++
-
-// Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// As a special exception, you may create a larger work that contains
-// part or all of the Bison parser skeleton and distribute that work
-// under terms of your choice, so long as that work isn't itself a
-// parser generator using the skeleton or a modified version thereof
-// as a parser skeleton.  Alternatively, if you modify or redistribute
-// the parser skeleton itself, you may (at your option) remove this
-// special exception, which will cause the skeleton and the resulting
-// Bison output files to be licensed under the GNU General Public
-// License without this special exception.
-
-// This special exception was added by the Free Software Foundation in
-// version 2.2 of Bison.
-
-
-/**
- ** \file ExpToCasExe/exptocas.tab.hxx
- ** Define the exptocas::parser class.
- */
-
-// C++ LALR(1) parser skeleton written by Akim Demaille.
-
-// DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
-// especially those whose name start with YY_ or yy_.  They are
-// private implementation details that can be changed or removed.
-
-#ifndef YY_EXPTOCAS_EXPTOCASEXE_EXPTOCAS_TAB_HXX_INCLUDED
-# define YY_EXPTOCAS_EXPTOCASEXE_EXPTOCAS_TAB_HXX_INCLUDED
-// "%code requires" blocks.
-
-#include <OSD_OpenFile.hxx>
-#include <TCollection_HAsciiString.hxx>
-#include <TColStd_HSequenceOfHAsciiString.hxx>
-#include <Express_HSequenceOfField.hxx>
-#include <Express_HSequenceOfItem.hxx>
-#include <Express_Field.hxx>
-#include <Express_Item.hxx>
-#include <Express_Enum.hxx>
-#include <Express_Alias.hxx>
-#include <Express_Select.hxx>
-#include <Express_Entity.hxx>
-#include <Express_Type.hxx>
-#include <Express_NamedType.hxx>
-#include <Express_PredefinedType.hxx>
-#include <Express_Number.hxx>
-#include <Express_Integer.hxx>
-#include <Express_Boolean.hxx>
-#include <Express_Logical.hxx>
-#include <Express_Real.hxx>
-#include <Express_String.hxx>
-#include <Express_ComplexType.hxx>
-#include <Express_Array.hxx>
-#include <Express_List.hxx>
-#include <Express_Set.hxx>
-#include <Express_Bag.hxx>
-#include <Express_Schema.hxx>
-#include <Express_Reference.hxx>
-#include <Express.hxx>
-  
-namespace exptocas {
-  class scanner;
-};
-#ifdef _MSC_VER
-// disable MSVC warning C4522: 'exptocas::parser::stack_symbol_type': multiple assignment operators
-#pragma warning(disable: 4522)
-#endif
-
-
-
-# include <cstdlib> // std::abort
-# include <iostream>
-# include <stdexcept>
-# include <string>
-# include <vector>
-
-#if defined __cplusplus
-# define YY_CPLUSPLUS __cplusplus
-#else
-# define YY_CPLUSPLUS 199711L
-#endif
-
-// Support move semantics when possible.
-#if 201103L <= YY_CPLUSPLUS
-# define YY_MOVE           std::move
-# define YY_MOVE_OR_COPY   move
-# define YY_MOVE_REF(Type) Type&&
-# define YY_RVREF(Type)    Type&&
-# define YY_COPY(Type)     Type
-#else
-# define YY_MOVE
-# define YY_MOVE_OR_COPY   copy
-# define YY_MOVE_REF(Type) Type&
-# define YY_RVREF(Type)    const Type&
-# define YY_COPY(Type)     const Type&
-#endif
-
-// Support noexcept when possible.
-#if 201103L <= YY_CPLUSPLUS
-# define YY_NOEXCEPT noexcept
-# define YY_NOTHROW
-#else
-# define YY_NOEXCEPT
-# define YY_NOTHROW throw ()
-#endif
-
-// Support constexpr when possible.
-#if 201703 <= YY_CPLUSPLUS
-# define YY_CONSTEXPR constexpr
-#else
-# define YY_CONSTEXPR
-#endif
-
-
-
-#ifndef YY_ATTRIBUTE_PURE
-# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
-#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define YY_ATTRIBUTE_PURE
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE_UNUSED
-# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
-#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-# else
-#  define YY_ATTRIBUTE_UNUSED
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
-#else
-# define YYUSE(E) /* empty */
-#endif
-
-#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
-#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
-# define YY_IGNORE_USELESS_CAST_BEGIN                          \
-    _Pragma ("GCC diagnostic push")                            \
-    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
-# define YY_IGNORE_USELESS_CAST_END            \
-    _Pragma ("GCC diagnostic pop")
-#endif
-#ifndef YY_IGNORE_USELESS_CAST_BEGIN
-# define YY_IGNORE_USELESS_CAST_BEGIN
-# define YY_IGNORE_USELESS_CAST_END
-#endif
-
-# ifndef YY_CAST
-#  ifdef __cplusplus
-#   define YY_CAST(Type, Val) static_cast<Type> (Val)
-#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
-#  else
-#   define YY_CAST(Type, Val) ((Type) (Val))
-#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
-#  endif
-# endif
-# ifndef YY_NULLPTR
-#  if defined __cplusplus
-#   if 201103L <= __cplusplus
-#    define YY_NULLPTR nullptr
-#   else
-#    define YY_NULLPTR 0
-#   endif
-#  else
-#   define YY_NULLPTR ((void*)0)
-#  endif
-# endif
-
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-namespace exptocas {
-
-
-
-
-  /// A Bison parser.
-  class parser
-  {
-  public:
-#ifndef YYSTYPE
-    /// Symbol semantic values.
-    union semantic_type
-    {
-
-  int num;
-  char *str;
-  TColStd_HSequenceOfHAsciiString *tlist;
-  Express_HSequenceOfField *flist;
-  Express_HSequenceOfItem *ilist;
-  Express_Field *field;
-  Express_Item *item;
-  Express_Type *type;
-  Express_Schema *schema;
-  Express_Reference *ref;
-
-
-    };
-#else
-    typedef YYSTYPE semantic_type;
-#endif
-
-    /// Syntax errors thrown from user actions.
-    struct syntax_error : std::runtime_error
-    {
-      syntax_error (const std::string& m)
-        : std::runtime_error (m)
-      {}
-
-      syntax_error (const syntax_error& s)
-        : std::runtime_error (s.what ())
-      {}
-
-      ~syntax_error () YY_NOEXCEPT YY_NOTHROW;
-    };
-
-    /// Token kinds.
-    struct token
-    {
-      enum token_kind_type
-      {
-        YYEMPTY = -2,
-    YYEOF = 0,                     // "end of file"
-    YYerror = 256,                 // error
-    YYUNDEF = 257,                 // "invalid token"
-    KSCHEM = 258,                  // KSCHEM
-    KENDS = 259,                   // KENDS
-    KTYP = 260,                    // KTYP
-    KENDT = 261,                   // KENDT
-    KENT = 262,                    // KENT
-    KENDE = 263,                   // KENDE
-    KREF = 264,                    // KREF
-    KFROM = 265,                   // KFROM
-    KSEL = 266,                    // KSEL
-    KENUM = 267,                   // KENUM
-    KLIST = 268,                   // KLIST
-    KARR = 269,                    // KARR
-    KBAG = 270,                    // KBAG
-    KSET = 271,                    // KSET
-    KOF = 272,                     // KOF
-    KNUM = 273,                    // KNUM
-    KINT = 274,                    // KINT
-    KDBL = 275,                    // KDBL
-    KSTR = 276,                    // KSTR
-    KLOG = 277,                    // KLOG
-    KBOOL = 278,                   // KBOOL
-    KOPT = 279,                    // KOPT
-    KUNIQ = 280,                   // KUNIQ
-    KSELF = 281,                   // KSELF
-    KABSTR = 282,                  // KABSTR
-    KSUBT = 283,                   // KSUBT
-    KSPRT = 284,                   // KSPRT
-    KANDOR = 285,                  // KANDOR
-    K1OF = 286,                    // K1OF
-    KAND = 287,                    // KAND
-    NUMBER = 288,                  // NUMBER
-    NAME = 289                     // NAME
-      };
-      /// Backward compatibility alias (Bison 3.6).
-      typedef token_kind_type yytokentype;
-    };
-
-    /// Token kind, as returned by yylex.
-    typedef token::yytokentype token_kind_type;
-
-    /// Backward compatibility alias (Bison 3.6).
-    typedef token_kind_type token_type;
-
-    /// Symbol kinds.
-    struct symbol_kind
-    {
-      enum symbol_kind_type
-      {
-        YYNTOKENS = 46, ///< Number of tokens.
-        S_YYEMPTY = -2,
-        S_YYEOF = 0,                             // "end of file"
-        S_YYerror = 1,                           // error
-        S_YYUNDEF = 2,                           // "invalid token"
-        S_KSCHEM = 3,                            // KSCHEM
-        S_KENDS = 4,                             // KENDS
-        S_KTYP = 5,                              // KTYP
-        S_KENDT = 6,                             // KENDT
-        S_KENT = 7,                              // KENT
-        S_KENDE = 8,                             // KENDE
-        S_KREF = 9,                              // KREF
-        S_KFROM = 10,                            // KFROM
-        S_KSEL = 11,                             // KSEL
-        S_KENUM = 12,                            // KENUM
-        S_KLIST = 13,                            // KLIST
-        S_KARR = 14,                             // KARR
-        S_KBAG = 15,                             // KBAG
-        S_KSET = 16,                             // KSET
-        S_KOF = 17,                              // KOF
-        S_KNUM = 18,                             // KNUM
-        S_KINT = 19,                             // KINT
-        S_KDBL = 20,                             // KDBL
-        S_KSTR = 21,                             // KSTR
-        S_KLOG = 22,                             // KLOG
-        S_KBOOL = 23,                            // KBOOL
-        S_KOPT = 24,                             // KOPT
-        S_KUNIQ = 25,                            // KUNIQ
-        S_KSELF = 26,                            // KSELF
-        S_KABSTR = 27,                           // KABSTR
-        S_KSUBT = 28,                            // KSUBT
-        S_KSPRT = 29,                            // KSPRT
-        S_KANDOR = 30,                           // KANDOR
-        S_K1OF = 31,                             // K1OF
-        S_KAND = 32,                             // KAND
-        S_NUMBER = 33,                           // NUMBER
-        S_NAME = 34,                             // NAME
-        S_35_ = 35,                              // ','
-        S_36_ = 36,                              // ';'
-        S_37_ = 37,                              // '='
-        S_38_ = 38,                              // '('
-        S_39_ = 39,                              // ')'
-        S_40_ = 40,                              // '['
-        S_41_ = 41,                              // ':'
-        S_42_ = 42,                              // ']'
-        S_43_ = 43,                              // '?'
-        S_44_ = 44,                              // '\\'
-        S_45_ = 45,                              // '.'
-        S_YYACCEPT = 46,                         // $accept
-        S_SCHEMA = 47,                           // SCHEMA
-        S_ILIST = 48,                            // ILIST
-        S_ITEM = 49,                             // ITEM
-        S_ENUM = 50,                             // ENUM
-        S_SELECT = 51,                           // SELECT
-        S_ALIAS = 52,                            // ALIAS
-        S_ENTITY = 53,                           // ENTITY
-        S_REFERENCE = 54,                        // REFERENCE
-        S_TLIST = 55,                            // TLIST
-        S_TLIST1 = 56,                           // TLIST1
-        S_TYPE = 57,                             // TYPE
-        S_TSTD = 58,                             // TSTD
-        S_TNAME = 59,                            // TNAME
-        S_TSET = 60,                             // TSET
-        S_INDEX = 61,                            // INDEX
-        S_OPTUNI = 62,                           // OPTUNI
-        S_SUBT = 63,                             // SUBT
-        S_SUPERT = 64,                           // SUPERT
-        S_SUPLST = 65,                           // SUPLST
-        S_FLIST = 66,                            // FLIST
-        S_FLIST1 = 67,                           // FLIST1
-        S_FIELD = 68,                            // FIELD
-        S_REDEF = 69,                            // REDEF
-        S_SPECIF = 70,                           // SPECIF
-        S_OPTNL = 71,                            // OPTNL
-        S_UNIQIT = 72,                           // UNIQIT
-        S_UNIQLS = 73,                           // UNIQLS
-        S_UNIQUE = 74,                           // UNIQUE
-        S_SPCLST = 75                            // SPCLST
-      };
-    };
-
-    /// (Internal) symbol kind.
-    typedef symbol_kind::symbol_kind_type symbol_kind_type;
-
-    /// The number of tokens.
-    static const symbol_kind_type YYNTOKENS = symbol_kind::YYNTOKENS;
-
-    /// A complete symbol.
-    ///
-    /// Expects its Base type to provide access to the symbol kind
-    /// via kind ().
-    ///
-    /// Provide access to semantic value.
-    template <typename Base>
-    struct basic_symbol : Base
-    {
-      /// Alias to Base.
-      typedef Base super_type;
-
-      /// Default constructor.
-      basic_symbol ()
-        : value ()
-      {}
-
-#if 201103L <= YY_CPLUSPLUS
-      /// Move constructor.
-      basic_symbol (basic_symbol&& that)
-        : Base (std::move (that))
-        , value (std::move (that.value))
-      {}
-#endif
-
-      /// Copy constructor.
-      basic_symbol (const basic_symbol& that);
-      /// Constructor for valueless symbols.
-      basic_symbol (typename Base::kind_type t);
-
-      /// Constructor for symbols with semantic value.
-      basic_symbol (typename Base::kind_type t,
-                    YY_RVREF (semantic_type) v);
-
-      /// Destroy the symbol.
-      ~basic_symbol ()
-      {
-        clear ();
-      }
-
-      /// Destroy contents, and record that is empty.
-      void clear ()
-      {
-        Base::clear ();
-      }
-
-#if YYDEBUG || 0
-      /// The user-facing name of this symbol.
-      const char *name () const YY_NOEXCEPT
-      {
-        return parser::symbol_name (this->kind ());
-      }
-#endif // #if YYDEBUG || 0
-
-
-      /// Backward compatibility (Bison 3.6).
-      symbol_kind_type type_get () const YY_NOEXCEPT;
-
-      /// Whether empty.
-      bool empty () const YY_NOEXCEPT;
-
-      /// Destructive move, \a s is emptied into this.
-      void move (basic_symbol& s);
-
-      /// The semantic value.
-      semantic_type value;
-
-    private:
-#if YY_CPLUSPLUS < 201103L
-      /// Assignment operator.
-      basic_symbol& operator= (const basic_symbol& that);
-#endif
-    };
-
-    /// Type access provider for token (enum) based symbols.
-    struct by_kind
-    {
-      /// Default constructor.
-      by_kind ();
-
-#if 201103L <= YY_CPLUSPLUS
-      /// Move constructor.
-      by_kind (by_kind&& that);
-#endif
-
-      /// Copy constructor.
-      by_kind (const by_kind& that);
-
-      /// The symbol kind as needed by the constructor.
-      typedef token_kind_type kind_type;
-
-      /// Constructor from (external) token numbers.
-      by_kind (kind_type t);
-
-      /// Record that this symbol is empty.
-      void clear ();
-
-      /// Steal the symbol kind from \a that.
-      void move (by_kind& that);
-
-      /// The (internal) type number (corresponding to \a type).
-      /// \a empty when empty.
-      symbol_kind_type kind () const YY_NOEXCEPT;
-
-      /// Backward compatibility (Bison 3.6).
-      symbol_kind_type type_get () const YY_NOEXCEPT;
-
-      /// The symbol kind.
-      /// \a S_YYEMPTY when empty.
-      symbol_kind_type kind_;
-    };
-
-    /// Backward compatibility for a private implementation detail (Bison 3.6).
-    typedef by_kind by_type;
-
-    /// "External" symbols: returned by the scanner.
-    struct symbol_type : basic_symbol<by_kind>
-    {};
-
-    /// Build a parser object.
-    parser (exptocas::scanner* scanner_yyarg);
-    virtual ~parser ();
-
-#if 201103L <= YY_CPLUSPLUS
-    /// Non copyable.
-    parser (const parser&) = delete;
-    /// Non copyable.
-    parser& operator= (const parser&) = delete;
-#endif
-
-    /// Parse.  An alias for parse ().
-    /// \returns  0 iff parsing succeeded.
-    int operator() ();
-
-    /// Parse.
-    /// \returns  0 iff parsing succeeded.
-    virtual int parse ();
-
-#if YYDEBUG
-    /// The current debugging stream.
-    std::ostream& debug_stream () const YY_ATTRIBUTE_PURE;
-    /// Set the current debugging stream.
-    void set_debug_stream (std::ostream &);
-
-    /// Type for debugging levels.
-    typedef int debug_level_type;
-    /// The current debugging level.
-    debug_level_type debug_level () const YY_ATTRIBUTE_PURE;
-    /// Set the current debugging level.
-    void set_debug_level (debug_level_type l);
-#endif
-
-    /// Report a syntax error.
-    /// \param msg    a description of the syntax error.
-    virtual void error (const std::string& msg);
-
-    /// Report a syntax error.
-    void error (const syntax_error& err);
-
-#if YYDEBUG || 0
-    /// The user-facing name of the symbol whose (internal) number is
-    /// YYSYMBOL.  No bounds checking.
-    static const char *symbol_name (symbol_kind_type yysymbol);
-#endif // #if YYDEBUG || 0
-
-
-
-
-  private:
-#if YY_CPLUSPLUS < 201103L
-    /// Non copyable.
-    parser (const parser&);
-    /// Non copyable.
-    parser& operator= (const parser&);
-#endif
-
-
-    /// Stored state numbers (used for stacks).
-    typedef unsigned char state_type;
-
-    /// Compute post-reduction state.
-    /// \param yystate   the current state
-    /// \param yysym     the nonterminal to push on the stack
-    static state_type yy_lr_goto_state_ (state_type yystate, int yysym);
-
-    /// Whether the given \c yypact_ value indicates a defaulted state.
-    /// \param yyvalue   the value to check
-    static bool yy_pact_value_is_default_ (int yyvalue);
-
-    /// Whether the given \c yytable_ value indicates a syntax error.
-    /// \param yyvalue   the value to check
-    static bool yy_table_value_is_error_ (int yyvalue);
-
-    static const short yypact_ninf_;
-    static const signed char yytable_ninf_;
-
-    /// Convert a scanner token kind \a t to a symbol kind.
-    /// In theory \a t should be a token_kind_type, but character literals
-    /// are valid, yet not members of the token_type enum.
-    static symbol_kind_type yytranslate_ (int t);
-
-#if YYDEBUG || 0
-    /// For a symbol, its name in clear.
-    static const char* const yytname_[];
-#endif // #if YYDEBUG || 0
-
-
-    // Tables.
-    // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-    // STATE-NUM.
-    static const short yypact_[];
-
-    // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-    // Performed when YYTABLE does not specify something else to do.  Zero
-    // means the default is an error.
-    static const signed char yydefact_[];
-
-    // YYPGOTO[NTERM-NUM].
-    static const short yypgoto_[];
-
-    // YYDEFGOTO[NTERM-NUM].
-    static const short yydefgoto_[];
-
-    // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-    // positive, shift that token.  If negative, reduce the rule whose
-    // number is the opposite.  If YYTABLE_NINF, syntax error.
-    static const unsigned char yytable_[];
-
-    static const short yycheck_[];
-
-    // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-    // symbol of state STATE-NUM.
-    static const signed char yystos_[];
-
-    // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
-    static const signed char yyr1_[];
-
-    // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
-    static const signed char yyr2_[];
-
-
-#if YYDEBUG
-    // YYRLINE[YYN] -- Source line where rule number YYN was defined.
-    static const short yyrline_[];
-    /// Report on the debug stream that the rule \a r is going to be reduced.
-    virtual void yy_reduce_print_ (int r) const;
-    /// Print the state stack on the debug stream.
-    virtual void yy_stack_print_ () const;
-
-    /// Debugging level.
-    int yydebug_;
-    /// Debug stream.
-    std::ostream* yycdebug_;
-
-    /// \brief Display a symbol kind, value and location.
-    /// \param yyo    The output stream.
-    /// \param yysym  The symbol.
-    template <typename Base>
-    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
-#endif
-
-    /// \brief Reclaim the memory associated to a symbol.
-    /// \param yymsg     Why this token is reclaimed.
-    ///                  If null, print nothing.
-    /// \param yysym     The symbol.
-    template <typename Base>
-    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
-
-  private:
-    /// Type access provider for state based symbols.
-    struct by_state
-    {
-      /// Default constructor.
-      by_state () YY_NOEXCEPT;
-
-      /// The symbol kind as needed by the constructor.
-      typedef state_type kind_type;
-
-      /// Constructor.
-      by_state (kind_type s) YY_NOEXCEPT;
-
-      /// Copy constructor.
-      by_state (const by_state& that) YY_NOEXCEPT;
-
-      /// Record that this symbol is empty.
-      void clear () YY_NOEXCEPT;
-
-      /// Steal the symbol kind from \a that.
-      void move (by_state& that);
-
-      /// The symbol kind (corresponding to \a state).
-      /// \a symbol_kind::S_YYEMPTY when empty.
-      symbol_kind_type kind () const YY_NOEXCEPT;
-
-      /// The state number used to denote an empty symbol.
-      /// We use the initial state, as it does not have a value.
-      enum { empty_state = 0 };
-
-      /// The state.
-      /// \a empty when empty.
-      state_type state;
-    };
-
-    /// "Internal" symbol: element of the stack.
-    struct stack_symbol_type : basic_symbol<by_state>
-    {
-      /// Superclass.
-      typedef basic_symbol<by_state> super_type;
-      /// Construct an empty symbol.
-      stack_symbol_type ();
-      /// Move or copy construction.
-      stack_symbol_type (YY_RVREF (stack_symbol_type) that);
-      /// Steal the contents from \a sym to build this.
-      stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) sym);
-#if YY_CPLUSPLUS < 201103L
-      /// Assignment, needed by push_back by some old implementations.
-      /// Moves the contents of that.
-      stack_symbol_type& operator= (stack_symbol_type& that);
-
-      /// Assignment, needed by push_back by other implementations.
-      /// Needed by some other old implementations.
-      stack_symbol_type& operator= (const stack_symbol_type& that);
-#endif
-    };
-
-    /// A stack with random access from its top.
-    template <typename T, typename S = std::vector<T> >
-    class stack
-    {
-    public:
-      // Hide our reversed order.
-      typedef typename S::iterator iterator;
-      typedef typename S::const_iterator const_iterator;
-      typedef typename S::size_type size_type;
-      typedef typename std::ptrdiff_t index_type;
-
-      stack (size_type n = 200)
-        : seq_ (n)
-      {}
-
-#if 201103L <= YY_CPLUSPLUS
-      /// Non copyable.
-      stack (const stack&) = delete;
-      /// Non copyable.
-      stack& operator= (const stack&) = delete;
-#endif
-
-      /// Random access.
-      ///
-      /// Index 0 returns the topmost element.
-      const T&
-      operator[] (index_type i) const
-      {
-        return seq_[size_type (size () - 1 - i)];
-      }
-
-      /// Random access.
-      ///
-      /// Index 0 returns the topmost element.
-      T&
-      operator[] (index_type i)
-      {
-        return seq_[size_type (size () - 1 - i)];
-      }
-
-      /// Steal the contents of \a t.
-      ///
-      /// Close to move-semantics.
-      void
-      push (YY_MOVE_REF (T) t)
-      {
-        seq_.push_back (T ());
-        operator[] (0).move (t);
-      }
-
-      /// Pop elements from the stack.
-      void
-      pop (std::ptrdiff_t n = 1) YY_NOEXCEPT
-      {
-        for (; 0 < n; --n)
-          seq_.pop_back ();
-      }
-
-      /// Pop all elements from the stack.
-      void
-      clear () YY_NOEXCEPT
-      {
-        seq_.clear ();
-      }
-
-      /// Number of elements on the stack.
-      index_type
-      size () const YY_NOEXCEPT
-      {
-        return index_type (seq_.size ());
-      }
-
-      /// Iterator on top of the stack (going downwards).
-      const_iterator
-      begin () const YY_NOEXCEPT
-      {
-        return seq_.begin ();
-      }
-
-      /// Bottom of the stack.
-      const_iterator
-      end () const YY_NOEXCEPT
-      {
-        return seq_.end ();
-      }
-
-      /// Present a slice of the top of a stack.
-      class slice
-      {
-      public:
-        slice (const stack& stack, index_type range)
-          : stack_ (stack)
-          , range_ (range)
-        {}
-
-        const T&
-        operator[] (index_type i) const
-        {
-          return stack_[range_ - i];
-        }
-
-      private:
-        const stack& stack_;
-        index_type range_;
-      };
-
-    private:
-#if YY_CPLUSPLUS < 201103L
-      /// Non copyable.
-      stack (const stack&);
-      /// Non copyable.
-      stack& operator= (const stack&);
-#endif
-      /// The wrapped container.
-      S seq_;
-    };
-
-
-    /// Stack type.
-    typedef stack<stack_symbol_type> stack_type;
-
-    /// The stack.
-    stack_type yystack_;
-
-    /// Push a new state on the stack.
-    /// \param m    a debug message to display
-    ///             if null, no trace is output.
-    /// \param sym  the symbol
-    /// \warning the contents of \a s.value is stolen.
-    void yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym);
-
-    /// Push a new look ahead token on the state on the stack.
-    /// \param m    a debug message to display
-    ///             if null, no trace is output.
-    /// \param s    the state
-    /// \param sym  the symbol (for its value and location).
-    /// \warning the contents of \a sym.value is stolen.
-    void yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym);
-
-    /// Pop \a n symbols from the stack.
-    void yypop_ (int n = 1);
-
-    /// Constants.
-    enum
-    {
-      yylast_ = 164,     ///< Last index in yytable_.
-      yynnts_ = 30,  ///< Number of nonterminal symbols.
-      yyfinal_ = 4 ///< Termination state number.
-    };
-
-
-    // User arguments.
-    exptocas::scanner* scanner;
-
-  };
-
-
-} // exptocas
-
-
-// "%code provides" blocks.
-
-#if !defined(yyFlexLexer) && !defined(FlexLexerOnce)
-#define yyFlexLexer exptocasFlexLexer
-#include "FlexLexer.h"
-#endif
-namespace exptocas {
-    // To feed data back to bison, the yylex method needs yylval and
-    // yylloc parameters. Since the exptocasFlexLexer class is defined in the
-    // system header <FlexLexer.h> the signature of its yylex() method
-    // can not be changed anymore. This makes it necessary to derive a
-    // scanner class that provides a method with the desired signature:
-    class scanner : public exptocasFlexLexer
-    {
-    public:
-      explicit scanner(std::istream* in = 0, std::ostream* out = 0);
-
-      int lex(exptocas::parser::semantic_type* yylval);
-    };
-};
-
-
-
-#endif // !YY_EXPTOCAS_EXPTOCASEXE_EXPTOCAS_TAB_HXX_INCLUDED

src/ExpToCasExe/exptocas.yacc

@@ -1,506 +0,0 @@
-/* 
- Copyright (c) 1999-2022 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.
-*/
-
-%code top {
-  // Created:	Thu Oct 28 12:21:16 1999
-  // Author:	Andrey BETENEV
-  // Copyright (c) 1999-2020 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.
-
-  /*****************************************************************************
-  
-  This YACC parser implements parsing algorithm for EXPRESS -> CASCADE/XSTEP
-  classes generator
-  
-  Input in the form of tokens is obtained from lexical analyser. Then, data 
-  structure representing schema is created on the basis of grammar analysis.
-  
-  NOTE: The grammar currently implemented is not full. 
-  FUNCTION, RULE and CONSTANT items, WHERE, INVERSE and DERIVE clauses 
-  of TYPE and ENTITY items are not considered (ignored on the level of lexical 
-  scanner). 
-  SUPERTYPE and UNIQUE clauses of ENTITY item are recognized but ignored.
-  Also, complex constructs such as using call to function in dimensions of 
-  complex time or redefinition of inherited field are ignored.
-  
-  *****************************************************************************/
-}
-
-%language "C++"
-%require "3.2"
-%parse-param  {exptocas::scanner* scanner}
-
-%code requires {
-#include <OSD_OpenFile.hxx>
-#include <TCollection_HAsciiString.hxx>
-#include <TColStd_HSequenceOfHAsciiString.hxx>
-#include <Express_HSequenceOfField.hxx>
-#include <Express_HSequenceOfItem.hxx>
-#include <Express_Field.hxx>
-#include <Express_Item.hxx>
-#include <Express_Enum.hxx>
-#include <Express_Alias.hxx>
-#include <Express_Select.hxx>
-#include <Express_Entity.hxx>
-#include <Express_Type.hxx>
-#include <Express_NamedType.hxx>
-#include <Express_PredefinedType.hxx>
-#include <Express_Number.hxx>
-#include <Express_Integer.hxx>
-#include <Express_Boolean.hxx>
-#include <Express_Logical.hxx>
-#include <Express_Real.hxx>
-#include <Express_String.hxx>
-#include <Express_ComplexType.hxx>
-#include <Express_Array.hxx>
-#include <Express_List.hxx>
-#include <Express_Set.hxx>
-#include <Express_Bag.hxx>
-#include <Express_Schema.hxx>
-#include <Express_Reference.hxx>
-#include <Express.hxx>
-  
-namespace exptocas {
-  class scanner;
-};
-#ifdef _MSC_VER
-// disable MSVC warning C4522: 'exptocas::parser::stack_symbol_type': multiple assignment operators
-#pragma warning(disable: 4522)
-#endif
-}
-
-%code {
-#undef yylex
-#define yylex scanner->lex
-// disable MSVC warnings in bison code
-#ifdef _MSC_VER
-#pragma warning(disable:4244 4800)
-#endif
-
-/************************************************/
-/* ERROR MESSAGE FUNCTION                       */
-
-/* external functions (from exptocas.l) */
-int ec_error ( const std::string& s, const std::string& text );
-int ec_curline ( void );
-
-//int yyerror ( char *s )
-//{
-//  printf ( "\nParse error at line %d: %s\n", ec_curline(), s );
-//  return 0;
-//}
-
-/************************************************/
-/* FUNCTIONS FOR CREATING SCHEMA REPRESENTATION */
-
-static Express_Schema *mkschema ( char *name, Express_HSequenceOfItem *ilist );
-static Express_HSequenceOfItem *mkilist ( Express_Item *item, Express_HSequenceOfItem *seq );
-static Express_Item *mkenum ( char *name, TColStd_HSequenceOfHAsciiString *tlist );
-static Express_Item *mkselect ( char *name, TColStd_HSequenceOfHAsciiString *tlist );
-static Express_Item *mkalias ( char *name, Express_Type *type );
-static Express_Item *mkentity ( char *name, TColStd_HSequenceOfHAsciiString *inherit,
-                                Express_HSequenceOfField *field, int isabstract );
-static Express_Reference *mkrefs ( char *name, TColStd_HSequenceOfHAsciiString *items);
-static TColStd_HSequenceOfHAsciiString *mktlist ( char *name, TColStd_HSequenceOfHAsciiString *tlist );
-static TColStd_HSequenceOfHAsciiString *mktlists ( TColStd_HSequenceOfHAsciiString *tlist1, TColStd_HSequenceOfHAsciiString *tlist2 );
-static Express_Type *mktstd ( int keyword );
-static Express_Type *mktname ( char *name );
-static Express_Type *mktset ( int keyword, int ilow, int ihigh, Express_Type *of );
-static Express_Field *mkfield ( char *name, Express_Type *type, int optional );
-static Express_HSequenceOfField *mkflist ( Express_Field *field, Express_HSequenceOfField *seq );
-}
-
-%code provides {
-#if !defined(yyFlexLexer) && !defined(FlexLexerOnce)
-#define yyFlexLexer exptocasFlexLexer
-#include "FlexLexer.h"
-#endif
-namespace exptocas {
-    // To feed data back to bison, the yylex method needs yylval and
-    // yylloc parameters. Since the exptocasFlexLexer class is defined in the
-    // system header <FlexLexer.h> the signature of its yylex() method
-    // can not be changed anymore. This makes it necessary to derive a
-    // scanner class that provides a method with the desired signature:
-    class scanner : public exptocasFlexLexer
-    {
-    public:
-      explicit scanner(std::istream* in = 0, std::ostream* out = 0);
-
-      int lex(exptocas::parser::semantic_type* yylval);
-    };
-};
-}
-
-/* Definition of possible types of expressions */
-%union {
-  int num;
-  char *str;
-  TColStd_HSequenceOfHAsciiString *tlist;
-  Express_HSequenceOfField *flist;
-  Express_HSequenceOfItem *ilist;
-  Express_Field *field;
-  Express_Item *item;
-  Express_Type *type;
-  Express_Schema *schema;
-  Express_Reference *ref;
-}
-
-/* Definition of keywords */
-
-%token <num> KSCHEM  /* SCHEMA keyword */
-%token <num> KENDS   /* END_SCHEMA keyword */
-%token <num> KTYP    /* TYPE keyword */
-%token <num> KENDT   /* END_TYPE keyword */
-%token <num> KENT    /* ENTITY keyword */
-%token <num> KENDE   /* END_ENTITY keyword */
-%token <num> KREF    /* REFERENCE keyword */
-%token <num> KFROM   /* FROM keyword */
-
-%token <num> KSEL    /* SELECT keyword */
-%token <num> KENUM   /* ENUMERATION keyword */
-%token <num> KLIST   /* LIST keyword */
-%token <num> KARR    /* ARRAY keyword */
-%token <num> KBAG    /* BAG keyword */
-%token <num> KSET    /* SET keyword */
-%token <num> KOF     /* OF keyword */
-
-%token <num> KNUM    /* NUMBER keyword */
-%token <num> KINT    /* INTEGER keyword */
-%token <num> KDBL    /* REAL keyword */
-%token <num> KSTR    /* STRING keyword */
-%token <num> KLOG    /* LOGICAL keyword */
-%token <num> KBOOL   /* BOOLEAN keyword */
-
-%token <num> KOPT    /* OPTIONAL keyword */
-%token <num> KUNIQ   /* UNIQUE keyword */
-%token <num> KSELF   /* SELF keyword */
-
-%token <num> KABSTR  /* ABSTRACT keyword */
-%token <num> KSUBT   /* SUBTYPE keyword */
-%token <num> KSPRT   /* SUPERTYPE keyword */
-%left  <num> KANDOR  /* ANDOR keyword (%left is for eliminating shift/reduce conflict on SUPLST) */
-%left  <num> K1OF    /* ONEOF keyword */
-%token <num> KAND    /* AND keyword */
-
-%token <num> NUMBER  /* integer value */
-%token <str> NAME    /* name of type or entity */
-
-%left ','            /* to eliminate shift/reduce conflict in SUPERTYPE */
-
-  /* Definition of expressions and their types */
-
-%type <num>    INDEX OPTNL OPTUNI SUPERT SUPLST REDEF SPCLST
-%type <tlist>  TLIST TLIST1 UNIQIT UNIQLS UNIQUE SUBT SPECIF
-%type <type>   TYPE TSTD TNAME TSET 
-%type <item>   ENUM SELECT ALIAS ENTITY ITEM
-%type <ilist>  ILIST
-%type <field>  FIELD
-%type <flist>  FLIST FLIST1
-%type <schema> SCHEMA
-%type <ref>    REFERENCE
-
-%%
-
-  /************************************************/
-  /*  Definition of parsing rules (expressions)   */
-  /************************************************/
-
-SCHEMA: KSCHEM NAME ';' ILIST KENDS ';' { $$ = mkschema ( $2, $4 ); /* Root: EXPRESS schema */ }
-      ;
-ILIST : ITEM             { $$ = mkilist ( $1, 0 ); /* list of items for schema */ }
-      | ITEM ILIST       { $$ = mkilist ( $1, $2 ); }
-      ;
-
-ITEM  : ENUM
-      | SELECT
-      | ALIAS
-      | REFERENCE
-      | ENTITY           { $$ = $1; /* item of schema (type definition) */ }
-	  ;
-ENUM  : KTYP NAME '=' KENUM KOF TLIST1 ';' KENDT ';' { $$ = mkenum ( $2, $6 ); /* TYPE ENUMERATION definition */ }
-      ;
-SELECT: KTYP NAME '=' KSEL TLIST1 ';' KENDT ';' { $$ = mkselect ( $2, $5 ); /* TYPE SELECT definition */ }
-      ;
-ALIAS : KTYP NAME '=' TYPE ';' KENDT ';' { $$ = mkalias ( $2, $4 ); /* TYPE '=' definition (alias) */ }
-      ;
-ENTITY: KENT NAME        SUPERT SUBT ';' FLIST1 UNIQUE KENDE ';' { $$ = mkentity ( $2, $4, $6, 0 ); /* ENTITY definition */ }
-      | KENT NAME KABSTR SUPERT SUBT ';' FLIST1 UNIQUE KENDE ';' { $$ = mkentity ( $2, $5, $7, 1 ); /* ENTITY definition */ }
-      ;
-
-REFERENCE: KREF KFROM NAME TLIST1 ';' { $$ = mkrefs ( $3, $4 ); /* REFERENCE FROM definition */ }
-      ;
-
-TLIST : NAME             { $$ = mktlist ( $1, 0 ); /* list of (type) names */ }
-      | NAME ',' TLIST   { $$ = mktlist ( $1, $3 ); }
-      ;
-TLIST1: '(' TLIST ')'    { $$ = $2; /* TLIST in brackets */ }
-      ;
-
-TYPE  : TSTD
-      | TNAME
-      | TSET             { $$ = $1; /* type, simple or complex */ }
-      ;
-TSTD  : KINT             { $$ = mktstd ( $1 ); /* predefined type: INTEGER */ }
-      | KNUM             { $$ = mktstd ( $1 ); /* predefined type: NUMBER */ }
-      | KDBL             { $$ = mktstd ( $1 ); /* predefined type: REAL */ }
-      | KSTR             { $$ = mktstd ( $1 ); /* predefined type: STRING */ }
-      | KLOG             { $$ = mktstd ( $1 ); /* predefined type: LOGICAL */ }
-      | KBOOL            { $$ = mktstd ( $1 ); /* predefined type: BOOLEAN */ }
-      ;                  
-TNAME : NAME             { $$ = mktname ( $1 ); /* named type */ }
-      ;
-TSET  : KLIST '[' INDEX ':' INDEX ']' KOF OPTUNI TYPE { $$ = mktset ( $1, $3, $5, $9 ); /* complex type: LIST */ }
-      | KARR  '[' INDEX ':' INDEX ']' KOF OPTUNI TYPE { $$ = mktset ( $1, $3, $5, $9 ); /* complex type: ARRAY */ }
-      | KSET  '[' INDEX ':' INDEX ']' KOF OPTUNI TYPE { $$ = mktset ( $1, $3, $5, $9 ); /* complex type: SET */ }
-      | KBAG  '[' INDEX ':' INDEX ']' KOF OPTUNI TYPE { $$ = mktset ( $1, $3, $5, $9 ); /* complex type: BAG */ }
-      ;
-INDEX : NUMBER           { $$ = $1; /* index for array, set, bag, list range */ }
-      | '?'              { $$ = -1; /* undefined */ }
-      | NAME '(' NAME ')' {$$ = -1; printf ( "Warning at line %d: index function %s(%s) ignored\n", ec_curline(), $1, $3 ); /* some function.. */ }
-      ;
-OPTUNI: /* empty */      { $$ = 0; /* UNIQUE keyword for complex type definition */ }
-      | KUNIQ            { $$ = 1; }
-      ;
-
-SUBT  : /* empty */      { $$ = NULL; /* no subtype clause */ }
-      | KSUBT KOF TLIST1 { $$ = $3;   /* subtype clause */ }
-      ;
-SUPERT: /* empty */      { $$ = 0;  /* no supertype clause */ }
-      | KSPRT            { $$ = 0;  /* supertype clause (ignored) */ }
-      | KSPRT KOF SUPLST { $$ = 0;  /* supertype clause (ignored) */ }
-      ;
-SUPLST: NAME             { $$ = 0; /* simple list of supertypes */ }
-      | '(' SUPLST ')'   { $$ = 0; /* allow bracketing */ }
-      | NAME ',' SUPLST  { $$ = 0; /* ... */ }
-      | K1OF SUPLST      { $$ = 0; /* ONEOF construct */ }
-      | SUPLST KANDOR SUPLST { $$ = 0; /* ANDOR construct */ }
-      ;
-
-FLIST : FIELD            { $$ = mkflist ( $1, 0 ); /* list of fields of ENTITY item */ }
-      | FIELD FLIST      { $$ = mkflist ( $1, $2 ); }
-      | REDEF            { $$ = 0;  /* redefinition of inherited field, just skip */ }
-      | REDEF FLIST      { $$ = $2; /* ignore redefinition of inherited field, take trailing list */ }
-      ;
-FLIST1: /* empty */      { $$ = NULL; /* empty list of fields */ }
-      | FLIST            { $$ = $1;   /* or not empty.. just to fix reduce/reduce conflict */ }
-      ;
-FIELD : NAME ':' OPTNL TYPE ';' { $$ = mkfield ( $1, $4, $3 ); }
-      ;
-REDEF : KSELF '\\' SPECIF ':' TYPE ';' { $$ = 0; printf ( "Warning at line %d: field redefinition ignored\n", ec_curline() ); /* redefinition of inherited field */ }
-      ;
-SPECIF: NAME             { $$ = mktlist ( $1, 0 ); /* inherited field specification */ } 
-      | NAME '.' SPECIF  { $$ = mktlist ( $1, $3 ); }
-      ;
-
-OPTNL : /* empty */      { $$ = 0; }
-      | KOPT             { $$ = 1; }
-      ;
-
-UNIQIT: NAME ':' TLIST ';'  { $$ = $3;   /* UNIQUE statement */ }
-      | NAME ':' SPCLST ';' { $$ = NULL; /* UNIQUE statement */ }
-      ;
-UNIQLS: UNIQIT           { $$ = NULL;    /* list of 1 UNIQUE statements */ }
-      | UNIQIT UNIQLS    { $$ = mktlists ( $1, $2 );/* list of UNIQUE statements */ }
-      ;
-UNIQUE: /* empty */      { $$ = NULL;    /* no UNIQUE clause in ENTITY */ }
-      | KUNIQ UNIQLS     { $$ = $2;      /* UNIQUE clause in ENTITY */ }
-      ;
-SPCLST: KSELF '\\' SPECIF      { $$ = 0; /* list of specifications */ }
-      | KSELF '\\' SPECIF ',' SPCLST { $$ = 0; }
-      | NAME ',' SPCLST        { $$ = 0; }
-      ;
-
-%%
-
-/************************************************/
-/* FUNCTIONS FOR CREATING SCHEMA REPRESENTATION */
-
-static Express_Schema *mkschema ( char *name, Express_HSequenceOfItem *ilist )
-{
-  Express_Schema *sch = new Express_Schema ( name, ilist );
-  Express::Schema() = sch;
-  return sch;
-}
-
-static Express_HSequenceOfItem *mkilist ( Express_Item *item, Express_HSequenceOfItem *seq )
-{
-  if ( ! seq ) { 
-    seq = new Express_HSequenceOfItem;
-    seq->Append ( item );
-  }
-  else seq->Prepend ( item );
-  return seq;
-}
-
-static Express_Item *mkenum ( char *name, TColStd_HSequenceOfHAsciiString *tlist )
-{
-  return new Express_Enum ( name, tlist );
-}
-
-static Express_Item *mkselect ( char *name, TColStd_HSequenceOfHAsciiString *tlist )
-{
-  return new Express_Select ( name, tlist );
-}
-
-static Express_Item *mkalias ( char *name, Express_Type *type )
-{
-  return new Express_Alias ( name, type );
-}
-
-static Express_Item *mkentity ( char *name, TColStd_HSequenceOfHAsciiString *inherit,
-				 Express_HSequenceOfField *field, int isabstract )
-{
-  Express_Entity *ent = new Express_Entity ( name, inherit, field );
-  if ( isabstract ) ent->SetAbstractFlag ( Standard_True );
-  return ent;
-}
-
-static Express_Reference *mkrefs ( char *name, TColStd_HSequenceOfHAsciiString *items)
-{
-  return new Express_Reference ( name, items );
-}
-
-static TColStd_HSequenceOfHAsciiString *mktlist ( char *name, TColStd_HSequenceOfHAsciiString *tlist )
-{
-  Handle(TCollection_HAsciiString) str = new TCollection_HAsciiString ( name );
-  if ( tlist ) tlist->Prepend ( str );
-  else {
-    tlist = new TColStd_HSequenceOfHAsciiString;
-    tlist->Append ( str );
-  }
-  return tlist;
-}
-
-static TColStd_HSequenceOfHAsciiString *mktlists ( TColStd_HSequenceOfHAsciiString *tlist1, 
-						   TColStd_HSequenceOfHAsciiString *tlist2 )
-{
-  if ( ! tlist1 ) return tlist2;
-  if ( ! tlist2 ) return tlist1;
-  for ( int i=1; i <= tlist2->Length(); i++ )
-    tlist1->Append ( tlist2->Value(i) );
-  return tlist1;
-}
-
-static Express_Type *mktstd ( int keyword )
-{
-  switch ( keyword ) {
-  case exptocas::parser::token::KINT : return new Express_Integer;
-  case exptocas::parser::token::KNUM : return new Express_Number;
-  case exptocas::parser::token::KDBL : return new Express_Real;
-  case exptocas::parser::token::KSTR : return new Express_String;
-  case exptocas::parser::token::KBOOL: return new Express_Boolean;
-  case exptocas::parser::token::KLOG : return new Express_Logical;
-  default   : ec_error ( "Predefined type not treated!", "" );
-    return NULL;
-  }
-}
-
-static Express_Type *mktname ( char *name )
-{
-  return new Express_NamedType ( name );
-}
-
-static Express_Type *mktset ( int keyword, int ilow, int ihigh, Express_Type *of )
-{
-  switch ( keyword ) {
-  case exptocas::parser::token::KLIST: return new Express_List  ( ilow, ihigh, of );
-  case exptocas::parser::token::KARR : return new Express_Array ( ilow, ihigh, of );
-  case exptocas::parser::token::KBAG : return new Express_Bag   ( ilow, ihigh, of );
-  case exptocas::parser::token::KSET : return new Express_Set   ( ilow, ihigh, of );
-  default   : ec_error ( "Complex type not treated!", "" );
-    return NULL;
-  }
-}
-
-static Express_Field *mkfield ( char *name, Express_Type *type, int optional )
-{
-  return new Express_Field ( name, type, optional );
-}
-
-static Express_HSequenceOfField *mkflist ( Express_Field *field, Express_HSequenceOfField *seq )
-{
-  if ( seq ) seq->Prepend ( field );
-  else {
-    seq = new Express_HSequenceOfField;
-    seq->Append ( field );
-  }
-  return seq;
-}
-
-/*******************************************************************/
-/* MAIN & co */
-
-/*
-void tlistfree ( struct tlist *list )
-{
-  if ( ! list ) return;
-  tlistfree ( list->next );
-  list->next = 0;
-  free ( list->str );
-  list->str = 0;
-}
-* /
-
-int printtlist ( struct ec_tlist *tl )
-{
-  int num=0;
-  while ( tl ) {
-    num++;
-    printf ( "%s\n", tl->name );
-    tl = tl->next;
-  }
-  return num;
-}
-
-int main ( void )
-{
-  int num = 0;
-  yyparse();
-
-  printf ( "\nFinished\n" );
-  if ( schema ) {
-    struct ec_item *it;
-    it = schema->items;
-    printf ( "\nSchema %s", schema->name );
-    printf ( "\nItems:" );
-    while ( it ) {
-      num++;
-      printf ( "\n%s", it->name );
-      it = it->next;
-    }
-//    num = printtlist ( res );
-    printf ( "\nTotal %d", num );
-  }
-
-//  tlistfree ( yylval.tlist );
-  return num;
-}
-*/
-
-void exptocas::parser::error(const std::string& s)
-{
-  printf("\nParse error at line %d: %s\n", scanner->lineno(), s.c_str());
-}
-

src/ExpToCasExe/occt_existed_step_entities.lst

@@ -1,942 +0,0 @@
-# Last update 27.10.2021
-#===============================================
-#             package StepAP203
-#===============================================
-ApprovedItem StepAP203
-CcDesignApproval StepAP203
-CcDesignCertification StepAP203
-CcDesignContract StepAP203
-CcDesignDateAndTimeAssignment StepAP203
-CcDesignPersonAndOrganizationAssignment StepAP203
-CcDesignSecurityClassification StepAP203
-CcDesignSpecificationReference StepAP203
-CertifiedItem StepAP203
-Change StepAP203
-ChangeRequest StepAP203
-ChangeRequestItem StepAP203
-ClassifiedItem StepAP203
-ContractedItem StepAP203
-DateTimeItem StepAP203
-PersonOrganizationItem StepAP203
-SpecifiedItem StepAP203
-StartRequest StepAP203
-StartRequestItem StepAP203
-StartWork StepAP203
-WorkItem StepAP203
-
-#===============================================
-#             package StepAP214
-#===============================================
-AppliedApprovalAssignment StepAP214
-AppliedDateAndTimeAssignment StepAP214
-AppliedDateAssignment StepAP214
-AppliedDocumentReference StepAP214
-AppliedExternalIdentificationAssignment StepAP214
-AppliedGroupAssignment StepAP214
-AppliedOrganizationAssignment StepAP214
-AppliedPersonAndOrganizationAssignment StepAP214
-AppliedPresentedItem StepAP214
-AppliedSecurityClassificationAssignment StepAP214
-ApprovalItem StepAP214
-AutoDesignActualDateAndTimeAssignment StepAP214
-AutoDesignActualDateAssignment StepAP214
-AutoDesignApprovalAssignment StepAP214
-AutoDesignDateAndPersonAssignment StepAP214
-AutoDesignDateAndPersonItem StepAP214
-AutoDesignDateAndTimeItem StepAP214
-AutoDesignDatedItem StepAP214
-AutoDesignDocumentReference StepAP214
-AutoDesignGeneralOrgItem StepAP214
-AutoDesignGroupAssignment StepAP214
-AutoDesignGroupedItem StepAP214
-AutoDesignNominalDateAndTimeAssignment StepAP214
-AutoDesignNominalDateAssignment StepAP214
-AutoDesignOrganizationAssignment StepAP214
-AutoDesignOrganizationItem StepAP214
-AutoDesignPersonAndOrganizationAssignment StepAP214
-AutoDesignPresentedItem StepAP214
-AutoDesignPresentedItemSelect StepAP214
-AutoDesignReferencingItem StepAP214
-AutoDesignSecurityClassificationAssignment StepAP214
-Class StepAP214
-DateAndTimeItem StepAP214
-DateItem StepAP214
-DocumentReferenceItem StepAP214
-ExternalIdentificationItem StepAP214
-ExternallyDefinedClass StepAP214
-ExternallyDefinedGeneralProperty StepAP214
-GroupItem StepAP214
-OrganizationItem StepAP214
-PersonAndOrganizationItem StepAP214
-PresentedItemSelect StepAP214
-Protocol StepAP214
-RepItemGroup StepAP214
-SecurityClassificationItem StepAP214
-
-#===============================================
-#             package StepAP242
-#===============================================
-DraughtingModelItemAssociation StepAP242
-GeometricItemSpecificUsage StepAP242
-IdAttribute StepAP242
-IdAttributeSelect StepAP242
-ItemIdentifiedRepresentationUsage StepAP242
-ItemIdentifiedRepresentationUsageDefinition StepAP242
-
-#===============================================
-#             package StepBasic
-#===============================================
-Action StepBasic
-ActionAssignment StepBasic
-ActionMethod StepBasic
-ActionRequestAssignment StepBasic
-ActionRequestSolution StepBasic
-Address StepBasic
-AheadOrBehind StepBasic
-ApplicationContext StepBasic
-ApplicationContextElement StepBasic
-ApplicationProtocolDefinition StepBasic
-Approval StepBasic
-ApprovalAssignment StepBasic
-ApprovalDateTime StepBasic
-ApprovalPersonOrganization StepBasic
-ApprovalRelationship StepBasic
-ApprovalRole StepBasic
-ApprovalStatus StepBasic
-AreaUnit StepBasic
-CalendarDate StepBasic
-Certification StepBasic
-CertificationAssignment StepBasic
-CertificationType StepBasic
-CharacterizedObject StepBasic
-Contract StepBasic
-ContractAssignment StepBasic
-ContractType StepBasic
-ConversionBasedUnit StepBasic
-ConversionBasedUnitAndAreaUnit StepBasic
-ConversionBasedUnitAndLengthUnit StepBasic
-ConversionBasedUnitAndMassUnit StepBasic
-ConversionBasedUnitAndPlaneAngleUnit StepBasic
-ConversionBasedUnitAndRatioUnit StepBasic
-ConversionBasedUnitAndSolidAngleUnit StepBasic
-ConversionBasedUnitAndTimeUnit StepBasic
-ConversionBasedUnitAndVolumeUnit StepBasic
-CoordinatedUniversalTimeOffset StepBasic
-Date StepBasic
-DateAndTime StepBasic
-DateAndTimeAssignment StepBasic
-DateAssignment StepBasic
-DateRole StepBasic
-DateTimeRole StepBasic
-DateTimeSelect StepBasic
-DerivedUnit StepBasic
-DerivedUnitElement StepBasic
-DesignContext StepBasic
-DigitalDocument StepBasic
-DimensionalExponents StepBasic
-Document StepBasic
-DocumentFile StepBasic
-DocumentProductAssociation StepBasic
-DocumentProductEquivalence StepBasic
-DocumentReference StepBasic
-DocumentRelationship StepBasic
-DocumentRepresentationType StepBasic
-DocumentType StepBasic
-DocumentUsageConstraint StepBasic
-Effectivity StepBasic
-EffectivityAssignment StepBasic
-EulerAngles StepBasic
-ExternalIdentificationAssignment StepBasic
-ExternallyDefinedItem StepBasic
-ExternalSource StepBasic
-GeneralProperty StepBasic
-Group StepBasic
-GroupAssignment StepBasic
-GroupRelationship StepBasic
-IdentificationAssignment StepBasic
-IdentificationRole StepBasic
-LengthMeasureWithUnit StepBasic
-LengthUnit StepBasic
-LocalTime StepBasic
-MassMeasureWithUnit StepBasic
-MassUnit StepBasic
-MeasureValueMember StepBasic
-MeasureWithUnit StepBasic
-MechanicalContext StepBasic
-NameAssignment StepBasic
-NamedUnit StepBasic
-ObjectRole StepBasic
-OrdinalDate StepBasic
-Organization StepBasic
-OrganizationalAddress StepBasic
-OrganizationAssignment StepBasic
-OrganizationRole StepBasic
-Person StepBasic
-PersonalAddress StepBasic
-PersonAndOrganization StepBasic
-PersonAndOrganizationAssignment StepBasic
-PersonAndOrganizationRole StepBasic
-PersonOrganizationSelect StepBasic
-PhysicallyModeledProductDefinition StepBasic
-PlaneAngleMeasureWithUnit StepBasic
-PlaneAngleUnit StepBasic
-Product StepBasic
-ProductCategory StepBasic
-ProductCategoryRelationship StepBasic
-ProductConceptContext StepBasic
-ProductContext StepBasic
-ProductDefinition StepBasic
-ProductDefinitionContext StepBasic
-ProductDefinitionEffectivity StepBasic
-ProductDefinitionFormation StepBasic
-ProductDefinitionFormationRelationship StepBasic
-ProductDefinitionFormationWithSpecifiedSource StepBasic
-ProductDefinitionOrReference StepBasic
-ProductDefinitionReference StepBasic
-ProductDefinitionReferenceWithLocalRepresentation StepBasic
-ProductDefinitionRelationship StepBasic
-ProductDefinitionWithAssociatedDocuments StepBasic
-ProductOrFormationOrDefinition StepBasic
-ProductRelatedProductCategory StepBasic
-ProductType StepBasic
-RatioMeasureWithUnit StepBasic
-RatioUnit StepBasic
-RoleAssociation StepBasic
-RoleSelect StepBasic
-SecurityClassification StepBasic
-SecurityClassificationAssignment StepBasic
-SecurityClassificationLevel StepBasic
-SiPrefix StepBasic
-SiUnit StepBasic
-SiUnitAndAreaUnit StepBasic
-SiUnitAndLengthUnit StepBasic
-SiUnitAndMassUnit StepBasic
-SiUnitAndPlaneAngleUnit StepBasic
-SiUnitAndRatioUnit StepBasic
-SiUnitAndSolidAngleUnit StepBasic
-SiUnitAndThermodynamicTemperatureUnit StepBasic
-SiUnitAndTimeUnit StepBasic
-SiUnitAndVolumeUnit StepBasic
-SiUnitName StepBasic
-SizeMember StepBasic
-SizeSelect StepBasic
-SolidAngleMeasureWithUnit StepBasic
-SolidAngleUnit StepBasic
-Source StepBasic
-SourceItem StepBasic
-ThermodynamicTemperatureUnit StepBasic
-TimeMeasureWithUnit StepBasic
-TimeUnit StepBasic
-UncertaintyMeasureWithUnit StepBasic
-Unit StepBasic
-VersionedActionRequest StepBasic
-VolumeUnit StepBasic
-WeekOfYearAndDayDate StepBasic
-
-#===============================================
-#             package StepDimTol
-#===============================================
-AngularityTolerance StepDimTol
-AreaUnitType StepDimTol
-CircularRunoutTolerance StepDimTol
-CoaxialityTolerance StepDimTol
-CommonDatum StepDimTol
-ConcentricityTolerance StepDimTol
-CylindricityTolerance StepDimTol
-Datum StepDimTol
-DatumFeature StepDimTol
-DatumOrCommonDatum StepDimTol
-DatumReference StepDimTol
-DatumReferenceCompartment StepDimTol
-DatumReferenceElement StepDimTol
-DatumReferenceModifier StepDimTol
-DatumReferenceModifierType StepDimTol
-DatumReferenceModifierWithValue StepDimTol
-DatumSystem StepDimTol
-DatumSystemOrReference StepDimTol
-DatumTarget StepDimTol
-FlatnessTolerance StepDimTol
-GeneralDatumReference StepDimTol
-GeometricTolerance StepDimTol
-GeometricToleranceModifier StepDimTol
-GeometricToleranceRelationship StepDimTol
-GeometricToleranceTarget StepDimTol
-GeometricToleranceType StepDimTol
-GeometricToleranceWithDatumReference StepDimTol
-GeometricToleranceWithDefinedAreaUnit StepDimTol
-GeometricToleranceWithDefinedUnit StepDimTol
-GeometricToleranceWithMaximumTolerance StepDimTol
-GeometricToleranceWithModifiers StepDimTol
-GeoTolAndGeoTolWthDatRef StepDimTol
-GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol StepDimTol
-GeoTolAndGeoTolWthDatRefAndGeoTolWthMod StepDimTol
-GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol StepDimTol
-GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol StepDimTol
-GeoTolAndGeoTolWthMaxTol StepDimTol
-GeoTolAndGeoTolWthMod StepDimTol
-LimitCondition StepDimTol
-LineProfileTolerance StepDimTol
-ModifiedGeometricTolerance StepDimTol
-NonUniformZoneDefinition StepDimTol
-ParallelismTolerance StepDimTol
-PerpendicularityTolerance StepDimTol
-PlacedDatumTargetFeature StepDimTol
-PositionTolerance StepDimTol
-ProjectedZoneDefinition StepDimTol
-RoundnessTolerance StepDimTol
-RunoutZoneDefinition StepDimTol
-RunoutZoneOrientation StepDimTol
-ShapeToleranceSelect StepDimTol
-SimpleDatumReferenceModifier StepDimTol
-SimpleDatumReferenceModifierMember StepDimTol
-StraightnessTolerance StepDimTol
-SurfaceProfileTolerance StepDimTol
-SymmetryTolerance StepDimTol
-ToleranceZone StepDimTol
-ToleranceZoneDefinition StepDimTol
-ToleranceZoneForm StepDimTol
-ToleranceZoneTarget StepDimTol
-TotalRunoutTolerance StepDimTol
-UnequallyDisposedGeometricTolerance StepDimTol
-
-#===============================================
-#             package StepElement
-#===============================================
-AnalysisItemWithinRepresentation StepElement
-Curve3dElementDescriptor StepElement
-CurveEdge StepElement
-CurveElementEndReleasePacket StepElement
-CurveElementFreedom StepElement
-CurveElementFreedomMember StepElement
-CurveElementPurpose StepElement
-CurveElementPurposeMember StepElement
-CurveElementSectionDefinition StepElement
-CurveElementSectionDerivedDefinitions StepElement
-Element2dShape StepElement
-ElementAspect StepElement
-ElementAspectMember StepElement
-ElementDescriptor StepElement
-ElementMaterial StepElement
-ElementOrder StepElement
-ElementVolume StepElement
-EnumeratedCurveElementFreedom StepElement
-EnumeratedCurveElementPurpose StepElement
-EnumeratedSurfaceElementPurpose StepElement
-EnumeratedVolumeElementPurpose StepElement
-MeasureOrUnspecifiedValue StepElement
-MeasureOrUnspecifiedValueMember StepElement
-Surface3dElementDescriptor StepElement
-SurfaceElementProperty StepElement
-SurfaceElementPurpose StepElement
-SurfaceElementPurposeMember StepElement
-SurfaceSection StepElement
-SurfaceSectionField StepElement
-SurfaceSectionFieldConstant StepElement
-SurfaceSectionFieldVarying StepElement
-UniformSurfaceSection StepElement
-UnspecifiedValue StepElement
-Volume3dElementDescriptor StepElement
-Volume3dElementShape StepElement
-VolumeElementPurpose StepElement
-VolumeElementPurposeMember StepElement
-
-#===============================================
-#             package StepFEA
-#===============================================
-AlignedCurve3dElementCoordinateSystem StepFEA
-AlignedSurface3dElementCoordinateSystem StepFEA
-ArbitraryVolume3dElementCoordinateSystem StepFEA
-ConstantSurface3dElementCoordinateSystem StepFEA
-CoordinateSystemType StepFEA
-Curve3dElementProperty StepFEA
-Curve3dElementRepresentation StepFEA
-CurveEdge StepFEA
-CurveElementEndCoordinateSystem StepFEA
-CurveElementEndOffset StepFEA
-CurveElementEndRelease StepFEA
-CurveElementInterval StepFEA
-CurveElementIntervalConstant StepFEA
-CurveElementIntervalLinearlyVarying StepFEA
-CurveElementLocation StepFEA
-DegreeOfFreedom StepFEA
-DegreeOfFreedomMember StepFEA
-DummyNode StepFEA
-ElementGeometricRelationship StepFEA
-ElementGroup StepFEA
-ElementOrElementGroup StepFEA
-ElementRepresentation StepFEA
-ElementVolume StepFEA
-EnumeratedDegreeOfFreedom StepFEA
-FeaAreaDensity StepFEA
-FeaAxis2Placement3d StepFEA
-FeaCurveSectionGeometricRelationship StepFEA
-FeaGroup StepFEA
-FeaLinearElasticity StepFEA
-FeaMassDensity StepFEA
-FeaMaterialPropertyRepresentation StepFEA
-FeaMaterialPropertyRepresentationItem StepFEA
-FeaModel StepFEA
-FeaModel3d StepFEA
-FeaModelDefinition StepFEA
-FeaMoistureAbsorption StepFEA
-FeaParametricPoint StepFEA
-FeaRepresentationItem StepFEA
-FeaSecantCoefficientOfLinearThermalExpansion StepFEA
-FeaShellBendingStiffness StepFEA
-FeaShellMembraneBendingCouplingStiffness StepFEA
-FeaShellMembraneStiffness StepFEA
-FeaShellShearStiffness StepFEA
-FeaSurfaceSectionGeometricRelationship StepFEA
-FeaTangentialCoefficientOfLinearThermalExpansion StepFEA
-FreedomAndCoefficient StepFEA
-FreedomsList StepFEA
-GeometricNode StepFEA
-Node StepFEA
-NodeDefinition StepFEA
-NodeGroup StepFEA
-NodeRepresentation StepFEA
-NodeSet StepFEA
-NodeWithSolutionCoordinateSystem StepFEA
-NodeWithVector StepFEA
-ParametricCurve3dElementCoordinateDirection StepFEA
-ParametricCurve3dElementCoordinateSystem StepFEA
-ParametricSurface3dElementCoordinateSystem StepFEA
-Surface3dElementRepresentation StepFEA
-SymmetricTensor22d StepFEA
-SymmetricTensor23d StepFEA
-SymmetricTensor23dMember StepFEA
-SymmetricTensor42d StepFEA
-SymmetricTensor43d StepFEA
-SymmetricTensor43dMember StepFEA
-UnspecifiedValue StepFEA
-Volume3dElementRepresentation StepFEA
-
-#===============================================
-#             package StepGeom
-#===============================================
-Axis1Placement StepGeom
-Axis2Placement StepGeom
-Axis2Placement2d StepGeom
-Axis2Placement3d StepGeom
-BezierCurve StepGeom
-BezierCurveAndRationalBSplineCurve StepGeom
-BezierSurface StepGeom
-BezierSurfaceAndRationalBSplineSurface StepGeom
-BoundaryCurve StepGeom
-BoundedCurve StepGeom
-BoundedSurface StepGeom
-BSplineCurve StepGeom
-BSplineCurveForm StepGeom
-BSplineCurveWithKnots StepGeom
-BSplineCurveWithKnotsAndRationalBSplineCurve StepGeom
-BSplineSurface StepGeom
-BSplineSurfaceForm StepGeom
-BSplineSurfaceWithKnots StepGeom
-BSplineSurfaceWithKnotsAndRationalBSplineSurface StepGeom
-CartesianPoint StepGeom
-CartesianTransformationOperator StepGeom
-CartesianTransformationOperator2d StepGeom
-CartesianTransformationOperator3d StepGeom
-Circle StepGeom
-CompositeCurve StepGeom
-CompositeCurveOnSurface StepGeom
-CompositeCurveSegment StepGeom
-Conic StepGeom
-ConicalSurface StepGeom
-Curve StepGeom
-CurveBoundedSurface StepGeom
-CurveOnSurface StepGeom
-CurveReplica StepGeom
-CylindricalSurface StepGeom
-DegeneratePcurve StepGeom
-DegenerateToroidalSurface StepGeom
-Direction StepGeom
-ElementarySurface StepGeom
-Ellipse StepGeom
-EvaluatedDegeneratePcurve StepGeom
-GeometricRepresentationContext StepGeom
-GeometricRepresentationContextAndGlobalUnitAssignedContext StepGeom
-GeometricRepresentationContextAndParametricRepresentationContext StepGeom
-GeometricRepresentationItem StepGeom
-GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx StepGeom
-Hyperbola StepGeom
-IntersectionCurve StepGeom
-KnotType StepGeom
-Line StepGeom
-OffsetCurve3d StepGeom
-OffsetSurface StepGeom
-OrientedSurface StepGeom
-OuterBoundaryCurve StepGeom
-Parabola StepGeom
-Pcurve StepGeom
-PcurveOrSurface StepGeom
-Placement StepGeom
-Plane StepGeom
-Point StepGeom
-PointOnCurve StepGeom
-PointOnSurface StepGeom
-PointReplica StepGeom
-Polyline StepGeom
-PreferredSurfaceCurveRepresentation StepGeom
-QuasiUniformCurve StepGeom
-QuasiUniformCurveAndRationalBSplineCurve StepGeom
-QuasiUniformSurface StepGeom
-QuasiUniformSurfaceAndRationalBSplineSurface StepGeom
-RationalBSplineCurve StepGeom
-RationalBSplineSurface StepGeom
-RectangularCompositeSurface StepGeom
-RectangularTrimmedSurface StepGeom
-ReparametrisedCompositeCurveSegment StepGeom
-SeamCurve StepGeom
-SphericalSurface StepGeom
-SuParameters StepGeom
-Surface StepGeom
-SurfaceBoundary StepGeom
-SurfaceCurve StepGeom
-SurfaceCurveAndBoundedCurve StepGeom
-SurfaceOfLinearExtrusion StepGeom
-SurfaceOfRevolution StepGeom
-SurfacePatch StepGeom
-SurfaceReplica StepGeom
-SweptSurface StepGeom
-ToroidalSurface StepGeom
-TransitionCode StepGeom
-TrimmedCurve StepGeom
-TrimmingMember StepGeom
-TrimmingPreference StepGeom
-TrimmingSelect StepGeom
-UniformCurve StepGeom
-UniformCurveAndRationalBSplineCurve StepGeom
-UniformSurface StepGeom
-UniformSurfaceAndRationalBSplineSurface StepGeom
-Vector StepGeom
-VectorOrDirection StepGeom
-
-#===============================================
-#             package StepKinematics
-#===============================================
-ActuatedDirection StepKinematics
-ActuatedKinematicPair StepKinematics
-ActuatedKinPairAndOrderKinPair StepKinematics
-ContextDependentKinematicLinkRepresentation StepKinematics
-CylindricalPair StepKinematics
-CylindricalPairValue StepKinematics
-CylindricalPairWithRange StepKinematics
-FullyConstrainedPair StepKinematics
-GearPair StepKinematics
-GearPairValue StepKinematics
-GearPairWithRange StepKinematics
-HighOrderKinematicPair StepKinematics
-HomokineticPair StepKinematics
-KinematicJoint StepKinematics
-KinematicLink StepKinematics
-KinematicLinkRepresentation StepKinematics
-KinematicLinkRepresentationAssociation StepKinematics
-KinematicPair StepKinematics
-KinematicPropertyDefinitionRepresentation StepKinematics
-KinematicPropertyMechanismRepresentation StepKinematics
-KinematicTopologyDirectedStructure StepKinematics
-KinematicTopologyNetworkStructure StepKinematics
-KinematicTopologyRepresentationSelect StepKinematics
-KinematicTopologyStructure StepKinematics
-LinearFlexibleAndPinionPair StepKinematics
-LinearFlexibleAndPlanarCurvePair StepKinematics
-LinearFlexibleLinkRepresentation StepKinematics
-LowOrderKinematicPair StepKinematics
-LowOrderKinematicPairValue StepKinematics
-LowOrderKinematicPairWithMotionCoupling StepKinematics
-LowOrderKinematicPairWithRange StepKinematics
-MechanismRepresentation StepKinematics
-MechanismStateRepresentation StepKinematics
-OrientedJoint StepKinematics
-PairRepresentationRelationship StepKinematics
-PairValue StepKinematics
-PlanarCurvePair StepKinematics
-PlanarCurvePairRange StepKinematics
-PlanarPair StepKinematics
-PlanarPairValue StepKinematics
-PlanarPairWithRange StepKinematics
-PointOnPlanarCurvePair StepKinematics
-PointOnPlanarCurvePairValue StepKinematics
-PointOnPlanarCurvePairWithRange StepKinematics
-PointOnSurfacePair StepKinematics
-PointOnSurfacePairValue StepKinematics
-PointOnSurfacePairWithRange StepKinematics
-PrismaticPair StepKinematics
-PrismaticPairValue StepKinematics
-PrismaticPairWithRange StepKinematics
-ProductDefinitionKinematics StepKinematics
-ProductDefinitionRelationshipKinematics StepKinematics
-RackAndPinionPair StepKinematics
-RackAndPinionPairValue StepKinematics
-RackAndPinionPairWithRange StepKinematics
-RevolutePair StepKinematics
-RevolutePairValue StepKinematics
-RevolutePairWithRange StepKinematics
-RigidLinkRepresentation StepKinematics
-RigidPlacement StepKinematics
-RollingCurvePair StepKinematics
-RollingCurvePairValue StepKinematics
-RollingSurfacePair StepKinematics
-RollingSurfacePairValue StepKinematics
-RotationAboutDirection StepKinematics
-ScrewPair StepKinematics
-ScrewPairValue StepKinematics
-ScrewPairWithRange StepKinematics
-SlidingCurvePair StepKinematics
-SlidingCurvePairValue StepKinematics
-SlidingSurfacePair StepKinematics
-SlidingSurfacePairValue StepKinematics
-SpatialRotation StepKinematics
-SphericalPair StepKinematics
-SphericalPairSelect StepKinematics
-SphericalPairValue StepKinematics
-SphericalPairWithPin StepKinematics
-SphericalPairWithPinAndRange StepKinematics
-SphericalPairWithRange StepKinematics
-SurfacePair StepKinematics
-SurfacePairWithRange StepKinematics
-UnconstrainedPair StepKinematics
-UnconstrainedPairValue StepKinematics
-UniversalPair StepKinematics
-UniversalPairValue StepKinematics
-UniversalPairWithRange StepKinematics
-
-#===============================================
-#             package StepRepr
-#===============================================
-AllAroundShapeAspect StepRepr
-Apex StepRepr
-AssemblyComponentUsage StepRepr
-AssemblyComponentUsageSubstitute StepRepr
-BetweenShapeAspect StepRepr
-CentreOfSymmetry StepRepr
-CharacterizedDefinition StepRepr
-CharacterizedRepresentation StepRepr
-CompGroupShAspAndCompShAspAndDatumFeatAndShAsp StepRepr
-CompositeGroupShapeAspect StepRepr
-CompositeShapeAspect StepRepr
-CompoundRepresentationItem StepRepr
-CompShAspAndDatumFeatAndShAsp StepRepr
-ConfigurationDesign StepRepr
-ConfigurationDesignItem StepRepr
-ConfigurationEffectivity StepRepr
-ConfigurationItem StepRepr
-ConstructiveGeometryRepresentation StepRepr
-ConstructiveGeometryRepresentationRelationship StepRepr
-ContinuosShapeAspect StepRepr
-DataEnvironment StepRepr
-DefinitionalRepresentation StepRepr
-DerivedShapeAspect StepRepr
-DescriptiveRepresentationItem StepRepr
-Extension StepRepr
-ExternallyDefinedRepresentation StepRepr
-FeatureForDatumTargetRelationship StepRepr
-FunctionallyDefinedTransformation StepRepr
-GeometricAlignment StepRepr
-GlobalUncertaintyAssignedContext StepRepr
-GlobalUnitAssignedContext StepRepr
-IntegerRepresentationItem StepRepr
-ItemDefinedTransformation StepRepr
-MakeFromUsageOption StepRepr
-MappedItem StepRepr
-MaterialDesignation StepRepr
-MaterialProperty StepRepr
-MaterialPropertyRepresentation StepRepr
-MeasureRepresentationItem StepRepr
-NextAssemblyUsageOccurrence StepRepr
-ParallelOffset StepRepr
-ParametricRepresentationContext StepRepr
-PerpendicularTo StepRepr
-ProductConcept StepRepr
-ProductDefinitionShape StepRepr
-ProductDefinitionUsage StepRepr
-PromissoryUsageOccurrence StepRepr
-PropertyDefinition StepRepr
-PropertyDefinitionRelationship StepRepr
-PropertyDefinitionRepresentation StepRepr
-QuantifiedAssemblyComponentUsage StepRepr
-Representation StepRepr
-RepresentationContext StepRepr
-RepresentationContextReference StepRepr
-RepresentationItem StepRepr
-RepresentationMap StepRepr
-RepresentationOrRepresentationReference StepRepr
-RepresentationReference StepRepr
-RepresentationRelationship StepRepr
-RepresentationRelationshipWithTransformation StepRepr
-RepresentedDefinition StepRepr
-ReprItemAndLengthMeasureWithUnit StepRepr
-ReprItemAndLengthMeasureWithUnitAndQRI StepRepr
-ReprItemAndMeasureWithUnit StepRepr
-ReprItemAndMeasureWithUnitAndQRI StepRepr
-ReprItemAndPlaneAngleMeasureWithUnit StepRepr
-ReprItemAndPlaneAngleMeasureWithUnitAndQRI StepRepr
-ShapeAspect StepRepr
-ShapeAspectDerivingRelationship StepRepr
-ShapeAspectRelationship StepRepr
-ShapeAspectTransition StepRepr
-ShapeDefinition StepRepr
-ShapeRepresentationRelationship StepRepr
-ShapeRepresentationRelationshipWithTransformation StepRepr
-SpecifiedHigherUsageOccurrence StepRepr
-StructuralResponseProperty StepRepr
-StructuralResponsePropertyDefinitionRepresentation StepRepr
-SuppliedPartRelationship StepRepr
-Tangent StepRepr
-Transformation StepRepr
-ValueRange StepRepr
-ValueRepresentationItem StepRepr
-
-#===============================================
-#             package StepShape
-#===============================================
-AdvancedBrepShapeRepresentation StepShape
-AdvancedFace StepShape
-AngleRelator StepShape
-AngularLocation StepShape
-AngularSize StepShape
-Block StepShape
-BooleanOperand StepShape
-BooleanOperator StepShape
-BooleanResult StepShape
-BoxDomain StepShape
-BoxedHalfSpace StepShape
-BrepWithVoids StepShape
-ClosedShell StepShape
-CompoundShapeRepresentation StepShape
-ConnectedEdgeSet StepShape
-ConnectedFaceSet StepShape
-ConnectedFaceShapeRepresentation StepShape
-ConnectedFaceSubSet StepShape
-ContextDependentShapeRepresentation StepShape
-CsgPrimitive StepShape
-CsgSelect StepShape
-CsgShapeRepresentation StepShape
-CsgSolid StepShape
-DefinitionalRepresentationAndShapeRepresentation StepShape
-DimensionalCharacteristic StepShape
-DimensionalCharacteristicRepresentation StepShape
-DimensionalLocation StepShape
-DimensionalLocationWithPath StepShape
-DimensionalSize StepShape
-DimensionalSizeWithPath StepShape
-DirectedDimensionalLocation StepShape
-Edge StepShape
-EdgeBasedWireframeModel StepShape
-EdgeBasedWireframeShapeRepresentation StepShape
-EdgeCurve StepShape
-EdgeLoop StepShape
-ExtrudedAreaSolid StepShape
-ExtrudedFaceSolid StepShape
-Face StepShape
-FaceBasedSurfaceModel StepShape
-FaceBound StepShape
-FaceOuterBound StepShape
-FaceSurface StepShape
-FacetedBrep StepShape
-FacetedBrepAndBrepWithVoids StepShape
-FacetedBrepShapeRepresentation StepShape
-GeometricallyBoundedSurfaceShapeRepresentation StepShape
-GeometricallyBoundedWireframeShapeRepresentation StepShape
-GeometricCurveSet StepShape
-GeometricSet StepShape
-GeometricSetSelect StepShape
-HalfSpaceSolid StepShape
-LimitsAndFits StepShape
-Loop StepShape
-LoopAndPath StepShape
-ManifoldSolidBrep StepShape
-ManifoldSurfaceShapeRepresentation StepShape
-MeasureQualification StepShape
-MeasureRepresentationItemAndQualifiedRepresentationItem StepShape
-NonManifoldSurfaceShapeRepresentation StepShape
-OpenShell StepShape
-OrientedClosedShell StepShape
-OrientedEdge StepShape
-OrientedFace StepShape
-OrientedOpenShell StepShape
-OrientedPath StepShape
-Path StepShape
-PlusMinusTolerance StepShape
-PointRepresentation StepShape
-PolyLoop StepShape
-PrecisionQualifier StepShape
-QualifiedRepresentationItem StepShape
-ReversibleTopologyItem StepShape
-RevolvedAreaSolid StepShape
-RevolvedFaceSolid StepShape
-RightAngularWedge StepShape
-RightCircularCone StepShape
-RightCircularCylinder StepShape
-SeamEdge StepShape
-ShapeDefinitionRepresentation StepShape
-ShapeDimensionRepresentation StepShape
-ShapeDimensionRepresentationItem StepShape
-ShapeRepresentation StepShape
-ShapeRepresentationWithParameters StepShape
-Shell StepShape
-ShellBasedSurfaceModel StepShape
-SolidModel StepShape
-SolidReplica StepShape
-Sphere StepShape
-Subedge StepShape
-Subface StepShape
-SurfaceModel StepShape
-SweptAreaSolid StepShape
-SweptFaceSolid StepShape
-ToleranceMethodDefinition StepShape
-ToleranceValue StepShape
-TopologicalRepresentationItem StepShape
-Torus StepShape
-TransitionalShapeRepresentation StepShape
-TypeQualifier StepShape
-ValueFormatTypeQualifier StepShape
-ValueQualifier StepShape
-Vertex StepShape
-VertexLoop StepShape
-VertexPoint StepShape
-
-#===============================================
-#             package StepVisual
-#===============================================
-AnnotationCurveOccurrence StepVisual
-AnnotationCurveOccurrenceAndGeomReprItem StepVisual
-AnnotationFillArea StepVisual
-AnnotationFillAreaOccurrence StepVisual
-AnnotationOccurrence StepVisual
-AnnotationPlane StepVisual
-AnnotationPlaneElement StepVisual
-AnnotationText StepVisual
-AnnotationTextOccurrence StepVisual
-AreaInSet StepVisual
-AreaOrView StepVisual
-BackgroundColour StepVisual
-BoxCharacteristicSelect StepVisual
-CameraImage StepVisual
-CameraImage2dWithScale StepVisual
-CameraImage3dWithScale StepVisual
-CameraModel StepVisual
-CameraModelD2 StepVisual
-CameraModelD3 StepVisual
-CameraModelD3MultiClipping StepVisual
-CameraModelD3MultiClippingInterectionSelect StepVisual
-CameraModelD3MultiClippingIntersection StepVisual
-CameraModelD3MultiClippingUnion StepVisual
-CameraModelD3MultiClippingUnionSelect StepVisual
-CameraUsage StepVisual
-CentralOrParallel StepVisual
-CharacterizedObjAndRepresentationAndDraughtingModel StepVisual
-Colour StepVisual
-ColourRgb StepVisual
-ColourSpecification StepVisual
-ComplexTriangulatedFace StepVisual
-ComplexTriangulatedSurfaceSet StepVisual
-CompositeText StepVisual
-CompositeTextWithExtent StepVisual
-ContextDependentInvisibility StepVisual
-ContextDependentOverRidingStyledItem StepVisual
-CoordinatesList StepVisual
-CubicBezierTessellatedEdge StepVisual
-CubicBezierTriangulatedFace StepVisual
-CurveStyle StepVisual
-CurveStyleFont StepVisual
-CurveStyleFontPattern StepVisual
-CurveStyleFontSelect StepVisual
-DirectionCountSelect StepVisual
-DraughtingAnnotationOccurrence StepVisual
-DraughtingCallout StepVisual
-DraughtingCalloutElement StepVisual
-DraughtingModel StepVisual
-DraughtingPreDefinedColour StepVisual
-DraughtingPreDefinedCurveFont StepVisual
-EdgeOrCurve StepVisual
-ExternallyDefinedCurveFont StepVisual
-ExternallyDefinedTextFont StepVisual
-FaceOrSurface StepVisual
-FillAreaStyle StepVisual
-FillAreaStyleColour StepVisual
-FillStyleSelect StepVisual
-FontSelect StepVisual
-Invisibility StepVisual
-InvisibilityContext StepVisual
-InvisibleItem StepVisual
-LayeredItem StepVisual
-MarkerMember StepVisual
-MarkerSelect StepVisual
-MarkerType StepVisual
-MechanicalDesignGeometricPresentationArea StepVisual
-MechanicalDesignGeometricPresentationRepresentation StepVisual
-NullStyle StepVisual
-NullStyleMember StepVisual
-OverRidingStyledItem StepVisual
-PathOrCompositeCurve StepVisual
-PlanarBox StepVisual
-PlanarExtent StepVisual
-PointStyle StepVisual
-PreDefinedColour StepVisual
-PreDefinedCurveFont StepVisual
-PreDefinedItem StepVisual
-PreDefinedTextFont StepVisual
-PresentationArea StepVisual
-PresentationLayerAssignment StepVisual
-PresentationLayerUsage StepVisual
-PresentationRepresentation StepVisual
-PresentationRepresentationSelect StepVisual
-PresentationSet StepVisual
-PresentationSize StepVisual
-PresentationSizeAssignmentSelect StepVisual
-PresentationStyleAssignment StepVisual
-PresentationStyleByContext StepVisual
-PresentationStyleSelect StepVisual
-PresentationView StepVisual
-PresentedItem StepVisual
-PresentedItemRepresentation StepVisual
-RenderingPropertiesSelect StepVisual
-RepositionedTessellatedGeometricSet StepVisual
-RepositionedTessellatedItem StepVisual
-ShadingSurfaceMethod StepVisual
-StyleContextSelect StepVisual
-StyledItem StepVisual
-StyledItemTarget StepVisual
-SurfaceSide StepVisual
-SurfaceSideStyle StepVisual
-SurfaceStyleBoundary StepVisual
-SurfaceStyleControlGrid StepVisual
-SurfaceStyleElementSelect StepVisual
-SurfaceStyleFillArea StepVisual
-SurfaceStyleParameterLine StepVisual
-SurfaceStyleReflectanceAmbient StepVisual
-SurfaceStyleRendering StepVisual
-SurfaceStyleRenderingWithProperties StepVisual
-SurfaceStyleSegmentationCurve StepVisual
-SurfaceStyleSilhouette StepVisual
-SurfaceStyleTransparent StepVisual
-SurfaceStyleUsage StepVisual
-Template StepVisual
-TemplateInstance StepVisual
-TessellatedAnnotationOccurrence StepVisual
-TessellatedConnectingEdge StepVisual
-TessellatedCurveSet StepVisual
-TessellatedEdge StepVisual
-TessellatedEdgeOrVertex StepVisual
-TessellatedFace StepVisual
-TessellatedGeometricSet StepVisual
-TessellatedItem StepVisual
-TessellatedPointSet StepVisual
-TessellatedShapeRepresentation StepVisual
-TessellatedShapeRepresentationWithAccuracyParameters StepVisual
-TessellatedShell StepVisual
-TessellatedSolid StepVisual
-TessellatedStructuredItem StepVisual
-TessellatedSurfaceSet StepVisual
-TessellatedVertex StepVisual
-TessellatedWire StepVisual
-TextLiteral StepVisual
-TextOrCharacter StepVisual
-TextPath StepVisual
-TextStyle StepVisual
-TextStyleForDefinedFont StepVisual
-TextStyleWithBoxCharacteristics StepVisual
-TriangulatedFace StepVisual
-ViewVolume StepVisual