mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-30 17:59:53 -04:00
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 05704c01f7.
* 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>
This commit is contained in:
MegaMech
@@ -0,0 +1,288 @@
|
||||
#include "ContentBrowser.h"
|
||||
#include "port/ui/PortMenu.h"
|
||||
#include "UIWidgets.h"
|
||||
#include "libultraship/src/Context.h"
|
||||
#include "port/Engine.h"
|
||||
|
||||
#include <imgui.h>
|
||||
#include <map>
|
||||
#include <filesystem>
|
||||
#include <iostream>
|
||||
#include <libultraship/libultraship.h>
|
||||
#include <spdlog/fmt/fmt.h>
|
||||
#include "spdlog/formatter.h"
|
||||
#include <common_structs.h>
|
||||
#include <defines.h>
|
||||
#include "CoreMath.h"
|
||||
#include "World.h"
|
||||
#include "AllActors.h"
|
||||
#include "port/Game.h"
|
||||
#include "src/engine/editor/SceneManager.h"
|
||||
|
||||
namespace Editor {
|
||||
|
||||
ContentBrowserWindow::~ContentBrowserWindow() {
|
||||
SPDLOG_TRACE("destruct content browser window");
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::DrawElement() {
|
||||
if (ImGui::Button(ICON_FA_REFRESH)) {
|
||||
Refresh = true;
|
||||
}
|
||||
|
||||
// Query content in o2r and add them to Content
|
||||
if (Refresh) {
|
||||
Refresh = false;
|
||||
RemoveCustomTracksFromTrackList();
|
||||
Tracks.clear();
|
||||
Content.clear();
|
||||
FindTracks();
|
||||
FindContent();
|
||||
return;
|
||||
}
|
||||
|
||||
ImGui::BeginChild("LeftPanel", ImVec2(120, 0), true, ImGuiWindowFlags_None);
|
||||
|
||||
ContentBrowserWindow::FolderButton("Tracks", TrackContent);
|
||||
ContentBrowserWindow::FolderButton("Actors", ActorContent);
|
||||
ContentBrowserWindow::FolderButton("Objects", ObjectContent);
|
||||
ContentBrowserWindow::FolderButton("Custom", CustomContent);
|
||||
ImGui::EndChild();
|
||||
ImGui::SameLine();
|
||||
ImGui::BeginChild("RightPanel", ImVec2(0, 0), true, ImGuiWindowFlags_None);
|
||||
if (TrackContent) {
|
||||
AddTrackContent();
|
||||
}
|
||||
|
||||
if (ActorContent) {
|
||||
AddActorContent();
|
||||
}
|
||||
|
||||
if (ObjectContent) {
|
||||
AddObjectContent();
|
||||
}
|
||||
|
||||
if (CustomContent) {
|
||||
AddCustomContent();
|
||||
}
|
||||
ImGui::EndChild();
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::FolderButton(const char* label, bool& contentFlag, const ImVec2& size) {
|
||||
std::string buttonText = fmt::format("{0} {1}", contentFlag ? ICON_FA_FOLDER_OPEN_O : ICON_FA_FOLDER_O, label);
|
||||
if (ImGui::Button(buttonText.c_str(), size)) {
|
||||
TrackContent = false;
|
||||
ActorContent = false;
|
||||
ObjectContent = false;
|
||||
CustomContent = false;
|
||||
contentFlag = !contentFlag;
|
||||
}
|
||||
}
|
||||
|
||||
std::unordered_map<std::string, std::function<AActor*(const FVector&)>> ActorList = {
|
||||
{ "Mario Sign", [](const FVector& pos) { return new AMarioSign(pos); } },
|
||||
{ "Wario Sign", [](const FVector& pos) { return new AWarioSign(pos); } },
|
||||
{ "Cloud", [](const FVector& pos) { return new ACloud(pos); } },
|
||||
{ "Finishline", [](const FVector& pos) { return new AFinishline(pos); } },
|
||||
{ "Ghostship", [](const FVector& pos) { return new AShip(pos, AShip::Skin::GHOSTSHIP); } },
|
||||
{ "Ship_1", [](const FVector& pos) { return new AShip(pos, AShip::Skin::SHIP2); } },
|
||||
{ "Ship_2", [](const FVector& pos) { return new AShip(pos, AShip::Skin::SHIP3); } },
|
||||
{ "SpaghettiShip", [](const FVector& pos) { return new ASpaghettiShip(pos); } },
|
||||
{ "Starship", [](const FVector& pos) { return new AStarship(pos); } },
|
||||
{ "Train", [](const FVector& pos) { return new ATrain(ATrain::TenderStatus::HAS_TENDER, 4, 2.5f, 0); } },
|
||||
{ "Boat", [](const FVector& pos) { return new ABoat((0.6666666f)/4, 0); } },
|
||||
{ "Bus", [](const FVector& pos) { return new ABus(2.0f, 2.5f, &D_80164550[0][0], 0); } },
|
||||
{ "Car", [](const FVector& pos) { return new ACar(2.0f, 2.5f, &D_80164550[0][0], 0); } },
|
||||
{ "Truck", [](const FVector& pos) { return new ATruck(2.0f, 2.5f, &D_80164550[0][0], 0); } },
|
||||
{ "Tanker Truck", [](const FVector& pos) { return new ATankerTruck(2.0f, 2.5f, &D_80164550[0][0], 0); } },
|
||||
};
|
||||
|
||||
std::unordered_map<std::string, std::function<OObject*(const FVector&)>> ObjectList = {
|
||||
{ "Bat", [](const FVector& pos) { return new OBat(pos, IRotator(0, 0, 0)); } },
|
||||
{ "Bomb Kart", [](const FVector& pos) { return new OBombKart(pos, &D_80164550[0][0], 0, 0, 0.8333333f); } },
|
||||
// { "Boos", [](const FVector& pos) { return new OBoos(pos, &D_80164550[0][0], 0, 0, 0.8333333f); } },
|
||||
{ "CheepCheep", [](const FVector& pos) { return new OCheepCheep(pos, OCheepCheep::CheepType::RACE, IPathSpan(0, 10)); } },
|
||||
{ "Crab", [](const FVector& pos) { return new OCrab(FVector2D(0, 10), FVector2D(20, 10)); } },
|
||||
{ "ChainChomp", [](const FVector& pos) { return new OChainChomp(); } },
|
||||
{ "Flagpole", [](const FVector& pos) { return new OFlagpole(pos, 0); } },
|
||||
{ "Hedgehog", [](const FVector& pos) { return new OHedgehog(pos, FVector2D(0, 10), 0); } },
|
||||
{ "HotAirBalloon", [](const FVector& pos) { return new OHotAirBalloon(pos); } },
|
||||
{ "Lakitu", [](const FVector& pos) { return new OLakitu(0, OLakitu::LakituType::STARTER); } },
|
||||
// { "Mole", [](const FVector& pos) { return new OMole(pos, ); } }, // <-- Needs a group
|
||||
{ "Chick Penguin", [](const FVector& pos) { return new OPenguin(pos, 0, OPenguin::PenguinType::CHICK, OPenguin::Behaviour::SLIDE3); } },
|
||||
{ "Penguin", [](const FVector& pos) { return new OPenguin(pos, 0, OPenguin::PenguinType::ADULT, OPenguin::Behaviour::CIRCLE); } },
|
||||
{ "Emperor Penguin", [](const FVector& pos) { return new OPenguin(pos, 0, OPenguin::PenguinType::EMPEROR, OPenguin::Behaviour::STRUT); } },
|
||||
{ "Seagull", [](const FVector& pos) { return new OSeagull(pos); } },
|
||||
{ "Thwomp", [](const FVector& pos) { return new OThwomp(pos.x, pos.z, 0, 1.0f, 0, 0, 2.0f); } },
|
||||
{ "Trashbin", [](const FVector& pos) { return new OTrashBin(pos, IRotator(0, 0, 0), 1.0f, OTrashBin::Behaviour::MUNCHING); } },
|
||||
{ "Trophy", [](const FVector& pos) { return new OTrophy(pos, OTrophy::TrophyType::GOLD_150, OTrophy::Behaviour::ROTATE2); } },
|
||||
{ "Snowman", [](const FVector& pos) { return new OSnowman(pos); } },
|
||||
{ "Podium", [](const FVector& pos) { return new OPodium(pos); } },
|
||||
{ "Balloons", [](const FVector& pos) { return new OGrandPrixBalloons(pos); } },
|
||||
};
|
||||
|
||||
void ContentBrowserWindow::AddTrackContent() {
|
||||
size_t i_track = 0;
|
||||
for (auto& track : Tracks) {
|
||||
if (!track.SceneFile.empty()) { // has scene file
|
||||
std::string label = fmt::format("{}##{}", track.Name, i_track);
|
||||
if (ImGui::Button(label.c_str())) {
|
||||
SetCourseByClass(track.course);
|
||||
gGamestateNext = RACING;
|
||||
SetSceneFile(track.Archive, track.SceneFile);
|
||||
break;
|
||||
}
|
||||
} else { // no scene file
|
||||
std::string label = fmt::format("{} {}", ICON_FA_EXCLAMATION_TRIANGLE, track.Name);
|
||||
if (ImGui::Button(label.c_str())) {
|
||||
track.SceneFile = track.Dir + "/scene.json";
|
||||
SetCourseByClass(track.course);
|
||||
SetSceneFile(track.Archive, track.SceneFile);
|
||||
SaveLevel();
|
||||
Refresh = true;
|
||||
}
|
||||
}
|
||||
|
||||
i_track += 1;
|
||||
}
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::RemoveCustomTracksFromTrackList() {
|
||||
for (auto& track : Tracks) {
|
||||
auto it = gWorldInstance.Courses.begin();
|
||||
while (it != gWorldInstance.Courses.end()) {
|
||||
if (track.course == *it) {
|
||||
delete *it;
|
||||
it = gWorldInstance.Courses.erase(it);
|
||||
} else {
|
||||
++it;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::AddActorContent() {
|
||||
FVector pos = GetPositionAheadOfCamera(300.0f);
|
||||
|
||||
size_t i_actor = 0;
|
||||
for (const auto& actor : ActorList) {
|
||||
if ((i_actor != 0) && (i_actor % 10 == 0)) {
|
||||
} else {
|
||||
ImGui::SameLine();
|
||||
}
|
||||
|
||||
std::string label = fmt::format("{}##{}", actor.first, i_actor);
|
||||
if (ImGui::Button(label.c_str())) {
|
||||
gWorldInstance.AddActor(actor.second(pos));
|
||||
}
|
||||
i_actor += 1;
|
||||
}
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::AddObjectContent() {
|
||||
FVector pos = GetPositionAheadOfCamera(300.0f);
|
||||
|
||||
size_t i_object = 0;
|
||||
for (auto& object : ObjectList) {
|
||||
if ((i_object != 0) && (i_object % 10 == 0)) {
|
||||
} else {
|
||||
ImGui::SameLine();
|
||||
}
|
||||
|
||||
std::string label = fmt::format("{}##{}", object.first, i_object);
|
||||
if (ImGui::Button(label.c_str())) {
|
||||
gWorldInstance.AddObject(object.second(pos));
|
||||
}
|
||||
i_object += 1;
|
||||
}
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::AddCustomContent() {
|
||||
FVector pos = GetPositionAheadOfCamera(300.0f);
|
||||
|
||||
size_t i_custom = 0;
|
||||
for (const auto& file : Content) {
|
||||
if ((i_custom != 0) && (i_custom % 10 == 0)) {
|
||||
} else {
|
||||
ImGui::SameLine();
|
||||
}
|
||||
|
||||
std::string label = fmt::format("{}##{}", file, i_custom);
|
||||
if (ImGui::Button(label.c_str())) {
|
||||
int coll;
|
||||
//printf("ContentBrowser.cpp: name: %s\n", test.c_str());
|
||||
std::string name = file.substr(file.find_last_of('/') + 1);
|
||||
auto actor = gWorldInstance.AddStaticMeshActor(name, FVector(pos), IRotator(0, 0, 0), FVector(1, 1, 1), "__OTR__" + file, &coll);
|
||||
// This is required because ptr gets cleaned up.
|
||||
actor->Model = "__OTR__" + file;
|
||||
|
||||
}
|
||||
i_custom += 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Finds modded archives only. For discovering tracks
|
||||
void ContentBrowserWindow::FindTracks() {
|
||||
auto manager = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager();
|
||||
|
||||
auto ptr2 = manager->ListDirectories("tracks/*");
|
||||
if (ptr2) {
|
||||
auto dirs = *ptr2;
|
||||
|
||||
for (const std::string& dir : dirs) {
|
||||
std::string name = dir.substr(dir.find_last_of('/') + 1);
|
||||
std::string sceneFile = dir + "/scene.json";
|
||||
std::string minimapFile = dir + "/minimap.png";
|
||||
if (manager->HasFile(sceneFile)) {
|
||||
auto archive = manager->GetArchiveFromFile(sceneFile);
|
||||
|
||||
Course* course = new Course();
|
||||
course->LoadO2R(dir);
|
||||
gWorldInstance.Courses.push_back(course);
|
||||
LoadLevel(archive, course, sceneFile);
|
||||
LoadMinimap(archive, course, minimapFile);
|
||||
Tracks.push_back({course, sceneFile, name, dir, archive});
|
||||
} else {
|
||||
const std::string file = dir + "/data_track_sections";
|
||||
|
||||
if (manager->HasFile(file)) {
|
||||
|
||||
Course* course = new Course();
|
||||
course->Id = (std::string("mods:") + name).c_str();
|
||||
course->Props.SetText(course->Props.Name, name.c_str(), sizeof(course->Props.Name));
|
||||
course->Props.SetText(course->Props.DebugName, name.c_str(), sizeof(course->Props.Name));
|
||||
|
||||
auto archive = manager->GetArchiveFromFile(file);
|
||||
Tracks.push_back({course, "", name, dir, archive});
|
||||
} else {
|
||||
printf("ContentBrowser.cpp: Track '%s' missing required track files. Cannot add to game\n Missing %s/data_track_sections file\n", name.c_str(), dir.c_str());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ContentBrowserWindow::FindContent() {
|
||||
auto ptr = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->ListFiles({"hmintro/*", "*tracks/*","actors/*", "objects/*"}, {""});
|
||||
if (ptr) {
|
||||
auto files = *ptr;
|
||||
for (const auto& file : files) {
|
||||
if (file.find("/mat_") != std::string::npos) {
|
||||
continue;
|
||||
} else if (file.size() >= 6 && file.substr(file.size() - 6, 5) == "_tri_" && isdigit(file.back())) {
|
||||
// ends with _tri_#
|
||||
continue;
|
||||
} else if (file.find("_vtx_") != std::string::npos) {
|
||||
// Has _vtx_
|
||||
continue;
|
||||
} else if (file.find('.') != std::string::npos) {
|
||||
// File has an extension
|
||||
continue;
|
||||
}
|
||||
|
||||
Content.push_back(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user