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

Coverity fixes. 

280252, 314742, 314745, 314747, 314755, 314756, 314757, 314758,
314935, 314936
This commit is contained in:
Wayne Stambaugh 2020-12-20 13:23:50 -05:00
parent 79c7cf12c9
commit f311831c27
11 changed files with 250 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

472
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp
View File

@ -116,7 +116,7 @@ void C3D_RENDER_RAYTRACING::opengl_delete_pbo()
} }
void C3D_RENDER_RAYTRACING::SetCurWindowSize( const wxSize &aSize ) void C3D_RENDER_RAYTRACING::SetCurWindowSize( const wxSize& aSize )
{ {
if( m_windowSize != aSize ) if( m_windowSize != aSize )
{ {
@ -140,9 +140,7 @@ void C3D_RENDER_RAYTRACING::restart_render_state()
m_blockPositionsWasProcessed.resize( m_blockPositions.size() ); m_blockPositionsWasProcessed.resize( m_blockPositions.size() );
// Mark the blocks not processed yet // Mark the blocks not processed yet
std::fill( m_blockPositionsWasProcessed.begin(), std::fill( m_blockPositionsWasProcessed.begin(), m_blockPositionsWasProcessed.end(), 0 );
m_blockPositionsWasProcessed.end(),
0 );
} }
@ -152,8 +150,8 @@ static inline void SetPixel( GLubyte *p, const CCOLORRGB &v )
} }
bool C3D_RENDER_RAYTRACING::Redraw( bool C3D_RENDER_RAYTRACING::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
bool aIsMoving, REPORTER* aStatusReporter, REPORTER* aWarningReporter ) REPORTER* aWarningReporter )
{ {
bool requestRedraw = false; bool requestRedraw = false;
@ -223,7 +221,7 @@ bool C3D_RENDER_RAYTRACING::Redraw(
// This will only render if need, otherwise it will redraw the PBO on the screen again // This will only render if need, otherwise it will redraw the PBO on the screen again
if( aIsMoving || was_camera_changed ) if( aIsMoving || was_camera_changed )
{ {
// Set head light (camera view light) with the oposite direction of the camera // Set head light (camera view light) with the opposite direction of the camera
if( m_camera_light ) if( m_camera_light )
m_camera_light->SetDirection( -m_camera.GetDir() ); m_camera_light->SetDirection( -m_camera.GetDir() );
@ -266,13 +264,14 @@ bool C3D_RENDER_RAYTRACING::Redraw(
requestRedraw = true; requestRedraw = true;
// release pointer to mapping buffer, this initialize the coping to PBO // release pointer to mapping buffer, this initialize the coping to PBO
glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB); glUnmapBufferARB( GL_PIXEL_UNPACK_BUFFER_ARB );
} }
} }
if( m_rt_render_state == RT_RENDER_STATE_FINISH ) if( m_rt_render_state == RT_RENDER_STATE_FINISH )
{ {
glClear( GL_COLOR_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT );
// Options if we want draw background instead // Options if we want draw background instead
//OGL_DrawBackground( SFVEC3F(m_boardAdapter.m_BgColorTop), //OGL_DrawBackground( SFVEC3F(m_boardAdapter.m_BgColorTop),
// SFVEC3F(m_boardAdapter.m_BgColorBot) ); // SFVEC3F(m_boardAdapter.m_BgColorBot) );
@ -286,13 +285,7 @@ bool C3D_RENDER_RAYTRACING::Redraw(
glEnable( GL_BLEND ); glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glEnable( GL_ALPHA_TEST ); glEnable( GL_ALPHA_TEST );
glDrawPixels( m_realBufferSize.x, m_realBufferSize.y, GL_RGBA, GL_UNSIGNED_BYTE, 0 );
glDrawPixels( m_realBufferSize.x,
m_realBufferSize.y,
GL_RGBA,
GL_UNSIGNED_BYTE,
0 );
glBindBufferARB( GL_PIXEL_UNPACK_BUFFER_ARB, 0 ); glBindBufferARB( GL_PIXEL_UNPACK_BUFFER_ARB, 0 );
return requestRedraw; return requestRedraw;
@ -301,8 +294,8 @@ bool C3D_RENDER_RAYTRACING::Redraw(
void C3D_RENDER_RAYTRACING::render( GLubyte* ptrPBO, REPORTER* aStatusReporter ) void C3D_RENDER_RAYTRACING::render( GLubyte* ptrPBO, REPORTER* aStatusReporter )
{ {
if( (m_rt_render_state == RT_RENDER_STATE_FINISH) || if( ( m_rt_render_state == RT_RENDER_STATE_FINISH )
(m_rt_render_state >= RT_RENDER_STATE_MAX) ) || ( m_rt_render_state >= RT_RENDER_STATE_MAX ) )
{ {
restart_render_state(); restart_render_state();
@ -314,7 +307,6 @@ void C3D_RENDER_RAYTRACING::render( GLubyte* ptrPBO, REPORTER* aStatusReporter )
// Set all pixels of PBO transparent (Alpha to 0) // Set all pixels of PBO transparent (Alpha to 0)
// This way it will draw the full buffer but only shows the updated ( // This way it will draw the full buffer but only shows the updated (
// already calculated) squares // already calculated) squares
// /////////////////////////////////////////////////////////////////////
unsigned int nPixels = m_realBufferSize.x * m_realBufferSize.y; unsigned int nPixels = m_realBufferSize.x * m_realBufferSize.y;
GLubyte *tmp_ptrPBO = ptrPBO + 3; // PBO is RGBA GLubyte *tmp_ptrPBO = ptrPBO + 3; // PBO is RGBA
@ -361,8 +353,7 @@ void C3D_RENDER_RAYTRACING::render( GLubyte* ptrPBO, REPORTER* aStatusReporter )
} }
void C3D_RENDER_RAYTRACING::rt_render_tracing( GLubyte* ptrPBO , void C3D_RENDER_RAYTRACING::rt_render_tracing( GLubyte* ptrPBO, REPORTER* aStatusReporter )
REPORTER* aStatusReporter )
{ {
m_isPreview = false; m_isPreview = false;
@ -376,6 +367,7 @@ void C3D_RENDER_RAYTRACING::rt_render_tracing( GLubyte* ptrPBO ,
size_t parallelThreadCount = std::min<size_t>( size_t parallelThreadCount = std::min<size_t>(
std::max<size_t>( std::thread::hardware_concurrency(), 2 ), std::max<size_t>( std::thread::hardware_concurrency(), 2 ),
m_blockPositions.size() ); m_blockPositions.size() );
for( size_t ii = 0; ii < parallelThreadCount; ++ii ) for( size_t ii = 0; ii < parallelThreadCount; ++ii )
{ {
std::thread t = std::thread( [&]() std::thread t = std::thread( [&]()
@ -411,8 +403,8 @@ void C3D_RENDER_RAYTRACING::rt_render_tracing( GLubyte* ptrPBO ,
if( aStatusReporter ) if( aStatusReporter )
aStatusReporter->Report( wxString::Format( _( "Rendering: %.0f %%" ), aStatusReporter->Report( wxString::Format( _( "Rendering: %.0f %%" ),
(float)(m_nrBlocksRenderProgress * 100) / (float) ( m_nrBlocksRenderProgress * 100 )
(float)m_blockPositions.size() ) ); / (float) m_blockPositions.size() ) );
// Check if it finish the rendering and if should continue to a post processing // Check if it finish the rendering and if should continue to a post processing
// or mark it as finished // or mark it as finished
@ -428,18 +420,16 @@ void C3D_RENDER_RAYTRACING::rt_render_tracing( GLubyte* ptrPBO ,
#ifdef USE_SRGB_SPACE #ifdef USE_SRGB_SPACE
// This should be removed in future when the KiCad support a greater version of /// @todo This should be removed in future when KiCad supports a greater version of glm lib.
// glm lib.
#define SRGB_GAMA 2.4f #define SRGB_GAMA 2.4f
// This function implements the conversion from linear RGB to sRGB // This function implements the conversion from linear RGB to sRGB
// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L12 // https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L12
static SFVEC3F convertLinearToSRGB( const SFVEC3F &aRGBcolor ) static SFVEC3F convertLinearToSRGB( const SFVEC3F& aRGBcolor )
{ {
const float gammaCorrection = 1.0f / SRGB_GAMA; const float gammaCorrection = 1.0f / SRGB_GAMA;
const SFVEC3F clampedColor = glm::clamp( aRGBcolor, SFVEC3F(0.0f), SFVEC3F(1.0f) ); const SFVEC3F clampedColor = glm::clamp( aRGBcolor, SFVEC3F( 0.0f ), SFVEC3F( 1.0f ) );
return glm::mix( glm::pow( clampedColor, SFVEC3F(gammaCorrection) ) * 1.055f - 0.055f, return glm::mix( glm::pow( clampedColor, SFVEC3F(gammaCorrection) ) * 1.055f - 0.055f,
clampedColor * 12.92f, clampedColor * 12.92f,
@ -449,7 +439,7 @@ static SFVEC3F convertLinearToSRGB( const SFVEC3F &aRGBcolor )
// This function implements the conversion from sRGB to linear RGB // This function implements the conversion from sRGB to linear RGB
// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L35 // https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L35
SFVEC3F ConvertSRGBToLinear( const SFVEC3F &aSRGBcolor ) SFVEC3F ConvertSRGBToLinear( const SFVEC3F& aSRGBcolor )
{ {
const float gammaCorrection = SRGB_GAMA; const float gammaCorrection = SRGB_GAMA;
@ -463,15 +453,13 @@ SFVEC3F ConvertSRGBToLinear( const SFVEC3F &aSRGBcolor )
#endif #endif
void C3D_RENDER_RAYTRACING::rt_final_color( GLubyte *ptrPBO, const SFVEC3F &rgbColor, void C3D_RENDER_RAYTRACING::rt_final_color( GLubyte* ptrPBO, const SFVEC3F& rgbColor,
bool applyColorSpaceConversion ) bool applyColorSpaceConversion )
{ {
SFVEC3F color = rgbColor; SFVEC3F color = rgbColor;
#ifdef USE_SRGB_SPACE #ifdef USE_SRGB_SPACE
/// @note This should be used in future when the KiCad support a greater version of glm lib.
// This should be used in future when the KiCad support a greater version of
// glm lib.
// if( applyColorSpaceConversion ) // if( applyColorSpaceConversion )
// rgbColor = glm::convertLinearToSRGB( rgbColor ); // rgbColor = glm::convertLinearToSRGB( rgbColor );
@ -486,7 +474,7 @@ void C3D_RENDER_RAYTRACING::rt_final_color( GLubyte *ptrPBO, const SFVEC3F &rgbC
} }
static void HITINFO_PACKET_init( HITINFO_PACKET *aHitPacket ) static void HITINFO_PACKET_init( HITINFO_PACKET* aHitPacket )
{ {
// Initialize hitPacket with a "not hit" information // Initialize hitPacket with a "not hit" information
for( unsigned int i = 0; i < RAYPACKET_RAYS_PER_PACKET; ++i ) for( unsigned int i = 0; i < RAYPACKET_RAYS_PER_PACKET; ++i )
@ -500,11 +488,9 @@ static void HITINFO_PACKET_init( HITINFO_PACKET *aHitPacket )
} }
void C3D_RENDER_RAYTRACING::rt_shades_packet(const SFVEC3F *bgColorY, void C3D_RENDER_RAYTRACING::rt_shades_packet( const SFVEC3F* bgColorY, const RAY* aRayPkt,
const RAY *aRayPkt, HITINFO_PACKET* aHitPacket, bool is_testShadow,
HITINFO_PACKET *aHitPacket, SFVEC3F* aOutHitColor )
bool is_testShadow,
SFVEC3F *aOutHitColor )
{ {
for( unsigned int y = 0, i = 0; y < RAYPACKET_DIM; ++y ) for( unsigned int y = 0, i = 0; y < RAYPACKET_DIM; ++y )
{ {
@ -512,12 +498,8 @@ void C3D_RENDER_RAYTRACING::rt_shades_packet(const SFVEC3F *bgColorY,
{ {
if( aHitPacket[i].m_hitresult == true ) if( aHitPacket[i].m_hitresult == true )
{ {
aOutHitColor[i] = shadeHit( bgColorY[y], aOutHitColor[i] = shadeHit( bgColorY[y], aRayPkt[i], aHitPacket[i].m_HitInfo,
aRayPkt[i], false, 0, is_testShadow );
aHitPacket[i].m_HitInfo,
false,
0,
is_testShadow );
} }
else else
{ {
@ -528,11 +510,11 @@ void C3D_RENDER_RAYTRACING::rt_shades_packet(const SFVEC3F *bgColorY,
} }
void C3D_RENDER_RAYTRACING::rt_trace_AA_packet( const SFVEC3F *aBgColorY, void C3D_RENDER_RAYTRACING::rt_trace_AA_packet( const SFVEC3F* aBgColorY,
const HITINFO_PACKET *aHitPck_X0Y0, const HITINFO_PACKET* aHitPck_X0Y0,
const HITINFO_PACKET *aHitPck_AA_X1Y1, const HITINFO_PACKET* aHitPck_AA_X1Y1,
const RAY *aRayPck, const RAY* aRayPck,
SFVEC3F *aOutHitColor ) SFVEC3F* aOutHitColor )
{ {
const bool is_testShadow = m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ); const bool is_testShadow = m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS );
@ -563,11 +545,11 @@ void C3D_RENDER_RAYTRACING::rt_trace_AA_packet( const SFVEC3F *aBgColorY,
unsigned int nodex0y1 = 0; unsigned int nodex0y1 = 0;
if( y < (RAYPACKET_DIM - 1) ) if( y < (RAYPACKET_DIM - 1) )
nodex0y1 = aHitPck_X0Y0[ idx0y1 ].m_HitInfo.m_acc_node_info; nodex0y1 = aHitPck_X0Y0[ idx0y1 ].m_HitInfo.m_acc_node_info;
unsigned int nodex1y1 = 0; unsigned int nodex1y1 = 0;
if( ( ( x < ( RAYPACKET_DIM - 1 ) ) && ( y < ( RAYPACKET_DIM - 1 ) ) ) ) if( idx1y1 < RAYPACKET_RAYS_PER_PACKET )
nodex1y1 = aHitPck_X0Y0[idx1y1].m_HitInfo.m_acc_node_info; nodex1y1 = aHitPck_X0Y0[idx1y1].m_HitInfo.m_acc_node_info;
// If all notes are equal we assume there was no change on the object hits. // If all notes are equal we assume there was no change on the object hits.
@ -610,25 +592,18 @@ void C3D_RENDER_RAYTRACING::rt_trace_AA_packet( const SFVEC3F *aBgColorY,
if( nodex0y0 != 0 ) if( nodex0y0 != 0 )
hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex0y0 ); hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex0y0 );
if( ( nodex1y0 != 0 ) && if( ( nodex1y0 != 0 ) && ( nodex0y0 != nodex1y0 ) )
( nodex0y0 != nodex1y0 ) )
hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex1y0 ); hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex1y0 );
if( ( nodex0y1 != 0 ) && if( ( nodex0y1 != 0 ) && ( nodex0y0 != nodex0y1 ) && ( nodex1y0 != nodex0y1 ) )
( nodex0y0 != nodex0y1 ) &&
( nodex1y0 != nodex0y1 ) )
hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex0y1 ); hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex0y1 );
if( (nodex1y1 != 0 ) && if( ( nodex1y1 != 0 ) && ( nodex0y0 != nodex1y1 ) && ( nodex0y1 != nodex1y1 ) &&
( nodex0y0 != nodex1y1 ) &&
( nodex0y1 != nodex1y1 ) &&
( nodex1y0 != nodex1y1 ) ) ( nodex1y0 != nodex1y1 ) )
hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex1y1 ); hitted |= m_accelerator->Intersect( rayAA, hitAA, nodex1y1 );
if( (node_AA_x0y0 != 0 ) && if( (node_AA_x0y0 != 0 ) && ( nodex0y0 != node_AA_x0y0 ) &&
( nodex0y0 != node_AA_x0y0 ) && ( nodex0y1 != node_AA_x0y0 ) && ( nodex1y0 != node_AA_x0y0 ) &&
( nodex0y1 != node_AA_x0y0 ) &&
( nodex1y0 != node_AA_x0y0 ) &&
( nodex1y1 != node_AA_x0y0 ) ) ( nodex1y1 != node_AA_x0y0 ) )
hitted |= m_accelerator->Intersect( rayAA, hitAA, node_AA_x0y0 ); hitted |= m_accelerator->Intersect( rayAA, hitAA, node_AA_x0y0 );
@ -657,12 +632,11 @@ void C3D_RENDER_RAYTRACING::rt_trace_AA_packet( const SFVEC3F *aBgColorY,
#define DISP_FACTOR 0.075f #define DISP_FACTOR 0.075f
void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int iBlock ) void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte* ptrPBO, signed int iBlock )
{ {
// Initialize ray packets // Initialize ray packets
const SFVEC2UI &blockPos = m_blockPositions[iBlock]; const SFVEC2UI &blockPos = m_blockPositions[iBlock];
const SFVEC2I blockPosI = SFVEC2I( blockPos.x + m_xoffset, const SFVEC2I blockPosI = SFVEC2I( blockPos.x + m_xoffset, blockPos.y + m_yoffset );
blockPos.y + m_yoffset );
RAYPACKET blockPacket( m_camera, (SFVEC2F)blockPosI + SFVEC2F(DISP_FACTOR, DISP_FACTOR), RAYPACKET blockPacket( m_camera, (SFVEC2F)blockPosI + SFVEC2F(DISP_FACTOR, DISP_FACTOR),
SFVEC2F(DISP_FACTOR, DISP_FACTOR) /* Displacement random factor */ ); SFVEC2F(DISP_FACTOR, DISP_FACTOR) /* Displacement random factor */ );
@ -697,13 +671,9 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
for( unsigned int x = 0; x < RAYPACKET_DIM; ++x ) for( unsigned int x = 0; x < RAYPACKET_DIM; ++x )
{ {
m_postshader_ssao.SetPixelData( blockPos.x + x, m_postshader_ssao.SetPixelData( blockPos.x + x, yBlockPos,
yBlockPos, SFVEC3F( 0.0f ), outColor,
SFVEC3F( 0.0f ), SFVEC3F( 0.0f ), 0, 1.0f );
outColor,
SFVEC3F( 0.0f ),
0,
1.0f );
} }
} }
} }
@ -718,7 +688,7 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
{ {
const SFVEC3F &outColor = bgColor[y]; const SFVEC3F &outColor = bgColor[y];
const unsigned int yConst = blockPos.x + ( (y + blockPos.y) * m_realBufferSize.x); const unsigned int yConst = blockPos.x + ( (y + blockPos.y) * m_realBufferSize.x );
for( unsigned int x = 0; x < RAYPACKET_DIM; ++x ) for( unsigned int x = 0; x < RAYPACKET_DIM; ++x )
{ {
@ -736,11 +706,8 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
SFVEC3F hitColor_X0Y0[RAYPACKET_RAYS_PER_PACKET]; SFVEC3F hitColor_X0Y0[RAYPACKET_RAYS_PER_PACKET];
// Shade original (0, 0) hits ("paint" the intersected objects) // Shade original (0, 0) hits ("paint" the intersected objects)
rt_shades_packet( bgColor, rt_shades_packet( bgColor, blockPacket.m_ray, hitPacket_X0Y0,
blockPacket.m_ray, m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ), hitColor_X0Y0 );
hitPacket_X0Y0,
m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ),
hitColor_X0Y0 );
if( m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_ANTI_ALIASING ) ) if( m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_ANTI_ALIASING ) )
{ {
@ -750,8 +717,8 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
HITINFO_PACKET hitPacket_AA_X1Y1[RAYPACKET_RAYS_PER_PACKET]; HITINFO_PACKET hitPacket_AA_X1Y1[RAYPACKET_RAYS_PER_PACKET];
HITINFO_PACKET_init( hitPacket_AA_X1Y1 ); HITINFO_PACKET_init( hitPacket_AA_X1Y1 );
RAYPACKET blockPacket_AA_X1Y1( m_camera, (SFVEC2F)blockPosI + SFVEC2F(0.5f, 0.5f), RAYPACKET blockPacket_AA_X1Y1( m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.5f, 0.5f ),
SFVEC2F(DISP_FACTOR, DISP_FACTOR) ); SFVEC2F( DISP_FACTOR, DISP_FACTOR ) );
if( !m_accelerator->Intersect( blockPacket_AA_X1Y1, hitPacket_AA_X1Y1 ) ) if( !m_accelerator->Intersect( blockPacket_AA_X1Y1, hitPacket_AA_X1Y1 ) )
{ {
@ -768,12 +735,9 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
} }
else else
{ {
rt_shades_packet( bgColor, rt_shades_packet( bgColor, blockPacket_AA_X1Y1.m_ray, hitPacket_AA_X1Y1,
blockPacket_AA_X1Y1.m_ray,
hitPacket_AA_X1Y1,
m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ), m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ),
hitColor_AA_X1Y1 hitColor_AA_X1Y1 );
);
} }
SFVEC3F hitColor_AA_X1Y0[RAYPACKET_RAYS_PER_PACKET]; SFVEC3F hitColor_AA_X1Y0[RAYPACKET_RAYS_PER_PACKET];
@ -783,7 +747,7 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
for( unsigned int i = 0; i < RAYPACKET_RAYS_PER_PACKET; ++i ) for( unsigned int i = 0; i < RAYPACKET_RAYS_PER_PACKET; ++i )
{ {
const SFVEC3F color_average = ( hitColor_X0Y0[i] + const SFVEC3F color_average = ( hitColor_X0Y0[i] +
hitColor_AA_X1Y1[i] ) * SFVEC3F(0.5f); hitColor_AA_X1Y1[i] ) * SFVEC3F( 0.5f );
hitColor_AA_X1Y0[i] = color_average; hitColor_AA_X1Y0[i] = color_average;
hitColor_AA_X0Y1[i] = color_average; hitColor_AA_X0Y1[i] = color_average;
@ -795,52 +759,39 @@ void C3D_RENDER_RAYTRACING::rt_render_trace_block( GLubyte *ptrPBO, signed int i
RAY blockRayPck_AA_X1Y1_half[RAYPACKET_RAYS_PER_PACKET]; RAY blockRayPck_AA_X1Y1_half[RAYPACKET_RAYS_PER_PACKET];
RAYPACKET_InitRays_with2DDisplacement( RAYPACKET_InitRays_with2DDisplacement(
m_camera, m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.5f - DISP_FACTOR, DISP_FACTOR ),
(SFVEC2F) blockPosI + SFVEC2F( 0.5f - DISP_FACTOR, DISP_FACTOR ),
SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X1Y0 ); SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X1Y0 );
RAYPACKET_InitRays_with2DDisplacement( RAYPACKET_InitRays_with2DDisplacement(
m_camera, m_camera, (SFVEC2F) blockPosI + SFVEC2F( DISP_FACTOR, 0.5f - DISP_FACTOR ),
(SFVEC2F) blockPosI + SFVEC2F( DISP_FACTOR, 0.5f - DISP_FACTOR ),
SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X0Y1 ); SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X0Y1 );
RAYPACKET_InitRays_with2DDisplacement( RAYPACKET_InitRays_with2DDisplacement(
m_camera, m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.25f - DISP_FACTOR, 0.25f - DISP_FACTOR ),
(SFVEC2F) blockPosI + SFVEC2F( 0.25f - DISP_FACTOR, 0.25f - DISP_FACTOR ),
SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X1Y1_half ); SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X1Y1_half );
rt_trace_AA_packet( bgColor, rt_trace_AA_packet( bgColor, hitPacket_X0Y0, hitPacket_AA_X1Y1, blockRayPck_AA_X1Y0,
hitPacket_X0Y0, hitPacket_AA_X1Y1,
blockRayPck_AA_X1Y0,
hitColor_AA_X1Y0 ); hitColor_AA_X1Y0 );
rt_trace_AA_packet( bgColor, rt_trace_AA_packet( bgColor, hitPacket_X0Y0, hitPacket_AA_X1Y1, blockRayPck_AA_X0Y1,
hitPacket_X0Y0, hitPacket_AA_X1Y1,
blockRayPck_AA_X0Y1,
hitColor_AA_X0Y1 ); hitColor_AA_X0Y1 );
rt_trace_AA_packet( bgColor, rt_trace_AA_packet( bgColor, hitPacket_X0Y0, hitPacket_AA_X1Y1, blockRayPck_AA_X1Y1_half,
hitPacket_X0Y0, hitPacket_AA_X1Y1,
blockRayPck_AA_X1Y1_half,
hitColor_AA_X0Y1_half ); hitColor_AA_X0Y1_half );
// Average the result // Average the result
for( unsigned int i = 0; i < RAYPACKET_RAYS_PER_PACKET; ++i ) for( unsigned int i = 0; i < RAYPACKET_RAYS_PER_PACKET; ++i )
{ {
hitColor_X0Y0[i] = ( hitColor_X0Y0[i] + hitColor_X0Y0[i] = ( hitColor_X0Y0[i] + hitColor_AA_X1Y1[i] + hitColor_AA_X1Y0[i] +
hitColor_AA_X1Y1[i] + hitColor_AA_X0Y1[i] + hitColor_AA_X0Y1_half[i] ) *
hitColor_AA_X1Y0[i] + SFVEC3F( 1.0f / 5.0f );
hitColor_AA_X0Y1[i] +
hitColor_AA_X0Y1_half[i]
) * SFVEC3F(1.0f / 5.0f);
} }
} }
// Copy results to the next stage // Copy results to the next stage
GLubyte* ptr = &ptrPBO[( blockPos.x + ( blockPos.y * m_realBufferSize.x ) ) * 4]; GLubyte* ptr = &ptrPBO[( blockPos.x + ( blockPos.y * m_realBufferSize.x ) ) * 4];
const uint32_t ptrInc = (m_realBufferSize.x - RAYPACKET_DIM) * 4; const uint32_t ptrInc = ( m_realBufferSize.x - RAYPACKET_DIM ) * 4;
if( m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_POST_PROCESSING ) ) if( m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_POST_PROCESSING ) )
{ {
@ -907,19 +858,21 @@ void C3D_RENDER_RAYTRACING::rt_render_post_process_shade( GLubyte* ptrPBO,
if( aStatusReporter ) if( aStatusReporter )
aStatusReporter->Report( _( "Rendering: Post processing shader" ) ); aStatusReporter->Report( _( "Rendering: Post processing shader" ) );
m_postshader_ssao.SetShadowsEnabled( m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ) ); m_postshader_ssao.SetShadowsEnabled(
m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_SHADOWS ) );
std::atomic<size_t> nextBlock( 0 ); std::atomic<size_t> nextBlock( 0 );
std::atomic<size_t> threadsFinished( 0 ); std::atomic<size_t> threadsFinished( 0 );
size_t parallelThreadCount = std::max<size_t>( std::thread::hardware_concurrency(), 2 ); size_t parallelThreadCount = std::max<size_t>( std::thread::hardware_concurrency(), 2 );
for( size_t ii = 0; ii < parallelThreadCount; ++ii ) for( size_t ii = 0; ii < parallelThreadCount; ++ii )
{ {
std::thread t = std::thread( [&]() std::thread t = std::thread( [&]()
{ {
for( size_t y = nextBlock.fetch_add( 1 ); for( size_t y = nextBlock.fetch_add( 1 );
y < m_realBufferSize.y; y < m_realBufferSize.y;
y = nextBlock.fetch_add( 1 ) ) y = nextBlock.fetch_add( 1 ) )
{ {
SFVEC3F *ptr = &m_shaderBuffer[ y * m_realBufferSize.x ]; SFVEC3F *ptr = &m_shaderBuffer[ y * m_realBufferSize.x ];
@ -952,8 +905,8 @@ void C3D_RENDER_RAYTRACING::rt_render_post_process_shade( GLubyte* ptrPBO,
} }
void C3D_RENDER_RAYTRACING::rt_render_post_process_blur_finish( GLubyte *ptrPBO, void C3D_RENDER_RAYTRACING::rt_render_post_process_blur_finish( GLubyte* ptrPBO,
REPORTER *aStatusReporter ) REPORTER* aStatusReporter )
{ {
(void) aStatusReporter; //unused (void) aStatusReporter; //unused
@ -969,9 +922,8 @@ void C3D_RENDER_RAYTRACING::rt_render_post_process_blur_finish( GLubyte *ptrPBO,
{ {
std::thread t = std::thread( [&]() std::thread t = std::thread( [&]()
{ {
for( size_t y = nextBlock.fetch_add( 1 ); for( size_t y = nextBlock.fetch_add( 1 ); y < m_realBufferSize.y;
y < m_realBufferSize.y; y = nextBlock.fetch_add( 1 ) )
y = nextBlock.fetch_add( 1 ) )
{ {
GLubyte *ptr = &ptrPBO[ y * m_realBufferSize.x * 4 ]; GLubyte *ptr = &ptrPBO[ y * m_realBufferSize.x * 4 ];
@ -1013,7 +965,7 @@ void C3D_RENDER_RAYTRACING::rt_render_post_process_blur_finish( GLubyte *ptrPBO,
} }
void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO ) void C3D_RENDER_RAYTRACING::render_preview( GLubyte* ptrPBO )
{ {
m_isPreview = true; m_isPreview = true;
@ -1028,9 +980,8 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
{ {
std::thread t = std::thread( [&]() std::thread t = std::thread( [&]()
{ {
for( size_t iBlock = nextBlock.fetch_add( 1 ); for( size_t iBlock = nextBlock.fetch_add( 1 ); iBlock < m_blockPositionsFast.size();
iBlock < m_blockPositionsFast.size(); iBlock = nextBlock.fetch_add( 1 ) )
iBlock = nextBlock.fetch_add( 1 ) )
{ {
const SFVEC2UI &windowPosUI = m_blockPositionsFast[ iBlock ]; const SFVEC2UI &windowPosUI = m_blockPositionsFast[ iBlock ];
const SFVEC2I windowsPos = SFVEC2I( windowPosUI.x + m_xoffset, const SFVEC2I windowsPos = SFVEC2I( windowPosUI.x + m_xoffset,
@ -1051,9 +1002,7 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
// Intersect packet block // Intersect packet block
m_accelerator->Intersect( blockPacket, hitPacket ); m_accelerator->Intersect( blockPacket, hitPacket );
// Calculate background gradient color // Calculate background gradient color
// /////////////////////////////////////////////////////////////////////
SFVEC3F bgColor[RAYPACKET_DIM]; SFVEC3F bgColor[RAYPACKET_DIM];
for( unsigned int y = 0; y < RAYPACKET_DIM; ++y ) for( unsigned int y = 0; y < RAYPACKET_DIM; ++y )
@ -1074,12 +1023,9 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
if( hitPacket[i].m_hitresult == true ) if( hitPacket[i].m_hitresult == true )
{ {
const SFVEC3F hitColor = shadeHit( bhColorY, const SFVEC3F hitColor = shadeHit( bhColorY, blockPacket.m_ray[i],
blockPacket.m_ray[i], hitPacket[i].m_HitInfo, false,
hitPacket[i].m_HitInfo, 0, false );
false,
0,
false );
hitColorShading[i] = CCOLORRGB( hitColor ); hitColorShading[i] = CCOLORRGB( hitColor );
} }
@ -1100,7 +1046,7 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
//RAY cRTB_ray; //RAY cRTB_ray;
//HITINFO cRTB_hitInfo; //HITINFO cRTB_hitInfo;
for( unsigned int x = 0; x < (RAYPACKET_DIM - 1); ++x ) for( unsigned int x = 0; x < ( RAYPACKET_DIM - 1 ); ++x )
{ {
// pxl 0 pxl 1 pxl 2 pxl 3 pxl 4 // pxl 0 pxl 1 pxl 2 pxl 3 pxl 4
// x0 x1 ... // x0 x1 ...
@ -1112,10 +1058,10 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
// '---------------------------' // '---------------------------'
// y1 | cLB | cxxx | cLRB | cxxx | cRB | // y1 | cLB | cxxx | cLRB | cxxx | cRB |
const unsigned int iLT = ((x + 0) + RAYPACKET_DIM * (y + 0)); const unsigned int iLT = ( ( x + 0 ) + RAYPACKET_DIM * ( y + 0 ) );
const unsigned int iRT = ((x + 1) + RAYPACKET_DIM * (y + 0)); const unsigned int iRT = ( ( x + 1 ) + RAYPACKET_DIM * ( y + 0 ) );
const unsigned int iLB = ((x + 0) + RAYPACKET_DIM * (y + 1)); const unsigned int iLB = ( ( x + 0 ) + RAYPACKET_DIM * ( y + 1 ) );
const unsigned int iRB = ((x + 1) + RAYPACKET_DIM * (y + 1)); const unsigned int iRB = ( ( x + 1 ) + RAYPACKET_DIM * ( y + 1 ) );
// !TODO: skip when there are no hits // !TODO: skip when there are no hits
const CCOLORRGB &cLT = hitColorShading[ iLT ]; const CCOLORRGB &cLT = hitColorShading[ iLT ];
@ -1140,12 +1086,11 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
bool hittedC = false; bool hittedC = false;
if( (hitPacket[ iLT ].m_hitresult == true) || if( ( hitPacket[iLT].m_hitresult == true )
(hitPacket[ iRT ].m_hitresult == true) || || ( hitPacket[iRT].m_hitresult == true )
(hitPacket[ iLB ].m_hitresult == true) || || ( hitPacket[iLB].m_hitresult == true )
(hitPacket[ iRB ].m_hitresult == true) ) || ( hitPacket[iRB].m_hitresult == true ) )
{ {
oriC = ( oriLT + oriRB ) * 0.5f; oriC = ( oriLT + oriRB ) * 0.5f;
dirC = glm::normalize( ( dirLT + dirRB ) * 0.5f ); dirC = glm::normalize( ( dirLT + dirRB ) * 0.5f );
@ -1162,23 +1107,18 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo, hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo,
nodeLT ); nodeLT );
if( ( nodeRT != 0 ) && if( ( nodeRT != 0 ) && ( nodeRT != nodeLT ) )
( nodeRT != nodeLT ) )
hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo, hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo,
nodeRT ); nodeRT );
if( ( nodeLB != 0 ) && if( ( nodeLB != 0 ) && ( nodeLB != nodeLT ) && ( nodeLB != nodeRT ) )
( nodeLB != nodeLT ) && hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo,
( nodeLB != nodeRT ) ) nodeLB );
hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo,
nodeLB );
if( ( nodeRB != 0 ) && if( ( nodeRB != 0 ) && ( nodeRB != nodeLB ) && ( nodeRB != nodeLT )
( nodeRB != nodeLB ) && && ( nodeRB != nodeRT ) )
( nodeRB != nodeLT ) && hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo,
( nodeRB != nodeRT ) ) nodeRB );
hittedC |= m_accelerator->Intersect( centerRay, centerHitInfo,
nodeRB );
if( hittedC ) if( hittedC )
{ {
@ -1191,17 +1131,12 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
hittedC = m_accelerator->Intersect( centerRay, centerHitInfo ); hittedC = m_accelerator->Intersect( centerRay, centerHitInfo );
if( hittedC ) if( hittedC )
cC = CCOLORRGB( shadeHit( bgColorY, cC = CCOLORRGB( shadeHit( bgColorY, centerRay, centerHitInfo,
centerRay, false, 0, false ) );
centerHitInfo,
false,
0,
false ) );
} }
} }
// Trace and shade cLRT // Trace and shade cLRT
// /////////////////////////////////////////////////////////////
CCOLORRGB cLRT = bgColorYRGB; CCOLORRGB cLRT = bgColorYRGB;
const SFVEC3F &oriRT = blockPacket.m_ray[ iRT ].m_Origin; const SFVEC3F &oriRT = blockPacket.m_ray[ iRT ].m_Origin;
@ -1212,14 +1147,14 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
// Trace the center ray // Trace the center ray
RAY rayLRT; RAY rayLRT;
rayLRT.Init( ( oriLT + oriRT ) * 0.5f, rayLRT.Init( ( oriLT + oriRT ) * 0.5f,
glm::normalize( ( dirLT + dirRT ) * 0.5f ) ); glm::normalize( ( dirLT + dirRT ) * 0.5f ) );
HITINFO hitInfoLRT; HITINFO hitInfoLRT;
hitInfoLRT.m_tHit = std::numeric_limits<float>::infinity(); hitInfoLRT.m_tHit = std::numeric_limits<float>::infinity();
if( hitPacket[ iLT ].m_hitresult && if( hitPacket[iLT].m_hitresult && hitPacket[iRT].m_hitresult
hitPacket[ iRT ].m_hitresult && && ( hitPacket[iLT].m_HitInfo.pHitObject
(hitPacket[ iLT ].m_HitInfo.pHitObject == hitPacket[ iRT ].m_HitInfo.pHitObject) ) == hitPacket[iRT].m_HitInfo.pHitObject ) )
{ {
hitInfoLRT.pHitObject = hitPacket[ iLT ].m_HitInfo.pHitObject; hitInfoLRT.pHitObject = hitPacket[ iLT ].m_HitInfo.pHitObject;
hitInfoLRT.m_tHit = ( hitPacket[ iLT ].m_HitInfo.m_tHit + hitInfoLRT.m_tHit = ( hitPacket[ iLT ].m_HitInfo.m_tHit +
@ -1228,46 +1163,41 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
glm::normalize( ( hitPacket[ iLT ].m_HitInfo.m_HitNormal + glm::normalize( ( hitPacket[ iLT ].m_HitInfo.m_HitNormal +
hitPacket[ iRT ].m_HitInfo.m_HitNormal ) * 0.5f ); hitPacket[ iRT ].m_HitInfo.m_HitNormal ) * 0.5f );
cLRT = CCOLORRGB( shadeHit( bgColorY, rayLRT, hitInfoLRT, false, 0, false ) ); cLRT = CCOLORRGB( shadeHit( bgColorY, rayLRT, hitInfoLRT, false,
cLRT = BlendColor( cLRT, BlendColor( cLT, cRT) ); 0, false ) );
cLRT = BlendColor( cLRT, BlendColor( cLT, cRT ) );
} }
else else
{ {
if( hitPacket[ iLT ].m_hitresult || // If any hits
hitPacket[ iRT ].m_hitresult ) // If any hits if( hitPacket[ iLT ].m_hitresult || hitPacket[ iRT ].m_hitresult )
{ {
const unsigned int nodeLT = hitPacket[ iLT ].m_HitInfo.m_acc_node_info; const unsigned int nodeLT =
const unsigned int nodeRT = hitPacket[ iRT ].m_HitInfo.m_acc_node_info; hitPacket[ iLT ].m_HitInfo.m_acc_node_info;
const unsigned int nodeRT =
hitPacket[ iRT ].m_HitInfo.m_acc_node_info;
bool hittedLRT = false; bool hittedLRT = false;
if( nodeLT != 0 ) if( nodeLT != 0 )
hittedLRT |= m_accelerator->Intersect( rayLRT, hitInfoLRT, nodeLT ); hittedLRT |= m_accelerator->Intersect( rayLRT, hitInfoLRT,
nodeLT );
if( ( nodeRT != 0 ) && if( ( nodeRT != 0 ) && ( nodeRT != nodeLT ) )
( nodeRT != nodeLT ) ) hittedLRT |= m_accelerator->Intersect( rayLRT, hitInfoLRT,
hittedLRT |= m_accelerator->Intersect( rayLRT,
hitInfoLRT,
nodeRT ); nodeRT );
if( hittedLRT ) if( hittedLRT )
cLRT = CCOLORRGB( shadeHit( bgColorY, cLRT = CCOLORRGB( shadeHit( bgColorY, rayLRT, hitInfoLRT,
rayLRT, false, 0, false ) );
hitInfoLRT,
false,
0,
false ) );
else else
{ {
hitInfoLRT.m_tHit = std::numeric_limits<float>::infinity(); hitInfoLRT.m_tHit = std::numeric_limits<float>::infinity();
if( m_accelerator->Intersect( rayLRT,hitInfoLRT ) ) if( m_accelerator->Intersect( rayLRT,hitInfoLRT ) )
cLRT = CCOLORRGB( shadeHit( bgColorY, cLRT = CCOLORRGB( shadeHit( bgColorY, rayLRT,
rayLRT, hitInfoLRT, false,
hitInfoLRT, 0, false ) );
false,
0,
false ) );
} }
} }
} }
@ -1293,10 +1223,9 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
HITINFO hitInfoLTB; HITINFO hitInfoLTB;
hitInfoLTB.m_tHit = std::numeric_limits<float>::infinity(); hitInfoLTB.m_tHit = std::numeric_limits<float>::infinity();
if( hitPacket[ iLT ].m_hitresult && if( hitPacket[ iLT ].m_hitresult && hitPacket[ iLB ].m_hitresult
hitPacket[ iLB ].m_hitresult && && ( hitPacket[ iLT ].m_HitInfo.pHitObject ==
( hitPacket[ iLT ].m_HitInfo.pHitObject == hitPacket[ iLB ].m_HitInfo.pHitObject ) )
hitPacket[ iLB ].m_HitInfo.pHitObject ) )
{ {
hitInfoLTB.pHitObject = hitPacket[ iLT ].m_HitInfo.pHitObject; hitInfoLTB.pHitObject = hitPacket[ iLT ].m_HitInfo.pHitObject;
hitInfoLTB.m_tHit = ( hitPacket[ iLT ].m_HitInfo.m_tHit + hitInfoLTB.m_tHit = ( hitPacket[ iLT ].m_HitInfo.m_tHit +
@ -1321,34 +1250,24 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
bool hittedLTB = false; bool hittedLTB = false;
if( nodeLT != 0 ) if( nodeLT != 0 )
hittedLTB |= m_accelerator->Intersect( rayLTB, hittedLTB |= m_accelerator->Intersect( rayLTB, hitInfoLTB,
hitInfoLTB,
nodeLT ); nodeLT );
if( ( nodeLB != 0 ) && if( ( nodeLB != 0 ) && ( nodeLB != nodeLT ) )
( nodeLB != nodeLT ) ) hittedLTB |= m_accelerator->Intersect( rayLTB, hitInfoLTB,
hittedLTB |= m_accelerator->Intersect( rayLTB,
hitInfoLTB,
nodeLB ); nodeLB );
if( hittedLTB ) if( hittedLTB )
cLTB = CCOLORRGB( shadeHit( bgColorY, cLTB = CCOLORRGB( shadeHit( bgColorY, rayLTB, hitInfoLTB,
rayLTB, false, 0, false ) );
hitInfoLTB,
false,
0,
false ) );
else else
{ {
hitInfoLTB.m_tHit = std::numeric_limits<float>::infinity(); hitInfoLTB.m_tHit = std::numeric_limits<float>::infinity();
if( m_accelerator->Intersect( rayLTB, hitInfoLTB ) ) if( m_accelerator->Intersect( rayLTB, hitInfoLTB ) )
cLTB = CCOLORRGB( shadeHit( bgColorY, cLTB = CCOLORRGB( shadeHit( bgColorY, rayLTB,
rayLTB, hitInfoLTB, false,
hitInfoLTB, 0, false ) );
false,
0,
false ) );
} }
} }
} }
@ -1364,14 +1283,14 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
// Trace the center ray // Trace the center ray
RAY rayRTB; RAY rayRTB;
rayRTB.Init( ( oriRT + oriRB ) * 0.5f, rayRTB.Init( ( oriRT + oriRB ) * 0.5f,
glm::normalize( ( dirRT + dirRB ) * 0.5f ) ); glm::normalize( ( dirRT + dirRB ) * 0.5f ) );
HITINFO hitInfoRTB; HITINFO hitInfoRTB;
hitInfoRTB.m_tHit = std::numeric_limits<float>::infinity(); hitInfoRTB.m_tHit = std::numeric_limits<float>::infinity();
if( hitPacket[ iRT ].m_hitresult && hitPacket[ iRB ].m_hitresult && if( hitPacket[ iRT ].m_hitresult && hitPacket[ iRB ].m_hitresult
( hitPacket[ iRT ].m_HitInfo.pHitObject == && ( hitPacket[ iRT ].m_HitInfo.pHitObject ==
hitPacket[ iRB ].m_HitInfo.pHitObject ) ) hitPacket[ iRB ].m_HitInfo.pHitObject ) )
{ {
hitInfoRTB.pHitObject = hitPacket[ iRT ].m_HitInfo.pHitObject; hitInfoRTB.pHitObject = hitPacket[ iRT ].m_HitInfo.pHitObject;
@ -1384,7 +1303,7 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
cRTB = CCOLORRGB( shadeHit( bgColorY, rayRTB, hitInfoRTB, false, 0, cRTB = CCOLORRGB( shadeHit( bgColorY, rayRTB, hitInfoRTB, false, 0,
false ) ); false ) );
cRTB = BlendColor( cRTB, BlendColor( cRT, cRB) ); cRTB = BlendColor( cRTB, BlendColor( cRT, cRB ) );
} }
else else
{ {
@ -1402,31 +1321,22 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
hittedRTB |= m_accelerator->Intersect( rayRTB, hitInfoRTB, hittedRTB |= m_accelerator->Intersect( rayRTB, hitInfoRTB,
nodeRT ); nodeRT );
if( ( nodeRB != 0 ) && if( ( nodeRB != 0 ) && ( nodeRB != nodeRT ) )
( nodeRB != nodeRT ) )
hittedRTB |= m_accelerator->Intersect( rayRTB, hitInfoRTB, hittedRTB |= m_accelerator->Intersect( rayRTB, hitInfoRTB,
nodeRB ); nodeRB );
if( hittedRTB ) if( hittedRTB )
{ {
cRTB = CCOLORRGB( shadeHit( bgColorY, cRTB = CCOLORRGB( shadeHit( bgColorY, rayRTB, hitInfoRTB,
rayRTB, false, 0, false) );
hitInfoRTB,
false,
0,
false) );
} }
else else
{ {
hitInfoRTB.m_tHit = std::numeric_limits<float>::infinity(); hitInfoRTB.m_tHit = std::numeric_limits<float>::infinity();
if( m_accelerator->Intersect( rayRTB, hitInfoRTB ) ) if( m_accelerator->Intersect( rayRTB, hitInfoRTB ) )
cRTB = CCOLORRGB( shadeHit( bgColorY, cRTB = CCOLORRGB( shadeHit( bgColorY, rayRTB, hitInfoRTB,
rayRTB, false, 0, false ) );
hitInfoRTB,
false,
0,
false ) );
} }
} }
} }
@ -1447,9 +1357,9 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
HITINFO hitInfoLRB; HITINFO hitInfoLRB;
hitInfoLRB.m_tHit = std::numeric_limits<float>::infinity(); hitInfoLRB.m_tHit = std::numeric_limits<float>::infinity();
if( hitPacket[ iLB ].m_hitresult && hitPacket[ iRB ].m_hitresult && if( hitPacket[iLB].m_hitresult && hitPacket[iRB].m_hitresult
( hitPacket[ iLB ].m_HitInfo.pHitObject == && ( hitPacket[iLB].m_HitInfo.pHitObject ==
hitPacket[ iRB ].m_HitInfo.pHitObject ) ) hitPacket[iRB].m_HitInfo.pHitObject ) )
{ {
hitInfoLRB.pHitObject = hitPacket[ iLB ].m_HitInfo.pHitObject; hitInfoLRB.pHitObject = hitPacket[ iLB ].m_HitInfo.pHitObject;
@ -1462,7 +1372,7 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
cLRB = CCOLORRGB( shadeHit( bgColorY, rayLRB, hitInfoLRB, false, 0, cLRB = CCOLORRGB( shadeHit( bgColorY, rayLRB, hitInfoLRB, false, 0,
false ) ); false ) );
cLRB = BlendColor( cLRB, BlendColor( cLB, cRB) ); cLRB = BlendColor( cLRB, BlendColor( cLB, cRB ) );
} }
else else
{ {
@ -1494,12 +1404,8 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
hitInfoLRB.m_tHit = std::numeric_limits<float>::infinity(); hitInfoLRB.m_tHit = std::numeric_limits<float>::infinity();
if( m_accelerator->Intersect( rayLRB, hitInfoLRB ) ) if( m_accelerator->Intersect( rayLRB, hitInfoLRB ) )
cLRB = CCOLORRGB( shadeHit( bgColorY, cLRB = CCOLORRGB( shadeHit( bgColorY, rayLRB, hitInfoLRB,
rayLRB, false, 0, false ) );
hitInfoLRB,
false,
0,
false ) );
} }
} }
} }
@ -1654,12 +1560,9 @@ void C3D_RENDER_RAYTRACING::render_preview( GLubyte *ptrPBO )
#define USE_EXPERIMENTAL_SOFT_SHADOWS 1 #define USE_EXPERIMENTAL_SOFT_SHADOWS 1
SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor, SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F& aBgColor, const RAY& aRay,
const RAY &aRay, HITINFO& aHitInfo, bool aIsInsideObject,
HITINFO &aHitInfo, unsigned int aRecursiveLevel, bool is_testShadow ) const
bool aIsInsideObject,
unsigned int aRecursiveLevel,
bool is_testShadow ) const
{ {
const CMATERIAL *objMaterial = aHitInfo.pHitObject->GetMaterial(); const CMATERIAL *objMaterial = aHitInfo.pHitObject->GetMaterial();
wxASSERT( objMaterial != NULL ); wxASSERT( objMaterial != NULL );
@ -1686,9 +1589,7 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
unsigned int nr_lights_that_can_cast_shadows = 0; unsigned int nr_lights_that_can_cast_shadows = 0;
for( LIST_LIGHT::const_iterator ii = lightList.begin(); for( LIST_LIGHT::const_iterator ii = lightList.begin(); ii != lightList.end(); ++ii )
ii != lightList.end();
++ii )
{ {
const CLIGHT *light = (CLIGHT *)*ii; const CLIGHT *light = (CLIGHT *)*ii;
@ -1735,14 +1636,12 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
#if USE_EXPERIMENTAL_SOFT_SHADOWS #if USE_EXPERIMENTAL_SOFT_SHADOWS
} }
else // Experimental softshadow calculation
// Experimental softshadow calculation
else
{ {
const unsigned int shadow_number_of_samples = const unsigned int shadow_number_of_samples =
m_boardAdapter.m_raytrace_nrsamples_shadows; m_boardAdapter.m_raytrace_nrsamples_shadows;
const float shadow_inc_factor = 1.0f / (float)(shadow_number_of_samples); const float shadow_inc_factor = 1.0f / (float) ( shadow_number_of_samples );
for( unsigned int i = 0; i < shadow_number_of_samples; ++i ) for( unsigned int i = 0; i < shadow_number_of_samples; ++i )
{ {
@ -1775,13 +1674,8 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
shadow_att_factor_sum += shadow_att_factor_light; shadow_att_factor_sum += shadow_att_factor_light;
} }
outColor += objMaterial->Shade( aRay, outColor += objMaterial->Shade( aRay, aHitInfo, NdotL, diffuseColorObj, vectorToLight,
aHitInfo, colorOfLight, shadow_att_factor_light );
NdotL,
diffuseColorObj,
vectorToLight,
colorOfLight,
shadow_att_factor_light );
} }
// Only use the headlight for preview // Only use the headlight for preview
@ -1806,18 +1700,17 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
if( !m_isPreview ) if( !m_isPreview )
{ {
// Reflections // Reflections
if( ( objMaterial->GetReflection() > 0.0f ) && if( ( objMaterial->GetReflection() > 0.0f )
m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_REFLECTIONS ) && && m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_REFLECTIONS )
( aRecursiveLevel < objMaterial->GetReflectionsRecursiveLevel() ) ) && ( aRecursiveLevel < objMaterial->GetReflectionsRecursiveLevel() ) )
{ {
const unsigned int reflection_number_of_samples = const unsigned int reflection_number_of_samples =
objMaterial->GetNrReflectionsSamples(); objMaterial->GetNrReflectionsSamples();
SFVEC3F sum_color = SFVEC3F(0.0f); SFVEC3F sum_color = SFVEC3F( 0.0f );
const SFVEC3F reflectVector = aRay.m_Dir - const SFVEC3F reflectVector = aRay.m_Dir - 2.0f *
2.0f * glm::dot( aRay.m_Dir, aHitInfo.m_HitNormal ) * glm::dot( aRay.m_Dir, aHitInfo.m_HitNormal ) * aHitInfo.m_HitNormal;
aHitInfo.m_HitNormal;
for( unsigned int i = 0; i < reflection_number_of_samples; ++i ) for( unsigned int i = 0; i < reflection_number_of_samples; ++i )
{ {
@ -1844,12 +1737,8 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
if( m_accelerator->Intersect( reflectedRay, reflectedHit ) ) if( m_accelerator->Intersect( reflectedRay, reflectedHit ) )
{ {
sum_color += ( diffuseColorObj + objMaterial->GetSpecularColor() ) * sum_color += ( diffuseColorObj + objMaterial->GetSpecularColor() ) *
shadeHit( aBgColor, shadeHit( aBgColor, reflectedRay, reflectedHit, false,
reflectedRay, aRecursiveLevel + 1, is_testShadow ) *
reflectedHit,
false,
aRecursiveLevel + 1,
is_testShadow ) *
SFVEC3F( objMaterial->GetReflection() * SFVEC3F( objMaterial->GetReflection() *
// Falloff factor // Falloff factor
(1.0f / ( 1.0f + 0.75f * reflectedHit.m_tHit * (1.0f / ( 1.0f + 0.75f * reflectedHit.m_tHit *
@ -1860,12 +1749,11 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
outColor += (sum_color / SFVEC3F( (float)reflection_number_of_samples) ); outColor += (sum_color / SFVEC3F( (float)reflection_number_of_samples) );
} }
// Refractions // Refraction
const float objTransparency = aHitInfo.pHitObject->GetModelTransparency(); const float objTransparency = aHitInfo.pHitObject->GetModelTransparency();
if( ( objTransparency > 0.0f ) && if( ( objTransparency > 0.0f ) && m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_REFRACTIONS )
m_boardAdapter.GetFlag( FL_RENDER_RAYTRACING_REFRACTIONS ) && && ( aRecursiveLevel < objMaterial->GetRefractionsRecursiveLevel() ) )
( aRecursiveLevel < objMaterial->GetRefractionsRecursiveLevel() ) )
{ {
const float airIndex = 1.000293f; const float airIndex = 1.000293f;
const float glassIndex = 1.49f; const float glassIndex = 1.49f;
@ -1876,10 +1764,7 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
SFVEC3F refractedVector; SFVEC3F refractedVector;
if( Refract( aRay.m_Dir, if( Refract( aRay.m_Dir, aHitInfo.m_HitNormal, refractionRatio, refractedVector ) )
aHitInfo.m_HitNormal,
refractionRatio,
refractedVector ) )
{ {
// This increase the start point by a "fixed" factor so it will work the // This increase the start point by a "fixed" factor so it will work the
// same for all distances // same for all distances
@ -1918,12 +1803,8 @@ SFVEC3F C3D_RENDER_RAYTRACING::shadeHit( const SFVEC3F &aBgColor,
if( m_accelerator->Intersect( refractedRay, refractedHit ) ) if( m_accelerator->Intersect( refractedRay, refractedHit ) )
{ {
refractedColor = shadeHit( aBgColor, refractedColor = shadeHit( aBgColor, refractedRay, refractedHit,
refractedRay, !aIsInsideObject, aRecursiveLevel + 1, false );
refractedHit,
!aIsInsideObject,
aRecursiveLevel + 1,
false );
const SFVEC3F absorbance = ( SFVEC3F(1.0f) - diffuseColorObj ) * const SFVEC3F absorbance = ( SFVEC3F(1.0f) - diffuseColorObj ) *
(1.0f - objTransparency ) * (1.0f - objTransparency ) *
@ -2026,14 +1907,14 @@ void C3D_RENDER_RAYTRACING::initialize_block_positions()
i++; i++;
const SFVEC2UI blockPos( mX * 4 * RAYPACKET_DIM - mX * 4, const SFVEC2UI blockPos( mX * 4 * RAYPACKET_DIM - mX * 4,
mY * 4 * RAYPACKET_DIM - mY * 4); mY * 4 * RAYPACKET_DIM - mY * 4 );
if( ( blockPos.x >= ( (unsigned int)m_windowSize.x - ( 4 * RAYPACKET_DIM + 4 ) ) ) && if( ( blockPos.x >= ( (unsigned int)m_windowSize.x - ( 4 * RAYPACKET_DIM + 4 ) ) ) &&
( blockPos.y >= ( (unsigned int)m_windowSize.y - ( 4 * RAYPACKET_DIM + 4 ) ) ) ) ( blockPos.y >= ( (unsigned int)m_windowSize.y - ( 4 * RAYPACKET_DIM + 4 ) ) ) )
break; break;
if( ( blockPos.x < ( (unsigned int)m_windowSize.x - ( 4 * RAYPACKET_DIM + 4) ) ) && if( ( blockPos.x < ( (unsigned int)m_windowSize.x - ( 4 * RAYPACKET_DIM + 4 ) ) ) &&
( blockPos.y < ( (unsigned int)m_windowSize.y - ( 4 * RAYPACKET_DIM + 4) ) ) ) ( blockPos.y < ( (unsigned int)m_windowSize.y - ( 4 * RAYPACKET_DIM + 4 ) ) ) )
{ {
m_blockPositionsFast.push_back( blockPos ); m_blockPositionsFast.push_back( blockPos );
@ -2047,25 +1928,26 @@ void C3D_RENDER_RAYTRACING::initialize_block_positions()
m_fastPreviewModeSize = m_realBufferSize; m_fastPreviewModeSize = m_realBufferSize;
m_realBufferSize.x = ((m_realBufferSize.x + RAYPACKET_DIM * 4) & RAYPACKET_INVMASK); m_realBufferSize.x = ( ( m_realBufferSize.x + RAYPACKET_DIM * 4 ) & RAYPACKET_INVMASK );
m_realBufferSize.y = ((m_realBufferSize.y + RAYPACKET_DIM * 4) & RAYPACKET_INVMASK); m_realBufferSize.y = ( ( m_realBufferSize.y + RAYPACKET_DIM * 4 ) & RAYPACKET_INVMASK );
m_xoffset = (m_windowSize.x - m_realBufferSize.x) / 2; m_xoffset = ( m_windowSize.x - m_realBufferSize.x ) / 2;
m_yoffset = (m_windowSize.y - m_realBufferSize.y) / 2; m_yoffset = ( m_windowSize.y - m_realBufferSize.y ) / 2;
m_postshader_ssao.UpdateSize( m_realBufferSize ); m_postshader_ssao.UpdateSize( m_realBufferSize );
// Calc block positions for regular rendering. Choose an 'inside out' // Calc block positions for regular rendering. Choose an 'inside out' style of rendering.
// style of rendering
m_blockPositions.clear(); m_blockPositions.clear();
const int blocks_x = m_realBufferSize.x / RAYPACKET_DIM; const int blocks_x = m_realBufferSize.x / RAYPACKET_DIM;
const int blocks_y = m_realBufferSize.y / RAYPACKET_DIM; const int blocks_y = m_realBufferSize.y / RAYPACKET_DIM;
m_blockPositions.reserve( blocks_x * blocks_y ); m_blockPositions.reserve( blocks_x * blocks_y );
for( int x = 0; x < blocks_x; ++x ) for( int x = 0; x < blocks_x; ++x )
{
for( int y = 0; y < blocks_y; ++y ) for( int y = 0; y < blocks_y; ++y )
m_blockPositions.emplace_back( x * RAYPACKET_DIM, y * RAYPACKET_DIM ); m_blockPositions.emplace_back( x * RAYPACKET_DIM, y * RAYPACKET_DIM );
}
const SFVEC2UI center( m_realBufferSize.x / 2, m_realBufferSize.y / 2 ); const SFVEC2UI center( m_realBufferSize.x / 2, m_realBufferSize.y / 2 );
std::sort( m_blockPositions.begin(), m_blockPositions.end(), std::sort( m_blockPositions.begin(), m_blockPositions.end(),
@ -2082,7 +1964,7 @@ void C3D_RENDER_RAYTRACING::initialize_block_positions()
} }
BOARD_ITEM *C3D_RENDER_RAYTRACING::IntersectBoardItem( const RAY &aRay ) BOARD_ITEM* C3D_RENDER_RAYTRACING::IntersectBoardItem( const RAY& aRay )
{ {
HITINFO hitInfo; HITINFO hitInfo;
hitInfo.m_tHit = std::numeric_limits<float>::infinity(); hitInfo.m_tHit = std::numeric_limits<float>::infinity();

41
3d-viewer/3d_rendering/3d_render_raytracing/raypacket.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt> * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -23,7 +23,7 @@
*/ */
/** /**
* @file raypacket.h * @file raypacket.h
* @brief * @brief
*/ */
@ -42,35 +42,28 @@
struct RAYPACKET struct RAYPACKET
{ {
CFRUSTUM m_Frustum; RAYPACKET( const CCAMERA& aCamera, const SFVEC2I& aWindowsPosition );
RAY m_ray[RAYPACKET_RAYS_PER_PACKET];
RAYPACKET( const CCAMERA &aCamera, RAYPACKET( const CCAMERA& aCamera, const SFVEC2I& aWindowsPosition,
const SFVEC2I &aWindowsPosition ); const SFVEC3F& aDirectionDisplacementFactor );
RAYPACKET( const CCAMERA &aCamera, RAYPACKET( const CCAMERA& aCamera, const SFVEC2I& aWindowsPosition,
const SFVEC2I &aWindowsPosition,
const SFVEC3F &aDirectionDisplacementFactor );
RAYPACKET( const CCAMERA &aCamera,
const SFVEC2I &aWindowsPosition,
unsigned int aPixelMultiple ); unsigned int aPixelMultiple );
RAYPACKET( const CCAMERA &aCamera, RAYPACKET( const CCAMERA& aCamera, const SFVEC2F& aWindowsPosition );
const SFVEC2F &aWindowsPosition );
RAYPACKET( const CCAMERA &aCamera, RAYPACKET( const CCAMERA& aCamera, const SFVEC2F& aWindowsPosition,
const SFVEC2F &aWindowsPosition, const SFVEC2F& a2DWindowsPosDisplacementFactor );
const SFVEC2F &a2DWindowsPosDisplacementFactor );
CFRUSTUM m_Frustum;
RAY m_ray[RAYPACKET_RAYS_PER_PACKET];
}; };
void RAYPACKET_InitRays( const CCAMERA &aCamera, void RAYPACKET_InitRays( const CCAMERA& aCamera, const SFVEC2F& aWindowsPosition, RAY* aRayPck );
const SFVEC2F &aWindowsPosition,
RAY *aRayPck );
void RAYPACKET_InitRays_with2DDisplacement( const CCAMERA &aCamera, void RAYPACKET_InitRays_with2DDisplacement( const CCAMERA& aCamera,
const SFVEC2F &aWindowsPosition, const SFVEC2F& aWindowsPosition,
const SFVEC2F &a2DWindowsPosDisplacementFactor, const SFVEC2F& a2DWindowsPosDisplacementFactor,
RAY *aRayPck ); RAY* aRayPck );
#endif // _RAYPACKET_H_ #endif // _RAYPACKET_H_

6
eeschema/dialogs/dialog_eeschema_page_settings.cpp
View File

@ -36,7 +36,7 @@ DIALOG_EESCHEMA_PAGE_SETTINGS::DIALOG_EESCHEMA_PAGE_SETTINGS( EDA_DRAW_FRAME* aP
DIALOG_EESCHEMA_PAGE_SETTINGS::~DIALOG_EESCHEMA_PAGE_SETTINGS() DIALOG_EESCHEMA_PAGE_SETTINGS::~DIALOG_EESCHEMA_PAGE_SETTINGS()
{ {
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ); auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
wxASSERT( cfg ); wxCHECK( cfg, /* void */ );
cfg->m_PageSettings.export_paper = m_PaperExport->GetValue(); cfg->m_PageSettings.export_paper = m_PaperExport->GetValue();
cfg->m_PageSettings.export_revision = m_RevisionExport->GetValue(); cfg->m_PageSettings.export_revision = m_RevisionExport->GetValue();
@ -86,7 +86,7 @@ void DIALOG_EESCHEMA_PAGE_SETTINGS::onTransferDataToWindow()
m_TextSheetNumber->SetLabel( msg ); m_TextSheetNumber->SetLabel( msg );
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ); auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
wxASSERT( cfg ); wxCHECK( cfg, /* void */ );
m_PaperExport->SetValue( cfg->m_PageSettings.export_paper ); m_PaperExport->SetValue( cfg->m_PageSettings.export_paper );
m_RevisionExport->SetValue( cfg->m_PageSettings.export_revision ); m_RevisionExport->SetValue( cfg->m_PageSettings.export_revision );
@ -167,4 +167,4 @@ bool DIALOG_EESCHEMA_PAGE_SETTINGS::onSavePageSettings()
} }
return true; return true;
} }

2
eeschema/tools/symbol_editor_drawing_tools.cpp
View File

@ -357,7 +357,7 @@ int SYMBOL_EDITOR_DRAWING_TOOLS::DrawShape( const TOOL_EVENT& aEvent )
default: break; // keep compiler quiet default: break; // keep compiler quiet
} }
wxASSERT( item ); wxCHECK( item, 0 );
item->SetWidth( settings->m_Defaults.line_width ); item->SetWidth( settings->m_Defaults.line_width );
item->SetFillMode( m_lastFillStyle ); item->SetFillMode( m_lastFillStyle );

14
eeschema/tools/symbol_editor_pin_tool.cpp
View File

@ -341,7 +341,19 @@ void SYMBOL_EDITOR_PIN_TOOL::CreateImagePins( LIB_PIN* aPin )
newPin->SetNumber( unknownNum ); newPin->SetNumber( unknownNum );
newPin->SetUnit( ii ); newPin->SetUnit( ii );
aPin->GetParent()->AddDrawItem( newPin );
try
{
aPin->GetParent()->AddDrawItem( newPin );
}
catch( const boost::bad_pointer& e )
{
wxLogError( "Cannot add new pin to symbol. Boost pointer error %s occurred.",
e.what() );
delete newPin;
return;
}
newPin->ClearFlags( IS_NEW ); newPin->ClearFlags( IS_NEW );
} }
} }

2
pcbnew/drc/drc_engine.cpp
View File

@ -723,7 +723,7 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRulesForItems( DRC_CONSTRAINT_TYPE_T aConstraintI
{ {
// A PTH pad has a plated cylinder around the hole so copper clearances apply // A PTH pad has a plated cylinder around the hole so copper clearances apply
// whether or not there's a flashed pad. Not true for NPTHs. // whether or not there's a flashed pad. Not true for NPTHs.
if( a->Type() == PCB_PAD_T ) if( a && a->Type() == PCB_PAD_T )
{ {
const PAD* pad = static_cast<const PAD*>( a ); const PAD* pad = static_cast<const PAD*>( a );

4
pcbnew/exporters/export_vrml.cpp
View File

@ -350,6 +350,8 @@ static void write_triangle_bag( std::ostream& aOut_file, const VRML_COLOR& aColo
switch( marker_found ) switch( marker_found )
{ {
case 1: // Material marker case 1: // Material marker
{
std::streamsize lastPrecision = aOut_file.precision();
aOut_file << " diffuseColor " << std::setprecision(3); aOut_file << " diffuseColor " << std::setprecision(3);
aOut_file << aColor.diffuse_red << " "; aOut_file << aColor.diffuse_red << " ";
aOut_file << aColor.diffuse_grn << " "; aOut_file << aColor.diffuse_grn << " ";
@ -368,6 +370,8 @@ static void write_triangle_bag( std::ostream& aOut_file, const VRML_COLOR& aColo
aOut_file << " ambientIntensity " << aColor.ambient << "\n"; aOut_file << " ambientIntensity " << aColor.ambient << "\n";
aOut_file << " transparency " << aColor.transp << "\n"; aOut_file << " transparency " << aColor.transp << "\n";
aOut_file << " shininess " << aColor.shiny << "\n"; aOut_file << " shininess " << aColor.shiny << "\n";
aOut_file.precision( lastPrecision );
}
break; break;
case 2: case 2:

14
pcbnew/pcb_base_frame.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2018 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2018 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -24,6 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <boost/uuid/entropy_error.hpp>
#include <kiface_i.h> #include <kiface_i.h>
#include <confirm.h> #include <confirm.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
@ -177,7 +178,16 @@ void PCB_BASE_FRAME::FocusOnItem( BOARD_ITEM* aItem )
{ {
static KIID lastBrightenedItemID( niluuid ); static KIID lastBrightenedItemID( niluuid );
BOARD_ITEM* lastItem = GetBoard()->GetItem( lastBrightenedItemID ); BOARD_ITEM* lastItem = nullptr;
try
{
lastItem = GetBoard()->GetItem( lastBrightenedItemID );
}
catch( const boost::uuids::entropy_error& e )
{
wxLogError( "A Boost UUID entropy exception was thrown in %s:%s.", __FILE__, __FUNCTION__ );
}
if( lastItem && lastItem != aItem && lastItem != DELETED_BOARD_ITEM::GetInstance() ) if( lastItem && lastItem != aItem && lastItem != DELETED_BOARD_ITEM::GetInstance() )
{ {

2
pcbnew/tools/board_inspection_tool.cpp
View File

@ -298,6 +298,8 @@ int BOARD_INSPECTION_TOOL::InspectClearance( const TOOL_EVENT& aEvent )
BOARD_ITEM* a = static_cast<BOARD_ITEM*>( selection.GetItem( 0 ) ); BOARD_ITEM* a = static_cast<BOARD_ITEM*>( selection.GetItem( 0 ) );
BOARD_ITEM* b = static_cast<BOARD_ITEM*>( selection.GetItem( 1 ) ); BOARD_ITEM* b = static_cast<BOARD_ITEM*>( selection.GetItem( 1 ) );
wxCHECK( a && b, 0 );
if( a->Type() == PCB_GROUP_T ) if( a->Type() == PCB_GROUP_T )
{ {
PCB_GROUP* ag = static_cast<PCB_GROUP*>( a ); PCB_GROUP* ag = static_cast<PCB_GROUP*>( a );

10
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -30,6 +30,7 @@ using namespace std::placeholders;
#include <core/kicad_algo.h> #include <core/kicad_algo.h>
#include <board.h> #include <board.h>
#include <board_item.h> #include <board_item.h>
#include <clipper.hpp>
#include <track.h> #include <track.h>
#include <footprint.h> #include <footprint.h>
#include <pcb_shape.h> #include <pcb_shape.h>
@ -2393,7 +2394,14 @@ void PCB_SELECTION_TOOL::GuessSelectionCandidates( GENERAL_COLLECTOR& aCollector
} }
else else
{ {
area = FOOTPRINT::GetCoverageArea( item, aCollector ); try
{
area = FOOTPRINT::GetCoverageArea( item, aCollector );
}
catch( const ClipperLib::clipperException& e )
{
wxLogError( "A clipper exception %s was detected.", e.what() );
}
} }
itemsByArea.emplace_back( item, area ); itemsByArea.emplace_back( item, area );

13
qa/drc_proto/drc_proto.cpp
View File

@ -81,7 +81,8 @@ PROJECT_CONTEXT loadKicadProject( wxString filename, OPT<wxString> rulesFilePath
manager.LoadProject( pro.GetFullPath() ); manager.LoadProject( pro.GetFullPath() );
rv.project = &manager.Prj(); rv.project = &manager.Prj();
rv.board.reset( KI_TEST::ReadBoardFromFileOrStream( std::string( brdName.GetFullPath().ToUTF8() ) ).release() ); rv.board.reset( KI_TEST::ReadBoardFromFileOrStream(
std::string( brdName.GetFullPath().ToUTF8() ) ).release() );
rv.board->SetProject( rv.project ); rv.board->SetProject( rv.project );
if( rulesFilePath ) if( rulesFilePath )
@ -132,6 +133,14 @@ int runDRCProto( PROJECT_CONTEXT project, std::shared_ptr<KIGFX::VIEW_OVERLAY> a
// provider->Enable(false); // provider->Enable(false);
} }
drcEngine->RunTests( EDA_UNITS::MILLIMETRES, true, false ); try
{
drcEngine->RunTests( EDA_UNITS::MILLIMETRES, true, false );
}
catch( const ClipperLib::clipperException& e )
{
consoleLog.Print( wxString::Format( "Clipper exception %s occurred.", e.what() ) );
}
return 0; return 0;
} }