X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_noise%2Fvaluenode_random.cpp;h=1ae09a49116d44d80a4624f3977114aa46df26de;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=3bf6ab4041fb74255e9e0d23a0d61df2df573b09;hpb=fafe917d6753b69bf88ebe1f688c7bfc7bc80702;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_noise/valuenode_random.cpp b/synfig-core/trunk/src/modules/mod_noise/valuenode_random.cpp
index 3bf6ab4..1ae09a4 100644
--- a/synfig-core/trunk/src/modules/mod_noise/valuenode_random.cpp
+++ b/synfig-core/trunk/src/modules/mod_noise/valuenode_random.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 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
@@ -60,13 +60,17 @@ ValueNode_Random::ValueNode_Random(const ValueBase &value):
 	set_link("radius",ValueNode_Const::create(Real(1)));
 	set_link("seed",ValueNode_Const::create(random.get_seed()));
 	set_link("speed",ValueNode_Const::create(Real(1)));
-	set_link("smooth",ValueNode_Const::create(int(Random::SMOOTH_CUBIC)));
+	set_link("smooth",ValueNode_Const::create(int(RandomNoise::SMOOTH_CUBIC)));
+	set_link("loop",ValueNode_Const::create(Real(0)));
 
 	switch(get_type())
 	{
 	case ValueBase::TYPE_ANGLE:
 		set_link("link",ValueNode_Const::create(value.get(Angle())));
 		break;
+	case ValueBase::TYPE_BOOL:
+		set_link("link",ValueNode_Const::create(value.get(bool())));
+		break;
 	case ValueBase::TYPE_COLOR:
 		set_link("link",ValueNode_Const::create(value.get(Color())));
 		break;
@@ -83,7 +87,7 @@ ValueNode_Random::ValueNode_Random(const ValueBase &value):
 		set_link("link",ValueNode_Const::create(value.get(Vector())));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(get_type()));
+		throw Exception::BadType(ValueBase::type_local_name(get_type()));
 	}
 
 	DCAST_HACK_ENABLE();
@@ -109,12 +113,14 @@ ValueNode_Random::~ValueNode_Random()
 ValueBase
 ValueNode_Random::operator()(Time t)const
 {
-	typedef const Random::SmoothType Smooth;
+	typedef const RandomNoise::SmoothType Smooth;
 
 	Real	radius	= (*radius_)(t).get(Real());
 	int		seed	= (*seed_)(t).get(int());
 	int		smooth	= (*smooth_)(t).get(int());
-	float	speed	= (*speed_ )(t).get(Real()) * t;
+	float	speed	= (*speed_ )(t).get(Real());
+	int		loop	= int((((*loop_ )(t).get(Real())) * speed) + 0.5);
+	speed *= t;
 
 	random.set_seed(seed);
 
@@ -122,30 +128,34 @@ ValueNode_Random::operator()(Time t)const
 	{
 	case ValueBase::TYPE_ANGLE:
 		return ((*link_)(t).get( Angle()) +
-				Angle::deg(random(Smooth(smooth), 0, 0, 0, speed) * radius));
+				Angle::deg(random(Smooth(smooth), 0, 0, 0, speed, loop) * radius));
+
+	case ValueBase::TYPE_BOOL:
+		return round_to_int((*link_)(t).get(  bool()) +
+							random(Smooth(smooth), 0, 0, 0, speed, loop) * radius) > 0;
 
 	case ValueBase::TYPE_COLOR:
 		return (((*link_)(t).get( Color()) +
-				 Color(random(Smooth(smooth), 0, 0, 0, speed),
-					   random(Smooth(smooth), 1, 0, 0, speed),
-					   random(Smooth(smooth), 2, 0, 0, speed), 0) * radius).clamped());
+				 Color(random(Smooth(smooth), 0, 0, 0, speed, loop),
+					   random(Smooth(smooth), 1, 0, 0, speed, loop),
+					   random(Smooth(smooth), 2, 0, 0, speed, loop), 0) * radius).clamped());
 
 	case ValueBase::TYPE_INTEGER:
 		return round_to_int((*link_)(t).get(   int()) +
-							random(Smooth(smooth), 0, 0, 0, speed) * radius);
+							random(Smooth(smooth), 0, 0, 0, speed, loop) * radius);
 
 	case ValueBase::TYPE_REAL:
 		return ((*link_)(t).get(  Real()) +
-				random(Smooth(smooth), 0, 0, 0, speed) * radius);
+				random(Smooth(smooth), 0, 0, 0, speed, loop) * radius);
 
 	case ValueBase::TYPE_TIME:
 		return ((*link_)(t).get(  Time()) +
-				random(Smooth(smooth), 0, 0, 0, speed) * radius);
+				random(Smooth(smooth), 0, 0, 0, speed, loop) * radius);
 
 	case ValueBase::TYPE_VECTOR:
 	{
-		float length(random(Smooth(smooth), 0, 0, 0, speed) * radius);
-		Angle::rad angle(random(Smooth(smooth), 1, 0, 0, speed) * PI);
+		float length(random(Smooth(smooth), 0, 0, 0, speed, loop) * radius);
+		Angle::rad angle(random(Smooth(smooth), 1, 0, 0, speed, loop) * PI);
 
 		return ((*link_)(t).get(Vector()) +
 				Vector(Angle::cos(angle).get(), Angle::sin(angle).get()) * length);
@@ -173,31 +183,18 @@ ValueNode_Random::get_local_name()const
 }
 
 bool
