reading of multidomain stl files into separate Poly_Triangulation objects (draft)

adm/UDLIST

@@ -108,7 +108,6 @@ n BRepMesh
 n BRepMeshData
 n BRepOffset
 n BRepOffsetAPI
-n BRepPreviewAPI
 n BRepPrim
 n BRepPrimAPI
 n BRepProj

adm/cmake/occt_csf.cmake

@@ -108,7 +108,6 @@ else()
   elseif (ANDROID)
     set (CSF_ThreadLibs  "c")
     set (CSF_OpenGlLibs  "EGL GLESv2")
-    set (CSF_androidlog  "log")
   elseif (UNIX)
     set (CSF_ThreadLibs  "pthread rt stdc++")
     if (USE_GLES2)

adm/cmake/occt_defs_flags.cmake

@@ -130,9 +130,7 @@ elseif ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
   if (APPLE)
     # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
     set (CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ ${CMAKE_CXX_FLAGS}")
-  elseif(NOT WIN32)
-    # CLang for Windows (at least CLang 8.0 distributed with VS 2019) 
-    # does not support option "-std=c++0x"
+  else()
     set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
   endif()
 elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)

adm/cmake/occt_macros.cmake

@@ -12,12 +12,18 @@ macro (OCCT_CHECK_AND_UNSET VARNAME)
   endif()
 endmacro()
 
-macro (OCCT_CHECK_AND_UNSET_GROUP GROUPNAME)
-  get_cmake_property(VARS VARIABLES)
-  string (REGEX MATCHALL "(^|;)${GROUPNAME}[A-Za-z0-9_]*" GROUPNAME_VARS "${VARS}")
-  foreach(GROUPNAME_VAR ${GROUPNAME_VARS})
-    OCCT_CHECK_AND_UNSET(${GROUPNAME_VAR})
-  endforeach()
+macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
+
+  if (WIN32)
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
+  endif()
 endmacro()
 
 macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)

adm/genconf.tcl

@@ -82,11 +82,6 @@ if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Micr
   lappend ::SYS_VC_LIST "vc142-uwp"
   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] } {
-  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset ClangCL)"
-  lappend ::SYS_VC_LIST "vclang"
-  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
-}
 
 # detect installed Visual Studio instances from global environment
 if { [info exists ::env(VS140COMNTOOLS)] } {
@@ -198,11 +193,7 @@ proc wokdep:gui:UpdateList {} {
   }
 
   if { "$::HAVE_ZLIB" == "true" } {
-    set aCheckLib "z"
-    if { "$::tcl_platform(platform)" == "windows" } {
-      set aCheckLib "zlib"
-    }
-    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "$aCheckLib" {"zlib"}
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "zlib" {"zlib"}
   }
   if { "$::HAVE_LIBLZMA" == "true" } {
     set aCheckLib "lzma"

adm/genconfdeps.tcl

@@ -241,11 +241,7 @@ proc wokdep:Preferred {theList theCmpl theArch} {
 
   # keep only two first digits in "vc141"
   if { ! [regexp {^vc[0-9][0-9]} $theCmpl aCmpl] } {
-    if { [regexp {^vclang} $theCmpl] } { 
-      set aCmpl vc14
-    } else {
-      set aCmpl $theCmpl
-    }
+    set aCmpl $theCmpl
   }
 
   set aShortList {}
@@ -635,11 +631,7 @@ proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
 
   # keep only two first digits in "vc141"
   if { ! [regexp {^vc[0-9][0-9]} ${::VCVER} aVcLib] } {
-    if { [regexp {^vclang} ${::VCVER}] } {
-      set aVcLib vc14
-    } else {
-      set aVcLib ${::VCVER}
-    }
+    set aVcLib ${::VCVER}
   }
 
   set isFound "true"

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" "vc142" "vclang" "cbp" "xcd" "pro"}
+  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "vc142" "cbp" "xcd" "pro"}
   set aSupportedPlatforms { "wnt" "uwp" "lin" "mac" "ios" "qnx" }
   set isHelpRequire false
 
@@ -320,7 +320,6 @@ proc genproj {theFormat args} {
       vc14     -  Visual Studio 2015
       vc141    -  Visual Studio 2017
       vc142    -  Visual Studio 2019
-      vclang   -  Visual Studio with ClangCL toolset
       cbp      -  CodeBlocks
       xcd      -  XCode
       pro      -  Qt Creator
@@ -530,8 +529,7 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl theSolution }
     "vc12"  -
     "vc14"  -
     "vc141" -
-    "vc142" -
-    "vclang"   { OS:MKVC  $anOutDir $aModules $theSolution $theFormat $isUWP}
+    "vc142"    { OS:MKVC  $anOutDir $aModules $theSolution $theFormat $isUWP}
     "cbp"      { OS:MKCBP $anOutDir $aModules $theSolution $thePlatform $theCmpl }
     "xcd"      {
       set ::THE_GUIDS_LIST($::aTKNullKey) "000000000000000000000000"
@@ -986,8 +984,7 @@ 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" == "vclang" } {
+  } elseif { "$vcversion" == "vc14" || "$vcversion" == "vc141" || "$vcversion" == "vc142" } {
     append var \
       "Microsoft Visual Studio Solution File, Format Version 12.00\n" \
       "# Visual Studio 14\n"
@@ -1228,9 +1225,6 @@ proc osutils:vcproj:readtemplate {theVcVer isUWP isExec} {
   } elseif { $theVcVer == "vc142" } {
     set aVCRTVer "vc14"
     set aToolset "v142"
-  } elseif { $theVcVer == "vclang" } {
-    set aVCRTVer "vc14"
-    set aToolset "ClangCL"
   }
 
   set what "$theVcVer"
@@ -1371,7 +1365,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
     }
   }
   if { "$::HAVE_ZLIB" == "true" } {
-    set aLibsMap(CSF_ZLIB) "z"
+    set aLibsMap(CSF_ZLIB) "zlib"
   }
   if { "$::HAVE_LIBLZMA" == "true" } {
     set aLibsMap(CSF_LIBLZMA) "liblzma"
@@ -1408,10 +1402,6 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
 
     # tbb headers define different pragma lib depending on debug/release
     set aLibsMap(CSF_TBB) ""
-
-    if { "$::HAVE_ZLIB" == "true" } {
-      set aLibsMap(CSF_ZLIB) "zlib"
-    }
   } else {
     set aLibsMap(CSF_dl)           "dl"
     if { "$theOS" == "mac" || "$theOS" == "ios" } {
@@ -1429,9 +1419,6 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
       set aFrmsMap(CSF_TclTkLibs)  "Tk"
       set aLibsMap(CSF_TclTkLibs)  ""
       set aLibsMap(CSF_QT)         "QtCore QtGui"
-    } elseif { "$theOS" == "android" } {
-      set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
-      set aLibsMap(CSF_androidlog) "log"
     } else {
       set aLibsMap(CSF_fontconfig) "fontconfig"
       if { "$theOS" == "qnx" } {

adm/templates/env.bat

@@ -77,9 +77,6 @@ if "%VCVER:~-4%" == "-uwp" (
   set VCLIB=%VCLIB%-uwp
   set VCPROP=Universal
 )
-if "%VCFMT%" == "vclang" (
-  set VCLIB=vc14
-)
 rem echo VCVER=%VCVER% VCFMT=%VCFMT% VCLIB=%VCLIB% VCPROP=%VCPROP%
 
 rem ----- Parsing of Visual Studio platform -----
@@ -109,10 +106,6 @@ 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%" == "vclang" (
-  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" (
   rem MinGW
 ) else (
@@ -125,7 +118,6 @@ if not "%DevEnvDir%" == "" (
   echo vc14  = VS 2015
   echo vc141 = VS 2017
   echo vc142 = VS 2019
-  echo vclang = VS 2019 with ClangCL toolset
   exit /B
 )
 
@@ -155,11 +147,6 @@ if /I "%VCFMT%" == "vc9" (
     set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
   ) 
   set "VCPlatformToolSet=v142"
-) 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=ClangCL"
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
 ) else (

dox/FILES_HTML.txt

@@ -14,7 +14,6 @@ overview/overview.md
 ../samples/qt/AndroidQt/ReadMe.md
 ../samples/java/jniviewer/ReadMe.md
 ../samples/ios/UIKitSample/ReadMe.md
-../samples/webgl/ReadMe.md
 
 tutorial/tutorial.md
 

dox/dev_guides/building/android/android.md

@@ -64,7 +64,7 @@ Then makefiles will appear in the build folder (e.g. <i> D:/occt/build-android <
 
 Alternatively one may specify the values without a toolchain file:
 
-> cmake -G "MinGW Makefiles" -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=D:/DevTools/android-ndk-r13b -DCMAKE_ANDROID_STL_TYPE=gnustl_shared -DCMAKE_SYSTEM_VERSION=21 -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_MAKE_PROGRAM=D:/DevTools/MinGW/bin/mingw32-make.exe -D3RDPARTY_DIR=D:/occt-3rdparty D:/occt
+> cmake -G "MinGW Makefiles" -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=D:/DevTools/android-ndk-r13b -DCMAKE_ANDROID_STL_TYPE=gnustl_shared -DCMAKE_SYSTEM_VERSION=15 -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_MAKE_PROGRAM=D:/DevTools/MinGW/bin/mingw32-make.exe -D3RDPARTY_DIR=D:/occt-3rdparty D:/occt
 
 @figure{/dev_guides/building/android/images/android_image006.png}
 

dox/dev_guides/debug/debug.md

@@ -150,8 +150,7 @@ Steps to prepare dump of the object into json:
 1. Create method <b>DumpJson</b>. The method should accept the output stream and the depth for the fields dump.
 Depth, equal to zero means that only fields of this class should be dumped. Default value -1 means that whole tree of dump will be built recursively calling dump of all fields.
 
-2. Put into the first row of the method <b>OCCT_DUMP_CLASS_BEGIN</b> or <b>OCCT_DUMP_TRANSIENT_CLASS_BEGIN</b> (for Standard_Transient objects).
-This macro appends class name into output stream.
+2. Put into the first row of the method <b>OCCT_DUMP_CLASS_BEGIN</b>. This macro creates a local variable, that will open Json structure on start, and close on exit from this method.
 
 3. Add several macro to store field values.
 
@@ -369,53 +368,3 @@ Each counter has its name shown when the collected statistics are printed.
 In DRAW, use command *dperf* to print all performance statistics.
 
 Note that performance counters are not thread-safe.
-
-@section occt_debug_sanitizers Use of compiler sanitizers
-
-GCC and Clang compilers provide options for instrumenting the code with the tools intended for detection of run-time errors, called sanitizers.
-This section provides some hints for using sanitizers for detecting possible errors in OCCT code.
-
-@subsection occt_debug_sanitizers_linux Linux
-
-Example of configuration steps for Ubuntu:
-
-1. In CMake configuration:
-
-  - Use up-to-date version of the GCC or CLang compiler; make sure that if CMAKE_CXX_COMPILER is set to C++ compiler (e.g. "clang++-6.0") and CMAKE_C_COMPILER is set to C compiler (e.g. "clang-6.0")
-  - Ensure that CMAKE_LINKER is set to the C++ linker bundled with compiler (e.g. clang++-6.0); this is important to avoid linking problems
-  - For building with Address sanitizer, set CMAKE_CXX_FLAGS and CMAKE_C_FLAGS to "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls"
-  - For building with Undefined Behavior sanitizer, set CMAKE_CXX_FLAGS and CMAKE_C_FLAGS to "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls"
-  - Set CMAKE_BUILD_TYPE to RelWithDebInfo to get more informative stack traces on errors
-
-2. Build as usual (make)
-
-  Be prepared that it works much slower than normal build and consumes more disk space.
-
-3. Before running executable, make sure that "llvm-symbolizer" is in PATH; this is necessary to get human-readable stack traces. The tool must have exactly that name.
-
-  If it is installed in common folder (/usr/bin or similar) with different name, one option is to create a symlink, for instance:
-> sudo ln -s /usr/bin/llvm-symbolizer-6.0 /usr/bin/llvm-symbolizer
-
-  Alternatively, add directory where actual llvm-symbolizer is located (such as /usr/lib/llvm-6.0/bin) to the PATH variable. 
-
-4. Set environment variable to disable memory leaks detection (they seem to be reported for every global variable at exit, not much useful):
-> export ASAN_OPTIONS=detect_leaks=0
-
-5. Set environment variable CSF_CPULIMIT_FACTOR to reasonably large number to increase the time limits for program execution (used by OCCT tests) to compensate the performance penalty introduced by sanitizers:
-> export CSF_CPULIMIT_FACTOR=20
-
-6. When using UBSan, set environment variable UBSAN_OPTIONS to get stack traces:
-> export UBSAN_OPTIONS=print_stacktrace=1
-
-7. Run DRAW and perform tests as usual, keeping in mind that running with sanitizer is much heavier than normal build:
-> ./draw.sh relwithdeb  <br>
-> Draw[]> testgrid -parallel 0
-
-Note that when running tests under sanitizers, behavior may be different.
-Known problems (as of CLang 6.0) are:
-- Software signals (access violation etc.) are not handled
-- Heap memory usage always reports zero
-
-@subsection occt_debug_sanitizers_windows Windows
-
-Though CLang toolset is available in Visual Studio 2015 and newer, sanitizer do not seem to be available out of the box (last tested with VS 2019 16.2.3).

dox/dev_guides/upgrade/upgrade.md

@@ -1857,38 +1857,3 @@ The following API changes have been made:
 @subsection upgrade_740_stdnamespace Standard_Stream.hxx no more has "using std::" statements
 *Standard_Stream.hxx* header, commonly included by other OCCT header files, does no more add entities from *std namespace* related to streams (like *std::cout*, *std::istream* and others) into global namespace.
 The application code relying on this matter should be updated to either specify std namespace explicitly (like std::cout) or add "using std::" statements locally.
-
-@section upgrade_occt750 Upgrade to OCCT 7.5.0
-
-@subsection upgrade_750_srgb_color RGB color definition
-
-OCCT 3D Viewer has been improved to properly perform lighting using in linear RGB color space and then convert result into non-linear gamma-shifted sRGB color space before displaying on display.
-This change affects texture mapping, material definition and color definition.
-
-Previously *Quantity_Color* definition was provided with unspecified RGB color space.
-In practice, mixed color spaces have been actually used, with non-linear sRGB prevailing in general.
-Since OCCT 7.5.0, *Quantity_Color* now specifies that components are defined in linear RGB color space.
-
-This change affects following parts:
-* Standard colors defined by *Quantity_NameOfColor* enumeration have been converted into linear RGB values within Quantity_Color construction.
-* Application may use new enumeration value *Quantity_TOC_sRGB* for passing/fetching colors in sRGB color space,
-  which can be useful for interoperation with color picking widgets (returning 8-bit integer values within [0..255] range)
-  or for porting colors constants within old application code without manual conversion.
-* *Graphic3d_MaterialAspect* color components are now expected in linear RGB color space,
-  and standard OCCT materials within *Graphic3d_NameOfMaterial* enumeration have been updated accordingly.
-* Texture mapping now handles new *Graphic3d_TextureRoot::IsColorMap()* for interpreting content in linear RGB or sRGB color space.
-  It is responsibility of user specifying this flag correctly. The flag value is TRUE by default.
-* Method *Image_PixMap::PixelColor()* has been extended with a new Boolean flag for performing linearization of non-linear sRGB.
-  This flag is FALSE by default; application should consider passing TRUE instead for further handling *Quantity_Color* properly as linear RGB values.
-
-@subsection upgrade_750_aspectwindow Aspect_Window interface change
-
-Unexpected const-ness of Aspect_Window::DoResize() method has been removed, so that application classes implementing this interface should be updated accordingly.
-
-@subsection upgrade_750_rename Renaming of types
-
-Enumeration BRepOffset_Type is renamed to ChFiDS_TypeOfConcavity.
-
-@subsection upgrade_750_sensitiveEntity Select3D_SensitiveEntity interface change
-
-The method Select3D_SensitiveEntity::NbSubElements() has been changed to be constant. Select3D_SensitiveEntity subclasses at application level should be updated accordingly.

dox/overview/overview.md

@@ -153,9 +153,6 @@ on this tool.
 **RapidJSON** is an Open Source JSON parser and generator for C++.
 RapidJSON is optionally used by OCCT for reading glTF files (https://rapidjson.org/).
 
-**DejaVu** fonts are a font family based on the Vera Fonts under a permissive license (MIT-like, https://dejavu-fonts.github.io/License.html).
-DejaVu Sans (basic Latin sub-set) is used by OCCT as fallback font when no system font is available.
-
 Adobe Systems, Inc. provides **Adobe Reader**, which can be used to view files in Portable Document Format (PDF). 
 
 @section OCCT_OVW_SECTION_3 Documentation
@@ -210,11 +207,10 @@ for which OCCT is certified to work.
 
 | OS        | Compiler |
 | --------- | ----------- |
-| Windows   | Microsoft Visual Studio: 2008 SP1, 2010 SP1, 2012 Update 4, 2013 Update 5, 2015 Update 3, 2017 <sup>1</sup>, 2019 <br>, LLVM (ClangCL), GCC 4.3+ (Mingw-w64)|
+| Windows   | Microsoft Visual Studio: 2008 SP1, 2010 SP1, 2012 Update 4, 2013 Update 5, 2015 Update 3, 2017 <sup>1</sup>, 2019 <br> GCC 4.3+ (Mingw-w64)|
 | Linux     | GNU gcc 4.3+ <br> LLVM CLang 3.6+ |
 | OS X / macOS | XCode 6 or newer |
 | Android   | NDK r10, GNU gcc 4.8 or newer |
-| Web       | Emscripten SDK 1.39 or newer (CLang) |
 
 1) VC++ 141 64-bit is used for regular testing and for building binary package of official release of OCCT on Windows.
 
@@ -573,11 +569,3 @@ There is a sample demonstrating usage of OCCT on iOS with Apple UIKit framework.
 @figure{/overview/images/sample_ios_uikit.png}
 
 See \subpage occt_samples_ios_uikit "iOS sample Readme" for details.
-
-@subsubsection OCCT_OVW_SECTION_7_3_6 Web
-
-WebGL Viewer sample demonstrating usage of OCCT 3D Viewer in Web browser with Emscripten SDK can be found in `samples/webgl`.
-
-@figure{/overview/images/sample_webgl.png}
-
-See \subpage occt_samples_webgl "WebGL sample Readme" for details.

samples/glfw/GlfwOcctView.cpp

@@ -35,49 +35,13 @@
 
 #include <GLFW/glfw3.h>
 
-namespace
-{
-  //! Convert GLFW mouse button into Aspect_VKeyMouse.
-  static Aspect_VKeyMouse mouseButtonFromGlfw (int theButton)
-  {
-    switch (theButton)
-    {
-      case GLFW_MOUSE_BUTTON_LEFT:   return Aspect_VKeyMouse_LeftButton;
-      case GLFW_MOUSE_BUTTON_RIGHT:  return Aspect_VKeyMouse_RightButton;
-      case GLFW_MOUSE_BUTTON_MIDDLE: return Aspect_VKeyMouse_MiddleButton;
-    }
-    return Aspect_VKeyMouse_NONE;
-  }
-
-  //! Convert GLFW key modifiers into Aspect_VKeyFlags.
-  static Aspect_VKeyFlags keyFlagsFromGlfw (int theFlags)
-  {
-    Aspect_VKeyFlags aFlags = Aspect_VKeyFlags_NONE;
-    if ((theFlags & GLFW_MOD_SHIFT) != 0)
-    {
-      aFlags |= Aspect_VKeyFlags_SHIFT;
-    }
-    if ((theFlags & GLFW_MOD_CONTROL) != 0)
-    {
-      aFlags |= Aspect_VKeyFlags_CTRL;
-    }
-    if ((theFlags & GLFW_MOD_ALT) != 0)
-    {
-      aFlags |= Aspect_VKeyFlags_ALT;
-    }
-    if ((theFlags & GLFW_MOD_SUPER) != 0)
-    {
-      aFlags |= Aspect_VKeyFlags_META;
-    }
-    return aFlags;
-  }
-}
-
 // ================================================================
 // Function : GlfwOcctView
 // Purpose  :
 // ================================================================
 GlfwOcctView::GlfwOcctView()
+: myCurAction3d (CurAction3d_Nothing),
+  myToRedraw (true)
 {
 }
 
@@ -229,7 +193,15 @@ void GlfwOcctView::mainloop()
     glfwWaitEvents();
     if (!myView.IsNull())
     {
-      FlushViewEvents (myContext, myView, true);
+      if (myView->IsInvalidated())
+      {
+        myView->Redraw();
+      }
+      else if (myToRedraw)
+      {
+        myView->RedrawImmediate();
+      }
+      myToRedraw = false;
     }
   }
 }
@@ -265,6 +237,7 @@ void GlfwOcctView::onResize (int theWidth, int theHeight)
     myView->MustBeResized();
     myView->Invalidate();
     myView->Redraw();
+    //myToRedraw = true;
   }
 }
 
@@ -274,10 +247,13 @@ void GlfwOcctView::onResize (int theWidth, int theHeight)
 // ================================================================
 void GlfwOcctView::onMouseScroll (double theOffsetX, double theOffsetY)
 {
-  if (!myView.IsNull())
-  {
-    UpdateZoom (Aspect_ScrollDelta (myOcctWindow->CursorPosition(), int(theOffsetY * 8.0)));
-  }
+  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;
 }
 
 // ================================================================
@@ -289,13 +265,27 @@ void GlfwOcctView::onMouseButton (int theButton, int theAction, int theMods)
   if (myView.IsNull()) { return; }
 
   const Graphic3d_Vec2i aPos = myOcctWindow->CursorPosition();
-  if (theAction == GLFW_PRESS)
+  if (theAction != GLFW_PRESS)
   {
-    PressMouseButton (aPos, mouseButtonFromGlfw (theButton), keyFlagsFromGlfw (theMods), false);
+    myCurAction3d = CurAction3d_Nothing;
+    return;
   }
-  else
+
+  myMouseMin = aPos;
+  myMouseMax = aPos;
+  switch (theButton)
   {
-    ReleaseMouseButton (aPos, mouseButtonFromGlfw (theButton), keyFlagsFromGlfw (theMods), false);
+    case GLFW_MOUSE_BUTTON_RIGHT:
+    {
+      myCurAction3d = CurAction3d_DynamicRoation;
+      myView->StartRotation (aPos.x(), aPos.y());
+      break;
+    }
+    case GLFW_MOUSE_BUTTON_MIDDLE:
+    {
+      myCurAction3d = CurAction3d_DynamicPanning;
+      break;
+    }
   }
 }
 
