Add IJKL translation movements to orbital camera.

Author: Adnn

src/apps/ch11_voxel/ch11_voxel/Scene.cpp

@@ -217,10 +217,10 @@ void Scene::voxelize()
 }
 
 
-void Scene::step(const graphics::Timer & /*aTimer*/,
+void Scene::step(const graphics::Timer & aTimer,
                  math::Size<2, int> aWindowResolution)
 {
-    mOrbitalCamera.update(aWindowResolution.height());
+    mOrbitalCamera.update(aTimer.delta(), aWindowResolution.height());
 
     //
     // Camera

src/libs/scenic/scenic/Camera.cpp

@@ -123,10 +123,12 @@ void Orbital::incrementOrbit(math::Radian<float> aAzimuthal, math::Radian<float>
 }
 
 
-void Orbital::pan(math::Vec<2, float> aPanning)
+void Orbital::translate(math::Vec<3, float> aTranslation)
 {
     math::OrthonormalBase<3, float> tangent = mSpherical.computeTangentFrame().base;
-    mSphericalOrigin -= aPanning.x() * tangent.u() - aPanning.y() * tangent.v();
+    mSphericalOrigin -= aTranslation.x() * tangent.u() 
+                        - aTranslation.y() * tangent.v()
+                        + aTranslation.z() * tangent.w();
 }
 
 
@@ -199,11 +201,19 @@ void OrbitalControl::callbackCursorPosition(double xpos, double ypos)
 }
 
 
-void OrbitalControl::update(float aViewHeightInWorld, int aWindowHeight)
+void OrbitalControl::update(float aDeltaTime, float aViewHeightInWorld, int aWindowHeight)
 {
     assert(aWindowHeight != 0);
-    mOrbital.pan(mDragVector_cursor * aViewHeightInWorld / aWindowHeight);
+    math::Vec<3, float> translation{
+        mDragVector_cursor * aViewHeightInWorld / aWindowHeight,
+        0.f};
     mDragVector_cursor = {0.f, 0.f};
+
+    // Handle translations
+    float movement = aDeltaTime * gTranslationSpeed;
+    translation += mMovementVector * movement;
+
+    mOrbital.translate(translation);
 }
 
 
@@ -236,6 +246,32 @@ void OrbitalControl::callbackScroll(double xoffset, double yoffset)
 }
 
 
+void OrbitalControl::callbackKeyboard(int key, int scancode, int action, int mods)
+{
+    if(action != GLFW_PRESS && action != GLFW_RELEASE)
+    {
+        return;
+    }
+
+    const float v = (action == GLFW_PRESS) ? 1 : 0;
+    switch(key)
+    {
+        case GLFW_KEY_I:
+            mMovementVector.z() = v;
+            break;
+        case GLFW_KEY_K:
+            mMovementVector.z() = -v;
+            break;
+        case GLFW_KEY_J:
+            mMovementVector.x() = v;
+            break;
+        case GLFW_KEY_L:
+            mMovementVector.x() = -v;
+            break;
+    }
+}
+
+
 ////////
 // FirstPersonControl
 ////////

src/libs/scenic/scenic/Camera.h

@@ -148,7 +148,12 @@ struct Orbital
     void incrementOrbitRadians(math::Vec<2, float> aIncrements)
     { incrementOrbit(math::Radian<float>{aIncrements.x()}, math::Radian<float>{aIncrements.y()}); }
 
-    void pan(math::Vec<2, float> aPanning);
+    void translate(math::Vec<3, float> aTranslation);
+
+    inline void pan(math::Vec<2, float> aPanning)
+    {
+        translate({aPanning.x(), aPanning.y(), 0.f});
+    }
 
     float & radius();
     float radius() const;
@@ -196,15 +201,14 @@ struct OrbitalControl
     void callbackMouseButton(int button, int action, int mods, double xpos, double ypos);
     void callbackCursorPosition(double xpos, double ypos);
     void callbackScroll(double xoffset, double yoffset);
-    void callbackKeyboard(int key, int scancode, int action, int mods)
-    {}
+    void callbackKeyboard(int key, int scancode, int action, int mods);
 
     // Note: Initially, this class was storing a copy of the VFOV,
     // and thus could do panning directly in the cursor position callback.
     // Yet this copy violated DRY, and was only behaving well with perspective projection.
     // Note: As an alternative to taking the window size, the class could store a pointer to the appinterface
     // and query when needed.
-    void update(float aViewHeightInWorld, int aWindowHeight);
+    void update(float aDeltaTime, float aViewHeightInWorld, int aWindowHeight);
 
     Orbital mOrbital;
 
@@ -218,10 +222,12 @@ struct OrbitalControl
 
     static constexpr math::Vec<2, float> gMouseControlFactor{1/700.f, 1/700.f};
     static constexpr float gScrollFactor = 0.05f;
+    static constexpr float gTranslationSpeed = 4.f; // worldunit/s
 
     // The drag quantity in cursor unit (usually pixels)
     // This allow deferring the actual panning until update(), which can convert this quantity to world unit.
     math::Vec<2, float> mDragVector_cursor;
+    math::Vec<3, float> mMovementVector;
     ControlMode mControlMode{ControlMode::None};
     math::Position<2, float> mPreviousDragPosition{0.f, 0.f};
 };

src/libs/scenic/scenic/CameraSystem.cpp

@@ -4,9 +4,9 @@
 namespace ad::scenic {
 
 
-void OrbitalCamera::update(int aWindowHeight)
+void OrbitalCamera::update(float aDeltaTime, int aWindowHeight)
 {
-    mOrbitalControl.update(mViewHeightInWorld, aWindowHeight);
+    mOrbitalControl.update(aDeltaTime, mViewHeightInWorld, aWindowHeight);
 }
 
 

src/libs/scenic/scenic/CameraSystem.h

@@ -9,7 +9,7 @@ namespace ad::scenic {
 
 struct OrbitalCamera
 {
-    void update(int aWindowHeight);
+    void update(float aDeltaTime, int aWindowHeight);
 
     void reset(float aAspectRatio);