github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Draw: DDARasterizer fatline joins

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6068 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-05-14 05:04:22 +00:00
parent 480c6ab757
commit 6d8d9a7b45
2 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
uppsrc/Draw/DDARasterizer.cpp
View file

@ -6,6 +6,9 @@ DDARasterizer::DDARasterizer()
{
cy = 0;
p0 = p1 = Point(0, 0);
j1 = j2 = Null;
b1 = b2 = Null;
close = false;
width = 1;
}
@ -91,10 +94,10 @@ struct DDARasterizer::Segments : DDARasterizer {
m.l = x;
m.h = x + cx;
m.flag = flag;
flag = true;
miny = min(y, miny);
maxy = max(y, maxy);
}
flag = true;
}
virtual void PutVert(int x, int y, int cy) {
for(int i = 0; i < cy; i++)
@ -104,23 +107,45 @@ struct DDARasterizer::Segments : DDARasterizer {
Segments() { miny = INT_MAX; maxy = 0; }
};
void DDARasterizer::FatLine(Point p1, Point p2, int n)
void DDARasterizer::FatLine(Point p2)
{
Point v = p2 - p1;
Pointf shift = n * Orthogonal(Pointf(v) / Length((Pointf(v))));
Pointf shift = width * Orthogonal(Pointf(v) / Length((Pointf(v))));
Point p = Pointf(p1) + shift / 2;
Point pp = p0;
p0 = p1; // avoid Close
Polygon();
Move(p);
Point bj2 = j2;
if(!IsNull(j1)) {
Move(j1);
Line(p);
}
else
Move(p);
if(IsNull(b1))
b1 = p;
Line(p += v);
// if(close && !IsNull(b1))
// Line(b1);
j1 = p;
Line(p -= shift);
// if(close && !IsNull(b2))
// Line(b2);
j2 = p;
Line(p - v);
if(!IsNull(bj2))
Line(bj2);
if(IsNull(b2))
b2 = p;
Fill();
p0 = pp;
}
DDARasterizer& DDARasterizer::Move(Point p)
{
Close();
p0 = p1 = p;
j1 = j2 = Null;
return *this;
}
@ -139,7 +164,7 @@ DDARasterizer& DDARasterizer::Line(Point p)
if(width <= 1)
DoLine(p1, p, false);
else
FatLine(p1, p, width);
FatLine(p);
p1 = p;
}
return *this;
@ -147,8 +172,12 @@ DDARasterizer& DDARasterizer::Line(Point p)
DDARasterizer& DDARasterizer::Close()
{
if(p1 != p0)
if(p1 != p0) {
close = true;
Line(p0);
close = false;
b1 = b2 = Null;
}
return *this;
}

5
uppsrc/Draw/DDARasterizer.h
View file

@ -14,12 +14,15 @@ class DDARasterizer {
int dirx;
One<Segments> pseg;
Point p0, p1;
Point j1, j2;
Point b1, b2;
int width;
bool close;
void AHorz(int x, int y, int cx);
void AVert(int x, int y, int cy);
void DoLine(Point p1, Point p2, bool last);
void FatLine(Point p1, Point p2, int n);
void FatLine(Point p2);
public:
virtual void PutHorz(int x, int y, int cx) = 0;