@@ -305,9 +295,30 @@ void GlfwOcctView::onMouseButton (int theButton, int theAction, int theMods)
 // ================================================================
 void GlfwOcctView::onMouseMove (int thePosX, int thePosY)
 {
-  const Graphic3d_Vec2i aNewPos (thePosX, thePosY);
-  if (!myView.IsNull())
+  if (myView.IsNull()) { return; }
+
+  switch (myCurAction3d)
   {
-    UpdateMousePosition (aNewPos, PressedMouseButtons(), LastMouseFlags(), false);
+    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;
+    }
   }
 }

samples/glfw/GlfwOcctView.h

@@ -25,12 +25,20 @@
 #include "GlfwOcctWindow.h"
 
 #include <AIS_InteractiveContext.hxx>
-#include <AIS_ViewController.hxx>
 #include <V3d_View.hxx>
 
 //! Sample class creating 3D Viewer within GLFW window.
-class GlfwOcctView : protected AIS_ViewController
+class GlfwOcctView
 {
+public:
+  enum CurAction3d
+  {
+    CurAction3d_Nothing,
+    CurAction3d_DynamicZooming,
+    CurAction3d_DynamicPanning,
+    CurAction3d_DynamicRoation
+  };
+
 public:
   //! Default constructor.
 	GlfwOcctView();
@@ -107,6 +115,11 @@ private:
   Handle(V3d_View) myView;
   Handle(AIS_InteractiveContext) myContext;
 
+  CurAction3d myCurAction3d;
+  Graphic3d_Vec2i myMouseMin;
+  Graphic3d_Vec2i myMouseMax;
+  bool myToRedraw;
+
 };
 
 #endif // _GlfwOcctView_Header

samples/glfw/GlfwOcctWindow.cpp

@@ -134,17 +134,17 @@ void GlfwOcctWindow::Unmap() const
 // Function : DoResize
 // Purpose  :
 // ================================================================
-Aspect_TypeOfResize GlfwOcctWindow::DoResize()
+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);
-    myXLeft   = anXPos;
-    myXRight  = anXPos + aWidth;
-    myYTop    = anYPos;
-    myYBottom = anYPos + 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;
 }

samples/glfw/GlfwOcctWindow.h

@@ -65,7 +65,7 @@ public:
   virtual Aspect_Drawable NativeParentHandle() const Standard_OVERRIDE { return 0; }
 
   //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE;
+  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;

samples/java/jniviewer/jni/OcctJni_Window.hxx

@@ -44,7 +44,7 @@ public:
   virtual void Unmap() const Standard_OVERRIDE {}
 
   //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
+  virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
 
   //! Apply the mapping change to the window <me>
   virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }

samples/mfc/standard/01_Geometry/src/GeomSources.cpp

@@ -216,7 +216,8 @@ void GeomSources::DisplaySurface(CGeometryDoc* aDoc,
 
 void GeomSources::ResetView(CGeometryDoc* aDoc)
 {
-  Handle(V3d_View) aView = aDoc->GetAISContext()->CurrentViewer()->ActiveViews().First();
+  aDoc->GetAISContext()->CurrentViewer()->InitActiveViews();
+  Handle(V3d_View) aView = aDoc->GetAISContext()->CurrentViewer()->ActiveView();
   aView->Reset();
 }
 

samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp

@@ -68,7 +68,8 @@ void TexturesExt_Presentation::DoSample()
 void TexturesExt_Presentation::Init()
 {
   // initialize v3d_view so it displays TexturesExt well
-  Handle(V3d_View) aView = getViewer()->ActiveViews().First();
+  getViewer()->InitActiveViews();
+  Handle(V3d_View) aView = getViewer()->ActiveView();
   aView->SetSize(ZVIEW_SIZE);
 
 //  getDocument()->UpdateResultMessageDlg("Textured Shape", 

samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp

@@ -1020,7 +1020,8 @@ void CViewer3dDoc::OnDumpView()
     pView->UpdateWindow();
   }
 
-  Handle(V3d_View) aView = myViewer->ActiveViews().First();
+  myViewer->InitActiveViews();
+  Handle(V3d_View) aView = myViewer->ActiveView();
   ExportView (aView);
 }
 

samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp

@@ -1012,61 +1012,65 @@ aParams.NbMsaaSamples = aParams.NbMsaaSamples == 0 ? 8 : 0;\n\
 GetDocument()->UpdateResultMessageDlg("SetAntialiasingOn/SetAntialiasingOff",Message);
 }
 
-void CViewer3dView::OnClearLights()
+void CViewer3dView::OnClearLights() 
 {
-// Setting Off all viewer active lights
-    V3d_ListOfLight lights;
-    for (V3d_ListOfLightIterator anIter = myView->Viewer()->ActiveLightIterator(); anIter.More(); anIter.Next())
+//	Setting Off all viewer active lights
+    TColStd_ListOfTransient lights;
+	for(myView->Viewer()->InitActiveLights(); myView->Viewer()->MoreActiveLights(); myView->Viewer()->NextActiveLights())
     {
-        lights.Append (anIter.Value());
+        lights.Append(myView->Viewer()->ActiveLight());
     }
-    V3d_ListOfLightIterator itrLights(lights);
+    TColStd_ListIteratorOfListOfTransient itrLights(lights);
     for (; itrLights.More(); itrLights.Next())
     {
-        myView->Viewer()->SetLightOff (itrLights.Value());
+        Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());
+        myView->Viewer()->SetLightOff(light);
     }
 
-// Setting Off all view active lights
+//	Setting Off all view active lights
     lights.Clear();
-    for (V3d_ListOfLightIterator anIter = myView->ActiveLightIterator(); anIter.More(); anIter.Next())
+    for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights())
     {
-        lights.Append (anIter.Value());
+        lights.Append(myView->ActiveLight());
     }
-    itrLights.Initialize (lights);
+    itrLights.Initialize(lights);
     for (; itrLights.More(); itrLights.Next())
     {
-        myView->SetLightOff (itrLights.Value());
+        Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());
+        myView->SetLightOff(light);
     }
 
-    myView->Viewer()->SetDefaultLights(); // Setting the default lights on
+	myView->Viewer()->SetDefaultLights();// Setting the default lights on
 
-    NbActiveLights = 2; // There are 2 default active lights
+	NbActiveLights = 2;// There are 2 default active lights
 
-    myView->Update();
+	myView->Update();
 
 TCollection_AsciiString Message("\
-// Setting Off all viewer active lights\n\
-V3d_ListOfLight lights;\n\
-for (V3d_ListOfLightIterator anIter = myView->Viewer()->ActiveLightIterator(); anIter.More(); anIter.Next())\n\
+//	Setting Off all viewer active lights\n\
+TColStd_ListOfTransient lights;\n\
+for(myView->Viewer()->InitActiveLights(); myView->Viewer()->MoreActiveLights(); myView->Viewer()->NextActiveLights())\n\
 {\n\
-    lights.Append (anIter.Value());\n\
+    lights.Append(myView->Viewer()->ActiveLight());\n\
 }\n\
-V3d_ListOfLightIterator itrLights(lights);\n\
+TColStd_ListIteratorOfListOfTransient itrLights(lights);\n\
 for (; itrLights.More(); itrLights.Next())\n\
 {\n\
-    myView->Viewer()->SetLightOff (itrLights.Value())\n\
+    Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());\n\
+    myView->Viewer()->SetLightOff(light);\n\
 }\n\
 \n\
-// Setting Off all view active lights\n\
+//	Setting Off all view active lights\n\
 lights.Clear();\n\
-for (V3d_ListOfLightIterator anIter = myView->ActiveLightIterator(); anIter.More(); anIter.Next())\n\
+for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights())\n\
 {\n\
-    lights.Append (anIter.Value());\n\
+    lights.Append(myView->ActiveLight());\n\
 }\n\
 itrLights.Initialize(lights);\n\
 for (; itrLights.More(); itrLights.Next())\n\
 {\n\
-    myView->SetLightOff (itrLights.Value());\n\
+    Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());\n\
+    myView->SetLightOff(light);\n\
 }\n\
 \n\
 myView->Viewer()->SetDefaultLights();// Setting the default lights on\n\

samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp

@@ -413,7 +413,8 @@ void CTriangulationDoc::OnDumpView()
     pView->UpdateWindow();
   }
 
-  Handle(V3d_View) aView = myViewer->ActiveViews().First();
+  myViewer->InitActiveViews();
+  Handle(V3d_View) aView = myViewer->ActiveView();
   ExportView (aView);
 }
 

samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp

@@ -230,7 +230,8 @@ void COCCDemoDoc::OnDumpView()
     pView->UpdateWindow();
   }
 
-  Handle(V3d_View) aView = myViewer->ActiveViews().First();
+  myViewer->InitActiveViews();
+  Handle(V3d_View) aView = myViewer->ActiveView();
   ExportView (aView);
 }
 

samples/mfc/standard/Common/OCC_3dBaseDoc.cpp

@@ -489,7 +489,8 @@ void OCC_3dBaseDoc::OnUpdateV3dButtons (CCmdUI* pCmdUI)
 // Common function to change raytracing params and redraw view
 void OCC_3dBaseDoc::OnObjectRayTracingAction()
 {
-  Handle(V3d_View) aView = myAISContext->CurrentViewer()->ActiveViews().First();
+  myAISContext->CurrentViewer()->InitActiveViews();
+  Handle(V3d_View) aView = myAISContext->CurrentViewer()->ActiveView();
   Graphic3d_RenderingParams& aParams = aView->ChangeRenderingParams();
   if (myRayTracingIsOn)
     aParams.Method = Graphic3d_RM_RAYTRACING;

samples/qt/AndroidQt/src/AndroidQt_Window.h

@@ -44,7 +44,7 @@ public:
   virtual void Unmap() const {}
 
   //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize() { return Aspect_TOR_UNKNOWN; }
+  virtual Aspect_TypeOfResize DoResize() const { return Aspect_TOR_UNKNOWN; }
 
   //! Apply the mapping change to the window <me>
   virtual Standard_Boolean DoMapping() const { return Standard_True; }

samples/qt/Common/src/OcctWindow.cxx

@@ -81,7 +81,7 @@ void OcctWindow::Unmap() const
 // function : DoResize
 // purpose  :
 // =======================================================================
-Aspect_TypeOfResize OcctWindow::DoResize()
+Aspect_TypeOfResize OcctWindow::DoResize() const
 {
   int                 aMask = 0;
   Aspect_TypeOfResize aMode = Aspect_TOR_UNKNOWN;
@@ -126,10 +126,10 @@ Aspect_TypeOfResize OcctWindow::DoResize()
         break;
     }  // end switch
 
-    myXLeft   = myWidget->rect().left();
-    myXRight  = myWidget->rect().right();
-    myYTop    = myWidget->rect().top();
-    myYBottom = myWidget->rect().bottom();
+    *( ( Standard_Integer* )&myXLeft  ) = myWidget->rect().left();
+    *( ( Standard_Integer* )&myXRight ) = myWidget->rect().right();
+    *( ( Standard_Integer* )&myYTop   ) = myWidget->rect().top();
+    *( ( Standard_Integer* )&myYBottom) = myWidget->rect().bottom();
   }
 
   return aMode;

samples/qt/Common/src/OcctWindow.h

@@ -51,7 +51,7 @@ public:
   virtual Aspect_Drawable NativeParentHandle() const;
 
   //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize();
+  virtual Aspect_TypeOfResize DoResize() const;
 
   //! Returns True if the window <me> is opened
   //! and False if the window is closed.

samples/tcl/ANC101.tcl

@@ -276,7 +276,7 @@ blend result _model 2 _model_161
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vbackground -color C8C8FF
+vbackground -color 0.784314 0.784314 1
 vdisplay -dispMode 1 result
 vfit
 vaspects result -setFaceBoundaryDraw 1 -mostContinuity c2

samples/tcl/MBBGehauseRohteil.tcl

@@ -262,7 +262,7 @@ unifysamedom result  p_1
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vbackground -color C8C8FF
+vbackground -color 0.784314 0.784314 1
 vdisplay -dispMode 1 result
 vfit
 vaspects result -setFaceBoundaryDraw 1

samples/tcl/ModelingDemo.tcl

@@ -86,7 +86,7 @@ sage " Fusion of this prism with the original part "
 sage "    fuse result rr result"
 sage " "
 fuse result rr result
-donly result
+donl result
 nexplode result f
 erase result
 fit
@@ -108,13 +108,13 @@ ttranslate cyl cyl 0 7.5 0
 sage " Display the Shape on Hidden Line Mode "
 sage "   hlr hid r"
 sage ""
-donly r
+donl r
 hlr hid r
 sage " Display the Shape on HLR Mode "
 sage "   hlr nohid r"
 sage "   hlr hlr r"
 sage ""
-donly r
+donl r
 hlr nohid r
 hlr hlr r
 sage "Demo completed"

samples/tcl/Penrose.tcl

@@ -68,18 +68,18 @@ vlight add directional direction 0 -10 0 head 1 color white
 vdisplay b1 b2 b3 b4 b5 b6 b7 b8 b9 b10
 
 # set colors like in boxes of on OCC logo
-vsetcolor b1  DD0029
-vsetcolor b2  F6DD00
-vsetcolor b3  98F918
-vsetcolor b4  E9007A
-vsetcolor b5  007ABC
-vsetcolor b6  93007A
-vsetcolor b7  EE9800
-vsetcolor b8  00B489
-vsetcolor b9  00A47A
-vsetcolor b10 007ABC
+vsetcolor b1 0.8671875 0 0.16015625
+vsetcolor b2 0.96484375 0.8671875 0
+vsetcolor b3 0.609375 0.97734375 0.09375
+vsetcolor b4 0.90234375 0 0.48046875
+vsetcolor b5 0 0.48046875 0.73828125
+vsetcolor b6 0.578125 0 0.48046875
+vsetcolor b7 0.93359375 0.609375 0
+vsetcolor b8 0 0.70703125 0.9296875
+vsetcolor b9 0 0.64453125 0.48046875
+vsetcolor b10 0 0.48046875 0.73828125
 
 # set material to plastic for better look
 for {set i 1} {$i <= 10} {incr i} {vsetmaterial b$i plastic}
 
-vdrawtext label "Which\nbox\nis\ncloser\nto\nyou?" -pos 0 -6 -2 -color BLACK -halign left -valign bottom -angle 0 -zoom 0 -height 40
+vdrawtext label "Which\nbox\nis\ncloser\nto\nyou?" -pos 0 -6 -2 -color 0 0 0 -halign left -valign bottom -angle 0 -zoom 0 -height 40

samples/tcl/cpu.tcl

@@ -255,27 +255,27 @@ if [info exists i7_show_3dview] {
   vlight add directional direction 1 -1 -2 head 1
 
   vdisplay case
-  vsetcolor case GRAY70
+  vsetcolor case 0.7 0.7 0.7
 
   vdisplay title
-  vsetcolor title GRAY10
+  vsetcolor title 0.1 0.1 0.1
 
   # board is mostly yellow (edges, triangle markers)
-  foreach f [explode board f] { vdisplay $f; vsetcolor $f B3803D }
+  foreach f [explode board f] { vdisplay $f; vsetcolor $f 0.7 0.5 0.3 }
   # top and bottom faces are light-green (outside) and dark-green (inside)
-  vsetcolor board_4  00998C
-  vsetcolor board_5  00998C
-  vsetcolor board_12 004D54
-  vsetcolor board_14 004D54
+  vsetcolor board_4 0 0.6 0.55
+  vsetcolor board_5 0 0.6 0.55
+  vsetcolor board_12 0 0.3 0.33
+  vsetcolor board_14 0 0.3 0.33
 
   vdisplay rpads
-  vsetcolor rpads B39966
+  vsetcolor rpads 0.7 0.6 0.4
 
   vdisplay bpads
-  vsetcolor bpads B39966
+  vsetcolor bpads 0.7 0.6 0.4
 
   vdisplay brpk
-  vsetcolor brpk 80664D
+  vsetcolor brpk 0.5 0.4 0.3
 
   donly board case rpads brpk; fit
 }
@@ -287,17 +287,17 @@ pload OCAF XDE
 NewDocument D MDTV-XCAF
 
 SetName D [XAddShape D board 0] "Board"
-foreach f [explode board f] { XSetColor D $f B3803D }
-XSetColor D board_4  00998C
-XSetColor D board_5  00998C
-XSetColor D board_12 004D54
-XSetColor D board_14 004D54
+foreach f [explode board f] { XSetColor D $f 0.7 0.5 0.3 }
+XSetColor D board_4 0 0.6 0.55
+XSetColor D board_5 0 0.6 0.55
+XSetColor D board_12 0 0.3 0.33
+XSetColor D board_14 0 0.3 0.33
 
 SetName D [XAddShape D case 0] "Case"
-XSetColor D case GRAY70
+XSetColor D case 0.7 0.7 0.7
 
 SetName D [XAddShape D title 0] "Case title"
-XSetColor D title GRAY10
+XSetColor D title 0.1 0.1 0.1
 
 SetName D [XAddShape D rpads 1] "Top side contact pads"
 SetName D [XAddShape D bpads 1] "Bottom contact pads"
@@ -306,17 +306,17 @@ SetName D [XFindShape D rpad] "Round pad"
 SetName D [XFindShape D Rpad] "Big round pad"
 SetName D [XFindShape D spad_1] "Square pad 1"
 SetName D [XFindShape D spad_2] "Square pad 2"
-XSetColor D rpad   B39966
-XSetColor D Rpad   B39966
-XSetColor D bpad   B39966
-XSetColor D spad_1 B39966
-XSetColor D spad_2 B39966
+XSetColor D rpad 0.7 0.6 0.4
+XSetColor D Rpad 0.7 0.6 0.4
+XSetColor D bpad 0.7 0.6 0.4
+XSetColor D spad_1 0.7 0.6 0.4
+XSetColor D spad_2 0.7 0.6 0.4
 
 SetName D [XAddShape D brpk 1] "Bottom packages"
 SetName D [XFindShape D rpk] "Bottom package"
-XSetColor D rpk1 GRAY70
-XSetColor D rpk2 80664D
-XSetColor D rpk3 GRAY70
+XSetColor D rpk1 0.7 0.7 0.7
+XSetColor D rpk2 0.5 0.4 0.3
+XSetColor D rpk3 0.7 0.7 0.7
 
 XShow D
 vlight clear

samples/tcl/dimensions.tcl

@@ -36,7 +36,9 @@ set anArrAngle [expr 3.14 * 12.0 / 180.0]
 
 # Form dimension names list to set parameters with vdimparam command
 set aList {rd_1 rd_2 ad_1 ad_2 ad_3}
-for {set i 1} {$i <= 10} {incr i} { lappend aList ld_$i }
+for {set i 1} {$i <= 10} {incr i} {
+lappend aList ld_$i
+}
 
 puts "Creating dimensions..."
 vdimension ld_1 -length -shapes bs_27 -plane xoy -color black -flyout -15
