git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Slightly better results
[ipdf/code.git]
/
src
/
document.cpp
diff --git
a/src/document.cpp
b/src/document.cpp
index
0b72a3e
..
5890730
100644
(file)
--- a/
src/document.cpp
+++ b/
src/document.cpp
@@
-105,6
+105,7
@@
int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
{
case RECT_FILLED:
case RECT_OUTLINE:
+ case PATH:
{
Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
if (obj_bounds.x < 0)
@@
-132,37
+133,23
@@
int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
}
case BEZIER:
{
- Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
- if (
obj_bounds.x < 0
)
+ // If we're entirely within the quadtree node, no clipping need occur.
+ if (
ContainedInQuadChild(m_objects.bounds[object_id], type)
)
{
- obj_bounds.w += obj_bounds.x;
- obj_bounds.x = 0;
+ m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[object_id], type));
+ m_objects.types.push_back(m_objects.types[object_id]);
+ m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
+ return 1;
}
- if (obj_bounds.y < 0)
- {
- obj_bounds.h += obj_bounds.y;
- obj_bounds.y = 0;
- }
- if (obj_bounds.x + obj_bounds.w > 1)
- {
- obj_bounds.w += (1 - (obj_bounds.x + obj_bounds.w));
- }
- if (obj_bounds.y + obj_bounds.h > 1)
- {
- obj_bounds.h += (1 - (obj_bounds.y + obj_bounds.h));
- }
- Rect child_node_bounds = TransformFromQuadChild(obj_bounds, type);
- Rect clip_bezier_bounds;
- clip_bezier_bounds.x = (child_node_bounds.x - m_objects.bounds[object_id].x) / m_objects.bounds[object_id].w;
- clip_bezier_bounds.y = (child_node_bounds.y - m_objects.bounds[object_id].y) / m_objects.bounds[object_id].h;
- clip_bezier_bounds.w = child_node_bounds.w / m_objects.bounds[object_id].w;
- clip_bezier_bounds.h = child_node_bounds.h / m_objects.bounds[object_id].h;
- std::vector<Bezier> new_curves = Bezier(m_objects.beziers[m_objects.data_indices[object_id]], child_node_bounds).ClipToRectangle(clip_bezier_bounds);
+ Rect clip_bezier_bounds = TransformRectCoordinates(m_objects.bounds[object_id], TransformFromQuadChild(Rect{0,0,1,1}, type));
+ std::vector<Bezier> new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(clip_bezier_bounds);
for (size_t i = 0; i < new_curves.size(); ++i)
{
Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
- new_bounds = TransformToQuadChild(new_curves[i].SolveBounds(), type);
- Bezier new_curve_data = new_curves[i].ToRelative(new_bounds);
+ Bezier new_curve_data = new_curves[i].ToAbsolute(TransformToQuadChild(m_objects.bounds[object_id],type));
+ new_bounds = new_curve_data.SolveBounds();
+ Debug("New bounds: %s", new_bounds.Str().c_str());
+ new_curve_data = new_curve_data.ToRelative(new_bounds);
unsigned index = AddBezierData(new_curve_data);
m_objects.bounds.push_back(new_bounds);
m_objects.types.push_back(BEZIER);
@@
-295,8
+282,8
@@
void Document::Load(const string & filename)
LoadStructVector<Bezier>(file, chunk_size/sizeof(Bezier), m_objects.beziers);
break;
- case CT_OBJ
GROUP
S:
- Debug("
Group
data...");
+ case CT_OBJ
PATH
S:
+ Debug("
Path
data...");
Warn("Not handled because lazy");
break;
}
@@
-310,32
+297,13
@@
void Document::Load(const string & filename)
#endif
}
-unsigned Document::Add
Group(unsigned start_index, unsigned end_index, const Colour & fill
)
+unsigned Document::Add
Path(unsigned start_index, unsigned end_index, const Colour & fill, const Colour & stroke
)
{
- Real xmin = 0; Real ymin = 0;
- Real xmax = 0; Real ymax = 0;
-
- for (unsigned i = start_index; i <= end_index; ++i)
- {
- Rect & objb = m_objects.bounds[i];
-
- if (i == start_index || objb.x < xmin)
- xmin = objb.x;
- if (i == start_index || (objb.x+objb.w) > xmax)
- xmax = (objb.x+objb.w);
-
- if (i == start_index || objb.y < ymin)
- ymin = objb.y;
- if (i == start_index || (objb.y+objb.h) > ymax)
- ymax = (objb.y+objb.h);
- }
-
- Rect bounds(xmin,ymin, xmax-xmin, ymax-ymin);
-
- Group group(start_index, end_index, 0U, fill);
-
- unsigned data_index = AddGroupData(group);
- unsigned result = Add(GROUP, bounds,data_index);
+ Path path(m_objects, start_index, end_index, fill, stroke);
+ unsigned data_index = AddPathData(path);
+ Rect bounds = path.SolveBounds(m_objects);
+ unsigned result = Add(PATH, bounds,data_index);
+ //Debug("Added path %u -> %u (%u objects) colour {%u,%u,%u,%u}, stroke {%u,%u,%u,%u}", start_index, end_index, (end_index - start_index), fill.r, fill.g, fill.b, fill.a, stroke.r, stroke.g, stroke.b, stroke.a);
return result;
}
@@
-346,6
+314,12
@@
unsigned Document::AddBezier(const Bezier & bezier)
{
Rect bounds = bezier.SolveBounds();
Bezier data = bezier.ToRelative(bounds); // Relative
+ if (data.ToAbsolute(bounds) != bezier)
+ {
+ Warn("%s != %s", data.ToAbsolute(Rect(0,0,1,1)).Str().c_str(),
+ bezier.Str().c_str());
+ Warn("ToAbsolute on ToRelative does not give original Bezier");
+ }
unsigned index = AddBezierData(data);
return Add(BEZIER, bounds, index);
}
@@
-364,10
+338,10
@@
unsigned Document::AddBezierData(const Bezier & bezier)
return m_objects.beziers.size()-1;
}
-unsigned Document::Add
GroupData(const Group & group
)
+unsigned Document::Add
PathData(const Path & path
)
{
- m_objects.
groups.push_back(group
);
- return m_objects.
group
s.size()-1;
+ m_objects.
paths.push_back(path
);
+ return m_objects.
path
s.size()-1;
}
void Document::DebugDumpObjects()
@@
-521,6
+495,34
@@
void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
}
}
+inline Colour ParseColourString(const string & colour_str)
+{
+ Colour c(0,0,0,0);
+ if (colour_str == "red")
+ c = {255,0,0,255};
+ else if (colour_str == "blue")
+ c = {0,0,255,255};
+ else if (colour_str == "green")
+ c = {0,255,0,255};
+ else if (colour_str == "black")
+ c = {0,0,0,255};
+ else if (colour_str == "white")
+ c = {255,255,255,255};
+ else if (colour_str.size() == 7 && colour_str[0] == '#')
+ {
+ Debug("Parse colour string: \"%s\"", colour_str.c_str());
+ char comp[3] = {colour_str[1], colour_str[2], '\0'};
+ c.r = strtoul(comp, NULL, 16);
+ comp[0] = colour_str[3]; comp[1] = colour_str[4];
+ c.g = strtoul(comp, NULL, 16);
+ comp[0] = colour_str[5]; comp[1] = colour_str[6];
+ c.b = strtoul(comp, NULL, 16);
+ c.a = 255;
+ Debug("Colour is: %u, %u, %u, %u", c.r, c.g, c.b, c.a);
+ }
+ return c;
+}
+
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
{
//Debug("Parse node <%s>", root.name());
@@
-550,9
+552,9
@@
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
//Debug("Path data attribute is \"%s\"", d.c_str());
bool closed = false;
pair<unsigned, unsigned> range = ParseSVGPathData(d, transform, closed);
- if (closed)
+ if (
true)//(
closed)
{
- Colour c(0,0,0,0);
+
string colour_str("");
map<string, string> style;
if (child.attribute("style"))
@@
-569,41
+571,39
@@
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
{
colour_str = style["fill"];
}
- if (colour_str == "red")
- c = {1,0,0,1};
- else if (colour_str == "blue")
- c = {0,0,1,1};
- else if (colour_str == "green")
- c = {0,1,0,1};
- else if (colour_str == "black")
- c = {0,0,0,1};
- else if (colour_str == "white")
- c = {1,1,1,1};
- else if (colour_str.size() == 7 && colour_str[0] == '#')
+ Colour fill = ParseColourString(colour_str);
+ Colour stroke = fill;
+
+ if (child.attribute("stroke"))
{
- Debug("Parse colour string: \"%s\"", colour_str.c_str());
- char comp[2] = {colour_str[1], colour_str[2]};
- c.r = Real(strtoul(comp, NULL, 16))/Real(255);
- comp[0] = colour_str[3]; comp[1] = colour_str[4];
- c.g = Real(strtoul(comp, NULL, 16))/Real(255);
- comp[0] = colour_str[5]; comp[1] = colour_str[6];
- c.b = Real(strtoul(comp, NULL, 16))/Real(255);
- c.a = 1;
- Debug("Colour is: %f, %f, %f, %f", Float(c.r), Float(c.g), Float(c.b), Float(c.a));
+ colour_str = child.attribute("stroke").as_string();
+ stroke = ParseColourString(colour_str);
}
+ else if (style.find("stroke") != style.end())
+ {
+ colour_str = style["stroke"];
+ stroke = ParseColourString(colour_str);
+ }
+
// Determin shading alpha
if (child.attribute("fill-opacity"))
{
-
c.a =
child.attribute("fill-opacity").as_float();
+
fill.a = 255*
child.attribute("fill-opacity").as_float();
}
else if (style.find("fill-opacity") != style.end())
{
-
c.a =
strtod(style["fill-opacity"].c_str(), NULL);
+
fill.a = 255*
strtod(style["fill-opacity"].c_str(), NULL);
}
-
- Debug("fill-opacity is %f", Float(c.a));
- AddGroup(range.first, range.second, c);
+ if (child.attribute("stroke-opacity"))
+ {
+ stroke.a = 255*child.attribute("stroke-opacity").as_float();
+ }
+ else if (style.find("stroke-opacity") != style.end())
+ {
+ stroke.a = 255*strtod(style["stroke-opacity"].c_str(), NULL);
+ }
+ AddPath(range.first, range.second, fill, stroke);
}
}
@@
-932,7
+932,8
@@
void Document::AddText(const string & text, Real scale, Real x, Real y)
//Real y0(y);
int ascent = 0, descent = 0, line_gap = 0;
stbtt_GetFontVMetrics(&m_font, &ascent, &descent, &line_gap);
- float font_scale = scale / (float)(ascent - descent);
+ Real font_scale = scale;
+ font_scale /= Real(ascent - descent);
Real y_advance = Real(font_scale) * Real(ascent - descent + line_gap);
for (unsigned i = 0; i < text.size(); ++i)
{
@@
-950,9
+951,9
@@
void Document::AddText(const string & text, Real scale, Real x, Real y)
{
kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
}
- x +=
Real(font_scale)
* Real(kerning);
+ x +=
font_scale
* Real(kerning);
AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
- x +=
Real(font_scale)
* Real(advance_width);
+ x +=
font_scale
* Real(advance_width);
}
}
@@
-1008,9
+1009,9
@@
void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
if (start_index < m_count && end_index < m_count)
{
- Add
Group
(start_index, end_index);
+ Add
Path
(start_index, end_index);
}
- Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
+
//
Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
stbtt_FreeShape(font, instructions);
}
UCC
git Repository :: git.ucc.asn.au
git.ucc.asn.au / ipdf / code.git / blobdiff
UCC git Repository :: git.ucc.asn.au