Commit 46020e20 authored by Maciej Sumiński's avatar Maciej Sumiński
Browse files

Merged the new Interactive Push and Shove router. 

Do not pay attention to add/remove files - it seems there may be a bug in git-bzr-ng plugin. I have checked them, they stayed exactly the same as before.
parents 41e41b95 51ee6916

common/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ set( COMMON_SRCS 
    wildcards_and_files_ext.cpp

    worksheet.cpp

    wxwineda.cpp

    wxunittext.cpp

    xnode.cpp

    zoom.cpp

    )

common/draw_panel_gal.cpp

+15 −8
Original line number Diff line number Diff line 
/*

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 2013 CERN

 * Copyright (C) 2013-2014 CERN

 * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>

 *

 * This program is free software; you can redistribute it and/or
@@ -67,7 +67,6 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin 


    m_viewControls = new KIGFX::WX_VIEW_CONTROLS( m_view, this );



    Connect( wxEVT_PAINT,       wxPaintEventHandler( EDA_DRAW_PANEL_GAL::onPaint ), NULL, this );

    Connect( wxEVT_SIZE,        wxSizeEventHandler( EDA_DRAW_PANEL_GAL::onSize ), NULL, this );



    /* Generic events for the Tool Dispatcher */
@@ -125,7 +124,7 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) ) 


        m_view->UpdateItems();

        m_gal->BeginDrawing();

        m_gal->ClearScreen();

        m_gal->ClearScreen( m_painter->GetSettings()->GetBackgroundColor() );



        if( m_view->IsDirty() )

        {
@@ -184,10 +183,21 @@ void EDA_DRAW_PANEL_GAL::Refresh( bool eraseBackground, const wxRect* rect ) 
}





void EDA_DRAW_PANEL_GAL::StartDrawing()

{

    m_pendingRefresh = false;

    Connect( wxEVT_PAINT, wxPaintEventHandler( EDA_DRAW_PANEL_GAL::onPaint ), NULL, this );



    wxPaintEvent redrawEvent;

    wxPostEvent( this, redrawEvent );

}





void EDA_DRAW_PANEL_GAL::StopDrawing()

{

    Disconnect( wxEVT_PAINT, wxPaintEventHandler( EDA_DRAW_PANEL_GAL::onPaint ), NULL, this );

    m_pendingRefresh = true;

    m_refreshTimer.Stop();

    Disconnect( wxEVT_PAINT, wxPaintEventHandler( EDA_DRAW_PANEL_GAL::onPaint ), NULL, this );

}
@@ -198,8 +208,7 @@ void EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType ) 
        return;



    // Prevent refreshing canvas during backend switch

    m_pendingRefresh = true;

    m_refreshTimer.Stop();

    StopDrawing();



    delete m_gal;
@@ -219,7 +228,6 @@ void EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType ) 


    wxSize size = GetClientSize();

    m_gal->ResizeScreen( size.GetX(), size.GetY() );

    m_gal->SetBackgroundColor( KIGFX::COLOR4D( 0.0, 0.0, 0.0, 1.0 ) );



    if( m_painter )

        m_painter->SetGAL( m_gal );
@@ -228,7 +236,6 @@ void EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType ) 
        m_view->SetGAL( m_gal );



    m_currentGal = aGalType;

    m_pendingRefresh = false;

}

common/gal/cairo/cairo_gal.cpp

+4 −4
Original line number Diff line number Diff line
@@ -315,10 +315,10 @@ void CAIRO_GAL::Flush() 
}





void CAIRO_GAL::ClearScreen()

void CAIRO_GAL::ClearScreen( const COLOR4D& aColor )

{

    cairo_set_source_rgb( currentContext,

                          backgroundColor.r, backgroundColor.g, backgroundColor.b );

    backgroundColor = aColor;

    cairo_set_source_rgb( currentContext, aColor.r, aColor.g, aColor.b );

    cairo_rectangle( currentContext, 0.0, 0.0, screenSize.x, screenSize.y );

    cairo_fill( currentContext );

}
@@ -973,7 +973,7 @@ void CAIRO_GAL::initSurface() 
    cairo_set_antialias( context, CAIRO_ANTIALIAS_SUBPIXEL );



    // Clear the screen

    ClearScreen();

    ClearScreen( backgroundColor );



    // Compute the world <-> screen transformations

    ComputeWorldScreenMatrix();