@@ -65,14 +67,29 @@ foreach i $aList {
 vfit
 
 puts "Displaying exported shapes..."
-vdisplay -dispMode 1 a b
+vdisplay a b
+vsetdispmode a 1
+vsetdispmode b 1
 vaspects a -setmaterial steel
 vaspects b -setmaterial bronze
 
 puts "Clipping shapes for better view..."
+vclipplane create pa
+vclipplane change pa equation 0 0 1 0
+vclipplane change pa capping on
+vclipplane change pa capping color 0.9 0.9 0.9
+vclipplane set    pa object a
 
-vclipplane pa -set a -equation 0 0 1 0 -capping on -color GRAY90 -texName $aHatch -texScale 0.05 -0.05
-vclipplane pb -set b -equation 0 0 1 0 -capping on -color GOLD   -texName $aHatch -texScale 0.05 -0.05
+vclipplane create pb
+vclipplane change pb equation 0 0 1 0
+vclipplane change pb capping on
+vclipplane change pb capping color 1.0 0.8 0.0
+vclipplane set    pb object b
+
+vclipplane change pa capping texname $aHatch
+vclipplane change pa capping texscale 0.05 -0.05
+vclipplane change pb capping texname $aHatch
+vclipplane change pb capping texscale 0.05  0.05
 
 vbottom
 vrotate -0.3 -0.3 0

samples/tcl/logo2019.tcl

@@ -77,13 +77,14 @@ SetName D $main "OCC Logo 2019"
 SetName D [XFindShape D sb] "Core"
 SetName D [XFindShape D tp] "Loop"
 SetName D [XFindShape D rs] "Connector"
-XSetColor D sb FF3652
-XSetColor D tp 00AADA
-XSetColor D rs 0073B0
+XSetColor D sb 1 0.21 0.32
+XSetColor D tp 0 0.667 0.855
+XSetColor D rs 0 0.45 0.69
 
 # display
-vinit View1
-vbackground -color WHITE
-XDisplay -dispMode 1 D
+vinit
+vsetcolorbg 1 1 1
+vsetdispmode 1
+XDisplay D
 vtop
 vfit

samples/tcl/markers.tcl

@@ -56,7 +56,7 @@ for { set aMarkerType 0 } { $aMarkerType <= 13 } { incr aMarkerType } {
   set aRow [expr $aMarkerType - 7]
   set aCol 5
   set aName [lindex $aMarkerTypeNames $aMarkerType]
-  vdrawtext "$aName" "$aName" -pos 0 [expr $aRow + 0.5] 0 -color 7FFFFF -halign center -valign center -angle 000 -zoom 0 -height 12 -aspect bold -font $aLabelFont -noupdate
+  vdrawtext "$aName" "$aName" -pos 0 [expr $aRow + 0.5] 0 -color 0.5 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 12 -aspect bold -font $aLabelFont -noupdate
   vdisplay -top -noupdate "$aName"
   if { $aMarkerType == 13 } {
     vmarkerstest m${aMarkerType}_${aCol} $aCol $aRow 0 PointsOnSide=1 FileName=$aCustom1

samples/tcl/materials.tcl

@@ -4,22 +4,36 @@
 #Title: Material properties in viewer
 
 set THE_MATERIALS {brass bronze copper gold jade neon_phc pewter obsidian plaster plastic satin silver steel stone chrome aluminium water glass diamond charcoal}
-set THE_COLORS    {default red green blue}
+set THE_COLORS    {default red green blue1}
 set THE_ROW_DIST  35
 
 proc drawLabels {} {
   set x 20
   set y 15
+  set r 0.098
+  set g 0.098
+  set b 0.098
   foreach aMatIter $::THE_MATERIALS {
-    vdrawtext "$aMatIter" "$aMatIter" -pos $x $y 0 -color GRAY10 -halign right -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial
+    vdrawtext "$aMatIter" "$aMatIter" -pos $x $y 0 -color $r $g $b -halign right -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial
     incr y 10
   }
   set x 40
   set y  5
   foreach aColIter $::THE_COLORS {
-    set aLabColor "$aColIter"
-    if { "$aColIter" == "default" } { set aLabColor BLACK }
-    vdrawtext "$aColIter" "$aColIter" -pos $x $y 0 -color "$aLabColor" -halign center -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial
+    if { $aColIter == "red" } {
+      set r 1.0
+      set g 0.0
+      set b 0
+    } elseif { $aColIter == "green" } {
+      set r 0.0
+      set g 1.0
+      set b 0.0
+    } elseif { $aColIter == "blue1" } {
+      set r 0.0
+      set g 0.0
+      set b 1.0
+    }
+    vdrawtext "$aColIter" "$aColIter" -pos $x $y 0 -color $r $g $b -halign center -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial
     incr x $::THE_ROW_DIST
   }
 }
@@ -55,7 +69,7 @@ vclose ALL
 vinit View1 w=768 h=768
 vtop
 vglinfo
-vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL
+vbackground -gradient 0.705882 0.784314 1  0.705882 0.705882 0.705882 -gradientMode VERTICAL
 
 vlight -change 0 -dir 0.577 -0.577 -0.577
 vrenderparams -msaa 8

samples/tcl/pathtrace_ball.tcl

@@ -57,10 +57,11 @@ for {set i 0} {$i < 12} {incr i} {
 }
 
 # Configure light sources
-vlight -change 0 -head 0
-vlight -change 0 -direction -0.25 -1 -1
-vlight -change 0 -sm   0.3
-vlight -change 0 -int 10.0
+vlight del 1
+vlight change 0 head 0
+vlight change 0 direction -0.25 -1 -1
+vlight change 0 sm 0.3
+vlight change 0 int 10
 
 # Load environment map
 vtextureenv on 1

samples/tcl/pathtrace_cube.tcl

@@ -12,8 +12,11 @@ vinit name=View1 w=512 h=512
 vglinfo
 
 # setup light sources
-vlight -clear
-vlight -add positional -head 0 -pos 0.5 0.5 0.85 -sm 0.06 -int 30.0
+vlight del 0
+vlight del 1
+vlight add positional head 0 pos 0.5 0.5 0.85
+vlight change 0 sm 0.06
+vlight change 0 int 30.0
 
 vvbo 0
 vsetdispmode 1

samples/tcl/pathtrace_materials.tcl

@@ -208,9 +208,8 @@ vviewparams -eye 139.412 -1.62643 178.037
 vviewparams -size 170.508
 
 # Restore light source parameters
-vlight -clear
-vlight -add ambient
-vlight -add directional -direction -0.303949 -0.434084 -0.848048 -smoothness 0.3 -intensity 12
+vlight clear
+vlight add directional direction -0.303949 -0.434084 -0.848048 smoothness 0.3 intensity 12
 
 # Load environment map
 vtextureenv on 1

samples/tcl/pencil.tcl

@@ -46,17 +46,18 @@ NewDocument D
 XAddShape D body_1
 XAddShape D core_1
 
-for {set i 1} {$i <= 26} {incr i} {XSetColor D body_1_$i BLUE}
-XSetColor D body_1_1 E68066
-XSetColor D body_1_9 E68066
-for {set i 10} {$i <= 22} {incr i} {XSetColor D body_1_$i 99B300}
-XSetColor D core_1 1A1AFF
-foreach ff [explode core_1 f] { XSetColor D $ff 1A1AFF ; puts "set color $ff" }
+#XSetColor D body_1   0. 0. 1.
+for {set i 1} {$i <= 26} {incr i} {XSetColor D body_1_$i 0. 0. 1.}
+XSetColor D body_1_1 0.9 0.5 0.4
+XSetColor D body_1_9 0.9 0.5 0.4
+for {set i 10} {$i <= 22} {incr i} {XSetColor D body_1_$i 0.6 0.7 0.0}
+XSetColor D core_1 0.1 0.1 1.
+foreach ff [explode core_1 f] { XSetColor D $ff 0.1 0.1 1. ; puts "set color $ff" }
+
+XShow D
 
-vclear
-vinit View1
-XDisplay -dispMode 1 D -explore
 vfit
+vsetdispmode 1
 vrenderparams -msaa 8
 vbackground -color WHITE
 

samples/tcl/vis_pbr_spheres.tcl

@@ -1,91 +0,0 @@
-# Script demonstrating PBR metallic-roughness material properties
-#Category: Visualization
-#Title: PBR metallic-rougness spheres
-
-pload XDE OCAF MODELING VISUALIZATION
-psphere s 0.35
-
-catch { Close D }
-XNewDoc D
-
-# grid of spheres
-set THE_UPPER 6
-foreach i [list 0 3] {
-  set aPrefix ""
-  set aColor "GRAY80"
-  if { $i != 0 } {
-    set aPrefix "g_";
-    set aColor "CCB11D"
-  }
-  set aColShapes {}
-  for { set m 0 } { $m <= $THE_UPPER } { incr m } {
-    set aRowShapes {}
-    for { set r 0 } { $r <= $THE_UPPER } { incr r } {
-      set aName ${aPrefix}m${m}r${r}
-      copy s $aName
-      lappend aRowShapes $aName
-      ttranslate $aName ${r} ${i} ${m}
-    }
-    set aName ${aPrefix}m${m}
-    compound {*}$aRowShapes $aName
-    lappend aColShapes $aName
-  }
-  set aName ${aPrefix}spheres
-  compound {*}$aColShapes $aName
-  set aLabName "Gray Spheres"
-  if { $i != 0 } { set aLabName "Golden Spheres" }
-  set aLabComp [XAddShape D $aName 0]
-  SetName D $aLabComp $aLabName
-
-  for { set m 0 } { $m <= $THE_UPPER } { incr m } {
-    set aMet [expr 100 * ${m}/$THE_UPPER]
-    set aName ${aPrefix}m${m}
-    XAddComponent D $aLabComp $aName
-    set aLabCompCol [XFindShape D $aName]
-    SetName D $aLabCompCol "${aPrefix}m${aMet}%"
-    SetName D {*}[XFindComponent D $aName] "${aPrefix}m${aMet}%"
-    for { set r 0 } { $r <= $THE_UPPER } { incr r } {
-      set aRoug [expr 100 * ${r}/$THE_UPPER]
-      set aName ${aPrefix}m${m}r${r}
-      XAddComponent D $aLabCompCol $aName
-      set aLab [XFindComponent D $aName]
-      SetName D {*}$aLab "${aPrefix}m${aMet}%_r${aRoug}%"
-      XAddVisMaterial D $aName -baseColor $aColor -metallic ${m}/$THE_UPPER -roughness ${r}/$THE_UPPER
-      XSetVisMaterial D {*}$aLab $aName
-    }
-  }
-}
-set aLab [XFindShape D s]
-SetName D {*}$aLab "Sphere"
-
-XGetAllVisMaterials D
-
-# labels
-text2brep tm  "Metal"     -plane 0 -1 0 0 0 -1 -height 0.5 -pos -0.5 0  6.5 -halign left  -valign top -font monospace
-text2brep tnm "Non-metal" -plane 0 -1 0 0 0 -1 -height 0.5 -pos -0.5 0 -0.5 -halign right -valign top -font monospace
-text2brep ts  "Smooth"    -plane 0 -1 0 1 0  0 -height 0.5 -pos -0.5 0 -0.5 -halign left  -valign top -font monospace
-text2brep tr  "Rough"     -plane 0 -1 0 1 0  0 -height 0.5 -pos  6.5 0 -0.5 -halign right -valign top -font monospace
-compound tm tnm ts tr labs
-set aLab [XAddShape D labs 0]
-SetName D $aLab "Labels"
-XAddComponent D $aLab tm
-XAddComponent D $aLab tnm
-XAddComponent D $aLab ts
-XAddComponent D $aLab tr
-SetName D {*}[XFindComponent D tm]  "Metal"
-SetName D    [XFindShape     D tm]  "Metal"
-SetName D {*}[XFindComponent D tnm] "Non-metal"
-SetName D    [XFindShape     D tnm] "Non-metal"
-SetName D {*}[XFindComponent D ts]  "Smooth"
-SetName D    [XFindShape     D ts]  "Smooth"
-SetName D {*}[XFindComponent D tr]  "Rough"
-SetName D    [XFindShape     D tr]  "Rough"
-
-vclear
-vinit View1 -width 768 -height 768
-vfront
-vrenderparams -shadingModel PBR
-vlight -change 0 -intensity 2.5
-XDisplay -dispMode 1 D
-vcamera -ortho
-vfit

samples/tcl/xde.tcl

@@ -28,20 +28,19 @@ SetName D [XFindShape D link]:2 "Nut instance 1"
 SetName D [XFindShape D link]:3 "Nut instance 2"
 
 puts "- Pin will be white"
-XSetColor D [XFindShape D pin] WHITE
+XSetColor D [XFindShape D pin] 1 1 1
 puts "- Nut itself will be dark gray"
-XSetColor D [XFindShape D nut] GRAY10
+XSetColor D [XFindShape D nut] 0.1 0.1 0.1
 puts "- Nut instance #1 will be red"
-XSetColor D [XFindShape D link]:2 RED
+XSetColor D [XFindShape D link]:2 1 0 0
 puts "- Nut instance #2 will be green"
-XSetColor D [XFindShape D link]:3 GREEN
+XSetColor D [XFindShape D link]:3 0 1 0
 
 puts "Starting DF browser..."
 DFBrowse D
 puts "Expand the document tree to see its structure and assigned names"
 
 puts "Showing assembly in 3d view..."
-vclear
-vinit View1
-XDisplay -dispMode 1 D -explore
+XShow D
 vfit
+vsetdispmode 1

samples/webgl/.gitignore

@@ -1,2 +0,0 @@
-/build
-/work

samples/webgl/CMakeLists.txt

@@ -1,66 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(occt-webgl-sample)
-
-set(CMAKE_CXX_STANDARD 11)
-set(APP_VERSION_MAJOR 1)
-set(APP_VERSION_MINOR 0)
-set(APP_TARGET occt-webgl-sample)
-
-# customize build
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=1")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_WEBGL2=1")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ALLOW_MEMORY_GROWTH=1")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s SAFE_HEAP=1")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_EXIT_RUNTIME=1")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s TOTAL_MEMORY=16MB")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ABORTING_MALLOC=0")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s FORCE_FILESYSTEM=1")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --preload-file myFile")
-
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
-file(GLOB SOURCES
-  *.h
-  *.cpp
-)
-source_group ("Headers" FILES
-  WasmOcctView.h)
-source_group ("Sources" FILES
-  WasmOcctView.cpp
-  main.cpp)
-
-# FreeType
-find_package(freetype REQUIRED NO_DEFAULT_PATH)
-if(freetype_FOUND)
-  message (STATUS "Using FreeType from \"${freetype_DIR}\"" )
-else()
-  message(WARNING "Could not find FreeType, please set freetype_DIR variable." )
-endif()
-
-# 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 TKRWMesh TKBinXCAF TKBin TKBinL TKOpenGl TKXCAF TKVCAF TKCAF TKV3d TKHLR TKMesh TKService TKShHealing TKPrim TKTopAlgo TKGeomAlgo TKBRep TKGeomBase TKG3d TKG2d TKMath TKLCAF TKCDF TKernel)
-
-add_executable(${APP_TARGET} ${SOURCES})
-target_link_libraries(
-  ${APP_TARGET}
-  ${OpenCASCADE_LIBS}
-  freetype
-)
-set_target_properties(${APP_TARGET} PROPERTIES LINK_FLAGS "-s EXPORTED_FUNCTIONS=['_main','_onFileDataRead'] -s EXTRA_EXPORTED_RUNTIME_METHODS=['ccall','cwrap']")
-
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.wasm DESTINATION ${CMAKE_INSTALL_PREFIX})
-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})

samples/webgl/ReadMe.md

