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

Overhaul 3D degenerate shape protection.

This commit is contained in:
Jeff Young 2023-09-14 12:32:54 +01:00
parent 51456d973b
commit 8cf291e423
4 changed files with 111 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3d-viewer/3d_canvas/board_adapter.h
View File

@ -351,7 +351,8 @@ private:
void createPadWithMargin( const PAD *aPad, CONTAINER_2D_BASE* aDstContainer, void createPadWithMargin( const PAD *aPad, CONTAINER_2D_BASE* aDstContainer,
PCB_LAYER_ID aLayer, const VECTOR2I& aMargin ) const; PCB_LAYER_ID aLayer, const VECTOR2I& aMargin ) const;
OBJECT_2D* createPadWithDrill( const PAD* aPad, int aInflateValue ); OBJECT_2D* createPadWithHole( const PAD* aPad, CONTAINER_2D_BASE* aDstContainer,
int aInflateValue );
void addPads( const FOOTPRINT* aFootprint, CONTAINER_2D_BASE* aDstContainer, void addPads( const FOOTPRINT* aFootprint, CONTAINER_2D_BASE* aDstContainer,
PCB_LAYER_ID aLayerId, bool aSkipPlatedPads, bool aSkipNonPlatedPads ); PCB_LAYER_ID aLayerId, bool aSkipPlatedPads, bool aSkipNonPlatedPads );
@ -372,9 +373,9 @@ private:
void addSolidAreasShapes( const ZONE* aZone, CONTAINER_2D_BASE* aDstContainer, void addSolidAreasShapes( const ZONE* aZone, CONTAINER_2D_BASE* aDstContainer,
PCB_LAYER_ID aLayerId ); PCB_LAYER_ID aLayerId );
void transformArcToSegments( const VECTOR2I& aCentre, const VECTOR2I& aStart, void createArcSegments( const VECTOR2I& aCentre, const VECTOR2I& aStart,
const EDA_ANGLE& aArcAngle, int aCircleToSegmentsCount, int aWidth, const EDA_ANGLE& aArcAngle, int aCircleToSegmentsCount, int aWidth,
CONTAINER_2D_BASE* aDstContainer, const BOARD_ITEM& aOwner ); CONTAINER_2D_BASE* aContainer, const BOARD_ITEM& aOwner );
void buildPadOutlineAsSegments( const PAD* aPad, CONTAINER_2D_BASE* aDstContainer, int aWidth ); void buildPadOutlineAsSegments( const PAD* aPad, CONTAINER_2D_BASE* aDstContainer, int aWidth );

300
3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
View File

