Revision: 27097
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27097
Author: theeth
Date: 2010-02-23 00:25:34 +0100 (Tue, 23 Feb 2010)
Log Message:
-----------
Move increment value into numinput structure.
Easier for transform to have different values per transform then (also
different from gears values).
(Based on a bug reported by Jonathan Smith)
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/include/ED_numinput.h
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/util/numinput.c
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c
2010-02-22 23:04:49 UTC (rev 27096)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c
2010-02-22 23:25:34 UTC (rev 27097)
@@ -436,6 +436,7 @@
initNumInput(&mm->num);
mm->num.idx_max = 0; /* one axis */
mm->num.flag |= NUM_NO_FRACTION;
+ mm->num.increment = 1.0f;
for (a=0, marker= markers->first; marker; marker= marker->next) {
if (marker->flag & SELECT) {
@@ -617,7 +618,7 @@
float vec[3];
char str_tx[256];
- if (handleNumInput(&mm->num, evt, 1.0))
+ if (handleNumInput(&mm->num, evt))
{
applyNumInput(&mm->num, vec);
outputNumInput(&mm->num, str_tx);
Modified: trunk/blender/source/blender/editors/include/ED_numinput.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_numinput.h 2010-02-22
23:04:49 UTC (rev 27096)
+++ trunk/blender/source/blender/editors/include/ED_numinput.h 2010-02-22
23:25:34 UTC (rev 27097)
@@ -33,6 +33,7 @@
char inv[3]; /* If the value is inverted or not
*/
float val[3]; /* Direct value of the input
*/
int ctrl[3]; /* Control to indicate what to do with the numbers
that are typed */
+ float increment;
} NumInput ;
/* NUMINPUT FLAGS */
@@ -48,7 +49,7 @@
void outputNumInput(NumInput *n, char *str);
short hasNumInput(NumInput *n);
void applyNumInput(NumInput *n, float *vec);
-char handleNumInput(NumInput *n, struct wmEvent *event, float increment);
+char handleNumInput(NumInput *n, struct wmEvent *event);
#define NUM_MODAL_INCREMENT_UP 18
#define NUM_MODAL_INCREMENT_DOWN 19
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2010-02-22
23:04:49 UTC (rev 27096)
+++ trunk/blender/source/blender/editors/transform/transform.c 2010-02-22
23:25:34 UTC (rev 27097)
@@ -721,7 +721,7 @@
}
// Modal numinput events
- t->redraw |= handleNumInput(&(t->num), event, t->snap[1]);
+ t->redraw |= handleNumInput(&(t->num), event);
}
/* else do non-mapped events */
else if (event->val==KM_PRESS) {
@@ -974,7 +974,7 @@
}
// Numerical input events
- t->redraw |= handleNumInput(&(t->num), event, t->snap[1]);
+ t->redraw |= handleNumInput(&(t->num), event);
// NDof input events
switch(handleNDofInput(&(t->ndof), event))
@@ -2081,6 +2081,8 @@
t->snap[1] = 5.0f;
t->snap[2] = 1.0f;
+ t->num.increment = 1.0f;
+
t->flag |= T_NO_CONSTRAINT;
/* we need min/max in view space */
@@ -2237,6 +2239,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = 0.1f;
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -2363,6 +2367,8 @@
t->snap[0] = 0.0f;
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+
+ t->num.increment = t->snap[1];
}
static void headerResize(TransInfo *t, float vec[3], char *str) {
@@ -2614,6 +2620,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
t->num.flag |= NUM_NULL_ONE | NUM_NO_NEGATIVE;
t->flag |= T_NO_CONSTRAINT;
@@ -2705,6 +2713,8 @@
t->snap[1] = (float)((5.0/180)*M_PI);
t->snap[2] = t->snap[1] * 0.2f;
+ t->num.increment = 1.0f;
+
if (t->flag & T_2D_EDIT)
t->flag |= T_NO_CONSTRAINT;
@@ -3032,6 +3042,8 @@
t->snap[1] = (float)((5.0/180)*M_PI);
t->snap[2] = t->snap[1] * 0.2f;
+ t->num.increment = 1.0f;
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -3149,6 +3161,8 @@
t->snap[0] = 0.0f;
t->snap[1] = t->snap[2] = 1.0f;
}
+
+ t->num.increment = t->snap[1];
}
static void headerTranslation(TransInfo *t, float vec[3], char *str) {
@@ -3339,6 +3353,8 @@
t->snap[1] = 1.0f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_CONSTRAINT;
}
}
@@ -3413,6 +3429,8 @@
t->snap[1] = (float)((5.0/180)*M_PI);
t->snap[2] = t->snap[1] * 0.2f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -3482,6 +3500,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_ZERO;
t->num.flag |= NUM_NO_ZERO;
@@ -3551,6 +3571,8 @@
t->snap[0] = 0.0f;
t->snap[1] = 1.0f;
t->snap[2] = t->snap[1] * 0.1f;
+
+ t->num.increment = t->snap[1];
}
@@ -3639,6 +3661,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
/* DON'T KNOW WHY THIS IS NEEDED */
if (G.editBMesh->imval[0] == 0 && G.editBMesh->imval[1] == 0) {
/* save the initial mouse co */
@@ -3748,6 +3772,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -3819,6 +3845,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -3893,6 +3921,8 @@
t->snap[0] = 0.0f;
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+
+ t->num.increment = t->snap[1];
}
static void headerBoneSize(TransInfo *t, float vec[3], char *str) {
@@ -4009,6 +4039,8 @@
t->snap[1] = 0.1f;
t->snap[2] = t->snap[1] * 0.1f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -4586,6 +4618,8 @@
t->snap[1] = (float)((5.0/180)*M_PI);
t->snap[2] = t->snap[1] * 0.2f;
+ t->num.increment = t->snap[1];
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -4754,6 +4788,8 @@
t->snap[1] = (float)((5.0/180)*M_PI);
t->snap[2] = t->snap[1] * 0.2f;
+ t->num.increment = 1.0f;
+
t->flag |= T_NO_CONSTRAINT;
}
@@ -4814,6 +4850,8 @@
t->snap[0] = 0.0f;
t->snap[1] = 1.0f;
t->snap[2] = t->snap[1] * 0.1f;
+
+ t->num.increment = t->snap[1];
}
int BakeTime(TransInfo *t, short mval[2])
@@ -5031,6 +5069,8 @@
t->snap[0] = 0.0f;
t->snap[1] = floor(t->scene->r.frs_sec / t->scene->r.frs_sec_base);
t->snap[2] = 10.0f;
+
+ t->num.increment = t->snap[1];
}
static void headerSeqSlide(TransInfo *t, float val[2], char *str)
@@ -5246,6 +5286,8 @@
/* initialise snap like for everything else */
t->snap[0] = 0.0f;
t->snap[1] = t->snap[2] = 1.0f;
+
+ t->num.increment = t->snap[1];
}
static void headerTimeTranslate(TransInfo *t, char *str)
@@ -5392,6 +5434,8 @@
/* initialise snap like for everything else */
t->snap[0] = 0.0f;
t->snap[1] = t->snap[2] = 1.0f;
+
+ t->num.increment = t->snap[1];
}
static void headerTimeSlide(TransInfo *t, float sval, char *str)
@@ -5524,6 +5568,8 @@
/* initialise snap like for everything else */
t->snap[0] = 0.0f;
t->snap[1] = t->snap[2] = 1.0f;
+
+ t->num.increment = t->snap[1];
}
static void headerTimeScale(TransInfo *t, char *str) {
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2010-02-22 23:04:49 UTC (rev 27096)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2010-02-22 23:25:34 UTC (rev 27097)
@@ -859,7 +859,8 @@
setlinestyle(0);
glBegin(GL_LINE_STRIP);
glVertex3fv(v1);
- glVertex3fv(v2);
+ glVertex3fv(center);
+// glVertex3fv(v2);
glEnd();
glPopMatrix();
Modified: trunk/blender/source/blender/editors/util/numinput.c
===================================================================
--- trunk/blender/source/blender/editors/util/numinput.c 2010-02-22
23:04:49 UTC (rev 27096)
+++ trunk/blender/source/blender/editors/util/numinput.c 2010-02-22
23:25:34 UTC (rev 27097)
@@ -159,7 +159,7 @@
}
}
-char handleNumInput(NumInput *n, wmEvent *event, float increment)
+char handleNumInput(NumInput *n, wmEvent *event)
{
float Val = 0;
short idx = n->idx, idx_max = n->idx_max;
@@ -170,13 +170,13 @@
if (!n->ctrl[idx])
n->ctrl[idx] = 1;
- n->val[idx] += increment;
+ n->val[idx] += n->increment;
break;
case NUM_MODAL_INCREMENT_DOWN:
if (!n->ctrl[idx])
n->ctrl[idx] = 1;
- n->val[idx] -= increment;
+ n->val[idx] -= n->increment;
break;
default:
return 0;
@@ -300,6 +300,8 @@
}
}
+ printf("%f\n", n->val[idx]);
+
/* REDRAW SINCE NUMBERS HAVE CHANGED */
return 1;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
