Add rotate_up command & binding

Author: noclone

library/private/window_impl.h

@@ -73,6 +73,14 @@ class window_impl : public window
    */
   void InitializeUpVector();
 
+  /**
+   * Implementation only API.
+   * Rotate the up vector around the specified axis.
+   * @param axis 0=X, 1=Y, 2=Z
+   * @param angleDegrees rotation angle in degrees
+   */
+  void RotateUpVector(int axis, double angleDegrees);
+
   /**
    * Implementation only API.
    * Set the importer on the internal renderer

library/src/interactor_impl.cxx

@@ -1113,6 +1113,35 @@ interactor& interactor_impl::initCommands()
     },
     command_documentation_t{ "azimuth_camera value", "tilt the camera right or left" });
 
+  this->addCommand(
+    "rotate_up",
+    [&](const std::vector<std::string>& args)
+    {
+      check_args(args, 2, "rotate_up");
+      int axis = -1;
+      if (args[0] == "x" || args[0] == "X")
+      {
+        axis = 0;
+      }
+      else if (args[0] == "y" || args[0] == "Y")
+      {
+        axis = 1;
+      }
+      else if (args[0] == "z" || args[0] == "Z")
+      {
+        axis = 2;
+      }
+      else
+      {
+        throw interactor::invalid_args_exception("rotate_up: axis must be x, y, or z");
+      }
+      double angle = options::parse<double>(args[1]);
+      this->Internals->Window.RotateUpVector(axis, angle);
+      this->Internals->Style->ResetTemporaryUp();
+    },
+    command_documentation_t{ "rotate_up x/y/z angle", "rotate the scene up vector around an axis" },
+    std::bind(complNames, std::placeholders::_1, std::vector<std::string>{ "x", "y", "z" }));
+
   this->addCommand(
     "increase_light_intensity",
     [&](const std::vector<std::string>&) { this->Internals->IncreaseLightIntensity(false); },
@@ -1608,9 +1637,11 @@ interactor& interactor_impl::initBindings()
   this->addBinding({mod_t::ANY, "1"}, "set_camera front", "Camera", std::bind(docStr, "Front View camera"));
   this->addBinding({mod_t::ANY, "2"}, "elevation_camera -90", "Camera", std::bind(docStr, "Rotate camera down"));
   this->addBinding({mod_t::ANY, "3"}, "set_camera right", "Camera", std::bind(docStr, "Right View camera"));
-  this->addBinding({mod_t::ANY, "4"}, "roll_camera -90", "Camera", std::bind(docStr, "Rotate camera right"));
+  this->addBinding({mod_t::NONE, "4"}, "roll_camera -90", "Camera", std::bind(docStr, "Rotate camera right"));
+  this->addBinding({mod_t::CTRL, "4"}, "rotate_up x 90", "Scene", std::bind(docStr, "Rotate scene up +90 around X"));
   this->addBinding({mod_t::ANY, "5"}, "toggle scene.camera.orthographic", "Camera", std::bind(docTglOpt, "Orthographic Projection", std::cref(opts.scene.camera.orthographic)), f3d::interactor::BindingType::TOGGLE);
-  this->addBinding({mod_t::ANY, "6"}, "roll_camera 90", "Camera", std::bind(docStr, "Rotate camera left"));
+  this->addBinding({mod_t::NONE, "6"}, "roll_camera 90", "Camera", std::bind(docStr, "Rotate camera left"));
+  this->addBinding({mod_t::CTRL, "6"}, "rotate_up x -90", "Scene", std::bind(docStr, "Rotate scene up -90 around X"));
   this->addBinding({mod_t::ANY, "7"}, "set_camera top", "Camera", std::bind(docStr, "Top View camera"));
   this->addBinding({mod_t::ANY, "8"}, "elevation_camera 90", "Camera", std::bind(docStr, "Rotate camera up"));
   this->addBinding({mod_t::ANY, "9"}, "set_camera isometric", "Camera", std::bind(docStr, "Isometric View camera"));

library/src/window_impl.cxx

@@ -211,6 +211,12 @@ void window_impl::InitializeUpVector()
   this->Internals->Renderer->InitializeUpVector(this->Internals->Options.scene.up_direction);
 }
 
+//----------------------------------------------------------------------------
+void window_impl::RotateUpVector(int axis, double angleDegrees)
+{
+  this->Internals->Renderer->RotateUpVector(axis, angleDegrees);
+}
+
 //----------------------------------------------------------------------------
 window_impl::Type window_impl::getType()
 {

vtkext/private/module/vtkF3DRenderer.cxx

@@ -405,6 +405,51 @@ void vtkF3DRenderer::InitializeUpVector(const std::vector<double>& upVec)
   this->SetEnvironmentRight(this->RightVector);
 }
 
+//----------------------------------------------------------------------------
+void vtkF3DRenderer::RotateUpVector(int axis, double angleDegrees)
+{
+  if (axis < 0 || axis > 2)
+  {
+    F3DLog::Print(F3DLog::Severity::Warning, "Invalid axis for rotate_up, must be 0 (X), 1 (Y), or 2 (Z)");
+    return;
+  }
+
+  vtkNew<vtkTransform> rotationTransform;
+  double axisVec[3] = { 0.0, 0.0, 0.0 };
+  axisVec[axis] = 1.0;
+  rotationTransform->RotateWXYZ(angleDegrees, axisVec);
+
+  double newUp[3];
+  rotationTransform->TransformPoint(this->UpVector, newUp);
+  vtkMath::Normalize(newUp);
+
+  double newRight[3];
+  rotationTransform->TransformPoint(this->RightVector, newRight);
+  vtkMath::Normalize(newRight);
+
+  double front[3];
+  vtkMath::Cross(newRight, newUp, front);
+  vtkMath::Normalize(front);
+
+  vtkMath::Cross(newUp, front, newRight);
+  vtkMath::Normalize(newRight);
+
+  this->UpVector[0] = newUp[0];
+  this->UpVector[1] = newUp[1];
+  this->UpVector[2] = newUp[2];
+  this->RightVector[0] = newRight[0];
+  this->RightVector[1] = newRight[1];
+  this->RightVector[2] = newRight[2];
+
+  this->SkyboxActor->SetFloorPlane(this->UpVector[0], this->UpVector[1], this->UpVector[2], 0.0);
+  this->SkyboxActor->SetFloorRight(front[0], front[1], front[2]);
+
+  this->SetEnvironmentUp(this->UpVector);
+  this->SetEnvironmentRight(this->RightVector);
+
+  this->GridConfigured = false;
+}
+
 //----------------------------------------------------------------------------
 void vtkF3DRenderer::ConfigureRenderPasses()
 {

vtkext/private/module/vtkF3DRenderer.h

@@ -208,6 +208,14 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
    */
   void InitializeUpVector(const std::vector<double>& upVec);
 
+  /**
+   * Rotate the up vector around the specified axis by the given angle (degrees).
+   * Updates skybox and environment orientation. Does NOT reset camera.
+   * @param axis 0=X, 1=Y, 2=Z
+   * @param angleDegrees rotation angle in degrees
+   */
+  void RotateUpVector(int axis, double angleDegrees);
+
   /**
    * Compute bounds of visible props as transformed by given matrix.
    */