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

Uncrustify cbbox_ray.cpp to avoid a lot of warnings on gcc 6.1

This commit is contained in:
jean-pierre charras 2016-07-27 14:52:04 +02:00
parent 9c5e872a4f
commit f029047a97
1 changed files with 530 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox_ray.cpp
View File

@ -49,9 +49,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
{
case MMM:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_min.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_min.z - m_max.y + aRay.c_zy > 0)
@ -81,9 +81,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case MMP:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_min.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_max.z - m_max.y + aRay.c_zy > 0)
@ -110,9 +110,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case MPM:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_min.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_min.z - m_min.y + aRay.c_zy < 0)
@ -139,9 +139,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case MPP:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_min.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_max.z - m_min.y + aRay.c_zy < 0)
@ -168,9 +168,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case PMM:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_max.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_min.z - m_max.y + aRay.c_zy > 0)
@ -198,9 +198,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case PMP:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_max.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_max.z - m_max.y + aRay.c_zy > 0)
@ -227,9 +227,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case PPM:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_max.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_min.z - m_min.y + aRay.c_zy < 0)
@ -256,9 +256,9 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case PPP:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_max.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_max.z - m_min.y + aRay.c_zy < 0)
@ -285,8 +285,8 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case OMM:
{
if(( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.x > m_max.x )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.z < m_min.z)
|| ( aRay.jbyk * m_min.z - m_max.y + aRay.c_zy > 0)
|| ( aRay.kbyj * m_min.y - m_max.z + aRay.c_yz > 0)
@ -305,8 +305,8 @@ bool CBBOX::Intersect( const RAY &aRay, float *t ) const
case OMP:
{
if(( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.x > m_max.x )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.z > m_max.z)
|| ( aRay.jbyk * m_max.z - m_max.y + aRay.c_zy > 0)
|| ( aRay.kbyj * m_min.y - m_min.z + aRay.c_yz < 0)
@ -608,9 +608,9 @@ bool CBBOX::Intersect( const RAY &aRay ) const
{
case MMM:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_min.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_min.z - m_max.y + aRay.c_zy > 0)
@ -619,15 +619,16 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_min.z - m_max.x + aRay.c_zx > 0)
)
return false;
return true;
}
case MMP:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_min.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_max.z - m_max.y + aRay.c_zy > 0)
@ -636,14 +637,15 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_max.z - m_max.x + aRay.c_zx > 0)
)
return false;
return true;
}
case MPM:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_min.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_min.z - m_min.y + aRay.c_zy < 0)
@ -652,14 +654,15 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_min.z - m_max.x + aRay.c_zx > 0)
)
return false;
return true;
}
case MPP:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_min.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_max.x + aRay.c_yx > 0)
|| ( aRay.jbyk * m_max.z - m_min.y + aRay.c_zy < 0)
@ -668,14 +671,15 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_max.z - m_max.x + aRay.c_zx > 0)
)
return false;
return true;
}
case PMM:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_max.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_min.z - m_max.y + aRay.c_zy > 0)
@ -684,15 +688,16 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_min.z - m_min.x + aRay.c_zx < 0)
)
return false;
return true;
}
case PMP:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y < m_min.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_max.x - m_max.y + aRay.c_xy > 0)
|| ( aRay.ibyj * m_min.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_max.z - m_max.y + aRay.c_zy > 0)
@ -701,14 +706,15 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_max.z - m_min.x + aRay.c_zx < 0)
)
return false;
return true;
}
case PPM:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z < m_min.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z < m_min.z )
|| ( aRay.jbyi * m_max.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_min.z - m_min.y + aRay.c_zy < 0)
@ -717,14 +723,15 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_min.z - m_min.x + aRay.c_zx < 0)
)
return false;
return true;
}
case PPP:
{
if( ( aRay.m_Origin.x > m_max.x ) ||
( aRay.m_Origin.y > m_max.y ) ||
( aRay.m_Origin.z > m_max.z )
if( ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y > m_max.y )
|| ( aRay.m_Origin.z > m_max.z )
|| ( aRay.jbyi * m_max.x - m_min.y + aRay.c_xy < 0)
|| ( aRay.ibyj * m_max.y - m_min.x + aRay.c_yx < 0)
|| ( aRay.jbyk * m_max.z - m_min.y + aRay.c_zy < 0)
@ -733,53 +740,58 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_max.z - m_min.x + aRay.c_zx < 0)
)
return false;
return true;
}
case OMM:
{
if( ( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.x > m_max.x )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.z < m_min.z)
|| ( aRay.jbyk * m_min.z - m_max.y + aRay.c_zy > 0)
|| ( aRay.kbyj * m_min.y - m_max.z + aRay.c_yz > 0) )
return false;
return true;
}
case OMP:
{
if(( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.x > m_max.x )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.z > m_max.z)
|| ( aRay.jbyk * m_max.z - m_max.y + aRay.c_zy > 0)
|| ( aRay.kbyj * m_min.y - m_min.z + aRay.c_yz < 0)
)
return false;
return true;
}
case OPM:
{
if(( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.x > m_max.x )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y > m_max.y) || ( aRay.m_Origin.z < m_min.z)
|| ( aRay.jbyk * m_min.z - m_min.y + aRay.c_zy < 0)
|| ( aRay.kbyj * m_max.y - m_max.z + aRay.c_yz > 0)
)
return false;
return true;
}
case OPP:
{
if(( aRay.m_Origin.x < m_min.x ) ||
( aRay.m_Origin.x > m_max.x )
if( ( aRay.m_Origin.x < m_min.x )
|| ( aRay.m_Origin.x > m_max.x )
|| ( aRay.m_Origin.y > m_max.y) || ( aRay.m_Origin.z > m_max.z)
|| ( aRay.jbyk * m_max.z - m_min.y + aRay.c_zy < 0)
|| ( aRay.kbyj * m_max.y - m_min.z + aRay.c_yz < 0)
)
return false;
return true;
}
@ -792,6 +804,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_min.z - m_max.x + aRay.c_zx > 0)
)
return false;
return true;
}
@ -804,6 +817,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_max.z - m_max.x + aRay.c_zx > 0)
)
return false;
return true;
}
@ -815,6 +829,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_min.z - m_min.x + aRay.c_zx < 0)
)
return false;
return true;
}
@ -827,6 +842,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyk * m_max.z - m_min.x + aRay.c_zx < 0)
)
return false;
return true;
}
@ -838,6 +854,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyj * m_min.y - m_max.x + aRay.c_yx > 0)
)
return false;
return true;
}
@ -849,6 +866,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyj * m_max.y - m_max.x + aRay.c_yx > 0)
)
return false;
return true;
}
@ -861,6 +879,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyj * m_min.y - m_min.x + aRay.c_yx < 0)
)
return false;
return true;
}
@ -872,6 +891,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.ibyj * m_max.y - m_min.x + aRay.c_yx < 0)
)
return false;
return true;
}
@ -883,6 +903,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
)
return false;
return true;
}
@ -893,6 +914,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
)
return false;
return true;
}
@ -903,6 +925,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
)
return false;
return true;
}
@ -913,6 +936,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.m_Origin.z < m_min.z) || ( aRay.m_Origin.z > m_max.z)
)
return false;
return true;
}
@ -924,6 +948,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.y > m_max.y)
)
return false;
return true;
}
@ -934,6 +959,7 @@ bool CBBOX::Intersect( const RAY &aRay ) const
|| ( aRay.m_Origin.y < m_min.y) || ( aRay.m_Origin.y > m_max.y)
)
return false;
return true;
}
}