wanp/townengine
2
1
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

move and combine option macro headers from public interface

Browse Source
This commit is contained in:
veclavtalica
2025-02-20 13:01:02 +03:00
parent d90bf4cbe2
commit 6bd3afe9b2
7 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/twn_audio.h
View File

@ -2,7 +2,6 @@
#define TWN_AUDIO_H
#include "twn_engine_api.h"
#include "twn_option.h"
#include <stdbool.h>
@ -23,6 +22,8 @@ TWN_API void audio_parameter(const char *channel, const char *parameter, float v
#ifndef TWN_NOT_C
#include "src/twn_option_c.h"
typedef struct PlayAudioArgs {
char *path;

8
include/twn_concatenate.h
View File

@ -1,8 +0,0 @@
#ifndef TWN_CONCATENATE_H
#define TWN_CONCATENATE_H
#define m_concatenate(p_a, p_b) m_concatenate_(p_a, p_b)
#define m_concatenate_(p_a, p_b) m_concatenate__(p_a, p_b)
#define m_concatenate__(p_a, p_b) p_a##p_b
#endif

3
include/twn_draw.h
View File

@ -2,7 +2,6 @@
#define TWN_DRAW_H
#include "twn_types.h"
#include "twn_option.h"
#include "twn_engine_api.h"
#include <stdbool.h>
@ -118,6 +117,8 @@ TWN_API void draw_model(const char *model,
#ifndef TWN_NOT_C
#include "src/twn_option_c.h"
typedef struct DrawSpriteArgs {
char const *texture;
Rect rect;

97
include/twn_option.h
View File

@ -1,97 +0,0 @@
#ifndef TWN_OPTION_H
#define TWN_OPTION_H
#include "twn_concatenate.h"
#include "twn_varargcount.h"
#include <stdbool.h>
/* usage example:
*
* struct result {
* float f;
* m_option_list(
* int, v
* )
* }
*
* struct result = {
* m_set(f, 1.0), -- non options could be set with this
* m_opt(v, 5), -- options are supposed to be initialized like that
* }
*
*/
#define m_set(p_member, p_value) .p_member = (p_value)
#define m_opt(p_member, p_value) .p_member##_opt = (p_value), .p_member##_opt_set = 1
#define m_is_set(p_value, p_member) ((p_value).p_member##_opt_set)
/* warn: beware of double evaluation! */
#define m_or(p_value, p_member, p_default) ((p_value).p_member##_opt_set ? (p_value).p_member##_opt : (p_default))
/* warn: beware of double evaluation! */
#define m_opt_from(p_member, p_value, p_member_from) .p_member##_opt = (p_value).p_member_from##_opt, \
.p_member##_opt_set = (p_value).p_member_from##_opt_set
#define m_option_list_2(t0, m0) \
t0 m0##_opt; \
bool m0##_opt_set : 1; \
#define m_option_list_4(t0, m0, t1, m1) \
t0 m0##_opt; \
t1 m1##_opt; \
bool m0##_opt_set : 1; \
bool m1##_opt_set : 1; \
#define m_option_list_6(t0, m0, t1, m1, t2, m2) \
t0 m0##_opt; \
t1 m1##_opt; \
t2 m1##_opt; \
bool m0##_opt_set : 1; \
bool m1##_opt_set : 1; \
bool m2##_opt_set : 1; \
#define m_option_list_8(t0, m0, t1, m1, t2, m2, t3, m3) \
t0 m0##_opt; \
t1 m1##_opt; \
t2 m2##_opt; \
t3 m3##_opt; \
bool m0##_opt_set : 1; \
bool m1##_opt_set : 1; \
bool m2##_opt_set : 1; \
bool m3##_opt_set : 1; \
#define m_option_list_10(t0, m0, t1, m1, t2, m2, \
t3, m3, t4, m4) \
t0 m0##_opt; \
t1 m1##_opt; \
t2 m2##_opt; \
t3 m3##_opt; \
t4 m4##_opt; \
bool m0##_opt_set : 1; \
bool m1##_opt_set : 1; \
bool m2##_opt_set : 1; \
bool m3##_opt_set : 1; \
bool m4##_opt_set : 1; \
#define m_option_list_12(t0, m0, t1, m1, t2, m2, \
t3, m3, t4, m4, t5, m5) \
t0 m0##_opt; \
t1 m1##_opt; \
t2 m2##_opt; \
t3 m3##_opt; \
t4 m4##_opt; \
t5 m5##_opt; \
bool m0##_opt_set : 1; \
bool m1##_opt_set : 1; \
bool m2##_opt_set : 1; \
bool m3##_opt_set : 1; \
bool m4##_opt_set : 1; \
bool m5##_opt_set : 1; \
#define m_option_list_(p_n, ...) m_concatenate(m_option_list_, p_n)(__VA_ARGS__)
#define m_option_list(...) m_option_list_(m_narg(__VA_ARGS__), __VA_ARGS__)
#endif

9
include/twn_varargcount.h
View File

@ -1,9 +0,0 @@
#ifndef TWN_VARARGCOUNT_H
#define TWN_VARARGCOUNT_H
#define m_narg(...) m_narg_(__VA_ARGS__, m_rseq_n_())
#define m_narg_(...) m_arg_n_(__VA_ARGS__)
#define m_arg_n_(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, N, ...) N
#define m_rseq_n_() 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
#endif