Changeset 140 for trunk/UEngine.pas

Timestamp:

May 17, 2023, 12:18:41 AM (12 months ago)

Author:

chronos

Message:

• Modified: Draw curved metro lines.

File:

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

trunk/UEngine.pas

@@ -361 +361 @@
     OldHighestServedDaysCount: Integer;
     RegistryContext: TRegistryContext;
+    CurvedLines: Boolean;
     procedure InitMenus;
     procedure InitCities;
@@ -415 +416 @@
   TrackClickDistance = 15;
   EndStationLength = 50;
+  EndStationWidth = 20;
   ShowDistances = False;
   TimePerSecondNormal = 60 * OneMinute;
@@ -3086 +3088 @@
 var
   MetroLine: TMetroLine;
-  S: Integer;
+  I: Integer;
+  Points: array of TPoint;
+  Vector: TVector;
+  HalfDownPoint: TPoint;
+  HalfUpPoint: TPoint;
+  Angle: Double;
+  EndPoint: TPoint;
+const
+  CurveRadius: Double = 0;
 begin
   for MetroLine in Lines do
@@ -3093 +3103 @@
     Canvas.Pen.Style := psSolid;
     Canvas.Pen.Width := GetMetroLineThickness;
-    if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].Position);
-    for S := 1 to Track.Points.Count - 1 do begin
-      Canvas.LineTo(Track.Points[S].Position);
-{      if (S = TrackPoints.Count - 1) then begin
+
+    if CurvedLines then begin
+      Points := nil;
+      if Track.Points.Count >= 2 then begin
+        SetLength(Points, (Track.Points.Count - 1) * 3 - 2);
+        for I := 1 to Track.Points.Count - 2 do begin
+          if I = 1 then begin
+            HalfDownPoint := Track.Points[I - 1].Position;
+          end else
+          if I > 0 then begin
+            HalfDownPoint := Point((Track.Points[I].Position.X + Track.Points[I - 1].Position.X) div 2,
+              (Track.Points[I].Position.Y + Track.Points[I - 1].Position.Y) div 2)
+          end else begin
+            HalfDownPoint := Track.Points[0].Position;
+          end;
+
+          if I = Track.Points.Count - 2 then begin
+            HalfUpPoint := Track.Points[I + 1].Position
+          end else
+          if I < Track.Points.Count - 1 then begin
+            HalfUpPoint := Point((Track.Points[I].Position.X + Track.Points[I + 1].Position.X) div 2,
+              (Track.Points[I].Position.Y + Track.Points[I + 1].Position.Y) div 2)
+          end else begin
+            HalfUpPoint := Track.Points[Track.Points.Count - 1].Position;
+          end;
+
+          Points[(I - 1) * 3] := HalfDownPoint;
+          Points[I * 3] := HalfUpPoint;
+
+          if (I > 0) and (I < Track.Points.Count - 1) then begin
+            Vector := TVector.Create(HalfDownPoint, Track.Points[I].Position);
+            Vector.SetLength(Vector.GetLength - CurveRadius);
+            Points[(I - 1) * 3 + 1] := AddPoint(Vector.Position, Vector.Direction);
+          end;
+          if I < Track.Points.Count - 1 then begin
+            Vector := TVector.Create(HalfUpPoint, Track.Points[I].Position);
+            Vector.SetLength(Vector.GetLength - CurveRadius);
+            Points[(I - 1) * 3 + 2] := AddPoint(Vector.Position, Vector.Direction);
+          end;
+        end;
+        if Length(Points) > 1 then
+          Canvas.PolyBezier(@Points[0], Length(Points));
+      end;
+    end else begin
+      if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].Position);
+      for I := 1 to Track.Points.Count - 1 do begin
+        Canvas.LineTo(Track.Points[I].Position);
+      end;
+    end;
+
+    if VisualStyle = vsLondon then begin
+      // Starting orthogonal line
+      if (Track.Points.Count > 1) then begin
         Canvas.Pen.EndCap := pecSquare;
