![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index c20b7a8646f2172603aba0cb15463a2daa6771c6..0086d110158d6681e03fe3482c7cd8265f47d2ab 100644 (file)
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
static void box3d_side_init (Box3DSide *side);
static void box3d_side_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
-static Inkscape::XML::Node *box3d_side_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *box3d_side_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void box3d_side_set (SPObject *object, unsigned int key, const gchar *value);
static void box3d_side_update (SPObject *object, SPCtx *ctx, guint flags);
static void box3d_side_set_shape (SPShape *shape);
-static Proj::Pt3 box3d_side_corner (Box3DSide *side, guint index);
-static std::vector<Proj::Pt3> box3d_side_corners (Box3DSide *side);
+static void box3d_side_compute_corner_ids(Box3DSide *side, unsigned int corners[4]);
static SPShapeClass *parent_class;
@@ -104,14 +103,13 @@ box3d_side_build (SPObject * object, SPDocument * document, Inkscape::XML::Node
}
static Inkscape::XML::Node *
-box3d_side_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+box3d_side_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
Box3DSide *side = SP_BOX3D_SIDE (object);
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
// this is where we end up when saving as plain SVG (also in other circumstances?)
// thus we don' set "sodipodi:type" so that the box is only saved as an ordinary svg:path
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
repr = xml_doc->createElement("svg:path");
}
sp_shape_set_shape ((SPShape *) object);
/* Duplicate the path */
- SPCurve *curve = ((SPShape *) object)->curve;
+ SPCurve const *curve = ((SPShape *) object)->curve;
//Nulls might be possible if this called iteratively
if ( !curve ) {
return NULL;
}
- NArtBpath *bpath = SP_CURVE_BPATH(curve);
- if ( !bpath ) {
- return NULL;
- }
- char *d = sp_svg_write_path ( bpath );
+ char *d = sp_svg_write_path ( curve->get_pathvector() );
repr->setAttribute("d", d);
g_free (d);
if (((SPObjectClass *) (parent_class))->write)
- ((SPObjectClass *) (parent_class))->write (object, repr, flags);
+ ((SPObjectClass *) (parent_class))->write (object, xml_doc, repr, flags);
return repr;
}
return;
}
- if (!SP_IS_BOX3D(SP_OBJECT(side)->parent)) {
+ SPObject *parent = SP_OBJECT(side)->parent;
+ if (!SP_IS_BOX3D(parent)) {
g_warning ("Parent of 3D box side is not a 3D box.\n");
return;
}
+ SPBox3D *box = SP_BOX3D(parent);
Persp3D *persp = box3d_side_perspective(side);
if (!persp) {
return;
}
- SPCurve *c = sp_curve_new ();
+ SPCurve *c = new SPCurve();
// TODO: Draw the correct quadrangle here
// To do this, determine the perspective of the box, the orientation of the side (e.g., XY-FRONT)
// compute the coordinates of the corners in P^3, project them onto the canvas, and draw the
// resulting path.
- std::vector<Proj::Pt3> corners = box3d_side_corners (side);
+ unsigned int corners[4];
+ box3d_side_compute_corner_ids(side, corners);
- NR::Matrix const i2d (sp_item_i2d_affine (SP_ITEM(shape)));
+ c->moveto(box3d_get_corner_screen(box, corners[0]));
+ c->lineto(box3d_get_corner_screen(box, corners[1]));
+ c->lineto(box3d_get_corner_screen(box, corners[2]));
+ c->lineto(box3d_get_corner_screen(box, corners[3]));
- // FIXME: This can better be implemented by using box3d_get_corner
- sp_curve_moveto (c, persp->tmat.image(corners[0]).affine() * i2d);
- sp_curve_lineto (c, persp->tmat.image(corners[1]).affine() * i2d);
- sp_curve_lineto (c, persp->tmat.image(corners[2]).affine() * i2d);
- sp_curve_lineto (c, persp->tmat.image(corners[3]).affine() * i2d);
-
- sp_curve_closepath (c);
- sp_shape_perform_path_effect(c, SP_SHAPE (side));
+ c->closepath();
+ sp_lpe_item_perform_path_effect(SP_LPE_ITEM (side), c);
sp_shape_set_curve_insync (SP_SHAPE (side), c, TRUE);
- sp_curve_unref (c);
+ c->unref();
}
void
return pstring->str;
}
-static Proj::Pt3
-box3d_side_corner (Box3DSide *side, guint index) {
- SPBox3D *box = SP_BOX3D(SP_OBJECT_PARENT(side));
- return Proj::Pt3 ((index & 0x1) ? box->orig_corner7[Proj::X] : box->orig_corner0[Proj::X],
- (index & 0x2) ? box->orig_corner7[Proj::Y] : box->orig_corner0[Proj::Y],
- (index & 0x4) ? box->orig_corner7[Proj::Z] : box->orig_corner0[Proj::Z],
- 1.0);
-}
-
-static std::vector<Proj::Pt3>
-box3d_side_corners (Box3DSide *side) {
- std::vector<Proj::Pt3> corners;
+static void
+box3d_side_compute_corner_ids(Box3DSide *side, unsigned int corners[4]) {
Box3D::Axis orth = Box3D::third_axis_direction (side->dir1, side->dir2);
- unsigned int i0 = (side->front_or_rear ? orth : 0);
- unsigned int i1 = i0 ^ side->dir1;
- unsigned int i2 = i0 ^ side->dir1 ^ side->dir2;
- unsigned int i3 = i0 ^ side->dir2;
-
- corners.push_back (box3d_side_corner (side, i0));
- corners.push_back (box3d_side_corner (side, i1));
- corners.push_back (box3d_side_corner (side, i2));
- corners.push_back (box3d_side_corner (side, i3));
- return corners;
+
+ corners[0] = (side->front_or_rear ? orth : 0);
+ corners[1] = corners[0] ^ side->dir1;
+ corners[2] = corners[0] ^ side->dir1 ^ side->dir2;
+ corners[3] = corners[0] ^ side->dir2;
}
Persp3D *