Test for 0025952: Wrong intersection curve

Test cases for the issue have been created.
2025-08-19 13:40:49 +03:00 · 2018-11-12 09:49:29 +03:00
1712 changed files with 30540 additions and 73807 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,11 +86,6 @@ if (BUILD_WITH_DEBUG)
  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
 endif()

-# option disabling OCCT exceptions in Release builds (No_Exception)
-if (NOT DEFINED BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (BUILD_RELEASE_DISABLE_EXCEPTIONS ON CACHE BOOL "${BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR}")
-endif()
-
 # option to enable or disable use of precompiled headers
 if (NOT DEFINED BUILD_USE_PCH)
  set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
@@ -633,26 +628,6 @@ else()
  OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
 endif()

-# RapidJSON
-# search for CSF_RapidJSON variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
-if (CAN_USE_RAPIDJSON)
-  set (USE_RAPIDJSON OFF CACHE BOOL "${USE_RAPIDJSON_DESCR}")
-
-  if (USE_RAPIDJSON)
-    add_definitions (-DHAVE_RAPIDJSON)
-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
-  else()
-    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
-    OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
-  endif()
-else()
-  OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
-
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
-  OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
-endif()
-
 # EIGEN
 if (CAN_USE_EIGEN)
  set (USE_EIGEN OFF CACHE BOOL "${USE_EIGEN_DESCR}")
--- a/adm/.gitignore
+++ b/adm/.gitignore
@@ -1 +0,0 @@
-/build-*
--- a/adm/MODULES
+++ b/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 TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh
+DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
 Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -203,7 +203,6 @@ n Aspect
 n DsgPrs
 n Graphic3d
 n Image
-n Media
 n MeshVS
 n OpenGl
 n D3DHost
@@ -439,7 +438,3 @@ n Geom2dEvaluator
 t TKVCAF
 n XCAFView
 n XCAFNoteObjects
-t TKRWMesh
-n RWGltf
-n RWMesh
-n RWObj
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -133,7 +133,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
        # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)

-        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
+        if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
@@ -181,9 +181,9 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
          # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)

-          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
+          if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                               PATH_SUFFIXES bin  win${COMPILER_BITNESS}/${COMPILER}/bin
                                                                               NO_DEFAULT_PATH)
            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -62,10 +62,8 @@ if (WIN32)
  set (CSF_advapi32      "advapi32.lib")
  set (CSF_gdi32         "gdi32.lib")
  set (CSF_user32        "user32.lib")
-  set (CSF_shell32       "shell32.lib")
  set (CSF_wsock32       "wsock32.lib")
  set (CSF_psapi         "psapi.lib")
-  set (CSF_winmm         "winmm.lib")
  set (CSF_d3d9          "D3D9.lib")
  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
    set (CSF_OpenGlLibs  "libEGL libGLESv2")
@@ -73,35 +71,28 @@ if (WIN32)
    set (CSF_OpenGlLibs  "opengl32.lib")
  endif()

-else()
+  else()

  if (APPLE)
    set (CSF_objc        "objc")

    # frameworks
-    if (IOS)
-      find_library (Appkit_LIB NAMES UIKit)
-      set (CSF_Appkit ${Appkit_LIB})
-    else()
-      find_library (Appkit_LIB NAMES AppKit)
-      set (CSF_Appkit ${Appkit_LIB})
-    endif()
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
+    find_library (Appkit_LIB NAMES AppKit)
+    set (CSF_Appkit ${Appkit_LIB})

    find_library (IOKit_LIB NAMES IOKit)
    set (CSF_IOKit ${IOKit_LIB})
+
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
    OCCT_CHECK_AND_UNSET (IOKit_LIB)

-    if (IOS)
-      find_library (OpenGlLibs_LIB NAMES OpenGLES)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-    elseif (USE_GLX)
+    if (USE_GLX)
      set (CSF_OpenGlLibs GL)
      set (CSF_XwLibs     "X11 Xext Xmu Xi")
    else()
      find_library (OpenGlLibs_LIB NAMES OpenGL)
      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+
      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
    endif()
    
@@ -117,6 +108,5 @@ else()
    endif()
    set (CSF_XwLibs      "X11 Xext Xmu Xi")
    set (CSF_dl          "dl")
-    set (CSF_fontconfig  "fontconfig")
  endif()
 endif()
--- a/adm/cmake/occt_defs_flags.cmake
+++ b/adm/cmake/occt_defs_flags.cmake
@@ -143,7 +143,5 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
 endif()

-if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-endif()
+set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -163,18 +163,13 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
  OCCT_MAKE_COMPILER_BITNESS()

  string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
-  if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
-    string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
-    list (APPEND SEARCH_TEMPLATES "[^gl]+${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}")
-    list (APPEND SEARCH_TEMPLATES "^[a-zA-Z]*[0-9]*-${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
-    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
-    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
-    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
-    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
-  endif()
+
+  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}")
+  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
+  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")

  SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)

--- a/adm/cmake/rapidjson.cmake
+++ b/adm/cmake/rapidjson.cmake
@@ -1,86 +0,0 @@
-# RapidJSON
-
-if (NOT DEFINED INSTALL_RAPIDJSON)
-  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
-endif()
-
-# RapidJSON directory
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
-  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
-endif()
-
-# search for RapidJSON in user defined directory
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
-    if (RAPIDJSON_DIR_NAME)
-      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
-    endif()
-  endif()
-endif()
-
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
-endif()
-
-if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-
-  set (HEADER_NAMES rapidjson/rapidjson.h)
-
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
-
-  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
-                                              PATH_SUFFIXES include rapidjson
-                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATH_SUFFIXES include rapidjson
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-
-  # use default (CMake) RapidJSON search
-  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
-      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
-    endif()
-
-    find_package(RapidJSON QUIET)
-
-    # restore ENV{RapidJSON_DIR}
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
-    endif()
-
-    if (${RAPIDJSON_FOUND})
-      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
-      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
-    endif()
-  endif()
-endif()
-
-if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-
-  # Install header files
-  if (INSTALL_RAPIDJSON)
-    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
-    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
-      if(IS_DIRECTORY "${SUBDIR}")
-        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      else()
-        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      endif()
-    endforeach()
-  endif()
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
-endif()
-
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET(RapidJSON_DIR)
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -28,11 +28,6 @@ Applies only for Debug configuration.")
 set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
 "Append the postfix to names of output libraries")

-set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
-"Disables exceptions like Standard_OutOfRange in Release builds.
-Defines No_Exception macros for Release builds when enabled (default).
-These exceptions are always enabled in Debug builds, but disable in Release for better performance")
-
 set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
 "Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
 Corresponding environment variable (CSF_FPE) can be changed manually
@@ -94,7 +89,6 @@ INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
 INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
 INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
 INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
-INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
 INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
 INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
 INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
@@ -162,10 +156,6 @@ set (USE_FREEIMAGE_DESCR
 "Indicates whether Freeimage product should be used in OCCT visualization
 module for support of popular graphics image formats (PNG, BMP etc)")

-set (USE_RAPIDJSON_DESCR
-"Indicates whether RapidJSON product should be used in OCCT DataExchange
-module for support of JSON-based formats like glTF")
-
 set (USE_EGL_DESCR
 "Indicates whether EGL should be used in OCCT visualization
 module instead of conventional OpenGL context creation APIs")
--- a/adm/genconf.tcl
+++ b/adm/genconf.tcl
@@ -30,30 +30,10 @@ set aRowIter 0
 set aCheckRowIter 0
 frame .myFrame -padx 5 -pady 5
 pack  .myFrame -fill both -expand 1
-frame .myFrame.myPrjFrame
 frame .myFrame.myVsFrame
 frame .myFrame.myHxxChecks
 frame .myFrame.myChecks

-# project file format
-set SYS_PRJFMT_LIST {}
-set SYS_PRJNAME_LIST {}
-if { "$::tcl_platform(platform)" == "windows" } {
-  lappend ::SYS_PRJFMT_LIST "vcxproj"
-  lappend ::SYS_PRJNAME_LIST "Visual Studio (.vcxproj)"
-}
-if { "$tcl_platform(os)" == "Darwin" } {
-  lappend ::SYS_PRJFMT_LIST "xcd"
-  lappend ::SYS_PRJNAME_LIST "XCode (.xcd)"
-}
-lappend ::SYS_PRJFMT_LIST "cbp"
-lappend ::SYS_PRJNAME_LIST "Code Blocks (.cbp)"
-lappend ::SYS_PRJFMT_LIST "pro"
-lappend ::SYS_PRJNAME_LIST "Qt Creator (.pro)"
-
-set aPrjIndex [lsearch $::SYS_PRJFMT_LIST $::PRJFMT]
-set ::PRJNAME [lindex $::SYS_PRJNAME_LIST $aPrjIndex]
-
 set SYS_VS_LIST {}
 set SYS_VC_LIST {}
 set SYS_VCVARS_LIST {}
@@ -121,7 +101,6 @@ proc wokdep:gui:Close {} {
 }

 proc wokdep:gui:SwitchConfig {} {
-  set ::PRJFMT [lindex $::SYS_PRJFMT_LIST [.myFrame.myPrjFrame.myPrjCombo current]]
  set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsFrame.myVsCombo current]]
  set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]

@@ -189,9 +168,6 @@ proc wokdep:gui:UpdateList {} {
    }
    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
  }
