Merge pull request #1911 from f3d-app/release

merge release into master
f3d-app · Jan 12, 2025 · 5f7a99c · 5f7a99c
2 parents cf464a6 + b6318e8
commit 5f7a99c
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 16 deletions.
diff --git a/.github/baselines/install_example_plugin_output.png b/.github/baselines/install_example_plugin_output.png
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ set(F3D_MINOR_VERSION 0)
 set(F3D_PATCH_VERSION 0)
 set(F3D_VERSION ${F3D_MAJOR_VERSION}.${F3D_MINOR_VERSION}.${F3D_PATCH_VERSION})
 
-set(F3D_PATCH_VERSION_EXTRA "RC2")
+set(F3D_PATCH_VERSION_EXTRA "RC3")
 if(F3D_PATCH_VERSION_EXTRA STREQUAL "")
   set(F3D_VERSION_FULL ${F3D_VERSION})
 else()

diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -375,10 +375,6 @@ if(NOT F3D_MACOS_BUNDLE)
   f3d_test(NAME TestDefaultConfigFileAndCommand DATA suzanne.stl ARGS --up=-Y --camera-direction=-1,0.5,-1 CONFIG config_build LONG_TIMEOUT TONE_MAPPING UI)
   f3d_test(NAME TestDefaultConfigTranslucent DATA red_translucent_monkey.gltf CONFIG config_build LONG_TIMEOUT TONE_MAPPING UI)
 
-if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20241219)
-  f3d_test(NAME TestDefaultConfigFileArmature DATA RiggedFigure.glb ARGS --animation-time=1 --armature CONFIG config_build LONG_TIMEOUT TONE_MAPPING UI)
-endif()
-
   file(COPY "${F3D_SOURCE_DIR}/resources/configs/thumbnail.d/" "${F3D_SOURCE_DIR}/plugins/native/configs/thumbnail.d/" DESTINATION "${CMAKE_BINARY_DIR}/share/f3d/configs/thumbnail_build.d")
   f3d_test(NAME TestThumbnailConfigFileVTU DATA dragon.vtu CONFIG thumbnail_build LONG_TIMEOUT TONE_MAPPING)
   f3d_test(NAME TestThumbnailConfigFileVTI DATA vase_4comp.vti CONFIG thumbnail_build LONG_TIMEOUT TONE_MAPPING)
@@ -852,6 +848,8 @@ f3d_test(NAME TestInteractionConsoleReload DATA f3d.glb INTERACTION UI) #Escape;
 f3d_test(NAME TestInteractionConsoleLoadNext DATA f3d.glb cow.vtp INTERACTION UI) #Escape;load_next_file_group;Return
 f3d_test(NAME TestInteractionConsoleRender ARGS --coloring-by-cells DATA waveletMaterial.vti INTERACTION UI) #Escape;toggle_volume_rendering;Return
 f3d_test(NAME TestInteractionConsoleCamera DATA f3d.glb INTERACTION UI) #Escape;set_camera top;Return
+f3d_test(NAME TestInteractionConsoleScrollbar DATA f3d.glb INTERACTION UI) #Escape;a;Enter;Grab scrollbar
+f3d_test(NAME TestInteractionConsoleEmptyCommand DATA f3d.glb INTERACTION UI) #Escape;Enter
 
 if (F3D_MODULE_TINYFILEDIALOGS)
 f3d_test(NAME TestInteractionFileOpen INTERACTION NO_BASELINE ENV CTEST_OPEN_DIALOG_FILE=${F3D_SOURCE_DIR}/testing/data/cow.vtp)

diff --git a/pyproject.toml b/pyproject.toml
@@ -52,7 +52,7 @@ wheel.packages = []
 version_file = "_version.py"
 version_scheme = "no-guess-dev"
 local_scheme = "no-local-version"
-fallback_version = "3.0.0-RC2"
+fallback_version = "3.0.0-RC3"
 
 [tool.scikit-build.cmake.define]
 CMAKE_OSX_DEPLOYMENT_TARGET = "10.15"

diff --git a/resources/configs/config.d/05_all.json b/resources/configs/config.d/05_all.json
@@ -11,9 +11,7 @@
     "camera-direction": "-1,-0.5,-1",
     "hdri-ambient": true,
     "translucency-support": true,
-    "animation-progress": true,
-    "point-size": 5,
-    "line-width": 2
+    "animation-progress": true
   }
 }
 ]
diff --git a/testing/baselines/TestDefaultConfigFileArmature.png b/testing/baselines/TestDefaultConfigFileArmature.png
diff --git a/testing/baselines/TestInteractionConsoleEmptyCommand.png b/testing/baselines/TestInteractionConsoleEmptyCommand.png
diff --git a/testing/baselines/TestInteractionConsoleScrollbar.png b/testing/baselines/TestInteractionConsoleScrollbar.png
diff --git a/testing/recordings/TestInteractionConsoleEmptyCommand.log b/testing/recordings/TestInteractionConsoleEmptyCommand.log
@@ -0,0 +1,10 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+
+KeyPressEvent 211 120 0 27 1 Escape 0
+CharEvent 211 120 0 27 1 Escape 0
+KeyReleaseEvent 211 120 0 27 1 Escape 0
+
+KeyPressEvent 211 120 0 13 1 Return 0
+CharEvent 211 120 0 13 1 Return 0
+KeyReleaseEvent 211 120 0 13 1 Return 0
diff --git a/testing/recordings/TestInteractionConsoleScrollbar.log b/testing/recordings/TestInteractionConsoleScrollbar.log
@@ -0,0 +1,24 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+
+KeyPressEvent 0 0 0 27 1 Escape 0
+CharEvent 0 0 0 27 1 Escape 0
+KeyReleaseEvent 0 0 0 27 1 Escape 0
+
+KeyPressEvent 0 0 0 97 1 a 0
+CharEvent 0 0 0 97 1 a 0
+KeyReleaseEvent 0 0 0 97 1 a 0
+
+KeyPressEvent 0 0 0 13 1 Return 0
+CharEvent 0 0 0 13 1 Return 0
+KeyReleaseEvent 0 0 0 13 1 Return 0
+
+MouseMoveEvent 52 79 0 0 0 Return 0
+TimerEvent 52 79 0 0 0 Return 0
+LeftButtonPressEvent 52 79 0 0 0 Return 0
+MouseMoveEvent 53 79 0 0 0 Return 0
+TimerEvent 53 79 0 0 0 Return 0
+MouseMoveEvent 150 81 0 0 0 Return 0
+TimerEvent 150 81 0 0 0 Return 0
+LeftButtonReleaseEvent 150 81 0 0 0 Return 0
+TimerEvent 150 81 0 0 0 Return 0
diff --git a/vtkext/private/module/vtkF3DImguiConsole.cxx b/vtkext/private/module/vtkF3DImguiConsole.cxx
@@ -143,9 +143,15 @@ void vtkF3DImguiConsole::ShowConsole()
   ImGui::PopItemWidth();
 
   ImGui::SetItemDefaultFocus();
-  ImGui::SetKeyboardFocusHere(-1);
 
-  if (runCommand)
+  // if always forcing the focus, it prevents grabbing the scrollbar
+  if (!ImGui::IsAnyItemActive())
+  {
+    ImGui::SetKeyboardFocusHere(-1);
+  }
+
+  // do not run the command if nothing is in the input text
+  if (runCommand && this->Pimpl->CurrentInput[0] != 0)
   {
     this->Pimpl->Logs.emplace_back(std::make_pair(
       Internals::LogType::Typed, std::string("> ") + this->Pimpl->CurrentInput.data()));