diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-10-21 11:53:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-10-28 12:21:07 +0300 |
| commit | 0269f0c574525128113877c1fcfee3682fc2cbca (patch) | |
| tree | df846c7a05b17c9be7570a1c6e1257a880965830 /source/blender/makesdna | |
| parent | 1b1f46a98c9e80b250b02a39ec36384a2c111781 (diff) | |
Tracking: Simplify configuration of intrinsics to refine
Previously, only predefined and limited set of intrinsics combinations
could have been refined. This was caused by a bundle adjustment library
used in the early days of the solver.
Now it is possible to fully customize which intrinsics are to be refined
during camera solving. Internally solver supports per-parameter settings
but in the interface they are grouped as following:
* Focal length
* Optical center
* Radial distortion coefficients (which includes k1, k2, k3, k4)
* Tangential distortion coefficients (which includes p1, p2)
Differential Revision: https://developer.blender.org/D9294
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_tracking_types.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index d0105cda1ea..0bbeabf130f 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -288,8 +288,7 @@ typedef struct MovieTrackingSettings { int reconstruction_flag; /* which camera intrinsics to refine. uses on the REFINE_* flags */ - short refine_camera_intrinsics; - char _pad2[2]; + int refine_camera_intrinsics; /* ** tool settings ** */ @@ -551,10 +550,12 @@ enum { /* MovieTrackingSettings->refine_camera_intrinsics */ enum { + REFINE_NO_INTRINSICS = (0), + REFINE_FOCAL_LENGTH = (1 << 0), REFINE_PRINCIPAL_POINT = (1 << 1), - REFINE_RADIAL_DISTORTION_K1 = (1 << 2), - REFINE_RADIAL_DISTORTION_K2 = (1 << 4), + REFINE_RADIAL_DISTORTION = (1 << 2), + REFINE_TANGENTIAL_DISTORTION = (1 << 3), }; /* MovieTrackingStrabilization->flag */ |