mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix modifying resourceName and rename editor namespace to trackeditor

This commit is contained in:
MegaMech 2025-12-15 12:14:20 -07:00
parent 1b98265853
commit 63fe20a02f
41 changed files with 256 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/Actor.cpp
View File

@ -25,7 +25,7 @@ void AActor::BeginPlay() {
if ((nullptr != Model) && (Model[0] != '\0')) {
// Prevent collision mesh from being generated extra times.
if (Triangles.size() == 0) {
Editor::GenerateCollisionMesh(this, (Gfx*)LOAD_ASSET_RAW(Model), 1.0f);
TrackEditor::GenerateCollisionMesh(this, (Gfx*)LOAD_ASSET_RAW(Model), 1.0f);
}
}
}

2
src/engine/RegisterContent.cpp
View File

@ -495,7 +495,7 @@ void RegisterTracks(Registry<TrackInfo>& r) {
r.Add(info, []() { GetWorld()->SetCurrentTrack(std::make_unique<BigDonut>()); });
info = {
.ResourceName = "mk:test_track",
.ResourceName = "hm:test_track",
.Name = "test track",
.DebugName = "test track",
.Length = "100m",

11
src/engine/Registry.h
View File

@ -97,6 +97,17 @@ public:
return list;
}
// Returns true if item succesfully removed
// Note that mCounter is not decremented on remove
bool Remove(const std::string& resourceName) {
auto it = mMap.find(resourceName);
if (it != mMap.end()) {
mMap.erase(it);
return true;
}
return false;
}
void Clear() {
mMap.clear();
mCounter = 0;

88
src/engine/TrackBrowser.cpp
View File

@ -1,6 +1,7 @@
#include "TrackBrowser.h"
#include "port/Engine.h"
#include "engine/editor/SceneManager.h"
#include <imgui.h>
TrackBrowser* TrackBrowser::Instance;
@ -8,57 +9,64 @@ void TrackBrowser::FindCustomTracks() {
auto manager = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager();
auto ptr2 = manager->ListDirectories("tracks/*");
if (ptr2) {
auto dirs = *ptr2;
if (!ptr2) {
return;
}
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";
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";
// The track has a valid scene file, add it to the registry
if (manager->HasFile(sceneFile)) {
auto archive = manager->GetArchiveFromFile(sceneFile);
// The track has a valid scene file, add it to the registry
if (manager->HasFile(sceneFile)) {
auto archive = manager->GetArchiveFromFile(sceneFile);
TrackInfo info;
info.Path = dir;
TrackEditor::LoadTrackInfo(info, archive, sceneFile);
printf("[TrackBrowser] Added custom track %s\n", info.Name.c_str());
gTrackRegistry.Add(info, [info, archive]() {
auto track = std::make_unique<Track>();
track->ResourceName = info.ResourceName;
track->Archive = archive;
GetWorld()->SetCurrentTrack(std::move(track));
});
} else { // The track does not have a valid scene file
const std::string file = dir + "/data_track_sections";
// If the track has a data_track_sections file,
// then it must at least be a valid track.
// So lets add it as an uninitialized track.
if (manager->HasFile(file)) {
printf("[TrackBrowser] [FindCustomTracks] Found a new custom track!\n");
printf(" Creating scene.json so the track can be configured in the editor\n");
TrackInfo info;
std::string resName = std::string("mods:") + name;
info.ResourceName = resName;
info.Name = name;
info.DebugName = name;
info.Path = dir;
Editor::LoadTrackInfo(info, archive, sceneFile);
printf("Added custom track %s\n", info.Name.c_str());
// Create the track
auto archive = manager->GetArchiveFromFile(file);
auto track = std::make_unique<Track>();
track->Archive = archive;
track->ResourceName = info.ResourceName;
TrackEditor::SaveLevel(track.get(), static_cast<const TrackInfo*>(&info)); // Write scene file so it will show up in the track browser
printf("[TrackBrowser] [FindCustomTracks] Saved scene.json to new track!\n");
// Passing these through seems kinda bad. But it works?
gTrackRegistry.Add(info, [info, archive]() {
auto track = std::make_unique<Track>();
track->ResourceName = info.ResourceName;
track->Archive = archive;
track->ResourceName = info.ResourceName;
GetWorld()->SetCurrentTrack(std::move(track));
});
} else { // The track does not have a valid scene file
const std::string file = dir + "/data_track_sections";
// If the track has a data_track_sections file,
// then it must at least be a valid track.
// So lets add it as an uninitialized track.
if (manager->HasFile(file)) {
TrackInfo info;
std::string resName = std::string("mods:") + name;
info.ResourceName = resName;
info.Name = name;
info.DebugName = name;
auto archive = manager->GetArchiveFromFile(file);
//mNewTracks.push_back({info, "", dir, archive});
auto track = std::make_unique<Track>();
Editor::SaveLevel(track.get()); // Write scene file so it will show up in the track browser
gTrackRegistry.Add(info, [info, archive]() {
auto track = std::make_unique<Track>();
track->ResourceName = info.ResourceName;
track->Archive = archive;
GetWorld()->SetCurrentTrack(std::move(track));
});
} 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());
}
} 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());
}
}
}