-  if { "$::HAVE_RAPIDJSON" == "true" } {
-    wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
-  }

  if { "$::CHECK_QT4" == "true" } {
    wokdep:SearchQt4     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
@@ -414,8 +390,6 @@ proc wokdep:gui:Show64Bitness { theRowIter } {
 }

 # Header
-ttk::label    .myFrame.myPrjFrame.myPrjLbl     -text "Project format:" -padding {5 5 20 5}
-ttk::combobox .myFrame.myPrjFrame.myPrjCombo   -values $SYS_PRJNAME_LIST -state readonly -textvariable PRJNAME -width 40
 ttk::label    .myFrame.myVsFrame.myVsLbl       -text "Visual Studio configuration:" -padding {5 5 20 5}
 ttk::combobox .myFrame.myVsFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
 ttk::combobox .myFrame.myVsFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
@@ -459,9 +433,6 @@ ttk::label    .myFrame.myChecks.myZLibLbl       -text "Use zlib"
 checkbutton   .myFrame.myChecks.myLzmaCheck     -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA   -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myLzmaLbl       -text "Use liblzma"

-checkbutton   .myFrame.myChecks.myRapidJsonCheck -offvalue "false" -onvalue "true" -variable HAVE_RAPIDJSON -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myChecks.myRapidJsonLbl   -text "Use RapidJSON"
-
 checkbutton   .myFrame.myChecks.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myQt4Lbl        -text "Search Qt4"
 checkbutton   .myFrame.myChecks.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
@@ -523,10 +494,6 @@ ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close

 # Create grid
 # Header
-grid .myFrame.myPrjFrame            -row $aRowIter -column 0 -columnspan 10 -sticky w
-grid .myFrame.myPrjFrame.myPrjLbl   -row 0 -column 0
-grid .myFrame.myPrjFrame.myPrjCombo -row 0 -column 1
-incr aRowIter
 if { "$tcl_platform(platform)" == "windows" } {
  grid .myFrame.myVsFrame               -row $aRowIter -column 0 -columnspan 10 -sticky w
  grid .myFrame.myVsFrame.myVsLbl       -row 0 -column 0
@@ -570,8 +537,8 @@ if { "$::tcl_platform(os)" != "Darwin" } {
 grid .myFrame.myChecks.myZLibCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myZLibLbl       -row $aCheckRowIter -column 7 -sticky w

-grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 12 -sticky e
-grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 13 -sticky w
+grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 10 -sticky e
+grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 11 -sticky w

 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
@@ -584,8 +551,8 @@ if { "$::tcl_platform(platform)" == "windows" } {
 }
 grid .myFrame.myChecks.myLzmaCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myLzmaLbl       -row $aCheckRowIter -column 7 -sticky w
-grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 12 -sticky e
-grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 10 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 11 -sticky w

 incr aCheckRowIter
 if { "$::tcl_platform(os)" == "Darwin" } {
@@ -594,10 +561,6 @@ if { "$::tcl_platform(os)" == "Darwin" } {
  incr aCheckRowIter
 }

-grid .myFrame.myChecks.myRapidJsonCheck -row $aCheckRowIter -column 6 -sticky e
-grid .myFrame.myChecks.myRapidJsonLbl   -row $aCheckRowIter -column 7 -sticky w
-incr aCheckRowIter
-
 # Additional headers search paths
 grid .myFrame.myIncLbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
 incr aRowIter
@@ -629,9 +592,6 @@ grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
 grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2

 # Bind events
-bind .myFrame.myPrjFrame.myPrjCombo <<ComboboxSelected>> {
-  wokdep:gui:SwitchConfig
-}
 bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
  wokdep:gui:SwitchConfig
 }
--- a/adm/genconfdeps.tcl
+++ b/adm/genconfdeps.tcl
@@ -27,10 +27,8 @@ if { "$tcl_platform(platform)" == "unix" } {
  set SYS_EXE_SUFFIX    ""
  if { "$tcl_platform(os)" == "Darwin" } {
    set SYS_LIB_SUFFIX "dylib"
-    set PRJFMT "xcd"
  } else {
    set SYS_LIB_SUFFIX "so"
-    set PRJFMT "cbp"
  }
  set VCVER "gcc"
  set VCVARS ""
@@ -41,7 +39,6 @@ if { "$tcl_platform(platform)" == "unix" } {
  set SYS_EXE_SUFFIX    ".exe"
  set VCVER  "vc10"
  set VCVARS ""
-  set PRJFMT "vcxproj"
 }

 set SHORTCUT_HEADERS "ShortCut"
@@ -68,7 +65,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
 }

 # fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
-set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
+set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
 foreach anEnvIter $THE_ENV_VARIABLES {
  set ${anEnvIter} "false"
  if { [info exists ::env(${anEnvIter})] } {
@@ -85,7 +82,7 @@ if { "$tcl_platform(platform)" != "windows" } {
  set HAVE_D3D ""
  set HAVE_RelWithDebInfo ""
 }
-foreach anEnvIter {ARCH VCVER VCVARS PRJFMT PRODUCTS_PATH} {
+foreach anEnvIter {ARCH VCVER VCVARS PRODUCTS_PATH} {
  if { [info exists ::env(${anEnvIter})] } {
    set ${anEnvIter} "$::env(${anEnvIter})"
  }
@@ -858,25 +855,6 @@ proc wokdep:SearchGLES {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin6
  return "$isFound"
 }

-# Search RapidJSON headers
-proc wokdep:SearchRapidJson {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
-  upvar $theErrInc anErrInc
-
-  set isFound "true"
-  set aRJHPath [wokdep:SearchHeader "rapidjson/rapidjson.h"]
-  if { "$aRJHPath"  == "" } {
-    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{rapidjson}*] "$::VCVER" "$::ARCH" ]
-    if { "$aPath" != "" && [file exists "$aPath/include/rapidjson/rapidjson.h"] } {
-      lappend ::CSF_OPT_INC "$aPath/include"
-    } else {
-      lappend anErrInc "Error: 'rapidjson/rapidjson.h' not found (RapidJSON)"
-      set isFound "false"
-    }
-  }
-
-  return "$isFound"
-}
-
 # Auxiliary function, gets VTK version to set default search directory
 proc wokdep:VtkVersion { thePath } {
  set aResult "6.1"
@@ -1140,33 +1118,15 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
  return "$isFound"
 }

-# Returns OCCT version string from file Standard_Version.hxx (if available)
-proc wokdep:DetectCasVersion {} {
-  set occt_ver 7.0.0
-  set aCasRoot [file normalize [file dirname [info script]]]
-  set filename "${aCasRoot}/src/Standard/Standard_Version.hxx"
-  if { [file exists $filename] } {
-    set fh [open $filename "r"]
-    set fh_loaded [read $fh]
-    close $fh
-    regexp {[^/]\s*#\s*define\s+OCC_VERSION_COMPLETE\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver
-  } else {
-    puts "Error: file '$filename' not found"
-  }
-  return $occt_ver
-}
-
 # Generate (override) custom environment file
 proc wokdep:SaveCustom {} {
-  set aGenInfo "This environment file was generated by genconf.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
  if { "$::tcl_platform(platform)" == "windows" } {
    set aCustomFilePath "./custom.bat"
    set aFile [open $aCustomFilePath "w"]
    puts $aFile "@echo off"
-    puts $aFile "rem $aGenInfo"
+    puts $aFile "rem This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"

    puts $aFile ""
-    puts $aFile "set PRJFMT=$::PRJFMT"
    puts $aFile "set VCVER=$::VCVER"
    puts $aFile "set ARCH=$::ARCH"
    puts $aFile "set VCVARS=$::VCVARS"
@@ -1186,41 +1146,26 @@ proc wokdep:SaveCustom {} {
    }

    set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional headers search paths"
    puts $aFile "set \"CSF_OPT_INC=$aStringInc\""

    set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib32 [regsub -all "$::PRODUCTS_PATH" $aStringLib32 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional libraries (32-bit) search paths"
    puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""

    set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib64 [regsub -all "$::PRODUCTS_PATH" $aStringLib64 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional libraries (64-bit) search paths"
    puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""

    set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin32 [regsub -all "$::PRODUCTS_PATH" $aStringBin32 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional (32-bit) search paths"
    puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""

    set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin64 [regsub -all "$::PRODUCTS_PATH" $aStringBin64 "%PRODUCTS_PATH%"]
-    }
    puts $aFile ""
    puts $aFile "rem Additional (64-bit) search paths"
    puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
@@ -1230,10 +1175,9 @@ proc wokdep:SaveCustom {} {
    set aCustomFilePath "./custom.sh"
    set aFile [open $aCustomFilePath "w"]
    puts $aFile "#!/bin/bash"
-    puts $aFile "# $aGenInfo"
+    puts $aFile "# This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"

    puts $aFile ""
-    puts $aFile "export PRJFMT=$::PRJFMT"
    puts $aFile "export ARCH=$::ARCH"
    puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"

@@ -1251,88 +1195,22 @@ proc wokdep:SaveCustom {} {
    }

    set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "\${PRODUCTS_PATH}"]
-    }
    puts $aFile ""
    puts $aFile "# Additional headers search paths"
    puts $aFile "export CSF_OPT_INC=\"$aStringInc\""

-    set aStringLib [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib [regsub -all "$::PRODUCTS_PATH" $aStringLib "\${PRODUCTS_PATH}"]
-    }
+    set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
    puts $aFile ""
    puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib]\""
+    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""

-    set aStringBin [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin [regsub -all "$::PRODUCTS_PATH" $aStringBin "\${PRODUCTS_PATH}"]
-    }
+    set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
    puts $aFile ""
    puts $aFile "# Additional ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin]\""
+    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""

    close $aFile
  }
+
  puts "Configuration saved to file '$aCustomFilePath'"
-
-  # generate custom.auto.pri
-  set toExportCustomPri 1
-  if { $toExportCustomPri == 1 } {
-    set aCasVer [wokdep:DetectCasVersion]
-    set aCustomFilePath "./adm/qmake/custom.auto.pri"
-    set aFile [open $aCustomFilePath "w"]
-    puts $aFile "# $aGenInfo"
-
-    puts $aFile ""
-    puts $aFile "VERSION=$aCasVer"
-    puts $aFile "PRODUCTS_PATH=\"$::PRODUCTS_PATH\""
-
-    puts $aFile ""
-    puts $aFile "# Optional 3rd-parties switches"
-    foreach anEnvIter $::THE_ENV_VARIABLES {
-      set aName ${anEnvIter}
-      set aValue [set ::${anEnvIter}]
-      if { "$aValue" == "true" } {
-        puts $aFile "CONFIG += ${aName}"
-      } else {
-        #puts $aFile "CONFIG -= ${aName}"
-      }
-    }
-
-    puts $aFile ""
-    puts $aFile "# Additional headers search paths"
-    foreach anIncPath $::CSF_OPT_INC {
-      if { "$::PRODUCTS_PATH" != "" } {
-        set anIncPath [regsub -all "$::PRODUCTS_PATH" $anIncPath "\$\$\{PRODUCTS_PATH\}"]
-      }
-      puts $aFile "INCLUDEPATH += \"${anIncPath}\""
-    }
-
-    puts $aFile ""
-    puts $aFile "# Additional libraries search paths"
-    foreach aLibPath [set ::CSF_OPT_LIB$::ARCH] {
-      if { "$::PRODUCTS_PATH" != "" } {
-        set aLibPath [regsub -all "$::PRODUCTS_PATH" $aLibPath "\$\$\{PRODUCTS_PATH\}"]
-      }
-      puts $aFile "LIBS += -L\"${aLibPath}\""
-    }
-
-    if { "$::tcl_platform(platform)" == "windows" } {
-      puts $aFile ""
-      puts $aFile "# Additional DLLs search paths"
-      foreach aDllPath [set ::CSF_OPT_BIN$::ARCH] {
-        if { "$::PRODUCTS_PATH" != "" } {
-          set aDllPath [regsub -all "$::PRODUCTS_PATH" $aDllPath "\$\$\{PRODUCTS_PATH\}"]
-        }
-        puts $aFile "LIBS += -L\"${aDllPath}\""
-      }
-    }
-
-    puts $aFile ""
-    close $aFile
-    puts "Configuration saved to file '$aCustomFilePath'"
-  }
 }
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -256,7 +256,7 @@ proc genAllResources {} {

 # Wrapper-function to generate VS project files
 proc genproj {theFormat args} {
-  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "cbp" "xcd" "pro"}
+  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "cbp" "xcd"}
  set aSupportedPlatforms { "wnt" "uwp" "lin" "mac" "ios" "qnx" }
  set isHelpRequire false

@@ -314,7 +314,6 @@ proc genproj {theFormat args} {
      vc141    -  Visual Studio 2017
      cbp      -  CodeBlocks
      xcd      -  XCode
-      pro      -  Qt Creator

    Platform (optional):
      wnt   -  Windows Desktop
@@ -396,14 +395,9 @@ proc genprojbat {theFormat thePlatform} {
      "cbp"   {
        file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.sh"  "$::path/codeblocks.sh"
        file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.bat" "$::path/codeblocks.bat"
-
        # Code::Blocks 16.01 does not create directory for import libs, help him
-        set aPlatformAndCompiler "${thePlatform}/gcc"
-        if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
-          set aPlatformAndCompiler "${thePlatform}/clang"
-        }
-        file mkdir "$::path/${aPlatformAndCompiler}/lib"
-        file mkdir "$::path/${aPlatformAndCompiler}/libd"
+        file mkdir "$::path/$thePlatform/cbp/lib"
+        file mkdir "$::path/$thePlatform/cbp/libd"
      }
      "xcd"   { file copy -force -- "$::THE_CASROOT/adm/templates/xcode.sh"      "$::path/xcode.sh" }
    }
@@ -478,6 +472,15 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl } {
    }
  }

+  # generate one solution for all projects if complete OS or VAS is processed
+  set anAllSolution "OCCT"
+
+  wokUtils:FILES:mkdir $anOutDir
+  if { ![file exists $anOutDir] } {
+    puts stderr "Error: Could not create output directory \"$anOutDir\""
+    return
+  }
+
  # create the out dir if it does not exist
  if (![file isdirectory $path/inc]) {
    puts "$path/inc folder does not exists and will be created"
@@ -488,19 +491,6 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl } {
  puts "Collecting required header files into $path/inc ..."
  osutils:collectinc $aModules $path/inc

-  if { "$theFormat" == "pro" } {
-    return
-  }
-
-  # generate one solution for all projects if complete OS or VAS is processed
-  set anAllSolution "OCCT"
-
-  wokUtils:FILES:mkdir $anOutDir
-  if { ![file exists $anOutDir] } {
-    puts stderr "Error: Could not create output directory \"$anOutDir\""
-    return
-  }
-
  # Generating project files for the selected format
  switch -exact -- "$theFormat" {
    "vc7"   -
@@ -1273,16 +1263,12 @@ proc wokUtils:FILES:FileToString { fin } {

 # List extensions of compilable files in OCCT
 proc osutils:compilable {thePlatform} {
-  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .c .cxx .cpp .mm] }
+  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
+    return [list .c .cxx .cpp .mm]
+  }
  return [list .c .cxx .cpp]
 }

-# List extensions of header file in OCCT
-proc osutils:fileExtensionsHeaders {thePlatform} {
-  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } { return [list .h .hxx .hpp .lxx .pxx .gxx ] }
-  return [list .h .hxx .hpp .lxx .pxx .gxx .mm ]
-}
-
 proc osutils:commonUsedTK { theToolKit } {
  set anUsedToolKits [list]
  set aDepToolkits [LibToLink $theToolKit]
@@ -1355,11 +1341,9 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
    set aLibsMap(CSF_advapi32)     "advapi32"
    set aLibsMap(CSF_gdi32)        "gdi32"
    set aLibsMap(CSF_user32)       "user32 comdlg32"
-    set aLibsMap(CSF_shell32)      "shell32"
    set aLibsMap(CSF_opengl32)     "opengl32"
    set aLibsMap(CSF_wsock32)      "wsock32"
    set aLibsMap(CSF_netapi32)     "netapi32"
-    set aLibsMap(CSF_winmm)        "winmm"
    set aLibsMap(CSF_OpenGlLibs)   "opengl32"
    if { "$::HAVE_GLES2" == "true" } {
      set aLibsMap(CSF_OpenGlLibs) "libEGL libGLESv2"
@@ -1377,23 +1361,17 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
    set aLibsMap(CSF_TBB) ""
  } else {
    set aLibsMap(CSF_dl)           "dl"
-    if { "$theOS" == "mac" || "$theOS" == "ios" } {
+    if { "$theOS" == "mac" } {
      set aLibsMap(CSF_objc)       "objc"
-      if { "$theOS" == "ios" } {
-        set aFrmsMap(CSF_Appkit)     "UIKit"
-        set aFrmsMap(CSF_OpenGlLibs) "OpenGLES"
-      } else {
-        set aFrmsMap(CSF_Appkit)     "AppKit"
-        set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
-      }
+      set aFrmsMap(CSF_Appkit)     "AppKit"
      set aFrmsMap(CSF_IOKit)      "IOKit"
+      set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
      set aFrmsMap(CSF_TclLibs)    "Tcl"
      set aLibsMap(CSF_TclLibs)    ""
      set aFrmsMap(CSF_TclTkLibs)  "Tk"
      set aLibsMap(CSF_TclTkLibs)  ""
      set aLibsMap(CSF_QT)         "QtCore QtGui"
    } else {
-      set aLibsMap(CSF_fontconfig) "fontconfig"
      if { "$theOS" == "qnx" } {
        # CSF_ThreadLibs - pthread API is part of libc on QNX
        set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
@@ -1487,7 +1465,8 @@ proc osutils:tk:units { tkloc } {
 }

 proc osutils:justwnt { listloc } {
-  set goaway [list Xw]
+  # ImageUtility is required for support for old (<6.5.4) versions of OCCT
+  set goaway [list Xdps Xw  ImageUtility WOKUnix]
  return [osutils:juststation $goaway $listloc]
 }

@@ -1577,28 +1556,31 @@ proc wokUtils:FILES:wtail { f n } {
 }

 # Generate entry for one source file in Visual Studio 10 project file
-proc osutils:vcxproj:cxxfile { theFile theParams } {
-  if { $theParams == "" } {
-    return "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\" />\n"
+proc osutils:vcxproj:file { file params } {
+  append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|Win32\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
+  }
+
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|Win32\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
+  }
+
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|x64\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
+  }
+
+  if { $params != "" } {
+    append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|x64\'\">[string trim ${params}]  %(AdditionalOptions)</AdditionalOptions>\n"
  }

-  set aParams [string trim ${theParams}]
-  append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\">\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|Win32\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|Win32\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Debug|x64\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
-  append text "      <AdditionalOptions Condition=\"\'\$(Configuration)|\$(Platform)\'==\'Release|x64\'\">${aParams} %(AdditionalOptions)</AdditionalOptions>\n"
  append text "    </ClCompile>\n"
  return $text
 }

-# Generate entry for one header file in Visual Studio 10 project file
-proc osutils:vcxproj:hxxfile { theFile } { return "    <ClInclude Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $theFile 3]]\" />\n" }
-
 # Generate Visual Studio 2010 project filters file
-proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
-  upvar $theCxxFilesMap aCxxFilesMap
-  upvar $theHxxFilesMap aHxxFilesMap
+proc osutils:vcxproj:filters { dir proj theFilesMap } {
+  upvar $theFilesMap aFilesMap

  # header
  append text "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
@@ -1609,25 +1591,17 @@ proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
  append text "    <Filter Include=\"Source files\">\n"
  append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
  append text "    </Filter>\n"
-  append text "    <Filter Include=\"Header files\">\n"
-  append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
-  append text "    </Filter>\n"
-  foreach unit $aCxxFilesMap(units) {
+  foreach unit $aFilesMap(units) {
    append text "    <Filter Include=\"Source files\\${unit}\">\n"
    append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
    append text "    </Filter>\n"
  }
-  foreach unit $aHxxFilesMap(units) {
-    append text "    <Filter Include=\"Header files\\${unit}\">\n"
-    append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
-    append text "    </Filter>\n"
-  }
  append text "  </ItemGroup>\n"

-  # list of cxx files
+  # list of files
  append text "  <ItemGroup>\n"
-  foreach unit $aCxxFilesMap(units) {
-    foreach file $aCxxFilesMap($unit) {
+  foreach unit $aFilesMap(units) {
+    foreach file $aFilesMap($unit) {
      append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
      append text "      <Filter>Source files\\${unit}</Filter>\n"
      append text "    </ClCompile>\n"
@@ -1635,19 +1609,51 @@ proc osutils:vcxproj:filters { dir proj theCxxFilesMap theHxxFilesMap } {
  }
  append text "  </ItemGroup>\n"

-  # list of hxx files
+  # end
+  append text "</Project>"
+
+  # write file
+  set fp [open [set fvcproj [file join $dir ${proj}.vcxproj.filters]] w]
+  fconfigure $fp -translation crlf
+  puts $fp $text
+  close $fp
+
+  return ${proj}.vcxproj.filters
+}
+
+# Generate Visual Studio 2011 project filters file
+proc osutils:vcx1proj:filters { dir proj theFilesMap } {
+  upvar $theFilesMap aFilesMap
+
+  # header
+  append text "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+  append text "<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
+
+  # list of "filters" (units)
  append text "  <ItemGroup>\n"
-  foreach unit $aHxxFilesMap(units) {
-    foreach file $aHxxFilesMap($unit) {
-      append text "    <ClInclude Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
-      append text "      <Filter>Header files\\${unit}</Filter>\n"
-      append text "    </ClInclude>\n"
+  append text "    <Filter Include=\"Source files\">\n"
+  append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
+  append text "    </Filter>\n"
+  foreach unit $aFilesMap(units) {
+    append text "    <Filter Include=\"Source files\\${unit}\">\n"
+    append text "      <UniqueIdentifier>[OS:genGUID]</UniqueIdentifier>\n"
+    append text "    </Filter>\n"
+  }
+  append text "  </ItemGroup>\n"
+
+  # list of files
+  append text "  <ItemGroup>\n"
+  foreach unit $aFilesMap(units) {
+    foreach file $aFilesMap($unit) {
+      append text "    <ClCompile Include=\"..\\..\\..\\[wokUtils:EASY:bs1 [wokUtils:FILES:wtail $file 3]]\">\n"
+      append text "      <Filter>Source files\\${unit}</Filter>\n"
+      append text "    </ClCompile>\n"
    }
  }
  append text "  </ItemGroup>\n"

  append text "  <ItemGroup>\n"
-  append text "    <ResourceCompile Include=\"${proj}.rc\" />\n"
+  append text "    <ResourceCompile Include=\"${proj}.rc\" />"
  append text "  </ItemGroup>\n"

  # end
@@ -1720,9 +1726,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  set anIncPaths "..\\..\\..\\inc"
 #  set aTKDefines ""
  set aFilesSection ""
-  set aVcFilesCxx(units) ""
-  set aVcFilesHxx(units) ""
+  set aVcFilesX(units) ""
  set listloc [osutils:tk:units $theToolKit]
+  set resultloc [osutils:justwnt $listloc]
  if [array exists written] { unset written }
  #puts "\t1 [wokparam -v %CMPLRS_CXX_Options [w_info -f]] father"
  #puts "\t2 [wokparam -v %CMPLRS_CXX_Options] branch"
@@ -1731,10 +1737,9 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  set fxloparamfcxx [lindex [osutils:intersect3 [_get_options wnt cmplrs_cxx f] [_get_options wnt cmplrs_cxx b]] 2]
  set fxloparamfc   [lindex [osutils:intersect3 [_get_options wnt cmplrs_c f] [_get_options wnt cmplrs_c b]] 2]
  set fxloparam ""
-  foreach fxlo $listloc {
+  foreach fxlo $resultloc {
    set xlo $fxlo
-    set aSrcFiles [osutils:tk:cxxfiles $xlo wnt]
-	set aHxxFiles [osutils:tk:hxxfiles $xlo wnt]
+    set aSrcFiles [osutils:tk:files $xlo wnt]
 	set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx $fxlo]
    if {$fxlo_cmplrs_options_cxx == ""} {
      set fxlo_cmplrs_options_cxx [_get_options wnt cmplrs_cxx b]
@@ -1763,22 +1768,12 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      foreach aSrcFile [lsort $aSrcFiles] {
        if { ![info exists written([file tail $aSrcFile])] } {
          set written([file tail $aSrcFile]) 1
-          append aFilesSection [osutils:vcxproj:cxxfile $aSrcFile $needparam]
+          append aFilesSection [osutils:vcxproj:file $aSrcFile $needparam]
        } else {
          puts "Warning : in vcproj more than one occurences for [file tail $aSrcFile]"
        }
-        if { ! [info exists aVcFilesCxx($xlo)] } { lappend aVcFilesCxx(units) $xlo }
-        lappend aVcFilesCxx($xlo) $aSrcFile
-      }
-      foreach aHxxFile [lsort $aHxxFiles] {
-        if { ![info exists written([file tail $aHxxFile])] } {
-          set written([file tail $aHxxFile]) 1
-          append aFilesSection [osutils:vcxproj:hxxfile $aHxxFile]
-        } else {
-          puts "Warning : in vcproj more than one occurences for [file tail $aHxxFile]"
-        }
-        if { ! [info exists aVcFilesHxx($xlo)] } { lappend aVcFilesHxx(units) $xlo }
-        lappend aVcFilesHxx($xlo) $aHxxFile
+        if { ! [info exists aVcFilesX($xlo)] } { lappend aVcFilesX(units) $xlo }
+        lappend aVcFilesX($xlo) $aSrcFile
      }
    } else {
      append aFilesSection "\t\t\t<Filter\n"
@@ -1794,9 +1789,15 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      }
      append aFilesSection "\t\t\t</Filter>\n"
    }
+
+    # macros
+#    append aTKDefines ";__${xlo}_DLL"
+    # common includes
+#    append anIncPaths ";..\\..\\..\\src\\${xlo}"
  }

  regsub -all -- {__TKINC__}  $theProjTmpl $anIncPaths theProjTmpl
+#  regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
  regsub -all -- {__FILES__}  $theProjTmpl $aFilesSection theProjTmpl

  # write file
@@ -1806,8 +1807,12 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  close $aFile

  # write filters file for vc10+
-  if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-    lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesCxx aVcFilesHxx]
+  if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" || "$theVcVer" == "vc9" } {
+    # nothing
+  } elseif { "$theVcVer" == "vc10" } {
+    lappend aVcFiles [osutils:vcxproj:filters $theOutDir $theToolKit aVcFilesX]
+  } else {
+    lappend aVcFiles [osutils:vcx1proj:filters $theOutDir $theToolKit aVcFilesX]
  }

  # write resource file
@@ -1839,14 +1844,16 @@ proc osutils:tk:loadunit { loc map } {
  return
 }

-# Returns the list of all files name in a toolkit within specified list of file extensions.
-proc osutils:tk:files { tkloc theExtensions } {
+# Returns the list of all compilable files name in a toolkit, or devunit of any type
+# Tfiles lists for each unit the type of file that can be compiled.
+proc osutils:tk:files { tkloc thePlatform } {
  set Tfiles(source,nocdlpack)     {source pubinclude}
  set Tfiles(source,toolkit)       {}
  set Tfiles(source,executable)    {source pubinclude}
  set listloc [concat [osutils:tk:units $tkloc] $tkloc]
  #puts " listloc = $listloc"

+  set l_comp [osutils:compilable $thePlatform]
  set resultloc $listloc
  set lret {}
  foreach loc $resultloc {
@@ -1871,7 +1878,7 @@ proc osutils:tk:files { tkloc theExtensions } {
      #puts $type
      foreach f $map($type) {
        #puts $f
-        if { [lsearch $theExtensions [file extension $f]] != -1 } {
+        if { [lsearch $l_comp [file extension $f]] != -1 } {
          lappend lret $f
        }
      }
@@ -1880,16 +1887,10 @@ proc osutils:tk:files { tkloc theExtensions } {
  return $lret
 }

-# Returns the list of all compilable files name in a toolkit.
-proc osutils:tk:cxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:compilable $thePlatform]] }
-
-# Returns the list of all header files name in a toolkit.
-proc osutils:tk:hxxfiles { tkloc thePlatform } { return [osutils:tk:files $tkloc [osutils:fileExtensionsHeaders $thePlatform]] }
-
 # Generate Visual Studio project file for executable
 proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  set aVcFiles {}
-  foreach f [osutils:tk:cxxfiles $theToolKit wnt] {
+  foreach f [osutils:tk:files $theToolKit wnt] {
    set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]

    set aProjName [file rootname [file tail $f]]
@@ -1924,16 +1925,15 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
    regsub -all -- {__TKDEP__} $aProjTmpl $aUsedLibs aProjTmpl

    set aFilesSection ""
-    set aVcFilesCxx(units) ""
-	set aVcFilesHxx(units) ""
+    set aVcFilesX(units) ""

    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 ""]
-        if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit }
-        lappend aVcFilesCxx($theToolKit) $f
+        append aFilesSection [osutils:vcxproj:file $f ""]
+        if { ! [info exists aVcFilesX($theToolKit)] } { lappend aVcFilesX(units) $theToolKit }
+        lappend aVcFilesX($theToolKit) $f
      } else {
        append aFilesSection "\t\t\t<Filter\n"
        append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
@@ -1945,8 +1945,10 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      puts "Warning : in vcproj there are than one occurences for [file tail $f]"
    }
    #puts "$aProjTmpl $aFilesSection"
+#    set aTKDefines ";__${theToolKit}_DLL"
    set anIncPaths "..\\..\\..\\inc"
    regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
+#    regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines    aProjTmpl
    regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
    regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl

@@ -1962,12 +1964,9 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {

    # write filters file for vc10
    if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-      lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
+      lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesX]
    }

-    # write resource file
-    lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
-
    set aCommonSettingsFileTmpl ""
    if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
      # nothing
@@ -2150,7 +2149,7 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} {
  if [array exists written] { unset written }
  foreach fxlo $resultloc {
    set xlo       $fxlo
-    set aSrcFiles [osutils:tk:cxxfiles $xlo $thePlatform]
+    set aSrcFiles [osutils:tk:files $xlo $thePlatform]
    foreach aSrcFile [lsort $aSrcFiles] {
      if { ![info exists written([file tail $aSrcFile])] } {
        set written([file tail $aSrcFile]) 1
@@ -2244,7 +2243,7 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } {
  set aWokArch    "$::env(ARCH)"

  set aCbpFiles {}
-  foreach aSrcFile [osutils:tk:cxxfiles $theToolKit $thePlatform] {
+  foreach aSrcFile [osutils:tk:files $theToolKit $thePlatform] {
    # collect list of referred libraries to link with
    set aUsedLibs     [list]
    set aFrameworks   [list]
@@ -2312,10 +2311,6 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  set aCmplFlagsDebug   [list]
  set toPassArgsByFile 0
  set aLibPrefix "lib"
-  set aPlatformAndCompiler "${thePlatform}/gcc"
-  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
-    set aPlatformAndCompiler "${thePlatform}/clang"
-  }
  if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" || "$thePlatform" == "qnx" } {
    set toPassArgsByFile 1
  }
@@ -2372,17 +2367,17 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  # Release target configuration
  puts $aFile "\t\t\t<Target title=\"Release\">"
  if { "$theIsExe" == "true" } {
-    puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
    puts $aFile "\t\t\t\t<Option type=\"1\" />"
  } else {
    if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bin/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${aPlatformAndCompiler}/lib/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bin/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${thePlatform}/cbp/lib/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
    } else {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/lib/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/lib/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
    }
    puts $aFile "\t\t\t\t<Option type=\"3\" />"
  }
-  puts $aFile "\t\t\t\t<Option object_output=\"../../../${aPlatformAndCompiler}/obj\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/obj\" />"
  puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
  puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
  if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2405,7 +2400,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  if { $toPassArgsByFile == 1 } {
    puts $aFile "\t\t\t\t\t<Add option=\"\@$aLnkFileName\" />"
  }
-  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${aPlatformAndCompiler}/lib\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/lib\" />"
  if { "$thePlatform" == "mac" } {
    if { [ lsearch $theLibsList X11 ] >= 0} {
      puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2413,7 +2408,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  }
  puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch})\" />"
  if { "$thePlatform" == "lin" } {
-    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aPlatformAndCompiler}/lib\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/lib\" />"
  }
  puts $aFile "\t\t\t\t</Linker>"

@@ -2422,17 +2417,17 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  # Debug target configuration
  puts $aFile "\t\t\t<Target title=\"Debug\">"
  if { "$theIsExe" == "true" } {
-    puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
    puts $aFile "\t\t\t\t<Option type=\"1\" />"
  } else {
    if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bind/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${aPlatformAndCompiler}/libd/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bind/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${thePlatform}/cbp/libd/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
    } else {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/libd/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/libd/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
    }
    puts $aFile "\t\t\t\t<Option type=\"3\" />"
  }
-  puts $aFile "\t\t\t\t<Option object_output=\"../../../${aPlatformAndCompiler}/objd\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/objd\" />"
  puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
  puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
  if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2455,7 +2450,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  if { $toPassArgsByFile == 1 } {
    puts $aFile "\t\t\t\t\t<Add option=\"\@$aLnkDebFileName\" />"
  }
-  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${aPlatformAndCompiler}/libd\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/libd\" />"
  if { "$thePlatform" == "mac" } {
    if { [ lsearch $theLibsList X11 ] >= 0} {
      puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2463,7 +2458,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
  }
  puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch}D)\" />"
  if { "$thePlatform" == "lin" } {
-    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aPlatformAndCompiler}/libd\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/libd\" />"
  }
  puts $aFile "\t\t\t\t</Linker>"

@@ -2530,8 +2525,8 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
      puts $aFile "\t\t\t<Option link=\"0\" />"
      puts $aFile "\t\t</Unit>"

-      set aFileObj  [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/obj/src/"]  $aSrcFile]]
-      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/objd/src/"] $aSrcFile]]
+      set aFileObj  [string map {.cxx .o} [string map [list "/src/" "/$thePlatform/cbp/obj/src/"]  $aSrcFile]]
+      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/$thePlatform/cbp/objd/src/"] $aSrcFile]]
      puts -nonewline $aFileLnkObj  "$aFileObj "
      puts -nonewline $aFileLnkObjd "$aFileObjd "
    } else {
@@ -2676,7 +2671,7 @@ proc OS:xcodeproj { theModules theOutDir theGuidsMap theLibType thePlatform} {
 }

 # Generates dependencies section for Xcode project files.
-proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids thePlatform theIsStatic} {
+proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids theIsStatic} {
  upvar $theGuidsMap         aGuidsMap
  upvar $theFileRefSection   aFileRefSection
  upvar $theDepsGuids        aDepsGuids
@@ -2687,7 +2682,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
  set aDepToolkits      [lappend [wokUtils:LIST:Purge [osutils:tk:close $theToolKit]] $theToolKit]

  if { "$theTargetType" == "executable" } {
-    set aFile [osutils:tk:cxxfiles $theToolKit mac]
+    set aFile [osutils:tk:files $theToolKit mac]
    set aProjName [file rootname [file tail $aFile]]
    set aDepToolkits [LibToLinkX $theToolKit $aProjName]
  }
@@ -2700,7 +2695,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
    }
  }

-  osutils:usedOsLibs $theToolKit $thePlatform aLibs aFrameworks
+  osutils:usedOsLibs $theToolKit "mac" aLibs aFrameworks
  set aUsedLibs [concat $aUsedLibs $aLibs]
  set aUsedLibs [concat $aUsedLibs $aFrameworks]
  foreach tkx $aUsedLibs {
@@ -2753,7 +2748,7 @@ proc osutils:xcdtk:sources {theToolKit theTargetType theSrcFileRefSection theGro
      set aGuidsMap($aPackage) [OS:genGUID "xcd"]
    }

-    set aSrcFiles [osutils:tk:cxxfiles $xlo mac]
+    set aSrcFiles [osutils:tk:files $xlo mac]
    foreach aSrcFile [lsort $aSrcFiles] {
      set aFileExt "sourcecode.cpp.cpp"

@@ -2915,7 +2910,7 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap theIsStatic thePlatform {t
  }

  puts $aPbxprojFile [osutils:xcdtk:sources $theToolKit $theTargetType aSrcFileRefSection aGroupSection aPackagesGuids aSrcFileGuids aGuidsMap anIncPaths]
-  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $thePlatform $theIsStatic]
+  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $theIsStatic]
  # End PBXBuildFile section

  # Begin PBXFileReference section
--- a/adm/qmake/.gitignore
+++ b/adm/qmake/.gitignore
@@ -1,5 +0,0 @@
-/*/*.pro
-/*/*/*.pro
-*.pro.user
-custom.pri
-custom.auto.pri
--- a/adm/qmake/OccCppConfig.pri
+++ b/adm/qmake/OccCppConfig.pri
@@ -1,157 +0,0 @@
-# This is project defines C++ compilation rules for building an OCCT Toolkit.
-
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-# Disable some dummy Qt defaults
-QT -= core gui
-CONFIG -= qt app_bundle
-CONFIG -= qml_debug
-CONFIG -= debug_and_release
-
-OccGitRoot = $$_PRO_FILE_PWD_/../../../..
-
-# Define compilation flags
-CONFIG += warn_on
-QMAKE_CFLAGS_WARN_ON   = -Wall
-QMAKE_CXXFLAGS_WARN_ON = -Wall
-win32 {
-  QMAKE_CFLAGS_WARN_ON   = -W4
-  QMAKE_CXXFLAGS_WARN_ON = -W4
-  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
-  QMAKE_CXXFLAGS_STL_ON = /EHa
-
-  QMAKE_CXXFLAGS += -fp:precise
-  #QMAKE_CXXFLAGS -= -Zc:throwingNew
-  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
-
-  QMAKE_LFLAGS += -INCREMENTAL:NO
-
-  CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS += -Od
-    QMAKE_CXXFLAGS += -Ob1
-  }
-
-  DEFINES -= WIN32
-  DEFINES -= WIN64
-  DEFINES += _CRT_SECURE_NO_WARNINGS
-  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
-  DEFINES += _SCL_SECURE_NO_WARNINGS
-} else {
-  CONFIG += c++11
-  QMAKE_CFLAGS   += -fexceptions
-  QMAKE_CXXFLAGS += -fexceptions
-  QMAKE_CXXFLAGS += -fvisibility=default
-  DEFINES += OCC_CONVERT_SIGNALS
-  mac {
-    iphoneos {
-      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
-    } else {
-      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
-    }
-  }
-}
-!CONFIG(debug, debug|release) {
-  # disable exceptions in Release builds
-  DEFINES += No_Exception
-  HAVE_RelWithDebInfo {
-    win32 {
-      CONFIG += force_debug_info
-    }
-  }
-}
-
-# Define output folder depending on compiler name
-MY_BITNESS = 32
-
-equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
-equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
-has64Target = $$find(QMAKE_TARGET.arch, "x64")
-count(has64Target, 1) { MY_BITNESS = 64 }
-
-MY_PLATFORM = platform
-CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
-} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
-} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
-} else:win32   { MY_PLATFORM = win$$MY_BITNESS
-} else:mac     { MY_PLATFORM = mac
-} else:linux   { MY_PLATFORM = lin
-} else:unix    { MY_PLATFORM = unix
-} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
-
-MY_COMPILER = compiler
-MY_VC_VER = 0
-android-g++ {
-  MY_COMPILER = gcc
-} else:clang {
-  MY_COMPILER = clang
-} else:gcc {
-  MY_COMPILER = gcc
-} else:win32-msvc2010 {
-  MY_COMPILER = vc10
-  MY_VC_VER = 10
-} else:win32-msvc2012 {
-  MY_COMPILER = vc11
-  MY_VC_VER = 11
-} else:win32-msvc2013 {
-  MY_COMPILER = vc12
-  MY_VC_VER = 12
-} else:win32-msvc2015 {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-} else:win32-msvc2017 {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-} else:win32-msvc {
-  MY_COMPILER = vc14
-  MY_VC_VER = 14
-  aMsvcVer = $$(VisualStudioVersion)
-  equals(aMsvcVer, 14.0){
-    # VS2015, vc140
-  } else:equals(aMsvcVer, 15.0){
-    # VS2015, vc141
-  } else:equals(aMsvcVer, 16.0){
-    # VS2019, vc142
-  } else {
-    warning (Unknown msvc version. "$$MY_COMPILER" is used)
-  }
-} else {
-  warning (Unknown compiler. "$$MY_COMPILER" is used)
-}
-MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
-#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
-
-CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
-
-DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
-win32 {
-  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
-  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
-  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
-
-  # dummy target creating lib/libd folder
-  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
-  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
-  occtkgen_libfolder.config = verbatim
-  QMAKE_SUBSTITUTES += occtkgen_libfolder
-
-  LIBS += -L$$aLibDest
-  equals(TEMPLATE, lib) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
-  } else {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
-  }
-  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
-  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
-  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
-} else {
-  LIBS += -L$$DESTDIR
-  equals(TEMPLATE, app) {
-    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
-  }
-}
-
-#OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
-OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}
--- a/adm/qmake/OccModule.pri
+++ b/adm/qmake/OccModule.pri
@@ -1,36 +0,0 @@
-# This is a project template file defining an OCCT Module.
-# This project should be included with predefined OCC_MODULE_NAME variable.
-TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-# Iterate over Toolkits within current Module and generate sub-project per Toolkit
-aModuleList = $$cat(../MODULES, lines)
-for (aModuleIter, aModuleList) {
-  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
-  aModule = $$first($$list($$aModuleIter))
-  equals (aModule, $$OCC_MODULE_NAME) {
-    for (aToolKit, $$list($$aModuleIter)) {
-      toSkipToolkit = 0
-      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
-      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
-      equals (toSkipToolkit, 0) {
-        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
-        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
-        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
-        eval(occtkgen_$${aToolKit}.config = verbatim)
-        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
-        SUBDIRS += $${aToolKit}
-
-        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
-        aTkDepends = $${aToolKit}.depends
-        for (aModExtIter, aModExtList) {
-          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
-        }
-        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
-      }
-    }
-  }
-}
--- a/adm/qmake/OccModule.pro.in
+++ b/adm/qmake/OccModule.pro.in
@@ -1,2 +0,0 @@
-OCC_MODULE_NAME = \$\$TARGET
-include(../OccModule.pri)
--- a/adm/qmake/OccToolkit.pri
+++ b/adm/qmake/OccToolkit.pri
@@ -1,144 +0,0 @@
-# This is a project template file defining an OCCT Toolkit.
-# This project should be included with predefined OCC_TOOLKIT_NAME variable.
-
-TEMPLATE = lib
-!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
-  TEMPLATE = app
-  CONFIG += console
-}
-win32 {
-  # do not append version to DLL name
-  CONFIG += skip_target_version_ext
-}
-
-include(OccCppConfig.pri)
-
-aSrcRoot = $$OccGitRoot/src
-aHxxRoot = $$OccGitRoot/inc
-INCLUDEPATH += $$aHxxRoot
-
-# CSF variables
-CSF_FREETYPE  = -lfreetype
-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_ZLIB      { CSF_ZLIB = -lzlib }
-HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
-win32 {
-  CSF_kernel32   = -lkernel32
-  CSF_advapi32   = -ladvapi32
-  CSF_gdi32      = -lgdi32
-  CSF_user32     = -luser32 -lcomdlg32
-  CSF_shell32    = -lShell32
-  CSF_opengl32   = -lopengl32
-  CSF_wsock32    = -lwsock32
-  CSF_netapi32   = -lnetapi32
-  CSF_OpenGlLibs = -lopengl32
-  HAVE_GLES2 { CSF_OpenGlLibs = -llibEGL -llibGLESv2 }
-  CSF_psapi      = -lPsapi
-  CSF_winmm      = -lwinmm
-  CSF_d3d9       = -ld3d9
-  CSF_TclLibs    = -ltcl86
-  CSF_TclTkLibs  = -ltk86
-  CSF_TBB =
-} else:mac {
-  CSF_dl         = -ldl
-  CSF_objc       = -lobjc
-  iphoneos {
-    CSF_Appkit     = -framework UIKit
-    CSF_OpenGlLibs = -framework OpenGLES
-  } else {
-    CSF_Appkit     = -framework AppKit
-    CSF_OpenGlLibs = -framework OpenGL
-  }
-  CSF_IOKit      = -framework IOKit
-  CSF_TclLibs    = -framework Tcl
-  CSF_TclTkLibs  = -framework Tk
-} else {
-  CSF_dl = -ldl
-  CSF_ThreadLibs = -lpthread -lrt
-  CSF_OpenGlLibs = -lGL
-  CSF_TclTkLibs  = -lX11 -ltk8.6
-  CSF_XwLibs     = -lX11 -lXext -lXmu -lXi
-  CSF_MotifLibs  = -lX11
-  CSF_fontconfig = -lfontconfig
-  HAVE_GLES2 { CSF_OpenGlLibs = -lEGL -lGLESv2 }
-}
-
-for (aCfgIter, CONFIG) {
-  aRes = $$find(aCfgIter, "^HAVE_")
-  count(aRes, 1) {
-    DEFINES += $$aCfgIter
-  }
-}
-
-# Define the list of standard OCCT file extensions
-aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
-aPxxRegex = ^.*\.(pxx)$
-aCxxRegex = ^.*\.(cxx|c)$
-mac { aCxxRegex = ^.*\.(cxx|c|m|mm)$ }
-
-# Auxiliary function for probing file extension
-defineTest (occCheckExtension) {
-  aProbe = $$find(1, "$$2")
-  count(aProbe, 1) { return(true) } else { return(false) }
-}
-
-# Auxiliary function for probing compilable files
-defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
-
-# Auxiliary function for probing header files
-defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
-
-aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
-aTkFiles += CMakeLists.txt
-aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
-anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
-
-for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
-for (anExternLib, anExternLibs) {
-  hasCsf = $$find(anExternLib, CSF_)
-  count(hasCsf, 1) {
-    aList = $$split($$anExternLib, "\n")
-    LIBS += $$aList
-  } else {
-    LIBS += -l$$anExternLib
-  }
-}
-
-# Iterate over Packages and add compilable files into this project
-isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
-for (aPackage, aPackages) {
-  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
-  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
-  for (aFileIter, aPackageFiles) {
-    occIsCxxFile($$aFileIter) {
-      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
-    }
-  }
-}
-
-# extend clean with versioned .so files
-!win32 {
-  aVerList = $$split(VERSION, ".")
-  aVerMaj = $$member(aVerList, 0)
-  aVerMin = $$member(aVerList, 1)
-  aVerMic = $$member(aVerList, 2)
-  equals(TEMPLATE, app) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
-  } else {
-    mac {
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
-    } else {
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
-    }
-  }
-}
--- a/adm/qmake/OccToolkit.pro.in
+++ b/adm/qmake/OccToolkit.pro.in
@@ -1,2 +0,0 @@
-OCC_TOOLKIT_NAME = \$\$TARGET
-include(../../OccToolkit.pri)
--- a/adm/qmake/Occt.pro
+++ b/adm/qmake/Occt.pro
@@ -1,41 +0,0 @@
-# This is an experimental Solution project for building entire OCCT framework using qmake.
-# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
-# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
-# Building OCCT using CMake is a preferred solution.
-#
-# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
-# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
-# - Launch genproj to fill in "inc" folder with links to header files.
-# - Open project in Qt Creator, and call "Run qmake".
-# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
-# - "Run qmake" and perform Build.
-TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
-
-OTHER_FILES += OccModule.pro.in \
-               OcctHeaderLink.hxx.in \
-               OccToolkit.pro.in \
-               OccCppConfig.pri \
-               OccModule.pri \
-               OccToolkit.pri \
-               custom.pri.template
-
-# Iterate over Modules and generate sub-projects
-aSolModuleList = $$cat(../MODULES, lines)
-for (aSolModuleIter, aSolModuleList) {
-  aSolModule = $$first($$list($$aSolModuleIter))
-  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
-  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
-  eval(occtkgen_$${aSolModule}.config = verbatim)
-  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
-  SUBDIRS += $${aSolModule}
-}
-
-# These dependencies are manually defined
-ModelingData.depends = FoundationClasses
-ModelingAlgorithms.depends = FoundationClasses ModelingData
-Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
-ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
-DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
-Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization
--- a/adm/qmake/OcctDummy.in
+++ b/adm/qmake/OcctDummy.in
--- a/adm/qmake/OcctHeaderLink.hxx.in
+++ b/adm/qmake/OcctHeaderLink.hxx.in
@@ -1 +0,0 @@
-#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"
--- a/adm/qmake/custom.pri.template
+++ b/adm/qmake/custom.pri.template
@@ -1,17 +0,0 @@
-PRODUCTS_PATH = c:/3rdparty/vc14
-
-#CONFIG += HAVE_FREEIMAGE
-#CONFIG += HAVE_FFMPEG
-#CONFIG += HAVE_TBB
-#CONFIG += HAVE_GLES2
-#CONFIG += HAVE_D3D
-#CONFIG += HAVE_VTK
-
-aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
-aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
-
-INCLUDEPATH += $$aFreeType/include
-LIBS        += -L$$aFreeType/lib
-
-INCLUDEPATH += $$aTclTk/include
-LIBS        += -L$$aTclTk/lib
--- a/adm/templates/env.bat
+++ b/adm/templates/env.bat
@@ -24,13 +24,11 @@ set "HAVE_GLES2=false"
 set "HAVE_D3D=false"
 set "HAVE_ZLIB=false"
 set "HAVE_LIBLZMA=false"
-set "HAVE_RAPIDJSON=false"
 set "CSF_OPT_INC="
 set "CSF_OPT_LIB32="
 set "CSF_OPT_LIB64="
 set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="
-set "CSF_DEFINES=%CSF_DEFINES_EXTRA%"

 if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
 if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
@@ -164,7 +162,6 @@ if ["%HAVE_GLES2%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
 if ["%HAVE_D3D%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D"       & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
 if ["%HAVE_ZLIB%"]      == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB"      & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
 if ["%HAVE_LIBLZMA%"]   == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA"   & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"
-if ["%HAVE_RAPIDJSON%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_RAPIDJSON" & set "CSF_DEFINES=HAVE_RAPIDJSON;%CSF_DEFINES%"

 rem Eliminate VS warning
 if ["%CSF_DEFINES%"]  == [""] set "CSF_DEFINES=;"
--- a/adm/templates/env.sh
+++ b/adm/templates/env.sh
@@ -6,7 +6,7 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath
 # Reset values
 export CASROOT="__CASROOT__"
 export CASDEB=""
-export PRJFMT="";
+export TARGET="";
 export HAVE_TBB="false";
 export HAVE_OPENCL="false";
 export HAVE_FREEIMAGE="false";
@@ -40,9 +40,9 @@ do
  elif [ "$i" == "i" ] || [ "$i" == "relwithdeb" ]; then
    export CASDEB="i"
  elif [ "$i" == "cbp" ]; then
-    export PRJFMT="cbp";
+    export TARGET="cbp";
  elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
-    export PRJFMT="xcd";
+    export TARGET="xcd";
  fi
 done
 shopt -u nocasematch
@@ -64,32 +64,28 @@ else
 fi

 export CASBIN=""
-if [ "${PRJFMT}" == "xcd" ]; then
+if [ "${TARGET}" == "cbp" ]; then
+  export CASBIN="${WOKSTATION}/cbp"
+elif [ "${TARGET}" == "xcd" ]; then
  export CASBIN="adm/mac/xcd/build"
-else
-  if [ "$aSystem" == "Darwin" ]; then
-    export CASBIN="${WOKSTATION}/clang"
-  else
-    export CASBIN="${WOKSTATION}/gcc"
-  fi
 fi

 export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"

-if [ "${PRJFMT}" == "xcd" ]; then
-  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
-  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
-  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
-  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
-  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
-  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
-else
+if [ "${TARGET}" == "cbp" ]; then
  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
+elif [ "${TARGET}" == "xcd" ]; then
+  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
+  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
+  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
 fi

 export CSF_OPT_CMPL=""
@@ -178,7 +174,7 @@ export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
 export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
 export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"

-if [ "${PRJFMT}" == "xcd" ]; then
+if [ "${TARGET}" == "xcd" ]; then
  if [ "${CASDEB}" == "d" ]; then
    export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
  else
--- a/adm/templates/template.vc10
+++ b/adm/templates/template.vc10
@@ -110,7 +110,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -159,7 +159,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -206,7 +206,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -255,7 +255,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/adm/templates/template.vc10x
+++ b/adm/templates/template.vc10x
@@ -103,7 +103,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
@@ -149,7 +149,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -193,7 +193,7 @@
      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
@@ -238,7 +238,7 @@
      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -248,11 +248,7 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-__FILES__
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="__XQTNAM__.rc" />
-  </ItemGroup>
+__FILES__  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/dox/CMakeLists.txt
+++ b/dox/CMakeLists.txt
@@ -89,14 +89,6 @@ file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nEXTERNAL_SEARCH        = NO")
 # Formula options
 file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH        = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")

-# If MSVC is used as build system, change warning format to the one recognized by MSVC
-if (MSVC)
-  file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nWARN_FORMAT            = \"$file($line): $text\"")
-endif()
-
-# Avoid Doxygen parsing messages in the build log
-file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nQUIET                  = YES")
-
 # Copy index file to provide fast access to HTML documentation
 file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")

--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -1091,7 +1091,7 @@ The following environment variables have become redundant:

 * *CSF_UnitsLexicon* and *CSF_UnitsDefinition* are no more used.  Units definition (*UnitsAPI/Lexi_Expr.dat* and *UnitsAPI/Units.dat*) is now embedded into source code.
 * *CSF_XSMessage* and *CSF_XHMessage* are now optional.
-  English messages (XSMessage/\*XSTEP.us* and SHMessage/\*SHAPE.us*) are now embedded into source code
+  English messages (XSMessage/*XSTEP.us* and SHMessage/*SHAPE.us*) are now embedded into source code
  and automatically loaded when environment variables are not set.
 * *CSF_ShadersDirectory* is not required any more, though it still can be used to load custom shaders.
  Mandatory GLSL resources are now embedded into source code.
@@ -1672,92 +1672,3 @@ Standard_Boolean meshing_new()
  return !aStatus;
 }
 ~~~~
-
-@subsection upgrade_740_chamfer Changes in API of Chamfer algorithms
-
-Some public methods of the class BRepFilletAPI_MakeChamfer are released from excess arguments:
- method Add for symmetric chamfer now takes only 2 arguments: distance and edge;
- method GetDistAngle now takes only 3 arguments: index of contour, distance and angle.
-
-@subsection upgrade_740_aspects Aspects unification
-
-Fill Area, Line and Marker aspects (classes *Graphic3d_AspectFillArea3d*, *Graphic3d_AspectLine3d*, *Graphic3d_AspectMarker3d* and *Graphic3d_AspectText3d*)
-have been merged into new class *Graphic3d_Aspects* providing a single state for rendering primitives of any type.
-The old per-primitive type aspect classes have been preserved as sub-classes of *Graphic3d_Aspects* with default values close to the previous behavior.
-All aspects except Graphic3d_AspectFillArea3d define Graphic3d_TOSM_UNLIT shading model.
-
-The previous approach with dedicated aspects per primitive type was handy in simplified case, but lead to confusion otherwise.
-In fact, drawing points or lines with lighting applied is a valid use case, but only *Graphic3d_AspectFillArea3d* previously defined necessary material properties.
-
-As aspects for different primitive types have been merged, Graphic3d_Group does no more provide per-type aspect properties.
-Existing code relying on old behavior and putting interleaved per-type aspects into single Graphic3d_Group should be updated.
-For example, the following pseudo-code will not work anymore, because all *SetGroupPrimitivesAspect* calls will setup the same property:
-~~~~
-Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-aGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect());    //!< overrides previous aspect
-
-Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments (2);
-Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles (3);
-aGroup->AddPrimitiveArray (aLines); //!< both arrays will use the same aspect
-aGroup->AddPrimitiveArray (aTris);
-~~~~
-
-To solve the problem, the code should be modified to either put primitives into dedicated groups (preferred approach), or using *SetPrimitivesAspect* in proper order:
-~~~~
-Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-
-aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles (3);
-aGroup->AddPrimitiveArray (aTris);
-
-Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments (2);
-aGroup->SetPrimitivesAspect (myDrawer->LineAspect()->Aspect()); //!< next array will use the new aspect
-aGroup->AddPrimitiveArray (aLines);
-~~~~
-
-@subsection upgrade_740_prsupdate Presentation invalidation
-
-Historically AIS_InteractiveObject provided two independent mechanisms invalidating presentation (asking presentation manager to recompute specific display mode or all modes):
-
-1. *AIS_InteractiveObject::SetToUpdate()*, marking existing presentation for update.
-   This is main invalidation API, which is expected to be followed by *AIS_InteractiveContext::Update()* call.
-2. *AIS_InteractiveObject::myToRecomputeModes* + *myRecomputeEveryPrs*.
-   This is auxiliary invalidation API, used internally by AIS_InteractiveContext::SetColor()/UnsetColor() and similar modification methods.
-
-The latter one has been removed to avoid confusion and unexpected behavior.
-In addition, two methods *AIS_InteractiveObject::Update()* have been deprecated in favor of new *AIS_InteractiveObject::UpdatePresentations()* recomputing only invalidated presentations.
-
-Custom presentations implementing interface methods *AIS_InteractiveObject::SetColor()* and others should be revised to use *AIS_InteractiveObject::SetToUpdate()*
-or updating presentation without recomputation (see *AIS_InteractiveObject::SynchronizeAspects()* and *AIS_InteractiveObject::replaceAspects()*).
-
-@subsection upgrade_740_interiorstyles Interior styles
-
-* *Aspect_IS_HOLLOW* is now an alias to *Aspect_IS_EMPTY* and does not implicitly enables drawing mesh edges anymore.
-  Specify Graphic3d_AspectFillArea3d::SetDrawEdges(true) with Graphic3d_AspectFillArea3d::SetInteriorStyle(Aspect_IS_EMPTY) to get previous behavior of Aspect_IS_HOLLOW style.
-* *Aspect_IS_HIDDENLINE* does not implicitly enables drawing mesh edges anymore.
-  Specify Graphic3d_AspectFillArea3d::SetDrawEdges(true) with Graphic3d_AspectFillArea3d::SetInteriorStyle(Aspect_IS_HIDDENLINE) to get previous behavior of Aspect_IS_HIDDENLINE style.
-
-@subsection upgrade_740_modedprs PrsMgr and SelectMgr hierarchy clean up
-
-Proxy classes *Prs3d_Presentation*, *PrsMgr_ModedPresentation* and *PrsMgr_Prs* have been removed.
-Code iterating through the list of low-level structures AIS_InteractiveObject::Presentations() should be updated to access PrsMgr_Presentation directly.
-Forward declarations of *Prs3d_Presentation* should be corrected, since it is now a typedef to *Graphic3d_Structure*.
-
-Proxy classes *SelectBasics_SensitiveEntity* and *SelectBasics_EntityOwner* have been removed - *Select3D_SensitiveEntity* and *SelectMgr_EntityOwner* should be now used directly instead.
-
-@subsection upgrade_740_geproj Custom defines within env.bat
-
-*env.bat* produced by Visual Studio project generator *genproj.bat* has been modified so that *%CSF_DEFINES%* variable is reset to initial state.
-Custom building environment relying on old behavior and setting extra macros within *%CSF_DEFINES%* before env.bat should be updated
-to either modify custom.bat or setup new variable *%CSF_DEFINES_EXTRA%* instead.
-
-@subsection upgrade_740_BVH_in_BOP Switching Boolean Operations algorithm to use BVH tree instead of UB tree
-
-Since OCCT 7.4.0 Boolean Operations algorithm uses BVH tree instead of UBTree to find the pairs of entities with interfering bounding boxes.
-The following API changes have been made:
-* BOPTools_BoxBndTree and BOPTools_BoxBndTreeSelector have been removed. Use the BOPTools_BoxTree and BOPTools_BoxTreeSelector instead.
-* BOPTools_BoxSelector::SetBox() method now accepts the BVH_Box instead of Bnd_Box.
-* Methods BOPTools_BoxSelector::Reject and BOPTools_BoxSelector::Accept have been removed as unused.
-* The RunParallel flag has been removed from the list of parameters of BOPAlgo_Tools::IntersectVertices method. Earlier, it performed selection from the UB tree in parallel mode. Now all interfering pairs are found in one pass, using pair traverse of the same BVH tree.
-
--- a/dox/overview/overview.md
+++ b/dox/overview/overview.md
@@ -222,7 +222,6 @@ for which OCCT is certified to work.
 | Freetype (for text rendering) | FreeType 2.4.11-2.7.1 https://sourceforge.net/projects/freetype/files/ |
 | FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.17.0+ https://sourceforge.net/projects/freeimage/files |
 | FFmpeg (optional, for video recording) | FFmpeg 3.1+ https://www.ffmpeg.org/download.html |
-| RapidJSON (optional, for reading glTF) | RapidJSON 1.1+ http://rapidjson.org/ |
 | Intel TBB (optional, for multithreaded algorithms) | TBB 4.x or 5.x https://www.threadingbuildingblocks.org/ |
 | VTK (for VTK Integration Services | VTK 6.1+ http://www.vtk.org/download/ |
 | Doxygen (optional for building documentation) | Doxygen 1.8.5+ https://www.stack.nl/~dimitri/doxygen/download.html |
--- a/dox/resources/occt_rm.doxyfile
+++ b/dox/resources/occt_rm.doxyfile
@@ -23,7 +23,7 @@ WARNINGS               = NO
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
-PREDEFINED             = Standard_EXPORT Standard_NODISCARD Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC "Standard_DEPRECATED=//! @deprecated "
+PREDEFINED             = Standard_EXPORT Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
 SEARCH_INCLUDES        = YES
--- a/dox/resources/occt_ug_html.doxyfile
+++ b/dox/resources/occt_ug_html.doxyfile
@@ -16,6 +16,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = \\$file:\$line: \$text\
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.md *.dox 
 RECURSIVE              = YES
@@ -55,6 +56,6 @@ USE_MATHJAX            = YES
 MATHJAX_FORMAT         = HTML-CSS

 # Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image html \1"
-ALIASES += figure{2}="\image html \1 \2"
-ALIASES += figure{3}="\image html \1 \2"
+ALIASES += figure{1}="\image html \1 \n"
+ALIASES += figure{2}="\image html \1 \2 \n"
+ALIASES += figure{3}="\image html \1 \2 \n"
--- a/dox/resources/occt_ug_pdf.doxyfile
+++ b/dox/resources/occt_ug_pdf.doxyfile
@@ -16,6 +16,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = \\$file:\$line: \$text\
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.md *.dox 
 RECURSIVE              = YES
@@ -48,6 +49,6 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex

 # Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image latex \1"
-ALIASES += figure{2}="\image latex \1 \2"
-ALIASES += figure{3}="\image latex \1 \2 width=\3"
+ALIASES += figure{1}="\image latex \1 \n"
+ALIASES += figure{2}="\image latex \1 \2 \n"
+ALIASES += figure{3}="\image latex \1 \2 width=\3 \n"
--- a/dox/user_guides/draw_test_harness/draw_test_harness.md
+++ b/dox/user_guides/draw_test_harness/draw_test_harness.md
@@ -1,4 +1,4 @@
-Draw Test Harness  {#occt_user_guides__test_harness}
+Draw Test Harness  {#occt_user_guides__test_harness}
 ===============================

@tableofcontents
@@ -5593,8 +5593,7 @@ Draw provides command to create curves and surfaces by approximation.

 * **2dapprox** fits a curve through 2d points; 
 * **appro** fits a curve through 3d points;
-* **surfapp** and **grilapp** fit a surface through 3d points by approximation;
-* **surfint** fit a surface through 3d points by interpolation;
+* **surfapp** and **grilapp** fit a surface through 3d points;
 * **2dinterpolate** interpolates a curve. 

@subsubsection occt_draw_6_8_1   appro, dapprox
@@ -5615,28 +5614,17 @@ Let us pick points and they will be fitted
 2dapprox c 10 
 ~~~~~

-@subsubsection occt_draw_6_8_2  surfapp, grilapp, surfint
+@subsubsection occt_draw_6_8_2  surfapp, grilapp


 Syntax: 
 ~~~~~
 surfapp name nbupoints nbvpoints x y z .... 
-or
-surfapp name nbupoints nbvpoints surf [periodic_flag = 0]
 grilapp name nbupoints nbvpoints xo dx yo dy z11 z12 ... 
-surfint name surf nbupoints nbvpoints [periodic_flag = 0]
 ~~~~~

 * **surfapp** fits a surface through an array of u and v points, nbupoints*nbvpoints. 
 * **grilapp** has the same function, but the x,y coordinates of the points are on a grid starting at x0,y0 with steps dx,dy. 
-* **surfapp** can take array of points from other input surface, if alternative syntax
-**surfapp** name nbupoints nbvpoints surf [periodic_flag = 0]
-is used.
-Both command use for fitting approximation algorithm.
-**surfint** uses interpolation algorithm and can take array of point only from other input surface.
-Optional parameter **periodic_flag** allows to get correct periodical surfaces in U direction.
-U direction of result surface corresponds colums of initial array of points.
-If **periodic_flag** = 1, algorithm uses first row of array as last row and builds periodical surface.

 **Example:** 
 ~~~~~
@@ -5872,8 +5860,6 @@ The following topics are covered in the eight sections of this chapter:
  * Topological operations, or booleans.
  * Drafting and blending.
  * Defeaturing.
-  * Making shapes periodic in 3D space.
-  * Making shapes connected.
  * Analysis of shapes.


@@ -7205,160 +7191,6 @@ parallel - enables the parallel processing mode.
 ~~~~


-@subsection occt_draw_makeperiodic 3D Model Periodicity
-
-Draw module for @ref occt_modalg_makeperiodic "making the shape periodic" includes the following commands:
-* **makeperiodic** - makes the shape periodic in required directions;
-* **repeatshape** - repeats the periodic shape in requested periodic direction;
-* **periodictwins** - returns the periodic twins for the shape;
-* **clearrepetitions** - clears all previous repetitions of the periodic shape.
-
-@subsubsection occt_draw_makeperiodic_makeperiodic makeperiodic
-
-The command makes the shape periodic in the required directions with the required period.
-If trimming is given it trims the shape to fit the requested period.
-
-Syntax:
-~~~~
-makeperiodic result shape [-x/y/z period [-trim first]]
-
-Where:
-result        - resulting periodic shape;
-shape         - input shape to make it periodic:
-x/y/z period - option to make the shape periodic in X, Y or Z direction with the given period;
-trim first   - option to trim the shape to fit the required period, starting the period in first.
-~~~~
-
-@subsubsection occt_draw_makeperiodic_repeatshape repeatshape
-
-The command repeats the periodic shape in periodic direction requested number of time.
-The result contains the all the repeated shapes glued together.
-The command should be called after **makeperiodic** command.
-
-Syntax:
-~~~~
-repeatshape result -x/y/z times
-
-Where:
-result       - resulting shape;
-x/y/z times - direction for repetition and number of repetitions (negative number of times means the repetition in negative direction).
-~~~~
-
-@subsubsection occt_draw_makeperiodic_periodictwins periodictwins
-
-For the given shape the command returns the identical shapes located on the opposite sides of the periodic direction.
-All periodic twins should have the same geometry.
-The command should be called after **makeperiodic** command.
-
-Syntax:
-~~~~
-periodictwins twins shape
-
-Where:
-twins - periodic twins for the given shape
-shape - shape to find the twins for
-~~~~
-
-@subsubsection occt_draw_makeperiodic_clearrepetitions clearrepetitions
-
-The command clears all previous repetitions of the periodic shape allowing to start the repetitions over.
-No arguments are needed for the command.
-
-
-@subsection occt_draw_makeconnected Making the touching shapes connected
-
-Draw module for @ref occt_modalg_makeconnected "making the touching same-dimensional shapes connected" includes the following commands:
-* **makeconnected** - make the input shapes connected or glued, performs material associations;
-* **cmaterialson** - returns the materials located on the requested side of a shape;
-* **cmakeperiodic** - makes the connected shape periodic in requested directions;
-* **crepeatshape** - repeats the periodic connected shape in requested directions requested number of times;
-* **cperiodictwins** - returns all periodic twins for the shape;
-* **cclearrepetitions** - clears all previous repetitions of the periodic shape, keeping the shape periodic.
-
-@subsubsection occt_draw_makeconnected_makeconnected makeconnected
-
-The command makes the input touching shapes connected.
-
-Syntax:
-~~~~
-makeconnected result shape1 shape2 ...
-
-Where:
-result            - resulting connected shape.
-shape1 shape2 ... - shapes to be made connected.
-~~~~
-
-@subsubsection occt_draw_makeconnected_cmaterialson cmaterialson
-
-The command returns the materials located on the requested side of the shape.
-The command should be called after the shapes have been made connected, i.e. after the command **makeconnected**.
-
-Syntax:
-~~~~
-cmaterialson result +/- shape
-
-Where:
-result - material shapes
-shape  - shape for which the materials are needed
-+/-    - side of a given shape ('+' for positive side, '-' - for negative).
-~~~~
-
-@subsubsection occt_draw_makeconnected_cmakeperiodic cmakeperiodic
-
-The command makes the connected shape periodic in the required directions with the required period.
-The command should be called after the shapes have been made connected, i.e. after the command **makeconnected**.
-
-Syntax:
-~~~~
-cmakeperiodic result [-x/y/z period [-trim first]]
- 
-Where:
-result        - resulting periodic shape;
-shape         - input shape to make it periodic:
-x/y/z period - option to make the shape periodic in X, Y or Z direction with the given period;
-trim first   - option to trim the shape to fit the required period, starting the period in first.
-~~~~
-
-@subsubsection occt_draw_makeconnected_crepeatshape crepeatshape
-
-The command repeats the connected periodic shape in the required periodic directions required number of times.
-The command should be called after the shapes have been made connected and periodic, i.e. after the commands **makeconnected** and **cmakeperiodic**.
-
-Syntax:
-~~~~
-crepeatshape result -x/y/z times
-
-Where:
-result       - resulting shape;
-x/y/z times - direction for repetition and number of repetitions (negative number of times means the repetition in negative direction).
-~~~~
-
-@subsubsection occt_draw_makeconnected_cperiodictwins cperiodictwins
-
-The command returns all periodic twins for the shape.
-The command should be called after the shapes have been made connected and periodic, i.e. after the commands **makeconnected** and **cmakeperiodic**.
-
-Syntax:
-~~~~
-cperiodictwins twins shape
-
-Where:
-twins - periodic twins of a shape.
-shape - input shape.
-~~~~
-
-@subsubsection occt_draw_makeconnected_cclearrepetitions cclearrepetitions
-
-The command clears all previous repetitions of the periodic shape keeping the shape periodic.
-The command should be called after the shapes have been made connected, periodic and the repetitions have been applied to the periodic shape, i.e. after the commands **makeconnected**, **cmakeperiodic** and **crepeatshape**.
-Otherwise the command will have no effect.
-
-Syntax:
-~~~~
-cclearrepetitions [result]
-~~~~
-
-
@subsection occt_draw_7_9  Analysis of topology and geometry

 Analysis of shapes includes commands to compute length, area, volumes and inertial properties, as well as to compute some aspects impacting shape validity.
@@ -8719,7 +8551,7 @@ Where:

@subsubsection occt_draw_bop_options_warn Drawing warning shapes

-**bdrawwarnshapes** command enables/disables drawing of warning shapes of BOP algorithms.
+**bdrawwarnshapes** command enables/disables drawing of waring shapes of BOP algorithms.

 Syntax:
 ~~~~
--- a/dox/user_guides/iges/iges.md
+++ b/dox/user_guides/iges/iges.md
@@ -178,10 +178,10 @@ if  (!Interface_Static::SetRVal ("read.maxprecision.val",0.1))
 Default value is 1.  

 <h4>read.stdsameparameter.mode</h4>
-defines the using of  *BRepLib\::SameParameter*. Its possible values are:  
-* 0 (Off) -- *BRepLib\::SameParameter* is not called,  
-* 1 (On) -- *BRepLib\::SameParameter* is called.  
-*BRepLib\::SameParameter* is used through  *ShapeFix_Edge\::SameParameter*. It ensures that the resulting edge will have the  lowest tolerance taking pcurves either unmodified from the IGES file or  modified by *BRepLib\::SameParameter*.  
+defines the using of  *BRepLib::SameParameter*. Its possible values are:  
+* 0 (Off) -- *BRepLib::SameParameter* is not called,  
+* 1 (On) -- *BRepLib::SameParameter* is called.  
+*BRepLib::SameParameter* is used through  *ShapeFix_Edge::SameParameter*. It ensures that the resulting edge will have the  lowest tolerance taking pcurves either unmodified from the IGES file or  modified by *BRepLib::SameParameter*.  
 Read this parameter  with:  
 ~~~~~
 Standard_Integer mv =  Interface_Static::IVal("read.stdsameparameter.mode"); 
@@ -202,7 +202,7 @@ The processor also  decides to re-compute either the 3D or the 2D curve even if
  * the number of sub-curves in  the 2D curve is different from the number of sub-curves in the 3D curve. This  can be either due to different numbers of sub-curves given in the IGES file or  because of splitting of curves during translation. 
  * 3D or 2D curve is a Circular  Arc (entity type 100) starting and ending in the same point (note that this  case is incorrect according to the IGES standard).
  
-The parameter  *read.surfacecurve.mode* defines which curve (3D or 2D) is used for re-computing  the other one:
+The parameter  *read.surfacecurve.mode* defines which curve (3D or 2D) is used for re-computing  the other one:  
 * *Default(0)* use  the preference flag value in the entity's Parameter Data section. The flag  values are:  
  * 0: no preference given, 
  * 1: use 2D for 142 entities  and 3D for 141 entities, 
@@ -400,12 +400,12 @@ reader.PrintTransferInfo  (failsonly, mode);
 ~~~~~
 displays the messages  that appeared during the last invocation of *Transfer* or *TransferRoots*.  

-If *failsonly* is  *IFSelect_FailOnly*, only fail messages will be output, if it is  *IFSelect_FailAndWarn*, all messages will be output. Parameter “mode” can have  *IFSelect_xxx* values where *xxx* can be:
-  * *GeneralCount* -- gives general statistics  on the transfer (number of translated IGES entities, number of fails and  warnings, etc)  
-  * *CountByItem* -- gives the number of IGES  entities with their types per message. 
-  * *ListByItem* -- gives the number of IGES  entities with their type and DE numbers per message.  
-  * *ResultCount*  -- gives the number of  resulting OCCT shapes per type.  
-  * *Mapping* -- gives mapping between  roots of the IGES file and the resulting OCCT shape per IGES and OCCT type.
+If *failsonly* is  *IFSelect_FailOnly*, only fail messages will be output, if it is  *IFSelect_FailAndWarn*, all messages will be output. Parameter “mode” can have  *IFSelect_xxx* values where *xxx* can be:  
+* *GeneralCount* -- gives general statistics  on the transfer (number of translated IGES entities, number of fails and  warnings, etc)  
+* *CountByItem* -- gives the number of IGES  entities with their types per message. 
+* *ListByItem* -- gives the number of IGES  entities with their type and DE numbers per message.  
+* *ResultCount*  -- gives the number of  resulting OCCT shapes per type.  
+* *Mapping* -- gives mapping between  roots of the IGES file and the resulting OCCT shape per IGES and OCCT type.
 
@subsection occt_iges_2_4 Mapping of IGES  entities to Open CASCADE Technology shapes

--- a/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im001.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im001.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im002.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im002.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im003.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im003.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im004.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im004.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im005.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im005.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im006.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im006.png
--- a/dox/user_guides/modeling_algos/modeling_algos.md
+++ b/dox/user_guides/modeling_algos/modeling_algos.md
@@ -3438,312 +3438,3 @@ Here are the few examples of defeaturing of the model containing boxes with blen
  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im029.png,"Result",220}</td></td>
 </tr>
 </table>
-
-
-@section occt_modalg_makeperiodic 3D Model Periodicity
-
-Open CASCADE Technology provides tools for making an arbitrary 3D model (or just shape) periodic in 3D space in the specified directions.
-
-Periodicity of the shape means that the shape can be repeated in any periodic direction any number of times without creation of the new geometry or splits.
-The idea of this algorithm is to make the shape look similarly on the opposite sides or on the period bounds of periodic directions.
-It does not mean that the opposite sides of the shape will be mirrored. It just means that the opposite sides of the shape should be split by each other and obtain the same geometry on opposite sides.
-Such approach will allow repeating the shape, i.e. translating the copy of a shape on the period, without creation of new geometry because there will be no coinciding parts of different dimension.
-
-For better understanding of what periodicity means lets create a simple prism and make it periodic.
-The following draw script creates the L-shape prism with extensions 10x5x10:
-~~~~
-polyline p 0 0 0 0 0 10 5 0 10 5 0 5 10 0 5 10 0 0 0 0 0
-mkplane f p
-prism s f 0 5 0
-~~~~
-@figure{/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im001.png,"Shape to make periodic",220}
-
-Making this shape periodic in X, Y and Z directions with the periods matching the shape's extensions should make the splits of negative X and Z sides of the shape. The shape is already similar on opposite sides of Y directions, thus no new splits is expected.
-Here is the shape after making it periodic:
-@figure{/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im002.png,"Periodic shape",220}
-And here is the repetition of the shape once in X and Z directions:
-@figure{/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im003.png,"Repeated shape",220}
-
-The OCCT Shape Periodicity tools also allows making the shape periodic with the period not matching the shape's extensions. Let's make the shape periodic with 11, 6 and 11 for X, Y, Z periods accordingly.
-Such values of periods mean that there will be a gap between repeated shapes, and since during repetition the opposite sides do not touch the shape will not be split at all.
-Here is the repetition of the shape once in X and Z directions:
-@figure{/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im004.png,"Repeated shape",220}
-As expected, the shape is not split and the repeated elements do not touch.
-
-If necessary the algorithm will trim the shape to fit into the requested period by splitting it with the planes limiting the shape's requested periods.
-E.g. let's make the L-shape periodic only in X direction with the period 2 starting at X parameter 4:
-@figure{/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im005.png,"Periodic trimmed shape",220}
-
-@subsection occt_modalg_makeperiodic_how_it_works How the shape is made periodic
-
-For making the shape periodic in certain direction the algorithm performs the following steps:
-* Creates the copy of the shape and moves it on the period into negative side of the requested direction;
-* Splits the negative side of the shape by the moved copy, ensuring copying of the geometry from positive side to negative;
-* Creates the copy of the shape (with already split negative side) and moves it on the period into the positive side of the requested direction;
-* Splits the positive side of the shape by the moved copy, ensuring copying of the geometry from negative side to positive.
-
-Repeated copying of the geometry ensures that the corner edges of the periodic shape will have the same geometry on opposite sides of all periodic directions.
-
-Thus, in the periodic shape the geometry from positive side of the shape is always copied on the negative side of periodic directions.
-
-@subsection occt_modalg_makeperiodic_association Opposite shapes association
-
-The algorithm also associates the identical (or twin) shapes located on the opposite sides of the periodic shape. By the construction, the twin shapes should always have the same geometry and distanced from each other on the period.
-It is possible that the shape does not have any twins. It means that when repeating this shape will not touch the opposite side of the shape. In the example when the periods of the shape are grater than its extensions, non of the sub-shapes has a twin.
-
-@subsection occt_modalg_makeperiodic_repetition Periodic shape repetition
-
-The algorithm also provides the methods to repeat the periodic shape in periodic directions. To repeat shape the algorithm makes the requested number of copies of the shape and translates them one by one on the time * period value.
-After all copies are made and translated they are glued to have valid shape.
-The subsequent repetitions are performed on the repeated shape, thus e.g. repeating the shape two times in any periodic direction will create result containing three shapes (original plus two copies).
-Single subsequent repetition in any direction will result already in 6 shapes.
-
-The repetitions can be cleared and started over.
-
-@subsection occt_modalg_makeperiodic_history History support
-
-The algorithm supports the history of shapes modifications, thus it is possible to track how the shapes have been changed to make it periodic and what new shapes have been created during repetitions.
-Both split history and history of periodic shape repetition are available here. Note, that all repeated shapes are stored as generated into the history.
-
-
-*BRepTools_History* is used for history support.
-
-@subsection occt_modalg_makeperiodic_errors Errors/Warnings
-
-The algorithm supports the Error/Warning reporting system which allows obtaining the extended overview of the errors and warning occurred during the operation.
-As soon as any error appears the algorithm stops working. The warnings allow continuing the job, informing the user that something went wrong.
-The algorithm returns the following alerts:
-* *BOPAlgo_AlertNoPeriodicityRequired* - Error alert is given if no periodicity has been requested in any direction;
-* *BOPAlgo_AlertUnableToTrim* - Error alert is given if the trimming of the shape for fitting it into requested period has failed;
-* *BOPAlgo_AlertUnableToMakeIdentical* - Error alert is given if splitting of the shape by its moved copies has failed;
-* *BOPAlgo_AlertUnableToRepeat* - Warning alert is given if the gluing of the repeated shapes has failed.
-
-For more information on the error/warning reporting system please see the chapter @ref occt_algorithms_ers "Errors and warnings reporting system" of Boolean operations user guide.
-
-@subsection occt_modalg_makeperiodic_usage Usage
-
-The algorithm is implemented in the class *BOPAlgo_MakePeriodic*.
-Here is the example of its usage on the API level:
-~~~~
-TopoDS_Shape aShape = ...;                 // The shape to make periodic
-Standard_Boolean bMakeXPeriodic = ...;     // Flag for making or not the shape periodic in X direction
-Standard_Real aXPeriod = ...;              // X period for the shape
-Standard_Boolean isXTrimmed = ...;         // Flag defining whether it is necessary to trimming
-                                           // the shape to fit to X period
-Standard_Real aXFirst = ...;               // Start of the X period
-                                           // (really necessary only if the trimming is requested)
-Standard_Boolean bRunParallel = ...;       // Parallel processing mode or single
-
-BOPAlgo_MakePeriodic aPeriodicityMaker;                   // Periodicity maker
-aPeriodicityMaker.SetShape(aShape);                       // Set the shape
-aPeriodicityMaker.MakeXPeriodic(bMakePeriodic, aXPeriod); // Making the shape periodic in X direction
-aPeriodicityMaker.SetTrimmed(isXTrimmed, aXFirst);        // Trim the shape to fit X period
-aPeriodicityMaker.SetRunParallel(bRunParallel);           // Set the parallel processing mode
-aPeriodicityMaker.Perform();                              // Performing the operation
-
-if (aPeriodicityMaker.HasErrors())                        // Check for the errors
-{
-  // errors treatment
-  Standard_SStream aSStream;
-  aPeriodicityMaker.DumpErrors(aSStream);
-  return;
-}
-if (aPeriodicityMaker.HasWarnings())                      // Check for the warnings
-{
-  // warnings treatment
-  Standard_SStream aSStream;
-  aPeriodicityMaker.DumpWarnings(aSStream);
-}
-const TopoDS_Shape& aPeriodicShape = aPeriodicityMaker.Shape(); // Result periodic shape
-
-aPeriodicityMaker.XRepeat(2);                                    // Making repetitions
-const TopoDS_Shape& aRepeat = aPeriodicityMaker.RepeatedShape(); // Getting the repeated shape
-aPeriodicityMaker.ClearRepetitions();                            // Clearing the repetitions
-~~~~
-
-Please note, that the class is based on the options class *BOPAlgo_Options*, which provides the following options for the algorithm:
-* Error/Warning reporting system;
-* Parallel processing mode.
-The other options of the base class are not supported here and will have no effect.
-
-All the history information obtained during the operation is stored into *BRepTools_History* object and available through *History()* method:
-~~~~
-// Get the history object
-const Handle(BRepTools_History)& BOPAlgo_MakePeriodic::History();
-~~~~
-
-For the usage of the MakePeriodic algorithm on the Draw level the following commands have been implemented:
-* **makeperiodic**
-* **repeatshape**
-* **periodictwins**
-* **clearrepetitions**
-
-For more details on the periodicity commands please refer the @ref occt_draw_makeperiodic "Periodicity commands" of the Draw test harness user guide.
-
-To track the history of a shape modification during MakePeriodic operation the @ref occt_draw_hist "standard history commands" can be used.
-
-To have possibility to access the error/warning shapes of the operation use the *bdrawwarnshapes* command before running the algorithm (see command usage in the @ref occt_algorithms_ers "Errors and warnings reporting system" of Boolean operations user guide).
-
-@subsection occt_modalg_makeperiodic_examples Examples
-
-Imagine that you need to make the drills in the plate on the same distance from each other. To model this process it is necessary to make a lot of cylinders (simulating the drills) and cut these cylinders from the plate.
-With the periodicity tool, the process looks very simple:
-~~~~
-# create plate 100 x 100
-box plate -50 -50 0 100 100 1
-# create a single drill with radius 1
-pcylinder drill 1 1
-# locate the drill in the left corner
-ttranslate drill -48 -48 0
-# make the drill periodic with 4 as X and Y periods, so the distance between drills will be 2
-makeperiodic drill drill -x 4 -trim -50 -y 4 -trim -50
-# repeat the drill to fill the plate, in result we get net of 25 x 25 drills
-repeatshape drills -x 24 -y 24
-# cut the drills from the plate
-bcut result plate drills
-~~~~
-@figure{/user_guides/modeling_algos/images/modeling_algos_mkperiodic_im006.png,"Plate with drills",220}
-
-
-@section occt_modalg_makeconnected Making touching shapes connected
-
-Open CASCADE Technology provides tools for making the same-dimensional touching shapes connected (or glued), i.e. for making the coinciding geometries topologically shared among shapes.
-To make the shapes connected they are glued by the means of @ref occt_algorithms_7 "General Fuse algorithm". The option BOPAlgo_GlueShift is used, thus if the input shapes have been interfering the algorithm will be unable to recognize this.
-
-Making the group of shapes connected can be useful e.g. before meshing the group. It will allow making the resulting mesh conformal.
-
-The algorithm for making the shapes connected is implemented in the class *BOPAlgo_MakeConnected*.
-
-@subsection occt_modalg_makeconnected_materials Material association
-
-In frames of this tool the input shapes are called materials, and each input shape has a unique material.
-
-After making the shapes connected, the border elements of the input shapes are associated with the shapes to which they belong. At that, the orientation of the border elements in the shape is taken into account.
-The associations are made for the following types:
-* For input SOLIDS the resulting FACES are associated with the input solids;
-* For input FACES the resulting EDGES are associated with the input faces;
-* For input EDGES the resulting VERTICES are associated with the input edges.
-The association process is called the material association. It allows finding the coinciding elements for the opposite input shapes. These elements will be associated to at least two materials (one on the positive side of the shape, the other - on negative).
-
-For obtaining the material information the following methods should be used
-* *MaterialsOnPositiveSide()* - returns the original shapes (materials) located on the positive side of the given shape (i.e. with FORWARD orientation);
-* *MaterialsOnNegativeSide()* - returns the original shapes (materials) located on the negative side of the given shape (i.e. with REVERSED orientation);
-
-~~~~
-// Returns the original shapes which images contain the given shape with FORWARD orientation.
-const TopTools_ListOfShape& BOPAlgo_MakeConnected::MaterialsOnPositiveSide(const TopoDS_Shape& theS)
-
-// Returns the original shapes which images contain the given shape with REVERSED orientation.
-const TopTools_ListOfShape& BOPAlgo_MakeConnected::MaterialsOnNegativeSide(const TopoDS_Shape& theS)
-~~~~
-
-@subsection occt_modalg_makeconnected_makeperiodic Making connected shape periodic
-
-The tool provides possibility to make the connected shape @ref occt_modalg_makeperiodic "periodic".
-Since by making the shape periodic it ensures that the geometry of coinciding shapes on the opposite sides will be the same it allows reusing the mesh of the shape for its periodic twins.
-
-After making the shape periodic the material associations are updated to correspond to the actual state of the result shape. Repetition of the periodic shape is also possible from here. Material associations are not going to be lost.
-
-@subsection occt_modalg_makeconnected_history History support
-
-The algorithm supports history of shapes modifications during the operation. Additionally to standard history method provided by *BRepTools_History* and used here as a history tool, the algorithm also provides the method to track the back connection - from resulting shapes to the input ones.
-The method is called *GetOrigins()*:
-~~~~
-// Returns the list of original shapes from which the current shape has been created.
-const TopTools_ListOfShape& BOPAlgo_MakeConnected::GetOrigins(const TopoDS_Shape& theS);
-~~~~
-
-Both Gluing history and history of making the shape periodic and periodic shape repetition are available here. Note, that all repeated shapes are stored as generated into the history.
-
-@subsection occt_modalg_makeconnected_errors Errors/Warnings
-
-The algorithm supports the Error/Warning reporting system which allows obtaining the extended overview of the errors and warning occurred during the operation.
-As soon as any error appears the algorithm stops working. The warnings allow continuing the job, informing the user that something went wrong.
-The algorithm returns the following alerts:
-* *BOPAlgo_AlertTooFewArguments* - error alert is given on the attempt to run the algorithm without the arguments;
-* *BOPAlgo_AlertMultiDimensionalArguments* - error alert is given on the attempt to run the algorithm on multi-dimensional arguments;
-* *BOPAlgo_AlertUnableToGlue* - error alert is given if the gluer algorithm is unable to glue the given arguments;
-* *BOPAlgo_AlertUnableToMakePeriodic* - warning alert is given if the periodicity maker is unable to make the connected shape periodic with given options;
-* *BOPAlgo_AlertShapeIsNotPeriodic* - warning alert is given on the attempt to repeat the shape before making it periodic.
-
-For more information on the error/warning reporting system please see the chapter @ref occt_algorithms_ers "Errors and warnings reporting system" of Boolean operations user guide.
-
-@subsection occt_modalg_makeconnected_usage Usage
-
-Here is the example of usage of the *BOPAlgo_MakePeriodic* algorithm on the API level:
-~~~~
-TopTools_ListOfShape anArguments = ...;  // Shapes to make connected
-Standard_Boolean bRunParallel = ...;     // Parallel processing mode
-
-BOPAlgo_MakeConnected aMC;               // Tool for making the shapes connected
-aMC.SetArguments(anArguments);           // Set the shapes
-aMC.SetRunParallel(bRunParallel);        // Set parallel processing mode
-aMC.Perform();                           // Perform the operation
-
-if (aMC.HasErrors())                     // Check for the errors
-{
-  // errors treatment
-  Standard_SStream aSStream;
-  aMC.DumpErrors(aSStream);
-  return;
-}
-if (aMC.HasWarnings())                   // Check for the warnings
-{
-  // warnings treatment
-  Standard_SStream aSStream;
-  aMC.DumpWarnings(aSStream);
-}
-
-const TopoDS_Shape& aGluedShape = aMC.Shape(); // Connected shape
-
-// Checking material associations
-TopAbs_ShapeEnum anElemType = ...;       // Type of border element
-TopExp_Explorer anExp(anArguments.First(), anElemType);
-for (; anExp.More(); anExp.Next())
-{
-  const TopoDS_Shape& anElement = anExp.Current();
-  const TopTools_ListOfShape& aNegativeM = aMC.MaterialsOnNegativeSide(anElement);
-  const TopTools_ListOfShape& aPositiveM = aMC.MaterialsOnPositiveSide(anElement);
-}
-
-// Making the connected shape periodic
-BOPAlgo_MakePeriodic::PeriodicityParams aParams = ...; // Options for periodicity of the connected shape
-aMC.MakePeriodic(aParams);
-
-// Shape repetition after making it periodic
-// Check if the shape has been made periodic successfully
-if (aMC.PeriodicityTool().HasErrors())
-{
-  // Periodicity maker error treatment
-}
-
-// Shape repetition in periodic directions
-aMC.RepeatShape(0, 2);
-
-const TopoDS_Shape& aShape = aMC.PeriodicShape(); // Periodic and repeated shape
-~~~~
-
-Please note, that the class is based on the options class *BOPAlgo_Options*, which provides the following options for the algorithm:
-* Error/Warning reporting system;
-* Parallel processing mode.
-The other options of the base class are not supported here and will have no effect.
-
-All the history information obtained during the operation is stored into *BRepTools_History* object and available through *History()* method:
-~~~~
-// Get the history object
-const Handle(BRepTools_History)& BOPAlgo_MakeConnected::History();
-~~~~
-
-For the usage of the MakeConnected algorithm on the Draw level the following commands have been implemented:
-* **makeconnected**
-* **cmaterialson**
-* **cmakeperiodic**
-* **crepeatshape**
-* **cperiodictwins**
-* **cclearrepetitions**
-
-For more details on the connexity commands please refer the @ref occt_draw_makeconnected "MakeConnected commands" of the Draw test harness user guide.
-
-To track the history of a shape modification during MakeConnected operation the @ref occt_draw_hist "standard history commands" can be used.
-
-To have possibility to access the error/warning shapes of the operation use the *bdrawwarnshapes* command before running the algorithm (see command usage in the @ref occt_algorithms_ers "Errors and warnings reporting system" of Boolean operations user guide).
--- a/dox/user_guides/modeling_data/images/modeling_data_obb_125K.png
+++ b/dox/user_guides/modeling_data/images/modeling_data_obb_125K.png
--- a/dox/user_guides/modeling_data/images/modeling_data_opt_obb_125K.png
+++ b/dox/user_guides/modeling_data/images/modeling_data_opt_obb_125K.png
--- a/dox/user_guides/modeling_data/images/modeling_data_pca_obb_125K.png
+++ b/dox/user_guides/modeling_data/images/modeling_data_pca_obb_125K.png
--- a/dox/user_guides/modeling_data/modeling_data.md
+++ b/dox/user_guides/modeling_data/modeling_data.md
@@ -1341,26 +1341,7 @@ Further, let us consider the triangle \f$ T_{0}\left \langle p_{0}, p_{1}, p_{2}
 <span>10.</span> Compute the center of OBB and its half dimensions.<br>
 <span>11.</span> Create OBB using the center, axes and half dimensions.<br>

-@subsubsection occt_modat_6_1_1_opt Creation of Optimal OBB from set of points
-
-For creation of the optimal OBB from set of points the same algorithm as described above is used but with some simplifications in logic and increased computation time.
-For the optimal OBB it is necessary to check all possible axes which can be created by the extremal points. And since the extremal points are only valid for the initial axes it is necessary to project the whole set of points on each axis.
-This approach usually provides much tighter OBB but the performance is lower. The complexity of the algorithm is still linear and with use of BVH for the set of points it is O(N + C*log(N)).
-
-Here is the example of optimal and not optimal OBB for the model using the set of 125K nodes:
-<table align="center">
-<tr>
-  <td>@figure{/user_guides/modeling_data/images/modeling_data_obb_125K.png,"Not optimal OBB by DiTo-14",160}</td>
-  <td>@figure{/user_guides/modeling_data/images/modeling_data_opt_obb_125K.png,"Optimal OBB by DiTo-14",160}</td>
-  <td>@figure{/user_guides/modeling_data/images/modeling_data_pca_obb_125K.png,"Not optimal OBB by PCA",160}</td>
-</tr>
-</table>
-
-Computation of the not optimal OBB in this case took 0.007 sec, optimal - 0.1 sec, which is about 14 times slower. Such performance is comparable to creation of the OBB for this shape by PCA approach (see below) which takes about 0.17 sec.
-
-The computation of optimal OBB is controlled by the same *theIsOptimal* flag in the BRepBndLib::AddOBB method as for PCA algorithm.
-
-These algorithms are implemented in the *Bnd_OBB::ReBuild(...)* method.
+This algorithm is implemented in the *Bnd_OBB::ReBuild(...)* method.

@subsubsection occt_modat_6_1_2 Creation of OBB based on Axes of inertia

--- a/dox/user_guides/visualization/visualization.md
+++ b/dox/user_guides/visualization/visualization.md
@@ -226,6 +226,8 @@ Selection is implemented as a combination of various algorithms divided among se
 #### SelectBasics

 *SelectBasics* package contains basic classes and interfaces for selection. The most notable are:
+  - *SelectBasics_SensitiveEntity* -- the base definition of a sensitive entity;
+  - *SelectBasics_EntityOwner* -- the base definition of the an entity owner -- the link between the sensitive entity and the object to be selected;
  - *SelectBasics_PickResult* -- the structure for storing quantitative results of detection procedure, for example, depth and distance to the center of geometry;
  - *SelectBasics_SelectingVolumeManager* -- the interface for interaction with the current selection frustum.

@@ -245,11 +247,9 @@ Each custom sensitive entity must inherit at least *SelectBasics_SensitiveEntity
  - triangulation;
  - wire.

-Each basic sensitive entity inherits *Select3D_SensitiveEntity*.
+Each basic sensitive entity inherits *Select3D_SensitiveEntity*, which is a child class of *SelectBasics_SensitiveEntity*.
 The package also contains two auxiliary classes, *Select3D_SensitivePoly* and *Select3D_SensitiveSet*.

-*Select3D_SensitiveEntity* -- the base definition of a sensitive entity.
-
 *Select3D_SensitiveSet* -- a base class for all complex sensitive entities that require the third level BVH usage. It implements traverse of the tree and defines an interface for the methods that check sub-entities.

 *Select3D_SensitivePoly* -- describes an arbitrary point set and implements basic functions for selection. It is important to know that this class does not perform any internal data checks. Hence, custom implementations of sensitive entity inherited from *Select3D_SensitivePoly* must satisfy the terms of Separating Axis Theorem to use standard OCCT overlap detection methods.
@@ -1793,11 +1793,12 @@ Create facet attributes.
 Handle(Graphic3d_AspectFillArea3d) aFaceAspect =  new Graphic3d_AspectFillArea3d();
 Graphic3d_MaterialAspect aBrassMaterial (Graphic3d_NOM_BRASS);
 Graphic3d_MaterialAspect aGoldMaterial  (Graphic3d_NOM_GOLD);
-aFaceAspect->SetInteriorStyle (Aspect_IS_SOLID_WIREFRAME);
+aFaceAspect->SetInteriorStyle (Aspect_IS_SOLID);
 aFaceAspect->SetInteriorColor (aMyColor);
 aFaceAspect->SetDistinguishOn ();
 aFaceAspect->SetFrontMaterial (aGoldMaterial);
 aFaceAspect->SetBackMaterial  (aBrassMaterial);
+aFaceAspect->SetEdgeOn();
 ~~~~~

 Create text attributes.
--- a/10
+++ b/10
@@ -19,6 +19,10 @@ anOpt2=$2
 anOpt3=$3
 anOpt4=$4
 anOpt5=$5
+if [ "$aTarget" == "" ]; then
+  aTarget="cbp"
+  if [ "$aSystem" == "Darwin" ]; then aTarget="xcd"; fi;
+fi

 if [ ! -e "${aScriptPath}/custom.sh" ]; then
  tclsh "${aScriptPath}/adm/genconf.tcl"
@@ -33,12 +37,6 @@ source "${aScriptPath}/custom.sh"

 if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi

-if [ "$aTarget" == "" ]; then aTarget=$PRJFMT; fi;
-if [ "$aTarget" == "" ]; then
-  aTarget="cbp"
-  if [ "$aSystem" == "Darwin" ]; then aTarget="xcd"; fi;
-fi
-
 cd $aScriptPath
 tclsh "./adm/start.tcl" genproj ${aTarget} $anOpt2 $anOpt3 $anOpt4 $anOpt5

--- a/genproj.bat
+++ b/genproj.bat
@@ -49,10 +49,6 @@ if "%aPlatform%" == "" (
  )
 )

-set aPrjFmt=%PRJFMT%
-if "%aPrjFmt%" == "" ( set "aPrjFmt=vcxproj" )
-if "%aPrjFmt%" == "vcxproj" ( set "aPrjFmt=%VCFMT%" )
-
 cd %~dp0
-%TCL_EXEC% %~dp0adm/start.tcl genproj %aPrjFmt% %aPlatform% %3 %4 %5
+%TCL_EXEC% %~dp0adm/start.tcl genproj %VCFMT% %aPlatform% %3 %4 %5
 SET "PATH=%OLD_PATH%"
--- a/samples/glfw/CMakeLists.txt
+++ b/samples/glfw/CMakeLists.txt
@@ -1,68 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(glfw-occt-demo)
-
-set(CMAKE_CXX_STANDARD 11)
-set(APP_VERSION_MAJOR 1)
-set(APP_VERSION_MINOR 0)
-set(APP_TARGET glfwocct)
-
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
-file(GLOB SOURCES
-  *.h
-  *.cpp
-)
-source_group ("Headers" FILES
-  GlfwOcctView.h
-  GlfwOcctWindow.h)
-source_group ("Sources" FILES
-  GlfwOcctView.cpp
-  GlfwOcctWindow.cpp
-  main.cpp)
-
-# OpenGL
-find_package(OpenGL REQUIRED)
-
-# Open CASCADE Technology
-find_package(OpenCASCADE REQUIRED NO_DEFAULT_PATH)
-if (OpenCASCADE_FOUND)
-  message (STATUS "Using OpenCASCADE from \"${OpenCASCADE_DIR}\"" )
-  INCLUDE_DIRECTORIES(${OpenCASCADE_INCLUDE_DIR})
-  LINK_DIRECTORIES(${OpenCASCADE_LIBRARY_DIR})
-else()
-  message (WARNING "Could not find OpenCASCADE, please set OpenCASCADE_DIR variable." )
-  set (OCCT_LIBRARY_DIR)
-  set (OCCT_BIN_DIR)
-endif()
-
-SET(OpenCASCADE_LIBS 
-  TKernel
-  TKService
-  TKV3d
-  TKOpenGl
-  TKBRep
-  TKGeomBase
-  TKGeomAlgo
-  TKG3d
-  TKG2d
-  TKTopAlgo
-  TKPrim
-)
-
-# glfw
-find_package(glfw3 REQUIRED)
-if (glfw3_FOUND)
-  message (STATUS "Using glfw3 ${glfw3_VERSION}" )
-  INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS})
-  LINK_DIRECTORIES(${GLFW_LIBRARY_DIRS})
-else()
-  message (STATUS "glfw3 is not found." )
-endif()
-
-add_executable(${APP_TARGET} ${SOURCES})
-target_link_libraries(
-  ${APP_TARGET}
-  ${OpenCASCADE_LIBS}
-  glfw
-  ${OPENGL_LIBRARIES}
-)
--- a/samples/glfw/GlfwOcctView.cpp
+++ b/samples/glfw/GlfwOcctView.cpp
@@ -1,324 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#include "GlfwOcctView.h"
-
-#include <AIS_Shape.hxx>
-#include <Aspect_Handle.hxx>
-#include <Aspect_DisplayConnection.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeCone.hxx>
-#include <Message.hxx>
-#include <Message_Messenger.hxx>
-#include <OpenGl_GraphicDriver.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-
-#include <iostream>
-
-#include <GLFW/glfw3.h>
-
-// ================================================================
-// Function : GlfwOcctView
-// Purpose  :
-// ================================================================
-GlfwOcctView::GlfwOcctView()
-: myCurAction3d (CurAction3d_Nothing),
-  myToRedraw (true)
-{
-}
-
-// ================================================================
-// Function : ~GlfwOcctView
-// Purpose  :
-// ================================================================
-GlfwOcctView::~GlfwOcctView()
-{
-}
-
-// ================================================================
-// Function : toView
-// Purpose  :
-// ================================================================
-GlfwOcctView* GlfwOcctView::toView (GLFWwindow* theWin)
-{
-  return static_cast<GlfwOcctView*>(glfwGetWindowUserPointer (theWin));
-}
-
-// ================================================================
-// Function : errorCallback
-// Purpose  :
-// ================================================================
-void GlfwOcctView::errorCallback (int theError, const char* theDescription)
-{
-  Message::DefaultMessenger()->Send (TCollection_AsciiString ("Error") + theError + ": " + theDescription, Message_Fail);
-}
-
-// ================================================================
-// Function : run
-// Purpose  :
-// ================================================================
-void GlfwOcctView::run()
-{
-  initWindow (800, 600, "glfw occt");
-  initViewer();
-  initDemoScene();
-  if (myView.IsNull())
-  {
-    return;
-  }
-
-  myView->MustBeResized();
-  myOcctWindow->Map();
-  mainloop();
-  cleanup();
-}
-
-// ================================================================
-// Function : initWindow
-// Purpose  :
-// ================================================================
-void GlfwOcctView::initWindow (int theWidth, int theHeight, const char* theTitle)
-{
-  glfwSetErrorCallback (GlfwOcctView::errorCallback);
-  glfwInit();
-  const bool toAskCoreProfile = true;
-  if (toAskCoreProfile)
-  {
-    glfwWindowHint (GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint (GLFW_CONTEXT_VERSION_MINOR, 3);
-#if defined (__APPLE__)
-    glfwWindowHint (GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-#endif
-    glfwWindowHint (GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-  }
-  myOcctWindow = new GlfwOcctWindow (theWidth, theHeight, theTitle);
-  glfwSetWindowUserPointer       (myOcctWindow->getGlfwWindow(), this);
-  // window callback
-  glfwSetWindowSizeCallback      (myOcctWindow->getGlfwWindow(), GlfwOcctView::onResizeCallback);
-  glfwSetFramebufferSizeCallback (myOcctWindow->getGlfwWindow(), GlfwOcctView::onFBResizeCallback);
-  // mouse callback
-  glfwSetScrollCallback          (myOcctWindow->getGlfwWindow(), GlfwOcctView::onMouseScrollCallback);
-  glfwSetMouseButtonCallback     (myOcctWindow->getGlfwWindow(), GlfwOcctView::onMouseButtonCallback);
-  glfwSetCursorPosCallback       (myOcctWindow->getGlfwWindow(), GlfwOcctView::onMouseMoveCallback);
-}
-
-// ================================================================
-// Function : initViewer
-// Purpose  :
-// ================================================================
-void GlfwOcctView::initViewer()
-{
-  if (myOcctWindow.IsNull()
-   || myOcctWindow->getGlfwWindow() == nullptr)
-  {
-    return;
-  }
-
-  Handle(OpenGl_GraphicDriver) aGraphicDriver = new OpenGl_GraphicDriver (myOcctWindow->GetDisplay(), false);
-  Handle(V3d_Viewer) aViewer = new V3d_Viewer (aGraphicDriver);
-  aViewer->SetDefaultLights();
-  aViewer->SetLightOn();
-  aViewer->SetDefaultTypeOfView (V3d_PERSPECTIVE);
-  aViewer->ActivateGrid (Aspect_GT_Rectangular, Aspect_GDM_Lines);
-  myView = aViewer->CreateView();
-  myView->SetImmediateUpdate (false);
-  myView->SetWindow (myOcctWindow, myOcctWindow->NativeGlContext());
-  myView->ChangeRenderingParams().ToShowStats = true;
-  myContext = new AIS_InteractiveContext (aViewer);
-}
-
-// ================================================================
-// Function : initDemoScene
-// Purpose  :
-// ================================================================
-void GlfwOcctView::initDemoScene()
-{
-  if (myContext.IsNull())
-  {
-    return;
-  }
-
-  myView->TriedronDisplay (Aspect_TOTP_LEFT_LOWER, Quantity_NOC_GOLD, 0.08, V3d_WIREFRAME);
-
-  gp_Ax2 anAxis;
-  anAxis.SetLocation (gp_Pnt (0.0, 0.0, 0.0));
-  Handle(AIS_Shape) aBox = new AIS_Shape (BRepPrimAPI_MakeBox (anAxis, 50, 50, 50).Shape());
-  myContext->Display (aBox, AIS_Shaded, 0, false);
-  anAxis.SetLocation (gp_Pnt (25.0, 125.0, 0.0));
-  Handle(AIS_Shape) aCone = new AIS_Shape (BRepPrimAPI_MakeCone (anAxis, 25, 0, 50).Shape());
-  myContext->Display (aCone, AIS_Shaded, 0, false);
-
-  TCollection_AsciiString aGlInfo;
-  {
-    TColStd_IndexedDataMapOfStringString aRendInfo;
-    myView->DiagnosticInformation (aRendInfo, Graphic3d_DiagnosticInfo_Basic);
-    for (TColStd_IndexedDataMapOfStringString::Iterator aValueIter (aRendInfo); aValueIter.More(); aValueIter.Next())
-    {
-      if (!aGlInfo.IsEmpty()) { aGlInfo += "\n"; }
-      aGlInfo += TCollection_AsciiString("  ") + aValueIter.Key() + ": " + aValueIter.Value();
-    }
-  }
-  Message::DefaultMessenger()->Send (TCollection_AsciiString("OpenGL info:\n") + aGlInfo, Message_Info);
-}
-
-// ================================================================
-// Function : mainloop
-// Purpose  :
-// ================================================================
-void GlfwOcctView::mainloop()
-{
-  while (!glfwWindowShouldClose (myOcctWindow->getGlfwWindow()))
-  {
-    // glfwPollEvents() for continuous rendering (immediate return if there are no new events)
-    // and glfwWaitEvents() for rendering on demand (something actually happened in the viewer)
-    //glfwPollEvents();
-    glfwWaitEvents();
-    if (!myView.IsNull())
-    {
-      if (myView->IsInvalidated())
-      {
-        myView->Redraw();
-      }
-      else if (myToRedraw)
-      {
-        myView->RedrawImmediate();
-      }
-      myToRedraw = false;
-    }
-  }
-}
-
-// ================================================================
-// Function : cleanup
-// Purpose  :
-// ================================================================
-void GlfwOcctView::cleanup()
-{
-  if (!myView.IsNull())
-  {
-    myView->Remove();
-  }
-  if (!myOcctWindow.IsNull())
-  {
-    myOcctWindow->Close();
-  }
-  glfwTerminate();
-}
-
-// ================================================================
-// Function : onResize
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onResize (int theWidth, int theHeight)
-{
-  if (theWidth  != 0
-   && theHeight != 0
-   && !myView.IsNull())
-  {
-    myView->Window()->DoResize();
-    myView->MustBeResized();
-    myView->Invalidate();
-    myView->Redraw();
-    //myToRedraw = true;
-  }
-}
-
-// ================================================================
-// Function : onMouseScroll
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onMouseScroll (double theOffsetX, double theOffsetY)
-{
-  if (myView.IsNull()) { return; }
-
-  const Graphic3d_Vec2i aPos = myOcctWindow->CursorPosition();
-  myView->StartZoomAtPoint (aPos.x(), aPos.y());
-  myView->ZoomAtPoint (0, 0, int(theOffsetY * 4.0), int(theOffsetY * 4.0));
-  myView->Invalidate();
-  myToRedraw = true;
-}
-
-// ================================================================
-// Function : onMouseButton
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onMouseButton (int theButton, int theAction, int theMods)
-{
-  if (myView.IsNull()) { return; }
-
-  const Graphic3d_Vec2i aPos = myOcctWindow->CursorPosition();
-  if (theAction != GLFW_PRESS)
-  {
-    myCurAction3d = CurAction3d_Nothing;
-    return;
-  }
-
-  myMouseMin = aPos;
-  myMouseMax = aPos;
-  switch (theButton)
-  {
-    case GLFW_MOUSE_BUTTON_RIGHT:
-    {
-      myCurAction3d = CurAction3d_DynamicRoation;
-      myView->StartRotation (aPos.x(), aPos.y());
-      break;
-    }
-    case GLFW_MOUSE_BUTTON_MIDDLE:
-    {
-      myCurAction3d = CurAction3d_DynamicPanning;
-      break;
-    }
-  }
-}
-
-// ================================================================
-// Function : onMouseMove
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onMouseMove (int thePosX, int thePosY)
-{
-  if (myView.IsNull()) { return; }
-
-  switch (myCurAction3d)
-  {
-    case CurAction3d_DynamicRoation:
-    {
-      myView->Rotation (thePosX, thePosY);
-      myView->Invalidate();
-      myToRedraw = true;
-      break;
-    }
-    case CurAction3d_DynamicPanning:
-    {
-      myView->Pan (thePosX - myMouseMax.x(), -(thePosY - myMouseMax.y()));
-      myView->Invalidate();
-      myToRedraw = true;
-      myMouseMax.SetValues (thePosX, thePosY);
-      break;
-    }
-    default:
-    {
-      myContext->MoveTo (thePosX, thePosY, myView, false);
-      myToRedraw = true;
-      break;
-    }
-  }
-}
--- a/samples/glfw/GlfwOcctView.h
+++ b/samples/glfw/GlfwOcctView.h
@@ -1,125 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#ifndef _GlfwOcctView_Header
-#define _GlfwOcctView_Header
-
-#include "GlfwOcctWindow.h"
-
-#include <AIS_InteractiveContext.hxx>
-#include <V3d_View.hxx>
-
-//! Sample class creating 3D Viewer within GLFW window.
-class GlfwOcctView
-{
-public:
-  enum CurAction3d
-  {
-    CurAction3d_Nothing,
-    CurAction3d_DynamicZooming,
-    CurAction3d_DynamicPanning,
-    CurAction3d_DynamicRoation
-  };
-
-public:
-  //! Default constructor.
-	GlfwOcctView();
-
-  //! Destructor.
-	~GlfwOcctView();
-
-  //! Main application entry point.
-  void run();
-
-private:
-
-  //! Create GLFW window.
-  void initWindow (int theWidth, int theHeight, const char* theTitle);
-
-  //! Create 3D Viewer.
-  void initViewer();
-
-  //! Fill 3D Viewer with a DEMO items.
-  void initDemoScene();
-
-  //! Application event loop.
-  void mainloop();
-
-  //! Clean up before .
-  void cleanup();
-
-//! @name GLWF callbacks
-private:
-  //! Window resize event.
-  void onResize (int theWidth, int theHeight);
-
-  //! Mouse scroll event.
-  void onMouseScroll (double theOffsetX, double theOffsetY);
-
-  //! Mouse click event.
-  void onMouseButton (int theButton, int theAction, int theMods);
-
-  //! Mouse move event.
-  void onMouseMove (int thePosX, int thePosY);
-
-//! @name GLWF callbacks (static functions)
-private:
-
-  //! GLFW callback redirecting messages into Message::DefaultMessenger().
-  static void errorCallback (int theError, const char* theDescription);
-
-  //! Wrapper for glfwGetWindowUserPointer() returning this class instance.
-  static GlfwOcctView* toView (GLFWwindow* theWin);
-
-  //! Window resize callback.
-  static void onResizeCallback (GLFWwindow* theWin, int theWidth, int theHeight)
-  { toView(theWin)->onResize (theWidth, theHeight); }
-
-  //! Frame-buffer resize callback.
-  static void onFBResizeCallback (GLFWwindow* theWin, int theWidth, int theHeight)
-  { toView(theWin)->onResize (theWidth, theHeight); }
-
-  //! Mouse scroll callback.
-  static void onMouseScrollCallback (GLFWwindow* theWin, double theOffsetX, double theOffsetY)
-  { toView(theWin)->onMouseScroll (theOffsetX, theOffsetY); }
-
-  //! Mouse click callback.
-  static void onMouseButtonCallback (GLFWwindow* theWin, int theButton, int theAction, int theMods)
-  { toView(theWin)->onMouseButton (theButton, theAction, theMods); }
-
-  //! Mouse move callback.
-  static void onMouseMoveCallback (GLFWwindow* theWin, double thePosX, double thePosY)
-  { toView(theWin)->onMouseMove ((int )thePosX, (int )thePosY); }
-
-private:
-
-  Handle(GlfwOcctWindow) myOcctWindow;
-  Handle(V3d_View) myView;
-  Handle(AIS_InteractiveContext) myContext;
-
-  CurAction3d myCurAction3d;
-  Graphic3d_Vec2i myMouseMin;
-  Graphic3d_Vec2i myMouseMax;
-  bool myToRedraw;
-
-};
-
-#endif // _GlfwOcctView_Header
--- a/samples/glfw/GlfwOcctWindow.cpp
+++ b/samples/glfw/GlfwOcctWindow.cpp
@@ -1,161 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#include "GlfwOcctWindow.h"
-
-#if defined (__APPLE__)
-  #undef Handle // avoid name collisions in macOS headers
-  #define GLFW_EXPOSE_NATIVE_COCOA
-  #define GLFW_EXPOSE_NATIVE_NSGL
-#elif defined (_WIN32)
-  #define GLFW_EXPOSE_NATIVE_WIN32
-  #define GLFW_EXPOSE_NATIVE_WGL
-#else
-  #define GLFW_EXPOSE_NATIVE_X11
-  #define GLFW_EXPOSE_NATIVE_GLX
-#endif
-#include <GLFW/glfw3.h>
-#include <GLFW/glfw3native.h>
-
-// ================================================================
-// Function : GlfwOcctWindow
-// Purpose  :
-// ================================================================
-GlfwOcctWindow::GlfwOcctWindow (int theWidth, int theHeight, const TCollection_AsciiString& theTitle)
-: myGlfwWindow (glfwCreateWindow (theWidth, theHeight, theTitle.ToCString(), NULL, NULL)),
-  myXLeft  (0),
-  myYTop   (0),
-  myXRight (0),
-  myYBottom(0)
-{
-  if (myGlfwWindow != nullptr)
-  {
-    int aWidth = 0, aHeight = 0;
-    glfwGetWindowPos (myGlfwWindow, &myXLeft, &myYTop);
-    glfwGetWindowSize(myGlfwWindow, &aWidth, &aHeight);
-    myXRight  = myXLeft + aWidth;
-    myYBottom = myYTop + aHeight;
-
-  #if !defined(_WIN32) && !defined(__APPLE__)
-    myDisplay = new Aspect_DisplayConnection (glfwGetX11Display());
-  #endif
-  }
-}
-
-// ================================================================
-// Function : Close
-// Purpose  :
-// ================================================================
-void GlfwOcctWindow::Close()
-{
-  if (myGlfwWindow != nullptr)
-  {
-    glfwDestroyWindow (myGlfwWindow);
-    myGlfwWindow = nullptr;
-  }
-}
-
-// ================================================================
-// Function : NativeHandle
-// Purpose  :
-// ================================================================
-Aspect_Drawable GlfwOcctWindow::NativeHandle() const
-{
-#if defined (__APPLE__)
-  return (Aspect_Drawable)glfwGetCocoaWindow (myGlfwWindow);
-#elif defined (_WIN32)
-  return (Aspect_Drawable)glfwGetWin32Window (myGlfwWindow);
-#else
-  return (Aspect_Drawable)glfwGetX11Window (myGlfwWindow);
-#endif
-}
-
-// ================================================================
-// Function : NativeGlContext
-// Purpose  :
-// ================================================================
-Aspect_RenderingContext GlfwOcctWindow::NativeGlContext() const
-{
-#if defined (__APPLE__)
-  return (NSOpenGLContext*)glfwGetNSGLContext (myGlfwWindow);
-#elif defined (_WIN32)
-  return glfwGetWGLContext (myGlfwWindow);
-#else
-  return glfwGetGLXContext (myGlfwWindow);
-#endif
-}
-
-// ================================================================
-// Function : IsMapped
-// Purpose  :
-// ================================================================
-Standard_Boolean GlfwOcctWindow::IsMapped() const
-{
-  return glfwGetWindowAttrib (myGlfwWindow, GLFW_VISIBLE) != 0;
-}
-
-// ================================================================
-// Function : Map
-// Purpose  :
-// ================================================================
-void GlfwOcctWindow::Map() const
-{
-  glfwShowWindow (myGlfwWindow);
-}
-
-// ================================================================
-// Function : Unmap
-// Purpose  :
-// ================================================================
-void GlfwOcctWindow::Unmap() const
-{
-  glfwHideWindow (myGlfwWindow);
-}
-
-// ================================================================
-// Function : DoResize
-// Purpose  :
-// ================================================================
-Aspect_TypeOfResize GlfwOcctWindow::DoResize() const
-{
-  if (glfwGetWindowAttrib (myGlfwWindow, GLFW_VISIBLE) == 1)
-  {
-    int anXPos = 0, anYPos = 0, aWidth = 0, aHeight = 0;
-    glfwGetWindowPos (myGlfwWindow, &anXPos, &anYPos);
-    glfwGetWindowSize(myGlfwWindow, &aWidth, &aHeight);
-    *const_cast<Standard_Integer*>(&myXLeft  ) = anXPos;
-    *const_cast<Standard_Integer*>(&myXRight ) = anXPos + aWidth;
-    *const_cast<Standard_Integer*>(&myYTop   ) = anYPos;
-    *const_cast<Standard_Integer*>(&myYBottom) = anYPos + aHeight;
-  }
-  return Aspect_TOR_UNKNOWN;
-}
-
-// ================================================================
-// Function : CursorPosition
-// Purpose  :
-// ================================================================
-Graphic3d_Vec2i GlfwOcctWindow::CursorPosition() const
-{
-  Graphic3d_Vec2d aPos;
-  glfwGetCursorPos (myGlfwWindow, &aPos.x(), &aPos.y());
-  return Graphic3d_Vec2i ((int )aPos.x(), (int )aPos.y());
-}
--- a/samples/glfw/GlfwOcctWindow.h
+++ b/samples/glfw/GlfwOcctWindow.h
@@ -1,115 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#ifndef _GlfwOcctWindow_Header
-#define _GlfwOcctWindow_Header
-
-#include <Aspect_DisplayConnection.hxx>
-#include <Aspect_RenderingContext.hxx>
-#include <Aspect_Window.hxx>
-#include <Graphic3d_Vec.hxx>
-#include <TCollection_AsciiString.hxx>
-
-struct GLFWwindow;
-
-//! GLFWwindow wrapper implementing Aspect_Window interface.
-class GlfwOcctWindow : public Aspect_Window
-{
-  DEFINE_STANDARD_RTTI_INLINE(GlfwOcctWindow, Aspect_Window)
-public:
-  //! Main constructor.
-  GlfwOcctWindow (int theWidth, int theHeight, const TCollection_AsciiString& theTitle);
-
-  //! Close the window.
-  virtual ~GlfwOcctWindow() { Close(); }
-
-  //! Close the window.
-  void Close();
-
-  //! Return X Display connection.
-  const Handle(Aspect_DisplayConnection)& GetDisplay() const { return myDisplay; }
-
-  //! Return GLFW window.
-  GLFWwindow* getGlfwWindow() { return myGlfwWindow; }
-
-  //! Return native OpenGL context.
-  Aspect_RenderingContext NativeGlContext() const;
-
-  //! Return cursor position.
-  Graphic3d_Vec2i CursorPosition() const;
-
-public:
-
-  //! Returns native Window handle
-  virtual Aspect_Drawable NativeHandle() const Standard_OVERRIDE;
-
-  //! Returns parent of native Window handle.
-  virtual Aspect_Drawable NativeParentHandle() const Standard_OVERRIDE { return 0; }
-
-  //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE;
-
-  //! Returns True if the window <me> is opened and False if the window is closed.
-  virtual Standard_Boolean IsMapped() const Standard_OVERRIDE;
-
-  //! Apply the mapping change to the window <me> and returns TRUE if the window is mapped at screen.
-  virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }
-
-  //! Opens the window <me>.
-  virtual void Map() const Standard_OVERRIDE;
-
-  //! Closes the window <me>.
-  virtual void Unmap() const Standard_OVERRIDE;
-
-  virtual void Position (Standard_Integer& theX1, Standard_Integer& theY1,
-                         Standard_Integer& theX2, Standard_Integer& theY2) const Standard_OVERRIDE
-  {
-    theX1 = myXLeft;
-    theX2 = myXRight;
-    theY1 = myYTop;
-    theY2 = myYBottom;
-  }
-
-  //! Returns The Window RATIO equal to the physical WIDTH/HEIGHT dimensions.
-  virtual Standard_Real Ratio() const Standard_OVERRIDE
-  {
-    return Standard_Real (myXRight - myXLeft) / Standard_Real (myYBottom - myYTop);
-  }
-
-  //! Return window size.
-  virtual void Size (Standard_Integer& theWidth, Standard_Integer& theHeight) const Standard_OVERRIDE
-  {
-    theWidth  = myXRight - myXLeft;
-    theHeight = myYBottom - myYTop;
-  }
-
-  virtual Aspect_FBConfig NativeFBConfig() const Standard_OVERRIDE { return NULL; }
-
-protected:
-  Handle(Aspect_DisplayConnection) myDisplay;
-  GLFWwindow*      myGlfwWindow;
-  Standard_Integer myXLeft;
-  Standard_Integer myYTop;
-  Standard_Integer myXRight;
-  Standard_Integer myYBottom;
-};
-
-#endif // _GlfwOcctWindow_Header
--- a/samples/glfw/main.cpp
+++ b/samples/glfw/main.cpp
@@ -1,37 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#include "GlfwOcctView.h"
-
-int main (int, char**)
-{
-  GlfwOcctView anApp;
-  try
-  {
-    anApp.run();
-  }
-  catch (const std::runtime_error& theError)
-  {
-    std::cerr << theError.what() << std::endl;
-    return EXIT_FAILURE;
-  }
-  return 0;
-}
--- a/samples/glfw/readme.md
+++ b/samples/glfw/readme.md
@@ -1,4 +0,0 @@
-A sample demonstrating usage of OCCT 3D Viewer within a window created using GLFW.
-
-Platforms: Windows, macOS, Linux
-Required: glfw
--- a/samples/mfc/standard/03_Viewer2d/src/StdAfx.h
+++ b/samples/mfc/standard/03_Viewer2d/src/StdAfx.h
@@ -155,6 +155,7 @@ class ISession2D_InteractiveObject;
 class V3d_Viewer;
 class SelectMgr_SelectableObject;
 class TCollection_AsciiString;
+class SelectBasics_EntityOwner;
 class gp_Pnt2d;

 //{{AFX_INSERT_LOCATION}}
--- a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
+++ b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
@@ -17,8 +17,7 @@ void ISession2D_Shape::Add(const TopoDS_Shape& aShape)
  myListOfShape.Append(aShape);
  myAlgo.Nullify();
  myPolyAlgo.Nullify();
-  SetToUpdate();
-  UpdatePresentations();
+  Update(); // protected method used to specify that the presentation are not up to date 
 }

 void ISession2D_Shape::Remove (const TopoDS_Shape& theShape)
@@ -43,17 +42,23 @@ void ISession2D_Shape::SetProjector (HLRAlgo_Projector& aProjector)
  myProjector= aProjector;
  myAlgo.Nullify();
  myPolyAlgo.Nullify();
-  SetToUpdate();
-  UpdatePresentations();
+  Update(); // protected method used to specify that the presentation are not up to date 
 };


 void ISession2D_Shape::SetNbIsos(Standard_Integer& aNbIsos)
-{
-  myNbIsos= aNbIsos;
-  myAlgo.Nullify();
-  SetToUpdate();
-  UpdatePresentations();
+{ 
+	myNbIsos= aNbIsos; 
+	myAlgo.Nullify(); 
+    
+	// declare the mode 100 to 110 as non valid
+	for (int i=100;i<=110;i++)
+       Update(i,Standard_False); // protected method used to specify that the presentation are not up to date 
+
+	// declare the mode 1100 to 1110 as non valid
+	for (int i=1100;i<=1110;i++)
+       Update(i,Standard_False); // protected method used to specify that the presentation are not up to date 
+
 };

 void ISession2D_Shape::BuildAlgo() 
--- a/samples/qt/AndroidQt/ReadMe.md
+++ b/samples/qt/AndroidQt/ReadMe.md
@@ -14,9 +14,9 @@ Requirements for building sample:
 * Android NDK r9d or newer
 * Apache Ant 1.9.4 or higher
 * OCCT compiled under Android platform and placed in directories:
-  * occt/libs/armeabi-v7a/\*.so and occt/inc/\*.hxx (libraries and include files of OCCT install)
-  * android/assets/opencascade/shared/Shaders/\* (Shaders folder of OCCT install: /share/opencascade/resources/Shaders)
-  * 3rdparty/include/freetype2/\*, 3rdparty/include/FreeImage.h and 3rdparty/libs/armeabi-v7a/libFreeImage.so and 3rdparty/libs/armeabi-v7a/libfreetype.so
+  * occt/libs/armeabi-v7a/*.so and occt/inc/*.hxx (libraries and include files of OCCT install)
+  * android/assets/opencascade/shared/Shaders/* (Shaders folder of OCCT install: /share/opencascade/resources/Shaders)
+  * 3rdparty/include/freetype2/*, 3rdparty/include/FreeImage.h and 3rdparty/libs/armeabi-v7a/libFreeImage.so and 3rdparty/libs/armeabi-v7a/libfreetype.so

 It is also possible to to correct OCCT.pri file an get resources from another tree of directories.

--- a/samples/qt/FuncDemo/FuncDemo.pro
+++ b/samples/qt/FuncDemo/FuncDemo.pro
@@ -44,13 +44,13 @@ unix {
 win32 {
    CONFIG(debug, debug|release) {
        DEFINES += _DEBUG
-        DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind
-        OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bind
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
        MOC_DIR = ./src
    } else {
        DEFINES += NDEBUG
-        DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin
-        OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bin
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
        MOC_DIR = ./src
    }
    LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -58,14 +58,14 @@ unix {
 win32 {
    CONFIG(debug, debug|release) {
        DEFINES += _DEBUG
-        DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind
-        OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd
-        MOC_DIR = ./win$$(ARCH)/$$(VCVER)/mocd
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bind
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
    } else {
        DEFINES += NDEBUG
-        DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin
-        OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
-        MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bin
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
    }
    LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
    DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -61,14 +61,14 @@ unix {
 win32 {
    CONFIG(debug, debug|release) {
        DEFINES += _DEBUG
-        DESTDIR = ./win$$(ARCH)/$$(VCVER)/bind
-        OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/objd
-        MOC_DIR = ./win$$(ARCH)/$$(VCVER)/mocd
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bind
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
    } else {
        DEFINES += NDEBUG
-        DESTDIR = ./win$$(ARCH)/$$(VCVER)/bin
-        OBJECTS_DIR = ./win$$(ARCH)/$$(VCVER)/obj
-        MOC_DIR = ./win$$(ARCH)/$$(VCVER)/moc
+        DESTDIR = ./win$(ARCH)/$(VCVER)/bin
+        OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
+        MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
    }
    LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath)
    DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
--- a/samples/tcl/ANC101.tcl
+++ b/samples/tcl/ANC101.tcl
@@ -264,11 +264,11 @@ bfuse _model _model t_s
 explode _model e

 # Make a weld at joint edges of platform and wedge 
+blend _model _model 2 _model_26
 blend _model _model 2 _model_27
 blend _model _model 2 _model_28
 blend _model _model 2 _model_29
-blend _model _model 2 _model_30
-blend _model _model 2 _model_32
+blend _model _model 2 _model_31

 # Cylinder on wedge
 blend result _model 2 _model_161
@@ -276,7 +276,8 @@ blend result _model 2 _model_161
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vbackground -color 0.784314 0.784314 1
-vdisplay -dispMode 1 result
+vsetcolorbg 200 200 255
+vdisplay result
 vfit
-vaspects result -setFaceBoundaryDraw 1 -mostContinuity c2
+vsetdispmode 1
+vshowfaceboundary result 1
--- a/samples/tcl/MBBGehauseRohteil.tcl
+++ b/samples/tcl/MBBGehauseRohteil.tcl
@@ -262,7 +262,8 @@ unifysamedom result  p_1
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vbackground -color 0.784314 0.784314 1
-vdisplay -dispMode 1 result
+vsetcolorbg 200 200 255
+vdisplay result
 vfit
-vaspects result -setFaceBoundaryDraw 1
+vsetdispmode 1
+vshowfaceboundary result 1
--- a/samples/tcl/Penrose.tcl
+++ b/samples/tcl/Penrose.tcl
@@ -53,7 +53,7 @@ for {set i 1} {$i <= 1} {incr i} {

 # prepare a view
 vinit Penrose w=1024 h=512
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 vrenderparams -rayTrace -fsaa on -reflections off -shadows off

 # set camera position and adjust lights
--- a/samples/tcl/cad.tcl
+++ b/samples/tcl/cad.tcl
@@ -57,7 +57,9 @@ bcommon res b9 c2
 # show result
 donly res
 trotate res 0 0 0 0 0 1 90
-vinit View1
-vdisplay -dispMode 1 res
-vaspects res -setFaceBoundaryDraw 1 -setFaceBoundaryColor WHITE -isoontriangulation 1
+vinit
+vdisplay res
+vsetdispmode 1
+vshowfaceboundary res 1 255 255 255
+vaspects -isoontriangulation 1
 vfit
--- a/samples/tcl/dimensions.tcl
+++ b/samples/tcl/dimensions.tcl
@@ -19,7 +19,7 @@ restore $aBotLoc b
 vinit View1 w=768 h=768
 vclear
 vsetdispmode 0
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 vbottom

 puts "Getting cut projection..."
--- a/samples/tcl/materials.tcl
+++ b/samples/tcl/materials.tcl
@@ -51,7 +51,7 @@ proc drawObjects {theRow theColor} {
    uplevel #0 box     $aBox $aCtr $aCtr $aCtr $aSize $aSize $aSize
    uplevel #0 ttranslate   $aSph $x $y 0
    uplevel #0 ttranslate   $aBox [expr $x + 10] $y 0
-    uplevel #0 vdisplay     -noredraw -dispMode 1 $aSph $aBox
+    uplevel #0 vdisplay     -noredraw $aSph $aBox
    uplevel #0 vsetmaterial -noredraw $aSph $aBox $aMatIter
    if {$theColor != ""} {
      uplevel #0 vsetcolor  -noredraw $aSph $aBox $theColor
@@ -64,19 +64,21 @@ proc drawObjects {theRow theColor} {
 # setup 3D viewer content
 pload MODELING VISUALIZATION

-vclear
-vclose ALL
+catch { vclose View1 }
 vinit View1 w=768 h=768
+vclear
 vtop
 vglinfo
-vbackground -gradient 0.705882 0.784314 1  0.705882 0.705882 0.705882 -gradientMode VERTICAL
+vsetgradientbg 180 200 255 180 180 180 2

 vlight -change 0 -dir 0.577 -0.577 -0.577
+vsetdispmode 1
 vrenderparams -msaa 8

 # adjust scene bounding box
 box bnd 0 0 0 180 210 1
-vdisplay -noredraw -dispMode 0 bnd
+vdisplay -noredraw bnd
+vsetdispmode       bnd 0
 vfit
 vremove -noredraw  bnd

@@ -86,3 +88,5 @@ drawObjects 0 ""
 drawObjects 1 red
 drawObjects 2 green
 drawObjects 3 blue1
+#vfit
+vzfit
--- a/samples/tcl/pencil.tcl
+++ b/samples/tcl/pencil.tcl
@@ -59,7 +59,7 @@ XShow D
 vfit
 vsetdispmode 1
 vrenderparams -msaa 8
-vbackground -color WHITE
+vsetcolorbg 255 255 255

 #param write.iges.brep.mode 1
 #WriteIges D d:/pencil3.igs
--- a/samples/tcl/raytrace.tcl
+++ b/samples/tcl/raytrace.tcl
@@ -30,7 +30,7 @@ vsettransparency glass 0.6
 vlight new spot pos -100 -100 300

 # set white background and fit view
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 vfit

 # set ray tracing
--- a/samples/tcl/snowflake.tcl
+++ b/samples/tcl/snowflake.tcl
@@ -129,7 +129,7 @@ vrenderparams -msaa 8
 vsetcolor snowflake 0 0 0 
 vsetcolor lines 0 0 0 
 vsetcolor text 0 0 0 
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 vtop
 vfit

--- a/src/AIS/AIS.cxx
+++ b/src/AIS/AIS.cxx
@@ -14,10 +14,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#include <AIS.hxx>

 #include <Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HSurface.hxx>
+#include <AIS.hxx>
 #include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
@@ -783,7 +783,6 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
  BRepAdaptor_Surface surf1( aFace );
  Handle( Adaptor3d_HSurface ) surf2;
  Standard_Boolean isOffset = Standard_False;
-  Offset = 0.0;

  if (surf1.GetType() == GeomAbs_OffsetSurface)
  {
@@ -802,6 +801,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
  {
    aPlane = surf2->Plane();
    aSurfType = AIS_KOS_Plane;
+    Offset = 0.;
    Result = Standard_True;
  }

@@ -817,6 +817,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
      gp_Pln thePlane( LinePos, LineDir ^ ExtrusionDir);
      aPlane = thePlane;
      aSurfType = AIS_KOS_Plane;
+      Offset = 0.;
      Result = Standard_True;
    }
  }
@@ -825,6 +826,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
  {
    aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface();
    aPlane = (Handle( Geom_Plane )::DownCast( aSurf ))->Pln();
+    Offset = 0.0e0;
  }
  if (Result == Standard_False)
  {
@@ -837,6 +839,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
        TheType == STANDARD_TYPE(Geom_ToroidalSurface))
      {
        aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface();
+        Offset = 0.0e0;
      }
      else
      {
@@ -896,18 +899,20 @@ gp_Pnt AIS::ProjectPointOnLine( const gp_Pnt & aPoint, const gp_Lin & aLine )
 //function : InitFaceLength
 //purpose  : 
 //=======================================================================
-void AIS::InitFaceLength (const TopoDS_Face& theFace,
-                          gp_Pln& thePlane,
-                          Handle(Geom_Surface)& theSurface,
-                          AIS_KindOfSurface& theSurfaceType,
-                          Standard_Real& theOffset)
+void AIS::InitFaceLength (const TopoDS_Face& aFace,
+                          gp_Pln               & aPlane,
+                          Handle(Geom_Surface) & aSurface,
+                          AIS_KindOfSurface    & aSurfaceType,
+                          Standard_Real        & anOffset)
 {
-  if (AIS::GetPlaneFromFace (theFace, thePlane, theSurface, theSurfaceType, theOffset)
-   && Abs (theOffset) > Precision::Confusion())
-  {
-    theSurface = new Geom_OffsetSurface (theSurface, theOffset);
-    theOffset = 0.0e0;
-  }
+  AIS::GetPlaneFromFace( aFace, aPlane, aSurface, aSurfaceType, anOffset );
+  
+  if (Abs( anOffset ) > Precision::Confusion())
+    {
+      aSurface = new Geom_OffsetSurface( aSurface, anOffset );
+      anOffset = 0.0e0;
+    }
+  
 }

 //=======================================================================
--- a/src/AIS/AIS.hxx
+++ b/src/AIS/AIS.hxx
@@ -17,26 +17,73 @@
 #ifndef _AIS_HeaderFile
 #define _AIS_HeaderFile

-#include <AIS_KindOfSurface.hxx>
-#include <Aspect_TypeOfLine.hxx>
-#include <Aspect_TypeOfMarker.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
-#include <Quantity_NameOfColor.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>

-class Bnd_Box;
-class Geom_Curve;
-class Geom_Plane;
-class Geom_Surface;
-class TopoDS_Edge;
-class TopoDS_Face;
+#include <Standard_Boolean.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+#include <AIS_KindOfSurface.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Quantity_NameOfColor.hxx>
+#include <Aspect_TypeOfLine.hxx>
+#include <Aspect_TypeOfMarker.hxx>
+class gp_Pnt;
 class TopoDS_Shape;
+class gp_Lin;
+class Geom_Curve;
+class TopoDS_Edge;
+class Geom_Plane;
 class TopoDS_Vertex;
+class TopoDS_Face;
+class gp_Pln;
+class Geom_Surface;
+class gp_Dir;
+class Bnd_Box;
+class gp_Elips;
+class Prs3d_Presentation;
+class AIS_Triangulation;
+class AIS_InteractiveContext;
+class AIS_GraphicTool;
+class AIS_GlobalStatus;
+class AIS_InteractiveObject;
+class AIS_Point;
+class AIS_Axis;
+class AIS_Trihedron;
+class AIS_PlaneTrihedron;
+class AIS_Line;
+class AIS_Circle;
+class AIS_Plane;
+class AIS_Shape;
+class AIS_ConnectedInteractive;
+class AIS_MultipleConnectedInteractive;
+class AIS_DimensionOwner;
+class AIS_Relation;
+class AIS_EllipseRadiusDimension;
+class AIS_MaxRadiusDimension;
+class AIS_MinRadiusDimension;
+class AIS_Chamf2dDimension;
+class AIS_Chamf3dDimension;
+class AIS_OffsetDimension;
+class AIS_FixRelation;
+class AIS_PerpendicularRelation;
+class AIS_ParallelRelation;
+class AIS_TangentRelation;
+class AIS_ConcentricRelation;
+class AIS_IdenticRelation;
+class AIS_SymmetricRelation;
+class AIS_MidPointRelation;
+class AIS_EqualRadiusRelation;
+class AIS_EqualDistanceRelation;
+class AIS_TypeFilter;
+class AIS_SignatureFilter;
+class AIS_ExclusionFilter;
+class AIS_AttributeFilter;
+class AIS_C0RegularityFilter;
+class AIS_BadEdgeFilter;
+class AIS_Selection;
+

 //! Application Interactive Services provide the means to create links between an application GUI viewer and
 //! the packages which are used to manage selection and presentation.
--- a/src/AIS/AIS_Animation.cxx
+++ b/src/AIS/AIS_Animation.cxx
@@ -168,7 +168,7 @@ void AIS_Animation::StartTimer (const Standard_Real    theStartPts,
 {
  if (myTimer.IsNull())
  {
-    myTimer = new Media_Timer();
+    myTimer = new AIS_AnimationTimer();
  }
  myTimer->Stop();
  myTimer->Seek (theStartPts);
--- a/src/AIS/AIS_Animation.hxx
+++ b/src/AIS/AIS_Animation.hxx
@@ -191,7 +191,7 @@ protected:

 protected:

-  Handle(Media_Timer) myTimer;
+  Handle(AIS_AnimationTimer) myTimer;

  TCollection_AsciiString myName;           //!< animation name
  NCollection_Sequence<Handle(AIS_Animation)>
--- a/src/AIS/AIS_AnimationTimer.cxx
+++ b/src/AIS/AIS_AnimationTimer.cxx
@@ -12,15 +12,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#include <Media_Timer.hxx>
+#include <AIS_AnimationTimer.hxx>

-IMPLEMENT_STANDARD_RTTIEXT(Media_Timer, Standard_Transient)
+IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationTimer, Standard_Transient)

 //=============================================================================
 //function : Pause
 //purpose  :
 //=============================================================================
-void Media_Timer::Pause()
+void AIS_AnimationTimer::Pause()
 {
  myTimer.Stop();
  myTimerFrom += myTimer.ElapsedTime() * myTimerSpeed;
@@ -31,7 +31,7 @@ void Media_Timer::Pause()
 //function : Stop
 //purpose  :
 //=============================================================================
-void Media_Timer::Stop()
+void AIS_AnimationTimer::Stop()
 {
  myTimer.Stop();
  myTimer.Reset();
@@ -42,7 +42,7 @@ void Media_Timer::Stop()
 //function : SetPlaybackSpeed
 //purpose  :
 //=============================================================================
-void Media_Timer::SetPlaybackSpeed (const Standard_Real theSpeed)
+void AIS_AnimationTimer::SetPlaybackSpeed (const Standard_Real theSpeed)
 {
  if (!myTimer.IsStarted())
  {
@@ -61,7 +61,7 @@ void Media_Timer::SetPlaybackSpeed (const Standard_Real theSpeed)
 //function : SetPlaybackSpeed
 //purpose  :
 //=============================================================================
-void Media_Timer::Seek (const Standard_Real theTime)
+void AIS_AnimationTimer::Seek (const Standard_Real theTime)
 {
  const Standard_Boolean isStarted = myTimer.IsStarted();
  myTimer.Stop();
--- a/src/AIS/AIS_AnimationTimer.hxx
+++ b/src/AIS/AIS_AnimationTimer.hxx
@@ -15,7 +15,60 @@
 #ifndef _AIS_AnimationTimer_HeaderFile
 #define _AIS_AnimationTimer_HeaderFile

-#include <Media_Timer.hxx>
-typedef Media_Timer AIS_AnimationTimer;
+#include <OSD_Timer.hxx>
+#include <Standard_Transient.hxx>
+#include <Standard_Type.hxx>
+
+//! Auxiliary class defining the animation timer.
+class AIS_AnimationTimer : public Standard_Transient
+{
+  DEFINE_STANDARD_RTTIEXT(AIS_AnimationTimer, Standard_Transient)
+public:
+
+  //! Empty constructor.
+  AIS_AnimationTimer() : myTimerFrom (0.0), myTimerSpeed (1.0) {}
+
+  //! Return elapsed time in seconds.
+  Standard_Real ElapsedTime() const
+  {
+    return myTimerFrom + myTimer.ElapsedTime() * myTimerSpeed;
+  }
+
+  //! Return playback speed coefficient (1.0 means normal speed).
+  Standard_Real PlaybackSpeed() const { return myTimerSpeed; }
+
+  //! Setup playback speed coefficient.
+  Standard_EXPORT void SetPlaybackSpeed (const Standard_Real theSpeed);
+
+  //! Return true if timer has been started.
+  Standard_Boolean IsStarted() const
+  {
+    return myTimer.IsStarted();
+  }
+
+  //! Start the timer.
+  void Start()
+  {
+    myTimer.Start();
+  }
+
+  //! Pause the timer.
+  Standard_EXPORT void Pause();
+
+  //! Stop the timer.
+  Standard_EXPORT void Stop();
+
+  //! Seek the timer to specified position.
+  Standard_EXPORT void Seek (const Standard_Real theTime);
+
+protected:
+
+  OSD_Timer     myTimer;
+  Standard_Real myTimerFrom;
+  Standard_Real myTimerSpeed;
+
+};
+
+DEFINE_STANDARD_HANDLE(AIS_AnimationTimer, Standard_Transient)

 #endif // _AIS_AnimationTimer_HeaderFile
--- a/src/AIS/AIS_Axis.cxx
+++ b/src/AIS/AIS_Axis.cxx
@@ -34,8 +34,10 @@
 #include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveSegment.hxx>
+#include <SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
+#include <Standard_Type.hxx>
 #include <StdPrs_Curve.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TopoDS.hxx>
@@ -79,7 +81,7 @@ myIsXYZAxis(Standard_True)
  Standard_Real aLength;
  try {
    aLength = UnitsAPI::AnyToLS(100. ,"mm");
-  } catch (Standard_Failure const&) {
+  } catch (Standard_Failure) {
    aLength = 0.1;
  }
  DA->SetAxisLength(aLength,aLength,aLength);
@@ -197,7 +199,8 @@ void AIS_Axis::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(G
 void AIS_Axis::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
 				const Standard_Integer)
 {
-  Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner (this, 3);
+  Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this);
+  eown -> SelectBasics_EntityOwner::Set(3);
  Handle(Select3D_SensitiveSegment) seg = new Select3D_SensitiveSegment(eown,
 									myPfirst,
 									myPlast);
@@ -218,7 +221,7 @@ void AIS_Axis::SetColor(const Quantity_Color &aCol)
  DA->LineAspect(Prs3d_DP_XAxis)->SetColor(aCol);
  DA->LineAspect(Prs3d_DP_YAxis)->SetColor(aCol);
  DA->LineAspect(Prs3d_DP_ZAxis)->SetColor(aCol);
-  SynchronizeAspects();
+  
 }

 //=======================================================================
@@ -227,6 +230,7 @@ void AIS_Axis::SetColor(const Quantity_Color &aCol)
 //=======================================================================
 void AIS_Axis::SetWidth(const Standard_Real aValue)
 {
+  
  if(aValue<0.0) return;
  if(aValue==0) UnsetWidth();
  
@@ -236,7 +240,6 @@ void AIS_Axis::SetWidth(const Standard_Real aValue)
  DA->LineAspect(Prs3d_DP_XAxis)->SetWidth(aValue);
  DA->LineAspect(Prs3d_DP_YAxis)->SetWidth(aValue);
  DA->LineAspect(Prs3d_DP_ZAxis)->SetWidth(aValue);
-  SynchronizeAspects();
 }


@@ -321,13 +324,14 @@ AcceptDisplayMode(const Standard_Integer aMode) const
 //=======================================================================
 void AIS_Axis::UnsetColor()
 {
+  
  myDrawer->LineAspect()->SetColor(Quantity_NOC_RED);
-  hasOwnColor = Standard_False;
+
+  hasOwnColor=Standard_False;

  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis)->SetColor(Quantity_NOC_TURQUOISE);
  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_YAxis)->SetColor(Quantity_NOC_TURQUOISE);
  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_ZAxis)->SetColor(Quantity_NOC_TURQUOISE);
-  SynchronizeAspects();
 }
 //=======================================================================
 //function : UnsetWidth
@@ -336,10 +340,10 @@ void AIS_Axis::UnsetColor()

 void AIS_Axis::UnsetWidth()
 {
-  myOwnWidth = 0.0f;
+  myOwnWidth = 0.0;
  myDrawer->LineAspect()->SetWidth(1.);
  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis)->SetWidth(1.);
  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_YAxis)->SetWidth(1.);
  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_ZAxis)->SetWidth(1.);
-  SynchronizeAspects();
 }
+
--- a/src/AIS/AIS_CameraFrustum.cxx
+++ b/src/AIS/AIS_CameraFrustum.cxx
@@ -1,289 +0,0 @@
-// Created on: 2018-12-12
-// Created by: Olga SURYANINOVA
-// Copyright (c) 2018 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 <AIS_CameraFrustum.hxx>
-
-#include <AIS_DisplayMode.hxx>
-#include <Graphic3d_ArrayOfTriangles.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Prs3d_LineAspect.hxx>
-#include <Prs3d_ShadingAspect.hxx>
-#include <Select3D_SensitiveGroup.hxx>
-#include <Select3D_SensitivePrimitiveArray.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(AIS_CameraFrustum, AIS_InteractiveObject)
-
-namespace
-{
-  static const Standard_ShortReal THE_DEFAULT_TRANSPARENCY = 0.7f;
-  static const Quantity_Color     THE_DEFAULT_COLOR = Quantity_NOC_WHITE;
-}
-
-//=======================================================================
-//function : Constructor
-//purpose  :
-//=======================================================================
-AIS_CameraFrustum::AIS_CameraFrustum()
-: myPoints (0, Graphic3d_Camera::FrustumVerticesNB)
-{
-  myDrawer->SetLineAspect (new Prs3d_LineAspect (THE_DEFAULT_COLOR, Aspect_TOL_SOLID, 1.0));
-
-  Handle(Prs3d_ShadingAspect) aShadingAspect = new Prs3d_ShadingAspect();
-  aShadingAspect->SetMaterial (Graphic3d_NOM_PLASTIC);
-  aShadingAspect->Aspect()->SetAlphaMode (Graphic3d_AlphaMode_Blend);
-  aShadingAspect->SetTransparency (THE_DEFAULT_TRANSPARENCY);
-  aShadingAspect->SetColor (THE_DEFAULT_COLOR);
-  myDrawer->SetShadingAspect (aShadingAspect);
-
-  myDrawer->SetTransparency (THE_DEFAULT_TRANSPARENCY);
-  SetDisplayMode (AIS_Shaded);
-}
-
-//=======================================================================
-//function : AcceptDisplayMode
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_CameraFrustum::AcceptDisplayMode (const Standard_Integer theMode) const
-{
-  return theMode == AIS_Shaded || theMode == AIS_WireFrame;
-}
-
-//=======================================================================
-//function : SetCameraFrustum
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::SetCameraFrustum (const Handle(Graphic3d_Camera)& theCamera)
-{
-  if (theCamera.IsNull())
-  {
-    return;
-  }
-
-  theCamera->FrustumPoints (myPoints);
-
-  fillTriangles();
-  fillBorders();
-
-  SetToUpdate();
-}
-
-//=======================================================================
-//function : SetColor
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::SetColor (const Quantity_Color& theColor)
-{
-  AIS_InteractiveObject::SetColor (theColor);
-  myDrawer->ShadingAspect()->SetColor (theColor);
-  myDrawer->LineAspect()->SetColor (theColor);
-  SynchronizeAspects();
-}
-
-//=======================================================================
-//function : UnsetColor
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::UnsetColor()
-{
-  if (!HasColor())
-  {
-    return;
-  }
-
-  AIS_InteractiveObject::UnsetColor();
-
-  myDrawer->ShadingAspect()->SetColor (THE_DEFAULT_COLOR);
-  myDrawer->LineAspect()->SetColor (THE_DEFAULT_COLOR);
-  SynchronizeAspects();
-}
-
-//=======================================================================
-//function : UnsetColor
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::UnsetTransparency()
-{
-  myDrawer->ShadingAspect()->SetTransparency (0.0f);
-  myDrawer->SetTransparency (0.0f);
-  SynchronizeAspects();
-}
-
-//=======================================================================
-//function : fillTriangles
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::fillTriangles()
-{
-  if (myTriangles.IsNull())
-  {
-    const Standard_Integer aPlaneTriangleVertsNb = 2 * 3;
-    const Standard_Integer aPlanesNb             = 3 * 2;
-
-    myTriangles = new Graphic3d_ArrayOfTriangles (Graphic3d_Camera::FrustumVerticesNB, aPlaneTriangleVertsNb * aPlanesNb);
-    myTriangles->SetVertice (Graphic3d_Camera::FrustumVerticesNB, gp_Pnt (0.0, 0.0, 0.0));
-
-    // Triangles go in order (clockwise vertices traversing for correct normal):
-    // (0, 2, 1), (3, 1, 2)
-    const Standard_Integer aLookup1_clockwise[]     = { 0, 1, 0, 1, 0, 1 };
-    const Standard_Integer aLookup2_clockwise[]     = { 0, 0, 1, 1, 1, 0 };
-    // Triangles go in order (counterclockwise vertices traversing for correct normal):
-    // (1, 2, 0), (2, 1, 3)
-    const Standard_Integer aLookup1_anticlockwise[] = { 0, 1, 0, 1, 0, 1 };
-    const Standard_Integer aLookup2_anticlockwise[] = { 1, 0, 0, 0, 1, 1 };
-    Standard_Integer aShifts[]        = { 0, 0, 0 };
-
-    // Planes go in order:
-    // LEFT, RIGHT, BOTTOM, TOP, NEAR, FAR
-    for (Standard_Integer aFaceIdx = 0; aFaceIdx < 3; ++aFaceIdx)
-    {
-      for (Standard_Integer i = 0; i < 2; ++i)
-      {
-        for (Standard_Integer aPntIter = 0; aPntIter < aPlaneTriangleVertsNb; ++aPntIter)
-        {
-          aShifts[aFaceIdx] = i;
-          if (i == 0)
-          {
-            aShifts[(aFaceIdx + 1) % 3] = aLookup1_clockwise[aPntIter];
-            aShifts[(aFaceIdx + 2) % 3] = aLookup2_clockwise[aPntIter];
-          }
-          else
-          {
-            aShifts[(aFaceIdx + 1) % 3] = aLookup1_anticlockwise[aPntIter];
-            aShifts[(aFaceIdx + 2) % 3] = aLookup2_anticlockwise[aPntIter];
-          }
-
-          Standard_Integer anIndex = aShifts[0] * 2 * 2 + aShifts[1] * 2 + aShifts[2];
-          myTriangles->AddEdge (anIndex + 1);
-        }
-      }
-    }
-  }
-
-  for (Standard_Integer aPointIter = 0; aPointIter < Graphic3d_Camera::FrustumVerticesNB; ++aPointIter)
-  {
-    const Graphic3d_Vec3d aPnt = myPoints[aPointIter];
-    myTriangles->SetVertice (aPointIter + 1, gp_Pnt (aPnt.x(), aPnt.y(), aPnt.z()));
-  }
-}
-
-//=======================================================================
-//function : fillBorders
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::fillBorders()
-{
-  if (myBorders.IsNull())
-  {
-    const Standard_Integer aPlaneSegmVertsNb = 2 * 4;
-    const Standard_Integer aPlanesNb         = 3 * 2;
-    myBorders = new Graphic3d_ArrayOfSegments (Graphic3d_Camera::FrustumVerticesNB, aPlaneSegmVertsNb * aPlanesNb);
-    myBorders->SetVertice (Graphic3d_Camera::FrustumVerticesNB, gp_Pnt (0.0, 0.0, 0.0));
-
-    // Segments go in order:
-    // (0, 2), (2, 3), (3, 1), (1, 0)
-    const Standard_Integer aLookup1[] = { 0, 1, 1, 1, 1, 0, 0, 0 };
-    const Standard_Integer aLookup2[] = { 0, 0, 0, 1, 1, 1, 1, 0 };
-    Standard_Integer aShifts[] = { 0, 0, 0 };
-
-    // Planes go in order:
-    // LEFT, RIGHT, BOTTOM, TOP, NEAR, FAR
-    for (Standard_Integer aFaceIdx = 0; aFaceIdx < 3; ++aFaceIdx)
-    {
-      for (Standard_Integer i = 0; i < 2; ++i)
-      {
-        for (Standard_Integer aSegmVertIter = 0; aSegmVertIter < aPlaneSegmVertsNb; ++aSegmVertIter)
-        {
-          aShifts[aFaceIdx] = i;
-          aShifts[(aFaceIdx + 1) % 3] = aLookup1[aSegmVertIter];
-          aShifts[(aFaceIdx + 2) % 3] = aLookup2[aSegmVertIter];
-
-          Standard_Integer anIndex = aShifts[0] * 2 * 2 + aShifts[1] * 2 + aShifts[2];
-          myBorders->AddEdge (anIndex + 1);
-        }
-      }
-    }
-  }
-
-  for (Standard_Integer aPointIter = 0; aPointIter < Graphic3d_Camera::FrustumVerticesNB; ++aPointIter)
-  {
-    const Graphic3d_Vec3d aPnt = myPoints[aPointIter];
-    myBorders->SetVertice (aPointIter + 1, gp_Pnt (aPnt.x(), aPnt.y(), aPnt.z()));
-  }
-}
-
-//=======================================================================
-//function : Compute
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
-                                 const Handle(Prs3d_Presentation)&           thePrs,
-                                 const Standard_Integer                      theMode)
-{
-  thePrs->SetInfiniteState (true);
-  if (myTriangles.IsNull())
-  {
-    return;
-  }
-
-  switch (theMode)
-  {
-    case AIS_Shaded:
-    {
-      Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-      aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-      aGroup->AddPrimitiveArray (myTriangles);
-    }
-    Standard_FALLTHROUGH
-    case AIS_WireFrame:
-    {
-      Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-      aGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect());
-      aGroup->AddPrimitiveArray (myBorders);
-      break;
-    }
-  }
-}
-
-//=======================================================================
-//function : ComputeSelection
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                          const Standard_Integer             theMode)
-{
-  Handle(SelectMgr_EntityOwner) anOwner = new SelectMgr_EntityOwner (this);
-  switch (theMode)
-  {
-    case SelectionMode_Edges:
-    {
-      Handle(Select3D_SensitiveGroup) aSensitiveEntity = new Select3D_SensitiveGroup (anOwner);
-      for (Standard_Integer anIter = 1; anIter <= myBorders->EdgeNumber(); anIter += 2)
-      {
-        aSensitiveEntity->Add (new Select3D_SensitiveSegment (anOwner, myBorders->Vertice (myBorders->Edge (anIter)), myBorders->Vertice(myBorders->Edge (anIter + 1))));
-      }
-      theSelection->Add (aSensitiveEntity);
-      break;
-    }
-    case SelectionMode_Volume:
-    {
-      Handle(Select3D_SensitivePrimitiveArray) aSelArray = new Select3D_SensitivePrimitiveArray (anOwner);
-      aSelArray->InitTriangulation (myTriangles->Attributes(), myTriangles->Indices(), TopLoc_Location());
-      theSelection->Add (aSelArray);
-      break;
-    }
-  }
-}
--- a/src/AIS/AIS_CameraFrustum.hxx
+++ b/src/AIS/AIS_CameraFrustum.hxx
@@ -1,85 +0,0 @@
-// Created on: 2018-12-12
-// Created by: Olga SURYANINOVA
-// Copyright (c) 2018 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 _AIS_CameraFrustum_HeaderFile
-#define _AIS_CameraFrustum_HeaderFile
-
-#include <AIS_InteractiveObject.hxx>
-
-class Graphic3d_ArrayOfSegments;
-class Graphic3d_ArrayOfTriangles;
-
-//! Presentation for drawing camera frustum.
-//! Default configuration is built with filling and some transparency.
-class AIS_CameraFrustum : public AIS_InteractiveObject
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_CameraFrustum, AIS_InteractiveObject)
-public:
-
-  //! Selection modes supported by this object
-  enum SelectionMode
-  {
-    SelectionMode_Edges  = 0, //!< detect by edges (default)
-    SelectionMode_Volume = 1, //!< detect by volume
-  };
-
-public:
-
-  //! Constructs camera frustum with default configuration.
-  Standard_EXPORT AIS_CameraFrustum();
-
-  //! Sets camera frustum.
-  Standard_EXPORT void SetCameraFrustum (const Handle(Graphic3d_Camera)& theCamera);
-
-  //! Setup custom color.
-  Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE;
-
-  //! Restore default color.
-  Standard_EXPORT virtual void UnsetColor() Standard_OVERRIDE;
-
-  //! Restore transparency setting.
-  Standard_EXPORT virtual void UnsetTransparency() Standard_OVERRIDE;
-
-  //! Return true if specified display mode is supported.
-  Standard_EXPORT virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE;
-
-protected:
-
-  //! Computes presentation of camera frustum.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
-
-  //! Compute selection.
-  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                                 const Standard_Integer             theMode) Standard_OVERRIDE;
-
-private:
-
-  //! Fills triangles primitive array for camera frustum filling.
-  void fillTriangles();
-
-  //! Fills polylines primitive array for camera frustum borders.
-  void fillBorders();
-
-protected:
-
-  NCollection_Array1<Graphic3d_Vec3d> myPoints;    //!< Array of points
-  Handle(Graphic3d_ArrayOfTriangles)  myTriangles; //!< Triangles for camera frustum filling
-  Handle(Graphic3d_ArrayOfSegments)   myBorders;   //!< Segments for camera frustum borders
-
-};
-
-#endif // _AIS_CameraFrustum_HeaderFile
--- a/src/AIS/AIS_Chamf2dDimension.hxx
+++ b/src/AIS/AIS_Chamf2dDimension.hxx
@@ -17,13 +17,29 @@
 #ifndef _AIS_Chamf2dDimension_HeaderFile
 #define _AIS_Chamf2dDimension_HeaderFile

-#include <AIS_KindOfDimension.hxx>
-#include <AIS_Relation.hxx>
-#include <DsgPrs_ArrowSide.hxx>
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
-
+#include <AIS_Relation.hxx>
+#include <Standard_Real.hxx>
+#include <DsgPrs_ArrowSide.hxx>
+#include <AIS_KindOfDimension.hxx>
+#include <Standard_Boolean.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Shape;
 class Geom_Plane;
+class TCollection_ExtendedString;
+class gp_Pnt;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;

+
+class AIS_Chamf2dDimension;
 DEFINE_STANDARD_HANDLE(AIS_Chamf2dDimension, AIS_Relation)

 //! A framework to define display of 2D chamfers.
@@ -32,9 +48,10 @@ DEFINE_STANDARD_HANDLE(AIS_Chamf2dDimension, AIS_Relation)
 //! chamfer, or the angle if it is not.
 class AIS_Chamf2dDimension : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension, AIS_Relation)
+
 public:

+  
  //! Constructs the display object for 2D chamfers.
  //! This object is defined by the face aFShape, the
  //! dimension aVal, the plane aPlane and the text aText.
@@ -62,7 +79,18 @@ public:
  //! to the object to display before computation  !!!
  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;

+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
+
+protected:
+
+
+
+
 private:
+
  
  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
  
@@ -73,8 +101,14 @@ private:
  gp_Pnt myPntAttach;
  gp_Dir myDir;

+
 };

+
 #include <AIS_Chamf2dDimension.lxx>

+
+
+
+
 #endif // _AIS_Chamf2dDimension_HeaderFile
--- a/src/AIS/AIS_Chamf3dDimension.hxx
+++ b/src/AIS/AIS_Chamf3dDimension.hxx
@@ -17,11 +17,28 @@
 #ifndef _AIS_Chamf3dDimension_HeaderFile
 #define _AIS_Chamf3dDimension_HeaderFile

-#include <AIS_KindOfDimension.hxx>
-#include <AIS_Relation.hxx>
-#include <DsgPrs_ArrowSide.hxx>
-#include <gp_Dir.hxx>
+#include <Standard.hxx>
+#include <Standard_Type.hxx>

+#include <gp_Pnt.hxx>
+#include <gp_Dir.hxx>
+#include <AIS_Relation.hxx>
+#include <Standard_Real.hxx>
+#include <DsgPrs_ArrowSide.hxx>
+#include <AIS_KindOfDimension.hxx>
+#include <Standard_Boolean.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Shape;
+class TCollection_ExtendedString;
+class gp_Pnt;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
+
+
+class AIS_Chamf3dDimension;
 DEFINE_STANDARD_HANDLE(AIS_Chamf3dDimension, AIS_Relation)

 //! A framework to define display of 3D chamfers.
@@ -30,9 +47,10 @@ DEFINE_STANDARD_HANDLE(AIS_Chamf3dDimension, AIS_Relation)
 //! chamfer, or the angle if it is not.
 class AIS_Chamf3dDimension : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension, AIS_Relation)
+
 public:

+  
  //! Constructs a display object for 3D chamfers.
  //! This object is defined by the shape aFShape, the
  //! dimension aVal and the text aText.
@@ -60,8 +78,19 @@ public:
  //! to the object to display before computation  !!!
  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;

+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
+
+protected:
+
+
+
+
 private:

+  
  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
  
  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -71,8 +100,14 @@ private:
  gp_Pnt myPntAttach;
  gp_Dir myDir;

+
 };

+
 #include <AIS_Chamf3dDimension.lxx>

+
+
+
+
 #endif // _AIS_Chamf3dDimension_HeaderFile
--- a/src/AIS/AIS_Circle.cxx
+++ b/src/AIS/AIS_Circle.cxx
@@ -112,29 +112,6 @@ void AIS_Circle::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,

 }

-//=======================================================================
-//function : replaceWithNewLineAspect
-//purpose  :
-//=======================================================================
-void AIS_Circle::replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect)
-{
-  if (!myDrawer->HasLink())
-  {
-    myDrawer->SetLineAspect (theAspect);
-    return;
-  }
-
-  const Handle(Graphic3d_AspectLine3d) anAspectOld = myDrawer->LineAspect()->Aspect();
-  const Handle(Graphic3d_AspectLine3d) anAspectNew = !theAspect.IsNull() ? theAspect->Aspect() : myDrawer->Link()->LineAspect()->Aspect();
-  if (anAspectNew != anAspectOld)
-  {
-    myDrawer->SetLineAspect (theAspect);
-    Graphic3d_MapOfAspectsToAspects aReplaceMap;
-    aReplaceMap.Bind (anAspectOld, anAspectNew);
-    replaceAspects (aReplaceMap);
-  }
-}
-
 //=======================================================================
 //function : SetColor
 //purpose  : 
@@ -145,41 +122,34 @@ void AIS_Circle::SetColor(const Quantity_Color &aCol)
  hasOwnColor=Standard_True;
  myDrawer->SetColor (aCol);

-  if (!myDrawer->HasOwnLineAspect())
-  {
-    Standard_Real WW = HasWidth() ? myOwnWidth :
-                                    myDrawer->HasLink() ?
-                                    AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) :
-                                    1.;
-    replaceWithNewLineAspect (new Prs3d_LineAspect (aCol, Aspect_TOL_SOLID, WW));
-  }
+  Standard_Real WW = HasWidth() ? myOwnWidth :
+                                  myDrawer->HasLink() ?
+                                  AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) :
+                                  1.;
+
+  if (!myDrawer->HasOwnLineAspect ())
+    myDrawer->SetLineAspect (new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW));
  else
-  {
    myDrawer->LineAspect()->SetColor(aCol);
-    SynchronizeAspects();
-  }
 }

+
+
 //=======================================================================
 //function : SetWidth 
 //purpose  : 
 //=======================================================================
 void AIS_Circle::SetWidth(const Standard_Real aValue)
 {
-  myOwnWidth = (Standard_ShortReal )aValue;
+  myOwnWidth=aValue;

-  if (!myDrawer->HasOwnLineAspect())
-  {
+  if (!myDrawer->HasOwnLineAspect ()) {
    Quantity_Color CC = Quantity_NOC_YELLOW;
    if( HasColor() ) CC = myDrawer->Color();
    else if(myDrawer->HasLink()) AIS_GraphicTool::GetLineColor (myDrawer->Link(), AIS_TOA_Line, CC);
-    replaceWithNewLineAspect (new Prs3d_LineAspect (CC, Aspect_TOL_SOLID, aValue));
-  }
-  else
-  {
+    myDrawer->SetLineAspect (new Prs3d_LineAspect(CC,Aspect_TOL_SOLID,aValue));
+  } else
    myDrawer->LineAspect()->SetWidth(aValue);
-    SynchronizeAspects();
-  }
 }


@@ -191,18 +161,15 @@ void AIS_Circle::UnsetColor()
 {
  hasOwnColor = Standard_False;

-  if (!HasWidth())
-  {
-    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
-  }
-  else
-  {
+  Handle(Prs3d_LineAspect) NullAsp;
+
+  if (!HasWidth()) myDrawer->SetLineAspect(NullAsp);
+  else{
    Quantity_Color CC = Quantity_NOC_YELLOW;;
    if( HasColor() ) CC = myDrawer->Color();
    else if (myDrawer->HasLink()) AIS_GraphicTool::GetLineColor(myDrawer->Link(),AIS_TOA_Line,CC);
    myDrawer->LineAspect()->SetColor(CC);
    myDrawer->SetColor (CC);
-    SynchronizeAspects();
  }
 }

@@ -212,13 +179,11 @@ void AIS_Circle::UnsetColor()
 //=======================================================================
 void AIS_Circle::UnsetWidth()
 {
-  if (!HasColor())
-  {
-    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
-  }
-  else
-  {
-   Standard_ShortReal WW = myDrawer->HasLink() ? (Standard_ShortReal )AIS_GraphicTool::GetLineWidth(myDrawer->Link(),AIS_TOA_Line) : 1.0f;
+  Handle(Prs3d_LineAspect) NullAsp;
+
+  if (!HasColor()) myDrawer->SetLineAspect(NullAsp);
+  else{
+   Standard_Real WW = myDrawer->HasLink() ? AIS_GraphicTool::GetLineWidth(myDrawer->Link(),AIS_TOA_Line) : 1.;
   myDrawer->LineAspect()->SetWidth(WW);
   myOwnWidth = WW;
  }
--- a/src/AIS/AIS_Circle.hxx
+++ b/src/AIS/AIS_Circle.hxx
@@ -115,9 +115,6 @@ private:
  
  Standard_EXPORT void ComputeArcSelection (const Handle(SelectMgr_Selection)& aSelection);

-  //! Replace aspects of already computed groups with the new value.
-  void replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect);
-
 private:

  Handle(Geom_Circle) myComponent;
--- a/src/AIS/AIS_ColorScale.cxx
+++ b/src/AIS/AIS_ColorScale.cxx
@@ -107,10 +107,6 @@ AIS_ColorScale::AIS_ColorScale()
  myTextHeight (20)
 {
  SetDisplayMode (0);
-  myDrawer->SetupOwnShadingAspect();
-  myDrawer->ShadingAspect()->Aspect()->SetShadingModel (Graphic3d_TOSM_UNLIT);
-  myDrawer->ShadingAspect()->Aspect()->SetAlphaMode (Graphic3d_AlphaMode_Opaque);
-  myDrawer->ShadingAspect()->Aspect()->SetInteriorColor (Quantity_NOC_WHITE);
 }

 //=======================================================================
@@ -462,6 +458,15 @@ void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
  const Standard_Integer aBarTop     = myYPos + myHeight - aTitleOffset - aBarYOffset;
  const Standard_Integer aBarHeight  = aBarTop - aBarBottom;

+  // draw title
+  if (!myTitle.IsEmpty())
+  {
+    drawText (Prs3d_Root::CurrentGroup (thePrs), myTitle,
+              myXPos + mySpacing,
+              aBarTop + aBarYOffset,
+              Graphic3d_VTA_BOTTOM);
+  }
+
  TColStd_SequenceOfExtendedString aLabels;
  if (myLabelType == Aspect_TOCSD_USER)
  {
@@ -491,27 +496,11 @@ void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
    aColorBreadth += aTextWidth;
  }

-  // draw title
-  Handle(Graphic3d_Group) aLabelsGroup;
-  if (!myTitle.IsEmpty()
-   || !aLabels.IsEmpty())
-  {
-    aLabelsGroup = thePrs->NewGroup();
-    aLabelsGroup->SetGroupPrimitivesAspect (myDrawer->TextAspect()->Aspect());
-  }
-  if (!myTitle.IsEmpty())
-  {
-    drawText (aLabelsGroup, myTitle,
-              myXPos + mySpacing,
-              aBarTop + aBarYOffset,
-              Graphic3d_VTA_BOTTOM);
-  }
-
  // draw colors
  drawColorBar (thePrs, aBarBottom, aBarHeight, aTextWidth, aColorBreadth);

  // draw Labels
-  drawLabels (aLabelsGroup, aLabels, aBarBottom, aBarHeight, aTextWidth, aColorBreadth);
+  drawLabels (thePrs, aLabels, aBarBottom, aBarHeight, aTextWidth, aColorBreadth);
 }

 //=======================================================================
@@ -638,8 +627,7 @@ void AIS_ColorScale::drawColorBar (const Handle(Prs3d_Presentation)& thePrs,
    }
  }

-  Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-  aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup (thePrs);
  aGroup->AddPrimitiveArray (aTriangles);

  const Quantity_Color aFgColor (hasOwnColor ? myDrawer->Color() : Quantity_NOC_WHITE);
@@ -654,7 +642,7 @@ void AIS_ColorScale::drawColorBar (const Handle(Prs3d_Presentation)& thePrs,
 //function : drawLabels
 //purpose  :
 //=======================================================================
-void AIS_ColorScale::drawLabels (const Handle(Graphic3d_Group)& theGroup,
+void AIS_ColorScale::drawLabels (const Handle(Prs3d_Presentation)& thePrs,
                                 const TColStd_SequenceOfExtendedString& theLabels,
                                 const Standard_Integer theBarBottom,
                                 const Standard_Integer theBarHeight,
@@ -728,14 +716,14 @@ void AIS_ColorScale::drawLabels (const Handle(Graphic3d_Group)& theGroup,
    Standard_Integer aPos2 = aNbLabels - 1 - i2;
    if (aFilter && !(aPos1 % aFilter))
    {
-      drawText (theGroup, theLabels.Value (i1 + 1),
+      drawText (Prs3d_Root::CurrentGroup (thePrs), theLabels.Value (i1 + 1),
                anXLeft, anYBottom + Standard_Integer(i1 * aStepY + anAscent),
                Graphic3d_VTA_CENTER);
      aLast1 = i1;
    }
    if (aFilter && !(aPos2 % aFilter))
    {
-      drawText (theGroup, theLabels.Value (i2 + 1),
+      drawText (Prs3d_Root::CurrentGroup (thePrs), theLabels.Value (i2 + 1),
                anXLeft, anYBottom + Standard_Integer(i2 * aStepY + anAscent),
                Graphic3d_VTA_CENTER);
      aLast2 = i2;
@@ -758,7 +746,7 @@ void AIS_ColorScale::drawLabels (const Handle(Graphic3d_Group)& theGroup,

  if (i0 != -1)
  {
-    drawText (theGroup, theLabels.Value (i0 + 1),
+    drawText (Prs3d_Root::CurrentGroup (thePrs), theLabels.Value (i0 + 1),
              anXLeft, anYBottom + Standard_Integer(i0 * aStepY + anAscent),
              Graphic3d_VTA_CENTER);
  }
@@ -781,8 +769,8 @@ void AIS_ColorScale::drawFrame (const Handle(Prs3d_Presentation)& thePrs,
  aPrim->AddVertex (theX,            theY, 0.0);

  Handle(Graphic3d_AspectLine3d) anAspect = new Graphic3d_AspectLine3d (theColor, Aspect_TOL_SOLID, 1.0);
-  Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-  aGroup->SetGroupPrimitivesAspect (anAspect);
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup (thePrs);
+  aGroup->SetPrimitivesAspect (anAspect);
  aGroup->AddPrimitiveArray (aPrim);
 }

@@ -796,6 +784,7 @@ void AIS_ColorScale::drawText (const Handle(Graphic3d_Group)& theGroup,
                               const Graphic3d_VerticalTextAlignment theVertAlignment)
 {
  const Handle(Prs3d_TextAspect)& anAspect = myDrawer->TextAspect();
+  theGroup->SetPrimitivesAspect (anAspect->Aspect());
  theGroup->Text (theText,
                  gp_Ax2 (gp_Pnt (theX, theY, 0.0), gp::DZ()),
                  anAspect->Height(),
--- a/src/AIS/AIS_ColorScale.hxx
+++ b/src/AIS/AIS_ColorScale.hxx
@@ -406,7 +406,7 @@ private:
  Standard_Integer computeMaxLabelWidth (const TColStd_SequenceOfExtendedString& theLabels) const;

  //! Draw labels.
-  void drawLabels (const Handle(Graphic3d_Group)& theGroup,
+  void drawLabels (const Handle(Prs3d_Presentation)& thePrs,
                   const TColStd_SequenceOfExtendedString& theLabels,
                   const Standard_Integer theBarBottom,
                   const Standard_Integer theBarHeight,
--- a/src/AIS/AIS_ColoredDrawer.hxx
+++ b/src/AIS/AIS_ColoredDrawer.hxx
@@ -27,7 +27,6 @@ public:
  AIS_ColoredDrawer (const Handle(Prs3d_Drawer)& theLink)
  : myIsHidden    (false),
    myHasOwnColor (false),
-    myHasOwnTransp(false),
    myHasOwnWidth (false)
  {
    Link (theLink);
@@ -35,15 +34,9 @@ public:

  bool IsHidden() const                                 { return myIsHidden;     }
  void SetHidden (const bool theToHide)                 { myIsHidden = theToHide;}
-
  bool HasOwnColor() const                              { return myHasOwnColor;  }
  void UnsetOwnColor()                                  { myHasOwnColor = false; }
  void SetOwnColor (const Quantity_Color& /*theColor*/) { myHasOwnColor = true;  }
-
-  bool HasOwnTransparency() const                       { return myHasOwnTransp;  }
-  void UnsetOwnTransparency()                           { myHasOwnTransp = false; }
-  void SetOwnTransparency (Standard_Real /*theTransp*/) { myHasOwnTransp = true;  }
-
  bool HasOwnWidth() const                              { return myHasOwnWidth;  }
  void UnsetOwnWidth()                                  { myHasOwnWidth = false; }
  void SetOwnWidth (const Standard_Real /*theWidth*/)   { myHasOwnWidth = true;  }
@@ -52,7 +45,6 @@ public:  //! @name list of overridden properties

  bool myIsHidden;
  bool myHasOwnColor;
-  bool myHasOwnTransp;
  bool myHasOwnWidth;

 };
--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -124,7 +124,8 @@ Handle(AIS_ColoredDrawer) AIS_ColoredShape::CustomAspects (const TopoDS_Shape& t
  {
    aDrawer = new AIS_ColoredDrawer (myDrawer);
    myShapeColors.Bind (theShape, aDrawer);
-    SetToUpdate();
+    LoadRecomputable (AIS_WireFrame);
+    LoadRecomputable (AIS_Shaded);
  }
  return aDrawer;
 }
@@ -140,7 +141,8 @@ void AIS_ColoredShape::ClearCustomAspects()
    return;
  }
  myShapeColors.Clear();
-  SetToUpdate();
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
 }

 //=======================================================================
@@ -155,7 +157,8 @@ void AIS_ColoredShape::UnsetCustomAspects (const TopoDS_Shape&    theShape,
    return;
  }

-  SetToUpdate();
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
  if (theToUnregister)
  {
    myShapeColors.UnBind (theShape);
@@ -180,23 +183,8 @@ void AIS_ColoredShape::SetCustomColor (const TopoDS_Shape&   theShape,
  const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
  setColor (aDrawer, theColor);
  aDrawer->SetOwnColor (theColor);
-}
-
-//=======================================================================
-//function : SetCustomTransparency
-//purpose  :
-//=======================================================================
-void AIS_ColoredShape::SetCustomTransparency (const TopoDS_Shape& theShape,
-                                              Standard_Real theTransparency)
-{
-  if (theShape.IsNull())
-  {
-    return;
-  }
-
-  const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
-  setTransparency (aDrawer, theTransparency);
-  aDrawer->SetOwnTransparency (theTransparency);
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
 }

 //=======================================================================
@@ -212,8 +200,10 @@ void AIS_ColoredShape::SetCustomWidth (const TopoDS_Shape& theShape,
  }

  const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
-  setWidth (aDrawer, theLineWidth);
+  setWidth (CustomAspects (theShape), theLineWidth);
  aDrawer->SetOwnWidth (theLineWidth);
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
 }

 //=======================================================================
@@ -223,6 +213,11 @@ void AIS_ColoredShape::SetCustomWidth (const TopoDS_Shape& theShape,

 void AIS_ColoredShape::SetColor (const Quantity_Color&  theColor)
 {
+  setColor (myDrawer, theColor);
+  myDrawer->SetColor (theColor);
+  hasOwnColor = Standard_True;
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
  for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
  {
    const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
@@ -248,7 +243,6 @@ void AIS_ColoredShape::SetColor (const Quantity_Color&  theColor)
      aDrawer->FaceBoundaryAspect()->SetColor (theColor);
    }
  }
-  AIS_Shape::SetColor (theColor);
 }

 //=======================================================================
@@ -258,6 +252,10 @@ void AIS_ColoredShape::SetColor (const Quantity_Color&  theColor)

 void AIS_ColoredShape::SetWidth (const Standard_Real    theLineWidth)
 {
+  setWidth (myDrawer, theLineWidth);
+  myOwnWidth = theLineWidth;
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
  for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
  {
    const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
@@ -279,16 +277,6 @@ void AIS_ColoredShape::SetWidth (const Standard_Real    theLineWidth)
      aDrawer->FaceBoundaryAspect()->SetWidth (theLineWidth);
    }
  }
-  AIS_Shape::SetWidth (theLineWidth);
-}
-
-//=======================================================================
-//function : UnsetWidth
-//purpose  :
-//=======================================================================
-void AIS_ColoredShape::UnsetWidth()
-{
-  SetWidth (1.0f);
 }

 //=======================================================================
@@ -298,20 +286,18 @@ void AIS_ColoredShape::UnsetWidth()

 void AIS_ColoredShape::SetTransparency (const Standard_Real theValue)
 {
+  setTransparency (myDrawer, theValue);
+  myDrawer->SetTransparency ((Standard_ShortReal )theValue);
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
  for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
  {
-    const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
-    if (aDrawer->HasOwnTransparency())
-    {
-      continue;
-    }
-
+    const Handle(Prs3d_Drawer)& aDrawer = anIter.Value();
    if (aDrawer->HasOwnShadingAspect())
    {
      aDrawer->ShadingAspect()->SetTransparency (theValue, myCurrentFacingModel);
    }
  }
-  AIS_Shape::SetTransparency (theValue);
 }

 //=======================================================================
@@ -320,7 +306,27 @@ void AIS_ColoredShape::SetTransparency (const Standard_Real theValue)
 //=======================================================================
 void AIS_ColoredShape::UnsetTransparency()
 {
-  SetTransparency (0.0f);
+  myDrawer->SetTransparency (0.0f);
+  if (myDrawer->HasOwnShadingAspect())
+  {
+    myDrawer->ShadingAspect()->SetTransparency (0.0, myCurrentFacingModel);
+    if (!HasColor()
+     && !HasMaterial()
+     && !myDrawer->ShadingAspect()->Aspect()->ToMapTexture())
+    {
+      myDrawer->SetShadingAspect (Handle(Prs3d_ShadingAspect)());
+    }
+  }
+
+  for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
+  {
+    const Handle(Prs3d_Drawer)& aDrawer = anIter.Value();
+    if (aDrawer->HasOwnShadingAspect())
+    {
+      aDrawer->ShadingAspect()->SetTransparency (0.0, myCurrentFacingModel);
+    }
+  }
+  SynchronizeAspects();
 }

 //=======================================================================
@@ -330,16 +336,19 @@ void AIS_ColoredShape::UnsetTransparency()

 void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
 {
+  setMaterial (myDrawer, theMaterial, HasColor(), IsTransparent());
+  //myOwnMaterial = theMaterial;
+  hasOwnMaterial = Standard_True;
+  LoadRecomputable (AIS_Shaded);
  for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
  {
    const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
    //if (aDrawer->HasOwnMaterial()) continue;
    if (aDrawer->HasOwnShadingAspect())
    {
-      setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), aDrawer->HasOwnTransparency());
+      setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), Standard_False); // aDrawer->IsTransparent()
    }
  }
