Refactorized GUI layer.

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index f4a38a0436b258016b5e38e68db07e05f9dde1dc..8bb7bb9a00e8c5a1f15f596b19e0587dace11eeb 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -3,23 +3,21 @@
 package SCX::Car;
 
 use strict;
+use Time::HiRes qw(gettimeofday);
 
 sub new {
        my ($class, $args) = @_;
 
        my $self = {
-               gui => $args->{gui},
+               gui      => $args->{gui},
                throttle => -1,
-               fuel => -1,
-               order => $args->{order},
-               track => $args->{track},
+               fuel     => -1,
+               id       => $args->{id},
+               track    => $args->{track},
        };
 
        bless $self, $class;
 
-       $self->set_throttle(undef);
-       $self->set_fuel(undef);
-
        return $self;
 }
 
@@ -34,11 +32,6 @@ sub set_throttle {
                || (defined $self->{throttle} && defined $val
                        && $self->{throttle} == $val);
 
-       if ($self->{in_pit_lane} && defined $val && $val > 3) {
-               delete $self->{in_pit_lane};
-               $self->gui->leave_pit_lane;
-       }
-
        $self->{throttle} = $val;
        $self->gui->set_throttle($self->{order}, $val);
 }
@@ -83,6 +76,15 @@ sub set_lap {
 
        $self->{lap} = $lap_nr;
        $self->gui->set_lap($self->{order}, defined $lap_nr ? $lap_nr : '--');
+       if ($self->track->{race_running} && $self->{lap} > 1) {
+               my $now = gettimeofday;
+               my $avg = ($now - $self->track->{race_running_since})
+                       / ($self->{lap} - 1);
+               $self->{avg_lap} = $avg;
+               $self->gui->set_avg_lap($self->{order}, $avg);
+       } else {
+               $self->gui->set_avg_lap($self->{order}, '--');
+       }
 }
 
 sub set_laptime {
@@ -90,9 +92,9 @@ sub set_laptime {
 
        if (defined $lap_time) {
                $lap_time = sprintf("%.2f", $lap_time);
-               if ($lap_time > 1.0 && (
-                       !$self->{in_pit_lane} && !defined $self->{best_lap}
-                       || $self->{best_lap} > $lap_time
+               if ($lap_time > 1.0 && !$self->{in_pit_lane}
+                       && (!defined $self->{best_lap}
+                               || $self->{best_lap} > $lap_time
                        )) {
 
                        $self->{best_lap} = $lap_time;
@@ -102,7 +104,6 @@ sub set_laptime {
                        $self->gui->set_best_lap($self->{order}, $lap_time,
                                $global);
                }
-               
        } else {
                $self->gui->set_best_lap($self->{order}, '--');
                $self->{best_lap} = undef;
@@ -126,22 +127,33 @@ sub set_driver {
                        && $self->{driver} == $driver_name);
 
        $self->{driver} = $driver_name;
-       $self->gui->set_driver($self->{order}, $driver_name || '--');
+       $self->gui->set_name($self->{order}, $driver_name || '--');
 }
 
 sub enter_pit_lane {
        my ($self) = @_;
 
+       return if $self->{in_pit_lane};
+
        $self->{in_pit_lane} = 1;
        $self->gui->enter_pit_lane;
 }
 
+sub leave_pit_lane {
+       my ($self) = @_;
+
+       return if !$self->{in_pit_lane};
+
+       $self->{in_pit_lane} = 0;
+       $self->gui->leave_pit_lane;
+}
+
 sub set_order {
        my ($self, $pos) = @_;
 
        $self->{order} = $pos;
        
-       $self->gui->set_driver($self->{order}, $self->{driver}
+       $self->gui->set_name($self->{order}, $self->{driver}
                || '--');
        $self->gui->set_car_icon($self->{order}, $self->{car_icon});
        $self->gui->set_throttle($self->{order}, $self->{throttle});
@@ -151,6 +163,8 @@ sub set_order {
                ? $self->{laptime} : '--');
        $self->gui->set_best_lap($self->{order}, defined $self->{best_lap}
                ? $self->{best_lap} : '--');
+       $self->gui->set_avg_lap($self->{order}, defined $self->{avg_lap}
+               ? $self->{avg_lap} : '--');
        $self->gui->set_fuel($self->{order}, $self->{fuel});
 }