diff --git a/src/box3d.cpp b/src/box3d.cpp
index 6f4253cab8683046f350e5eb6637637b6cdcd46b..93efa5c35183589ea7e604066d7afb9d93e8b52d 100644 (file)
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
#include "line-geometry.h"
#include "persp3d-reference.h"
#include "uri.h"
-#include "2geom/geom.h"
+#include <2geom/line.h>
#include "sp-guide.h"
#include "sp-namedview.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "desktop.h"
#include "desktop-handles.h"
static Inkscape::XML::Node *box3d_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static gchar *box3d_description(SPItem *item);
-static NR::Matrix box3d_set_transform(SPItem *item, NR::Matrix const &xform);
+static Geom::Matrix box3d_set_transform(SPItem *item, Geom::Matrix const &xform);
static void box3d_convert_to_guides(SPItem *item);
static void box3d_ref_changed(SPObject *old_ref, SPObject *ref, SPBox3D *box);
}
}
-static NR::Matrix
-box3d_set_transform(SPItem *item, NR::Matrix const &xform)
+static Geom::Matrix
+box3d_set_transform(SPItem *item, Geom::Matrix const &xform)
{
SPBox3D *box = SP_BOX3D(item);
Persp3D *persp = box3d_get_perspective(box);
Persp3D *transf_persp;
- if (!persp3d_has_all_boxes_in_selection (persp)) {
+ if (sp_desktop_document(inkscape_active_desktop()) == SP_OBJECT_DOCUMENT(item) &&
+ !persp3d_has_all_boxes_in_selection (persp)) {
std::list<SPBox3D *> selboxes = sp_desktop_selection(inkscape_active_desktop())->box3DList();
/* create a new perspective as a copy of the current one and link the selected boxes to it */
persp3d_unset_transforms(transf_persp);
}
- NR::Matrix ret(NR::transform(xform));
+ Geom::Matrix ret(Geom::Matrix(xform).without_translation());
gdouble const sw = hypot(ret[0], ret[1]);
gdouble const sh = hypot(ret[2], ret[3]);
}
}
- return NR::identity();
+ return Geom::identity();
}
Proj::Pt3
@@ -490,7 +491,7 @@ box3d_snap (SPBox3D *box, int id, Proj::Pt3 const &pt_proj, Proj::Pt3 const &sta
// determine the distances to all potential snapping points
double snap_dists[num_snap_lines];
for (int i = 0; i < num_snap_lines; ++i) {
- snap_dists[i] = NR::L2 (snap_pts[i] - pt) * zoom;
+ snap_dists[i] = Geom::L2 (snap_pts[i] - pt) * zoom;
}
// while we are within a given tolerance of the starting point,
static bool
box3d_half_line_crosses_joining_line (Geom::Point const &A, Geom::Point const &B,
Geom::Point const &C, Geom::Point const &D) {
- Geom::Point E; // the point of intersection
Geom::Point n0 = (B - A).ccw();
double d0 = dot(n0,A);
Geom::Point n1 = (D - C).ccw();
double d1 = dot(n1,C);
- Geom::IntersectorKind intersects = Geom::line_intersection(n0, d0, n1, d1, E);
- if (intersects == Geom::coincident || intersects == Geom::parallel) {
+
+ Geom::Line lineAB(A,B);
+ Geom::Line lineCD(C,D);
+
+ Geom::OptCrossing inters = Geom::OptCrossing(); // empty by default
+ try
+ {
+ inters = Geom::intersection(lineAB, lineCD);
+ }
+ catch (Geom::InfiniteSolutions e)
+ {
+ // We're probably dealing with parallel lines, so they don't really cross
+ return false;
+ }
+
+ if (!inters) {
return false;
}
+ Geom::Point E = lineAB.pointAt((*inters).ta); // the point of intersection
+
if ((dot(C,n0) < d0) == (dot(D,n0) < d0)) {
// C and D lie on the same side of the line AB
return false;
v1.normalize();
v2.normalize();
- return (v1[NR::X]*v2[NR::Y] - v1[NR::Y]*v2[NR::X] > 0);
+ return (v1[Geom::X]*v2[Geom::Y] - v1[Geom::Y]*v2[Geom::X] > 0);
}
static inline void
Geom::Point vp_x = persp3d_get_VP(persp, Proj::X).affine();
Geom::Point vp_y = persp3d_get_VP(persp, Proj::Y).affine();
Geom::Point vp_z = persp3d_get_VP(persp, Proj::Z).affine();
- Geom::Point vpx(vp_x[NR::X], vp_x[NR::Y]);
- Geom::Point vpy(vp_y[NR::X], vp_y[NR::Y]);
- Geom::Point vpz(vp_z[NR::X], vp_z[NR::Y]);
+ Geom::Point vpx(vp_x[Geom::X], vp_x[Geom::Y]);
+ Geom::Point vpy(vp_y[Geom::X], vp_y[Geom::Y]);
+ Geom::Point vpz(vp_z[Geom::X], vp_z[Geom::Y]);
Geom::Point c3 = box3d_get_corner_screen(box, 3, false);
- Geom::Point corner3(c3[NR::X], c3[NR::Y]);
+ Geom::Point corner3(c3[Geom::X], c3[Geom::Y]);
if (box3d_half_line_crosses_joining_line (corner3, vpx, vpy, vpz)) {
central_axis = Box3D::X;
Geom::Point c2(box3d_get_corner_screen(box, 2, false));
Geom::Point c7(box3d_get_corner_screen(box, 7, false));
- Geom::Point corner1(c1[NR::X], c1[NR::Y]);
- Geom::Point corner2(c2[NR::X], c2[NR::Y]);
- Geom::Point corner7(c7[NR::X], c7[NR::Y]);
+ Geom::Point corner1(c1[Geom::X], c1[Geom::Y]);
+ Geom::Point corner2(c2[Geom::X], c2[Geom::Y]);
+ Geom::Point corner7(c7[Geom::X], c7[Geom::Y]);
// FIXME: At present we don't use the information about central_corner computed above.
switch (central_axis) {
case Box3D::Y:
@@ -1415,8 +1431,9 @@ box3d_push_back_corner_pair(SPBox3D *box, std::list<std::pair<Geom::Point, Geom:
void
box3d_convert_to_guides(SPItem *item) {
SPBox3D *box = SP_BOX3D(item);
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- if (prefs_get_int_attribute("tools.shapes.3dbox", "convertguides", 1) == 0) {
+ if (!prefs->getBool("/tools/shapes/3dbox/convertguides", true)) {
sp_item_convert_to_guides(SP_ITEM(box));
return;
}