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

Transparent HRR generator fixes, Path+Area+MarkTool - better support for 'empty' styles

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@542 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2008-10-19 09:44:36 +00:00
parent dc009570ae
commit c0b70044ce
5 changed files with 121 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Draw/Display.cpp
View file

@ -158,7 +158,7 @@ void ColorDisplayNull::Paint(Draw& w, const Rect& r, const Value& q,
Color ink, Color paper, dword style) const
{
if(IsNull(q))
PaintBackground(w, r, q, ink, paper, style);
StdDisplay().Paint(w, r, nulltext, ink, paper, style);
else
w.DrawRect(r, Color(q));
}

2
uppsrc/Draw/Raster.h
View file

@ -164,7 +164,7 @@ public:
virtual Info GetInfo() { return info; }
virtual Line GetLine(int line);
virtual int GetPaletteCount() { return palette.GetCount(); }
virtual RGBA *GetPalette() { return palette.Begin(); }
virtual const RGBA *GetPalette() { return palette.Begin(); }
virtual const RasterFormat *GetFormat() { return &format; }
void Load(Raster& raster);

10
uppsrc/Geom/Draw/hrr.cpp
View file

@ -352,10 +352,10 @@ static String EncodeMask(const ImageBuffer& mask, bool write_size)
int start = out.GetLength();
while(p < e) {
bool init0 = false;
if(p->a >= 128)
if(p->a < 128)
{ // full part
const RGBA *b = p;
while(++p < e && p->a >= 128)
while(++p < e && p->a < 128)
;
int n = p - b;
while(n > 253) {
@ -370,7 +370,7 @@ static String EncodeMask(const ImageBuffer& mask, bool write_size)
init0 = true;
if(p < e) {
const RGBA *b = p;
while(++p < e && p->a < 128)
while(++p < e && p->a >= 128)
;
if(p < e) {
if(init0)
@ -1472,7 +1472,7 @@ bool HRR::Write(Writeback drawback, bool downscale, int level, int px, int py,
// TIMING("HRR::Write / save (direct)");
if(info.mono || IsNull(info.background)) {
int kind = GetMaskInfo(~part, part.GetLength());
if(kind != 1 && !info.mono) {
if(kind && !info.mono) {
int pixoff = CeilPack64(stream.GetPos());
pixel_directory[level + count][lin] = pixoff;
int64 pixpos = Unpack64(pixoff);
@ -1550,7 +1550,7 @@ bool HRR::Write(Writeback drawback, bool downscale, int level, int px, int py,
// TIMING("HRR::Write / save (indirect)");
if(info.mono || IsNull(info.background)) {
int kind = GetMaskInfo(block.block, block.block.GetLength());
if(kind != 1 && !info.mono) {
if(kind && !info.mono) {
int pixoff = CeilPack64(stream.GetPos());
pixel_directory[level][lin] = pixoff;
int64 pixpos = Unpack64(pixoff);

166
uppsrc/Geom/Draw/plotter.cpp
View file

@ -1048,24 +1048,35 @@ long PathTool::ticks = 0;
PathTool::PathTool()
: use_last(false)
, dummy(true)
{
ClearExtent();
}
PathTool::~PathTool() {}
void PathTool::Set(const Plotter& _info, const String& pattern, Color color, int width, double dash)
void PathTool::Reset()
{
dummy = true;
ClearExtent();
}
bool PathTool::Set(const Plotter& _info, const String& pattern, Color color, int width, double dash)
{
if(dummy = IsNull(color)) {
Reset();
return false;
}
Clear();
plotter = _info;
pathdraw.Set(*plotter.draw, plotter.GetPath(pattern), color, width, dash, false);
use_last = false;
return true;
}
bool PathTool::SetExtent(const Rectf& rc)
{
if(rc && plotter.logclip)
{
if(!dummy && rc.Intersects(plotter.logclip)) {
Rectf rcc = plotter.LtoP(rc);
simple = rcc.left >= plotter.clip.left && rcc.top >= plotter.clip.top
&& rcc.right <= plotter.clip.right && rcc.bottom <= plotter.clip.bottom;
@ -1078,26 +1089,31 @@ bool PathTool::SetExtent(const Rectf& rc)
LineToRaw = (simple ? THISBACK(LineToRawSimple) : THISBACK(LineToRawClip));
return within;
}
else
else {
MoveToRaw = THISBACK(MoveToRawDummy);
LineToRaw = THISBACK(LineToRawDummy);
return false;
}
}
void PathTool::ClearExtent()
{
MoveToRaw = THISBACK(MoveToRawClip);
LineToRaw = THISBACK(LineToRawClip);
simple = false;
pathdraw.ClearExtent();
if(dummy) {
MoveToRaw = THISBACK(MoveToRawDummy);
LineToRaw = THISBACK(LineToRawDummy);
}
else {
MoveToRaw = THISBACK(MoveToRawClip);
LineToRaw = THISBACK(LineToRawClip);
simple = false;
pathdraw.ClearExtent();
}
}
void PathTool::Paint()
{
if(plotter.draw)
{
// if(is_closed)
// LineTo(last_point);
if(!dummy && plotter.draw)
pathdraw.Paint();
}
ClearExtent();
}
@ -1107,6 +1123,9 @@ void PathTool::Clear()
ClearExtent();
}
void PathTool::MoveToRawDummy(Pointf pt) {}
void PathTool::LineToRawDummy(Pointf pt) {}
void PathTool::MoveToRawSimple(Pointf pt)
{
pathdraw.MoveTo(plotter.LtoPoint(last_point = pt));
@ -1196,6 +1215,7 @@ AreaTool::AreaTool()
prev_ghost = false;
clip_arcs = false;
fill_color = Black;
dummy = true;
Clear();
}
@ -1203,8 +1223,7 @@ AreaTool::~AreaTool() {}
bool AreaTool::SetExtent(const Rectf& rc)
{
if(rc && plotter.logclip)
{
if(!dummy && rc.Intersects(plotter.logclip)) {
Rectf rcc = plotter.LtoP(rc);
simple = rcc.left >= plotter.clip.left && rcc.top >= plotter.clip.top
&& rcc.right <= plotter.clip.right && rcc.bottom <= plotter.clip.bottom;
@ -1212,14 +1231,23 @@ bool AreaTool::SetExtent(const Rectf& rc)
LineToRaw = (simple ? THISBACK(LineToRawSimple) : THISBACK(LineToRawClip));
return true;
}
else
else {
MoveToRaw = THISBACK(MoveToRawDummy);
LineToRaw = THISBACK(LineToRawDummy);
return false;
}
}
void AreaTool::ClearExtent()
{
MoveToRaw = THISBACK(MoveToRawClip);
LineToRaw = THISBACK(LineToRawClip);
if(dummy) {
MoveToRaw = THISBACK(MoveToRawDummy);
LineToRaw = THISBACK(LineToRawDummy);
}
else {
MoveToRaw = THISBACK(MoveToRawClip);
LineToRaw = THISBACK(LineToRawClip);
}
simple = false;
}
@ -1235,6 +1263,9 @@ void AreaTool::Clear()
ClearExtent();
}
void AreaTool::MoveToRawDummy(Pointf pt) {}
void AreaTool::LineToRawDummy(Pointf pt) {}
void AreaTool::MoveToRawSimple(Pointf pt)
{
Flush();
@ -1284,14 +1315,12 @@ void AreaTool::LineToRawClip(Pointf pt)
&& next_phys.y >= plotter.clip.top && next_phys.y <= plotter.clip.bottom);
#if DEBUG_AREA
int vc = vertices.GetCount();
if(show)
{
if(show) {
LOG("[" << vc << "/" << begin_index << "] AreaTool::LineToRawClip " << pt << ", next_phys " << next_phys
<< ", top = " << vertices.Top() << ", last_in " << last_in << ", next_in " << next_in);
}
#endif
if(next_in && last_in)
{
if(next_in && last_in) {
Point ppt = PointfToPoint(next_phys);
if(ppt != vertices.Top())
{
@ -1302,16 +1331,14 @@ void AreaTool::LineToRawClip(Pointf pt)
last_phys = next_phys;
last_in = next_in;
}
else
{
else {
Pointf A = last_phys, B = next_phys;
bool clipped = ClipLine(A, B, plotter.clip);
Point cb = ClipBind(clipped ? B : next_phys);
Point ca = clipped ? ClipBind(A) : cb;
if(vertices.GetCount() > begin_index || clipped)
SkipTo(ca, (next_phys - last_phys) % (clip_center - last_phys) >= 0);
if(clipped && cb != vertices.Top())
{
if(clipped && cb != vertices.Top()) {
if(prev_ghost)
ghost_lines.Add(vertices.GetCount());
vertices.Add(cb);
@ -1351,8 +1378,7 @@ void AreaTool::SkipTo(Point pt, bool clockwise)
return;
// Size diff(pt.x + la.x - plotter.clip.left - plotter.clip.right, pt.y + la.y - plotter.clip.top - plotter.clip.bottom);
if(la.y <= plotter.clip.top)
{
if(la.y <= plotter.clip.top) {
if(pt.y <= plotter.clip.top)
Horz(pt.x);
else if(pt.y >= plotter.clip.bottom)
@ -1364,8 +1390,7 @@ void AreaTool::SkipTo(Point pt, bool clockwise)
else
NEVER();
}
else if(la.y >= plotter.clip.bottom)
{
else if(la.y >= plotter.clip.bottom) {
if(pt.y <= plotter.clip.top)
Horz(clockwise ? plotter.clip.left : plotter.clip.right).Vert(plotter.clip.top).Horz(pt.x);
else if(pt.y >= plotter.clip.bottom)
@ -1377,8 +1402,7 @@ void AreaTool::SkipTo(Point pt, bool clockwise)
else
NEVER();
}
else if(la.x <= plotter.clip.left)
{
else if(la.x <= plotter.clip.left) {
if(pt.y <= plotter.clip.top)
Vert(plotter.clip.top).Horz(pt.x);
else if(pt.y >= plotter.clip.bottom)
@ -1390,8 +1414,7 @@ void AreaTool::SkipTo(Point pt, bool clockwise)
else
NEVER();
}
else if(la.x >= plotter.clip.right)
{
else if(la.x >= plotter.clip.right) {
if(pt.y <= plotter.clip.top)
Vert(plotter.clip.top).Horz(pt.x);
else if(pt.y >= plotter.clip.bottom)
@ -1409,28 +1432,24 @@ void AreaTool::SkipTo(Point pt, bool clockwise)
void AreaTool::Flush()
{
if((vertices.GetCount() - begin_index >= 3) && !simple)
{
if((vertices.GetCount() - begin_index >= 3) && !simple) {
ASSERT(!IsNull(last_start));
LineTo(last_start);
}
int add = vertices.GetCount() - begin_index;
ASSERT(add >= 0);
if(add >= 2 && vertices.Top() == vertices[begin_index])
{
if(add >= 2 && vertices.Top() == vertices[begin_index]) {
vertices.Drop(); // remove superfluous end point
if(!ghost_lines.IsEmpty() && ghost_lines.Top() == vertices.GetCount())
ghost_lines.Drop();
add--;
}
if(add <= 2)
{
if(add <= 2) {
vertices.SetCountR(begin_index);
while(!ghost_lines.IsEmpty() && ghost_lines.Top() >= begin_index)
ghost_lines.Drop();
}
else
{
else {
counts.Add(add);
begin_index = vertices.GetCount();
}
@ -1442,10 +1461,8 @@ AreaTool& AreaTool::Horz(int x)
ASSERT(count > 0);
Point *p = vertices.End();
int y = p[-1].y;
if(count >= 2 && y == p[-2].y)
{
while(count > 2 && y == p[-3].y)
{
if(count >= 2 && y == p[-2].y) {
while(count > 2 && y == p[-3].y) {
count--;
p--;
}
@ -1455,8 +1472,7 @@ AreaTool& AreaTool::Horz(int x)
while(!ghost_lines.IsEmpty() && ghost_lines.Top() >= end)
ghost_lines.Drop();
}
else
{
else {
if(prev_ghost)
ghost_lines.Add(vertices.GetCount());
vertices.Add(Point(x, y));
@ -1470,10 +1486,8 @@ AreaTool& AreaTool::Vert(int y)
ASSERT(count > 0);
Point *p = vertices.End();
int x = p[-1].x;
if(count >= 2 && x == p[-2].x)
{
while(count > 2 && x == p[-3].x)
{
if(count >= 2 && x == p[-2].x) {
while(count > 2 && x == p[-3].x) {
count--;
p--;
}
@ -1483,8 +1497,7 @@ AreaTool& AreaTool::Vert(int y)
while(!ghost_lines.IsEmpty() && ghost_lines.Top() >= end)
ghost_lines.Drop();
}
else
{
else {
if(prev_ghost)
ghost_lines.Add(vertices.GetCount());
vertices.Add(Point(x, y));
@ -1492,9 +1505,20 @@ AreaTool& AreaTool::Vert(int y)
return *this;
}
void AreaTool::Set(const Plotter& _info, Color _fill_color, uint64 _fill_pattern,
void AreaTool::Reset()
{
dummy = true;
Clear();
}
bool AreaTool::Set(const Plotter& _info, Color _fill_color, uint64 _fill_pattern,
const String& outline_pattern, Color outline_color, int outline_width, double outline_dash)
{
dummy = IsNull(_fill_color) && IsNull(outline_color);
if(dummy) {
Reset();
return false;
}
if(outline_width < 0)
outline_width = DotsToPixels(*_info.draw, -outline_width);
const PathStyle& path = _info.GetPath(outline_pattern);
@ -1510,9 +1534,7 @@ void AreaTool::Set(const Plotter& _info, Color _fill_color, uint64 _fill_pattern
is_line = !path.IsEmpty();
std_pen = !is_line || IsNull(outline_color)
|| (ghost_lines.IsEmpty() && is_solid && pw < (_info.draw->Dots() ? 20 : 2.5) /*&& !IsNull(fill_color)*/ && !fill_pattern);
if(std_pen)
// || *outline_pattern == 0 && !fill_pattern && outline_width <= 1)
{
if(std_pen) {
fill_outline_color = is_solid ? Nvl(pc, outline_color) : Color(Null);
fill_outline_style = is_solid ? fround(pw) : 0;
if(_info.draw->Pixels() && outline_width > 1)
@ -1522,8 +1544,7 @@ void AreaTool::Set(const Plotter& _info, Color _fill_color, uint64 _fill_pattern
fill_outline_style = 0;
}
}
else
{
else {
raw_outline.Set(*plotter.draw, path, outline_color, outline_width, outline_dash, true);
fill_outline_color = thick_outline_color = Null;
fill_outline_style = 0;
@ -1535,6 +1556,7 @@ void AreaTool::Set(const Plotter& _info, Color _fill_color, uint64 _fill_pattern
LOG("AreaTool::Set, phys clip = " << plotter.clip << ", log clip = " << plotter.logclip
<< ", a = " << plotter.physical.a);
#endif
return true;
}
void AreaTool::FlushFill()
@ -2321,17 +2343,28 @@ MarkTool::MarkTool()
MarkTool::~MarkTool() {}
void MarkTool::Set(const Plotter& info, One<Marker> _marker)
void MarkTool::Reset()
{
marker.Clear();
Clear();
}
bool MarkTool::Set(const Plotter& info, One<Marker> _marker)
{
if(!_marker) {
Reset();
return false;
}
marker = _marker;
size = marker->GetSize();
plotter.Set(info, size);
Clear();
return true;
}
bool MarkTool::SetExtent(const Rectf& rc)
{
if(plotter.IntersectsLClip(rc)) {
if(marker && plotter.IntersectsLClip(rc)) {
Rectf crc = plotter.LtoP(rc);
if(plotter.InPClip(crc))
PutRaw = &MarkTool::PutSimple;
@ -2339,13 +2372,18 @@ bool MarkTool::SetExtent(const Rectf& rc)
PutRaw = &MarkTool::PutClip;
return true;
}
else
else {
PutRaw = &MarkTool::PutDummy;
return false;
}
}
void MarkTool::ClearExtent()
{
PutRaw = &MarkTool::PutClip;
if(marker)
PutRaw = &MarkTool::PutClip;
else
PutRaw = &MarkTool::PutDummy;
}
void MarkTool::Put(const Array<Pointf>& pt)

15
uppsrc/Geom/Draw/plotter.h
View file

@ -264,7 +264,8 @@ public:
virtual void Paint(); // flush & clear paint buffer
virtual void Clear(); // clear paint buffer
void Set(const Plotter& info, const String& style = Null,
void Reset();
bool Set(const Plotter& info, const String& style = Null,
Color color = Black, int width = -10, double dash = Null);
bool SetExtent(const Rectf& rc);
@ -280,8 +281,10 @@ public:
protected:
virtual bool ArcToRaw(Pointf pt, double bulge);
void MoveToRawDummy(Pointf pt);
void MoveToRawSimple(Pointf pt);
void MoveToRawClip(Pointf pt);
void LineToRawDummy(Pointf pt);
void LineToRawSimple(Pointf pt);
void LineToRawClip(Pointf pt);
@ -289,6 +292,7 @@ protected:
bool use_last;
Pointf last_phys;
PathDraw pathdraw;
bool dummy;
bool simple;
};
@ -304,7 +308,8 @@ public:
virtual void Paint(); // flush & clear paint buffer
virtual void Clear(); // clear paint buffer
void Set(const Plotter& info, Color fill_color = Black, uint64 fill_pattern = 0,
void Reset();
bool Set(const Plotter& info, Color fill_color = Black, uint64 fill_pattern = 0,
const String& outline_pattern = Null, Color outline_color = Black,
int outline_width = -10, double outline_dash = Null);
@ -324,8 +329,10 @@ public:
void LineToGhost(Pointf pt) { prev_ghost = true; LineTo(pt); prev_ghost = false; }
protected:
void MoveToRawDummy(Pointf pt);
void MoveToRawSimple(Pointf pt);
void MoveToRawClip(Pointf pt);
void LineToRawDummy(Pointf pt);
void LineToRawSimple(Pointf pt);
void LineToRawClip(Pointf pt);
@ -357,6 +364,7 @@ private:
bool std_pen;
bool simple;
bool is_line;
bool dummy;
int point_pixels;
Color point_color;
@ -401,7 +409,8 @@ public:
MarkTool();
virtual ~MarkTool();
void Set(const Plotter& info, One<Marker> marker);
void Reset();
bool Set(const Plotter& info, One<Marker> marker);
bool SetExtent(const Rectf& rc);
void ClearExtent();