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

3D-Viewer: fix code style

This commit is contained in:
Mario Luzeiro 2020-11-01 08:10:08 +00:00 committed by Wayne Stambaugh
parent 386a0bbe4a
commit 3fce3b6591
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.cpp
View File

@ -116,15 +116,15 @@ bool CITEMLAYERCSG2D::Intersect( const RAYSEG2D &aSegRay,
//check against all subbed objects //check against all subbed objects
for( unsigned int i = 0; i < m_objectB->size(); ++i ) for( unsigned int i = 0; i < m_objectB->size(); ++i )
{ {
if( ((const COBJECT2D *)(*m_objectB)[i])->IsPointInside( currentRayPos ) ) if( ( (const COBJECT2D *)( *m_objectB)[i] )->IsPointInside( currentRayPos ) )
{ {
// ray point is inside a subtracted region, so move it to the end of the // ray point is inside a subtracted region, so move it to the end of the
// subtracted region // subtracted region
float hitDist; float hitDist;
SFVEC2F tmpNormal; SFVEC2F tmpNormal;
if( !((const COBJECT2D *)(*m_objectB)[i])->Intersect( currentRay, if( !( (const COBJECT2D *)( *m_objectB)[i] )->Intersect( currentRay,
&hitDist, &hitDist,
&tmpNormal ) ) &tmpNormal ) )
return false; // ray hit main object but did not leave subtracted volume return false; // ray hit main object but did not leave subtracted volume
wxASSERT( hitDist <= 1.0f ); wxASSERT( hitDist <= 1.0f );

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.cpp
View File

@ -541,7 +541,7 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
SFVEC2UI grid_divisions; SFVEC2UI grid_divisions;
if( aDivFactor < 0.0f) if( aDivFactor < 0.0f )
{ {
grid_divisions = SFVEC2UI( 1 ); grid_divisions = SFVEC2UI( 1 );
} }
@ -551,8 +551,8 @@ void Convert_path_polygon_to_polygon_blocks_and_dummy_blocks(
aDivFactor = medOfTheSquaresSegmentLength; aDivFactor = medOfTheSquaresSegmentLength;
grid_divisions.x = (unsigned int)( (bbox.GetExtent().x / aDivFactor) ); grid_divisions.x = (unsigned int)( ( bbox.GetExtent().x / aDivFactor ) );
grid_divisions.y = (unsigned int)( (bbox.GetExtent().y / aDivFactor) ); grid_divisions.y = (unsigned int)( ( bbox.GetExtent().y / aDivFactor ) );
grid_divisions = glm::clamp( grid_divisions , grid_divisions = glm::clamp( grid_divisions ,
SFVEC2UI( 1, 1 ), SFVEC2UI( 1, 1 ),

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.cpp
View File

@ -64,7 +64,7 @@ bool CLAYERITEM::Intersect( const RAY &aRay, HITINFO &aHitInfo ) const
if( tBBoxStart >= aHitInfo.m_tHit ) if( tBBoxStart >= aHitInfo.m_tHit )
return false; return false;
if( fabs(tBBoxStart - tBBoxEnd) <= FLT_EPSILON ) if( fabs( tBBoxStart - tBBoxEnd ) <= FLT_EPSILON )
return false; return false;
const bool startedInside = m_bbox.Inside( aRay.m_Origin ); const bool startedInside = m_bbox.Inside( aRay.m_Origin );