style cleanup: key.c
This commit is contained in:
@@ -65,16 +65,17 @@
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
||||
#define KEY_MODE_DUMMY 0 /* use where mode isn't checked for */
|
||||
#define KEY_MODE_BPOINT 1
|
||||
#define KEY_MODE_BEZTRIPLE 2
|
||||
#define KEY_MODE_DUMMY 0 /* use where mode isn't checked for */
|
||||
#define KEY_MODE_BPOINT 1
|
||||
#define KEY_MODE_BEZTRIPLE 2
|
||||
|
||||
// old defines from DNA_ipo_types.h for data-type
|
||||
#define IPO_FLOAT 4
|
||||
#define IPO_BEZTRIPLE 100
|
||||
#define IPO_BPOINT 101
|
||||
// old defines from DNA_ipo_types.h for data-type
|
||||
#define IPO_FLOAT 4
|
||||
#define IPO_BEZTRIPLE 100
|
||||
#define IPO_BPOINT 101
|
||||
|
||||
int slurph_opt= 1;
|
||||
/* extern, not threadsafe */
|
||||
int slurph_opt = 1;
|
||||
|
||||
|
||||
void free_key(Key *key)
|
||||
@@ -83,7 +84,7 @@ void free_key(Key *key)
|
||||
|
||||
BKE_free_animdata((ID *)key);
|
||||
|
||||
while ( (kb= key->block.first) ) {
|
||||
while ( (kb = key->block.first) ) {
|
||||
|
||||
if (kb->data) MEM_freeN(kb->data);
|
||||
|
||||
@@ -97,7 +98,7 @@ void free_key_nolib(Key *key)
|
||||
{
|
||||
KeyBlock *kb;
|
||||
|
||||
while ( (kb= key->block.first) ) {
|
||||
while ( (kb = key->block.first) ) {
|
||||
|
||||
if (kb->data) MEM_freeN(kb->data);
|
||||
|
||||
@@ -115,50 +116,55 @@ void free_key_nolib(Key *key)
|
||||
* well. I expect we'll sort it out soon... */
|
||||
|
||||
/* from blendef: */
|
||||
#define GS(a) (*((short *)(a)))
|
||||
#define GS(a) (*((short *)(a)))
|
||||
|
||||
/* from misc_util: flip the bytes from x */
|
||||
/* #define GS(x) (((unsigned char *)(x))[0] << 8 | ((unsigned char *)(x))[1]) */
|
||||
|
||||
Key *add_key(ID *id) /* common function */
|
||||
Key *add_key(ID *id) /* common function */
|
||||
{
|
||||
Key *key;
|
||||
char *el;
|
||||
|
||||
key= alloc_libblock(&G.main->key, ID_KE, "Key");
|
||||
key = alloc_libblock(&G.main->key, ID_KE, "Key");
|
||||
|
||||
key->type= KEY_NORMAL;
|
||||
key->from= id;
|
||||
key->type = KEY_NORMAL;
|
||||
key->from = id;
|
||||
|
||||
key->uidgen = 1;
|
||||
|
||||
// XXX the code here uses some defines which will soon be depreceated...
|
||||
if ( GS(id->name)==ID_ME) {
|
||||
el= key->elemstr;
|
||||
|
||||
el[0]= 3;
|
||||
el[1]= IPO_FLOAT;
|
||||
el[2]= 0;
|
||||
|
||||
key->elemsize= 12;
|
||||
}
|
||||
else if ( GS(id->name)==ID_LT) {
|
||||
el= key->elemstr;
|
||||
|
||||
el[0]= 3;
|
||||
el[1]= IPO_FLOAT;
|
||||
el[2]= 0;
|
||||
|
||||
key->elemsize= 12;
|
||||
}
|
||||
else if ( GS(id->name)==ID_CU) {
|
||||
el= key->elemstr;
|
||||
|
||||
el[0]= 4;
|
||||
el[1]= IPO_BPOINT;
|
||||
el[2]= 0;
|
||||
|
||||
key->elemsize= 16;
|
||||
/* XXX the code here uses some defines which will soon be depreceated... */
|
||||
switch (GS(id->name)) {
|
||||
case ID_ME:
|
||||
el = key->elemstr;
|
||||
|
||||
el[0] = 3;
|
||||
el[1] = IPO_FLOAT;
|
||||
el[2] = 0;
|
||||
|
||||
key->elemsize = 12;
|
||||
|
||||
break;
|
||||
case ID_LT:
|
||||
el = key->elemstr;
|
||||
|
||||
el[0] = 3;
|
||||
el[1] = IPO_FLOAT;
|
||||
el[2] = 0;
|
||||
|
||||
key->elemsize = 12;
|
||||
|
||||
break;
|
||||
case ID_CU:
|
||||
el = key->elemstr;
|
||||
|
||||
el[0] = 4;
|
||||
el[1] = IPO_BPOINT;
|
||||
el[2] = 0;
|
||||
|
||||
key->elemsize = 16;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
return key;
|
||||
@@ -169,21 +175,21 @@ Key *copy_key(Key *key)
|
||||
Key *keyn;
|
||||
KeyBlock *kbn, *kb;
|
||||
|
||||
if (key==NULL) return NULL;
|
||||
if (key == NULL) return NULL;
|
||||
|
||||
keyn= copy_libblock(&key->id);
|
||||
keyn = copy_libblock(&key->id);
|
||||
|
||||
BLI_duplicatelist(&keyn->block, &key->block);
|
||||
|
||||
kb= key->block.first;
|
||||
kbn= keyn->block.first;
|
||||
kb = key->block.first;
|
||||
kbn = keyn->block.first;
|
||||
while (kbn) {
|
||||
|
||||
if (kbn->data) kbn->data= MEM_dupallocN(kbn->data);
|
||||
if (kb==key->refkey) keyn->refkey= kbn;
|
||||
if (kbn->data) kbn->data = MEM_dupallocN(kbn->data);
|
||||
if (kb == key->refkey) keyn->refkey = kbn;
|
||||
|
||||
kbn= kbn->next;
|
||||
kb= kb->next;
|
||||
kbn = kbn->next;
|
||||
kb = kb->next;
|
||||
}
|
||||
|
||||
return keyn;
|
||||
@@ -195,23 +201,23 @@ Key *copy_key_nolib(Key *key)
|
||||
Key *keyn;
|
||||
KeyBlock *kbn, *kb;
|
||||
|
||||
if (key==0) return 0;
|
||||
if (key == 0) return 0;
|
||||
|
||||
keyn= MEM_dupallocN(key);
|
||||
keyn = MEM_dupallocN(key);
|
||||
|
||||
keyn->adt = NULL;
|
||||
|
||||
BLI_duplicatelist(&keyn->block, &key->block);
|
||||
|
||||
kb= key->block.first;
|
||||
kbn= keyn->block.first;
|
||||
kb = key->block.first;
|
||||
kbn = keyn->block.first;
|
||||
while (kbn) {
|
||||
|
||||
if (kbn->data) kbn->data= MEM_dupallocN(kbn->data);
|
||||
if (kb==key->refkey) keyn->refkey= kbn;
|
||||
if (kbn->data) kbn->data = MEM_dupallocN(kbn->data);
|
||||
if (kb == key->refkey) keyn->refkey = kbn;
|
||||
|
||||
kbn= kbn->next;
|
||||
kb= kb->next;
|
||||
kbn = kbn->next;
|
||||
kb = kb->next;
|
||||
}
|
||||
|
||||
return keyn;
|
||||
@@ -224,9 +230,9 @@ void make_local_key(Key *key)
|
||||
* - only local users: set flag
|
||||
* - mixed: make copy
|
||||
*/
|
||||
if (key==NULL) return;
|
||||
if (key == NULL) return;
|
||||
|
||||
key->id.lib= NULL;
|
||||
key->id.lib = NULL;
|
||||
new_id(NULL, &key->id, NULL);
|
||||
}
|
||||
|
||||
@@ -241,7 +247,7 @@ void sort_keys(Key *key)
|
||||
KeyBlock *kb2;
|
||||
|
||||
/* locate the key which is out of position */
|
||||
for (kb= key->block.first; kb; kb= kb->next)
|
||||
for (kb = key->block.first; kb; kb = kb->next)
|
||||
if ((kb->next) && (kb->pos > kb->next->pos))
|
||||
break;
|
||||
|
||||
@@ -251,7 +257,7 @@ void sort_keys(Key *key)
|
||||
BLI_remlink(&key->block, kb);
|
||||
|
||||
/* find the right location and insert before */
|
||||
for (kb2=key->block.first; kb2; kb2= kb2->next) {
|
||||
for (kb2 = key->block.first; kb2; kb2 = kb2->next) {
|
||||
if (kb2->pos > kb->pos) {
|
||||
BLI_insertlink(&key->block, kb2->prev, kb);
|
||||
break;
|
||||
@@ -260,7 +266,7 @@ void sort_keys(Key *key)
|
||||
}
|
||||
|
||||
/* new rule; first key is refkey, this to match drawing channels... */
|
||||
key->refkey= key->block.first;
|
||||
key->refkey = key->block.first;
|
||||
}
|
||||
|
||||
/**************** do the key ****************/
|
||||
@@ -269,30 +275,30 @@ void key_curve_position_weights(float t, float *data, int type)
|
||||
{
|
||||
float t2, t3, fc;
|
||||
|
||||
if (type==KEY_LINEAR) {
|
||||
data[0]= 0.0f;
|
||||
data[1]= -t + 1.0f;
|
||||
data[2]= t;
|
||||
data[3]= 0.0f;
|
||||
if (type == KEY_LINEAR) {
|
||||
data[0] = 0.0f;
|
||||
data[1] = -t + 1.0f;
|
||||
data[2] = t;
|
||||
data[3] = 0.0f;
|
||||
}
|
||||
else if (type==KEY_CARDINAL) {
|
||||
t2= t*t;
|
||||
t3= t2*t;
|
||||
fc= 0.71f;
|
||||
|
||||
data[0]= -fc*t3 + 2.0f*fc*t2 - fc*t;
|
||||
data[1]= (2.0f-fc)*t3 + (fc-3.0f)*t2 + 1.0f;
|
||||
data[2]= (fc-2.0f)*t3 + (3.0f-2.0f*fc)*t2 + fc*t;
|
||||
data[3]= fc*t3 - fc*t2;
|
||||
}
|
||||
else if (type==KEY_BSPLINE) {
|
||||
t2= t*t;
|
||||
t3= t2*t;
|
||||
else if (type == KEY_CARDINAL) {
|
||||
t2 = t * t;
|
||||
t3 = t2 * t;
|
||||
fc = 0.71f;
|
||||
|
||||
data[0]= -0.16666666f*t3 + 0.5f*t2 - 0.5f*t + 0.16666666f;
|
||||
data[1]= 0.5f*t3 - t2 + 0.6666666f;
|
||||
data[2]= -0.5f*t3 + 0.5f*t2 + 0.5f*t + 0.16666666f;
|
||||
data[3]= 0.16666666f*t3;
|
||||
data[0] = -fc * t3 + 2.0f * fc * t2 - fc * t;
|
||||
data[1] = (2.0f - fc) * t3 + (fc - 3.0f) * t2 + 1.0f;
|
||||
data[2] = (fc - 2.0f) * t3 + (3.0f - 2.0f * fc) * t2 + fc * t;
|
||||
data[3] = fc * t3 - fc * t2;
|
||||
}
|
||||
else if (type == KEY_BSPLINE) {
|
||||
t2 = t * t;
|
||||
t3 = t2 * t;
|
||||
|
||||
data[0] = -0.16666666f * t3 + 0.5f * t2 - 0.5f * t + 0.16666666f;
|
||||
data[1] = 0.5f * t3 - t2 + 0.66666666f;
|
||||
data[2] = -0.5f * t3 + 0.5f * t2 + 0.5f * t + 0.16666666f;
|
||||
data[3] = 0.16666666f * t3;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -301,28 +307,28 @@ void key_curve_tangent_weights(float t, float *data, int type)
|
||||
{
|
||||
float t2, fc;
|
||||
|
||||
if (type==KEY_LINEAR) {
|
||||
data[0]= 0.0f;
|
||||
data[1]= -1.0f;
|
||||
data[2]= 1.0f;
|
||||
data[3]= 0.0f;
|
||||
if (type == KEY_LINEAR) {
|
||||
data[0] = 0.0f;
|
||||
data[1] = -1.0f;
|
||||
data[2] = 1.0f;
|
||||
data[3] = 0.0f;
|
||||
}
|
||||
else if (type==KEY_CARDINAL) {
|
||||
t2= t*t;
|
||||
fc= 0.71f;
|
||||
|
||||
data[0]= -3.0f*fc*t2 +4.0f*fc*t - fc;
|
||||
data[1]= 3.0f*(2.0f-fc)*t2 +2.0f*(fc-3.0f)*t;
|
||||
data[2]= 3.0f*(fc-2.0f)*t2 +2.0f*(3.0f-2.0f*fc)*t + fc;
|
||||
data[3]= 3.0f*fc*t2 -2.0f*fc*t;
|
||||
}
|
||||
else if (type==KEY_BSPLINE) {
|
||||
t2= t*t;
|
||||
else if (type == KEY_CARDINAL) {
|
||||
t2 = t * t;
|
||||
fc = 0.71f;
|
||||
|
||||
data[0]= -0.5f*t2 + t - 0.5f;
|
||||
data[1]= 1.5f*t2 - 2.0f*t;
|
||||
data[2]= -1.5f*t2 + t + 0.5f;
|
||||
data[3]= 0.5f*t2;
|
||||
data[0] = -3.0f * fc * t2 + 4.0f * fc * t - fc;
|
||||
data[1] = 3.0f * (2.0f - fc) * t2 + 2.0f * (fc - 3.0f) * t;
|
||||
data[2] = 3.0f * (fc - 2.0f) * t2 + 2.0f * (3.0f - 2.0f * fc) * t + fc;
|
||||
data[3] = 3.0f * fc * t2 - 2.0f * fc * t;
|
||||
}
|
||||
else if (type == KEY_BSPLINE) {
|
||||
t2 = t * t;
|
||||
|
||||
data[0] = -0.5f * t2 + t - 0.5f;
|
||||
data[1] = 1.5f * t2 - 2.0f * t;
|
||||
data[2] = -1.5f * t2 + t + 0.5f;
|
||||
data[3] = 0.5f * t2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -331,25 +337,25 @@ void key_curve_normal_weights(float t, float *data, int type)
|
||||
{
|
||||
float fc;
|
||||
|
||||
if (type==KEY_LINEAR) {
|
||||
data[0]= 0.0f;
|
||||
data[1]= 0.0f;
|
||||
data[2]= 0.0f;
|
||||
data[3]= 0.0f;
|
||||
if (type == KEY_LINEAR) {
|
||||
data[0] = 0.0f;
|
||||
data[1] = 0.0f;
|
||||
data[2] = 0.0f;
|
||||
data[3] = 0.0f;
|
||||
}
|
||||
else if (type==KEY_CARDINAL) {
|
||||
fc= 0.71f;
|
||||
|
||||
data[0]= -6.0f*fc*t + 4.0f*fc;
|
||||
data[1]= 6.0f*(2.0f-fc)*t + 2.0f*(fc-3.0f);
|
||||
data[2]= 6.0f*(fc-2.0f)*t + 2.0f*(3.0f-2.0f*fc);
|
||||
data[3]= 6.0f*fc*t - 2.0f*fc;
|
||||
else if (type == KEY_CARDINAL) {
|
||||
fc = 0.71f;
|
||||
|
||||
data[0] = -6.0f * fc * t + 4.0f * fc;
|
||||
data[1] = 6.0f * (2.0f - fc) * t + 2.0f * (fc - 3.0f);
|
||||
data[2] = 6.0f * (fc - 2.0f) * t + 2.0f * (3.0f - 2.0f * fc);
|
||||
data[3] = 6.0f * fc * t - 2.0f * fc;
|
||||
}
|
||||
else if (type==KEY_BSPLINE) {
|
||||
data[0]= -1.0f*t + 1.0f;
|
||||
data[1]= 3.0f*t - 2.0f;
|
||||
data[2]= -3.0f*t + 1.0f;
|
||||
data[3]= 1.0f*t;
|
||||
else if (type == KEY_BSPLINE) {
|
||||
data[0] = -1.0f * t + 1.0f;
|
||||
data[1] = 3.0f * t - 2.0f;
|
||||
data[2] = -3.0f * t + 1.0f;
|
||||
data[3] = 1.0f * t;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -357,106 +363,108 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
|
||||
{
|
||||
/* return 1 means k[2] is the position, return 0 means interpolate */
|
||||
KeyBlock *k1, *firstkey;
|
||||
float d, dpos, ofs=0, lastpos, temp, fval[4];
|
||||
float d, dpos, ofs = 0, lastpos, temp, fval[4];
|
||||
short bsplinetype;
|
||||
|
||||
firstkey= lb->first;
|
||||
k1= lb->last;
|
||||
lastpos= k1->pos;
|
||||
dpos= lastpos - firstkey->pos;
|
||||
firstkey = lb->first;
|
||||
k1 = lb->last;
|
||||
lastpos = k1->pos;
|
||||
dpos = lastpos - firstkey->pos;
|
||||
|
||||
if (fac < firstkey->pos) fac= firstkey->pos;
|
||||
else if (fac > k1->pos) fac= k1->pos;
|
||||
if (fac < firstkey->pos) fac = firstkey->pos;
|
||||
else if (fac > k1->pos) fac = k1->pos;
|
||||
|
||||
k1=k[0]=k[1]=k[2]=k[3]= firstkey;
|
||||
t[0]=t[1]=t[2]=t[3]= k1->pos;
|
||||
k1 = k[0] = k[1] = k[2] = k[3] = firstkey;
|
||||
t[0] = t[1] = t[2] = t[3] = k1->pos;
|
||||
|
||||
/* if (fac<0.0 || fac>1.0) return 1; */
|
||||
|
||||
if (k1->next==NULL) return 1;
|
||||
if (k1->next == NULL) return 1;
|
||||
|
||||
if (cycl) { /* pre-sort */
|
||||
k[2]= k1->next;
|
||||
k[3]= k[2]->next;
|
||||
if (k[3]==NULL) k[3]=k1;
|
||||
if (cycl) { /* pre-sort */
|
||||
k[2] = k1->next;
|
||||
k[3] = k[2]->next;
|
||||
if (k[3] == NULL) k[3] = k1;
|
||||
while (k1) {
|
||||
if (k1->next==NULL) k[0]=k1;
|
||||
k1=k1->next;
|
||||
if (k1->next == NULL) k[0] = k1;
|
||||
k1 = k1->next;
|
||||
}
|
||||
/* k1= k[1]; */ /* UNUSED */
|
||||
t[0]= k[0]->pos;
|
||||
t[1]+= dpos;
|
||||
t[2]= k[2]->pos + dpos;
|
||||
t[3]= k[3]->pos + dpos;
|
||||
fac+= dpos;
|
||||
ofs= dpos;
|
||||
if (k[3]==k[1]) {
|
||||
t[3]+= dpos;
|
||||
ofs= 2.0f*dpos;
|
||||
t[0] = k[0]->pos;
|
||||
t[1] += dpos;
|
||||
t[2] = k[2]->pos + dpos;
|
||||
t[3] = k[3]->pos + dpos;
|
||||
fac += dpos;
|
||||
ofs = dpos;
|
||||
if (k[3] == k[1]) {
|
||||
t[3] += dpos;
|
||||
ofs = 2.0f * dpos;
|
||||
}
|
||||
if (fac<t[1]) fac+= dpos;
|
||||
k1= k[3];
|
||||
if (fac < t[1]) fac += dpos;
|
||||
k1 = k[3];
|
||||
}
|
||||
else { /* pre-sort */
|
||||
k[2]= k1->next;
|
||||
t[2]= k[2]->pos;
|
||||
k[3]= k[2]->next;
|
||||
if (k[3]==NULL) k[3]= k[2];
|
||||
t[3]= k[3]->pos;
|
||||
k1= k[3];
|
||||
else { /* pre-sort */
|
||||
k[2] = k1->next;
|
||||
t[2] = k[2]->pos;
|
||||
k[3] = k[2]->next;
|
||||
if (k[3] == NULL) k[3] = k[2];
|
||||
t[3] = k[3]->pos;
|
||||
k1 = k[3];
|
||||
}
|
||||
|
||||
while ( t[2]<fac ) { /* find correct location */
|
||||
if (k1->next==NULL) {
|
||||
while (t[2] < fac) { /* find correct location */
|
||||
if (k1->next == NULL) {
|
||||
if (cycl) {
|
||||
k1= firstkey;
|
||||
ofs+= dpos;
|
||||
k1 = firstkey;
|
||||
ofs += dpos;
|
||||
}
|
||||
else if (t[2]==t[3]) break;
|
||||
else if (t[2] == t[3]) break;
|
||||
}
|
||||
else k1= k1->next;
|
||||
else k1 = k1->next;
|
||||
|
||||
t[0]= t[1];
|
||||
k[0]= k[1];
|
||||
t[1]= t[2];
|
||||
k[1]= k[2];
|
||||
t[2]= t[3];
|
||||
k[2]= k[3];
|
||||
t[3]= k1->pos+ofs;
|
||||
k[3]= k1;
|
||||
t[0] = t[1];
|
||||
k[0] = k[1];
|
||||
t[1] = t[2];
|
||||
k[1] = k[2];
|
||||
t[2] = t[3];
|
||||
k[2] = k[3];
|
||||
t[3] = k1->pos + ofs;
|
||||
k[3] = k1;
|
||||
|
||||
if (ofs > 2.1f + lastpos) break;
|
||||
}
|
||||
|
||||
bsplinetype= 0;
|
||||
if (k[1]->type==KEY_BSPLINE || k[2]->type==KEY_BSPLINE) bsplinetype= 1;
|
||||
bsplinetype = 0;
|
||||
if (k[1]->type == KEY_BSPLINE || k[2]->type == KEY_BSPLINE) bsplinetype = 1;
|
||||
|
||||
|
||||
if (cycl==0) {
|
||||
if (bsplinetype==0) { /* B spline doesn't go through the control points */
|
||||
if (fac<=t[1]) { /* fac for 1st key */
|
||||
t[2]= t[1];
|
||||
k[2]= k[1];
|
||||
if (cycl == 0) {
|
||||
if (bsplinetype == 0) { /* B spline doesn't go through the control points */
|
||||
if (fac <= t[1]) { /* fac for 1st key */
|
||||
t[2] = t[1];
|
||||
k[2] = k[1];
|
||||
return 1;
|
||||
}
|
||||
if (fac>=t[2] ) { /* fac after 2nd key */
|
||||
if (fac >= t[2]) { /* fac after 2nd key */
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else if (fac>t[2]) { /* last key */
|
||||
fac= t[2];
|
||||
k[3]= k[2];
|
||||
t[3]= t[2];
|
||||
else if (fac > t[2]) { /* last key */
|
||||
fac = t[2];
|
||||
k[3] = k[2];
|
||||
t[3] = t[2];
|
||||
}
|
||||
}
|
||||
|
||||
d= t[2]-t[1];
|
||||
d = t[2] - t[1];
|
||||
if (d == 0.0f) {
|
||||
if (bsplinetype==0) {
|
||||
return 1; /* both keys equal */
|
||||
if (bsplinetype == 0) {
|
||||
return 1; /* both keys equal */
|
||||
}
|
||||
}
|
||||
else d= (fac-t[1])/d;
|
||||
else {
|
||||
d = (fac - t[1]) / d;
|
||||
}
|
||||
|
||||
/* interpolation */
|
||||
|
||||
@@ -465,11 +473,11 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
|
||||
if (k[1]->type != k[2]->type) {
|
||||
key_curve_position_weights(d, fval, k[2]->type);
|
||||
|
||||
temp= 1.0f-d;
|
||||
t[0]= temp*t[0]+ d*fval[0];
|
||||
t[1]= temp*t[1]+ d*fval[1];
|
||||
t[2]= temp*t[2]+ d*fval[2];
|
||||
t[3]= temp*t[3]+ d*fval[3];
|
||||
temp = 1.0f - d;
|
||||
t[0] = temp * t[0] + d * fval[0];
|
||||
t[1] = temp * t[1] + d * fval[1];
|
||||
t[2] = temp * t[2] + d * fval[2];
|
||||
t[3] = temp * t[3] + d * fval[3];
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -480,8 +488,8 @@ static void flerp(int tot, float *in, float *f0, float *f1, float *f2, float *f3
|
||||
{
|
||||
int a;
|
||||
|
||||
for (a=0; a<tot; a++) {
|
||||
in[a]= t[0]*f0[a]+t[1]*f1[a]+t[2]*f2[a]+t[3]*f3[a];
|
||||
for (a = 0; a < tot; a++) {
|
||||
in[a] = t[0] * f0[a] + t[1] * f1[a] + t[2] * f2[a] + t[3] * f3[a];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -489,8 +497,8 @@ static void rel_flerp(int tot, float *in, float *ref, float *out, float fac)
|
||||
{
|
||||
int a;
|
||||
|
||||
for (a=0; a<tot; a++) {
|
||||
in[a]-= fac*(ref[a]-out[a]);
|
||||
for (a = 0; a < tot; a++) {
|
||||
in[a] -= fac * (ref[a] - out[a]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -506,24 +514,24 @@ static char *key_block_get_data(Key *key, KeyBlock *actkb, KeyBlock *kb, char **
|
||||
float (*co)[3];
|
||||
int a;
|
||||
|
||||
me= (Mesh*)key->from;
|
||||
me = (Mesh *)key->from;
|
||||
|
||||
if (me->edit_btmesh && me->edit_btmesh->bm->totvert == kb->totelem) {
|
||||
a= 0;
|
||||
co= MEM_callocN(sizeof(float)*3*me->edit_btmesh->bm->totvert, "key_block_get_data");
|
||||
a = 0;
|
||||
co = MEM_callocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data");
|
||||
|
||||
BM_ITER(eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH, NULL) {
|
||||
copy_v3_v3(co[a], eve->co);
|
||||
a++;
|
||||
}
|
||||
|
||||
*freedata= (char*)co;
|
||||
return (char*)co;
|
||||
*freedata = (char *)co;
|
||||
return (char *)co;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*freedata= NULL;
|
||||
*freedata = NULL;
|
||||
return kb->data;
|
||||
}
|
||||
|
||||
@@ -531,33 +539,33 @@ static char *key_block_get_data(Key *key, KeyBlock *actkb, KeyBlock *kb, char **
|
||||
/* currently only the first value of 'ofs' may be set. */
|
||||
static short key_pointer_size(const Key *key, const int mode, int *poinsize, int *ofs)
|
||||
{
|
||||
if (key->from==NULL) {
|
||||
if (key->from == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
switch(GS(key->from->name)) {
|
||||
case ID_ME:
|
||||
*ofs= sizeof(float)*3;
|
||||
*poinsize= *ofs;
|
||||
break;
|
||||
case ID_LT:
|
||||
*ofs= sizeof(float)*3;
|
||||
*poinsize= *ofs;
|
||||
break;
|
||||
case ID_CU:
|
||||
if (mode == KEY_MODE_BPOINT) {
|
||||
*ofs= sizeof(float)*4;
|
||||
*poinsize= *ofs;
|
||||
}
|
||||
else {
|
||||
ofs[0]= sizeof(float)*12;
|
||||
*poinsize= (*ofs) / 3;
|
||||
}
|
||||
switch (GS(key->from->name)) {
|
||||
case ID_ME:
|
||||
*ofs = sizeof(float) * 3;
|
||||
*poinsize = *ofs;
|
||||
break;
|
||||
case ID_LT:
|
||||
*ofs = sizeof(float) * 3;
|
||||
*poinsize = *ofs;
|
||||
break;
|
||||
case ID_CU:
|
||||
if (mode == KEY_MODE_BPOINT) {
|
||||
*ofs = sizeof(float) * 4;
|
||||
*poinsize = *ofs;
|
||||
}
|
||||
else {
|
||||
ofs[0] = sizeof(float) * 12;
|
||||
*poinsize = (*ofs) / 3;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
BLI_assert(!"invalid 'key->from' ID type");
|
||||
return FALSE;
|
||||
break;
|
||||
default:
|
||||
BLI_assert(!"invalid 'key->from' ID type");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
@@ -566,108 +574,113 @@ static short key_pointer_size(const Key *key, const int mode, int *poinsize, int
|
||||
static void cp_key(const int start, int end, const int tot, char *poin, Key *key, KeyBlock *actkb, KeyBlock *kb, float *weights, const int mode)
|
||||
{
|
||||
float ktot = 0.0, kd = 0.0;
|
||||
int elemsize, poinsize = 0, a, *ofsp, ofs[32], flagflo=0;
|
||||
int elemsize, poinsize = 0, a, *ofsp, ofs[32], flagflo = 0;
|
||||
char *k1, *kref, *freek1, *freekref;
|
||||
char *cp, elemstr[8];
|
||||
|
||||
/* currently always 0, in future key_pointer_size may assign */
|
||||
ofs[1]= 0;
|
||||
ofs[1] = 0;
|
||||
|
||||
if (!key_pointer_size(key, mode, &poinsize, &ofs[0]))
|
||||
return;
|
||||
|
||||
if (end>tot) end= tot;
|
||||
if (end > tot) end = tot;
|
||||
|
||||
if (tot != kb->totelem) {
|
||||
ktot= 0.0;
|
||||
flagflo= 1;
|
||||
ktot = 0.0;
|
||||
flagflo = 1;
|
||||
if (kb->totelem) {
|
||||
kd= kb->totelem/(float)tot;
|
||||
kd = kb->totelem / (float)tot;
|
||||
}
|
||||
else {
|
||||
return;
|
||||
}
|
||||
else return;
|
||||
}
|
||||
|
||||
k1= key_block_get_data(key, actkb, kb, &freek1);
|
||||
kref= key_block_get_data(key, actkb, key->refkey, &freekref);
|
||||
k1 = key_block_get_data(key, actkb, kb, &freek1);
|
||||
kref = key_block_get_data(key, actkb, key->refkey, &freekref);
|
||||
|
||||
/* this exception is needed for slurphing */
|
||||
if (start!=0) {
|
||||
if (start != 0) {
|
||||
|
||||
poin+= poinsize*start;
|
||||
poin += poinsize * start;
|
||||
|
||||
if (flagflo) {
|
||||
ktot+= start*kd;
|
||||
a= (int)floor(ktot);
|
||||
ktot += start * kd;
|
||||
a = (int)floor(ktot);
|
||||
if (a) {
|
||||
ktot-= a;
|
||||
k1+= a*key->elemsize;
|
||||
ktot -= a;
|
||||
k1 += a * key->elemsize;
|
||||
}
|
||||
}
|
||||
else k1+= start*key->elemsize;
|
||||
else k1 += start * key->elemsize;
|
||||
}
|
||||
|
||||
if (mode == KEY_MODE_BEZTRIPLE) {
|
||||
elemstr[0]= 1;
|
||||
elemstr[1]= IPO_BEZTRIPLE;
|
||||
elemstr[2]= 0;
|
||||
elemstr[0] = 1;
|
||||
elemstr[1] = IPO_BEZTRIPLE;
|
||||
elemstr[2] = 0;
|
||||
}
|
||||
|
||||
/* just do it here, not above! */
|
||||
elemsize= key->elemsize;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) elemsize*= 3;
|
||||
elemsize = key->elemsize;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) elemsize *= 3;
|
||||
|
||||
for (a=start; a<end; a++) {
|
||||
cp= key->elemstr;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) cp= elemstr;
|
||||
for (a = start; a < end; a++) {
|
||||
cp = key->elemstr;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) cp = elemstr;
|
||||
|
||||
ofsp= ofs;
|
||||
|
||||
while ( cp[0] ) {
|
||||
|
||||
switch(cp[1]) {
|
||||
case IPO_FLOAT:
|
||||
if (weights) {
|
||||
memcpy(poin, kref, sizeof(float)*3);
|
||||
if (*weights!=0.0f)
|
||||
rel_flerp(cp[0], (float *)poin, (float *)kref, (float *)k1, *weights);
|
||||
weights++;
|
||||
}
|
||||
else
|
||||
memcpy(poin, k1, sizeof(float)*3);
|
||||
break;
|
||||
case IPO_BPOINT:
|
||||
memcpy(poin, k1, sizeof(float)*4);
|
||||
break;
|
||||
case IPO_BEZTRIPLE:
|
||||
memcpy(poin, k1, sizeof(float)*12);
|
||||
break;
|
||||
default:
|
||||
/* should never happen */
|
||||
if (freek1) MEM_freeN(freek1);
|
||||
if (freekref) MEM_freeN(freekref);
|
||||
BLI_assert(!"invalid 'cp[1]'");
|
||||
return;
|
||||
ofsp = ofs;
|
||||
|
||||
while (cp[0]) {
|
||||
|
||||
switch (cp[1]) {
|
||||
case IPO_FLOAT:
|
||||
if (weights) {
|
||||
memcpy(poin, kref, sizeof(float) * 3);
|
||||
if (*weights != 0.0f)
|
||||
rel_flerp(cp[0], (float *)poin, (float *)kref, (float *)k1, *weights);
|
||||
weights++;
|
||||
}
|
||||
else {
|
||||
memcpy(poin, k1, sizeof(float) * 3);
|
||||
}
|
||||
break;
|
||||
case IPO_BPOINT:
|
||||
memcpy(poin, k1, sizeof(float) * 4);
|
||||
break;
|
||||
case IPO_BEZTRIPLE:
|
||||
memcpy(poin, k1, sizeof(float) * 12);
|
||||
break;
|
||||
default:
|
||||
/* should never happen */
|
||||
if (freek1) MEM_freeN(freek1);
|
||||
if (freekref) MEM_freeN(freekref);
|
||||
BLI_assert(!"invalid 'cp[1]'");
|
||||
return;
|
||||
}
|
||||
|
||||
poin+= ofsp[0];
|
||||
cp+= 2; ofsp++;
|
||||
poin += ofsp[0];
|
||||
cp += 2; ofsp++;
|
||||
}
|
||||
|
||||
/* are we going to be nasty? */
|
||||
if (flagflo) {
|
||||
ktot+= kd;
|
||||
ktot += kd;
|
||||
while (ktot >= 1.0f) {
|
||||
ktot -= 1.0f;
|
||||
k1+= elemsize;
|
||||
kref+= elemsize;
|
||||
k1 += elemsize;
|
||||
kref += elemsize;
|
||||
}
|
||||
}
|
||||
else {
|
||||
k1+= elemsize;
|
||||
kref+= elemsize;
|
||||
k1 += elemsize;
|
||||
kref += elemsize;
|
||||
}
|
||||
|
||||
if (mode == KEY_MODE_BEZTRIPLE) a+=2;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) {
|
||||
a += 2;
|
||||
}
|
||||
}
|
||||
|
||||
if (freek1) MEM_freeN(freek1);
|
||||
@@ -679,26 +692,27 @@ static void cp_cu_key(Curve *cu, Key *key, KeyBlock *actkb, KeyBlock *kb, const
|
||||
Nurb *nu;
|
||||
int a, step, a1, a2;
|
||||
|
||||
for (a=0, nu=cu->nurb.first; nu; nu=nu->next, a+=step) {
|
||||
for (a = 0, nu = cu->nurb.first; nu; nu = nu->next, a += step) {
|
||||
if (nu->bp) {
|
||||
step= nu->pntsu*nu->pntsv;
|
||||
step = nu->pntsu * nu->pntsv;
|
||||
|
||||
a1= MAX2(a, start);
|
||||
a2= MIN2(a+step, end);
|
||||
a1 = MAX2(a, start);
|
||||
a2 = MIN2(a + step, end);
|
||||
|
||||
if (a1<a2) cp_key(a1, a2, tot, out, key, actkb, kb, NULL, KEY_MODE_BPOINT);
|
||||
if (a1 < a2) cp_key(a1, a2, tot, out, key, actkb, kb, NULL, KEY_MODE_BPOINT);
|
||||
}
|
||||
else if (nu->bezt) {
|
||||
step= 3*nu->pntsu;
|
||||
step = 3 * nu->pntsu;
|
||||
|
||||
/* exception because keys prefer to work with complete blocks */
|
||||
a1= MAX2(a, start);
|
||||
a2= MIN2(a+step, end);
|
||||
a1 = MAX2(a, start);
|
||||
a2 = MIN2(a + step, end);
|
||||
|
||||
if (a1<a2) cp_key(a1, a2, tot, out, key, actkb, kb, NULL, KEY_MODE_BEZTRIPLE);
|
||||
if (a1 < a2) cp_key(a1, a2, tot, out, key, actkb, kb, NULL, KEY_MODE_BEZTRIPLE);
|
||||
}
|
||||
else {
|
||||
step = 0;
|
||||
}
|
||||
else
|
||||
step= 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -711,90 +725,87 @@ void do_rel_key(const int start, int end, const int tot, char *basispoin, Key *k
|
||||
int poinsize;
|
||||
|
||||
/* currently always 0, in future key_pointer_size may assign */
|
||||
ofs[1]= 0;
|
||||
ofs[1] = 0;
|
||||
|
||||
if (!key_pointer_size(key, mode, &poinsize, &ofs[0]))
|
||||
return;
|
||||
|
||||
if (end>tot) end= tot;
|
||||
if (end > tot) end = tot;
|
||||
|
||||
/* in case of beztriple */
|
||||
elemstr[0]= 1; /* nr of ipofloats */
|
||||
elemstr[1]= IPO_BEZTRIPLE;
|
||||
elemstr[2]= 0;
|
||||
elemstr[0] = 1; /* nr of ipofloats */
|
||||
elemstr[1] = IPO_BEZTRIPLE;
|
||||
elemstr[2] = 0;
|
||||
|
||||
/* just here, not above! */
|
||||
elemsize= key->elemsize;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) elemsize*= 3;
|
||||
elemsize = key->elemsize;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) elemsize *= 3;
|
||||
|
||||
/* step 1 init */
|
||||
cp_key(start, end, tot, basispoin, key, actkb, key->refkey, NULL, mode);
|
||||
|
||||
/* step 2: do it */
|
||||
|
||||
for (kb=key->block.first; kb; kb=kb->next) {
|
||||
if (kb!=key->refkey) {
|
||||
float icuval= kb->curval;
|
||||
for (kb = key->block.first; kb; kb = kb->next) {
|
||||
if (kb != key->refkey) {
|
||||
float icuval = kb->curval;
|
||||
|
||||
/* only with value, and no difference allowed */
|
||||
if (!(kb->flag & KEYBLOCK_MUTE) && icuval!=0.0f && kb->totelem==tot) {
|
||||
if (!(kb->flag & KEYBLOCK_MUTE) && icuval != 0.0f && kb->totelem == tot) {
|
||||
KeyBlock *refb;
|
||||
float weight, *weights= kb->weights;
|
||||
float weight, *weights = kb->weights;
|
||||
|
||||
/* reference now can be any block */
|
||||
refb= BLI_findlink(&key->block, kb->relative);
|
||||
if (refb==NULL) continue;
|
||||
refb = BLI_findlink(&key->block, kb->relative);
|
||||
if (refb == NULL) continue;
|
||||
|
||||
poin= basispoin;
|
||||
from= key_block_get_data(key, actkb, kb, &freefrom);
|
||||
reffrom= key_block_get_data(key, actkb, refb, &freereffrom);
|
||||
poin = basispoin;
|
||||
from = key_block_get_data(key, actkb, kb, &freefrom);
|
||||
reffrom = key_block_get_data(key, actkb, refb, &freereffrom);
|
||||
|
||||
poin += start * poinsize;
|
||||
reffrom += key->elemsize * start; // key elemsize yes!
|
||||
from += key->elemsize * start;
|
||||
|
||||
poin+= start*poinsize;
|
||||
reffrom+= key->elemsize*start; // key elemsize yes!
|
||||
from+= key->elemsize*start;
|
||||
for (b = start; b < end; b++) {
|
||||
|
||||
for (b=start; b<end; b++) {
|
||||
|
||||
if (weights)
|
||||
weight= *weights * icuval;
|
||||
else
|
||||
weight= icuval;
|
||||
weight = weights ? (*weights * icuval) : icuval;
|
||||
|
||||
cp= key->elemstr;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) cp= elemstr;
|
||||
cp = key->elemstr;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) cp = elemstr;
|
||||
|
||||
ofsp= ofs;
|
||||
ofsp = ofs;
|
||||
|
||||
while ( cp[0] ) { /* cp[0]==amount */
|
||||
while (cp[0]) { /* cp[0]==amount */
|
||||
|
||||
switch(cp[1]) {
|
||||
case IPO_FLOAT:
|
||||
rel_flerp(3, (float *)poin, (float *)reffrom, (float *)from, weight);
|
||||
break;
|
||||
case IPO_BPOINT:
|
||||
rel_flerp(4, (float *)poin, (float *)reffrom, (float *)from, weight);
|
||||
break;
|
||||
case IPO_BEZTRIPLE:
|
||||
rel_flerp(12, (float *)poin, (float *)reffrom, (float *)from, weight);
|
||||
break;
|
||||
default:
|
||||
/* should never happen */
|
||||
if (freefrom) MEM_freeN(freefrom);
|
||||
if (freereffrom) MEM_freeN(freereffrom);
|
||||
BLI_assert(!"invalid 'cp[1]'");
|
||||
return;
|
||||
switch (cp[1]) {
|
||||
case IPO_FLOAT:
|
||||
rel_flerp(3, (float *)poin, (float *)reffrom, (float *)from, weight);
|
||||
break;
|
||||
case IPO_BPOINT:
|
||||
rel_flerp(4, (float *)poin, (float *)reffrom, (float *)from, weight);
|
||||
break;
|
||||
case IPO_BEZTRIPLE:
|
||||
rel_flerp(12, (float *)poin, (float *)reffrom, (float *)from, weight);
|
||||
break;
|
||||
default:
|
||||
/* should never happen */
|
||||
if (freefrom) MEM_freeN(freefrom);
|
||||
if (freereffrom) MEM_freeN(freereffrom);
|
||||
BLI_assert(!"invalid 'cp[1]'");
|
||||
return;
|
||||
}
|
||||
|
||||
poin+= ofsp[0];
|
||||
poin += ofsp[0];
|
||||
|
||||
cp+= 2;
|
||||
cp += 2;
|
||||
ofsp++;
|
||||
}
|
||||
|
||||
reffrom+= elemsize;
|
||||
from+= elemsize;
|
||||
reffrom += elemsize;
|
||||
from += elemsize;
|
||||
|
||||
if (mode == KEY_MODE_BEZTRIPLE) b+= 2;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) b += 2;
|
||||
if (weights) weights++;
|
||||
}
|
||||
|
||||
@@ -811,194 +822,194 @@ static void do_key(const int start, int end, const int tot, char *poin, Key *key
|
||||
float k1tot = 0.0, k2tot = 0.0, k3tot = 0.0, k4tot = 0.0;
|
||||
float k1d = 0.0, k2d = 0.0, k3d = 0.0, k4d = 0.0;
|
||||
int a, ofs[32], *ofsp;
|
||||
int flagdo= 15, flagflo=0, elemsize, poinsize=0;
|
||||
int flagdo = 15, flagflo = 0, elemsize, poinsize = 0;
|
||||
char *k1, *k2, *k3, *k4, *freek1, *freek2, *freek3, *freek4;
|
||||
char *cp, elemstr[8];
|
||||
|
||||
/* currently always 0, in future key_pointer_size may assign */
|
||||
ofs[1]= 0;
|
||||
ofs[1] = 0;
|
||||
|
||||
if (!key_pointer_size(key, mode, &poinsize, &ofs[0]))
|
||||
return;
|
||||
|
||||
if (end>tot) end= tot;
|
||||
if (end > tot) end = tot;
|
||||
|
||||
k1= key_block_get_data(key, actkb, k[0], &freek1);
|
||||
k2= key_block_get_data(key, actkb, k[1], &freek2);
|
||||
k3= key_block_get_data(key, actkb, k[2], &freek3);
|
||||
k4= key_block_get_data(key, actkb, k[3], &freek4);
|
||||
k1 = key_block_get_data(key, actkb, k[0], &freek1);
|
||||
k2 = key_block_get_data(key, actkb, k[1], &freek2);
|
||||
k3 = key_block_get_data(key, actkb, k[2], &freek3);
|
||||
k4 = key_block_get_data(key, actkb, k[3], &freek4);
|
||||
|
||||
/* test for more or less points (per key!) */
|
||||
if (tot != k[0]->totelem) {
|
||||
k1tot= 0.0;
|
||||
k1tot = 0.0;
|
||||
flagflo |= 1;
|
||||
if (k[0]->totelem) {
|
||||
k1d= k[0]->totelem/(float)tot;
|
||||
k1d = k[0]->totelem / (float)tot;
|
||||
}
|
||||
else flagdo -= 1;
|
||||
}
|
||||
if (tot != k[1]->totelem) {
|
||||
k2tot= 0.0;
|
||||
k2tot = 0.0;
|
||||
flagflo |= 2;
|
||||
if (k[0]->totelem) {
|
||||
k2d= k[1]->totelem/(float)tot;
|
||||
k2d = k[1]->totelem / (float)tot;
|
||||
}
|
||||
else flagdo -= 2;
|
||||
}
|
||||
if (tot != k[2]->totelem) {
|
||||
k3tot= 0.0;
|
||||
k3tot = 0.0;
|
||||
flagflo |= 4;
|
||||
if (k[0]->totelem) {
|
||||
k3d= k[2]->totelem/(float)tot;
|
||||
k3d = k[2]->totelem / (float)tot;
|
||||
}
|
||||
else flagdo -= 4;
|
||||
}
|
||||
if (tot != k[3]->totelem) {
|
||||
k4tot= 0.0;
|
||||
k4tot = 0.0;
|
||||
flagflo |= 8;
|
||||
if (k[0]->totelem) {
|
||||
k4d= k[3]->totelem/(float)tot;
|
||||
k4d = k[3]->totelem / (float)tot;
|
||||
}
|
||||
else flagdo -= 8;
|
||||
}
|
||||
|
||||
/* this exception needed for slurphing */
|
||||
if (start!=0) {
|
||||
/* this exception needed for slurphing */
|
||||
if (start != 0) {
|
||||
|
||||
poin+= poinsize*start;
|
||||
poin += poinsize * start;
|
||||
|
||||
if (flagdo & 1) {
|
||||
if (flagflo & 1) {
|
||||
k1tot+= start*k1d;
|
||||
a= (int)floor(k1tot);
|
||||
k1tot += start * k1d;
|
||||
a = (int)floor(k1tot);
|
||||
if (a) {
|
||||
k1tot-= a;
|
||||
k1+= a*key->elemsize;
|
||||
k1tot -= a;
|
||||
k1 += a * key->elemsize;
|
||||
}
|
||||
}
|
||||
else k1+= start*key->elemsize;
|
||||
else k1 += start * key->elemsize;
|
||||
}
|
||||
if (flagdo & 2) {
|
||||
if (flagflo & 2) {
|
||||
k2tot+= start*k2d;
|
||||
a= (int)floor(k2tot);
|
||||
k2tot += start * k2d;
|
||||
a = (int)floor(k2tot);
|
||||
if (a) {
|
||||
k2tot-= a;
|
||||
k2+= a*key->elemsize;
|
||||
k2tot -= a;
|
||||
k2 += a * key->elemsize;
|
||||
}
|
||||
}
|
||||
else k2+= start*key->elemsize;
|
||||
else k2 += start * key->elemsize;
|
||||
}
|
||||
if (flagdo & 4) {
|
||||
if (flagflo & 4) {
|
||||
k3tot+= start*k3d;
|
||||
a= (int)floor(k3tot);
|
||||
k3tot += start * k3d;
|
||||
a = (int)floor(k3tot);
|
||||
if (a) {
|
||||
k3tot-= a;
|
||||
k3+= a*key->elemsize;
|
||||
k3tot -= a;
|
||||
k3 += a * key->elemsize;
|
||||
}
|
||||
}
|
||||
else k3+= start*key->elemsize;
|
||||
else k3 += start * key->elemsize;
|
||||
}
|
||||
if (flagdo & 8) {
|
||||
if (flagflo & 8) {
|
||||
k4tot+= start*k4d;
|
||||
a= (int)floor(k4tot);
|
||||
k4tot += start * k4d;
|
||||
a = (int)floor(k4tot);
|
||||
if (a) {
|
||||
k4tot-= a;
|
||||
k4+= a*key->elemsize;
|
||||
k4tot -= a;
|
||||
k4 += a * key->elemsize;
|
||||
}
|
||||
}
|
||||
else k4+= start*key->elemsize;
|
||||
else k4 += start * key->elemsize;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* in case of beztriple */
|
||||
elemstr[0]= 1; /* nr of ipofloats */
|
||||
elemstr[1]= IPO_BEZTRIPLE;
|
||||
elemstr[2]= 0;
|
||||
elemstr[0] = 1; /* nr of ipofloats */
|
||||
elemstr[1] = IPO_BEZTRIPLE;
|
||||
elemstr[2] = 0;
|
||||
|
||||
/* only here, not above! */
|
||||
elemsize= key->elemsize;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) elemsize*= 3;
|
||||
elemsize = key->elemsize;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) elemsize *= 3;
|
||||
|
||||
for (a=start; a<end; a++) {
|
||||
for (a = start; a < end; a++) {
|
||||
|
||||
cp= key->elemstr;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) cp= elemstr;
|
||||
cp = key->elemstr;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) cp = elemstr;
|
||||
|
||||
ofsp= ofs;
|
||||
|
||||
while ( cp[0] ) { /* cp[0]==amount */
|
||||
|
||||
switch(cp[1]) {
|
||||
case IPO_FLOAT:
|
||||
flerp(3, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
|
||||
break;
|
||||
case IPO_BPOINT:
|
||||
flerp(4, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
|
||||
break;
|
||||
case IPO_BEZTRIPLE:
|
||||
flerp(12, (void *)poin, (void *)k1, (void *)k2, (void *)k3, (void *)k4, t);
|
||||
break;
|
||||
default:
|
||||
/* should never happen */
|
||||
if (freek1) MEM_freeN(freek1);
|
||||
if (freek2) MEM_freeN(freek2);
|
||||
if (freek3) MEM_freeN(freek3);
|
||||
if (freek4) MEM_freeN(freek4);
|
||||
BLI_assert(!"invalid 'cp[1]'");
|
||||
return;
|
||||
ofsp = ofs;
|
||||
|
||||
while (cp[0]) { /* cp[0]==amount */
|
||||
|
||||
switch (cp[1]) {
|
||||
case IPO_FLOAT:
|
||||
flerp(3, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
|
||||
break;
|
||||
case IPO_BPOINT:
|
||||
flerp(4, (float *)poin, (float *)k1, (float *)k2, (float *)k3, (float *)k4, t);
|
||||
break;
|
||||
case IPO_BEZTRIPLE:
|
||||
flerp(12, (void *)poin, (void *)k1, (void *)k2, (void *)k3, (void *)k4, t);
|
||||
break;
|
||||
default:
|
||||
/* should never happen */
|
||||
if (freek1) MEM_freeN(freek1);
|
||||
if (freek2) MEM_freeN(freek2);
|
||||
if (freek3) MEM_freeN(freek3);
|
||||
if (freek4) MEM_freeN(freek4);
|
||||
BLI_assert(!"invalid 'cp[1]'");
|
||||
return;
|
||||
}
|
||||
|
||||
poin+= ofsp[0];
|
||||
cp+= 2;
|
||||
poin += ofsp[0];
|
||||
cp += 2;
|
||||
ofsp++;
|
||||
}
|
||||
/* lets do it the difficult way: when keys have a different size */
|
||||
if (flagdo & 1) {
|
||||
if (flagflo & 1) {
|
||||
k1tot+= k1d;
|
||||
k1tot += k1d;
|
||||
while (k1tot >= 1.0f) {
|
||||
k1tot -= 1.0f;
|
||||
k1+= elemsize;
|
||||
k1 += elemsize;
|
||||
}
|
||||
}
|
||||
else k1+= elemsize;
|
||||
else k1 += elemsize;
|
||||
}
|
||||
if (flagdo & 2) {
|
||||
if (flagflo & 2) {
|
||||
k2tot+= k2d;
|
||||
k2tot += k2d;
|
||||
while (k2tot >= 1.0f) {
|
||||
k2tot -= 1.0f;
|
||||
k2+= elemsize;
|
||||
k2 += elemsize;
|
||||
}
|
||||
}
|
||||
else k2+= elemsize;
|
||||
else k2 += elemsize;
|
||||
}
|
||||
if (flagdo & 4) {
|
||||
if (flagflo & 4) {
|
||||
k3tot+= k3d;
|
||||
k3tot += k3d;
|
||||
while (k3tot >= 1.0f) {
|
||||
k3tot -= 1.0f;
|
||||
k3+= elemsize;
|
||||
k3 += elemsize;
|
||||
}
|
||||
}
|
||||
else k3+= elemsize;
|
||||
else k3 += elemsize;
|
||||
}
|
||||
if (flagdo & 8) {
|
||||
if (flagflo & 8) {
|
||||
k4tot+= k4d;
|
||||
k4tot += k4d;
|
||||
while (k4tot >= 1.0f) {
|
||||
k4tot -= 1.0f;
|
||||
k4+= elemsize;
|
||||
k4 += elemsize;
|
||||
}
|
||||
}
|
||||
else k4+= elemsize;
|
||||
else k4 += elemsize;
|
||||
}
|
||||
|
||||
if (mode == KEY_MODE_BEZTRIPLE) a+= 2;
|
||||
if (mode == KEY_MODE_BEZTRIPLE) a += 2;
|
||||
}
|
||||
|
||||
if (freek1) MEM_freeN(freek1);
|
||||
@@ -1009,53 +1020,53 @@ static void do_key(const int start, int end, const int tot, char *poin, Key *key
|
||||
|
||||
static float *get_weights_array(Object *ob, char *vgroup)
|
||||
{
|
||||
MDeformVert *dvert= NULL;
|
||||
BMEditMesh *em= NULL;
|
||||
MDeformVert *dvert = NULL;
|
||||
BMEditMesh *em = NULL;
|
||||
BMIter iter;
|
||||
BMVert *eve;
|
||||
int totvert= 0, defgrp_index= 0;
|
||||
int totvert = 0, defgrp_index = 0;
|
||||
|
||||
/* no vgroup string set? */
|
||||
if (vgroup[0]==0) return NULL;
|
||||
if (vgroup[0] == 0) return NULL;
|
||||
|
||||
/* gather dvert and totvert */
|
||||
if (ob->type==OB_MESH) {
|
||||
Mesh *me= ob->data;
|
||||
dvert= me->dvert;
|
||||
totvert= me->totvert;
|
||||
if (ob->type == OB_MESH) {
|
||||
Mesh *me = ob->data;
|
||||
dvert = me->dvert;
|
||||
totvert = me->totvert;
|
||||
|
||||
if (me->edit_btmesh && me->edit_btmesh->bm->totvert == totvert)
|
||||
em= me->edit_btmesh;
|
||||
em = me->edit_btmesh;
|
||||
}
|
||||
else if (ob->type==OB_LATTICE) {
|
||||
Lattice *lt= ob->data;
|
||||
dvert= lt->dvert;
|
||||
totvert= lt->pntsu*lt->pntsv*lt->pntsw;
|
||||
else if (ob->type == OB_LATTICE) {
|
||||
Lattice *lt = ob->data;
|
||||
dvert = lt->dvert;
|
||||
totvert = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
}
|
||||
|
||||
if (dvert==NULL) return NULL;
|
||||
if (dvert == NULL) return NULL;
|
||||
|
||||
/* find the group (weak loop-in-loop) */
|
||||
defgrp_index= defgroup_name_index(ob, vgroup);
|
||||
defgrp_index = defgroup_name_index(ob, vgroup);
|
||||
if (defgrp_index >= 0) {
|
||||
float *weights;
|
||||
int i;
|
||||
|
||||
weights= MEM_callocN(totvert*sizeof(float), "weights");
|
||||
weights = MEM_callocN(totvert * sizeof(float), "weights");
|
||||
|
||||
if (em) {
|
||||
eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL);
|
||||
for (i=0; eve; eve=BM_iter_step(&iter), i++) {
|
||||
dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
|
||||
for (i = 0; eve; eve = BM_iter_step(&iter), i++) {
|
||||
dvert = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT);
|
||||
|
||||
if (dvert) {
|
||||
weights[i]= defvert_find_weight(dvert, defgrp_index);
|
||||
weights[i] = defvert_find_weight(dvert, defgrp_index);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (i=0; i < totvert; i++, dvert++) {
|
||||
weights[i]= defvert_find_weight(dvert, defgrp_index);
|
||||
for (i = 0; i < totvert; i++, dvert++) {
|
||||
weights[i] = defvert_find_weight(dvert, defgrp_index);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1066,7 +1077,7 @@ static float *get_weights_array(Object *ob, char *vgroup)
|
||||
|
||||
static void do_mesh_key(Scene *scene, Object *ob, Key *key, char *out, const int tot)
|
||||
{
|
||||
KeyBlock *k[4], *actkb= ob_get_keyblock(ob);
|
||||
KeyBlock *k[4], *actkb = ob_get_keyblock(ob);
|
||||
float t[4];
|
||||
int flag = 0;
|
||||
|
||||
@@ -1085,29 +1096,27 @@ static void do_mesh_key(Scene *scene, Object *ob, Key *key, char *out, const int
|
||||
step = 1;
|
||||
}
|
||||
|
||||
for (a=0; a<tot; a+=step, cfra+= delta) {
|
||||
for (a = 0; a < tot; a += step, cfra += delta) {
|
||||
flag = setkeys(ctime_scaled, &key->block, k, t, 0);
|
||||
|
||||
if (flag==0)
|
||||
do_key(a, a+step, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
|
||||
if (flag == 0)
|
||||
do_key(a, a + step, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
|
||||
else
|
||||
cp_key(a, a+step, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
|
||||
cp_key(a, a + step, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (key->type==KEY_RELATIVE) {
|
||||
if (key->type == KEY_RELATIVE) {
|
||||
KeyBlock *kb;
|
||||
float f = 0.0;
|
||||
for (kb= key->block.first; kb; kb= kb->next, f += 0.1f) {
|
||||
kb->weights= get_weights_array(ob, kb->vgroup);
|
||||
// kb->pos = f;
|
||||
for (kb = key->block.first; kb; kb = kb->next) {
|
||||
kb->weights = get_weights_array(ob, kb->vgroup);
|
||||
}
|
||||
|
||||
do_rel_key(0, tot, tot, (char *)out, key, actkb, KEY_MODE_DUMMY);
|
||||
|
||||
for (kb= key->block.first; kb; kb= kb->next) {
|
||||
for (kb = key->block.first; kb; kb = kb->next) {
|
||||
if (kb->weights) MEM_freeN(kb->weights);
|
||||
kb->weights= NULL;
|
||||
kb->weights = NULL;
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -1115,7 +1124,7 @@ static void do_mesh_key(Scene *scene, Object *ob, Key *key, char *out, const int
|
||||
|
||||
flag = setkeys(ctime_scaled, &key->block, k, t, 0);
|
||||
|
||||
if (flag==0)
|
||||
if (flag == 0)
|
||||
do_key(0, tot, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
|
||||
else
|
||||
cp_key(0, tot, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
|
||||
@@ -1128,17 +1137,18 @@ static void do_cu_key(Curve *cu, Key *key, KeyBlock *actkb, KeyBlock **k, float
|
||||
Nurb *nu;
|
||||
int a, step;
|
||||
|
||||
for (a=0, nu=cu->nurb.first; nu; nu=nu->next, a+=step) {
|
||||
for (a = 0, nu = cu->nurb.first; nu; nu = nu->next, a += step) {
|
||||
if (nu->bp) {
|
||||
step= nu->pntsu*nu->pntsv;
|
||||
do_key(a, a+step, tot, out, key, actkb, k, t, KEY_MODE_BPOINT);
|
||||
step = nu->pntsu * nu->pntsv;
|
||||
do_key(a, a + step, tot, out, key, actkb, k, t, KEY_MODE_BPOINT);
|
||||
}
|
||||
else if (nu->bezt) {
|
||||
step= 3*nu->pntsu;
|
||||
do_key(a, a+step, tot, out, key, actkb, k, t, KEY_MODE_BEZTRIPLE);
|
||||
step = 3 * nu->pntsu;
|
||||
do_key(a, a + step, tot, out, key, actkb, k, t, KEY_MODE_BEZTRIPLE);
|
||||
}
|
||||
else {
|
||||
step = 0;
|
||||
}
|
||||
else
|
||||
step= 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1147,24 +1157,25 @@ static void do_rel_cu_key(Curve *cu, Key *key, KeyBlock *actkb, char *out, const
|
||||
Nurb *nu;
|
||||
int a, step;
|
||||
|
||||
for (a=0, nu=cu->nurb.first; nu; nu=nu->next, a+=step) {
|
||||
for (a = 0, nu = cu->nurb.first; nu; nu = nu->next, a += step) {
|
||||
if (nu->bp) {
|
||||
step= nu->pntsu*nu->pntsv;
|
||||
do_rel_key(a, a+step, tot, out, key, actkb, KEY_MODE_BPOINT);
|
||||
step = nu->pntsu * nu->pntsv;
|
||||
do_rel_key(a, a + step, tot, out, key, actkb, KEY_MODE_BPOINT);
|
||||
}
|
||||
else if (nu->bezt) {
|
||||
step= 3*nu->pntsu;
|
||||
do_rel_key(a, a+step, tot, out, key, actkb, KEY_MODE_BEZTRIPLE);
|
||||
step = 3 * nu->pntsu;
|
||||
do_rel_key(a, a + step, tot, out, key, actkb, KEY_MODE_BEZTRIPLE);
|
||||
}
|
||||
else {
|
||||
step = 0;
|
||||
}
|
||||
else
|
||||
step= 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const int tot)
|
||||
{
|
||||
Curve *cu= ob->data;
|
||||
KeyBlock *k[4], *actkb= ob_get_keyblock(ob);
|
||||
Curve *cu = ob->data;
|
||||
KeyBlock *k[4], *actkb = ob_get_keyblock(ob);
|
||||
float t[4];
|
||||
int flag = 0;
|
||||
|
||||
@@ -1185,7 +1196,7 @@ static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const in
|
||||
step = 1;
|
||||
}
|
||||
|
||||
for (nu=cu->nurb.first; nu; nu=nu->next) {
|
||||
for (nu = cu->nurb.first; nu; nu = nu->next) {
|
||||
int estep, mode;
|
||||
|
||||
if (nu->bp) {
|
||||
@@ -1206,10 +1217,10 @@ static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const in
|
||||
int count;
|
||||
|
||||
if (remain <= 0) {
|
||||
cfra+= delta;
|
||||
cfra += delta;
|
||||
flag = setkeys(ctime_scaled, &key->block, k, t, 0);
|
||||
|
||||
remain= step;
|
||||
remain = step;
|
||||
}
|
||||
|
||||
count = MIN2(remain, estep);
|
||||
@@ -1217,10 +1228,10 @@ static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const in
|
||||
count += 3 - count % 3;
|
||||
}
|
||||
|
||||
if (flag==0)
|
||||
do_key(i, i+count, tot, (char *)out, key, actkb, k, t, mode);
|
||||
if (flag == 0)
|
||||
do_key(i, i + count, tot, (char *)out, key, actkb, k, t, mode);
|
||||
else
|
||||
cp_key(i, i+count, tot, (char *)out, key, actkb, k[2], NULL, mode);
|
||||
cp_key(i, i + count, tot, (char *)out, key, actkb, k[2], NULL, mode);
|
||||
|
||||
a += count;
|
||||
i += count;
|
||||
@@ -1229,7 +1240,7 @@ static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const in
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (key->type==KEY_RELATIVE) {
|
||||
if (key->type == KEY_RELATIVE) {
|
||||
do_rel_cu_key(cu, cu->key, actkb, out, tot);
|
||||
}
|
||||
else {
|
||||
@@ -1237,7 +1248,7 @@ static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const in
|
||||
|
||||
flag = setkeys(ctime_scaled, &key->block, k, t, 0);
|
||||
|
||||
if (flag==0) do_cu_key(cu, key, actkb, k, t, out, tot);
|
||||
if (flag == 0) do_cu_key(cu, key, actkb, k, t, out, tot);
|
||||
else cp_cu_key(cu, key, actkb, k[2], 0, tot, out, tot);
|
||||
}
|
||||
}
|
||||
@@ -1245,8 +1256,8 @@ static void do_curve_key(Scene *scene, Object *ob, Key *key, char *out, const in
|
||||
|
||||
static void do_latt_key(Scene *scene, Object *ob, Key *key, char *out, const int tot)
|
||||
{
|
||||
Lattice *lt= ob->data;
|
||||
KeyBlock *k[4], *actkb= ob_get_keyblock(ob);
|
||||
Lattice *lt = ob->data;
|
||||
KeyBlock *k[4], *actkb = ob_get_keyblock(ob);
|
||||
float t[4];
|
||||
int flag;
|
||||
|
||||
@@ -1256,27 +1267,27 @@ static void do_latt_key(Scene *scene, Object *ob, Key *key, char *out, const int
|
||||
float cfra = (float)scene->r.cfra;
|
||||
int a;
|
||||
|
||||
for (a=0; a<tot; a++, cfra+= delta) {
|
||||
for (a = 0; a < tot; a++, cfra += delta) {
|
||||
flag = setkeys(ctime_scaled, &key->block, k, t, 0);
|
||||
|
||||
if (flag==0)
|
||||
do_key(a, a+1, tot, out, key, actkb, k, t, KEY_MODE_DUMMY);
|
||||
if (flag == 0)
|
||||
do_key(a, a + 1, tot, out, key, actkb, k, t, KEY_MODE_DUMMY);
|
||||
else
|
||||
cp_key(a, a+1, tot, out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
|
||||
cp_key(a, a + 1, tot, out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (key->type==KEY_RELATIVE) {
|
||||
if (key->type == KEY_RELATIVE) {
|
||||
KeyBlock *kb;
|
||||
|
||||
for (kb= key->block.first; kb; kb= kb->next)
|
||||
kb->weights= get_weights_array(ob, kb->vgroup);
|
||||
for (kb = key->block.first; kb; kb = kb->next)
|
||||
kb->weights = get_weights_array(ob, kb->vgroup);
|
||||
|
||||
do_rel_key(0, tot, tot, out, key, actkb, KEY_MODE_DUMMY);
|
||||
|
||||
for (kb= key->block.first; kb; kb= kb->next) {
|
||||
for (kb = key->block.first; kb; kb = kb->next) {
|
||||
if (kb->weights) MEM_freeN(kb->weights);
|
||||
kb->weights= NULL;
|
||||
kb->weights = NULL;
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -1284,7 +1295,7 @@ static void do_latt_key(Scene *scene, Object *ob, Key *key, char *out, const int
|
||||
|
||||
flag = setkeys(ctime_scaled, &key->block, k, t, 0);
|
||||
|
||||
if (flag==0)
|
||||
if (flag == 0)
|
||||
do_key(0, tot, tot, (char *)out, key, actkb, k, t, KEY_MODE_DUMMY);
|
||||
else
|
||||
cp_key(0, tot, tot, (char *)out, key, actkb, k[2], NULL, KEY_MODE_DUMMY);
|
||||
@@ -1297,39 +1308,39 @@ static void do_latt_key(Scene *scene, Object *ob, Key *key, char *out, const int
|
||||
/* returns key coordinates (+ tilt) when key applied, NULL otherwise */
|
||||
float *do_ob_key(Scene *scene, Object *ob)
|
||||
{
|
||||
Key *key= ob_get_key(ob);
|
||||
KeyBlock *actkb= ob_get_keyblock(ob);
|
||||
Key *key = ob_get_key(ob);
|
||||
KeyBlock *actkb = ob_get_keyblock(ob);
|
||||
char *out;
|
||||
int tot= 0, size= 0;
|
||||
int tot = 0, size = 0;
|
||||
|
||||
if (key==NULL || key->block.first==NULL)
|
||||
if (key == NULL || key->block.first == NULL)
|
||||
return NULL;
|
||||
|
||||
/* compute size of output array */
|
||||
if (ob->type == OB_MESH) {
|
||||
Mesh *me= ob->data;
|
||||
Mesh *me = ob->data;
|
||||
|
||||
tot= me->totvert;
|
||||
size= tot*3*sizeof(float);
|
||||
tot = me->totvert;
|
||||
size = tot * 3 * sizeof(float);
|
||||
}
|
||||
else if (ob->type == OB_LATTICE) {
|
||||
Lattice *lt= ob->data;
|
||||
Lattice *lt = ob->data;
|
||||
|
||||
tot= lt->pntsu*lt->pntsv*lt->pntsw;
|
||||
size= tot*3*sizeof(float);
|
||||
tot = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
size = tot * 3 * sizeof(float);
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= ob->data;
|
||||
Curve *cu = ob->data;
|
||||
Nurb *nu;
|
||||
|
||||
for (nu=cu->nurb.first; nu; nu=nu->next) {
|
||||
for (nu = cu->nurb.first; nu; nu = nu->next) {
|
||||
if (nu->bezt) {
|
||||
tot += 3*nu->pntsu;
|
||||
size += nu->pntsu*12*sizeof(float);
|
||||
tot += 3 * nu->pntsu;
|
||||
size += nu->pntsu * 12 * sizeof(float);
|
||||
}
|
||||
else if (nu->bp) {
|
||||
tot += nu->pntsu*nu->pntsv;
|
||||
size += nu->pntsu*nu->pntsv*12*sizeof(float);
|
||||
tot += nu->pntsu * nu->pntsv;
|
||||
size += nu->pntsu * nu->pntsv * 12 * sizeof(float);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1339,25 +1350,25 @@ float *do_ob_key(Scene *scene, Object *ob)
|
||||
return NULL;
|
||||
|
||||
/* allocate array */
|
||||
out= MEM_callocN(size, "do_ob_key out");
|
||||
out = MEM_callocN(size, "do_ob_key out");
|
||||
|
||||
/* prevent python from screwing this up? anyhoo, the from pointer could be dropped */
|
||||
key->from= (ID *)ob->data;
|
||||
key->from = (ID *)ob->data;
|
||||
|
||||
if (ob->shapeflag & OB_SHAPE_LOCK) {
|
||||
/* shape locked, copy the locked shape instead of blending */
|
||||
KeyBlock *kb= BLI_findlink(&key->block, ob->shapenr-1);
|
||||
KeyBlock *kb = BLI_findlink(&key->block, ob->shapenr - 1);
|
||||
|
||||
if (kb && (kb->flag & KEYBLOCK_MUTE))
|
||||
kb= key->refkey;
|
||||
kb = key->refkey;
|
||||
|
||||
if (kb==NULL) {
|
||||
kb= key->block.first;
|
||||
ob->shapenr= 1;
|
||||
if (kb == NULL) {
|
||||
kb = key->block.first;
|
||||
ob->shapenr = 1;
|
||||
}
|
||||
|
||||
if (OB_TYPE_SUPPORT_VGROUP(ob->type)) {
|
||||
float *weights= get_weights_array(ob, kb->vgroup);
|
||||
float *weights = get_weights_array(ob, kb->vgroup);
|
||||
|
||||
cp_key(0, tot, tot, out, key, actkb, kb, weights, 0);
|
||||
|
||||
@@ -1368,33 +1379,33 @@ float *do_ob_key(Scene *scene, Object *ob)
|
||||
}
|
||||
else {
|
||||
/* do shapekey local drivers */
|
||||
float ctime= (float)scene->r.cfra; // XXX this needs to be checked
|
||||
float ctime = (float)scene->r.cfra; // XXX this needs to be checked
|
||||
|
||||
BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime, ADT_RECALC_DRIVERS);
|
||||
|
||||
if (ob->type==OB_MESH) do_mesh_key(scene, ob, key, out, tot);
|
||||
else if (ob->type==OB_LATTICE) do_latt_key(scene, ob, key, out, tot);
|
||||
else if (ob->type==OB_CURVE) do_curve_key(scene, ob, key, out, tot);
|
||||
else if (ob->type==OB_SURF) do_curve_key(scene, ob, key, out, tot);
|
||||
if (ob->type == OB_MESH) do_mesh_key(scene, ob, key, out, tot);
|
||||
else if (ob->type == OB_LATTICE) do_latt_key(scene, ob, key, out, tot);
|
||||
else if (ob->type == OB_CURVE) do_curve_key(scene, ob, key, out, tot);
|
||||
else if (ob->type == OB_SURF) do_curve_key(scene, ob, key, out, tot);
|
||||
}
|
||||
|
||||
return (float*)out;
|
||||
return (float *)out;
|
||||
}
|
||||
|
||||
Key *ob_get_key(Object *ob)
|
||||
{
|
||||
if (ob==NULL) return NULL;
|
||||
if (ob == NULL) return NULL;
|
||||
|
||||
if (ob->type==OB_MESH) {
|
||||
Mesh *me= ob->data;
|
||||
if (ob->type == OB_MESH) {
|
||||
Mesh *me = ob->data;
|
||||
return me->key;
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= ob->data;
|
||||
Curve *cu = ob->data;
|
||||
return cu->key;
|
||||
}
|
||||
else if (ob->type==OB_LATTICE) {
|
||||
Lattice *lt= ob->data;
|
||||
else if (ob->type == OB_LATTICE) {
|
||||
Lattice *lt = ob->data;
|
||||
return lt->key;
|
||||
}
|
||||
return NULL;
|
||||
@@ -1403,23 +1414,23 @@ Key *ob_get_key(Object *ob)
|
||||
KeyBlock *add_keyblock(Key *key, const char *name)
|
||||
{
|
||||
KeyBlock *kb;
|
||||
float curpos= -0.1;
|
||||
float curpos = -0.1;
|
||||
int tot;
|
||||
|
||||
kb= key->block.last;
|
||||
if (kb) curpos= kb->pos;
|
||||
kb = key->block.last;
|
||||
if (kb) curpos = kb->pos;
|
||||
|
||||
kb= MEM_callocN(sizeof(KeyBlock), "Keyblock");
|
||||
kb = MEM_callocN(sizeof(KeyBlock), "Keyblock");
|
||||
BLI_addtail(&key->block, kb);
|
||||
kb->type= KEY_CARDINAL;
|
||||
kb->type = KEY_CARDINAL;
|
||||
|
||||
tot= BLI_countlist(&key->block);
|
||||
tot = BLI_countlist(&key->block);
|
||||
if (name) {
|
||||
BLI_strncpy(kb->name, name, sizeof(kb->name));
|
||||
}
|
||||
else {
|
||||
if (tot==1) BLI_strncpy(kb->name, "Basis", sizeof(kb->name));
|
||||
else BLI_snprintf(kb->name, sizeof(kb->name), "Key %d", tot-1);
|
||||
if (tot == 1) BLI_strncpy(kb->name, "Basis", sizeof(kb->name));
|
||||
else BLI_snprintf(kb->name, sizeof(kb->name), "Key %d", tot - 1);
|
||||
}
|
||||
|
||||
BLI_uniquename(&key->block, kb, "Key", '.', offsetof(KeyBlock, name), sizeof(kb->name));
|
||||
@@ -1427,10 +1438,10 @@ KeyBlock *add_keyblock(Key *key, const char *name)
|
||||
kb->uid = key->uidgen++;
|
||||
|
||||
key->totkey++;
|
||||
if (key->totkey==1) key->refkey= kb;
|
||||
if (key->totkey == 1) key->refkey = kb;
|
||||
|
||||
kb->slidermin= 0.0f;
|
||||
kb->slidermax= 1.0f;
|
||||
kb->slidermin = 0.0f;
|
||||
kb->slidermax = 1.0f;
|
||||
|
||||
/**
|
||||
* \note caller may want to set this to current time, but don't do it here since we need to sort
|
||||
@@ -1461,10 +1472,10 @@ KeyBlock *add_keyblock_ctime(Key *key, const char *name, const short do_force)
|
||||
/* only the active keyblock */
|
||||
KeyBlock *ob_get_keyblock(Object *ob)
|
||||
{
|
||||
Key *key= ob_get_key(ob);
|
||||
Key *key = ob_get_key(ob);
|
||||
|
||||
if (key) {
|
||||
KeyBlock *kb= BLI_findlink(&key->block, ob->shapenr-1);
|
||||
KeyBlock *kb = BLI_findlink(&key->block, ob->shapenr - 1);
|
||||
return kb;
|
||||
}
|
||||
|
||||
@@ -1473,7 +1484,7 @@ KeyBlock *ob_get_keyblock(Object *ob)
|
||||
|
||||
KeyBlock *ob_get_reference_keyblock(Object *ob)
|
||||
{
|
||||
Key *key= ob_get_key(ob);
|
||||
Key *key = ob_get_key(ob);
|
||||
|
||||
if (key)
|
||||
return key->refkey;
|
||||
@@ -1488,12 +1499,12 @@ KeyBlock *key_get_keyblock(Key *key, int index)
|
||||
int i;
|
||||
|
||||
if (key) {
|
||||
kb= key->block.first;
|
||||
kb = key->block.first;
|
||||
|
||||
for (i= 1; i < key->totkey; i++) {
|
||||
kb= kb->next;
|
||||
for (i = 1; i < key->totkey; i++) {
|
||||
kb = kb->next;
|
||||
|
||||
if (index==i)
|
||||
if (index == i)
|
||||
return kb;
|
||||
}
|
||||
}
|
||||
@@ -1525,7 +1536,7 @@ char *key_get_curValue_rnaPath(Key *key, KeyBlock *kb)
|
||||
/* create the RNA pointer */
|
||||
RNA_pointer_create(&key->id, &RNA_ShapeKey, kb, &ptr);
|
||||
/* get pointer to the property too */
|
||||
prop= RNA_struct_find_property(&ptr, "value");
|
||||
prop = RNA_struct_find_property(&ptr, "value");
|
||||
|
||||
/* return the path */
|
||||
return RNA_path_from_ID_to_property(&ptr, prop);
|
||||
@@ -1541,17 +1552,17 @@ void latt_to_key(Lattice *lt, KeyBlock *kb)
|
||||
float *fp;
|
||||
int a, tot;
|
||||
|
||||
tot= lt->pntsu*lt->pntsv*lt->pntsw;
|
||||
if (tot==0) return;
|
||||
tot = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
if (tot == 0) return;
|
||||
|
||||
if (kb->data) MEM_freeN(kb->data);
|
||||
|
||||
kb->data= MEM_callocN(lt->key->elemsize*tot, "kb->data");
|
||||
kb->totelem= tot;
|
||||
kb->data = MEM_callocN(lt->key->elemsize * tot, "kb->data");
|
||||
kb->totelem = tot;
|
||||
|
||||
bp= lt->def;
|
||||
fp= kb->data;
|
||||
for (a=0; a<kb->totelem; a++, fp+=3, bp++) {
|
||||
bp = lt->def;
|
||||
fp = kb->data;
|
||||
for (a = 0; a < kb->totelem; a++, fp += 3, bp++) {
|
||||
copy_v3_v3(fp, bp->vec);
|
||||
}
|
||||
}
|
||||
@@ -1562,13 +1573,13 @@ void key_to_latt(KeyBlock *kb, Lattice *lt)
|
||||
float *fp;
|
||||
int a, tot;
|
||||
|
||||
bp= lt->def;
|
||||
fp= kb->data;
|
||||
bp = lt->def;
|
||||
fp = kb->data;
|
||||
|
||||
tot= lt->pntsu*lt->pntsv*lt->pntsw;
|
||||
tot= MIN2(kb->totelem, tot);
|
||||
tot = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
tot = MIN2(kb->totelem, tot);
|
||||
|
||||
for (a=0; a<tot; a++, fp+=3, bp++) {
|
||||
for (a = 0; a < tot; a++, fp += 3, bp++) {
|
||||
copy_v3_v3(bp->vec, fp);
|
||||
}
|
||||
}
|
||||
@@ -1583,45 +1594,45 @@ void curve_to_key(Curve *cu, KeyBlock *kb, ListBase *nurb)
|
||||
int a, tot;
|
||||
|
||||
/* count */
|
||||
tot= count_curveverts(nurb);
|
||||
if (tot==0) return;
|
||||
tot = count_curveverts(nurb);
|
||||
if (tot == 0) return;
|
||||
|
||||
if (kb->data) MEM_freeN(kb->data);
|
||||
|
||||
kb->data= MEM_callocN(cu->key->elemsize*tot, "kb->data");
|
||||
kb->totelem= tot;
|
||||
kb->data = MEM_callocN(cu->key->elemsize * tot, "kb->data");
|
||||
kb->totelem = tot;
|
||||
|
||||
nu= nurb->first;
|
||||
fp= kb->data;
|
||||
nu = nurb->first;
|
||||
fp = kb->data;
|
||||
while (nu) {
|
||||
|
||||
if (nu->bezt) {
|
||||
bezt= nu->bezt;
|
||||
a= nu->pntsu;
|
||||
bezt = nu->bezt;
|
||||
a = nu->pntsu;
|
||||
while (a--) {
|
||||
copy_v3_v3(fp, bezt->vec[0]);
|
||||
fp+= 3;
|
||||
fp += 3;
|
||||
copy_v3_v3(fp, bezt->vec[1]);
|
||||
fp+= 3;
|
||||
fp += 3;
|
||||
copy_v3_v3(fp, bezt->vec[2]);
|
||||
fp+= 3;
|
||||
fp[0]= bezt->alfa;
|
||||
fp+= 3; /* alphas */
|
||||
fp += 3;
|
||||
fp[0] = bezt->alfa;
|
||||
fp += 3; /* alphas */
|
||||
bezt++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
bp= nu->bp;
|
||||
a= nu->pntsu*nu->pntsv;
|
||||
bp = nu->bp;
|
||||
a = nu->pntsu * nu->pntsv;
|
||||
while (a--) {
|
||||
copy_v3_v3(fp, bp->vec);
|
||||
fp[3]= bp->alfa;
|
||||
fp[3] = bp->alfa;
|
||||
|
||||
fp+= 4;
|
||||
fp += 4;
|
||||
bp++;
|
||||
}
|
||||
}
|
||||
nu= nu->next;
|
||||
nu = nu->next;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1633,45 +1644,45 @@ void key_to_curve(KeyBlock *kb, Curve *UNUSED(cu), ListBase *nurb)
|
||||
float *fp;
|
||||
int a, tot;
|
||||
|
||||
nu= nurb->first;
|
||||
fp= kb->data;
|
||||
nu = nurb->first;
|
||||
fp = kb->data;
|
||||
|
||||
tot= count_curveverts(nurb);
|
||||
tot = count_curveverts(nurb);
|
||||
|
||||
tot= MIN2(kb->totelem, tot);
|
||||
tot = MIN2(kb->totelem, tot);
|
||||
|
||||
while (nu && tot>0) {
|
||||
while (nu && tot > 0) {
|
||||
|
||||
if (nu->bezt) {
|
||||
bezt= nu->bezt;
|
||||
a= nu->pntsu;
|
||||
while (a-- && tot>0) {
|
||||
bezt = nu->bezt;
|
||||
a = nu->pntsu;
|
||||
while (a-- && tot > 0) {
|
||||
copy_v3_v3(bezt->vec[0], fp);
|
||||
fp+= 3;
|
||||
fp += 3;
|
||||
copy_v3_v3(bezt->vec[1], fp);
|
||||
fp+= 3;
|
||||
fp += 3;
|
||||
copy_v3_v3(bezt->vec[2], fp);
|
||||
fp+= 3;
|
||||
bezt->alfa= fp[0];
|
||||
fp+= 3; /* alphas */
|
||||
fp += 3;
|
||||
bezt->alfa = fp[0];
|
||||
fp += 3; /* alphas */
|
||||
|
||||
tot-= 3;
|
||||
tot -= 3;
|
||||
bezt++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
bp= nu->bp;
|
||||
a= nu->pntsu*nu->pntsv;
|
||||
while (a-- && tot>0) {
|
||||
bp = nu->bp;
|
||||
a = nu->pntsu * nu->pntsv;
|
||||
while (a-- && tot > 0) {
|
||||
copy_v3_v3(bp->vec, fp);
|
||||
bp->alfa= fp[3];
|
||||
bp->alfa = fp[3];
|
||||
|
||||
fp+= 4;
|
||||
fp += 4;
|
||||
tot--;
|
||||
bp++;
|
||||
}
|
||||
}
|
||||
nu= nu->next;
|
||||
nu = nu->next;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1682,16 +1693,16 @@ void mesh_to_key(Mesh *me, KeyBlock *kb)
|
||||
float *fp;
|
||||
int a;
|
||||
|
||||
if (me->totvert==0) return;
|
||||
if (me->totvert == 0) return;
|
||||
|
||||
if (kb->data) MEM_freeN(kb->data);
|
||||
|
||||
kb->data= MEM_callocN(me->key->elemsize*me->totvert, "kb->data");
|
||||
kb->totelem= me->totvert;
|
||||
kb->data = MEM_callocN(me->key->elemsize * me->totvert, "kb->data");
|
||||
kb->totelem = me->totvert;
|
||||
|
||||
mvert= me->mvert;
|
||||
fp= kb->data;
|
||||
for (a=0; a<kb->totelem; a++, fp+=3, mvert++) {
|
||||
mvert = me->mvert;
|
||||
fp = kb->data;
|
||||
for (a = 0; a < kb->totelem; a++, fp += 3, mvert++) {
|
||||
copy_v3_v3(fp, mvert->co);
|
||||
|
||||
}
|
||||
@@ -1703,87 +1714,87 @@ void key_to_mesh(KeyBlock *kb, Mesh *me)
|
||||
float *fp;
|
||||
int a, tot;
|
||||
|
||||
mvert= me->mvert;
|
||||
fp= kb->data;
|
||||
mvert = me->mvert;
|
||||
fp = kb->data;
|
||||
|
||||
tot= MIN2(kb->totelem, me->totvert);
|
||||
tot = MIN2(kb->totelem, me->totvert);
|
||||
|
||||
for (a=0; a<tot; a++, fp+=3, mvert++) {
|
||||
for (a = 0; a < tot; a++, fp += 3, mvert++) {
|
||||
copy_v3_v3(mvert->co, fp);
|
||||
}
|
||||
}
|
||||
|
||||
/************************* vert coords ************************/
|
||||
float (*key_to_vertcos(Object *ob, KeyBlock *kb))[3]
|
||||
float (*key_to_vertcos(Object * ob, KeyBlock * kb))[3]
|
||||
{
|
||||
float (*vertCos)[3], *co;
|
||||
float *fp= kb->data;
|
||||
int tot= 0, a;
|
||||
float *fp = kb->data;
|
||||
int tot = 0, a;
|
||||
|
||||
/* Count of vertex coords in array */
|
||||
if (ob->type == OB_MESH) {
|
||||
Mesh *me= (Mesh*)ob->data;
|
||||
tot= me->totvert;
|
||||
Mesh *me = (Mesh *)ob->data;
|
||||
tot = me->totvert;
|
||||
}
|
||||
else if (ob->type == OB_LATTICE) {
|
||||
Lattice *lt= (Lattice*)ob->data;
|
||||
tot= lt->pntsu*lt->pntsv*lt->pntsw;
|
||||
Lattice *lt = (Lattice *)ob->data;
|
||||
tot = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= (Curve*)ob->data;
|
||||
tot= count_curveverts(&cu->nurb);
|
||||
Curve *cu = (Curve *)ob->data;
|
||||
tot = count_curveverts(&cu->nurb);
|
||||
}
|
||||
|
||||
if (tot == 0) return NULL;
|
||||
|
||||
vertCos= MEM_callocN(tot*sizeof(*vertCos), "key_to_vertcos vertCos");
|
||||
vertCos = MEM_callocN(tot * sizeof(*vertCos), "key_to_vertcos vertCos");
|
||||
|
||||
/* Copy coords to array */
|
||||
co= (float*)vertCos;
|
||||
co = (float *)vertCos;
|
||||
|
||||
if (ELEM(ob->type, OB_MESH, OB_LATTICE)) {
|
||||
for (a= 0; a<tot; a++, fp+=3, co+=3) {
|
||||
for (a = 0; a < tot; a++, fp += 3, co += 3) {
|
||||
copy_v3_v3(co, fp);
|
||||
}
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= (Curve*)ob->data;
|
||||
Nurb *nu= cu->nurb.first;
|
||||
Curve *cu = (Curve *)ob->data;
|
||||
Nurb *nu = cu->nurb.first;
|
||||
BezTriple *bezt;
|
||||
BPoint *bp;
|
||||
|
||||
while (nu) {
|
||||
if (nu->bezt) {
|
||||
int i;
|
||||
bezt= nu->bezt;
|
||||
a= nu->pntsu;
|
||||
bezt = nu->bezt;
|
||||
a = nu->pntsu;
|
||||
|
||||
while (a--) {
|
||||
for (i= 0; i<3; i++) {
|
||||
for (i = 0; i < 3; i++) {
|
||||
copy_v3_v3(co, fp);
|
||||
fp+= 3; co+= 3;
|
||||
fp += 3; co += 3;
|
||||
}
|
||||
|
||||
fp+= 3; /* skip alphas */
|
||||
fp += 3; /* skip alphas */
|
||||
|
||||
bezt++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
bp= nu->bp;
|
||||
a= nu->pntsu*nu->pntsv;
|
||||
bp = nu->bp;
|
||||
a = nu->pntsu * nu->pntsv;
|
||||
|
||||
while (a--) {
|
||||
copy_v3_v3(co, fp);
|
||||
|
||||
fp+= 4;
|
||||
co+= 3;
|
||||
fp += 4;
|
||||
co += 3;
|
||||
|
||||
bp++;
|
||||
}
|
||||
}
|
||||
|
||||
nu= nu->next;
|
||||
nu = nu->next;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1792,80 +1803,80 @@ float (*key_to_vertcos(Object *ob, KeyBlock *kb))[3]
|
||||
|
||||
void vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3])
|
||||
{
|
||||
float *co= (float*)vertCos, *fp;
|
||||
int tot= 0, a, elemsize;
|
||||
float *co = (float *)vertCos, *fp;
|
||||
int tot = 0, a, elemsize;
|
||||
|
||||
if (kb->data) MEM_freeN(kb->data);
|
||||
|
||||
/* Count of vertex coords in array */
|
||||
if (ob->type == OB_MESH) {
|
||||
Mesh *me= (Mesh*)ob->data;
|
||||
tot= me->totvert;
|
||||
elemsize= me->key->elemsize;
|
||||
Mesh *me = (Mesh *)ob->data;
|
||||
tot = me->totvert;
|
||||
elemsize = me->key->elemsize;
|
||||
}
|
||||
else if (ob->type == OB_LATTICE) {
|
||||
Lattice *lt= (Lattice*)ob->data;
|
||||
tot= lt->pntsu*lt->pntsv*lt->pntsw;
|
||||
elemsize= lt->key->elemsize;
|
||||
Lattice *lt = (Lattice *)ob->data;
|
||||
tot = lt->pntsu * lt->pntsv * lt->pntsw;
|
||||
elemsize = lt->key->elemsize;
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= (Curve*)ob->data;
|
||||
elemsize= cu->key->elemsize;
|
||||
tot= count_curveverts(&cu->nurb);
|
||||
Curve *cu = (Curve *)ob->data;
|
||||
elemsize = cu->key->elemsize;
|
||||
tot = count_curveverts(&cu->nurb);
|
||||
}
|
||||
|
||||
if (tot == 0) {
|
||||
kb->data= NULL;
|
||||
kb->data = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
fp= kb->data= MEM_callocN(tot*elemsize, "key_to_vertcos vertCos");
|
||||
fp = kb->data = MEM_callocN(tot * elemsize, "key_to_vertcos vertCos");
|
||||
|
||||
/* Copy coords to keyblock */
|
||||
|
||||
if (ELEM(ob->type, OB_MESH, OB_LATTICE)) {
|
||||
for (a= 0; a<tot; a++, fp+=3, co+=3) {
|
||||
for (a = 0; a < tot; a++, fp += 3, co += 3) {
|
||||
copy_v3_v3(fp, co);
|
||||
}
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= (Curve*)ob->data;
|
||||
Nurb *nu= cu->nurb.first;
|
||||
Curve *cu = (Curve *)ob->data;
|
||||
Nurb *nu = cu->nurb.first;
|
||||
BezTriple *bezt;
|
||||
BPoint *bp;
|
||||
|
||||
while (nu) {
|
||||
if (nu->bezt) {
|
||||
int i;
|
||||
bezt= nu->bezt;
|
||||
a= nu->pntsu;
|
||||
bezt = nu->bezt;
|
||||
a = nu->pntsu;
|
||||
|
||||
while (a--) {
|
||||
for (i= 0; i<3; i++) {
|
||||
for (i = 0; i < 3; i++) {
|
||||
copy_v3_v3(fp, co);
|
||||
fp+= 3; co+= 3;
|
||||
fp += 3; co += 3;
|
||||
}
|
||||
|
||||
fp+= 3; /* skip alphas */
|
||||
fp += 3; /* skip alphas */
|
||||
|
||||
bezt++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
bp= nu->bp;
|
||||
a= nu->pntsu*nu->pntsv;
|
||||
bp = nu->bp;
|
||||
a = nu->pntsu * nu->pntsv;
|
||||
|
||||
while (a--) {
|
||||
copy_v3_v3(fp, co);
|
||||
|
||||
fp+= 4;
|
||||
co+= 3;
|
||||
fp += 4;
|
||||
co += 3;
|
||||
|
||||
bp++;
|
||||
}
|
||||
}
|
||||
|
||||
nu= nu->next;
|
||||
nu = nu->next;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1873,51 +1884,51 @@ void vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3])
|
||||
void offset_to_key(Object *ob, KeyBlock *kb, float (*ofs)[3])
|
||||
{
|
||||
int a;
|
||||
float *co= (float*)ofs, *fp= kb->data;
|
||||
float *co = (float *)ofs, *fp = kb->data;
|
||||
|
||||
if (ELEM(ob->type, OB_MESH, OB_LATTICE)) {
|
||||
for (a= 0; a<kb->totelem; a++, fp+=3, co+=3) {
|
||||
for (a = 0; a < kb->totelem; a++, fp += 3, co += 3) {
|
||||
add_v3_v3(fp, co);
|
||||
}
|
||||
}
|
||||
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
|
||||
Curve *cu= (Curve*)ob->data;
|
||||
Nurb *nu= cu->nurb.first;
|
||||
Curve *cu = (Curve *)ob->data;
|
||||
Nurb *nu = cu->nurb.first;
|
||||
BezTriple *bezt;
|
||||
BPoint *bp;
|
||||
|
||||
while (nu) {
|
||||
if (nu->bezt) {
|
||||
int i;
|
||||
bezt= nu->bezt;
|
||||
a= nu->pntsu;
|
||||
bezt = nu->bezt;
|
||||
a = nu->pntsu;
|
||||
|
||||
while (a--) {
|
||||
for (i= 0; i<3; i++) {
|
||||
for (i = 0; i < 3; i++) {
|
||||
add_v3_v3(fp, co);
|
||||
fp+= 3; co+= 3;
|
||||
fp += 3; co += 3;
|
||||
}
|
||||
|
||||
fp+= 3; /* skip alphas */
|
||||
fp += 3; /* skip alphas */
|
||||
|
||||
bezt++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
bp= nu->bp;
|
||||
a= nu->pntsu*nu->pntsv;
|
||||
bp = nu->bp;
|
||||
a = nu->pntsu * nu->pntsv;
|
||||
|
||||
while (a--) {
|
||||
add_v3_v3(fp, co);
|
||||
|
||||
fp+= 4;
|
||||
co+= 3;
|
||||
fp += 4;
|
||||
co += 3;
|
||||
|
||||
bp++;
|
||||
}
|
||||
}
|
||||
|
||||
nu= nu->next;
|
||||
nu = nu->next;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user