X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_bline.cpp;h=82e5a429fc0870d5798c0e559396ea902998b984;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=ee0d83148a242916265ab6f16074d5a7d77332d0;hpb=170f9a7e60b16e212cb7ab740627376be68713cb;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp
index ee0d831..82e5a42 100644
--- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -340,13 +341,16 @@ ValueNode_BLine::operator()(Time t)const
 	BLinePoint prev,first;
 	first.set_origin(100.0f);
 
+	// loop through all the list's entries
 	for(iter=list.begin();iter!=list.end();++iter,index++)
 	{
+		// how 'on' is this vertex?
 		float amount(iter->amount_at_time(t,&rising));
 
 		assert(amount>=0.0f);
 		assert(amount<=1.0f);
 
+		// it's fully on
 		if(amount==1.0f)
 		{
 			if(first_flag)
@@ -381,8 +385,8 @@ ValueNode_BLine::operator()(Time t)const
 
 			prev=curr;
 		}
-		else
-		if(amount>0.0f)
+		// it's partly on
+		else if(amount>0.0f)
 		{
 			std::vector<ListEntry>::const_iterator begin_iter,end_iter;
 
@@ -417,34 +421,28 @@ ValueNode_BLine::operator()(Time t)const
 			blp_here_on=(*iter->value_node)(on_time).get(blp_here_on);
 //			blp_here_on=(*iter->value_node)(t).get(blp_here_on);
 
-			// Find "end" of dynamic group
+			// Find "end" of dynamic group - ie. search forward along
+			// the bline from the current point until we find a point
+			// which is more 'on'than the current one
 			end_iter=iter;
 //			for(++end_iter;begin_iter!=list.end();++end_iter)
 			for(++end_iter;end_iter!=list.end();++end_iter)
 				if(end_iter->amount_at_time(t)>amount)
-				{
-					blp_next_off=(*end_iter->value_node)(off_time).get(prev);
 					break;
-				}
 
 			// If we did not find an end of the dynamic group...
+			// Writeme!  at least now it doesn't crash if first_iter
+			// isn't set yet
 			if(end_iter==list.end())
 			{
-				if(get_loop())
-				{
+				if(get_loop() && !first_flag)
 					end_iter=first_iter;
-					blp_next_off=(*end_iter->value_node)(off_time).get(prev);
-//					end=first;
-				}
 				else
-				{
-					// Writeme!
-					end_iter=first_iter;
-					blp_next_off=(*end_iter->value_node)(off_time).get(prev);
-//					end=first;
-				}
+					end_iter=--list.end();
 			}
 
+			blp_next_off=(*end_iter->value_node)(off_time).get(prev);
+
 			// Find "begin" of dynamic group
 			begin_iter=iter;
 			blp_prev_off.set_origin(100.0f); // set the origin to 100 (which is crazy) so that we can check to see if it was found
@@ -461,6 +459,7 @@ ValueNode_BLine::operator()(Time t)const
 				--begin_iter;
 				dist_from_begin++;
 
+				// if we've gone all around the loop, give up
 				if(begin_iter==iter)
 					break;
 
@@ -469,24 +468,18 @@ ValueNode_BLine::operator()(Time t)const
 					blp_prev_off=(*begin_iter->value_node)(off_time).get(prev);
 					break;
 				}
-			}while(begin_iter!=iter);
+			}while(true);
 
 			// If we did not find a begin
 			if(blp_prev_off.get_origin()==100.0f)
 			{
-				if(get_loop())
-				{
-					begin_iter=first_iter;
-					blp_prev_off=(*begin_iter->value_node)(off_time).get(prev);
-//					blp_prev_off=first;
-				}
+				// Writeme! - this needs work, but at least now it
+				// doesn't crash
+				if(first_flag)
+					begin_iter=list.begin();
 				else
-				{
-					// Writeme!
 					begin_iter=first_iter;
-					blp_prev_off=(*begin_iter->value_node)(off_time).get(prev);
-//					blp_prev_off=first;
-				}
+				blp_prev_off=(*begin_iter->value_node)(off_time).get(prev);
 			}
 
 			// this is how the curve looks when we have completely vanished