X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fpersp3d.cpp;h=ec4244f6ba47b6eb5a679990c1d4c7f74ff08aee;hb=f6c2660540212355133d68b1e8e72c2bcd1fdec5;hp=4b594d754fd9ded04022a6adbd21df4c236ba2c9;hpb=2a9dd6d81e787a3daa8f1e85feba6e8c0ccdab67;p=inkscape.git diff --git a/src/persp3d.cpp b/src/persp3d.cpp index 4b594d754..ec4244f6b 100644 --- a/src/persp3d.cpp +++ b/src/persp3d.cpp @@ -30,7 +30,7 @@ static void persp3d_build(SPObject *object, SPDocument *document, Inkscape::XML: 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); @@ -93,7 +93,8 @@ persp3d_init(Persp3D *persp) { persp->tmat = Proj::TransfMat3x4 (); - persp->boxes_transformed.clear(); + persp->boxes_transformed = new std::map; + 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); } @@ -209,10 +212,10 @@ persp3d_create_xml_element (SPDocument *document, Persp3D *dup) {// if dup is gi repr = xml_doc->createElement("inkscape:perspective"); repr->setAttribute("sodipodi:type", "inkscape:persp3d"); - Proj::Pt2 proj_vp_x = Proj::Pt2 (-50.0, 600.0, 1.0); + 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 (700.0, 600.0, 1.0); - Proj::Pt2 proj_origin = Proj::Pt2 (300.0, 400.0, 1.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)/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"); } @@ -268,7 +282,7 @@ persp3d_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) } 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; } @@ -324,8 +338,8 @@ persp3d_toggle_VP (Persp3D *persp, Proj::Axis axis, bool set_undo) { /* toggle VPs for the same axis in all perspectives of a given list */ void -persp3d_toggle_VPs (std::set p, Proj::Axis axis) { - for (std::set::iterator i = p.begin(); i != p.end(); ++i) { +persp3d_toggle_VPs (std::list p, Proj::Axis axis) { + for (std::list::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, @@ -407,44 +421,44 @@ persp3d_has_box (Persp3D *persp, SPBox3D *box) { void persp3d_add_box_transform (Persp3D *persp, SPBox3D *box) { - std::map::iterator i = persp->boxes_transformed.find(box); - if (i != persp->boxes_transformed.end() && (*i).second == true) { + std::map::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::iterator i = persp->boxes_transformed.begin(); - i != persp->boxes_transformed.end(); ++i) { + for (std::map::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; @@ -455,8 +469,8 @@ persp3d_was_transformed (Persp3D *persp) { bool persp3d_all_transformed(Persp3D *persp) { - for (std::map::iterator i = persp->boxes_transformed.begin(); - i != persp->boxes_transformed.end(); ++i) { + for (std::map::iterator i = persp->boxes_transformed->begin(); + i != persp->boxes_transformed->end(); ++i) { if ((*i).second == false) { return false; } @@ -466,8 +480,8 @@ persp3d_all_transformed(Persp3D *persp) { void persp3d_unset_transforms(Persp3D *persp) { - for (std::map::iterator i = persp->boxes_transformed.begin(); - i != persp->boxes_transformed.end(); ++i) { + for (std::map::iterator i = persp->boxes_transformed->begin(); + i != persp->boxes_transformed->end(); ++i) { (*i).second = false; } } @@ -550,27 +564,13 @@ persp3d_on_repr_attr_changed ( Inkscape::XML::Node * /*repr*/, persp3d_update_box_displays (persp); } -/* returns a std::set() of all perspectives of the currently selected boxes */ -std::set -persp3d_currently_selected_persps () { - Inkscape::Selection *selection = sp_desktop_selection(inkscape_active_desktop()); - - std::set 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 selboxes = sp_desktop_selection(inkscape_active_desktop())->box3DList(); for (std::vector::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; } @@ -578,17 +578,55 @@ persp3d_has_all_boxes_in_selection (Persp3D *persp) { return true; } -std::list -persp3d_selected_boxes (Persp3D *persp) { - const GSList *selection = sp_desktop_selection (inkscape_active_desktop())->itemList(); - std::list 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_unselected_boxes(Inkscape::Selection *selection) { + std::list plist = selection->perspList(); + std::map > punsel; + + std::list::iterator i; + std::vector::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::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 > punsel = persp3d_unselected_boxes(selection); + + std::map >::iterator i; + std::list::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 */ @@ -632,13 +670,13 @@ persp3d_print_all_selected() { g_print ("\n======================================\n"); g_print ("Selected perspectives and their boxes:\n"); - std::set sel_persps = persp3d_currently_selected_persps(); + std::list sel_persps = sp_desktop_selection(inkscape_active_desktop())->perspList(); - for (std::set::iterator j = sel_persps.begin(); j != sel_persps.end(); ++j) { + for (std::list::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::iterator i = persp->boxes_transformed.begin(); - i != persp->boxes_transformed.end(); ++i) { + for (std::map::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");