diff --git a/log.txt b/log.txt deleted file mode 100644 index 89a4e0af..00000000 --- a/log.txt +++ /dev/null @@ -1,145 +0,0 @@ -[11:51:18.682] |16888| [INFO] Loading pipeline "kernel_material" -[11:51:18.683] |05964| [INFO] Loading pipeline "kernel_shape" -[11:51:18.683] |29584| [INFO] Loading pipeline "kernel_shade" -[11:51:18.684] |25484| [INFO] Loading pipeline "kernel_ui" -[11:51:18.685] |23760| [INFO] Loading pipeline "kernel_flood" -[11:51:18.685] |26808| [INFO] Loading pipeline "kernel_blit" -[11:51:18.687] |29620| [SUCCESS] Successfully compiled pipeline "kernel_material" in 0.002 seconds -[11:51:18.687] |29620| [SUCCESS] Successfully compiled pipeline "kernel_flood" in 0.001 seconds -[11:51:18.687] |29620| [SUCCESS] Successfully compiled pipeline "kernel_shade" in 0.003 seconds -[11:51:18.687] |29620| [SUCCESS] Successfully compiled pipeline "kernel_shape" in 0.001 seconds -[11:51:18.687] |29620| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.001 seconds -[11:51:18.687] |29620| [SUCCESS] Successfully compiled pipeline "kernel_blit" in 0.001 seconds -[11:51:18.723] |29584| [INFO] Inserting asset cache entry for "font/fixedsys.ttf12.0_font" -[11:51:18.725] |26348| [INFO] Loading sprite texture [f6ddd0f8a4758bce] "sprite/crosshair.ase" -[11:51:18.727] |28868| [INFO] Loading font "font/fixedsys.ttf" (point size 12.000) -[11:51:18.730] |25484| [INFO] Created player with id 54446c99 for sim client h0x1. is_master: 1 -[11:51:18.733] |26348| [SUCCESS] Loaded sprite texture [f6ddd0f8a4758bce] "sprite/crosshair.ase" in 0.008 seconds (cache size: 20416 bytes). -[11:51:18.750] |25484| [INFO] Loading sprite sheet [d2db500e4a9e79a6] "sprite/tim.ase" -[11:51:18.751] |25484| [SUCCESS] Loaded sprite sheet [d2db500e4a9e79a6] "sprite/tim.ase" in 0.001 seconds (cache size: 16320 bytes). -[11:51:18.751] |25484| [INFO] Loading sprite sheet [b977d286fa3eb7c7] "sprite/gun.ase" -[11:51:18.751] |25484| [SUCCESS] Loaded sprite sheet [b977d286fa3eb7c7] "sprite/gun.ase" in 0.000 seconds (cache size: 16320 bytes). -[11:51:18.782] |26348| [INFO] Loading sprite texture [69e272c667301980] "sprite/tim.ase" -[11:51:18.783] |26348| [INFO] Loading sprite texture [acf325b34223e086] "sprite/gun.ase" -[11:51:18.787] |26348| [SUCCESS] Loaded sprite texture [69e272c667301980] "sprite/tim.ase" in 0.005 seconds (cache size: 32704 bytes). -[11:51:18.787] |26348| [SUCCESS] Loaded sprite texture [acf325b34223e086] "sprite/gun.ase" in 0.004 seconds (cache size: 35520 bytes). -[11:51:18.808] |28868| [SUCCESS] Loaded font "font/fixedsys.ttf" (point size 12.000) in 0.080 seconds -[11:51:19.391] |26808| [DEBUG] Spawn test 2 -[11:51:19.412] |26808| [INFO] Loading sprite sheet [c7595d812ab95147] "sprite/tile.ase" -[11:51:19.412] |26808| [SUCCESS] Loaded sprite sheet [c7595d812ab95147] "sprite/tile.ase" in 0.000 seconds (cache size: 16320 bytes). -[11:51:19.435] |26348| [INFO] Loading sprite texture [f85f052a30eff918] "sprite/tile.ase" -[11:51:19.436] |28868| [SUCCESS] Loaded sprite texture [f85f052a30eff918] "sprite/tile.ase" in 0.002 seconds (cache size: 20416 bytes). -[11:51:19.850] |25484| [DEBUG] Spawn test 2 -[11:51:20.109] |05964| [DEBUG] Spawn test 2 -[11:51:20.150] |16888| [DEBUG] Spawn test 2 -[11:51:20.170] |25484| [DEBUG] Spawn test 2 -[11:51:20.210] |23760| [DEBUG] Spawn test 2 -[11:51:20.249] |29620| [DEBUG] Spawn test 2 -[11:51:20.270] |29584| [DEBUG] Spawn test 2 -[11:51:20.310] |29584| [DEBUG] Spawn test 2 -[11:51:20.329] |05964| [DEBUG] Spawn test 2 -[11:51:20.370] |05964| [DEBUG] Spawn test 2 -[11:51:20.410] |29620| [DEBUG] Spawn test 2 -[11:51:20.450] |25484| [DEBUG] Spawn test 2 -[11:51:20.470] |26808| [DEBUG] Spawn test 2 -[11:51:20.509] |29584| [DEBUG] Spawn test 2 -[11:51:20.530] |29620| [DEBUG] Spawn test 2 -[11:51:20.570] |26808| [DEBUG] Spawn test 2 -[11:51:20.610] |26808| [DEBUG] Spawn test 2 -[11:51:20.649] |25484| [DEBUG] Spawn test 2 -[11:51:20.670] |05964| [DEBUG] Spawn test 2 -[11:51:20.710] |29620| [DEBUG] Spawn test 2 -[11:51:20.729] |29584| [DEBUG] Spawn test 2 -[11:51:20.769] |25484| [DEBUG] Spawn test 2 -[11:51:20.790] |29620| [DEBUG] Spawn test 2 -[11:51:20.850] |23760| [DEBUG] Spawn test 2 -[11:51:20.869] |29620| [DEBUG] Spawn test 2 -[11:51:20.910] |05964| [DEBUG] Spawn test 2 -[11:51:20.930] |26808| [DEBUG] Spawn test 2 -[11:51:20.970] |05964| [DEBUG] Spawn test 2 -[11:51:20.990] |23760| [DEBUG] Spawn test 2 -[11:51:21.030] |25484| [DEBUG] Spawn test 2 -[11:51:30.609] |26348| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:30.609] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:30.611] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:30.623] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.012 seconds -[11:51:30.623] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.012 seconds -[11:51:30.623] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:30.796] |26348| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.172 seconds -[11:51:31.010] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:31.010] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:31.010] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:31.016] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.007 seconds -[11:51:31.016] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.005 seconds -[11:51:31.016] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:31.016] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:31.226] |26348| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:31.226] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:31.227] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:31.234] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.008 seconds -[11:51:31.234] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.005 seconds -[11:51:31.234] |26348| [INFO] Loading pipeline "kernel_ui" -[11:51:31.234] |26348| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:31.395] |26348| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:31.395] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:31.395] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:31.402] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.007 seconds -[11:51:31.402] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.007 seconds -[11:51:31.402] |26348| [INFO] Loading pipeline "kernel_ui" -[11:51:31.402] |26348| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:31.589] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:31.589] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:31.589] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:31.596] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.007 seconds -[11:51:31.596] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.006 seconds -[11:51:31.596] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:31.596] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:31.781] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:31.781] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:31.781] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:31.789] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.008 seconds -[11:51:31.789] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.007 seconds -[11:51:31.789] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:31.789] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:31.952] |26348| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:31.952] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:31.953] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:31.959] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.006 seconds -[11:51:31.959] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.006 seconds -[11:51:31.959] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:31.959] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:32.122] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:32.122] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:32.122] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:32.130] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.008 seconds -[11:51:32.130] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.005 seconds -[11:51:32.130] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:32.130] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:32.328] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:32.328] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:32.328] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:32.335] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.007 seconds -[11:51:32.335] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.007 seconds -[11:51:32.335] |26348| [INFO] Loading pipeline "kernel_ui" -[11:51:32.335] |26348| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:32.486] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:32.486] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:32.486] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:32.492] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.006 seconds -[11:51:32.492] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.005 seconds -[11:51:32.492] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:32.492] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:32.688] |26348| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:32.688] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:32.690] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:32.701] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.013 seconds -[11:51:32.701] |26348| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.008 seconds -[11:51:32.701] |26348| [INFO] Loading pipeline "kernel_ui" -[11:51:32.701] |26348| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds -[11:51:32.871] |28868| [DEBUG] Change detected in shader source file "src/kernel/kernel_ui.rst", recompiling... -[11:51:32.871] |28868| [INFO] Compiling shader "src/kernel/kernel_ui.rst:vs" -[11:51:32.871] |26348| [INFO] Compiling shader "src/kernel/kernel_ui.rst:ps" -[11:51:32.878] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:vs" in 0.007 seconds -[11:51:32.878] |28868| [SUCCESS] Finished compiling shader "src/kernel/kernel_ui.rst:ps" in 0.006 seconds -[11:51:32.878] |28868| [INFO] Loading pipeline "kernel_ui" -[11:51:32.878] |28868| [SUCCESS] Successfully compiled pipeline "kernel_ui" in 0.000 seconds diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json deleted file mode 100644 index ddc6cda1..00000000 --- a/src/.vscode/settings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "files.associations": { - "*.rst": "hlsl", - "*.knl": "hlsl", - "mp3.h": "c", - "resource.h": "c", - "watch.h": "c", - "base.h": "c", - "tar.h": "c" - } -} \ No newline at end of file diff --git a/src/ase/ase.h b/src/ase/ase.h index 39486065..3500c41e 100644 --- a/src/ase/ase.h +++ b/src/ase/ase.h @@ -1,6 +1,9 @@ #ifndef ASE_H #define ASE_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../bitbuff/bitbuff.h" inline void ASE_StartupDeps(void) @@ -9,6 +12,9 @@ inline void ASE_StartupDeps(void) BB_Main(); } +//////////////////////////////// +//~ Layer headers + #include "ase_core.h" void ASE_Main(void); diff --git a/src/asset_cache/asset_cache.h b/src/asset_cache/asset_cache.h index 1e8a065d..1aa0d469 100644 --- a/src/asset_cache/asset_cache.h +++ b/src/asset_cache/asset_cache.h @@ -1,6 +1,9 @@ #ifndef ASSET_CACHE_H #define ASSET_CACHE_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" void AC_Main(void); @@ -10,6 +13,9 @@ inline void AC_StartupDeps(void) P_Main(); } +//////////////////////////////// +//~ Layer headers + #include "asset_cache_core.h" #endif diff --git a/src/base/base.h b/src/base/base.h index cbb2b1ed..b812299f 100644 --- a/src/base/base.h +++ b/src/base/base.h @@ -1,10 +1,16 @@ #ifndef BASE_H #define BASE_H +//////////////////////////////// +//~ Layer dependencies + inline void StartupBaseDeps(void) { } +//////////////////////////////// +//~ Layer headers + #include "base_core.h" #if LanguageIsC || LanguageIsCpp diff --git a/src/base/win32/base_win32_job.c b/src/base/win32/base_win32_job.c index 5de59d42..10e3c1aa 100644 --- a/src/base/win32/base_win32_job.c +++ b/src/base/win32/base_win32_job.c @@ -1416,7 +1416,6 @@ GenericJobDesc *PushJobDesc_(u64 sig_size, u64 sig_align, GenericJobFunc *func, return result; } -#if 1 void RunJobEx(GenericJobDesc *desc) { __prof; @@ -1491,76 +1490,6 @@ void RunJobEx(GenericJobDesc *desc) } } } -#else -void RunJob(i32 count, GenericJobFunc *func, void *sig, PoolKind pool_kind, PriorityKind priority, Counter *counter) -{ - __prof; - struct W32_SharedCtx *g = &W32_shared_ctx; - if (count > 0) - { - if (counter) - { - AddCounter(counter, count); - } - W32_Fiber *fiber = W32_FiberFromId(FiberId()); - priority = ClampI32(priority, fiber->job_priority, PriorityKind_Count - 1); /* A job cannot create a job with a higher priority than itself */ - if (pool_kind == PoolKind_Inherit) - { - pool_kind = fiber->job_pool; - } - W32_JobPool *pool = &g->job_pools[pool_kind]; - W32_JobQueue *queue = &pool->job_queues[priority]; - LockTicketMutex(&queue->lock); - { - W32_JobInfo *info = 0; - if (queue->first_free) - { - info = queue->first_free; - queue->first_free = info->next; - } - else - { - info = PushStructNoZero(queue->arena, W32_JobInfo); - } - ZeroStruct(info); - info->count = count; - info->func = func; - info->sig = sig; - info->counter = counter; - if (queue->last) - { - queue->last->next = info; - } - else - { - queue->first = info; - } - queue->last = info; - } - UnlockTicketMutex(&queue->lock); - - /* Wake workers */ - { - LockTicketMutex(&pool->workers_wake_tm); - { - Atomic64FetchAdd(&pool->num_jobs_in_queue.v, count); - if (count >= W32_WakeAllThreshold) - { - WakeByAddressAll(&pool->num_jobs_in_queue); - } - else - { - for (i32 i = 0; i < count; ++i) - { - WakeByAddressSingle(&pool->num_jobs_in_queue); - } - } - } - UnlockTicketMutex(&pool->workers_wake_tm); - } - } -} -#endif //////////////////////////////// //~ @hookdef Helpers diff --git a/src/bitbuff/bitbuff.h b/src/bitbuff/bitbuff.h index 3023897b..dd2c26ad 100644 --- a/src/bitbuff/bitbuff.h +++ b/src/bitbuff/bitbuff.h @@ -1,12 +1,18 @@ #ifndef BITBUFF_H #define BITBUFF_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void BB_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "bitbuff_core.h" void BB_Main(void); diff --git a/src/collider/collider.h b/src/collider/collider.h index aa3cb380..2becf8fc 100644 --- a/src/collider/collider.h +++ b/src/collider/collider.h @@ -1,12 +1,18 @@ #ifndef COLLIDER_H #define COLLIDER_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void CLD_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "collider_core.h" void CLD_Main(void); diff --git a/src/draw/draw.h b/src/draw/draw.h index 1946f27d..21e5a832 100644 --- a/src/draw/draw.h +++ b/src/draw/draw.h @@ -1,6 +1,9 @@ #ifndef DRAW_H #define DRAW_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../gpu/gpu.h" #include "../sprite/sprite.h" @@ -15,6 +18,9 @@ inline void D_StartupDeps(void) CLD_Main(); } +//////////////////////////////// +//~ Layer headers + #include "draw_core.h" void D_Main(void); diff --git a/src/dxc/dxc.h b/src/dxc/dxc.h index bf9fc8c8..aae5d4ec 100644 --- a/src/dxc/dxc.h +++ b/src/dxc/dxc.h @@ -1,12 +1,18 @@ #ifndef DXC_H #define DXC_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void DXC_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "dxc_core.h" void DXC_Main(void); diff --git a/src/font/font.h b/src/font/font.h index 7036c1f4..a4c52111 100644 --- a/src/font/font.h +++ b/src/font/font.h @@ -1,6 +1,9 @@ #ifndef FONT_H #define FONT_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../ttf/ttf.h" #include "../gpu/gpu.h" @@ -15,6 +18,9 @@ inline void F_StartupDeps(void) AC_Main(); } +//////////////////////////////// +//~ Layer headers + #include "font_core.h" void F_Main(void); diff --git a/src/gpu/gpu.h b/src/gpu/gpu.h index 9a21efa6..68e9e227 100644 --- a/src/gpu/gpu.h +++ b/src/gpu/gpu.h @@ -1,6 +1,9 @@ #ifndef GPU_H #define GPU_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../tar/tar.h" @@ -21,6 +24,9 @@ inline void GPU_StartupDeps(void) W_Main(); } +//////////////////////////////// +//~ Layer headers + #include "gpu_core.h" #if PlatformIsWindows # include "gpu_dx12.h" diff --git a/src/inc/inc.h b/src/inc/inc.h index 92ee615c..177b924b 100644 --- a/src/inc/inc.h +++ b/src/inc/inc.h @@ -1,12 +1,18 @@ #ifndef INC_H #define INC_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void INC_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "inc_core.h" void INC_Main(void); diff --git a/src/json/json.h b/src/json/json.h index 5b2e91cb..8ce3cb16 100644 --- a/src/json/json.h +++ b/src/json/json.h @@ -1,12 +1,18 @@ #ifndef JSON_H #define JSON_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void JSON_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "json_core.h" void JSON_Main(void); diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h index 6bab975f..73d205bf 100644 --- a/src/kernel/kernel.h +++ b/src/kernel/kernel.h @@ -1,8 +1,14 @@ #ifndef KERNEL_H #define KERNEL_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" +//////////////////////////////// +//~ Layer headers + #include "kernel_core.h" #endif diff --git a/src/mixer/mixer.h b/src/mixer/mixer.h index a7570172..65e1cb18 100644 --- a/src/mixer/mixer.h +++ b/src/mixer/mixer.h @@ -1,6 +1,9 @@ #ifndef MIXER_H #define MIXER_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../sound/sound.h" @@ -11,6 +14,9 @@ inline void MIX_StartupDeps(void) SND_Main(); } +//////////////////////////////// +//~ Layer headers + #include "mixer_core.h" void MIX_Main(void); diff --git a/src/mp3/mp3.h b/src/mp3/mp3.h index 6cf153de..1bea2dde 100644 --- a/src/mp3/mp3.h +++ b/src/mp3/mp3.h @@ -1,12 +1,18 @@ #ifndef MP3_H #define MP3_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void MP3_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "mp3_core.h" void MP3_Main(void); diff --git a/src/net/net.h b/src/net/net.h index 84893ca3..3b26de49 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -1,6 +1,9 @@ #ifndef NET_H #define NET_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../bitbuff/bitbuff.h" @@ -11,6 +14,9 @@ inline void N_StartupDeps(void) BB_Main(); } +//////////////////////////////// +//~ Layer headers + #include "net_core.h" void N_Main(void); diff --git a/src/platform/platform.h b/src/platform/platform.h index 34ffe2ab..31d39c18 100644 --- a/src/platform/platform.h +++ b/src/platform/platform.h @@ -1,12 +1,18 @@ #ifndef PLATFORM_H #define PLATFORM_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void P_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "platform_core.h" #include "platform_log.h" #if PlatformIsWindows diff --git a/src/playback/playback.h b/src/playback/playback.h index a834cb98..8976fc8c 100644 --- a/src/playback/playback.h +++ b/src/playback/playback.h @@ -1,6 +1,9 @@ #ifndef PLAYBACK_H #define PLAYBACK_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../mixer/mixer.h" @@ -11,6 +14,9 @@ inline void PB_StartupDeps(void) MIX_Main(); } +//////////////////////////////// +//~ Layer headers + #include "playback_core.h" #if PlatformIsWindows # include "playback_win32.h" diff --git a/src/pp/pp.h b/src/pp/pp.h index 866edce6..0ac1842f 100644 --- a/src/pp/pp.h +++ b/src/pp/pp.h @@ -1,6 +1,9 @@ #ifndef PP_H #define PP_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../gpu/gpu.h" #include "../sprite/sprite.h" @@ -23,6 +26,9 @@ inline void StartupPpDeps(void) BB_Main(); } +//////////////////////////////// +//~ Layer headers + #include "pp_sim.h" #include "pp_phys.h" #include "pp_space.h" diff --git a/src/resource/resource.h b/src/resource/resource.h index 8ce87dcd..26401b13 100644 --- a/src/resource/resource.h +++ b/src/resource/resource.h @@ -1,6 +1,9 @@ #ifndef RESOURCE_H #define RESOURCE_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../tar/tar.h" @@ -17,6 +20,9 @@ inline void RES_StartupDeps(void) #endif } +//////////////////////////////// +//~ Layer headers + #include "resource_core.h" void RES_Main(void); diff --git a/src/settings/settings.h b/src/settings/settings.h index 5c0e2088..238d927b 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -1,6 +1,9 @@ #ifndef SETTINGS_H #define SETTINGS_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../json/json.h" @@ -11,6 +14,9 @@ inline void SETTINGS_StartupDeps(void) JSON_Main(); } +//////////////////////////////// +//~ Layer headers + #include "settings_core.h" void SETTINGS_Main(void); diff --git a/src/sound/sound.h b/src/sound/sound.h index 692ca3ee..8df5458f 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -1,6 +1,9 @@ #ifndef SOUND_H #define SOUND_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../mp3/mp3.h" @@ -15,6 +18,9 @@ inline void SND_StartupDeps(void) AC_Main(); } +//////////////////////////////// +//~ Layer headers + #include "sound_core.h" void SND_Main(void); diff --git a/src/sprite/sprite.h b/src/sprite/sprite.h index 2312a8c2..cbde6ec1 100644 --- a/src/sprite/sprite.h +++ b/src/sprite/sprite.h @@ -1,6 +1,9 @@ #ifndef SPRITE_H #define SPRITE_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../gpu/gpu.h" @@ -17,6 +20,9 @@ inline void S_StartupDeps(void) W_Main(); } +//////////////////////////////// +//~ Layer headers + #include "sprite_core.h" void S_Main(void); diff --git a/src/tar/tar.h b/src/tar/tar.h index a8dd88d9..26eb04b8 100644 --- a/src/tar/tar.h +++ b/src/tar/tar.h @@ -1,6 +1,9 @@ #ifndef TAR_H #define TAR_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" #include "../bitbuff/bitbuff.h" @@ -11,6 +14,9 @@ inline void TAR_StartupDeps(void) BB_Main(); } +//////////////////////////////// +//~ Layer headers + #include "tar_core.h" void TAR_Main(void); diff --git a/src/ttf/ttf.h b/src/ttf/ttf.h index 5ee38ed3..5d368f0a 100644 --- a/src/ttf/ttf.h +++ b/src/ttf/ttf.h @@ -1,12 +1,18 @@ #ifndef TTF_H #define TTF_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" inline void TTF_StartupDeps(void) { BaseMain(); } +//////////////////////////////// +//~ Layer headers + #include "ttf_core.h" #if PlatformIsWindows # include "ttf_dwrite.h" diff --git a/src/watch/watch.h b/src/watch/watch.h index 264919eb..b9367c76 100644 --- a/src/watch/watch.h +++ b/src/watch/watch.h @@ -1,6 +1,9 @@ #ifndef WATCH_H #define WATCH_H +//////////////////////////////// +//~ Layer dependencies + #include "../base/base.h" #include "../platform/platform.h" inline void W_StartupDeps(void) @@ -9,6 +12,9 @@ inline void W_StartupDeps(void) P_Main(); } +//////////////////////////////// +//~ Layer headers + #include "watch_core.h" void W_Main(void);