Changeset 8 for trunk

Timestamp:

Mar 26, 2015, 5:40:03 PM (10 years ago)

Author:

chronos

Message:

• Added: Show clock in top right corner.

File:

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

trunk/UEngine.pas

@@ -134 +134 @@
     procedure ComputeShapeDistanceStation(Station: TMetroStation;
       UpdatedShape: TStationShape; Distance: Integer);
+    function GetTime: TDateTime;
+    procedure DrawClock(Canvas: TCanvas);
   public
     Passengers: TMetroPassengers;
@@ -146 +148 @@
     ServedPassengerCount: Integer;
     State: TGameState;
-    Time: TDateTime;
+    StartTime: TDateTime;
     procedure Tick;
     procedure MouseMove(Position: TPoint);
@@ -155 +157 @@
     destructor Destroy; override;
     procedure Paint(Canvas: TCanvas);
+    property Time: TDateTime read GetTime;
   end;
 
@@ -569 +572 @@
 end;
 
+function TEngine.GetTime: TDateTime;
+begin
+  Result := (Now - StartTime) / OneSecond * (60 * OneMinute);
+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.Tick;
 const
@@ -584 +621 @@
 begin
   if State = gsRunning then begin
-    Time := Time + OneMinute;
 
   // Add new stations
@@ -754 +790 @@
     if Assigned(Station) then begin
       SelectedStation := Station;
+      if not Assigned(SelectedLine) then
       for I := 0 to Lines.Count - 1 do
       if TMetroLine(Lines[I]).Stations.Count = 0 then begin
@@ -801 +838 @@
   LastNewPassengerTime := Now;
   State := gsRunning;
-  Time := 0;
+  StartTime := Now;
 end;
 
@@ -928 +965 @@
     Canvas.Pen.Color := clBlack;
     DrawShape(Canvas, Position, Shape, StationSize);
-    Text := '';
-    for P := 0 to 2 do
-      Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
-    Canvas.TextOut(Position.X + 20, Position.Y + 20, Text);
 
     // Draw passengers
@@ -965 +998 @@
   // Interface
   Text := IntToStr(ServedPassengerCount);
-  Canvas.Draw(Canvas.Width - 100, 20, ImagePassenger.Picture.Bitmap);
+  Canvas.Draw(Canvas.Width - 140, 20, ImagePassenger.Picture.Bitmap);
   Canvas.Brush.Style := bsClear;
-  Canvas.TextOut(Canvas.Width - 106 - Canvas.TextWidth(Text), 25, Text);
+  Canvas.TextOut(Canvas.Width - 146 - Canvas.TextWidth(Text), 25, Text);
 
   Text := IntToStr(Trains.GetUnusedCount);
-  Canvas.Draw(Canvas.Width - 180, 20, ImageLocomotive.Picture.Bitmap);
+  Canvas.Draw(Canvas.Width - 240, 20, ImageLocomotive.Picture.Bitmap);
   Canvas.Brush.Style := bsClear;
-  Canvas.TextOut(Canvas.Width - 186 - Canvas.TextWidth(Text), 25, Text);
+  Canvas.TextOut(Canvas.Width - 246 - Canvas.TextWidth(Text), 25, Text);
+
+  DrawClock(Canvas);
 
   // Game over