Changeset 15

Timestamp:

Mar 27, 2015, 1:13:50 PM (9 years ago)

Author:

chronos

Message:

• Modified: Moved train movement to separate method.

File:

• trunk/UEngine.pas (modified) (3 diffs)

trunk/UEngine.pas

@@ -158 +158 @@
       UpdatedShape: TStationShape; Distance: Integer);
     function GetTime: TDateTime;
+    procedure TrainMovement;
   public
     Passengers: TMetroPassengers;
@@ -793 +794 @@
 end;
 
-procedure TEngine.DrawClock(Canvas: TCanvas);
-var
-  ClockCenter: TPoint;
-  Angle: Double;
-  Text: string;
-  I: Integer;
-const
-  ClockSize = 20;
-begin
-  Canvas.Pen.Style := psSolid;
-  Canvas.Pen.Color := clBlack;
-  Canvas.Pen.Width := 2;
-  ClockCenter := Point(Canvas.Width - 30, 40);
-  Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
-  Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, ClockSize, ClockSize);
-  Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
-    ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8)));
-  Text := FormatDateTime('ddd', Time);
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 5, ClockCenter.Y -
-    Canvas.TextWidth(Text) div 2, Text);
-  for I := 0 to 12 do begin
-    Angle := I / 12 * 2 * Pi;
-    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
-      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8),
-      ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.9),
-      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.9));
-  end;
-end;
-
-procedure TEngine.DrawTrains(Canvas: TCanvas);
-var
-  I: Integer;
+procedure TEngine.TrainMovement;
+var
+  I: Integer;
+  CurrentStationIndex: Integer;
+  CurrentStation: TMetroStation;
   P: Integer;
-  Pos: TPoint;
-  Points: array of TPoint;
-  Angle: Double;
-  ShapePos: TPoint;
-begin
-    // Draw trains
-  for I := 0 to Trains.Count - 1 do
-  with TMetroTrain(Trains[I]) do begin
-    if Assigned(Line) then begin
-      Canvas.Brush.Color := Line.Color;
-      Canvas.Brush.Style := bsSolid;
-      Canvas.Pen.Style := psClear;
-      Pos := GetPosition;
-      Angle := GetAngle;
-
-      SetLength(Points, 4);
-      Points[0] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y - TrainSize div 3), Angle);
-      Points[1] := RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y - TrainSize div 3), Angle);
-      Points[2] := RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
-      Points[3] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
-      Canvas.Polygon(Points);
-      Canvas.Brush.Color := clWhite;
-      for P := 0 to Passengers.Count - 1 do
-      with TMetroPassenger(Passengers[P]) do begin
-        ShapePos := Point(Pos.X - Trunc(TrainSize div 3 * 1) + (P mod 3) * TrainSize div 3,
-          Pos.Y - Trunc(TrainSize div 6 * 1) + (P div 3) * TrainSize div 3);
-        ShapePos := RotatePoint(Pos, ShapePos, Angle);
-        DrawShape(Canvas, ShapePos, Shape, TrainSize div 3, Angle + Pi / 2);
-      end;
-    end;
-  end;
-
-end;
-
-procedure TEngine.Tick;
-const
-  NewStationPeriod = OneSecond * 20;
-  NewPassengerPeriod = OneSecond;
-  NewPassengerProbability = 0.1;
-var
   Passenger: TMetroPassenger;
-  I: Integer;
-  P: Integer;
   PosDelta: Integer;
-  CurrentStation: TMetroStation;
-  CurrentStationIndex: Integer;
-begin
-  if State = gsRunning then begin
-
-  // Add new trains
-  if (Now - LastNewWeekTime) > 7 then begin
-    LastNewWeekTime := Now;
-    Trains.AddNew;
-    // TODO: Show notification screen with confirmation
-  end;
-
-  // Add new shape
-  if (Now - LastNewShapeTime) > 10 then begin
-    LastNewShapeTime := Now;
-    if ShapeCount <= Integer(High(TStationShape)) then Inc(ShapeCount);
-  end;
-
-  // Add new stations
-  if (Now - LastNewStationTime) > NewStationPeriod then begin
-    LastNewStationTime := Now;
-    Stations.AddNew;
-  end;
-
-  // Add new passengers
-  if (Now - LastNewPassengerTime) > NewPassengerPeriod then begin
-    LastNewPassengerTime := Now;
-    for I := 0 to Stations.Count - 1 do
-    with TMetroStation(Stations[I]) do
-    if Random < NewPassengerProbability then begin
-      Passenger := Self.Passengers.AddNew;
-      Passenger.Station := TMetroStation(Stations[I]);
-      Passengers.Add(Passenger);
-
-      // Passenger is not allowed to have same shape
-      while (Passenger.Shape = Passenger.Station.Shape) or not (Passenger.Shape in GetExistStationShapes) do
-        Passenger.Shape := TStationShape((Integer(Passenger.Shape) + 1) mod Integer(ShapeCount));
-    end;
-  end;
-
+begin
   // Move trains
   for I := 0 to Trains.Count - 1 do
