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
52ec2775
Commit
52ec2775
authored
Apr 05, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed bug of displaying stroked rectangles on wrong layer depth.
parent
84239542
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
opengl_gal.cpp
common/gal/opengl/opengl_gal.cpp
+4
-10
No files found.
common/gal/opengl/opengl_gal.cpp
View file @
52ec2775
...
@@ -819,10 +819,6 @@ void OPENGL_GAL::DrawRectangle( VECTOR2D aStartPoint, VECTOR2D aEndPoint )
...
@@ -819,10 +819,6 @@ void OPENGL_GAL::DrawRectangle( VECTOR2D aStartPoint, VECTOR2D aEndPoint )
selectShader
(
-
1
);
selectShader
(
-
1
);
glPushMatrix
();
glTranslated
(
0
,
0
,
layerDepth
);
// Stroke the outline
// Stroke the outline
if
(
isStrokeEnabled
)
if
(
isStrokeEnabled
)
{
{
...
@@ -841,15 +837,13 @@ void OPENGL_GAL::DrawRectangle( VECTOR2D aStartPoint, VECTOR2D aEndPoint )
...
@@ -841,15 +837,13 @@ void OPENGL_GAL::DrawRectangle( VECTOR2D aStartPoint, VECTOR2D aEndPoint )
{
{
glColor4d
(
fillColor
.
r
,
fillColor
.
g
,
fillColor
.
b
,
fillColor
.
a
);
glColor4d
(
fillColor
.
r
,
fillColor
.
g
,
fillColor
.
b
,
fillColor
.
a
);
glBegin
(
GL_QUADS
);
glBegin
(
GL_QUADS
);
glVertex
2d
(
aStartPoint
.
x
,
aStartPoint
.
y
);
glVertex
3d
(
aStartPoint
.
x
,
aStartPoint
.
y
,
layerDepth
);
glVertex
2d
(
diagonalPointA
.
x
,
diagonalPointA
.
y
);
glVertex
3d
(
diagonalPointA
.
x
,
diagonalPointA
.
y
,
layerDepth
);
glVertex
2d
(
aEndPoint
.
x
,
aEndPoint
.
y
);
glVertex
3d
(
aEndPoint
.
x
,
aEndPoint
.
y
,
layerDepth
);
glVertex
2d
(
diagonalPointB
.
x
,
diagonalPointB
.
y
);
glVertex
3d
(
diagonalPointB
.
x
,
diagonalPointB
.
y
,
layerDepth
);
glEnd
();
glEnd
();
}
}
glPopMatrix
();
// Restore the stroke color
// Restore the stroke color
glColor4d
(
strokeColor
.
r
,
strokeColor
.
g
,
strokeColor
.
b
,
strokeColor
.
a
);
glColor4d
(
strokeColor
.
r
,
strokeColor
.
g
,
strokeColor
.
b
,
strokeColor
.
a
);
}
}
...
...
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