Commit 01a8442b authored by jean-pierre charras's avatar jean-pierre charras
Browse files

3d viewer: minor code cleaning (remove useless #include ) 

dialog_track_via_size: set minimal size  and make dialog resizable.
Update demo file.
parent 459ea885

3d-viewer/3d_canvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ EDA_3D_CANVAS::~EDA_3D_CANVAS() 
}





void EDA_3D_CANVAS::ClearLists( GLuint aGlList )

void EDA_3D_CANVAS::ClearLists( int aGlList )

{

    if( aGlList )

    {

3d-viewer/3d_canvas.h

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#endif



#include <3d_struct.h>

#include <convert_basic_shapes_to_polygon.h>



class BOARD_DESIGN_SETTINGS;

class EDA_3D_FRAME;
@@ -91,7 +90,8 @@ private: 
    GLuint          m_text_fake_shadow_back;

    GLuint          m_text_fake_shadow_board;



    void Create_and_Render_Shadow_Buffer( GLuint *aDst_gl_texture, GLuint aTexture_size, bool aDraw_body, int aBlurPasses );

    void Create_and_Render_Shadow_Buffer( GLuint *aDst_gl_texture,

            GLuint aTexture_size, bool aDraw_body, int aBlurPasses );



public:

    EDA_3D_CANVAS( EDA_3D_FRAME* parent, int* attribList = 0 );
@@ -107,7 +107,7 @@ public: 
     * @param aGlList = the list to clear.

     * if 0 (default) all lists are cleared

     */

    void   ClearLists( GLuint aGlList = 0 );

    void   ClearLists( int aGlList = 0 );



    // Event functions:

    void   OnPaint( wxPaintEvent& event );
@@ -154,7 +154,7 @@ public: 
    /**

     * Function BuildTechLayers3DView

     * Called by CreateDrawGL_List()

     * Populates the OpenGL GL_ID_BOARD draw list with items on tech layers

     * Populates the OpenGL GL_ID_TECH_LAYERS draw list with items on tech layers

     */

    void   BuildTechLayers3DView();

3d-viewer/3d_class.cpp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <fctsys.h>



#include <3d_viewer.h>

#include <3d_struct.h>





bool S3D_MASTER::IsOpenGlAllowed()

3d-viewer/3d_draw.cpp

+6 −4
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ void EDA_3D_CANVAS::Create_and_Render_Shadow_Buffer( GLuint *aDst_gl_texture, 
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );

    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );



    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, aTexture_size, aTexture_size, 0, GL_RGBA, GL_UNSIGNED_BYTE, depthbufferRGBA );

    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, aTexture_size, aTexture_size, 0,

                  GL_RGBA, GL_UNSIGNED_BYTE, depthbufferRGBA );



    glFlush();

    glFinish();
@@ -364,7 +365,8 @@ void EDA_3D_CANVAS::Redraw() 


    InitGL();



    if( g_Parm_3D_Visu.GetFlag( FL_MODULE ) && g_Parm_3D_Visu.IsRealisticMode() && g_Parm_3D_Visu.HightQualityMode() )

    if( g_Parm_3D_Visu.GetFlag( FL_MODULE ) && g_Parm_3D_Visu.IsRealisticMode() &&

        g_Parm_3D_Visu.HightQualityMode() )

    {

        GenerateFakeShadowsTextures ();

    }

3d-viewer/3d_frame.cpp

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ void EDA_3D_FRAME::On3DGridSelection( wxCommandEvent& event ) 
}





void EDA_3D_FRAME::NewDisplay( GLuint aGlList )

void EDA_3D_FRAME::NewDisplay( int aGlList )

{

    m_reloadRequest = false;