f3d-app · mwestphal · Jan 12, 2025 · Jan 8, 2025 · Jan 10, 2025 · Jan 11, 2025
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 "RC1")
+set(F3D_PATCH_VERSION_EXTRA "RC2")
 if(F3D_PATCH_VERSION_EXTRA STREQUAL "")
   set(F3D_VERSION_FULL ${F3D_VERSION})
 else()

diff --git a/application/F3DNSDelegate.mm b/application/F3DNSDelegate.mm
@@ -14,18 +14,26 @@
 // This is a subclass of NSApplicationDelegate.
 @interface F3DNSDelegateInternal : NSObject<NSApplicationDelegate>
 @property F3DStarter* Starter;
+@property BOOL ShouldHandleFileOpening;
 @end
 
 @implementation F3DNSDelegateInternal
 @synthesize Starter;
+@synthesize ShouldHandleFileOpening;
 
 // ----------------------------------------------------------------------------
 - (BOOL)application:(NSApplication*)theApplication openFile:(NSString*)filename
 {
   (void)theApplication;
-  Starter->AddFile([filename UTF8String]);
-  Starter->LoadFileGroup();
-  Starter->Render();
+  if (ShouldHandleFileOpening)
+  {
+    int index = Starter->AddFile([filename UTF8String]);
+    if (index > -1)
+    {    
+      Starter->LoadFileGroup(index);
+    }   
+    Starter->Render();
+  }
   return YES;
 }
 
@@ -105,6 +113,13 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification
                          action:@selector(toggleFullScreen:)
                   keyEquivalent:@"f"]
     setKeyEquivalentModifierMask:NSEventModifierFlagControl | NSEventModifierFlagCommand];
+
+  ShouldHandleFileOpening = false;
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+  ShouldHandleFileOpening = true;
 }
 
 @end

diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -373,6 +373,10 @@ 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)
@@ -417,9 +421,10 @@ f3d_test(NAME TestVerboseAnimationWrongAnimationTimeHigh DATA BoxAnimated.gltf A
 f3d_test(NAME TestVerboseAnimationWrongAnimationTimeLow DATA BoxAnimated.gltf ARGS --animation-time=-5 --verbose REGEXP "Animation time -5 is outside of range \\[0, 3\\.70833\\], using 0" NO_BASELINE)
 
 # Armature test
-f3d_test(NAME TestGLTFRigNoArmature DATA RiggedFigure.glb ARGS --animation-time=1)
+f3d_test(NAME TestGLTFRigArmatureNoArmature DATA RiggedFigure.glb ARGS --animation-time=1 --opacity=0.5 -p)
 if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20241219)
   f3d_test(NAME TestGLTFRigArmature DATA RiggedFigure.glb ARGS --animation-time=1 --armature)
+  f3d_test(NAME TestGLTFRigArmatureWithOpacity DATA RiggedFigure.glb ARGS --animation-time=1 --armature --opacity=0.5 -p)
   f3d_test(NAME TestGLTFRigArmatureSphereTube DATA RiggedFigure.glb ARGS --animation-time=1 --armature --point-size=20 --line-width=5)
 endif()
 
@@ -841,6 +846,10 @@ f3d_test(NAME TestInteractionConsoleInvalidCommand DATA f3d.glb INTERACTION UI)
 f3d_test(NAME TestInteractionConsoleInvalidOption DATA f3d.glb INTERACTION UI) #Escape;toggle foo;Return
 f3d_test(NAME TestInteractionConsoleClear DATA dragon.vtu INTERACTION UI) #Escape;e;Escape;printt;BackSpace;_scee;Left;n;Right;_info;Return;clear;Return
 f3d_test(NAME TestInteractionConsoleTypingSceneInfo DATA f3d.glb INTERACTION UI) #Escape;e;Escape;printt;BackSpace;_scee;Left;Right;_info;Return
+f3d_test(NAME TestInteractionConsoleReload DATA f3d.glb INTERACTION UI) #Escape;reload_current_file_group;Return
+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
 
 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/doc/user/QUICKSTART.md b/doc/user/QUICKSTART.md
@@ -58,7 +58,7 @@ For **default scene** formats, certain default values are set automatically:
  - roughness: 0.3
  - camera-orthographic: false
 
-They will be overridden when using corresponding [options](OPTIONS.md).
+They will be overridden when using corresponding [options](OPTIONS.md), either from command line or [configuration file](CONFIGURATION_FILE.md).
 
 ## Interacting with your scene
 

diff --git a/library/private/interactor_impl.h b/library/private/interactor_impl.h
@@ -106,6 +106,11 @@ class interactor_impl : public interactor
    */
   void EventLoop();
 