-ValueNode_Random::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Random::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-	case 0:
-		link_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	case 1:
-		radius_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	case 2:
-		seed_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	case 3:
-		speed_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	case 4:
-		smooth_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(link_,   get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(radius_, ValueBase::TYPE_REAL);
+	case 2: CHECK_TYPE_AND_SET_VALUE(seed_,   ValueBase::TYPE_INTEGER);
+	case 3: CHECK_TYPE_AND_SET_VALUE(speed_,  ValueBase::TYPE_REAL);
+	case 4: CHECK_TYPE_AND_SET_VALUE(smooth_, ValueBase::TYPE_INTEGER);
+	case 5: CHECK_TYPE_AND_SET_VALUE(loop_,  ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -206,6 +203,7 @@ ValueNode::LooseHandle
 ValueNode_Random::get_link_vfunc(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return link_;
@@ -213,6 +211,7 @@ ValueNode_Random::get_link_vfunc(int i)const
 	case 2: return seed_;
 	case 3: return speed_;
 	case 4: return smooth_;
+	case 5: return loop_;
 	}
 	return 0;
 }
@@ -220,13 +219,14 @@ ValueNode_Random::get_link_vfunc(int i)const
 int
 ValueNode_Random::link_count()const
 {
-	return 5;
+	return 6;
 }
 
 String
 ValueNode_Random::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return "link";
@@ -234,6 +234,7 @@ ValueNode_Random::link_name(int i)const
 	case 2: return "seed";
 	case 3: return "speed";
 	case 4: return "smooth";
+	case 5: return "loop";
 	}
 	return String();
 }
@@ -242,6 +243,7 @@ String
 ValueNode_Random::link_local_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return _("Link");
@@ -249,6 +251,7 @@ ValueNode_Random::link_local_name(int i)const
 	case 2: return _("Seed");
 	case 3: return _("Animation Speed");
 	case 4: return _("Interpolation");
+	case 5: return _("Loop Time");
 	}
 	return String();
 }
@@ -261,6 +264,7 @@ ValueNode_Random::get_link_index_from_name(const String &name)const
 	if(name=="seed"  ) return 2;
 	if(name=="speed" ) return 3;
 	if(name=="smooth") return 4;
+	if(name=="loop"  ) return 5;
 	throw Exception::BadLinkName(name);
 }
 
@@ -269,9 +273,32 @@ ValueNode_Random::check_type(ValueBase::Type type)
 {
 	return
 		type==ValueBase::TYPE_ANGLE		||
+		type==ValueBase::TYPE_BOOL		||
 		type==ValueBase::TYPE_COLOR		||
 		type==ValueBase::TYPE_INTEGER	||
 		type==ValueBase::TYPE_REAL		||
 		type==ValueBase::TYPE_TIME		||
 		type==ValueBase::TYPE_VECTOR	;
 }
+
+ValueNode*
+ValueNode_Random::clone(const GUID& deriv_guid)const
+{
+	ValueNode_Random* ret = (ValueNode_Random*)LinkableValueNode::clone(deriv_guid);
+	ret->randomize_seed();
+	return ret;
+}
+
+void
+ValueNode_Random::randomize_seed()
+{
+	int i = get_link_index_from_name("seed");
+	ValueNode::Handle link = get_link_vfunc(i);
+	if(!link->is_exported() && link->get_name() == "constant")
+	{
+		int seed = time(NULL) + rand();
+		if (seed < 0) seed = -seed;
+		random.set_seed(seed);
+		set_link(i, ValueNode_Const::create(seed));
+	}
+}