![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index a46b55d42705cf1de20d9e800596bf80037bf6fd..6b8a5ce070744cb441d3da50119fc146cd632710 100644 (file)
#include <sp-path.h>
#include <style.h>
#include <display/curve.h>
-#include <libnr/n-art-bpath.h>
#include <extension/system.h>
#include <2geom/pathvector.h>
#include <2geom/rect.h>
#include <2geom/bezier-curve.h>
#include <2geom/hvlinesegment.h>
#include "helper/geom.h"
+#include "helper/geom-curves.h"
#include <io/sys.h>
#include <string>
{
-
-
//########################################################################
-//# U T I L I T Y
+//# M E S S A G E S
//########################################################################
-
-
-/**
- * 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<Inkscape::XML::Node *> &results,
- Inkscape::XML::Node *node,
- char const *name)
+static void err(const char *fmt, ...)
{
- if ( !name || strcmp(node->name(), name) == 0 )
- results.push_back(node);
+ va_list args;
+ g_log(NULL, G_LOG_LEVEL_WARNING, "Pov-out err: ");
+ va_start(args, fmt);
+ g_logv(NULL, G_LOG_LEVEL_WARNING, fmt, args);
+ va_end(args);
+ g_log(NULL, G_LOG_LEVEL_WARNING, "\n");
+}
- for (Inkscape::XML::Node *child = node->firstChild() ; child ;
- child = child->next())
- findElementsByTagName( results, child, name );
-}
+//########################################################################
+//# U T I L I T Y
+//########################################################################
return s;
}
-
+#define DSTR(d) (dstr(d).c_str())
/**
*/
void PovOutput::vec2(double a, double b)
{
- out("<%s, %s>", dstr(a).c_str(), dstr(b).c_str());
+ out("<%s, %s>", DSTR(a), DSTR(b));
}
*/
void PovOutput::vec3(double a, double b, double c)
{
- out("<%s, %s, %s>", dstr(a).c_str(), dstr(b).c_str(), dstr(c).c_str());
+ out("<%s, %s, %s>", DSTR(a), DSTR(b), DSTR(c));
}
*/
void PovOutput::vec4(double a, double b, double c, double d)
{
- out("<%s, %s, %s, %s>", dstr(a).c_str(), dstr(b).c_str(),
- dstr(c).c_str(), dstr(d).c_str());
+ out("<%s, %s, %s, %s>", DSTR(a), DSTR(b), DSTR(c), DSTR(d));
}
out("/*###################################################################\n");
out("### This PovRay document was generated by Inkscape\n");
out("### http://www.inkscape.org\n");
- out("### Created: %s", ctime(&tim));
+ out("### Created: %s", ctime(&tim));
out("### Version: %s\n", INKSCAPE_VERSION);
out("#####################################################################\n");
out("### NOTES:\n");
using Geom::X;
using Geom::Y;
- Geom::Matrix tf = sp_item_i2d_affine(item);
-
//### Get the Shape
if (!SP_IS_SHAPE(item))//Bulia's suggestion. Allow all shapes
return true;
povShapes.push_back(shapeInfo); //passed all tests. save the info
// convert the path to only lineto's and cubic curveto's:
+ Geom::Matrix tf = sp_item_i2d_affine(item);
Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf );
//Count the NR_CURVETOs/LINETOs (including closing line segment)
for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit)
{
- if( dynamic_cast<Geom::LineSegment const *> (&*cit) ||
- dynamic_cast<Geom::HLineSegment const *>(&*cit) ||
- dynamic_cast<Geom::VLineSegment const *>(&*cit) )
+ if( is_straight_curve(*cit) )
{
Geom::Point p0 = cit->initialPoint();
Geom::Point p1 = cit->finalPoint();
}
else
{
- g_warning("logical error, because pathv_to_linear_and_cubic_beziers was used");
+ err("logical error, because pathv_to_linear_and_cubic_beziers was used");
return false;
}
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());
+ out("#declare %s_MIN_X = %s;\n", id.c_str(), DSTR(cminx));
+ out("#declare %s_CENTER_X = %s;\n", id.c_str(), DSTR((cmaxx+cminx)/2.0));
+ out("#declare %s_MAX_X = %s;\n", id.c_str(), DSTR(cmaxx));
+ out("#declare %s_WIDTH = %s;\n", id.c_str(), DSTR(cmaxx-cminx));
+ out("#declare %s_MIN_Y = %s;\n", id.c_str(), DSTR(cminy));
+ out("#declare %s_CENTER_Y = %s;\n", id.c_str(), DSTR((cmaxy+cminy)/2.0));
+ out("#declare %s_MAX_Y = %s;\n", id.c_str(), DSTR(cmaxy));
+ out("#declare %s_HEIGHT = %s;\n", id.c_str(), DSTR(cmaxy-cminy));
if (shapeInfo.color.length()>0)
out("#declare %s_COLOR = %s;\n",
id.c_str(), shapeInfo.color.c_str());
}
/**
- * Output the curve data to buffer
+ * Descend the svg tree recursively, translating data
*/
-bool PovOutput::doCurvesRecursive(SPDocument *doc, Inkscape::XML::Node *node)
+bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
{
- /**
- * 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)
+
+ String id;
+ if (!obj->id)
+ {
+ char buf[16];
+ sprintf(buf, "id%d", idIndex++);
+ id = buf;
+ }
+ else
{
- SPItem *item = SP_ITEM(reprobj);
- String id = str;
+ id = obj->id;
+ }
+
+ if (SP_IS_ITEM(obj))
+ {
+ SPItem *item = SP_ITEM(obj);
if (!doCurve(item, id))
return false;
}
/**
* Descend into children
- */
- for (Inkscape::XML::Node *child = node->firstChild() ; child ;
- child = child->next())
+ */
+ for (SPObject *child = obj->firstChild() ; child ; child = child->next)
{
- if (!doCurvesRecursive(doc, child))
+ if (!doTreeRecursive(doc, child))
return false;
}
/**
* Output the curve data to buffer
*/
-bool PovOutput::doCurves(SPDocument *doc)
+bool PovOutput::doTree(SPDocument *doc)
{
double bignum = 1000000.0;
minx = bignum;
miny = bignum;
maxy = -bignum;
- if (!doCurvesRecursive(doc, doc->rroot))
+ if (!doTreeRecursive(doc, doc->root))
return false;
//## Let's make a union of all of the Shapes
out(" * Allow the user to redefine the Z-Increment\n");
out(" */\n");
out("#ifndef (AllShapes_Z_Increment)\n");
- out("#declare AllShapes_Z_Increment = %s;\n", dstr(zinc).c_str());
+ out("#declare AllShapes_Z_Increment = %s;\n", DSTR(zinc));
out("#end\n");
out("\n");
out("#declare AllShapes_Z_Scale = 1.0;\n");
out("}\n");
- out("#declare %s_MIN_X = %s;\n", pfx, dstr(minx).c_str());
- out("#declare %s_CENTER_X = %s;\n", pfx, dstr((maxx+minx)/2.0).c_str());
- out("#declare %s_MAX_X = %s;\n", pfx, dstr(maxx).c_str());
- out("#declare %s_WIDTH = %s;\n", pfx, dstr(maxx-minx).c_str());
- out("#declare %s_MIN_Y = %s;\n", pfx, dstr(miny).c_str());
- out("#declare %s_CENTER_Y = %s;\n", pfx, dstr((maxy+miny)/2.0).c_str());
- out("#declare %s_MAX_Y = %s;\n", pfx, dstr(maxy).c_str());
- out("#declare %s_HEIGHT = %s;\n", pfx, dstr(maxy-miny).c_str());
+ out("#declare %s_MIN_X = %s;\n", pfx, DSTR(minx));
+ out("#declare %s_CENTER_X = %s;\n", pfx, DSTR((maxx+minx)/2.0));
+ out("#declare %s_MAX_X = %s;\n", pfx, DSTR(maxx));
+ out("#declare %s_WIDTH = %s;\n", pfx, DSTR(maxx-minx));
+ out("#declare %s_MIN_Y = %s;\n", pfx, DSTR(miny));
+ out("#declare %s_CENTER_Y = %s;\n", pfx, DSTR((maxy+miny)/2.0));
+ out("#declare %s_MAX_Y = %s;\n", pfx, DSTR(maxy));
+ out("#declare %s_HEIGHT = %s;\n", pfx, DSTR(maxy-miny));
out("/*##############################################\n");
out("### end %s\n", id.c_str());
out("##############################################*/\n");
nrNodes = 0;
nrSegments = 0;
nrShapes = 0;
+ idIndex = 0;
outbuf.clear();
povShapes.clear();
}
//###### SAVE IN POV FORMAT TO BUFFER
//# Lets do the curves first, to get the stats
- if (!doCurves(doc))
+ if (!doTree(doc))
{
- g_warning("Could not output curves for %s\n", uri);
+ err("Could not output curves for %s", uri);
return;
}
if (!doHeader())
{
- g_warning("Could not write header for %s\n", uri);
+ err("Could not write header for %s", uri);
return;
}
if (!doTail())
{
- g_warning("Could not write footer for %s\n", uri);
+ err("Could not write footer for %s", uri);
return;
}
* API call to save document
*/
void
-PovOutput::save(Inkscape::Extension::Output *mod,
+PovOutput::save(Inkscape::Extension::Output */*mod*/,
SPDocument *doc, gchar const *uri)
{
saveDocument(doc, uri);
/**
* Make sure that we are in the database
*/
-bool PovOutput::check (Inkscape::Extension::Extension *module)
+bool PovOutput::check (Inkscape::Extension::Extension */*module*/)
{
/* We don't need a Key
if (NULL == Inkscape::Extension::db.get(SP_MODULE_KEY_OUTPUT_POV))