Revision: 26297
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26297
Author: campbellbarton
Date: 2010-01-26 14:50:17 +0100 (Tue, 26 Jan 2010)
Log Message:
-----------
rename defgroup functions to be more consistant.
* no functional changes *
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_deform.h
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/simple_deform.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
Modified: trunk/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_deform.h 2010-01-26
13:17:28 UTC (rev 26296)
+++ trunk/blender/source/blender/blenkernel/BKE_deform.h 2010-01-26
13:50:17 UTC (rev 26297)
@@ -40,21 +40,24 @@
struct bDeformGroup;
struct MDeformVert;
-void copy_defgroups (struct ListBase *lb1, struct ListBase *lb2);
-struct bDeformGroup *copy_defgroup (struct bDeformGroup *ingroup);
-struct bDeformGroup *get_named_vertexgroup (Object *ob, char *name);
-int get_defgroup_num (struct Object *ob, struct bDeformGroup *dg);
-int *get_defgroup_flip_map(struct Object *ob);
-int get_named_vertexgroup_num (Object *ob, const char *name);
-void unique_vertexgroup_name (struct bDeformGroup *dg, struct Object *ob);
-void flip_vertexgroup_name (char *name, const char *from_name, int
strip_number);
+void defgroup_copy_list(struct ListBase *lb1,
struct ListBase *lb2);
+struct bDeformGroup *defgroup_duplicate(struct bDeformGroup *ingroup);
+struct bDeformGroup *defgroup_find_name(Object *ob, char *name);
+int defgroup_find_index(struct Object *ob,
struct bDeformGroup *dg);
+int *defgroup_flip_map(struct Object *ob);
+int defgroup_name_index(Object *ob, const
char *name);
+void defgroup_unique_name(struct bDeformGroup *dg,
struct Object *ob);
-float deformvert_get_weight(const struct MDeformVert *dvert, int group_num);
-float vertexgroup_get_vertex_weight(const struct MDeformVert *dvert, int
index, int group_num);
+float defvert_find_weight(const struct MDeformVert *dvert, int group_num);
+float defvert_find_weight_safe(const struct MDeformVert *dvert, int index, int
group_num);
-void copy_defvert (struct MDeformVert *dvert_r, const struct MDeformVert
*dvert);
-void flip_defvert (struct MDeformVert *dvert, int *flip_map);
-void normalize_defvert (struct MDeformVert *dvert);
+void defvert_copy(struct MDeformVert *dvert_r, const struct MDeformVert
*dvert);
+void defvert_flip(struct MDeformVert *dvert, int *flip_map);
+void defvert_normalize(struct MDeformVert *dvert);
+/* utility function, note that 32 chars is the maximum string length since its
only
+ * used with defgroups currently */
+void flip_side_name(char *name, const char *from_name, int strip_number);
+
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2010-01-26
13:17:28 UTC (rev 26296)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2010-01-26
13:50:17 UTC (rev 26297)
@@ -415,7 +415,7 @@
copy_m4_m4(mat, ob->obmat);
/* get index of vertex group */
- dgroup = get_named_vertexgroup_num(ob, substring);
+ dgroup = defgroup_name_index(ob, substring);
if (dgroup < 0) return;
/* get DerivedMesh */
@@ -524,7 +524,7 @@
copy_m4_m4(mat, ob->obmat);
/* get index of vertex group */
- dgroup = get_named_vertexgroup_num(ob, substring);
+ dgroup = defgroup_name_index(ob, substring);
if (dgroup < 0) return;
if (dvert == NULL) return;
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2010-01-26
13:17:28 UTC (rev 26296)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2010-01-26
13:50:17 UTC (rev 26297)
@@ -67,19 +67,19 @@
#endif
-void copy_defgroups (ListBase *outbase, ListBase *inbase)
+void defgroup_copy_list (ListBase *outbase, ListBase *inbase)
{
bDeformGroup *defgroup, *defgroupn;
outbase->first= outbase->last= 0;
for (defgroup = inbase->first; defgroup; defgroup=defgroup->next){
- defgroupn= copy_defgroup(defgroup);
+ defgroupn= defgroup_duplicate(defgroup);
BLI_addtail(outbase, defgroupn);
}
}
-bDeformGroup *copy_defgroup (bDeformGroup *ingroup)
+bDeformGroup *defgroup_duplicate (bDeformGroup *ingroup)
{
bDeformGroup *outgroup;
@@ -96,7 +96,7 @@
return outgroup;
}
-void copy_defvert (MDeformVert *dvert_r, const MDeformVert *dvert)
+void defvert_copy (MDeformVert *dvert_r, const MDeformVert *dvert)
{
if(dvert_r->totweight == dvert->totweight) {
if(dvert->totweight)
@@ -115,7 +115,7 @@
}
}
-void normalize_defvert (MDeformVert *dvert)
+void defvert_normalize (MDeformVert *dvert)
{
if(dvert->totweight<=0) {
/* nothing */
@@ -137,7 +137,7 @@
}
}
-void flip_defvert (MDeformVert *dvert, int *flip_map)
+void defvert_flip (MDeformVert *dvert, int *flip_map)
{
MDeformWeight *dw;
int i;
@@ -148,7 +148,7 @@
}
-bDeformGroup *get_named_vertexgroup (Object *ob, char *name)
+bDeformGroup *defgroup_find_name (Object *ob, char *name)
{
/* return a pointer to the deform group with this name
* or return NULL otherwise.
@@ -163,11 +163,11 @@
return NULL;
}
-int get_named_vertexgroup_num (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 get_defgroup_num and
- * get_named_vertexgroup. The other two could be called instead, but
that
+ * deform groups. This function is a combination of defgroup_find_index
and
+ * defgroup_find_name. The other two could be called instead, but that
* require looping over the vertexgroups twice.
*/
bDeformGroup *curdef;
@@ -183,7 +183,7 @@
return -1;
}
-int get_defgroup_num (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.
@@ -225,7 +225,7 @@
}
/* note, must be freed */
-int *get_defgroup_flip_map(Object *ob)
+int *defgroup_flip_map(Object *ob)
{
bDeformGroup *dg;
int totdg= BLI_countlist(&ob->defbase);
@@ -240,9 +240,9 @@
for (dg=ob->defbase.first, i=0; dg; dg=dg->next, i++) {
if(map[i] == -1) { /* may be calculated previously */
- flip_vertexgroup_name(name, dg->name, 0);
+ flip_side_name(name, dg->name, 0);
if(strcmp(name, dg->name)) {
- flip_num= get_named_vertexgroup_num(ob,
name);
+ flip_num= defgroup_name_index(ob, name);
if(flip_num > -1) {
map[i]= flip_num;
map[flip_num]= i; /* save an
extra lookup */
@@ -254,7 +254,7 @@
}
}
-void unique_vertexgroup_name (bDeformGroup *dg, Object *ob)
+void defgroup_unique_name (bDeformGroup *dg, Object *ob)
{
bDeformGroup *curdef;
int number;
@@ -311,7 +311,7 @@
/* finds the best possible flipped name. For renaming; check for unique names
afterwards */
/* if strip_number: removes number extensions */
-void flip_vertexgroup_name (char *name, const char *from_name, int
strip_number)
+void flip_side_name (char *name, const char *from_name, int strip_number)
{
int len;
char prefix[sizeof((bDeformGroup *)NULL)->name]={""}; /* The part
before the facing */
@@ -425,7 +425,7 @@
-float deformvert_get_weight(const struct MDeformVert *dvert, int group_num)
+float defvert_find_weight(const struct MDeformVert *dvert, int group_num)
{
if(dvert)
{
@@ -441,11 +441,11 @@
return 0.0;
}
-float vertexgroup_get_vertex_weight(const struct MDeformVert *dvert, int
index, int group_num)
+float defvert_find_weight_safe(const struct MDeformVert *dvert, int index, int
group_num)
{
if(group_num == -1 || dvert == NULL)
return 1.0;
- return deformvert_get_weight(dvert+index, group_num);
+ return defvert_find_weight(dvert+index, group_num);
}
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2010-01-26
13:17:28 UTC (rev 26296)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2010-01-26
13:50:17 UTC (rev 26297)
@@ -867,7 +867,7 @@
}
else /* --- Using Nominated VertexGroup only --- */
{
- int defgrp_index = get_named_vertexgroup_num(ob, mmd->vgroup);
+ int defgrp_index = defgroup_name_index(ob, mmd->vgroup);
/* get dverts */
if (defgrp_index >= 0)
@@ -1812,7 +1812,7 @@
if (do_vgroup_mirr) {
- flip_map= get_defgroup_flip_map(ob);
+ flip_map= defgroup_flip_map(ob);
if(flip_map == NULL)
do_vgroup_mirr= 0;
}
@@ -1874,7 +1874,7 @@
if (do_vgroup_mirr) {
MDeformVert *dvert= DM_get_vert_data(result,
numVerts, CD_MDEFORMVERT);
if(dvert) {
- flip_defvert(dvert, flip_map);
+ defvert_flip(dvert, flip_map);
}
}
@@ -3298,7 +3298,7 @@
options = bmd->flags|bmd->val_flags|bmd->lim_flags|bmd->e_flags;
/*if ((options & BME_BEVEL_VWEIGHT) && bmd->defgrp_name[0]) {
- defgrp_index = get_named_vertexgroup_num(ob, bmd->defgrp_name);
+ defgrp_index = defgroup_name_index(ob, bmd->defgrp_name);
if (defgrp_index < 0) {
options &= ~BME_BEVEL_VWEIGHT;
}
@@ -3553,7 +3553,7 @@
if(!dmd->texture) return;
- defgrp_index = get_named_vertexgroup_num(ob, dmd->defgrp_name);
+ defgrp_index = defgroup_name_index(ob, dmd->defgrp_name);
mvert = CDDM_get_verts(dm);
if(defgrp_index >= 0)
@@ -4169,7 +4169,7 @@
medges = dm->getEdgeArray(dm);
numDMEdges = dm->getNumEdges(dm);
- defgrp_index = get_named_vertexgroup_num(ob, smd->defgrp_name);
+ defgrp_index = defgroup_name_index(ob, smd->defgrp_name);
if (defgrp_index >= 0)
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
@@ -4424,7 +4424,7 @@
/* 3) if we were given a vertex group name,
* only those vertices should be affected */
- defgrp_index = get_named_vertexgroup_num(ob, cmd->defgrp_name);
+ defgrp_index = defgroup_name_index(ob, cmd->defgrp_name);
if ((ob->type == OB_MESH) && dm && defgrp_index >= 0)
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
@@ -4582,7 +4582,7 @@
/* 3) if we were given a vertex group name,
* only those vertices should be affected */
- defgrp_index = get_named_vertexgroup_num(ob, cmd->defgrp_name);
+ defgrp_index = defgroup_name_index(ob, cmd->defgrp_name);
if ((ob->type == OB_MESH) && dm && defgrp_index >= 0)
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
@@ -5080,7 +5080,7 @@
}
/* get the index of the deform group */
- defgrp_index = get_named_vertexgroup_num(ob, wmd->defgrp_name);
+ defgrp_index = defgroup_name_index(ob, wmd->defgrp_name);
if(defgrp_index >= 0){
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
@@ -5511,7 +5511,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
