Changeset 14 for trunk

Timestamp:

Mar 27, 2015, 1:09:12 PM (9 years ago)

Author:

chronos

Message:

• Modified: TTrackPoint change from record to class. Also TLine.TrackPoints is now TObjectList instead of array.

File:

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

trunk/UEngine.pas

@@ -15 +15 @@
   TMetroPassengers = class;
   TMetroLines = class;
+  TMetroLine = class;
   TMetroTrains = class;
 
@@ -41 +42 @@
   end;
 
-  TTrackPoint = record
+  TTrackPoint = class
+    Line: TMetroLine;
     StationIndex: Integer;
     Point: TPoint;
+    Pending: Boolean;
+  end;
+
+  TTrackPoints = class(TObjectList)
+    Line: TMetroLine;
   end;
 
@@ -53 +60 @@
     Stations: TMetroStations;
     Trains: TMetroTrains;
-    TrackPoints: array of TTrackPoint;
+    TrackPoints: TTrackPoints;
     procedure ConnectStation(Station: TMetroStation);
     procedure DisconnectStation(Station: TMetroStation);
@@ -190 +197 @@
   StationMaxDistance = 300;
   MaxWaitingPassengers = 10;
+  MetroLineThickness = 13;
 
 implementation
@@ -295 +303 @@
   Train: TMetroTrain;
   StationIndex: Integer;
+  NewTrackPoint: TTrackPoint;
 begin
   Stations.Add(Station);
@@ -300 +309 @@
   StationIndex := Stations.Count - 1;
   if Stations.Count = 1 then begin
-    SetLength(TrackPoints, Length(TrackPoints) + 1);
-    TrackPoints[High(TrackPoints)].StationIndex := StationIndex;
-    TrackPoints[High(TrackPoints)].Point := Station.Position;
+    NewTrackPoint := TTrackPoint.Create;
+    NewTrackPoint.StationIndex := StationIndex;
+    NewTrackPoint.Point := Station.Position;
+    NewTrackPoint.Line := TrackPoints.Line;
+    TrackPoints.Add(NewTrackPoint);
   end else begin
      if Stations.Count > 1 then
@@ -329 +340 @@
     Station.Lines.Remove(Self);
     if Stations.Count > 0 then begin