2
src/engine/actors/Cloud.cpp
View File

@ -50,7 +50,7 @@ void ACloud::BeginPlay() {
// Prevent collision mesh from being generated extra times.
if (Editor_IsEnabled()) {
if (Triangles.size() == 0) {
Editor::GenerateCollisionMesh(this, (Gfx*)cloud_mesh, 1.0f);
TrackEditor::GenerateCollisionMesh(this, (Gfx*) cloud_mesh, 1.0f);
}
}
}

2
src/engine/actors/Finishline.cpp
View File

@ -53,7 +53,7 @@ void AFinishline::BeginPlay() {
// Prevent collision mesh from being generated extra times.
if (Editor_IsEnabled()) {
if (Triangles.size() == 0) {
Editor::GenerateCollisionMesh(this, (Gfx*)LOAD_ASSET_RAW(D_0D001B90), 1.0f);
TrackEditor::GenerateCollisionMesh(this, (Gfx*)LOAD_ASSET_RAW(D_0D001B90), 1.0f);
}
}
}

2
src/engine/actors/Ship.cpp
View File

@ -55,7 +55,7 @@ void AShip::BeginPlay() {
// Prevent collision mesh from being generated extra times.
if (Editor_IsEnabled()) {
if (Triangles.size() == 0) {
Editor::GenerateCollisionMesh(this, (Gfx*)_skin, Scale.y);
TrackEditor::GenerateCollisionMesh(this, (Gfx*) _skin, Scale.y);
}
}
}

2
src/engine/actors/Starship.cpp
View File

@ -35,7 +35,7 @@ void AStarship::BeginPlay() {
// Prevent collision mesh from being generated extra times.
if (Editor_IsEnabled()) {
if (Triangles.size() == 0) {
Editor::GenerateCollisionMesh(this, (Gfx*)Model, 1.0f);
TrackEditor::GenerateCollisionMesh(this, (Gfx*)Model, 1.0f);
}
}
}

2
src/engine/editor/Collision.cpp
View File

