griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

== Scaling Constraints Working in Local-Space ==

Browse Source 
* Patch #5442: "Fix Bone SizeLimit" by Heriberto Mendez (gammarayq21)
'Limit Scale' constraint can now work on bone's local scaling too.

* I've also made the 'Copy Scale' constraint able to use the local scaling
of bones too.
This commit is contained in:
Joshua Leung
2006-12-18 10:17:40 +00:00
parent 019b13b830
commit dbbf45875b
2 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source/blender/blenkernel/intern/armature.c
View File

@@ -1550,6 +1550,24 @@ static void do_local_constraint(bPoseChannel *pchan, bConstraint *con)
}
}
break;
case CONSTRAINT_TYPE_SIZELIKE:
{
bSizeLikeConstraint *data= con->data;
float fac= con->enforce;
if(data->tar && data->subtarget[0]) {
bPoseChannel *pchant= get_pose_channel(data->tar->pose, data->subtarget);
if(pchant) {
if (data->flag & SIZELIKE_X)
pchan->size[0]= FloatLerpf(pchant->size[0], pchan->size[0], fac);
if (data->flag & SIZELIKE_Y)
pchan->size[1]= FloatLerpf(pchant->size[1], pchan->size[1], fac);
if (data->flag & SIZELIKE_Z)
pchan->size[2]= FloatLerpf(pchant->size[2], pchan->size[2], fac);
}
}
}
break;
case CONSTRAINT_TYPE_LOCLIMIT:
{
bLocLimitConstraint *data= con->data;
@@ -1626,6 +1644,37 @@ static void do_local_constraint(bPoseChannel *pchan, bConstraint *con)
EulToQuat(eul, pchan->quat);
}
break;
case CONSTRAINT_TYPE_SIZELIMIT:
{
bSizeLimitConstraint *data= con->data;
float fac= con->enforce;
if (data->flag & LIMIT_XMIN) {
if(pchan->size[0] < data->xmin)
pchan->size[0] = FloatLerpf(data->xmin, pchan->size[0], fac);
}
if (data->flag & LIMIT_XMAX) {
if (pchan->size[0] > data->xmax)
pchan->size[0] = FloatLerpf(data->xmax, pchan->size[0], fac);
}
if (data->flag & LIMIT_YMIN) {
if(pchan->size[1] < data->ymin)
pchan->size[1] = FloatLerpf(data->ymin, pchan->size[1], fac);
}
if (data->flag & LIMIT_YMAX) {
if (pchan->size[1] > data->ymax)
pchan->size[1] = FloatLerpf(data->ymax, pchan->size[1], fac);
}
if (data->flag & LIMIT_ZMIN) {
if(pchan->size[2] < data->zmin)
pchan->size[2] = FloatLerpf(data->zmin, pchan->size[2], fac);
}
if (data->flag & LIMIT_ZMAX) {
if (pchan->size[2] > data->zmax)
pchan->size[2] = FloatLerpf(data->zmax, pchan->size[2], fac);
}
}
break;
}
}

14
source/blender/src/buttons_object.c
View File

@@ -752,6 +752,8 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s
/* Draw XYZ toggles */
uiBlockBeginAlign(block);
if (is_armature_target)
uiDefButBitS(block, TOG, CONSTRAINT_LOCAL, B_CONSTRAINT_TEST, "Local", *xco+((width/2)-98), *yco-64, 50, 18, &con->flag, 0, 24, 0, 0, "Work on a Pose's local transform");
but=uiDefButI(block, TOG|BIT|0, B_CONSTRAINT_TEST, "X", *xco+((width/2)-48), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy X component");
but=uiDefButI(block, TOG|BIT|1, B_CONSTRAINT_TEST, "Y", *xco+((width/2)-16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Y component");
but=uiDefButI(block, TOG|BIT|2, B_CONSTRAINT_TEST, "Z", *xco+((width/2)+16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Z component");
@@ -1103,7 +1105,10 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s
int togButWidth = 50;
int textButWidth = ((width/2)-togButWidth);
height = 78;
if (ob->type == OB_ARMATURE && (ob->flag & OB_POSEMODE))
height = 106;
else
height = 78;
uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-10, *yco-height, width+40,height-1, NULL, 5.0, 0.0, 12, rb_col, "");
/* Draw Pairs of LimitToggle+LimitValue */
@@ -1138,6 +1143,13 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s
uiDefButBitS(block, TOG, LIMIT_ZMAX, B_CONSTRAINT_TEST, "maxZ", *xco+(width-(textButWidth-5)-togButWidth), *yco-72, 50, 18, &data->flag, 0, 24, 0, 0, "Use maximum z value");
uiDefButF(block, NUM, B_CONSTRAINT_TEST, "", *xco+(width-textButWidth-5), *yco-72, (textButWidth-5), 18, &(data->zmax), 0.0001, 1000, 0.1,0.5,"Highest z value to allow");
uiBlockEndAlign(block);
if (ob->type == OB_ARMATURE && (ob->flag & OB_POSEMODE)) {
uiBlockBeginAlign(block);
uiDefBut(block, LABEL, B_CONSTRAINT_TEST,"Co-ordinate Space:",*xco, *yco-100,150,18, NULL, 0.0, 0.0, 0.0, 0.0, "");
uiDefButBitS(block, TOG, CONSTRAINT_LOCAL, B_CONSTRAINT_TEST, "Local", *xco+160, *yco-100, 60, 18, &con->flag, 0, 24, 0, 0, "Work on a Pose's local transform");
uiBlockEndAlign(block);
}
}
break;
case CONSTRAINT_TYPE_RIGIDBODYJOINT: