[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45616] trunk/blender/source/blender/ blenkernel/intern/key.c: style cleanup: key.c
Campbell Barton
ideasman42 at gmail.com
Sat Apr 14 04:32:36 CEST 2012
Revision: 45616
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45616
Author: campbellbarton
Date: 2012-04-14 02:32:32 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
style cleanup: key.c
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/key.c
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2012-04-13 20:58:59 UTC (rev 45615)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2012-04-14 02:32:32 UTC (rev 45616)
@@ -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 @@
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 @@
{
KeyBlock *kb;
- while ( (kb= key->block.first) ) {
+ while ( (kb = key->block.first) ) {
if (kb->data) MEM_freeN(kb->data);
@@ -115,51 +116,56 @@
* 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;
+ /* 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;
}
- 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;
- }
return key;
}
@@ -169,21 +175,21 @@
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 *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 @@
* - 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 @@
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 @@
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 @@
}
/* 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 @@
{
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_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_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.6666666f;
- data[2]= -0.5f*t3 + 0.5f*t2 + 0.5f*t + 0.16666666f;
- data[3]= 0.16666666f*t3;
+ 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 @@
{
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_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_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;
+ 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 @@
{
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 @@
{
/* 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];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list