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

Transform fun

Browse Source 
extracting params in split transform operators.

work in progress still, but lots of fun with operator replay (F6)
This commit is contained in:
Martin Poirier
2009-03-06 15:50:15 +00:00
parent aeef01559e
commit c07acfb4fd
10 changed files with 570 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/editors/transform/transform_constraints.c
View File

@@ -90,6 +90,28 @@
static void drawObjectConstraint(TransInfo *t);
/* ************************** CONSTRAINTS ************************* */
void constraintAutoValues(TransInfo *t, float vec[3])
{
int mode = t->con.mode;
if (mode & CON_APPLY)
{
float nval = (t->flag & T_NULL_ONE)?1.0f:0.0f;
if ((mode & CON_AXIS0) == 0)
{
vec[0] = nval;
}
if ((mode & CON_AXIS1) == 0)
{
vec[1] = nval;
}
if ((mode & CON_AXIS2) == 0)
{
vec[2] = nval;
}
}
}
void constraintNumInput(TransInfo *t, float vec[3])
{
int mode = t->con.mode;
@@ -99,6 +121,8 @@ void constraintNumInput(TransInfo *t, float vec[3])
if (getConstraintSpaceDimension(t) == 2) {
int axis = mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
if (axis == (CON_AXIS0|CON_AXIS1)) {
vec[0] = vec[0];
vec[1] = vec[1];
vec[2] = nval;
}
else if (axis == (CON_AXIS1|CON_AXIS2)) {
@@ -107,12 +131,14 @@ void constraintNumInput(TransInfo *t, float vec[3])
vec[0] = nval;
}
else if (axis == (CON_AXIS0|CON_AXIS2)) {
vec[0] = vec[0];
vec[2] = vec[1];
vec[1] = nval;
}
}
else if (getConstraintSpaceDimension(t) == 1) {
if (mode & CON_AXIS0) {
vec[0] = vec[0];
vec[1] = nval;
vec[2] = nval;
}
@@ -152,6 +178,12 @@ static void postConstraintChecks(TransInfo *t, float vec[3], float pvec[3]) {
applyNumInput(&t->num, vec);
constraintNumInput(t, vec);
}
if (t->flag & T_AUTOVALUES)
{
VECCOPY(vec, t->auto_values);
constraintAutoValues(t, vec);
}
if (t->con.mode & CON_AXIS0) {
pvec[i++] = vec[0];
@@ -522,9 +554,9 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[]) {
*/
void setUserConstraint(TransInfo *t, int mode, const char ftext[]) {
char text[40];
short twmode= (t->spacetype==SPACE_VIEW3D)? ((View3D*)t->view)->twmode: V3D_MANIP_GLOBAL;
//short twmode= (t->spacetype==SPACE_VIEW3D)? ((View3D*)t->view)->twmode: V3D_MANIP_GLOBAL;
switch(twmode) {
switch(t->current_orientation) {
case V3D_MANIP_GLOBAL:
{
float mtx[3][3];
@@ -772,7 +804,7 @@ void drawPropCircle(TransInfo *t)
}
set_inverted_drawing(1);
drawcircball(GL_LINE_LOOP, t->center, t->propsize, imat);
drawcircball(GL_LINE_LOOP, t->center, t->prop_size, imat);
set_inverted_drawing(0);
glPopMatrix();