Skip to content

Commit

Permalink
fix: model loader emissive factor issue
Browse files Browse the repository at this point in the history
  • Loading branch information
hoffstadt committed Jan 29, 2025
1 parent 3145314 commit dfe7bf8
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions extensions/pl_model_loader_ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,11 +439,13 @@ pl__refr_load_material(const char* pcDirectory, plMaterialComponent* ptMaterial,
if(ptGltfMaterial->normal_texture.texture)
pl__load_gltf_texture(PL_TEXTURE_SLOT_NORMAL_MAP, &ptGltfMaterial->normal_texture, pcDirectory, ptGltfMaterial, ptMaterial);

ptMaterial->tEmissiveColor.r = ptGltfMaterial->emissive_factor[0];
ptMaterial->tEmissiveColor.g = ptGltfMaterial->emissive_factor[1];
ptMaterial->tEmissiveColor.b = ptGltfMaterial->emissive_factor[2];
if(ptMaterial->tEmissiveColor.r != 0.0f || ptMaterial->tEmissiveColor.g != 0.0f || ptMaterial->tEmissiveColor.b != 0.0f)
ptMaterial->tEmissiveColor.a = 1.0f;
if(ptGltfMaterial->emissive_texture.texture)
{
ptMaterial->tEmissiveColor.r = ptGltfMaterial->emissive_factor[0];
ptMaterial->tEmissiveColor.g = ptGltfMaterial->emissive_factor[1];
ptMaterial->tEmissiveColor.b = ptGltfMaterial->emissive_factor[2];
pl__load_gltf_texture(PL_TEXTURE_SLOT_EMISSIVE_MAP, &ptGltfMaterial->emissive_texture, pcDirectory, ptGltfMaterial, ptMaterial);
}

Expand Down Expand Up @@ -984,7 +986,7 @@ pl__refr_load_gltf_object(plModelLoaderData* ptData, plGltfLoadingData* ptSceneD
if(ptMaterial->tBlendMode == PL_BLEND_MODE_ALPHA)
bOpaque = false;

if(gptResource->is_resource_valid(ptMaterial->atTextureMaps[PL_TEXTURE_SLOT_EMISSIVE_MAP].tResource))
if(gptResource->is_resource_valid(ptMaterial->atTextureMaps[PL_TEXTURE_SLOT_EMISSIVE_MAP].tResource) || ptMaterial->tEmissiveColor.a > 0.0f)
bOpaque = false;

if(bOpaque)
Expand Down

0 comments on commit dfe7bf8

Please sign in to comment.