aboutsummaryrefslogtreecommitdiffstats
path: root/src/assets.c
diff options
context:
space:
mode:
authornathan <nathansmith@disroot.org>2025-10-07 02:14:00 +0000
committernathan <nathansmith@disroot.org>2025-10-07 02:14:00 +0000
commit19e8c4da3820e3d3e4af10d338f1c03ad377de81 (patch)
treedef0a78d25178504a130e98c003d0c0ef9f083d4 /src/assets.c
parentc1682ff0b346a089d16b4f75732d39c85100e343 (diff)
downloadFindThings-main.tar.gz
FindThings-main.tar.bz2
FindThings-main.zip
ExistingHEADmain
Diffstat (limited to 'src/assets.c')
-rw-r--r--src/assets.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/assets.c b/src/assets.c
index bcdb3cb..db87d54 100644
--- a/src/assets.c
+++ b/src/assets.c
@@ -30,7 +30,8 @@ const char shaderAssetNames[SHADER_ASSET_COUNT][FT_NAMEMAX] = {
const char modelAssetPaths[MODEL_ASSET_COUNT][FT_NAMEMAX] = {
"UtilityPole.obj",
"Samantha.obj",
- "ShopKeeper.obj"
+ "ShopKeeper.obj",
+ "ShopKeeper.obj" // John and Ron ARE NOT the same person
};
void initShaderAssets(Shader shaders[SHADER_ASSET_COUNT])
@@ -47,8 +48,19 @@ void initShaderAssets(Shader shaders[SHADER_ASSET_COUNT])
void initModelAssets(Assets* assets)
{
+ // John.
+ assets->models[JOHN_MODEL].materials[0].maps[MATERIAL_MAP_DIFFUSE].texture =
+ assets->textures[JOHN_TEXTURE];
-}
+ // Ron.
+ assets->models[RON_MODEL].materials[0].maps[MATERIAL_MAP_DIFFUSE].texture =
+ assets->textures[RON_TEXTURE];
+}
+
+/*
+ there are people who pronounce Wario as War-io instead of Wah-rio
+ do they also pronounce Mario as Mor-io?
+*/
void initAssets(Assets* assets)
{