X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fpersp3d.cpp;h=4b594d754fd9ded04022a6adbd21df4c236ba2c9;hb=6bffd52160c0be8ad7b402099c7e1c70eeed4556;hp=27701c80deff7fd642a531997ba4f10881238b5e;hpb=5834db43b21308e958a2fdbbec082b1a4f019a38;p=inkscape.git diff --git a/src/persp3d.cpp b/src/persp3d.cpp index 27701c80d..4b594d754 100644 --- a/src/persp3d.cpp +++ b/src/persp3d.cpp @@ -93,7 +93,6 @@ persp3d_init(Persp3D *persp) { persp->tmat = Proj::TransfMat3x4 (); - //persp->boxes = NULL; persp->boxes_transformed.clear(); persp->document = NULL; @@ -118,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)); - } - **/ } @@ -220,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 */ @@ -239,7 +245,7 @@ persp3d_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) { Persp3D *persp = SP_PERSP3D(object); - if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) { + 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)); @@ -309,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, @@ -348,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); } @@ -373,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 @@ -475,7 +476,6 @@ 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); } @@ -485,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); } } @@ -543,21 +543,17 @@ persp3d_on_repr_attr_changed ( Inkscape::XML::Node * /*repr*/, 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) { @@ -595,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); @@ -631,16 +629,10 @@ persp3d_print_debugging_info_all(SPDocument *document) { void persp3d_print_all_selected() { - /** - if (persp3d->boxes_transformed.empty()) { - g_print ("No selected perspectives in document\n"); - return; - } - **/ g_print ("\n======================================\n"); g_print ("Selected perspectives and their boxes:\n"); - std::set sel_persps = persp3d_currently_selected_persps (inkscape_active_event_context()); + 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);