resources paths refact

This commit is contained in:
Che10vek 2023-11-20 01:30:57 +10:00
parent 12db8a1448
commit 2ee9e33c6d
20 changed files with 19 additions and 8 deletions

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 257 KiB

View File

@ -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");
}

View File

@ -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_

View File

@ -1,3 +1,6 @@
#ifndef VOX_TYPEDEFS_H
#define VOX_TYPEDEFS_H
#include <stdlib.h>
#include <stdint.h>
@ -6,3 +9,5 @@ typedef unsigned char ubyte;
typedef uint8_t blockid_t;
typedef uint16_t light_t;
#endif