@@ -1004 +897 @@
     end;
   end;
+end;
+
+procedure TEngine.DrawClock(Canvas: TCanvas);
+var
+  ClockCenter: TPoint;
+  Angle: Double;
+  Text: string;
+  I: Integer;
+const
+  ClockSize = 20;
+begin
+  Canvas.Pen.Style := psSolid;
+  Canvas.Pen.Color := clBlack;
+  Canvas.Pen.Width := 2;
+  ClockCenter := Point(Canvas.Width - 30, 40);
+  Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
+  Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, ClockSize, ClockSize);
+  Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
+    ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8)));
+  Text := FormatDateTime('ddd', Time);
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 5, ClockCenter.Y -
+    Canvas.TextWidth(Text) div 2, Text);
+  for I := 0 to 12 do begin
+    Angle := I / 12 * 2 * Pi;
+    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
+      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8),
+      ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.9),
+      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.9));
+  end;
+end;
+
+procedure TEngine.DrawTrains(Canvas: TCanvas);
+var
+  I: Integer;
+  P: Integer;
+  Pos: TPoint;
+  Points: array of TPoint;
+  Angle: Double;
+  ShapePos: TPoint;
+begin
+    // Draw trains
+  for I := 0 to Trains.Count - 1 do
+  with TMetroTrain(Trains[I]) do begin
+    if Assigned(Line) then begin
+      Canvas.Brush.Color := Line.Color;
+      Canvas.Brush.Style := bsSolid;
+      Canvas.Pen.Style := psClear;
+      Pos := GetPosition;
+      Angle := GetAngle;
+
+      SetLength(Points, 4);
+      Points[0] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y - TrainSize div 3), Angle);
+      Points[1] := RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y - TrainSize div 3), Angle);
+      Points[2] := RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
+      Points[3] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
+      Canvas.Polygon(Points);
+      Canvas.Brush.Color := clWhite;
+      for P := 0 to Passengers.Count - 1 do
+      with TMetroPassenger(Passengers[P]) do begin
+        ShapePos := Point(Pos.X - Trunc(TrainSize div 3 * 1) + (P mod 3) * TrainSize div 3,
+          Pos.Y - Trunc(TrainSize div 6 * 1) + (P div 3) * TrainSize div 3);
+        ShapePos := RotatePoint(Pos, ShapePos, Angle);
+        DrawShape(Canvas, ShapePos, Shape, TrainSize div 3, Angle + Pi / 2);
+      end;
+    end;
+  end;
+
+end;
+
+procedure TEngine.Tick;
+const
+  NewStationPeriod = OneSecond * 20;
+  NewPassengerPeriod = OneSecond;
+  NewPassengerProbability = 0.1;
+var
+  Passenger: TMetroPassenger;
+  I: Integer;
+begin
+  if State = gsRunning then begin
+
+  // Add new trains
+  if (Now - LastNewWeekTime) > 7 then begin
+    LastNewWeekTime := Now;
+    Trains.AddNew;
+    // TODO: Show notification screen with confirmation
+  end;
+
+  // Add new shape
+  if (Now - LastNewShapeTime) > 10 then begin
+    LastNewShapeTime := Now;
+    if ShapeCount <= Integer(High(TStationShape)) then Inc(ShapeCount);
+  end;
+
+  // Add new stations
+  if (Now - LastNewStationTime) > NewStationPeriod then begin
+    LastNewStationTime := Now;
+    Stations.AddNew;
+  end;
+
+  // Add new passengers
+  if (Now - LastNewPassengerTime) > NewPassengerPeriod then begin
+    LastNewPassengerTime := Now;
+    for I := 0 to Stations.Count - 1 do
+    with TMetroStation(Stations[I]) do
+    if Random < NewPassengerProbability then begin
+      Passenger := Self.Passengers.AddNew;
+      Passenger.Station := TMetroStation(Stations[I]);
+      Passengers.Add(Passenger);
+
+      // Passenger is not allowed to have same shape
+      while (Passenger.Shape = Passenger.Station.Shape) or not (Passenger.Shape in GetExistStationShapes) do
+        Passenger.Shape := TStationShape((Integer(Passenger.Shape) + 1) mod Integer(ShapeCount));
+    end;
+  end;
+
+  TrainMovement;
 
   // Game over