X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fbox3d-context.cpp;h=e3476deb3a00aec82ab547d3c56a08e73a504fd0;hb=11c5de79de3c200331e168a745b0505a50aeffea;hp=d5d367d818b1e75473a8105d49ed182741e938e1;hpb=60d3de07a6473dd321c1d0016f49d13eb06c0884;p=inkscape.git
diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index d5d367d81..e3476deb3 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,67 +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 &rc, guint state);
-static void sp_3dbox_finish(SP3DBoxContext *rc);
+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;
}
-Box3D::Perspective3D * SP3DBoxContext::current_perspective = NULL;
-guint SP3DBoxContext::number_of_handles = 3;
-
-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;
@@ -106,163 +111,133 @@ 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->rx = 0.0;
- box3d_context->ry = 0.0;
-
box3d_context->ctrl_dragged = false;
box3d_context->extruded = false;
- /* create an initial perspective */
- if (!SP3DBoxContext::current_perspective) {
- SP3DBoxContext::current_perspective = new Box3D::Perspective3D (
- // VP in x-direction
- Box3D::VanishingPoint( NR::Point( 50.0, 600.0),
- NR::Point( -1.0, 0.0), Box3D::VP_INFINITE),
- // VP in y-direction
- Box3D::VanishingPoint( NR::Point(500.0,1000.0),
- NR::Point( 0.0, 1.0), Box3D::VP_INFINITE),
- // VP in z-direction
- Box3D::VanishingPoint( NR::Point(700.0, 500.0),
- NR::Point(sqrt(3.0),1.0), Box3D::VP_INFINITE));
- }
-
+ 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();
+
+ if (((SPEventContextClass *) parent_class)->finish) {
+ ((SPEventContextClass *) parent_class)->finish(ec);
+ }
+}
+
+
+static void sp_box3d_context_dispose(GObject *object)
{
- SP3DBoxContext *rc = SP_3DBOX_CONTEXT(object);
+ Box3DContext *bc = SP_BOX3D_CONTEXT(object);
SPEventContext *ec = SP_EVENT_CONTEXT(object);
ec->enableGrDrag(false);
- rc->sel_changed_connection.disconnect();
- rc->sel_changed_connection.~connection();
+ delete (bc->_vpdrag);
+ bc->_vpdrag = NULL;
- /* fixme: This is necessary because we do not grab */
- if (rc->item) {
- sp_3dbox_finish(rc);
- }
+ bc->sel_changed_connection.disconnect();
+ bc->sel_changed_connection.~connection();
- if (ec->shape_knot_holder) {
- sp_knot_holder_destroy(ec->shape_knot_holder);
- ec->shape_knot_holder = NULL;
- }
+ delete ec->shape_editor;
+ ec->shape_editor = 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;
+ /* fixme: This is necessary because we do not grab */
+ if (bc->item) {
+ sp_box3d_finish(bc);
}
- if (rc->_message_context) {
- delete rc->_message_context;
+ if (bc->_message_context) {
+ delete bc->_message_context;
}
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 *rc = SP_3DBOX_CONTEXT(data);
- SPEventContext *ec = SP_EVENT_CONTEXT(rc);
+ 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();
}
+}
- 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);
+/* 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);
+
+ 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 (!has_persp) {
+ document->current_persp3d = persp3d_create_xml_element (document);
+ }
}
-static void sp_3dbox_context_setup(SPEventContext *ec)
+static void sp_box3d_context_setup(SPEventContext *ec)
{
- SP3DBoxContext *rc = SP_3DBOX_CONTEXT(ec);
+ Box3DContext *bc = SP_BOX3D_CONTEXT(ec);
if (((SPEventContextClass *) parent_class)->setup) {
((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);
}
- rc->sel_changed_connection.disconnect();
- rc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged(
- sigc::bind(sigc::ptr_fun(&sp_3dbox_context_selection_changed), (gpointer)rc)
+ bc->sel_changed_connection.disconnect();
+ bc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged(
+ sigc::bind(sigc::ptr_fun(&sp_box3d_context_selection_changed), (gpointer)bc)
);
- sp_event_context_read(ec, "rx");
- sp_event_context_read(ec, "ry");
+ 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();
}
- rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
+ bc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
}
-static void sp_3dbox_context_set(SPEventContext *ec, gchar const *key, gchar const *val)
-{
- SP3DBoxContext *rc = 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 ) {
- rc->rx = ( val
- ? g_ascii_strtod (val, NULL)
- : 0.0 );
- } else if ( strcmp(key, "ry") == 0 ) {
- rc->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;
@@ -287,49 +262,61 @@ 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;
Inkscape::Selection *selection = sp_desktop_selection (desktop);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
- SP3DBoxContext *rc = SP_3DBOX_CONTEXT(event_context);
+ 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, 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));
- rc->drag_origin = button_dt;
- rc->drag_ptB = button_dt;
- rc->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 (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;
- rc->center = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE | Inkscape::Snapper::SNAPPOINT_BBOX,
- button_dt, rc->item).getPoint();
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop, true, bc->item);
+ m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, button_dt, Inkscape::SNAPSOURCE_HANDLE);
+ 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;
@@ -349,47 +336,52 @@ 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));
+ 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_BBOX | Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, rc->item).getPoint();
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop, true, bc->item);
+ m.freeSnapReturnByRef(Inkscape::SnapPreferences::SNAPPOINT_NODE, motion_dt, Inkscape::SNAPSOURCE_HANDLE);
- rc->ctrl_dragged = event->motion.state & GDK_CONTROL_MASK;
+ bc->ctrl_dragged = event->motion.state & GDK_CONTROL_MASK;
- if (event->motion.state & GDK_SHIFT_MASK && !rc->extruded) {
- /* once shift is pressed, set rc->extruded (no need to create further faces;
- all of them are already created in sp_3dbox_init) */
- rc->extruded = true;
+ if (event->motion.state & GDK_SHIFT_MASK && !bc->extruded && bc->item) {
+ // once shift is pressed, set bc->extruded
+ bc->extruded = true;
}
- if (!rc->extruded) {
- rc->drag_ptB = motion_dt;
- rc->drag_ptC = motion_dt;
+ if (!bc->extruded) {
+ bc->drag_ptB = from_2geom(motion_dt);
+ bc->drag_ptC = from_2geom(motion_dt);
+
+ 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;
} else {
// Without Ctrl, motion of the extruded corner is constrained to the
// perspective line from drag_ptB to vanishing point Y.
- if (!rc->ctrl_dragged) {
- rc->drag_ptC = Box3D::perspective_line_snap (rc->drag_ptB, Box3D::Z, motion_dt);
+ if (!bc->ctrl_dragged) {
+ /* snapping */
+ Box3D::PerspectiveLine pline (bc->drag_ptB, Proj::Z, SP_ACTIVE_DOCUMENT->current_persp3d);
+ 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 {
- rc->drag_ptC = motion_dt;
- }
- rc->drag_ptC = m.freeSnap(Inkscape::Snapper::SNAPPOINT_BBOX | Inkscape::Snapper::SNAPPOINT_NODE, rc->drag_ptC, rc->item).getPoint();
- if (rc->ctrl_dragged) {
- Box3D::PerspectiveLine pl1 (NR::Point (event_context->xp, event_context->yp), Box3D::Y);
- Box3D::PerspectiveLine pl2 (rc->drag_ptB, Box3D::X);
- NR::Point corner1 = pl1.meet(pl2);
-
- Box3D::PerspectiveLine pl3 (corner1, Box3D::X);
- Box3D::PerspectiveLine pl4 (rc->drag_ptC, Box3D::Z);
- rc->drag_ptB = pl3.meet(pl4);
+ bc->drag_ptC = from_2geom(motion_dt);
+
+ bc->drag_ptB_proj.normalize();
+ 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, Inkscape::SNAPSOURCE_HANDLE);
+ bc->drag_ptC = from_2geom(pt2g);
}
-
-
- sp_3dbox_drag(*rc, event->motion.state);
-
+
+ sp_box3d_drag(*bc, event->motion.state);
+
ret = TRUE;
}
break;
@@ -397,10 +389,11 @@ static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEven
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(rc);
+ 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) {
@@ -421,23 +414,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:
@@ -447,12 +423,95 @@ static gint sp_3dbox_context_root_handler(SPEventContext *event_context, GdkEven
ret = TRUE;
break;
+ 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;
+
+ /* TODO: what is this???
+ case GDK_O:
+ 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_g:
+ case GDK_G:
+ if (MOD__SHIFT_ONLY) {
+ sp_selection_to_guides(desktop);
+ ret = true;
+ }
+ break;
+
case GDK_x:
case GDK_X:
if (MOD__ALT_ONLY) {
- // desktop->setToolboxFocusTo ("altx-rect");
+ 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__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__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:
@@ -465,9 +524,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(rc);
+ sp_box3d_finish(bc);
}
// do not return true, so that space would work switching to selector
}
@@ -477,22 +537,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;
}
@@ -506,7 +550,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;
@@ -519,71 +563,102 @@ 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 */
+ 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
}
+ box3d_set_z_orders(SP_BOX3D(bc.item));
bc.item->updateRepr();
+ // 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(); ****/
+
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);
- 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);
+ /* 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);
+
+ 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 *rc)
+static void sp_box3d_finish(Box3DContext *bc)
{
- rc->_message_context->clear();
+ bc->_message_context->clear();
+ bc->ctrl_dragged = false;
+ bc->extruded = false;
+
+ if ( bc->item != NULL ) {
+ SPDesktop * desktop = SP_EVENT_CONTEXT_DESKTOP(bc);
+ SPDocument *doc = sp_desktop_document(desktop);
+ if (!doc || !doc->current_persp3d)
+ return;
+
+ SPBox3D *box = SP_BOX3D(bc->item);
- if ( rc->item != NULL ) {
- SPDesktop * desktop;
+ box->orig_corner0 = bc->drag_origin_proj;
+ box->orig_corner7 = bc->drag_ptC_proj;
- desktop = SP_EVENT_CONTEXT_DESKTOP(rc);
+ box->updateRepr();
- SP_OBJECT(rc->item)->updateRepr();
+ box3d_relabel_corners(box);
sp_canvas_end_forced_full_redraws(desktop->canvas);
- sp_desktop_selection(desktop)->set(rc->item);
+ sp_desktop_selection(desktop)->set(bc->item);
sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_3DBOX,
_("Create 3D box"));
- rc->item = NULL;
+ bc->item = NULL;
}
+}
- rc->ctrl_dragged = false;
- rc->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();
+ }
}
/*