-  AIS_Shape::SetMaterial (theMaterial);
 }

 //=======================================================================
@@ -512,8 +521,8 @@ void AIS_ColoredShape::ComputeSelection (const Handle(SelectMgr_Selection)& theS
  Handle(SelectMgr_SelectableObject) aThis (this);
  for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (theSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next())
  {
-    const Handle(SelectMgr_EntityOwner)& anOwner = aSelEntIter.Value()->BaseSensitive()->OwnerId();
-    anOwner->SetSelectable (aThis);
+    Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast (aSelEntIter.Value()->BaseSensitive()->OwnerId());
+    anOwner->Set (aThis);
  }

  StdSelect_BRepSelectionTool::PreBuildBVH (theSelection);
@@ -577,7 +586,7 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
                                                 const DataMapOfDrawerCompd& theDrawerClosedFaces,
                                                 const Standard_Integer theMode)
 {
-  Handle(Graphic3d_Group) anOpenGroup, aClosedGroup, anEdgesGroup;
+  Handle(Graphic3d_Group) anOpenGroup, aClosedGroup;
  for (size_t aShType = 0; aShType <= (size_t )TopAbs_SHAPE; ++aShType)
  {
    const Standard_Boolean isClosed = aShType == TopAbs_SHAPE;
@@ -631,7 +640,7 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
        {
          if (aShadedGroup.IsNull())
          {
-            aShadedGroup = thePrs->NewGroup();
+            aShadedGroup = Prs3d_Root::NewGroup (thePrs);
            aShadedGroup->SetClosed (isClosed);
          }
          aShadedGroup->SetPrimitivesAspect (aDrawer->ShadingAspect()->Aspect());
@@ -640,15 +649,18 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation

        if (aDrawer->FaceBoundaryDraw())
        {
-          if (Handle(Graphic3d_ArrayOfSegments) aBndSegments = StdPrs_ShadedShape::FillFaceBoundaries (aShapeDraw, aDrawer->FaceBoundaryUpperContinuity()))
+          Handle(Graphic3d_ArrayOfSegments) aBndSegments = StdPrs_ShadedShape::FillFaceBoundaries (aShapeDraw);
+          if (!aBndSegments.IsNull())
          {
-            if (anEdgesGroup.IsNull())
+            if (aShadedGroup.IsNull())
            {
-              anEdgesGroup = thePrs->NewGroup();
+              aShadedGroup = Prs3d_Root::NewGroup (thePrs);
+              aShadedGroup->SetClosed (isClosed);
            }

-            anEdgesGroup->SetPrimitivesAspect (aDrawer->FaceBoundaryAspect()->Aspect());
-            anEdgesGroup->AddPrimitiveArray (aBndSegments);
+            Handle(Graphic3d_AspectLine3d) aBoundaryAspect = aDrawer->FaceBoundaryAspect()->Aspect();
+            aShadedGroup->SetPrimitivesAspect (aBoundaryAspect);
+            aShadedGroup->AddPrimitiveArray (aBndSegments);
          }
        }
      }
@@ -703,29 +715,13 @@ Standard_Boolean AIS_ColoredShape::dispatchColors (const Handle(AIS_ColoredDrawe
      {
        const TopoDS_Shape& aFace = aFaceIter.Value();
        Handle(AIS_ColoredDrawer) aFaceDrawer;
-        if (aFace.ShapeType() != TopAbs_FACE
-        || !theShapeDrawerMap.Find (aFace, aFaceDrawer))
-        {
-          continue;
-        }
-
-        if (aFaceDrawer->IsHidden())
+        if (aFace.ShapeType() == TopAbs_FACE
+         && theShapeDrawerMap.Find (aFace, aFaceDrawer)
+         && aFaceDrawer->IsHidden())
        {
          isClosedShell = Standard_False;
          break;
        }
-        else if (aFaceDrawer->HasOwnShadingAspect()
-              && aFaceDrawer->ShadingAspect()->Aspect()->AlphaMode() != Graphic3d_AlphaMode_Opaque)
-        {
-          if (aFaceDrawer->ShadingAspect()->Aspect()->AlphaMode() != Graphic3d_AlphaMode_BlendAuto
-           || aFaceDrawer->ShadingAspect()->Aspect()->FrontMaterial().Alpha() < 1.0f
-           || (aFaceDrawer->ShadingAspect()->Aspect()->Distinguish()
-            && aFaceDrawer->ShadingAspect()->Aspect()->BackMaterial().Alpha()  < 1.0f))
-          {
-            isClosedShell = Standard_False;
-            break;
-          }
-        }
      }
    }

--- a/src/AIS/AIS_ColoredShape.hxx
+++ b/src/AIS/AIS_ColoredShape.hxx
@@ -56,10 +56,6 @@ public: //! @name sub-shape aspects
  Standard_EXPORT void SetCustomColor (const TopoDS_Shape&   theShape,
                                       const Quantity_Color& theColor);

-  //! Customize transparency of specified sub-shape
-  Standard_EXPORT void SetCustomTransparency (const TopoDS_Shape& theShape,
-                                              Standard_Real theTransparency);
-
  //! Customize line width of specified sub-shape
  Standard_EXPORT void SetCustomWidth (const TopoDS_Shape& theShape,
                                       const Standard_Real theLineWidth);
@@ -81,16 +77,11 @@ public: //! @name global aspects
  //! Sets transparency value.
  Standard_EXPORT virtual void SetTransparency (const Standard_Real theValue) Standard_OVERRIDE;

-  //! Sets the material aspect.
-  Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE;
-
-public:
-
  //! Removes the setting for transparency in the reconstructed compound shape.
  Standard_EXPORT virtual void UnsetTransparency() Standard_OVERRIDE;

-  //! Setup line width of entire shape.
-  Standard_EXPORT virtual void UnsetWidth() Standard_OVERRIDE;
+  //! Sets the material aspect.
+  Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE;

 protected: //! @name override presentation computation

--- a/src/AIS/AIS_ConcentricRelation.hxx
+++ b/src/AIS/AIS_ConcentricRelation.hxx
@@ -17,11 +17,24 @@
 #ifndef _AIS_ConcentricRelation_HeaderFile
 #define _AIS_ConcentricRelation_HeaderFile

-#include <AIS_Relation.hxx>
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <gp_Pnt.hxx>
+#include <Standard_Real.hxx>
 #include <gp_Dir.hxx>
-
+#include <AIS_Relation.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Shape;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;

+
+class AIS_ConcentricRelation;
 DEFINE_STANDARD_HANDLE(AIS_ConcentricRelation, AIS_Relation)

 //! A framework to define a constraint by a relation of
@@ -31,9 +44,10 @@ DEFINE_STANDARD_HANDLE(AIS_ConcentricRelation, AIS_Relation)
 //! relation of concentricity can be extended.
 class AIS_ConcentricRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation, AIS_Relation)
+
 public:

+  
  //! Constructs the display object for concentric relations
  //! between shapes.
  //! This object is defined by the two shapes, aFShape
@@ -51,8 +65,19 @@ public:
  //! to the object to display before computation  !!!
  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;

+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
+
+protected:
+
+
+
+
 private:

+  
  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
  
  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -70,6 +95,13 @@ private:
  gp_Dir myDir;
  gp_Pnt myPnt;

+
 };

+
+
+
+
+
+
 #endif // _AIS_ConcentricRelation_HeaderFile
--- a/src/AIS/AIS_ConnectedInteractive.cxx
+++ b/src/AIS/AIS_ConnectedInteractive.cxx
@@ -23,6 +23,7 @@
 #include <Precision.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Projector.hxx>
+#include <PrsMgr_ModedPresentation.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -91,12 +92,12 @@ void AIS_ConnectedInteractive::connect (const Handle(AIS_InteractiveObject)& the

 void AIS_ConnectedInteractive::Disconnect()
 {
-  for (PrsMgr_Presentations::Iterator aPrsIter (myPresentations); aPrsIter.More(); aPrsIter.Next())
+  for(Standard_Integer aPrsIter = 1; aPrsIter <= myPresentations.Length(); ++aPrsIter)
  {
-    const Handle(PrsMgr_Presentation)& aPrs = aPrsIter.Value();
+    const Handle(PrsMgr_Presentation)& aPrs = myPresentations (aPrsIter).Presentation();
    if (!aPrs.IsNull())
    {
-      aPrs->DisconnectAll (Graphic3d_TOC_DESCENDANT);
+      aPrs->Presentation()->DisconnectAll (Graphic3d_TOC_DESCENDANT);
    }
  }
 }
@@ -111,7 +112,7 @@ void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3
  if (HasConnection())
  {
    thePrs->Clear (Standard_False);
-    thePrs->DisconnectAll (Graphic3d_TOC_DESCENDANT);
+    thePrs->RemoveAll();

    if (!myReference->HasInteractiveContext())
    {
@@ -233,7 +234,7 @@ void AIS_ConnectedInteractive::ComputeSelection (const Handle(SelectMgr_Selectio

  for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (TheRefSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
  {
-    if (const Handle(Select3D_SensitiveEntity)& aSensitive = aSelEntIter.Value()->BaseSensitive())
+    if (Handle(Select3D_SensitiveEntity) aSensitive = Handle(Select3D_SensitiveEntity)::DownCast (aSelEntIter.Value()->BaseSensitive()))
    {
      // Get the copy of SE3D
      if (Handle(Select3D_SensitiveEntity) aNewSensitive = aSensitive->GetConnected())
@@ -271,7 +272,7 @@ void AIS_ConnectedInteractive::computeSubShapeSelection (const Handle(SelectMgr_
  Shapes2EntitiesMap aShapes2EntitiesMap;
  for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (aRefSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
  {
-    if (const Handle(Select3D_SensitiveEntity)& aSE = aSelEntIter.Value()->BaseSensitive())
+    if (Handle(Select3D_SensitiveEntity) aSE = Handle(Select3D_SensitiveEntity)::DownCast (aSelEntIter.Value()->BaseSensitive()))
    {
      if (Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast (aSE->OwnerId()))
      {
--- a/src/AIS/AIS_Dimension.cxx
+++ b/src/AIS/AIS_Dimension.cxx
@@ -335,31 +335,31 @@ TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidt
  if (myDrawer->DimensionAspect()->IsText3d())
  {
    // text width produced by BRepFont
-    Font_BRepFont aFont;
-    if (aFont.FindAndInit (aTextAspect->Aspect()->Font(), aTextAspect->Aspect()->GetTextFontAspect(), aTextAspect->Height(), Font_StrictLevel_Any))
+    Font_BRepFont aFont (aTextAspect->Aspect()->Font().ToCString(),
+                         aTextAspect->Aspect()->GetTextFontAspect(),
+                         aTextAspect->Height());
+
+    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
    {
-      for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
-      {
-        Standard_Utf32Char aCurrChar = *anIter;
-        Standard_Utf32Char aNextChar = *(++anIter);
-        theWidth += aFont.AdvanceX (aCurrChar, aNextChar);
-      }
+      Standard_Utf32Char aCurrChar = *anIter;
+      Standard_Utf32Char aNextChar = *(++anIter);
+      theWidth += aFont.AdvanceX (aCurrChar, aNextChar);
    }
  }
  else
  {
    // Text width for 1:1 scale 2D case
-    Font_FTFontParams aFontParams;
-    aFontParams.PointSize  = (unsigned int )aTextAspect->Height();
-    aFontParams.Resolution = THE_2D_TEXT_RESOLUTION;
-    if (Handle(Font_FTFont) aFont = Font_FTFont::FindAndCreate (aTextAspect->Aspect()->Font(), aTextAspect->Aspect()->GetTextFontAspect(), aFontParams, Font_StrictLevel_Any))
+    Handle(Font_FTFont) aFont = new Font_FTFont();
+    aFont->Init (aTextAspect->Aspect()->Font().ToCString(),
+                 aTextAspect->Aspect()->GetTextFontAspect(),
+                 (const unsigned int)aTextAspect->Height(),
+                 THE_2D_TEXT_RESOLUTION);
+
+    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
    {
-      for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
-      {
-        Standard_Utf32Char aCurrChar = *anIter;
-        Standard_Utf32Char aNextChar = *(++anIter);
-        theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar);
-      }
+      Standard_Utf32Char aCurrChar = *anIter;
+      Standard_Utf32Char aNextChar = *(++anIter);
+      theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar);
    }
  }

@@ -431,7 +431,6 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
                              const TCollection_ExtendedString& theText,
                              const Standard_Integer theLabelPosition)
 {
-  Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
  if (myDrawer->DimensionAspect()->IsText3d())
  {
    // getting font parameters
@@ -518,7 +517,7 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
    aCenterOfLabel.Transform (aTextPlaneTrsf);

    gp_Ax2 aFlippingAxes (aCenterOfLabel, GetPlane().Axis().Direction(), aTextDir);
-    aGroup->SetFlippingOptions (Standard_True, aFlippingAxes);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_True, aFlippingAxes);

    // draw text
    if (myDrawer->DimensionAspect()->IsTextShaded())
@@ -547,14 +546,11 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
      {
        myDrawer->SetFreeBoundaryAspect (new Prs3d_LineAspect (aColor, Aspect_TOL_SOLID, 1.0));
      }
+
      myDrawer->FreeBoundaryAspect()->Aspect()->SetColor (aColor);

      // drawing text
-      if (Handle(Graphic3d_ArrayOfPrimitives) anEdges = StdPrs_WFShape::AddAllEdges (aTextShape, myDrawer))
-      {
-        aGroup->SetGroupPrimitivesAspect (myDrawer->FreeBoundaryAspect()->Aspect());
-        aGroup->AddPrimitiveArray (anEdges);
-      }
+      StdPrs_WFShape::Add (thePresentation, aTextShape, myDrawer);
    }
    Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_False, gp_Ax2());

@@ -569,7 +565,7 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
  // generate primitives for 2D text
  myDrawer->DimensionAspect()->TextAspect()->Aspect()->SetDisplayType (Aspect_TODT_DIMENSION);

-  Prs3d_Text::Draw (aGroup,
+  Prs3d_Text::Draw (Prs3d_Root::CurrentGroup (thePresentation),
                    myDrawer->DimensionAspect()->TextAspect(),
                    theText,
                    theTextPos);
@@ -603,7 +599,6 @@ void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresenta
    gp_Pnt aTextPos = ElCLib::Value (theExtensionSize, anExtensionLine);
    gp_Dir aTextDir = theExtensionDir;

-    Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
    drawText (thePresentation,
              aTextPos,
              aTextDir,
@@ -635,17 +630,16 @@ void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresenta
  aSensitiveCurve.Append (anExtStart);
  aSensitiveCurve.Append (anExtEnd);

-  Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
  if (!myDrawer->DimensionAspect()->IsText3d() && theMode == ComputeMode_All)
  {
-    aGroup->SetStencilTestOptions (Standard_True);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_True);
  }
  Handle(Graphic3d_AspectLine3d) aDimensionLineStyle = myDrawer->DimensionAspect()->LineAspect()->Aspect();
-  aGroup->SetPrimitivesAspect (aDimensionLineStyle);
-  aGroup->AddPrimitiveArray (anExtPrimitive);
+  Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionLineStyle);
+  Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (anExtPrimitive);
  if (!myDrawer->DimensionAspect()->IsText3d() && theMode == ComputeMode_All)
  {
-    aGroup->SetStencilTestOptions (Standard_False);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_False);
  }
 }

@@ -739,6 +733,8 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
    case LabelPosition_HCenter:
    {
      // add label on dimension or extension line to presentation
+      Prs3d_Root::NewGroup (thePresentation);
+
      gp_Pnt aTextPos = IsTextPositionCustom() ? myFixedTextPosition
                                              : (aCenterLineBegin.XYZ() + aCenterLineEnd.XYZ()) * 0.5;
      gp_Dir aTextDir = aDimensionLine.Direction();
@@ -746,7 +742,6 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
      // add text primitives
      if (theMode == ComputeMode_All || theMode == ComputeMode_Text)
      {
-        thePresentation->NewGroup();
        drawText (thePresentation,
                  aTextPos,
                  aTextDir,
@@ -804,28 +799,24 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
        aDimensionAspect->TextAspect()->SetVerticalJustification (aTextJustificaton);

        // main dimension line, short extension
+        if (!aDimensionAspect->IsText3d() && theMode == ComputeMode_All)
        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
-          if (!aDimensionAspect->IsText3d() && theMode == ComputeMode_All)
-          {
-            aGroup->SetStencilTestOptions (Standard_True);
-          }
-          aGroup->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-          aGroup->AddPrimitiveArray (aPrimSegments);
-          if (!aDimensionAspect->IsText3d() && theMode == ComputeMode_All)
-          {
-            aGroup->SetStencilTestOptions (Standard_False);
-          }
+          Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_True);
+        }
+        Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+        Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);
+        if (!aDimensionAspect->IsText3d() && theMode == ComputeMode_All)
+        {
+          Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_False);
        }

        // add arrows to presentation
+        Prs3d_Root::NewGroup (thePresentation);
+
+        DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
+        if (!theIsOneSide)
        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
-          DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
-          if (!theIsOneSide)
-          {
-            DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
-          }
+          DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
        }

        if (!isArrowsExternal)
@@ -834,18 +825,19 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
        }

        // add arrow extension lines to presentation
+        Prs3d_Root::NewGroup (thePresentation);
+
+        DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
+                       aFirstArrowEnd, aFirstExtensionDir,
+                       THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
+        if (!theIsOneSide)
        {
          DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
-                         aFirstArrowEnd, aFirstExtensionDir,
+                         aSecondArrowEnd, aSecondExtensionDir,
                         THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
-          if (!theIsOneSide)
-          {
-            DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
-                           aSecondArrowEnd, aSecondExtensionDir,
-                           THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
-          }
        }
      }
+
      break;
    }
    // ------------------------------------------------------------------------ //
@@ -855,48 +847,45 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
    case LabelPosition_Left:
    {
      // add label on dimension or extension line to presentation
-      {
-        // Left extension with the text
-        DrawExtension (thePresentation, anExtensionSize,
-                       isArrowsExternal
-                         ? aFirstArrowEnd
-                         : aFirstArrowBegin,
-                       aFirstExtensionDir,
-                       aLabelString,
-                       aLabelWidth,
-                       theMode,
-                       aLabelPosition);
-      }
+      Prs3d_Root::NewGroup (thePresentation);
+
+      // Left extension with the text
+      DrawExtension (thePresentation, anExtensionSize,
+                     isArrowsExternal
+                       ? aFirstArrowEnd
+                       : aFirstArrowBegin,
+                     aFirstExtensionDir,
+                     aLabelString,
+                     aLabelWidth,
+                     theMode,
+                     aLabelPosition);

      // add dimension line primitives
      if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
      {
        // add central dimension line
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);

-          // add graphical primitives
-          Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (2);
-          aPrimSegments->AddVertex (aCenterLineBegin);
-          aPrimSegments->AddVertex (aCenterLineEnd);
+        // add graphical primitives
+        Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (2);
+        aPrimSegments->AddVertex (aCenterLineBegin);
+        aPrimSegments->AddVertex (aCenterLineEnd);

-          aGroup->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-          aGroup->AddPrimitiveArray (aPrimSegments);
+        Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+        Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);

-          // add selection primitives
-          SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
-          aSensitiveCurve.Append (aCenterLineBegin);
-          aSensitiveCurve.Append (aCenterLineEnd);
-        }
+        // add selection primitives
+        SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
+        aSensitiveCurve.Append (aCenterLineBegin);
+        aSensitiveCurve.Append (aCenterLineEnd);

        // add arrows to presentation
+        Prs3d_Root::NewGroup (thePresentation);
+
+        DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
+        if (!theIsOneSide)
        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
-          DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
-          if (!theIsOneSide)
-          {
-            DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
-          }
+          DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
        }

        if (!isArrowsExternal || theIsOneSide)
@@ -905,11 +894,11 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
        }

        // add extension lines for external arrows
