From 0a3b66cfb573a91ba3b19f30ead4a026bdfa6873 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Sep 2018 14:58:20 +1000 Subject: Gizmo: dial3d option to get angles w/o wrapping Needed for spinning multiple revolutions. --- source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/gizmo_library') diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c index 4acd033a6e2..7ceb46f20de 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c @@ -267,8 +267,10 @@ static void dial_ghostarc_get_angles( } inter->prev.angle = delta; + const bool wrap_angle = RNA_boolean_get(gz->ptr, "wrap_angle"); + const double delta_final = (double)delta + ((2 * M_PI) * (double)inter->rotations); *r_start = start; - *r_delta = fmod(delta + 2.0f * (float)M_PI * inter->rotations, 2 * (float)M_PI); + *r_delta = (float)(wrap_angle ? fmod(delta_final, 2 * M_PI) : delta_final); return; /* If we can't project (unlikely). */ @@ -492,6 +494,7 @@ static void GIZMO_GT_dial_3d(wmGizmoType *gzt) {0, NULL, 0, NULL, NULL} }; RNA_def_enum_flag(gzt->srna, "draw_options", rna_enum_draw_options, 0, "Draw Options", ""); + RNA_def_boolean(gzt->srna, "wrap_angle", true, "Wrap Angle", ""); WM_gizmotype_target_property_def(gzt, "offset", PROP_FLOAT, 1); } -- cgit v1.2.3