Merge branch 'f3d-app:master' into master

f3d-app · Sep 29, 2024 · 0b77402 · 0b77402
2 parents de4561c + f7c013c
commit 0b77402
Show file tree

Hide file tree

Showing 22 changed files with 460 additions and 25 deletions.
diff --git a/.github/workflows/winget-release.yml b/.github/workflows/winget-release.yml
@@ -0,0 +1,27 @@
+name: Submit Winget Package to Windows Package Manager Community Repository
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: "Specific tag name"
+        required: true
+        type: string
+jobs:
+  winget-publish:
+    name: Publish winget package
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set winget version env
+        env:
+          TAG_NAME: ${{ inputs.tag_name || github.event.release.tag_name }}
+        run: echo "WINGET_TAG_NAME=$(echo ${TAG_NAME#v})" >> $GITHUB_ENV
+      - name: Submit package to Windows Package Manager Community Repository
+        uses: vedantmgoyal2009/winget-releaser@v2
+        with:
+          identifier: f3d-app.f3d
+          installers-regex: '^F3D-[\d\.]+-Windows-x86_64\.exe$'
+          version: ${{ env.WINGET_TAG_NAME }}
+          release-tag: ${{ inputs.tag_name || github.event.release.tag_name }}
+          token: ${{ secrets.WINGET_ACC_TOKEN }}
diff --git a/application/F3DStarter.cxx b/application/F3DStarter.cxx
@@ -1095,7 +1095,7 @@ void F3DStarter::LoadFile(int index, bool relativeIndex)
         f3d::log::error("Could not load file: ", ex.what());
       }
 
-      if (!this->Internals->AppOptions.NoRender)
+      if (!dynamicOptions.scene.camera.index.has_value() && !this->Internals->AppOptions.NoRender)
       {
         // Setup the camera according to options
         this->Internals->SetupCamera(this->Internals->AppOptions.CamConf);

diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -754,6 +754,8 @@ f3d_test(NAME TestInteractionCameraHotkeys DATA cow.vtp INTERACTION)
 f3d_test(NAME TestInteractionZoomToMouse DATA cow.vtp INTERACTION)
 f3d_test(NAME TestInteractionOrthographicProjection DATA cow.vtp INTERACTION) #5;5
 f3d_test(NAME TestInteractionZoomToggleOrthographicProjection DATA cow.vtp INTERACTION) #MouseWheel;5;Mousewheelx6;5
+f3d_test(NAME TestInteractionRotateCameraMinus90 DATA f3d.glb INTERACTION)
+f3d_test(NAME TestInteractionRotateCamera90 DATA f3d.glb INTERACTION)
 
 # Progress test
 f3d_test(NAME TestProgress DATA cow.vtp ARGS --progress NO_BASELINE)

diff --git a/doc/user/INTERACTIONS.md b/doc/user/INTERACTIONS.md
@@ -57,7 +57,9 @@ Note that some hotkeys can be available or not depending on the file being loade
 Camera Hotkeys:
 * <kbd>1</kbd>: front view camera.
 * <kbd>3</kbd>: right view camera.
+* <kbd>4</kbd>: roll the camera left by 90 degrees.
 * <kbd>5</kbd>: toggle orthographic projection.
+* <kbd>6</kbd>: roll the camera right by 90 degrees.
 * <kbd>7</kbd>: top view camera.
 * <kbd>9</kbd>: isometric view camera.
 * <kbd>Enter</kbd>: reset the camera to its initial parameters.

diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx
@@ -327,10 +327,18 @@ class interactor_impl::internals
         self->SetViewOrbit(ViewType::VT_RIGHT, self);
         render = true;
         break;
+      case '4':
+        self->Window.getCamera().roll(-90);
+        render = true;
+        break;
       case '5':
         self->Options.scene.camera.orthographic = !self->Options.scene.camera.orthographic;
         render = true;
         break;
+      case '6':
+        self->Window.getCamera().roll(90);
+        render = true;
+        break;
       case '7':
         self->SetViewOrbit(ViewType::VT_TOP, self);
         render = true;

diff --git a/testing/baselines/TestCameraIndexConfiguration.png b/testing/baselines/TestCameraIndexConfiguration.png
diff --git a/testing/baselines/TestInteractionCheatsheet.png b/testing/baselines/TestInteractionCheatsheet.png
diff --git a/testing/baselines/TestInteractionCheatsheetBlackBG.png b/testing/baselines/TestInteractionCheatsheetBlackBG.png
diff --git a/testing/baselines/TestInteractionCheatsheetBlackBGRaytracing.png b/testing/baselines/TestInteractionCheatsheetBlackBGRaytracing.png
diff --git a/testing/baselines/TestInteractionCheatsheetRaytracing.png b/testing/baselines/TestInteractionCheatsheetRaytracing.png
diff --git a/testing/baselines/TestInteractionCheatsheetScalars.png b/testing/baselines/TestInteractionCheatsheetScalars.png
diff --git a/testing/baselines/TestInteractionCheatsheetScalarsRaytracing.png b/testing/baselines/TestInteractionCheatsheetScalarsRaytracing.png
diff --git a/testing/baselines/TestInteractionCheatsheetWhiteBG.png b/testing/baselines/TestInteractionCheatsheetWhiteBG.png
diff --git a/testing/baselines/TestInteractionCheatsheetWhiteBGRaytracing.png b/testing/baselines/TestInteractionCheatsheetWhiteBGRaytracing.png
diff --git a/testing/baselines/TestInteractionNoFileCheatsheet.png b/testing/baselines/TestInteractionNoFileCheatsheet.png
diff --git a/testing/baselines/TestInteractionNoFileCheatsheetRaytracing.png b/testing/baselines/TestInteractionNoFileCheatsheetRaytracing.png
diff --git a/testing/baselines/TestInteractionRotateCamera90.png b/testing/baselines/TestInteractionRotateCamera90.png
diff --git a/testing/baselines/TestInteractionRotateCameraMinus90.png b/testing/baselines/TestInteractionRotateCameraMinus90.png
diff --git a/testing/recordings/TestInteractionRotateCamera90.log b/testing/recordings/TestInteractionRotateCamera90.log
@@ -0,0 +1,133 @@
+# StreamVersion 1.2
+ExposeEvent 0 599 0 0 0 0 0
+RenderEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+ExposeEvent 0 599 0 0 0 0 0
+RenderEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+TimerEvent 0 599 0 0 0 0 0
+KeyPressEvent 1051 -293 0 54 1 6 0
+CharEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+KeyReleaseEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0
+TimerEvent 1051 -293 0 54 1 6 0