UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEWED: Formatting #4739

Browse source
This commit is contained in:
Ray 2025-02-02 12:59:34 +01:00
parent bddb5df0d4
commit cfe96931f5
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/rmodels.c
View file

@ -5347,10 +5347,11 @@ static Model LoadGLTF(const char *fileName)
Image imMetallicRoughness = LoadImageFromCgltfImage(data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture->image, texPath); Image imMetallicRoughness = LoadImageFromCgltfImage(data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture->image, texPath);
if (imMetallicRoughness.data != NULL) if (imMetallicRoughness.data != NULL)
{ {
Image imMetallic, imRoughness; Image imMetallic = { 0 };
Image imRoughness = { 0 };
imMetallic.data = RL_MALLOC(imMetallicRoughness.width * imMetallicRoughness.height); imMetallic.data = RL_MALLOC(imMetallicRoughness.width*imMetallicRoughness.height);
imRoughness.data = RL_MALLOC(imMetallicRoughness.width * imMetallicRoughness.height); imRoughness.data = RL_MALLOC(imMetallicRoughness.width*imMetallicRoughness.height);
imMetallic.width = imRoughness.width = imMetallicRoughness.width; imMetallic.width = imRoughness.width = imMetallicRoughness.width;
imMetallic.height = imRoughness.height = imMetallicRoughness.height; imMetallic.height = imRoughness.height = imMetallicRoughness.height;
@ -5358,17 +5359,17 @@ static Model LoadGLTF(const char *fileName)
imMetallic.format = imRoughness.format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE; imMetallic.format = imRoughness.format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE;
imMetallic.mipmaps = imRoughness.mipmaps = 1; imMetallic.mipmaps = imRoughness.mipmaps = 1;
for (int x = 0; x < imRoughness.width; x++) { for (int x = 0; x < imRoughness.width; x++)
for (int y = 0; y < imRoughness.height; y++) { {
for (int y = 0; y < imRoughness.height; y++)
{
Color color = GetImageColor(imMetallicRoughness, x, y); Color color = GetImageColor(imMetallicRoughness, x, y);
Color roughness = (Color) {color.g}; ((unsigned char *)imRoughness.data)[y*imRoughness.width + x] = color.g; // Roughness color channel
Color metallic = (Color) {color.b}; ((unsigned char *)imMetallic.data)[y*imMetallic.width + x] = color.b; // Metallic color channel
((unsigned char *)imRoughness.data)[y*imRoughness.width + x] = color.g;
((unsigned char *)imMetallic.data)[y*imMetallic.width + x] = color.b;
} }
} }
model.materials[j].maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTextureFromImage(imRoughness); model.materials[j].maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTextureFromImage(imRoughness);
model.materials[j].maps[MATERIAL_MAP_METALNESS].texture = LoadTextureFromImage(imMetallic); model.materials[j].maps[MATERIAL_MAP_METALNESS].texture = LoadTextureFromImage(imMetallic);