[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16058] branches/harmonic-skeleton/source/ blender/src/reeb.c: Fix flipped arc caused by harmonic interpolation

[Martin Poirier]

Revision: 16058
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16058
Author:   theeth
Date:     2008-08-11 22:01:15 +0200 (Mon, 11 Aug 2008)

Log Message:
-----------
Fix flipped arc caused by harmonic interpolation

Modified Paths:
--------------
    branches/harmonic-skeleton/source/blender/src/reeb.c

Modified: branches/harmonic-skeleton/source/blender/src/reeb.c
===================================================================
--- branches/harmonic-skeleton/source/blender/src/reeb.c	2008-08-11 19:06:30 UTC (rev 16057)
+++ branches/harmonic-skeleton/source/blender/src/reeb.c	2008-08-11 20:01:15 UTC (rev 16058)
@@ -1161,17 +1161,21 @@
 			reweightArc(next_arc, node, end_weight);
 		}
 	}
-	
-	old_weight = arc->head->weight; /* backup head weight, other arcs need it intact, it will be fixed by the source arc */
-	
-	arc->head->weight = start_weight;
-	arc->tail->weight = end_weight;
-	
-	reweightBuckets(arc);
-	resizeArcBuckets(arc);
-	fillArcEmptyBuckets(arc);
-	
-	arc->head->weight = old_weight;
+
+	/* update only if needed */	
+	if (arc->head->weight != start_weight)
+	{
+		old_weight = arc->head->weight; /* backup head weight, other arcs need it intact, it will be fixed by the source arc */
+		
+		arc->head->weight = start_weight;
+		arc->tail->weight = end_weight;
+		
+		reweightBuckets(arc);
+		resizeArcBuckets(arc);
+		fillArcEmptyBuckets(arc);
+		
+		arc->head->weight = old_weight;
+	}
 } 
 
 void reweightSubgraph(ReebGraph *rg, ReebNode *start_node, float start_weight)
@@ -1269,6 +1273,34 @@
 	return joined;
 }
 
+/* Reweight graph from smallest node, fix fliped arcs */
+void fixSubgraphsOrientation(ReebGraph *rg, int nb_subgraphs)
+{
+	int subgraph;
+	
+	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
+	{
+		ReebNode *node;
+		ReebNode *start_node = NULL;
+		
+		for (node = rg->nodes.first; node; node = node->next)
+		{
+			if (node->flag == subgraph)
+			{
+				if (start_node == NULL || node->weight < start_node->weight)
+				{
+					start_node = node;
+				}
+			}
+		}
+		
+		if (start_node)
+		{
+			reweightSubgraph(rg, start_node, start_node->weight);
+		}
+	}
+}
+
 int joinSubgraphs(ReebGraph *rg, float threshold)
 {
 	int nb_subgraphs;
@@ -1282,6 +1314,12 @@
 	
 	nb_subgraphs = BLI_FlagSubgraphs((BGraph*)rg);
 	
+	/* Harmonic function can create flipped arcs, take the occasion to fix them */
+	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
+	{
+		fixSubgraphsOrientation(rg, nb_subgraphs);
+	}
+
 	if (nb_subgraphs > 1)
 	{
 		joined |= joinSubgraphsEnds(rg, threshold, nb_subgraphs);