Impl new intro (#193)

* Update menus

* Update CMakeLists.txt

* Add Ship

* Impl hm ship actors

* Update HM course

* Impl new intro

* Finish intro scene

* Rename

* Start Editor Work

* raycast works

* Fix ScreenRayTrace in widescreen

* Basic Actor Picking

* wip

* Editor use vtx collision

* gizmo work

* otr works for object picking

* Impl objects for editor

* actor init

* Update

* Add all axis move (freemove)

* Docking Windows works here

* Setup imgui layout for editor

* Editor Snap to Ground works

* Basic Scene Explorer Works

* Editor get actor names

* Impl editor object names

* impl Editor Play and Pause buttons

* Editor translate works while paused

* Fix freecam lighting

* Added adjustable track properties to editor

* Editor matrix, icons, rotation, impl light

* Setup Track Properties 1

* Editor tooling wip

* Load modded o2rs

* Don't enable hud if editor is enabled

* Updates

* SceneManager nearly working

* Fix mario kart 64 intro logo sizing

* Fix Rotator

* Finish new matrix translation code

* Cleanup headers

* Cleanup

* Cleanup 2

* Cleanup 3

* Prevent divize by zero crash

* Add visible circle for translate in all axis

* Editor scaling/rot works properly now

* Scale All_Axis evenly

* Fixes to includes to work on Linux.

* Removed overfilled arguments in gfx_create_framebuffer()

* Added missing function definitions to Game.h

* Editor sun face the camera

* Add rotation model to gizmo

* Add new handles

* Failed attempt at transforming collision

* Impl water volume

* Import fast64 paths

* water surface

* Scene Setup 1

* Custom Track O2R almost working needs testing

* Custom Track Load path O2r

* Render custom track. Wip collision

* Add missing function

* Debug Spawning Custom O2R Track

* Import courses working now

* Fix memory leak

* Remove New Track Button

* Engine.cpp more consistent with sf64

* Fix Editor Enable Button

* Editor Accurate mouse click drag objects

* Editor selects closest object and cleanup

* Gizmo rot and scale collision working

* Remove constexpr from IRotator

* Impl properties for location/rot/scale

* Better Properties display, swap rot handles

* Fix content browser dock and editor now disabled by default

* Remove GameInfoWindow, Multiplayer Button, and FPS Slider

* Disable Editor when its disabled

* Add new logo to hm intro

* Fix pause menu item box cursor

* Remove minimap from Course::from_json and to_json

* Impl Import Minimap

* Fix custom minimap rendering

* minimap uses extension .png

* Refactor minimap

* Freecam only for player 1

* GrandPrix Balloons work in custom track

* Track Id is now std::string and outside of Props

* Moved editor assets to be included in ship.o2r

* Fixed GenerateO2R to package the correct folder and save to the correct filename

* Linux specific changes.

* Added "#include <stdio.h>" that required them
* Changed how the "ship.o2r" file is loaded to allow it to load the file from within appimages.
* Changed the Linuxdeploy version to avoid errors later when the Github Actions creates appimages(same fix applied to other ports.)

* Revert "Moved editor assets to be included in ship.o2r"

This reverts commit 05704c01f761baa67a83e357d9765f5c6b5e3fdb.

* Added back files(this time without LUS changes)

* Changed workflow file to use correct filename for assets file.

* Missed a few spots in the workflow file.

* Added .desktop file and made corrections to the main workflow.

* Added the rest of upstream CMakeLists.txt

* disabled USE_NETWORKING

* New InverseMatrix

* Renamed both .o2r files to be more accurate to its contents.

* Reverted CmakeList.txt

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>

3 files changed, 39 insertions, 101 deletions

diff --git a/src/actors/falling_rock/render.inc.c b/src/actors/falling_rock/render.inc.c
index b7a23088b..20c6a49b3 100644
--- a/src/actors/falling_rock/render.inc.c
+++ b/src/actors/falling_rock/render.inc.c
@@ -52,67 +52,5 @@ void render_actor_falling_rock(Camera* camera, struct FallingRock* rock) {
     if (render_set_position(sp4C, 0) == 0) {
         return;
     }
-    // gSPDisplayList(gDisplayListHead++, d_course_choco_mountain_dl_falling_rock);
-    //! @todo: Placeholder DLs weird vtx issues
-    gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING);
-    gDPSetCycleType(gDisplayListHead++, G_CYC_2CYCLE);
-    gDPPipeSync(gDisplayListHead++);
-    gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
-    gSPSetGeometryMode(gDisplayListHead++, G_FOG);
-    gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEI, G_CC_PASS2);
-    gDPSetRenderMode(gDisplayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2);
-    gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
-    gDPPipeSync(gDisplayListHead++);
-    gDPTileSync(gDisplayListHead++);
-    gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0,
-               G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD);
-    gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C);
-    gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_choco_mountain_wall_texture);
-    gDPTileSync(gDisplayListHead++);
-    gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-               G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-    gDPLoadSync(gDisplayListHead++);
-    gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 1023, 256);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_falling_rock_model, 15, 0);
-    gSP1Triangle(gDisplayListHead++, 0, 1, 2, 0);
-    gSP1Triangle(gDisplayListHead++, 3, 4, 5, 0);
-    gSP1Triangle(gDisplayListHead++, 6, 7, 8, 0);
-    gSP1Triangle(gDisplayListHead++, 9, 10, 11, 0);
-    gSP1Triangle(gDisplayListHead++, 12, 13, 14, 0);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006C28, 5, 0);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006D08, 10, 5);
-    gSP1Triangle(gDisplayListHead++, 0, 5, 6, 0);
-    gSP1Triangle(gDisplayListHead++, 1, 7, 8, 0);
-    gSP1Triangle(gDisplayListHead++, 2, 9, 10, 0);
-    gSP1Triangle(gDisplayListHead++, 3, 11, 12, 0);
-    gSP1Triangle(gDisplayListHead++, 4, 13, 14, 0);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006C78, 5, 0);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006DA8, 10, 5);
-    gSP1Triangle(gDisplayListHead++, 0, 5, 6, 0);
-    gSP1Triangle(gDisplayListHead++, 1, 7, 8, 0);
-    gSP1Triangle(gDisplayListHead++, 2, 9, 10, 0);
-    gSP1Triangle(gDisplayListHead++, 3, 11, 12, 0);
-    gSP1Triangle(gDisplayListHead++, 4, 13, 14, 0);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006CC8, 4, 0);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006E48, 8, 4);
-    gSP1Triangle(gDisplayListHead++, 0, 4, 5, 0);
-    gSP1Triangle(gDisplayListHead++, 1, 6, 7, 0);
-    gSP1Triangle(gDisplayListHead++, 2, 8, 9, 0);
-    gSP1Triangle(gDisplayListHead++, 3, 10, 11, 0);
-    gDPTileSync(gDisplayListHead++);
-    gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_MIRROR | G_TX_WRAP,
-               5, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD);
-    gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C);
-    gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_choco_mountain_rock_texture);
-    gDPTileSync(gDisplayListHead++);
-    gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-               G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-    gDPLoadSync(gDisplayListHead++);
-    gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, 1023, 256);
-    gSPVertex(gDisplayListHead++, d_course_choco_mountain_6006EC8, 3, 0);
-    gSP1Triangle(gDisplayListHead++, 0, 1, 2, 0);
-    gSPClearGeometryMode(gDisplayListHead++, G_FOG | G_LIGHTING);
-    gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE);
-    gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 1, 1, G_OFF);
-    gDPPipeSync(gDisplayListHead++);
+    gSPDisplayList(gDisplayListHead++, d_course_choco_mountain_dl_falling_rock);
 }