-        {
-          DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
-                         aSecondArrowEnd, aSecondExtensionDir,
-                         THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
-        }
+        Prs3d_Root::NewGroup (thePresentation);
+
+        DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
+                       aSecondArrowEnd, aSecondExtensionDir,
+                       THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
      }

      break;
@@ -921,6 +910,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
    case LabelPosition_Right:
    {
      // add label on dimension or extension line to presentation
+      Prs3d_Root::NewGroup (thePresentation);

      // Right extension with text
      DrawExtension (thePresentation, anExtensionSize,
@@ -935,30 +925,27 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
      if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
      {
        // add central dimension line
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);

-          // add graphical primitives
-          Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (2);
-          aPrimSegments->AddVertex (aCenterLineBegin);
-          aPrimSegments->AddVertex (aCenterLineEnd);
-          aGroup->SetGroupPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-          aGroup->AddPrimitiveArray (aPrimSegments);
+        // add graphical primitives
+        Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (2);
+        aPrimSegments->AddVertex (aCenterLineBegin);
+        aPrimSegments->AddVertex (aCenterLineEnd);
+        Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+        Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);

-          // add selection primitives
-          SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
-          aSensitiveCurve.Append (aCenterLineBegin);
-          aSensitiveCurve.Append (aCenterLineEnd);
-        }
+        // add selection primitives
+        SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
+        aSensitiveCurve.Append (aCenterLineBegin);
+        aSensitiveCurve.Append (aCenterLineEnd);

        // add arrows to presentation
