Merge pull request #16 from Amethyst-szs/dev

Version 1.2 release, merging dev into stable

.vscode/settings.json

@@ -13,7 +13,9 @@
         "tuple": "cpp",
         "utility": "cpp",
         "atomic": "cpp",
-        "cstdarg": "cpp"
+        "cstdarg": "cpp",
+        "xlocinfo": "cpp",
+        "xstring": "cpp"
     },
     "cmake.configureOnOpen": false,
     "C_Cpp.errorSquiggles": "Enabled"

Makefile

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

README.md

@@ -18,6 +18,19 @@ LunaKit is a development tool / modification of Super Mario Odyssey designed to
 ![Gameplay 2](https://user-images.githubusercontent.com/62185604/220535575-e94cbda0-a6bf-49fd-ac5f-8bfa92da732f.jpg)
 
 ## How to use:
+
+### Installation on switch
+- Install Atmosphere and SMO V1.0.0
+- Remove any previous mods that would cause conflicts
+- Download newest build from [releases](https://github.com/Amethyst-szs/smo-lunakit/releases/)
+- Drag and drop the included `atmosphere` and `LunaKit` folders onto the root of your SD card
+
+### Installation on [Ryujinx](https://ryujinx.org/)
+- Download newest build from [releases](https://github.com/Amethyst-szs/smo-lunakit/releases/)
+- Drag and drop the included `atmosphere` and `LunaKit` folders onto the root of the [emulated SD card](https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide#managing-mods)
+
+### Installation on Yuzu is NOT actively supported.
+
 ### Controls:
 - Open the interface by holding ZR + R and tapping L  
 - Hide windows by pressing L-Stick  

src/al/scene/Scene.h

@@ -12,23 +12,14 @@
 
 namespace al {
     class StageResourceKeeper;
-
     class LiveActorKit;
-
     class LayoutKit;
-
     class SceneStopCtrl;
-
     class SceneMsgCtrl;
-
     class ScreenCoverCtrl;
-
     class AudioDirector;
-
     class AudioKeeper;
-
     class NerveKeeper;
-
     class GraphicsInitArg;
 
 #define GETTER(type, name, field, suffix) type name() suffix {  \
@@ -37,61 +28,41 @@ namespace al {
 
 #define GETTER_NOIMPL(type, name, suffix) type name() suffix;
 
+
     class Scene : public al::NerveExecutor,
                   public al::IUseAudioKeeper,
                   public al::IUseCamera,
                   public al::IUseSceneObjHolder {
     public:
         Scene(const char *name);
-
         virtual ~Scene();
 
         virtual void init(const al::SceneInitInfo &);
-
         virtual void appear();
-
         virtual void kill();
-
         virtual void movement();
-
         virtual void control();
-
         virtual void drawMain();
-
         virtual void drawSub();
 
         GETTER_NOIMPL(AudioKeeper*, getAudioKeeper, const override);
-
         GETTER_NOIMPL(SceneObjHolder*, getSceneObjHolder, const override);
-
         GETTER_NOIMPL(CameraDirector*, getCameraDirector, const override);
 
         GETTER(LayoutKit*, getLayoutKit, mLayoutKit, const);
-
         GETTER(SceneStopCtrl*, getSceneStopCtrl, mSceneStopCtrl, const);
-
         GETTER(SceneMsgCtrl*, getSceneMsgCtrl, mSceneMsgCtrl, const);
 
         void initializeAsync(const al::SceneInitInfo &);
-
         void initDrawSystemInfo(const al::SceneInitInfo &);
-
         void initSceneObjHolder(al::SceneObjHolder *);
-
         void initAndLoadStageResource(const char *, int);
-
         void initLiveActorKit(const al::SceneInitInfo &, int, int, int);
-
         void initLiveActorKitWithGraphics(const al::GraphicsInitArg &, const al::SceneInitInfo &, int, int, int);
-
         void initLayoutKit(const al::SceneInitInfo &);
-
         void initSceneStopCtrl();
-
         void initSceneMsgCtrl();
-
         void initScreenCoverCtrl();
-
         void endInit(const al::ActorInitInfo &);
 
 //    private:

src/al/util.hpp

@@ -82,6 +82,10 @@ namespace al {
 
     int getPlayerControllerPort(int);
 
+    PlayerActorBase* getPlayerActor(al::LiveActor const*, int);
+
+    PlayerActorBase* tryGetPlayerActor(al::PlayerHolder const*, int);
+
     char const *getActionName(al::LiveActor const *);
 
     char const *getActionFrame(al::LiveActor const *);

src/game/HakoniwaSequence/HakoniwaSequence.h

@@ -76,7 +76,7 @@ class HakoniwaSequence : public al::Sequence {
         al::LayoutKit* mLytKit;                     // 0xF8
         bool mYBalls;                                   
         sead::FixedSafeString<0x80> stageName;  
-        int scenarioNum;    
+        uint scenarioNum;    
         al::ScreenCaptureExecutor* mScreenCapExecutor;
         al::WipeHolder* mWipeHolder;
         bool mMissEnd;

src/helpers/GetHelper.cpp

@@ -4,8 +4,7 @@ bool isInScene()
 {
     al::Sequence* curSequence = GameSystemFunction::getGameSystem()->mCurSequence;
     if (curSequence && al::isEqualString(curSequence->getName().cstr(), "HakoniwaSequence")) {
-        auto gameSeq = (HakoniwaSequence*)curSequence;
-        auto curScene = gameSeq->curScene;
+        auto curScene = curSequence->mCurrentScene;
 
         return curScene && curScene->mIsAlive;
     }
@@ -54,20 +53,30 @@ HakoniwaSequence* tryGetHakoniwaSequence()
 al::Scene* tryGetScene()
 {
     al::Sequence* curSequence = GameSystemFunction::getGameSystem()->mCurSequence;
+
     if (curSequence && al::isEqualString(curSequence->getName().cstr(), "HakoniwaSequence")) {
-        auto gameSeq = (HakoniwaSequence*)curSequence;
-        auto curScene = gameSeq->curScene;
+        auto curScene = curSequence->mCurrentScene;
 
         if (curScene && curScene->mIsAlive)
-            return gameSeq->curScene;
+            return curScene;
     }
 
     return nullptr;
 }
 
+al::Scene* tryGetScene(al::Sequence* curSequence)
+{
+    auto curScene = curSequence->mCurrentScene;
+
+    if (curScene && curScene->mIsAlive)
+        return curScene;
+
+    return nullptr;
+}
+
 al::Scene* tryGetScene(HakoniwaSequence* curSequence)
 {
-    auto curScene = curSequence->curScene;
+    auto curScene = curSequence->mCurrentScene;
 
     if (curScene && curScene->mIsAlive)
         return curScene;
@@ -149,7 +158,14 @@ PlayerActorBase* tryGetPlayerActor()
         auto curScene = gameSeq->curScene;
 
         if (curScene && curScene->mIsAlive) {
-            PlayerActorBase* playerBase = rs::getPlayerActor(curScene);
+            if(!isInStageScene(curScene))
+                return nullptr;
+
+            al::PlayerHolder* pHolder = al::getScenePlayerHolder(curScene);
+            if(!pHolder)
+                return nullptr;
+
+            PlayerActorBase* playerBase = al::tryGetPlayerActor(pHolder, 0);
             return playerBase;
         }
     }
@@ -162,16 +178,30 @@ PlayerActorBase* tryGetPlayerActor(HakoniwaSequence* curSequence)
     auto curScene = curSequence->curScene;
 
     if (curScene && curScene->mIsAlive) {
-        PlayerActorBase* playerBase = rs::getPlayerActor(curScene);
+        if(!isInStageScene(curScene))
+            return nullptr;
+
+        al::PlayerHolder* pHolder = al::getScenePlayerHolder(curScene);
+        if(!pHolder)
+            return nullptr;
+
+        PlayerActorBase* playerBase = al::tryGetPlayerActor(pHolder, 0);
         return playerBase;
     }
 
     return nullptr;
 }
 
-PlayerActorBase* tryGetPlayerActor(al::Scene* scene)
+PlayerActorBase* tryGetPlayerActor(StageScene* scene)
 {
-    PlayerActorBase* playerBase = rs::getPlayerActor(scene);
+    if(!isInStageScene(scene))
+        return nullptr;
+
+    al::PlayerHolder* pHolder = al::getScenePlayerHolder(scene);
+    if(!pHolder)
+        return nullptr;
+
+    PlayerActorBase* playerBase = al::tryGetPlayerActor(pHolder, 0);
     return playerBase;
 }
 

src/helpers/GetHelper.h

@@ -7,6 +7,7 @@
 #include "al/nerve/NerveKeeper.h"
 #include "al/nerve/NerveStateBase.h"
 #include "al/nerve/NerveStateCtrl.h"
+#include "al/util.hpp"
 
 #include "game/System/GameSystem.h"
 #include "game/System/Application.h"
@@ -29,6 +30,7 @@ al::Sequence* tryGetSequence();
 HakoniwaSequence* tryGetHakoniwaSequence();
 
 al::Scene* tryGetScene();
+al::Scene* tryGetScene(al::Sequence* curSequence);
 al::Scene* tryGetScene(HakoniwaSequence* curSequence);
 StageScene* tryGetStageScene();
 StageScene* tryGetStageScene(HakoniwaSequence* curSequence);
@@ -42,7 +44,7 @@ GameDataHolderAccessor* tryGetGameDataHolderAccess(StageScene* scene);
 
 PlayerActorBase* tryGetPlayerActor();
 PlayerActorBase* tryGetPlayerActor(HakoniwaSequence* curSequence);
-PlayerActorBase* tryGetPlayerActor(al::Scene* scene);
+PlayerActorBase* tryGetPlayerActor(StageScene* scene);
 PlayerActorHakoniwa* tryGetPlayerActorHakoniwa();
 PlayerActorHakoniwa* tryGetPlayerActorHakoniwa(HakoniwaSequence* curSequence);
 PlayerActorHakoniwa* tryGetPlayerActorHakoniwa(StageScene* scene);

src/helpers/ImGuiHelper.cpp

@@ -0,0 +1,74 @@
+#include "helpers/ImGuiHelper.h"
+
+void ImGuiHelper::drawVector3Drag(const char* prefixName, const char* tooltip, sead::Vector3f* vec, float speed, float limit)
+{
+    if(!vec)
+        return;
+
+    const char* symbols = "XYZ";
+    sead::FixedSafeString<0xf> sliderName(prefixName);
+
+    ImGui::BeginGroup();
+
+    for(uint i = 0; i < strlen(symbols); i++) {
+        sliderName.append(symbols[i]);
+        ImGui::DragFloat(sliderName.cstr(), &vec->e[i], speed, -limit, limit, "%.2f", ImGuiSliderFlags_NoRoundToFormat);
+        sliderName.chop(1);
+    }
+
+    ImGui::EndGroup();
+
+    if(ImGui::IsItemHovered())
+        ImGui::SetTooltip(tooltip);
+
+    ImGui::Separator();
+}
+
+void ImGuiHelper::drawVector3Slide(const char* prefixName, const char* tooltip, sead::Vector3f* vec, float limit, bool isNormalize)
+{
+    if(!vec)
+        return;
+
+    const char* symbols = "XYZ";
+    sead::FixedSafeString<0xf> sliderName(prefixName);
+
+    ImGui::BeginGroup();
+
+    for(uint i = 0; i < strlen(symbols); i++) {
+        sliderName.append(symbols[i]);
+        ImGui::SliderFloat(sliderName.cstr(), &vec->e[i], -limit, limit, "%.2f", ImGuiSliderFlags_NoRoundToFormat);
+        sliderName.chop(1);
+    }
+
+    if(isNormalize)
+        vec->normalize();
+
+    ImGui::EndGroup();
+
+    if(ImGui::IsItemHovered())
+        ImGui::SetTooltip(tooltip);
+
+    ImGui::Separator();
+}
+
+void ImGuiHelper::drawQuat(const char* tooltip, sead::Quatf* quat)
+{
+    if(!quat)
+        return;
+
+    ImGui::BeginGroup();
+
+    ImGui::DragFloat("QW", &quat->w, 0.05f, 0.f, 0.f, "%.2f", ImGuiSliderFlags_NoRoundToFormat);
+    ImGui::SliderFloat("QX", &quat->x, -1.f, 1.f, "%.3f", ImGuiSliderFlags_NoRoundToFormat);
+    ImGui::SliderFloat("QY", &quat->y, -1.f, 1.f, "%.3f", ImGuiSliderFlags_NoRoundToFormat);
+    ImGui::SliderFloat("QZ", &quat->z, -1.f, 1.f, "%.3f", ImGuiSliderFlags_NoRoundToFormat);
+
+    // quat->normalize();
+
+    ImGui::EndGroup();
+
+    if(ImGui::IsItemHovered())
+        ImGui::SetTooltip(tooltip);
+
+    ImGui::Separator();
+}

src/helpers/ImGuiHelper.h

@@ -0,0 +1,15 @@
+#include "imgui.h"
+
+#include "sead/prim/seadSafeString.h"
+#include "sead/math/seadVector.h"
+#include "sead/math/seadQuat.h"
+
+namespace ImGuiHelper {
+
+    // Vector editors
+    void drawVector3Drag(const char* prefixName, const char* tooltip, sead::Vector3f* vec, float speed, float limit);
+    void drawVector3Slide(const char* prefixName, const char* tooltip, sead::Vector3f* vec, float limit, bool isNormalize);
+
+    // Quaternion editors
+    void drawQuat(const char* tooltip, sead::Quatf* quat);
+};

src/logger/LoadLogger.cpp

@@ -0,0 +1,21 @@
+#include "LoadLogger.hpp"
+#include "devgui/DevGuiManager.h"
+#include "lib.hpp"
+#include "nifm.h"
+#include "socket.h"
+#include "util.h"
+
+void LoadLog::pushTextToVector(const char* text) {
+    sead::DateTime currentTime = sead::DateTime(0);
+    sead::CalendarTime calendarTime;
+    char temp[256];
+
+    currentTime.setNow();
+    currentTime.getCalendarTime(&calendarTime);
+
+    if (mTextLines.size() > mMaxListSize)
+        mTextLines.erase(mTextLines.begin());
+    snprintf(temp, sizeof(temp), "%02d:%02d:%02d | %s", calendarTime.getHour(), calendarTime.getMinute(), calendarTime.getSecond(), text);
+
+    mTextLines.push_back(strdup(temp));
+}