common/gal/opengl/opengl_gal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -589,10 +589,10 @@ void OPENGL_GAL::Flush() 
}





void OPENGL_GAL::ClearScreen()

void OPENGL_GAL::ClearScreen( const COLOR4D& aColor )

{

    // Clear screen

    glClearColor( backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a );

    glClearColor( aColor.r, aColor.g, aColor.b, aColor.a );

    glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );

}

common/geometry/shape_collisions.cpp

+186 −85
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ 
 */



#include <math/vector2d.h>

#include <math.h>



#include <geometry/shape.h>

#include <geometry/shape_line_chain.h>

#include <geometry/shape_circle.h>

#include <geometry/shape_rect.h>

#include <geometry/shape_segment.h>



typedef VECTOR2I::extended_type ecoord;
@@ -45,7 +47,7 @@ static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_CIRCLE& aB, int 
        return false;



    if( aNeedMTV )

        aMTV = delta.Resize( sqrt( abs( min_dist_sq - dist_sq ) ) + 1 );

        aMTV = delta.Resize( min_dist - sqrt( dist_sq ) + 3 );  // fixme: apparent rounding error



    return true;

}
@@ -57,12 +59,8 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_CIRCLE& aB, int a 
    const VECTOR2I c = aB.GetCenter();

    const VECTOR2I p0 = aA.GetPosition();

    const VECTOR2I size = aA.GetSize();

    const ecoord r = aB.GetRadius();

    const ecoord min_dist = aClearance + r;

    const ecoord min_dist_sq = min_dist * min_dist;



    if( aA.BBox( 0 ).Contains( c ) )

        return true;

    const int r = aB.GetRadius();

    const int min_dist = aClearance + r;

    

    const VECTOR2I vts[] =

    {
@@ -73,33 +71,35 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_CIRCLE& aB, int a 
        VECTOR2I( p0.x,          p0.y )

    };



    ecoord nearest_seg_dist_sq = VECTOR2I::ECOORD_MAX;

    int nearest_seg_dist = INT_MAX;

    VECTOR2I nearest;



    bool inside = c.x >= p0.x && c.x <= ( p0.x + size.x )

                  && c.y >= p0.y && c.y <= ( p0.y + size.y );



    if( !inside )

    {



    if( !aNeedMTV && inside )

        return true;



    for( int i = 0; i < 4; i++ )

    {

        const SEG seg( vts[i], vts[i + 1] );

            ecoord dist_sq = seg.SquaredDistance( c );



            if( dist_sq < min_dist_sq )

            {

                if( !aNeedMTV )

        VECTOR2I pn = seg.NearestPoint( c );



        int d = ( pn - c ).EuclideanNorm();



        if( ( d < min_dist ) && !aNeedMTV )

            return true;

                else



        if( d < nearest_seg_dist )

        {

                    nearest = seg.NearestPoint( c );

                    nearest_seg_dist_sq = dist_sq;

                }

            }

            nearest = pn;

            nearest_seg_dist = d;

        }

    }



    if( nearest_seg_dist_sq >= min_dist_sq && !inside )

    if( nearest_seg_dist >= min_dist && !inside )

        return false;



    VECTOR2I delta = c - nearest;
@@ -107,25 +107,77 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_CIRCLE& aB, int a 
    if( !aNeedMTV )

        return true;



   

    if( inside )

        aMTV = -delta.Resize( sqrt( abs( r * r + nearest_seg_dist_sq ) + 1 ) );

        aMTV = -delta.Resize( abs( min_dist + 1 + nearest_seg_dist ) + 1 );

    else

        aMTV = delta.Resize( sqrt( abs( r * r - nearest_seg_dist_sq ) + 1 ) );

        aMTV = delta.Resize( abs( min_dist + 1 - nearest_seg_dist ) + 1 );





    return true;

}





