unsigned Document::AddGroup(unsigned start_index, unsigned end_index)
{
- //TODO: Set bounds rect?
- unsigned result = Add(GROUP, Rect(0,0,1,1),0);
+ 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;
return result;
}
+/**
+ * Add a Bezier using Absolute coords
+ */
unsigned Document::AddBezier(const Bezier & bezier)
{
- unsigned index = AddBezierData(bezier);
- return Add(BEZIER, bezier.SolveBounds(), index);
+ Rect bounds = bezier.SolveBounds();
+ Bezier data = bezier.ToRelative(bounds); // Relative
+ unsigned index = AddBezierData(data);
+ return Add(BEZIER, bounds, index);
}
unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index)
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;
else
return;
}
- Debug("Token is \"%s\"", command.c_str());
+ //Debug("Token is \"%s\"", command.c_str());
SVGMatrix delta = {1,0,0,0,1,0};
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.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())
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 = 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,
+ 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));
break;
}
}
+
+ if (start_index < m_count && end_index < m_count)
+ {
+ AddGroup(start_index, end_index);
+ }
stbtt_FreeShape(font, instructions);
}