From 2ee9e33c6d677ce232449c0945a42dd2f7740c72 Mon Sep 17 00:00:00 2001 From: Che10vek Date: Mon, 20 Nov 2023 01:30:57 +1000 Subject: [PATCH] resources paths refact --- res/{ => fonts}/font.png | Bin res/{ => fonts}/font_0.png | Bin res/{ => fonts}/font_1.png | Bin res/{ => fonts}/font_2.png | Bin res/{ => fonts}/font_3.png | Bin res/{ => fonts}/font_4.png | Bin res/{ => shaders}/lines.glslf | 0 res/{ => shaders}/lines.glslv | 0 res/{ => shaders}/main.glslf | 0 res/{ => shaders}/main.glslv | 0 res/{ => shaders}/screen.glslf | 0 res/{ => shaders}/screen.glslv | 0 res/{ => shaders}/ui.glslf | 0 res/{ => shaders}/ui.glslv | 0 res/{ => textures}/block.png | Bin res/{ => textures}/menubg.png | Bin res/{ => textures}/slot.png | Bin src/assets/AssetsLoader.cpp | 16 ++++++++-------- src/constants.h | 6 ++++++ src/typedefs.h | 5 +++++ 20 files changed, 19 insertions(+), 8 deletions(-) rename res/{ => fonts}/font.png (100%) rename res/{ => fonts}/font_0.png (100%) rename res/{ => fonts}/font_1.png (100%) rename res/{ => fonts}/font_2.png (100%) rename res/{ => fonts}/font_3.png (100%) rename res/{ => fonts}/font_4.png (100%) rename res/{ => shaders}/lines.glslf (100%) rename res/{ => shaders}/lines.glslv (100%) rename res/{ => shaders}/main.glslf (100%) rename res/{ => shaders}/main.glslv (100%) rename res/{ => shaders}/screen.glslf (100%) rename res/{ => shaders}/screen.glslv (100%) rename res/{ => shaders}/ui.glslf (100%) rename res/{ => shaders}/ui.glslv (100%) rename res/{ => textures}/block.png (100%) rename res/{ => textures}/menubg.png (100%) rename res/{ => textures}/slot.png (100%) diff --git a/res/font.png b/res/fonts/font.png similarity index 100% rename from res/font.png rename to res/fonts/font.png diff --git a/res/font_0.png b/res/fonts/font_0.png similarity index 100% rename from res/font_0.png rename to res/fonts/font_0.png diff --git a/res/font_1.png b/res/fonts/font_1.png similarity index 100% rename from res/font_1.png rename to res/fonts/font_1.png diff --git a/res/font_2.png b/res/fonts/font_2.png similarity index 100% rename from res/font_2.png rename to res/fonts/font_2.png diff --git a/res/font_3.png b/res/fonts/font_3.png similarity index 100% rename from res/font_3.png rename to res/fonts/font_3.png diff --git a/res/font_4.png b/res/fonts/font_4.png similarity index 100% rename from res/font_4.png rename to res/fonts/font_4.png diff --git a/res/lines.glslf b/res/shaders/lines.glslf similarity index 100% rename from res/lines.glslf rename to res/shaders/lines.glslf diff --git a/res/lines.glslv b/res/shaders/lines.glslv similarity index 100% rename from res/lines.glslv rename to res/shaders/lines.glslv diff --git a/res/main.glslf b/res/shaders/main.glslf similarity index 100% rename from res/main.glslf rename to res/shaders/main.glslf diff --git a/res/main.glslv b/res/shaders/main.glslv similarity index 100% rename from res/main.glslv rename to res/shaders/main.glslv diff --git a/res/screen.glslf b/res/shaders/screen.glslf similarity index 100% rename from res/screen.glslf rename to res/shaders/screen.glslf diff --git a/res/screen.glslv b/res/shaders/screen.glslv similarity index 100% rename from res/screen.glslv rename to res/shaders/screen.glslv diff --git a/res/ui.glslf b/res/shaders/ui.glslf similarity index 100% rename from res/ui.glslf rename to res/shaders/ui.glslf diff --git a/res/ui.glslv b/res/shaders/ui.glslv similarity index 100% rename from res/ui.glslv rename to res/shaders/ui.glslv diff --git a/res/block.png b/res/textures/block.png similarity index 100% rename from res/block.png rename to res/textures/block.png diff --git a/res/menubg.png b/res/textures/menubg.png similarity index 100% rename from res/menubg.png rename to res/textures/menubg.png diff --git a/res/slot.png b/res/textures/slot.png similarity index 100% rename from res/slot.png rename to res/textures/slot.png diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index f74c3348..2e62556e 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -103,14 +103,14 @@ void AssetsLoader::createDefaults(AssetsLoader& loader) { } void AssetsLoader::addDefaults(AssetsLoader& loader) { - loader.add(ASSET_SHADER, "res/main", "main"); - loader.add(ASSET_SHADER, "res/lines", "lines"); - loader.add(ASSET_SHADER, "res/ui", "ui"); + loader.add(ASSET_SHADER, SHADERS_FOLDER"/main", "main"); + loader.add(ASSET_SHADER, SHADERS_FOLDER"/lines", "lines"); + loader.add(ASSET_SHADER, SHADERS_FOLDER"/ui", "ui"); - loader.add(ASSET_ATLAS, "res/block.png", "block"); - loader.add(ASSET_TEXTURE, "res/block.png", "block_tex"); - loader.add(ASSET_TEXTURE, "res/slot.png", "slot"); - loader.add(ASSET_TEXTURE, "res/menubg.png", "menubg"); + loader.add(ASSET_ATLAS, TEXTURES_FOLDER"/block.png", "block"); + loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/block.png", "block_tex"); + loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/slot.png", "slot"); + loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/menubg.png", "menubg"); - loader.add(ASSET_FONT, "res/font", "normal"); + loader.add(ASSET_FONT, FONTS_FOLDER"/font", "normal"); } diff --git a/src/constants.h b/src/constants.h index 06d0f67a..97a3f4e7 100644 --- a/src/constants.h +++ b/src/constants.h @@ -20,4 +20,10 @@ inline uint vox_index(int x, int y, int z, int w, int d) { #define ATLAS_MARGIN_SIZE 2 +#define RES_FLODER "res/" + +#define SHADERS_FOLDER "res/shaders" +#define TEXTURES_FOLDER "res/textures" +#define FONTS_FOLDER "res/fonts" + #endif // SRC_CONSTANTS_H_ diff --git a/src/typedefs.h b/src/typedefs.h index 8bc06297..920015c6 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -1,3 +1,6 @@ +#ifndef VOX_TYPEDEFS_H +#define VOX_TYPEDEFS_H + #include #include @@ -6,3 +9,5 @@ typedef unsigned char ubyte; typedef uint8_t blockid_t; typedef uint16_t light_t; + +#endif