From 6cf2a8f9e21beb917d95b388c80777ed6a194c4c Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Thu, 16 Feb 2023 15:44:46 -0400 Subject: macros: Add new `TL_{}_OBJECTS` xmacros This will be needed for later. --- context.h | 28 +++++++++++++++++++++++++--- include/pso/macros.h | 28 +++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/context.h b/context.h index 8b00bac..16b224c 100644 --- a/context.h +++ b/context.h @@ -36,9 +36,30 @@ typedef long ptrdiff_t; o(TMainTask) #define TL_OBJECTS \ o(tl_su, TL_SU) \ + TL_OBJECTS_AT_TL_00 + +#define TL_OBJECTS_AT_TL_00 \ + TL_00_OBJECTS \ + TL_02_OBJECTS \ + o(tl_particle, TL_PARTICLE) \ + TL_PARTICLE_MODEL_OBJECTS + +#define TL_OBJECTS_AT_TL_00_WITHOUT_TL_PARTICLE \ + TL_00_OBJECTS \ + TL_02_OBJECTS \ + TL_PARTICLE_MODEL_OBJECTS + +#define TL_OBJECTS_AT_TL_02 \ + TL_02_OBJECTS \ + o(tl_particle, TL_PARTICLE) \ + TL_PARTICLE_MODEL_OBJECTS + +#define TL_00_OBJECTS \ o(tl_00, TL_00) \ o(tl_camera, TL_CAMERA) \ - o(tl_01, TL_01) \ + o(tl_01, TL_01) + +#define TL_02_OBJECTS \ o(tl_02, TL_02) \ o(tl_item_equip, TL_ITEM_EQUIP) \ o(tl_03, TL_03) \ @@ -48,8 +69,9 @@ typedef long ptrdiff_t; o(tl_06, TL_06) \ o(tl_07, TL_07) \ o(tl_loc_end, TL_LOC_END) \ - o(tl_window, TL_WINDOW) \ - o(tl_particle, TL_PARTICLE) \ + o(tl_window, TL_WINDOW) + +#define TL_PARTICLE_MODEL_OBJECTS \ o(tl_particlemodel, TL_PARTICLEMODEL) \ o(tl_radermap, TL_RADERMAP) \ o(tl_clipout, TL_CLIPOUT) \ diff --git a/include/pso/macros.h b/include/pso/macros.h index f10c911..8d76186 100644 --- a/include/pso/macros.h +++ b/include/pso/macros.h @@ -7,9 +7,30 @@ o(TMainTask) #define TL_OBJECTS \ o(tl_su, TL_SU) \ + TL_OBJECTS_AT_TL_00 + +#define TL_OBJECTS_AT_TL_00 \ + TL_00_OBJECTS \ + TL_02_OBJECTS \ + o(tl_particle, TL_PARTICLE) \ + TL_PARTICLE_MODEL_OBJECTS + +#define TL_OBJECTS_AT_TL_00_WITHOUT_TL_PARTICLE \ + TL_00_OBJECTS \ + TL_02_OBJECTS \ + TL_PARTICLE_MODEL_OBJECTS + +#define TL_OBJECTS_AT_TL_02 \ + TL_02_OBJECTS \ + o(tl_particle, TL_PARTICLE) \ + TL_PARTICLE_MODEL_OBJECTS + +#define TL_00_OBJECTS \ o(tl_00, TL_00) \ o(tl_camera, TL_CAMERA) \ - o(tl_01, TL_01) \ + o(tl_01, TL_01) + +#define TL_02_OBJECTS \ o(tl_02, TL_02) \ o(tl_item_equip, TL_ITEM_EQUIP) \ o(tl_03, TL_03) \ @@ -19,8 +40,9 @@ o(tl_06, TL_06) \ o(tl_07, TL_07) \ o(tl_loc_end, TL_LOC_END) \ - o(tl_window, TL_WINDOW) \ - o(tl_particle, TL_PARTICLE) \ + o(tl_window, TL_WINDOW) + +#define TL_PARTICLE_MODEL_OBJECTS \ o(tl_particlemodel, TL_PARTICLEMODEL) \ o(tl_radermap, TL_RADERMAP) \ o(tl_clipout, TL_CLIPOUT) \ -- cgit v1.2.3-13-gbd6f