X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fpersp3d.cpp;h=4b594d754fd9ded04022a6adbd21df4c236ba2c9;hb=6bffd52160c0be8ad7b402099c7e1c70eeed4556;hp=818afe053ffacd106536a41410d5a24e75caf2e5;hpb=fa90912de6e92199e5fa5957d1d47fd485abc011;p=inkscape.git diff --git a/src/persp3d.cpp b/src/persp3d.cpp index 818afe053..4b594d754 100644 --- a/src/persp3d.cpp +++ b/src/persp3d.cpp @@ -93,7 +93,7 @@ persp3d_init(Persp3D *persp) { persp->tmat = Proj::TransfMat3x4 (); - //persp->boxes = NULL; + persp->boxes_transformed.clear(); persp->document = NULL; persp->my_counter = global_counter++; @@ -117,27 +117,13 @@ static void persp3d_build(SPObject *object, SPDocument *document, Inkscape::XML: if (repr) { repr->addListener (&persp3d_repr_events, object); } - - // FIXME: What precisely does this do and is it necessary for perspectives? - /* Register ourselves */ - //sp_document_add_resource(document, "persp3d", object); } /** * Virtual release of Persp3D members before destruction. */ static void persp3d_release(SPObject *object) { - //Persp3D *persp = (Persp3D *) object; - SP_OBJECT_REPR(object)->removeListenerByData(object); - - // FIXME: What precisely does this do and is it necessary for perspectives? - /** - if (SP_OBJECT_DOCUMENT(object)) { - // Unregister ourselves - sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "persp3d", SP_OBJECT(object)); - } - **/ } @@ -219,8 +205,29 @@ persp3d_create_xml_element (SPDocument *document, Persp3D *dup) {// if dup is gi if (dup) { repr = SP_OBJECT_REPR(dup)->duplicate (xml_doc); } else { + /* if no perspective is given, create a default one */ 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_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); + + gchar *str = NULL; + str = proj_vp_x.coord_string(); + repr->setAttribute("inkscape:vp_x", str); + g_free (str); + str = proj_vp_y.coord_string(); + repr->setAttribute("inkscape:vp_y", str); + g_free (str); + str = proj_vp_z.coord_string(); + repr->setAttribute("inkscape:vp_z", str); + g_free (str); + str = proj_origin.coord_string(); + repr->setAttribute("inkscape:persp3d-origin", str); + g_free (str); + Inkscape::GC::release(repr); } /* Append the new persp3d to defs */ @@ -236,11 +243,13 @@ persp3d_create_xml_element (SPDocument *document, Persp3D *dup) {// if dup is gi static Inkscape::XML::Node * persp3d_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) { - SPDocument *document = SP_OBJECT_DOCUMENT(object); Persp3D *persp = SP_PERSP3D(object); - if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) { - repr = SP_OBJECT_REPR(persp3d_create_xml_element (document)); + 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 (flags & SP_OBJECT_WRITE_EXT) { @@ -306,7 +315,6 @@ persp3d_toggle_VP (Persp3D *persp, Proj::Axis axis, bool set_undo) { // On the other hand, vp_drag_sel_modified() would update all boxes; // here we can confine ourselves to the boxes of this particular perspective. persp3d_update_box_reprs (persp); - persp3d_update_z_orders (persp); SP_OBJECT(persp)->updateRepr(SP_OBJECT_WRITE_EXT); if (set_undo) { sp_document_done(sp_desktop_document(inkscape_active_desktop()), SP_VERB_CONTEXT_3DBOX, @@ -326,7 +334,7 @@ persp3d_toggle_VPs (std::set p, Proj::Axis axis) { void persp3d_set_VP_state (Persp3D *persp, Proj::Axis axis, Proj::VPState state) { - if (persp3d_VP_is_finite(persp, axis) != (state == Proj::FINITE)) { + if (persp3d_VP_is_finite(persp, axis) != (state == Proj::VP_FINITE)) { persp3d_toggle_VP(persp, axis); } } @@ -345,7 +353,6 @@ persp3d_rotate_VP (Persp3D *persp, Proj::Axis axis, double angle, bool alt_press persp->tmat.set_infinite_direction (axis, a); persp3d_update_box_reprs (persp); - persp3d_update_z_orders (persp); SP_OBJECT(persp)->updateRepr(SP_OBJECT_WRITE_EXT); } @@ -370,15 +377,12 @@ persp3d_pt_to_str (Persp3D *persp, Proj::Axis const axis) void persp3d_add_box (Persp3D *persp, SPBox3D *box) { if (!box) { - //g_warning ("Trying to add NULL box to perspective.\n"); return; } if (std::find (persp->boxes.begin(), persp->boxes.end(), box) != persp->boxes.end()) { - //g_warning ("Attempting to add already existent box to perspective.\n"); return; } persp->boxes.push_back(box); - //SP_OBJECT_REPR(box)->setAttribute("inkscape:perspectiveID", SP_OBJECT_REPR(persp)->attribute("id")); } void @@ -401,11 +405,77 @@ persp3d_has_box (Persp3D *persp, SPBox3D *box) { return false; } +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) { + 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; +} + +void +persp3d_remove_box_transform (Persp3D *persp, SPBox3D *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()) { + 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; +} + +bool +persp3d_was_transformed (Persp3D *persp) { + 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) + return false; + } + + 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; + } + } + return false; // all boxes in the perspective are still untransformed; a pending transformation should be applied +} + +bool +persp3d_all_transformed(Persp3D *persp) { + for (std::map::iterator i = persp->boxes_transformed.begin(); + i != persp->boxes_transformed.end(); ++i) { + if ((*i).second == false) { + return false; + } + } + return true; +} + +void +persp3d_unset_transforms(Persp3D *persp) { + for (std::map::iterator i = persp->boxes_transformed.begin(); + i != persp->boxes_transformed.end(); ++i) { + (*i).second = false; + } +} + void persp3d_update_box_displays (Persp3D *persp) { if (persp->boxes.empty()) return; - //g_print ("Requesting display update for %d boxes in the perspective.\n", persp->boxes.size()); for (std::vector::iterator i = persp->boxes.begin(); i != persp->boxes.end(); ++i) { box3d_position_set(*i); } @@ -415,9 +485,9 @@ void persp3d_update_box_reprs (Persp3D *persp) { if (persp->boxes.empty()) return; - //g_print ("Requesting repr update for %d boxes in the perspective.\n", persp->boxes.size()); for (std::vector::iterator i = persp->boxes.begin(); i != persp->boxes.end(); ++i) { SP_OBJECT(*i)->updateRepr(SP_OBJECT_WRITE_EXT); + box3d_set_z_orders(*i); } } @@ -459,46 +529,36 @@ persp3d_absorb(Persp3D *persp1, Persp3D *persp2) { // otherwise the loop below gets confused when perspectives are reattached. std::list boxes_of_persp2 = persp3d_list_of_boxes(persp2); - Inkscape::XML::Node *persp_repr = SP_OBJECT_REPR(persp1); - const gchar *persp_id = persp_repr->attribute("id"); - gchar *href = g_strdup_printf("#%s", persp_id); - for (std::list::iterator i = boxes_of_persp2.begin(); i != boxes_of_persp2.end(); ++i) { - SP_OBJECT_REPR(*i)->setAttribute("inkscape:perspectiveID", href); + box3d_switch_perspectives((*i), persp2, persp1, true); + SP_OBJECT(*i)->updateRepr(SP_OBJECT_WRITE_EXT); // so that undo/redo can do its job properly } - g_free(href); - - persp1->boxes.insert(persp1->boxes.begin(), persp2->boxes.begin(), persp2->boxes.end()); } -static void -persp3d_on_repr_attr_changed ( Inkscape::XML::Node * repr, - const gchar *key, - const gchar *oldval, - const gchar *newval, - bool is_interactive, +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 ) { - //g_print("persp3d_on_repr_attr_changed!!!! TODO: Do we need to trigger any further updates than the box reprs?"); - if (!data) return; Persp3D *persp = (Persp3D*) data; persp3d_update_box_displays (persp); - - //lpeobj->requestModified(SP_OBJECT_MODIFIED_FLAG); } /* returns a std::set() of all perspectives of the currently selected boxes */ std::set -persp3d_currently_selected_persps (SPEventContext *ec) { - Inkscape::Selection *selection = sp_desktop_selection (ec->desktop); +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(SP_BOX3D(i->data)->persp_ref->getObject()); + p.insert(box3d_get_perspective(SP_BOX3D(i->data))); } } return p; @@ -531,6 +591,8 @@ persp3d_selected_boxes (Persp3D *persp) { return sel; } +/* some debugging stuff follows */ + void persp3d_print_debugging_info (Persp3D *persp) { g_print ("=== Info for Persp3D %d ===\n", persp->my_counter); @@ -546,7 +608,7 @@ persp3d_print_debugging_info (Persp3D *persp) { g_print (" Boxes: "); for (std::vector::iterator i = persp->boxes.begin(); i != persp->boxes.end(); ++i) { - g_print ("%d (%d)", (*i)->my_counter, (*i)->persp_ref->getObject()->my_counter); + g_print ("%d (%d) ", (*i)->my_counter, box3d_get_perspective(*i)->my_counter); } g_print ("\n"); g_print ("========================\n"); @@ -562,8 +624,28 @@ persp3d_print_debugging_info_all(SPDocument *document) { persp3d_print_debugging_info(SP_PERSP3D(child)); } } + persp3d_print_all_selected(); } +void +persp3d_print_all_selected() { + g_print ("\n======================================\n"); + g_print ("Selected perspectives and their boxes:\n"); + + std::set sel_persps = persp3d_currently_selected_persps(); + + for (std::set::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) { + g_print ("<%d,%d> ", (*i).first->my_counter, (*i).second); + } + g_print ("\n"); + } + g_print ("======================================\n\n"); + } + /* Local Variables: mode:c++