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

Export VRML: fix bug that prevent to merge 3D footprint shapes to the board file. 

Fixes #9127
https://gitlab.com/kicad/code/kicad/issues/9127
This commit is contained in:
jean-pierre charras 2021-09-09 18:05:04 +02:00
parent 1a43515128
commit 5e742d97b6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/exporters/export_vrml.cpp
View File

@ -775,10 +775,12 @@ static void compose_quat( double q1[4], double q2[4], double qr[4] )
void EXPORTER_PCB_VRML::ExportVrmlFootprint( FOOTPRINT* aFootprint, std::ostream* aOutputFile )
{
wxCHECK( aFootprint && aOutputFile, /* void */ );
int old_precision = aOutputFile->precision();
aOutputFile->precision( m_precision );
// Note: if m_UseInlineModelsInBrdfile is false, the 3D footprint shape is copied to
// the vrml board file, and aOutputFile is not used (can be nullptr)
// if m_UseInlineModelsInBrdfile is true, the 3D footprint shape is copied to
// aOutputFile (with the suitable rotation/translation/scale transform, and the vrml board
// file contains only the filename of 3D shapes to add to the full vrml scene
wxCHECK( aFootprint, /* void */ );
// Export pad holes
for( PAD* pad : aFootprint->Pads() )
@ -854,6 +856,11 @@ void EXPORTER_PCB_VRML::ExportVrmlFootprint( FOOTPRINT* aFootprint, std::ostream
if( m_UseInlineModelsInBrdfile )
{
wxCHECK( aOutputFile, /* void */ );
int old_precision = aOutputFile->precision();
aOutputFile->precision( m_precision );
wxFileName srcFile = m_Cache3Dmodels->GetResolver()->ResolvePath( sM->m_Filename );
wxFileName dstFile;
dstFile.SetPath( m_Subdir3DFpModels );
@ -923,6 +930,8 @@ void EXPORTER_PCB_VRML::ExportVrmlFootprint( FOOTPRINT* aFootprint, std::ostream
fn.Replace( "\\", "/" );
(*aOutputFile) << TO_UTF8( fn ) << "\"\n } ]\n";
(*aOutputFile) << " }\n";
aOutputFile->precision( old_precision );
}
else
{
@ -949,8 +958,6 @@ void EXPORTER_PCB_VRML::ExportVrmlFootprint( FOOTPRINT* aFootprint, std::ostream
++sM;
}
aOutputFile->precision( old_precision );
}