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

Merged 'testing'

This commit is contained in:
Maciej Suminski 2013-10-14 11:40:14 +02:00
parent c33564c6df 75bb84704d
commit 4b6c6a5c98
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -415,6 +415,7 @@ add_dependencies( 3d-viewer boost )
add_dependencies( pcad2kicadpcb boost ) add_dependencies( pcad2kicadpcb boost )
add_dependencies( polygon boost ) add_dependencies( polygon boost )
add_dependencies( pl_editor boost ) add_dependencies( pl_editor boost )
add_dependencies( pnsrouter boost )
############# #############

14
common/gal/opengl/opengl_compositor.cpp
View File

@ -95,8 +95,13 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
{ {
wxASSERT( m_initialized ); wxASSERT( m_initialized );
if( m_buffers.size() >= m_maxBuffers ) //if( usedBuffers() >= m_maxBuffers )
{
wxLogError( wxT( "Cannot create more framebuffers. OpenGL rendering backend requires at"
"least 3 framebuffers. You may try to update/change "
"your graphic drivers." ) );
return 0; // Unfortunately we have no more free buffers left return 0; // Unfortunately we have no more free buffers left
}
// GL_COLOR_ATTACHMENTn are consecutive integers // GL_COLOR_ATTACHMENTn are consecutive integers
GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers(); GLuint attachmentPoint = GL_COLOR_ATTACHMENT0 + usedBuffers();
@ -165,6 +170,8 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
wxLogFatalError( wxT( "Cannot create the framebuffer." ) ); wxLogFatalError( wxT( "Cannot create the framebuffer." ) );
break; break;
} }
return 0;
} }
ClearBuffer(); ClearBuffer();
@ -218,6 +225,11 @@ void OPENGL_COMPOSITOR::ClearBuffer()
void OPENGL_COMPOSITOR::DrawBuffer( unsigned int aBufferHandle ) void OPENGL_COMPOSITOR::DrawBuffer( unsigned int aBufferHandle )
{ {
wxASSERT( m_initialized ); wxASSERT( m_initialized );
if( aBufferHandle == 0 || aBufferHandle > usedBuffers() )
{
wxLogError( wxT( "Wrong framebuffer handle" ) );
return;
}
// Switch to the main framebuffer and blit the scene // Switch to the main framebuffer and blit the scene
glBindFramebuffer( GL_FRAMEBUFFER, DIRECT_RENDERING ); glBindFramebuffer( GL_FRAMEBUFFER, DIRECT_RENDERING );

14
pcbnew/router/router_tool.cpp
View File

@ -55,14 +55,14 @@ ROUTER_TOOL::ROUTER_TOOL() :
m_menu = new CONTEXT_MENU; m_menu = new CONTEXT_MENU;
m_menu->SetTitle( wxT( "Interactive router" ) ); // fixme: not implemented yet. Sorry. m_menu->SetTitle( wxT( "Interactive router" ) ); // fixme: not implemented yet. Sorry.
m_menu->Add( wxT( "Cancel" ), 0 ); m_menu->Add( wxT( "Cancel" ), 1 );
m_menu->Add( wxT( "New track" ), 1 ); m_menu->Add( wxT( "New track" ), 2 );
m_menu->Add( wxT( "End track" ), 2 ); m_menu->Add( wxT( "End track" ), 3 );
m_menu->Add( wxT( "Auto-end track" ), 3 ); m_menu->Add( wxT( "Auto-end track" ), 4 );
m_menu->Add( wxT( "Place via" ), 4 ); m_menu->Add( wxT( "Place via" ), 5 );
m_menu->Add( wxT( "Switch posture" ), 5 ); m_menu->Add( wxT( "Switch posture" ), 6 );
m_menu->Add( wxT( "Routing options..." ), 6 ); m_menu->Add( wxT( "Routing options..." ), 7 );
} }