Revision: 42289
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42289
Author: campbellbarton
Date: 2011-11-30 07:39:54 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
use consistent naming for deform.c, also moved defvert_remove_index into
deform.c, was local in modifier code.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_deform.h
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
Modified: trunk/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_deform.h 2011-11-30
07:11:29 UTC (rev 42288)
+++ trunk/blender/source/blender/blenkernel/BKE_deform.h 2011-11-30
07:39:54 UTC (rev 42289)
@@ -52,14 +52,16 @@
struct MDeformWeight *defvert_find_index(const struct MDeformVert *dv, const
int defgroup);
struct MDeformWeight *defvert_verify_index(struct MDeformVert *dv, const int
defgroup);
+void defvert_remove_index(struct MDeformVert *dvert, int
defgroup, struct MDeformWeight *dw);
-float defvert_find_weight(const struct MDeformVert *dvert, const int
group_num);
-float defvert_array_find_weight_safe(const struct MDeformVert *dvert, int
index, int group_num);
+float defvert_find_weight(const struct MDeformVert *dvert, const int
defgroup);
+float defvert_array_find_weight_safe(const struct MDeformVert *dvert, const
int index, const int defgroup);
-void defvert_copy(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert);
-void defvert_copy_index(struct MDeformVert *dv_dst, const struct MDeformVert
*dv_src, const int defgroup);
-void defvert_sync(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert, int use_verify);
-void defvert_sync_mapped(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert, const int *flip_map, const int flip_map_len, const int use_verify);
+void defvert_copy(struct MDeformVert *dvert_dst, const struct MDeformVert
*dvert_src);
+void defvert_copy_index(struct MDeformVert *dvert_dst, const struct
MDeformVert *dvert_src, const int defgroup);
+void defvert_sync(struct MDeformVert *dvert_dst, const struct MDeformVert
*dvert_src, int use_verify);
+void defvert_sync_mapped(struct MDeformVert *dvert_dst, const struct
MDeformVert *dvert_src,
+ const int *flip_map, const int flip_map_len, const
int use_verify);
void defvert_remap (struct MDeformVert *dvert, int *map);
void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int
flip_map_len);
void defvert_normalize(struct MDeformVert *dvert);
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2011-11-30
07:11:29 UTC (rev 42288)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2011-11-30
07:39:54 UTC (rev 42289)
@@ -45,7 +45,7 @@
#include "BLI_utildefines.h"
-void defgroup_copy_list (ListBase *outbase, ListBase *inbase)
+void defgroup_copy_list(ListBase *outbase, ListBase *inbase)
{
bDeformGroup *defgroup, *defgroupn;
@@ -57,7 +57,7 @@
}
}
-bDeformGroup *defgroup_duplicate (bDeformGroup *ingroup)
+bDeformGroup *defgroup_duplicate(bDeformGroup *ingroup)
{
bDeformGroup *outgroup;
@@ -65,7 +65,7 @@
return NULL;
outgroup=MEM_callocN(sizeof(bDeformGroup), "copy deformGroup");
-
+
/* For now, just copy everything over. */
memcpy (outgroup, ingroup, sizeof(bDeformGroup));
@@ -75,22 +75,22 @@
}
/* copy & overwrite weights */
-void defvert_copy (MDeformVert *dvert_r, const MDeformVert *dvert)
+void defvert_copy(MDeformVert *dvert_dst, const MDeformVert *dvert_src)
{
- if(dvert_r->totweight == dvert->totweight) {
- if(dvert->totweight)
- memcpy(dvert_r->dw, dvert->dw, dvert->totweight *
sizeof(MDeformWeight));
+ if (dvert_dst->totweight == dvert_src->totweight) {
+ if (dvert_src->totweight)
+ memcpy(dvert_dst->dw, dvert_src->dw,
dvert_src->totweight * sizeof(MDeformWeight));
}
else {
- if(dvert_r->dw)
- MEM_freeN(dvert_r->dw);
+ if (dvert_dst->dw)
+ MEM_freeN(dvert_dst->dw);
- if(dvert->totweight)
- dvert_r->dw= MEM_dupallocN(dvert->dw);
+ if (dvert_src->totweight)
+ dvert_dst->dw= MEM_dupallocN(dvert_src->dw);
else
- dvert_r->dw= NULL;
+ dvert_dst->dw= NULL;
- dvert_r->totweight = dvert->totweight;
+ dvert_dst->totweight = dvert_src->totweight;
}
}
@@ -98,20 +98,20 @@
* - do nothing if neither are set.
* - add destination weight if needed.
*/
-void defvert_copy_index (MDeformVert *dv_dst, const MDeformVert *dv_src, const
int defgroup)
+void defvert_copy_index(MDeformVert *dvert_dst, const MDeformVert *dvert_src,
const int defgroup)
{
MDeformWeight *dw_src, *dw_dst;
- dw_src= defvert_find_index(dv_src, defgroup);
+ dw_src= defvert_find_index(dvert_src, defgroup);
if (dw_src) {
/* source is valid, verify destination */
- dw_dst= defvert_verify_index(dv_dst, defgroup);
+ dw_dst= defvert_verify_index(dvert_dst, defgroup);
dw_dst->weight= dw_src->weight;
}
else {
/* source was NULL, assign zero, could also remove */
- dw_dst= defvert_find_index(dv_dst, defgroup);
+ dw_dst= defvert_find_index(dvert_dst, defgroup);
if (dw_dst) {
dw_dst->weight= 0.0f;
@@ -122,37 +122,38 @@
/* only sync over matching weights, don't add or remove groups
* warning, loop within loop.
*/
-void defvert_sync (MDeformVert *dvert_r, const MDeformVert *dvert, int
use_verify)
+void defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, int
use_verify)
{
- if(dvert->totweight && dvert_r->totweight) {
+ if (dvert_src->totweight && dvert_dst->totweight) {
int i;
- MDeformWeight *dw;
- for(i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++) {
- MDeformWeight *dw_r;
- if(use_verify) dw_r= defvert_verify_index(dvert_r,
dw->def_nr);
- else dw_r=
defvert_find_index(dvert_r, dw->def_nr);
+ MDeformWeight *dw_src;
+ for (i=0, dw_src=dvert_src->dw; i < dvert_src->totweight; i++,
dw_src++) {
+ MDeformWeight *dw_dst;
+ if (use_verify) dw_dst= defvert_verify_index(dvert_dst,
dw_src->def_nr);
+ else dw_dst= defvert_find_index(dvert_dst,
dw_src->def_nr);
- if(dw_r) {
- dw_r->weight= dw->weight;
+ if (dw_dst) {
+ dw_dst->weight= dw_src->weight;
}
}
}
}
/* be sure all flip_map values are valid */
-void defvert_sync_mapped (MDeformVert *dvert_r, const MDeformVert *dvert,
const int *flip_map, const int flip_map_len, const int use_verify)
+void defvert_sync_mapped(MDeformVert *dvert_dst, const MDeformVert *dvert_src,
+ const int *flip_map, const int flip_map_len, const
int use_verify)
{
- if (dvert->totweight && dvert_r->totweight) {
+ if (dvert_src->totweight && dvert_dst->totweight) {
int i;
- MDeformWeight *dw;
- for (i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++) {
- if (dw->def_nr < flip_map_len) {
- MDeformWeight *dw_r;
- if(use_verify) dw_r=
defvert_verify_index(dvert_r, flip_map[dw->def_nr]);
- else dw_r=
defvert_find_index(dvert_r, flip_map[dw->def_nr]);
+ MDeformWeight *dw_src;
+ for (i=0, dw_src=dvert_src->dw; i < dvert_src->totweight; i++,
dw_src++) {
+ if (dw_src->def_nr < flip_map_len) {
+ MDeformWeight *dw_dst;
+ if (use_verify) dw_dst=
defvert_verify_index(dvert_dst, flip_map[dw_src->def_nr]);
+ else dw_dst=
defvert_find_index(dvert_dst, flip_map[dw_src->def_nr]);
- if(dw_r) {
- dw_r->weight= dw->weight;
+ if (dw_dst) {
+ dw_dst->weight= dw_src->weight;
}
}
}
@@ -160,18 +161,18 @@
}
/* be sure all flip_map values are valid */
-void defvert_remap (MDeformVert *dvert, int *map)
+void defvert_remap(MDeformVert *dvert, int *map)
{
MDeformWeight *dw;
int i;
- for(i=0, dw=dvert->dw; i<dvert->totweight; i++, dw++) {
+ for (i=0, dw=dvert->dw; i<dvert->totweight; i++, dw++) {
dw->def_nr= map[dw->def_nr];
}
}
-void defvert_normalize (MDeformVert *dvert)
+void defvert_normalize(MDeformVert *dvert)
{
- if(dvert->totweight<=0) {
+ if (dvert->totweight<=0) {
/* nothing */
}
else if (dvert->totweight==1) {
@@ -181,30 +182,30 @@
int i;
float tot= 0.0f;
MDeformWeight *dw;
- for(i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++)
+ for (i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++)
tot += dw->weight;
- if(tot > 0.0f) {
- for(i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++)
+ if (tot > 0.0f) {
+ for (i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++)
dw->weight /= tot;
}
}
}
-void defvert_flip (MDeformVert *dvert, const int *flip_map, const int
flip_map_len)
+void defvert_flip(MDeformVert *dvert, const int *flip_map, const int
flip_map_len)
{
MDeformWeight *dw;
int i;
- for(dw= dvert->dw, i=0; i<dvert->totweight; dw++, i++) {
- if((dw->def_nr < flip_map_len) && (flip_map[dw->def_nr] >= 0)) {
+ for (dw= dvert->dw, i=0; i<dvert->totweight; dw++, i++) {
+ if ((dw->def_nr < flip_map_len) && (flip_map[dw->def_nr] >= 0))
{
dw->def_nr= flip_map[dw->def_nr];
}
}
}
-bDeformGroup *defgroup_find_name (Object *ob, const char *name)
+bDeformGroup *defgroup_find_name(Object *ob, const char *name)
{
/* return a pointer to the deform group with this name
* or return NULL otherwise.
@@ -219,7 +220,7 @@
return NULL;
}
-int defgroup_name_index (Object *ob, const char *name)
+int defgroup_name_index(Object *ob, const char *name)
{
/* Return the location of the named deform group within the list of
* deform groups. This function is a combination of defgroup_find_index
and
@@ -228,8 +229,8 @@
*/
bDeformGroup *curdef;
int def_nr;
-
- if(name && name[0] != '\0') {
+
+ if (name && name[0] != '\0') {
for (curdef=ob->defbase.first, def_nr=0; curdef;
curdef=curdef->next, def_nr++) {
if (!strcmp(curdef->name, name))
return def_nr;
@@ -239,7 +240,7 @@
return -1;
}
-int defgroup_find_index (Object *ob, bDeformGroup *dg)
+int defgroup_find_index(Object *ob, bDeformGroup *dg)
{
/* Fetch the location of this deform group
* within the linked list of deform groups.
@@ -275,7 +276,7 @@
* constant for this)
*/
if (eg == NULL) return -1;
-
+
return def_nr;
}
@@ -284,7 +285,7 @@
{
int totdg= *flip_map_len= BLI_countlist(&ob->defbase);
- if(totdg==0) {
+ if (totdg==0) {
return NULL;
}
else {
@@ -297,16 +298,16 @@
}
for (dg=ob->defbase.first, i=0; dg; dg=dg->next, i++) {
- if(map[i] == -1) { /* may be calculated previously */
+ if (map[i] == -1) { /* may be calculated previously */
/* incase no valid value is found, use this */
- if(use_default)
+ if (use_default)
map[i]= i;
flip_side_name(name, dg->name, FALSE);
- if(strcmp(name, dg->name)) {
+ if (strcmp(name, dg->name)) {
flip_num= defgroup_name_index(ob, name);
- if(flip_num >= 0) {
+ if (flip_num >= 0) {
map[i]= flip_num;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