@@ -1,28 +0,0 @@
-OCCT WebGL Viewer sample {#occt_samples_webgl}
-================== 
-
-This sample demonstrates simple way of using OCCT libraries in Web application written in C++ and translated into WebAssembly module using Emscripten SDK (emsdk):
-https://emscripten.org/
-
-Sample consists of the Open CASCADE 3D Viewer with a button for opening a model in BREP format.
-The sample requires a WebGL 2.0 capable browser supporting WebAssembly 1.0 (Wasm).
-
-Installation and configuration:
- 1. Install Emscripten SDK and activate minimal configuration (Python, Java and CLang) following *emsdk* documentation. Activate also MinGW when building sample on Windows host.
- 2. Build (using *emsdk*) or download FreeType static library.
- 3. Configure CMake for building Open CASCADE Technology (OCCT) static libraries (BUILD_LIBRARY_TYPE="Static").
-    For this, activate *emsdk* command prompt, configure CMake for building OCCT using cross-compilation toolchain, disable *BUILD_MODULE_Draw*. 
- 4. Perform building and installation steps.
-~~~~~
-    > ${EMSDK}/fastcomp/emscripten/cmake/Modules/Platform/Emscripten.cmake
-~~~~~
- 5. Configure CMake for building this WebGL sample using *emsdk* with paths to OCCT and FreeType. Perform building and installation steps.
- 6. Copy data/occ/Ball.brep from OCCT into "samples" folder within WebGL sample installation path.
- 7. Navigate to installation folder and start web server from it; Python coming with *emsdk* can be used for this purpose:
-~~~~~
-    > python -m SimpleHTTPServer 8080
-~~~~~
- 8. Open compatible browser and enter path taking into account your web server settings:
-~~~~~
-    > http://localhost:8080/occt-webgl-sample.html
-~~~~~

samples/webgl/WasmOcctView.cpp

@@ -1,678 +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 "WasmOcctView.h"
-
-#include "WasmVKeys.h"
-
-#include <AIS_Shape.hxx>
-#include <AIS_ViewCube.hxx>
-#include <Aspect_Handle.hxx>
-#include <Aspect_DisplayConnection.hxx>
-#include <Aspect_NeutralWindow.hxx>
-#include <Message.hxx>
-#include <Message_Messenger.hxx>
-#include <OpenGl_GraphicDriver.hxx>
-#include <Prs3d_DatumAspect.hxx>
-
-#include <iostream>
-
-#define THE_CANVAS_ID "canvas"
-
-namespace
-{
-  EM_JS(int, jsCanvasGetWidth, (), {
-    return canvas.width;
-  });
-
-  EM_JS(int, jsCanvasGetHeight, (), {
-    return canvas.height;
-  });
-
-  EM_JS(float, jsDevicePixelRatio, (), {
-    var aDevicePixelRatio = window.devicePixelRatio || 1;
-    return aDevicePixelRatio;
-  });
-
-  //! Return cavas size in pixels.
-  static Graphic3d_Vec2i jsCanvasSize()
-  {
-    return Graphic3d_Vec2i (jsCanvasGetWidth(), jsCanvasGetHeight());
-  }
-}
-
-// ================================================================
-// Function : WasmOcctView
-// Purpose  :
-// ================================================================
-WasmOcctView::WasmOcctView()
-: myDevicePixelRatio (1.0f),
-  myUpdateRequests (0)
-{
-}
-
-// ================================================================
-// Function : ~WasmOcctView
-// Purpose  :
-// ================================================================
-WasmOcctView::~WasmOcctView()
-{
-}
-
-// ================================================================
-// Function : run
-// Purpose  :
-// ================================================================
-void WasmOcctView::run()
-{
-  initWindow();
-  initViewer();
-  initDemoScene();
-  if (myView.IsNull())
-  {
-    return;
-  }
-
-  myView->MustBeResized();
-  myView->Redraw();
-
-  // There is no inifinite message loop, main() will return from here immediately.
-  // Tell that our Module should be left loaded and handle events through callbacks.
-  //emscripten_set_main_loop (redrawView, 60, 1);
-  //emscripten_set_main_loop (redrawView, -1, 1);
-  EM_ASM(Module['noExitRuntime'] = true);
-}
-
-// ================================================================
-// Function : initWindow
-// Purpose  :
-// ================================================================
-void WasmOcctView::initWindow()
-{
-  myDevicePixelRatio = jsDevicePixelRatio();
-  myCanvasId = THE_CANVAS_ID;
-  const char* aTargetId = !myCanvasId.IsEmpty() ? myCanvasId.ToCString() : NULL;
-  const EM_BOOL toUseCapture = EM_TRUE;
-  emscripten_set_resize_callback     (NULL,      this, toUseCapture, onResizeCallback);
-
-  emscripten_set_mousedown_callback  (NULL,      this, toUseCapture, onMouseCallback);
-  emscripten_set_mouseup_callback    (NULL,      this, toUseCapture, onMouseCallback);
-  emscripten_set_mousemove_callback  (NULL,      this, toUseCapture, onMouseCallback);
-  emscripten_set_dblclick_callback   (aTargetId, this, toUseCapture, onMouseCallback);
-  emscripten_set_click_callback      (aTargetId, this, toUseCapture, onMouseCallback);
-  emscripten_set_mouseenter_callback (aTargetId, this, toUseCapture, onMouseCallback);
-  emscripten_set_mouseleave_callback (aTargetId, this, toUseCapture, onMouseCallback);
-  emscripten_set_wheel_callback      (aTargetId, this, toUseCapture, onWheelCallback);
-
-  emscripten_set_touchstart_callback (aTargetId, this, toUseCapture, onTouchCallback);
-  emscripten_set_touchend_callback   (aTargetId, this, toUseCapture, onTouchCallback);
-  emscripten_set_touchmove_callback  (aTargetId, this, toUseCapture, onTouchCallback);
-  emscripten_set_touchcancel_callback(aTargetId, this, toUseCapture, onTouchCallback);
-
-  //emscripten_set_keypress_callback   (NULL,      this, toUseCapture, onKeyCallback);
-  emscripten_set_keydown_callback    (NULL,      this, toUseCapture, onKeyDownCallback);
-  emscripten_set_keyup_callback      (NULL,      this, toUseCapture, onKeyUpCallback);
-}
-
-// ================================================================
-// Function : dumpGlInfo
-// Purpose  :
-// ================================================================
-void WasmOcctView::dumpGlInfo (bool theIsBasic)
-{
-  TColStd_IndexedDataMapOfStringString aGlCapsDict;
-  myView->DiagnosticInformation (aGlCapsDict, theIsBasic ? Graphic3d_DiagnosticInfo_Basic : Graphic3d_DiagnosticInfo_Complete);
-  if (theIsBasic)
-  {
-    TCollection_AsciiString aViewport;
-    aGlCapsDict.FindFromKey ("Viewport", aViewport);
-    aGlCapsDict.Clear();
-    aGlCapsDict.Add ("Viewport", aViewport);
-  }
-  aGlCapsDict.Add ("Display scale", TCollection_AsciiString(myDevicePixelRatio));
-
-  // beautify output
-  {
-    TCollection_AsciiString* aGlVer   = aGlCapsDict.ChangeSeek ("GLversion");
-    TCollection_AsciiString* aGlslVer = aGlCapsDict.ChangeSeek ("GLSLversion");
-    if (aGlVer   != NULL
-     && aGlslVer != NULL)
-    {
-      *aGlVer = *aGlVer + " [GLSL: " + *aGlslVer + "]";
-      aGlslVer->Clear();
-    }
-  }
-
-  TCollection_AsciiString anInfo;
-  for (TColStd_IndexedDataMapOfStringString::Iterator aValueIter (aGlCapsDict); aValueIter.More(); aValueIter.Next())
-  {
-    if (!aValueIter.Value().IsEmpty())
-    {
-      if (!anInfo.IsEmpty())
-      {
-        anInfo += "\n";
-      }
-      anInfo += aValueIter.Key() + ": " + aValueIter.Value();
-    }
-  }
-
-  ::Message::DefaultMessenger()->Send (anInfo, Message_Warning);
-}
-
-// ================================================================
-// Function : initPixelScaleRatio
-// Purpose  :
-// ================================================================
-void WasmOcctView::initPixelScaleRatio()
-{
-  SetTouchToleranceScale (myDevicePixelRatio);
-  if (!myView.IsNull())
-  {
-    myView->ChangeRenderingParams().Resolution = (unsigned int )(96.0 * myDevicePixelRatio + 0.5);
-  }
-  if (!myContext.IsNull())
-  {
-    myContext->SetPixelTolerance (int(myDevicePixelRatio * 6.0));
-    if (!myViewCube.IsNull())
-    {
-      static const double THE_CUBE_SIZE = 60.0;
-      myViewCube->SetSize (myDevicePixelRatio * THE_CUBE_SIZE, false);
-      myViewCube->SetBoxFacetExtension (myViewCube->Size() * 0.15);
-      myViewCube->SetAxesPadding (myViewCube->Size() * 0.10);
-      myViewCube->SetFontHeight  (THE_CUBE_SIZE * 0.16);
-      if (myViewCube->HasInteractiveContext())
-      {
-        myContext->Redisplay (myViewCube, false);
-      }
-    }
-  }
-}
-
-// ================================================================
-// Function : initViewer
-// Purpose  :
-// ================================================================
-bool WasmOcctView::initViewer()
-{
-  // Build with "--preload-file MyFontFile.ttf" option
-  // and register font in Font Manager to use custom font(s).
-  /*const char* aFontPath = "MyFontFile.ttf";
-  if (Handle(Font_SystemFont) aFont = Font_FontMgr::GetInstance()->CheckFont (aFontPath))
-  {
-    Font_FontMgr::GetInstance()->RegisterFont (aFont, true);
-  }
-  else
-  {
-    Message::DefaultMessenger()->Send (TCollection_AsciiString ("Error: font '") + aFontPath + "' is not found", Message_Fail);
-  }*/
-
-  Handle(Aspect_DisplayConnection) aDisp;
-  Handle(OpenGl_GraphicDriver) aDriver = new OpenGl_GraphicDriver (aDisp, false);
-  aDriver->ChangeOptions().buffersNoSwap = true; // swap has no effect in WebGL
-  if (!aDriver->InitContext())
-  {
-    Message::DefaultMessenger()->Send (TCollection_AsciiString ("Error: EGL initialization failed"), Message_Fail);
-    return false;
-  }
-
-  Handle(V3d_Viewer) aViewer = new V3d_Viewer (aDriver);
-  aViewer->SetComputedMode (false);
-  aViewer->SetDefaultShadingModel (Graphic3d_TOSM_FRAGMENT);
-  aViewer->SetDefaultLights();
-  aViewer->SetLightOn();
-
-  Handle(Aspect_NeutralWindow) aWindow = new Aspect_NeutralWindow();
-  Graphic3d_Vec2i aWinSize = jsCanvasSize();
-  if (aWinSize.x() < 10 || aWinSize.y() < 10)
-  {
-    Message::DefaultMessenger()->Send (TCollection_AsciiString ("Warning: invalid canvas size"), Message_Warning);
-  }
-  aWindow->SetSize (aWinSize.x(), aWinSize.y());
-
-  myTextStyle = new Prs3d_TextAspect();
-  myTextStyle->SetFont (Font_NOF_ASCII_MONO);
-  myTextStyle->SetHeight (12);
-  myTextStyle->Aspect()->SetColor (Quantity_NOC_GRAY95);
-  myTextStyle->Aspect()->SetColorSubTitle (Quantity_NOC_BLACK);
-  myTextStyle->Aspect()->SetDisplayType (Aspect_TODT_SHADOW);
-  myTextStyle->Aspect()->SetTextFontAspect (Font_FA_Bold);
-  myTextStyle->Aspect()->SetTextZoomable (false);
-  myTextStyle->SetHorizontalJustification (Graphic3d_HTA_LEFT);
-  myTextStyle->SetVerticalJustification (Graphic3d_VTA_BOTTOM);
-
-  myView = new V3d_View (aViewer);
-  myView->SetImmediateUpdate (false);
-  myView->ChangeRenderingParams().Resolution = (unsigned int )(96.0 * myDevicePixelRatio + 0.5);
-  myView->ChangeRenderingParams().ToShowStats = true;
-  myView->ChangeRenderingParams().StatsTextAspect = myTextStyle->Aspect();
-  myView->ChangeRenderingParams().StatsTextHeight = (int )myTextStyle->Height();
-  myView->SetWindow (aWindow);
-  dumpGlInfo (false);
-
-  myContext = new AIS_InteractiveContext (aViewer);
-  initPixelScaleRatio();
-  return true;
-}
-
-// ================================================================
-// Function : initDemoScene
-// Purpose  :
-// ================================================================
-void WasmOcctView::initDemoScene()
-{
-  if (myContext.IsNull())
-  {
-    return;
-  }
-
-  //myView->TriedronDisplay (Aspect_TOTP_LEFT_LOWER, Quantity_NOC_GOLD, 0.08, V3d_WIREFRAME);
-
-  myViewCube = new AIS_ViewCube();
-  // presentation parameters
-  initPixelScaleRatio();
-  myViewCube->SetTransformPersistence (new Graphic3d_TransformPers (Graphic3d_TMF_TriedronPers, Aspect_TOTP_RIGHT_LOWER, Graphic3d_Vec2i (100, 100)));
-  myViewCube->Attributes()->SetDatumAspect (new Prs3d_DatumAspect());
-  myViewCube->Attributes()->DatumAspect()->SetTextAspect (myTextStyle);
-  // animation parameters
-  myViewCube->SetViewAnimation (myViewAnimation);
-  myViewCube->SetFixedAnimationLoop (false);
-  myViewCube->SetAutoStartAnimation (true);
-  myContext->Display (myViewCube, false);
-
-  // Build with "--preload-file MySampleFile.brep" option to load some shapes here.
-}
-
-
-// ================================================================
-// Function : updateView
-// Purpose  :
-// ================================================================
-void WasmOcctView::updateView()
-{
-  if (!myView.IsNull())
-  {
-    if (++myUpdateRequests == 1)
-    {
-      emscripten_async_call (onRedrawView, this, 0);
-    }
-  }
-}
-
-// ================================================================
-// Function : redrawView
-// Purpose  :
-// ================================================================
-void WasmOcctView::redrawView()
-{
-  if (!myView.IsNull())
-  {
-    FlushViewEvents (myContext, myView, true);
-  }
-}
-
-// ================================================================
-// Function : handleViewRedraw
-// Purpose  :
-// ================================================================
-void WasmOcctView::handleViewRedraw (const Handle(AIS_InteractiveContext)& theCtx,
-                                     const Handle(V3d_View)& theView)
-{
-  myUpdateRequests = 0;
-  AIS_ViewController::handleViewRedraw (theCtx, theView);
-  if (myToAskNextFrame)
-  {
-    // ask more frames
-    ++myUpdateRequests;
-    emscripten_async_call (onRedrawView, this, 0);
-  }
-}
-
-// ================================================================
-// Function : onResizeEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onResizeEvent (int theEventType, const EmscriptenUiEvent* theEvent)
-{
-  (void )theEventType; // EMSCRIPTEN_EVENT_RESIZE or EMSCRIPTEN_EVENT_CANVASRESIZED
-  (void )theEvent;
-  if (myView.IsNull())
-  {
-    return EM_FALSE;
-  }
-
-  Handle(Aspect_NeutralWindow) aWindow = Handle(Aspect_NeutralWindow)::DownCast (myView->Window());
-  Graphic3d_Vec2i aWinSizeOld, aWinSizeNew (jsCanvasSize());
-  if (aWinSizeNew.x() < 10 || aWinSizeNew.y() < 10)
-  {
-    Message::DefaultMessenger()->Send (TCollection_AsciiString ("Warning: invalid canvas size"), Message_Warning);
-  }
-  aWindow->Size (aWinSizeOld.x(), aWinSizeOld.y());
-  const float aPixelRatio = jsDevicePixelRatio();
-  if (aWinSizeNew != aWinSizeOld
-   || aPixelRatio != myDevicePixelRatio)
-  {
-    if (myDevicePixelRatio != aPixelRatio)
-    {
-      myDevicePixelRatio = aPixelRatio;
-      initPixelScaleRatio();
-    }
-    aWindow->SetSize (aWinSizeNew.x(), aWinSizeNew.y());
-    myView->MustBeResized();
-    myView->Invalidate();
-    myView->Redraw();
-    dumpGlInfo (true);
-  }
-  return EM_TRUE;
-}
-
-// ================================================================
-// Function : onMouseEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onMouseEvent (int theEventType, const EmscriptenMouseEvent* theEvent)
-{
-  if (myView.IsNull())
-  {
-    return EM_FALSE;
-  }
-
-  Graphic3d_Vec2i aWinSize;
-  myView->Window()->Size (aWinSize.x(), aWinSize.y());
-  const Graphic3d_Vec2i aNewPos = convertPointToBacking (Graphic3d_Vec2i (theEvent->canvasX, theEvent->canvasY));
-  Aspect_VKeyFlags aFlags = 0;
-  if (theEvent->ctrlKey  == EM_TRUE) { aFlags |= Aspect_VKeyFlags_CTRL;  }
-  if (theEvent->shiftKey == EM_TRUE) { aFlags |= Aspect_VKeyFlags_SHIFT; }
-  if (theEvent->altKey   == EM_TRUE) { aFlags |= Aspect_VKeyFlags_ALT;   }
-  if (theEvent->metaKey  == EM_TRUE) { aFlags |= Aspect_VKeyFlags_META;  }
-
-  const bool isEmulated = false;
-  const Aspect_VKeyMouse aButtons = WasmVKeys_MouseButtonsFromNative (theEvent->buttons);
-  switch (theEventType)
-  {
-    case EMSCRIPTEN_EVENT_MOUSEMOVE:
-    {
-      if ((aNewPos.x() < 0 || aNewPos.x() > aWinSize.x()
-        || aNewPos.y() < 0 || aNewPos.y() > aWinSize.y())
-        && PressedMouseButtons() == Aspect_VKeyMouse_NONE)
-      {
-        return EM_FALSE;
-      }
-      if (UpdateMousePosition (aNewPos, aButtons, aFlags, isEmulated))
-      {
-        updateView();
-      }
-      break;
-    }
-    case EMSCRIPTEN_EVENT_MOUSEDOWN:
-    case EMSCRIPTEN_EVENT_MOUSEUP:
-    {
-      if (aNewPos.x() < 0 || aNewPos.x() > aWinSize.x()
-       || aNewPos.y() < 0 || aNewPos.y() > aWinSize.y())
-      {
-        return EM_FALSE;
-      }
-      if (UpdateMouseButtons (aNewPos, aButtons, aFlags, isEmulated))
-      {
-        updateView();
-      }
-      break;
-    }
-    case EMSCRIPTEN_EVENT_CLICK:
-    case EMSCRIPTEN_EVENT_DBLCLICK:
-    {
-      if (aNewPos.x() < 0 || aNewPos.x() > aWinSize.x()
-       || aNewPos.y() < 0 || aNewPos.y() > aWinSize.y())
-      {
-        return EM_FALSE;
-      }
-      break;
-    }
-    case EMSCRIPTEN_EVENT_MOUSEENTER:
-    {
-      break;
-    }
-    case EMSCRIPTEN_EVENT_MOUSELEAVE:
-    {
-      // there is no SetCapture() support, so that mouse unclick events outside canvas will not arrive,
-      // so we have to forget current state...
-      if (UpdateMouseButtons (aNewPos, Aspect_VKeyMouse_NONE, aFlags, isEmulated))
-      {
-        updateView();
-      }
-      break;
-    }
-  }
-  return EM_TRUE;
-}
-
-// ================================================================
-// Function : onWheelEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onWheelEvent (int theEventType, const EmscriptenWheelEvent* theEvent)
-{
-  if (myView.IsNull()
-   || theEventType != EMSCRIPTEN_EVENT_WHEEL)
-  {
-    return EM_FALSE;
-  }
-
-  Graphic3d_Vec2i aWinSize;
-  myView->Window()->Size (aWinSize.x(), aWinSize.y());
-  const Graphic3d_Vec2i aNewPos = convertPointToBacking (Graphic3d_Vec2i (theEvent->mouse.canvasX, theEvent->mouse.canvasY));
-  if (aNewPos.x() < 0 || aNewPos.x() > aWinSize.x()
-   || aNewPos.y() < 0 || aNewPos.y() > aWinSize.y())
-  {
-    return EM_FALSE;
-  }
-
-  double aDelta = 0.0;
-  switch (theEvent->deltaMode)
-  {
-    case DOM_DELTA_PIXEL:
-    {
-      aDelta = theEvent->deltaY / (5.0 * myDevicePixelRatio);
-      break;
-    }
-    case DOM_DELTA_LINE:
-    {
-      aDelta = theEvent->deltaY * 8.0;
-      break;
-    }
-    case DOM_DELTA_PAGE:
-    {
-      aDelta = theEvent->deltaY >= 0.0 ? 24.0 : -24.0;
-      break;
-    }
-  }
-
-  if (UpdateZoom (Aspect_ScrollDelta (aNewPos, -aDelta)))
-  {
-    updateView();
-  }
-  return EM_TRUE;
-}
-
-// ================================================================
-// Function : onTouchEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onTouchEvent (int theEventType, const EmscriptenTouchEvent* theEvent)
-{
-  const double aClickTolerance = 5.0;
-  if (myView.IsNull())
-  {
-    return EM_FALSE;
-  }
-
-  Graphic3d_Vec2i aWinSize;
-  myView->Window()->Size (aWinSize.x(), aWinSize.y());
-  bool hasUpdates = false;
-  for (int aTouchIter = 0; aTouchIter < theEvent->numTouches; ++aTouchIter)
-  {
-    const EmscriptenTouchPoint& aTouch = theEvent->touches[aTouchIter];
-    if (!aTouch.isChanged)
-    {
-      continue;
-    }
-
-    const Standard_Size aTouchId = (Standard_Size )aTouch.identifier;
-    const Graphic3d_Vec2i aNewPos = convertPointToBacking (Graphic3d_Vec2i (aTouch.canvasX, aTouch.canvasY));
-    switch (theEventType)
-    {
-      case EMSCRIPTEN_EVENT_TOUCHSTART:
-      {
-        if (aNewPos.x() >= 0 && aNewPos.x() < aWinSize.x()
-         && aNewPos.y() >= 0 && aNewPos.y() < aWinSize.y())
-        {
-          hasUpdates = true;
-          AddTouchPoint (aTouchId, Graphic3d_Vec2d (aNewPos));
-          myClickTouch.From.SetValues (-1.0, -1.0);
-          if (myTouchPoints.Extent() == 1)
-          {
-            myClickTouch.From = Graphic3d_Vec2d (aNewPos);
-          }
-        }
-        break;
-      }
-      case EMSCRIPTEN_EVENT_TOUCHMOVE:
-      {
-        const int anOldIndex = myTouchPoints.FindIndex (aTouchId);
-        if (anOldIndex != 0)
-        {
-          hasUpdates = true;
-          UpdateTouchPoint (aTouchId, Graphic3d_Vec2d (aNewPos));
-          if (myTouchPoints.Extent() == 1
-           && (myClickTouch.From - Graphic3d_Vec2d (aNewPos)).cwiseAbs().maxComp() > aClickTolerance)
-          {
-            myClickTouch.From.SetValues (-1.0, -1.0);
-          }
-        }
-        break;
-      }
-      case EMSCRIPTEN_EVENT_TOUCHEND:
-      case EMSCRIPTEN_EVENT_TOUCHCANCEL:
-      {
-        if (RemoveTouchPoint (aTouchId))
-        {
-          if (myTouchPoints.IsEmpty()
-           && myClickTouch.From.minComp() >= 0.0)
-          {
-            if (myDoubleTapTimer.IsStarted()
-             && myDoubleTapTimer.ElapsedTime() <= myMouseDoubleClickInt)
-            {
-              myView->FitAll (0.01, false);
-              myView->Invalidate();
-            }
-            else
-            {
-              myDoubleTapTimer.Stop();
-              myDoubleTapTimer.Reset();
-              myDoubleTapTimer.Start();
-              SelectInViewer (Graphic3d_Vec2i (myClickTouch.From), false);
-            }
-          }
-          hasUpdates = true;
-        }
-        break;
-      }
-    }
-  }
-  if (hasUpdates)
-  {
-    updateView();
-  }
-  return hasUpdates || !myTouchPoints.IsEmpty() ? EM_TRUE : EM_FALSE;
-}
-
-// ================================================================
-// Function : onKeyDownEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onKeyDownEvent (int theEventType, const EmscriptenKeyboardEvent* theEvent)
-{
-  if (myView.IsNull()
-   || theEventType != EMSCRIPTEN_EVENT_KEYDOWN) // EMSCRIPTEN_EVENT_KEYPRESS
-  {
-    return EM_FALSE;
-  }
-
-  const double aTimeStamp = EventTime();
-  const Aspect_VKey aVKey = WasmVKeys_VirtualKeyFromNative (theEvent->keyCode);
-  if (aVKey == Aspect_VKey_UNKNOWN)
-  {
-    return EM_FALSE;
-  }
-
-  if (theEvent->repeat == EM_FALSE)
-  {
-    myKeys.KeyDown (aVKey, aTimeStamp);
-  }
-
-  if (Aspect_VKey2Modifier (aVKey) == 0)
-  {
-    // normal key
-  }
-  return EM_FALSE;
-}
-
-// ================================================================
-// Function : onKeyUpEvent
-// Purpose  :
-// ================================================================
-EM_BOOL WasmOcctView::onKeyUpEvent (int theEventType, const EmscriptenKeyboardEvent* theEvent)
-{
-  if (myView.IsNull()
-   || theEventType != EMSCRIPTEN_EVENT_KEYUP)
-  {
-    return EM_FALSE;
-  }
-
-  const double aTimeStamp = EventTime();
-  const Aspect_VKey aVKey = WasmVKeys_VirtualKeyFromNative (theEvent->keyCode);
-  if (aVKey == Aspect_VKey_UNKNOWN)
-  {
-    return EM_FALSE;
-  }
-
-  if (theEvent->repeat == EM_TRUE)
-  {
-    return EM_FALSE;
-  }
-
-  const unsigned int aModif = myKeys.Modifiers();
-  myKeys.KeyUp (aVKey, aTimeStamp);
-  if (Aspect_VKey2Modifier (aVKey) == 0)
-  {
-    // normal key released
-    switch (aVKey | aModif)
-    {
-      case Aspect_VKey_F:
-      {
-        myView->FitAll (0.01, false);
-        myView->Invalidate();
-        updateView();
-        return EM_TRUE;
-      }
-    }
-  }
-  return EM_FALSE;
-}

samples/webgl/WasmOcctView.h

@@ -1,157 +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 _WasmOcctView_HeaderFile
-#define _WasmOcctView_HeaderFile
-
-#include <AIS_InteractiveContext.hxx>
-#include <AIS_ViewController.hxx>
-#include <V3d_View.hxx>
-
-#include <emscripten.h>
-#include <emscripten/html5.h>
-
-class AIS_ViewCube;
-
-//! Sample class creating 3D Viewer within Emscripten canvas.
-class WasmOcctView : protected AIS_ViewController
-{
-public:
-  //! Default constructor.
-  WasmOcctView();
-
-  //! Destructor.
-  virtual ~WasmOcctView();
-
-  //! Main application entry point.
-  void run();
-
-  //! Return interactive context.
-  const Handle(AIS_InteractiveContext)& Context() const { return myContext; }
-
-  //! Return view.
-  const Handle(V3d_View)& View() const { return myView; }
-
-  //! Return device pixel ratio for handling high DPI displays.
-  float DevicePixelRatio() const { return myDevicePixelRatio; }
-
-private:
-
-  //! Create window.
-  void initWindow();
-
-  //! Create 3D Viewer.
-  bool initViewer();
-
-  //! Fill 3D Viewer with a DEMO items.
-  void initDemoScene();
-
-  //! Application event loop.
-  void mainloop();
-
-  //! Request view redrawing.
-  void updateView();
-
-  //! Flush events and redraw view.
-  void redrawView();
-
-  //! Handle view redraw.
-  virtual void handleViewRedraw (const Handle(AIS_InteractiveContext)& theCtx,
-                                 const Handle(V3d_View)& theView) override;
-
-  //! Dump WebGL context information.
-  void dumpGlInfo (bool theIsBasic);
-
-  //! Initialize pixel scale ratio.
-  void initPixelScaleRatio();
-
-  //! Return point from logical units to backing store.
-  Graphic3d_Vec2d convertPointToBacking (const Graphic3d_Vec2d& thePnt) const
-  {
-    return thePnt * myDevicePixelRatio;
-  }
-
-  //! Return point from logical units to backing store.
-  Graphic3d_Vec2i convertPointToBacking (const Graphic3d_Vec2i& thePnt) const
-  {
-    Graphic3d_Vec2d aPnt = Graphic3d_Vec2d (thePnt) * myDevicePixelRatio + Graphic3d_Vec2d (0.5);
-    return Graphic3d_Vec2i (aPnt);
-  }
-
-//! @name Emscripten callbacks
-private:
-  //! Window resize event.
-  EM_BOOL onResizeEvent (int theEventType, const EmscriptenUiEvent* theEvent);
-
-  //! Mouse event.
-  EM_BOOL onMouseEvent (int theEventType, const EmscriptenMouseEvent* theEvent);
-
-  //! Scroll event.
-  EM_BOOL onWheelEvent (int theEventType, const EmscriptenWheelEvent* theEvent);
-
-  //! Touch event.
-  EM_BOOL onTouchEvent (int theEventType, const EmscriptenTouchEvent* theEvent);
-
-  //! Key down event.
-  EM_BOOL onKeyDownEvent (int theEventType, const EmscriptenKeyboardEvent* theEvent);
-
-  //! Key up event.
-  EM_BOOL onKeyUpEvent (int theEventType, const EmscriptenKeyboardEvent* theEvent);
-
-//! @name Emscripten callbacks (static functions)
-private:
-
-  static EM_BOOL onResizeCallback (int theEventType, const EmscriptenUiEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onResizeEvent (theEventType, theEvent); }
-
-  static void onRedrawView (void* theView)
-  { return ((WasmOcctView* )theView)->redrawView(); }
-
-  static EM_BOOL onMouseCallback (int theEventType, const EmscriptenMouseEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onMouseEvent (theEventType, theEvent); }
-
-  static EM_BOOL onWheelCallback (int theEventType, const EmscriptenWheelEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onWheelEvent (theEventType, theEvent); }
-
-  static EM_BOOL onTouchCallback (int theEventType, const EmscriptenTouchEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onTouchEvent (theEventType, theEvent); }
-
-  static EM_BOOL onKeyDownCallback (int theEventType, const EmscriptenKeyboardEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onKeyDownEvent (theEventType, theEvent); }
-
-  static EM_BOOL onKeyUpCallback (int theEventType, const EmscriptenKeyboardEvent* theEvent, void* theView)
-  { return ((WasmOcctView* )theView)->onKeyUpEvent (theEventType, theEvent); }
-
-private:
-
-  Handle(AIS_InteractiveContext) myContext;          //!< interactive context
-  Handle(V3d_View)               myView;             //!< 3D view
-  Handle(Prs3d_TextAspect)       myTextStyle;        //!< text style for OSD elements
-  Handle(AIS_ViewCube)           myViewCube;         //!< view cube object
-  TCollection_AsciiString        myCanvasId;         //!< canvas element id on HTML page
-  Aspect_Touch                   myClickTouch;       //!< single touch position for handling clicks
-  OSD_Timer                      myDoubleTapTimer;   //!< timer for handling double tap
-  float                          myDevicePixelRatio; //!< device pixel ratio for handling high DPI displays
-  unsigned int                   myUpdateRequests;   //!< counter for unhandled update requests
-
-};
-
-#endif // _WasmOcctView_HeaderFile

samples/webgl/WasmVKeys.h

@@ -1,264 +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 _WasmVKeys_HeaderFile
-#define _WasmVKeys_HeaderFile
-
-#include <Aspect_VKey.hxx>
-
-#include <emscripten/key_codes.h>
-
-//! Convert Emscripten mouse buttons into Aspect_VKeyMouse.
-inline Aspect_VKeyMouse WasmVKeys_MouseButtonsFromNative (unsigned short theButtons)
-{
-  Aspect_VKeyMouse aButtons = Aspect_VKeyMouse_NONE;
-  if ((theButtons & 0x1) != 0)
-  {
-    aButtons |= Aspect_VKeyMouse_LeftButton;
-  }
-  if ((theButtons & 0x2) != 0)
-  {
-    aButtons |= Aspect_VKeyMouse_RightButton;
-  }
-  if ((theButtons & 0x4) != 0)
-  {
-    aButtons |= Aspect_VKeyMouse_MiddleButton;
-  }
-  return aButtons;
-}
-
-//! Convert DOM virtual key into Aspect_VKey.
-inline Aspect_VKey WasmVKeys_VirtualKeyFromNative (Standard_Integer theKey)
-{
-  if (theKey >= DOM_VK_0
-   && theKey <= DOM_VK_9)
-  {
-    // numpad keys
-    return Aspect_VKey((theKey - DOM_VK_0) + Aspect_VKey_0);
-  }
-  if (theKey >= DOM_VK_A
-   && theKey <= DOM_VK_Z)
-  {
-    // main latin alphabet keys
-    return Aspect_VKey((theKey - DOM_VK_A) + Aspect_VKey_A);
-  }
-  if (theKey >= DOM_VK_F1
-   && theKey <= DOM_VK_F24)
-  {
-    // special keys
-    if (theKey <= DOM_VK_F12)
-    {
-      return Aspect_VKey((theKey - DOM_VK_F1) + Aspect_VKey_F1);
-    }
-    return Aspect_VKey_UNKNOWN;
-  }
-  if (theKey >= DOM_VK_NUMPAD0
-   && theKey <= DOM_VK_NUMPAD9)
-  {
-    // numpad keys
-    return Aspect_VKey((theKey - DOM_VK_NUMPAD0) + Aspect_VKey_Numpad0);
-  }
-
-  switch (theKey)
-  {
-    case DOM_VK_CANCEL:
-    case DOM_VK_HELP:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_BACK_SPACE:
-      return Aspect_VKey_Backspace;
-    case DOM_VK_TAB:
-      return Aspect_VKey_Tab;
-    case DOM_VK_CLEAR:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_RETURN:
-    case DOM_VK_ENTER:
-      return Aspect_VKey_Enter;
-    case DOM_VK_SHIFT:
-      return Aspect_VKey_Shift;
-    case DOM_VK_CONTROL:
-      return Aspect_VKey_Control;
-    case DOM_VK_ALT:
-      return Aspect_VKey_Alt;
-    case DOM_VK_PAUSE:
-    case DOM_VK_CAPS_LOCK:
-    case DOM_VK_KANA:
-    //case DOM_VK_HANGUL:
-    case DOM_VK_EISU:
-    case DOM_VK_JUNJA:
-    case DOM_VK_FINAL:
-    case DOM_VK_HANJA:
-    //case DOM_VK_KANJI:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_ESCAPE:
-      return Aspect_VKey_Escape;
-    case DOM_VK_CONVERT:
-    case DOM_VK_NONCONVERT:
-    case DOM_VK_ACCEPT:
-    case DOM_VK_MODECHANGE:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_SPACE:
-      return Aspect_VKey_Space;
-    case DOM_VK_PAGE_UP:
-      return Aspect_VKey_PageUp;
-    case DOM_VK_PAGE_DOWN:
-      return Aspect_VKey_PageDown;
-    case DOM_VK_END:
-      return Aspect_VKey_End;
-    case DOM_VK_HOME:
-      return Aspect_VKey_Home;
-    case DOM_VK_LEFT:
-      return Aspect_VKey_Left;
-    case DOM_VK_UP:
-      return Aspect_VKey_Up;
-    case DOM_VK_RIGHT:
-      return Aspect_VKey_Right;
-    case DOM_VK_DOWN:
-      return Aspect_VKey_Down;
-    case DOM_VK_SELECT:
-    case DOM_VK_PRINT:
-    case DOM_VK_EXECUTE:
-    case DOM_VK_PRINTSCREEN:
-    case DOM_VK_INSERT:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_DELETE:
-      return Aspect_VKey_Delete;
-    case DOM_VK_COLON:
-      return Aspect_VKey_Comma;
-    case DOM_VK_SEMICOLON:
-      return Aspect_VKey_Semicolon;
-    case DOM_VK_LESS_THAN:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_EQUALS:
-      return Aspect_VKey_Equal;
-    case DOM_VK_GREATER_THAN:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_QUESTION_MARK:
-      return Aspect_VKey_Slash;
-    case DOM_VK_AT: // @ key
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_WIN:
-      return Aspect_VKey_Meta;
-    case DOM_VK_CONTEXT_MENU:
-    case DOM_VK_SLEEP:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_MULTIPLY:
-      return Aspect_VKey_NumpadMultiply;
-    case DOM_VK_ADD:
-      return Aspect_VKey_NumpadAdd;
-    case DOM_VK_SEPARATOR:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_SUBTRACT:
-      return Aspect_VKey_NumpadSubtract;
-    case DOM_VK_DECIMAL:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_DIVIDE:
-      return Aspect_VKey_NumpadDivide;
-    case DOM_VK_NUM_LOCK:
-      return Aspect_VKey_Numlock;
-    case DOM_VK_SCROLL_LOCK:
-      return Aspect_VKey_Scroll;
-    case DOM_VK_WIN_OEM_FJ_JISHO:
-    case DOM_VK_WIN_OEM_FJ_MASSHOU:
-    case DOM_VK_WIN_OEM_FJ_TOUROKU:
-    case DOM_VK_WIN_OEM_FJ_LOYA:
-    case DOM_VK_WIN_OEM_FJ_ROYA:
-    case DOM_VK_CIRCUMFLEX:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_EXCLAMATION:
-    case DOM_VK_DOUBLE_QUOTE:
-    //case DOM_VK_HASH:
-    case DOM_VK_DOLLAR:
-    case DOM_VK_PERCENT:
-    case DOM_VK_AMPERSAND:
-    case DOM_VK_UNDERSCORE:
-    case DOM_VK_OPEN_PAREN:
-    case DOM_VK_CLOSE_PAREN:
-    case DOM_VK_ASTERISK:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_PLUS:
-      return Aspect_VKey_Plus;
-    case DOM_VK_PIPE:
-    case DOM_VK_HYPHEN_MINUS:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_OPEN_CURLY_BRACKET:
-      return Aspect_VKey_BracketLeft;
-    case DOM_VK_CLOSE_CURLY_BRACKET:
-      return Aspect_VKey_BracketRight;
-    case DOM_VK_TILDE:
-      return Aspect_VKey_Tilde;
-    case DOM_VK_VOLUME_MUTE:
-      return Aspect_VKey_VolumeMute;
-    case DOM_VK_VOLUME_DOWN:
-      return Aspect_VKey_VolumeDown;
-    case DOM_VK_VOLUME_UP:
-      return Aspect_VKey_VolumeUp;
-    case DOM_VK_COMMA:
-      return Aspect_VKey_Comma;
-    case DOM_VK_PERIOD:
-      return Aspect_VKey_Period;
-    case DOM_VK_SLASH:
-      return Aspect_VKey_Slash;
-    case DOM_VK_BACK_QUOTE:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_OPEN_BRACKET:
-      return Aspect_VKey_BracketLeft;
-    case DOM_VK_BACK_SLASH:
-      return Aspect_VKey_Backslash;
-    case DOM_VK_CLOSE_BRACKET:
-      return Aspect_VKey_BracketRight;
-    case DOM_VK_QUOTE:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_META:
-      return Aspect_VKey_Meta;
-    case DOM_VK_ALTGR:
-      return Aspect_VKey_Alt;
-    case DOM_VK_WIN_ICO_HELP:
-    case DOM_VK_WIN_ICO_00:
-    case DOM_VK_WIN_ICO_CLEAR:
-    case DOM_VK_WIN_OEM_RESET:
-    case DOM_VK_WIN_OEM_JUMP:
-    case DOM_VK_WIN_OEM_PA1:
-    case DOM_VK_WIN_OEM_PA2:
-    case DOM_VK_WIN_OEM_PA3:
-    case DOM_VK_WIN_OEM_WSCTRL:
-    case DOM_VK_WIN_OEM_CUSEL:
-    case DOM_VK_WIN_OEM_ATTN:
-    case DOM_VK_WIN_OEM_FINISH:
-    case DOM_VK_WIN_OEM_COPY:
-    case DOM_VK_WIN_OEM_AUTO:
-    case DOM_VK_WIN_OEM_ENLW:
-    case DOM_VK_WIN_OEM_BACKTAB:
-    case DOM_VK_ATTN:
-    case DOM_VK_CRSEL:
-    case DOM_VK_EXSEL:
-    case DOM_VK_EREOF:
-      return Aspect_VKey_UNKNOWN;
-    case DOM_VK_PLAY:
-      return Aspect_VKey_MediaPlayPause;
-    case DOM_VK_ZOOM:
-    case DOM_VK_PA1:
-    case DOM_VK_WIN_OEM_CLEAR:
-      return Aspect_VKey_UNKNOWN;
-  }
-  return Aspect_VKey_UNKNOWN;
-}
-
-#endif // _WasmVKeys_HeaderFile

samples/webgl/main.cpp

@@ -1,66 +0,0 @@
-#include <iostream>
-
-#include "WasmOcctView.h"
-
-#include <Message.hxx>
-#include <Message_Messenger.hxx>
-#include <OSD_MemInfo.hxx>
-#include <OSD_Parallel.hxx>
-
-#include <AIS_Shape.hxx>
-#include <BRepTools.hxx>
-#include <BRep_Builder.hxx>
-#include <Standard_ArrayStreamBuffer.hxx>
-
-#include <emscripten.h>
-#include <emscripten/html5.h>
-
-//! Global viewer instance.
-static WasmOcctView aViewer;
-
-//! File data read event.
-extern "C" void onFileDataRead (void* theOpaque, void* theBuffer, int theDataLen)
-{
-  const char* aName = theOpaque != NULL ? (const char* )theOpaque : "";
-  {
-    AIS_ListOfInteractive aShapes;
-    aViewer.Context()->DisplayedObjects (AIS_KOI_Shape, -1, aShapes);
-    for (AIS_ListOfInteractive::Iterator aShapeIter (aShapes); aShapeIter.More(); aShapeIter.Next())
-    {
-      aViewer.Context()->Remove (aShapeIter.Value(), false);
-    }
-  }
-
-  Standard_ArrayStreamBuffer aStreamBuffer ((const char* )theBuffer, theDataLen);
-  std::istream aStream (&aStreamBuffer);
-  TopoDS_Shape aShape;
-  BRep_Builder aBuilder;
-  BRepTools::Read (aShape, aStream, aBuilder);
-
-  Handle(AIS_Shape) aShapePrs = new AIS_Shape (aShape);
-  aShapePrs->SetMaterial (Graphic3d_NOM_SILVER);
-  aViewer.Context()->Display (aShapePrs, AIS_Shaded, 0, false);
-  aViewer.View()->FitAll (0.01, false);
-  aViewer.View()->Redraw();
-  Message::DefaultMessenger()->Send (TCollection_AsciiString("Loaded file ") + aName, Message_Info);
-  Message::DefaultMessenger()->Send (OSD_MemInfo::PrintInfo(), Message_Trace);
-}
-
-//! File read error event.
-static void onFileReadFailed (void* theOpaque)
-{
-  const char* aName = (const char* )theOpaque;
-  Message::DefaultMessenger()->Send (TCollection_AsciiString("Error: unable to load file ") + aName, Message_Fail);
-}
-
-int main()
-{
-  Message::DefaultMessenger()->Printers().First()->SetTraceLevel (Message_Trace);
-  Message::DefaultMessenger()->Send (TCollection_AsciiString("NbLogicalProcessors: ") + OSD_Parallel::NbLogicalProcessors(), Message_Trace);
-  aViewer.run();
-  Message::DefaultMessenger()->Send (OSD_MemInfo::PrintInfo(), Message_Trace);
-
-  // load some file
-  emscripten_async_wget_data ("samples/Ball.brep", (void* )"samples/Ball.brep", onFileDataRead, onFileReadFailed);
-  return 0;
-}

samples/webgl/occt-webgl-sample.html

@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html lang=en-us>
-<head>
-<meta charset=utf-8><meta content="text/html; charset=utf-8" http-equiv=Content-Type>
-<link rel="shortcut icon" href="lamp.ico" type="image/x-icon" />
-<title>OCCT WebGL Viewer Sample</title>
-</head>
-<body>
-
-<h2>OCCT WebGL Viewer Sample</h2>
-<div>
-  <canvas id=canvas oncontextmenu=event.preventDefault() tabindex=-1 style="border:0 none;background-color:#000" width="409" height="409"></canvas>
-  <img id=occlogo src="OCC_logo.png" style="position: absolute; left: 20px; top: 0px; z-index: 2;" />
-</div>
-
-<div><label for="fileInput">Choose BREP file to upload: </label><input type="file" id="fileInput" accept=".brep"></div>
-<h4>Console output:</h4>
-<p id="output"></p>
-<script>
-//! Resize canvas to fit into window.
-function updateCanvasSize()
-{
-  // size of canvas in logical (density-independent) units
-  var aSizeX = Math.min (window.innerWidth,  window.screen.availWidth);
-  var aSizeY = Math.min (window.innerHeight, window.screen.availHeight);
-  aSizeX = Math.max (300, aSizeX - 30);
-  aSizeY = Math.max (300, aSizeY / 2);
-  canvas.style.width  = aSizeX + "px";
-  canvas.style.height = aSizeY + "px";
-
-  // drawing buffer size (aka backing store)
-  var aDevicePixelRatio = window.devicePixelRatio || 1;
-  canvas.width  = aSizeX * aDevicePixelRatio;
-  canvas.height = aSizeY * aDevicePixelRatio;
-
-  occlogo.style.top = (aSizeY - 30) + "px";
-}
-window.onresize = updateCanvasSize;
-updateCanvasSize();
-
-//! Check browser support.
-function isWasmSupported()
-{
-  try {
-    if (typeof WebAssembly === "object"
-     && typeof WebAssembly.instantiate === "function") {
-      const aDummyModule = new WebAssembly.Module (Uint8Array.of (0x0, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00));
-      if (aDummyModule instanceof WebAssembly.Module)
-      {
-        return new WebAssembly.Instance(aDummyModule) instanceof WebAssembly.Instance;
-      }
-    }
-  } catch (e) {}
-  return false;
-}
-if (!isWasmSupported())
-{
-  var anElement = document.getElementById('output');
-  anElement.innerHTML += "Browser is too old - WebAssembly support is missing!<br>Please check updates or install a modern browser.<br>";
-}
-
-//! Define OCCT WebGL Viewer module.
-var Module =
-{
-  print: (function() {
-    var anElement = document.getElementById('output');
-    return function(theText) { anElement.innerHTML += theText + "<br>"; };
-  })(),
-  printErr: function(theText) {
-    //var anElement = document.getElementById('output');
-    //anElement.innerHTML += theText + "<br>";
-  },
-  canvas: (function() {
-    var aCanvas = document.getElementById('canvas');
-    return aCanvas;
-  })()
-};
-
-//! Handle file uploading.
-fileInput.onchange = function()
-{
-  if (fileInput.files.length == 0) { return; }
-  // Warning! Entire file is pre-loaded into memory.
-  var aFile = fileInput.files[0];
-  var aReader = new FileReader();
-  aReader.onload = function()
-  {
-    var aDataArray = new Uint8Array (aReader.result);
-    var aNameArray = new Uint8Array (toUtf8Array (aFile.name));
-    const aDataBuffer = Module._malloc(aDataArray.length);
-    const aNameBuffer = Module._malloc(aNameArray.length);
-    Module.HEAPU8.set(aNameArray, aNameBuffer);
-    Module.HEAPU8.set(aDataArray, aDataBuffer);
-    Module.ccall('onFileDataRead', null, ['number', 'number', 'number'], [aNameBuffer, aDataBuffer, aDataArray.length]);
-    Module._free(aDataBuffer);
-    Module._free(aNameBuffer);
-    fileInput.value = '';
-  };
-  aReader.readAsArrayBuffer(aFile);
-};
-
-//! Convert string into UTF-8 array.
-function toUtf8Array (theText)
-{
-  var aRes = [];
-  for (var aCharIter = 0; aCharIter < theText.length; ++aCharIter)
-  {
-    var aCharCode = theText.charCodeAt (aCharIter);
-    if (aCharCode < 0x80)
-    {
-      aRes.push (aCharCode);
-    }
-    else if (aCharCode < 0x800)
-    {
-      aRes.push (0xc0 | (aCharCode >> 6), 0x80 | (aCharCode & 0x3f));
-    }
-    else if (aCharCode < 0xd800 || aCharCode >= 0xe000)
-    {
-      aRes.push (0xe0 | (aCharCode >> 12), 0x80 | ((aCharCode>>6) & 0x3f), 0x80 | (aCharCode & 0x3f));
-    }
-    else
-    {
-      ++aCharIter;
-      aCharCode = 0x10000 + (((aCharCode & 0x3ff)<<10) | (theText.charCodeAt (aCharIter) & 0x3ff));
-      aRes.push(0xf0 | (aCharCode >>18), 0x80 | ((aCharCode>>12) & 0x3f), 0x80 | ((aCharCode>>6) & 0x3f), 0x80 | (aCharCode & 0x3f));
-    }
-  }
-  return aRes;
-}
-</script>
-<script type="text/javascript" src="occt-webgl-sample.js" charset="utf-8"></script>
-</body>
-</html>

src/AIS/AIS_Circle.cxx

@@ -197,7 +197,7 @@ void AIS_Circle::UnsetColor()
   }
   else
   {
-    Quantity_Color CC = Quantity_NOC_YELLOW;
+    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);

