summaryrefslogtreecommitdiff
path: root/src/engine/editor
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2026-07-23 02:02:58 +0200
committerGitHub <noreply@github.com>2026-07-22 18:02:58 -0600
commit4c24ae2bc2294c96a81d296a68b6d404f34358e7 (patch)
tree0a4d1fb0e353e1b14755d1a2c8d2fcc4d4c29b70 /src/engine/editor
parent022e0737d598e93429355db66c07be39e974926f (diff)
Refactor cmake (#721)
* some start of refactor * Update SetFlags.cmake * Update SetCmakeVar.cmake * Update SetFlags.cmake * Fix error int-convertion * more refactor * clean up include and source file * fix link of lib * fix a warning * fix include in src/actors * fix include in src/debug * fix include in src/ending * fix include in src/engine/actors * fix include in src/engine/cameras * fix include in src/engine/editor * fix include in src/engine/objects * fix include in src/engine/tracks * fix include in src/port/ui * fix include in src/racing * fix include in src/engine/vehicles * fix include in subfolder of src/engine * fix include in src/engine * fix include in src/enhancements * fix include in src * fix switch * invert common and findlib * Update SetFlags.cmake * clean up some workflow * some splification * Update build.sh * Update Game.h * add header back * Delete test_check.cmake * continue * Update common.cmake
Diffstat (limited to 'src/engine/editor')
-rw-r--r--src/engine/editor/Collision.cpp2
-rw-r--r--src/engine/editor/Editor.cpp2
-rw-r--r--src/engine/editor/EditorMath.cpp4
-rw-r--r--src/engine/editor/Gizmo.cpp4
-rw-r--r--src/engine/editor/Light.cpp4
-rw-r--r--src/engine/editor/ObjectPicker.cpp2
-rw-r--r--src/engine/editor/SceneManager.cpp6
-rw-r--r--src/engine/editor/SceneManager.h2
8 files changed, 13 insertions, 13 deletions
diff --git a/src/engine/editor/Collision.cpp b/src/engine/editor/Collision.cpp
index 9ded514d6..5712d8582 100644
--- a/src/engine/editor/Collision.cpp
+++ b/src/engine/editor/Collision.cpp
@@ -2,7 +2,7 @@
#include <libultraship/libultraship.h>
#include <libultra/gbi.h>
-#include "Matrix.h"
+#include "engine/Matrix.h"
#include "engine/Actor.h"
#include "engine/objects/Object.h"
diff --git a/src/engine/editor/Editor.cpp b/src/engine/editor/Editor.cpp
index d8eeecda9..673667088 100644
--- a/src/engine/editor/Editor.cpp
+++ b/src/engine/editor/Editor.cpp
@@ -20,7 +20,7 @@ extern "C" {
#include "common_structs.h"
#include "main.h"
#include "defines.h"
-#include "actors.h"
+#include "racing/actors.h"
#include "camera.h"
}
diff --git a/src/engine/editor/EditorMath.cpp b/src/engine/editor/EditorMath.cpp
index 02932a5a7..635d68d59 100644
--- a/src/engine/editor/EditorMath.cpp
+++ b/src/engine/editor/EditorMath.cpp
@@ -17,8 +17,8 @@ extern "C" {
#include "common_structs.h"
#include "main.h"
#include "defines.h"
-#include "actors.h"
-#include "math_util.h"
+#include "racing/actors.h"
+#include "racing/math_util.h"
#include "math_util_2.h"
#include "camera.h"
}
diff --git a/src/engine/editor/Gizmo.cpp b/src/engine/editor/Gizmo.cpp
index 4301f7db4..bb09dc765 100644
--- a/src/engine/editor/Gizmo.cpp
+++ b/src/engine/editor/Gizmo.cpp
@@ -23,10 +23,10 @@
extern "C" {
#include "common_structs.h"
#include "main.h"
-#include "actors.h"
+#include "racing/actors.h"
#include "camera.h"
#include "src/racing/collision.h"
-#include "math_util.h"
+#include "racing/math_util.h"
}
namespace TrackEditor {
diff --git a/src/engine/editor/Light.cpp b/src/engine/editor/Light.cpp
index 477793540..8a27b410a 100644
--- a/src/engine/editor/Light.cpp
+++ b/src/engine/editor/Light.cpp
@@ -21,9 +21,9 @@ extern "C" {
#include "common_structs.h"
#include "main.h"
#include "defines.h"
-#include "actors.h"
+#include "racing/actors.h"
#include "camera.h"
-#include "math_util.h"
+#include "racing/math_util.h"
#include "math_util_2.h"
}
diff --git a/src/engine/editor/ObjectPicker.cpp b/src/engine/editor/ObjectPicker.cpp
index 013ad983e..e95e32e94 100644
--- a/src/engine/editor/ObjectPicker.cpp
+++ b/src/engine/editor/ObjectPicker.cpp
@@ -21,7 +21,7 @@ extern "C" {
#include "common_structs.h"
#include "main.h"
#include "defines.h"
-#include "actors.h"
+#include "racing/actors.h"
#include "camera.h"
}
diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp
index f4b582bc5..36e42e985 100644
--- a/src/engine/editor/SceneManager.cpp
+++ b/src/engine/editor/SceneManager.cpp
@@ -2,7 +2,7 @@
#include "port/Game.h"
#include "engine/CoreMath.h"
-#include "World.h"
+#include "engine/World.h"
#include "GameObject.h"
#include <iostream>
@@ -27,11 +27,11 @@
extern "C" {
#include "common_structs.h"
-#include "actors.h"
+#include "racing/actors.h"
#include "actor_types.h"
#include "code_80005FD0.h"
#include "code_800029B0.h"
-#include "render_courses.h"
+#include "racing/render_courses.h"
}
namespace TrackEditor {
diff --git a/src/engine/editor/SceneManager.h b/src/engine/editor/SceneManager.h
index 44c2f538f..0d12da569 100644
--- a/src/engine/editor/SceneManager.h
+++ b/src/engine/editor/SceneManager.h
@@ -1,7 +1,7 @@
#pragma once
#include <libultraship/libultraship.h>
-#include "CoreMath.h"
+#include "engine/CoreMath.h"
#include "engine/tracks/Track.h"
#include <optional>
#include <nlohmann/json.hpp>