X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fbox3d-context.cpp;h=14f4470bc1241b9fe240d565846c0fbac8235565;hb=c559a44911579b77710f6698f1a064195da7c292;hp=8ef5f5960467041929fae395f5f9304174f09b90;hpb=bfbe1a13d86c5f5796f307e583677e5150f9a530;p=inkscape.git diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp index 8ef5f5960..14f4470bc 100644 --- a/src/box3d-context.cpp +++ b/src/box3d-context.cpp @@ -1,4 +1,4 @@ -#define __SP_3DBOX_CONTEXT_C__ +#define __SP_BOX3D_CONTEXT_C__ /* * 3D box drawing context @@ -24,12 +24,13 @@ #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" #include "desktop.h" #include "message-context.h" -#include "pixmaps/cursor-rect.xpm" +#include "pixmaps/cursor-3dbox.xpm" #include "box3d.h" #include "box3d-context.h" #include "sp-metrics.h" @@ -37,64 +38,71 @@ #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 "desktop-style.h" +#include "transf_mat_3x4.h" +#include "perspective-line.h" +#include "persp3d.h" +#include "box3d-side.h" +#include "document-private.h" +#include "line-geometry.h" +#include "shape-editor.h" -static void sp_3dbox_context_class_init(SP3DBoxContextClass *klass); -static void sp_3dbox_context_init(SP3DBoxContext *box3d_context); -static void sp_3dbox_context_dispose(GObject *object); +static void sp_box3d_context_class_init(Box3DContextClass *klass); +static void sp_box3d_context_init(Box3DContext *box3d_context); +static void sp_box3d_context_dispose(GObject *object); -static void sp_3dbox_context_setup(SPEventContext *ec); -static void sp_3dbox_context_set(SPEventContext *ec, gchar const *key, gchar const *val); +static void sp_box3d_context_setup(SPEventContext *ec); +static void sp_box3d_context_finish(SPEventContext *ec); -static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEvent *event); -static gint sp_3dbox_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); +static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEvent *event); +static gint sp_box3d_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); -static void sp_3dbox_drag(SP3DBoxContext &bc, guint state); -static void sp_3dbox_finish(SP3DBoxContext *bc); +static void sp_box3d_drag(Box3DContext &bc, guint state); +static void sp_box3d_finish(Box3DContext *bc); static SPEventContextClass *parent_class; - -GtkType sp_3dbox_context_get_type() +GtkType sp_box3d_context_get_type() { static GType type = 0; if (!type) { GTypeInfo info = { - sizeof(SP3DBoxContextClass), + sizeof(Box3DContextClass), NULL, NULL, - (GClassInitFunc) sp_3dbox_context_class_init, + (GClassInitFunc) sp_box3d_context_class_init, NULL, NULL, - sizeof(SP3DBoxContext), + sizeof(Box3DContext), 4, - (GInstanceInitFunc) sp_3dbox_context_init, + (GInstanceInitFunc) sp_box3d_context_init, NULL, /* value_table */ }; - type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SP3DBoxContext", &info, (GTypeFlags) 0); + type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "Box3DContext", &info, (GTypeFlags) 0); } return type; } -static void sp_3dbox_context_class_init(SP3DBoxContextClass *klass) +static void sp_box3d_context_class_init(Box3DContextClass *klass) { GObjectClass *object_class = (GObjectClass *) klass; SPEventContextClass *event_context_class = (SPEventContextClass *) klass; parent_class = (SPEventContextClass *) g_type_class_peek_parent(klass); - object_class->dispose = sp_3dbox_context_dispose; + object_class->dispose = sp_box3d_context_dispose; - event_context_class->setup = sp_3dbox_context_setup; - event_context_class->set = sp_3dbox_context_set; - event_context_class->root_handler = sp_3dbox_context_root_handler; - event_context_class->item_handler = sp_3dbox_context_item_handler; + event_context_class->setup = sp_box3d_context_setup; + event_context_class->finish = sp_box3d_context_finish; + event_context_class->root_handler = sp_box3d_context_root_handler; + event_context_class->item_handler = sp_box3d_context_item_handler; } -static void sp_3dbox_context_init(SP3DBoxContext *box3d_context) +static void sp_box3d_context_init(Box3DContext *box3d_context) { SPEventContext *event_context = SP_EVENT_CONTEXT(box3d_context); - event_context->cursor_shape = cursor_rect_xpm; + event_context->cursor_shape = cursor_3dbox_xpm; event_context->hot_x = 4; event_context->hot_y = 4; event_context->xp = 0; @@ -103,22 +111,35 @@ static void sp_3dbox_context_init(SP3DBoxContext *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; box3d_context->extruded = false; - + box3d_context->_vpdrag = NULL; new (&box3d_context->sel_changed_connection) sigc::connection(); } -static void sp_3dbox_context_dispose(GObject *object) +static void sp_box3d_context_finish(SPEventContext *ec) +{ + Box3DContext *bc = SP_BOX3D_CONTEXT(ec); + SPDesktop *desktop = ec->desktop; + + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); + sp_box3d_finish(bc); + bc->sel_changed_connection.disconnect(); +// sp_repr_remove_listener_by_data(cc->active_shape_repr, cc); + + if (((SPEventContextClass *) parent_class)->finish) { + ((SPEventContextClass *) parent_class)->finish(ec); + } +} + + +static void sp_box3d_context_dispose(GObject *object) { - SP3DBoxContext *bc = SP_3DBOX_CONTEXT(object); + Box3DContext *bc = SP_BOX3D_CONTEXT(object); SPEventContext *ec = SP_EVENT_CONTEXT(object); ec->enableGrDrag(false); @@ -129,20 +150,12 @@ static void sp_3dbox_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_3dbox_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; + sp_box3d_finish(bc); } if (bc->_message_context) { @@ -152,119 +165,79 @@ static void sp_3dbox_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 */ -void sp_3dbox_context_selection_changed(Inkscape::Selection *selection, gpointer data) +static void sp_box3d_context_selection_changed(Inkscape::Selection *selection, gpointer data) { - SP3DBoxContext *bc = SP_3DBOX_CONTEXT(data); + 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()->setCurrentPersp3D(selection->perspList().front()); } +} - 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); - } - if (SP_IS_3DBOX (item)) { - bc->_vpdrag->document->current_perspective = bc->_vpdrag->document->get_persp_of_box (SP_3DBOX (item)); - } - } else { - /* If several boxes sharing the same perspective are selected, - we can still set the current selection accordingly */ - std::set perspectives; - for (GSList *i = (GSList *) selection->itemList(); i != NULL; i = i->next) { - if (SP_IS_3DBOX (i->data)) { - perspectives.insert (bc->_vpdrag->document->get_persp_of_box (SP_3DBOX (i->data))); - } - } - if (perspectives.size() == 1) { - bc->_vpdrag->document->current_perspective = *(perspectives.begin()); +/* Create a default perspective in document defs if none is present (which can happen, among other + * circumstances, after 'vacuum defs' or when a pre-0.46 file is opened). + */ +static void sp_box3d_context_ensure_persp_in_defs(SPDocument *document) { + SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document); + + 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; } - // TODO: What to do if several boxes with different perspectives are selected? + } + + if (!has_persp) { + document->setCurrentPersp3D(persp3d_create_xml_element (document)); } } -static void sp_3dbox_context_setup(SPEventContext *ec) +static void sp_box3d_context_setup(SPEventContext *ec) { - SP3DBoxContext *bc = SP_3DBOX_CONTEXT(ec); + Box3DContext *bc = SP_BOX3D_CONTEXT(ec); if (((SPEventContextClass *) parent_class)->setup) { ((SPEventContextClass *) parent_class)->setup(ec); } + 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(); bc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged( - sigc::bind(sigc::ptr_fun(&sp_3dbox_context_selection_changed), (gpointer)bc) + sigc::bind(sigc::ptr_fun(&sp_box3d_context_selection_changed), (gpointer)bc) ); 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(); } bc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -static void sp_3dbox_context_set(SPEventContext *ec, gchar const *key, gchar const *val) -{ - //SP3DBoxContext *bc = SP_3DBOX_CONTEXT(ec); - - /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like - * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ - /** - if ( strcmp(key, "rx") == 0 ) { - bc->rx = ( val - ? g_ascii_strtod (val, NULL) - : 0.0 ); - } else if ( strcmp(key, "ry") == 0 ) { - bc->ry = ( val - ? g_ascii_strtod (val, NULL) - : 0.0 ); - } - **/ -} - -static gint sp_3dbox_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) +static gint sp_box3d_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) { SPDesktop *desktop = event_context->desktop; @@ -289,49 +262,66 @@ static gint sp_3dbox_context_item_handler(SPEventContext *event_context, SPItem return ret; } -static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEvent *event) +static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEvent *event) { static bool dragging; SPDesktop *desktop = event_context->desktop; + SPDocument *document = sp_desktop_document (desktop); Inkscape::Selection *selection = sp_desktop_selection (desktop); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); - SP3DBoxContext *bc = SP_3DBOX_CONTEXT(event_context); + Box3DContext *bc = SP_BOX3D_CONTEXT(event_context); + Persp3D *cur_persp = document->getCurrentPersp3D(); - 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); + Geom::Point button_dt(desktop->w2d(button_w)); // 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, disregarding groups, honoring Alt + + // remember clicked item, *not* disregarding groups (since a 3D box is a group), honoring Alt event_context->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, event->button.state & GDK_CONTROL_MASK); dragging = true; - - /* Position center */ - NR::Point const button_dt(desktop->w2d(button_w)); - bc->drag_origin = button_dt; - bc->drag_ptB = button_dt; - bc->drag_ptC = button_dt; - - /* 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(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE); + m.unSetup(); + bc->center = from_2geom(button_dt); + + bc->drag_origin = from_2geom(button_dt); + bc->drag_ptB = from_2geom(button_dt); + bc->drag_ptC = from_2geom(button_dt); + + // This can happen after saving when the last remaining perspective was purged and must be recreated. + if (!cur_persp) { + sp_box3d_context_ensure_persp_in_defs(document); + cur_persp = document->getCurrentPersp3D(); + } + + /* Projective preimages of clicked point under current perspective */ + bc->drag_origin_proj = cur_persp->perspective_impl->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; 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; @@ -351,61 +341,70 @@ static gint sp_3dbox_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)); - - SnapManager const &m = desktop->namedview->snap_manager; - motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, bc->item).getPoint(); + Geom::Point const motion_w(event->motion.x, + event->motion.y); + Geom::Point motion_dt(desktop->w2d(motion_w)); + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop, true, bc->item); + m.freeSnapReturnByRef(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE); bc->ctrl_dragged = event->motion.state & GDK_CONTROL_MASK; - if (event->motion.state & GDK_SHIFT_MASK && !bc->extruded) { - /* once shift is pressed, set bc->extruded (no need to create further faces; - all of them are already created in sp_3dbox_init); since we made the rear face - invisible in the beginning to avoid "flashing", we must set its correct style now */ + if (event->motion.state & GDK_SHIFT_MASK && !bc->extruded && bc->item) { + // once shift is pressed, set bc->extruded bc->extruded = true; - g_assert (bc->item); - SP_3DBOX (bc->item)->faces[5]->set_style (NULL, true); } 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->perspective_impl->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; } else { // Without Ctrl, motion of the extruded corner is constrained to the // perspective line from drag_ptB to vanishing point Y. if (!bc->ctrl_dragged) { - bc->drag_ptC = Box3D::perspective_line_snap (bc->drag_ptB, Box3D::Z, motion_dt, bc->_vpdrag->document->current_perspective); + /* snapping */ + Box3D::PerspectiveLine pline (bc->drag_ptB, Proj::Z, document->getCurrentPersp3D()); + bc->drag_ptC = pline.closest_to (from_2geom(motion_dt)); + + bc->drag_ptB_proj.normalize(); + bc->drag_ptC_proj = cur_persp->perspective_impl->tmat.preimage (bc->drag_ptC, bc->drag_ptB_proj[Proj::X], Proj::X); } else { - bc->drag_ptC = motion_dt; - } - bc->drag_ptC = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, bc->drag_ptC, bc->item).getPoint(); - if (bc->ctrl_dragged) { - 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 = from_2geom(motion_dt); + + bc->drag_ptB_proj.normalize(); + bc->drag_ptC_proj = cur_persp->perspective_impl->tmat.preimage (from_2geom(motion_dt), bc->drag_ptB_proj[Proj::X], Proj::X); } + m.freeSnapReturnByRef(bc->drag_ptC, Inkscape::SNAPSOURCE_NODE_HANDLE); } - - - sp_3dbox_drag(*bc, event->motion.state); - + m.unSetup(); + + sp_box3d_drag(*bc, event->motion.state); + ret = TRUE; + } else if (!sp_event_context_knot_mouseover(bc)) { + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop); + + Geom::Point const motion_w(event->motion.x, event->motion.y); + Geom::Point motion_dt(desktop->w2d(motion_w)); + m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE)); + m.unSetup(); } break; case GDK_BUTTON_RELEASE: event_context->xp = event_context->yp = 0; if ( event->button.button == 1 && !event_context->space_panning) { dragging = false; + sp_event_context_discard_delayed_snap_event(event_context); if (!event_context->within_tolerance) { // we've been dragging, finish the box - sp_3dbox_finish(bc); + sp_box3d_finish(bc); } else if (event_context->item_to_select) { // no dragging, select clicked item if any if (event->button.state & GDK_SHIFT_MASK) { @@ -426,23 +425,6 @@ static gint sp_3dbox_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: @@ -452,64 +434,106 @@ static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEven ret = TRUE; break; - case GDK_I: - Box3D::Perspective3D::print_debugging_info(); + case GDK_bracketright: + persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, -180/snaps, MOD__ALT); + sp_document_done(document, SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); + ret = true; + break; + + case GDK_bracketleft: + persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::X, 180/snaps, MOD__ALT); + sp_document_done(document, SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; - case GDK_L: - bc->_vpdrag->show_lines = !bc->_vpdrag->show_lines; - bc->_vpdrag->updateLines(); + case GDK_parenright: + persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, -180/snaps, MOD__ALT); + sp_document_done(document, SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); ret = true; break; - case GDK_A: - if (MOD__CTRL) break; // Don't catch Ctrl+A ("select all") - if (bc->_vpdrag->show_lines) { - bc->_vpdrag->front_or_rear_lines = bc->_vpdrag->front_or_rear_lines ^ 0x2; // toggle rear PLs + case GDK_parenleft: + persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Y, 180/snaps, MOD__ALT); + sp_document_done(document, SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); + ret = true; + break; + + case GDK_braceright: + persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, -180/snaps, MOD__ALT); + sp_document_done(document, SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); + ret = true; + break; + + case GDK_braceleft: + persp3d_rotate_VP (document->getCurrentPersp3D(), Proj::Z, 180/snaps, MOD__ALT); + sp_document_done(document, SP_VERB_CONTEXT_3DBOX, + _("Change perspective (angle of PLs)")); + ret = true; + break; + + /* TODO: what is this??? + case GDK_O: + if (MOD__CTRL && MOD__SHIFT) { + Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(), + 6, 0xff00ff00); } - bc->_vpdrag->updateLines(); ret = true; break; + */ + case GDK_g: + case GDK_G: + if (MOD__SHIFT_ONLY) { + sp_selection_to_guides(desktop); + ret = true; + } + break; + + case GDK_p: + case GDK_P: + if (MOD__SHIFT_ONLY) { + if (document->getCurrentPersp3D()) { + persp3d_print_debugging_info (document->getCurrentPersp3D()); + } + ret = true; + } + break; + + case GDK_x: case GDK_X: - { - if (MOD__CTRL) break; // Don't catch Ctrl+X ('cut') and Ctrl+Shift+X ('open XML editor') - Inkscape::Selection *selection = sp_desktop_selection (inkscape_active_desktop()); - for (GSList const *i = selection->itemList(); i != NULL; i = i->next) { - if (!SP_IS_3DBOX (i->data)) continue; - sp_3dbox_switch_front_face (SP_3DBOX (i->data), Box3D::X); - } - bc->_vpdrag->updateLines(); - ret = true; + if (MOD__ALT_ONLY) { + desktop->setToolboxFocusTo ("altx-box3d"); + 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") - Inkscape::Selection *selection = sp_desktop_selection (inkscape_active_desktop()); - for (GSList const *i = selection->itemList(); i != NULL; i = i->next) { - if (!SP_IS_3DBOX (i->data)) continue; - sp_3dbox_switch_front_face (SP_3DBOX (i->data), Box3D::Y); + if (MOD__SHIFT_ONLY) { + persp3d_toggle_VPs(selection->perspList(), Proj::Y); + bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? + ret = true; } - bc->_vpdrag->updateLines(); - ret = true; break; - } + case GDK_z: case GDK_Z: - { - if (MOD__CTRL) break; // Don't catch Ctrl+Z ("undo") - Inkscape::Selection *selection = sp_desktop_selection (inkscape_active_desktop()); - for (GSList const *i = selection->itemList(); i != NULL; i = i->next) { - if (!SP_IS_3DBOX (i->data)) continue; - sp_3dbox_switch_front_face (SP_3DBOX (i->data), Box3D::Z); + if (MOD__SHIFT_ONLY) { + persp3d_toggle_VPs(selection->perspList(), Proj::Z); + bc->_vpdrag->updateLines(); // FIXME: Shouldn't this be done automatically? + ret = true; } - bc->_vpdrag->updateLines(); - ret = true; break; - } case GDK_Escape: sp_desktop_selection(desktop)->clear(); @@ -521,9 +545,10 @@ static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEven sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); dragging = false; + sp_event_context_discard_delayed_snap_event(event_context); if (!event_context->within_tolerance) { // we've been dragging, finish the box - sp_3dbox_finish(bc); + sp_box3d_finish(bc); } // do not return true, so that space would work switching to selector } @@ -533,22 +558,6 @@ static gint sp_3dbox_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; } @@ -562,7 +571,7 @@ static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEven return ret; } -static void sp_3dbox_drag(SP3DBoxContext &bc, guint state) +static void sp_box3d_drag(Box3DContext &bc, guint /*state*/) { SPDesktop *desktop = SP_EVENT_CONTEXT(&bc)->desktop; @@ -575,68 +584,85 @@ static void sp_3dbox_drag(SP3DBoxContext &bc, guint state) /* Create object */ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_EVENT_CONTEXT_DOCUMENT(&bc)); Inkscape::XML::Node *repr = xml_doc->createElement("svg:g"); - repr->setAttribute("sodipodi:type", "inkscape:3dbox"); + 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()); - - /* Hook paths to the faces of the box (applies last used style if necessary) */ + Inkscape::XML::Node *repr_side; + // TODO: Incorporate this in box3d-side.cpp! for (int i = 0; i < 6; ++i) { - SP_3DBOX(bc.item)->faces[i]->hook_path_to_3dbox(); + repr_side = xml_doc->createElement("svg:path"); + repr_side->setAttribute("sodipodi:type", "inkscape:box3dside"); + repr->addChild(repr_side, NULL); + + Box3DSide *side = SP_BOX3D_SIDE(inkscape_active_document()->getObjectByRepr (repr_side)); + + guint desc = Box3D::int_to_face(i); + + Box3D::Axis plane = (Box3D::Axis) (desc & 0x7); + plane = (Box3D::is_plane(plane) ? plane : Box3D::orth_plane_or_axis(plane)); + side->dir1 = Box3D::extract_first_axis_direction(plane); + side->dir2 = Box3D::extract_second_axis_direction(plane); + side->front_or_rear = (Box3D::FrontOrRear) (desc & 0x8); + + /* Set style */ + box3d_side_apply_style(side); + + SP_OBJECT(side)->updateRepr(); // calls box3d_side_write() and updates, e.g., the axes string description } - // make rear face invisible in the beginning to avoid "flashing" - SP_3DBOX (bc.item)->faces[5]->set_style (NULL, false); + box3d_set_z_orders(SP_BOX3D(bc.item)); bc.item->updateRepr(); - sp_3dbox_set_z_orders (SP_3DBOX (bc.item)); // TODO: It would be nice to show the VPs during dragging, but since there is no selection // at this point (only after finishing the box), we must do this "manually" - bc._vpdrag->updateDraggers(); + /* bc._vpdrag->updateDraggers(); */ sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5); } - // FIXME: remove these extra points - NR::Point pt = bc.drag_ptB; - NR::Point shift_pt = bc.drag_ptC; + g_assert(bc.item); - NR::Rect r; - if (!(state & GDK_SHIFT_MASK)) { - r = Inkscape::snap_rectangular_box(desktop, bc.item, pt, bc.center, state); - } else { - r = Inkscape::snap_rectangular_box(desktop, bc.item, shift_pt, bc.center, state); - } + SPBox3D *box = SP_BOX3D(bc.item); + + box->orig_corner0 = bc.drag_origin_proj; + box->orig_corner7 = bc.drag_ptC_proj; + + box3d_check_for_swapped_coords(box); + + /* we need to call this from here (instead of from box3d_position_set(), for example) + because z-order setting must not interfere with display updates during undo/redo */ + box3d_set_z_orders (box); - SPEventContext *ec = SP_EVENT_CONTEXT(&bc); - NR::Point origin_w(ec->xp, ec->yp); - NR::Point origin(desktop->w2d(origin_w)); - sp_3dbox_position_set(bc); - sp_3dbox_set_z_orders (SP_3DBOX (bc.item)); + 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_3dbox_finish(SP3DBoxContext *bc) +static void sp_box3d_finish(Box3DContext *bc) { bc->_message_context->clear(); + bc->ctrl_dragged = false; + bc->extruded = false; if ( bc->item != NULL ) { - SPDesktop * desktop; + SPDesktop * desktop = SP_EVENT_CONTEXT_DESKTOP(bc); + SPDocument *doc = sp_desktop_document(desktop); + if (!doc || !doc->getCurrentPersp3D()) + return; - desktop = SP_EVENT_CONTEXT_DESKTOP(bc); + SPBox3D *box = SP_BOX3D(bc->item); - SP_OBJECT(bc->item)->updateRepr(); - sp_3dbox_set_ratios(SP_3DBOX(bc->item)); + box->orig_corner0 = bc->drag_origin_proj; + box->orig_corner7 = bc->drag_ptC_proj; + + box->updateRepr(); + + box3d_relabel_corners(box); sp_canvas_end_forced_full_redraws(desktop->canvas); @@ -646,9 +672,14 @@ static void sp_3dbox_finish(SP3DBoxContext *bc) bc->item = NULL; } +} - bc->ctrl_dragged = false; - 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(); + } } /* @@ -660,4 +691,4 @@ static void sp_3dbox_finish(SP3DBoxContext *bc) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :