diff options
Diffstat (limited to 'src/assets.c')
| -rw-r--r-- | src/assets.c | 16 |
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) { |