src/AIS/AIS_ColorScale.cxx

@@ -415,6 +415,11 @@ Standard_Boolean AIS_ColorScale::FindColor (const Standard_Real theValue,
 //=======================================================================
 Standard_Integer AIS_ColorScale::computeMaxLabelWidth (const TColStd_SequenceOfExtendedString& theLabels) const
 {
+  {
+    Handle(V3d_Viewer) aViewer = GetContext()->CurrentViewer();
+    aViewer->InitActiveViews(); // for AIS_ColorScale::TextSize()
+  }
+
   Standard_Integer aWidthMax = 0;
   for (TColStd_SequenceOfExtendedString::Iterator aLabIter (theLabels); aLabIter.More(); aLabIter.Next())
   {

src/AIS/AIS_ColoredDrawer.hxx

@@ -26,7 +26,6 @@ public:
   //! Default constructor.
   AIS_ColoredDrawer (const Handle(Prs3d_Drawer)& theLink)
   : myIsHidden    (false),
-    myHasOwnMaterial(false),
     myHasOwnColor (false),
     myHasOwnTransp(false),
     myHasOwnWidth (false)
@@ -37,10 +36,6 @@ public:
   bool IsHidden() const                                 { return myIsHidden;     }
   void SetHidden (const bool theToHide)                 { myIsHidden = theToHide;}
 
-  bool HasOwnMaterial() const                           { return myHasOwnMaterial;  }
-  void UnsetOwnMaterial()                               { myHasOwnMaterial = false; }
-  void SetOwnMaterial()                                 { myHasOwnMaterial = true;  }
-
   bool HasOwnColor() const                              { return myHasOwnColor;  }
   void UnsetOwnColor()                                  { myHasOwnColor = false; }
   void SetOwnColor (const Quantity_Color& /*theColor*/) { myHasOwnColor = true;  }
@@ -56,7 +51,6 @@ public:
 public:  //! @name list of overridden properties
 
   bool myIsHidden;
-  bool myHasOwnMaterial;
   bool myHasOwnColor;
   bool myHasOwnTransp;
   bool myHasOwnWidth;

src/AIS/AIS_ColoredShape.cxx

@@ -333,11 +333,7 @@ void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
   for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
   {
     const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
-    if (aDrawer->HasOwnMaterial())
-    {
-      continue;
-    }
-
+    //if (aDrawer->HasOwnMaterial()) continue;
     if (aDrawer->HasOwnShadingAspect())
     {
       setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), aDrawer->HasOwnTransparency());

src/AIS/AIS_ConnectedInteractive.cxx

@@ -79,12 +79,6 @@ void AIS_ConnectedInteractive::connect (const Handle(AIS_InteractiveObject)& the
 
   if (!myReference.IsNull())
   {
-    if (myReference->HasInteractiveContext()
-     && myReference->GetContext()->DisplayStatus (myReference) != AIS_DS_None)
-    {
-      myReference.Nullify();
-      throw Standard_ProgramError("AIS_ConnectedInteractive::Connect() - connected object should NOT be displayed in context");
-    }
     myTypeOfPresentation3d = myReference->TypeOfPresentation3d();
   }
   setLocalTransformation (theLocation);

src/AIS/AIS_FixRelation.cxx

@@ -300,7 +300,7 @@ void AIS_FixRelation::ComputeVertex(const TopoDS_Vertex& /*FixVertex*/,
       gp_Pln pln(myPlane->Pln());
       gp_Dir dir(pln.XAxis().Direction());
       gp_Vec transvec = gp_Vec(dir)*myArrowSize;
-      curpos = myPntAttach.Translated(transvec);
+      curpos = myPntAttach.Translated(transvec);;
       myPosition = curpos;
       myAutomaticPosition = Standard_True;
   }

src/AIS/AIS_FixRelation.hxx

@@ -65,7 +65,7 @@ public:
   
   //! Returns true if the Interactive Objects in the relation
   //! are movable.
-  virtual Standard_Boolean IsMovable() const Standard_OVERRIDE { return Standard_True; }
+    virtual Standard_Boolean IsMovable() const Standard_OVERRIDE;
   
   //! computes the presentation according to a point of view
   //! given by <aProjector>.
@@ -109,4 +109,6 @@ private:
 
 };
 
+#include <AIS_FixRelation.lxx>
+
 #endif // _AIS_FixRelation_HeaderFile

src/AIS/AIS_FixRelation.lxx

@@ -0,0 +1,24 @@
+// Created on: 1997-02-28
+// Created by: Jean-Pierre COMBE
+// Copyright (c) 1997-1999 Matra Datavision
+// Copyright (c) 1999-2014 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.
+
+//=======================================================================
+//function : IsMovable
+//purpose  : 
+//=======================================================================
+inline Standard_Boolean AIS_FixRelation::IsMovable() const 
+{
+  return Standard_True;
+}

src/AIS/AIS_GraphicTool.cxx

@@ -92,7 +92,7 @@ Aspect_TypeOfLine AIS_GraphicTool::GetLineType (const Handle(Prs3d_Drawer)& Dr,
 				 const AIS_TypeOfAttribute Att)
 {
   Handle(Prs3d_LineAspect) LA = GetLineAspect(Dr,Att);
-  return LA->Aspect()->Type();
+  return LA->Aspect()->Type();;
 }
 
 

src/AIS/AIS_IdenticRelation.cxx

@@ -560,7 +560,7 @@ void AIS_IdenticRelation::ComputeTwoLinesPresentation(const Handle(Prs3d_Present
       gp_Pln pln(myPlane->Pln());
       gp_Dir dir(pln.XAxis().Direction());
       gp_Vec transvec = gp_Vec(dir)*myArrowSize;
-      curpos = myFAttach.Translated(transvec);
+      curpos = myFAttach.Translated(transvec);;
       myPosition = curpos;
       myAutomaticPosition = Standard_True;
     }

src/AIS/AIS_IdenticRelation.hxx

@@ -58,7 +58,7 @@ public:
   void ClearUsers() { myUsers.Clear(); }
 
   //! Returns true if the interactive object is movable.
-  virtual Standard_Boolean IsMovable() const Standard_OVERRIDE { return Standard_True; }
+    virtual Standard_Boolean IsMovable() const Standard_OVERRIDE;
   
   //! computes the presentation according to a point of view
   //! given by <aProjector>.
@@ -134,4 +134,11 @@ private:
 
 };
 
+
+#include <AIS_IdenticRelation.lxx>
+
+
+
+
+
 #endif // _AIS_IdenticRelation_HeaderFile

src/AIS/AIS_IdenticRelation.lxx

@@ -0,0 +1,24 @@
+// Created on: 1997-03-04
+// Created by: Jean-Pierre COMBE
+// Copyright (c) 1997-1999 Matra Datavision
+// Copyright (c) 1999-2014 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.
+
+//=======================================================================
+//function : IsMovable
+//purpose  : 
+//=======================================================================
+inline Standard_Boolean AIS_IdenticRelation::IsMovable() const 
+{
+  return Standard_True;
+}

src/AIS/AIS_InteractiveContext.cxx

@@ -65,15 +65,13 @@ namespace
   typedef NCollection_DataMap<Handle(SelectMgr_SelectableObject), Handle(SelectMgr_IndexedMapOfOwner)>::Iterator AIS_MapIteratorOfMapOfObjectOwners;
 
   //! Initialize default highlighting attributes.
-  static void initDefaultHilightAttributes (const Handle(Prs3d_Drawer)& theDrawer,
-                                            const Quantity_Color& theColor)
+  static void initDefaultHilightAttributes (const Handle(Prs3d_Drawer)& theDrawer)
   {
     theDrawer->SetMethod (Aspect_TOHM_COLOR);
     theDrawer->SetDisplayMode (0);
-    theDrawer->SetColor (theColor);
 
-    theDrawer->SetupOwnShadingAspect();
-    theDrawer->SetupOwnPointAspect();
+    theDrawer->SetPointAspect (new Prs3d_PointAspect (Aspect_TOM_POINT, Quantity_NOC_BLACK, 1.0));
+    *theDrawer->PointAspect()->Aspect() = *theDrawer->Link()->PointAspect()->Aspect();
     theDrawer->SetLineAspect (new Prs3d_LineAspect (Quantity_NOC_BLACK, Aspect_TOL_SOLID, 1.0));
     *theDrawer->LineAspect()->Aspect() = *theDrawer->Link()->LineAspect()->Aspect();
     theDrawer->SetWireAspect (new Prs3d_LineAspect (Quantity_NOC_BLACK, Aspect_TOL_SOLID, 1.0));
@@ -84,24 +82,6 @@ namespace
     *theDrawer->FreeBoundaryAspect()->Aspect() = *theDrawer->Link()->FreeBoundaryAspect()->Aspect();
     theDrawer->SetUnFreeBoundaryAspect (new Prs3d_LineAspect (Quantity_NOC_BLACK, Aspect_TOL_SOLID, 1.0));
     *theDrawer->UnFreeBoundaryAspect()->Aspect() = *theDrawer->Link()->UnFreeBoundaryAspect()->Aspect();
-    theDrawer->SetDatumAspect (new Prs3d_DatumAspect());
-
-    theDrawer->ShadingAspect()->SetColor (theColor);
-    theDrawer->WireAspect()->SetColor (theColor);
-    theDrawer->LineAspect()->SetColor (theColor);
-    theDrawer->PlaneAspect()->ArrowAspect()->SetColor (theColor);
-    theDrawer->PlaneAspect()->IsoAspect()->SetColor (theColor);
-    theDrawer->PlaneAspect()->EdgesAspect()->SetColor (theColor);
-    theDrawer->FreeBoundaryAspect()->SetColor (theColor);
-    theDrawer->UnFreeBoundaryAspect()->SetColor (theColor);
-    theDrawer->PointAspect()->SetColor (theColor);
-    for (Standard_Integer aPartIter = 0; aPartIter < Prs3d_DP_None; ++aPartIter)
-    {
-      if (Handle(Prs3d_LineAspect) aLineAsp = theDrawer->DatumAspect()->LineAspect ((Prs3d_DatumParts )aPartIter))
-      {
-        aLineAsp->SetColor (theColor);
-      }
-    }
 
     theDrawer->WireAspect()->SetWidth (2.0);
     theDrawer->LineAspect()->SetWidth (2.0);
@@ -150,26 +130,30 @@ myIsAutoActivateSelMode(Standard_True)
   {
     const Handle(Prs3d_Drawer)& aStyle = myStyles[Prs3d_TypeOfHighlight_Dynamic];
     aStyle->Link (myDefaultDrawer);
-    initDefaultHilightAttributes (aStyle, Quantity_NOC_CYAN1);
+    initDefaultHilightAttributes (aStyle);
     aStyle->SetZLayer(Graphic3d_ZLayerId_Top);
+    aStyle->SetColor (Quantity_NOC_CYAN1);
   }
   {
     const Handle(Prs3d_Drawer)& aStyle = myStyles[Prs3d_TypeOfHighlight_LocalDynamic];
     aStyle->Link (myDefaultDrawer);
-    initDefaultHilightAttributes (aStyle, Quantity_NOC_CYAN1);
+    initDefaultHilightAttributes (aStyle);
     aStyle->SetZLayer(Graphic3d_ZLayerId_Topmost);
+    aStyle->SetColor (Quantity_NOC_CYAN1);
   }
   {
     const Handle(Prs3d_Drawer)& aStyle = myStyles[Prs3d_TypeOfHighlight_Selected];
     aStyle->Link (myDefaultDrawer);
-    initDefaultHilightAttributes (aStyle, Quantity_NOC_GRAY80);
+    initDefaultHilightAttributes (aStyle);
     aStyle->SetZLayer(Graphic3d_ZLayerId_UNKNOWN);
+    aStyle->SetColor (Quantity_NOC_GRAY80);
   }
   {
     const Handle(Prs3d_Drawer)& aStyle = myStyles[Prs3d_TypeOfHighlight_LocalSelected];
     aStyle->Link (myDefaultDrawer);
-    initDefaultHilightAttributes (aStyle, Quantity_NOC_GRAY80);
+    initDefaultHilightAttributes (aStyle);
     aStyle->SetZLayer(Graphic3d_ZLayerId_UNKNOWN);
+    aStyle->SetColor (Quantity_NOC_GRAY80);
   }
   {
     const Handle(Prs3d_Drawer)& aStyle = myStyles[Prs3d_TypeOfHighlight_SubIntensity];
@@ -2554,15 +2538,6 @@ void AIS_InteractiveContext::SetTransformPersistence (const Handle(AIS_Interacti
                                                       const Handle(Graphic3d_TransformPers)& theTrsfPers)
 {
   theObject->SetTransformPersistence (theTrsfPers);
-  UpdateOnTransformPersistence (theObject);
-}
-
-//=======================================================================
-//function : UpdateOnTransformPersistence
-//purpose  :
-//=======================================================================
-void AIS_InteractiveContext::UpdateOnTransformPersistence (const Handle(AIS_InteractiveObject)& theObject)
-{
   if (!myObjects.IsBound (theObject))
   {
     return;

src/AIS/AIS_InteractiveContext.hxx

@@ -344,11 +344,6 @@ public: //! @name object local transformation management
   Standard_EXPORT void SetTransformPersistence (const Handle(AIS_InteractiveObject)& theObject,
                                                 const Handle(Graphic3d_TransformPers)& theTrsfPers);
 
-  //! Updates displayed interactive object by checking and recomputing its flagged as "to be recomputed" presentation and selection structures.
-  //! This method does not force any recomputation on its own.
-  //! The method recomputes selections even if they are loaded without activation in particular selector.
-  Standard_EXPORT void UpdateOnTransformPersistence (const Handle(AIS_InteractiveObject)& theIObj);
-
   Standard_DEPRECATED("This method is deprecated - SetTransformPersistence() taking Graphic3d_TransformPers should be called instead")
   void SetTransformPersistence (const Handle(AIS_InteractiveObject)& theObj,
                                 const Graphic3d_TransModeFlags&      theFlag,
@@ -1221,9 +1216,6 @@ public: //! @name sub-intensity management (deprecated)
   //! @param theSelection an instance of the selection
   void SetSelection (const Handle(AIS_Selection)& theSelection) { mySelection = theSelection; }
 
-  //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
-
 protected: //! @name internal methods
 
   Standard_EXPORT void GetDefModes (const Handle(AIS_InteractiveObject)& anIobj, Standard_Integer& Dmode, Standard_Integer& HiMod, Standard_Integer& SelMode) const;

src/AIS/AIS_InteractiveContext_3.cxx

@@ -86,42 +86,3 @@ void AIS_InteractiveContext::PolygonOffsets(
     anObj->PolygonOffsets( aMode, aFactor, aUnits );
 }
 // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
-
-//=======================================================================
-//function : DumpJson
-//purpose  : 
-//=======================================================================
-void AIS_InteractiveContext::DumpJson (Standard_OStream& theOStream, Standard_Integer) const
-{
-  OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)
-
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myObjects.Size())
-
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, mgrSelector.get())
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myMainPM.get())
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myMainVwr.get())
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myMainSel.get())
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myLastActiveView)
-
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myLastPicked.get())
-
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myToHilightSelected)
-
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, mySelection.get())
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myFilters.get())
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myDefaultDrawer.get())
-
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_Selected])
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_Dynamic])
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_LocalSelected])
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_LocalDynamic])
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myStyles[Prs3d_TypeOfHighlight_SubIntensity])
-
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myDetectedSeq.Size())
-
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurDetected)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCurHighlighted)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myPickingStrategy)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myAutoHilight)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myIsAutoActivateSelMode)
-}

