X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fbox3d-context.cpp;h=2d20318e36cd5bae58bfb56612adbd5c21b953d7;hb=dc04c2a317d9e7ea799d78d5b4e9bf28997ca46f;hp=83952d5ef6583999080f3a19fb2273592a7a0144;hpb=182911d054ac2fa73e3bf625b5ea0710bfb416f0;p=inkscape.git diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp index 83952d5ef..2d20318e3 100644 --- a/src/box3d-context.cpp +++ b/src/box3d-context.cpp @@ -24,6 +24,7 @@ #include "document.h" #include "sp-namedview.h" #include "selection.h" +#include "selection-chemistry.h" #include "desktop-handles.h" #include "snap.h" #include "display/curve.h" @@ -37,16 +38,16 @@ #include "object-edit.h" #include "xml/repr.h" #include "xml/node-event-vector.h" -#include "prefs-utils.h" +#include "preferences.h" #include "context-fns.h" -#include "inkscape.h" #include "desktop-style.h" #include "transf_mat_3x4.h" #include "perspective-line.h" #include "persp3d.h" #include "box3d-side.h" -#include "document-private.h" // for debugging (see case GDK_P) +#include "document-private.h" #include "line-geometry.h" +#include "shape-editor.h" static void sp_box3d_context_class_init(Box3DContextClass *klass); static void sp_box3d_context_init(Box3DContext *box3d_context); @@ -108,9 +109,6 @@ static void sp_box3d_context_init(Box3DContext *box3d_context) event_context->within_tolerance = false; event_context->item_to_select = NULL; - event_context->shape_repr = NULL; - event_context->shape_knot_holder = NULL; - box3d_context->item = NULL; box3d_context->ctrl_dragged = false; @@ -134,22 +132,14 @@ static void sp_box3d_context_dispose(GObject *object) bc->sel_changed_connection.disconnect(); bc->sel_changed_connection.~connection(); + delete ec->shape_editor; + ec->shape_editor = NULL; + /* fixme: This is necessary because we do not grab */ if (bc->item) { sp_box3d_finish(bc); } - if (ec->shape_knot_holder) { - sp_knot_holder_destroy(ec->shape_knot_holder); - ec->shape_knot_holder = NULL; - } - - if (ec->shape_repr) { // remove old listener - sp_repr_remove_listener_by_data(ec->shape_repr, ec); - Inkscape::GC::release(ec->shape_repr); - ec->shape_repr = 0; - } - if (bc->_message_context) { delete bc->_message_context; } @@ -157,14 +147,6 @@ static void sp_box3d_context_dispose(GObject *object) G_OBJECT_CLASS(parent_class)->dispose(object); } -static Inkscape::XML::NodeEventVector ec_shape_repr_events = { - NULL, /* child_added */ - NULL, /* child_removed */ - ec_shape_event_attr_changed, - NULL, /* content_changed */ - NULL /* order_changed */ -}; - /** \brief Callback that processes the "changed" signal on the selection; destroys old and creates new knotholder @@ -174,35 +156,31 @@ static void sp_box3d_context_selection_changed(Inkscape::Selection *selection, g Box3DContext *bc = SP_BOX3D_CONTEXT(data); SPEventContext *ec = SP_EVENT_CONTEXT(bc); - if (ec->shape_knot_holder) { // destroy knotholder - sp_knot_holder_destroy(ec->shape_knot_holder); - ec->shape_knot_holder = NULL; - } + ec->shape_editor->unset_item(SH_KNOTHOLDER); + SPItem *item = selection->singleItem(); + ec->shape_editor->set_item(item, SH_KNOTHOLDER); - if (ec->shape_repr) { // remove old listener - sp_repr_remove_listener_by_data(ec->shape_repr, ec); - Inkscape::GC::release(ec->shape_repr); - ec->shape_repr = 0; + if (selection->perspList().size() == 1) { + // selecting a single box changes the current perspective + ec->desktop->doc()->current_persp3d = selection->perspList().front(); } +} - SPDocument *doc = sp_desktop_document(bc->desktop); - doc->persps_sel.clear(); - doc->persps_sel = persp3d_currently_selected_persps(ec); +/* create a default perspective in document defs if none is present + (can happen after 'vacuum defs' or when a pre-0.46 file is opened) */ +static void sp_box3d_context_check_for_persp_in_defs(SPDocument *document) { + SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document); - SPItem *item = selection->singleItem(); - if (item) { - ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop); - Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item); - if (shape_repr) { - ec->shape_repr = shape_repr; - Inkscape::GC::anchor(shape_repr); - sp_repr_add_listener(shape_repr, &ec_shape_repr_events, ec); + bool has_persp = false; + for (SPObject *child = sp_object_first_child(defs); child != NULL; child = SP_OBJECT_NEXT(child) ) { + if (SP_IS_PERSP3D(child)) { + has_persp = true; + break; } } - if (doc->persps_sel.size() == 1) { - // selecting a single box changes the current perspective - doc->current_persp3d = *(doc->persps_sel.begin()); + if (!has_persp) { + document->current_persp3d = persp3d_create_xml_element (document); } } @@ -214,15 +192,13 @@ static void sp_box3d_context_setup(SPEventContext *ec) ((SPEventContextClass *) parent_class)->setup(ec); } + sp_box3d_context_check_for_persp_in_defs(sp_desktop_document (ec->desktop)); + + ec->shape_editor = new ShapeEditor(ec->desktop); + SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); if (item) { - ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop); - Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item); - if (shape_repr) { - ec->shape_repr = shape_repr; - Inkscape::GC::anchor(shape_repr); - sp_repr_add_listener(shape_repr, &ec_shape_repr_events, ec); - } + ec->shape_editor->set_item(item, SH_KNOTHOLDER); } bc->sel_changed_connection.disconnect(); @@ -231,12 +207,13 @@ static void sp_box3d_context_setup(SPEventContext *ec) ); bc->_vpdrag = new Box3D::VPDrag(sp_desktop_document (ec->desktop)); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - if (prefs_get_int_attribute("tools.shapes", "selcue", 0) != 0) { + if (prefs->getBool("/tools/shapes/selcue")) { ec->enableSelectionCue(); } - if (prefs_get_int_attribute("tools.shapes", "gradientdrag", 0) != 0) { + if (prefs->getBool("/tools/shapes/gradientdrag")) { ec->enableGrDrag(); } @@ -274,24 +251,25 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven SPDesktop *desktop = event_context->desktop; Inkscape::Selection *selection = sp_desktop_selection (desktop); - int const snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); Box3DContext *bc = SP_BOX3D_CONTEXT(event_context); g_assert (SP_ACTIVE_DOCUMENT->current_persp3d); Persp3D *cur_persp = SP_ACTIVE_DOCUMENT->current_persp3d; - event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); + event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); gint ret = FALSE; switch (event->type) { case GDK_BUTTON_PRESS: if ( event->button.button == 1 && !event_context->space_panning) { - NR::Point const button_w(event->button.x, - event->button.y); + Geom::Point const button_w(event->button.x, + event->button.y); // save drag origin - event_context->xp = (gint) button_w[NR::X]; - event_context->yp = (gint) button_w[NR::Y]; + event_context->xp = (gint) button_w[Geom::X]; + event_context->yp = (gint) button_w[Geom::Y]; event_context->within_tolerance = true; // remember clicked item, *not* disregarding groups (since a 3D box is a group), honoring Alt @@ -300,27 +278,28 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven dragging = true; /* */ - NR::Point const button_dt(desktop->w2d(button_w)); - bc->drag_origin = button_dt; - bc->drag_ptB = button_dt; - bc->drag_ptC = button_dt; + Geom::Point button_dt(desktop->w2d(button_w)); + bc->drag_origin = from_2geom(button_dt); + bc->drag_ptB = from_2geom(button_dt); + bc->drag_ptC = from_2geom(button_dt); /* Projective preimages of clicked point under current perspective */ - bc->drag_origin_proj = cur_persp->tmat.preimage (button_dt, 0, Proj::Z); + bc->drag_origin_proj = cur_persp->tmat.preimage (from_2geom(button_dt), 0, Proj::Z); bc->drag_ptB_proj = bc->drag_origin_proj; bc->drag_ptC_proj = bc->drag_origin_proj; bc->drag_ptC_proj.normalize(); bc->drag_ptC_proj[Proj::Z] = 0.25; /* Snap center */ - SnapManager const &m = desktop->namedview->snap_manager; - bc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, - button_dt, bc->item).getPoint(); + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop, true, bc->item); + m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, button_dt); + bc->center = from_2geom(button_dt); sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), ( GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK ), NULL, event->button.time); ret = TRUE; @@ -340,12 +319,13 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven // motion notify coordinates as given (no snapping back to origin) event_context->within_tolerance = false; - NR::Point const motion_w(event->motion.x, - event->motion.y); - NR::Point motion_dt(desktop->w2d(motion_w)); + Geom::Point const motion_w(event->motion.x, + event->motion.y); + Geom::Point motion_dt(desktop->w2d(motion_w)); - SnapManager const &m = desktop->namedview->snap_manager; - motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, bc->item).getPoint(); + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop, true, bc->item); + m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, motion_dt); bc->ctrl_dragged = event->motion.state & GDK_CONTROL_MASK; @@ -355,10 +335,10 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven } if (!bc->extruded) { - bc->drag_ptB = motion_dt; - bc->drag_ptC = motion_dt; + bc->drag_ptB = from_2geom(motion_dt); + bc->drag_ptC = from_2geom(motion_dt); - bc->drag_ptB_proj = cur_persp->tmat.preimage (motion_dt, 0, Proj::Z); + bc->drag_ptB_proj = cur_persp->tmat.preimage (from_2geom(motion_dt), 0, Proj::Z); bc->drag_ptC_proj = bc->drag_ptB_proj; bc->drag_ptC_proj.normalize(); bc->drag_ptC_proj[Proj::Z] = 0.25; @@ -368,30 +348,19 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven if (!bc->ctrl_dragged) { /* snapping */ Box3D::PerspectiveLine pline (bc->drag_ptB, Proj::Z, SP_ACTIVE_DOCUMENT->current_persp3d); - bc->drag_ptC = pline.closest_to (motion_dt); + bc->drag_ptC = pline.closest_to (from_2geom(motion_dt)); bc->drag_ptB_proj.normalize(); bc->drag_ptC_proj = cur_persp->tmat.preimage (bc->drag_ptC, bc->drag_ptB_proj[Proj::X], Proj::X); } else { - bc->drag_ptC = motion_dt; + bc->drag_ptC = from_2geom(motion_dt); bc->drag_ptB_proj.normalize(); - bc->drag_ptC_proj = cur_persp->tmat.preimage (motion_dt, bc->drag_ptB_proj[Proj::X], Proj::X); - } - bc->drag_ptC = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, bc->drag_ptC, bc->item).getPoint(); - if (bc->ctrl_dragged) { - g_print ("TODO: What should happen here?\n"); - // Update bc->drag_ptB in case we are ctrl-dragging - /*** - Box3D::PerspectiveLine pl1 (NR::Point (event_context->xp, event_context->yp), Box3D::Y, bc->_vpdrag->document->current_perspective); - Box3D::PerspectiveLine pl2 (bc->drag_ptB, Box3D::X, bc->_vpdrag->document->current_perspective); - NR::Point corner1 = pl1.meet(pl2); - - Box3D::PerspectiveLine pl3 (corner1, Box3D::X, bc->_vpdrag->document->current_perspective); - Box3D::PerspectiveLine pl4 (bc->drag_ptC, Box3D::Z, bc->_vpdrag->document->current_perspective); - bc->drag_ptB = pl3.meet(pl4); - ***/ + bc->drag_ptC_proj = cur_persp->tmat.preimage (from_2geom(motion_dt), bc->drag_ptB_proj[Proj::X], Proj::X); } + Geom::Point pt2g = to_2geom(bc->drag_ptC); + m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, pt2g); + bc->drag_ptC = from_2geom(pt2g); } sp_box3d_drag(*bc, event->motion.state); @@ -427,23 +396,6 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven break; case GDK_KEY_PRESS: switch (get_group0_keyval (&event->key)) { - case GDK_Alt_L: - case GDK_Alt_R: - case GDK_Control_L: - case GDK_Control_R: - case GDK_Shift_L: - case GDK_Shift_R: - case GDK_Meta_L: // Meta is when you press Shift+Alt (at least on my machine) - case GDK_Meta_R: - /*** - if (!dragging){ - sp_event_show_modifier_tip (event_context->defaultMessageContext(), event, - _("Ctrl: make square or integer-ratio rect, lock a rounded corner circular"), - _("Shift: draw around the starting point"), - NULL); - } - ***/ - break; case GDK_Up: case GDK_Down: case GDK_KP_Up: @@ -455,111 +407,92 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven case GDK_bracketright: persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::X, -180/snaps, MOD__ALT); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; case GDK_bracketleft: persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::X, 180/snaps, MOD__ALT); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; case GDK_parenright: persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Y, -180/snaps, MOD__ALT); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; case GDK_parenleft: persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Y, 180/snaps, MOD__ALT); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; case GDK_braceright: persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Z, -180/snaps, MOD__ALT); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; case GDK_braceleft: persp3d_rotate_VP (inkscape_active_document()->current_persp3d, Proj::Z, 180/snaps, MOD__ALT); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; case GDK_O: - Box3D::create_canvas_point(persp3d_get_VP(inkscape_active_document()->current_persp3d, Proj::W).affine(), - 6, 0xff00ff00); - ret = true; - break; - - case GDK_I: - if (MOD__ALT) { - persp3d_print_debugging_info_all (inkscape_active_document()); - } else { - persp3d_print_debugging_info (inkscape_active_document()->current_persp3d); + if (MOD__CTRL && MOD__SHIFT) { + Box3D::create_canvas_point(persp3d_get_VP(inkscape_active_document()->current_persp3d, Proj::W).affine(), + 6, 0xff00ff00); } ret = true; break; - case GDK_P: - { - if (MOD__SHIFT && MOD__CTRL) break; // Don't catch Shift+Ctrl+P (Preferences dialog) - SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(SP_ACTIVE_DOCUMENT); - g_print ("=== Persp3D Objects: ==============================\n"); - for (SPObject *i = sp_object_first_child(SP_OBJECT(defs)); i != NULL; i = SP_OBJECT_NEXT(i) ) { - g_print ("Object encountered\n"); - if (SP_IS_PERSP3D(i)) { - //g_print ("Encountered a Persp3D in defs\n"); - SP_PERSP3D(i)->tmat.print(); - g_print ("\n"); - g_print ("Computing preimage of point (300, 400)\n"); - SP_PERSP3D(i)->tmat.preimage (NR::Point (300, 400), 0, Proj::Z); - g_print ("Computing preimage of point (200, 500)\n"); - SP_PERSP3D(i)->tmat.preimage (NR::Point (200, 500), 0, Proj::Z); - } - } - g_print ("===================================================\n"); - - ret = true; - break; - } - - case GDK_V: - if (bc->_vpdrag) { - bc->_vpdrag->printDraggers(); + case GDK_g: + case GDK_G: + if (MOD__SHIFT_ONLY) { + sp_selection_to_guides(desktop); ret = true; - } else { - g_print ("No VPDrag in Box3DContext.\n"); } break; case GDK_x: + case GDK_X: if (MOD__ALT_ONLY) { desktop->setToolboxFocusTo ("altx-box3d"); ret = TRUE; } - break; - case GDK_X: - if (MOD__CTRL) break; // Don't catch Ctrl+X ('cut') and Ctrl+Shift+X ('open XML editor') - persp3d_toggle_VPs(persp3d_currently_selected_persps(event_context), Proj::X); - bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? - ret = true; + if (MOD__SHIFT_ONLY) { + persp3d_toggle_VPs(selection->perspList(), Proj::X); + bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? + ret = true; + } break; + case GDK_y: case GDK_Y: - { - if (MOD__CTRL) break; // Don't catch Ctrl+Y ("redo") - persp3d_toggle_VPs(persp3d_currently_selected_persps(event_context), Proj::Y); - bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? - ret = true; + if (MOD__SHIFT_ONLY) { + persp3d_toggle_VPs(selection->perspList(), Proj::Y); + bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? + ret = true; + } break; - } + case GDK_z: case GDK_Z: - { - if (MOD__CTRL) break; // Don't catch Ctrl+Z ("undo") - persp3d_toggle_VPs(persp3d_currently_selected_persps(event_context), Proj::Z); - bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? - ret = true; + if (MOD__SHIFT_ONLY) { + persp3d_toggle_VPs(selection->perspList(), Proj::Z); + bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? + ret = true; + } break; - } case GDK_Escape: sp_desktop_selection(desktop)->clear(); @@ -583,22 +516,6 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven break; } break; - case GDK_KEY_RELEASE: - switch (get_group0_keyval (&event->key)) { - case GDK_Alt_L: - case GDK_Alt_R: - case GDK_Control_L: - case GDK_Control_R: - case GDK_Shift_L: - case GDK_Shift_R: - case GDK_Meta_L: // Meta is when you press Shift+Alt - case GDK_Meta_R: - event_context->defaultMessageContext()->clear(); - break; - default: - break; - } - break; default: break; } @@ -628,11 +545,10 @@ static void sp_box3d_drag(Box3DContext &bc, guint /*state*/) repr->setAttribute("sodipodi:type", "inkscape:box3d"); /* Set style */ - sp_desktop_apply_style_tool (desktop, repr, "tools.shapes.3dbox", false); + sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/3dbox", false); bc.item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr); Inkscape::GC::release(repr); - /**** bc.item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer()); ****/ Inkscape::XML::Node *repr_side; // TODO: Incorporate this in box3d-side.cpp! for (int i = 0; i < 6; ++i) { @@ -682,18 +598,13 @@ static void sp_box3d_drag(Box3DContext &bc, guint /*state*/) box3d_position_set(box); // status text - //GString *Ax = SP_PX_TO_METRIC_STRING(origin[NR::X], desktop->namedview->getDefaultMetric()); - //GString *Ay = SP_PX_TO_METRIC_STRING(origin[NR::Y], desktop->namedview->getDefaultMetric()); bc._message_context->setF(Inkscape::NORMAL_MESSAGE, _("3D Box; with Shift to extrude along the Z axis")); - //g_string_free(Ax, FALSE); - //g_string_free(Ay, FALSE); } static void sp_box3d_finish(Box3DContext *bc) { bc->_message_context->clear(); g_assert (SP_ACTIVE_DOCUMENT->current_persp3d); - //Persp3D *cur_persp = SP_ACTIVE_DOCUMENT->current_persp3d; if ( bc->item != NULL ) { SPDesktop * desktop = SP_EVENT_CONTEXT_DESKTOP(bc); @@ -720,6 +631,14 @@ static void sp_box3d_finish(Box3DContext *bc) bc->extruded = false; } +void sp_box3d_context_update_lines(SPEventContext *ec) { + /* update perspective lines if we are in the 3D box tool (so that infinite ones are shown correctly) */ + if (SP_IS_BOX3D_CONTEXT (ec)) { + Box3DContext *bc = SP_BOX3D_CONTEXT (ec); + bc->_vpdrag->updateLines(); + } +} + /* Local Variables: mode:c++