github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-24 14:15:27 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

GLDraw: DrawGL

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12413 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-10-24 11:35:02 +00:00
parent e6b5d3129c
commit 834494ae5a
11 changed files with 64 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/GLDraw/DrawGL.cpp
View file

@ -86,6 +86,7 @@ void DrawGL::EndOp()
void DrawGL::SyncScissor()
{
GL_TIMING("SyncScissor");
Rect clip = cloff.Top().clip;
Size sz = clip.GetSize();
glScissor(clip.left, view_size.cy - sz.cy - clip.top, sz.cx, sz.cy);
@ -151,7 +152,7 @@ const Vector<double>& DrawGL::GetDash(int& width)
width = 1;
if(width > 0)
return nodash;
if(width == PEN_NULL) {
if(width == PEN_NULL || IsNull(width)) {
width = 0;
return nodash;
}
@ -193,6 +194,7 @@ void DrawGL::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
void DrawGL::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
{
GL_TIMING("DrawGL::DrawArcOp");
Vector<Vector<Pointf>> poly;
GLArc(poly, rc, start, end);
ApplyDash(poly, width);
@ -217,6 +219,7 @@ void DrawGL::DoPath(Vector<Vector<Pointf>>& poly, const Point *pp, const Point *
void DrawGL::DrawPolyPolylineOp(const Point *vertices, int vertex_count, const int *counts, int count_count, int width, Color color, Color doxor)
{
GL_TIMING("DrawGL::DrawPolyPolylineOp");
if(vertex_count < 2 || IsNull(color))
return;
Vector<Vector<Pointf>> poly;
@ -237,6 +240,7 @@ void DrawGL::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count, cons
const int *disjunct_polygon_counts, int dpcc, Color color,
int width, Color outline, uint64 pattern, Color doxor)
{
GL_TIMING("DrawGL::DrawPolyPolyPolygonOp");
Vector<Vector<Pointf>> poly;
while(--dpcc >= 0) {
const Point *sp = vertices;