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>

1 files changed, 10 insertions, 16 deletions

diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index 1618bf57f..24ce0abe7 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -57,7 +57,6 @@ UNUSED s32 D_801655B8;
 s32 D_801655BC;
 s32 D_801655C0;
 s32 D_801655C4;
-s32 D_801655C8;
 s32 D_801655CC;
 UNUSED s32 D_801655D0[2];
 s32 D_801655D8;
@@ -94,13 +93,6 @@ UNUSED s32 D_801656F8[4];
 s16 D_80165708;
 UNUSED s32 D_8016570C;
 s16 D_80165710;
-UNUSED s32 D_80165714;
-s16 D_80165718;
-UNUSED s32 D_8016571C;
-s16 D_80165720;
-UNUSED s32 D_80165724;
-s16 D_80165728;
-UNUSED s32 D_8016572C;
 s16 D_80165730;
 UNUSED s32 D_80165734;
 //! Tracking a count of some object type, don't know what object type yet
@@ -186,7 +178,6 @@ s32 D_8016586C;
 UNUSED s32 D_80165870[2];
 s32 D_80165878;
 s32 D_8016587C;
-u8* D_80165880;
 UNUSED s32 D_80165884;
 s8 D_80165888;
 UNUSED s32 D_8016588C;
@@ -687,6 +678,7 @@ void render_object_for_player(s32 cameraId) {
     CM_DrawObjects(cameraId);
     CM_DrawParticles(cameraId);
     CM_RenderCourseObjects(cameraId);
+    CM_DrawEditor();
 
     // switch (gCurrentCourseId) {
     //     case COURSE_MARIO_RACEWAY:
@@ -777,7 +769,7 @@ void render_object_for_player(s32 cameraId) {
     render_object_leaf_particle(cameraId);
 
     if (D_80165730 != 0) {
-        render_balloons_grand_prix(cameraId);
+        //render_balloons_grand_prix(cameraId);
     }
     if (gModeSelection == BATTLE) {
         CM_DrawBattleBombKarts(cameraId);
@@ -1243,7 +1235,7 @@ void func_80059A88(s32 playerId) {
 void func_80059AC8(void) {
     s32 i;
 
-    if (gIsGamePaused == false) {
+    if ((gIsGamePaused == false) && (gIsEditorPaused == false)) {
         func_8008C1D8(&D_80165678);
         gRaceFrameCounter++;
         for (i = 0; i < gPlayerCount; i++) {
@@ -1409,7 +1401,7 @@ void func_8005A070(void) {
     gMatrixHudCount = 0;
     D_801655C0 = 0;
     func_80041D34();
-    if (gIsGamePaused == false) {
+    if (gIsGamePaused == false && (gIsEditorPaused == false)) {
         func_8005C728();
         if (gGamestate == ENDING) {
             // func_80086604();
@@ -1640,9 +1632,9 @@ void update_object(void) {
     //         update_ferries_smoke_particle();
     //         break;
     // }
-    if (D_80165730 != 0) {
-        func_80074EE8();
-    }
+    //if (D_80165730 != 0) {
+    //    func_80074EE8(); // Grand prix balloons
+    //}
     func_80076F2C();
     if ((s16) GetCourse() != GetFrappeSnowland()) {
         update_leaf();
@@ -1658,7 +1650,9 @@ void func_8005A99C(void) {
             if (gPlayerCountSelection1 == 3) {
                 D_801657E8 = true;
             }
-            gIsHUDVisible = (s32) 1;
+            if (CVarGetInteger("gEditorEnabled", 0) == false) {
+                gIsHUDVisible = (s32) 1;
+            }
             D_8018D170 = (s32) 1;
             D_8018D190 = (s32) 1;
             D_8018D204 = 0;