diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2007-12-26 22:35:54 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2007-12-26 22:35:54 +0000 |
| commit | da9c97afb1d035ac4d716d5d365dc527e4ee732b (patch) | |
| tree | fef96db4b84a5d1f23263ade3dedbd8d09fd4a67 /src/box3d.cpp | |
| parent | check for cairo version (diff) | |
| download | inkscape-da9c97afb1d035ac4d716d5d365dc527e4ee732b.tar.gz inkscape-da9c97afb1d035ac4d716d5d365dc527e4ee732b.zip | |
Recompute box corners relative to new perspective when merging persps (to prevent boxes from jumping randomly)
(bzr r4311)
Diffstat (limited to 'src/box3d.cpp')
| -rw-r--r-- | src/box3d.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/box3d.cpp b/src/box3d.cpp index 0f9f8defe..3397cd6b0 100644 --- a/src/box3d.cpp +++ b/src/box3d.cpp @@ -1428,7 +1428,19 @@ box3d_get_perspective(SPBox3D const *box) { } void -box3d_switch_perspectives(SPBox3D *box, Persp3D *old_persp, Persp3D *new_persp) { +box3d_switch_perspectives(SPBox3D *box, Persp3D *old_persp, Persp3D *new_persp, bool recompute_corners) { + if (recompute_corners) { + box->orig_corner0.normalize(); + box->orig_corner7.normalize(); + double z0 = box->orig_corner0[Proj::Z]; + double z7 = box->orig_corner7[Proj::Z]; + NR::Point corner0_screen = box3d_get_corner_screen(box, 0); + NR::Point corner7_screen = box3d_get_corner_screen(box, 7); + + box->orig_corner0 = new_persp->tmat.preimage(corner0_screen, z0, Proj::Z); + box->orig_corner7 = new_persp->tmat.preimage(corner7_screen, z7, Proj::Z); + } + persp3d_remove_box (old_persp, box); persp3d_add_box (new_persp, box); |