summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorRay <[email protected]>2023-02-04 20:19:51 +0100
committerRay <[email protected]>2023-02-04 20:19:51 +0100
commit43e45cbb810b58a5c78e3d6fe708260043083b91 (patch)
tree645f5ed67017b1d5f27e5122f8ac9d0d6862fae9 /src
parent7914332c40ee811ad08a90e4eb7d40c2d1e81f4e (diff)
downloadraylib-43e45cbb810b58a5c78e3d6fe708260043083b91.tar.gz
raylib-43e45cbb810b58a5c78e3d6fe708260043083b91.zip
Replace TABS by 4 spaces
Diffstat (limited to 'src')
-rw-r--r--src/rmodels.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/rmodels.c b/src/rmodels.c
index b5d8578f..3c9384d2 100644
--- a/src/rmodels.c
+++ b/src/rmodels.c
@@ -1875,34 +1875,34 @@ bool ExportMesh(Mesh mesh, const char *fileName)
// Process obj materials
static void ProcessMaterialsOBJ(Material *rayMaterials, tinyobj_material_t *materials, int materialCount)
{
- // Init model materials
- for (int m = 0; m < materialCount; m++)
- {
- // Init material to default
- // NOTE: Uses default shader, which only supports MATERIAL_MAP_DIFFUSE
- rayMaterials[m] = LoadMaterialDefault();
+ // Init model materials
+ for (int m = 0; m < materialCount; m++)
+ {
+ // Init material to default
+ // NOTE: Uses default shader, which only supports MATERIAL_MAP_DIFFUSE
+ rayMaterials[m] = LoadMaterialDefault();
- // Get default texture, in case no texture is defined
- // NOTE: rlgl default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8
- rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 };
+ // Get default texture, in case no texture is defined
+ // NOTE: rlgl default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8
+ rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 };
- if (materials[m].diffuse_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].texture = LoadTexture(materials[m].diffuse_texname); //char *diffuse_texname; // map_Kd
+ if (materials[m].diffuse_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].texture = LoadTexture(materials[m].diffuse_texname); //char *diffuse_texname; // map_Kd
- rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].color = (Color){ (unsigned char)(materials[m].diffuse[0]*255.0f), (unsigned char)(materials[m].diffuse[1]*255.0f), (unsigned char)(materials[m].diffuse[2] * 255.0f), 255 }; //float diffuse[3];
- rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].value = 0.0f;
+ rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].color = (Color){ (unsigned char)(materials[m].diffuse[0]*255.0f), (unsigned char)(materials[m].diffuse[1]*255.0f), (unsigned char)(materials[m].diffuse[2] * 255.0f), 255 }; //float diffuse[3];
+ rayMaterials[m].maps[MATERIAL_MAP_DIFFUSE].value = 0.0f;
- if (materials[m].specular_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_SPECULAR].texture = LoadTexture(materials[m].specular_texname); //char *specular_texname; // map_Ks
- rayMaterials[m].maps[MATERIAL_MAP_SPECULAR].color = (Color){ (unsigned char)(materials[m].specular[0]*255.0f), (unsigned char)(materials[m].specular[1]*255.0f), (unsigned char)(materials[m].specular[2] * 255.0f), 255 }; //float specular[3];
- rayMaterials[m].maps[MATERIAL_MAP_SPECULAR].value = 0.0f;
+ if (materials[m].specular_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_SPECULAR].texture = LoadTexture(materials[m].specular_texname); //char *specular_texname; // map_Ks
+ rayMaterials[m].maps[MATERIAL_MAP_SPECULAR].color = (Color){ (unsigned char)(materials[m].specular[0]*255.0f), (unsigned char)(materials[m].specular[1]*255.0f), (unsigned char)(materials[m].specular[2] * 255.0f), 255 }; //float specular[3];
+ rayMaterials[m].maps[MATERIAL_MAP_SPECULAR].value = 0.0f;
- if (materials[m].bump_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_NORMAL].texture = LoadTexture(materials[m].bump_texname); //char *bump_texname; // map_bump, bump
- rayMaterials[m].maps[MATERIAL_MAP_NORMAL].color = WHITE;
- rayMaterials[m].maps[MATERIAL_MAP_NORMAL].value = materials[m].shininess;
+ if (materials[m].bump_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_NORMAL].texture = LoadTexture(materials[m].bump_texname); //char *bump_texname; // map_bump, bump
+ rayMaterials[m].maps[MATERIAL_MAP_NORMAL].color = WHITE;
+ rayMaterials[m].maps[MATERIAL_MAP_NORMAL].value = materials[m].shininess;
- rayMaterials[m].maps[MATERIAL_MAP_EMISSION].color = (Color){ (unsigned char)(materials[m].emission[0]*255.0f), (unsigned char)(materials[m].emission[1]*255.0f), (unsigned char)(materials[m].emission[2] * 255.0f), 255 }; //float emission[3];
+ rayMaterials[m].maps[MATERIAL_MAP_EMISSION].color = (Color){ (unsigned char)(materials[m].emission[0]*255.0f), (unsigned char)(materials[m].emission[1]*255.0f), (unsigned char)(materials[m].emission[2] * 255.0f), 255 }; //float emission[3];
- if (materials[m].displacement_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_HEIGHT].texture = LoadTexture(materials[m].displacement_texname); //char *displacement_texname; // disp
- }
+ if (materials[m].displacement_texname != NULL) rayMaterials[m].maps[MATERIAL_MAP_HEIGHT].texture = LoadTexture(materials[m].displacement_texname); //char *displacement_texname; // disp
+ }
}
#endif
@@ -4041,7 +4041,7 @@ static Model LoadOBJ(const char *fileName)
}
// Init model materials
- ProcessMaterialsOBJ(model.materials, materials, materialCount);
+ ProcessMaterialsOBJ(model.materials, materials, materialCount);
tinyobj_attrib_free(&attrib);
tinyobj_shapes_free(meshes, meshCount);