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
Commit before breaking everything
[ipdf/code.git]
/
src
/
document.cpp
diff --git
a/src/document.cpp
b/src/document.cpp
index
0b43cfc
..
6b1e473
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,13
+133,25
@@
int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
}
case BEZIER:
{
- Rect child_node_bounds = TransformFromQuadChild({0,0,1,1}, type);
- std::vector<Bezier> new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(child_node_bounds);
- Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+ // If we're entirely within the quadtree node, no clipping need occur.
+ if (ContainedInQuadChild(m_objects.bounds[object_id], type))
+ {
+ 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;
+ }
+ 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)
{
- unsigned index = AddBezierData(new_curves[i]);
- m_objects.bounds.push_back(obj_bounds);
+ Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+ 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);
m_objects.data_indices.push_back(index);
}
@@
-269,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;
}
@@
-284,30
+297,13
@@
void Document::Load(const string & filename)
#endif
}
-unsigned Document::Add
Group(unsigned start_index, unsigned end_index
)
+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);
- unsigned result = Add(GROUP, bounds,0);
- m_objects.groups[m_count-1].first = start_index;
- m_objects.groups[m_count-1].second = end_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;
}
@@
-318,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);
}
@@
-327,7
+329,6
@@
unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index
m_objects.types.push_back(type);
m_objects.bounds.push_back(bounds);
m_objects.data_indices.push_back(data_index);
- m_objects.groups.push_back(pair<unsigned, unsigned>(data_index, data_index));
return (m_count++); // Why can't we just use the size of types or something?
}
@@
-337,6
+338,11
@@
unsigned Document::AddBezierData(const Bezier & bezier)
return m_objects.beziers.size()-1;
}
+unsigned Document::AddPathData(const Path & path)
+{
+ m_objects.paths.push_back(path);
+ return m_objects.paths.size()-1;
+}
void Document::DebugDumpObjects()
{
@@
-386,12
+392,28
@@
static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const s
{
string token("");
while (GetToken(d, token, i, delims) == ",");
- x =
strtod(token.c_str(),NULL
);
+ x =
RealFromStr(token
);
if (GetToken(d, token, i, delims) != ",")
{
Fatal("Expected \",\" seperating x,y pair");
}
- y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+ y = RealFromStr(GetToken(d,token,i,delims));
+}
+
+static bool GetKeyValuePair(const string & d, string & key, string & value, unsigned & i, const string & delims = "()[],{}<>;:=")
+{
+ key = "";
+ string token;
+ while (GetToken(d, token, i, delims) == ":" || token == ";");
+ key = token;
+ if (GetToken(d, token, i, delims) != ":")
+ {
+ Error("Expected \":\" seperating key:value pair");
+ return false;
+ }
+ value = "";
+ GetToken(d, value, i, delims);
+ return true;
}
static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform)
@@
-438,11
+460,11
@@
void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
}
else if (command == "scale")
{
- delta.a =
(strtod(GetToken(s,token,i).c_str(), NULL
));
+ delta.a =
RealFromStr(GetToken(s,token,i
));
GetToken(s, token, i);
if (token == ",")
{
- delta.d =
(strtod(GetToken(s,token,i).c_str(), NULL
));
+ delta.d =
RealFromStr(GetToken(s,token,i
));
assert(GetToken(s, token, i) == ")");
}
else
@@
-473,11
+495,48
@@
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());
-
+
+ // Centre the SVGs
+ if (strcmp(root.name(),"svg") == 0)
+ {
+ Real ww = RealFromStr(root.attribute("width").as_string());
+ Real hh = RealFromStr(root.attribute("height").as_string());
+ parent_transform.e -= parent_transform.a * ww/Real(2);
+ parent_transform.f -= parent_transform.d * hh/Real(2);
+ }
+
for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
{
SVGMatrix transform(parent_transform);
@@
-487,6
+546,8
@@
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
ParseSVGTransform(attrib_trans.as_string(), transform);
}
+
+
if (strcmp(child.name(), "svg") == 0 || strcmp(child.name(),"g") == 0
|| strcmp(child.name(), "group") == 0)
{
@@
-497,9
+558,62
@@
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
else if (strcmp(child.name(), "path") == 0)
{
string d = child.attribute("d").as_string();
- Debug("Path data attribute is \"%s\"", d.c_str());
- pair<unsigned, unsigned> range = ParseSVGPathData(d, transform);
- AddGroup(range.first, range.second);
+ //Debug("Path data attribute is \"%s\"", d.c_str());
+ bool closed = false;
+ pair<unsigned, unsigned> range = ParseSVGPathData(d, transform, closed);
+ if (true)//(closed)
+ {
+
+ string colour_str("");
+ map<string, string> style;
+ if (child.attribute("style"))
+ {
+ ParseSVGStyleData(child.attribute("style").as_string(), style);
+ }
+
+ // Determine shading colour
+ if (child.attribute("fill"))
+ {
+ colour_str = child.attribute("fill").as_string();
+ }
+ else if (style.find("fill") != style.end())
+ {
+ colour_str = style["fill"];
+ }
+ Colour fill = ParseColourString(colour_str);
+ Colour stroke = fill;
+
+ if (child.attribute("stroke"))
+ {
+ 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"))
+ {
+ fill.a = 255*child.attribute("fill-opacity").as_float();
+ }
+ else if (style.find("fill-opacity") != style.end())
+ {
+ fill.a = 255*strtod(style["fill-opacity"].c_str(), NULL);
+ }
+ 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);
+ }
}
else if (strcmp(child.name(), "line") == 0)
@@
-557,6
+671,17
@@
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
}
}
+void Document::ParseSVGStyleData(const string & style, map<string, string> & results)
+{
+ unsigned i = 0;
+ string key;
+ string value;
+ while (i < style.size() && GetKeyValuePair(style, key, value, i))
+ {
+ results[key] = value;
+ }
+}
+
/**
* Parse an SVG string into a rectangle
*/
@@
-593,7
+718,7
@@
void Document::LoadSVG(const string & filename, const Rect & bounds)
input.close();
// a c e, b d f
- SVGMatrix transform = {bounds.w,
0
,bounds.x, 0,bounds.h,bounds.y};
+ SVGMatrix transform = {bounds.w,
0
,bounds.x, 0,bounds.h,bounds.y};
ParseSVGNode(doc_xml, transform);
}
@@
-601,8
+726,9
@@
void Document::LoadSVG(const string & filename, const Rect & bounds)
// Fear the wrath of the tokenizing svg data
// Seriously this isn't really very DOM-like at all is it?
-pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
+pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGMatrix & transform
, bool & closed
)
{
+ closed = false;
Real x[4] = {0,0,0,0};
Real y[4] = {0,0,0,0};
@@
-638,9
+764,9
@@
pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
if (command == "m" || command == "M")
{
//Debug("Construct moveto command");
- Real dx = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ Real dx = Real
FromStr(GetToken(d,token,i,delims
));
assert(GetToken(d,token,i,delims) == ",");
- Real dy = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ Real dy = Real
FromStr(GetToken(d,token,i,delims
));
x[0] = (relative) ? x[0] + dx : dx;
y[0] = (relative) ? y[0] + dy : dy;
@@
-653,25
+779,25
@@
pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
else if (command == "c" || command == "C" || command == "q" || command == "Q")
{
//Debug("Construct curveto command");
- Real dx = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ Real dx = Real
FromStr(GetToken(d,token,i,delims
));
assert(GetToken(d,token,i,delims) == ",");
- Real dy = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ Real dy = Real
FromStr(GetToken(d,token,i,delims
));
x[1] = (relative) ? x[0] + dx : dx;
y[1] = (relative) ? y[0] + dy : dy;
- dx = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ dx = Real
FromStr(GetToken(d,token,i,delims
));
assert(GetToken(d,token,i,delims) == ",");
- dy = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ dy = Real
FromStr(GetToken(d,token,i,delims
));
x[2] = (relative) ? x[0] + dx : dx;
y[2] = (relative) ? y[0] + dy : dy;
if (command != "q" && command != "Q")
{
- dx = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ dx = Real
FromStr(GetToken(d,token,i,delims
));
assert(GetToken(d,token,i,delims) == ",");
- dy = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ dy = Real
FromStr(GetToken(d,token,i,delims
));
x[3] = (relative) ? x[0] + dx : dx;
y[3] = (relative) ? y[0] + dy : dy;
}
@@
-702,14
+828,14
@@
pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
}
else if (command == "l" || command == "L" || command == "h" || command == "H" || command == "v" || command == "V")
{
- Debug("Construct lineto command, relative %d", relative);
+
//
Debug("Construct lineto command, relative %d", relative);
- Real dx = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
- Real dy;
+ Real dx = Real
FromStr(GetToken(d,token,i,delims
));
+ Real dy
= 0
;
if (command == "l" || command == "L")
{
assert(GetToken(d,token,i,delims) == ",");
- dy = Real
(strtod(GetToken(d,token,i,delims).c_str(),NULL
));
+ dy = Real
FromStr(GetToken(d,token,i,delims
));
}
else if (command == "v" || command == "V")
{
@@
-763,6
+889,7
@@
pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
x[0] = x3;
y[0] = y3;
command = "m";
+ closed = true;
}
else
{
@@
-814,7
+941,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)
{
@@
-832,9
+960,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);
}
}
@@
-890,9
+1018,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