static VECTOR2I pushoutForce( const SHAPE_CIRCLE& aA, const SEG& aB, int aClearance )

{

    VECTOR2I nearest = aB.NearestPoint( aA.GetCenter() );

    VECTOR2I f (0, 0);



    int dist = ( nearest - aA.GetCenter() ).EuclideanNorm();

    int min_dist = aClearance + aA.GetRadius();



    if( dist < min_dist )

        f = ( aA.GetCenter() - nearest ).Resize ( min_dist - dist + 10 );



    return f;

}





static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_LINE_CHAIN& aB, int aClearance,

                            bool aNeedMTV, VECTOR2I& aMTV )

{

    bool found = false;

    VECTOR2I::extended_type clSq = (VECTOR2I::extended_type) aClearance * aClearance;





    for( int s = 0; s < aB.SegmentCount(); s++ )

    {



        if( aA.Collide( aB.CSegment( s ), aClearance ) )

            return true;

        {

            found = true;

            break;

        }

    }



    return false;

    if( !aNeedMTV || !found )

        return found;

    

    SHAPE_CIRCLE cmoved( aA );

    VECTOR2I f_total( 0, 0 );



    for( int s = 0; s < aB.SegmentCount(); s++ )

    {

        VECTOR2I f = pushoutForce( cmoved, aB.CSegment( s ), aClearance );

        cmoved.SetCenter( cmoved.GetCenter() + f );

        f_total += f;

    }

    

    aMTV = f_total;

    return found;

}





static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_SEGMENT& aSeg, int aClearance,

                            bool aNeedMTV, VECTOR2I& aMTV )

{

	bool col = aA.Collide( aSeg.GetSeg(), aClearance + aSeg.GetWidth() / 2);



    if( col && aNeedMTV )

    {

        aMTV = pushoutForce( aA, aSeg.GetSeg(), aClearance + aSeg.GetWidth() / 2);

    }

    return col;

}
@@ -155,8 +207,39 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_LINE_CHAIN& aB, in 
}





bool CollideShapes( const SHAPE* aA, const SHAPE* aB, int aClearance,

static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_SEGMENT& aSeg, int aClearance,

                            bool aNeedMTV, VECTOR2I& aMTV )

{

	return aA.Collide( aSeg.GetSeg(), aClearance + aSeg.GetWidth() / 2 );

}





static inline bool Collide( const SHAPE_SEGMENT& aA, const SHAPE_SEGMENT& aB, int aClearance,

                            bool aNeedMTV, VECTOR2I& aMTV )

{

	return aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2 );

}





static inline bool Collide( const SHAPE_LINE_CHAIN& aA, const SHAPE_SEGMENT& aB, int aClearance,

                            bool aNeedMTV, VECTOR2I& aMTV )

{

	if( aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2 ) )

		return true;



	return false;

}





template<class ShapeAType, class ShapeBType> bool

CollCase( const SHAPE* aA, const SHAPE* aB, int aClearance, bool aNeedMTV, VECTOR2I& aMTV )

{

	return Collide (*static_cast<const ShapeAType*>( aA ),

					*static_cast<const ShapeBType*>( aB ),

					aClearance, aNeedMTV, aMTV);

}



bool CollideShapes( const SHAPE* aA, const SHAPE* aB, int aClearance, bool aNeedMTV, VECTOR2I& aMTV )

