0032583: Visualization, AIS - add Bullet Physics wrapper

Added new package Dynamics and optional dependency CSF_BULLET.

adm/UDLIST

@@ -216,6 +216,7 @@ n SelectMgr
 n StdPrs
 n StdSelect
 n V3d
+n Dynamics
 n Wasm
 n WNT
 n Xw

adm/genconf.tcl

@@ -63,45 +63,30 @@ set SYS_VC_LIST {}
 set SYS_VCVARS_LIST {}
 
 # detect installed Visual Studio 2017+ instances by running vswhere.exe
-if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] && "$res" != "" } {
+if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
   lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141)"
   lappend ::SYS_VC_LIST "vc141"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
-if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] && "$res" != "" } {
+if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] } {
   lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141) UWP"
   lappend ::SYS_VC_LIST "vc141-uwp"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
-if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] && "$res" != "" } {
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
   lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142)"
   lappend ::SYS_VC_LIST "vc142"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
-if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] && "$res" != "" } {
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] } {
   lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142) UWP"
   lappend ::SYS_VC_LIST "vc142-uwp"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
-if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] && "$res" != "" } {
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] } {
   lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset ClangCL)"
   lappend ::SYS_VC_LIST "vclang"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\Auxiliary\\Build\\vcvarsall.bat"