src/AIS/AIS_InteractiveObject.cxx

@@ -83,17 +83,6 @@ void AIS_InteractiveObject::SetContext (const Handle(AIS_InteractiveContext)& th
   }
 }
 
-//-----------------------------------------------------------------------------
-void AIS_InteractiveObject::SetTransformPersistence (const Handle(Graphic3d_TransformPers)& theTrsfPers)
-{
-  SelectMgr_SelectableObject::SetTransformPersistence (theTrsfPers);
-
-  if (!GetContext().IsNull())
-  {
-    GetContext()->UpdateOnTransformPersistence (this);
-  }
-}
-
 //=======================================================================
 //function : HasPresentation
 //purpose  :
@@ -159,11 +148,11 @@ void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& theAspect
 //function : DumpJson
 //purpose  : 
 //=======================================================================
-void AIS_InteractiveObject::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
+void AIS_InteractiveObject::DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth) const
 {
-  OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)
+  OCCT_DUMP_CLASS_BEGIN (theOStream, AIS_InteractiveObject);
 
-  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, SelectMgr_SelectableObject)
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myCTXPtr)
-  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myOwner)
+  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, SelectMgr_SelectableObject);
+  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myCTXPtr);
+  OCCT_DUMP_FIELD_VALUE_POINTER (theOStream, myOwner);
 }

src/AIS/AIS_InteractiveObject.hxx

@@ -108,11 +108,6 @@ public:
   //! Returns the context pointer to the interactive context.
   Standard_EXPORT Handle(AIS_InteractiveContext) GetContext() const;
 
-  //! Sets up Transform Persistence defining a special Local Coordinate system where this object should be located.
-  //! Updates the presentation in context if it is not NULL
-  //! @sa Graphic3d_TransformPers class description
-  Standard_EXPORT virtual void SetTransformPersistence (const Handle(Graphic3d_TransformPers)& theTrsfPers);
-
   //! Returns TRUE when this object has a presentation in the current DisplayMode()
   Standard_EXPORT Standard_Boolean HasPresentation() const;
 
@@ -124,7 +119,7 @@ public:
   Standard_EXPORT void SetAspect (const Handle(Prs3d_BasicAspect)& anAspect);
 
   //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
+  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 protected:
 
   //! The TypeOfPresention3d means that the interactive object

src/AIS/AIS_Manipulator.hxx

@@ -30,8 +30,7 @@
 #include <V3d_View.hxx>
 #include <Standard_Version.hxx>
 #include <Standard_DefineHandle.hxx>
-
-NCOLLECTION_HSEQUENCE(AIS_ManipulatorObjectSequence, Handle(AIS_InteractiveObject))
+NCOLLECTION_HSEQUENCE(AIS_ManipulatorObjectSequence, Handle(AIS_InteractiveObject));
 
 DEFINE_STANDARD_HANDLE (AIS_Manipulator, AIS_InteractiveObject)
 

src/AIS/AIS_OffsetDimension.cxx

@@ -168,7 +168,7 @@ void AIS_OffsetDimension::ComputeSelection(const Handle(SelectMgr_Selection)& aS
   gp_Pnt myTSAttach = mySAttach.Transformed (myRelativePos);
   gp_Dir myTDirAttach = myDirAttach.Transformed (myRelativePos);
   gp_Dir myTDirAttach2 = myDirAttach2.Transformed (myRelativePos);
-  gp_Pnt Tcurpos = myPosition.Transformed (myRelativePos);
+  gp_Pnt Tcurpos = myPosition.Transformed (myRelativePos);;
 
   gp_Lin L1 (myTFAttach,myTDirAttach);
   gp_Lin L2 (myTSAttach,myTDirAttach2);

src/AIS/AIS_Shape.cxx

@@ -990,19 +990,3 @@ Standard_Boolean AIS_Shape::OwnHLRDeviationAngle ( Standard_Real &  anAngle,
   aPreviousAngle = myDrawer->PreviousHLRDeviationAngle (); 
   return myDrawer->HasOwnHLRDeviationAngle();
 }
-
-//=======================================================================
-//function : DumpJson
-//purpose  : 
-//=======================================================================
-void AIS_Shape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
-{
-  OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)
-  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, AIS_InteractiveObject)
-
-  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myshape)
-  OCCT_DUMP_FIELD_VALUES_DUMPED (theOStream, theDepth, &myBB)
-
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myInitAng)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myCompBB)
-}

src/AIS/AIS_Shape.hxx

@@ -325,9 +325,6 @@ public:
                                                       const TopoDS_Shape& theShape,
                                                       const Handle(Prs3d_Drawer)& theDrawer);
 
-  //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
-
 protected:
 
   TopoDS_Shape     myshape;    //!< shape to display

src/AIS/AIS_TextLabel.cxx

@@ -44,7 +44,8 @@ AIS_TextLabel::AIS_TextLabel()
   myHasFlipping      (Standard_False)
 {
   myDrawer->SetTextAspect (new Prs3d_TextAspect());
-  myDrawer->SetDisplayMode (0);
+
+  SetDisplayMode (0);
 }
 
 //=======================================================================

src/AIS/AIS_TextLabel.hxx

@@ -32,9 +32,6 @@ public:
   //! Default constructor
   Standard_EXPORT AIS_TextLabel();
 
-  //! Return TRUE for supported display mode.
-  virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
-
   //! Setup color of entire text.
   Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE;
 

src/AIS/AIS_Trihedron.cxx

@@ -32,7 +32,6 @@
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Projector.hxx>
 #include <Prs3d_ShadingAspect.hxx>
@@ -60,8 +59,6 @@ AIS_Trihedron::AIS_Trihedron (const Handle(Geom_Axis2Placement)& theComponent)
   myTrihDispMode (Prs3d_DM_WireFrame),
   myComponent (theComponent)
 {
-  myAutoHilight = Standard_False;
-
   // selection priorities
   mySelectionPriority.Bind (Prs3d_DP_None,   5); // complete triedron: priority 5 (same as faces)
   mySelectionPriority.Bind (Prs3d_DP_Origin, 8); // origin: priority 8
@@ -73,7 +70,6 @@ AIS_Trihedron::AIS_Trihedron (const Handle(Geom_Axis2Placement)& theComponent)
   {
     mySelectionPriority.Bind ((Prs3d_DatumParts )aPartIter, 5); // planes: priority: 5
   }
-  myHiddenLineAspect = new Graphic3d_AspectLine3d (Quantity_NOC_WHITE, Aspect_TOL_EMPTY, 1.0f);
 
   // trihedron labels
   myLabel.Bind (Prs3d_DP_XAxis, "X");
@@ -139,6 +135,7 @@ void AIS_Trihedron::SetSize(const Standard_Real aValue)
   myDrawer->DatumAspect()->SetAxisLength(aValue, aValue, aValue);
 
   SetToUpdate();
+  UpdatePresentations();
   UpdateSelection();
 }
 
@@ -166,6 +163,7 @@ void AIS_Trihedron::UnsetSize()
   else
   {
     SetToUpdate();
+    UpdatePresentations();
   }
   UpdateSelection();
 }
@@ -312,37 +310,36 @@ void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManag
   aPresentation->Clear();
   const Prs3d_DatumParts aPart = anOwner->DatumPart();
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup (aPresentation);
+  Handle(Prs3d_DatumAspect) anAspect = myDrawer->DatumAspect();
   if (aPart >= Prs3d_DP_XOYAxis && aPart <= Prs3d_DP_XOZAxis)
   {
     // planes selection is equal in both shading and wireframe mode
-    aGroup->SetGroupPrimitivesAspect (theStyle->LineAspect()->Aspect());
+    aGroup->SetGroupPrimitivesAspect (getHighlightLineAspect()->Aspect());
   }
   else
   {
     if (myTrihDispMode == Prs3d_DM_Shaded)
     {
-      aGroup->SetGroupPrimitivesAspect (theStyle->ShadingAspect()->Aspect());
+      aGroup->SetGroupPrimitivesAspect (anAspect->ShadingAspect(aPart)->Aspect());
     }
     else
     {
       if (aPart == Prs3d_DP_Origin)
       {
-        aGroup->SetGroupPrimitivesAspect (theStyle->PointAspect()->Aspect());
+        aGroup->SetGroupPrimitivesAspect (getHighlightPointAspect()->Aspect());
       }
       else
       {
-        aGroup->SetGroupPrimitivesAspect(theStyle->LineAspect()->Aspect());
+        aGroup->SetGroupPrimitivesAspect (anAspect->LineAspect(aPart)->Aspect());
       }
     }
   }
   aGroup->AddPrimitiveArray (arrayOfPrimitives(aPart));
 
-  const Graphic3d_ZLayerId aLayer = theStyle->ZLayer() != Graphic3d_ZLayerId_UNKNOWN ? theStyle->ZLayer() : myDrawer->ZLayer();
-  if (aPresentation->GetZLayer() != aLayer)
+  if (aPresentation->GetZLayer() != theStyle->ZLayer())
   {
-    aPresentation->SetZLayer (aLayer);
+    aPresentation->SetZLayer (theStyle->ZLayer());
   }
-
   aPresentation->Highlight (theStyle);
   thePM->AddToImmediateList (aPresentation);
 }
@@ -359,22 +356,25 @@ void AIS_Trihedron::HilightSelected (const Handle(PrsMgr_PresentationManager3d)&
     return;
   }
 
+  Handle(Prs3d_DatumAspect) anAspect = myDrawer->DatumAspect();
   const bool isShadingMode = myTrihDispMode == Prs3d_DM_Shaded;
 