-      while (Length(TrackPoints) > 0) and (not ComparePoint(TrackPoints[High(TrackPoints)].Point,
+      while (TrackPoints.Count > 0) and (not ComparePoint(TTrackPoint(TrackPoints.Last).Point,
         TMetroStation(Stations.Last).Position)) do
-        SetLength(TrackPoints, Length(TrackPoints) - 1);
-    end else SetLength(TrackPoints, 0);
+        TrackPoints.Delete(TrackPoints.Count - 1);
+    end else TrackPoints.Clear;
     // Remove trains if less then two stations
     if Stations.Count < 2 then
@@ -346 +357 @@
 var
   Delta: TPoint;
+  NewTrackPoint: TTrackPoint;
 begin
   Delta := Point(P2.X - P1.X, P2.Y - P1.Y);
   if Abs(Delta.X) > Abs(Delta.Y) then begin
-    SetLength(TrackPoints, Length(TrackPoints) + 1);
-    TrackPoints[High(TrackPoints)].Point := Point(P2.X - Sign(Delta.X) * Abs(Delta.Y), P1.Y);
-    TrackPoints[High(TrackPoints)].StationIndex := StationIndex - 1;
+    NewTrackPoint := TTrackPoint.Create;
+    NewTrackPoint.Line := TrackPoints.Line;
+    NewTrackPoint.Point := Point(P2.X - Sign(Delta.X) * Abs(Delta.Y), P1.Y);
+    NewTrackPoint.StationIndex := StationIndex - 1;
+    TrackPoints.Add(NewTrackPoint);
   end else begin
-    SetLength(TrackPoints, Length(TrackPoints) + 1);
-    TrackPoints[High(TrackPoints)].Point := Point(P1.X, P2.Y - Sign(Delta.Y) * Abs(Delta.X));
-    TrackPoints[High(TrackPoints)].StationIndex := StationIndex - 1;
-  end;
-  SetLength(TrackPoints, Length(TrackPoints) + 1);
-  TrackPoints[High(TrackPoints)].Point := P2;
-  TrackPoints[High(TrackPoints)].StationIndex := StationIndex;
+    NewTrackPoint := TTrackPoint.Create;
+    NewTrackPoint.Line := TrackPoints.Line;
+    NewTrackPoint.Point := Point(P1.X, P2.Y - Sign(Delta.Y) * Abs(Delta.X));
+    NewTrackPoint.StationIndex := StationIndex - 1;
+    TrackPoints.Add(NewTrackPoint);
+  end;
+  NewTrackPoint := TTrackPoint.Create;
+  NewTrackPoint.Line := TrackPoints.Line;
+  NewTrackPoint.Point := P2;
+  NewTrackPoint.StationIndex := StationIndex;
+  TrackPoints.Add(NewTrackPoint);
 end;
 
@@ -367 +385 @@
 begin
   Result := 0;
-  for I := 0 to High(TrackPoints) do
+  for I := 0 to TrackPoints.Count - 1 do
   if I > 0 then
-    Result := Result + Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
+    Result := Result + Distance(TTrackPoint(TrackPoints[I]).Point, TTrackPoint(TrackPoints[I - 1]).Point);
 end;
 
@@ -377 +395 @@
 begin
   Result := 0;
-  for I := 0 to High(TrackPoints) do begin
+  for I := 0 to TrackPoints.Count - 1 do begin
     if I > 0 then
-      Result := Result + Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
-    if TrackPoints[I].StationIndex = StationIndex then Break;
+      Result := Result + Distance(TTrackPoint(TrackPoints[I]).Point, TTrackPoint(TrackPoints[I - 1]).Point);
+    if TTrackPoint(TrackPoints[I]).StationIndex = StationIndex then Break;
   end;
 end;
@@ -390 +408 @@
   Trains := TMetroTrains.Create;
   Trains.OwnsObjects := False;
+  TrackPoints := TTrackPoints.Create;
+  TrackPoints.Line := Self;
 end;
 
 destructor TMetroLine.Destroy;
 begin
+  TrackPoints.Free;
   Trains.Free;
   Stations.Free;
@@ -427 +448 @@
   with Line do begin
     Sum := 0;
-    if Length(TrackPoints) > 1 then
-    for I := 1 to High(TrackPoints) do begin
-      D := Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
+    if TrackPoints.Count > 1 then
+    for I := 1 to TrackPoints.Count - 1 do begin
+      D := Distance(TTrackPoint(TrackPoints[I]).Point, TTrackPoint(TrackPoints[I - 1]).Point);
       if (Sum + D) > Self.TrackPos then begin
-        R := Point(TrackPoints[I].Point.X - TrackPoints[I - 1].Point.X,
-          TrackPoints[I].Point.Y - TrackPoints[I - 1].Point.Y);
-        Result := Point(Trunc(TrackPoints[I - 1].Point.X + R.X * (TrackPos - Sum) / D),
-          Trunc(TrackPoints[I - 1].Point.Y + R.Y * (TrackPos - Sum) / D));
+        R := Point(TTrackPoint(TrackPoints[I]).Point.X - TTrackPoint(TrackPoints[I - 1]).Point.X,
+          TTrackPoint(TrackPoints[I]).Point.Y - TTrackPoint(TrackPoints[I - 1]).Point.Y);
+        Result := Point(Trunc(TTrackPoint(TrackPoints[I - 1]).Point.X + R.X * (TrackPos - Sum) / D),
+          Trunc(TTrackPoint(TrackPoints[I - 1]).Point.Y + R.Y * (TrackPos - Sum) / D));
         Exit;
       end else Sum := Sum + D;
     end;
-    if Length(TrackPoints) > 0 then
-      Result := TrackPoints[High(TrackPoints)].Point;
+    if TrackPoints.Count > 0 then
+      Result := TTrackPoint(TrackPoints.Last).Point;
   end;
 end;
@@ -453 +474 @@
   with Line do begin
     Sum := 0;
-    if Length(TrackPoints) > 1 then
-    for I := 1 to High(TrackPoints) do begin
-      D := Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
+    if TrackPoints.Count > 1 then
+    for I := 1 to TrackPoints.Count - 1 do begin
+      D := Distance(TTrackPoint(TrackPoints[I]).Point, TTrackPoint(TrackPoints[I - 1]).Point);
       if (Sum + D) > Self.TrackPos then begin
-        Result := ArcTan2(TrackPoints[I].Point.Y - TrackPoints[I - 1].Point.Y,
-          TrackPoints[I].Point.X - TrackPoints[I - 1].Point.X);
+        Result := ArcTan2(TTrackPoint(TrackPoints[I]).Point.Y - TTrackPoint(TrackPoints[I - 1]).Point.Y,
+          TTrackPoint(TrackPoints[I]).Point.X - TTrackPoint(TrackPoints[I - 1]).Point.X);
         Exit;
       end else Sum := Sum + D;
@@ -589 +610 @@
   while (I < Lines.Count) do
   with TMetroLine(Lines[I]) do begin
-    for T := 1 to High(TrackPoints) do begin
-      D := PointToLineDistance(Pos, TrackPoints[T - 1].Point, TrackPoints[T].Point);
+    for T := 1 to TrackPoints.Count - 1 do begin
+      D := PointToLineDistance(Pos, TTrackPoint(TrackPoints[T - 1]).Point, TTrackPoint(TrackPoints[T]).Point);
       if D < Distance then begin
         Result := TMetroLine(Lines[I]);
@@ -1167 +1188 @@
     Canvas.Pen.Color := Color;
     Canvas.Pen.Style := psSolid;
-    Canvas.Pen.Width := 15;
-    if Length(TrackPoints) > 0 then Canvas.MoveTo(TrackPoints[0].Point);
-    for S := 1 to High(TrackPoints) do begin
-      Canvas.LineTo(TrackPoints[S].Point);
-      if (S = High(TrackPoints)) then begin
-        Angle := arctan2((TrackPoints[S].Point.Y - TrackPoints[S - 1].Point.Y), (TrackPoints[S].Point.X - TrackPoints[S - 1].Point.X));
-        EndPoint := Point(Round(TrackPoints[S].Point.X + EndStationLength * Cos(Angle)),
-          Round(TrackPoints[S].Point.Y + EndStationLength * Sin(Angle)));
+    Canvas.Pen.Width := MetroLineThickness;
+    if TrackPoints.Count > 0 then Canvas.MoveTo(TTrackPoint(TrackPoints[0]).Point);
+    for S := 1 to TrackPoints.Count - 1 do begin
+      Canvas.LineTo(TTrackPoint(TrackPoints[S]).Point);
+      if (S = TrackPoints.Count - 1) then begin
+        Canvas.Pen.EndCap := pecSquare;
+        Angle := arctan2((TTrackPoint(TrackPoints[S]).Point.Y - TTrackPoint(TrackPoints[S - 1]).Point.Y),
+          (TTrackPoint(TrackPoints[S]).Point.X - TTrackPoint(TrackPoints[S - 1]).Point.X));
+        EndPoint := Point(Round(TTrackPoint(TrackPoints[S]).Point.X + EndStationLength * Cos(Angle)),
+          Round(TTrackPoint(TrackPoints[S]).Point.Y + EndStationLength * Sin(Angle)));
         Canvas.LineTo(EndPoint);
         Canvas.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationLength / 3),
@@ -1180 +1203 @@
         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;
-    if (Length(TrackPoints) > 1) then begin
-      Angle := arctan2((TrackPoints[1].Point.Y - TrackPoints[0].Point.Y), (TrackPoints[1].Point.X - TrackPoints[0].Point.X));
-      Canvas.MoveTo(TrackPoints[0].Point);
-      EndPoint := Point(Round(TrackPoints[0].Point.X - EndStationLength * Cos(Angle)),
-        Round(TrackPoints[0].Point.Y - EndStationLength * Sin(Angle)));
+    if (TrackPoints.Count > 1) then begin
+      Canvas.Pen.EndCap := pecSquare;
+      Angle := arctan2((TTrackPoint(TrackPoints[1]).Point.Y - TTrackPoint(TrackPoints[0]).Point.Y),
+        (TTrackPoint(TrackPoints[1]).Point.X - TTrackPoint(TrackPoints[0]).Point.X));
+      Canvas.MoveTo(TTrackPoint(TrackPoints[0]).Point);
+      EndPoint := Point(Round(TTrackPoint(TrackPoints[0]).Point.X - EndStationLength * Cos(Angle)),
+        Round(TTrackPoint(TrackPoints[0]).Point.Y - EndStationLength * Sin(Angle)));
       Canvas.LineTo(EndPoint);
       Canvas.MoveTo(Point(Round(EndPoint.X - Cos(Angle + Pi / 2) * EndStationLength / 3),
@@ -1192 +1218 @@
       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;