[Bf-blender-cvs] [1b936e8] wiggly-widgets: Change dial to something that resembles current rotation widget better.
Antony Riakiotakis
noreply at git.blender.org
Tue Oct 14 16:20:34 CEST 2014
Commit: 1b936e8ce6b706a6948c5c611d1d256f24782169
Author: Antony Riakiotakis
Date: Tue Oct 14 13:03:30 2014 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB1b936e8ce6b706a6948c5c611d1d256f24782169
Change dial to something that resembles current rotation widget better.
===================================================================
M source/blender/editors/interface/3d_widgets/dial_widget.c
M source/blender/editors/transform/transform_manipulator.c
===================================================================
diff --git a/source/blender/editors/interface/3d_widgets/dial_widget.c b/source/blender/editors/interface/3d_widgets/dial_widget.c
index e14e2e1..002bd02 100644
--- a/source/blender/editors/interface/3d_widgets/dial_widget.c
+++ b/source/blender/editors/interface/3d_widgets/dial_widget.c
@@ -1,523 +1,779 @@
-int _WIDGET_nverts_dial = 160;
-int _WIDGET_ntris_dial = 192;
+int _WIDGET_nverts_dial = 192;
+int _WIDGET_ntris_dial = 384;
float _WIDGET_verts_dial[][3] = {
- {-0.000000, 0.979766, 0.037380},
- {-0.382683, 0.923880, 0.080198},
- {-0.707107, 0.707107, 0.080198},
- {-0.905186, 0.374940, 0.037380},
- {-0.979766, -0.000000, 0.037380},
- {-0.923880, -0.382684, 0.080198},
- {-0.707107, -0.707107, 0.080198},
- {-0.374940, -0.905186, 0.037380},
- {-0.000000, -0.979766, 0.037380},
- {0.382683, -0.923880, 0.080198},
- {0.707107, -0.707107, 0.080198},
- {0.905186, -0.374940, 0.037380},
- {0.979766, 0.000000, 0.037380},
- {0.923879, 0.382684, 0.080198},
- {0.707107, 0.707107, 0.080198},
- {0.374940, 0.905186, 0.037380},
- {-0.000000, 0.799034, 0.037380},
- {-0.298034, 0.719517, 0.080198},
- {-0.550695, 0.550695, 0.080198},
- {-0.738211, 0.305777, 0.037380},
- {-0.799034, -0.000000, 0.037380},
- {-0.719517, -0.298034, 0.080198},
- {-0.550695, -0.550695, 0.080198},
- {-0.305777, -0.738211, 0.037380},
- {-0.000000, -0.799034, 0.037380},
- {0.298034, -0.719517, 0.080198},
- {0.550695, -0.550695, 0.080198},
- {0.738211, -0.305777, 0.037380},
- {0.799034, 0.000000, 0.037380},
- {0.719517, 0.298034, 0.080198},
- {0.550694, 0.550695, 0.080198},
- {0.305777, 0.738211, 0.037380},
- {-0.000000, 0.799034, 0.037380},
- {-0.298034, 0.719517, 0.080198},
- {-0.550695, 0.550695, 0.080198},
- {-0.738211, 0.305777, 0.037380},
- {-0.799034, -0.000000, 0.037380},
- {-0.719517, -0.298034, 0.080198},
- {-0.550695, -0.550695, 0.080198},
- {-0.305777, -0.738211, 0.037380},
- {-0.000000, -0.799034, 0.037380},
- {0.298034, -0.719517, 0.080198},
- {0.550695, -0.550695, 0.080198},
- {0.738211, -0.305777, 0.037380},
- {0.799034, 0.000000, 0.037380},
- {0.719517, 0.298034, 0.080198},
- {0.550694, 0.550695, 0.080198},
- {0.305777, 0.738211, 0.037380},
- {-0.000000, 0.979766, 0.037380},
- {-0.382683, 0.923880, 0.080198},
- {-0.707107, 0.707107, 0.080198},
- {-0.905186, 0.374940, 0.037380},
- {-0.979766, -0.000000, 0.037380},
- {-0.923880, -0.382684, 0.080198},
- {-0.707107, -0.707107, 0.080198},
- {-0.374940, -0.905186, 0.037380},
- {-0.000000, -0.979766, 0.037380},
- {0.382683, -0.923880, 0.080198},
- {0.707107, -0.707107, 0.080198},
- {0.905186, -0.374940, 0.037380},
- {0.979766, 0.000000, 0.037380},
- {0.923879, 0.382684, 0.080198},
- {0.707107, 0.707107, 0.080198},
- {0.374940, 0.905186, 0.037380},
- {0.382683, 0.923880, 0.000000},
- {0.725722, 0.725722, 0.000000},
- {0.948202, 0.392758, 0.000000},
- {1.000000, 0.000000, 0.000000},
- {0.923880, -0.382684, 0.000000},
- {0.725722, -0.725722, 0.000000},
- {0.392758, -0.948202, 0.000000},
- {-0.000000, -1.000000, 0.000000},
- {-0.382683, -0.923880, 0.000000},
- {-0.725722, -0.725722, 0.000000},
- {-0.948202, -0.392758, 0.000000},
- {-1.000000, -0.000000, 0.000000},
- {-0.923880, 0.382683, 0.000000},
- {-0.725722, 0.725722, 0.000000},
- {-0.392758, 0.948202, 0.000000},
- {0.000000, 1.000000, 0.000000},
- {-0.000000, 0.979766, -0.037380},
- {-0.382683, 0.923880, -0.080198},
- {-0.707107, 0.707107, -0.080198},
- {-0.905186, 0.374940, -0.037380},
- {-0.979766, -0.000000, -0.037380},
- {-0.923880, -0.382684, -0.080198},
- {-0.707107, -0.707107, -0.080198},
- {-0.374940, -0.905186, -0.037380},
- {-0.000000, -0.979766, -0.037380},
- {0.382683, -0.923880, -0.080198},
- {0.707107, -0.707107, -0.080198},
- {0.905186, -0.374940, -0.037380},
- {0.979766, 0.000000, -0.037380},
- {0.923879, 0.382684, -0.080198},
- {0.707107, 0.707107, -0.080198},
- {0.374940, 0.905186, -0.037380},
- {-0.000000, 0.799034, -0.037380},
- {-0.298034, 0.719517, -0.080198},
- {-0.550695, 0.550695, -0.080198},
- {-0.738211, 0.305777, -0.037380},
- {-0.799034, -0.000000, -0.037380},
- {-0.719517, -0.298034, -0.080198},
- {-0.550695, -0.550695, -0.080198},
- {-0.305777, -0.738211, -0.037380},
- {-0.000000, -0.799034, -0.037380},
- {0.298034, -0.719517, -0.080198},
- {0.550695, -0.550695, -0.080198},
- {0.738211, -0.305777, -0.037380},
- {0.799034, 0.000000, -0.037380},
- {0.719517, 0.298034, -0.080198},
- {0.550694, 0.550695, -0.080198},
- {0.305777, 0.738211, -0.037380},
- {-0.000000, 0.778800, 0.000000},
- {-0.287395, 0.693834, 0.000000},
- {-0.531037, 0.531037, 0.000000},
- {-0.719517, 0.298034, 0.000000},
- {-0.778800, -0.000000, 0.000000},
- {-0.693834, -0.287395, 0.000000},
- {-0.531037, -0.531037, 0.000000},
- {-0.298034, -0.719517, 0.000000},
- {-0.000000, -0.778800, 0.000000},
- {0.287395, -0.693834, 0.000000},
- {0.531037, -0.531038, 0.000000},
- {0.719517, -0.298034, 0.000000},
- {0.778800, 0.000000, 0.000000},
- {0.693834, 0.287396, 0.000000},
- {0.531037, 0.531038, 0.000000},
- {0.298033, 0.719517, 0.000000},
- {-0.000000, 0.799034, -0.037380},
- {-0.298034, 0.719517, -0.080198},
- {-0.550695, 0.550695, -0.080198},
- {-0.738211, 0.305777, -0.037380},
- {-0.799034, -0.000000, -0.037380},
- {-0.719517, -0.298034, -0.080198},
- {-0.550695, -0.550695, -0.080198},
- {-0.305777, -0.738211, -0.037380},
- {-0.000000, -0.799034, -0.037380},
- {0.298034, -0.719517, -0.080198},
- {0.550695, -0.550695, -0.080198},
- {0.738211, -0.305777, -0.037380},
- {0.799034, 0.000000, -0.037380},
- {0.719517, 0.298034, -0.080198},
- {0.550694, 0.550695, -0.080198},
- {0.305777, 0.738211, -0.037380},
- {-0.000000, 0.979766, -0.037380},
- {-0.382683, 0.923880, -0.080198},
- {-0.707107, 0.707107, -0.080198},
- {-0.905186, 0.374940, -0.037380},
- {-0.979766, -0.000000, -0.037380},
- {-0.923880, -0.382684, -0.080198},
- {-0.707107, -0.707107, -0.080198},
- {-0.374940, -0.905186, -0.037380},
- {-0.000000, -0.979766, -0.037380},
- {0.382683, -0.923880, -0.080198},
- {0.707107, -0.707107, -0.080198},
- {0.905186, -0.374940, -0.037380},
- {0.979766, 0.000000, -0.037380},
- {0.923879, 0.382684, -0.080198},
- {0.707107, 0.707107, -0.080198},
- {0.374940, 0.905186, -0.037380},
+ {1.034000, 0.000000, 0.000000},
+ {1.017000, 0.000000, 0.029445},
+ {0.983000, 0.000000, 0.029445},
+ {0.966000, 0.000000, 0.000000},
+ {0.983000, 0.000000, -0.029445},
+ {1.017000, 0.000000, -0.029445},
+ {1.014132, 0.201723, 0.000000},
+ {0.997459, 0.198407, 0.029445},
+ {0.964112, 0.191774, 0.029445},
+ {0.947439, 0.188457, 0.000000},
+ {0.964112, 0.191774, -0.029445},
+ {0.997459, 0.198407, -0.029445},
+ {0.955292, 0.395695, 0.000000},
+ {0.939586, 0.389189, 0.029445},
+ {0.908174, 0.376178, 0.029445},
+ {0.892468, 0.369672, 0.000000},
+ {0.908174, 0.376178, -0.029445},
+ {0.939586, 0.389189, -0.029445},
+ {0.859740, 0.574460, 0.000000},
+ {0.845605, 0.565015, 0.029445},
+ {0.817335, 0.546126, 0.029445},
+ {0.803200, 0.536681, 0.000000},
+ {0.817335, 0.546126, -0.029445},
+ {0.845605, 0.565015, -0.029445},
+ {0.731148, 0.731148, 0.000000},
+ {0.719128, 0.719128, 0.029445},
+ {0.695086, 0.695086, 0.029445},
+ {0.683065, 0.683065, 0.000000},
+ {0.695086, 0.695086, -0.029445},
+ {0.719128, 0.719128, -0.029445},
+ {0.574460, 0.859740, 0.000000},
+ {0.565015, 0.845605, 0.029445},
+ {0.546125, 0.817335, 0.029445},
+ {0.536681, 0.803200, 0.000000},
+ {0.546125, 0.817335, -0.029445},
+ {0.565015, 0.845605, -0.029445},
+ {0.395695, 0.955291, 0.000000},
+ {0.389189, 0.939585, 0.029445},
+ {0.376178, 0.908173, 0.029445},
+ {0.369672, 0.892467, 0.000000},
+ {0.376178, 0.908173, -0.029445},
+ {0.389189, 0.939585, -0.029445},
+ {0.201724, 1.014132, 0.000000},
+ {0.198407, 0.997459, 0.029445},
+ {0.191774, 0.964112, 0.029445},
+ {0.188457, 0.947439, 0.000000},
+ {0.191774, 0.964112, -0.029445},
+ {0.198407, 0.997459, -0.029445},
+ {0.000000, 1.034000, 0.000000},
+ {0.000000, 1.017000, 0.029445},
+ {0.000000, 0.983000, 0.029445},
+ {0.000000, 0.966000, 0.000000},
+ {0.000000, 0.983000, -0.029445},
+ {0.000000, 1.017000, -0.029445},
+ {-0.201723, 1.014132, 0.000000},
+ {-0.198407, 0.997459, 0.029445},
+ {-0.191774, 0.964112, 0.029445},
+ {-0.188457, 0.947439, 0.000000},
+ {-0.191774, 0.964112, -0.029445},
+ {-0.198407, 0.997459, -0.029445},
+ {-0.395695, 0.955291, 0.000000},
+ {-0.389189, 0.939585, 0.029445},
+ {-0.376178, 0.908174, 0.029445},
+ {-0.369672, 0.892468, 0.000000},
+ {-0.376178, 0.908174, -0.029445},
+ {-0.389189, 0.939585, -0.029445},
+ {-0.574459, 0.859740, 0.000000},
+ {-0.565015, 0.845605, 0.029445},
+ {-0.546125, 0.817335, 0.029445},
+ {-0.536681, 0.803200, 0.000000},
+ {-0.546125, 0.817335, -0.029445},
+ {-0.565015, 0.845605, -0.029445},
+ {-0.731149, 0.731148, 0.000000},
+ {-0.719128, 0.719127, 0.029445},
+ {-0.695086, 0.695086, 0.029445},
+ {-0.683065, 0.683065, 0.000000},
+ {-0.695086, 0.695086, -0.029445},
+ {-0.719128, 0.719127, -0.029445},
+ {-0.859740, 0.574460, 0.000000},
+ {-0.845604, 0.565015, 0.029445},
+ {-0.817335, 0.546126, 0.029445},
+ {-0.803200, 0.536681, 0.000000},
+ {-0.817335, 0.546126, -0.029445},
+ {-0.845604, 0.565015, -0.029445},
+ {-0.955291, 0.395695, 0.000000},
+ {-0.939585, 0.389189, 0.029445},
+ {-0.908173, 0.376178, 0.029445},
+ {-0.892468, 0.369672, 0.000000},
+ {-0.908173, 0.376178, -0.029445},
+ {-0.939585, 0.389189, -0.029445},
+ {-1.014132, 0.201723, 0.000000},
+ {-0.997459, 0.198407, 0.029445},
+ {-0.964112, 0.191774, 0.029445},
+ {-0.947439, 0.188457, 0.000000},
+ {-0.964112, 0.191774, -0.029445},
+ {-0.997459, 0.198407, -
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list