Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2018-10-05 16:40:14 +0300
committermano-wii <germano.costa@ig.com.br>2018-10-05 16:43:06 +0300
commit44df83a5884163026a3067cf4bf6ce37919ad9da (patch)
tree87e3f08b91aeaf238aca5ab3b32b7b833f14aed0 /source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
parent564d37c4b67af534b6c12d2bebbd7883c3d3817c (diff)
Dial3d Gizmo: consider the offset value in the incremental angle drawing.
This prevents misalignment with the Spin tool gizmo for example.
Diffstat (limited to 'source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c')
-rw-r--r--source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c9
1 files changed, 5 insertions, 4 deletions
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. */