@ -62,6 +62,39 @@
#define TO_SFVEC2F( vec ) SFVEC2F( TO_3DU( vec.x ), TO_3DU( -vec.y ) ) #define TO_SFVEC2F( vec ) SFVEC2F( TO_3DU( vec.x ), TO_3DU( -vec.y ) )
void addFILLED_CIRCLE_2D( CONTAINER_2D_BASE* aContainer, const SFVEC2F& aCenter, float aRadius,
const BOARD_ITEM& aBoardItem )
{
if( aRadius > 0.0f )
aContainer->Add( new FILLED_CIRCLE_2D( aCenter, aRadius, aBoardItem ) );
}
void addRING_2D( CONTAINER_2D_BASE* aContainer, const SFVEC2F& aCenter, float aInnerRadius,
float aOuterRadius, const BOARD_ITEM& aBoardItem )
{
if( aOuterRadius > aInnerRadius && aInnerRadius > 0.0f )
aContainer->Add( new RING_2D( aCenter, aInnerRadius, aOuterRadius, aBoardItem ) );
}
void addROUND_SEGMENT_2D( CONTAINER_2D_BASE* aContainer, const SFVEC2F& aStart, const SFVEC2F& aEnd,
float aWidth, const BOARD_ITEM& aBoardItem )
{
if( Is_segment_a_circle( aStart, aEnd ) )
{
// Cannot add segments that have the same start and end point
addFILLED_CIRCLE_2D( aContainer, aStart, aWidth / 2, aBoardItem );
return;
}
if( aWidth > 0.0f )
aContainer->Add( new ROUND_SEGMENT_2D( aStart, aEnd, aWidth, aBoardItem ) );
}
void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContainer, void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContainer,
const BOARD_ITEM* aOwner ) const BOARD_ITEM* aOwner )
{ {
@ -91,24 +124,8 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
// Stroke callback // Stroke callback
[&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2 ) [&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2 )
{ {
const SFVEC2F pt1_3DU = TO_SFVEC2F( aPt1 ); addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( aPt1 ), TO_SFVEC2F( aPt2 ),
const SFVEC2F pt2_3DU = TO_SFVEC2F( aPt2 ); penWidth_3DU, *aOwner );
if( penWidth_3DU == 0.0 )
{
// Don't attempt to render degenerate shapes
}
else if( Is_segment_a_circle( pt1_3DU, pt2_3DU ) )
{
// Cannot add segments that have the same start and end point
aContainer->Add( new FILLED_CIRCLE_2D( pt1_3DU, penWidth_3DU / 2,
*aOwner ) );
}
else
{
aContainer->Add( new ROUND_SEGMENT_2D( pt1_3DU, pt2_3DU, penWidth_3DU,
*aOwner ) );
}
}, },
// Triangulation callback // Triangulation callback
[&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2, const VECTOR2I& aPt3 ) [&]( const VECTOR2I& aPt1, const VECTOR2I& aPt2, const VECTOR2I& aPt3 )
@ -140,18 +157,19 @@ void BOARD_ADAPTER::addShape( const PCB_DIMENSION_BASE* aDimension, CONTAINER_2D
{ {
const SEG& seg = static_cast<const SHAPE_SEGMENT*>( shape.get() )->GetSeg(); const SEG& seg = static_cast<const SHAPE_SEGMENT*>( shape.get() )->GetSeg();
aContainer->Add( new ROUND_SEGMENT_2D( TO_SFVEC2F( seg.A ), TO_SFVEC2F( seg.B ), addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( seg.A ), TO_SFVEC2F( seg.B ),
TO_3DU( linewidth ), *aOwner ) ); TO_3DU( linewidth ), *aOwner );
break; break;
} }
case SH_CIRCLE: case SH_CIRCLE:
{ {
int radius = static_cast<const SHAPE_CIRCLE*>( shape.get() )->GetRadius(); int radius = static_cast<const SHAPE_CIRCLE*>( shape.get() )->GetRadius();
int delta = aDimension->GetLineThickness() / 2; float innerR3DU = TO_3DU( radius ) - TO_3DU( aDimension->GetLineThickness() ) / 2.0f;
float outerR3DU = TO_3DU( radius ) + TO_3DU( aDimension->GetLineThickness() ) / 2.0f;
addRING_2D( aContainer, TO_SFVEC2F( shape->Centre() ), innerR3DU, outerR3DU, *aOwner );
aContainer->Add( new RING_2D( TO_SFVEC2F( shape->Centre() ), TO_3DU( radius - delta ),
TO_3DU( radius + delta ), *aOwner ) );
break; break;
} }
@ -260,8 +278,7 @@ void BOARD_ADAPTER::createViaWithMargin( const PCB_TRACK* aTrack, CONTAINER_2D_B
const float radius3DU = TO_3DU( ( aTrack->GetWidth() / 2 ) + aMargin ); const float radius3DU = TO_3DU( ( aTrack->GetWidth() / 2 ) + aMargin );
if( radius3DU > 0.0 ) addFILLED_CIRCLE_2D( aDstContainer, start3DU, radius3DU, *aTrack );
aDstContainer->Add( new FILLED_CIRCLE_2D( start3DU, radius3DU, *aTrack ) );
} }
@ -273,14 +290,8 @@ void BOARD_ADAPTER::createTrack( const PCB_TRACK* aTrack, CONTAINER_2D_BASE* aDs
switch( aTrack->Type() ) switch( aTrack->Type() )
{ {
case PCB_VIA_T: case PCB_VIA_T:
{ addFILLED_CIRCLE_2D( aDstContainer, start3DU, TO_3DU( aTrack->GetWidth() / 2 ), *aTrack );
const float radius3DU = TO_3DU( aTrack->GetWidth() / 2 );
if( radius3DU > 0.0 )
aDstContainer->Add( new FILLED_CIRCLE_2D( start3DU, radius3DU, *aTrack ) );
break; break;
}
case PCB_ARC_T: case PCB_ARC_T:
{ {
@ -321,29 +332,14 @@ void BOARD_ADAPTER::createTrack( const PCB_TRACK* aTrack, CONTAINER_2D_BASE* aDs
circlesegcount = alg::clamp( 1, circlesegcount, 128 ); circlesegcount = alg::clamp( 1, circlesegcount, 128 );
} }
transformArcToSegments( VECTOR2I( center.x, center.y ), arc->GetStart(), arc_angle, createArcSegments( VECTOR2I( center.x, center.y ), arc->GetStart(), arc_angle,
circlesegcount, arc->GetWidth(), aDstContainer, *arc ); circlesegcount, arc->GetWidth(), aDstContainer, *arc );
break; break;
} }
case PCB_TRACE_T: // Track is a usual straight segment case PCB_TRACE_T: // Track is a usual straight segment
{ {
if( aTrack->GetWidth() == 0 ) addROUND_SEGMENT_2D( aDstContainer, start3DU, end3DU, TO_3DU( aTrack->GetWidth() ), *aTrack );
{
// Don't attempt to render degenerate shapes
}
else if( Is_segment_a_circle( start3DU, end3DU ) )
{
// Cannot add segments that have the same start and end point
aDstContainer->Add( new FILLED_CIRCLE_2D( start3DU, TO_3DU( aTrack->GetWidth() / 2 ),
*aTrack ) );
}
else
{
aDstContainer->Add( new ROUND_SEGMENT_2D( start3DU, end3DU, TO_3DU( aTrack->GetWidth() ),
*aTrack ) );
}
break; break;
} }
@ -395,24 +391,11 @@ void BOARD_ADAPTER::createPadWithMargin( const PAD* aPad, CONTAINER_2D_BASE* aCo
{ {
const SHAPE_SEGMENT* seg = static_cast<const SHAPE_SEGMENT*>( shape ); const SHAPE_SEGMENT* seg = static_cast<const SHAPE_SEGMENT*>( shape );
const SFVEC2F a3DU = TO_SFVEC2F( seg->GetSeg().A ); addROUND_SEGMENT_2D( aContainer,
const SFVEC2F b3DU = TO_SFVEC2F( seg->GetSeg().B ); TO_SFVEC2F( seg->GetSeg().A ),
const double width3DU = TO_3DU( seg->GetWidth() + clearance.x * 2 ); TO_SFVEC2F( seg->GetSeg().B ),
TO_3DU( seg->GetWidth() + clearance.x * 2 ),
if( width3DU == 0.0 ) *aPad );
{
// Don't attempt to render degenerate shapes
}
else if( Is_segment_a_circle( a3DU, b3DU ) )
{
// Cannot add segments that have the same start and end point
aContainer->Add( new FILLED_CIRCLE_2D( a3DU, width3DU / 2, *aPad ) );
}
else
{
aContainer->Add( new ROUND_SEGMENT_2D( a3DU, b3DU, width3DU, *aPad ) );
}
break; break;
} }
@ -420,13 +403,10 @@ void BOARD_ADAPTER::createPadWithMargin( const PAD* aPad, CONTAINER_2D_BASE* aCo
{ {
const SHAPE_CIRCLE* circle = static_cast<const SHAPE_CIRCLE*>( shape ); const SHAPE_CIRCLE* circle = static_cast<const SHAPE_CIRCLE*>( shape );
const double radius3DU = TO_3DU( circle->GetRadius() + clearance.x ); addFILLED_CIRCLE_2D( aContainer,
const SFVEC2F center3DU = TO_SFVEC2F( circle->GetCenter() ); TO_SFVEC2F( circle->GetCenter() ),
TO_3DU( circle->GetRadius() + clearance.x ),
// Don't render zero radius circles *aPad );
if( radius3DU > 0.0 )
aContainer->Add( new FILLED_CIRCLE_2D( center3DU, radius3DU, *aPad ) );
break; break;
} }
@ -458,23 +438,12 @@ void BOARD_ADAPTER::createPadWithMargin( const PAD* aPad, CONTAINER_2D_BASE* aCo
for( int i = 0; i < l.SegmentCount(); i++ ) for( int i = 0; i < l.SegmentCount(); i++ )
{ {
SHAPE_SEGMENT seg( l.Segment( i ).A, l.Segment( i ).B, arc->GetWidth() ); SHAPE_SEGMENT seg( l.Segment( i ).A, l.Segment( i ).B, arc->GetWidth() );
const SFVEC2F a3DU = TO_SFVEC2F( seg.GetSeg().A );
const SFVEC2F b3DU = TO_SFVEC2F( seg.GetSeg().B );
const double width3DU = TO_3DU( arc->GetWidth() + clearance.x * 2 );
if( width3DU == 0.0 ) addROUND_SEGMENT_2D( aContainer,
{ TO_SFVEC2F( seg.GetSeg().A ),
// Don't attempt to render degenerate shapes TO_SFVEC2F( seg.GetSeg().B ),
} TO_3DU( arc->GetWidth() + clearance.x * 2 ),
else if( Is_segment_a_circle( a3DU, b3DU ) ) *aPad );
{
// Cannot add segments that have the same start and end point
aContainer->Add( new FILLED_CIRCLE_2D( a3DU, width3DU / 2, *aPad ) );
}
else
{
aContainer->Add( new ROUND_SEGMENT_2D( a3DU, b3DU, width3DU, *aPad ) );
}
} }
break; break;
@ -498,29 +467,22 @@ void BOARD_ADAPTER::createPadWithMargin( const PAD* aPad, CONTAINER_2D_BASE* aCo
} }
OBJECT_2D* BOARD_ADAPTER::createPadWithDrill( const PAD* aPad, int aInflateValue ) OBJECT_2D* BOARD_ADAPTER::createPadWithHole( const PAD* aPad, CONTAINER_2D_BASE* aDstContainer,
int aInflateValue )
{ {
if( !aPad->HasHole() ) if( !aPad->HasHole() )
{ {
wxLogTrace( m_logTrace, wxT( "BOARD_ADAPTER::createPadWithDrill - found an invalid pad" ) ); wxLogTrace( m_logTrace, wxT( "BOARD_ADAPTER::createPadWithHole - found an invalid pad" ) );
return nullptr; return nullptr;
} }
std::shared_ptr<SHAPE_SEGMENT> slot = aPad->GetEffectiveHoleShape(); std::shared_ptr<SHAPE_SEGMENT> slot = aPad->GetEffectiveHoleShape();
if( slot->GetSeg().A == slot->GetSeg().B ) addROUND_SEGMENT_2D( aDstContainer,
{ TO_SFVEC2F( slot->GetSeg().A ),
return new FILLED_CIRCLE_2D( TO_SFVEC2F( slot->GetSeg().A ), TO_SFVEC2F( slot->GetSeg().B ),
TO_3DU( slot->GetWidth() / 2 + aInflateValue ), TO_3DU( slot->GetWidth() + aInflateValue * 2 ),
*aPad ); *aPad );
}
else
{
return new ROUND_SEGMENT_2D( TO_SFVEC2F( slot->GetSeg().A ),
TO_SFVEC2F( slot->GetSeg().B ),
TO_3DU( slot->GetWidth() + aInflateValue * 2 ),
*aPad );
}
} }
@ -589,10 +551,10 @@ void BOARD_ADAPTER::addPads( const FOOTPRINT* aFootprint, CONTAINER_2D_BASE* aCo
// based on TransformArcToPolygon function from // based on TransformArcToPolygon function from
// common/convert_basic_shapes_to_polygon.cpp // common/convert_basic_shapes_to_polygon.cpp
void BOARD_ADAPTER::transformArcToSegments( const VECTOR2I& aCentre, const VECTOR2I& aStart, void BOARD_ADAPTER::createArcSegments( const VECTOR2I& aCentre, const VECTOR2I& aStart,
const EDA_ANGLE& aArcAngle, int aCircleToSegmentsCount, const EDA_ANGLE& aArcAngle, int aCircleToSegmentsCount,
int aWidth, CONTAINER_2D_BASE* aContainer, int aWidth, CONTAINER_2D_BASE* aContainer,
const BOARD_ITEM& aOwner ) const BOARD_ITEM& aOwner )
{ {
// Don't attempt to render degenerate shapes // Don't attempt to render degenerate shapes
if( aWidth == 0 ) if( aWidth == 0 )
@ -622,26 +584,16 @@ void BOARD_ADAPTER::transformArcToSegments( const VECTOR2I& aCentre, const VECTO
curr_end = arc_start; curr_end = arc_start;
RotatePoint( curr_end, aCentre, -ii ); RotatePoint( curr_end, aCentre, -ii );
const SFVEC2F start3DU = TO_SFVEC2F( curr_start ); addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( curr_start ), TO_SFVEC2F( curr_end ),
const SFVEC2F end3DU = TO_SFVEC2F( curr_end ); TO_3DU( aWidth ), aOwner );
if( Is_segment_a_circle( start3DU, end3DU ) )
aContainer->Add( new FILLED_CIRCLE_2D( start3DU, TO_3DU( aWidth / 2 ), aOwner ) );
else
aContainer->Add( new ROUND_SEGMENT_2D( start3DU, end3DU, TO_3DU( aWidth ), aOwner ) );
curr_start = curr_end; curr_start = curr_end;
} }
if( curr_end != arc_end ) if( curr_end != arc_end )
{ {
const SFVEC2F start3DU = TO_SFVEC2F( curr_end ); addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( curr_end ), TO_SFVEC2F( arc_end ),
const SFVEC2F end3DU = TO_SFVEC2F( arc_end ); TO_3DU( aWidth ), aOwner );
if( Is_segment_a_circle( start3DU, end3DU ) )
aContainer->Add( new FILLED_CIRCLE_2D( start3DU, TO_3DU( aWidth / 2 ), aOwner ) );
else
aContainer->Add( new ROUND_SEGMENT_2D( start3DU, end3DU, TO_3DU( aWidth ), aOwner ) );
} }
} }
@ -650,8 +602,7 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
const BOARD_ITEM* aOwner ) const BOARD_ITEM* aOwner )
{ {
// The full width of the lines to create // The full width of the lines to create
// The extra 1 protects the inner/outer radius values from degeneracy const float linewidth3DU = TO_3DU( aShape->GetWidth() );
const int linewidth = aShape->GetWidth() + 1;
PLOT_DASH_TYPE lineStyle = aShape->GetStroke().GetPlotStyle(); PLOT_DASH_TYPE lineStyle = aShape->GetStroke().GetPlotStyle();
if( lineStyle <= PLOT_DASH_TYPE::FIRST_TYPE ) if( lineStyle <= PLOT_DASH_TYPE::FIRST_TYPE )
@ -660,23 +611,14 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
{ {
case SHAPE_T::CIRCLE: case SHAPE_T::CIRCLE:
{ {
const SFVEC2F center3DU = TO_SFVEC2F( aShape->GetCenter() ); SFVEC2F center3DU = TO_SFVEC2F( aShape->GetCenter() );
float inner_radius3DU = TO_3DU( aShape->GetRadius() - linewidth / 2 ); float innerR3DU = TO_3DU( aShape->GetRadius() ) - linewidth3DU / 2.0;
float outer_radius3DU = TO_3DU( aShape->GetRadius() + linewidth / 2 ); float outerR3DU = TO_3DU( aShape->GetRadius() ) + linewidth3DU / 2.0;
if( inner_radius3DU < 0 )
inner_radius3DU = 0.0;
if( aShape->IsFilled() ) if( aShape->IsFilled() )
{ addFILLED_CIRCLE_2D( aContainer, center3DU, outerR3DU, *aOwner );
aContainer->Add( new FILLED_CIRCLE_2D( center3DU, outer_radius3DU, else
*aOwner ) ); addRING_2D( aContainer, center3DU, innerR3DU, outerR3DU, *aOwner );
}
else if( outer_radius3DU > inner_radius3DU )
{
aContainer->Add( new RING_2D( center3DU, inner_radius3DU, outer_radius3DU,
*aOwner ) );
}
break; break;
} }
@ -697,14 +639,14 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
{ {
std::vector<VECTOR2I> pts = aShape->GetRectCorners(); std::vector<VECTOR2I> pts = aShape->GetRectCorners();
aContainer->Add( new ROUND_SEGMENT_2D( TO_SFVEC2F( pts[0] ), TO_SFVEC2F( pts[1] ), addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( pts[0] ), TO_SFVEC2F( pts[1] ),
TO_3DU( linewidth ), *aOwner ) ); linewidth3DU, *aOwner );
aContainer->Add( new ROUND_SEGMENT_2D( TO_SFVEC2F( pts[1] ), TO_SFVEC2F( pts[2] ), addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( pts[1] ), TO_SFVEC2F( pts[2] ),
TO_3DU( linewidth ), *aOwner ) ); linewidth3DU, *aOwner );
aContainer->Add( new ROUND_SEGMENT_2D( TO_SFVEC2F( pts[2] ), TO_SFVEC2F( pts[3] ), addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( pts[2] ), TO_SFVEC2F( pts[3] ),
TO_3DU( linewidth ), *aOwner ) ); linewidth3DU, *aOwner );
aContainer->Add( new ROUND_SEGMENT_2D( TO_SFVEC2F( pts[3] ), TO_SFVEC2F( pts[0] ), addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( pts[3] ), TO_SFVEC2F( pts[0] ),
TO_3DU( linewidth ), *aOwner ) ); linewidth3DU, *aOwner );
} }
break; break;
@ -712,33 +654,15 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
{ {
unsigned int segCount = GetCircleSegmentCount( aShape->GetBoundingBox().GetSizeMax() ); unsigned int segCount = GetCircleSegmentCount( aShape->GetBoundingBox().GetSizeMax() );
transformArcToSegments( aShape->GetCenter(), aShape->GetStart(), aShape->GetArcAngle(), createArcSegments( aShape->GetCenter(), aShape->GetStart(), aShape->GetArcAngle(),
segCount, linewidth, aContainer, *aOwner ); segCount, aShape->GetWidth(), aContainer, *aOwner );
break; break;
} }
case SHAPE_T::SEGMENT: case SHAPE_T::SEGMENT:
{ addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( aShape->GetStart() ),
const SFVEC2F start3DU = TO_SFVEC2F( aShape->GetStart() ); TO_SFVEC2F( aShape->GetEnd() ), linewidth3DU, *aOwner );
const SFVEC2F end3DU = TO_SFVEC2F( aShape->GetEnd() );
const double linewidth3DU = TO_3DU( linewidth );
if( linewidth3DU == 0.0 )
{
// Don't attempt to render degenerate shapes
}
else if( Is_segment_a_circle( start3DU, end3DU ) )
{
// Cannot add segments that have the same start and end point
aContainer->Add( new FILLED_CIRCLE_2D( start3DU, linewidth3DU / 2, *aOwner ) );
}
else
{
aContainer->Add( new ROUND_SEGMENT_2D( start3DU, end3DU, linewidth3DU, *aOwner ) );
}
break; break;
}
case SHAPE_T::BEZIER: case SHAPE_T::BEZIER:
case SHAPE_T::POLY: case SHAPE_T::POLY:
@ -761,12 +685,11 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
break; break;
} }
} }
else if( linewidth > 0 ) else
{ {
std::vector<SHAPE*> shapes = aShape->MakeEffectiveShapes( true ); std::vector<SHAPE*> shapes = aShape->MakeEffectiveShapes( true );
SFVEC2F a3DU; SFVEC2F a3DU;
SFVEC2F b3DU; SFVEC2F b3DU;
double width3DU = TO_3DU( linewidth );
const PCB_PLOT_PARAMS& plotParams = aShape->GetBoard()->GetPlotOptions(); const PCB_PLOT_PARAMS& plotParams = aShape->GetBoard()->GetPlotOptions();
KIGFX::PCB_RENDER_SETTINGS renderSettings; KIGFX::PCB_RENDER_SETTINGS renderSettings;
@ -776,16 +699,11 @@ void BOARD_ADAPTER::addShape( const PCB_SHAPE* aShape, CONTAINER_2D_BASE* aConta
for( SHAPE* shape : shapes ) for( SHAPE* shape : shapes )
{ {
STROKE_PARAMS::Stroke( shape, lineStyle, linewidth, &renderSettings, STROKE_PARAMS::Stroke( shape, lineStyle, aShape->GetWidth(), &renderSettings,
[&]( const VECTOR2I& a, const VECTOR2I& b ) [&]( const VECTOR2I& a, const VECTOR2I& b )
{ {
a3DU = TO_SFVEC2F( a ); addROUND_SEGMENT_2D( aContainer, TO_SFVEC2F( a ), TO_SFVEC2F( b ),
b3DU = TO_SFVEC2F( b ); linewidth3DU, *aOwner );
if( Is_segment_a_circle( a3DU, b3DU ) )
aContainer->Add( new FILLED_CIRCLE_2D( a3DU, width3DU / 2, *aOwner ) );
else
aContainer->Add( new ROUND_SEGMENT_2D( a3DU, b3DU, width3DU, *aOwner ) );
} ); } );
} }
@ -799,8 +717,8 @@ void BOARD_ADAPTER::addSolidAreasShapes( const ZONE* aZone, CONTAINER_2D_BASE* a
PCB_LAYER_ID aLayerId ) PCB_LAYER_ID aLayerId )
{ {
// This convert the poly in outline and holes // This convert the poly in outline and holes
ConvertPolygonToTriangles( *aZone->GetFilledPolysList( aLayerId ), *aContainer, ConvertPolygonToTriangles( *aZone->GetFilledPolysList( aLayerId ), *aContainer, m_biuTo3Dunits,
m_biuTo3Dunits, *aZone ); *aZone );
} }
@ -814,7 +732,7 @@ void BOARD_ADAPTER::buildPadOutlineAsSegments( const PAD* aPad, CONTAINER_2D_BAS
const float inner_radius3DU = TO_3DU( radius - aWidth / 2 ); const float inner_radius3DU = TO_3DU( radius - aWidth / 2 );
const float outer_radius3DU = TO_3DU( radius + aWidth / 2 ); const float outer_radius3DU = TO_3DU( radius + aWidth / 2 );
aContainer->Add( new RING_2D( center3DU, inner_radius3DU, outer_radius3DU, *aPad ) ); addRING_2D( aContainer, center3DU, inner_radius3DU, outer_radius3DU, *aPad );
return; return;
} }
@ -828,18 +746,6 @@ void BOARD_ADAPTER::buildPadOutlineAsSegments( const PAD* aPad, CONTAINER_2D_BAS
SFVEC2F start3DU = TO_SFVEC2F( path.CPoint( j ) ); SFVEC2F start3DU = TO_SFVEC2F( path.CPoint( j ) );
SFVEC2F end3DU = TO_SFVEC2F( path.CPoint( j + 1 ) ); SFVEC2F end3DU = TO_SFVEC2F( path.CPoint( j + 1 ) );
if( aWidth == 0 ) addROUND_SEGMENT_2D( aContainer, start3DU, end3DU, TO_3DU( aWidth ), *aPad );
{
// Don't attempt to render degenerate shapes
}
else if( Is_segment_a_circle( start3DU, end3DU ) )
{
// Cannot add segments that have the same start and end point
aContainer->Add( new FILLED_CIRCLE_2D( start3DU, TO_3DU( aWidth / 2 ), *aPad ) );
}
else
{
aContainer->Add( new ROUND_SEGMENT_2D( start3DU, end3DU, TO_3DU( aWidth ), *aPad ) );
}
} }
} }