diff --git a/src/actors/falling_rock/update.inc.c b/src/actors/falling_rock/update.inc.c
index f189aeaa1..b700a4226 100644
--- a/src/actors/falling_rock/update.inc.c
+++ b/src/actors/falling_rock/update.inc.c
@@ -76,7 +76,7 @@ void update_actor_falling_rocks(struct FallingRock* rock) {
         rock->respawnTimer -= 1;
         return;
     }
-    if (rock->pos[1] < D_8015F8E4) {
+    if (rock->pos[1] < CM_GetWaterLevel(rock->pos, NULL)) {
         func_8029CF0C(sRockSpawnData, rock);
     }
     rock->rot[0] += (s16) ((rock->velocity[2] * 5461.0f) / 20.0f);
diff --git a/src/actors/train/render.inc.c b/src/actors/train/render.inc.c
index d5d4d2203..825aa4cd9 100644
--- a/src/actors/train/render.inc.c
+++ b/src/actors/train/render.inc.c
@@ -15,9 +15,9 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     UNUSED s32 pad[2];
     s32 maxObjectsReached;
     Vec3f sp160;
-    Mat4 sp120;
-    Mat4 spE0;
-    Mat4 spA0;
+    Mat4 mainMtx;
+    Mat4 objectMtx;
+    Mat4 resultMtx;
 
     f32 distance = is_within_render_distance(camera->pos, actor->pos, camera->rot[1], 2500.0f,
                                              gCameraZoom[camera - camera1], 9000000.0f);
@@ -36,8 +36,8 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
 
     gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
 
-    mtxf_pos_rotation_xyz(sp120, actor->pos, actor->rot);
-    maxObjectsReached = render_set_position(sp120, 0) == 0;
+    mtxf_pos_rotation_xyz(mainMtx, actor->pos, actor->rot);
+    maxObjectsReached = render_set_position(mainMtx, 0) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -62,12 +62,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
 
-    mtxf_rotate_x(sp120, actor->wheelRot);
+    mtxf_rotate_x(mainMtx, actor->wheelRot);
     vec3f_set(sp160, 17.0f, 6.0f, 32.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -75,12 +75,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, actor->wheelRot);
+    mtxf_rotate_x(mainMtx, actor->wheelRot);
     vec3f_set(sp160, -17.0, 6.0f, 32.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -88,12 +88,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
+    mtxf_rotate_x(mainMtx, (s16) (actor->wheelRot + 0x16C));
     vec3f_set(sp160, 17.0f, 6.0f, 16.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -101,12 +101,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
+    mtxf_rotate_x(mainMtx, (s16) (actor->wheelRot + 0x16C));
     vec3f_set(sp160, -17.0f, 6.0f, 16.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -114,12 +114,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
+    mtxf_rotate_x(mainMtx, (s16) (actor->wheelRot + 0x444));
     vec3f_set(sp160, 17.0f, 12.0f, -12.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -127,12 +127,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
+    mtxf_rotate_x(mainMtx, (s16) (actor->wheelRot + 0x444));
     vec3f_set(sp160, -17.0f, 12.0f, -12.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -140,12 +140,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
+    mtxf_rotate_x(mainMtx, (s16) (actor->wheelRot + 0x2D8));
     vec3f_set(sp160, 17.0f, 12.0f, -34.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }
@@ -153,12 +153,12 @@ void render_actor_train_engine(Camera* camera, struct TrainCar* actor) {
     gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
-    mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
+    mtxf_rotate_x(mainMtx, (s16) (actor->wheelRot + 0x2D8));
     vec3f_set(sp160, -17.0f, 12.0f, -34.0f);
-    mtxf_translate(spE0, sp160);
-    mtxf_multiplication(spA0, sp120, spE0);
+    mtxf_translate(objectMtx, sp160);
+    mtxf_multiplication(resultMtx, mainMtx, objectMtx);
 
-    maxObjectsReached = render_set_position(spA0, 3) == 0;
+    maxObjectsReached = render_set_position(resultMtx, 3) == 0;
     if (maxObjectsReached) {
         return;
     }