-}
-if { ! [catch {exec vswhere.exe -version "\[17.0,17.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] && "$res" != "" } {
-  lappend ::SYS_VS_LIST "Visual Studio 2022 (17, toolset v143)"
-  lappend ::SYS_VC_LIST "vc143"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-}
-if { ! [catch {exec vswhere.exe -version "\[17.0,17.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] && "$res" != "" } {
-  lappend ::SYS_VS_LIST "Visual Studio 2022 (17, toolset v143) UWP"
-  lappend ::SYS_VC_LIST "vc143-uwp"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-}
-if { ! [catch {exec vswhere.exe -version "\[17.0,17.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] && "$res" != "" } {
-  lappend ::SYS_VS_LIST "Visual Studio 2022 (17, toolset ClangCL)"
-  lappend ::SYS_VC_LIST "vclang"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
 
 # detect installed Visual Studio instances from global environment
@@ -190,16 +175,6 @@ proc wokdep:gui:SwitchArch {} {
   grid .myFrame.myClose -row $::aRowIter -column 6 -columnspan 2
 }
 
-# update label text and visibility
-font create wokdep:gui:EmptyFont -size -1
-proc wokdep:gui:SetLabelText {theLabel theText} {
-  set aFont TkDefaultFont
-  if { $theText == "" } {
-    set aFont wokdep:gui:EmptyFont
-  }
-  $theLabel configure -text $theText -font $aFont
-}
-
 proc wokdep:gui:UpdateList {} {
   set anIncErrs   {}
   set anLib32Errs {}
@@ -263,6 +238,15 @@ proc wokdep:gui:UpdateList {} {
     set aDummy {}
     wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs aDummy aDummy "draco" "draco/compression/decode.h" "draco" {"draco"}
   }
+  if { "$::HAVE_BULLET" == "true" } {
+    set aDummy {}
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs aDummy aDummy "bullet" "bullet/btBulletDynamicsCommon.h" "BulletDynamics" {"bullet"}
+    set aHeaderPath1 [wokdep:SearchHeader "btBulletDynamicsCommon.h"]
+    set aHeaderPath2 [wokdep:SearchHeader "bullet/btBulletDynamicsCommon.h"]
+    if { "$aHeaderPath1" == "" && "$aHeaderPath2" != "" } {
+      lappend ::CSF_OPT_INC [file dirname "$aHeaderPath2"]
+    }
+  }
 
   if {"$::BUILD_Inspector" == "true" } {
     set ::CHECK_QT "true"
@@ -276,18 +260,16 @@ proc wokdep:gui:UpdateList {} {
     wokdep:SearchJDK     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
   }
 
-  wokdep:gui:SetLabelText .myFrame.myIncErrLbl [join $anIncErrs   "\n"]
+  .myFrame.myIncErrLbl   configure -text [join $anIncErrs   "\n"]
+  .myFrame.myLib32_ErrLbl  configure -text [join $anLib32Errs "\n"]
+  .myFrame.myLib64_ErrLbl  configure -text [join $anLib64Errs "\n"]
+  .myFrame.myBin32_ErrLbl  configure -text [join $anBin32Errs "\n"]
+  .myFrame.myBin64_ErrLbl  configure -text [join $anBin64Errs "\n"]
 
-  wokdep:gui:SetLabelText .myFrame.myIncErrLbl     [join $anIncErrs   "\n"]
-  wokdep:gui:SetLabelText .myFrame.myLib32_ErrLbl  [join $anLib32Errs "\n"]
-  wokdep:gui:SetLabelText .myFrame.myLib64_ErrLbl  [join $anLib64Errs "\n"]
-  wokdep:gui:SetLabelText .myFrame.myBin32_ErrLbl  [join $anBin32Errs "\n"]
-  wokdep:gui:SetLabelText .myFrame.myBin64_ErrLbl  [join $anBin64Errs "\n"]
-
-  wokdep:gui:SetLabelText .myFrame.myLib32D_ErrLbl [join $anLib32Errs "\n"]
-  wokdep:gui:SetLabelText .myFrame.myLib64D_ErrLbl [join $anLib64Errs "\n"]
-  wokdep:gui:SetLabelText .myFrame.myBin32D_ErrLbl [join $anBin32Errs "\n"]
-  wokdep:gui:SetLabelText .myFrame.myBin64D_ErrLbl [join $anBin64Errs "\n"]
+  .myFrame.myLib32D_ErrLbl configure -text [join $anLib32Errs "\n"]
+  .myFrame.myLib64D_ErrLbl configure -text [join $anLib64Errs "\n"]
+  .myFrame.myBin32D_ErrLbl configure -text [join $anBin32Errs "\n"]
+  .myFrame.myBin64D_ErrLbl configure -text [join $anBin64Errs "\n"]
 
   # merge duplicates
   set ::CSF_OPT_LIB32  [lsort -unique $::CSF_OPT_LIB32]
@@ -492,6 +474,8 @@ checkbutton   .myFrame.myChecks.myXLibCheck     -offvalue "false" -onvalue "true
 ttk::label    .myFrame.myChecks.myXLibLbl       -text "Use X11 for windows drawing"
 ttk::label    .myFrame.myChecks.myVtkLbl        -text "Use VTK"
 checkbutton   .myFrame.myChecks.myVtkCheck      -offvalue "false" -onvalue "true" -variable HAVE_VTK       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myBulletLbl     -text "Use Bullet"
+checkbutton   .myFrame.myChecks.myBulletCheck   -offvalue "false" -onvalue "true" -variable HAVE_BULLET    -command wokdep:gui:UpdateList
 
 checkbutton   .myFrame.myChecks.myZLibCheck     -offvalue "false" -onvalue "true" -variable HAVE_ZLIB      -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myZLibLbl       -text "Use zlib"
@@ -682,8 +666,8 @@ grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
 grid .myFrame.myChecks.myFFmpegLbl     -row $aCheckRowIter -column 1 -sticky w
-grid .myFrame.myChecks.myVtkCheck      -row $aCheckRowIter -column 2 -sticky e
-grid .myFrame.myChecks.myVtkLbl        -row $aCheckRowIter -column 3 -sticky w
+grid .myFrame.myChecks.myBulletCheck   -row $aCheckRowIter -column 2 -sticky e
+grid .myFrame.myChecks.myBulletLbl     -row $aCheckRowIter -column 3 -sticky w
 grid .myFrame.myChecks.myOpenVrCheck   -row $aCheckRowIter -column 4 -sticky e
 grid .myFrame.myChecks.myOpenVrLbl     -row $aCheckRowIter -column 5 -sticky w
 grid .myFrame.myChecks.myE57Check      -row $aCheckRowIter -column 6 -sticky e
@@ -696,6 +680,8 @@ if { "$::tcl_platform(platform)" == "windows" } {
 
 incr aCheckRowIter
 
+grid .myFrame.myChecks.myVtkCheck      -row $aCheckRowIter -column 2  -sticky e
+grid .myFrame.myChecks.myVtkLbl        -row $aCheckRowIter -column 3  -sticky w
 grid .myFrame.myChecks.myTbbCheck      -row $aCheckRowIter -column 12 -sticky e
 grid .myFrame.myChecks.myTbbLbl        -row $aCheckRowIter -column 13 -sticky w
 

adm/genconfdeps.tcl

@@ -73,7 +73,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_TK HAVE_FREETYPE HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK \
-  HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_DRACO HAVE_OPENVR HAVE_OPENCL \
+  HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_DRACO HAVE_OPENVR HAVE_BULLET HAVE_OPENCL \
   CHECK_QT4 CHECK_JDK HAVE_XLIB \
   HAVE_RelWithDebInfo BUILD_Inspector }
 foreach anEnvIter $THE_ENV_VARIABLES { set ${anEnvIter} "false" }

adm/genproj.tcl

@@ -260,7 +260,7 @@ proc genAllResources { theSrcDir } {
 
 # Wrapper-function to generate VS project files
 proc genproj {theFormat args} {
-  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "vc142" "vc143" "vclang" "cbp" "xcd" "pro"}
+  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "vc142" "vclang" "cbp" "xcd" "pro"}
   set aSupportedPlatforms { "wnt" "uwp" "lin" "mac" "ios" "qnx" }
   set isHelpRequire false
 
@@ -324,7 +324,6 @@ proc genproj {theFormat args} {
       vc14     -  Visual Studio 2015
       vc141    -  Visual Studio 2017
       vc142    -  Visual Studio 2019
-      vc143    -  Visual Studio 2022
       vclang   -  Visual Studio with ClangCL toolset
       cbp      -  CodeBlocks
       xcd      -  XCode
@@ -561,7 +560,6 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
     "vc14"  -
     "vc141" -
     "vc142" -
-    "vc143" -
     "vclang"   { OS:MKVC  $anOutDir $aModules $aTools $theSolution $theFormat $isUWP}
     "cbp"      { OS:MKCBP $anOutDir $aModules $theSolution $thePlatform $theCmpl }
     "xcd"      {
@@ -1016,8 +1014,8 @@ proc osutils:vcsolution:header { vcversion } {
     append var \
       "Microsoft Visual Studio Solution File, Format Version 12.00\n" \
       "# Visual Studio 2013\n"
-  } elseif { "$vcversion" == "vc14"  || "$vcversion" == "vc141" ||
-             "$vcversion" == "vc142" || "$vcversion" == "vc143" || "$vcversion" == "vclang" } {
+  } elseif { "$vcversion" == "vc14" || "$vcversion" == "vc141" || 
+             "$vcversion" == "vc142" || "$vcversion" == "vclang" } {
     append var \
       "Microsoft Visual Studio Solution File, Format Version 12.00\n" \
       "# Visual Studio 14\n"
@@ -1292,9 +1290,6 @@ proc osutils:vcproj:readtemplate {theVcVer isUWP isExec} {
   } elseif { $theVcVer == "vc142" } {
     set aVCRTVer "vc14"
     set aToolset "v142"
-  } elseif { $theVcVer == "vc143" } {
-    set aVCRTVer "vc14"
-    set aToolset "v143"
   } elseif { $theVcVer == "vclang" } {
     set aVCRTVer "vc14"
     set aToolset "ClangCL"
@@ -1420,6 +1415,9 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap theRelease} {
   if { "$::HAVE_FREETYPE" == "true" } {
     set aLibsMap(CSF_FREETYPE) "freetype"
   }
+  if { "$::HAVE_BULLET" == "true" && "$theOS" != "wnt" } {
+    set aLibsMap(CSF_BULLET) "BulletDynamics BulletCollision LinearMath"
+  }
   set aLibsMap(CSF_TclLibs)   "tcl8.6"
   if { "$::HAVE_TK" == "true" } {
     set aLibsMap(CSF_TclTkLibs) "tk8.6"

adm/scripts/wasm_build.bat

@@ -38,7 +38,6 @@ rem Optional 3rd-party libraries to enable
 set "USE_FREETYPE=ON"
 set "USE_RAPIDJSON=OFF"
 set "USE_DRACO=OFF"
-set "USE_PTHREADS=OFF"
 
 rem Archive tool
 set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
@@ -60,14 +59,9 @@ for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
 
 set "aBuildType=Release"
 set "aBuildTypePrefix="
-set "anExtraCxxFlags="
-if /I ["%USE_PTHREADS%"] == ["ON"] (
-  set "anExtraCxxFlags=-pthread"
-  set "aBuildTypePrefix=%aBuildTypePrefix%-pthread"
-)
 if ["%toDebug%"] == ["1"] (
   set "aBuildType=Debug"
-  set "aBuildTypePrefix=%aBuildTypePrefix%-debug"
+  set "aBuildTypePrefix=-debug"
 )
 
 call :cmakeGenerate
@@ -165,7 +159,6 @@ if ["%toCMake%"] == ["1"] (
  -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
  -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^
  -D BUILD_LIBRARY_TYPE:STRING="Static" ^
- -D CMAKE_CXX_FLAGS="%anExtraCxxFlags%" ^
  -D INSTALL_DIR:PATH="%aDestDir%" ^
  -D INSTALL_DIR_INCLUDE:STRING="inc" ^
  -D INSTALL_DIR_RESOURCE:STRING="src" ^
@@ -263,7 +256,6 @@ if ["%toCMake%"] == ["1"] (
   cmake -G "MinGW Makefiles" ^
  -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
  -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^
- -D CMAKE_CXX_FLAGS="%anExtraCxxFlags%" ^
  -D CMAKE_INSTALL_PREFIX:PATH="%aDestDirSmpl%" ^
  -D SOURCE_MAP_BASE:STRING="%sourceMapBase%" ^
  -D OpenCASCADE_DIR:PATH="%aDestDir%/lib/cmake/opencascade" ^

adm/scripts/wasm_custom.bat.template

@@ -24,6 +24,5 @@ rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
 
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_RAPIDJSON=OFF"
 rem set "USE_DRACO=ON"
-rem set "USE_PTHREADS=ON"

adm/scripts/wasm_sample_build.bat

@@ -21,8 +21,6 @@ set "toInstall=1"
 set "toDebug=0"
 set "sourceMapBase="
 
-set "USE_PTHREADS=OFF"
-
 rem Configuration file
 if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat"
 
@@ -32,14 +30,9 @@ if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" )
 
 set "aBuildType=Release"
 set "aBuildTypePrefix="
-set "anExtraCxxFlags="
-if /I ["%USE_PTHREADS%"] == ["ON"] (
-  set "anExtraCxxFlags=-pthread"
-  set "aBuildTypePrefix=%aBuildTypePrefix%-pthread"
-)
 if ["%toDebug%"] == ["1"] (
   set "aBuildType=Debug"
-  set "aBuildTypePrefix=%aBuildTypePrefix%-debug"
+  set "aBuildTypePrefix=-debug"
 )
 
 call :cmakeGenerate
@@ -71,7 +64,6 @@ if ["%toCMake%"] == ["1"] (
   cmake -G "MinGW Makefiles" ^
  -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
  -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^
- -D CMAKE_CXX_FLAGS="%anExtraCxxFlags%" ^
  -D CMAKE_INSTALL_PREFIX:PATH="%aDestDirSmpl%" ^
  -D SOURCE_MAP_BASE:STRING="%sourceMapBase%" ^
  -D OpenCASCADE_DIR:PATH="%aDestDirOcct%/lib/cmake/opencascade" ^

adm/templates/env.bat

@@ -29,6 +29,7 @@ set "HAVE_LIBLZMA=false"
 set "HAVE_RAPIDJSON=false"
 set "HAVE_DRACO=false"
 set "HAVE_OPENVR=false"
+set "HAVE_BULLET=false"
 set "HAVE_E57=false"
 set "CSF_OPT_INC="
 set "CSF_OPT_LIB32="
@@ -121,12 +122,8 @@ if not "%DevEnvDir%" == "" (
   for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
     set "DevEnvDir=%%i\Common7\IDE\"
   )
-) else if /I "%VCFMT%" == "vc143" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
-  )
 ) else if /I "%VCFMT%" == "vclang" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
     set "DevEnvDir=%%i\Common7\IDE\"
   )
 ) else if /I "%VCFMT%" == "gcc" (
@@ -141,7 +138,6 @@ if not "%DevEnvDir%" == "" (
   echo vc14  = VS 2015
   echo vc141 = VS 2017
   echo vc142 = VS 2019
-  echo vc143 = VS 2022
   echo vclang = VS 2019 with ClangCL toolset
   exit /B
 )
@@ -172,15 +168,10 @@ if /I "%VCFMT%" == "vc9" (
     set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
   ) 
   set "VCPlatformToolSet=v142"
-) else if /I "%VCFMT%" == "vc143" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+) else if /I "%VCFMT%" == "vclang" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
     set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
   ) 
-  set "VCPlatformToolSet=v143"
-) else if /I "%VCFMT%" == "vclang" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  )
   set "VCPlatformToolSet=ClangCL"
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
@@ -215,6 +206,7 @@ if ["%HAVE_LIBLZMA%"]   == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
 if ["%HAVE_RAPIDJSON%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_RAPIDJSON" & set "CSF_DEFINES=HAVE_RAPIDJSON;%CSF_DEFINES%"
 if ["%HAVE_DRACO%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_DRACO"     & set "CSF_DEFINES=HAVE_DRACO;%CSF_DEFINES%"
 if ["%HAVE_OPENVR%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENVR"    & set "CSF_DEFINES=HAVE_OPENVR;%CSF_DEFINES%"
+if ["%HAVE_BULLET%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_BULLET"    & set "CSF_DEFINES=HAVE_BULLET;%CSF_DEFINES%"
 if ["%HAVE_E57%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_E57"       & set "CSF_DEFINES=HAVE_E57;%CSF_DEFINES%"
 
 rem Eliminate VS warning

adm/templates/env.sh

@@ -22,6 +22,7 @@ export HAVE_LIBLZMA="false";
 export HAVE_RAPIDJSON="false";
 export HAVE_DRACO="false";
 export HAVE_OPENVR="false";
+export HAVE_BULLET="false";
 export HAVE_E57="false";
 export HAVE_XLIB="true";
 if [ "$aSystem" == "Darwin" ]; then
@@ -104,7 +105,7 @@ fi
 
 export CSF_OPT_CMPL=""
 
-# Optiona 3rd-parties should be enabled by HAVE macros
+# Optional 3rd-parties should be enabled by HAVE macros
 if [ "$HAVE_TBB"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_TBB"; fi
 if [ "$HAVE_OPENCL"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"; fi
 if [ "$HAVE_TK"        == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_TK"; fi
@@ -118,6 +119,7 @@ if [ "$HAVE_LIBLZMA"   == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -D
 if [ "$HAVE_RAPIDJSON" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_RAPIDJSON"; fi
 if [ "$HAVE_DRACO"     == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_DRACO"; fi
 if [ "$HAVE_OPENVR"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENVR"; fi
+if [ "$HAVE_BULLET"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_BULLET"; fi
 if [ "$HAVE_E57"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_E57"; fi
 if [ "$HAVE_XLIB"      == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_XLIB"; fi
 

samples/glfw/CMakeLists.txt

@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.2)
 
 project(glfw-occt-demo)
 
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/adm/cmake" ${CMAKE_MODULE_PATH})
-
 set(CMAKE_CXX_STANDARD 11)
 set(APP_VERSION_MAJOR 1)
 set(APP_VERSION_MINOR 0)
@@ -26,14 +24,15 @@ source_group ("Sources" FILES
 find_package(OpenGL REQUIRED)
 
 # Open CASCADE Technology
-find_package (OpenCASCADE REQUIRED)
-if (NOT OpenCASCADE_FOUND)
-  message (FATAL_ERROR "coult not find OpenCASCADE, please set OpenCASCADE_DIR variable" )
-else()
-  message (STATUS "Using OpenCASCADE from \"${OpenCASCADE_INSTALL_PREFIX}\"" )
-  message (STATUS "OpenCASCADE_INCLUDE_DIR=${OpenCASCADE_INCLUDE_DIR}")
-  message (STATUS "OpenCASCADE_LIBRARY_DIR=${OpenCASCADE_LIBRARY_DIR}")
+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 

samples/glfw/GlfwOcctWindow.cpp

@@ -55,7 +55,7 @@ GlfwOcctWindow::GlfwOcctWindow (int theWidth, int theHeight, const TCollection_A
     myYBottom = myYTop + aHeight;
 
   #if !defined(_WIN32) && !defined(__APPLE__)
-    myDisplay = new Aspect_DisplayConnection ((Aspect_XDisplay* )glfwGetX11Display());
+    myDisplay = new Aspect_DisplayConnection (glfwGetX11Display());
   #endif
   }
 }

samples/glfw/adm/cmake/FindOpenCASCADE.cmake

@@ -1,157 +0,0 @@
-# This script finds OpenCASCADE Technology libraries.
-# The script requires:
-#  OpenCASCADE_DIR - root OCCT folder or folder with CMake configuration files
-#
-# Script will define the following variables on success:
-#  OpenCASCADE_FOUND       - package is successfully found
-#  OpenCASCADE_INCLUDE_DIR - directory with headers
-#  OpenCASCADE_LIBRARY_DIR - directory with libraries for linker
-#  OpenCASCADE_BINARY_DIR  - directory with DLLs
-include(FindPackageHandleStandardArgs)
-
-# MY_PLATFORM variable
-math (EXPR MY_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
-if (WIN32)
-  set (MY_PLATFORM "win${MY_BITNESS}")
-elseif(APPLE)
-  set (MY_PLATFORM "mac")
-else()
-  set (MY_PLATFORM "lin")
-endif()
-
-# MY_PLATFORM_AND_COMPILER variable
-if (MSVC)
-  if (MSVC90)
-    set (MY_COMPILER vc9)
-  elseif (MSVC10)
-    set (MY_COMPILER vc10)
-  elseif (MSVC11)
-    set (MY_COMPILER vc11)
-  elseif (MSVC12)
-    set (MY_COMPILER vc12)
-  elseif (MSVC14)
-    set (MY_COMPILER vc14)
-  else()
-    set (MY_COMPILER vc15)
-    message (WARNING "Unknown msvc version. $$MY_COMPILER is used")
-  endif()
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
-  set (MY_COMPILER gcc)
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-  set (MY_COMPILER gcc)
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  set (MY_COMPILER clang)
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-  set (MY_COMPILER icc)
-else()
-  set (MY_COMPILER ${CMAKE_GENERATOR})
-  string (REGEX REPLACE " " "" COMPILER ${MY_COMPILER})
-endif()
-set (MY_PLATFORM_AND_COMPILER "${MY_PLATFORM}/${MY_COMPILER}")
-
-set (OpenCASCADE_DIR "" CACHE PATH "Path to Open CASCADE libraries.")
-
-# default paths
-set (OpenCASCADE_INCLUDE_DIR "${OpenCASCADE_DIR}/inc")
-set (OpenCASCADE_LIBRARY_DIR "${OpenCASCADE_DIR}/${MY_PLATFORM_AND_COMPILER}/lib")
-set (OpenCASCADE_BINARY_DIR  "${OpenCASCADE_DIR}/${MY_PLATFORM_AND_COMPILER}/bin")
-
-# complete list of OCCT Toolkits (copy-paste from adm/UDLIST, since installed OCCT does not include UDLIST)
-set (OpenCASCADE_TKLIST "")
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKernel TKMath) # FoundationClasses
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKG2d TKG3d TKGeomBase TKBRep) # ModelingData
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing) # ModelingAlgorithms
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost) # Visualization
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF) # ApplicationFramework
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh) # DataExchange
-set (OpenCASCADE_TKLIST ${OpenCASCADE_TKLIST} TKDraw TKViewerTest) # Draw
-
-# validate location of OCCT libraries and headers
-set (OpenCASCADE_INCLUDE_DIR_FOUND)
-set (OpenCASCADE_LIBRARY_DIR_FOUND)
-set (OpenCASCADE_LIBRARY_DEBUG_DIR_FOUND)
-set (OpenCASCADE_IMPLIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
-set (OpenCASCADE_SHAREDLIB_RELEASE_FOUND)
-set (OpenCASCADE_SHAREDLIB_DEBUG_FOUND)
-if (EXISTS "${OpenCASCADE_INCLUDE_DIR}/Standard.hxx")
-  set (OpenCASCADE_INCLUDE_DIR_FOUND ON)
-endif()
-
-if (EXISTS "${OpenCASCADE_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  set (OpenCASCADE_LIBRARY_DIR_FOUND ON)
-elseif (NOT WIN32 AND EXISTS "${OpenCASCADE_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  set (OpenCASCADE_LIBRARY_DIR_FOUND ON)
-  set (OpenCASCADE_IMPLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
-endif()
-
-if (EXISTS "${OpenCASCADE_LIBRARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  set (OpenCASCADE_LIBRARY_DEBUG_DIR_FOUND ON)
-elseif (NOT WIN32 AND EXISTS "${OpenCASCADE_LIBRARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  set (OpenCASCADE_LIBRARY_DEBUG_DIR_FOUND ON)
-  set (OpenCASCADE_IMPLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
-elseif (OpenCASCADE_LIBRARY_DIR_FOUND)
-  message (STATUS "Only release OpenCASCADE libraries have been found")
-endif()
-
-if (NOT OpenCASCADE_LIBRARY_DIR_FOUND AND OpenCASCADE_LIBRARY_DEBUG_DIR_FOUND)
-  set (OpenCASCADE_LIBRARY_DIR_FOUND ON)
-  message (WARNING "Only debug OpenCASCADE libraries have been found")
-endif()
-
-if (WIN32)
-  if (EXISTS "${OpenCASCADE_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set (OpenCASCADE_SHAREDLIB_RELEASE_FOUND ON)
-  endif()
-  if (EXISTS "${OpenCASCADE_BINARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set (OpenCASCADE_SHAREDLIB_DEBUG_FOUND ON)
-  endif()
-else()
-  if (EXISTS "${OpenCASCADE_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set (OpenCASCADE_SHAREDLIB_RELEASE_FOUND ON)
-  endif()
-  if (EXISTS "${OpenCASCADE_LIBRARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}TKernel${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set (OpenCASCADE_SHAREDLIB_DEBUG_FOUND ON)
-  endif()
-endif()
-
-if (OpenCASCADE_INCLUDE_DIR_FOUND AND OpenCASCADE_LIBRARY_DIR_FOUND)
-  set (OpenCASCADE_FOUND ON)
-  set (OpenCASCADE_INSTALL_PREFIX ${OpenCASCADE_DIR})
-
-  # Define OCCT toolkits so that CMake can put absolute paths to linker;
-  # the library existance is not checked here, since modules can be disabled.
-  foreach (aLibIter ${OpenCASCADE_TKLIST})
-    add_library (${aLibIter} SHARED IMPORTED)
-
-    set_property (TARGET ${aLibIter} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties (${aLibIter} PROPERTIES IMPORTED_IMPLIB_RELEASE "${OpenCASCADE_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${OpenCASCADE_IMPLIB_SUFFIX}")
-    if (OpenCASCADE_SHAREDLIB_RELEASE_FOUND)
-      if (WIN32)
-        set_target_properties (${aLibIter} PROPERTIES IMPORTED_LOCATION_RELEASE "${OpenCASCADE_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-      else()
-        set_target_properties (${aLibIter} PROPERTIES IMPORTED_LOCATION_RELEASE "${OpenCASCADE_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-      endif()
-    endif()
-
-    if (OpenCASCADE_LIBRARY_DEBUG_DIR_FOUND)
-      set_property (TARGET ${aLibIter} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-      set_target_properties (${aLibIter} PROPERTIES IMPORTED_IMPLIB_DEBUG "${OpenCASCADE_LIBRARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${OpenCASCADE_IMPLIB_SUFFIX}")
-      if (OpenCASCADE_SHAREDLIB_DEBUG_FOUND)
-        if (WIN32)
-          set_target_properties (${aLibIter} PROPERTIES IMPORTED_LOCATION_DEBUG "${OpenCASCADE_BINARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-        else()
-          set_target_properties (${aLibIter} PROPERTIES IMPORTED_LOCATION_DEBUG "${OpenCASCADE_LIBRARY_DIR}d/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-        endif()
-      endif()
-    endif()
-  endforeach()
-else()
-  # fallback searching for CMake configs
-  if (NOT "${OpenCASCADE_DIR}" STREQUAL "")
-    set (anOcctDirBak "${OpenCASCADE_DIR}")
-    find_package (OpenCASCADE CONFIG QUIET PATHS "${OpenCASCADE_DIR}" NO_DEFAULT_PATH)
-    set (OpenCASCADE_DIR "${anOcctDirBak}" CACHE PATH "Path to Open CASCADE libraries." FORCE)
-  else()
-    find_package (OpenCASCADE CONFIG QUIET)
-  endif()
-endif()

samples/qt/Common/src/View.cxx

@@ -95,7 +95,6 @@ View::View( Handle(AIS_InteractiveContext) theContext, QWidget* parent )
   myCurZoom = 0;
   setAttribute(Qt::WA_PaintOnScreen);
   setAttribute(Qt::WA_NoSystemBackground);
-  setAttribute(Qt::WA_NativeWindow);
 
   myDefaultGestures = myMouseGestureMap;
   myCurrentMode = CurAction3d_Nothing;
@@ -107,6 +106,8 @@ View::View( Handle(AIS_InteractiveContext) theContext, QWidget* parent )
   setBackgroundRole( QPalette::NoRole );//NoBackground );
   // set focus policy to threat QContextMenuEvent from keyboard  
   setFocusPolicy( Qt::StrongFocus );
+  setAttribute( Qt::WA_PaintOnScreen );
+  setAttribute( Qt::WA_NoSystemBackground );
   init();
 }
 

samples/webgl/CMakeLists.txt

@@ -77,8 +77,5 @@ if (NOT "${SOURCE_MAP_BASE}" STREQUAL "")
   endif()
 endif()
 install(FILES occt-webgl-sample.html DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(FILES ${OpenCASCADE_RESOURCE_DIR}/DrawResources/OCC_logo.png  DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(FILES ${OpenCASCADE_RESOURCE_DIR}/DrawResources/lamp.ico      DESTINATION ${CMAKE_INSTALL_PREFIX})
-if (CMAKE_CXX_FLAGS MATCHES "-pthread")
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.worker.js DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif()
+install(FILES ${OpenCASCADE_RESOURCE_DIR}/DrawResources/OCC_logo.png DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(FILES ${OpenCASCADE_RESOURCE_DIR}/DrawResources/lamp.ico DESTINATION ${CMAKE_INSTALL_PREFIX})

samples/webgl/WasmOcctView.cpp

@@ -202,12 +202,9 @@ void WasmOcctView::initWindow()
   emscripten_set_touchmove_callback  (aTargetId, this, toUseCapture, onTouchCallback);
   emscripten_set_touchcancel_callback(aTargetId, this, toUseCapture, onTouchCallback);
 
-  //emscripten_set_keypress_callback   (aTargetId, this, toUseCapture, onKeyCallback);
-  emscripten_set_keydown_callback    (aTargetId, this, toUseCapture, onKeyDownCallback);
-  emscripten_set_keyup_callback      (aTargetId, this, toUseCapture, onKeyUpCallback);
-  //emscripten_set_focus_callback    (aTargetId, this, toUseCapture, onFocusCallback);
-  //emscripten_set_focusin_callback  (aTargetId, this, toUseCapture, onFocusCallback);
-  emscripten_set_focusout_callback   (aTargetId, this, toUseCapture, onFocusCallback);
+  //emscripten_set_keypress_callback   (EMSCRIPTEN_EVENT_TARGET_WINDOW, this, toUseCapture, onKeyCallback);
+  emscripten_set_keydown_callback    (EMSCRIPTEN_EVENT_TARGET_WINDOW, this, toUseCapture, onKeyDownCallback);
+  emscripten_set_keyup_callback      (EMSCRIPTEN_EVENT_TARGET_WINDOW, this, toUseCapture, onKeyUpCallback);
 }
 
 // ================================================================
@@ -516,8 +513,7 @@ EM_BOOL WasmOcctView::onMouseEvent (int theEventType, const EmscriptenMouseEvent
     EmscriptenMouseEvent anEvent = *theEvent;
     anEvent.targetX -= jsGetBoundingClientLeft();
     anEvent.targetY -= jsGetBoundingClientTop();
-    aWindow->ProcessMouseEvent (*this, theEventType, &anEvent);
-    return EM_FALSE;
+    return aWindow->ProcessMouseEvent (*this, theEventType, &anEvent) ? EM_TRUE : EM_FALSE;
   }
 
   return aWindow->ProcessMouseEvent (*this, theEventType, theEvent) ? EM_TRUE : EM_FALSE;
@@ -591,24 +587,6 @@ bool WasmOcctView::navigationKeyModifierSwitch (unsigned int theModifOld,
   return hasActions;
 }
 
-// ================================================================
-// Function : onFocusEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onFocusEvent (int theEventType, const EmscriptenFocusEvent* theEvent)
-{
-  if (myView.IsNull()
-   || (theEventType != EMSCRIPTEN_EVENT_FOCUS
-    && theEventType != EMSCRIPTEN_EVENT_FOCUSIN // about to receive focus
-    && theEventType != EMSCRIPTEN_EVENT_FOCUSOUT))
-  {
-    return EM_FALSE;
-  }
-
-  Handle(Wasm_Window) aWindow = Handle(Wasm_Window)::DownCast (myView->Window());
-  return aWindow->ProcessFocusEvent (*this, theEventType, theEvent) ? EM_TRUE : EM_FALSE;
-}
-
 // ================================================================
 // Function : onKeyDownEvent
 // Purpose  :

samples/webgl/WasmOcctView.h

@@ -181,9 +181,6 @@ private:
   //! Key up event.
   EM_BOOL onKeyUpEvent (int theEventType, const EmscriptenKeyboardEvent* theEvent);
 
-  //! Focus change event.
-  EM_BOOL onFocusEvent (int theEventType, const EmscriptenFocusEvent* theEvent);
-
 //! @name Emscripten callbacks (static functions)
 private:
 
@@ -208,9 +205,6 @@ private:
   static EM_BOOL onKeyUpCallback (int theEventType, const EmscriptenKeyboardEvent* theEvent, void* theView)
   { return ((WasmOcctView* )theView)->onKeyUpEvent (theEventType, theEvent); }
 
-  static EM_BOOL onFocusCallback (int theEventType, const EmscriptenFocusEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onFocusEvent (theEventType, theEvent); }
-
 private:
 
   //! Register hot-keys for specified Action.

samples/webgl/occt-webgl-sample.html

@@ -42,11 +42,6 @@ function updateCanvasSize()
 window.onresize = updateCanvasSize;
 updateCanvasSize();
 
-// capture keyboard input on mouse click
-occViewerCanvas.tabIndex = -1;
-occViewerCanvas.onclick = (theEvent) => { occViewerCanvas.focus() };
-occViewerCanvas.focus();
-
 //! Check browser support.
 function isWasmSupported()
 {
@@ -83,7 +78,6 @@ fileInput.onchange = function()
     OccViewerModule.openFromMemory (aFile.name, aDataBuffer, aDataArray.length, true);
     //OccViewerModule._free (aDataBuffer); will be freed by called method
     OccViewerModule.displayGround (true);
-    occViewerCanvas.focus();
   };
   aReader.readAsArrayBuffer(aFile);
 };

src/AIS/AIS_InteractiveContext.hxx

@@ -53,6 +53,7 @@ class TCollection_ExtendedString;
 class Prs3d_LineAspect;
 class Prs3d_BasicAspect;
 class TopoDS_Shape;
+class SelectMgr_EntityOwner;
 class SelectMgr_Filter;
 
 //! The Interactive Context allows you to manage graphic behavior and selection of Interactive Objects in one or more viewers.

src/AIS/AIS_InteractiveObject.hxx

@@ -22,7 +22,9 @@
 #include <SelectMgr_SelectableObject.hxx>
 
 class AIS_InteractiveContext;
+class Graphic3d_MaterialAspect;
 class Prs3d_BasicAspect;
+class Bnd_Box;
 class V3d_View;
 
 //! Defines a class of objects with display and selection services.

src/AIS/AIS_LightSource.cxx

@@ -257,29 +257,27 @@ Standard_Boolean AIS_LightSource::ProcessDragging (const Handle(AIS_InteractiveC
   {
     case AIS_DragAction_Start:
     {
+      myStartTransform = theDragFrom;
       myLocTrsfStart = LocalTransformation();
       return Standard_True;
     }
     case AIS_DragAction_Update:
     {
-      mySensSphere->ResetLastDetectedPoint();
-      SetLocalTransformation (myLocTrsfStart);
-      theCtx->MainSelector()->Pick (theDragFrom.x(), theDragFrom.y(), theView);
+      theCtx->MainSelector()->Pick (myStartTransform.x(), myStartTransform.y(), theView);
       gp_Pnt aStartPosition = mySensSphere->LastDetectedPoint();
-
-      mySensSphere->ResetLastDetectedPoint();
       theCtx->MainSelector()->Pick (theDragTo.x(), theDragTo.y(), theView);
       gp_Pnt aCurrPosition = mySensSphere->LastDetectedPoint();
-      if (aCurrPosition.X() != RealLast()
-       && aStartPosition.Distance (aCurrPosition) > Precision::Confusion())
+      if (aCurrPosition.X() != RealLast() && aStartPosition.Distance (aCurrPosition) > Precision::Confusion())
       {
         gp_Quaternion aQRot;
         aQRot.SetRotation (gp_Vec (gp_Pnt (0, 0, 0), aStartPosition), gp_Vec (gp_Pnt (0, 0, 0), aCurrPosition));
         gp_Trsf aTrsf;
         aTrsf.SetRotation (aQRot);
         SetLocalTransformation (myLocTrsfStart * aTrsf);
-        const Standard_Integer aHiMod = HasHilightMode() ? HilightMode() : 0;
-        theOwner->UpdateHighlightTrsf (theCtx->CurrentViewer(), theCtx->MainPrsMgr(), aHiMod);
+        myLocTrsfStart = LocalTransformation();
+        myStartTransform = theDragTo;
+        theOwner->Selectable()->ClearDynamicHighlight (theCtx->MainPrsMgr());
+        theCtx->HilightWithColor (this, Handle(Prs3d_Drawer)(), false);
       }
       return Standard_True;
     }
@@ -477,7 +475,7 @@ void AIS_LightSource::updateLightLocalTransformation()
 // =======================================================================
 void AIS_LightSource::setLocalTransformation (const Handle(TopLoc_Datum3D)& theTrsf)
 {
-  const gp_Trsf aTrsf = !theTrsf.IsNull() ? theTrsf->Transformation() : gp_Trsf();
+  const gp_Trsf aTrsf = theTrsf->Transformation();
   switch (myLightSource->Type())
   {
     case Graphic3d_TypeOfLightSource_Ambient:

src/AIS/AIS_LightSource.hxx

@@ -20,6 +20,7 @@
 #include <Graphic3d_CLight.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 
+class Prs3d_ShadingAspect;
 class Select3D_SensitiveSphere;
 
 //! Interactive object for a light source.
@@ -259,6 +260,7 @@ protected:
   Aspect_TypeOfMarker              myCodirMarkerType;       //!< icon of arrow co-directional to camera direction (look from)
   Aspect_TypeOfMarker              myOpposMarkerType;       //!< icon of arrow opposite to camera direction (look at)
 
+  Graphic3d_Vec2i  myStartTransform;    //!< position of starting transformation
   gp_Trsf          myLocTrsfStart;      //!< object transformation before transformation
   Standard_Real    mySize;              //!< presentation size
   Standard_Integer myNbArrows;          //!< number of directional light arrows

src/AIS/AIS_Plane.hxx

@@ -24,6 +24,7 @@
 
 class Geom_Plane;
 class Geom_Axis2Placement;
+class gp_Pnt;
 
 //! Constructs plane datums to be used in construction of
 //! composite shapes.

src/AIS/AIS_ViewController.hxx

@@ -41,6 +41,7 @@ class AIS_InteractiveContext;
 class AIS_Point;
 class AIS_RubberBand;
 class AIS_XRTrackedDevice;
+class Graphic3d_Camera;
 class SelectMgr_EntityOwner;
 class V3d_View;
 class WNT_HIDSpaceMouse;
@@ -441,13 +442,10 @@ public: //! @name resize events
   virtual void ProcessInput() Standard_OVERRIDE {}
 
   //! Handle focus event.
-  //! Default implementation resets cached input state (pressed keys).
+  //! Default implementation does nothing.
   virtual void ProcessFocus (bool theIsActivated) Standard_OVERRIDE
   {
-    if (!theIsActivated)
-    {
-      ResetViewInput();
-    }
+    (void )theIsActivated;
   }
 
   //! Handle window close event.

src/AIS/AIS_ViewCube.cxx

@@ -27,13 +27,13 @@
 #include <Prs3d_Text.hxx>
 #include <Prs3d_ToolDisk.hxx>
 #include <Prs3d_ToolSphere.hxx>
+#include <Select3D_SensitivePrimitiveArray.hxx>
 #include <SelectMgr_SequenceOfOwner.hxx>
 #include <V3d.hxx>
 #include <V3d_View.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_ViewCube, AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(AIS_ViewCubeOwner, SelectMgr_EntityOwner)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ViewCubeSensitive, Select3D_SensitivePrimitiveArray)
 
 namespace
 {
@@ -56,48 +56,46 @@ namespace
   }
 }
 
-//=======================================================================
-//function : AIS_ViewCubeSensitive
-//purpose  :
-//=======================================================================
-AIS_ViewCubeSensitive::AIS_ViewCubeSensitive (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                              const Handle(Graphic3d_ArrayOfTriangles)& theTris)
-: Select3D_SensitivePrimitiveArray (theOwner)
+//! Simple sensitive element for picking by point only.
+class AIS_ViewCubeSensitive : public Select3D_SensitivePrimitiveArray
 {
-  InitTriangulation (theTris->Attributes(), theTris->Indices(), TopLoc_Location());
-}
-
-//=======================================================================
-//function : Matches
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_ViewCubeSensitive::Matches (SelectBasics_SelectingVolumeManager& theMgr,
-                                                 SelectBasics_PickResult& thePickResult)
-{
-  return isValidRay (theMgr) && Select3D_SensitivePrimitiveArray::Matches (theMgr, thePickResult);
-}
-
-//=======================================================================
-//function : isValidRay
-//purpose  :
-//=======================================================================
-bool AIS_ViewCubeSensitive::isValidRay (const SelectBasics_SelectingVolumeManager& theMgr) const
-{
-  if (theMgr.GetActiveSelectionType() != SelectMgr_SelectionType_Point)
+  DEFINE_STANDARD_RTTI_INLINE(AIS_ViewCubeSensitive, Select3D_SensitivePrimitiveArray)
+public:
+  //! Constructor.
+  AIS_ViewCubeSensitive (const Handle(SelectMgr_EntityOwner)& theOwner,
+                         const Handle(Graphic3d_ArrayOfTriangles)& theTris)
+  : Select3D_SensitivePrimitiveArray (theOwner)
   {
-    // disallow rectangular selection
-    return false;
+    InitTriangulation (theTris->Attributes(), theTris->Indices(), TopLoc_Location());
   }
 
-  if (AIS_ViewCubeOwner* anOwner = dynamic_cast<AIS_ViewCubeOwner* >(myOwnerId.get()))
+  //! Checks whether element overlaps current selecting volume.
+  virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
+                                    SelectBasics_PickResult& thePickResult) Standard_OVERRIDE
   {
-    const Standard_Real anAngleToler = 10.0 * M_PI / 180.0;
-    const gp_Dir aRay = theMgr.GetViewRayDirection();
-    const gp_Dir aDir = V3d::GetProjAxis (anOwner->MainOrientation());
-    return !aRay.IsNormal (aDir, anAngleToler);
+    return isValidRay (theMgr)
+        && Select3D_SensitivePrimitiveArray::Matches (theMgr, thePickResult);
   }
-  return true;
-}
+
+  //! Checks if picking ray can be used for detection.
+  bool isValidRay (const SelectBasics_SelectingVolumeManager& theMgr) const
+  {
+    if (theMgr.GetActiveSelectionType() != SelectMgr_SelectionType_Point)
+    {
+      // disallow rectangular selection
+      return false;
+    }
+
+    if (AIS_ViewCubeOwner* anOwner = dynamic_cast<AIS_ViewCubeOwner* >(myOwnerId.get()))
+    {
+      const Standard_Real anAngleToler = 10.0 * M_PI / 180.0;
+      const gp_Dir aRay = theMgr.GetViewRayDirection();
+      const gp_Dir aDir = V3d::GetProjAxis (anOwner->MainOrientation());
+      return !aRay.IsNormal (aDir, anAngleToler);
+    }
+    return true;
+  }
+};
 
 //=======================================================================
 //function : IsBoxSide

src/AIS/AIS_ViewCube.hxx

@@ -24,7 +24,6 @@
 #include <Prs3d_TextAspect.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <V3d_TypeOfOrientation.hxx>
-#include <Select3D_SensitivePrimitiveArray.hxx>
 
 class AIS_AnimationCamera;
 class AIS_ViewCubeOwner;
@@ -725,25 +724,4 @@ protected:
 
 };
 
-//! Simple sensitive element for picking by point only.
-class AIS_ViewCubeSensitive : public Select3D_SensitivePrimitiveArray
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_ViewCubeSensitive, Select3D_SensitivePrimitiveArray)
-public:
-
-  //! Constructor.
-  Standard_EXPORT AIS_ViewCubeSensitive (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                         const Handle(Graphic3d_ArrayOfTriangles)& theTris);
-
-  //! Checks whether element overlaps current selecting volume.
-  Standard_EXPORT virtual Standard_Boolean Matches (SelectBasics_SelectingVolumeManager& theMgr,
-                                                    SelectBasics_PickResult& thePickResult) Standard_OVERRIDE;
-
-protected:
-
-  //! Checks if picking ray can be used for detection.
-  Standard_EXPORT bool isValidRay (const SelectBasics_SelectingVolumeManager& theMgr) const;
-
-};
-
 #endif // _AIS_ViewCube_HeaderFile

src/Adaptor2d/Adaptor2d_Curve2d.hxx

@@ -29,6 +29,9 @@
 #include <Standard_Handle.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+class Standard_OutOfRange;
+class Standard_NoSuchObject;
+class Standard_DomainError;
 class gp_Pnt2d;
 class gp_Vec2d;
 class Geom2d_BezierCurve;

src/Adaptor2d/Adaptor2d_Line2d.hxx

@@ -29,6 +29,9 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <Standard_Boolean.hxx>
 #include <GeomAbs_CurveType.hxx>
+class Standard_OutOfRange;
+class Standard_NoSuchObject;
+class Standard_DomainError;
 class gp_Pnt2d;
 class gp_Dir2d;
 class gp_Lin2d;

src/Adaptor2d/Adaptor2d_OffsetCurve.hxx

@@ -23,6 +23,10 @@
 #include <Standard_Integer.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+class Standard_NoSuchObject;
+class Standard_DomainError;
+class Standard_OutOfRange;
+class Standard_TypeMismatch;
 class gp_Pnt2d;
 class gp_Vec2d;
 class gp_Lin2d;

src/Adaptor3d/Adaptor3d_Curve.hxx

@@ -29,6 +29,9 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <GeomAbs_CurveType.hxx>
 
+class Standard_OutOfRange;
+class Standard_NoSuchObject;
+class Standard_DomainError;
 class gp_Pnt;
 class gp_Vec;
 class Geom_BezierCurve;

src/Adaptor3d/Adaptor3d_HVertex.hxx

@@ -21,6 +21,7 @@
 #include <gp_Pnt2d.hxx>
 #include <TopAbs_Orientation.hxx>
 
+class gp_Pnt2d;
 
 class Adaptor3d_HVertex;
 DEFINE_STANDARD_HANDLE(Adaptor3d_HVertex, Standard_Transient)

src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.hxx

@@ -34,6 +34,8 @@
 #include <TColGeom_HArray1OfSurface.hxx>
 #include <AdvApp2Var_EvaluatorFunc2Var.hxx>
 #include <Standard_OStream.hxx>
+class Standard_OutOfRange;
+class Standard_ConstructionError;
 class AdvApprox_Cutting;
 class AdvApp2Var_Criterion;
 class Geom_BSplineSurface;

src/AdvApp2Var/AdvApp2Var_Framework.hxx

@@ -28,6 +28,7 @@
 #include <GeomAbs_IsoType.hxx>
 #include <Standard_Real.hxx>
 #include <TColStd_HArray1OfReal.hxx>
+class Standard_NoSuchObject;
 class AdvApp2Var_Iso;
 class AdvApp2Var_Node;
 

src/AdvApp2Var/AdvApp2Var_Network.hxx

@@ -26,6 +26,7 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
+class Standard_NoSuchObject;
 class AdvApp2Var_Patch;
 
 

src/AdvApprox/AdvApprox_ApproxAFunction.hxx

@@ -37,6 +37,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <Standard_OStream.hxx>
+class Standard_OutOfRange;
+class Standard_ConstructionError;
 class AdvApprox_Cutting;
 
 

src/AdvApprox/AdvApprox_PrefAndRec.hxx

@@ -25,6 +25,7 @@
 #include <Standard_Real.hxx>
 #include <AdvApprox_Cutting.hxx>
 #include <Standard_Boolean.hxx>
+class Standard_DomainError;
 
 
 

src/AdvApprox/AdvApprox_SimpleApprox.hxx

@@ -33,6 +33,8 @@
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 class PLib_JacobiPolynomial;
+class Standard_OutOfRange;
+class Standard_ConstructionError;
 
 
 //! Approximate  a function on   an intervall [First,Last]

src/AppBlend/AppBlend_Approx.hxx

@@ -29,6 +29,9 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <Standard_Real.hxx>
+class StdFail_NotDone;
+class Standard_DomainError;
+class Standard_OutOfRange;
 
 
 //! Bspline approximation of a surface.

src/AppDef/AppDef_LinearCriteria.hxx

@@ -31,6 +31,9 @@
 #include <math_Vector.hxx>
 class FEmTool_ElementaryCriterion;
 class FEmTool_Curve;
+class Standard_NotImplemented;
+class Standard_DomainError;
+class AppDef_MultiLine;
 class math_Matrix;
 
 

src/AppDef/AppDef_MultiLine.hxx

@@ -28,6 +28,9 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
+class Standard_ConstructionError;
+class Standard_DimensionError;
+class Standard_OutOfRange;
 class AppDef_MultiPointConstraint;
 
 

src/AppDef/AppDef_MultiPointConstraint.hxx

@@ -27,6 +27,9 @@
 #include <TColgp_HArray1OfVec.hxx>
 #include <TColgp_HArray1OfVec2d.hxx>
 
+class Standard_OutOfRange;
+class Standard_ConstructionError;
+class Standard_DimensionError;
 class gp_Vec;
 class gp_Vec2d;
 

src/AppDef/AppDef_SmoothCriterion.hxx

@@ -28,6 +28,8 @@
 #include <Standard_Integer.hxx>
 #include <math_Vector.hxx>
 #include <TColStd_Array1OfReal.hxx>
+class Standard_NotImplemented;
+class Standard_DomainError;
 class FEmTool_Curve;
 class math_Matrix;
 

src/AppDef/AppDef_Variational.hxx

@@ -35,6 +35,14 @@
 #include <math_Vector.hxx>
 #include <AppParCurves_Constraint.hxx>
 class AppDef_SmoothCriterion;
+class Standard_OutOfRange;
+class Standard_DimensionError;
+class Standard_DomainError;
+class Standard_ConstructionError;
+class StdFail_NotDone;
+class gp_VectorWithNullMagnitude;
+class AppDef_MultiLine;
+class AppParCurves_MultiBSpCurve;
 class math_Matrix;
 class FEmTool_Curve;
 class FEmTool_Assembly;

src/AppParCurves/AppParCurves.hxx

@@ -26,6 +26,23 @@
 #include <Standard_Real.hxx>
 #include <math_IntegerVector.hxx>
 class math_Matrix;
+class AppParCurves_MultiPoint;
+class AppParCurves_MultiCurve;
+class AppParCurves_MultiBSpCurve;
+class AppParCurves_ConstraintCouple;
+class AppParCurves_LeastSquare;
+class AppParCurves_ResolConstraint;
+class AppParCurves_Function;
+class AppParCurves_BSpFunction;
+class AppParCurves_Gradient;
+class AppParCurves_Gradient_BFGS;
+class AppParCurves_ParLeastSquare;
+class AppParCurves_ResConstraint;
+class AppParCurves_ParFunction;
+class AppParCurves_BSpGradient;
+class AppParCurves_BSpGradient_BFGS;
+class AppParCurves_BSpParLeastSquare;
+class AppParCurves_BSpParFunction;
 
 
 //! Parallel Approximation in n curves.

src/AppParCurves/AppParCurves_MultiBSpCurve.hxx

@@ -30,6 +30,10 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
+class Standard_OutOfRange;
+class Standard_DimensionError;
+class Standard_ConstructionError;
+class AppParCurves_MultiCurve;
 class gp_Pnt;
 class gp_Pnt2d;
 class gp_Vec;

src/AppParCurves/AppParCurves_MultiCurve.hxx

@@ -28,6 +28,9 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
+class Standard_OutOfRange;
+class Standard_DimensionError;
+class Standard_ConstructionError;
 class AppParCurves_MultiPoint;
 class gp_Pnt;
 class gp_Pnt2d;

src/AppParCurves/AppParCurves_MultiPoint.hxx

@@ -27,6 +27,8 @@
 #include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 class Standard_Transient;
+class Standard_OutOfRange;
+class Standard_DimensionError;
 class gp_Pnt;
 class gp_Pnt2d;
 

src/Approx/Approx_MCurvesToBSpCurve.hxx

@@ -25,6 +25,7 @@
 #include <Standard_Boolean.hxx>
 #include <AppParCurves_SequenceOfMultiCurve.hxx>
 class AppParCurves_MultiCurve;
+class AppParCurves_MultiBSpCurve;
 
 
 

src/Approx/Approx_SweepApproximation.hxx

@@ -44,6 +44,9 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <Standard_OStream.hxx>
 class Approx_SweepFunction;
+class StdFail_NotDone;
+class Standard_DomainError;
+class Standard_OutOfRange;
 class AdvApprox_Cutting;
 
 

src/Approx/Approx_SweepFunction.hxx

@@ -31,6 +31,8 @@
 #include <Standard_Integer.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <GeomAbs_Shape.hxx>
+class Standard_NotImplemented;
+class Standard_OutOfRange;
 class gp_Pnt;
 
 

src/Aspect/Aspect_Background.hxx

@@ -22,6 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <Quantity_Color.hxx>
+class Quantity_Color;
 
 
 //! This class allows the definition of

src/Aspect/Aspect_CircularGrid.hxx

@@ -24,6 +24,9 @@
 #include <Standard_Real.hxx>
 #include <Aspect_Grid.hxx>
 
+class Standard_NegativeValue;
+class Standard_NullValue;
+class Standard_NumericError;
 
 class Aspect_CircularGrid : public Aspect_Grid
 {

src/Aspect/Aspect_GenId.hxx

@@ -24,6 +24,7 @@
 #include <Standard_Integer.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <Standard_Boolean.hxx>
+class Aspect_IdentDefinitionError;
 
 
 //! This class permits the creation and control of integer identifiers.

src/Aspect/Aspect_RectangularGrid.hxx

@@ -23,6 +23,9 @@
 #include <Standard_Real.hxx>
 #include <Aspect_Grid.hxx>
 #include <Standard_Boolean.hxx>
+class Standard_NegativeValue;
+class Standard_NullValue;
+class Standard_NumericError;
 
 class Aspect_RectangularGrid : public Aspect_Grid
 {

src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.hxx

@@ -27,6 +27,7 @@
 #include <BOPAlgo_ListOfCheckResult.hxx>
 #include <Standard_Real.hxx>
 #include <TopAbs_ShapeEnum.hxx>
+class TopoDS_Shape;
 
 
 //! check the validity of argument(s) for Boolean Operations

src/BOPAlgo/BOPAlgo_BOP.hxx

@@ -27,6 +27,7 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+class TopoDS_Shape;
 class BOPAlgo_PaveFiller;
 
 //!

src/BOPAlgo/BOPAlgo_Builder.hxx

@@ -38,6 +38,8 @@
 #include <TopAbs_ShapeEnum.hxx>
 class IntTools_Context;
 class TopoDS_Shape;
+class BOPAlgo_PaveFiller;
+class TopoDS_Solid;
 
 //!
 //! The class is a General Fuse algorithm - base algorithm for the

src/BOPAlgo/BOPAlgo_BuilderFace.hxx

@@ -26,6 +26,7 @@
 #include <TopAbs_Orientation.hxx>
 #include <BOPAlgo_BuilderArea.hxx>
 #include <NCollection_BaseAllocator.hxx>
+class TopoDS_Face;
 
 
 //! The algorithm to build new faces from the given faces and

src/BOPAlgo/BOPAlgo_CheckResult.hxx

@@ -24,6 +24,7 @@
 #include <BOPAlgo_CheckStatus.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <Standard_Real.hxx>
+class TopoDS_Shape;
 
 
 //! contains information about faulty shapes and faulty types

src/BOPAlgo/BOPAlgo_MakerVolume.hxx

@@ -26,6 +26,7 @@
 #include <TopoDS_Solid.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
+class TopoDS_Solid;
 class BOPAlgo_PaveFiller;
 
 

src/BOPAlgo/BOPAlgo_PaveFiller.hxx

@@ -53,7 +53,10 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 class IntTools_Context;
+class BOPDS_DS;
+class BOPAlgo_SectionAttribute;
 class BOPDS_PaveBlock;
+class BOPDS_CommonBlock;
 class gp_Pnt;
 class BOPDS_Curve;
 class TopoDS_Vertex;

src/BOPAlgo/BOPAlgo_Section.hxx

@@ -23,6 +23,7 @@
 #include <NCollection_BaseAllocator.hxx>
 #include <TopTools_ListOfShape.hxx>
 class BOPAlgo_PaveFiller;
+class TopoDS_Shape;
 
 
 

src/BOPAlgo/BOPAlgo_WireSplitter.hxx

@@ -26,6 +26,7 @@
 #include <IntTools_Context.hxx>
 #include <NCollection_BaseAllocator.hxx>
 #include <TopTools_ListOfShape.hxx>
+class BOPAlgo_WireEdgeSet;
 class TopoDS_Wire;
 class TopoDS_Face;
 

src/BOPDS/BOPDS_Iterator.hxx

@@ -31,6 +31,7 @@
 #include <Precision.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
+class BOPDS_DS;
 class IntTools_Context;
 
 //! The class BOPDS_Iterator is

src/BOPDS/BOPDS_PaveBlock.hxx

@@ -28,6 +28,8 @@
 #include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 #include <TColStd_MapOfInteger.hxx>
+class BOPDS_Pave;
+class Bnd_Box;
 
 
 class BOPDS_PaveBlock;

src/BOPDS/BOPDS_SubIterator.hxx

@@ -26,6 +26,7 @@
 #include <TColStd_ListOfInteger.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
+class BOPDS_DS;
 
 
 //! The class BOPDS_SubIterator is used to compute intersections between

src/BOPTest/BOPTest.hxx

@@ -22,6 +22,8 @@
 #include <BOPAlgo_Operation.hxx>
 
 #include <Draw_Interpretor.hxx>
+class BOPTest_Objects;
+class BOPTest_DrawableShape;
 class Message_Report;
 
 class BOPTest 

src/BOPTest/BOPTest_DrawableShape.hxx

@@ -26,6 +26,7 @@
 #include <Standard_CString.hxx>
 class Draw_Text3D;
 class TopoDS_Shape;
+class Draw_Color;
 class gp_Pnt;
 class Draw_Display;
 

src/BOPTools/BOPTools_AlgoTools2D.hxx

@@ -28,6 +28,7 @@ class gp_Vec;
 class Geom2d_Curve;
 class Geom_Curve;
 class BRepAdaptor_Surface;
+class ProjLib_ProjectedCurve;
 class IntTools_Context;
 
 

src/BOPTools/BOPTools_Set.hxx

@@ -25,6 +25,7 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
+class TopoDS_Shape;
 
 
 

src/BRep/BRep_Builder.hxx

@@ -30,6 +30,8 @@
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_ListOfTriangulation.hxx>
 
+class Standard_NullObject;
+class Standard_DomainError;
 class TopoDS_Face;
 class Geom_Surface;
 class TopLoc_Location;

src/BRep/BRep_CurveOn2Surfaces.hxx

@@ -26,7 +26,10 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 class Geom_Surface;
+class Standard_NullObject;
+class TopLoc_Location;
 class gp_Pnt;
+class BRep_CurveRepresentation;
 
 
 class BRep_CurveOn2Surfaces;

src/BRep/BRep_CurveOnClosedSurface.hxx

@@ -27,6 +27,7 @@
 class Geom2d_Curve;
 class Geom_Surface;
 class TopLoc_Location;
+class gp_Pnt2d;
 class BRep_CurveRepresentation;
 
 

src/BRep/BRep_CurveOnSurface.hxx

@@ -27,6 +27,7 @@
 class Geom2d_Curve;
 class Geom_Surface;
 class TopLoc_Location;
+class gp_Pnt2d;
 class gp_Pnt;
 class BRep_CurveRepresentation;
 

src/BRep/BRep_CurveRepresentation.hxx

@@ -24,6 +24,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
 #include <GeomAbs_Shape.hxx>
+class Standard_DomainError;
+class TopLoc_Location;
 class Geom_Surface;
 class Poly_Triangulation;
 class Geom_Curve;

src/BRep/BRep_PointRepresentation.hxx

@@ -24,6 +24,8 @@
 #include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
+class Standard_DomainError;
+class TopLoc_Location;
 class Geom_Curve;
 class Geom2d_Curve;
 class Geom_Surface;

src/BRep/BRep_Polygon3D.hxx

@@ -23,7 +23,9 @@
 #include <BRep_CurveRepresentation.hxx>
 #include <Standard_Boolean.hxx>
 class Poly_Polygon3D;
+class Standard_DomainError;
 class TopLoc_Location;
+class BRep_CurveRepresentation;
 
 
 class BRep_Polygon3D;

src/BRep/BRep_PolygonOnSurface.hxx

@@ -24,7 +24,9 @@
 #include <Standard_Boolean.hxx>
 class Poly_Polygon2D;
 class Geom_Surface;
+class Standard_DomainError;
 class TopLoc_Location;
+class BRep_CurveRepresentation;
 
 
 class BRep_PolygonOnSurface;

src/BRep/BRep_PolygonOnTriangulation.hxx

@@ -25,6 +25,7 @@
 class Poly_PolygonOnTriangulation;
 class Poly_Triangulation;
 class TopLoc_Location;
+class BRep_CurveRepresentation;
 
 
 class BRep_PolygonOnTriangulation;

src/BRep/BRep_TFace.hxx

@@ -26,6 +26,7 @@
 #include <Standard_Boolean.hxx>
 #include <TopoDS_TFace.hxx>
 class Geom_Surface;
+class TopLoc_Location;
 class TopoDS_TShape;
 
 class BRep_TFace;

src/BRep/BRep_TVertex.hxx

@@ -24,6 +24,7 @@
 #include <Standard_Real.hxx>
 #include <BRep_ListOfPointRepresentation.hxx>
 #include <TopoDS_TVertex.hxx>
+class gp_Pnt;
 class TopoDS_TShape;
 
 

src/BRepAdaptor/BRepAdaptor_CompCurve.hxx

@@ -32,6 +32,11 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <GeomAbs_CurveType.hxx>
 
+class Standard_NullObject;
+class Standard_DomainError;
+class Standard_OutOfRange;
+class Standard_NoSuchObject;
+class TopoDS_Wire;
 class TopoDS_Edge;
 class gp_Pnt;
 class gp_Vec;

src/BRepAdaptor/BRepAdaptor_Curve.hxx

@@ -29,7 +29,14 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <GeomAbs_CurveType.hxx>
 
+class Standard_NullObject;
+class Standard_DomainError;
+class Standard_OutOfRange;
+class Standard_NoSuchObject;
+class TopoDS_Edge;
 class TopoDS_Face;
+class gp_Trsf;
+class GeomAdaptor_Curve;
 class Adaptor3d_CurveOnSurface;
 class gp_Pnt;
 class gp_Vec;

src/BRepAdaptor/BRepAdaptor_Curve2d.hxx

@@ -24,6 +24,9 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
+class Standard_NullObject;
+class TopoDS_Edge;
+class TopoDS_Face;
 
 
 //! The Curve2d from BRepAdaptor allows to use an Edge

src/BRepAdaptor/BRepAdaptor_Surface.hxx

@@ -25,6 +25,10 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TopoDS_Face.hxx>
 
+class Standard_OutOfRange;
+class Standard_DomainError;
+class Standard_NoSuchObject;
+class gp_Trsf;
 class gp_Pnt;
 class gp_Vec;
 class gp_Pln;

src/BRepAlgo/BRepAlgo_AsDes.hxx

@@ -24,6 +24,7 @@
 #include <Standard_Transient.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <Standard_Boolean.hxx>
+class Standard_ConstructionError;
 class TopoDS_Shape;
 
 

src/BRepAlgo/BRepAlgo_FaceRestrictor.hxx

@@ -25,6 +25,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
+class TopoDS_Face;
 class TopoDS_Wire;
 
 

src/BRepAlgo/BRepAlgo_Image.hxx

@@ -26,6 +26,7 @@
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
+class Standard_ConstructionError;
 class TopoDS_Shape;
 
 

src/BRepAlgo/BRepAlgo_Loop.hxx

@@ -27,6 +27,7 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <BRepAlgo_Image.hxx>
+class TopoDS_Face;
 class TopoDS_Edge;
 
 

src/BRepAlgo/BRepAlgo_NormalProjection.hxx

@@ -29,6 +29,10 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
+class Standard_ConstructionError;
+class Standard_NoSuchObject;
+class StdFail_NotDone;
+class TopoDS_Shape;
 class TopoDS_Edge;
 class Adaptor3d_Curve;
 

src/BRepBlend/BRepBlend_AppFunc.hxx

@@ -23,6 +23,7 @@
 #include <BRepBlend_AppFuncRoot.hxx>
 #include <Standard_Real.hxx>
 #include <math_Vector.hxx>
+class Standard_OutOfRange;
 class BRepBlend_Line;
 class Blend_Function;
 class Blend_AppFunction;

src/BRepBlend/BRepBlend_AppFuncRoot.hxx

@@ -36,7 +36,10 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <GeomAbs_Shape.hxx>
 class BRepBlend_Line;
+class Standard_OutOfRange;
 class Blend_AppFunction;
+class gp_Pnt;
+class Blend_Point;
 
 
 class BRepBlend_AppFuncRoot;

src/BRepBlend/BRepBlend_AppFuncRst.hxx

@@ -23,6 +23,7 @@
 #include <BRepBlend_AppFuncRoot.hxx>
 #include <Standard_Real.hxx>
 #include <math_Vector.hxx>
+class Standard_OutOfRange;
 class BRepBlend_Line;
 class Blend_SurfRstFunction;
 class Blend_AppFunction;

src/BRepBlend/BRepBlend_AppFuncRstRst.hxx

@@ -23,6 +23,7 @@
 #include <BRepBlend_AppFuncRoot.hxx>
 #include <Standard_Real.hxx>
 #include <math_Vector.hxx>
+class Standard_OutOfRange;
 class BRepBlend_Line;
 class Blend_RstRstFunction;
 class Blend_AppFunction;

src/BRepBlend/BRepBlend_AppSurface.hxx

@@ -33,6 +33,9 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <Standard_OStream.hxx>
+class StdFail_NotDone;
+class Standard_DomainError;
+class Standard_OutOfRange;
 class Approx_SweepFunction;
 
 

src/BRepBlend/BRepBlend_CurvPointRadInv.hxx

@@ -29,6 +29,7 @@
 #include <Standard_Real.hxx>
 
 class math_Matrix;
+class gp_Pnt;
 
 
 //! Function of reframing between a point and a curve.

src/BRepBlend/BRepBlend_Extremity.hxx

@@ -28,6 +28,10 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Adaptor3d_HVertex;
+class Standard_DomainError;
+class Standard_OutOfRange;
+class gp_Pnt;
+class gp_Vec;
 class IntSurf_Transition;
 class BRepBlend_PointOnRst;
 

src/BRepBlend/BRepBlend_Line.hxx

@@ -26,7 +26,9 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
+class Standard_OutOfRange;
 class Blend_Point;
+class BRepBlend_Extremity;
 
 
 class BRepBlend_Line;

src/BRepBlend/BRepBlend_PointOnRst.hxx

@@ -20,6 +20,8 @@
 #include <Adaptor2d_Curve2d.hxx>
 #include <IntSurf_Transition.hxx>
 
+class Standard_DomainError;
+class IntSurf_Transition;
 
 //! Definition of an intersection point between a line
 //! and a restriction on a surface.

src/BRepBlend/BRepBlend_RstRstLineBuilder.hxx

@@ -32,6 +32,7 @@ class Blend_CurvPointFuncInv;
 class Adaptor3d_HVertex;
 class IntSurf_Transition;
 class BRepBlend_Extremity;
+class Blend_Point;
 
 
 //! This  class processes the  data  resulting from

src/BRepBlend/BRepBlend_SurfRstLineBuilder.hxx

@@ -33,6 +33,7 @@ class gp_Pnt2d;
 class Adaptor3d_HVertex;
 class IntSurf_Transition;
 class BRepBlend_Extremity;
+class Blend_Point;
 
 //! This  class processes data  resulting  from
 //! Blend_CSWalking  taking  in consideration the Surface