Skip to content

Commit 69b77f2

Browse files
committed
simplify barrel rotation and do not try to offset 90
We'll need to add a left-handed preference on the gui instead of trying to make rotation universal
1 parent 198f834 commit 69b77f2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mypaint-brush.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ mypaint_brush_set_state(MyPaintBrush *self, MyPaintBrushState i, float value)
12531253
self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION] = 180;
12541254
} else {
12551255
//converts barrel_ration to degrees, offsets it 90 degrees to make the button at the top be zero. Subtract ascension because it directly affects the rotation values.
1256-
step_barrel_rotation = frac * smallest_angular_difference(self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION],barrel_rotation * 360 + 90 - self->states[MYPAINT_BRUSH_STATE_ASCENSION] -180.0);
1256+
step_barrel_rotation = frac * smallest_angular_difference(self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION],barrel_rotation * 360 - self->states[MYPAINT_BRUSH_STATE_ASCENSION]);
12571257
}
12581258
update_states_and_setting_values (self, step_ddab, step_dx, step_dy, step_dpressure, step_declination, step_ascension, step_dtime, step_viewzoom, step_viewrotation, step_declinationx, step_declinationy, step_barrel_rotation);
12591259
}
@@ -1289,13 +1289,13 @@ mypaint_brush_set_state(MyPaintBrush *self, MyPaintBrushState i, float value)
12891289
step_dtime = dtime_left;
12901290
step_viewzoom = viewzoom;
12911291
step_viewrotation = viewrotation;
1292-
step_barrel_rotation = smallest_angular_difference(self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION], barrel_rotation * 360 - self->states[MYPAINT_BRUSH_STATE_ASCENSION] -180.0);
1292+
step_barrel_rotation = smallest_angular_difference(self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION], barrel_rotation * 360 - self->states[MYPAINT_BRUSH_STATE_ASCENSION]);
12931293
if (barrel_rotation == -1.0) {
12941294
step_barrel_rotation = 0;
12951295
self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION] = 180;
12961296
}
12971297
else {
1298-
step_barrel_rotation = smallest_angular_difference(self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION],barrel_rotation * 360 +90 - self->states[MYPAINT_BRUSH_STATE_ASCENSION] -180.0);
1298+
step_barrel_rotation = smallest_angular_difference(self->states[MYPAINT_BRUSH_STATE_BARREL_ROTATION],barrel_rotation * 360 - self->states[MYPAINT_BRUSH_STATE_ASCENSION]);
12991299
}
13001300

13011301
//dtime_left = 0; but that value is not used any more

0 commit comments

Comments
 (0)