X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=SCX%2FTrack.pm;h=2feed611c7b5394d482e1e6db8db0cbbf3cf398d;hb=972687391b212153ee34a6ecf616fd1c1a53d01b;hp=09db4b708690c753f4b2e9f549fb893c8c1745ce;hpb=041b40ba9d04693394c1472224cbb4285a0280c3;p=slotcarman.git

diff --git a/SCX/Track.pm b/SCX/Track.pm
index 09db4b7..2feed61 100644
--- a/SCX/Track.pm
+++ b/SCX/Track.pm
@@ -39,7 +39,8 @@ sub car { return shift->{cars}->[shift]; }
 sub race_start {
 	my ($self) = @_;
 
-	return if $self->{race_running} || $self->{start_in_progress};
+	return if $self->{race_running} || $self->{start_in_progress}
+		|| $self->{qualification_running};
 	$self->{race_running} = 0;
 	$self->{start_in_progress} = 1;
 	$self->{semaphore} = 0;
@@ -64,14 +65,13 @@ sub semaphore_step {
 		$self->{race_running_since} = gettimeofday;
 		$self->{start_in_progress} = undef;
 		$self->{gui}->show_semaphore(0);
-		Glib::Timeout->add(3*$SEMAPHORE_STEP, \&semaphore_step, $self);
+		Glib::Timeout->add($SEMAPHORE_STEP, \&semaphore_step, $self);
 	} else {
 		$self->{gui}->show_semaphore(undef);
 		$self->{semaphore} = undef;
 	}
 	return FALSE;
 }
-
 sub race_end {
 	my ($self) = @_;
 
@@ -81,13 +81,14 @@ sub race_end {
 sub race_setup {
 	my ($self, $rounds) = @_;
 
+	$self->{round} = 0;
 	if ($rounds) {
-		$self->{gui}->rounds('0/' . $rounds);
 		$self->{race_rounds} = $rounds;
 	} else {
-		$self->{gui}->rounds('0');
 		$self->{race_rounds} = 0;
 	}
+
+	$self->print_rounds;
 	$self->{best_lap} = undef;
 
 	$self->{gui}->show_semaphore(undef);
@@ -96,18 +97,44 @@ sub race_setup {
 
 	$self->{gui}->time(undef);
 	$self->{gui}->best_lap(undef);
+}
+
+sub reset {
+	my ($self) = @_;
+
+	$self->{race_running} = 0;
+	$self->{start_in_progress} = 0;
+	$self->{best_lap} = undef;
+	$self->{round} = 0;
+
+	$self->print_rounds;
+	$self->{gui}->best_lap(undef);
+	$self->{gui}->time(undef);
 
 	for my $car (0..5) {
 		$self->car($car)->reset;
-		$self->car($car)->set_order($car);
 	}
 }
 
+sub print_rounds {
+	my ($self) = @_;
+
+	$self->{gui}->rounds($self->{qualification_running}
+		? 'Qualification'
+		: $self->{race_rounds}
+		? $self->{round} . '/' . $self->{race_rounds}
+		: $self->{round}
+	);
+}
+
 sub check_best_lap {
 	my ($self, $time, $who) = @_;
 
 	return if !defined $time || $time == 0;
 
+#	print "Check_best_lap $time $who vs ",
+#		defined $self->{best_lap} ? $self->{best_lap} : 'undef',
+#		"\n";
 	if (!defined $self->{best_lap}
 		|| $time < $self->{best_lap}) {
 		$self->{best_lap} = $time;
@@ -127,7 +154,7 @@ sub qualification_start {
 	}
 
 	$self->{qualification_running} = 1;
-	$self->{gui}->lap('Qualification');
+	$self->{gui}->rounds('Qualification');
 	$self->{gui}->time(undef);
 	$self->{gui}->best_lap(undef);
 }
@@ -136,14 +163,64 @@ sub packet_received {
 	my ($self, $time) = @_;
 
 	if ($self->{race_running}) {
-		$self->gui->time($time - $self->{race_running_since});
+		$self->{gui}->time($time - $self->{race_running_since});
 	}
 }
 
 sub recalc_order {
-	my ($self) = @_;
+	my ($self, $now) = @_;
+
+	return if !$self->{race_running};
+
+	my @laps;
+	my @times;
+	for my $id (0..5) {
+		$laps[$id]  = $self->car($id)->{lap} // -1;
+		$times[$id] = $self->car($id)->{first_finish_time} // $now;
+	}
+
+	my @new_order = sort {
+		$laps[$b] <=> $laps[$a]
+		||
+		$times[$a] <=> $times[$b]
+		||
+		$a <=> $b;
+	} (0..5);
+
+	my $lap_max = $laps[$new_order[0]];
+	if (defined $lap_max && $lap_max != $self->{round}
+		&& (!$self->{race_rounds}
+			|| $lap_max <= $self->{race_rounds})) {
+		$self->{round} = $lap_max;
+		$self->print_rounds;
+	}
 
-	# FIXME: Implement me
+	for my $id (0..5) {
+		my $car = $new_order[$id];
+		if ($self->car($car)->{order} != $id) {
+			$self->car($car)->set_order($id);
+		}
+	}
+	return ($new_order[0], $lap_max, $times[$new_order[0]]);
+}
+
+sub finish_line {
+	my ($self, $time, $regular, @cars) = @_;
+
+	my @processed;
+	for my $car (@cars) {
+		push @processed, $car
+                        if $self->car($car)->finish_line($time, $regular);
+        }
+
+        if (@processed) {
+                my ($first_car, $lap_max, $time_min)
+			= $self->recalc_order($time);
+
+		for my $car (@processed) {
+			$self->car($car)->recalc_distance($lap_max, $time_min);
+		}
+	}
 }
 
 1;