More fixes.

[slotcarman.git] / SCX / Track.pm

diff --git a/SCX/Track.pm b/SCX/Track.pm
index 21f3ab499f70061e98e624f68be3dec763c5f983..b71257e5a32546a8132d3f68438321ffa8f7b367 100644 (file)
--- a/SCX/Track.pm
+++ b/SCX/Track.pm
@@ -39,7 +39,9 @@ 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->{round} = 0;
        $self->{race_running} = 0;
        $self->{start_in_progress} = 1;
        $self->{semaphore} = 0;
@@ -64,14 +66,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,39 +82,64 @@ 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->{race_time} = 0;
+
+       $self->print_rounds;
        $self->{best_lap} = undef;
 
        $self->{gui}->show_semaphore(undef);
        $self->{race_running} = 0;
        $self->{start_in_progress} = 0;
 
-       $self->{gui}->time('00:00');
-       $self->{gui}->best_lap('0.00');
+       $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)->set_order($car);
-               $self->car($car)->set_lap(0);
-               $self->car($car)->set_laptime(undef);
+               $self->car($car)->reset;
        }
 }
 
+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;
-               $self->{gui}->best_lap(sprintf("%.2f", $time), $who);
+               $self->{gui}->best_lap($time, $who);
                return 1;
        }
        return 0;
@@ -128,10 +154,85 @@ sub qualification_start {
                $self->car($car)->set_laptime(undef);
        }
 
-       $self->{qualification_running};
-       $self->{gui}->lap('Qualification');
-       $self->{gui}->time('00:00');
-       $self->{gui}->best_lap('0:00');
+       $self->{qualification_running} = 1;
+       $self->{gui}->rounds('Qualification');
+       $self->{gui}->time(undef);
+       $self->{gui}->best_lap(undef);
+}
+
+sub packet_received {
+       my ($self, $time) = @_;
+
+       if ($self->{race_running}) {
+               $self->{gui}->time($time - $self->{race_running_since});
+       }
+}
+
+sub recalc_order {
+       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 && $self->{round} && $lap_max != $self->{round}
+               && (!$self->{race_rounds}
+                       || $lap_max <= $self->{race_rounds})) {
+               $self->{round} = $lap_max;
+               $self->print_rounds;
+       }
+
+       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;
+       my $was_processed;
+
+       for my $car (@cars) {
+               if ($self->car($car)->finish_line($time, $regular)) {
+                       $processed{$car} = 1;
+                       $was_processed = 1;
+               }
+        }
+
+       
+        if ($was_processed) {
+                my ($first_car, $lap_max, $time_min)
+                       = $self->recalc_order($time);
+
+               for my $car (0..5) {
+                       if ($processed{$car}) {
+                               $self->car($car)->recalc_distance(
+                                       $lap_max, $time_min
+                               );
+                       } else {
+                               #$self->car($car)->greyout_distance;
+                       }
+               }
+       }
 }
 
 1;