X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=16cb8f9f6f6bc17a8d4c2af3339fcbf5d28a5aab;hp=e684f3ee40bf599d9ee7fe1cf6439ccbd4aa510c;hb=2a1715c907ba3ccfb952e9630c3fe305655637e0;hpb=5f25f354c33142215147b1fa3d18445bd0d7a6ee diff --git a/src/document.cpp b/src/document.cpp index e684f3e..16cb8f9 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -99,6 +99,46 @@ void Document::GenBaseQuadtree() GenQuadChild(0, QTC_TOP_LEFT); } +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; + } + 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(); @@ -109,11 +149,7 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren { if (IntersectsQuadChild(m_objects.bounds[i], type)) { - Debug("Adding %s -> %s", m_objects.bounds[i].Str().c_str(), TransformToQuadChild(m_objects.bounds[i], type).Str().c_str()); - 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(); @@ -218,6 +254,11 @@ void Document::Load(const string & filename) Debug("Bezier data..."); LoadStructVector(file, chunk_size/sizeof(Bezier), m_objects.beziers); break; + + case CT_OBJGROUPS: + Debug("Group data..."); + Warn("Not handled because lazy"); + break; } } Debug("Successfully loaded %u objects from \"%s\"", ObjectCount(), filename.c_str()); @@ -229,12 +270,51 @@ void Document::Load(const string & filename) #endif } -void Document::Add(ObjectType type, const Rect & bounds, unsigned data_index) +unsigned Document::AddGroup(unsigned start_index, unsigned end_index) +{ + 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) +{ + 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) { 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? + m_objects.groups.push_back(pair(data_index, data_index)); + return (m_count++); // Why can't we just use the size of types or something? } unsigned Document::AddBezierData(const Bezier & bezier) @@ -309,7 +389,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; @@ -324,7 +404,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}; @@ -363,8 +443,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; @@ -375,13 +455,13 @@ 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); } } 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()) @@ -404,7 +484,9 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) { string d = child.attribute("d").as_string(); Debug("Path data attribute is \"%s\"", d.c_str()); - ParseSVGPathData(d, transform); + pair range = ParseSVGPathData(d, transform); + AddGroup(range.first, range.second); + } else if (strcmp(child.name(), "line") == 0) { @@ -414,8 +496,7 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform) 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) { @@ -488,7 +569,7 @@ 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? -void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) +pair Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) { Real x[4] = {0,0,0,0}; Real y[4] = {0,0,0,0}; @@ -504,9 +585,12 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) bool start = false; - static string delims("()[],{}<>;:=LlmMqQzZcC"); + + static string delims("()[],{}<>;:=LlHhVvmMqQzZcC"); + + pair 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; @@ -573,9 +657,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) for (int j = 0; j < 4; ++j) TransformXYPair(x[j],y[j], 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[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])); @@ -584,16 +666,32 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) } - else if (command == "l" || command == "L") + else if (command == "l" || command == "L" || command == "h" || command == "H" || command == "v" || command == "V") { Debug("Construct lineto command, relative %d", relative); 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)); + 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; 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]; + } Real x1(x[1]); Real y1(y[1]); @@ -602,8 +700,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) TransformXYPair(x[1],y[1],transform); - unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[1],y[1],x[1],y[1])); - 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])); @@ -626,9 +723,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) for (int j = 0; j < 4; ++j) TransformXYPair(x[j],y[j], 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[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] = x3; @@ -649,6 +744,7 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform) } prev_i = i; } + return range; } void Document::SetFont(const string & font_filename) @@ -683,18 +779,28 @@ void Document::AddText(const string & text, Real scale, Real x, Real y) 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 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(left_side_bearing + kerning); AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y); - x += 0.5*scale; + x += Real(font_scale) * Real(advance_width); } } @@ -712,7 +818,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: @@ -725,7 +832,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 @@ -733,8 +840,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: @@ -742,12 +848,16 @@ 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 = 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) + { + AddGroup(start_index, end_index); + } stbtt_FreeShape(font, instructions); }