From 2d5719fc649d7d4e39f4f761fd8f6a7717959b0d Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Sun, 1 Oct 2023 15:52:03 +0100 Subject: [PATCH] Conditionally compile BitmapFont for Anroid --- include/BitmapFont.h | 4 ++++ include/GameEngine.h | 6 ++++++ src/BitmapFont.c | 4 ++++ src/GameEngine.c | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/include/BitmapFont.h b/include/BitmapFont.h index 71f666c..24234c1 100644 --- a/include/BitmapFont.h +++ b/include/BitmapFont.h @@ -1,6 +1,8 @@ #ifndef BITMAP_FONT_H #define BITMAP_FONT_H +#ifdef __ANDROID__ + #include "AssetManager.h" #include "Renderer.h" #include "SDL_pixels.h" @@ -29,4 +31,6 @@ void destroy_bitmap_font(AssetManager *am, BitmapFont **font); } #endif // !__cplusplus +#endif // __ANDROID__ + #endif // !BITMAP_FONT_H diff --git a/include/GameEngine.h b/include/GameEngine.h index 8b01bc8..46368b1 100644 --- a/include/GameEngine.h +++ b/include/GameEngine.h @@ -43,9 +43,12 @@ void remove_object(ObjectID *id); // ASSET MANAGEMENT API AssetID load_asset(const char *path, AssetType type); void unload_asset(AssetID *id); + +#ifdef __ANDROID__ BitmapFont *load_bitmap_font(const char *filepath, u64 tile_width, u64 tile_height); void unload_bitmap_font(BitmapFont **font); +#endif // __ANDROID__ // END ASSET MANAGEMENT API // RENDERING API @@ -90,9 +93,12 @@ i32 set_font_script_name(AssetID id, const char *script); void render_text_with_font_asset(AssetID id, const char *text, const RenderRect *src, RenderRect dest, SDL_Color color); + +#ifdef __ANDROID__ void render_text_with_bitmap_font(BitmapFont *font, const char *text, u64 font_size, u64 start_index, RenderRect dest, SDL_Color color); +#endif // __ANDROID__ // END RENDERING API // AUDIO API diff --git a/src/BitmapFont.c b/src/BitmapFont.c index 778caa2..a3ce856 100644 --- a/src/BitmapFont.c +++ b/src/BitmapFont.c @@ -1,3 +1,5 @@ +#ifdef __ANDROID__ + #include "BitmapFont.h" #include "AssetManager.h" #include "Renderer.h" @@ -147,3 +149,5 @@ RenderRect get_character_sprite(BitmapFont *font, u64 index) { return rect; } + +#endif /* ifdef __ANDROID__ */ diff --git a/src/GameEngine.c b/src/GameEngine.c index 60f8554..3a48824 100644 --- a/src/GameEngine.c +++ b/src/GameEngine.c @@ -216,6 +216,7 @@ void unload_asset(AssetID *id) { remove_asset_from_manager(GameEngine.asset_manager, id); } +#ifdef __ANDROID__ BitmapFont *load_bitmap_font(const char *filepath, u64 tile_width, u64 tile_height) { return create_bitmap_font(GameEngine.asset_manager, @@ -226,6 +227,7 @@ BitmapFont *load_bitmap_font(const char *filepath, u64 tile_width, void unload_bitmap_font(BitmapFont **font) { destroy_bitmap_font(GameEngine.asset_manager, font); } +#endif /* ifdef __ANDROID__ */ WindowSize get_window_defined_size() { return GameEngine.window.defined_size; } @@ -450,12 +452,14 @@ void render_text_with_font_asset(AssetID id, const char *text, surface = NULL; } +#ifdef __ANDROID__ void render_text_with_bitmap_font(BitmapFont *font, const char *text, u64 font_size, u64 start_index, RenderRect dest, SDL_Color color) { render_bitmap_font_text(GameEngine.asset_manager, GameEngine.window.renderer, font, font_size, text, start_index, dest, color); } +#endif /* ifdef __ANDROID__ */ i8 play_audio_asset(AssetID id, i16 loops, bool fade_in, u32 fade_length_in_ms) {