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

Remove Kbool from Kicad. Use Clipper instead. 

Clipper is, by far, more easier to use than Kbool, and is currently actively maintained.
It is used only to normalize polygons, i.e. to convert self intersecting polygons to simple polygons,
which is not possible with boost::polygon.
parents 7fd24c7f c0992a93

3d-viewer/3d_draw.cpp

+2 −6
Original line number Diff line number Diff line
@@ -170,13 +170,9 @@ GLuint EDA_3D_CANVAS::CreateDrawGL_List() 
    if( g_Parm_3D_Visu.m_Layers < 2 )

        g_Parm_3D_Visu.m_Layers = 2;



    g_Parm_3D_Visu.m_BoardScale = 2.0 / max( g_Parm_3D_Visu.m_BoardSize.x,

    g_Parm_3D_Visu.m_BoardScale = 2.0 / std::max( g_Parm_3D_Visu.m_BoardSize.x,

                                                  g_Parm_3D_Visu.m_BoardSize.y );



    // @TODO: epoxy_width (board thickness) must be set by user,

    // because all boards thickness no not match with this setup:

    // double epoxy_width = 1.6;    // epoxy width in mm



    g_Parm_3D_Visu.m_Epoxy_Width = pcb->GetDesignSettings().GetBoardThickness()

                                   * g_Parm_3D_Visu.m_BoardScale;

CMakeLists.txt

+2 −3
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ add_subdirectory(gerbview) 
add_subdirectory(kicad)

add_subdirectory(pcbnew)

add_subdirectory(polygon)

add_subdirectory(polygon/kbool/src)

add_subdirectory(potrace)

add_subdirectory(bitmap2component)

add_subdirectory(pcb_calculator)

bitmap2component/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ endif(APPLE) 
target_link_libraries( bitmap2component common polygon bitmaps

                        ${wxWidgets_LIBRARIES}

                        potrace

                        kbool )

                        )



install(TARGETS bitmap2component

        DESTINATION ${KICAD_BIN}

common/footprint_info.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames ) 


                for( unsigned i=0; i<fpnames.GetCount();  ++i )

                {

                    auto_ptr<MODULE> m( pi->FootprintLoad( libPath, fpnames[i] ) );

                    std::auto_ptr<MODULE> m( pi->FootprintLoad( libPath, fpnames[i] ) );



                    // we're loading what we enumerated, all must be there.

                    wxASSERT( m.get() );

cvpcb/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ target_link_libraries(cvpcb 
    common

    bitmaps

    polygon

    kbool

    ${wxWidgets_LIBRARIES}

    ${OPENGL_LIBRARIES}

    ${GDI_PLUS_LIBRARIES}