-  Handle(Prs3d_Drawer) anAspect = !myHilightDrawer.IsNull() ? myHilightDrawer : GetContext()->SelectionStyle();
+  const Handle(Prs3d_Drawer)& aContextSelStyle = GetContext()->SelectionStyle();
+  const Quantity_Color& aSelectionColor = aContextSelStyle->Color();
   for (SelectMgr_SequenceOfOwner::Iterator anIterator (theOwners); anIterator.More(); anIterator.Next())
   {
     const Handle(SelectMgr_EntityOwner)& anOwner = anIterator.Value();
     Handle(AIS_TrihedronOwner) aTrihedronOwner = Handle(AIS_TrihedronOwner)::DownCast(anOwner);
     if (aTrihedronOwner.IsNull())
     {
-      thePM->Color (this, anAspect, 0);
+      thePM->Color (this, aContextSelStyle, 0);
       continue;
     }
       
     const Prs3d_DatumParts aPart = aTrihedronOwner->DatumPart();
     Handle(Graphic3d_Group) aGroup;
-    if (mySelectedParts.Contains (aPart) || !myPartToGroup.Find (aPart, aGroup))
+    if (mySelectedParts.Contains (aPart)
+    || !myPartToGroup.Find (aPart, aGroup))
     {
       continue;
     }
@@ -382,23 +382,27 @@ void AIS_Trihedron::HilightSelected (const Handle(PrsMgr_PresentationManager3d)&
     if (aPart >= Prs3d_DP_XOYAxis
      && aPart <= Prs3d_DP_XOZAxis)
     {
-      aGroup->SetGroupPrimitivesAspect (anAspect->LineAspect()->Aspect());
+      getHighlightLineAspect()->SetColor (aSelectionColor);
+      aGroup->SetGroupPrimitivesAspect (getHighlightLineAspect()->Aspect());
     }
     else
     {
       if (isShadingMode)
       {
-        aGroup->SetGroupPrimitivesAspect (anAspect->ShadingAspect()->Aspect());
+        getHighlightAspect()->SetColor (aSelectionColor);
+        aGroup->SetGroupPrimitivesAspect (getHighlightAspect()->Aspect());
       }
       else
       {
         if (aPart == Prs3d_DP_Origin)
         {
-          aGroup->SetGroupPrimitivesAspect (anAspect->PointAspect()->Aspect());
+          getHighlightPointAspect()->SetColor (aSelectionColor);
+          aGroup->SetGroupPrimitivesAspect (getHighlightPointAspect()->Aspect());
         }
         else
         {
-          aGroup->SetGroupPrimitivesAspect (anAspect->LineAspect()->Aspect());
+          getHighlightLineAspect()->SetColor (aSelectionColor);
+          aGroup->SetGroupPrimitivesAspect (getHighlightLineAspect()->Aspect());
         }
       }
     }
@@ -422,9 +426,9 @@ void AIS_Trihedron::ClearSelected()
     if (aPart >= Prs3d_DP_XOYAxis
      && aPart <= Prs3d_DP_XOZAxis)
     {
-      aGroup->SetGroupPrimitivesAspect (myHiddenLineAspect);
+      aGroup->SetGroupPrimitivesAspect (anAspect->LineAspect (aPart)->Aspect());
     }
-    else if (isShadingMode)
+    if (isShadingMode)
     {
       aGroup->SetGroupPrimitivesAspect (anAspect->ShadingAspect (aPart)->Aspect());
     }
@@ -549,8 +553,11 @@ void AIS_Trihedron::computePresentation (const Handle(PrsMgr_PresentationManager
     Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup (thePrs);
     myPartToGroup.Bind (aPart, aGroup);
 
+    const Handle(Graphic3d_AspectLine3d)& aLineAspect = anAspect->LineAspect (aPart)->Aspect();
+    aLineAspect->SetType (Aspect_TOL_EMPTY);
+
     aGroup->AddPrimitiveArray (arrayOfPrimitives (aPart));
-    aGroup->SetGroupPrimitivesAspect (myHiddenLineAspect);
+    aGroup->SetGroupPrimitivesAspect (aLineAspect);
   }
 }
 
@@ -927,19 +934,64 @@ void AIS_Trihedron::updatePrimitives(const Handle(Prs3d_DatumAspect)& theAspect,
   }
 }
 
-//=======================================================================
-//function : DumpJson
-//purpose  : 
-//=======================================================================
-void AIS_Trihedron::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
+// =======================================================================
+// function : getHighlightAspect
+// purpose  :
+// =======================================================================
+Handle(Prs3d_ShadingAspect) AIS_Trihedron::getHighlightAspect()
 {
-  OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)
+  if (!myHighlightAspect.IsNull())
+    return myHighlightAspect;
 
-  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, AIS_InteractiveObject)
+  Quantity_Color aHighlightColor = Quantity_NOC_GRAY80;
+  if (!myHilightDrawer.IsNull())
+    aHighlightColor = myHilightDrawer->Color();
 
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnSize)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnTextColor)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnArrowColor)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myHasOwnDatumAspect)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, myTrihDispMode)
+  myHighlightAspect = new Prs3d_ShadingAspect();
+  myHighlightAspect->Aspect()->SetInteriorStyle (Aspect_IS_SOLID);
+  myHighlightAspect->SetColor (aHighlightColor);
+
+  Graphic3d_MaterialAspect aHighlightMaterial;
+  aHighlightMaterial.SetColor (aHighlightColor);
+  myHighlightAspect->SetMaterial (aHighlightMaterial);
+
+  return myHighlightAspect;
+}
+
+// =======================================================================
+// function : getHighlightLineAspect
+// purpose  :
+// =======================================================================
+Handle(Prs3d_LineAspect) AIS_Trihedron::getHighlightLineAspect()
+{
+  if (!myHighlightLineAspect.IsNull())
+    return myHighlightLineAspect;
+
+  Quantity_Color aHighlightColor = Quantity_NOC_GRAY80;
+  if (!myHilightDrawer.IsNull())
+    aHighlightColor = myHilightDrawer->Color();
+
+  Handle(Prs3d_DatumAspect) aDatumAspect = Attributes()->DatumAspect();
+  Handle(Prs3d_LineAspect) aLineAspect = aDatumAspect->LineAspect(Prs3d_DP_XAxis);
+  myHighlightLineAspect = new Prs3d_LineAspect (aHighlightColor, aLineAspect->Aspect()->Type(),
+                                                aLineAspect->Aspect()->Width());
+
+  return myHighlightLineAspect;
+}
+
+// =======================================================================
+// function : getHighlightPointAspect
+// purpose  :
+// =======================================================================
+Handle(Prs3d_PointAspect) AIS_Trihedron::getHighlightPointAspect()
+{
+  if (!myHighlightPointAspect.IsNull())
+    return myHighlightPointAspect;
+
+  Quantity_Color aHighlightColor = Quantity_NOC_GRAY80;
+  if (!myHilightDrawer.IsNull())
+    aHighlightColor = myHilightDrawer->Color();
+  myHighlightPointAspect = new Prs3d_PointAspect (Aspect_TOM_PLUS, aHighlightColor, 1.0);
+
+  return myHighlightPointAspect;
 }

src/AIS/AIS_Trihedron.hxx

@@ -186,6 +186,9 @@ public:
 
 public:
 
+  //! Disables auto highlighting to use HilightSelected() and HilightOwnerWithColor() overridden methods.
+  virtual Standard_Boolean IsAutoHilight() const Standard_OVERRIDE { return false; }
+
   //! Method which clear all selected owners belonging
   //! to this selectable object ( for fast presentation draw ).
   Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE;
@@ -219,9 +222,6 @@ protected:
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
                                                  const Standard_Integer theMode) Standard_OVERRIDE;
 
-  //! Dumps the content of me into the stream
-  Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
-
 protected:
 
   //! Creates a sensitive entity for the datum part that will be used in selection owner creation.
@@ -248,6 +248,13 @@ protected:
                                          const gp_Dir& theYDir,
                                          const gp_Dir& theZDir);
 
+  //! Returns highlight line aspect , create if it is the first call
+  Handle(Prs3d_ShadingAspect) getHighlightAspect();
+  //! Returns highlight line aspect , create if it is the first call
+  Handle(Prs3d_LineAspect) getHighlightLineAspect();
+  //! Returns highlight line aspect , create if it is the first call
+  Handle(Prs3d_PointAspect) getHighlightPointAspect();
+
 protected:
   Standard_Boolean myHasOwnSize;
   Standard_Boolean myHasOwnTextColor;
@@ -262,7 +269,10 @@ protected:
 
   NCollection_DataMap<Prs3d_DatumParts, Handle(Graphic3d_Group)> myPartToGroup;
   NCollection_List<Prs3d_DatumParts> mySelectedParts;
-  Handle(Graphic3d_AspectLine3d) myHiddenLineAspect;
+
+  Handle(Prs3d_ShadingAspect) myHighlightAspect;
+  Handle(Prs3d_LineAspect)    myHighlightLineAspect;
+  Handle(Prs3d_PointAspect)   myHighlightPointAspect;
 
   NCollection_DataMap<Prs3d_DatumParts, Handle(Graphic3d_ArrayOfPrimitives)> myPrimitives;
 };

src/AIS/AIS_ViewController.cxx

@@ -69,7 +69,6 @@ AIS_ViewController::AIS_ViewController()
   myMousePressed        (Aspect_VKeyMouse_NONE),
   myMouseModifiers      (Aspect_VKeyFlags_NONE),
   myMouseSingleButton   (-1),
-  myMouseStopDragOnUnclick (false),
   //
   myTouchToleranceScale      (1.0f),
   myTouchRotationThresholdPx (6.0f),
@@ -113,15 +112,6 @@ AIS_ViewController::AIS_ViewController()
   myMouseGestureMap.Bind (Aspect_VKeyMouse_MiddleButton | Aspect_VKeyFlags_CTRL, AIS_MouseGesture_Pan);
 }
 
-// =======================================================================
-// function : ~AIS_ViewController
-// purpose  :
-// =======================================================================
-AIS_ViewController::~AIS_ViewController()
-{
-  //
-}
-
 // =======================================================================
 // function : ResetViewInput
 // purpose  :
@@ -621,7 +611,6 @@ bool AIS_ViewController::UpdateMouseButtons (const Graphic3d_Vec2i& thePoint,
     {
       myMouseClickTimer.Stop();
       myMouseClickCounter = 0;
-      myMouseStopDragOnUnclick = false;
       myUI.Dragging.ToStop = true;
       toUpdateView = true;
     }
@@ -630,12 +619,6 @@ bool AIS_ViewController::UpdateMouseButtons (const Graphic3d_Vec2i& thePoint,
   else if (theButtons == Aspect_VKeyMouse_NONE)
   {
     myMouseSingleButton = -1;
-    if (myMouseStopDragOnUnclick)
-    {
-      myMouseStopDragOnUnclick = false;
-      myUI.Dragging.ToStop = true;
-      toUpdateView = true;
-    }
   }
   else if (myMouseSingleButton == -1)
   {
@@ -786,7 +769,6 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
       myMouseClickTimer.Stop();
       myMouseClickCounter = 0;
       myMouseSingleButton = -1;
-      myMouseStopDragOnUnclick = true;
     }
   }
 

src/AIS/AIS_ViewController.hxx

@@ -51,9 +51,6 @@ public:
   //! Empty constructor.
   Standard_EXPORT AIS_ViewController();
 
-  //! Destructor.
-  Standard_EXPORT virtual ~AIS_ViewController();
-
   //! Return input buffer.
   const AIS_ViewInputBuffer& InputBuffer (AIS_ViewInputBufferType theType) const { return theType == AIS_ViewInputBufferType_UI ? myUI : myGL; }
 
@@ -650,7 +647,6 @@ protected: //! @name mouse input variables
   Aspect_VKeyMouse    myMousePressed;             //!< active mouse buttons
   Aspect_VKeyFlags    myMouseModifiers;           //!< active key modifiers passed with last mouse event
   Standard_Integer    myMouseSingleButton;        //!< index of mouse button pressed alone (>0)
-  Standard_Boolean    myMouseStopDragOnUnclick;   //!< queue stop dragging even with at next mouse unclick
 
 protected: //! @name multi-touch input variables
 

src/AIS/AIS_ViewCube.cxx

@@ -137,9 +137,6 @@ AIS_ViewCube::AIS_ViewCube()
   myBoxEdgeGap (0.0),
   myBoxFacetExtension (1.0),
   myAxesPadding (1.0),
-  myAxesRadius (1.0),
-  myAxesConeRadius (3.0),
-  myAxesSphereRadius (4.0),
   myCornerMinSize (2.0),
   myRoundRadius  (0.0),
   myToDisplayAxes (true),
@@ -602,7 +599,7 @@ void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
       anAxisGroup->SetGroupPrimitivesAspect (aDatumAspect->ShadingAspect (aPart)->Aspect());
 
       const Standard_Real anArrowLength = 0.2 * anAxisSize;
-      Handle(Graphic3d_ArrayOfTriangles) aTriangleArray = Prs3d_Arrow::DrawShaded (anAx1, myAxesRadius, anAxisSize, myAxesConeRadius, anArrowLength, THE_NB_ARROW_FACETTES);
+      Handle(Graphic3d_ArrayOfTriangles) aTriangleArray = Prs3d_Arrow::DrawShaded (anAx1, 1.0, anAxisSize, 3.0, anArrowLength, THE_NB_ARROW_FACETTES);
       anAxisGroup->AddPrimitiveArray (aTriangleArray);
 
       TCollection_AsciiString anAxisLabel;
@@ -624,7 +621,7 @@ void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
       Handle(Prs3d_ShadingAspect) anAspectCen = new Prs3d_ShadingAspect();
       anAspectCen->SetColor (Quantity_NOC_WHITE);
       aGroup->SetGroupPrimitivesAspect (anAspectCen->Aspect());
-      Prs3d_ToolSphere aTool (myAxesSphereRadius, THE_NB_DISK_SLICES, THE_NB_DISK_SLICES);
+      Prs3d_ToolSphere aTool (4.0, THE_NB_DISK_SLICES, THE_NB_DISK_SLICES);
       gp_Trsf aTrsf;
       aTrsf.SetTranslation (gp_Vec (gp::Origin(), aLocation));
       Handle(Graphic3d_ArrayOfTriangles) aCenterArray;

src/AIS/AIS_ViewCube.hxx

@@ -189,45 +189,6 @@ public: //! @name Geometry management API
   //! The value should be within [0, 0.5] range.
   Standard_EXPORT void SetRoundRadius (const Standard_Real theValue);
 
-  //! Returns radius of axes of the trihedron; 1.0 by default.
-  Standard_Real AxesRadius() const { return myAxesRadius; }
-
-  //! Sets radius of axes of the trihedron.
-  void SetAxesRadius (const Standard_Real theRadius)
-  {
-    if (Abs (myAxesRadius - theRadius) > Precision::Confusion())
-    {
-      myAxesRadius = theRadius;
-      SetToUpdate();
-    }
-  }
-
-  //! Returns radius of cone of axes of the trihedron; 3.0 by default.
-  Standard_Real AxesConeRadius() const { return myAxesConeRadius; }
-
-  //! Sets radius of cone of axes of the trihedron.
-  void SetAxesConeRadius (Standard_Real theRadius)
-  {
-    if (Abs (myAxesConeRadius - theRadius) > Precision::Confusion())
-    {
-      myAxesConeRadius = theRadius;
-      SetToUpdate();
-    }
-  }
-
-  //! Returns radius of sphere (central point) of the trihedron; 4.0 by default.
-  Standard_Real AxesSphereRadius() const { return myAxesSphereRadius; }
-
-  //! Sets radius of sphere (central point) of the trihedron.
-  void SetAxesSphereRadius (Standard_Real theRadius)
-  {
-    if (Abs (myAxesSphereRadius - theRadius) > Precision::Confusion())
-    {
-      myAxesSphereRadius = theRadius;
-      SetToUpdate();
-    }
-  }
-
   //! @return TRUE if trihedron is drawn; TRUE by default.
   Standard_Boolean ToDrawAxes() const { return myToDisplayAxes; }
 
@@ -660,9 +621,6 @@ protected:
   Standard_Real                 myBoxEdgeGap;        //!< gap between box side and box edge
   Standard_Real                 myBoxFacetExtension; //!< box facet extension
   Standard_Real                 myAxesPadding;       //!< Padding between box and axes
-  Standard_Real                 myAxesRadius;        //!< radius of axes of the trihedron; 1.0 by default
-  Standard_Real                 myAxesConeRadius;    //!< radius of cone of axes of the trihedron; 3.0 by default
-  Standard_Real                 myAxesSphereRadius;  //!< radius of sphere (central point) of the trihedron; 4.0 by default
   Standard_Real                 myCornerMinSize;     //!< minimal size of box corner
   Standard_Real                 myRoundRadius;       //!< relative round radius within [0; 0.5] range
   Standard_Boolean              myToDisplayAxes;     //!< trihedron visibility

src/AIS/FILES

@@ -69,12 +69,14 @@ AIS_ExclusionFilter.hxx
 AIS_ExclusionFilter.lxx
 AIS_FixRelation.cxx
 AIS_FixRelation.hxx
+AIS_FixRelation.lxx
 AIS_GlobalStatus.cxx
 AIS_GlobalStatus.hxx
 AIS_GraphicTool.cxx
 AIS_GraphicTool.hxx
 AIS_IdenticRelation.cxx
 AIS_IdenticRelation.hxx
+AIS_IdenticRelation.lxx
 AIS_IndexedDataMapOfOwnerPrs.hxx
 AIS_InteractiveContext.cxx
 AIS_InteractiveContext.hxx

src/Adaptor2d/Adaptor2d_OffsetCurve.cxx

@@ -530,7 +530,7 @@ gp_Circ2d Adaptor2d_OffsetCurve::Circle() const
 gp_Elips2d Adaptor2d_OffsetCurve::Ellipse() const
 {
   if (myCurve->GetType() == GeomAbs_Ellipse && myOffset == 0.) {
-    return myCurve->Ellipse();
+    return myCurve->Ellipse();;
   }
   else {
     throw Standard_NoSuchObject("Adaptor2d_OffsetCurve:Ellipse");
@@ -656,16 +656,19 @@ static Standard_Integer nbPoints(const Handle(Adaptor2d_HCurve2d)& theCurve)
 
   Standard_Integer nbs = 20;
 
-  if (theCurve->GetType() == GeomAbs_BezierCurve)
+  if (theCurve->GetType() == GeomAbs_Line)
+    nbs = 2;
+  else if (theCurve->GetType() == GeomAbs_BezierCurve)
   {
-    nbs = Max(nbs, 3 + theCurve->NbPoles());
+    nbs = 3 + theCurve->NbPoles();
   }
   else if (theCurve->GetType() == GeomAbs_BSplineCurve) {
-    nbs = Max(nbs, theCurve->NbKnots() * theCurve->Degree());
+    nbs = theCurve->NbKnots();
+    nbs *= theCurve->Degree();
   }
 
-  if (nbs > 300)
-    nbs = 300;
+  if (nbs > 200)
+    nbs = 200;
   return nbs;
 
 }

src/Adaptor3d/Adaptor3d_TopolTool.cxx

@@ -540,7 +540,7 @@ Standard_Boolean  Adaptor3d_TopolTool::IsThePointOn(const gp_Pnt2d& P,
     if (surumin || survmin || surumax || survmax) {
       return(Standard_True);
     }
-    return Standard_False;
+    return(Standard_False);;
   }
 }
 

src/AdvApp2Var/AdvApp2Var_SysBase.hxx

@@ -16,8 +16,12 @@
 #define AdvApp2Var_SysBase_HeaderFile
 
 #include <Standard_Macro.hxx>
-#include <Standard_TypeDef.hxx>
 #include <AdvApp2Var_Data_f2c.hxx>
+#if _MSC_VER
+#include <stddef.h>
+#else
+#include <stdint.h>
+#endif
 
 class AdvApp2Var_SysBase {
  public:

src/AppBlend/AppBlend_AppSurf.gxx

@@ -374,7 +374,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
       Standard_Real Uf = F.Parameter(Lin->Point(1));
       Standard_Real Ul = F.Parameter(Lin->Point(NbPoint))-Uf;
       for (i=2; i<NbPoint; i++) {
-	theParams(i) = (F.Parameter(Lin->Point(i))-Uf)/Ul;
+	theParams(i) = (F.Parameter(Lin->Point(i))-Uf)/Ul;;
       }
       AppDef_Compute theAppDef(theParams,dmin,dmax,tol3d,tol2d,nbit,
 				 Standard_True, Standard_True);
@@ -426,7 +426,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin,
 	Standard_Real Uf = F.Parameter(Lin->Point(1));
 	Standard_Real Ul = F.Parameter(Lin->Point(NbPoint))-Uf;
 	for (i=2; i<NbPoint; i++) {
-	  theParams(i) = (F.Parameter(Lin->Point(i))-Uf)/Ul;
+	  theParams(i) = (F.Parameter(Lin->Point(i))-Uf)/Ul;;
 	}
 
 	theapprox.Init(dmin,dmax,tol3d,tol2d,nbit,Standard_True,

src/AppCont/AppCont_LeastSquare.cxx

@@ -452,7 +452,7 @@ AppCont_LeastSquare::AppCont_LeastSquare(const AppCont_Function&       SSP,
       myDone = Standard_True;
       for (i = bdeb; i <= bfin; i++) {
         for (j = bdeb; j <= bfin; j++) {
-          IBPij = IBP(i, j);
+          IBPij = IBP(i, j);;
           for (k = 1; k<= nbcol; k++) {
             myPoles(i, k)   += IBPij * B2(j, k);
           }

src/AppParCurves/AppParCurves.cxx

@@ -65,7 +65,7 @@ void AppParCurves::Bernstein(const Standard_Integer NbPoles,
 			     math_Matrix& DA) {
   
   Standard_Integer i, j, id, Ndeg = NbPoles-1;
-  Standard_Real u0, u1, y0, y1, xs, bj, bj1;
+  Standard_Real u0, u1, y0, y1, xs, bj, bj1;;
   Standard_Integer first = U.Lower(), last = U.Upper();
   math_Vector B(1, NbPoles-1);
 

src/AppParCurves/AppParCurves_LeastSquare.gxx

@@ -1272,7 +1272,7 @@ const AppParCurves_MultiBSpCurve& AppParCurves_LeastSquare::BSplineValue()
 {
   if (!done) {throw StdFail_NotDone();}
 
-  Standard_Integer i, j, j2, npoints = nbP+nbP2d;
+  Standard_Integer i, j, j2, npoints = nbP+nbP2d;;
   gp_Pnt Pt;
   gp_Pnt2d Pt2d;
   Standard_Integer ideb = resinit, ifin = resfin;

src/AppStd/AppStd_Application.cxx

@@ -16,7 +16,6 @@
 //AGV 15/10/01 : Add XmlOcaf support; add MessageDriver support
 
 #include <AppStd_Application.hxx>
-#include <Standard_Dump.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application)
 
@@ -30,13 +29,3 @@ Standard_CString AppStd_Application::ResourcesName() {
   return aRes;
 }
 
-//=======================================================================
-//function : DumpJson
-//purpose  : 
-//=======================================================================
-void AppStd_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
-{
-  OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)
-
-  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application)
-}

src/AppStd/AppStd_Application.hxx

@@ -35,9 +35,6 @@ public:
   //! resources
   Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE;
 
-  //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
-
   DEFINE_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application)
 };
 

src/AppStdL/AppStdL_Application.cxx

@@ -16,7 +16,6 @@
 //AGV 15/10/01 : Add XmlOcaf support; add MessageDriver support
 
 #include <AppStdL_Application.hxx>
-#include <Standard_Dump.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application)
 
@@ -31,13 +30,3 @@ Standard_CString AppStdL_Application::ResourcesName()
   return aRes;
 }
 
-//=======================================================================
-//function : DumpJson
-//purpose  : 
-//=======================================================================
-void AppStdL_Application::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
-{
-  OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)
-
-  OCCT_DUMP_BASE_CLASS (theOStream, theDepth, TDocStd_Application)
-}

src/AppStdL/AppStdL_Application.hxx

@@ -34,9 +34,6 @@ public:
   //! resources
   Standard_EXPORT Standard_CString ResourcesName() Standard_OVERRIDE;
 
-  //! Dumps the content of me into the stream
-  Standard_EXPORT void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
-
   DEFINE_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application)
 };
 

src/Approx/Approx_CurveOnSurface.cxx

@@ -27,11 +27,8 @@
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2dAdaptor_HCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_HCurve.hxx>
 #include <GeomAdaptor_HSurface.hxx>
-#include <GeomConvert.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
@@ -303,10 +300,6 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
   }
 }
 
-//=============================================================================
-//function : Approx_CurveOnSurface
-//purpose  : Constructor
-//=============================================================================
  Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_HCurve2d)& C2D,
 					      const Handle(Adaptor3d_HSurface)& Surf,
 					      const Standard_Real First,
