From: ishmal Date: Fri, 1 Aug 2008 19:16:47 +0000 (+0000) Subject: make redundant. use correct fields of cubic bezier point array X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8eaa447bca02c775a06c0f7cce3ce8353161c86;p=inkscape.git make redundant. use correct fields of cubic bezier point array --- diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index f4cfc9200..6e7b21b86 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -46,32 +46,6 @@ namespace Internal -//######################################################################## -//# U T I L I T Y -//######################################################################## - - - -/** - * This function searches the Repr tree recursively from the given node, - * and adds refs to all nodes with the given name, to the result vector - */ -static void -findElementsByTagName(std::vector &results, - Inkscape::XML::Node *node, - char const *name) -{ - if ( !name || strcmp(node->name(), name) == 0 ) - results.push_back(node); - - for (Inkscape::XML::Node *child = node->firstChild() ; child ; - child = child->next()) - findElementsByTagName( results, child, name ); - -} - - - //######################################################################## //# OUTPUT FORMATTING //######################################################################## @@ -146,6 +120,11 @@ bool JavaFXOutput::doHeader(const String &name) out("public class %s extends CompositeNode {\n", name.c_str()); out("}\n"); out("\n\n"); + out("function %s.composeNode() =\n", name.c_str()); + out("Group\n"); + out(" {\n"); + out(" content:\n"); + out(" [\n"); return true; } @@ -156,6 +135,9 @@ bool JavaFXOutput::doHeader(const String &name) */ bool JavaFXOutput::doTail(const String &name) { + out(" ] // content\n"); + out(" }; // Group\n"); + out("// end function %s.composeNode()\n", name.c_str()); out("\n\n\n\n"); out("Frame {\n"); out(" title: \"Test\"\n"); @@ -178,180 +160,200 @@ bool JavaFXOutput::doTail(const String &name) } - /** * Output the curve data to buffer */ -bool JavaFXOutput::doCurves(SPDocument *doc, const String &name) +bool JavaFXOutput::doCurve(SPItem *item, const String &id) { using Geom::X; using Geom::Y; - - - std::vectorresults; - findElementsByTagName(results, doc->rroot, NULL); - //findElementsByTagName(results, SP_ACTIVE_DOCUMENT->rroot, NULL); - if (results.size() == 0) - return true; - out("function %s.composeNode() =\n", name.c_str()); - out("Group\n"); - out(" {\n"); - out(" content:\n"); - out(" [\n"); + Geom::Matrix tf = sp_item_i2d_affine(item); - for (unsigned int indx = 0; indx < results.size() ; indx++) - { - //### Fetch the object from the repr info - Inkscape::XML::Node *rpath = results[indx]; - char *str = (char *) rpath->attribute("id"); - if (!str) - continue; + //### Get the Shape + if (!SP_IS_SHAPE(item))//Bulia's suggestion. Allow all shapes + return true; - String id = str; - SPObject *reprobj = SP_ACTIVE_DOCUMENT->getObjectByRepr(rpath); - if (!reprobj) - continue; + SPShape *shape = SP_SHAPE(item); + SPCurve *curve = shape->curve; + if (curve->is_empty()) + return true; - //### Get the transform of the item - if (!SP_IS_ITEM(reprobj)) - continue; + nrShapes++; - SPItem *item = SP_ITEM(reprobj); - Geom::Matrix tf = sp_item_i2d_affine(item); - - //### Get the Shape - if (!SP_IS_SHAPE(reprobj))//Bulia's suggestion. Allow all shapes - continue; - - SPShape *shape = SP_SHAPE(reprobj); - SPCurve *curve = shape->curve; - if (curve->is_empty()) - continue; - - nrShapes++; - - out(" /*###################################################\n"); - out(" ### PATH: %s\n", id.c_str()); - out(" ###################################################*/\n"); - out(" Path \n"); - out(" {\n"); - out(" id: \"%s\"\n", id.c_str()); + out(" /*###################################################\n"); + out(" ### PATH: %s\n", id.c_str()); + out(" ###################################################*/\n"); + out(" Path \n"); + out(" {\n"); + out(" id: \"%s\"\n", id.c_str()); + /** + * Get the fill and stroke of the shape + */ + SPStyle *style = SP_OBJECT_STYLE(shape); + if (style) + { /** - * Get the fill and stroke of the shape + * Fill */ - SPStyle *style = SP_OBJECT_STYLE(shape); - if (style) + if (style->fill.isColor()) { - /** - * Fill - */ - if (style->fill.isColor()) - { - // see color.h for how to parse SPColor - gint alpha = 0xffffffff; - guint32 rgba = style->fill.value.color.toRGBA32(alpha); - unsigned int r = SP_RGBA32_R_U(rgba); - unsigned int g = SP_RGBA32_G_U(rgba); - unsigned int b = SP_RGBA32_B_U(rgba); - unsigned int a = SP_RGBA32_A_U(rgba); - out(" fill: rgba(0x%02x, 0x%02x, 0x%02x, 0x%02x)\n", - r, g, b, a); - } - /** - * Stroke - */ - /** - * TODO: stroke code here - */ + // see color.h for how to parse SPColor + gint alpha = 0xffffffff; + guint32 rgba = style->fill.value.color.toRGBA32(alpha); + unsigned int r = SP_RGBA32_R_U(rgba); + unsigned int g = SP_RGBA32_G_U(rgba); + unsigned int b = SP_RGBA32_B_U(rgba); + unsigned int a = SP_RGBA32_A_U(rgba); + out(" fill: rgba(0x%02x, 0x%02x, 0x%02x, 0x%02x)\n", + r, g, b, a); } + /** + * Stroke + */ + /** + * TODO: stroke code here + */ + } - // convert the path to only lineto's and cubic curveto's: - Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf ); + // convert the path to only lineto's and cubic curveto's: + Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf ); - //Count the NR_CURVETOs/LINETOs (including closing line segment) - guint segmentCount = 0; - for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) { - segmentCount += (*it).size(); - if (it->closed()) - segmentCount += 1; - } + //Count the NR_CURVETOs/LINETOs (including closing line segment) + guint segmentCount = 0; + for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) { + segmentCount += (*it).size(); + if (it->closed()) + segmentCount += 1; + } - out(" d:\n"); - out(" [\n"); + out(" d:\n"); + out(" [\n"); - unsigned int segmentNr = 0; + unsigned int segmentNr = 0; - nrSegments += segmentCount; + nrSegments += segmentCount; - for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) + /** + * For all Subpaths in the + */ + for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) + { + Geom::Point p = pit->front().initialPoint() * tf; + out(" MoveTo {\n"); + out(" x: %s\n", dstr(p[X]).c_str()); + out(" y: %s\n", dstr(p[Y]).c_str()); + out(" absolute: true\n"); + out(" },\n"); + + /** + * For all segments in the subpath + */ + for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit) { - Geom::Point p = pit->front().initialPoint() * tf; - out(" MoveTo {\n"); - out(" x: %s\n", dstr(p[X]).c_str()); - out(" y: %s\n", dstr(p[Y]).c_str()); - out(" absolute: true\n"); - out(" },\n"); - for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit) + //### LINE + if( dynamic_cast (&*cit) || + dynamic_cast(&*cit) || + dynamic_cast(&*cit) ) { - //### LINE - if( dynamic_cast (&*cit) || - dynamic_cast(&*cit) || - dynamic_cast(&*cit) ) - { - Geom::Point p = cit->initialPoint() * tf; - out(" LineTo {\n"); - out(" x: %s\n", dstr(p[X]).c_str()); - out(" y: %s\n", dstr(p[Y]).c_str()); - out(" absolute: true\n"); - out(" },\n"); - nrNodes++; - } - //### BEZIER - else if(Geom::CubicBezier const *cubic = dynamic_cast(&*cit)) - { - std::vector points = cubic->points(); - Geom::Point p0 = points[0] * tf; - Geom::Point p1 = points[1] * tf; - Geom::Point p2 = points[2] * tf; - out(" CurveTo {\n"); - out(" x1: %s\n", dstr(p0[X]).c_str()); - out(" y1: %s\n", dstr(p0[Y]).c_str()); - out(" x2: %s\n", dstr(p1[X]).c_str()); - out(" y2: %s\n", dstr(p1[Y]).c_str()); - out(" x3: %s\n", dstr(p2[X]).c_str()); - out(" y3: %s\n", dstr(p2[Y]).c_str()); - out(" smooth: false\n"); - out(" absolute: true\n"); - out(" },\n"); - nrNodes++; - } - else - { - g_error ("logical error, because pathv_to_linear_and_cubic_beziers was used"); - } + Geom::Point p = cit->initialPoint() * tf; + out(" LineTo {\n"); + out(" x: %s\n", dstr(p[X]).c_str()); + out(" y: %s\n", dstr(p[Y]).c_str()); + out(" absolute: true\n"); + out(" },\n"); + nrNodes++; } - if (pit->closed()) + //### BEZIER + else if(Geom::CubicBezier const *cubic = dynamic_cast(&*cit)) { - out(" ClosePath {},\n"); + std::vector points = cubic->points(); + Geom::Point p0 = points[1] * tf; + Geom::Point p1 = points[2] * tf; + Geom::Point p2 = points[3] * tf; + out(" CurveTo {\n"); + out(" x1: %s\n", dstr(p0[X]).c_str()); + out(" y1: %s\n", dstr(p0[Y]).c_str()); + out(" x2: %s\n", dstr(p1[X]).c_str()); + out(" y2: %s\n", dstr(p1[Y]).c_str()); + out(" x3: %s\n", dstr(p2[X]).c_str()); + out(" y3: %s\n", dstr(p2[Y]).c_str()); + out(" absolute: true\n"); + out(" },\n"); + nrNodes++; } + else + { + g_error ("logical error, because pathv_to_linear_and_cubic_beziers was used"); + } + segmentNr++; + } + if (pit->closed()) + { + out(" ClosePath {},\n"); } + } - out(" ] // d\n"); - out(" }, // Path\n"); + out(" ] // d\n"); + out(" }, // Path\n"); - - out(" /*###################################################\n"); - out(" ### end path %s\n", id.c_str()); - out(" ###################################################*/\n\n\n\n"); + + out(" /*###################################################\n"); + out(" ### end path %s\n", id.c_str()); + out(" ###################################################*/\n\n\n\n"); - }//for + return true; +} - out(" ] // content\n"); - out(" }; // Group\n"); - out("// end function %s.composeNode()\n", name.c_str()); + +/** + * Output the curve data to buffer + */ +bool JavaFXOutput::doCurvesRecursive(SPDocument *doc, Inkscape::XML::Node *node) +{ + /** + * If the object is an Item, try processing it + */ + char *str = (char *) node->attribute("id"); + SPObject *reprobj = doc->getObjectByRepr(node); + if (SP_IS_ITEM(reprobj) && str) + { + SPItem *item = SP_ITEM(reprobj); + String id = str; + if (!doCurve(item, id)) + return false; + } + + /** + * Descend into children + */ + for (Inkscape::XML::Node *child = node->firstChild() ; child ; + child = child->next()) + { + if (!doCurvesRecursive(doc, child)) + return false; + } + + return true; +} + + +/** + * Output the curve data to buffer + */ +bool JavaFXOutput::doCurves(SPDocument *doc) +{ + + double bignum = 1000000.0; + minx = bignum; + maxx = -bignum; + miny = bignum; + maxy = -bignum; + + if (!doCurvesRecursive(doc, doc->rroot)) + return false; return true; @@ -396,7 +398,7 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *uri) //###### SAVE IN POV FORMAT TO BUFFER //# Lets do the curves first, to get the stats - if (!doCurves(doc, name)) + if (!doCurves(doc)) return false; String curveBuf = outbuf; outbuf.clear(); diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h index 471d021d6..27a742861 100644 --- a/src/extension/internal/javafx-out.h +++ b/src/extension/internal/javafx-out.h @@ -89,7 +89,9 @@ private: /** * Output the SVG document's curve data as POV curves */ - bool doCurves(SPDocument *doc, const String &name); + bool doCurve(SPItem *item, const String &id); + bool doCurvesRecursive(SPDocument *doc, Inkscape::XML::Node *node); + bool doCurves(SPDocument *doc); /** * Output the file footer @@ -108,6 +110,11 @@ private: int nrSegments; int nrShapes; + double minx; + double miny; + double maxx; + double maxy; + }; diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp index 4a0951224..a46b55d42 100644 --- a/src/extension/internal/pov-out.cpp +++ b/src/extension/internal/pov-out.cpp @@ -261,63 +261,35 @@ bool PovOutput::doTail() /** * Output the curve data to buffer */ -bool PovOutput::doCurves(SPDocument *doc) +bool PovOutput::doCurve(SPItem *item, const String &id) { using Geom::X; using Geom::Y; - std::vectorresults; - //findElementsByTagName(results, SP_ACTIVE_DOCUMENT->rroot, "path"); - findElementsByTagName(results, SP_ACTIVE_DOCUMENT->rroot, NULL); - if (results.size() == 0) - return true; - - double bignum = 1000000.0; - double minx = bignum; - double maxx = -bignum; - double miny = bignum; - double maxy = -bignum; - - for (unsigned int indx = 0; indx < results.size() ; indx++) - { - //### Fetch the object from the repr info - Inkscape::XML::Node *rpath = results[indx]; - char *str = (char *) rpath->attribute("id"); - if (!str) - continue; - - String id = str; - SPObject *reprobj = SP_ACTIVE_DOCUMENT->getObjectByRepr(rpath); - if (!reprobj) - continue; - - //### Get the transform of the item - if (!SP_IS_ITEM(reprobj)) - continue; - - SPItem *item = SP_ITEM(reprobj); - Geom::Matrix tf = sp_item_i2d_affine(item); + Geom::Matrix tf = sp_item_i2d_affine(item); - //### Get the Shape - if (!SP_IS_SHAPE(reprobj))//Bulia's suggestion. Allow all shapes - continue; + //### Get the Shape + if (!SP_IS_SHAPE(item))//Bulia's suggestion. Allow all shapes + return true; - SPShape *shape = SP_SHAPE(reprobj); - SPCurve *curve = shape->curve; - if (curve->is_empty()) - continue; + SPShape *shape = SP_SHAPE(item); + SPCurve *curve = shape->curve; + if (curve->is_empty()) + return true; - nrShapes++; + nrShapes++; - PovShapeInfo shapeInfo; - shapeInfo.id = id; - shapeInfo.color = ""; + PovShapeInfo shapeInfo; + shapeInfo.id = id; + shapeInfo.color = ""; - //Try to get the fill color of the shape - SPStyle *style = SP_OBJECT_STYLE(shape); - /* fixme: Handle other fill types, even if this means translating gradients to a single + //Try to get the fill color of the shape + SPStyle *style = SP_OBJECT_STYLE(shape); + /* fixme: Handle other fill types, even if this means translating gradients to a single flat colour. */ - if (style && (style->fill.isColor())) + if (style) + { + if (style->fill.isColor()) { // see color.h for how to parse SPColor float rgb[3]; @@ -333,117 +305,170 @@ bool PovOutput::doCurves(SPDocument *doc) rgbf.append(dstr(1.0 - dopacity)); rgbf.append(">"); shapeInfo.color += rgbf; } + } - povShapes.push_back(shapeInfo); //passed all tests. save the info + povShapes.push_back(shapeInfo); //passed all tests. save the info - // convert the path to only lineto's and cubic curveto's: - Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf ); + // convert the path to only lineto's and cubic curveto's: + Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf ); - //Count the NR_CURVETOs/LINETOs (including closing line segment) - guint segmentCount = 0; - for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) { - segmentCount += (*it).size(); - if (it->closed()) - segmentCount += 1; + //Count the NR_CURVETOs/LINETOs (including closing line segment) + int segmentCount = 0; + for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) + { + segmentCount += (*it).size(); + if (it->closed()) + segmentCount += 1; } - out("/*###################################################\n"); - out("### PRISM: %s\n", id.c_str()); - out("###################################################*/\n"); - out("#declare %s = prism {\n", id.c_str()); - out(" linear_sweep\n"); - out(" bezier_spline\n"); - out(" 1.0, //top\n"); - out(" 0.0, //bottom\n"); - out(" %d //nr points\n", segmentCount * 4); - int segmentNr = 0; - - nrSegments += segmentCount; - - Geom::Rect cminmax( pathv.front().initialPoint(), pathv.front().initialPoint() ); // at moment of writing, 2geom lacks proper initialization of empty intervals in rect... + out("/*###################################################\n"); + out("### PRISM: %s\n", id.c_str()); + out("###################################################*/\n"); + out("#declare %s = prism {\n", id.c_str()); + out(" linear_sweep\n"); + out(" bezier_spline\n"); + out(" 1.0, //top\n"); + out(" 0.0, //bottom\n"); + out(" %d //nr points\n", segmentCount * 4); + int segmentNr = 0; + + nrSegments += segmentCount; + + /** + * at moment of writing, 2geom lacks proper initialization of empty intervals in rect... + */ + Geom::Rect cminmax( pathv.front().initialPoint(), pathv.front().initialPoint() ); - for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) - { + /** + * For all Subpaths in the + */ + for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) + { - cminmax.expandTo(pit->initialPoint()); + cminmax.expandTo(pit->initialPoint()); - for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit) - { + /** + * For all segments in the subpath + */ + for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit) + { - if( dynamic_cast (&*cit) || + if( dynamic_cast (&*cit) || dynamic_cast(&*cit) || dynamic_cast(&*cit) ) - { - Geom::Point p0 = cit->initialPoint() * tf; - Geom::Point p1 = cit->finalPoint() * tf; - segment(segmentNr++, - p0[X], p0[Y], p0[X], p0[Y], p1[X], p1[Y], p1[X], p1[Y] ); - nrNodes += 8; - } - else if(Geom::CubicBezier const *cubic = dynamic_cast(&*cit)) - { - std::vector points = cubic->points(); - Geom::Point p0 = points[0] * tf; - Geom::Point p1 = points[1] * tf; - Geom::Point p2 = points[2] * tf; - Geom::Point p3 = points[3] * tf; - segment(segmentNr++, + { + Geom::Point p0 = cit->initialPoint(); + Geom::Point p1 = cit->finalPoint(); + segment(segmentNr++, + p0[X], p0[Y], p0[X], p0[Y], p1[X], p1[Y], p1[X], p1[Y] ); + nrNodes += 8; + } + else if(Geom::CubicBezier const *cubic = dynamic_cast(&*cit)) + { + std::vector points = cubic->points(); + Geom::Point p0 = points[0]; + Geom::Point p1 = points[1]; + Geom::Point p2 = points[2]; + Geom::Point p3 = points[3]; + segment(segmentNr++, p0[X],p0[Y], p1[X],p1[Y], p2[X],p2[Y], p3[X],p3[Y]); - nrNodes += 8; - } - else - { - g_warning("logical error, because pathv_to_linear_and_cubic_beziers was used"); - return false; - } + nrNodes += 8; + } + else + { + g_warning("logical error, because pathv_to_linear_and_cubic_beziers was used"); + return false; + } - if (segmentNr <= static_cast(segmentCount)) - out(",\n"); - else - out("\n"); + if (segmentNr < segmentCount) + out(",\n"); + else + out("\n"); - cminmax.expandTo(cit->finalPoint()); + cminmax.expandTo(cit->finalPoint()); } } - out("}\n"); + out("}\n"); + + double cminx = cminmax.min()[X]; + double cmaxx = cminmax.max()[X]; + double cminy = cminmax.min()[Y]; + double cmaxy = cminmax.max()[Y]; + + out("#declare %s_MIN_X = %s;\n", id.c_str(), dstr(cminx).c_str()); + out("#declare %s_CENTER_X = %s;\n", id.c_str(), dstr((cmaxx+cminx)/2.0).c_str()); + out("#declare %s_MAX_X = %s;\n", id.c_str(), dstr(cmaxx).c_str()); + out("#declare %s_WIDTH = %s;\n", id.c_str(), dstr(cmaxx-cminx).c_str()); + out("#declare %s_MIN_Y = %s;\n", id.c_str(), dstr(cminy).c_str()); + out("#declare %s_CENTER_Y = %s;\n", id.c_str(), dstr((cmaxy+cminy)/2.0).c_str()); + out("#declare %s_MAX_Y = %s;\n", id.c_str(), dstr(cmaxy).c_str()); + out("#declare %s_HEIGHT = %s;\n", id.c_str(), dstr(cmaxy-cminy).c_str()); + if (shapeInfo.color.length()>0) + out("#declare %s_COLOR = %s;\n", + id.c_str(), shapeInfo.color.c_str()); + out("/*###################################################\n"); + out("### end %s\n", id.c_str()); + out("###################################################*/\n\n\n\n"); + + if (cminx < minx) + minx = cminx; + if (cmaxx > maxx) + maxx = cmaxx; + if (cminy < miny) + miny = cminy; + if (cmaxy > maxy) + maxy = cmaxy; - double cminx = cminmax.min()[X]; - double cmaxx = cminmax.max()[X]; - double cminy = cminmax.min()[Y]; - double cmaxy = cminmax.max()[Y]; + return true; +} - //# prefix for following declarations - char *pfx = (char *)id.c_str(); +/** + * Output the curve data to buffer + */ +bool PovOutput::doCurvesRecursive(SPDocument *doc, Inkscape::XML::Node *node) +{ + /** + * If the object is an Item, try processing it + */ + char *str = (char *) node->attribute("id"); + SPObject *reprobj = doc->getObjectByRepr(node); + if (SP_IS_ITEM(reprobj) && str) + { + SPItem *item = SP_ITEM(reprobj); + String id = str; + if (!doCurve(item, id)) + return false; + } - out("#declare %s_MIN_X = %s;\n", pfx, dstr(cminx).c_str()); - out("#declare %s_CENTER_X = %s;\n", pfx, dstr((cmaxx+cminx)/2.0).c_str()); - out("#declare %s_MAX_X = %s;\n", pfx, dstr(cmaxx).c_str()); - out("#declare %s_WIDTH = %s;\n", pfx, dstr(cmaxx-cminx).c_str()); - out("#declare %s_MIN_Y = %s;\n", pfx, dstr(cminy).c_str()); - out("#declare %s_CENTER_Y = %s;\n", pfx, dstr((cmaxy+cminy)/2.0).c_str()); - out("#declare %s_MAX_Y = %s;\n", pfx, dstr(cmaxy).c_str()); - out("#declare %s_HEIGHT = %s;\n", pfx, dstr(cmaxy-cminy).c_str()); - if (shapeInfo.color.length()>0) - out("#declare %s_COLOR = %s;\n", - pfx, shapeInfo.color.c_str()); - out("/*###################################################\n"); - out("### end %s\n", id.c_str()); - out("###################################################*/\n\n\n\n"); - if (cminx < minx) - minx = cminx; - if (cmaxx > maxx) - maxx = cmaxx; - if (cminy < miny) - miny = cminy; - if (cmaxy > maxy) - maxy = cmaxy; + /** + * Descend into children + */ + for (Inkscape::XML::Node *child = node->firstChild() ; child ; + child = child->next()) + { + if (!doCurvesRecursive(doc, child)) + return false; + } - }//for + return true; +} +/** + * Output the curve data to buffer + */ +bool PovOutput::doCurves(SPDocument *doc) +{ + double bignum = 1000000.0; + minx = bignum; + maxx = -bignum; + miny = bignum; + maxy = -bignum; + if (!doCurvesRecursive(doc, doc->rroot)) + return false; //## Let's make a union of all of the Shapes if (povShapes.size()>0) @@ -532,8 +557,6 @@ bool PovOutput::doCurves(SPDocument *doc) } - - //######################################################################## //# M A I N O U T P U T //######################################################################## diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h index fa19a3e0c..8689e2372 100644 --- a/src/extension/internal/pov-out.h +++ b/src/extension/internal/pov-out.h @@ -18,6 +18,8 @@ #include #include "extension/implementation/implementation.h" +#include + namespace Inkscape { @@ -117,6 +119,8 @@ private: /** * Output the SVG document's curve data as POV curves */ + bool doCurve(SPItem *item, const String &id); + bool doCurvesRecursive(SPDocument *doc, Inkscape::XML::Node *node); bool doCurves(SPDocument *doc); /** @@ -160,6 +164,11 @@ private: int nrNodes; int nrSegments; int nrShapes; + + double minx; + double miny; + double maxx; + double maxy; };