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

Very minor fix: fix shadowed local vars.

This commit is contained in:
jean-pierre charras 2016-06-15 10:27:24 +02:00
parent 947c73f23b
commit 7abf006c80
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
3d-viewer/x3dmodelparser.cpp
View File

@ -433,13 +433,13 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,
// Save points to vector as doubles // Save points to vector as doubles
wxStringTokenizer point_tokens( coordinate_properties[ wxT( "point" ) ] ); wxStringTokenizer point_tokens( coordinate_properties[ wxT( "point" ) ] );
double point = 0.0; double dpoint = 0.0;
while( point_tokens.HasMoreTokens() ) while( point_tokens.HasMoreTokens() )
{ {
if( point_tokens.GetNextToken().ToDouble( &point ) ) if( point_tokens.GetNextToken().ToDouble( &dpoint ) )
{ {
points.push_back( point ); points.push_back( dpoint );
} }
else else
{ {
@ -462,24 +462,24 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,
for( unsigned id = 0; id < points.size() / 3; id++ ) for( unsigned id = 0; id < points.size() / 3; id++ )
{ {
int triplet_indx = id * 3; int triplet_indx = id * 3;
S3D_VERTEX point( points[ triplet_indx ], S3D_VERTEX vpoint( points[ triplet_indx ],
points[ triplet_indx + 1 ], points[ triplet_indx + 1 ],
points[ triplet_indx + 2 ] ); points[ triplet_indx + 2 ] );
point.x *= scale.x; vpoint.x *= scale.x;
point.y *= scale.y; vpoint.y *= scale.y;
point.z *= scale.z; vpoint.z *= scale.z;
rotate( point, rotation, angle ); rotate( vpoint, rotation, angle );
point.x += translation.x; vpoint.x += translation.x;
point.y += translation.y; vpoint.y += translation.y;
point.z += translation.z; vpoint.z += translation.z;
m_model->m_Point.push_back( point ); m_model->m_Point.push_back( vpoint );
// VRML // VRML
vrml_pointlist.Append( wxString::Format( wxT( "%f %f %f\n" ), point.x, point.y, point.z ) ); vrml_pointlist.Append( wxString::Format( wxT( "%f %f %f\n" ), vpoint.x, vpoint.y, vpoint.z ) );
} }
vrml_points.push_back( vrml_pointlist ); vrml_points.push_back( vrml_pointlist );

2
pcbnew/router/pns_optimizer.cpp
View File

@ -315,7 +315,7 @@ void LINE_RESTRICTIONS::Build( PNS_NODE* aWorld, PNS_LINE* aOriginLine, const SH
for( int i = 0; i < n; i++ ) for( int i = 0; i < n; i++ )
{ {
const VECTOR2I &v = l.CPoint( i ), v_next; const VECTOR2I &v = l.CPoint( i );
RVERTEX r( false, 0xff ); RVERTEX r( false, 0xff );
if( aRestrictedAreaEnable ) if( aRestrictedAreaEnable )