From 60793dbdf2d2e8f6fdce98e0104d0bae692aa8f4 Mon Sep 17 00:00:00 2001 From: jacob Date: Tue, 26 Aug 2025 23:15:55 -0500 Subject: [PATCH] res refactor progress --- src/base/base.h | 62 +++++++++---------- src/meta/meta.c | 2 +- {res/pp => src/pp/pp_res}/font/fixedsys.ttf | 0 .../pp/pp_res}/noise_128x128x64_16.dat | 0 {res/pp => src/pp/pp_res}/sound/test.mp3 | 0 {res/pp => src/pp/pp_res}/sprite/blood.ase | 0 {res/pp => src/pp/pp_res}/sprite/box.ase | 0 .../pp/pp_res}/sprite/box_rounded.ase | 0 {res/pp => src/pp/pp_res}/sprite/bullet.ase | 0 .../pp => src/pp/pp_res}/sprite/crosshair.ase | 0 {res/pp => src/pp/pp_res}/sprite/gun.ase | 0 {res/pp => src/pp/pp_res}/sprite/tile.ase | 0 {res/pp => src/pp/pp_res}/sprite/tim.ase | 0 src/{res => resource}/res.c | 0 src/{res => resource}/res.h | 0 src/{res => resource}/res.lay | 0 16 files changed, 31 insertions(+), 33 deletions(-) rename {res/pp => src/pp/pp_res}/font/fixedsys.ttf (100%) rename {res/pp => src/pp/pp_res}/noise_128x128x64_16.dat (100%) rename {res/pp => src/pp/pp_res}/sound/test.mp3 (100%) rename {res/pp => src/pp/pp_res}/sprite/blood.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/box.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/box_rounded.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/bullet.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/crosshair.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/gun.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/tile.ase (100%) rename {res/pp => src/pp/pp_res}/sprite/tim.ase (100%) rename src/{res => resource}/res.c (100%) rename src/{res => resource}/res.h (100%) rename src/{res => resource}/res.lay (100%) diff --git a/src/base/base.h b/src/base/base.h index 4c62990c..36ad33f8 100644 --- a/src/base/base.h +++ b/src/base/base.h @@ -82,7 +82,7 @@ #endif //- Windows NTDDI version -/* FIXME: Remove this */ +/* TODO: Remove this */ #if 0 #if CompilerIsMsvc # define NTDDI_WIN11_DT 0x0C0A0000 @@ -315,27 +315,6 @@ void __asan_unpoison_memory_region(void const volatile *add, size_t); #define DllPushFront(f,l,n) DllPushFront_NPZ(0,f,l,n,next,prev) #define DllRemove(f,l,n) DllRemove_NPZ(0,f,l,n,next,prev) -//////////////////////////////// -//~ Struct alignment / padding macros - -//- Pack -#if CompilerIsMsvc -# define Packed(s) __pragma(pack(push, 1)) s __pragma(pack(pop)) -#elif CompilerIsClang -# define Packed(s) s __attribute((__packed__)) -#elif LanguageIsGpu -# define Packed(s) s -#endif - -//- alignas -#if (CompilerIsMsvc && LanguageIsC) || (LanguageIsC && __STDC_VERSION__ < 202311L) -# if CompilerIsMsvc -# define alignas(n) __declspec(align(n)) -# else -# define alignas(n) __attribute__((aligned(n))) -# endif -#endif - //////////////////////////////// //~ Color helper macros @@ -378,16 +357,16 @@ void __asan_unpoison_memory_region(void const volatile *add, size_t); #if LanguageIsC /* Intrinsic header info: - * 0; if (ret == 0) { + Echo(Lit("Compiling...")); String cmd_str = msvc_cmd_str; // String cmd_str = clang_cmd_str; OS_CommandResult result = OS_RunCommand(arena, cmd_str); diff --git a/res/pp/font/fixedsys.ttf b/src/pp/pp_res/font/fixedsys.ttf similarity index 100% rename from res/pp/font/fixedsys.ttf rename to src/pp/pp_res/font/fixedsys.ttf diff --git a/res/pp/noise_128x128x64_16.dat b/src/pp/pp_res/noise_128x128x64_16.dat similarity index 100% rename from res/pp/noise_128x128x64_16.dat rename to src/pp/pp_res/noise_128x128x64_16.dat diff --git a/res/pp/sound/test.mp3 b/src/pp/pp_res/sound/test.mp3 similarity index 100% rename from res/pp/sound/test.mp3 rename to src/pp/pp_res/sound/test.mp3 diff --git a/res/pp/sprite/blood.ase b/src/pp/pp_res/sprite/blood.ase similarity index 100% rename from res/pp/sprite/blood.ase rename to src/pp/pp_res/sprite/blood.ase diff --git a/res/pp/sprite/box.ase b/src/pp/pp_res/sprite/box.ase similarity index 100% rename from res/pp/sprite/box.ase rename to src/pp/pp_res/sprite/box.ase diff --git a/res/pp/sprite/box_rounded.ase b/src/pp/pp_res/sprite/box_rounded.ase similarity index 100% rename from res/pp/sprite/box_rounded.ase rename to src/pp/pp_res/sprite/box_rounded.ase diff --git a/res/pp/sprite/bullet.ase b/src/pp/pp_res/sprite/bullet.ase similarity index 100% rename from res/pp/sprite/bullet.ase rename to src/pp/pp_res/sprite/bullet.ase diff --git a/res/pp/sprite/crosshair.ase b/src/pp/pp_res/sprite/crosshair.ase similarity index 100% rename from res/pp/sprite/crosshair.ase rename to src/pp/pp_res/sprite/crosshair.ase diff --git a/res/pp/sprite/gun.ase b/src/pp/pp_res/sprite/gun.ase similarity index 100% rename from res/pp/sprite/gun.ase rename to src/pp/pp_res/sprite/gun.ase diff --git a/res/pp/sprite/tile.ase b/src/pp/pp_res/sprite/tile.ase similarity index 100% rename from res/pp/sprite/tile.ase rename to src/pp/pp_res/sprite/tile.ase diff --git a/res/pp/sprite/tim.ase b/src/pp/pp_res/sprite/tim.ase similarity index 100% rename from res/pp/sprite/tim.ase rename to src/pp/pp_res/sprite/tim.ase diff --git a/src/res/res.c b/src/resource/res.c similarity index 100% rename from src/res/res.c rename to src/resource/res.c diff --git a/src/res/res.h b/src/resource/res.h similarity index 100% rename from src/res/res.h rename to src/resource/res.h diff --git a/src/res/res.lay b/src/resource/res.lay similarity index 100% rename from src/res/res.lay rename to src/resource/res.lay