From 87af115ee06273c4bc560eb8e57ad80118a35462 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 20 Sep 2023 18:33:32 +0100 Subject: [PATCH] Make better use of method overrides. --- .../3d_rendering/opengl/layer_triangles.cpp | 10 +-- .../3d_rendering/opengl/layer_triangles.h | 10 +-- .../3d_rendering/opengl/render_3d_opengl.cpp | 61 ++++++++----------- 3 files changed, 34 insertions(+), 47 deletions(-) diff --git a/3d-viewer/3d_rendering/opengl/layer_triangles.cpp b/3d-viewer/3d_rendering/opengl/layer_triangles.cpp index 0112913284..36b6656be4 100644 --- a/3d-viewer/3d_rendering/opengl/layer_triangles.cpp +++ b/3d-viewer/3d_rendering/opengl/layer_triangles.cpp @@ -498,11 +498,11 @@ void OPENGL_RENDER_LIST::DrawAllCameraCulled( float zCameraPos, bool aDrawMiddle } -void OPENGL_RENDER_LIST::DrawAllCameraCulledSubtractLayer( bool aDrawMiddle, - const OPENGL_RENDER_LIST* aLayerToSubtractA, - const OPENGL_RENDER_LIST* aLayerToSubtractB, - const OPENGL_RENDER_LIST* aLayerToSubtractC, - const OPENGL_RENDER_LIST* aLayerToSubtractD ) const +void OPENGL_RENDER_LIST::DrawAllCameraCulled( bool aDrawMiddle, + const OPENGL_RENDER_LIST* aLayerToSubtractA, + const OPENGL_RENDER_LIST* aLayerToSubtractB, + const OPENGL_RENDER_LIST* aLayerToSubtractC, + const OPENGL_RENDER_LIST* aLayerToSubtractD ) const { glClearStencil( 0x00 ); glClear( GL_STENCIL_BUFFER_BIT ); diff --git a/3d-viewer/3d_rendering/opengl/layer_triangles.h b/3d-viewer/3d_rendering/opengl/layer_triangles.h index 93ade70970..6985a80ea3 100644 --- a/3d-viewer/3d_rendering/opengl/layer_triangles.h +++ b/3d-viewer/3d_rendering/opengl/layer_triangles.h @@ -196,11 +196,11 @@ public: */ void DrawAllCameraCulled( float zCameraPos, bool aDrawMiddle = true ) const; - void DrawAllCameraCulledSubtractLayer( bool aDrawMiddle, - const OPENGL_RENDER_LIST* aLayerToSubtractA = nullptr, - const OPENGL_RENDER_LIST* aLayerToSubtractB = nullptr, - const OPENGL_RENDER_LIST* aLayerToSubtractC = nullptr, - const OPENGL_RENDER_LIST* aLayerToSubtractD = nullptr ) const; + void DrawAllCameraCulled( bool aDrawMiddle, + const OPENGL_RENDER_LIST* aLayerToSubtractA = nullptr, + const OPENGL_RENDER_LIST* aLayerToSubtractB = nullptr, + const OPENGL_RENDER_LIST* aLayerToSubtractC = nullptr, + const OPENGL_RENDER_LIST* aLayerToSubtractD = nullptr ) const; void ApplyScalePosition( float aZposition, float aZscale ); diff --git a/3d-viewer/3d_rendering/opengl/render_3d_opengl.cpp b/3d-viewer/3d_rendering/opengl/render_3d_opengl.cpp index b369d062c4..7ca4ed9b70 100644 --- a/3d-viewer/3d_rendering/opengl/render_3d_opengl.cpp +++ b/3d-viewer/3d_rendering/opengl/render_3d_opengl.cpp @@ -628,29 +628,24 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter, if( viasHolesLayer != nullptr ) { - pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, - m_outerThroughHoles, - viasHolesLayer, - m_antiBoard ); + pLayerDispList->DrawAllCameraCulled( drawMiddleSegments, + m_outerThroughHoles, viasHolesLayer, + m_antiBoard ); // Draw plated pads if( layer_id == F_Cu && m_platedPadsFront ) { setPlatedCopperAndDepthOffset( layer_id ); - m_platedPadsFront->DrawAllCameraCulledSubtractLayer( - drawMiddleSegments, - m_outerThroughHoles, - viasHolesLayer, - m_antiBoard ); + m_platedPadsFront->DrawAllCameraCulled( drawMiddleSegments, + m_outerThroughHoles, + viasHolesLayer, m_antiBoard ); } else if( layer_id == B_Cu && m_platedPadsBack ) { setPlatedCopperAndDepthOffset( layer_id ); - m_platedPadsBack->DrawAllCameraCulledSubtractLayer( - drawMiddleSegments, - m_outerThroughHoles, - viasHolesLayer, - m_antiBoard ); + m_platedPadsBack->DrawAllCameraCulled( drawMiddleSegments, + m_outerThroughHoles, + viasHolesLayer, m_antiBoard ); } unsetDepthOffset(); @@ -658,23 +653,20 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter, } else { - pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, - m_outerThroughHoles, - m_antiBoard ); + pLayerDispList->DrawAllCameraCulled( drawMiddleSegments, m_outerThroughHoles, + m_antiBoard ); if( layer_id == F_Cu && m_platedPadsFront ) { setPlatedCopperAndDepthOffset( layer_id ); - m_platedPadsFront->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, - m_outerThroughHoles, - m_antiBoard ); + m_platedPadsFront->DrawAllCameraCulled( drawMiddleSegments, + m_outerThroughHoles, m_antiBoard ); } else if( layer_id == B_Cu && m_platedPadsBack ) { setPlatedCopperAndDepthOffset( layer_id ); - m_platedPadsBack->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, - m_outerThroughHoles, - m_antiBoard ); + m_platedPadsBack->DrawAllCameraCulled( drawMiddleSegments, + m_outerThroughHoles, m_antiBoard ); } unsetDepthOffset(); @@ -724,10 +716,7 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter, // Do not render Paste layers when skipRenderHoles is enabled // otherwise it will cause z-fight issues if( layer_id != B_Paste && layer_id != F_Paste ) - { - pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, - anti_board ); - } + pLayerDispList->DrawAllCameraCulled( drawMiddleSegments, anti_board ); } else if( m_boardAdapter.m_Cfg->m_Render.subtract_mask_from_silk && !m_boardAdapter.m_Cfg->m_Render.opengl_show_off_board_silk @@ -738,18 +727,17 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter, const OPENGL_RENDER_LIST* pLayerDispListMask = m_layers.at( layerMask_id ); - pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, - pLayerDispListMask, - throughHolesOuter, anti_board ); + pLayerDispList->DrawAllCameraCulled( drawMiddleSegments, pLayerDispListMask, + throughHolesOuter, anti_board ); } else if( throughHolesOuter ) { - pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, nullptr, - throughHolesOuter, anti_board ); + pLayerDispList->DrawAllCameraCulled( drawMiddleSegments, throughHolesOuter, + anti_board ); } else { - pLayerDispList->DrawAllCameraCulledSubtractLayer( drawMiddleSegments, anti_board ); + pLayerDispList->DrawAllCameraCulled( drawMiddleSegments, anti_board ); } } @@ -1025,8 +1013,8 @@ void RENDER_3D_OPENGL::renderSolderMaskLayer( PCB_LAYER_ID aLayerID, float aZPos } else { - m_board->DrawAllCameraCulledSubtractLayer( aDrawMiddleSegments, pLayerDispListMask, - m_outerViaThroughHoles ); + m_board->DrawAllCameraCulled( aDrawMiddleSegments, pLayerDispListMask, + m_outerViaThroughHoles ); } } else @@ -1047,8 +1035,7 @@ void RENDER_3D_OPENGL::renderSolderMaskLayer( PCB_LAYER_ID aLayerID, float aZPos } else { - m_board->DrawAllCameraCulledSubtractLayer( aDrawMiddleSegments, - m_outerViaThroughHoles ); + m_board->DrawAllCameraCulled( aDrawMiddleSegments, m_outerViaThroughHoles ); } } }