![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/persp3d.cpp b/src/persp3d.cpp
index 76cbc15880aeb4273a2bb77a0e36cfdc5aa94332..916e9f25f421fe071452b070e4088abfb2cf9bdf 100644 (file)
--- a/src/persp3d.cpp
+++ b/src/persp3d.cpp
static void persp3d_release(SPObject *object);
static void persp3d_set(SPObject *object, unsigned key, gchar const *value);
static void persp3d_update(SPObject *object, SPCtx *ctx, guint flags);
-static Inkscape::XML::Node *persp3d_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *persp3d_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void persp3d_on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data);
{
persp->tmat = Proj::TransfMat3x4 ();
- persp->boxes_transformed.clear();
+ persp->boxes_transformed = new std::map<SPBox3D *, bool>;
+ persp->boxes_transformed->clear();
persp->document = NULL;
persp->my_counter = global_counter++;
@@ -123,6 +124,8 @@ static void persp3d_build(SPObject *object, SPDocument *document, Inkscape::XML:
* Virtual release of Persp3D members before destruction.
*/
static void persp3d_release(SPObject *object) {
+ Persp3D *persp = SP_PERSP3D (object);
+ delete persp->boxes_transformed;
SP_OBJECT_REPR(object)->removeListenerByData(object);
}
static void
persp3d_update(SPObject *object, SPCtx *ctx, guint flags)
{
- if (flags & SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG) {
+ if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
/* TODO: Should we update anything here? */
@@ -212,7 +215,7 @@ persp3d_create_xml_element (SPDocument *document, Persp3D *dup) {// if dup is gi
Proj::Pt2 proj_vp_x = Proj::Pt2 (0.0, sp_document_height(document)/2, 1.0);
Proj::Pt2 proj_vp_y = Proj::Pt2 ( 0.0,1000.0, 0.0);
Proj::Pt2 proj_vp_z = Proj::Pt2 (sp_document_width(document), sp_document_height(document)/2, 1.0);
- Proj::Pt2 proj_origin = Proj::Pt2 (sp_document_width(document)/2, sp_document_height(document)/2, 1.0);
+ Proj::Pt2 proj_origin = Proj::Pt2 (sp_document_width(document)/2, sp_document_height(document)/3, 1.0);
gchar *str = NULL;
str = proj_vp_x.coord_string();
@@ -227,7 +230,6 @@ persp3d_create_xml_element (SPDocument *document, Persp3D *dup) {// if dup is gi
str = proj_origin.coord_string();
repr->setAttribute("inkscape:persp3d-origin", str);
g_free (str);
- Inkscape::GC::release(repr);
}
/* Append the new persp3d to defs */
@@ -237,18 +239,30 @@ persp3d_create_xml_element (SPDocument *document, Persp3D *dup) {// if dup is gi
return (Persp3D *) sp_object_get_child_by_repr (SP_OBJECT(defs), repr);
}
+Persp3D *
+persp3d_document_first_persp (SPDocument *document) {
+ SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document);
+ Inkscape::XML::Node *repr;
+ for (SPObject *child = sp_object_first_child(defs); child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ repr = SP_OBJECT_REPR(child);
+ if (SP_IS_PERSP3D(child)) {
+ return SP_PERSP3D(child);
+ }
+ }
+ return NULL;
+}
+
/**
* Virtual write: write object attributes to repr.
*/
static Inkscape::XML::Node *
-persp3d_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+persp3d_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
Persp3D *persp = SP_PERSP3D(object);
if ((flags & SP_OBJECT_WRITE_BUILD & SP_OBJECT_WRITE_EXT) && !repr) {
// this is where we end up when saving as plain SVG (also in other circumstances?);
// hence we don't set the sodipodi:type attribute
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
repr = xml_doc->createElement("inkscape:perspective");
}
}
if (((SPObjectClass *) persp3d_parent_class)->write)
- (* ((SPObjectClass *) persp3d_parent_class)->write)(object, repr, flags);
+ (* ((SPObjectClass *) persp3d_parent_class)->write)(object, xml_doc, repr, flags);
return repr;
}
/* convenience wrapper around persp3d_get_finite_dir() and persp3d_get_infinite_dir() */
-NR::Point persp3d_get_PL_dir_from_pt (Persp3D *persp, NR::Point const &pt, Proj::Axis axis) {
+Geom::Point persp3d_get_PL_dir_from_pt (Persp3D *persp, Geom::Point const &pt, Proj::Axis axis) {
if (persp3d_VP_is_finite(persp, axis)) {
return persp3d_get_finite_dir(persp, pt, axis);
} else {
@@ -282,20 +296,20 @@ NR::Point persp3d_get_PL_dir_from_pt (Persp3D *persp, NR::Point const &pt, Proj:
}
}
-NR::Point
-persp3d_get_finite_dir (Persp3D *persp, NR::Point const &pt, Proj::Axis axis) {
+Geom::Point
+persp3d_get_finite_dir (Persp3D *persp, Geom::Point const &pt, Proj::Axis axis) {
Box3D::PerspectiveLine pl(pt, axis, persp);
return pl.direction();
}
-NR::Point
+Geom::Point
persp3d_get_infinite_dir (Persp3D *persp, Proj::Axis axis) {
Proj::Pt2 vp(persp3d_get_VP(persp, axis));
if (vp[2] != 0.0) {
g_print ("VP should be infinite but is (%f : %f : %f)\n", vp[0], vp[1], vp[2]);
- g_return_val_if_fail(vp[2] != 0.0, NR::Point(0.0, 0.0));
+ g_return_val_if_fail(vp[2] != 0.0, Geom::Point(0.0, 0.0));
}
- return NR::Point(vp[0], vp[1]);
+ return Geom::Point(vp[0], vp[1]);
}
double
/* toggle VPs for the same axis in all perspectives of a given list */
void
-persp3d_toggle_VPs (std::set<Persp3D *> p, Proj::Axis axis) {
- for (std::set<Persp3D *>::iterator i = p.begin(); i != p.end(); ++i) {
+persp3d_toggle_VPs (std::list<Persp3D *> p, Proj::Axis axis) {
+ for (std::list<Persp3D *>::iterator i = p.begin(); i != p.end(); ++i) {
persp3d_toggle_VP((*i), axis, false);
}
sp_document_done(sp_desktop_document(inkscape_active_desktop()), SP_VERB_CONTEXT_3DBOX,
@@ -347,8 +361,8 @@ persp3d_rotate_VP (Persp3D *persp, Proj::Axis axis, double angle, bool alt_press
return;
}
Proj::Pt2 v_dir_proj (persp->tmat.column(axis));
- NR::Point v_dir (v_dir_proj[0], v_dir_proj[1]);
- double a = NR::atan2 (v_dir) * 180/M_PI;
+ Geom::Point v_dir (v_dir_proj[0], v_dir_proj[1]);
+ double a = Geom::atan2 (v_dir) * 180/M_PI;
a += alt_pressed ? 0.5 * ((angle > 0 ) - (angle < 0)) : angle; // the r.h.s. yields +/-0.5 or angle
persp->tmat.set_infinite_direction (axis, a);
@@ -362,7 +376,7 @@ persp3d_update_with_point (Persp3D *persp, Proj::Axis const axis, Proj::Pt2 cons
}
void
-persp3d_apply_affine_transformation (Persp3D *persp, NR::Matrix const &xform) {
+persp3d_apply_affine_transformation (Persp3D *persp, Geom::Matrix const &xform) {
persp->tmat *= xform;
persp3d_update_box_reprs(persp);
SP_OBJECT(persp)->updateRepr(SP_OBJECT_WRITE_EXT);
void
persp3d_add_box_transform (Persp3D *persp, SPBox3D *box) {
- std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.find(box);
- if (i != persp->boxes_transformed.end() && (*i).second == true) {
+ std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->find(box);
+ if (i != persp->boxes_transformed->end() && (*i).second == true) {
g_print ("Warning! In %s (%d): trying to add transform status for box %d twice when it's already listed as true.\n", SP_OBJECT_REPR(persp)->attribute("id"), persp->my_counter, box->my_counter);
return;
}
- persp->boxes_transformed[box] = false;
+ (*persp->boxes_transformed)[box] = false;
}
void
persp3d_remove_box_transform (Persp3D *persp, SPBox3D *box) {
- persp->boxes_transformed.erase(box);
+ persp->boxes_transformed->erase(box);
}
void
persp3d_set_box_transformed (Persp3D *persp, SPBox3D *box, bool transformed) {
- if (persp->boxes_transformed.find(box) == persp->boxes_transformed.end()) {
+ if (persp->boxes_transformed->find(box) == persp->boxes_transformed->end()) {
g_print ("Warning! In %s (%d): trying to set transform status for box %d, but it is not listed in the perspective!! Aborting.\n",
SP_OBJECT_REPR(persp)->attribute("id"), persp->my_counter,
box->my_counter);
return;
}
- persp->boxes_transformed[box] = transformed;
+ (*persp->boxes_transformed)[box] = transformed;
}
bool
persp3d_was_transformed (Persp3D *persp) {
- if (persp->boxes_transformed.size() == 1) {
+ if (persp->boxes_transformed->size() == 1) {
/* either the transform has not been applied to the single box associated to this perspective yet
or the transform was already reset; in both cases we need to return false because upcoming
transforms need to be applied */
- (*persp->boxes_transformed.begin()).second = false; // make sure the box is marked as untransformed (in case more boxes are added later)
+ (*persp->boxes_transformed->begin()).second = false; // make sure the box is marked as untransformed (in case more boxes are added later)
return false;
}
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
if ((*i).second == true) {
// at least one of the boxes in the perspective has already been transformed;
return true;
bool
persp3d_all_transformed(Persp3D *persp) {
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
if ((*i).second == false) {
return false;
}
void
persp3d_unset_transforms(Persp3D *persp) {
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
(*i).second = false;
}
}
persp3d_update_box_displays (persp);
}
-/* returns a std::set() of all perspectives of the currently selected boxes */
-std::set<Persp3D *>
-persp3d_currently_selected_persps () {
- Inkscape::Selection *selection = sp_desktop_selection(inkscape_active_desktop());
-
- std::set<Persp3D *> p;
- for (GSList *i = (GSList *) selection->itemList(); i != NULL; i = i->next) {
- if (SP_IS_BOX3D (i->data)) {
- p.insert(box3d_get_perspective(SP_BOX3D(i->data)));
- }
- }
- return p;
-}
-
/* checks whether all boxes linked to this perspective are currently selected */
bool
persp3d_has_all_boxes_in_selection (Persp3D *persp) {
- const GSList *selection = sp_desktop_selection (inkscape_active_desktop())->itemList();
+ std::list<SPBox3D *> selboxes = sp_desktop_selection(inkscape_active_desktop())->box3DList();
for (std::vector<SPBox3D *>::iterator i = persp->boxes.begin(); i != persp->boxes.end(); ++i) {
- if (g_slist_find((GSList *) selection, *i) == NULL) {
+ if (std::find(selboxes.begin(), selboxes.end(), *i) == selboxes.end()) {
// we have an unselected box in the perspective
return false;
}
return true;
}
-std::list<SPBox3D *>
-persp3d_selected_boxes (Persp3D *persp) {
- const GSList *selection = sp_desktop_selection (inkscape_active_desktop())->itemList();
- std::list<SPBox3D *> sel;
+/**
+ * For each perspective having a box in \a selection, determine all its unselected boxes.
+ */
+// TODO: Check where we can use pass-by-reference (or so) instead of recreating all the lists afresh.
+std::map<Persp3D *, std::list<SPBox3D *> >
+persp3d_unselected_boxes(Inkscape::Selection *selection) {
+ std::list<Persp3D *> plist = selection->perspList();
+ std::map<Persp3D *, std::list<SPBox3D *> > punsel;
+
+ std::list<Persp3D *>::iterator i;
+ std::vector<SPBox3D *>::iterator j;
+ // for all perspectives in the list ...
+ for (i = plist.begin(); i != plist.end(); ++i) {
+ Persp3D *persp = *i;
+ // ... and each box associated to it ...
+ for (j = persp->boxes.begin(); j != persp->boxes.end(); ++j) {
+ SPBox3D *box = *j;
+ // ... check whether it is unselected, and if so add it to the list
+ if (persp->boxes_transformed->find(box) == persp->boxes_transformed->end()) {
+ punsel[persp].push_back(box);
+ }
+ }
+ }
+ return punsel;
+}
- for (std::vector<SPBox3D *>::iterator i = persp->boxes.begin(); i != persp->boxes.end(); ++i) {
- if (g_slist_find((GSList *) selection, *i) != NULL) {
- sel.push_back(SP_BOX3D(*i));
+/**
+ * Split all perspectives with a box in \a selection by moving their unselected boxes to newly
+ * created perspectives.
+ */
+void
+persp3d_split_perspectives_according_to_selection(Inkscape::Selection *selection) {
+ std::map<Persp3D *, std::list<SPBox3D *> > punsel = persp3d_unselected_boxes(selection);
+
+ std::map<Persp3D *, std::list<SPBox3D *> >::iterator i;
+ std::list<SPBox3D *>::iterator j;
+ // for all perspectives in the list ...
+ for (i = punsel.begin(); i != punsel.end(); ++i) {
+ Persp3D *persp = (*i).first;
+ // ... if the perspective has unselected boxes ...
+ if (!(*i).second.empty()) {
+ // create a new perspective and move these boxes over
+ Persp3D * new_persp = persp3d_create_xml_element (SP_OBJECT_DOCUMENT(persp), persp);
+ for (j = (*i).second.begin(); j != (*i).second.end(); ++j) {
+ SPBox3D *box = *j;
+ box3d_switch_perspectives(box, persp, new_persp);
+ }
}
}
- return sel;
}
/* some debugging stuff follows */
g_print ("\n======================================\n");
g_print ("Selected perspectives and their boxes:\n");
- std::set<Persp3D *> sel_persps = persp3d_currently_selected_persps();
+ std::list<Persp3D *> sel_persps = sp_desktop_selection(inkscape_active_desktop())->perspList();
- for (std::set<Persp3D *>::iterator j = sel_persps.begin(); j != sel_persps.end(); ++j) {
+ for (std::list<Persp3D *>::iterator j = sel_persps.begin(); j != sel_persps.end(); ++j) {
Persp3D *persp = SP_PERSP3D(*j);
g_print (" %s (%d): ", SP_OBJECT_REPR(persp)->attribute("id"), persp->my_counter);
- for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed.begin();
- i != persp->boxes_transformed.end(); ++i) {
+ for (std::map<SPBox3D *, bool>::iterator i = persp->boxes_transformed->begin();
+ i != persp->boxes_transformed->end(); ++i) {
g_print ("<%d,%d> ", (*i).first->my_counter, (*i).second);
}
g_print ("\n");