Camera

game/camera.h

@@ -28,7 +28,9 @@ class Camera final {
       Dive
       };
 
-    void reset(World& world);
+    void reset();
+    void reset(const Npc* pl);
+
     void save(Serialize &s);
     void load(Serialize &s,Npc* pl);
 
@@ -54,7 +56,7 @@ class Camera final {
 
     void toogleDebug();
 
-    void tick(const Npc& npc, uint64_t dt, bool inMove, bool includeRot);
+    void tick(uint64_t dt);
     void debugDraw(DbgPainter& p);
 
     Tempest::PointF spin()     const;
@@ -63,7 +65,7 @@ class Camera final {
     void            setSpin(const Tempest::PointF& p);
     void            setDestSpin(const Tempest::PointF& p);
 
-    void            setPosition(float x,float y,float z);
+    void            setPosition(const Tempest::Vec3& pos);
     void            setDestPosition(const Tempest::Vec3& pos);
 
     void            setDialogDistance(float d);
@@ -77,44 +79,53 @@ class Camera final {
 
   private:
     struct State {
-      Tempest::Vec3 pos   = {};
-      Tempest::Vec3 spin  = {};
-      Tempest::Vec3 spin2 = {};
-      float         range = 0.3f;
+      float               range  = 3.f;
+      Tempest::Vec3       spin   = {};
+      Tempest::Vec3       target = {};
       };
 
-    State                 state, dest;
-    float                 dlgDist = 0;
+    Tempest::Vec3         cameraPos = {};
+    Tempest::Vec3         origin    = {};
+    Tempest::Vec3         rotOffset = {};
+    Tempest::Vec3         offsetAng = {};
+    State                 src, dst;
+
+    float                 dlgDist   = 0;
+    float                 userRange = 0.13f;
 
     Tempest::Matrix4x4    proj;
     uint32_t              vpWidth=0;
     uint32_t              vpHeight=0;
 
-    bool                  hasPos   = false;
-    bool                  dbg      = false;
-    bool                  tgEnable = true;
-    bool                  fpEnable = false;
-    bool                  lbEnable = false;
-    Mode                  camMod   = Normal;
+    bool                  dbg           = false;
+    bool                  tgEnable      = true;
+    bool                  fpEnable      = false;
+    bool                  lbEnable      = false;
+    bool                  inertiaTarget = true;
+    Mode                  camMod        = Normal;
 
     mutable int           raysCasted = 0;
 
-    Tempest::Vec3         applyModPosition(const Tempest::Vec3& pos);
-    Tempest::Vec3         applyModRotation(const Tempest::Vec3& spin);
+    static float          maxDist;
+    static float          baseSpeeed;
+    static float          offsetAngleMul;
+
+    void                  calcControlPoints(float dtF);
 
-    Tempest::Vec3         calcTranslation(float dist) const;
+    Tempest::Vec3         calcOffsetAngles(const Tempest::Vec3& srcOrigin, const Tempest::Vec3& target) const;
+    Tempest::Vec3         calcOffsetAngles(Tempest::Vec3 srcOrigin, Tempest::Vec3 dstOrigin, Tempest::Vec3 target) const;
+    float                 calcCameraColision(const Tempest::Vec3& target, const Tempest::Vec3& origin, const Tempest::Vec3& rotSpin, float dist) const;
 
-    void                  implReset(const Npc& pl);
     void                  implMove(Tempest::KeyEvent::KeyType t);
-    Tempest::Matrix4x4    mkView    (const Tempest::Vec3& pos, float dist) const;
+    Tempest::Matrix4x4    mkView    (const Tempest::Vec3& pos, const Tempest::Vec3& spin) const;
     Tempest::Matrix4x4    mkRotation(const Tempest::Vec3& spin) const;
-    void                  clampRange(float& z);
 
-    void                  followPos(Tempest::Vec3& pos, Tempest::Vec3 dest, bool inMove, float dtF);
-    void                  followAng(Tempest::Vec3& spin, Tempest::Vec3 dest, float dtF);
-    static void           followAng(float& ang,float dest,float speed);
+    void                  clampRotation(Tempest::Vec3& spin);
 
-    float                 calcCameraColision(const Tempest::Matrix4x4& view, const float dist) const;
+    void                  followCamera(Tempest::Vec3& pos,  Tempest::Vec3 dest, float dtF);
+    void                  followPos   (Tempest::Vec3& pos,  Tempest::Vec3 dest, float dtF);
+    void                  followAng   (Tempest::Vec3& spin, Tempest::Vec3 dest, float dtF);
+    static void           followAng   (float& ang, float dest, float speed, float dtF);
 
     const Daedalus::GEngineClasses::CCamSys& cameraDef() const;
   };

game/game/gamesession.cpp

@@ -88,7 +88,7 @@ GameSession::GameSession(std::string file) {
   if(!testMode)
     initScripts(true);
   wrld->triggerOnStart(true);
-  cam->reset(*wrld);
+  cam->reset(wrld->player());
   Gothic::inst().setLoadingProgress(96);
   ticks = 1;
   // wrld->setDayTime(8,0);
@@ -318,7 +318,7 @@ auto GameSession::implChangeWorld(std::unique_ptr<GameSession>&& game,
       break;
       }
 
-  cam->reset(*wrld);
+  cam->reset();
   Log::i("Done loading world[",world,"]");
   return std::move(game);
   }

game/game/playercontrol.cpp

@@ -14,10 +14,6 @@ PlayerControl::PlayerControl(DialogMenu& dlg, InventoryMenu &inv)
   :dlg(dlg),inv(inv) {
   }
 
-bool PlayerControl::isInMove() {
-  return ctrl[Action::Forward] | ctrl[Action::Left] | ctrl[Action::Right]; // | ctrl[Action::Back];
-  }
-
 void PlayerControl::setTarget(Npc *other) {
   auto w  = Gothic::inst().world();
   auto pl = w ? w->player() : nullptr;
@@ -369,6 +365,9 @@ void PlayerControl::marvinF8(uint64_t dt) {
   pl.clearSpeed();
   pl.quitIneraction();
   pl.setAnim(AnimationSolver::Idle);
+
+  if(auto c = Gothic::inst().camera())
+    c->reset();
   }
 
 void PlayerControl::marvinK(uint64_t dt) {

game/game/playercontrol.h

@@ -34,7 +34,6 @@ class PlayerControl final {
     bool interact(Item&        item);
 
     void clearInput();
-    bool isInMove();
 
     void setTarget(Npc* other);
     void actionFocus(Npc& other);

game/game/serialize.h

@@ -35,7 +35,7 @@ class Serialize final {
   public:
     enum {
       MinVersion = 0,
-      Version    = 34
+      Version    = 35
       };
 
     Serialize(Tempest::ODevice& fout);

game/mainwindow.cpp

@@ -669,7 +669,6 @@ void MainWindow::tickCamera(uint64_t dt) {
 
   auto&      camera       = *pcamera;
   const auto ws           = player.weaponState();
-  const bool followCamera = player.isInMove();
   const bool meleeFocus   = (ws==WeaponState::Fist ||
                              ws==WeaponState::W1H  ||
                              ws==WeaponState::W2H);
@@ -709,7 +708,7 @@ void MainWindow::tickCamera(uint64_t dt) {
     return;
   if(camera.isToogleEnabled())
     camera.setMode(solveCameraMode());
-  camera.tick(*pl, dt, followCamera, (!mouseP[Event::ButtonLeft] || player.hasActionFocus() || fs));
+  camera.tick(dt);
   renderer.setCameraView(camera);
   }
 
@@ -866,8 +865,14 @@ void MainWindow::render(){
 
     video.tick();
     uint64_t dt = 0;
-    if(!video.isActive())
+    if(!video.isActive()) {
+      /*
+        Note: game update goes first
+        once player position is updated, we can update the camera
+        lastly - update animation (since cameraBone ca be moved)
+        */
       dt = tick();
+      }
 
     auto& sync = fence[cmdId];
     if(!sync.wait(0)) {
@@ -876,8 +881,8 @@ void MainWindow::render(){
       }
 
     if(!video.isActive()) {
-      Gothic::inst().updateAnimation(dt);
       tickCamera(dt);
+      Gothic::inst().updateAnimation(dt);
       }
 
     if(video.isActive()) {

game/ui/dialogmenu.cpp

@@ -167,9 +167,7 @@ void DialogMenu::dialogCamera(Camera& camera) {
   if(pl && other){
     auto p0 = pl   ->cameraBone();
     auto p1 = other->cameraBone();
-    camera.setPosition(0.5f*(p0.x+p1.x),
-                       0.5f*(p0.y+p1.y) + 50,
-                       0.5f*(p0.z+p1.z));
+    camera.setPosition((p0+p1)*0.5f + Vec3(0,50,0));
     p0 -= p1;
 
     if(pl==other) {