archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Dial3d Gizmo: consider the offset value in the incremental angle drawing.

Browse Source 
This prevents misalignment with the Spin tool gizmo for example.
This commit is contained in:
Germano Cavalcante
2018-10-05 10:40:14 -03:00
parent 564d37c4b6
commit 44df83a588
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
View File

@@ -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. */