diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index 4467074d0b7229c9dc87ef385d66035e077af23d..63ccf827e740cf4b55c1a632686031a9f104bdcc 100644 (file)
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -545,6 +545,7 @@ static inline Box3D::Axis movement_axis_of_3dbox_corner (guint corner, guint sta
case 7:
return ((state & GDK_SHIFT_MASK) ? Box3D::XY : Box3D::Z);
}
+ return Box3D::NONE;
}
/*
@@ -554,15 +555,16 @@ static inline Box3D::Axis movement_axis_of_3dbox_corner (guint corner, guint sta
*/
// Should we make the threshold settable in the preferences?
-static double remember_snap_threshold = 20;
+static double remember_snap_threshold = 30;
static guint remember_snap_index = 0;
+static guint remember_snap_index_center = 0;
static NR::Point snap_knot_position_3dbox (SP3DBox *box, guint corner, Box3D::Axis direction, NR::Point const &origin, NR::Point const &p, guint state)
{
SPDesktop * desktop = inkscape_active_desktop();
Box3D::Perspective3D *persp = sp_desktop_document (desktop)->get_persp_of_box (box);
- g_return_val_if_fail (!is_single_axis_direction (direction), p);
+ if (is_single_axis_direction (direction)) return p;
Box3D::Axis axis1 = Box3D::extract_first_axis_direction (direction);
Box3D::Axis axis2 = Box3D::extract_second_axis_direction (direction);
@@ -615,6 +617,67 @@ static NR::Point snap_knot_position_3dbox (SP3DBox *box, guint corner, Box3D::Ax
}
}
+static NR::Point snap_center_position_3dbox (SP3DBox *box, NR::Point const &origin, NR::Point const &p)
+{
+ SPDesktop * desktop = inkscape_active_desktop();
+ Box3D::Perspective3D *persp = sp_desktop_document (desktop)->get_persp_of_box (box);
+
+ Box3D::Axis axis1 = Box3D::X;
+ Box3D::Axis axis2 = Box3D::Y;
+
+ NR::Matrix const i2d (sp_item_i2d_affine (SP_ITEM (box)));
+ NR::Point origin_dt = origin * i2d;
+ NR::Point p_dt = p * i2d;
+
+ Box3D::PerspectiveLine pl1 (origin_dt, axis1, persp);
+ Box3D::PerspectiveLine pl2 (origin_dt, axis2, persp);
+ NR::Point midpt1 = sp_3dbox_get_midpoint_in_axis_direction (box->old_corner1, box->old_corner5, Box3D::Z, persp);
+ NR::Point midpt2 = sp_3dbox_get_midpoint_in_axis_direction (box->old_corner3, box->old_corner7, Box3D::Z, persp);
+ Box3D::Line diag1 (origin_dt, midpt1);
+ Box3D::Line diag2 (origin_dt, midpt2);
+
+ int num_snap_lines = 4;
+ NR::Point snap_pts[num_snap_lines];
+
+ // should we snap to the closest point or to the projection along perspective lines?
+ snap_pts[0] = pl1.closest_to (p_dt);
+ snap_pts[1] = pl2.closest_to (p_dt);
+ snap_pts[2] = diag1.closest_to (p_dt);
+ snap_pts[3] = diag2.closest_to (p_dt);
+
+ gdouble const zoom = desktop->current_zoom();
+
+ double snap_dists[num_snap_lines];
+
+ for (int i = 0; i < num_snap_lines; ++i) {
+ snap_dists[i] = NR::L2 (snap_pts[i] - p_dt) * zoom;
+ }
+
+ bool within_tolerance = true;
+ for (int i = 0; i < num_snap_lines; ++i) {
+ if (snap_dists[i] > remember_snap_threshold) {
+ within_tolerance = false;
+ break;
+ }
+ }
+
+ int snap_index = -1;
+ double snap_dist = NR_HUGE;
+ for (int i = 0; i < num_snap_lines; ++i) {
+ if (snap_dists[i] < snap_dist) {
+ snap_index = i;
+ snap_dist = snap_dists[i];
+ }
+ }
+
+ if (within_tolerance) {
+ return snap_pts[remember_snap_index_center] * i2d.inverse();
+ } else {
+ remember_snap_index_center = snap_index;
+ return snap_pts[snap_index] * i2d.inverse();
+ }
+}
+
static NR::Point sp_3dbox_knot_get(SPItem *item, guint knot_id)
{
g_assert(item != NULL);
@@ -645,7 +708,37 @@ static void sp_3dbox_knot_set(SPItem *item, guint knot_id, NR::Point const &new_
sp_3dbox_update_curves (box);
sp_3dbox_set_ratios (box);
sp_3dbox_update_perspective_lines ();
- sp_3dbox_set_z_orders (box);
+ sp_3dbox_set_z_orders_later_on (box);
+}
+
+static void sp_3dbox_knot_center_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ SP3DBox *box = SP_3DBOX(item);
+
+ NR::Matrix const i2d (sp_item_i2d_affine (item));
+ NR::Point new_pt (new_pos);
+
+ if ((state & GDK_CONTROL_MASK) && !(state & GDK_SHIFT_MASK)) {
+ // snap if Ctrl is pressed and movement isn't already constrained to a single axis
+ new_pt = snap_center_position_3dbox (box, origin, new_pos);
+ }
+
+ if (state & GDK_SHIFT_MASK) {
+ sp_3dbox_recompute_Z_corners_from_new_center (box, new_pt * i2d);
+ } else {
+ sp_3dbox_recompute_XY_corners_from_new_center (box, new_pt * i2d);
+ }
+
+ sp_3dbox_update_curves (box);
+ sp_3dbox_set_z_orders_later_on (box);
+}
+
+static NR::Point sp_3dbox_knot_center_get(SPItem *item)
+{
+ NR::Maybe<NR::Point> center = sp_3dbox_get_center(SP_3DBOX(item));
+ if (!center) return NR::Point (0, 0);
+ NR::Matrix const i2d (sp_item_i2d_affine (item));
+ return (*center) * i2d;
}
static void sp_3dbox_knot0_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
_("Resize box along the Z axis; with <b>Shift</b> in X/Y direction; with <b>Ctrl</b> to constrain to the directions of edges or diagonals"));
sp_knot_holder_add(knot_holder, sp_3dbox_knot7_set, sp_3dbox_knot7_get, NULL,
_("Resize box along the Z axis; with <b>Shift</b> in X/Y direction; with <b>Ctrl</b> to constrain to the directions of edges or diagonals"));
+
+ // center dragging
+ sp_knot_holder_add_full(knot_holder, sp_3dbox_knot_center_set, sp_3dbox_knot_center_get, NULL,
+ SP_KNOT_SHAPE_CROSS, SP_KNOT_MODE_XOR,_("Move the box in perspective."));
+
sp_pat_knot_holder(item, knot_holder);
return knot_holder;
static SPKnotHolder *
sp_misc_knot_holder(SPItem *item, SPDesktop *desktop) // FIXME: eliminate, instead make a pattern-drag similar to gradient-drag
{
- if ((SP_OBJECT(item)->style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
+ if ((SP_OBJECT(item)->style->fill.isPaintserver())
&& SP_IS_PATTERN(SP_STYLE_FILL_SERVER(SP_OBJECT(item)->style)))
{
SPKnotHolder *knot_holder = sp_knot_holder_new(desktop, item, NULL);
@@ -1276,7 +1374,7 @@ sp_misc_knot_holder(SPItem *item, SPDesktop *desktop) // FIXME: eliminate, inste
static void
sp_pat_knot_holder(SPItem *item, SPKnotHolder *knot_holder)
{
- if ((SP_OBJECT(item)->style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
+ if ((SP_OBJECT(item)->style->fill.isPaintserver())
&& SP_IS_PATTERN(SP_STYLE_FILL_SERVER(SP_OBJECT(item)->style)))
{
sp_knot_holder_add_full(knot_holder, sp_pattern_xy_set, sp_pattern_xy_get, NULL, SP_KNOT_SHAPE_CROSS, SP_KNOT_MODE_XOR,