+        Prs3d_Root::NewGroup (thePresentation);
+
+        DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
+        if (!theIsOneSide)
        {
-          thePresentation->NewGroup();
-          DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
-          if (!theIsOneSide)
-          {
-            DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
-          }
+          DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
        }

        if (!isArrowsExternal || theIsOneSide)
@@ -967,11 +954,11 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
        }

        // add extension lines for external arrows
-        {
-          DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
-                         aFirstArrowEnd, aFirstExtensionDir,
-                         THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
-        }
+        Prs3d_Root::NewGroup (thePresentation);
+
+        DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
+                       aFirstArrowEnd, aFirstExtensionDir,
+                       THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
      }

      break;
@@ -981,7 +968,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
  // add flyout lines to presentation
  if (theMode == ComputeMode_All)
  {
-    Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+    Prs3d_Root::NewGroup (thePresentation);

    Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments(4);
    aPrimSegments->AddVertex (theFirstPoint);
@@ -990,8 +977,8 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
    aPrimSegments->AddVertex (theSecondPoint);
    aPrimSegments->AddVertex (aLineEndPoint);

-    aGroup->SetGroupPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-    aGroup->AddPrimitiveArray (aPrimSegments);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+    Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);
  }

  mySelectionGeom.IsComputed = Standard_True;
--- a/src/AIS/AIS_DragAction.hxx
+++ b/src/AIS/AIS_DragAction.hxx
@@ -1,26 +0,0 @@
-// Copyright (c) 2018-2019 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 _AIS_DragAction_HeaderFile
-#define _AIS_DragAction_HeaderFile
-
-//! Dragging action.
-enum AIS_DragAction
-{
-  AIS_DragAction_Start,  //!< (try) start dragging object
-  AIS_DragAction_Update, //!< perform dragging (update position)
-  AIS_DragAction_Stop,   //!< stop dragging (save position)
-  AIS_DragAction_Abort,  //!< abort dragging (restore initial position)
-};
-
-#endif // _AIS_DragAction_HeaderFile
--- a/src/AIS/AIS_EqualDistanceRelation.hxx
+++ b/src/AIS/AIS_EqualDistanceRelation.hxx
@@ -17,12 +17,32 @@
 #ifndef _AIS_EqualDistanceRelation_HeaderFile
 #define _AIS_EqualDistanceRelation_HeaderFile

+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <TopoDS_Shape.hxx>
+#include <gp_Pnt.hxx>
 #include <AIS_Relation.hxx>
-#include <AIS_TypeOfDist.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
 #include <DsgPrs_ArrowSide.hxx>
-
+#include <AIS_TypeOfDist.hxx>
+class TopoDS_Shape;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
+class TopoDS_Edge;
+class Bnd_Box;
+class gp_Pnt;
+class TopoDS_Vertex;