+  /**
+   * Set a command to be run on the next event loop
+   */
+  void SetCommandBuffer(const char* command);
+
   /**
    * An exception that can be thrown by certain command callbacks
    * when the arguments of the callback are incorrect and expected

diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx
@@ -237,7 +237,7 @@ class interactor_impl::internals
     if (event == vtkF3DConsoleOutputWindow::TriggerEvent)
     {
       const char* commandWithArgs = static_cast<const char*>(data);
-      self->Interactor.triggerCommand(commandWithArgs);
+      self->Interactor.SetCommandBuffer(commandWithArgs);
     }
     else if (event == vtkF3DConsoleOutputWindow::ShowEvent ||
       event == vtkF3DConsoleOutputWindow::HideEvent)
@@ -516,6 +516,12 @@ class interactor_impl::internals
       this->EventLoopUserCallBack();
     }
 
+    if (this->CommandBuffer.has_value())
+    {
+      this->Interactor.triggerCommand(this->CommandBuffer.value());
+      this->CommandBuffer.reset();
+    }
+
     this->AnimationManager->Tick();
 
     if (this->RenderRequested)
@@ -543,6 +549,7 @@ class interactor_impl::internals
   std::map<unsigned long, std::pair<int, std::function<void()>>> TimerCallBacks;
 
   std::map<std::string, std::function<void(const std::vector<std::string>&)>> Commands;
+  std::optional<std::string> CommandBuffer;
 
   std::map<interaction_bind_t, BindingCommands> Bindings;
   std::multimap<std::string, interaction_bind_t> GroupedBinds;
@@ -1254,6 +1261,13 @@ void interactor_impl::UpdateRendererAfterInteraction()
   this->Internals->Style->UpdateRendererAfterInteraction();
 }
 
+//----------------------------------------------------------------------------
+void interactor_impl::SetCommandBuffer(const char* command)
+{
+  // XXX This replace previous command buffer, it should be improved
+  this->Internals->CommandBuffer = command;
+}
+
 //----------------------------------------------------------------------------
 interactor_impl::invalid_args_exception::invalid_args_exception(const std::string& what)
   : exception(what)

diff --git a/library/src/window_impl.cxx b/library/src/window_impl.cxx
@@ -178,6 +178,7 @@ window_impl::window_impl(const options& options, const std::optional<Type>& type
 #endif
   this->Internals->RenWin->SetMultiSamples(0); // Disable hardware antialiasing
   this->Internals->RenWin->SetOffScreenRendering(offscreen);
+  this->Internals->RenWin->SetWindowName("f3d");
   this->Internals->RenWin->AddRenderer(this->Internals->Renderer);
   this->Internals->Camera = std::make_unique<detail::camera_impl>();
   this->Internals->Camera->SetVTKRenderer(this->Internals->Renderer);

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-RC1"
+fallback_version = "3.0.0-RC2"
 
 [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,7 +11,9 @@
     "camera-direction": "-1,-0.5,-1",
     "hdri-ambient": true,
     "translucency-support": true,
-    "animation-progress": true
+    "animation-progress": true,
+    "point-size": 5,
+    "line-width": 2
   }
 }
 ]
diff --git a/testing/baselines/TestDefaultConfigFileArmature.png b/testing/baselines/TestDefaultConfigFileArmature.png
diff --git a/testing/baselines/TestGLTFRigArmatureNoArmature.png b/testing/baselines/TestGLTFRigArmatureNoArmature.png
diff --git a/testing/baselines/TestGLTFRigArmatureWithOpacity.png b/testing/baselines/TestGLTFRigArmatureWithOpacity.png
diff --git a/testing/baselines/TestGLTFRigNoArmature.png b/testing/baselines/TestGLTFRigNoArmature.png
diff --git a/testing/baselines/TestInteractionConsoleCamera.png b/testing/baselines/TestInteractionConsoleCamera.png
diff --git a/testing/baselines/TestInteractionConsoleLoadNext.png b/testing/baselines/TestInteractionConsoleLoadNext.png
diff --git a/testing/baselines/TestInteractionConsoleReload.png b/testing/baselines/TestInteractionConsoleReload.png
diff --git a/testing/baselines/TestInteractionConsoleRender.png b/testing/baselines/TestInteractionConsoleRender.png
diff --git a/testing/recordings/TestInteractionConsoleCamera.log b/testing/recordings/TestInteractionConsoleCamera.log
@@ -0,0 +1,74 @@
+# StreamVersion 1.2
+ConfigureEvent 1249 1374 0 0 0 0 0
+ExposeEvent 0 1406 0 0 0 0 0
+RenderEvent 0 1406 0 0 0 0 0
+
+KeyPressEvent -763 401 0 27 1 Escape 0
+CharEvent -763 401 0 27 1 Escape 0
+KeyReleaseEvent -763 401 0 27 1 Escape 0
+
+KeyPressEvent -763 401 0 115 1 s 0
+CharEvent -763 401 0 115 1 s 0
+KeyReleaseEvent -763 401 0 115 1 s 0
+
+KeyPressEvent -763 401 0 101 1 e 0
+CharEvent -763 401 0 101 1 e 0
+KeyReleaseEvent -763 401 0 101 1 e 0
+
+KeyPressEvent -763 401 0 116 1 t 0
+CharEvent -763 401 0 116 1 t 0
+KeyReleaseEvent -763 401 0 116 1 t 0
+
+KeyPressEvent -763 401 1 95 1 underscore 0
+CharEvent -763 401 1 95 1 underscore 0
+KeyReleaseEvent -763 401 1 95 1 underscore 0
+
+KeyPressEvent -763 401 0 99 1 c 0
+CharEvent -763 401 0 99 1 c 0
+KeyReleaseEvent -763 401 0 99 1 c 0
+
+KeyPressEvent -763 401 0 97 1 a 0
+CharEvent -763 401 0 97 1 a 0
+KeyReleaseEvent -763 401 0 97 1 a 0
+
+KeyPressEvent -763 401 0 109 1 m 0
+CharEvent -763 401 0 109 1 m 0
+KeyReleaseEvent -763 401 0 109 1 m 0
+
+KeyPressEvent -763 401 0 101 1 e 0
+CharEvent -763 401 0 101 1 e 0
+KeyReleaseEvent -763 401 0 101 1 e 0
+
+KeyPressEvent -763 401 0 114 1 r 0
+CharEvent -763 401 0 114 1 r 0
+KeyReleaseEvent -763 401 0 114 1 r 0
+
+KeyPressEvent -763 401 0 97 1 a 0
+CharEvent -763 401 0 97 1 a 0
+KeyReleaseEvent -763 401 0 97 1 a 0
+
+KeyPressEvent -763 401 0 32 1 space 0
+CharEvent -763 401 0 32 1 space 0
+KeyReleaseEvent -763 401 0 32 1 space 0
+
+KeyPressEvent -763 401 0 116 1 t 0
+CharEvent -763 401 0 116 1 t 0
+KeyReleaseEvent -763 401 0 116 1 t 0
+
+KeyPressEvent -763 401 0 111 1 o 0
+CharEvent -763 401 0 111 1 o 0
+KeyReleaseEvent -763 401 0 111 1 o 0
+
+KeyPressEvent -763 401 0 112 1 p 0
+CharEvent -763 401 0 112 1 p 0
+KeyReleaseEvent -763 401 0 112 1 p 0
+
+KeyPressEvent -763 401 0 13 1 Return 0
+CharEvent -763 401 0 13 1 Return 0
+KeyReleaseEvent -763 401 0 13 1 Return 0
+
+KeyPressEvent -763 401 0 27 1 Escape 0
+CharEvent -763 401 0 27 1 Escape 0
+KeyReleaseEvent -763 401 0 27 1 Escape 0
+
+TimerEvent 212 76 0 27 1 Escape 0
diff --git a/testing/recordings/TestInteractionConsoleClear.log b/testing/recordings/TestInteractionConsoleClear.log
@@ -123,3 +123,4 @@ KeyPressEvent 0 0 0 13 1 Return 0
 CharEvent 0 0 0 13 1 Return 0
 KeyReleaseEvent 0 0 0 13 1 Return 0
 
+TimerEvent 351 169 0 0 0 0 0
diff --git a/testing/recordings/TestInteractionConsoleInvalidCommand.log b/testing/recordings/TestInteractionConsoleInvalidCommand.log
@@ -20,3 +20,5 @@ KeyReleaseEvent 0 0 0 111 1 o 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
+
+TimerEvent 351 169 0 0 0 0 0
diff --git a/testing/recordings/TestInteractionConsoleInvalidOption.log b/testing/recordings/TestInteractionConsoleInvalidOption.log
@@ -48,3 +48,5 @@ KeyReleaseEvent 0 0 0 111 1 o 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
+
+TimerEvent 351 169 0 0 0 0 0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -123,3 +123,4 @@ KeyPressEvent 0 0 0 13 1 Return 0
		CharEvent 0 0 0 13 1 Return 0
		KeyReleaseEvent 0 0 0 13 1 Return 0

		TimerEvent 351 169 0 0 0 0 0