m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
return 1;
}
+ case GROUP:
+ break;
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));
if (i == start_index || objb.y < ymin)
ymin = objb.y;
if (i == start_index || (objb.y+objb.h) > ymax)
- ymax = objb.y;
+ ymax = (objb.y+objb.h);
}
Rect bounds(xmin,ymin, xmax-xmin, ymax-ymin);
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())
}
}
+/**
+ * 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());
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";
}
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);
{
kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
}
- x += Real(font_scale) * Real(left_side_bearing + kerning);
+ Debug("%c: lsb %d, kern %d, adv_width %d", text[i], left_side_bearing, kerning, advance_width);
+ x += Real(font_scale) * Real(kerning);
AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
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 = 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);
+ }
+ 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