m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount()});
m_quadtree.root_id = 0;
GenQuadChild(0, QTC_TOP_LEFT);
- GenQuadParent(0, QTC_BOTTOM_RIGHT);
}
+int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
+{
+ switch (m_objects.types[object_id])
+ {
+ case RECT_FILLED:
+ case RECT_OUTLINE:
+ {
+ Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+ if (obj_bounds.x < 0)
+ {
+ obj_bounds.w += obj_bounds.x;
+ obj_bounds.x = 0;
+ }
+ 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));
+ }
+ m_objects.bounds.push_back(obj_bounds);
+ m_objects.types.push_back(m_objects.types[object_id]);
+ m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
+ return 1;
+ }
+ case BEZIER:
+ {
+ // 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)
+ {
+ 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();
+ 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);
+ }
+ return new_curves.size();
+ }
+ default:
+ Debug("Adding %s -> %s", m_objects.bounds[object_id].Str().c_str(), TransformToQuadChild(m_objects.bounds[object_id], type).Str().c_str());
+ 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;
+ }
+ return 0;
+}
QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type)
{
QuadTreeIndex new_index = m_quadtree.nodes.size();
m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
for (unsigned i = m_quadtree.nodes[parent].object_begin; i < m_quadtree.nodes[parent].object_end; ++i)
{
- if (ContainedInQuadChild(m_objects.bounds[i], type))
+ if (IntersectsQuadChild(m_objects.bounds[i], type))
{
- m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[i], type));
- m_objects.types.push_back(m_objects.types[i]);
- m_objects.data_indices.push_back(m_objects.data_indices[i]);
- m_count++;
+ m_count += ClipObjectToQuadChild(i, type);
}
}
m_quadtree.nodes[new_index].object_end = m_objects.bounds.size();
Debug("Bezier data...");
LoadStructVector<Bezier>(file, chunk_size/sizeof(Bezier), m_objects.beziers);
break;
+
+ case CT_OBJPATHS:
+ Debug("Path data...");
+ Warn("Not handled because lazy");
+ break;
}
}
Debug("Successfully loaded %u objects from \"%s\"", ObjectCount(), filename.c_str());
#endif
}
-void Document::Add(ObjectType type, const Rect & bounds, unsigned data_index)
+unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colour & fill)
+{
+ Path path(m_objects, start_index, end_index, fill);
+ unsigned data_index = AddPathData(path);
+ Rect bounds = path.SolveBounds(m_objects);
+ unsigned result = Add(PATH, bounds,data_index);
+ return result;
+}
+
+/**
+ * Add a Bezier using Absolute coords
+ */
+unsigned Document::AddBezier(const Bezier & bezier)
+{
+ Rect bounds = bezier.SolveBounds();
+ Bezier data = bezier.ToRelative(bounds); // Relative
+ if (data.ToAbsolute(bounds) != bezier)
+ {
+ Error("%s != %s", data.ToAbsolute(Rect(0,0,1,1)).Str().c_str(),
+ bezier.Str().c_str());
+ Fatal("ToAbsolute on ToRelative does not give original Bezier");
+ }
+ unsigned index = AddBezierData(data);
+ return Add(BEZIER, bounds, index);
+}
+
+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_count; // Why can't we just use the size of types or something?
+ return (m_count++); // Why can't we just use the size of types or something?
}
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()
{
static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const string & delims = "()[],{}<>;:=")
{
string token("");
- x = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+ while (GetToken(d, token, i, delims) == ",");
+ x = strtod(token.c_str(),NULL);
if (GetToken(d, token, i, delims) != ",")
{
Fatal("Expected \",\" seperating x,y pair");
y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
}
-static void TransformXYPair(Real & x, Real & y, SVGMatrix & transform)
+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)
{
Real x0(x);
x = transform.a * x + transform.c * y + transform.e;
void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
{
- Debug("Parsing transform %s", s.c_str());
+ //Debug("Parsing transform %s", s.c_str());
string token;
string command;
unsigned i = 0;
- GetToken(s, command, i);
- Debug("Token is \"%s\"", command.c_str());
- SVGMatrix delta = {1,0,0,1,0,0};
+ while (i < s.size())
+ {
+ GetToken(s, command, i);
+ if (command == "," || command == "" || command == ":")
+ {
+ if (i < s.size())
+ GetToken(s, command, i);
+ else
+ return;
+ }
+ //Debug("Token is \"%s\"", command.c_str());
+
+ SVGMatrix delta = {1,0,0,0,1,0};
- assert(GetToken(s,token, i) == "(");
- if (command == "translate")
- {
- GetXYPair(s, delta.e, delta.f, i);
- assert(GetToken(s,token, i) == ")");
- }
- else if (command == "matrix")
- {
- GetXYPair(s, delta.a, delta.b,i);
- GetXYPair(s, delta.c, delta.d,i);
- GetXYPair(s, delta.e, delta.f,i);
- assert(GetToken(s,token, i) == ")");
- }
- else if (command == "scale")
- {
- delta.a = (strtod(GetToken(s,token,i).c_str(), NULL));
- GetToken(s, token, i);
- if (token != ")")
+ assert(GetToken(s,token, i) == "(");
+ if (command == "translate")
{
- delta.b = (strtod(token.c_str(), NULL));
+ GetXYPair(s, delta.e, delta.f, i);
+ assert(GetToken(s,token, i) == ")");
+ }
+ else if (command == "matrix")
+ {
+ GetXYPair(s, delta.a, delta.b,i);
+ GetXYPair(s, delta.c, delta.d,i);
+ GetXYPair(s, delta.e, delta.f,i);
+ assert(GetToken(s,token, i) == ")");
+ }
+ else if (command == "scale")
+ {
+ delta.a = (strtod(GetToken(s,token,i).c_str(), NULL));
+ GetToken(s, token, i);
+ if (token == ",")
+ {
+ delta.d = (strtod(GetToken(s,token,i).c_str(), NULL));
+ assert(GetToken(s, token, i) == ")");
+ }
+ else
+ {
+ delta.d = delta.a;
+ assert(token == ")");
+ }
+
}
else
{
- delta.b = delta.a;
+ Warn("Unrecognised transform \"%s\", using identity", command.c_str());
}
-
- }
- else
- {
- Warn("Unrecognised transform \"%s\", using identity", command.c_str());
- }
- Debug("Old transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
- Debug("Delta transform is {%f,%f,%f,%f,%f,%f}", delta.a, delta.b, delta.c, delta.d,delta.e,delta.f);
+ //Debug("Old transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
+ //Debug("Delta transform is {%f,%f,%f,%f,%f,%f}", delta.a, delta.b, delta.c, delta.d,delta.e,delta.f);
- SVGMatrix old(transform);
- transform.a = old.a * delta.a + old.c * delta.b;
- transform.c = old.a * delta.c + old.c * delta.d;
- transform.e = old.a * delta.e + old.c * delta.f + old.e;
+ SVGMatrix old(transform);
+ transform.a = old.a * delta.a + old.c * delta.b;
+ transform.c = old.a * delta.c + old.c * delta.d;
+ transform.e = old.a * delta.e + old.c * delta.f + old.e;
- transform.b = old.b * delta.a + old.d * delta.b;
- transform.d = old.b * delta.c + old.d * delta.d;
- transform.f = old.b * delta.e + old.d * delta.f + old.f;
+ transform.b = old.b * delta.a + old.d * delta.b;
+ transform.d = old.b * delta.c + old.d * delta.d;
+ transform.f = old.b * delta.e + old.d * delta.f + old.f;
- Debug("New transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
+ //Debug("New transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
+ }
}
void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
{
- Debug("Parse node <%s>", root.name());
+ //Debug("Parse node <%s>", root.name());
for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
ParseSVGTransform(attrib_trans.as_string(), transform);
}
+
+
if (strcmp(child.name(), "svg") == 0 || strcmp(child.name(),"g") == 0
|| strcmp(child.name(), "group") == 0)
{
else if (strcmp(child.name(), "path") == 0)
{
string d = child.attribute("d").as_string();
- Debug("Path data attribute is \"%s\"", d.c_str());
- ParseSVGPathData(d, transform);
+ //Debug("Path data attribute is \"%s\"", d.c_str());
+ bool closed = false;
+ pair<unsigned, unsigned> range = ParseSVGPathData(d, transform, closed);
+ if (closed)
+ {
+ Colour c(0,0,0,0);
+ 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"];
+ }
+ 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] == '#')
+ {
+ 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));
+ }
+
+ // Determin shading alpha
+ if (child.attribute("fill-opacity"))
+ {
+ c.a = child.attribute("fill-opacity").as_float();
+ }
+ else if (style.find("fill-opacity") != style.end())
+ {
+ c.a = strtod(style["fill-opacity"].c_str(), NULL);
+ }
+
+ Debug("fill-opacity is %f", Float(c.a));
+ AddPath(range.first, range.second, c);
+ }
+
}
else if (strcmp(child.name(), "line") == 0)
{
Real y1(child.attribute("y2").as_float());
TransformXYPair(x0,y0,transform);
TransformXYPair(x1,y1,transform);
- unsigned index = AddBezierData(Bezier(x0,y0,x1,y1,x1,y1,x1,y1));
- Add(BEZIER, Rect(0,0,1,1), index);
+ AddBezier(Bezier(x0,y0,x1,y1,x1,y1,x1,y1));
}
else if (strcmp(child.name(), "rect") == 0)
{
}
}
+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
+ */
+void Document::ParseSVG(const string & input, const Rect & bounds)
+{
+ using namespace pugi;
+
+ xml_document doc_xml;
+ xml_parse_result result = doc_xml.load(input.c_str());
+
+ if (!result)
+ Error("Couldn't parse SVG input - %s", result.description());
+
+ Debug("Loaded XML - %s", result.description());
+ SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y};
+ ParseSVGNode(doc_xml, transform);
+}
+
/**
* Load an SVG into a rectangle
*/
xml_parse_result result = doc_xml.load(input);
if (!result)
- Fatal("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
+ Error("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
Debug("Loaded XML - %s", result.description());
input.close();
-
- SVGMatrix transform = {bounds.w, 0,bounds.x, bounds.h,0,bounds.y};
+ // a c e, b d f
+ SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y};
ParseSVGNode(doc_xml, transform);
}
// Fear the wrath of the tokenizing svg data
// Seriously this isn't really very DOM-like at all is it?
-void 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};
bool start = false;
- static string delims("()[],{}<>;:=LlmMqQzZcC");
+
+ static string delims("()[],{}<>;:=LlHhVvmMqQzZcC");
+
+ pair<unsigned, unsigned> range(m_count, m_count);
- while (i < d.size() && GetToken(d, token, i).size() > 0)
+ while (i < d.size() && GetToken(d, token, i, delims).size() > 0)
{
if (isalpha(token[0]))
command = token;
if (command == "m" || command == "M")
{
//Debug("Construct moveto command");
- Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) * transform.a;
+ Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
assert(GetToken(d,token,i,delims) == ",");
- Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) * transform.d;
+ Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
- x[0] = (relative) ? x[0] + dx : dx + transform.e;
- y[0] = (relative) ? y[0] + dy : dy + transform.f;
-
-
+ x[0] = (relative) ? x[0] + dx : dx;
+ y[0] = (relative) ? y[0] + dy : dy;
+ x0 = x[0];
+ y0 = y[0];
//Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
command = (command == "m") ? "l" : "L";
}
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)) * transform.a;
+ Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
assert(GetToken(d,token,i,delims) == ",");
- Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL))*transform.d;
+ Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
- x[1] = (relative) ? x[0] + dx : dx + transform.e;
- y[1] = (relative) ? y[0] + dy : dy + transform.f;
+ 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)) *transform.a;
+ dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
assert(GetToken(d,token,i,delims) == ",");
- dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
+ dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
- x[2] = (relative) ? x[0] + dx : dx + transform.e;
- y[2] = (relative) ? y[0] + dy : dy + transform.f;
+ 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)) *transform.a;
+ dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
assert(GetToken(d,token,i,delims) == ",");
- dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
- x[3] = (relative) ? x[0] + dx : dx + transform.e;
- y[3] = (relative) ? y[0] + dy : dy + transform.f;
+ dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+ x[3] = (relative) ? x[0] + dx : dx;
+ y[3] = (relative) ? y[0] + dy : dy;
}
else
{
y[2] = y[3] + Real(2) * (old_y1 - y[3])/ Real(3);
}
- unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
- Add(BEZIER,Rect(0,0,1,1),index);
-
+ Real x3(x[3]);
+ Real y3(y[3]);
+ for (int j = 0; j < 4; ++j)
+ TransformXYPair(x[j],y[j], transform);
+
+ range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
//Debug("[%u] curveto %f,%f %f,%f %f,%f", index, Float(x[1]),Float(y[1]),Float(x[2]),Float(y[2]),Float(x[3]),Float(y[3]));
- x[0] = x[3];
- y[0] = y[3];
+ x[0] = x3;
+ y[0] = y3;
}
- else if (command == "l" || command == "L")
+ else if (command == "l" || command == "L" || command == "h" || command == "H" || command == "v" || command == "V")
{
- //Debug("Construct lineto command");
+ //Debug("Construct lineto command, relative %d", relative);
- Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.a;
- assert(GetToken(d,token,i,delims) == ",");
- Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
+ Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+ Real dy;
+ if (command == "l" || command == "L")
+ {
+ assert(GetToken(d,token,i,delims) == ",");
+ dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+ }
+ else if (command == "v" || command == "V")
+ {
+ swap(dx,dy);
+ }
- x[1] = (relative) ? x[0] + dx : dx + transform.e;
- y[1] = (relative) ? y[0] + dy : dy + transform.f;
+ x[1] = (relative) ? x[0] + dx : dx;
+ y[1] = (relative) ? y[0] + dy : dy;
+ if (command == "v" || command == "V")
+ {
+ x[1] = x[0];
+ }
+ else if (command == "h" || command == "H")
+ {
+ y[1] = y[0];
+ }
- x[2] = x[1];
- y[2] = y[1];
+ Real x1(x[1]);
+ Real y1(y[1]);
- x[3] = x[1];
- y[3] = y[1];
+ TransformXYPair(x[0],y[0],transform);
+ TransformXYPair(x[1],y[1],transform);
+
- unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
- Add(BEZIER,Rect(0,0,1,1),index);
+ range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[1],y[1],x[1],y[1]));
//Debug("[%u] lineto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
- x[0] = x[3];
- y[0] = y[3];
+ x[0] = x1;
+ y[0] = y1;
}
else if (command == "z" || command == "Z")
x[3] = x0;
y[3] = y0;
- unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
- Add(BEZIER,Rect(0,0,1,1),index);
-
+ Real x3(x[3]);
+ Real y3(y[3]);
+ for (int j = 0; j < 4; ++j)
+ TransformXYPair(x[j],y[j], transform);
+
+ range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
//Debug("[%u] returnto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
- x[0] = x[3];
- y[0] = y[3];
+ x[0] = x3;
+ y[0] = y3;
command = "m";
+ closed = true;
}
else
{
}
prev_i = i;
}
+ return range;
}
void Document::SetFont(const string & font_filename)
free(m_font_data);
}
- FILE *font_file = fopen("DejaVuSansMono.ttf", "rb");
+ FILE *font_file = fopen(font_filename.c_str(), "rb");
fseek(font_file, 0, SEEK_END);
size_t font_file_size = ftell(font_file);
fseek(font_file, 0, SEEK_SET);
return;
}
- float font_scale = stbtt_ScaleForPixelHeight(&m_font, scale);
Real x0(x);
//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 y_advance = Real(font_scale) * Real(ascent - descent + line_gap);
for (unsigned i = 0; i < text.size(); ++i)
{
if (text[i] == '\n')
{
- y += 0.5*scale;
+ y += y_advance;
x = x0;
}
if (!isprint(text[i]))
continue;
+ int advance_width = 0, left_side_bearing = 0, kerning = 0;
+ stbtt_GetCodepointHMetrics(&m_font, text[i], &advance_width, &left_side_bearing);
+ if (i >= 1)
+ {
+ kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
+ }
+ x += Real(font_scale) * Real(kerning);
AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
- x += 0.5*scale;
+ x += Real(font_scale) * Real(advance_width);
}
}
int num_instructions = stbtt_GetGlyphShape(font, glyph_index, &instructions);
Real current_x(0), current_y(0);
-
+ unsigned start_index = m_count;
+ unsigned end_index = m_count;
for (int i = 0; i < num_instructions; ++i)
{
// TTF uses 16-bit signed ints for coordinates:
Real old_x(current_x), old_y(current_y);
current_x = inst_x;
current_y = inst_y;
- unsigned bezier_index;
+
switch(instructions[i].type)
{
// Move To
break;
// Line To
case STBTT_vline:
- bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + x, old_y + y, current_x + x, current_y + y, current_x + x, current_y + y));
- Add(BEZIER,Rect(0,0,1,1),bezier_index);
+ end_index = AddBezier(Bezier(old_x + x, old_y + y, old_x + x, old_y + y, current_x + x, current_y + y, current_x + x, current_y + y));
break;
// Quadratic Bezier To:
case STBTT_vcurve:
// - Endpoints are the same.
// - cubic1 = quad0+(2/3)*(quad1-quad0)
// - cubic2 = quad2+(2/3)*(quad1-quad2)
- bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + Real(2)*(inst_cx-old_x)/Real(3) + x, old_y + Real(2)*(inst_cy-old_y)/Real(3) + y,
+ end_index = AddBezier(Bezier(old_x + x, old_y + y, old_x + Real(2)*(inst_cx-old_x)/Real(3) + x, old_y + Real(2)*(inst_cy-old_y)/Real(3) + y,
current_x + Real(2)*(inst_cx-current_x)/Real(3) + x, current_y + Real(2)*(inst_cy-current_y)/Real(3) + y, current_x + x, current_y + y));
- Add(BEZIER,Rect(0,0,1,1),bezier_index);
break;
}
}
+
+ if (start_index < m_count && end_index < m_count)
+ {
+ AddPath(start_index, end_index);
+ }
+ Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
stbtt_FreeShape(font, instructions);
}
git.ucc.asn.au / ipdf / code.git / blobdiff
UCC git Repository :: git.ucc.asn.au