X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=SCX%2FTrack.pm;h=c88e6f8540ff024ce9d67c9636b60310084d4096;hb=5341c13d51c282a68cb9fdeb92b15711630d33e7;hp=fcf6b80d94747fbe3cf4e1af8edf0d285f78de9a;hpb=47a074f4d544cc734a6c053025747ec08149370b;p=slotcarman.git

diff --git a/SCX/Track.pm b/SCX/Track.pm
index fcf6b80..c88e6f8 100644
--- a/SCX/Track.pm
+++ b/SCX/Track.pm
@@ -5,7 +5,6 @@ package SCX::Track;
 use strict;
 use Carp;
 
-use Time::HiRes qw(gettimeofday);
 use Glib qw(TRUE FALSE);
 use SCX::Car;
 
@@ -19,6 +18,8 @@ sub new {
 		race_running => 0,
 		lap_counting_up => 1,
 		round => 0,
+		now => 0,
+		qualification_setup => -100,
 	};
 
 	bless $self, $class;
@@ -41,16 +42,22 @@ sub new {
 sub car { return shift->{cars}->[shift]; }
 
 sub race_start {
-	my ($self) = @_;
+	my ($self, $time) = @_;
 
 	return if $self->{race_running} || $self->{start_in_progress}
 		|| $self->{qualification_running};
-	$self->{round} = 0;
-	$self->{race_running} = 0;
-	$self->{start_in_progress} = 1;
-	$self->{semaphore} = 0;
-	$self->{gui}->show_semaphore(0);
-	Glib::Timeout->add($SEMAPHORE_STEP, \&semaphore_step, $self);
+
+	if ($time - $self->{qualification_setup} < 1) {
+		$self->{qualification_running} = 1;
+	} else {
+		$self->{round} = 0;
+		$self->{race_running} = 0;
+		$self->{start_in_progress} = 1;
+		$self->{semaphore} = 0;
+		$self->{gui}->show_semaphore(0);
+		Glib::Timeout->add($SEMAPHORE_STEP, \&semaphore_step, $self);
+	}
+	$self->print_rounds;
 }
 
 sub semaphore_step {
@@ -67,7 +74,7 @@ sub semaphore_step {
 		Glib::Timeout->add($timeout, \&semaphore_step, $self);
 	} elsif ($self->{semaphore} == 6) {
 		$self->{race_running} = 1;
-		$self->{race_running_since} = gettimeofday;
+		$self->{race_running_since} = $self->{now};
 		$self->{start_in_progress} = undef;
 		$self->{gui}->show_semaphore(0);
 		Glib::Timeout->add($SEMAPHORE_STEP, \&semaphore_step, $self);
@@ -77,6 +84,7 @@ sub semaphore_step {
 	}
 	return FALSE;
 }
+
 sub race_end {
 	my ($self) = @_;
 
@@ -84,20 +92,25 @@ sub race_end {
 }
 
 sub race_setup {
-	my ($self, $rounds) = @_;
+	my ($self, $rounds, $time) = @_;
 
-	$self->{round} = 0;
-	if ($rounds) {
-		$self->{race_rounds} = $rounds;
+	if ($time - $self->{qualification_setup} < 1) {
+		$self->{round} = 0;
 	} else {
-		$self->{race_rounds} = 0;
+		if ($rounds) {
+			$self->{race_rounds} = $rounds;
+		} else {
+			$self->{race_rounds} = 0;
+		}
 	}
 
+	$self->{round} = 0;
 	$self->print_rounds;
 	$self->{best_lap} = undef;
 
 	$self->{gui}->show_semaphore(undef);
 	$self->{race_running} = 0;
+	$self->{qualification_running} = 0;
 	$self->{start_in_progress} = 0;
 
 	$self->{gui}->time(undef);
@@ -108,6 +121,7 @@ sub reset {
 	my ($self) = @_;
 
 	$self->{race_running} = 0;
+	$self->{qualification_running} = 0;
 	$self->{start_in_progress} = 0;
 	$self->{race_finishing} = 0;
 	$self->{best_lap} = undef;
@@ -126,8 +140,10 @@ sub print_rounds {
 	my ($self) = @_;
 
 	my $msg;
-	if ($self->{qualification_running}) {
-		$msg = 'Qualification';
+	if ($self->{qualification_running}
+		|| $self->{now} - $self->{qualification_setup} < 1) {
+		$msg = 'Qualification: ' . $self->{race_rounds}
+			. ($self->{race_rounds} == 1 ? ' round' : ' rounds');
 	} elsif ($self->{race_rounds}) {
 		$msg = $self->{round} . '/' . $self->{race_rounds};
 	} else {
@@ -154,24 +170,29 @@ sub check_best_lap {
 	return 0;
 }
 
-sub qualification_start {
-	my ($self) = @_;
+sub qualification_setup {
+	my ($self, $rounds, $cars, $time) = @_;
 
 	return if $self->{qualification_running};
+
 	for my $car (0..5) {
 		$self->car($car)->set_lap(undef);
 		$self->car($car)->set_laptime(undef);
 	}
 
-	$self->{qualification_running} = 1;
-	$self->{gui}->rounds('Qualification');
+	$self->{qualification_setup} = $time;
+	$self->{race_rounds} = $rounds;
+	$self->{qualification_cars} = $cars;
 	$self->{gui}->time(undef);
 	$self->{gui}->best_lap(undef);
+	$self->print_rounds;
 }
 
 sub packet_received {
 	my ($self, $time) = @_;
 
+	$self->{now} = $time;
+
 	if ($self->{race_running}) {
 		$self->{gui}->time($time - $self->{race_running_since});
 	}
@@ -220,6 +241,36 @@ sub recalc_order {
 	return ($lap_max_changed, $lap_max, $times[$new_order[0]]);
 }
 
+sub recalc_qual_order {
+	my ($self) = @_;
+
+	return if !$self->{qualification_running};
+
+	my @times;
+	for my $id (0..5) {
+		$times[$id] = $self->car($id)->{best_lap};
+		if (!defined $times[$id] || $times[$id] <= 0) {
+			$times[$id] = 999_999;
+		}
+	}
+
+	my @new_order = sort {
+		$times[$a] <=> $times[$b]
+		||
+		$a <=> $b;
+	} (0..5);
+
+	my $best_time = $times[$new_order[0]];
+
+	for my $id (0..5) {
+		my $car = $new_order[$id];
+		if ($self->car($car)->{order} != $id) {
+			$self->car($car)->set_order($id);
+		}
+	}
+	return ($times[$new_order[0]]);
+}
+
 sub finish_line {
 	my ($self, $time, $regular, @cars) = @_;
 
@@ -235,6 +286,14 @@ sub finish_line {
 
 	return if !$was_processed;
 
+	if ($self->{qualification_running}) {
+		my ($best) = $self->recalc_qual_order;
+		for my $car (0..5) {
+			$self->car($car)->recalc_qual_distance($best);
+		}
+		return;
+	}
+
 	my ($lap_max_changed, $lap_max, $time_min)
 		= $self->recalc_order($time);