+
+class AIS_EqualDistanceRelation;
 DEFINE_STANDARD_HANDLE(AIS_EqualDistanceRelation, AIS_Relation)

 //! A framework to display equivalent distances between
@@ -32,9 +52,10 @@ DEFINE_STANDARD_HANDLE(AIS_EqualDistanceRelation, AIS_Relation)
 //! These distances are used to compare shapes by this vector alone.
 class AIS_EqualDistanceRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
+
 public:

+  
  //! Constructs a framework to display equivalent
  //! distances between the shapes aShape1, aShape2,
  //! aShape3, aShape4 and the plane aPlane.
@@ -84,8 +105,19 @@ public:
  //! a line or a circle.
  Standard_EXPORT static void ComputeOneEdgeOneVertexLength (const Handle(Prs3d_Presentation)& aPresentation, const Handle(Prs3d_Drawer)& aDrawer, const Standard_Real ArrowSize, const TopoDS_Shape& FirstShape, const TopoDS_Shape& SecondShape, const Handle(Geom_Plane)& Plane, const Standard_Boolean AutomaticPos, const Standard_Boolean IsSetBndBox, const Bnd_Box& BndBox, gp_Pnt& Position, gp_Pnt& FirstAttach, gp_Pnt& SecondAttach, gp_Pnt& FirstExtreme, gp_Pnt& SecondExtreme, DsgPrs_ArrowSide& SymbolPrs);

+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
+
+protected:
+
+
+
+
 private:

+  
  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
  
  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -103,8 +135,14 @@ private:
  gp_Pnt myPoint3;
  gp_Pnt myPoint4;

+
 };

+
 #include <AIS_EqualDistanceRelation.lxx>

+
+
+
+
 #endif // _AIS_EqualDistanceRelation_HeaderFile
--- a/src/AIS/AIS_EqualRadiusRelation.hxx
+++ b/src/AIS/AIS_EqualRadiusRelation.hxx
@@ -17,17 +17,31 @@
 #ifndef _AIS_EqualRadiusRelation_HeaderFile
 #define _AIS_EqualRadiusRelation_HeaderFile

+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <gp_Pnt.hxx>
 #include <AIS_Relation.hxx>
-
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Edge;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;

+
+class AIS_EqualRadiusRelation;
 DEFINE_STANDARD_HANDLE(AIS_EqualRadiusRelation, AIS_Relation)

+
 class AIS_EqualRadiusRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_EqualRadiusRelation, AIS_Relation)
+
 public:

+  
  //! Creates equal relation of two arc's radiuses.
  //! If one of edges is not in the given plane,
  //! the presentation method projects it onto the plane.
@@ -42,8 +56,19 @@ public:
  //! to the object to display before computation  !!!
  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;

+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)
+
+protected:
+
+
+
+
 private:

+  
  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
  
  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -57,6 +82,13 @@ private:
  gp_Pnt myFirstPoint;
  gp_Pnt mySecondPoint;

+
 };

+
+
+
+
+
+
 #endif // _AIS_EqualRadiusRelation_HeaderFile
--- a/src/AIS/AIS_FixRelation.hxx
+++ b/src/AIS/AIS_FixRelation.hxx
@@ -17,11 +17,32 @@
 #ifndef _AIS_FixRelation_HeaderFile
 #define _AIS_FixRelation_HeaderFile

+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
 #include <TopoDS_Wire.hxx>
+#include <gp_Pnt.hxx>
 #include <AIS_Relation.hxx>
-
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Shape;
 class Geom_Plane;
+class TopoDS_Wire;
+class gp_Pnt;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
+class TopoDS_Vertex;
+class Geom_Curve;
+class TopoDS_Edge;
+class gp_Lin;
+class gp_Circ;

+
+class AIS_FixRelation;
 DEFINE_STANDARD_HANDLE(AIS_FixRelation, AIS_Relation)

 //! Constructs and manages a constraint by a fixed
@@ -34,8 +55,9 @@ DEFINE_STANDARD_HANDLE(AIS_FixRelation, AIS_Relation)
 //! object.
 class AIS_FixRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_FixRelation, AIS_Relation)
+
 public:
+
  
  //! initializes the vertex aShape, the
  //! plane aPlane and the wire aWire, which connects
@@ -76,6 +98,16 @@ public:
  //! to the object to display before computation  !!!
  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;

+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)
+
+protected:
+
+
+
+
 private:

  
@@ -109,6 +141,11 @@ private:

 };

+
 #include <AIS_FixRelation.lxx>

+
+
+
+
 #endif // _AIS_FixRelation_HeaderFile
--- a/src/AIS/AIS_IdenticRelation.hxx
+++ b/src/AIS/AIS_IdenticRelation.hxx
@@ -17,14 +17,21 @@
 #ifndef _AIS_IdenticRelation_HeaderFile
 #define _AIS_IdenticRelation_HeaderFile

-#include <AIS_Relation.hxx>
-#include <gp_Pnt.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <TColStd_ListOfTransient.hxx>
+#include <Standard.hxx>
+#include <Standard_Type.hxx>

+#include <Standard_Boolean.hxx>
+#include <gp_Pnt.hxx>
+#include <AIS_Relation.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Standard_Real.hxx>
 class TopoDS_Shape;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
 class Geom_Line;
 class gp_Pnt;
 class Geom_Circle;
@@ -33,6 +40,8 @@ class TopoDS_Wire;
 class TopoDS_Vertex;
 class gp_Dir;

+
+class AIS_IdenticRelation;
 DEFINE_STANDARD_HANDLE(AIS_IdenticRelation, AIS_Relation)

 //! Constructs a constraint by a relation of identity
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -37,6 +37,7 @@
 #include <Prs3d_PlaneAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
+#include <PrsMgr_ModedPresentation.hxx>
 #include <PrsMgr_PresentableObject.hxx>
 #include <Quantity_Color.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -106,6 +107,7 @@ AIS_InteractiveContext::AIS_InteractiveContext(const Handle(V3d_Viewer)& MainVie
 myMainPM(new PrsMgr_PresentationManager3d(MainViewer->StructureManager())),
 myMainVwr(MainViewer),
 myMainSel(new StdSelect_ViewerSelector3d()),
+myWasLastMain(Standard_False),
 myToHilightSelected(Standard_True),
 mySelection(new AIS_Selection()),
 myFilters(new SelectMgr_OrFilter()),
