From 707c64a54d778474f26a53d30b0a9c53d6b3914c Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Wed, 16 Jul 2025 23:46:37 -0500 Subject: [PATCH] reorganize directory structure --- demo.mk | 10 +++++----- src/demo/ballistics.cpp | 7 +++++-- src/{demo => platform}/font.cpp | 6 +++--- src/{demo => platform}/font.hpp | 0 src/{demo => platform}/framebuffer.cpp | 0 src/{demo => platform}/graphics.cpp | 11 ++++++----- src/{demo => platform}/graphics.hpp | 0 src/{demo => platform}/graphics_primitive.hpp | 2 +- src/{demo => platform}/input.cpp | 2 +- src/{demo => platform}/input.hpp | 0 src/{demo/demo.cpp => platform/main.cpp} | 6 +++--- src/{demo => platform}/ta_parameter_presets.hpp | 0 src/{demo => platform}/texture.cpp | 0 src/{demo => platform}/texture.hpp | 0 14 files changed, 24 insertions(+), 20 deletions(-) rename src/{demo => platform}/font.cpp (97%) rename src/{demo => platform}/font.hpp (100%) rename src/{demo => platform}/framebuffer.cpp (100%) rename src/{demo => platform}/graphics.cpp (97%) rename src/{demo => platform}/graphics.hpp (100%) rename src/{demo => platform}/graphics_primitive.hpp (98%) rename src/{demo => platform}/input.cpp (99%) rename src/{demo => platform}/input.hpp (100%) mode change 100755 => 100644 rename src/{demo/demo.cpp => platform/main.cpp} (93%) rename src/{demo => platform}/ta_parameter_presets.hpp (100%) rename src/{demo => platform}/texture.cpp (100%) rename src/{demo => platform}/texture.hpp (100%) diff --git a/demo.mk b/demo.mk index 263cf8e..50b6cf1 100644 --- a/demo.mk +++ b/demo.mk @@ -13,12 +13,12 @@ DEMO_OBJ = \ $(LIB)/printf/printf.o \ $(LIB)/printf/unparse.o \ $(LIB)/printf/parse.o \ - src/demo/demo.o \ - src/demo/graphics.o \ - src/demo/input.o \ + src/platform/main.o \ + src/platform/graphics.o \ + src/platform/input.o \ + src/platform/texture.o \ + src/platform/font.o \ src/demo/ballistics.o \ - src/demo/texture.o \ - src/demo/font.o \ src/physics/particle.o \ demo.elf: LDSCRIPT = $(LIB)/main.lds diff --git a/src/demo/ballistics.cpp b/src/demo/ballistics.cpp index 01e1e6e..2fb5f1d 100644 --- a/src/demo/ballistics.cpp +++ b/src/demo/ballistics.cpp @@ -1,8 +1,11 @@ +#include "math/float_types.hpp" +#include "math/transform.hpp" + +#include "platform/graphics_primitive.hpp" + #include "physics/particle.hpp" #include "demo/ballistics.hpp" -#include "math/transform.hpp" -#include "demo/graphics_primitive.hpp" namespace demo { diff --git a/src/demo/font.cpp b/src/platform/font.cpp similarity index 97% rename from src/demo/font.cpp rename to src/platform/font.cpp index 5872998..655c19e 100644 --- a/src/demo/font.cpp +++ b/src/platform/font.cpp @@ -1,8 +1,8 @@ #include "holly/isp_tsp.hpp" -#include "demo/font.hpp" -#include "demo/ta_parameter_presets.hpp" -#include "demo/texture.hpp" +#include "platform/font.hpp" +#include "platform/ta_parameter_presets.hpp" +#include "platform/texture.hpp" #include "printf/unparse.h" diff --git a/src/demo/font.hpp b/src/platform/font.hpp similarity index 100% rename from src/demo/font.hpp rename to src/platform/font.hpp diff --git a/src/demo/framebuffer.cpp b/src/platform/framebuffer.cpp similarity index 100% rename from src/demo/framebuffer.cpp rename to src/platform/framebuffer.cpp diff --git a/src/demo/graphics.cpp b/src/platform/graphics.cpp similarity index 97% rename from src/demo/graphics.cpp rename to src/platform/graphics.cpp index 47aced5..10a7eb5 100644 --- a/src/demo/graphics.cpp +++ b/src/platform/graphics.cpp @@ -17,12 +17,13 @@ #include "math/float_types.hpp" #include "math/transform.hpp" -#include "demo/ta_parameter_presets.hpp" -#include "demo/graphics_primitive.hpp" -#include "demo/graphics.hpp" +#include "platform/ta_parameter_presets.hpp" +#include "platform/graphics_primitive.hpp" +#include "platform/graphics.hpp" +#include "platform/input.hpp" +#include "platform/font.hpp" + #include "demo/ballistics.hpp" -#include "demo/input.hpp" -#include "demo/font.hpp" #include "maple/maple_bus_bits.hpp" diff --git a/src/demo/graphics.hpp b/src/platform/graphics.hpp similarity index 100% rename from src/demo/graphics.hpp rename to src/platform/graphics.hpp diff --git a/src/demo/graphics_primitive.hpp b/src/platform/graphics_primitive.hpp similarity index 98% rename from src/demo/graphics_primitive.hpp rename to src/platform/graphics_primitive.hpp index 665e67d..cefa7d9 100644 --- a/src/demo/graphics_primitive.hpp +++ b/src/platform/graphics_primitive.hpp @@ -1,7 +1,7 @@ #include "math/math.hpp" #include "holly/framebuffer.hpp" -#include "demo/ta_parameter_presets.hpp" +#include "platform/ta_parameter_presets.hpp" #define _fsrra(n) (1.0f / (sqrt(n))) diff --git a/src/demo/input.cpp b/src/platform/input.cpp similarity index 99% rename from src/demo/input.cpp rename to src/platform/input.cpp index 385cc96..a068037 100644 --- a/src/demo/input.cpp +++ b/src/platform/input.cpp @@ -10,7 +10,7 @@ #include "sh7091/serial.hpp" -#include "demo/input.hpp" +#include "platform/input.hpp" namespace input { diff --git a/src/demo/input.hpp b/src/platform/input.hpp old mode 100755 new mode 100644 similarity index 100% rename from src/demo/input.hpp rename to src/platform/input.hpp diff --git a/src/demo/demo.cpp b/src/platform/main.cpp similarity index 93% rename from src/demo/demo.cpp rename to src/platform/main.cpp index 615f37e..f574384 100644 --- a/src/demo/demo.cpp +++ b/src/platform/main.cpp @@ -2,9 +2,9 @@ #include "interrupt.hpp" //#include "aica/aica.hpp" -#include "demo/graphics.hpp" -#include "demo/input.hpp" -#include "demo/texture.hpp" +#include "platform/graphics.hpp" +#include "platform/input.hpp" +#include "platform/texture.hpp" #include "printf/printf.h" void vbr100() diff --git a/src/demo/ta_parameter_presets.hpp b/src/platform/ta_parameter_presets.hpp similarity index 100% rename from src/demo/ta_parameter_presets.hpp rename to src/platform/ta_parameter_presets.hpp diff --git a/src/demo/texture.cpp b/src/platform/texture.cpp similarity index 100% rename from src/demo/texture.cpp rename to src/platform/texture.cpp diff --git a/src/demo/texture.hpp b/src/platform/texture.hpp similarity index 100% rename from src/demo/texture.hpp rename to src/platform/texture.hpp