X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=1e768bd92d47d752f733acc929174273e8faebb5;hp=6a862913918df20a543d9386c93180eaf30261c3;hb=58a6719da2337b3e6e20b581885f170bbe5fc480;hpb=da646c739f87bf28c5a7af2bc180b93b3444321b diff --git a/src/document.cpp b/src/document.cpp index 6a86291..1e768bd 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -94,9 +94,8 @@ void Document::Save(const string & filename) void Document::GenBaseQuadtree() { - m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount()}); + m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount(), -1}); m_quadtree.root_id = 0; - GenQuadChild(0, QTC_TOP_LEFT); } int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) @@ -105,6 +104,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) @@ -130,6 +130,32 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) 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 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(); + 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); + } + 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)); @@ -142,7 +168,8 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type) QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type) { QuadTreeIndex new_index = m_quadtree.nodes.size(); - m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0}); + Debug("-------------- Generating Quadtree Node %d (parent %d) ----------------------", new_index, parent); + m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0, -1}); 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) @@ -177,7 +204,7 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren QuadTreeIndex Document::GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren type) { QuadTreeIndex new_index = m_quadtree.nodes.size(); - m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0}); + m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0, -1}); m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size(); for (unsigned i = m_quadtree.nodes[child].object_begin; i < m_quadtree.nodes[child].object_end; ++i) @@ -255,8 +282,8 @@ void Document::Load(const string & filename) LoadStructVector(file, chunk_size/sizeof(Bezier), m_objects.beziers); break; - case CT_OBJGROUPS: - Debug("Group data..."); + case CT_OBJPATHS: + Debug("Path data..."); Warn("Not handled because lazy"); break; } @@ -270,45 +297,56 @@ void Document::Load(const string & filename) #endif } -unsigned Document::AddGroup(unsigned start_index, unsigned end_index) +unsigned Document::AddPath(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); + m_objects.paths[data_index].m_index = result; + //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; } +/** + * 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 + if (data.ToAbsolute(bounds) != bezier) + { + Warn("%s != %s", data.ToAbsolute(bounds).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); } -unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index) +unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index, QuadTreeIndex qti) { 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(data_index, data_index)); +#ifndef QUADTREE_DISABLED + if (qti != -1) + { + if (m_count == m_quadtree.nodes[qti].object_end+1) + { + m_quadtree.nodes[qti].object_end++; + } + else + { + QuadTreeIndex overlay = m_quadtree.nodes.size(); + m_quadtree.nodes.push_back(m_quadtree.nodes[qti]); + m_quadtree.nodes[overlay].object_begin = m_count; + m_quadtree.nodes[overlay].object_end = m_count+1; + m_quadtree.nodes[qti].next_overlay = overlay; + } + } +#endif return (m_count++); // Why can't we just use the size of types or something? } @@ -318,6 +356,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() { @@ -367,12 +410,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) @@ -384,7 +443,7 @@ static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform) 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; @@ -399,7 +458,7 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) else return; } - Debug("Token is \"%s\"", command.c_str()); + //Debug("Token is \"%s\"", command.c_str()); SVGMatrix delta = {1,0,0,0,1,0}; @@ -419,11 +478,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 @@ -438,8 +497,8 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) 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; @@ -450,15 +509,52 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform) 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); } } +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()); + //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); @@ -468,6 +564,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) { @@ -478,9 +576,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 range = ParseSVGPathData(d, transform); - AddGroup(range.first, range.second); + //Debug("Path data attribute is \"%s\"", d.c_str()); + bool closed = false; + pair range = ParseSVGPathData(d, transform, closed); + if (true && range.first < m_count && range.second < m_count)//(closed) + { + + string colour_str(""); + map 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) @@ -538,6 +689,35 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) } } +void Document::ParseSVGStyleData(const string & style, map & 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 */ @@ -550,13 +730,13 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) 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()); + Debug("Loaded XML from \"%s\" - %s", filename.c_str(), result.description()); 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); } @@ -564,8 +744,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 Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) +pair 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}; @@ -601,38 +782,40 @@ pair 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 = RealFromStr(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 = RealFromStr(GetToken(d,token,i,delims)); 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)); + Real dx = RealFromStr(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 = RealFromStr(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 = RealFromStr(GetToken(d,token,i,delims)); assert(GetToken(d,token,i,delims) == ","); - dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)); + dy = RealFromStr(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 = RealFromStr(GetToken(d,token,i,delims)); assert(GetToken(d,token,i,delims) == ","); - dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)); + dy = RealFromStr(GetToken(d,token,i,delims)); x[3] = (relative) ? x[0] + dx : dx; y[3] = (relative) ? y[0] + dy : dy; } @@ -663,14 +846,14 @@ pair 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 = RealFromStr(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 = RealFromStr(GetToken(d,token,i,delims)); } else if (command == "v" || command == "V") { @@ -724,6 +907,7 @@ pair Document::ParseSVGPathData(const string & d, const SVGM x[0] = x3; y[0] = y3; command = "m"; + closed = true; } else { @@ -749,7 +933,7 @@ 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); @@ -771,11 +955,12 @@ void Document::AddText(const string & text, Real scale, Real x, Real y) 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); + 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) { @@ -789,13 +974,13 @@ void Document::AddText(const string & text, Real scale, Real x, Real y) int advance_width = 0, left_side_bearing = 0, kerning = 0; stbtt_GetCodepointHMetrics(&m_font, text[i], &advance_width, &left_side_bearing); - if (i > 1) + if (i >= 1) { kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]); } - x += Real(font_scale) * Real(left_side_bearing + 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); } } @@ -813,7 +998,8 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca 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: @@ -826,7 +1012,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca 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 @@ -834,8 +1020,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca 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: @@ -843,11 +1028,89 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca // - 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) + { + 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); } + +void Document::TransformObjectBounds(const SVGMatrix & transform) +{ + for (unsigned i = 0; i < m_count; ++i) + { + TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform); + m_objects.bounds[i].w *= transform.a; + m_objects.bounds[i].h *= transform.d; + } +} + +void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type) +{ + #ifdef TRANSFORM_BEZIERS_TO_PATH + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.x += dx; + p.y += dy; + } + return; + #endif + + for (unsigned i = 0; i < m_count; ++i) + { + if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type) + { + m_objects.bounds[i].x += dx; + m_objects.bounds[i].y += dy; + } + } +} + +void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount, ObjectType type) +{ + #ifdef TRANSFORM_BEZIERS_TO_PATH + for (unsigned i = 0; i < m_objects.paths.size(); ++i) + { + Path & p = m_objects.paths[i]; + p.w /= scale_amount; + p.h /= scale_amount; + p.x -= x; + p.x /= scale_amount; + p.x += x; + p.y -= y; + p.y /= scale_amount; + p.y += y; + } + return; + #endif + + for (unsigned i = 0; i < m_count; ++i) + { + if (type != NUMBER_OF_OBJECT_TYPES && m_objects.types[i] != type) + continue; + + m_objects.bounds[i].w /= scale_amount; + m_objects.bounds[i].h /= scale_amount; + //m_objects.bounds[i].x = x + (m_objects.bounds[i].x-x)/scale_amount; + //m_objects.bounds[i].y = y + (m_objects.bounds[i].y-x)/scale_amount; + m_objects.bounds[i].x -= x; + m_objects.bounds[i].x /= scale_amount; + m_objects.bounds[i].x += x; + + m_objects.bounds[i].y -= y; + m_objects.bounds[i].y /= scale_amount; + m_objects.bounds[i].y += y; + } + +} + +