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

Fix VRML export bug. 

* Split graphic circle objects into two 180 degree arcs to prevent the
  VRML_LAYER::AddCircle() function from obscuring objects in the hole
  (cut out) area of the circle.
This commit is contained in:
Wayne Stambaugh 2015-09-09 11:08:53 -04:00
parent 5659e3f8dc
commit 42ecf0a994
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/exporters/export_vrml.cpp
View File

@ -124,6 +124,7 @@ enum VRML_COLOR_INDEX
VRML_COLOR_TRACK, VRML_COLOR_TRACK,
VRML_COLOR_SILK, VRML_COLOR_SILK,
VRML_COLOR_TIN, VRML_COLOR_TIN,
VRML_COLOR_TRANSPARENT,
VRML_COLOR_LAST VRML_COLOR_LAST
}; };
@ -583,6 +584,7 @@ static void export_vrml_drawsegment( MODEL_VRML& aModel, DRAWSEGMENT* drawseg )
double y = drawseg->GetStart().y * aModel.scale; double y = drawseg->GetStart().y * aModel.scale;
double xf = drawseg->GetEnd().x * aModel.scale; double xf = drawseg->GetEnd().x * aModel.scale;
double yf = drawseg->GetEnd().y * aModel.scale; double yf = drawseg->GetEnd().y * aModel.scale;
double r = sqrt( pow( x - xf, 2 ) + pow( y - yf, 2 ) );
// Items on the edge layer are handled elsewhere; just return // Items on the edge layer are handled elsewhere; just return
if( layer == Edge_Cuts ) if( layer == Edge_Cuts )
@ -600,7 +602,10 @@ static void export_vrml_drawsegment( MODEL_VRML& aModel, DRAWSEGMENT* drawseg )
break; break;
case S_CIRCLE: case S_CIRCLE:
export_vrml_circle( aModel, layer, x, y, xf, yf, w ); // Break circles into two 180 arcs to prevent the vrml hole from obscuring objects
// within the hole area of the circle.
export_vrml_arc( aModel, layer, x, y, x, y-r, w, 180.0 );
export_vrml_arc( aModel, layer, x, y, x, y+r, w, 180.0 );
break; break;
default: default:
@ -671,9 +676,9 @@ static void export_vrml_pcbtext( MODEL_VRML& aModel, TEXTE_PCB* text )
static void export_vrml_drawings( MODEL_VRML& aModel, BOARD* pcb ) static void export_vrml_drawings( MODEL_VRML& aModel, BOARD* pcb )
{ {
// draw graphic items // draw graphic items
for( EDA_ITEM* drawing = pcb->m_Drawings; drawing != 0; drawing = drawing->Next() ) for( BOARD_ITEM* drawing = pcb->m_Drawings; drawing != 0; drawing = drawing->Next() )
{ {
LAYER_ID layer = ( (DRAWSEGMENT*) drawing )->GetLayer(); LAYER_ID layer = drawing->GetLayer();
if( layer != F_Cu && layer != B_Cu && layer != B_SilkS && layer != F_SilkS ) if( layer != F_Cu && layer != B_Cu && layer != B_SilkS && layer != F_SilkS )
continue; continue;