-        Angle := arctan2D(((TrackPoints[S].Position.Y - TrackPoints[S - 1].Position.Y),
-          (TrackPoints[S].Position.X - TrackPoints[S - 1].Position.X));
-        EndPoint := Point(Round(TrackPoints[S].Position.X + EndStationLength * Cos(Angle)),
-          Round(TrackPoints[S].Position.Y + EndStationLength * Sin(Angle)));
+        Angle := Arctan2((Track.Points[1].Position.Y - Track.Points[0].Position.Y),
+          (Track.Points[1].Position.X - Track.Points[0].Position.X));
+        Canvas.MoveTo(Track.Points[1].Position);
+        EndPoint := Point(Round(Track.Points[1].Position.X - EndStationLength * Cos(Angle)),
+          Round(Track.Points[1].Position.Y - EndStationLength * Sin(Angle)));
         Canvas.LineTo(EndPoint);
-        Canvas.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationLength / 3),
-          Round(EndPoint.Y + Sin(Angle + Pi / 2) * EndStationLength / 3)));
-        Canvas.LineTo(Point(Round(EndPoint.X + Cos(Angle - Pi / 2) * EndStationLength / 3),
-          Round(EndPoint.Y + Sin(Angle - Pi / 2) * EndStationLength / 3)));
+        Canvas.MoveTo(Point(Round(EndPoint.X - Cos(Angle + Pi / 2) * EndStationWidth / 2),
+          Round(EndPoint.Y - Sin(Angle + Pi / 2) * EndStationWidth / 2)));
+        Canvas.LineTo(Point(Round(EndPoint.X - Cos(Angle - Pi / 2) * EndStationWidth / 2),
+          Round(EndPoint.Y - Sin(Angle - Pi / 2) * EndStationWidth / 2)));
         Canvas.Pen.EndCap := pecRound;
-      end;}
-    end;
-(*    Canvas.Pen.Color := Color;
-    Canvas.Pen.Style := psSolid;
-    Canvas.Pen.Width := GetMetroLineThickness div 2;
-    if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].PositionDesigned);
-    for S := 1 to Track.Points.Count - 1 do begin
-      Canvas.LineTo(Track.Points[S].PositionDesigned);
-{      if (S = TrackPoints.Count - 1) then begin
+      end;
+
+      // Ending orthogonal line
+      if (Track.Points.Count > 1) then begin
         Canvas.Pen.EndCap := pecSquare;
-        Angle := arctan2((TrackPoints[S].Position.Y - TrackPoints[S - 1].Position.Y),
-          (TrackPoints[S].Position.X - TrackPoints[S - 1].Position.X));
-        EndPoint := Point(Round(TrackPoints[S].Position.X + EndStationLength * Cos(Angle)),
-          Round(TrackPoints[S].Position.Y + EndStationLength * Sin(Angle)));
+        Angle := Arctan2((Track.Points[Track.Points.Count - 1].Position.Y - Track.Points[Track.Points.Count - 2].Position.Y),
+          (Track.Points[Track.Points.Count - 1].Position.X - Track.Points[Track.Points.Count - 2].Position.X));
+        Canvas.MoveTo(Track.Points[Track.Points.Count - 2].Position);
+        EndPoint := Point(Round(Track.Points[Track.Points.Count - 2].Position.X + EndStationLength * Cos(Angle)),
+          Round(Track.Points[Track.Points.Count - 2].Position.Y + EndStationLength * Sin(Angle)));
         Canvas.LineTo(EndPoint);
-        Canvas.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationLength / 3),
-          Round(EndPoint.Y + Sin(Angle + Pi / 2) * EndStationLength / 3)));
-        Canvas.LineTo(Point(Round(EndPoint.X + Cos(Angle - Pi / 2) * EndStationLength / 3),
-          Round(EndPoint.Y + Sin(Angle - Pi / 2) * EndStationLength / 3)));
+        Canvas.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationWidth / 2),
+        Round(EndPoint.Y + Sin(Angle + Pi / 2) * EndStationWidth / 2)));
+        Canvas.LineTo(Point(Round(EndPoint.X + Cos(Angle - Pi / 2) * EndStationWidth / 2),
+          Round(EndPoint.Y + Sin(Angle - Pi / 2) * EndStationWidth / 2)));
         Canvas.Pen.EndCap := pecRound;
-      end;}
-    end;
-    {
-    if (TrackPoints.Count > 1) then begin
-      Canvas.Pen.EndCap := pecSquare;
-      Angle := arctan2((TrackPoints[1].Position.Y - TrackPoints[0].Position.Y),
-        (TrackPoints[1].Position.X - TrackPoints[0].Position.X));
-      Canvas.MoveTo(TrackPoints[0].Position);
-      EndPoint := Point(Round(TrackPoints[0].Position.X - EndStationLength * Cos(Angle)),
-        Round(TrackPoints[0].Position.Y - EndStationLength * Sin(Angle)));
-      Canvas.LineTo(EndPoint);
-      Canvas.MoveTo(Point(Round(EndPoint.X - Cos(Angle + Pi / 2) * EndStationLength / 3),
-        Round(EndPoint.Y - Sin(Angle + Pi / 2) * EndStationLength / 3)));
-      Canvas.LineTo(Point(Round(EndPoint.X - Cos(Angle - Pi / 2) * EndStationLength / 3),
-        Round(EndPoint.Y - Sin(Angle - Pi / 2) * EndStationLength / 3)));
-      Canvas.Pen.EndCap := pecRound;
-    end;  }
-    *)
+      end;
+    end;
   end;
 
@@ -4233 +4273 @@
 begin
   inherited;
+  CurvedLines := True;
   MovableTracks := True;
   Colors := TColors.Create;