X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Faicontrol.cpp;h=3e31aaf638e602412fa8a184dfbde2796dabe41d;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=2d48bf764a3f498047a078a34965461fc2985c2d;hpb=90f9efba8d88f41c7a180734b7bcbdd1501d995e;p=r2c2.git

diff --git a/source/libr2c2/aicontrol.cpp b/source/libr2c2/aicontrol.cpp
index 2d48bf7..3e31aaf 100644
--- a/source/libr2c2/aicontrol.cpp
+++ b/source/libr2c2/aicontrol.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include "aicontrol.h"
 #include "catalogue.h"
 #include "layout.h"
@@ -15,77 +8,58 @@ using namespace Msp;
 
 namespace R2C2 {
 
-AIControl::AIControl(Train &t, Controller *n):
-	train(t),
-	next_ctrl(n),
-	target_speed(Control::continuous("speed", 0, 1000)),
-	state(NORMAL)
+AIControl::AIControl(Train &t):
+	TrainAI(t),
+	target_speed(0),
+	reverse(false),
+	pending_reverse(false),
+	state(NORMAL),
+	need_update(false)
 {
-	target_speed.set(0);
-
 	train.signal_arrived.connect(sigc::mem_fun(this, &AIControl::arrived));
-	next_ctrl->signal_control_changed.connect(sigc::mem_fun(this, &AIControl::control_changed));
 }
 
-AIControl::~AIControl()
+void AIControl::set_target_speed(float s)
 {
-	delete next_ctrl;
-}
+	if(s && !train.is_active())
+		train.set_active(true);
 
-void AIControl::set_control(const string &n, float v)
-{
-	if(n=="speed")
-	{
-		if(v && !train.is_active())
-			train.set_active(true);
-
-		target_speed.set(v);
-		if(state!=BLOCKED)
-		{
-			float approach_speed = 5*train.get_layout().get_catalogue().get_scale();
-			if(state==APPROACH && target_speed.value>approach_speed)
-				next_ctrl->set_control("speed", approach_speed);
-			else
-				next_ctrl->set_control("speed", target_speed.value);
-		}
-
-		signal_control_changed.emit(target_speed);
-	}
-	else
-		next_ctrl->set_control(n, v);
+	target_speed = s;
+	need_update = true;
+	signal_event.emit(Message("target-speed-changed", target_speed));
 }
 
-const Controller::Control &AIControl::get_control(const string &n) const
+void AIControl::set_reverse(bool r)
 {
-	if(n=="speed")
-		return target_speed;
+	pending_reverse = r;
+	if(train.get_controller().get_speed())
+		set_target_speed(0);
 	else
-		return next_ctrl->get_control(n);
-}
-
-float AIControl::get_speed() const
-{
-	return next_ctrl->get_speed();
-}
-
-bool AIControl::get_reverse() const
-{
-	return next_ctrl->get_reverse();
+	{
+		reverse = r;
+		train.set_control("reverse", reverse);
+		signal_event.emit(Message("reverse-changed", reverse));
+	}
 }
 
-float AIControl::get_braking_distance() const
+void AIControl::message(const Message &msg)
 {
-	return next_ctrl->get_braking_distance();
+	if(msg.type=="set-target-speed")
+		set_target_speed(msg.value.value<float>());
+	else if(msg.type=="set-reverse")
+		set_reverse(msg.value.value<bool>());
+	else if(msg.type=="toggle-reverse")
+		set_reverse(!reverse);
 }
 
-void AIControl::tick(const Time::TimeDelta &dt)
+void AIControl::tick(const Time::TimeStamp &, const Time::TimeDelta &)
 {
 	float scale = train.get_layout().get_catalogue().get_scale();
 	float rsv_dist = train.get_reserved_distance();
-	float brake_dist = next_ctrl->get_braking_distance();
+	float brake_dist = train.get_controller().get_braking_distance();
 	float approach_margin = 50*scale;
 	float approach_speed = 5*scale;
-	float margin = 10*scale;
+	float margin = 1*scale;
 
 	State old_state = state;
 
@@ -102,37 +76,37 @@ void AIControl::tick(const Time::TimeDelta &dt)
 	if(state==NORMAL && train.get_preceding_train())
 		state = FOLLOW;
 
-	if(state!=old_state || state==FOLLOW)
+	if(state!=old_state || state==FOLLOW || need_update)
 	{
 		float speed_limit = -1;
 		if(state==BLOCKED)
 			speed_limit = 0;
 		else if(state==APPROACH)
 			speed_limit = approach_speed;
-		else if(state==FOLLOW)
+		else if(state==FOLLOW && train.get_preceding_train()->is_active())
 			speed_limit = train.get_preceding_train()->get_speed();
 
-		if(speed_limit>=0 && target_speed.value>speed_limit)
-			next_ctrl->set_control("speed", speed_limit);
+		if(speed_limit>=0 && target_speed>speed_limit)
+			train.set_control("speed", speed_limit);
 		else
-			next_ctrl->set_control("speed", target_speed.value);
+			train.set_control("speed", target_speed);
+
+		need_update = false;
 	}
 
-	next_ctrl->tick(dt);
+	if(pending_reverse!=reverse && !train.get_controller().get_speed())
+	{
+		reverse = pending_reverse;
+		train.set_control("reverse", reverse);
+	}
 
-	if(!target_speed.value && !next_ctrl->get_speed() && train.is_active())
+	if(!target_speed && !train.get_controller().get_speed() && train.is_active())
 		train.set_active(false);
 }
 
-void AIControl::control_changed(const Control &ctrl)
-{
-	if(ctrl.name!="speed")
-		signal_control_changed.emit(ctrl);
-}
-
 void AIControl::arrived()
 {
-	set_control("speed", 0);
+	set_target_speed(0);
 }
 
 } // namespace R2C2