griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#35650] parented camera behavior

Browse Source 
fly mode with parenting was broken for both locked/unlocked parent mode.
This commit is contained in:
Campbell Barton
2013-06-06 19:04:56 +00:00
parent ab87d4daec
commit 9695a50ec4
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/space_view3d/view3d_fly.c
View File

@@ -227,6 +227,9 @@ typedef struct FlyInfo {
/* use for some lag */
float dvec_prev[3]; /* old for some lag */
/* for parenting calculation */
float view_mat_prev[4][4];
} FlyInfo;
static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar), void *arg)
@@ -409,6 +412,8 @@ static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent
/* Done with correcting for the dist */
}
ED_view3d_to_m4(fly->view_mat_prev, fly->rv3d->ofs, fly->rv3d->viewquat, fly->rv3d->dist);
/* center the mouse, probably the UI mafia are against this but without its quite annoying */
WM_cursor_warp(win, fly->ar->winrct.xmin + fly->ar->winx / 2, fly->ar->winrct.ymin + fly->ar->winy / 2);
@@ -731,21 +736,15 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly,
Object *ob_update;
float view_mat[4][4];
float prev_view_mat[4][4];
float prev_view_imat[4][4];
float diff_mat[4][4];
float parent_mat[4][4];
float size_mat[4][4];
ED_view3d_to_m4(prev_view_mat, fly->rv3d->ofs, fly->rv3d->viewquat, fly->rv3d->dist);
invert_m4_m4(prev_view_imat, prev_view_mat);
invert_m4_m4(prev_view_imat, fly->view_mat_prev);
ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist);
mul_m4_m4m4(diff_mat, view_mat, prev_view_imat);
mul_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat);
size_to_mat4(size_mat, fly->root_parent->size);
mul_m4_m4m4(parent_mat, parent_mat, size_mat);
BKE_object_apply_mat4(fly->root_parent, parent_mat, true, false);
// BKE_object_where_is_calc(scene, fly->root_parent);
@@ -756,6 +755,8 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly,
ob_update = ob_update->parent;
}
copy_m4_m4(fly->view_mat_prev, view_mat);
id_key = &fly->root_parent->id;
}
else {
@@ -766,7 +767,7 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly,
size_to_mat4(size_mat, v3d->camera->size);
mul_m4_m4m4(view_mat, view_mat, size_mat);
BKE_object_apply_mat4(v3d->camera, view_mat, true, false);
BKE_object_apply_mat4(v3d->camera, view_mat, true, true);
id_key = &v3d->camera->id;
}