haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3D-Viewer: fix a bug introduced in the previous commits

This commit is contained in:
Mario Luzeiro 2020-09-04 01:25:23 +01:00 committed by Jon Evans
parent 6bc19dbfe9
commit 3f2cada6c6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp
View File

@ -1545,9 +1545,15 @@ void C3D_RENDER_RAYTRACING::add_3D_models( CCONTAINER &aDstContainer,
((mesh.m_FaceIdxSize % 3) == 0) && ((mesh.m_FaceIdxSize % 3) == 0) &&
(mesh.m_MaterialIdx < a3DModel->m_MaterialsSize) ) (mesh.m_MaterialIdx < a3DModel->m_MaterialsSize) )
{ {
const CBLINN_PHONG_MATERIAL &blinn_material = (*materialVector)[mesh.m_MaterialIdx]; float moduleTransparency;
const CBLINN_PHONG_MATERIAL *blinn_material;
const float moduleTransparency = 1.0f - ( ( 1.0f - blinn_material.GetTransparency() ) * aModuleOpacity ); if( !aSkipMaterialInformation )
{
blinn_material = &(*materialVector)[mesh.m_MaterialIdx];
moduleTransparency = 1.0f - ( ( 1.0f - blinn_material->GetTransparency() ) * aModuleOpacity );
}
// Add all face triangles // Add all face triangles
for( unsigned int faceIdx = 0; for( unsigned int faceIdx = 0;
@ -1592,7 +1598,7 @@ void C3D_RENDER_RAYTRACING::add_3D_models( CCONTAINER &aDstContainer,
if( !aSkipMaterialInformation ) if( !aSkipMaterialInformation )
{ {
newTriangle->SetMaterial( (const CMATERIAL *)&blinn_material ); newTriangle->SetMaterial( blinn_material );
newTriangle->SetModelTransparency( moduleTransparency ); newTriangle->SetModelTransparency( moduleTransparency );
if( mesh.m_Color == NULL ) if( mesh.m_Color == NULL )