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, 44 insertions, 32 deletions

diff --git a/src/port/ui/PortMenu.cpp b/src/port/ui/PortMenu.cpp
index 791e2ac73..b21ddc1fa 100644
--- a/src/port/ui/PortMenu.cpp
+++ b/src/port/ui/PortMenu.cpp
@@ -91,6 +91,14 @@ void PortMenu::AddSettings() {
     // General Settings
     AddSidebarEntry("Settings", "General", 3);
     WidgetPath path = { "Settings", "General", SECTION_COLUMN_1 };
+
+    static bool isFullscreen = false;
+    AddWidget(path, "Toggle Fullscreen", WIDGET_CHECKBOX)
+        .ValuePointer(&isFullscreen)
+        .PreFunc([](WidgetInfo& info) { isFullscreen = Ship::Context::GetInstance()->GetWindow()->IsFullscreen(); })
+        .Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); })
+        .Options(CheckboxOptions().Tooltip("Toggles Fullscreen On/Off."));
+
     AddWidget(path, "Menu Theme", WIDGET_CVAR_COMBOBOX)
         .CVar("gSettings.Menu.Theme")
         .Options(ComboboxOptions()
@@ -179,7 +187,6 @@ void PortMenu::AddSettings() {
 
     // Graphics Settings
     static int32_t maxFps;
-    static bool isFullscreen = false;
     const char* tooltip = "";
     if (Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() == Ship::WindowBackend::FAST3D_DXGI_DX11) {
         maxFps = 360;
@@ -193,11 +200,8 @@ void PortMenu::AddSettings() {
     }
     path.sidebarName = "Graphics";
     AddSidebarEntry("Settings", "Graphics", 3);
-    AddWidget(path, "Toggle Fullscreen", WIDGET_CHECKBOX)
-        .ValuePointer(&isFullscreen)
-        .PreFunc([](WidgetInfo& info) { isFullscreen = Ship::Context::GetInstance()->GetWindow()->IsFullscreen(); })
-        .Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); })
-        .Options(CheckboxOptions().Tooltip("Toggles Fullscreen On/Off."));
+    AddWidget(path, "Renderer API (Needs reload)", WIDGET_VIDEO_BACKEND);
+
 #ifndef __APPLE__
     AddWidget(path, "Internal Resolution: %.0f%%", WIDGET_CVAR_SLIDER_FLOAT)
         .CVar(CVAR_INTERNAL_RESOLUTION)
@@ -240,21 +244,21 @@ void PortMenu::AddSettings() {
                 .DefaultValue(1));
 #endif
 
