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

Fix null-ptr dereference when layer doesn't exist. 

Also removes a whole slew of extraneous type-casts, and makes better
use of for( x : listOfX ) for readability.

Fixes https://gitlab.com/kicad/code/kicad/issues/8996
This commit is contained in:
Jeff Young 2021-08-19 11:39:29 +01:00
parent 928225e467
commit 9f8f81cae2
3 changed files with 145 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.cpp
View File

@ -65,8 +65,8 @@ CONTAINER_2D::CONTAINER_2D() : CONTAINER_2D_BASE( OBJECT_2D_TYPE::CONTAINER )
} }
void CONTAINER_2D::GetListObjectsIntersects( const BBOX_2D& aBBox, void CONTAINER_2D::GetIntersectingObjects( const BBOX_2D& aBBox,
CONST_LIST_OBJECT2D& aOutList ) const CONST_LIST_OBJECT2D& aOutList ) const
{ {
/// @todo Determine what to do with this code. /// @todo Determine what to do with this code.
} }
@ -299,8 +299,8 @@ bool BVH_CONTAINER_2D::recursiveIntersectAny( const BVH_CONTAINER_NODE_2D* aNode
} }
void BVH_CONTAINER_2D::GetListObjectsIntersects( const BBOX_2D& aBBox, void BVH_CONTAINER_2D::GetIntersectingObjects( const BBOX_2D& aBBox,
CONST_LIST_OBJECT2D& aOutList ) const CONST_LIST_OBJECT2D& aOutList ) const
{ {
wxASSERT( aBBox.IsInitialized() == true ); wxASSERT( aBBox.IsInitialized() == true );
wxASSERT( m_isInitialized == true ); wxASSERT( m_isInitialized == true );

12
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.h
View File

@ -71,8 +71,8 @@ public:
* @param aBBox The bounding box to test. * @param aBBox The bounding box to test.
* @param aOutList The list of objects that intersects the bounding box. * @param aOutList The list of objects that intersects the bounding box.
*/ */
virtual void GetListObjectsIntersects( const BBOX_2D& aBBox, virtual void GetIntersectingObjects( const BBOX_2D& aBBox,
CONST_LIST_OBJECT2D& aOutList ) const = 0; CONST_LIST_OBJECT2D& aOutList ) const = 0;
/** /**
* Intersect and check if a segment ray hits a object or is inside it. * Intersect and check if a segment ray hits a object or is inside it.
@ -96,8 +96,8 @@ class CONTAINER_2D : public CONTAINER_2D_BASE
public: public:
CONTAINER_2D(); CONTAINER_2D();
void GetListObjectsIntersects( const BBOX_2D& aBBox, void GetIntersectingObjects( const BBOX_2D& aBBox,
CONST_LIST_OBJECT2D& aOutList ) const override; CONST_LIST_OBJECT2D& aOutList ) const override;
bool IntersectAny( const RAYSEG2D& aSegRay ) const override; bool IntersectAny( const RAYSEG2D& aSegRay ) const override;
}; };
@ -123,8 +123,8 @@ public:
void Clear() override; void Clear() override;
void GetListObjectsIntersects( const BBOX_2D& aBBox, void GetIntersectingObjects( const BBOX_2D& aBBox,
CONST_LIST_OBJECT2D& aOutList ) const override; CONST_LIST_OBJECT2D& aOutList ) const override;
bool IntersectAny( const RAYSEG2D& aSegRay ) const override; bool IntersectAny( const RAYSEG2D& aSegRay ) const override;

371
3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp
View File

@ -236,8 +236,10 @@ void RENDER_3D_RAYTRACE::createObject( CONTAINER_3D& aDstContainer, const OBJECT
void RENDER_3D_RAYTRACE::createItemsFromContainer( const BVH_CONTAINER_2D* aContainer2d, void RENDER_3D_RAYTRACE::createItemsFromContainer( const BVH_CONTAINER_2D* aContainer2d,
PCB_LAYER_ID aLayer_id, const MATERIAL* aMaterialLayer, const SFVEC3F& aLayerColor, PCB_LAYER_ID aLayer_id,
float aLayerZOffset ) const MATERIAL* aMaterialLayer,
const SFVEC3F& aLayerColor,
float aLayerZOffset )
{ {
if( aContainer2d == nullptr ) if( aContainer2d == nullptr )
return; return;
@ -247,11 +249,8 @@ void RENDER_3D_RAYTRACE::createItemsFromContainer( const BVH_CONTAINER_2D* aCont
if( listObject2d.size() == 0 ) if( listObject2d.size() == 0 )
return; return;
for( LIST_OBJECT2D::const_iterator itemOnLayer = listObject2d.begin(); for( const OBJECT_2D* object2d_A : listObject2d )
itemOnLayer != listObject2d.end(); ++itemOnLayer )
{ {
const OBJECT_2D* object2d_A = static_cast<const OBJECT_2D*>( *itemOnLayer );
// not yet used / implemented (can be used in future to clip the objects in the // not yet used / implemented (can be used in future to clip the objects in the
// board borders // board borders
OBJECT_2D* object2d_C = CSGITEM_FULL; OBJECT_2D* object2d_C = CSGITEM_FULL;
@ -262,7 +261,7 @@ void RENDER_3D_RAYTRACE::createItemsFromContainer( const BVH_CONTAINER_2D* aCont
// Subtract holes but not in SolderPaste // Subtract holes but not in SolderPaste
// (can be added as an option in future) // (can be added as an option in future)
if( !( ( aLayer_id == B_Paste ) || ( aLayer_id == F_Paste ) ) ) if( !( aLayer_id == B_Paste || aLayer_id == F_Paste ) )
{ {
// Check if there are any layerhole that intersects this object // Check if there are any layerhole that intersects this object
// Eg: a segment is cut by a via hole or THT hole. // Eg: a segment is cut by a via hole or THT hole.
@ -270,33 +269,19 @@ void RENDER_3D_RAYTRACE::createItemsFromContainer( const BVH_CONTAINER_2D* aCont
if( layerHolesMap.find( aLayer_id ) != layerHolesMap.end() ) if( layerHolesMap.find( aLayer_id ) != layerHolesMap.end() )
{ {
MAP_CONTAINER_2D_BASE::const_iterator ii_hole = layerHolesMap.find( aLayer_id ); const BVH_CONTAINER_2D* holes2d = layerHolesMap.at( aLayer_id );
const BVH_CONTAINER_2D* containerLayerHoles2d = CONST_LIST_OBJECT2D intersecting;
static_cast<const BVH_CONTAINER_2D*>( ii_hole->second );
CONST_LIST_OBJECT2D intersectionList; holes2d->GetIntersectingObjects( object2d_A->GetBBox(), intersecting );
containerLayerHoles2d->GetListObjectsIntersects( object2d_A->GetBBox(),
intersectionList );
if( !intersectionList.empty() ) for( const OBJECT_2D* hole2d : intersecting )
{ object2d_B->push_back( hole2d );
for( CONST_LIST_OBJECT2D::const_iterator holeOnLayer = intersectionList.begin();
holeOnLayer != intersectionList.end(); ++holeOnLayer )
{
const OBJECT_2D* hole2d = static_cast<const OBJECT_2D*>( *holeOnLayer );
//if( object2d_A->Intersects( hole2d->GetBBox() ) )
//if( object2d_A->GetBBox().Intersects( hole2d->GetBBox() ) )
object2d_B->push_back( hole2d );
}
}
} }
// Check if there are any THT that intersects this object // Check if there are any THT that intersects this object. If we're processing a silk
// If we're processing a silk screen layer and the flag is set, then // layer and the flag is set, then clip the silk at the outer edge of the annular ring,
// clip the silk screening at the outer edge of the annular ring, rather // rather than the at the outer edge of the copper plating.
// than the at the outer edge of the copper plating.
const BVH_CONTAINER_2D& throughHoleOuter = const BVH_CONTAINER_2D& throughHoleOuter =
( m_boardAdapter.GetFlag( FL_CLIP_SILK_ON_VIA_ANNULUS ) ( m_boardAdapter.GetFlag( FL_CLIP_SILK_ON_VIA_ANNULUS )
&& m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE ) && m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE )
@ -306,71 +291,44 @@ void RENDER_3D_RAYTRACE::createItemsFromContainer( const BVH_CONTAINER_2D* aCont
if( !throughHoleOuter.GetList().empty() ) if( !throughHoleOuter.GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
throughHoleOuter.GetListObjectsIntersects( object2d_A->GetBBox(), throughHoleOuter.GetIntersectingObjects( object2d_A->GetBBox(), intersecting );
intersectionList );
if( !intersectionList.empty() ) for( const OBJECT_2D* hole2d : intersecting )
{ object2d_B->push_back( hole2d );
for( CONST_LIST_OBJECT2D::const_iterator hole = intersectionList.begin();
hole != intersectionList.end(); ++hole )
{
const OBJECT_2D* hole2d = static_cast<const OBJECT_2D*>( *hole );
//if( object2d_A->Intersects( hole2d->GetBBox() ) )
//if( object2d_A->GetBBox().Intersects( hole2d->GetBBox() ) )
object2d_B->push_back( hole2d );
}
}
} }
} }
if( !m_antioutlineBoard2dObjects->GetList().empty() ) if( !m_antioutlineBoard2dObjects->GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
m_antioutlineBoard2dObjects->GetListObjectsIntersects( object2d_A->GetBBox(), m_antioutlineBoard2dObjects->GetIntersectingObjects( object2d_A->GetBBox(),
intersectionList ); intersecting );
if( !intersectionList.empty() ) for( const OBJECT_2D* obj : intersecting )
{ object2d_B->push_back( obj );
for( const OBJECT_2D* obj : intersectionList )
{
object2d_B->push_back( obj );
}
}
} }
const MAP_CONTAINER_2D_BASE& mapLayers = m_boardAdapter.GetLayerMap(); const MAP_CONTAINER_2D_BASE& mapLayers = m_boardAdapter.GetLayerMap();
if( m_boardAdapter.GetFlag( FL_SUBTRACT_MASK_FROM_SILK ) if( m_boardAdapter.GetFlag( FL_SUBTRACT_MASK_FROM_SILK )
&& m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE ) && m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE )
&& ( ( ( aLayer_id == B_SilkS ) && ( mapLayers.find( B_Mask ) != mapLayers.end() ) ) && ( ( aLayer_id == B_SilkS && mapLayers.find( B_Mask ) != mapLayers.end() )
|| ( ( aLayer_id == F_SilkS ) || ( aLayer_id == F_SilkS && mapLayers.find( F_Mask ) != mapLayers.end() ) ) )
&& ( mapLayers.find( F_Mask ) != mapLayers.end() ) ) ) )
{ {
const PCB_LAYER_ID layerMask_id = ( aLayer_id == B_SilkS ) ? B_Mask : F_Mask; const PCB_LAYER_ID layerMask_id = ( aLayer_id == B_SilkS ) ? B_Mask : F_Mask;
const BVH_CONTAINER_2D* containerMaskLayer2d = const BVH_CONTAINER_2D* containerMaskLayer2d = mapLayers.at( layerMask_id );
static_cast<const BVH_CONTAINER_2D*>( mapLayers.at( layerMask_id ) );
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
if( containerMaskLayer2d ) // can be null if B_Mask or F_Mask is not shown if( containerMaskLayer2d ) // can be null if B_Mask or F_Mask is not shown
containerMaskLayer2d->GetListObjectsIntersects( object2d_A->GetBBox(), containerMaskLayer2d->GetIntersectingObjects( object2d_A->GetBBox(), intersecting );
intersectionList );
if( !intersectionList.empty() ) for( const OBJECT_2D* obj2d : intersecting )
{ object2d_B->push_back( obj2d );
for( CONST_LIST_OBJECT2D::const_iterator objOnLayer = intersectionList.begin();
objOnLayer != intersectionList.end(); ++objOnLayer )
{
const OBJECT_2D* obj2d = static_cast<const OBJECT_2D*>( *objOnLayer );
object2d_B->push_back( obj2d );
}
}
} }
if( object2d_B->empty() ) if( object2d_B->empty() )
@ -468,75 +426,56 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
antiboardPoly.BooleanSubtract( boardPolyCopy, SHAPE_POLY_SET::PM_FAST ); antiboardPoly.BooleanSubtract( boardPolyCopy, SHAPE_POLY_SET::PM_FAST );
antiboardPoly.Fracture( SHAPE_POLY_SET::PM_FAST ); antiboardPoly.Fracture( SHAPE_POLY_SET::PM_FAST );
for( int iOutlinePolyIdx = 0; iOutlinePolyIdx < antiboardPoly.OutlineCount(); for( int ii = 0; ii < antiboardPoly.OutlineCount(); ii++ )
iOutlinePolyIdx++ )
{ {
ConvertPolygonToBlocks( antiboardPoly, ConvertPolygonToBlocks( antiboardPoly, *m_antioutlineBoard2dObjects,
*m_antioutlineBoard2dObjects, m_boardAdapter.BiuTo3dUnits(), -1.0f, m_boardAdapter.BiuTo3dUnits(), -1.0f,
*dynamic_cast<const BOARD_ITEM*>( m_boardAdapter.GetBoard() ), *m_boardAdapter.GetBoard(), ii );
iOutlinePolyIdx );
} }
m_antioutlineBoard2dObjects->BuildBVH(); m_antioutlineBoard2dObjects->BuildBVH();
boardPolyCopy.Fracture( SHAPE_POLY_SET::PM_FAST ); boardPolyCopy.Fracture( SHAPE_POLY_SET::PM_FAST );
for( int iOutlinePolyIdx = 0; iOutlinePolyIdx < outlineCount; iOutlinePolyIdx++ ) for( int ii = 0; ii < outlineCount; ii++ )
{ {
ConvertPolygonToBlocks( boardPolyCopy, *m_outlineBoard2dObjects, ConvertPolygonToBlocks( boardPolyCopy, *m_outlineBoard2dObjects,
m_boardAdapter.BiuTo3dUnits(), divFactor, m_boardAdapter.BiuTo3dUnits(), divFactor,
*dynamic_cast<const BOARD_ITEM*>( m_boardAdapter.GetBoard() ), *m_boardAdapter.GetBoard(), ii );
iOutlinePolyIdx );
} }
if( m_boardAdapter.GetFlag( FL_SHOW_BOARD_BODY ) ) if( m_boardAdapter.GetFlag( FL_SHOW_BOARD_BODY ) )
{ {
const LIST_OBJECT2D& listObjects = m_outlineBoard2dObjects->GetList(); const LIST_OBJECT2D& listObjects = m_outlineBoard2dObjects->GetList();
for( LIST_OBJECT2D::const_iterator object2d_iterator = listObjects.begin(); for( const OBJECT_2D* object2d_A : listObjects )
object2d_iterator != listObjects.end(); ++object2d_iterator )
{ {
const OBJECT_2D* object2d_A =
static_cast<const OBJECT_2D*>( *object2d_iterator );
std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>(); std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>();
// Check if there are any THT that intersects this outline object part // Check if there are any THT that intersects this outline object part
if( !m_boardAdapter.GetThroughHoleOds().GetList().empty() ) if( !m_boardAdapter.GetThroughHoleOds().GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; const BVH_CONTAINER_2D& throughHoles = m_boardAdapter.GetThroughHoleOds();
m_boardAdapter.GetThroughHoleOds().GetListObjectsIntersects( CONST_LIST_OBJECT2D intersecting;
object2d_A->GetBBox(), intersectionList );
if( !intersectionList.empty() ) throughHoles.GetIntersectingObjects( object2d_A->GetBBox(), intersecting );
for( const OBJECT_2D* hole : intersecting )
{ {
for( CONST_LIST_OBJECT2D::const_iterator hole = if( object2d_A->Intersects( hole->GetBBox() ) )
intersectionList.begin(); object2d_B->push_back( hole );
hole != intersectionList.end(); ++hole )
{
const OBJECT_2D* hole2d = static_cast<const OBJECT_2D*>( *hole );
if( object2d_A->Intersects( hole2d->GetBBox() ) )
//if( object2d_A->GetBBox().Intersects( hole2d->GetBBox() ) )
object2d_B->push_back( hole2d );
}
} }
} }
if( !m_antioutlineBoard2dObjects->GetList().empty() ) if( !m_antioutlineBoard2dObjects->GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
m_antioutlineBoard2dObjects->GetListObjectsIntersects( m_antioutlineBoard2dObjects->GetIntersectingObjects( object2d_A->GetBBox(),
object2d_A->GetBBox(), intersectionList ); intersecting );
if( !intersectionList.empty() ) for( const OBJECT_2D* obj : intersecting )
{ object2d_B->push_back( obj );
for( const OBJECT_2D* obj : intersectionList )
{
object2d_B->push_back( obj );
}
}
} }
if( object2d_B->empty() ) if( object2d_B->empty() )
@ -548,30 +487,28 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
if( object2d_B == CSGITEM_EMPTY ) if( object2d_B == CSGITEM_EMPTY )
{ {
LAYER_ITEM* objPtr = new LAYER_ITEM( object2d_A, LAYER_ITEM* objPtr = new LAYER_ITEM( object2d_A,
m_boardAdapter.GetLayerBottomZPos( F_Cu ), m_boardAdapter.GetLayerBottomZPos( F_Cu ),
m_boardAdapter.GetLayerBottomZPos( B_Cu ) ); m_boardAdapter.GetLayerBottomZPos( B_Cu ) );
objPtr->SetMaterial( &m_materials.m_EpoxyBoard ); objPtr->SetMaterial( &m_materials.m_EpoxyBoard );
objPtr->SetColor( objPtr->SetColor( ConvertSRGBToLinear( m_boardAdapter.m_BoardBodyColor ) );
ConvertSRGBToLinear( (SFVEC3F) m_boardAdapter.m_BoardBodyColor ) );
m_objectContainer.Add( objPtr ); m_objectContainer.Add( objPtr );
} }
else else
{ {
LAYER_ITEM_2D* itemCSG2d = LAYER_ITEM_2D* itemCSG2d = new LAYER_ITEM_2D( object2d_A, object2d_B,
new LAYER_ITEM_2D( object2d_A, object2d_B, CSGITEM_FULL, CSGITEM_FULL,
(const BOARD_ITEM&) *m_boardAdapter.GetBoard() ); *m_boardAdapter.GetBoard() );
m_containerWithObjectsToDelete.Add( itemCSG2d ); m_containerWithObjectsToDelete.Add( itemCSG2d );
LAYER_ITEM* objPtr = new LAYER_ITEM( itemCSG2d, LAYER_ITEM* objPtr = new LAYER_ITEM( itemCSG2d,
m_boardAdapter.GetLayerBottomZPos( F_Cu ), m_boardAdapter.GetLayerBottomZPos( F_Cu ),
m_boardAdapter.GetLayerBottomZPos( B_Cu ) ); m_boardAdapter.GetLayerBottomZPos( B_Cu ) );
objPtr->SetMaterial( &m_materials.m_EpoxyBoard ); objPtr->SetMaterial( &m_materials.m_EpoxyBoard );
objPtr->SetColor( objPtr->SetColor( ConvertSRGBToLinear( m_boardAdapter.m_BoardBodyColor ) );
ConvertSRGBToLinear( (SFVEC3F) m_boardAdapter.m_BoardBodyColor ) );
m_objectContainer.Add( objPtr ); m_objectContainer.Add( objPtr );
} }
} }
@ -586,24 +523,18 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
{ {
const LIST_OBJECT2D& holeList = m_boardAdapter.GetThroughHoleOds().GetList(); const LIST_OBJECT2D& holeList = m_boardAdapter.GetThroughHoleOds().GetList();
for( LIST_OBJECT2D::const_iterator hole = holeList.begin(); for( const OBJECT_2D* hole2d : holeList )
hole != holeList.end(); ++hole )
{ {
const OBJECT_2D* hole2d = static_cast<const OBJECT_2D*>( *hole );
if( !m_antioutlineBoard2dObjects->GetList().empty() ) if( !m_antioutlineBoard2dObjects->GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
m_antioutlineBoard2dObjects->GetListObjectsIntersects( m_antioutlineBoard2dObjects->GetIntersectingObjects( hole2d->GetBBox(),
hole2d->GetBBox(), intersectionList ); intersecting );
if( !intersectionList.empty() )
{
// Do not add cylinder if it intersects the edge of the board
// Do not add cylinder if it intersects the edge of the board
if( !intersecting.empty() )
continue; continue;
}
} }
switch( hole2d->GetObjectType() ) switch( hole2d->GetObjectType() )
@ -618,8 +549,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
radius ); radius );
objPtr->SetMaterial( &m_materials.m_EpoxyBoard ); objPtr->SetMaterial( &m_materials.m_EpoxyBoard );
objPtr->SetColor( ConvertSRGBToLinear( objPtr->SetColor( ConvertSRGBToLinear( m_boardAdapter.m_BoardBodyColor ) );
(SFVEC3F) m_boardAdapter.m_BoardBodyColor ) );
m_objectContainer.Add( objPtr ); m_objectContainer.Add( objPtr );
} }
@ -638,20 +568,24 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
aStatusReporter->Report( _( "Load Raytracing: layers" ) ); aStatusReporter->Report( _( "Load Raytracing: layers" ) );
// Add layers maps (except B_Mask and F_Mask) // Add layers maps (except B_Mask and F_Mask)
for( MAP_CONTAINER_2D_BASE::const_iterator ii = m_boardAdapter.GetLayerMap().begin(); for( auto entry : m_boardAdapter.GetLayerMap() )
ii != m_boardAdapter.GetLayerMap().end(); ++ii )
{ {
PCB_LAYER_ID layer_id = static_cast<PCB_LAYER_ID>( ii->first ); PCB_LAYER_ID layer_id = entry.first;
const BVH_CONTAINER_2D* container2d = entry.second;
// Only process layers that exist
if( !container2d )
continue;
if( aOnlyLoadCopperAndShapes && !IsCopperLayer( layer_id ) ) if( aOnlyLoadCopperAndShapes && !IsCopperLayer( layer_id ) )
continue; continue;
// Mask layers are not processed here because they are a special case // Mask layers are not processed here because they are a special case
if( ( layer_id == B_Mask ) || ( layer_id == F_Mask ) ) if( layer_id == B_Mask || layer_id == F_Mask )
continue; continue;
MATERIAL* materialLayer = &m_materials.m_SilkS; MATERIAL* materialLayer = &m_materials.m_SilkS;
SFVEC3F layerColor = SFVEC3F( 0.0f, 0.0f, 0.0f ); SFVEC3F layerColor = SFVEC3F( 0.0f, 0.0f, 0.0f );
switch( layer_id ) switch( layer_id )
{ {
@ -667,6 +601,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
layerColor = m_boardAdapter.m_SolderPasteColor; layerColor = m_boardAdapter.m_SolderPasteColor;
else else
layerColor = m_boardAdapter.GetLayerColor( layer_id ); layerColor = m_boardAdapter.GetLayerColor( layer_id );
break; break;
case B_SilkS: case B_SilkS:
@ -676,7 +611,9 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
layerColor = m_boardAdapter.m_SilkScreenColorBot; layerColor = m_boardAdapter.m_SilkScreenColorBot;
else else
layerColor = m_boardAdapter.GetLayerColor( layer_id ); layerColor = m_boardAdapter.GetLayerColor( layer_id );
break; break;
case F_SilkS: case F_SilkS:
materialLayer = &m_materials.m_SilkS; materialLayer = &m_materials.m_SilkS;
@ -684,6 +621,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
layerColor = m_boardAdapter.m_SilkScreenColorTop; layerColor = m_boardAdapter.m_SilkScreenColorTop;
else else
layerColor = m_boardAdapter.GetLayerColor( layer_id ); layerColor = m_boardAdapter.GetLayerColor( layer_id );
break; break;
case Dwgs_User: case Dwgs_User:
@ -711,14 +649,14 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
layerColor = m_boardAdapter.m_CopperColor; layerColor = m_boardAdapter.m_CopperColor;
} }
else else
{
layerColor = m_boardAdapter.GetLayerColor( layer_id ); layerColor = m_boardAdapter.GetLayerColor( layer_id );
}
materialLayer = &m_materials.m_NonPlatedCopper; materialLayer = &m_materials.m_NonPlatedCopper;
break; break;
} }
const BVH_CONTAINER_2D* container2d = static_cast<const BVH_CONTAINER_2D*>( ii->second );
createItemsFromContainer( container2d, layer_id, materialLayer, layerColor, 0.0f ); createItemsFromContainer( container2d, layer_id, materialLayer, layerColor, 0.0f );
} // for each layer on map } // for each layer on map
@ -738,24 +676,23 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
if( !aOnlyLoadCopperAndShapes ) if( !aOnlyLoadCopperAndShapes )
{ {
// Add Mask layer // Add Mask layer
// Solder mask layers are "negative" layers so the elements that we have // Solder mask layers are "negative" layers so the elements that we have in the container
// (in the container) should remove the board outline. // should remove the board outline. We will check for all objects in the outline if it
// We will check for all objects in the outline if it intersects any object // intersects any object in the layer container and also any hole.
// in the layer container and also any hole. if( m_boardAdapter.GetFlag( FL_SOLDERMASK ) && !m_outlineBoard2dObjects->GetList().empty() )
if( m_boardAdapter.GetFlag( FL_SOLDERMASK )
&& ( m_outlineBoard2dObjects->GetList().size() >= 1 ) )
{ {
const MATERIAL* materialLayer = &m_materials.m_SolderMask; const MATERIAL* materialLayer = &m_materials.m_SolderMask;
for( MAP_CONTAINER_2D_BASE::const_iterator ii = m_boardAdapter.GetLayerMap().begin(); for( auto entry : m_boardAdapter.GetLayerMap() )
ii != m_boardAdapter.GetLayerMap().end(); ++ii )
{ {
PCB_LAYER_ID layer_id = static_cast<PCB_LAYER_ID>( ii->first ); PCB_LAYER_ID layer_id = entry.first;
const BVH_CONTAINER_2D* container2d = entry.second;
const BVH_CONTAINER_2D* containerLayer2d = // Only process layers that exist
static_cast<const BVH_CONTAINER_2D*>( ii->second ); if( !container2d )
continue;
// Only get the Solder mask layers // Only get the Solder mask layers (and only if the board has them)
if( !( layer_id == B_Mask || layer_id == F_Mask ) ) if( !( layer_id == B_Mask || layer_id == F_Mask ) )
continue; continue;
@ -777,58 +714,35 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
const float zLayerMax = m_boardAdapter.GetLayerTopZPos( layer_id ); const float zLayerMax = m_boardAdapter.GetLayerTopZPos( layer_id );
// Get the outline board objects // Get the outline board objects
const LIST_OBJECT2D& listObjects = m_outlineBoard2dObjects->GetList(); for( const OBJECT_2D* object2d_A : m_outlineBoard2dObjects->GetList() )
for( LIST_OBJECT2D::const_iterator object2d_iterator = listObjects.begin();
object2d_iterator != listObjects.end(); ++object2d_iterator )
{ {
const OBJECT_2D* object2d_A =
static_cast<const OBJECT_2D*>( *object2d_iterator );
std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>(); std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>();
// Check if there are any THT that intersects this outline object part // Check if there are any THT that intersects this outline object part
if( !m_boardAdapter.GetThroughHoleOds().GetList().empty() ) if( !m_boardAdapter.GetThroughHoleOds().GetList().empty() )
{ {
const BVH_CONTAINER_2D& throughHoles = m_boardAdapter.GetThroughHoleOds();
CONST_LIST_OBJECT2D intersecting;
CONST_LIST_OBJECT2D intersectionList; throughHoles.GetIntersectingObjects( object2d_A->GetBBox(), intersecting );
m_boardAdapter.GetThroughHoleOds().GetListObjectsIntersects( for( const OBJECT_2D* hole : intersecting )
object2d_A->GetBBox(), intersectionList );
if( !intersectionList.empty() )
{ {
for( CONST_LIST_OBJECT2D::const_iterator hole = if( object2d_A->Intersects( hole->GetBBox() ) )
intersectionList.begin(); object2d_B->push_back( hole );
hole != intersectionList.end(); ++hole )
{
const OBJECT_2D* hole2d = static_cast<const OBJECT_2D*>( *hole );
if( object2d_A->Intersects( hole2d->GetBBox() ) )
object2d_B->push_back( hole2d );
}
} }
} }
// Check if there are any objects in the layer to subtract with the // Check if there are any objects in the layer to subtract with the current
// current object // object
if( !containerLayer2d->GetList().empty() ) if( !container2d->GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
containerLayer2d->GetListObjectsIntersects( container2d->GetIntersectingObjects( object2d_A->GetBBox(), intersecting );
object2d_A->GetBBox(), intersectionList );
if( !intersectionList.empty() ) for( const OBJECT_2D* obj : intersecting )
{ object2d_B->push_back( obj );
for( CONST_LIST_OBJECT2D::const_iterator obj = intersectionList.begin();
obj != intersectionList.end(); ++obj )
{
const OBJECT_2D* obj2d = static_cast<const OBJECT_2D*>( *obj );
object2d_B->push_back( obj2d );
}
}
} }
if( object2d_B->empty() ) if( object2d_B->empty() )
@ -853,9 +767,9 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
} }
else else
{ {
LAYER_ITEM_2D* itemCSG2d = LAYER_ITEM_2D* itemCSG2d = new LAYER_ITEM_2D( object2d_A, object2d_B,
new LAYER_ITEM_2D( object2d_A, object2d_B, CSGITEM_FULL, CSGITEM_FULL,
object2d_A->GetBoardItem() ); object2d_A->GetBoardItem() );
m_containerWithObjectsToDelete.Add( itemCSG2d ); m_containerWithObjectsToDelete.Add( itemCSG2d );
@ -919,8 +833,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
const SFVEC3F v2 = SFVEC3F( v1.x, v3.y, v1.z ); const SFVEC3F v2 = SFVEC3F( v1.x, v3.y, v1.z );
const SFVEC3F v4 = SFVEC3F( v3.x, v1.y, v1.z ); const SFVEC3F v4 = SFVEC3F( v3.x, v1.y, v1.z );
SFVEC3F backgroundColor = ConvertSRGBToLinear( SFVEC3F backgroundColor = ConvertSRGBToLinear( m_boardAdapter.m_BgColorTop );
static_cast<SFVEC3F>( m_boardAdapter.m_BgColorTop ) );
TRIANGLE* newTriangle1 = new TRIANGLE( v1, v2, v3 ); TRIANGLE* newTriangle1 = new TRIANGLE( v1, v2, v3 );
TRIANGLE* newTriangle2 = new TRIANGLE( v3, v4, v1 ); TRIANGLE* newTriangle2 = new TRIANGLE( v3, v4, v1 );
@ -928,8 +841,8 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
m_objectContainer.Add( newTriangle1 ); m_objectContainer.Add( newTriangle1 );
m_objectContainer.Add( newTriangle2 ); m_objectContainer.Add( newTriangle2 );
newTriangle1->SetMaterial( (const MATERIAL*) &m_materials.m_Floor ); newTriangle1->SetMaterial( &m_materials.m_Floor );
newTriangle2->SetMaterial( (const MATERIAL*) &m_materials.m_Floor ); newTriangle2->SetMaterial( &m_materials.m_Floor );
newTriangle1->SetColor( backgroundColor ); newTriangle1->SetColor( backgroundColor );
newTriangle2->SetColor( backgroundColor ); newTriangle2->SetColor( backgroundColor );
@ -948,8 +861,8 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe
m_objectContainer.Add( newTriangle3 ); m_objectContainer.Add( newTriangle3 );
m_objectContainer.Add( newTriangle4 ); m_objectContainer.Add( newTriangle4 );
newTriangle3->SetMaterial( (const MATERIAL*) &m_materials.m_Floor ); newTriangle3->SetMaterial( &m_materials.m_Floor );
newTriangle4->SetMaterial( (const MATERIAL*) &m_materials.m_Floor ); newTriangle4->SetMaterial( &m_materials.m_Floor );
newTriangle3->SetColor( backgroundColor ); newTriangle3->SetColor( backgroundColor );
newTriangle4->SetColor( backgroundColor ); newTriangle4->SetColor( backgroundColor );
@ -1037,7 +950,7 @@ void RENDER_3D_RAYTRACE::insertHole( const PCB_VIA* aVia )
- m_boardAdapter.GetCopperThickness(); - m_boardAdapter.GetCopperThickness();
const SFVEC2F center = SFVEC2F( aVia->GetStart().x * m_boardAdapter.BiuTo3dUnits(), const SFVEC2F center = SFVEC2F( aVia->GetStart().x * m_boardAdapter.BiuTo3dUnits(),
-aVia->GetStart().y * m_boardAdapter.BiuTo3dUnits() ); -aVia->GetStart().y * m_boardAdapter.BiuTo3dUnits() );
RING_2D* ring = new RING_2D( center, radiusBUI * m_boardAdapter.BiuTo3dUnits(), RING_2D* ring = new RING_2D( center, radiusBUI * m_boardAdapter.BiuTo3dUnits(),
( radiusBUI + m_boardAdapter.GetHolePlatingThickness() ) ( radiusBUI + m_boardAdapter.GetHolePlatingThickness() )
@ -1050,7 +963,7 @@ void RENDER_3D_RAYTRACE::insertHole( const PCB_VIA* aVia )
objPtr->SetMaterial( &m_materials.m_Copper ); objPtr->SetMaterial( &m_materials.m_Copper );
if( m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE ) ) if( m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE ) )
objPtr->SetColor( ConvertSRGBToLinear( (SFVEC3F) m_boardAdapter.m_CopperColor ) ); objPtr->SetColor( ConvertSRGBToLinear( m_boardAdapter.m_CopperColor ) );
else if( aVia->GetViaType() == VIATYPE::MICROVIA ) else if( aVia->GetViaType() == VIATYPE::MICROVIA )
objPtr->SetColor( ConvertSRGBToLinear( m_boardAdapter.GetItemColor( LAYER_VIA_MICROVIA ) ) ); objPtr->SetColor( ConvertSRGBToLinear( m_boardAdapter.GetItemColor( LAYER_VIA_MICROVIA ) ) );
else if( aVia->GetViaType() == VIATYPE::BLIND_BURIED ) else if( aVia->GetViaType() == VIATYPE::BLIND_BURIED )
@ -1069,7 +982,7 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
SFVEC3F objColor; SFVEC3F objColor;
if( m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE ) ) if( m_boardAdapter.GetFlag( FL_USE_REALISTIC_MODE ) )
objColor = (SFVEC3F) m_boardAdapter.m_CopperColor; objColor = m_boardAdapter.m_CopperColor;
else else
objColor = m_boardAdapter.GetItemColor( LAYER_PADS_TH ); objColor = m_boardAdapter.GetItemColor( LAYER_PADS_TH );
@ -1106,8 +1019,8 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
// it will use instead a CSG of two circles. // it will use instead a CSG of two circles.
if( object2d_A && !m_antioutlineBoard2dObjects->GetList().empty() ) if( object2d_A && !m_antioutlineBoard2dObjects->GetList().empty() )
{ {
m_antioutlineBoard2dObjects->GetListObjectsIntersects( object2d_A->GetBBox(), m_antioutlineBoard2dObjects->GetIntersectingObjects( object2d_A->GetBBox(),
antiOutlineIntersectionList ); antiOutlineIntersectionList );
} }
if( !antiOutlineIntersectionList.empty() ) if( !antiOutlineIntersectionList.empty() )
@ -1120,8 +1033,8 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>(); std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>();
object2d_B->push_back( innerCircle ); object2d_B->push_back( innerCircle );
LAYER_ITEM_2D* itemCSG2d = LAYER_ITEM_2D* itemCSG2d = new LAYER_ITEM_2D( outterCircle, object2d_B, CSGITEM_FULL,
new LAYER_ITEM_2D( outterCircle, object2d_B, CSGITEM_FULL, *aPad ); *aPad );
m_containerWithObjectsToDelete.Add( itemCSG2d ); m_containerWithObjectsToDelete.Add( itemCSG2d );
m_containerWithObjectsToDelete.Add( innerCircle ); m_containerWithObjectsToDelete.Add( innerCircle );
@ -1170,8 +1083,7 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>(); std::vector<const OBJECT_2D*>* object2d_B = new std::vector<const OBJECT_2D*>();
object2d_B->push_back( innerSeg ); object2d_B->push_back( innerSeg );
LAYER_ITEM_2D* itemCSG2d = LAYER_ITEM_2D* itemCSG2d = new LAYER_ITEM_2D( outerSeg, object2d_B, CSGITEM_FULL, *aPad );
new LAYER_ITEM_2D( outerSeg, object2d_B, CSGITEM_FULL, *aPad );
m_containerWithObjectsToDelete.Add( itemCSG2d ); m_containerWithObjectsToDelete.Add( itemCSG2d );
m_containerWithObjectsToDelete.Add( innerSeg ); m_containerWithObjectsToDelete.Add( innerSeg );
@ -1181,9 +1093,8 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
if( object2d_A && !m_antioutlineBoard2dObjects->GetList().empty() ) if( object2d_A && !m_antioutlineBoard2dObjects->GetList().empty() )
{ {
m_antioutlineBoard2dObjects->GetIntersectingObjects( object2d_A->GetBBox(),
m_antioutlineBoard2dObjects->GetListObjectsIntersects( object2d_A->GetBBox(), antiOutlineIntersectionList );
antiOutlineIntersectionList );
} }
} }
@ -1195,30 +1106,20 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
// It will use the non inflated holes // It will use the non inflated holes
if( !m_boardAdapter.GetThroughHoleIds().GetList().empty() ) if( !m_boardAdapter.GetThroughHoleIds().GetList().empty() )
{ {
CONST_LIST_OBJECT2D intersectionList; CONST_LIST_OBJECT2D intersecting;
m_boardAdapter.GetThroughHoleIds().GetListObjectsIntersects(
object2d_A->GetBBox(), intersectionList );
if( !intersectionList.empty() ) m_boardAdapter.GetThroughHoleIds().GetIntersectingObjects( object2d_A->GetBBox(),
intersecting );
for( const OBJECT_2D* hole2d : intersecting )
{ {
for( CONST_LIST_OBJECT2D::const_iterator hole = intersectionList.begin(); if( object2d_A->Intersects( hole2d->GetBBox() ) )
hole != intersectionList.end(); ++hole ) object2d_B->push_back( hole2d );
{
const OBJECT_2D* hole2d = static_cast<const OBJECT_2D*>( *hole );
if( object2d_A->Intersects( hole2d->GetBBox() ) )
object2d_B->push_back( hole2d );
}
} }
} }
if( !antiOutlineIntersectionList.empty() ) for( const OBJECT_2D* obj : antiOutlineIntersectionList )
{ object2d_B->push_back( obj );
for( const OBJECT_2D* obj : antiOutlineIntersectionList )
{
object2d_B->push_back( obj );
}
}
if( object2d_B->empty() ) if( object2d_B->empty() )
{ {
@ -1237,7 +1138,7 @@ void RENDER_3D_RAYTRACE::insertHole( const PAD* aPad )
else else
{ {
LAYER_ITEM_2D* itemCSG2d = new LAYER_ITEM_2D( object2d_A, object2d_B, CSGITEM_FULL, LAYER_ITEM_2D* itemCSG2d = new LAYER_ITEM_2D( object2d_A, object2d_B, CSGITEM_FULL,
(const BOARD_ITEM&) *aPad ); *aPad );
m_containerWithObjectsToDelete.Add( itemCSG2d ); m_containerWithObjectsToDelete.Add( itemCSG2d );
@ -1275,9 +1176,7 @@ void RENDER_3D_RAYTRACE::addPadsAndVias()
for( PAD* pad : footprint->Pads() ) for( PAD* pad : footprint->Pads() )
{ {
if( pad->GetAttribute() != PAD_ATTRIB::NPTH ) if( pad->GetAttribute() != PAD_ATTRIB::NPTH )
{
insertHole( pad ); insertHole( pad );
}
} }
} }
} }