added horizontal velocity, recovery point position, animation frames, cappy pos and rotation

Author: CraftyBoss

include/al/util.hpp

@@ -113,6 +113,10 @@ namespace al
     char const *getActionFrame(al::LiveActor const *);
 
     sead::Vector3f *getCameraPos(al::IUseCamera const *, int);
+
+    float calcSpeed(al::LiveActor const *);
+    float calcSpeedH(al::LiveActor const *);
+    float calcSpeedV(al::LiveActor const *);
 
     // setters
 

include/game/Player/PlayerActorHakoniwa.h

@@ -12,6 +12,7 @@
 #include "PlayerAnimator.h"
 #include "HackCap.h"
 #include "PlayerModelKeeper.h"
+#include "PlayerRecoverySafetyPoint.h"
 
 #define PACTORSIZE 0xC8
 
@@ -28,5 +29,6 @@ class PlayerActorHakoniwa : public PlayerActorBase , public IUseDimension {
         PlayerModelKeeper *mPlayerModelKeeper; // 0x158
         unsigned char padding_168[0x08];
         PlayerAnimator *mPlayerAnimator; // 0x168 
-
+        undefined padding_270[0x100];
+        PlayerRecoverySafetyPoint *mPlayerRecoverPoint; // 0x270
 };

include/game/Player/PlayerAnimator.h

@@ -9,9 +9,9 @@ class PlayerAnimator {
 
         bool isAnim(const sead::SafeStringBase<char> &animName) const;
 
-        float *getAnimFrame(void) const;
-        float *getAnimFrameMax(void) const;
-        float *getAnimFrameRate(void) const;
+        float getAnimFrame(void) const;
+        float getAnimFrameMax(void) const;
+        float getAnimFrameRate(void) const;
 
         unsigned char padding_18[0x18];
         PlayerAnimFrameCtrl *mAnimFrameCtrl;

include/game/Player/PlayerRecoverySafetyPoint.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sead/math/seadVector.h"
+
+class PlayerRecoverySafetyPoint {
+    public:
+        sead::Vector3f *getSafetyPoint(void) const;
+        sead::Vector3f *getSafetyPointGravity(void) const;
+        sead::Vector3f *getSafetyPointArea(void) const;
+};

source/main.cpp

@@ -37,8 +37,11 @@ void stageSceneHook() {
     sead::Quatf *playerQuat = al::getQuat(player);
     sead::Quatf *capQuat = al::getQuat(cap);
 
+    sead::Vector3f *playerRecoveryPoint = player->mPlayerRecoverPoint->getSafetyPoint();
+
     const char *curAnimName = player->mPlayerAnimator->mAnimFrameCtrl->getActionName();
-    float *curAnimFrame = player->mPlayerAnimator->getAnimFrame();
+
+    float curAnimFrame = player->mPlayerAnimator->getAnimFrame();
 
     static bool showMenu = true;
 
@@ -68,16 +71,26 @@ void stageSceneHook() {
 
         sead::Vector3f eulerAngles = QuatToEuler(playerQuat);
 
+        sead::Vector3f capEuler = QuatToEuler(capQuat);
+
         sead::Vector3f playerRot = sead::Vector3f(DEG(eulerAngles.x),DEG(eulerAngles.y),DEG(eulerAngles.z));
 
+        sead::Vector3f capRot = sead::Vector3f(DEG(capEuler.x),DEG(capEuler.y),DEG(capEuler.z));
+
         switch (pageNum)
         {
         case 0:
-            al::setPaneStringFormat(stageScene->stageSceneLayout->coinCounter, "TxtDebug", "Mario Pos:\nX: %f\nY: %f\nZ: %f\nMario Velocity:\nX: %f\nY: %f\nZ: %f\nMario Rotation:\nX: %f\nY: %f\nZ: %f", playerTrans->x, playerTrans->y, playerTrans->z, playerVel->x, playerVel->y, playerVel->z, playerRot.x, playerRot.y, playerRot.z);
+            al::setPaneStringFormat(stageScene->stageSceneLayout->coinCounter, 
+                "TxtDebug", "Mario Pos:\nX: %f\nY: %f\nZ: %f\nMario Velocity:\nX: %f\nY: %f\nZ: %f\nMario Rotation:\nX: %f\nY: %f\nZ: %f\nHorizontal Speed: %f\nRecovery Point Location:\nX: %f\nY: %f\nZ: %f\n", 
+                playerTrans->x, playerTrans->y, playerTrans->z, playerVel->x, playerVel->y, playerVel->z, playerRot.x, playerRot.y, playerRot.z, al::calcSpeedH(player), playerRecoveryPoint->x,playerRecoveryPoint->y, playerRecoveryPoint->z
+            );
             break;
 
         case 1:
-            al::setPaneStringFormat(stageScene->stageSceneLayout->coinCounter, "TxtDebug", "\nLeft Stick Input:\nX: %f\nY: %f\nRight Stick Input:\nX: %f\nY: %f", inputLeft->x, inputLeft->y, inputRight->x, inputRight->y);
+            al::setPaneStringFormat(stageScene->stageSceneLayout->coinCounter, "TxtDebug", 
+                "\nLeft Stick Input:\nX: %f\nY: %f\nRight Stick Input:\nX: %f\nY: %f\nCurrent Animation Frame: %f\nCappy Position:\nX: %f\nY: %f\nZ: %f\nCappy Rotation:\nX: %f\nY: %f\nZ: %f\n", 
+                inputLeft->x, inputLeft->y, inputRight->x, inputRight->y, curAnimFrame, capTrans->x, capTrans->y, capTrans->z, capRot.x, capRot.y, capRot.z
+            );
             break;
         default:
             al::setPaneStringFormat(stageScene->stageSceneLayout->coinCounter, "TxtDebug", "Unknown Page");