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

3D-Viewer: fix issue with solder mask 

Fixes https://gitlab.com/kicad/code/kicad/issues/8272
This commit is contained in:
Mario Luzeiro 2021-04-21 23:56:11 +01:00 committed by jean-pierre charras
parent 9b1890606d
commit e92dc96767
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_rendering/legacy/layer_triangles.cpp
View File

@ -648,9 +648,7 @@ GLuint OPENGL_RENDER_LIST::generate_top_or_bot_seg_ends(
glEnable( GL_TEXTURE_2D );
glBindTexture( GL_TEXTURE_2D, aTextureId );
setBlendfunction();
glAlphaFunc( GL_GREATER, 0.98f );
glAlphaFunc( GL_GREATER, 0.2f );
glEnable( GL_ALPHA_TEST );
glNormal3f( 0.0f, 0.0f, aIsNormalUp?1.0f:-1.0f );

6
3d-viewer/3d_rendering/legacy/render_3d_legacy.cpp
View File

@ -982,7 +982,7 @@ bool RENDER_3D_LEGACY::initializeOpenGL()
if( !circleImage )
return false;
unsigned int circleRadius = ( SIZE_OF_CIRCLE_TEXTURE / 2 ) - 0;
unsigned int circleRadius = ( SIZE_OF_CIRCLE_TEXTURE / 2 ) - 4;
circleImage->CircleFilled( ( SIZE_OF_CIRCLE_TEXTURE / 2 ) - 0,
( SIZE_OF_CIRCLE_TEXTURE / 2 ) - 0,
@ -993,10 +993,6 @@ bool RENDER_3D_LEGACY::initializeOpenGL()
circleImageBlured->EfxFilter_SkipCenter( circleImage, IMAGE_FILTER::GAUSSIAN_BLUR, circleRadius - 8 );
circleImage->EfxFilter_SkipCenter( circleImageBlured, IMAGE_FILTER::GAUSSIAN_BLUR, circleRadius - 8 );
circleImageBlured->EfxFilter_SkipCenter( circleImage, IMAGE_FILTER::GAUSSIAN_BLUR, circleRadius - 8 );
m_circleTexture = OglLoadTexture( *circleImageBlured );
delete circleImageBlured;

6
3d-viewer/common_ogl/ogl_utils.cpp
View File

@ -81,9 +81,9 @@ GLuint OglLoadTexture( const IMAGE& aImage )
ori++;
dst[0] = v;
dst[1] = v;
dst[2] = v;
dst[0] = 255;
dst[1] = 255;
dst[2] = 255;
dst[3] = v;
dst+= 4;
}