@@ -317,75 +310,14 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
 					      const Standard_Integer MaxSegments, 
 					      const Standard_Boolean only3d, 
 					      const Standard_Boolean only2d)
-: myC2D(C2D),
-  mySurf(Surf),
-  myFirst(First),
-  myLast(Last),
-  myTol(Tol),
-  myIsDone(Standard_False),
-  myHasResult(Standard_False),
-  myError3d(0.0),
-  myError2dU(0.0),
-  myError2dV(0.0)
- {
-   Perform(MaxSegments, MaxDegree, S, only3d, only2d);
- }
-
-//=============================================================================
-//function : Approx_CurveOnSurface
-//purpose  : Constructor
-//=============================================================================
- Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_HCurve2d)& theC2D,
-                                              const Handle(Adaptor3d_HSurface)& theSurf,
-                                              const Standard_Real               theFirst,
-                                              const Standard_Real               theLast,
-                                              const Standard_Real               theTol)
-: myC2D(theC2D),
-  mySurf(theSurf),
-  myFirst(theFirst),
-  myLast(theLast),
-  myTol(theTol),
-  myIsDone(Standard_False),
-  myHasResult(Standard_False),
-  myError3d(0.0),
-  myError2dU(0.0),
-  myError2dV(0.0)
-{
-}
-
-//=============================================================================
-//function : Perform
-//purpose  :
-//=============================================================================
-void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
-                                    const Standard_Integer theMaxDegree,
-                                    const GeomAbs_Shape    theContinuity,
-                                    const Standard_Boolean theOnly3d,
-                                    const Standard_Boolean theOnly2d)
 {
   myIsDone = Standard_False;
-  myHasResult = Standard_False;
-  myError2dU = 0.0;
-  myError2dV = 0.0;
-  myError3d = 0.0;
+  if(only3d && only2d) throw Standard_ConstructionError();
+  GeomAbs_Shape Order  = S;
 
-  if(theOnly3d && theOnly2d) throw Standard_ConstructionError();
+  Handle( Adaptor2d_HCurve2d ) TrimmedC2D = C2D->Trim( First, Last, Precision::PConfusion() );
 
-  Handle( Adaptor2d_HCurve2d ) TrimmedC2D = myC2D->Trim( myFirst, myLast, Precision::PConfusion() );
-
-  Standard_Boolean isU, isForward;
-  Standard_Real aParam;
-  if (theOnly3d && isIsoLine(TrimmedC2D, isU, aParam, isForward))
-  {
-    if (buildC3dOnIsoLine(TrimmedC2D, isU, aParam, isForward))
-    {
-      myIsDone = Standard_True;
-      myHasResult = Standard_True;
-      return;
-    }
-  }
-
-  Adaptor3d_CurveOnSurface COnS( TrimmedC2D, mySurf );
+  Adaptor3d_CurveOnSurface COnS( TrimmedC2D, Surf );
   Handle(Adaptor3d_HCurveOnSurface) HCOnS = new Adaptor3d_HCurveOnSurface();
   HCOnS->Set(COnS);
 
@@ -395,34 +327,37 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
   Handle(TColStd_HArray1OfReal) ThreeDTol;
 
   // create evaluators and choose appropriate one
-  Approx_CurveOnSurface_Eval3d Eval3dCvOnSurf (HCOnS,             myFirst, myLast);
-  Approx_CurveOnSurface_Eval2d Eval2dCvOnSurf (       TrimmedC2D, myFirst, myLast);
-  Approx_CurveOnSurface_Eval   EvalCvOnSurf   (HCOnS, TrimmedC2D, myFirst, myLast);
+  Approx_CurveOnSurface_Eval3d Eval3dCvOnSurf (HCOnS,             First, Last);
+  Approx_CurveOnSurface_Eval2d Eval2dCvOnSurf (       TrimmedC2D, First, Last);
+  Approx_CurveOnSurface_Eval   EvalCvOnSurf   (HCOnS, TrimmedC2D, First, Last);
   AdvApprox_EvaluatorFunction* EvalPtr;
-  if ( theOnly3d ) EvalPtr = &Eval3dCvOnSurf;
-  else if ( theOnly2d ) EvalPtr = &Eval2dCvOnSurf;
+  if ( only3d ) EvalPtr = &Eval3dCvOnSurf;
+  else if ( only2d ) EvalPtr = &Eval2dCvOnSurf;
   else EvalPtr = &EvalCvOnSurf;
 
   // Initialization for 2d approximation
-  if(!theOnly3d) {
+  if(!only3d) {
     Num1DSS = 2;
     OneDTol = new TColStd_HArray1OfReal(1,Num1DSS);
 
     Standard_Real TolU, TolV;
 
-    TolU = mySurf->UResolution(myTol)/2;
-    TolV = mySurf->VResolution(myTol)/2;
+    TolU = Surf->UResolution(Tol)/2;
+    TolV = Surf->VResolution(Tol)/2;
 
     OneDTol->SetValue(1,TolU);
     OneDTol->SetValue(2,TolV);
   }
   
-  if(!theOnly2d) {
+  if(!only2d) {
     Num3DSS=1;
     ThreeDTol = new TColStd_HArray1OfReal(1,Num3DSS);
-    ThreeDTol->Init(myTol/2);
+    ThreeDTol->Init(Tol/2);
   }
 
+  myError2dU = 0;
+  myError2dV = 0;
+  myError3d = 0;
 
   Standard_Integer NbInterv_C2 = HCOnS->NbIntervals(GeomAbs_C2);
   TColStd_Array1OfReal CutPnts_C2(1, NbInterv_C2 + 1);
@@ -434,8 +369,8 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
   AdvApprox_PrefAndRec CutTool(CutPnts_C2,CutPnts_C3);
   AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, 
 	      			     OneDTol, TwoDTolNul, ThreeDTol,
-				     myFirst, myLast, theContinuity,
-				     theMaxDegree, theMaxSegments,
+				     First, Last, Order,
+				     MaxDegree, MaxSegments,
 				     *EvalPtr, CutTool);
 
   myIsDone = aApprox.IsDone();
@@ -446,14 +381,14 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
     Handle(TColStd_HArray1OfInteger) Mults = aApprox.Multiplicities();
     Standard_Integer Degree = aApprox.Degree();
 
-    if(!theOnly2d) 
+    if(!only2d) 
       {
 	TColgp_Array1OfPnt Poles(1,aApprox.NbPoles());
 	aApprox.Poles(1,Poles);
 	myCurve3d = new Geom_BSplineCurve(Poles, Knots->Array1(), Mults->Array1(), Degree);
 	myError3d = aApprox.MaxError(3, 1);
       }
-    if(!theOnly3d) 
+    if(!only3d) 
       {
 	TColgp_Array1OfPnt2d Poles2d(1,aApprox.NbPoles());
 	TColStd_Array1OfReal Poles1dU(1,aApprox.NbPoles());
@@ -469,6 +404,8 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
       }
   }
   
+//    }
+
 }
 
  Standard_Boolean Approx_CurveOnSurface::IsDone() const
@@ -506,215 +443,3 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
   return myError2dV;
 }
 
-//=============================================================================
-//function : isIsoLine
-//purpose  :
-//=============================================================================
-Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_HCurve2d) theC2D,
-                                                  Standard_Boolean&                theIsU,
-                                                  Standard_Real&                   theParam,
-                                                  Standard_Boolean&                theIsForward) const
-{
-  // These variables are used to check line state (vertical or horizontal).
-  Standard_Boolean isAppropriateType = Standard_False;
-  gp_Pnt2d aLoc2d;
-  gp_Dir2d aDir2d;
-
-  // Test type.
-  const GeomAbs_CurveType aType = theC2D->GetType();
-  if (aType == GeomAbs_Line)
-  {
-    gp_Lin2d aLin2d = theC2D->Line();
-    aLoc2d = aLin2d.Location();
-    aDir2d = aLin2d.Direction();
-    isAppropriateType = Standard_True;
-  }
-  else if (aType == GeomAbs_BSplineCurve)
-  {
-    Handle(Geom2d_BSplineCurve) aBSpline2d = theC2D->BSpline();
-    if (aBSpline2d->Degree() != 1 || aBSpline2d->NbPoles() != 2)
-      return Standard_False; // Not a line or uneven parameterization.
-
-    aLoc2d = aBSpline2d->Pole(1);
-
-    // Vector should be non-degenerated.
-    gp_Vec2d aVec2d(aBSpline2d->Pole(1), aBSpline2d->Pole(2));
-    if (aVec2d.SquareMagnitude() < Precision::Confusion())
-      return Standard_False; // Degenerated spline.
-    aDir2d = aVec2d;
-
-    isAppropriateType = Standard_True;
-  }
-  else if (aType == GeomAbs_BezierCurve)
-  {
-    Handle(Geom2d_BezierCurve) aBezier2d = theC2D->Bezier();
-    if (aBezier2d->Degree() != 1 || aBezier2d->NbPoles() != 2)
-      return Standard_False; // Not a line or uneven parameterization.
-
-    aLoc2d = aBezier2d->Pole(1);
-
-    // Vector should be non-degenerated.
-    gp_Vec2d aVec2d(aBezier2d->Pole(1), aBezier2d->Pole(2));
-    if (aVec2d.SquareMagnitude() < Precision::Confusion())
-      return Standard_False; // Degenerated spline.
-    aDir2d = aVec2d;
-
-    isAppropriateType = Standard_True;
-  }
-
-  if (!isAppropriateType)
-    return Standard_False;
-
-  // Check line to be vertical or horizontal.
-  if (aDir2d.IsParallel(gp::DX2d(), Precision::Angular()))
-  {
-    // Horizontal line. V = const.
-    theIsU = Standard_False;
-    theParam = aLoc2d.Y();
-    theIsForward = aDir2d.Dot(gp::DX2d()) > 0.0;
-    return Standard_True;
-  }
-  else if (aDir2d.IsParallel(gp::DY2d(), Precision::Angular()))
-  {
-    // Vertical line. U = const.
-    theIsU = Standard_True;
-    theParam = aLoc2d.X();
-    theIsForward = aDir2d.Dot(gp::DY2d()) > 0.0;
-    return Standard_True;
-  }
-
-  return Standard_False;
-}
-
-#include <GeomLib.hxx>
-
-//=============================================================================
-//function : buildC3dOnIsoLine
-//purpose  :
-//=============================================================================
-Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_HCurve2d) theC2D,
-                                                          const Standard_Boolean           theIsU,
-                                                          const Standard_Real              theParam,
-                                                          const Standard_Boolean           theIsForward)
-{
-  // Convert adapter to the appropriate type.
-  Handle(GeomAdaptor_HSurface) aGeomAdapter = Handle(GeomAdaptor_HSurface)::DownCast(mySurf);
-  if (aGeomAdapter.IsNull())
-    return Standard_False;
-
-  if (mySurf->GetType() == GeomAbs_Sphere)
-    return Standard_False;
-
-  // Extract isoline
-  Handle(Geom_Surface) aSurf = aGeomAdapter->ChangeSurface().Surface();
-  Handle(Geom_Curve) aC3d;
-
-  gp_Pnt2d aF2d = theC2D->Value(theC2D->FirstParameter());
-  gp_Pnt2d aL2d = theC2D->Value(theC2D->LastParameter());
-
-  Standard_Boolean isToTrim = Standard_True;
-  Standard_Real U1, U2, V1, V2;
-  aSurf->Bounds(U1, U2, V1, V2);
-
-  if (theIsU)
-  {
-    Standard_Real aV1Param = Min(aF2d.Y(), aL2d.Y());
-    Standard_Real aV2Param = Max(aF2d.Y(), aL2d.Y());
-    if (aV2Param < V1 - myTol || aV1Param > V2 + myTol)
-    {
-      return Standard_False;
-    }
-    else if (Precision::IsInfinite(V1) || Precision::IsInfinite(V2))
-    {
-      if (Abs(aV2Param - aV1Param) < Precision::PConfusion())
-      {
-        return Standard_False;
-      }
-      aSurf = new Geom_RectangularTrimmedSurface(aSurf, U1, U2, aV1Param, aV2Param);
-      isToTrim = Standard_False;
-    }
-    else
-    {
-      aV1Param = Max(aV1Param, V1);
-      aV2Param = Min(aV2Param, V2);
-      if (Abs(aV2Param - aV1Param) < Precision::PConfusion())
-      {
-        return Standard_False;
-      }
-    }
-    aC3d = aSurf->UIso(theParam);
-    if (isToTrim)
-      aC3d = new Geom_TrimmedCurve(aC3d, aV1Param, aV2Param);
-  }
-  else
-  {
-    Standard_Real aU1Param = Min(aF2d.X(), aL2d.X());
-    Standard_Real aU2Param = Max(aF2d.X(), aL2d.X());
-    if (aU2Param < U1 - myTol || aU1Param > U2 + myTol)
-    {
-      return Standard_False;
-    }
-    else if (Precision::IsInfinite(U1) || Precision::IsInfinite(U2))
-    {
-      if (Abs(aU2Param - aU1Param) < Precision::PConfusion())
-      {
-        return Standard_False;
-      }
-      aSurf = new Geom_RectangularTrimmedSurface(aSurf, aU1Param, aU2Param, V1, V2);
-      isToTrim = Standard_False;
-    }
-    else
-    {
-      aU1Param = Max(aU1Param, U1);
-      aU2Param = Min(aU2Param, U2);
-      if (Abs(aU2Param - aU1Param) < Precision::PConfusion())
-      {
-        return Standard_False;
-      }
-    }
-    aC3d = aSurf->VIso(theParam);
-    if (isToTrim)
-      aC3d = new Geom_TrimmedCurve(aC3d, aU1Param, aU2Param);
-  }
-
-  // Convert arbitrary curve type to the b-spline.
-  myCurve3d = GeomConvert::CurveToBSplineCurve(aC3d, Convert_QuasiAngular);
-  if (!theIsForward)
-    myCurve3d->Reverse();
-
-  // Rebuild parameterization for the 3d curve to have the same parameterization with
-  // a two-dimensional curve. 
-  TColStd_Array1OfReal aKnots = myCurve3d->Knots();
-  BSplCLib::Reparametrize(theC2D->FirstParameter(), theC2D->LastParameter(), aKnots);
-  myCurve3d->SetKnots(aKnots);
-
-  // Evaluate error.
-  myError3d = 0.0;
-
-  const Standard_Real aParF = myFirst;
-  const Standard_Real aParL = myLast;
-  const Standard_Integer aNbPnt = 23;
-  for(Standard_Integer anIdx = 0; anIdx <= aNbPnt; ++anIdx)
-  {
-    const Standard_Real aPar = aParF + ((aParL - aParF) * anIdx) / aNbPnt;
-
-    const gp_Pnt2d aPnt2d = theC2D->Value(aPar);
-
-    const gp_Pnt aPntC3D = myCurve3d->Value(aPar);
-    const gp_Pnt aPntC2D = mySurf->Value(aPnt2d.X(), aPnt2d.Y());
-
-    const Standard_Real aSqDeviation = aPntC3D.SquareDistance(aPntC2D);
-    myError3d = Max(aSqDeviation, myError3d);
-  }
-
-  myError3d = Sqrt(myError3d);
-
-  // Target tolerance is not obtained. This situation happens for isolines on the sphere.
-  // OCCT is unable to convert it keeping original parameterization, while the geometric
-  // form of the result is entirely identical. In that case, it is better to utilize
-  // a general-purpose approach. 
-  if (myError3d > myTol)
-    return Standard_False;
-
-  return Standard_True;
-}

src/Approx/Approx_CurveOnSurface.hxx

@@ -40,22 +40,9 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  //! This constructor calls perform method. This constructor is deprecated.
-  Standard_DEPRECATED("This constructor is deprecated. Use other constructor and perform method instead.")
+  
   Standard_EXPORT Approx_CurveOnSurface(const Handle(Adaptor2d_HCurve2d)& C2D, const Handle(Adaptor3d_HSurface)& Surf, const Standard_Real First, const Standard_Real Last, const Standard_Real Tol, const GeomAbs_Shape Continuity, const Standard_Integer MaxDegree, const Standard_Integer MaxSegments, const Standard_Boolean Only3d = Standard_False, const Standard_Boolean Only2d = Standard_False);
-
-  //! This constructor does not call perform method.
-  //! @param theC2D   2D Curve to be approximated in 3D.
-  //! @param theSurf  Surface where 2D curve is located.
-  //! @param theFirst First parameter of resulting curve.
-  //! @param theFirst Last parameter of resulting curve.
-  //! @param theTol   Computation tolerance.
-  Standard_EXPORT Approx_CurveOnSurface(const Handle(Adaptor2d_HCurve2d)& theC2D,
-                                        const Handle(Adaptor3d_HSurface)& theSurf,
-                                        const Standard_Real               theFirst,
-                                        const Standard_Real               theLast,
-                                        const Standard_Real               theTol);
-
+  
   Standard_EXPORT Standard_Boolean IsDone() const;
   
   Standard_EXPORT Standard_Boolean HasResult() const;
@@ -72,64 +59,18 @@ public:
   //! 2d Curve
   Standard_EXPORT Standard_Real MaxError2dV() const;
 
-  //! Constructs the 3d curve. Input parameters are ignored when the input curve is
-  //! U-isoline or V-isoline.
-  //! @param theMaxSegments Maximal number of segments in the resulting spline.
-  //! @param theMaxDegree   Maximal degree of the result.
-  //! @param theContinuity  Resulting continuity.
-  //! @param theOnly3d      Determines building only 3D curve.
-  //! @param theOnly2d      Determines building only 2D curve.
-  Standard_EXPORT void Perform(const Standard_Integer theMaxSegments, 
-                               const Standard_Integer theMaxDegree, 
-                               const GeomAbs_Shape    theContinuity,
-                               const Standard_Boolean theOnly3d = Standard_False,
-                               const Standard_Boolean theOnly2d = Standard_False);
+
+
 
 protected:
 
-  //! Checks whether the 2d curve is a isoline. It can be represented by b-spline, bezier,
-  //! or geometric line. This line should have natural parameterization.
-  //! @param theC2D       Trimmed curve to be checked.
-  //! @param theIsU       Flag indicating that line is u const.
-  //! @param theParam     Line parameter.
-  //! @param theIsForward Flag indicating forward parameterization on a isoline.
-  //! @return Standard_True when 2d curve is a line and Standard_False otherwise.
-  Standard_Boolean isIsoLine(const Handle(Adaptor2d_HCurve2d) theC2D,
-                             Standard_Boolean&                theIsU,
-                             Standard_Real&                   theParam,
-                             Standard_Boolean&                theIsForward) const;
 
-  //! Builds 3D curve for a isoline. This method takes corresponding isoline from
-  //! the input surface.
-  //! @param theC2D   Trimmed curve to be approximated.
-  //! @param theIsU   Flag indicating that line is u const.
-  //! @param theParam Line parameter.
-  //! @param theIsForward Flag indicating forward parameterization on a isoline.
-  //! @return Standard_True when 3d curve is built and Standard_False otherwise.
-  Standard_Boolean buildC3dOnIsoLine(const Handle(Adaptor2d_HCurve2d) theC2D,
-                                     const Standard_Boolean           theIsU,
-                                     const Standard_Real              theParam,
-                                     const Standard_Boolean           theIsForward);
 
-private:
-  Approx_CurveOnSurface& operator= (const Approx_CurveOnSurface&);
+
 
 private:
 
-  //! Input curve.
-  const Handle(Adaptor2d_HCurve2d) myC2D;
 
-  //! Input surface.
-  const Handle(Adaptor3d_HSurface) mySurf;
-
-  //! First parameter of the result.
-  const Standard_Real myFirst;
-
-  //! Last parameter of the result.
-  const Standard_Real myLast;
-
-  //! Tolerance.
-  Standard_Real myTol;
 
   Handle(Geom2d_BSplineCurve) myCurve2d;
   Handle(Geom_BSplineCurve) myCurve3d;

src/Approx/Approx_SameParameter.cxx

@@ -462,7 +462,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
     myC3d->D0(pc3d[ii],Pc3d);
     dist2 = Pcons.SquareDistance(Pc3d);
     use_parameter = (dist2 <= Tol2  && (pc3d[ii] > pc3d[count-1] + deltamin)) ;
-    Standard_Real aDistMin = RealLast();
+    Standard_Real aDistMin = RealLast();;
     if(use_parameter) {
 
       if(dist2 > dmax2) dmax2 = dist2;

src/Aspect/Aspect_DisplayConnection.cxx

@@ -25,7 +25,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection,Standard_Transient)
 // =======================================================================
 Aspect_DisplayConnection::Aspect_DisplayConnection()
 {
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
   myDisplay = NULL;
   myIsOwnDisplay = false;
   OSD_Environment anEnv ("DISPLAY");
@@ -40,7 +40,7 @@ Aspect_DisplayConnection::Aspect_DisplayConnection()
 // =======================================================================
 Aspect_DisplayConnection::~Aspect_DisplayConnection()
 {
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
   if (myDisplay != NULL
    && myIsOwnDisplay)
   {
@@ -49,7 +49,7 @@ Aspect_DisplayConnection::~Aspect_DisplayConnection()
 #endif
 }
 
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
 // =======================================================================
 // function : Aspect_DisplayConnection
 // purpose  :

src/Aspect/Aspect_DisplayConnection.hxx

@@ -20,7 +20,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <NCollection_DataMap.hxx>
 
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
   #include <InterfaceGraphic.hxx>
 #endif
 
@@ -39,7 +39,7 @@ public:
   //! Destructor. Close opened connection.
   Standard_EXPORT ~Aspect_DisplayConnection();
 
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
   //! Constructor. Creates connection with display specified in theDisplayName.
   //! Display name should be in format "hostname:number" or "hostname:number.screen_number", where:
   //! hostname      - Specifies the name of the host machine on which the display is physically attached.

src/Aspect/Aspect_FBConfig.hxx

@@ -14,7 +14,7 @@
 #ifndef _Aspect_FBConfig_HeaderFile
 #define _Aspect_FBConfig_HeaderFile
 
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
   typedef struct __GLXFBConfigRec* GLXFBConfig;
   typedef GLXFBConfig Aspect_FBConfig; // GLXFBConfig* under UNIX
 #else

src/Aspect/Aspect_NeutralWindow.hxx

@@ -59,7 +59,7 @@ public:
   virtual void Unmap() const Standard_OVERRIDE { myIsMapped = Standard_False; }
 
   //! Resize window - do nothing.
-  virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
+  virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
 
   //! Map window - do nothing.
   virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }