Commit: 44df83a5884163026a3067cf4bf6ce37919ad9da
Author: mano-wii
Date: Fri Oct 5 10:40:14 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB44df83a5884163026a3067cf4bf6ce37919ad9da
Dial3d Gizmo: consider the offset value in the incremental angle drawing.
This prevents misalignment with the Spin tool gizmo for example.
===================================================================
M source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
===================================================================
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 fa8dd38cad6..51a789fee66 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
@@ -194,7 +194,8 @@ static void dial_ghostarc_draw_helpline(
/**
* Draws segments to indicate the position of each increment.
*/
-static void dial_ghostarc_draw_incremental_angle(const float incremental_angle)
+static void dial_ghostarc_draw_incremental_angle(
+ const float incremental_angle, const float offset)
{
const int tot_incr = (2 * M_PI) / incremental_angle;
GPU_line_width(1.0f);
@@ -206,8 +207,8 @@ static void dial_ghostarc_draw_incremental_angle(const
float incremental_angle)
float v[3] = { 0 };
for (int i = 0; i < tot_incr; i++) {
- v[0] = sinf(incremental_angle * i);
- v[1] = cosf(incremental_angle * i);
+ v[0] = sinf(offset + incremental_angle * i);
+ v[1] = cosf(offset + incremental_angle * i);
mul_v2_fl(v, DIAL_WIDTH * 1.1f);
immVertex3fv(pos, v);
@@ -563,7 +564,7 @@ void ED_gizmotypes_dial_3d_draw_util(
}
if (params->angle_increment) {
- dial_ghostarc_draw_incremental_angle(params->angle_increment);
+ dial_ghostarc_draw_incremental_angle(params->angle_increment,
params->angle_ofs);
}
/* Draw actual dial gizmo. */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
