Merge pull request #45 from Amethyst-szs/dev

Assist bubble recovery point info added

.gitignore

@@ -40,6 +40,7 @@ build/
 compile_commands.jso
 deploy
 imgui/backends/vulkan/generate_spv.sh
+.vscode/
 
 # promo assets
 promo_screenshots/

.vscode/c_cpp_properties.json

@@ -6,7 +6,8 @@
                 "${workspaceFolder}/src/**",
                 "${workspaceFolder}/src/nn/**",
                 "${workspaceFolder}/src/sead/**",
-                "${workspaceFolder}/src/lib/**"
+                "${workspaceFolder}/src/lib/**",
+                "${workspaceFolder}/imgui"
             ],
             "defines": [],
             "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++",

.vscode/settings.json

@@ -1,22 +1,23 @@
 {
-    "liveshare.sharedTerminalWidth": 300,
-    "files.associations": {
-        "type_traits": "cpp",
-        "*.tcc": "cpp",
-        "functional": "cpp",
-        "optional": "cpp",
-        "istream": "cpp",
-        "ostream": "cpp",
-        "ratio": "cpp",
-        "system_error": "cpp",
-        "array": "cpp",
-        "tuple": "cpp",
-        "utility": "cpp",
-        "atomic": "cpp",
-        "cstdarg": "cpp",
-        "xlocinfo": "cpp",
-        "xstring": "cpp"
-    },
-    "cmake.configureOnOpen": false,
-    "C_Cpp.errorSquiggles": "Enabled"
-}
+  "liveshare.sharedTerminalWidth": 300,
+  "files.associations": {
+    "type_traits": "cpp",
+    "*.tcc": "cpp",
+    "functional": "cpp",
+    "optional": "cpp",
+    "istream": "cpp",
+    "ostream": "cpp",
+    "ratio": "cpp",
+    "system_error": "cpp",
+    "array": "cpp",
+    "tuple": "cpp",
+    "utility": "cpp",
+    "atomic": "cpp",
+    "cstdarg": "cpp",
+    "xlocinfo": "cpp",
+    "xstring": "cpp",
+    "ranges": "cpp"
+  },
+  "cmake.configureOnOpen": false,
+  "C_Cpp.errorSquiggles": "Enabled"
+}

Makefile

@@ -1,4 +1,4 @@
-FTP_IP ?= 192.168.0.24 # put console IP here
+FTP_IP ?= 192.168.0.6 # put console IP here
 .PHONY: all clean
 
 all:

src/game/Player/PlayerActorHakoniwa.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <game/Interfaces/IUseDimension.h>
+#include "game/Player/PlayerRecoverySafetyPoint.h"
 #include "PlayerActorBase.h"
 
 class PlayerConst;

src/game/Player/PlayerHackKeeper.h

@@ -11,9 +11,9 @@
 #include "game/Player/HackCap.h"
 #include "game/Player/PlayerCollider.h"
 #include "game/Player/HackCap/CapTargetInfo.h"
+#include "game/Player/PlayerRecoverySafetyPoint.h"
 
 struct HackEndParam;
-struct PlayerRecoverySafetyPoint;
 struct PlayerDamageKeeper;
 struct IPlayerModelChanger;
 struct IUsePlayerHeightCheck;

src/game/Player/PlayerRecoverySafetyPoint.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "al/LiveActor/LiveActor.h"
+#include "al/collision/Collider.h"
+#include "al/sensor/HitSensor.h"
+#include "game/Interfaces/IUseDimension.h"
+#include "game/Player/HackCap.h"
+#include "sead/math/seadVector.h"
+
+class PlayerRecoverySafetyPoint {
+public:
+    sead::Vector3f* getSafetyPoint();
+    void startRecovery(float);
+    void startBubbleWait();
+    void noticeDangerousPoint(sead::Vector3f const&, bool);
+
+    al::LiveActor* mActor;                                      //0x00
+    HackCap* mHackCap;                                          //0x08
+    IUseDimension* mIUseDimension;                              //0x10
+    al::CollisionPartsFilterBase* mCollisionPartsFilterBase;    //0x18
+    al::HitSensor* mHitSensor;                                  //0x20
+    const char mUnk1[0x1c];                                     //0x28
+    sead::Vector3f mSafetyPointPos;                             //0x44
+    sead::Vector3f mSafetyPointGrav;                            //0x50
+    const char mUnk2[0x54];
+    const char mUnk3[0x8];
+};

src/program/devgui/categories/info/CategoryInfPlayer.cpp

@@ -97,4 +97,7 @@ void CategoryInfPlayer::updateCatDisplay()
     PlayerAnimator* anim = playerHak->mPlayerAnimator;
     ImGui::Text("Anim: %s (%.00f/%.00f)", anim->curAnim.cstr(), anim->getAnimFrame(), anim->getAnimFrameMax());
     ImGui::Text("Sub Anim: %s (%.00f/%.00f)", anim->curSubAnim.cstr(), anim->getSubAnimFrame(), anim->getSubAnimFrameMax());
+
+    sead::Vector3f kidsPos = playerHak->mPlayerRecoverySafetyPoint->mSafetyPointPos;
+    ImGui::InputFloat3("Assist Pos", &kidsPos.x, "%.00f", ImGuiInputTextFlags_ReadOnly);
 }

src/program/devgui/homemenu/HomeMenuPrims.cpp

@@ -82,6 +82,13 @@ void HomeMenuPrims::renderPlayerCategory(al::Scene* scene, PrimitiveQueue* queue
             queue->pushLine(capPos, capTarget, {0.9f, 0.2f, 0.2f, 1.f});
         }
     }
+
+    if (mSettings->getSettingEntryByName("Assist Bubble")->isTrue()) {
+        PlayerActorHakoniwa* playerHak = tryGetPlayerActorHakoniwa();
+        if (playerHak) {
+            queue->pushPoint(playerHak->mPlayerRecoverySafetyPoint->mSafetyPointPos, 15.f, sead::Color4f::cGreen);
+        }
+    }
 }
 
 void HomeMenuPrims::renderTriangleCategory(al::Scene* scene, PrimitiveQueue* queue) {

src/program/devgui/settings/PrimMenuSettings.cpp

@@ -20,6 +20,7 @@ PrimMenuSettings::PrimMenuSettings(DevGuiManager* parent)
     registerNewSetting(false, "World Axis", PrimMenuCat_PLAYER, false);
     registerNewSetting(false, "Player Front", PrimMenuCat_PLAYER, false);
     registerNewSetting(false, "Cappy Info", PrimMenuCat_PLAYER, false);
+    registerNewSetting(false, "Assist Bubble", PrimMenuCat_PLAYER, false);
 
     // Collision / Triangle category
     registerNewSetting(false, "Collision", PrimMenuCat_TRIANGLE, false);