diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/assets.c | 7 | ||||
| -rw-r--r-- | src/assets.h | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/assets.c b/src/assets.c index c3db1ce..bcdb3cb 100644 --- a/src/assets.c +++ b/src/assets.c @@ -13,7 +13,9 @@ const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX] = { "SamanthaFloor.png", "trashcan.png", "trash.png", - "medicalTrash.png" + "medicalTrash.png", + "John.png", + "Ron.png" }; const char imageAssetPaths[IMAGE_ASSET_COUNT][FT_NAMEMAX] = { @@ -27,7 +29,8 @@ const char shaderAssetNames[SHADER_ASSET_COUNT][FT_NAMEMAX] = { const char modelAssetPaths[MODEL_ASSET_COUNT][FT_NAMEMAX] = { "UtilityPole.obj", - "Samantha.obj" + "Samantha.obj", + "ShopKeeper.obj" }; void initShaderAssets(Shader shaders[SHADER_ASSET_COUNT]) diff --git a/src/assets.h b/src/assets.h index 81c56e3..e0c40ea 100644 --- a/src/assets.h +++ b/src/assets.h @@ -3,10 +3,10 @@ #ifndef ASSETS_H #define ASSETS_H -#define TEXTURE_ASSET_COUNT 13 +#define TEXTURE_ASSET_COUNT 15 #define IMAGE_ASSET_COUNT 1 #define SHADER_ASSET_COUNT 2 -#define MODEL_ASSET_COUNT 2 +#define MODEL_ASSET_COUNT 3 extern const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX]; extern const char imageAssetPaths[IMAGE_ASSET_COUNT][FT_NAMEMAX]; @@ -29,7 +29,9 @@ enum { SAMANTHA_FLOOR_TEXTURE, TRASHCAN_TEXTURE, TRASH_TEXTURE, - MEDICAL_TRASH_TEXTURE + MEDICAL_TRASH_TEXTURE, + JOHN_TEXTURE, + RON_TEXTURE }; // Image asset ids. @@ -46,7 +48,8 @@ enum { // Model asset ids. enum { UTILITY_POLE_MODEL, - SAMANTHA_MODEL + SAMANTHA_MODEL, + SHOP_KEEPER_MODEL }; typedef struct { |