Sync frame 2

vabold · Feb 8, 2024 · 523a7fd · 523a7fd
1 parent 08311d2
commit 523a7fd
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 2 deletions.
diff --git a/source/egg/math/Vector.cc b/source/egg/math/Vector.cc
@@ -92,6 +92,18 @@ Vector3f Vector3f::minimize(const Vector3f &rhs) const {
     return out;
 }
 
+Vector3f Vector3f::proj(const Vector3f &rhs) const {
+    return rhs * rhs.dot(*this);
+}
+
+Vector3f Vector3f::rej(const Vector3f &rhs) const {
+    return *this - proj(rhs);
+}
+
+std::pair<Vector3f, Vector3f> Vector3f::projAndRej(const Vector3f &rhs) {
+    return std::pair(proj(rhs), rej(rhs));
+}
+
 void Vector3f::read(Stream &stream) {
     x = stream.read_f32();
     y = stream.read_f32();

diff --git a/source/egg/math/Vector.hh b/source/egg/math/Vector.hh
@@ -107,6 +107,9 @@ struct Vector3f {
     f32 normalise();
     Vector3f maximize(const Vector3f &rhs) const;
     Vector3f minimize(const Vector3f &rhs) const;
+    Vector3f proj(const Vector3f &rhs) const;
+    Vector3f rej(const Vector3f &rhs) const;
+    std::pair<Vector3f, Vector3f> projAndRej(const Vector3f &rhs);
 
     void read(Stream &stream);
 

diff --git a/source/game/kart/KartDynamics.cc b/source/game/kart/KartDynamics.cc
@@ -34,6 +34,8 @@ void KartDynamics::calc(f32 dt, f32 maxSpeed, bool /*air*/) {
 
     m_mainRot.normalise();
     m_fullRot.normalise();
+
+    m_totalForce.setZero();
 }
 
 const EGG::Vector3f &KartDynamics::pos() const {
@@ -48,6 +50,10 @@ const EGG::Quatf &KartDynamics::fullRot() const {
     return m_fullRot;
 }
 
+const EGG::Vector3f &KartDynamics::extVel() const {
+    return m_extVel;
+}
+
 void KartDynamics::setPos(const EGG::Vector3f &pos) {
     m_pos = pos;
 }
@@ -72,4 +78,8 @@ void KartDynamics::setExtraRot(const EGG::Quatf &q) {
     m_extraRot = q;
 }
 
+void KartDynamics::setExtVel(const EGG::Vector3f &v) {
+    m_extVel = v;
+}
+
 } // namespace Kart
diff --git a/source/game/kart/KartDynamics.hh b/source/game/kart/KartDynamics.hh
@@ -15,13 +15,15 @@ public:
     const EGG::Vector3f &pos() const;
     const EGG::Vector3f &velocity() const;
     const EGG::Quatf &fullRot() const;
+    const EGG::Vector3f &extVel() const;
 
     void setPos(const EGG::Vector3f &pos);
     void setGravity(f32 gravity);
     void setMainRot(const EGG::Quatf &q);
     void setFullRot(const EGG::Quatf &q);
     void setSpecialRot(const EGG::Quatf &q);
     void setExtraRot(const EGG::Quatf &q);
+    void setExtVel(const EGG::Vector3f &v);
 
 private:
     // These are the only vars needed in setInitialPhysicsValues

diff --git a/source/game/kart/KartMove.cc b/source/game/kart/KartMove.cc
@@ -12,7 +12,7 @@
 
 namespace Kart {
 
-KartMove::KartMove() : m_scale(1.0f, 1.0f, 1.0f) {}
+KartMove::KartMove() : m_smoothedUp(EGG::Vector3f::ey), m_scale(1.0f, 1.0f, 1.0f) {}
 
 void KartMove::setInitialPhysicsValues(const EGG::Vector3f &pos, const EGG::Vector3f &angles) {
     EGG::Quatf quaternion;
@@ -53,4 +53,8 @@ f32 KartMove::hardSpeedLimit() const {
     return m_hardSpeedLimit;
 }
 
+const EGG::Vector3f &KartMove::smoothedUp() const {
+    return m_smoothedUp;
+}
+
 } // namespace Kart
diff --git a/source/game/kart/KartMove.hh b/source/game/kart/KartMove.hh
@@ -15,8 +15,10 @@ public:
 
     const EGG::Vector3f &scale() const;
     f32 hardSpeedLimit() const;
+    const EGG::Vector3f &smoothedUp() const;
 
 private:
+    EGG::Vector3f m_smoothedUp;
     EGG::Vector3f m_scale;
     f32 m_hardSpeedLimit;
 };

diff --git a/source/game/kart/KartObjectProxy.cc b/source/game/kart/KartObjectProxy.cc
@@ -94,6 +94,10 @@ const EGG::Quatf &KartObjectProxy::fullRot() const {
     return dynamics()->fullRot();
 }
 
+bool KartObjectProxy::isBike() const {
+    return param()->isBike();
+}
+
 Abstract::List *KartObjectProxy::list() const {
     return s_list;
 }

diff --git a/source/game/kart/KartObjectProxy.hh b/source/game/kart/KartObjectProxy.hh
@@ -53,6 +53,7 @@ public:
 
     const EGG::Vector3f &pos() const;
     const EGG::Quatf &fullRot() const;
+    bool isBike() const;
 
     Abstract::List *list() const;
 

diff --git a/source/game/kart/KartSub.cc b/source/game/kart/KartSub.cc
@@ -41,6 +41,16 @@ void KartSub::calcPass0() {
 
     move()->calc();
 
+    EGG::Vector3f local_38 = dynamics()->extVel();
+    if (isBike()) {
+        local_38 = local_38.rej(move()->smoothedUp());
+    } else {
+        local_38.x = 0.0f;
+        local_38.y = 0.0f;
+    }
+
+    dynamics()->setExtVel(local_38);
+
     f32 maxSpeed = move()->hardSpeedLimit();
     physics()->calc(DT, maxSpeed, scale(), !state()->isGround());
 }

diff --git a/source/test/TestDirector.cc b/source/test/TestDirector.cc
@@ -33,7 +33,7 @@ bool TestDirector::init() {
 
 bool TestDirector::calc() {
     // Check if we're out of frames
-    constexpr u16 TARGET_FRAME = 1;
+    constexpr u16 TARGET_FRAME = 2;
     assert(TARGET_FRAME <= m_frameCount);
     if (++m_currentFrame > TARGET_FRAME) {
         return false;