Changeset 126 for trunk/UEngine.pas

Timestamp:

Apr 23, 2023, 10:35:50 PM (13 months ago)

Author:

chronos

Message:

• Modified: Improved code for drawing game clock.
• Modified: Updated position of clock and exit button in game screen.
• Modified: New game logo.

File:

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

trunk/UEngine.pas

@@ -173 +173 @@
   TMetroImprovementSet = set of TMetroImprovement;
   TFullScrenChangeEvent = procedure (Sender: TObject; Active: Boolean) of object;
+
+  { TClock }
+
+  TClock = class(TControl)
+    Time: TDateTime;
+    TextColor: TColor;
+    BackgroundColor: TColor;
+    procedure Paint; override;
+  end;
 
   { TEngine }
@@ -306 +315 @@
     ImageNewImprovement1: TImage;
     ImageNewImprovement2: TImage;
+    Clock: TClock;
     AvailableImprovements: TMetroImprovementSet;
     Improvement1: TMetroImprovement;
@@ -425 +435 @@
   SSeoul = 'Seoul';
   SBeijing = 'Beijing';
+
+{ TClock }
+
+procedure TClock.Paint;
+var
+  ClockCenter: TPoint;
+  Angle: Double;
+  I: Integer;
+  IsDay: Boolean;
+begin
+  IsDay := (((Time / OneHour) mod 24) > 6) and (((Time / OneHour) mod 24) < 18);
+  if IsDay then begin
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Brush.Color := BackgroundColor;
+  end else begin
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Brush.Color := TextColor;
+  end;
+  Canvas.Pen.Style := psSolid;
+  Canvas.Pen.Color := TextColor;
+  Canvas.Pen.Width := 2;
+  ClockCenter := Point(Bounds.Left + Bounds.Width div 2,
+    Bounds.Top + Bounds.Height div 2);
+  Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
+  Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, Bounds.Width div 2, Bounds.Height div 2);
+  Canvas.Brush.Style := bsClear;
+
+  if IsDay then begin
+    Canvas.Pen.Color := TextColor;
+  end else begin
+    Canvas.Pen.Color := BackgroundColor;
+  end;
+  Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * (Bounds.Width / 2) * 0.8),
+    ClockCenter.Y + Round(Sin(Angle) * (Bounds.Height / 2) * 0.8)));
+  for I := 0 to 12 do begin
+    Angle := I / 12 * 2 * Pi;
+    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * (Bounds.Width / 2) * 0.7),
+      ClockCenter.Y + Round(Sin(Angle) * (Bounds.Height / 2) * 0.7),
+      ClockCenter.X + Round(Cos(Angle) * (Bounds.Width / 2) * 0.9),
+      ClockCenter.Y + Round(Sin(Angle) * (Bounds.Height / 2) * 0.9));
+  end;
+end;
 
 { TMetroCarriage }
@@ -2240 +2292 @@
 procedure TEngine.DrawClock(Canvas: TCanvas; CanvasSize: TPoint);
 var
-  ClockCenter: TPoint;
-  Angle: Double;
+  X: Integer;
+  Y: Integer;
   Text: string;
-  I: Integer;
-  Y: Integer;
-  IsDay: Boolean;
-const
-  ClockSize = 20;
-begin
-  IsDay := (((Time / OneHour) mod 24) > 6) and (((Time / OneHour) mod 24) < 18);
-  if IsDay then begin
-    Canvas.Brush.Style := bsSolid;
-    Canvas.Brush.Color := Colors.Background;
-  end else begin
-    Canvas.Brush.Style := bsSolid;
-    Canvas.Brush.Color := Colors.Text;
-  end;
-  Canvas.Pen.Style := psSolid;
-  Canvas.Pen.Color := Colors.Text;
-  Canvas.Pen.Width := 2;
-  ClockCenter := Point(CanvasSize.X - 30, 40);
-  Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
-  Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, ClockSize, ClockSize);
-  Canvas.Brush.Style := bsClear;
-
-  if IsDay then begin
-    Canvas.Pen.Color := Colors.Text;
-  end else begin
-    Canvas.Pen.Color := Colors.Background;
-  end;
-  Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
-    ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8)));
-  for I := 0 to 12 do begin
-    Angle := I / 12 * 2 * Pi;
-    Canvas.Line(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.7),
-      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.7),
-      ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.9),
-      ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.9));
-  end;
-  Y := ClockCenter.Y;
+begin
+  Clock.Time := Time;
+  Clock.Canvas := Canvas;
+  Clock.TextColor := Colors.Text;
+  Clock.BackgroundColor := Colors.Background;
+  Clock.Bounds := Bounds(ScaleX(15, 96), ScaleY(15, 96),
+    ScaleX(40, 96), ScaleY(40, 96));
+  Clock.Paint;
+
+  X := Clock.Bounds.Left + Clock.Bounds.Width + ScaleY(10, 96);
+  Y := Clock.Bounds.Top;
 
   Canvas.Pen.Color := Colors.Text;
   Canvas.Font.Color := Colors.Text;