@@ -424,7 +426,8 @@ void AIS_InteractiveContext::Display (const Handle(AIS_InteractiveObject)& theIO
  setContextToObject (theIObj);
  if (!myObjects.IsBound (theIObj))
  {
-    setObjectStatus (theIObj, AIS_DS_Displayed, theDispMode, theSelectionMode);
+    Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (AIS_DS_Displayed, theDispMode, theSelectionMode);
+    myObjects.Bind   (theIObj, aStatus);
    myMainVwr->StructureManager()->RegisterObject (theIObj);
    myMainPM->Display(theIObj, theDispMode);
    if (theSelectionMode != -1)
@@ -501,7 +504,8 @@ void AIS_InteractiveContext::Load (const Handle(AIS_InteractiveObject)& theIObj,
  {
    Standard_Integer aDispMode, aHiMod, aSelModeDef;
    GetDefModes (theIObj, aDispMode, aHiMod, aSelModeDef);
-    setObjectStatus (theIObj, AIS_DS_Erased, aDispMode, theSelMode != -1 ? theSelMode : aSelModeDef);
+    Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (AIS_DS_Erased, aDispMode, theSelMode != -1 ? theSelMode : aSelModeDef);
+    myObjects.Bind (theIObj, aStatus);
    myMainVwr->StructureManager()->RegisterObject (theIObj);
  }

@@ -752,9 +756,7 @@ Standard_Boolean AIS_InteractiveContext::IsHilighted (const Handle(SelectMgr_Ent
    return myObjects (anObj)->IsHilighted();
  }

-  const Handle(Prs3d_Drawer)& aStyle = getSelStyle (anObj, theOwner);
-  const Standard_Integer aHiMode = getHilightMode (anObj, aStyle, -1);
-  return theOwner->IsHilighted (myMainPM, aHiMode);
+  return theOwner->IsSelected();
 }

 //=======================================================================
@@ -950,8 +952,7 @@ void AIS_InteractiveContext::RecomputePrsOnly (const Handle(AIS_InteractiveObjec
    return;
  }

-  theIObj->SetToUpdate();
-  theIObj->UpdatePresentations (theAllModes);
+  theIObj->Update (theAllModes);
  if (!theToUpdateViewer)
  {
    return;
@@ -1005,7 +1006,13 @@ void AIS_InteractiveContext::Update (const Handle(AIS_InteractiveObject)& theIOb
    return;
  }

-  theIObj->UpdatePresentations();
+  TColStd_ListOfInteger aPrsModes;
+  theIObj->ToBeUpdated (aPrsModes);
+  for (TColStd_ListIteratorOfListOfInteger aPrsModesIt (aPrsModes); aPrsModesIt.More(); aPrsModesIt.Next())
+  {
+    theIObj->Update (aPrsModesIt.Value(), Standard_False);
+  }
+
  mgrSelector->Update(theIObj);

  if (theUpdateViewer)
@@ -1362,6 +1369,63 @@ void AIS_InteractiveContext::SetCurrentFacingModel (const Handle(AIS_Interactive
  }
 }

+//=======================================================================
+//function : redisplayPrsRecModes
+//purpose  :
+//=======================================================================
+void AIS_InteractiveContext::redisplayPrsRecModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                                   const Standard_Boolean               theToUpdateViewer)
+{
+  if (theIObj->RecomputeEveryPrs())
+  {
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
+  }
+  else
+  {
+    for (TColStd_ListIteratorOfListOfInteger aModes (theIObj->ListOfRecomputeModes()); aModes.More(); aModes.Next())
+    {
+      theIObj->Update (aModes.Value(), Standard_False);
+    }
+    theIObj->UpdateSelection();
+    theIObj->SetRecomputeOk();
+  }
+
+  if (theToUpdateViewer)
+  {
+    UpdateCurrentViewer();
+  }
+}
+
+//=======================================================================
+//function : redisplayPrsModes
+//purpose  :
+//=======================================================================
+void AIS_InteractiveContext::redisplayPrsModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                                const Standard_Boolean               theToUpdateViewer)
+{
+  if (theIObj->RecomputeEveryPrs())
+  {
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
+  }
+  else
+  {
+    TColStd_ListOfInteger aModes;
+    theIObj->ToBeUpdated (aModes);
+    for (TColStd_ListIteratorOfListOfInteger aModeIter (aModes); aModeIter.More(); aModeIter.Next())
+    {
+      theIObj->Update (aModeIter.Value(), Standard_False);
+    }
+    theIObj->SetRecomputeOk();
+  }
+
+  if (theToUpdateViewer)
+  {
+    UpdateCurrentViewer();
+  }
+}
+
 //=======================================================================
 //function : SetColor
 //purpose  :
@@ -1377,11 +1441,7 @@ void AIS_InteractiveContext::SetColor (const Handle(AIS_InteractiveObject)& theI

  setContextToObject (theIObj);
  theIObj->SetColor (theColor);
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1426,11 +1486,7 @@ void AIS_InteractiveContext::SetDeviationCoefficient (const Handle(AIS_Interacti

  Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
  aShape->SetOwnDeviationCoefficient (theCoefficient);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1460,11 +1516,7 @@ void AIS_InteractiveContext::SetHLRDeviationCoefficient (const Handle(AIS_Intera

  Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
  aShape->SetOwnHLRDeviationCoefficient (theCoefficient);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1493,11 +1545,7 @@ void AIS_InteractiveContext::SetDeviationAngle (const Handle(AIS_InteractiveObje

  Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
  aShape->SetOwnDeviationAngle (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1526,10 +1574,15 @@ void AIS_InteractiveContext::SetAngleAndDeviation (const Handle(AIS_InteractiveO

  Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
  aShape->SetAngleAndDeviation (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
+
+  if (theIObj->RecomputeEveryPrs())
  {
-    UpdateCurrentViewer();
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
+  }
+  else
+  {
+    Update (theIObj, theToUpdateViewer);
  }
 }

@@ -1558,11 +1611,7 @@ void AIS_InteractiveContext::SetHLRAngleAndDeviation (const Handle(AIS_Interacti
  }
  Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
  aShape->SetHLRAngleAndDeviation (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1590,11 +1639,7 @@ void AIS_InteractiveContext::SetHLRDeviationAngle (const Handle(AIS_InteractiveO
  }
  Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
  aShape->SetOwnHLRDeviationAngle (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1610,11 +1655,7 @@ void AIS_InteractiveContext::UnsetColor (const Handle(AIS_InteractiveObject)& th
  }

  theIObj->UnsetColor();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1660,27 +1701,23 @@ void AIS_InteractiveContext::SetWidth (const Handle(AIS_InteractiveObject)& theI

  setContextToObject (theIObj);
  theIObj->SetWidth (theWidth);
-  theIObj->UpdatePresentations();
-  if (!myLastPicked.IsNull() && myLastPicked->IsSameSelectable (theIObj))
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
+  if (!myLastinMain.IsNull() && myLastinMain->IsSameSelectable (theIObj))
  {
-    if (myLastPicked->IsAutoHilight())
+    if (myLastinMain->IsAutoHilight())
    {
      const Standard_Integer aHiMode = theIObj->HasHilightMode() ? theIObj->HilightMode() : 0;
-      myLastPicked->HilightWithColor (myMainPM,
-                                      myLastPicked->IsSelected() ? getSelStyle (theIObj, myLastPicked) : getHiStyle (theIObj, myLastPicked),
+      myLastinMain->HilightWithColor (myMainPM,
+                                      myLastinMain->IsSelected() ? getSelStyle (theIObj, myLastinMain) : getHiStyle (theIObj, myLastinMain),
                                      aHiMode);
    }
    else
    {
      theIObj->HilightOwnerWithColor (myMainPM,
-                                      myLastPicked->IsSelected() ? getSelStyle (theIObj, myLastPicked) : getHiStyle (theIObj, myLastPicked),
-                                      myLastPicked);
+                                      myLastinMain->IsSelected() ? getSelStyle (theIObj, myLastinMain) : getHiStyle (theIObj, myLastinMain),
+                                      myLastinMain);
    }
  }
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
 }

 //=======================================================================
@@ -1696,11 +1733,7 @@ void AIS_InteractiveContext::UnsetWidth (const Handle(AIS_InteractiveObject)& th
  }

  theIObj->UnsetWidth();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1718,11 +1751,7 @@ void AIS_InteractiveContext::SetMaterial (const Handle(AIS_InteractiveObject)& t

  setContextToObject (theIObj);
  theIObj->SetMaterial (theMaterial);
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1737,11 +1766,7 @@ void AIS_InteractiveContext::UnsetMaterial (const Handle(AIS_InteractiveObject)&
    return;
  }
  theIObj->UnsetMaterial();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1771,11 +1796,7 @@ void AIS_InteractiveContext::SetTransparency (const Handle(AIS_InteractiveObject
  }

  theIObj->SetTransparency (theValue);
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1791,11 +1812,7 @@ void AIS_InteractiveContext::UnsetTransparency (const Handle(AIS_InteractiveObje
  }

  theIObj->UnsetTransparency();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }

 //=======================================================================
@@ -1805,7 +1822,6 @@ void AIS_InteractiveContext::UnsetTransparency (const Handle(AIS_InteractiveObje
 void AIS_InteractiveContext::SetSelectedAspect (const Handle(Prs3d_BasicAspect)& theAspect,
                                                const Standard_Boolean           theToUpdateViewer)
 {
-  Standard_DISABLE_DEPRECATION_WARNINGS
  Standard_Boolean isFound = Standard_False;
  for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
  {
@@ -1813,7 +1829,6 @@ void AIS_InteractiveContext::SetSelectedAspect (const Handle(Prs3d_BasicAspect)&
    Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (aSelIter.Value()->Selectable());
    anObj->SetAspect (theAspect);
  }
-  Standard_ENABLE_DEPRECATION_WARNINGS

  if (isFound && theToUpdateViewer)
  {
@@ -1936,18 +1951,42 @@ void AIS_InteractiveContext::GetDefModes (const Handle(AIS_InteractiveObject)& t
 void AIS_InteractiveContext::EraseGlobal (const Handle(AIS_InteractiveObject)& theIObj,
                                          const Standard_Boolean               theToUpdateviewer)
 {
-  Handle(AIS_GlobalStatus) aStatus;
  if (theIObj.IsNull()
-  || !myObjects.Find (theIObj, aStatus)
-  ||  aStatus->GraphicStatus() == AIS_DS_Erased)
+  || !myObjects.IsBound (theIObj))
  {
    return;
  }

+  Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj);
+
  const Standard_Integer aDispMode = theIObj->HasHilightMode() ? theIObj->HilightMode() : 0;
-  unhighlightOwners (theIObj);
+  if (aStatus->GraphicStatus() == AIS_DS_Erased)
+  {
+    return;
+  }
+
+  if (aStatus->IsHilighted())
+  {
+    Standard_DISABLE_DEPRECATION_WARNINGS
+    if (IsCurrent (theIObj))
+    {
+      AddOrRemoveCurrentObject (theIObj, Standard_False);
+    }
+    else if (myMainPM->IsHighlighted (theIObj, aStatus->DisplayMode()))
+    {
+      unhighlightGlobal (theIObj);
+    }
+    Standard_ENABLE_DEPRECATION_WARNINGS
+  }
+
  myMainPM->SetVisibility (theIObj, aStatus->DisplayMode(), Standard_False);

+  if (aStatus->IsHilighted()
+   && theIObj->HasHilightMode())
+  {
+    unhighlightGlobal (theIObj);
+  }
+
  if (!myLastPicked.IsNull()
    && myLastPicked->IsSameSelectable (theIObj))
  {
@@ -2003,9 +2042,8 @@ void AIS_InteractiveContext::unhighlightOwners (const Handle(AIS_InteractiveObje
 void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& theIObj,
                                          const Standard_Boolean               theToUpdateviewer)
 {
-  Handle(AIS_GlobalStatus) aStatus;
  if (theIObj.IsNull()
-  || !myObjects.Find (theIObj, aStatus))
+  || !myObjects.IsBound (theIObj))
  {
    // for cases when reference shape of connected interactives was not displayed
    // but its selection primitives were calculated
@@ -2014,6 +2052,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
    return;
  }

+  Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj);
  unhighlightOwners (theIObj);

  myMainPM->Erase (theIObj, -1);
@@ -2054,7 +2093,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
  const Handle(SelectMgr_SelectableObject)& anObj = theIObj; // to avoid ambiguity
  mgrSelector->Remove (anObj);

-  setObjectStatus (theIObj, AIS_DS_None, -1, -1);
+  myObjects.UnBind (theIObj);
  myMainVwr->StructureManager()->UnregisterObject (theIObj);

  for (V3d_ListOfViewIterator aDefViewIter (myMainVwr->DefinedViewIterator()); aDefViewIter.More(); aDefViewIter.Next())
@@ -2062,11 +2101,13 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
    aDefViewIter.Value()->View()->ChangeHiddenObjects()->Remove (theIObj.get());
  }

-  if (!myLastPicked.IsNull())
+  if (!myLastinMain.IsNull())
  {
-    if (myLastPicked->IsSameSelectable (theIObj))
+    if (myLastinMain->IsSameSelectable (theIObj)
+     || myLastPicked->IsSameSelectable(theIObj))
    {
      clearDynamicHighlight();
+      myLastinMain.Nullify();
      myLastPicked.Nullify();
    }
  }
@@ -2120,12 +2161,15 @@ Standard_Boolean AIS_InteractiveContext::ClearDetected (Standard_Boolean theToRe
  myCurDetected = 0;
  myCurHighlighted = 0;
  myDetectedSeq.Clear();
+  myLastPicked  = myLastinMain;
+  myWasLastMain = Standard_True;
  Standard_Boolean toUpdate = Standard_False;
  if (!myLastPicked.IsNull() && myLastPicked->HasSelectable())
  {
    toUpdate = Standard_True;
    clearDynamicHighlight();
  }
+  myLastinMain.Nullify();
  myLastPicked.Nullify();
  myMainSel->ClearPicked();
  if (toUpdate && theToRedrawImmediate)
@@ -2416,13 +2460,6 @@ void AIS_InteractiveContext::Disconnect (const Handle(AIS_InteractiveObject)& th
  {
    Handle(AIS_MultipleConnectedInteractive) theObj (Handle(AIS_MultipleConnectedInteractive)::DownCast (theAssembly));
    theObj->Disconnect (theObjToDisconnect);
-    if (!myObjects.IsBound (theObjToDisconnect))
-    {
-      // connected presentation might contain displayed presentations
-      myMainPM->Erase (theObjToDisconnect, -1);
-      theObjToDisconnect->ErasePresentations (true);
-    }
-
    const Handle(SelectMgr_SelectableObject)& anObj = theObjToDisconnect; // to avoid ambiguity
    mgrSelector->Remove (anObj);
  }
@@ -2522,38 +2559,3 @@ void AIS_InteractiveContext::SetTransformPersistence (const Handle(AIS_Interacti
    anActiveViewIter.Value()->View()->InvalidateZLayerBoundingBox (aLayerId);
  }
 }
-
-//=======================================================================
-//function : GravityPoint
-//purpose  :
-//=======================================================================
-gp_Pnt AIS_InteractiveContext::GravityPoint (const Handle(V3d_View)& theView) const
-{
-  return theView->GravityPoint();
-}
-//=======================================================================
-//function : setObjectStatus
-//purpose  :
-//=======================================================================
-void AIS_InteractiveContext::setObjectStatus (const Handle(AIS_InteractiveObject)& theIObj,
-                                              const AIS_DisplayStatus theStatus,
-                                              const Standard_Integer theDispMode,
-                                              const Standard_Integer theSelectionMode)
-{
-  if (theStatus != AIS_DS_None)
-  {
-    Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (AIS_DS_Displayed, theDispMode, theSelectionMode);
-    myObjects.Bind (theIObj, aStatus);
-  }
-  else
-    myObjects.UnBind (theIObj);
-
-  for (PrsMgr_ListOfPresentableObjectsIter aPrsIter (theIObj->Children()); aPrsIter.More(); aPrsIter.Next())
-  {
-    Handle(AIS_InteractiveObject) aChild (Handle(AIS_InteractiveObject)::DownCast (aPrsIter.Value()));
-    if (aChild.IsNull())
-      continue;
-
-    setObjectStatus (aChild, theStatus, theDispMode, theSelectionMode);
-  }
-}
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -198,21 +198,6 @@ public: //! @name highlighting management
  const Handle(Prs3d_Drawer)& HighlightStyle (const Prs3d_TypeOfHighlight theStyleType) const { return myStyles[theStyleType]; }

  //! Setup highlight style settings.
-  //! It is preferred modifying existing style returned by method HighlightStyle()
-  //! instead of creating a new drawer.
-  //!
-  //! If a new highlight style is created, its presentation Zlayer should be checked,
-  //! otherwise highlighting might not work as expected.
-  //! Default values are:
-  //!  - Prs3d_TypeOfHighlight_Dynamic:      Graphic3d_ZLayerId_Top,
-  //!    object highlighting is drawn on top of main scene within Immediate Layers,
-  //!    so that V3d_View::RedrawImmediate() will be enough to see update;
-  //!  - Prs3d_TypeOfHighlight_LocalDynamic: Graphic3d_ZLayerId_Topmost,
-  //!    object parts highlighting is drawn on top of main scene within Immediate Layers
-  //!    with depth cleared (even overlapped geometry will be revealed);
-  //!  - Prs3d_TypeOfHighlight_Selected:     Graphic3d_ZLayerId_UNKNOWN,
-  //!    object highlighting is drawn on top of main scene within the same layer
-  //!    as object itself (e.g. Graphic3d_ZLayerId_Default by default) and increased priority.
  void SetHighlightStyle (const Prs3d_TypeOfHighlight theStyleType,
                          const Handle(Prs3d_Drawer)& theStyle) { myStyles[theStyleType] = theStyle; }

@@ -227,14 +212,6 @@ public: //! @name highlighting management
  }

  //! Setup the style of dynamic highlighting.
-  //! It is preferred modifying existing style returned by method HighlightStyle()
-  //! instead of creating a new drawer.
-  //!
-  //! If a new highlight style is created, its presentation Zlayer should be checked,
-  //! otherwise highlighting might not work as expected.
-  //! Default value is Graphic3d_ZLayerId_Top,
-  //! object highlighting is drawn on top of main scene within Immediate Layers,
-  //! so that V3d_View::RedrawImmediate() will be enough to see update;
  void SetHighlightStyle (const Handle(Prs3d_Drawer)& theStyle) { myStyles[Prs3d_TypeOfHighlight_Dynamic] = theStyle; }

  //! Returns current selection style settings.
@@ -454,7 +431,6 @@ public: //! @name iteration through detected entities
 public: //! @name Selection management

  //! Sets the graphic basic aspect to the current presentation of ALL selected objects.
-  Standard_DEPRECATED ("Deprecated method - presentation attributes should be assigned directly to object")
  Standard_EXPORT void SetSelectedAspect (const Handle(Prs3d_BasicAspect)& theAspect,
                                          const Standard_Boolean           theToUpdateViewer);

@@ -557,14 +533,6 @@ public: //! @name Selection management
  Standard_EXPORT void AddOrRemoveSelected (const Handle(AIS_InteractiveObject)& theObject,
                                            const Standard_Boolean               theToUpdateViewer);

-  //! Updates Selected state of specified owner without calling HilightSelected().
-  //! Has no effect if Selected state is not changed, and redirects to AddOrRemoveSelected() otherwise.
-  //! @param theOwner owner object to set selected state
-  //! @param theIsSelected new selected state
-  //! @return TRUE if Selected state has been changed
-  Standard_EXPORT Standard_Boolean SetSelectedState (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                     const Standard_Boolean               theIsSelected);
-
  //! Highlights selected objects.
  Standard_EXPORT void HilightSelected (const Standard_Boolean theToUpdateViewer);

@@ -824,9 +792,6 @@ public: //! @name common properties
  //! returns the number of removed  structures from the viewers.
  Standard_EXPORT Standard_Integer PurgeDisplay();

-  //! Return rotation gravity point.
-  Standard_EXPORT virtual gp_Pnt GravityPoint (const Handle(V3d_View)& theView) const;
-
 public: //! @name debug visualization

  //! Visualization of sensitives - for debugging purposes!
@@ -1094,7 +1059,6 @@ public: //! @name iso-line display attributes
  //! Returns true if drawing isolines on triangulation algorithm is enabled.
  Standard_EXPORT Standard_Boolean IsoOnTriangulation() const;

-//! @name obsolete methods
 public:

  //! Updates the view of the current object in open context.
@@ -1220,6 +1184,14 @@ protected: //! @name internal methods
  Standard_EXPORT void InitAttributes();
  
  Standard_EXPORT Standard_Integer PurgeViewer (const Handle(V3d_Viewer)& Vwr);
+  
+  //! UNKNOWN
+  Standard_EXPORT void redisplayPrsModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                          const Standard_Boolean               theToUpdateViewer);
+  
+  //! UNKNOWN
+  Standard_EXPORT void redisplayPrsRecModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                             const Standard_Boolean               theToUpdateViewer);

  //! Helper function to unhighlight all entity owners currently highlighted with seleciton color.
  Standard_EXPORT void unhighlightOwners (const Handle(AIS_InteractiveObject)& theObject);
@@ -1290,10 +1262,6 @@ protected: //! @name internal methods
    return myStyles[!theOwner.IsNull() && theOwner->ComesFromDecomposition() ? Prs3d_TypeOfHighlight_LocalDynamic : Prs3d_TypeOfHighlight_Dynamic];
  }

-  //! Return TRUE if highlight style of owner requires full viewer redraw.
-  Standard_EXPORT Standard_Boolean isSlowHiStyle (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                  const Handle(V3d_Viewer)& theViewer) const;
-
  //! Helper function that returns correct selection style for the object:
  //! if custom style is defined via object's highlight drawer, it will be used. Otherwise,
  //! selection style of interactive context will be returned.
@@ -1351,27 +1319,19 @@ protected: //! @name internal methods
  //! Removes dynamic highlight draw
  void clearDynamicHighlight() const
  {
-    if (myLastPicked.IsNull())
+    if (myLastinMain.IsNull())
      return;

-    if (myLastPicked->IsAutoHilight())
+    if (myLastinMain->IsAutoHilight())
    {
      myMainPM->ClearImmediateDraw();
    }
    else
    {
-      myLastPicked->Selectable()->ClearDynamicHighlight (myMainPM);
+      myLastinMain->Selectable()->ClearDynamicHighlight (myMainPM);
    }
  }

-  //! Bind/Unbind status to object and its children
-  //! @param theObj [in] the object to change status
-  //! @param theStatus status, if NULL, unbind object
-  Standard_EXPORT void setObjectStatus (const Handle(AIS_InteractiveObject)& theIObj,
-                                        const AIS_DisplayStatus theStatus,
-                                        const Standard_Integer theDispyMode,
-                                        const Standard_Integer theSelectionMode);
-
 protected: //! @name internal fields

  AIS_DataMapOfIOStatus myObjects;
@@ -1380,6 +1340,8 @@ protected: //! @name internal fields
  Handle(V3d_Viewer) myMainVwr;
  Handle(StdSelect_ViewerSelector3d) myMainSel;
  Handle(SelectMgr_EntityOwner) myLastPicked;
+  Handle(SelectMgr_EntityOwner) myLastinMain;
+  Standard_Boolean myWasLastMain;
  Standard_Boolean myToHilightSelected;
  Handle(AIS_Selection) mySelection;
  Handle(SelectMgr_OrFilter) myFilters;
--- a/src/AIS/AIS_InteractiveContext_1.cxx
+++ b/src/AIS/AIS_InteractiveContext_1.cxx
@@ -30,7 +30,7 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Quantity_Color.hxx>
-#include <Select3D_SensitiveEntity.hxx>
+#include <SelectBasics_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Filter.hxx>
 #include <SelectMgr_OrFilter.hxx>
@@ -184,6 +184,7 @@ void AIS_InteractiveContext::unhighlightSelected (const Standard_Boolean theIsTo
    {
      anObjToClear.Add (anInteractive);
    }
+    anOwner->SetSelected (Standard_False);
    if (anOwner == anInteractive->GlobalSelOwner())
    {
      myObjects.ChangeFind (anInteractive)->SetHilightStatus (Standard_False);
@@ -292,22 +293,6 @@ void AIS_InteractiveContext::highlightWithSubintensity (const Handle(SelectMgr_E
  theOwner->HilightWithColor (myMainPM, myStyles[Prs3d_TypeOfHighlight_SubIntensity], theMode);
 }

-//=======================================================================
-//function : isSlowHiStyle
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_InteractiveContext::isSlowHiStyle (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                        const Handle(V3d_Viewer)& theViewer) const
-{
-  if (const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable()))
-  {
-    const Handle(Prs3d_Drawer)& aHiStyle = getHiStyle (anObj, myLastPicked);
-    return aHiStyle->ZLayer() == Graphic3d_ZLayerId_UNKNOWN
-       || !theViewer->ZLayerSettings (aHiStyle->ZLayer()).IsImmediate();
-  }
-  return Standard_False;
-}
-
 //=======================================================================
 //function : MoveTo
 //purpose  :
@@ -327,6 +312,8 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
  myDetectedSeq.Clear();

  // preliminaires
+  myLastPicked  = myLastinMain;
+  myWasLastMain = Standard_True;
  AIS_StatusOfDetection aStatus        = AIS_SOD_Nothing;
  Standard_Boolean      toUpdateViewer = Standard_False;

@@ -385,17 +372,13 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
    // method call. As result it is necessary to rehighligt it with mySelectionColor.
    if (!myLastPicked.IsNull() && myLastPicked->HasSelectable())
    {
-      if (isSlowHiStyle (myLastPicked, theView->Viewer()))
-      {
-        theView->Viewer()->Invalidate();
-      }
-
      clearDynamicHighlight();
      toUpdateViewer = Standard_True;
    }

    // initialize myLastPicked field with currently detected object
    myLastPicked = aNewPickedOwner;
+    myLastinMain = myLastPicked;

    // highlight detected object if it is not selected or myToHilightSelected flag is true
    if (myLastPicked->HasSelectable())
@@ -404,11 +387,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
       && (!myLastPicked->IsSelected()
         || myToHilightSelected))
      {
-        if (isSlowHiStyle (myLastPicked, theView->Viewer()))
-        {
-          theView->Viewer()->Invalidate();
-        }
-
        highlightWithColor (myLastPicked, theView->Viewer());
        toUpdateViewer = Standard_True;
      }
@@ -427,36 +405,18 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
    && !myLastPicked.IsNull()
     && myLastPicked->HasSelectable())
    {
-      if (isSlowHiStyle (myLastPicked, theView->Viewer()))
-      {
-        theView->Viewer()->Invalidate();
-      }
-
      clearDynamicHighlight();
      toUpdateViewer = Standard_True;
    }

+    myLastinMain.Nullify();
    myLastPicked.Nullify();
  }

  if (toUpdateViewer
   && theToRedrawOnUpdate)
  {
-    if (theView->ComputedMode())
-    {
-      theView->Viewer()->Update();
-    }
-    else
-    {
-      if (theView->IsInvalidated())
-      {
-        theView->Viewer()->Redraw();
-      }
-      else
-      {
-        theView->Viewer()->RedrawImmediate();
-      }
-    }
+    theView->Viewer()->Update();
  }

  return aStatus;
@@ -495,6 +455,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Integer  theXPMi
  // all objects detected by the selector are taken, previous current objects are emptied,
  // new objects are put...
  ClearSelected (Standard_False);
+  myWasLastMain = Standard_True;
  myMainSel->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
  for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
  {
@@ -503,6 +464,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Integer  theXPMi
      continue;

    mySelection->Select (aCurOwner);
+    aCurOwner->SetSelected (Standard_True);
  }

  if (myAutoHilight)
@@ -534,6 +496,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& the
  // all objects detected by the selector are taken, previous current objects are emptied,
  // new objects are put...
  ClearSelected (Standard_False);
+  myWasLastMain = Standard_True;
  myMainSel->Pick (thePolyline, theView);
  for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
  {
@@ -542,6 +505,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& the
      continue;

    mySelection->Select (anOwner);
+    anOwner->SetSelected (Standard_True);
  }

  if (myAutoHilight)
@@ -563,17 +527,17 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& the
 //=======================================================================
 AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Boolean toUpdateViewer)
 {
-  if (!myLastPicked.IsNull())
+  if (myWasLastMain && !myLastinMain.IsNull())
  {
    if (myAutoHilight)
    {
      clearDynamicHighlight();
    }
-    if (!myLastPicked->IsSelected()
-      || myLastPicked->IsForcedHilight()
+    if (!myLastinMain->IsSelected()
+      || myLastinMain->IsForcedHilight()
      || NbSelected() > 1)
    {
-      SetSelected (myLastPicked, Standard_False);
+      SetSelected (myLastinMain, Standard_False);
      if(toUpdateViewer)
      {
        UpdateCurrentViewer();
@@ -602,9 +566,9 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Boolean toU
  {
    clearDynamicHighlight();
  }
-  if (!myLastPicked.IsNull())
+  if (myWasLastMain && !myLastinMain.IsNull())
  {
-    AddOrRemoveSelected (myLastPicked, toUpdateViewer);
+    AddOrRemoveSelected (myLastinMain, toUpdateViewer);
  }

  Standard_Integer aSelNum = NbSelected();
@@ -634,6 +598,7 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Integer the
  {
    UnhilightSelected (Standard_False);
  }
+  myWasLastMain = Standard_True;
  myMainSel->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
  for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
  {
@@ -641,7 +606,8 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Integer the
    if (anOwner.IsNull() || !anOwner->HasSelectable() || !myFilters->IsOk (anOwner))
      continue;

-    mySelection->Select (anOwner);
+    AIS_SelectStatus aSelStatus = mySelection->Select (anOwner);
+    anOwner->SetSelected (aSelStatus == AIS_SS_Added);
  }

  if (myAutoHilight)
@@ -674,6 +640,7 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const TColgp_Array1OfPnt2d
  {
    UnhilightSelected (Standard_False);
  }
+  myWasLastMain = Standard_True;
  myMainSel->Pick (thePolyline, theView);
  for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
  {
@@ -681,7 +648,8 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const TColgp_Array1OfPnt2d
    if (anOwner.IsNull() || !anOwner->HasSelectable() || !myFilters->IsOk (anOwner))
      continue;

-    mySelection->Select (anOwner);
+    AIS_SelectStatus aSelStatus = mySelection->Select (anOwner);
+    anOwner->SetSelected (aSelStatus == AIS_SS_Added);
  }

  if (myAutoHilight)
@@ -716,6 +684,7 @@ void AIS_InteractiveContext::HilightSelected (const Standard_Boolean theToUpdate
      aState->SetHilightStatus (Standard_True);
      aState->SetHilightStyle (anObjSelStyle);
    }
+    anOwner->SetSelected (Standard_True);
    if (!anOwner->IsAutoHilight())
    {
      NCollection_Handle<SelectMgr_SequenceOfOwner> aSeq;
@@ -765,6 +734,7 @@ void AIS_InteractiveContext::UnhilightSelected (const Standard_Boolean theToUpda
      myObjects.ChangeFind (anObj)->SetHilightStatus (Standard_False);
    }

+    anOwner->SetSelected (Standard_False);
    anOwner->Unhilight (myMainPM);
  }

@@ -786,6 +756,13 @@ void AIS_InteractiveContext::ClearSelected (const Standard_Boolean theToUpdateVi
  {
    unhighlightSelected();
  }
+  else
+  {
+    for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
+    {
+      aSelIter.Value()->SetSelected (Standard_False);
+    }
+  }

  mySelection->Clear();
  if (myAutoHilight)
@@ -811,7 +788,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t

  if (!myObjects.IsBound (theObject))
  {
-    return;
+    Display (theObject, Standard_False);
  }

  Handle(SelectMgr_EntityOwner) anOwner = theObject->GlobalSelOwner();
@@ -847,6 +824,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
    {
      Unhilight (aSelectable, Standard_False);
    }
+    aSelOwner->SetSelected (Standard_False);
    if (aSelOwner == aSelectable->GlobalSelOwner())
    {
      myObjects.ChangeFind (aSelectable)->SetHilightStatus (Standard_False);
@@ -871,6 +849,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
      HilightWithColor (theObject, anObjSelStyle, Standard_False);
    }
  }
+  anOwner->SetSelected (Standard_True);

  if (theToUpdateViewer)
    UpdateCurrentViewer();
@@ -903,7 +882,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
  }

  if (!myObjects.IsBound (anObject))
-    return;
+    Display (anObject, Standard_False);

  if (myAutoHilight)
  {
@@ -917,10 +896,12 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
    if (!HighlightStyle (theOwner, aCustomStyle) ||
      (!aCustomStyle.IsNull() && aCustomStyle != anObjSelStyle))
    {
+      theOwner->SetSelected (Standard_True);
      highlightSelected (theOwner);
    }
  }

+  theOwner->SetSelected (Standard_True);
  if (myAutoHilight && theOwner == anObject->GlobalSelOwner())
  {
    Handle(AIS_GlobalStatus)& aState = myObjects.ChangeFind (anObject);
@@ -969,7 +950,8 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
  if (!myFilters->IsOk(theOwner) && !theOwner->IsSelected())
    return;

-  mySelection->Select (theOwner);
+  AIS_SelectStatus aSelStat = mySelection->Select (theOwner);
+  theOwner->SetSelected (aSelStat == AIS_SS_Added);

  if (myAutoHilight)
  {
@@ -1004,43 +986,6 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
    UpdateCurrentViewer();
 }

-// =======================================================================
-// function : SetSelectedState
-// purpose  :
-// =======================================================================
-Standard_Boolean AIS_InteractiveContext::SetSelectedState (const Handle(SelectMgr_EntityOwner)& theEntity,
-                                                           const Standard_Boolean theIsSelected)
-{
-  if (theEntity.IsNull())
-  {
-    throw Standard_ProgramError ("Internal error: AIS_InteractiveContext::SetSelectedState() called with NO object");
-  }
-
-  if (!theEntity->HasSelectable()
-    || mySelection->IsSelected (theEntity) == theIsSelected)
-  {
-    return false;
-  }
-
-  if (theEntity->IsAutoHilight())
-  {
-    AddOrRemoveSelected (theEntity, false);
-    return true;
-  }
-
-  if (theIsSelected)
-  {
-    const AIS_SelectStatus aSelStatus = mySelection->AddSelect (theEntity);
-    theEntity->SetSelected (true);
-    return aSelStatus == AIS_SS_Added;
-  }
-  else
-  {
-    const AIS_SelectStatus aSelStatus = mySelection->Select (theEntity);
-    theEntity->SetSelected (false);
-    return aSelStatus == AIS_SS_Removed;
-  }
-}

 //=======================================================================
 //function : IsSelected
@@ -1154,9 +1099,9 @@ void AIS_InteractiveContext::EntityOwners(Handle(SelectMgr_IndexedMapOfOwner)& t

    for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (aSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
    {
-      if (Handle(Select3D_SensitiveEntity) aEntity = aSelEntIter.Value()->BaseSensitive())
+      if (Handle(SelectBasics_SensitiveEntity) aEntity = aSelEntIter.Value()->BaseSensitive())
      {
-        if (const Handle(SelectMgr_EntityOwner)& aOwner = aEntity->OwnerId())
+        if (Handle(SelectMgr_EntityOwner) aOwner = Handle(SelectMgr_EntityOwner)::DownCast(aEntity->OwnerId()))
        {
          theOwners->Add (aOwner);
        }
@@ -1211,6 +1156,7 @@ Standard_Integer AIS_InteractiveContext::HilightNextDetected (const Handle(V3d_V

  highlightWithColor (anOwner, theView->Viewer());
  myLastPicked = anOwner;
+  myLastinMain = myLastPicked;

  if (theToRedrawImmediate)
  {
@@ -1246,6 +1192,7 @@ Standard_Integer AIS_InteractiveContext::HilightPreviousDetected (const Handle(V

  highlightWithColor (anOwner, theView->Viewer());
  myLastPicked = anOwner;
+  myLastinMain = myLastPicked;

  if (theToRedrawImmediate)
  {
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"`