-    AddWidget(path, "Current FPS: %d", WIDGET_CVAR_SLIDER_INT)
-        .CVar("gInterpolationFPS")
-        .Callback([](WidgetInfo& info) {
-            int32_t defaultValue = std::static_pointer_cast<IntSliderOptions>(info.options)->defaultValue;
-            if (CVarGetInteger(info.cVar, defaultValue) == defaultValue) {
-                info.name = "Current FPS: Original (%d)";
-            } else {
-                info.name = "Current FPS: %d";
-            }
-        })
-        .PreFunc([](WidgetInfo& info) {
-            if (mPortMenu->disabledMap.at(DISABLE_FOR_MATCH_REFRESH_RATE_ON).active)
-                info.activeDisables.push_back(DISABLE_FOR_MATCH_REFRESH_RATE_ON);
-        })
-        .Options(IntSliderOptions().Tooltip(tooltip).Min(20).Max(maxFps).DefaultValue(20));
+    // AddWidget(path, "Current FPS: %d", WIDGET_CVAR_SLIDER_INT)
+    //     .CVar("gInterpolationFPS")
+    //     .Callback([](WidgetInfo& info) {
+    //         int32_t defaultValue = std::static_pointer_cast<IntSliderOptions>(info.options)->defaultValue;
+    //         if (CVarGetInteger(info.cVar, defaultValue) == defaultValue) {
+    //             info.name = "Current FPS: Original (%d)";
+    //         } else {
+    //             info.name = "Current FPS: %d";
+    //         }
+    //     })
+    //     .PreFunc([](WidgetInfo& info) {
+    //         if (mPortMenu->disabledMap.at(DISABLE_FOR_MATCH_REFRESH_RATE_ON).active)
+    //             info.activeDisables.push_back(DISABLE_FOR_MATCH_REFRESH_RATE_ON);
+    //     })
+    //     .Options(IntSliderOptions().Tooltip(tooltip).Min(20).Max(maxFps).DefaultValue(20));
     AddWidget(path, "Match Refresh Rate", WIDGET_BUTTON)
         .Callback([](WidgetInfo& info) {
             int hz = Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate();
@@ -280,7 +284,6 @@ void PortMenu::AddSettings() {
                      .Min(0)
                      .Max(360)
                      .DefaultValue(80));
-    AddWidget(path, "Renderer API (Needs reload)", WIDGET_VIDEO_BACKEND);
     AddWidget(path, "Enable Vsync", WIDGET_CVAR_CHECKBOX)
         .CVar(CVAR_VSYNC_ENABLED)
         .PreFunc([](WidgetInfo& info) { info.isHidden = mPortMenu->disabledMap.at(DISABLE_FOR_NO_VSYNC).active; })
@@ -364,6 +367,19 @@ void PortMenu::AddEnhancements() {
         .CVar("gMinHeight")
         .Options(FloatSliderOptions().Min(-50.0f).Max(50.0f).DefaultValue(0.0f)
                      .Tooltip("When Disable Wall Collision are enable what is the minimal height you can get."));
+
+    path = { "Enhancements", "HM64 Lab", SECTION_COLUMN_1 };
+    AddSidebarEntry("Enhancements", "HM64 Lab", 4);
+    AddWidget(path, "Enable HM64 Labs", WIDGET_CVAR_CHECKBOX)
+    .CVar("gEditorEnabled")
+    .Callback([](WidgetInfo& info) {
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Tools")->ToggleVisibility();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Scene Explorer")->ToggleVisibility();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Content Browser")->ToggleVisibility();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Track Properties")->ToggleVisibility();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Properties")->ToggleVisibility();
+    })
+    .Options(UIWidgets::CheckboxOptions({{ .tooltip = "Edit the universe!"}}));
 }
 
 #ifdef __SWITCH__
@@ -409,14 +425,6 @@ void PortMenu::AddDevTools() {
             "Enables the Gfx Debugger window, allowing you to input commands. Type help for some examples"))
         .WindowName("GfxDebuggerWindow");
 
-    path = { "Developer", "Game Info", SECTION_COLUMN_1 };
-    AddSidebarEntry("Developer", "Game Info", 1);
-    AddWidget(path, "Popout Game Info", WIDGET_WINDOW_BUTTON)
-        .CVar("gGameInfoEnabled")
-        .Options(ButtonOptions().Tooltip(
-            "Shows the game info window, contains player and actor information"))
-        .WindowName("GameInfo");
-
     path = { "Developer", "Stats", SECTION_COLUMN_1 };
     AddSidebarEntry("Developer", "Stats", 1);
     AddWidget(path, "Popout Stats", WIDGET_WINDOW_BUTTON)
@@ -457,9 +465,13 @@ void PortMenu::InitElement() {
 
     disabledMap = {
         { DISABLE_FOR_FREE_CAM_ON,
-          { [](disabledInfo& info) -> bool { return CVarGetInteger("gFreecam", 0); }, "Free Cam is Enabled" } },
+          { [](disabledInfo& info) -> bool { return CVarGetInteger("gFreecam", 0); }, "Freecam is Enabled" } },
         { DISABLE_FOR_FREE_CAM_OFF,
-          { [](disabledInfo& info) -> bool { return !CVarGetInteger("gFreecam", 0); }, "Free Cam is Disabled" } },
+          { [](disabledInfo& info) -> bool { return !CVarGetInteger("gFreecam", 0); }, "Freecam is Disabled" } },
+        { DISABLE_FOR_EDITOR_ON,
+          { [](disabledInfo& info) -> bool { return CVarGetInteger("gEditorEnabled", 0); }, "Editor is Enabled" } },
+        { DISABLE_FOR_EDITOR_OFF,
+          { [](disabledInfo& info) -> bool { return !CVarGetInteger("gEditorEnabled", 0); }, "Editor is Disabled" } },
         { DISABLE_FOR_DEBUG_MODE_OFF,
           { [](disabledInfo& info) -> bool { return !CVarGetInteger("gEnableDebugMode", 0); },
             "Debug Mode is Disabled" } },