+  Canvas.Brush.Style := bsClear;
   Text := FormatDateTime('ddd', Time + 2);
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - ScaleX(10, 96),
-    Y - Canvas.TextHeight(Text) div 2, Text);
+  Canvas.TextOut(X, Y + (Clock.Bounds.Height - Canvas.TextHeight(Text)) div 2, Text);
+  X := X + ScaleX(40, 96) + ScaleY(5, 96);
+  Y := Clock.Bounds.Top + (Clock.Bounds.Height - ImagePause.Bounds.Height) div 2;
+
+  ImagePause.Canvas := Canvas;
+  ImagePause.Bounds := Bounds(X, Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImagePause.Paint;
+  X := X + ImagePause.Bounds.Width + ScaleX(5, 96);
+
+  ImagePlay.Canvas := Canvas;
+  ImagePlay.Bounds := Bounds(X, Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImagePlay.Paint;
+  X := X + ImagePlay.Bounds.Width + ScaleX(5, 96);
+
+  ImageFastForward.Canvas := Canvas;
+  ImageFastForward.Bounds := Bounds(X, Y, ScaleX(20, 96), ScaleY(20, 96));
+  ImageFastForward.Paint;
+
+  X := Clock.Bounds.Left;
+  Y := Clock.Bounds.Top + Clock.Bounds.Height + ScaleY(5, 96);
+
+  Canvas.Pen.Color := Colors.Text;
+  Canvas.Font.Color := Colors.Text;
+  Canvas.Brush.Style := bsClear;
+  Text := SDay + ' ' + IntToStr(Trunc(Time));
+  Canvas.TextOut(X, Y, Text);
   Y := Y + Canvas.TextHeight(Text) + ScaleY(5, 96);
-
-  Text := SDay + ' ' + IntToStr(Trunc(Time));
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - ScaleX(10, 96),
-    Y - Canvas.TextHeight(Text) div 2, Text);
-  Y := Y + Canvas.TextHeight(Text) + ScaleY(5, 96);
-
-  ImagePause.Canvas := Canvas;
-  ImagePause.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96), Y,
-    ScaleX(20, 96), ScaleY(20, 96));
-  ImagePause.Paint;
-  Y := Y + ImagePause.Bounds.Height + ScaleY(5, 96);
-
-  ImagePlay.Canvas := Canvas;
-  ImagePlay.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y,
-    ScaleX(20, 96), ScaleY(20, 96));
-  ImagePlay.Paint;
-  Y := Y + ImagePlay.Bounds.Height + ScaleY(5, 96);
-
-  ImageFastForward.Canvas := Canvas;
-  ImageFastForward.Bounds := Bounds(CanvasSize.X - ScaleX(20 + 10, 96) , Y,
-    ScaleX(20, 96), ScaleY(20, 96));
-  ImageFastForward.Paint;
-  Y := Y + ImageFastForward.Bounds.Height + ScaleY(5, 96);
 end;
 
@@ -2778 +2806 @@
   Text: string;
   Radius: Integer;
-  Angle: Real;
-  Pos: TPoint;
   X: Integer;
   Y: Integer;
@@ -2881 +2907 @@
   Canvas.Font.Color := Colors.Text;
   ButtonBack.Canvas := Canvas;
-  ButtonBack.Bounds.Left := 10;
-  ButtonBack.Bounds.Top := 10;
+  ButtonBack.Bounds := Bounds(CanvasSize.X - ButtonBack.Bounds.Width - 10, 10,
+    ButtonBack.Bounds.Width, ButtonBack.Bounds.Height);
   ButtonBack.Paint;
 
@@ -3599 +3625 @@
 begin
   inherited;
+  Colors := TColors.Create;
+  Colors.Init(FDarkMode);
   ImprovementImageSize := ScaleX(64, 96);
   IconSize := ScaleX(32, 96);
@@ -3604 +3632 @@
   ButtonBack := TImage.Create;
   ButtonBack.OnClick := ButtonBackClick;
-  ButtonBack.Bounds := Bounds(0, 0, ScaleX(80, 96), ScaleY(80, 96));
+  ButtonBack.Bounds := Bounds(0, 0, ScaleX(50, 96), ScaleY(50, 96));
   Cities := TCities.Create;
   InitCities;
@@ -3641 +3669 @@
   ImageNewImprovement2 := TImage.Create;
   ImageNewImprovement2.OnClick := ButtonNewImprovement2;
+  Clock := TClock.Create;
   MetaCanvas := TMetaCanvas.Create;
-  Colors.Init(FDarkMode);
 end;
 
@@ -3650 +3678 @@
   FreeAndNil(Trains);
   FreeAndNil(Carriages);
+  FreeAndNil(Clock);
   FreeAndNil(ImageTunnel);
   FreeAndNil(ImageTerminal);