Changeset 97 for trunk/UEngine.pas

Timestamp:

Sep 28, 2022, 1:18:41 PM (20 months ago)

Author:

chronos

Message:

• Fixed: Normalized images quality and on screen placement.

File:

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

trunk/UEngine.pas

@@ -178 +178 @@
     LastState: TGameState;
     TimePerSecond: TDateTime;
+    ImprovementImageSize: Integer;
+    IconSize: Integer;
     function GetServedDaysCount: Integer;
     procedure ResizeView;
@@ -301 +303 @@
   LineColorsDist = 50;
   TrainSpeed = 2000;
-  ImagePassengerName = 'Images/Passenger.png';
-  ImageLocomotiveName = 'Images/Locomotive.png';
-  ImageLeftArrowName = 'Images/Left arrow.png';
-  ImagePlayName = 'Images/Play.png';
-  ImagePauseName = 'Images/Pause.png';
-  ImageFastForwardName = 'Images/Fast forward.png';
   TrainPassengerCount = 6;
   StationMinDistance = 100;
@@ -2173 +2169 @@
 
     ImageNewTrain.Canvas := Canvas;
-    ImageNewTrain.Bounds := Bounds((CanvasSize.X - ImageLocomotive.Bitmap.Width * ImageZoom) div 2,
-      (CanvasSize.Y - ImageLocomotive.Bitmap.Height * ImageZoom) div 2,
-      ImageLocomotive.Bitmap.Width * ImageZoom,
-      ImageLocomotive.Bitmap.Height * ImageZoom);
+    ImageNewTrain.Bounds := Bounds(CanvasSize.X div 2 - ImprovementImageSize div 2,
+      CanvasSize.Y div 2 - ImprovementImageSize div 2,
+      ImprovementImageSize, ImprovementImageSize);
     ImageNewTrain.Paint;
 
-    Y := (CanvasSize.Y - ImageLocomotive.Bitmap.Height * ImageZoom) div 2 +
-      Round(ImageLocomotive.Bitmap.Height * ImageZoom * 1.1);
+    Y := (CanvasSize.Y - ImprovementImageSize) div 2 +
+      Round(ImprovementImageSize * 1.1);
 
     Text := STrain;
@@ -2196 +2191 @@
   Y: Integer;
   X: Integer;
-const
-  ImageZoom = 4;
+  Center: TPoint;
 begin
   with Canvas do begin
+    Center := Point(CanvasSize.X div 2, CanvasSize.Y div 2);
+
     Pen.Color := Self.Colors.Text;
     Pen.Style := psSolid;
@@ -2226 +2222 @@
     if Improvement1 <> miNone then begin
       ImageNewImprovement1.Canvas := Canvas;
-      ImageNewImprovement1.Bounds := Bounds(CanvasSize.X div 2 - CanvasSize.X div 8 -
-        ImageNewImprovement1.Bitmap.Width * ImageZoom div 2,
-        (CanvasSize.Y - ImageNewImprovement1.Bitmap.Height * ImageZoom) div 2,
-        ImageNewImprovement1.Bitmap.Width * ImageZoom,
-        ImageNewImprovement1.Bitmap.Height * ImageZoom);
+      ImageNewImprovement1.Bounds := Bounds(Center.X - CanvasSize.X div 8 -
+        ImprovementImageSize div 2, Center.Y - ImprovementImageSize div 2,
+        ImprovementImageSize, ImprovementImageSize);
       ImageNewImprovement1.Paint;
     end;
@@ -2236 +2230 @@
     if Improvement2 <> miNone then begin
       ImageNewImprovement2.Canvas := Canvas;
-      ImageNewImprovement2.Bounds := Bounds(CanvasSize.X div 2 + CanvasSize.X div 8 -
-        ImageNewImprovement2.Bitmap.Width * ImageZoom div 2,
-        (CanvasSize.Y - ImageNewImprovement2.Bitmap.Height * ImageZoom) div 2,
-        ImageNewImprovement2.Bitmap.Width * ImageZoom,
-        ImageNewImprovement2.Bitmap.Height * ImageZoom);
+      ImageNewImprovement2.Bounds := Bounds(Center.X + CanvasSize.X div 8 -
+        ImprovementImageSize div 2, Center.Y - ImprovementImageSize div 2,
+        ImprovementImageSize, ImprovementImageSize);
      ImageNewImprovement2.Paint;
     end;
 
-    Y := (CanvasSize.Y - ImageLocomotive.Bitmap.Height * ImageZoom) div 2 +
-      Round(ImageLocomotive.Bitmap.Height * ImageZoom * 1.1);
+    Y := Center.Y - ImprovementImageSize div 2 +
+      Round(ImprovementImageSize * 1.1);
 
     if Improvement1 <> miNone then begin
@@ -2252 +2244 @@
       Font.Color := Self.Colors.Text;
       TextSize := TextExtent(Text);
-      TextOut(CanvasSize.X div 2 - CanvasSize.X div 8 - TextSize.Width div 2, Y, Text);
+      TextOut(Center.X - CanvasSize.X div 8 - TextSize.Width div 2, Y, Text);
     end;
 
@@ -2260 +2252 @@
       Font.Color := Self.Colors.Text;
       TextSize := TextExtent(Text);
-      TextOut(CanvasSize.X div 2 + CanvasSize.X div 8 - TextSize.Width div 2, Y, Text);
+      TextOut(Center.X + CanvasSize.X div 8 - TextSize.Width div 2, Y, Text);
     end;
   end;
@@ -2427 +2419 @@
   Angle: Real;
   Pos: TPoint;
