diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2007-07-10 13:19:35 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2007-07-10 13:19:35 +0000 |
| commit | 50afcb2361cee0bdd7fdd1120f60cf961bbf58b0 (patch) | |
| tree | 7ba2f3ae247a79348b06a2f41d6226162fa6a0d0 /src/box3d-face.cpp | |
| parent | Different resizing variant for 3D boxes (8 handles) (diff) | |
| download | inkscape-50afcb2361cee0bdd7fdd1120f60cf961bbf58b0.tar.gz inkscape-50afcb2361cee0bdd7fdd1120f60cf961bbf58b0.zip | |
correct way to transform coordinates (fixes earlier ad-hoc solution)
(bzr r3208)
Diffstat (limited to 'src/box3d-face.cpp')
| -rw-r--r-- | src/box3d-face.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/box3d-face.cpp b/src/box3d-face.cpp index f45f4a6ed..4f85fbf6e 100644 --- a/src/box3d-face.cpp +++ b/src/box3d-face.cpp @@ -173,18 +173,16 @@ void Box3DFace::set_path_repr() void Box3DFace::set_curve() { - SPDocument *doc = SP_OBJECT_DOCUMENT(this->parent_box3d); - gdouble height = sp_document_height(doc); - if (this->path == NULL) { g_warning("this->path is NULL! \n"); return; } + NR::Matrix const i2d (sp_item_i2d_affine (SP_ITEM (this->parent_box3d))); SPCurve *curve = sp_curve_new(); - sp_curve_moveto(curve, (*corners[0])[NR::X], height - (*corners[0])[NR::Y]); - sp_curve_lineto(curve, (*corners[1])[NR::X], height - (*corners[1])[NR::Y]); - sp_curve_lineto(curve, (*corners[2])[NR::X], height - (*corners[2])[NR::Y]); - sp_curve_lineto(curve, (*corners[3])[NR::X], height - (*corners[3])[NR::Y]); + sp_curve_moveto(curve, (*corners[0]) * i2d); + sp_curve_lineto(curve, (*corners[1]) * i2d); + sp_curve_lineto(curve, (*corners[2]) * i2d); + sp_curve_lineto(curve, (*corners[3]) * i2d); sp_curve_closepath(curve); sp_shape_set_curve(SP_SHAPE(this->path), curve, true); sp_curve_unref(curve); @@ -192,15 +190,13 @@ void Box3DFace::set_curve() gchar * Box3DFace::svg_repr_string() { - SPDocument *doc = SP_OBJECT_DOCUMENT(this->parent_box3d); - gdouble height = sp_document_height(doc); - + NR::Matrix const i2d (sp_item_i2d_affine (SP_ITEM (this->parent_box3d))); GString *pstring = g_string_new(""); g_string_sprintf (pstring, "M %f,%f L %f,%f L %f,%f L %f,%f z", - (*corners[0])[NR::X], height - (*corners[0])[NR::Y], - (*corners[1])[NR::X], height - (*corners[1])[NR::Y], - (*corners[2])[NR::X], height - (*corners[2])[NR::Y], - (*corners[3])[NR::X], height - (*corners[3])[NR::Y]); + ((*corners[0]) * i2d)[NR::X], ((*corners[0]) * i2d)[NR::Y], + ((*corners[1]) * i2d)[NR::X], ((*corners[1]) * i2d)[NR::Y], + ((*corners[2]) * i2d)[NR::X], ((*corners[2]) * i2d)[NR::Y], + ((*corners[3]) * i2d)[NR::X], ((*corners[3]) * i2d)[NR::Y]); return pstring->str; } |