@ -14,7 +14,7 @@ extern "C" {
#include "assets/textures/other_textures.h"
}
namespace Editor {
namespace TrackEditor {
void GenerateCollisionMesh(std::variant<AActor*, OObject*, GameObject*> object, Gfx* model, float scale) {
int8_t opcode;
uintptr_t lo;

2
src/engine/editor/Collision.h
View File

@ -19,7 +19,7 @@
#define EDITOR_GFX_GET_OPCODE(var) ((uint32_t) ((var) & 0xFF000000))
namespace Editor {
namespace TrackEditor {
void GenerateCollisionMesh(std::variant<AActor*, OObject*, GameObject*> object, Gfx* model, float scale);
void DebugCollision(GameObject* obj, FVector pos, IRotator rot, FVector scale, const std::vector<Triangle>& triangles);
}

2
src/engine/editor/Editor.cpp
View File

@ -24,7 +24,7 @@ extern "C" {
#include "camera.h"
}
namespace Editor {
namespace TrackEditor {
Editor* Editor::Instance;
Editor::Editor() {

4
src/engine/editor/Editor.h
View File

@ -12,7 +12,7 @@ extern "C" {
}
#include "ObjectPicker.h"
namespace Editor {
namespace TrackEditor {
class ObjectPicker;
class Editor {
@ -54,7 +54,7 @@ private:
void Copy(MtxF* src, MtxF* dest);
void Clear(MtxF* mf);
};
} // namespace Editor
} // namespace TrackEditor
#endif // __cplusplus

4
src/engine/editor/GameObject.cpp
View File

@ -1,7 +1,7 @@
#include <libultraship/libultraship.h>
#include "GameObject.h"
namespace Editor {
namespace TrackEditor {
GameObject::GameObject(FVector pos, IRotator rot, FVector scale, const char* model, std::vector<Triangle> triangles, CollisionType collision, float boundingBoxSize) {
Pos = pos;
@ -38,4 +38,4 @@ namespace Editor {
Scale = scale;
};
} // namespace Editor
} // namespace TrackEditor

2
src/engine/editor/GameObject.h
View File

@ -16,7 +16,7 @@ extern "C" {
struct Triangle;
namespace Editor {
namespace TrackEditor {
class GameObject {
public:
enum class CollisionType {

2
src/engine/editor/Gizmo.cpp
View File

@ -29,7 +29,7 @@ extern "C" {
#include "math_util.h"
}
namespace Editor {
namespace TrackEditor {
void Gizmo::Load() {
/* Translate handle collision */

2
src/engine/editor/Gizmo.h
View File

@ -8,7 +8,7 @@
#include "engine/objects/Object.h"
#include <variant>
namespace Editor {
namespace TrackEditor {
class Gizmo {
public:

2
src/engine/editor/Handles.cpp
View File

@ -3,7 +3,7 @@
#include "Handles.h"
namespace Editor {
namespace TrackEditor {
Handles::Handles() {
}

2
src/engine/editor/Handles.h
View File

@ -4,7 +4,7 @@
#include <libultra/gbi.h>
#include "GameObject.h"
namespace Editor {
namespace TrackEditor {
class Handles : public GameObject {
Handles();

2
src/engine/editor/Light.cpp
View File

@ -27,7 +27,7 @@ extern "C" {
#include "math_util_2.h"
}
namespace Editor {
namespace TrackEditor {
size_t LightObject::NumLights = 0;

2
src/engine/editor/Light.h
View File

@ -5,7 +5,7 @@
#include "Collision.h"
#include "GameObject.h"
namespace Editor {
namespace TrackEditor {
class LightObject : public GameObject {
public:

4
src/engine/editor/ObjectPicker.cpp
View File

@ -25,7 +25,7 @@ extern "C" {
#include "camera.h"
}
namespace Editor {
namespace TrackEditor {
void ObjectPicker::Load() {
eGizmo.Load();
@ -230,7 +230,7 @@ std::pair<GameObject*, float> ObjectPicker::CheckEditorObjectRay(Ray ray) {
break;
}
case GameObject::CollisionType::BOUNDING_SPHERE:
printf("Editor::ObjectPicker.cpp Bounding sphere collision type not yet supported\n");
printf("[ObjectPicker] [CheckEditorObjectRay] Bounding sphere collision type not yet supported\n");
break;
}
}

2
src/engine/editor/ObjectPicker.h
View File

@ -7,7 +7,7 @@
#include "GameObject.h"
#include "engine/Matrix.h"
namespace Editor {
namespace TrackEditor {
class ObjectPicker {
public:
void SelectObject(std::vector<GameObject*> objects);

58
src/engine/editor/SceneManager.cpp
View File

@ -33,18 +33,27 @@ extern "C" {
#include "render_courses.h"
}
namespace Editor {
void SaveLevel(Track* track) {
namespace TrackEditor {
void SaveLevel(Track* track, const TrackInfo* info) {
nlohmann::json data;
/**
* Save track properties, static mesh actors, actors, and tour camera
*/
data["Props"] = track->Props.to_json();
try {
data["Props"] = track->Props.to_json();
data["Props"]["ResourceName"] = track->ResourceName.c_str();
} catch (...) {
SPDLOG_ERROR("[SceneManager] [SaveLevel] Failed serializing track Props");
}
nlohmann::json staticMesh;
SaveStaticMeshActors(staticMesh);
data["StaticMeshActors"] = staticMesh;
try {
nlohmann::json staticMesh;
SaveStaticMeshActors(staticMesh);
data["StaticMeshActors"] = staticMesh;
} catch (...) {
SPDLOG_ERROR("[SceneManager] [SaveLevel] Failed serializing StaticMeshActors");
}
nlohmann::json actors;
@ -75,7 +84,6 @@ namespace Editor {
std::vector<uint8_t> bytes; // Turn the str into raw data
bytes.assign(jsonStr.begin(), jsonStr.end());
const TrackInfo* info = gTrackRegistry.GetInfo(track->ResourceName);
std::string sceneFile = info->Path + "/scene.json";
// Write file to disk
@ -304,8 +312,8 @@ namespace Editor {
}
void SaveFog(nlohmann::json& fog) {
fog["EnableFog"] = bFog;
if (bFog) {
fog["EnableFog"] = bFog;
fog["Colour"]["R"] = gFogColour.r;
fog["Colour"]["G"] = gFogColour.g;
fog["Colour"]["B"] = gFogColour.b;
@ -324,6 +332,7 @@ namespace Editor {
try {
track->Props.from_json(data["Props"]);
track->ResourceName = data["Props"].at("ResourceName").get<std::string>();
} catch(const std::exception& e) {
std::cerr << " Error parsing track properties: " << e.what() << std::endl;
std::cerr << " Is your scene.json file out of date?" << std::endl;
@ -331,27 +340,34 @@ namespace Editor {
}
void LoadPaths(Track* track, const std::string& trackPath) {
SPDLOG_INFO("[SceneManager] [LoadPaths] Loading Paths...");
std::string path_file = (trackPath + "/data_paths").c_str();
auto res = std::dynamic_pointer_cast<MK64::Paths>(ResourceLoad(path_file.c_str()));
if (nullptr == res) {
SPDLOG_ERROR(" Unable to load path file (data_paths)");
SPDLOG_ERROR(" This file is required for custom tracks to work ");
SPDLOG_ERROR(" Make sure the first path point is at coordinates 0,0,0");
SPDLOG_ERROR(" In blender you may need to apply transformations and then move the point to 0,0,0");
}
if (res != nullptr) {
auto& paths = res->PathList;
auto& paths = res->PathList;
size_t i = 0;
u16* ptr = &track->Props.PathSizes.unk0;
for (auto& path : paths) {
if (i >= ARRAY_COUNT(track->Props.PathTable2)) {
printf("[Track.cpp] The game can only import 5 paths. Found more than 5. Skipping the rest\n");
break; // Only 5 paths allowed. 4 track, 1 vehicle
}
ptr[i] = path.size();
track->Props.PathTable2[i] = (TrackPathPoint*) path.data();
i += 1;
size_t i = 0;
u16* ptr = &track->Props.PathSizes.unk0;
for (auto& path : paths) {
if (i >= ARRAY_COUNT(track->Props.PathTable2)) {
SPDLOG_INFO(" The game can only import 5 paths. Found more than 5. Skipping the rest\n");
break; // Only 5 paths allowed. 4 track, 1 vehicle
}
ptr[i] = path.size();
track->Props.PathTable2[i] = (TrackPathPoint*) path.data();
SPDLOG_INFO(" Added path {}", i);
i += 1;
}
gVehiclePathSize = track->Props.PathSizes.unk0; // This is likely incorrect.
SPDLOG_INFO("[SceneManager] [LoadPaths] Path Loading Complete!");
}
void LoadTrackInfoData(TrackInfo& info, nlohmann::json& data) {

4
src/engine/editor/SceneManager.h
View File

@ -6,8 +6,8 @@
#include <optional>
#include <nlohmann/json.hpp>
namespace Editor {
void SaveLevel(Track* track);
namespace TrackEditor {
void SaveLevel(Track* track, const TrackInfo* info);
void LoadTrackDataFromJson(Track* track, const std::string& trackPath);
void LoadTrackInfo(TrackInfo& info, std::shared_ptr<Ship::Archive> archive, std::string sceneFile);
void Load_AddStaticMeshActor(const nlohmann::json& actorJson);

2
src/engine/tracks/TestTrack.cpp
View File

@ -71,7 +71,7 @@ TestTrack::TestTrack() {
Props.Minimap.Colour = {255, 255, 255};
ResizeMinimap(&Props.Minimap);
ResourceName = "mk:test_track";
ResourceName = "hm:test_track";
Props.SetText(Props.Name, "Test Track", sizeof(Props.Name));
Props.SetText(Props.DebugName, "test track", sizeof(Props.DebugName));

9
src/engine/tracks/Track.cpp
View File

@ -350,14 +350,13 @@ bool IsTriangleWindingInverted() {
return !gModifiedGfxSet.empty();
}
Track::Track() {
Props.SetText(Props.Name, "Blank Track", sizeof(Props.Name));
Props.SetText(Props.DebugName, "blnktrck", sizeof(Props.DebugName));
Props.SetText(Props.TrackLength, "100m", sizeof(Props.TrackLength));
// Props.Cup = FLOWER_CUP;
// Props.CupIndex = 3;
ResourceName = "";
ResourceName = "mod:blank_track";
Props.Minimap.Texture = minimap_mario_raceway;
Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture);
Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture);
@ -449,7 +448,7 @@ void Track::Load() {
} else { // Load custom track
bIsMod = true;
Editor::LoadTrackDataFromJson(this, trackPath);
TrackEditor::LoadTrackDataFromJson(this, trackPath);
const std::string trackSectionPath = (trackPath + "/data_track_sections");
TrackSections* sections = (TrackSections*) LOAD_ASSET_RAW(trackSectionPath.c_str());
@ -646,6 +645,10 @@ void Track::Draw(ScreenContext* arg0) {
}
const TrackInfo* info = gTrackRegistry.GetInfo(ResourceName);
if (nullptr == info) {
printf("[Track] [Draw] Resource name did not return a valid TrackInfo %s\n", ResourceName.c_str());
return;
}
std::string res = info->Path + "/data_track_sections";
TrackSections* sections = (TrackSections*) LOAD_ASSET_RAW(res.c_str());

10
src/engine/tracks/Track.h
View File

@ -86,7 +86,6 @@ typedef struct {
} TrackSections;
typedef struct Properties {
char ResourceName[128];
char Name[128];
char DebugName[128];
char TrackLength[128];
@ -116,8 +115,6 @@ typedef struct Properties {
#ifdef __cplusplus
nlohmann::json to_json() const {
nlohmann::json j;
// j["Id"] = Id ? Id : "";
j["ResourceName"] = ResourceName ? ResourceName : "";
j["Name"] = Name ? Name : "";
j["DebugName"] = DebugName ? DebugName : "";
j["TrackLength"] = TrackLength ? TrackLength : "";
@ -180,19 +177,12 @@ typedef struct Properties {
// Function to load struct from JSON
void from_json(const nlohmann::json& j) {
//Id = j.at("Id").get<std::string>().c_str();
// Name = j.at("Name").get<std::string>().c_str();
strncpy(ResourceName, j.at("ResourceName").get<std::string>().c_str(), sizeof(ResourceName) - 1);
ResourceName[sizeof(ResourceName) - 1] = '\0'; // Ensure null termination
strncpy(Name, j.at("Name").get<std::string>().c_str(), sizeof(Name) - 1);
Name[sizeof(Name) - 1] = '\0'; // Ensure null termination
// DebugName = j.at("DebugName").get<std::string>().c_str();
strncpy(DebugName, j.at("DebugName").get<std::string>().c_str(), sizeof(DebugName) - 1);
DebugName[sizeof(DebugName) - 1] = '\0'; // Ensure null termination
// TrackLength = j.at("TrackLength").get<std::string>().c_str();
strncpy(TrackLength, j.at("TrackLength").get<std::string>().c_str(), sizeof(TrackLength) - 1);
TrackLength[sizeof(TrackLength) - 1] = '\0'; // Ensure null termination

2
src/menus.c
View File

@ -1177,7 +1177,7 @@ void splash_menu_act(struct Controller* controller, u16 controllerIdx) {
}
case DEBUG_MENU_LAUNCH_EDITOR: {
if (btnAndStick & (A_BUTTON | START_BUTTON)) {
Editor_Launch("mk:test_track");
Editor_Launch("hm:test_track");
play_sound2(SOUND_INTRO_ENTER_MENU);
}

4
src/port/Game.cpp
View File

@ -69,7 +69,7 @@ Cup* gBattleCup;
HarbourMastersIntro gMenuIntro;
Editor::Editor gEditor;
TrackEditor::Editor gEditor;
s32 gTrophyIndex = NULL;
@ -757,7 +757,7 @@ void CM_ActorGenerateCollision(struct Actor* actor) {
if ((nullptr != act->Model) && (act->Model[0] != '\0')) {
if (act->Triangles.size() == 0) {
Editor::GenerateCollisionMesh(act, (Gfx*)LOAD_ASSET_RAW(act->Model), 1.0f);
TrackEditor::GenerateCollisionMesh(act, (Gfx*)LOAD_ASSET_RAW(act->Model), 1.0f);
}
}
}

2
src/port/Game.h
View File

@ -25,7 +25,7 @@ extern "C" {
extern s32 gTrophyIndex;
#ifdef __cplusplus
extern Editor::Editor gEditor;
extern TrackEditor::Editor gEditor;
extern HarbourMastersIntro gMenuIntro;
extern bool bCleanWorld;
extern Registry<TrackInfo> gTrackRegistry;

2
src/port/ui/ContentBrowser.cpp
View File

@ -29,7 +29,7 @@ extern "C" {
#include "collision.h"
}
namespace Editor {
namespace TrackEditor {
bool bIsTrainWindowOpen = false; // Global because member variables do not work in lambdas
ContentBrowserWindow::~ContentBrowserWindow() {

2
src/port/ui/ContentBrowser.h
View File

@ -4,7 +4,7 @@
#include "engine/tracks/Track.h"
#include "AllActors.h"
namespace Editor {
namespace TrackEditor {
class ContentBrowserWindow : public Ship::GuiWindow {
public:
using Ship::GuiWindow::GuiWindow;

10
src/port/ui/ImguiUI.cpp
View File

@ -69,21 +69,21 @@ void SetupGuiElements() {
SPDLOG_ERROR("Could not find input GfxDebuggerWindow");
}
mToolsWindow = std::make_shared<Editor::ToolsWindow>("gEditorEnabled", "Tools", ImVec2(100, 100),
mToolsWindow = std::make_shared<TrackEditor::ToolsWindow>("gEditorEnabled", "Tools", ImVec2(100, 100),
(ImGuiWindowFlags_NoTitleBar));
gui->AddGuiWindow(mToolsWindow);
mSceneExplorerWindow = std::make_shared<Editor::SceneExplorerWindow>("gEditorEnabled", "Scene Explorer");
mSceneExplorerWindow = std::make_shared<TrackEditor::SceneExplorerWindow>("gEditorEnabled", "Scene Explorer");
gui->AddGuiWindow(mSceneExplorerWindow);
mPropertiesWindow = std::make_shared<Editor::PropertiesWindow>("gEditorEnabled", "Properties");
mPropertiesWindow = std::make_shared<TrackEditor::PropertiesWindow>("gEditorEnabled", "Properties");
gui->AddGuiWindow(mPropertiesWindow);
mTrackPropertiesWindow = std::make_shared<Editor::TrackPropertiesWindow>("gEditorEnabled", "Track Properties");
mTrackPropertiesWindow = std::make_shared<TrackEditor::TrackPropertiesWindow>("gEditorEnabled", "Track Properties");
gui->AddGuiWindow(mTrackPropertiesWindow);
mContentBrowserWindow =
std::make_shared<Editor::ContentBrowserWindow>("gEditorEnabled", "Content Browser");
std::make_shared<TrackEditor::ContentBrowserWindow>("gEditorEnabled", "Content Browser");
gui->AddGuiWindow(mContentBrowserWindow);
}

2
src/port/ui/Properties.cpp
View File

@ -23,7 +23,7 @@ extern "C" {
#include "actors.h"
}
namespace Editor {
namespace TrackEditor {
PropertiesWindow::~PropertiesWindow() {
SPDLOG_TRACE("destruct properties window");

2
src/port/ui/Properties.h
View File

@ -3,7 +3,7 @@
#include <libultraship/libultraship.h>
#include "port/Game.h"
namespace Editor {
namespace TrackEditor {
class PropertiesWindow : public Ship::GuiWindow {
public:
using Ship::GuiWindow::GuiWindow;

2
src/port/ui/SceneExplorer.cpp
View File

@ -18,7 +18,7 @@ extern "C" {
#include "actors.h"
}
namespace Editor {
namespace TrackEditor {
SceneExplorerWindow::~SceneExplorerWindow() {
SPDLOG_TRACE("destruct scene explorer window");

2
src/port/ui/SceneExplorer.h
View File

@ -4,7 +4,7 @@
#include "port/Game.h"
namespace Editor {
namespace TrackEditor {
class SceneExplorerWindow : public Ship::GuiWindow {
public:
using Ship::GuiWindow::GuiWindow;

9
src/port/ui/Tools.cpp
View File

@ -12,13 +12,14 @@
#include <defines.h>
#include "port/Game.h"
#include "engine/editor/SceneManager.h"
#include "engine/TrackBrowser.h"
extern "C" {
#include "code_800029B0.h"
#include "code_80057C60.h"
}
namespace Editor {
namespace TrackEditor {
ToolsWindow::~ToolsWindow() {
SPDLOG_TRACE("destruct tools window");
@ -36,7 +37,8 @@ namespace Editor {
// Save button
if (ImGui::Button(ICON_FA_FLOPPY_O, ImVec2(50, 25))) {
if (gEditor.IsPaused()) {
SaveLevel(GetWorld()->GetTrack());
SaveLevel(GetWorld()->GetTrack(), gTrackRegistry.GetInfo(GetWorld()->GetTrack()->ResourceName));
TrackBrowser::Instance->Refresh(gTrackRegistry);
} else {
printf("[Editor] Cannot save during simulation\n Please switch back to edit mode!\n\n");
}
@ -140,7 +142,8 @@ namespace Editor {
ImGui::PushStyleColor(ImGuiCol_Button, defaultColor);
if (ImGui::Button(gEditor.IsPaused() ? ICON_FA_PLAY : ICON_FA_STOP, ImVec2(50, 25))) {
if (gEditor.IsPaused()) {
SaveLevel(GetWorld()->GetTrack());
SaveLevel(GetWorld()->GetTrack(), gTrackRegistry.GetInfo(GetWorld()->GetTrack()->ResourceName));
TrackBrowser::Instance->Refresh(gTrackRegistry);
CVarSetInteger("gFreecam", false);
CM_SetFreeCamera(false);
} else {

2
src/port/ui/Tools.h
View File

@ -2,7 +2,7 @@
#include <libultraship/libultraship.h>
namespace Editor {
namespace TrackEditor {
class ToolsWindow : public Ship::GuiWindow {
public:
using Ship::GuiWindow::GuiWindow;

114
src/port/ui/TrackProperties.cpp
View File

@ -14,6 +14,9 @@
#include "port/Game.h"
#include "engine/cameras/TourCamera.h"
#include "engine/TrackBrowser.h"
#include "engine/editor/SceneManager.h"
#include "engine/Registry.h"
extern "C" {
#include "code_800029B0.h"
@ -23,26 +26,23 @@ extern "C" {
#include "render_objects.h"
}
namespace Editor {
namespace TrackEditor {
TrackPropertiesWindow::~TrackPropertiesWindow() {
SPDLOG_TRACE("destruct track properties window");
}
void TrackPropertiesWindow::DrawElement() {
static char idBuffer[256] = "mk:mario_raceway";
static char nameBuffer[256] = "Mario Raceway";
static char debugNameBuffer[256] = "m circuit";
static char lengthBuffer[256] = "567m";
if (nullptr == GetWorld()->GetTrack()) {
return;
}
ImGui::InputText("ID", idBuffer, IM_ARRAYSIZE(idBuffer));
ImGui::InputText("Name", GetWorld()->GetTrack()->Props.Name, IM_ARRAYSIZE(nameBuffer));
ImGui::InputText("Debug Name", GetWorld()->GetTrack()->Props.DebugName, IM_ARRAYSIZE(debugNameBuffer));
ImGui::InputText("Track Length", GetWorld()->GetTrack()->Props.TrackLength, IM_ARRAYSIZE(lengthBuffer));
if (ImGui::Button("Edit TrackInfo")) {
ImGui::OpenPopup("Edit TrackInfo");
}
DrawResourceNameEdit();
ImGui::InputFloat("Water Level", &GetWorld()->GetTrack()->Props.WaterLevel);
if (ImGui::CollapsingHeader("Camera")) {
@ -175,6 +175,100 @@ namespace Editor {
TrackPropertiesWindow::DrawTourCamera();
}
void TrackPropertiesWindow::DrawResourceNameEdit() {
Track* track = GetWorld()->GetTrack();
if (!track) {
return;
}
static char resourceNameBuffer[128] = {};
static char nameBuffer[128] = "blank_track";
static char debugNameBuffer[128] = "blanktrack";
static char lengthBuffer[128] = "100m";
static bool initialized = false;
static std::string oldResourceName = track->ResourceName;
// Auto-sizing fills the height of the screen for a single frame.
// Because there's no content in the window in the first frame.
// This forces the window size to prevent that
ImGui::SetNextWindowSize(ImVec2(400, 350), ImGuiCond_Always);
if (ImGui::BeginPopupModal("Edit TrackInfo", nullptr,
ImGuiWindowFlags_AlwaysAutoResize)) {
// Initialize once per popup open
if (!initialized) {
strncpy(resourceNameBuffer, track->ResourceName.c_str(), sizeof(resourceNameBuffer));
resourceNameBuffer[sizeof(resourceNameBuffer) - 1] = '\0';
oldResourceName = track->ResourceName;
initialized = true;
}
ImGui::TextWrapped(
"Changing the Resource Name will:\n"
"- Save the current track\n"
"- Reload the track\n"
"- Update the registry\n\n"
);
gEditor.Pause();
ImGui::Spacing();
ImGui::Separator();
ImGui::Spacing();
ImGui::Text("New Resource Name");
ImGui::InputText("##ResourceNameInput", resourceNameBuffer, IM_ARRAYSIZE(resourceNameBuffer));
ImGui::InputText("Name", GetWorld()->GetTrack()->Props.Name, IM_ARRAYSIZE(nameBuffer));
ImGui::InputText("Debug Name", GetWorld()->GetTrack()->Props.DebugName, IM_ARRAYSIZE(debugNameBuffer));
ImGui::InputText("Track Length", GetWorld()->GetTrack()->Props.TrackLength, IM_ARRAYSIZE(lengthBuffer));
ImGui::Spacing();
ImGui::Separator();
ImGui::Spacing();
bool cancel = ImGui::Button("Cancel", ImVec2(120, 0));
ImGui::SameLine();
bool confirm = ImGui::Button("Confirm", ImVec2(120, 0));
if (confirm) {
if (oldResourceName != resourceNameBuffer) {
track->ResourceName = resourceNameBuffer;
const TrackInfo* oldInfo = gTrackRegistry.GetInfo(oldResourceName);
TrackInfo info;
info.ResourceName = track->ResourceName;
info.Name = track->Props.Name;
info.DebugName = track->Props.DebugName;
info.Path = oldInfo->Path;
TrackEditor::SaveLevel(track, static_cast<const TrackInfo*>(&info));
auto archive = track->Archive;
gTrackRegistry.Remove(oldResourceName);
gTrackRegistry.Add(info, [info, archive]() {
auto track = std::make_unique<Track>();
track->Archive = archive;
track->ResourceName = info.ResourceName;
GetWorld()->SetCurrentTrack(std::move(track));
});
TrackBrowser::Instance->Refresh(gTrackRegistry);
gGotoMode = RACING;
}
initialized = false;
ImGui::CloseCurrentPopup();
}
if (cancel) {
initialized = false;
ImGui::CloseCurrentPopup();
}
ImGui::EndPopup();
}
}
void TrackPropertiesWindow::DrawMusic() {
const char* items[] = {
"None", "Title Screen", "Main Menu", "Wario Stadium", "Moo Moo Farm",

3
src/port/ui/TrackProperties.h
View File

@ -6,7 +6,7 @@ extern "C" {
#include "sounds.h"
}
namespace Editor {
namespace TrackEditor {
class TrackPropertiesWindow : public Ship::GuiWindow {
public:
using Ship::GuiWindow::GuiWindow;
@ -15,6 +15,7 @@ public:
protected:
void InitElement() override {};
void DrawElement() override;
void DrawResourceNameEdit();
void DrawMusic();
void DrawFog();
void DrawLight();