{

	switch( aA->Type() )

	{
@@ -164,63 +247,81 @@ bool CollideShapes( const SHAPE* aA, const SHAPE* aB, int aClearance, 
			switch( aB->Type() )

			{

				case SH_CIRCLE: 

            return Collide( *static_cast<const SHAPE_RECT*>( aA ),

                *static_cast<const SHAPE_CIRCLE*>( aB ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_RECT, SHAPE_CIRCLE>( aA, aB, aClearance, aNeedMTV, aMTV );



				case SH_LINE_CHAIN: 

            return Collide( *static_cast<const SHAPE_RECT*>( aA ),

                *static_cast<const SHAPE_LINE_CHAIN*>( aB ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_RECT, SHAPE_LINE_CHAIN>( aA, aB, aClearance, aNeedMTV, aMTV );



				case SH_SEGMENT: 

					return CollCase<SHAPE_RECT, SHAPE_SEGMENT>( aA, aB, aClearance, aNeedMTV, aMTV );



				default:

					break;

			}

        break;



		case SH_CIRCLE:

			switch( aB->Type() )

			{

				case SH_RECT:

            return Collide( *static_cast<const SHAPE_RECT*>( aB ),

                *static_cast<const SHAPE_CIRCLE*>( aA ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_RECT, SHAPE_CIRCLE>( aB, aA, aClearance, aNeedMTV, aMTV );



				case SH_CIRCLE:

            return Collide( *static_cast<const SHAPE_CIRCLE*>( aA ),

                *static_cast<const SHAPE_CIRCLE*>( aB ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_CIRCLE, SHAPE_CIRCLE>( aA, aB, aClearance, aNeedMTV, aMTV );



				case SH_LINE_CHAIN:

            return Collide( *static_cast<const SHAPE_CIRCLE*>( aA ),

                *static_cast<const SHAPE_LINE_CHAIN *>( aB ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_CIRCLE, SHAPE_LINE_CHAIN>( aA, aB, aClearance, aNeedMTV, aMTV );



				case SH_SEGMENT:

					return CollCase<SHAPE_CIRCLE, SHAPE_SEGMENT>( aA, aB, aClearance, aNeedMTV, aMTV );

				default:

					break;

			}

        break;



		case SH_LINE_CHAIN:

			switch( aB->Type() )

			{

				case SH_RECT:

            return Collide( *static_cast<const SHAPE_RECT*>( aB ),

                *static_cast<const SHAPE_LINE_CHAIN*>( aA ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_RECT, SHAPE_LINE_CHAIN>( aB, aA, aClearance, aNeedMTV, aMTV );



				case SH_CIRCLE:

            return Collide( *static_cast<const SHAPE_CIRCLE*>( aB ),

                *static_cast<const SHAPE_LINE_CHAIN*>( aA ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_CIRCLE, SHAPE_LINE_CHAIN>( aB, aA, aClearance, aNeedMTV, aMTV );



				case SH_LINE_CHAIN:

            return Collide( *static_cast<const SHAPE_LINE_CHAIN*>( aA ),

                *static_cast<const SHAPE_LINE_CHAIN*>( aB ), aClearance, aNeedMTV, aMTV );

					return CollCase<SHAPE_LINE_CHAIN, SHAPE_LINE_CHAIN>( aA, aB, aClearance, aNeedMTV, aMTV );



				case SH_SEGMENT:

					return CollCase<SHAPE_LINE_CHAIN, SHAPE_SEGMENT>( aA, aB, aClearance, aNeedMTV, aMTV );



				default:

					break;

			}



		case SH_SEGMENT:

			switch( aB->Type() )

			{

				case SH_RECT:

					return CollCase<SHAPE_RECT, SHAPE_SEGMENT>( aB, aA, aClearance, aNeedMTV, aMTV );



				case SH_CIRCLE:

					return CollCase<SHAPE_CIRCLE, SHAPE_SEGMENT>( aB, aA, aClearance, aNeedMTV, aMTV );



				case SH_LINE_CHAIN:

					return CollCase<SHAPE_LINE_CHAIN, SHAPE_SEGMENT>( aB, aA, aClearance, aNeedMTV, aMTV );



				case SH_SEGMENT:

					return CollCase<SHAPE_SEGMENT, SHAPE_SEGMENT>( aA, aB, aClearance, aNeedMTV, aMTV );



				default:

					break;

			}



		default:

			break;

	}



    assert( 0 );    // unsupported_collision

	bool unsupported_collision = true;



	assert( unsupported_collision == false );



	return false;

}