-begin
+  X: Integer;
+  Y: Integer;
+  SeparatorSize: Integer;
+begin
+  SeparatorSize := ScaleX(20, 96);
+  X := CanvasSize.X div 2;
+  Y := CanvasSize.Y - LineColorsDist;
+
   // Line selection
   Canvas.Pen.Width := 4;
@@ -2445 +2444 @@
     end;
 
-    Canvas.EllipseC(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist + I * LineColorsDist,
-      CanvasSize.Y - LineColorsDist, Radius, Radius);
-  end;
+    Canvas.EllipseC(X - Length(LineColors) div 2 * LineColorsDist + I * LineColorsDist,
+      Y, Radius, Radius);
+  end;
+  X := X - Length(LineColors) div 2 * LineColorsDist - 2 * SeparatorSize;
 
   // Draw unused trains
+  ImageLocomotive.Bounds := Bounds(X - IconSize, Y - IconSize div 2,
+    IconSize, IconSize);
+  ImageLocomotive.Canvas := Canvas;
+  ImageLocomotive.Paint;
+  X := X - IconSize - SeparatorSize div 3;
+
   Text := IntToStr(Trains.GetUnusedCount);
-  Canvas.Draw(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 100,
-    CanvasSize.Y - LineColorsDist - ImageLocomotive.Bitmap.Height div 2, ImageLocomotive.Bitmap);
   Canvas.Brush.Style := bsClear;
   Canvas.Font.Size := 14;
   Canvas.Font.Color := Colors.Text;
-  Canvas.TextOut(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 50 - Canvas.TextWidth(Text),
-    CanvasSize.Y - LineColorsDist - Canvas.TextHeight(Text) div 2, Text);
+  Canvas.TextOut(X - Canvas.TextWidth(Text),
+    Y - Canvas.TextHeight(Text) div 2, Text);
+  X := X - Canvas.TextWidth(Text) - SeparatorSize;
 
   // Draw unused carriages
   Text := IntToStr(Carriages.GetUnusedCount);
-  Canvas.Draw(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 200,
-    CanvasSize.Y - LineColorsDist - ImageCarriage.Bitmap.Height div 2, ImageCarriage.Bitmap);
+  ImageCarriage.Bounds := Bounds(X - IconSize, Y - IconSize div 2,
+    IconSize, IconSize);
+  ImageCarriage.Canvas := Canvas;
+  ImageCarriage.Paint;
+  X := X - IconSize - SeparatorSize div 3;
+
   Canvas.Brush.Style := bsClear;
   Canvas.Font.Size := 14;
   Canvas.Font.Color := Colors.Text;
-  Canvas.TextOut(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 150 - Canvas.TextWidth(Text),
-    CanvasSize.Y - LineColorsDist - Canvas.TextHeight(Text) div 2, Text);
-
-  // Status interface
+  Canvas.TextOut(X - Canvas.TextWidth(Text),
+    Y - Canvas.TextHeight(Text) div 2, Text);
+
+  // Passenger count
+  X := CanvasSize.X - ScaleX(30, 96);
   Text := IntToStr(ServedPassengerCount);
-  Canvas.Draw(CanvasSize.X - 50, CanvasSize.Y - 60, ImagePassenger.Bitmap);
+  ImagePassenger.Bounds := Bounds(X - Canvas.TextWidth(Text), Y - IconSize div 2,
+    IconSize, IconSize);
+  ImagePassenger.Canvas := Canvas;
+  ImagePassenger.Paint;
+  X := X - Canvas.TextWidth(Text) - SeparatorSize div 3;
+
   Canvas.Brush.Style := bsClear;
   Canvas.Font.Size := 14;
   Canvas.Font.Color := Colors.Text;
-  Canvas.TextOut(CanvasSize.X - 70 - Canvas.TextWidth(Text),
-    CanvasSize.Y - 55, Text);
+  Canvas.TextOut(X - Canvas.TextWidth(Text),
+    Y - Canvas.TextHeight(Text) div 2, Text);
 
   DrawClock(Canvas, CanvasSize);
@@ -2783 +2798 @@
 
     // Select unused train
-    if (Distance(Position, Point(View.DestRect.Right div 2 - Length(LineColors) div 2 * LineColorsDist - 100,
-      View.DestRect.Bottom - LineColorsDist)) < 30) and
+    if (Distance(Position, ImageLocomotive.Bounds.CenterPoint) < 30) and
     (Trains.GetUnusedCount > 0) then begin
       SelectedTrain := Trains.GetUnused;
@@ -2791 +2805 @@
 
     // Select unused carriage
-    if (Distance(Position, Point(View.DestRect.Right div 2 - Length(LineColors) div 2 * LineColorsDist - 200,
-      View.DestRect.Bottom - LineColorsDist)) < 30) and
+    if (Distance(Position, ImageCarriage.Bounds.CenterPoint) < 30) and
     (Carriages.GetUnusedCount > 0) then begin
       SelectedCarriage := Carriages.GetUnused;
@@ -2974 +2987 @@
 constructor TEngine.Create;
 begin
+  ImprovementImageSize := ScaleX(64, 96);
+  IconSize := ScaleX(32, 96);
   TimePerSecond := TimePerSecondNormal;
   ButtonBack := TImage.Create;
@@ -3010 +3025 @@
   ImageNewImprovement2 := TImage.Create;
   ImageNewImprovement2.OnClick := ButtonNewImprovement2;
-  //if FileExists(ImagePassengerName) then
-  //  ImagePassenger.Picture.LoadFromFile(ImagePassengerName);
-  //if FileExists(ImageLocomotiveName) then
-  //  ImageLocomotive.Picture.LoadFromFile(ImageLocomotiveName);
   MetaCanvas := TMetaCanvas.Create;
   Cities := TCities.Create;