Merge pull request #1038 from f3d-app/release

merge release into master

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-skip = ./testing/**/*,./.git/**/*,./external/cxxopts/cxxopts.hpp
+skip = ./testing/**/*,./.git/**/*,./external/cxxopts/cxxopts.hpp,./external/nlohmann_json/nlohmann/json.hpp
 ignore-words-list=nnumber,unknwn,dota,modle

CMakeLists.txt

@@ -31,7 +31,7 @@ include(f3dVersion)
 # Handle F3D_VERSION
 set(F3D_MAJOR_VERSION 2)
 set(F3D_MINOR_VERSION 2)
-set(F3D_PATCH_VERSION 0)
+set(F3D_PATCH_VERSION 1)
 set(F3D_VERSION ${F3D_MAJOR_VERSION}.${F3D_MINOR_VERSION}.${F3D_PATCH_VERSION})
 
 set(F3D_PATCH_VERSION_EXTRA "")

library/src/window_impl.cxx

@@ -26,10 +26,6 @@
 #include <vtkExternalOpenGLRenderWindow.h>
 #endif
 
-#if defined(_WIN32)
-#include <vtkWindows.h>
-#endif
-
 namespace f3d::detail
 {
 class window_impl::internals
@@ -218,14 +214,6 @@ void window_impl::Initialize(bool withColoring)
 {
   this->Internals->WithColoring = withColoring;
   this->Internals->Renderer->Initialize(this->Internals->Options.getAsString("scene.up-direction"));
-
-#if defined(_WIN32)
-  // On Windows, the Log window can get in front in some case, make sure the render window is on top
-  // on initialization
-  HWND f3dWindow = static_cast<HWND>(this->Internals->RenWin->GetGenericWindowId());
-  BringWindowToTop(f3dWindow);
-#endif
-
   this->Internals->Initialized = true;
 }
 

library/testing/TestSDKCamera.cxx

@@ -8,7 +8,7 @@
 #include <iostream>
 #include <limits>
 
-// TODO these methodes should be put in types.h at some point.
+// TODO these methods should be put in types.h at some point.
 // https://github.com/f3d-app/f3d/issues/361
 bool compareDouble(double a, double b)
 {

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "scikit_build_core.build"
 [project]
 name = "f3d"
 requires-python = ">=3.7"
-version = "2.2.0"
+version = "2.2.1"
 description = "F3D, a fast and minimalist 3D viewer"
 readme = "README.md"
 license = {file = "LICENSE.md"}