[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12646] branches/harmonic-skeleton/blender /source/blender: Fixing inter-arc parenting problems
Martin Poirier
theeth at yahoo.com
Wed Nov 21 23:44:17 CET 2007
Revision: 12646
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12646
Author: theeth
Date: 2007-11-21 23:44:17 +0100 (Wed, 21 Nov 2007)
Log Message:
-----------
Fixing inter-arc parenting problems
Removing a lot of debugging cruft
Start of recursive symmetry detection
Modified Paths:
--------------
branches/harmonic-skeleton/blender/source/blender/include/reeb.h
branches/harmonic-skeleton/blender/source/blender/src/editarmature.c
branches/harmonic-skeleton/blender/source/blender/src/reeb.c
Modified: branches/harmonic-skeleton/blender/source/blender/include/reeb.h
===================================================================
--- branches/harmonic-skeleton/blender/source/blender/include/reeb.h 2007-11-21 22:12:16 UTC (rev 12645)
+++ branches/harmonic-skeleton/blender/source/blender/include/reeb.h 2007-11-21 22:44:17 UTC (rev 12646)
@@ -84,9 +84,9 @@
struct EditMesh;
-void weightToHarmonic(struct EditMesh *em);
-void weightFromDistance(struct EditMesh *em);
-void weightFromLoc(struct EditMesh *me, int axis);
+int weightToHarmonic(struct EditMesh *em);
+int weightFromDistance(struct EditMesh *em);
+int weightFromLoc(struct EditMesh *me, int axis);
void renormalizeWeight(struct EditMesh *em, float newmax);
ReebGraph * generateReebGraph(struct EditMesh *me, int subdivisions);
Modified: branches/harmonic-skeleton/blender/source/blender/src/editarmature.c
===================================================================
--- branches/harmonic-skeleton/blender/source/blender/src/editarmature.c 2007-11-21 22:12:16 UTC (rev 12645)
+++ branches/harmonic-skeleton/blender/source/blender/src/editarmature.c 2007-11-21 22:44:17 UTC (rev 12646)
@@ -3175,6 +3175,74 @@
return embedLength / arcLength;
}
+void symetryMarkdownArc(ReebArc *arc, ReebNode *node, int level)
+{
+ while(arc)
+ {
+ int i;
+ arc->flags = level;
+
+ node = OTHER_NODE(arc, node);
+
+ for(i = 0; node->arcs[i] != NULL; i++)
+ {
+ ReebArc *connectedArc = node->arcs[i];
+
+ if (connectedArc != arc)
+ {
+ ReebNode *connectedNode = OTHER_NODE(connectedArc, node);
+
+ connectedArc->flags = -subtreeDepth(connectedNode);
+ }
+ }
+
+ arc = NULL;
+
+ for(i = 0; node->arcs[i] != NULL; i++)
+ {
+ int isSymetryAxis = 0;
+ ReebArc *connectedArc = node->arcs[i];
+
+ /* only arcs not already marked as symetric */
+ if (connectedArc->flags < 0)
+ {
+ int j;
+
+ /* true by default */
+ isSymetryAxis = 1;
+
+ for(j = 0; node->arcs[j] != NULL && isSymetryAxis == 1; j++)
+ {
+ ReebArc *otherArc = node->arcs[j];
+
+ /* different arc, same depth */
+ if (otherArc != connectedArc && otherArc->flags == connectedArc->flags)
+ {
+ /* not on the symetry axis */
+ isSymetryAxis = 0;
+ }
+ }
+ }
+
+ /* arc could be on the symetry axis */
+ if (isSymetryAxis == 1)
+ {
+ /* no arc as been marked previously, keep this one */
+ if (arc == NULL)
+ {
+ arc = connectedArc;
+ }
+ else
+ {
+ /* there can't be more than one symetry arc */
+ arc = NULL;
+ break;
+ }
+ }
+ }
+ }
+}
+
void symetryMarkdown(ReebGraph *rg)
{
ReebNode *node;
@@ -3198,74 +3266,9 @@
/* only work if only one arc is incident on the first node */
if (countConnectedArcs(rg, node) == 1)
{
- int symetry = 1;
-
arc = node->arcs[0];
- while(arc)
- {
- int i;
- arc->flags = symetry;
-
- node = OTHER_NODE(arc, node);
-
- for(i = 0; node->arcs[i] != NULL; i++)
- {
- ReebArc *connectedArc = node->arcs[i];
-
- if (connectedArc != arc)
- {
- ReebNode *connectedNode = OTHER_NODE(connectedArc, node);
-
- connectedArc->flags = -subtreeDepth(connectedNode);
- }
- }
-
- arc = NULL;
-
- for(i = 0; node->arcs[i] != NULL; i++)
- {
- int isSymetryAxis = 0;
- ReebArc *connectedArc = node->arcs[i];
-
- /* only arcs not already marked as symetric */
- if (connectedArc->flags < 0)
- {
- int j;
-
- /* true by default */
- isSymetryAxis = 1;
-
- for(j = 0; node->arcs[j] != NULL && isSymetryAxis == 1; j++)
- {
- ReebArc *otherArc = node->arcs[j];
-
- /* different arc, same depth */
- if (otherArc != connectedArc && otherArc->flags == connectedArc->flags)
- {
- /* not on the symetry axis */
- isSymetryAxis = 0;
- }
- }
- }
-
- /* arc could be on the symetry axis */
- if (isSymetryAxis == 1)
- {
- /* no arc as been marked previously, keep this one */
- if (arc == NULL)
- {
- arc = connectedArc;
- }
- else
- {
- /* there can't be more than one symetry arc */
- arc = NULL;
- break;
- }
- }
- }
- }
+ symetryMarkdownArc(arc, node, 1);
}
/* mark down non-symetric arcs */
@@ -3544,8 +3547,9 @@
void generateSkeletonFromReebGraph(ReebGraph *rg)
{
- GHash *nodeEndMap = NULL;
+ GHash *arcBoneMap = NULL;
ReebArc *arc = NULL;
+ ReebNode *node = NULL;
Object *src = NULL;
Object *dst = NULL;
@@ -3571,7 +3575,7 @@
make_editArmature();
- nodeEndMap = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+ arcBoneMap = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
symetryMarkdown(rg);
@@ -3579,40 +3583,48 @@
{
EditBone *lastBone = NULL;
EditBone *firstBone = NULL;
- EditBone *parentBone = NULL;
ReebNode *head, *tail;
int i;
-
+
+ /* Find out the direction of the arc through simple heuristics (in order of priority) :
+ *
+ * 1- Arcs on primary symetry axis (flags == 1) point up (head: high weight -> tail: low weight)
+ * 2- Arcs starting on a primary axis point away from it (head: node on primary axis)
+ * 3- Arcs point down (head: low weight -> tail: high weight)
+ *
+ * Finally, the arc direction is stored in its flags: 1 (low -> high), -1 (high -> low)
+ */
+
/* if arc is a symetry axis, internal bones go up the tree */
if (arc->flags == 1 && arc->v2->degree != 1)
{
head = arc->v2;
tail = arc->v1;
+
+ arc->flags = -1; /* mark arc direction */
}
/* Bones point AWAY from the symetry axis */
else if (arc->v1->flags == 1)
{
head = arc->v1;
tail = arc->v2;
+
+ arc->flags = 1; /* mark arc direction */
}
else if (arc->v2->flags == 1)
{
head = arc->v2;
tail = arc->v1;
+
+ arc->flags = -1; /* mark arc direction */
}
- /* otherwise, use some sort of heuristic */
+ /* otherwise, always go from low weight to high weight */
else
{
- if (arc->v1->degree >= arc->v2->degree)
- {
- head = arc->v1;
- tail = arc->v2;
- }
- else
- {
- head = arc->v2;
- tail = arc->v1;
- }
+ head = arc->v1;
+ tail = arc->v2;
+
+ arc->flags = 1; /* mark arc direction */
}
/* Loop over subdivision methods */
@@ -3644,25 +3656,64 @@
lastBone = bone;
}
- BLI_ghash_insert(nodeEndMap, tail, lastBone);
-
- parentBone = BLI_ghash_lookup(nodeEndMap, head);
-
- if (parentBone != NULL)
+ BLI_ghash_insert(arcBoneMap, arc, lastBone);
+ }
+
+ /* Second pass, setup parent relationship between arcs */
+ for(node = rg->nodes.first; node; node = node->next)
+ {
+ ReebArc *incomingArc = NULL;
+ int i;
+
+ for(i = 0; node->arcs[i] != NULL; i++)
{
- /* Find the first bone in the chain */
- firstBone = lastBone;
- while(firstBone->parent != NULL)
+ arc = node->arcs[i];
+
+ /* if arc is incoming into the node */
+ if ((arc->v1 == node && arc->flags == -1) || (arc->v2 == node && arc->flags == 1))
{
- firstBone = firstBone->parent;
+ if (incomingArc == NULL)
+ {
+ incomingArc = arc;
+ /* loop further to make sure there's only one incoming arc */
+ }
+ else
+ {
+ /* skip this node if more than one incomingArc */
+ incomingArc = NULL;
+ break; /* No need to look further, we are skipping already */
+ }
}
-
- firstBone->parent = parentBone;
- firstBone->flag |= BONE_CONNECTED;
}
+
+ if (incomingArc != NULL)
+ {
+ EditBone *parentBone = BLI_ghash_lookup(arcBoneMap, incomingArc);
+
+ /* Look for outgoing arcs and parent their bones */
+ for(i = 0; node->arcs[i] != NULL; i++)
+ {
+ arc = node->arcs[i];
+
+ /* if arc is outgoing from the node */
+ if ((arc->v1 == node && arc->flags == 1) || (arc->v2 == node && arc->flags == -1))
+ {
+ EditBone *childBone = BLI_ghash_lookup(arcBoneMap, arc);
+
+ /* find the root bone */
+ while(childBone->parent != NULL)
+ {
+ childBone = childBone->parent;
+ }
+
+ childBone->parent = parentBone;
+ childBone->flag |= BONE_CONNECTED;
+ }
+ }
+ }
}
- BLI_ghash_free(nodeEndMap, NULL, NULL);
+ BLI_ghash_free(arcBoneMap, NULL, NULL);
setcursor_space(SPACE_VIEW3D, CURSOR_EDIT);
Modified: branches/harmonic-skeleton/blender/source/blender/src/reeb.c
===================================================================
--- branches/harmonic-skeleton/blender/source/blender/src/reeb.c 2007-11-21 22:12:16 UTC (rev 12645)
+++ branches/harmonic-skeleton/blender/source/blender/src/reeb.c 2007-11-21 22:44:17 UTC (rev 12646)
@@ -60,12 +60,6 @@
#include "reeb.h"
-#if 0
-#define DPRINT(a) a
-#else
-#define DPRINT(a)
-#endif
-
/*
* Skeleton generation algorithm based on:
* "Harmonic Skeleton for Realistic Character Animation"
@@ -149,8 +143,6 @@
float start = ceil(arc->v1->weight);
arc->bcount = (int)(floor(arc->v2->weight) - start) + 1;
- DPRINT(printf("allocating %i buckets for range %f >> %f\n", arc->bcount, arc->v1->weight, arc->v2->weight));
-
if (arc->bcount > 0)
{
arc->buckets = MEM_callocN(sizeof(EmbedBucket) * arc->bcount, "embed bucket");
@@ -174,8 +166,6 @@
allocArcBuckets(arc);
- DPRINT(printf("old: %i new: %i\n", oldBCount, arc->bcount));
-
if (oldBCount != 0 && arc->bcount != 0)
{
int oldStart = (int)oldBuckets[0].val;
@@ -197,8 +187,6 @@
len = MIN2(oldEnd - (oldStart + oldOffset) + 1, newEnd - (newStart - newOffset) + 1);
- DPRINT(printf("%i, %i, %i\n", newOffset, oldOffset, len));
-
memcpy(arc->buckets + newOffset, oldBuckets + oldOffset, len * sizeof(EmbedBucket));
}
@@ -219,20 +207,18 @@
newEdge->next = NULL;
newEdge->prev = NULL;
- DPRINT(printf("copy edge [%p] -> [%p]\n", edge, newEdge));
-
return newEdge;
}
void printArc(ReebArc *arc)
{
-// ReebEdge *edge;
+ ReebEdge *edge;
printf("arc: (%i)%f -> (%i)%f\n", arc->v1->index, arc->v1->weight, arc->v2->index, arc->v2->weight);
-// for(edge = arc->edges.first; edge ; edge = edge->next)
-// {
-// printf("\tedge (%i, %i)\n", edge->v1->index, edge->v2->index);
-// }
+ for(edge = arc->edges.first; edge ; edge = edge->next)
+ {
+ printf("\tedge (%i, %i)\n", edge->v1->index, edge->v2->index);
+ }
}
void freeArc(ReebArc *arc)
@@ -328,6 +314,7 @@
void verifyBuckets(ReebGraph *rg)
{
+#ifdef DEBUG_REEB
ReebArc *arc = NULL;
for(arc = rg->arcs.first; arc; arc = arc->next)
{
@@ -355,6 +342,7 @@
}
}
}
+#endif
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list