From da9c97afb1d035ac4d716d5d365dc527e4ee732b Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Wed, 26 Dec 2007 22:35:54 +0000 Subject: Recompute box corners relative to new perspective when merging persps (to prevent boxes from jumping randomly) (bzr r4311) --- src/box3d.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/box3d.cpp') 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); -- cgit v1.2.3