Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
4b6c6a5c
Commit
4b6c6a5c
authored
Oct 14, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Plain Diff
Merged 'testing'
parents
c33564c6
75bb8470
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
9 deletions
+22
-9
CMakeLists.txt
CMakeLists.txt
+1
-0
opengl_compositor.cpp
common/gal/opengl/opengl_compositor.cpp
+13
-1
router_tool.cpp
pcbnew/router/router_tool.cpp
+8
-8
No files found.
CMakeLists.txt
View file @
4b6c6a5c
...
@@ -415,6 +415,7 @@ add_dependencies( 3d-viewer boost )
...
@@ -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
)
#############
#############
...
...
common/gal/opengl/opengl_compositor.cpp
View file @
4b6c6a5c
...
@@ -95,8 +95,13 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
...
@@ -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()
...
@@ -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()
...
@@ -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
);
...
...
pcbnew/router/router_tool.cpp
View file @
4b6c6a5c
...
@@ -55,14 +55,14 @@ ROUTER_TOOL::ROUTER_TOOL() :
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment