From b76e309166f714b0a66fb4802f02e92a82d09082 Mon Sep 17 00:00:00 2001
From: Jonathan Bradley <jcb@pikum.xyz>
Date: Thu, 9 Jan 2025 14:44:31 -0500
Subject: flatten file structure + rename

---
 editor/editor-main.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 editor/editor.cpp      |  8 ++++----
 editor/main.cpp        | 38 --------------------------------------
 3 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 editor/editor-main.cpp
 delete mode 100644 editor/main.cpp

(limited to 'editor')

diff --git a/editor/editor-main.cpp b/editor/editor-main.cpp
new file mode 100644
index 0000000..2dee016
--- /dev/null
+++ b/editor/editor-main.cpp
@@ -0,0 +1,38 @@
+#include <csignal>
+
+#include "arg-handler.hpp"
+#include "plugins.hpp"
+#include "editor.hpp"
+#include "event.hpp"
+#include "game.hpp"
+#include "game-settings.hpp"
+#include "window-types.hpp"
+
+void signal_handler(int signal_num) {
+	fprintf(stdout, "Received signal: %d - shutting down\n", signal_num);
+	pkeSettings.isGameRunning = false;
+}
+
+int main(int argc, char *argv[]) {
+	signal(SIGTERM, signal_handler);
+	fflush(stdout);
+	fflush(stderr);
+	fprintf(stdout, "\rPKE_EDITOR ENTERING\n");
+	fprintf(stderr, "\r");
+	// setup
+	{
+		pkeSettings.isSimulationPaused = true;
+		pkeSettings.isShowingEditor = true;
+		LoadedPkePlugins.Push({
+			.OnInit = PkeEditor_Init,
+			.OnTick = PkeEditor_Tick,
+			.OnTeardown = PkeEditor_Teardown,
+			.OnImGuiRender = PkeEditor_RecordImGui,
+		});
+	}
+	// run
+	PkeArgs_Parse(argc, argv);
+	Game_Main({}, argv[0]);
+	fprintf(stdout, "PKE_EDITOR EXITING\n");
+	return 0;
+}
diff --git a/editor/editor.cpp b/editor/editor.cpp
index 86fae96..8a2390b 100644
--- a/editor/editor.cpp
+++ b/editor/editor.cpp
@@ -14,11 +14,11 @@
 #include "player-input.hpp"
 #include "plugins.hpp"
 #include "project.hpp"
-#include "thread_pool.hpp"
-#include "vendor/glm_include.hpp"
-#include "vendor/tinyfiledialogs//tinyfiledialogs.h"
+#include "thread-pool.hpp"
+#include "vendor-glm-include.hpp"
+#include "vendor-tinyfiledialogs.h"
 #include "window.hpp"
-#include "vendor/pk.h"
+#include "pk.h"
 
 #include <GLFW/glfw3.h>
 #include <compare>
diff --git a/editor/main.cpp b/editor/main.cpp
deleted file mode 100644
index 2dee016..0000000
--- a/editor/main.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <csignal>
-
-#include "arg-handler.hpp"
-#include "plugins.hpp"
-#include "editor.hpp"
-#include "event.hpp"
-#include "game.hpp"
-#include "game-settings.hpp"
-#include "window-types.hpp"
-
-void signal_handler(int signal_num) {
-	fprintf(stdout, "Received signal: %d - shutting down\n", signal_num);
-	pkeSettings.isGameRunning = false;
-}
-
-int main(int argc, char *argv[]) {
-	signal(SIGTERM, signal_handler);
-	fflush(stdout);
-	fflush(stderr);
-	fprintf(stdout, "\rPKE_EDITOR ENTERING\n");
-	fprintf(stderr, "\r");
-	// setup
-	{
-		pkeSettings.isSimulationPaused = true;
-		pkeSettings.isShowingEditor = true;
-		LoadedPkePlugins.Push({
-			.OnInit = PkeEditor_Init,
-			.OnTick = PkeEditor_Tick,
-			.OnTeardown = PkeEditor_Teardown,
-			.OnImGuiRender = PkeEditor_RecordImGui,
-		});
-	}
-	// run
-	PkeArgs_Parse(argc, argv);
-	Game_Main({}, argv[0]);
-	fprintf(stdout, "PKE_EDITOR EXITING\n");
-	return 0;
-}
-- 
cgit v1.2.3