6
3d-viewer/3d_canvas/create_layer_items.cpp
View File

@ -464,12 +464,12 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
m_averageHoleDiameter += ( ( pad->GetDrillSize().x + m_averageHoleDiameter += ( ( pad->GetDrillSize().x +
pad->GetDrillSize().y ) / 2.0f ) * m_biuTo3Dunits; pad->GetDrillSize().y ) / 2.0f ) * m_biuTo3Dunits;
m_throughHoleOds.Add( createPadWithDrill( pad, inflate ) ); createPadWithHole( pad, &m_throughHoleOds, inflate );
if( m_Cfg->m_Render.clip_silk_on_via_annulus ) if( m_Cfg->m_Render.clip_silk_on_via_annulus )
m_throughHoleAnnularRings.Add( createPadWithDrill( pad, inflate ) ); createPadWithHole( pad, &m_throughHoleAnnularRings, inflate );
m_throughHoleIds.Add( createPadWithDrill( pad, 0 ) ); createPadWithHole( pad, &m_throughHoleIds, 0 );
} }
} }

1
3d-viewer/3d_rendering/raytracing/shapes2D/round_segment_2d.h
View File

@ -31,6 +31,7 @@
#include "object_2d.h" #include "object_2d.h"
#include "../ray.h" #include "../ray.h"
#include "filled_circle_2d.h"
#include <plugins/3dapi/xv3d_types.h> // SFVEC2F #include <plugins/3dapi/xv3d_types.h> // SFVEC2F
class BOARD_ITEM; class BOARD_ITEM;