Changeset 32 for trunk

Timestamp:

Apr 19, 2015, 12:25:37 AM (10 years ago)

Author:

chronos

Message:

• Modified: More TTrack structures cleanup and preparation for separation.

File:

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

trunk/UEngine.pas

@@ -22 +22 @@
   TTrackPoints = class;
   TTrack = class;
+  TTrackLinks = class;
 
   { TMapStation }
@@ -71 +72 @@
     PositionDesigned: TPoint;
     Pending: Boolean;
+    Track: TTrack;
     NeighPoints: TTrackPoints;
-    Track: TTrack;
+    NeighLinks: TTrackLinks;
+    procedure Connect(TrackPoint: TTrackPoint);
+    procedure Disconnect(TrackPoint: TTrackPoint);
     function GetDown: TTrackPoint;
     function GetUp: TTrackPoint;
@@ -94 +98 @@
   TTrackLink = class
     Points: TTrackPoints;
-    PointDown: TTrackPoint;
-    PointUp: TTrackPoint;
-    Line: TMetroLine;
     Shift: TPoint;
     Track: TTrack;
@@ -103 +104 @@
   end;
 
+  { TTrackLinks }
+
   TTrackLinks = class(TObjectList)
+    Track: TTrack;
+    function SearchPoints(Point1, Point2: TTrackPoint): TTrackLink;
+    function AddNew: TTrackLink;
   end;
 
@@ -110 +116 @@
     Links: TTrackLinks;
     Line: TMetroLine;
+    procedure RouteTrack(TP1, TP2: TTrackPoint);
+    procedure RemoveTrackBetween(TP1, TP2: TTrackPoint);
     constructor Create;
     destructor Destroy; override;
@@ -150 +158 @@
     procedure ConnectStation(Station: TMapStation; LineStationDown, LineStationUp: TLineStation);
     procedure DisconnectStation(ALineStation: TLineStation);
-    procedure RouteTrack(TP1, TP2: TTrackPoint);
-    procedure RemoveTrackBetween(TP1, TP2: TTrackPoint);
     function GetTrackLength: Integer;
     constructor Create;
@@ -335 +341 @@
   //TimePerSecond = (60 * OneMinute);
   TimePerSecond = (60 * OneMinute);
-  NewStationPeriod = 1;
+  NewStationPeriod = 0.01;
   NewShapePeriod = 10;
   NewTrainPeriod = 7; // Each week
@@ -350 +356 @@
   SZeroZoomNotAlowed = 'Zero zoom not allowed';
 
+{ TTrackLinks }
+
+function TTrackLinks.SearchPoints(Point1, Point2: TTrackPoint): TTrackLink;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < 0) and
+  ((TTrackLink(Items[I]).Points.First <> Point1) or (TTrackLink(Items[I]).Points.Last <> Point2))
+  and ((TTrackLink(Items[I]).Points.First <> Point2) or (TTrackLink(Items[I]).Points.Last <> Point1)) do
+  Inc(I);
+  if I < 0 then Result := TTrackLink(Items[I])
+    else Result := nil;
+end;
+
+function TTrackLinks.AddNew: TTrackLink;
+begin
+  Result := TTrackLink.Create;
+  Result.Track := Track;
+end;
+
 { TTrackPoints }
 
@@ -365 +392 @@
   Points.Track := Self;
   Links := TTrackLinks.Create;
+  Links.Track := Self;
 end;
 
@@ -475 +503 @@
 begin
   I := 0;
-  while (I < Count) and (TTrackLink(Items[I]).PointUp <> TrackPoint) and (TTrackLink(Items[I]) <> Skip) do Inc(I);
+  while (I < Count) and (TTrackLink(Items[I]).Points[1] <> TrackPoint) and (TTrackLink(Items[I]) <> Skip) do Inc(I);
   if I < Count then Result := TTrackLink(Items[I])
     else Result := nil;
@@ -485 +513 @@
 begin
   I := 0;
-  while (I < Count) and (TTrackLink(Items[I]).PointDown <> TrackPoint) and (TTrackLink(Items[I]) <> Skip) do Inc(I);
+  while (I < Count) and (TTrackLink(Items[I]).Points[0] <> TrackPoint) and (TTrackLink(Items[I]) <> Skip) do Inc(I);
   if I < Count then Result := TTrackLink(Items[I])
     else Result := nil;
@@ -517 +545 @@
 
 { TTrackPoint }
+
+procedure TTrackPoint.Connect(TrackPoint: TTrackPoint);
+var
+  NewLink: TTrackLink;
+begin
+  if NeighPoints.IndexOf(TrackPoint) = -1 then begin
+    NeighPoints.Add(TrackPoint);
+    TrackPoint.NeighPoints.Add(Self);
+
+    // Add new link to both self and connected track point
+    NewLink := Track.Links.AddNew;
+    NewLink.Points.Add(TrackPoint);
+    NewLink.Points.Add(Self);
+    NeighLinks.Add(NewLink);
+    TrackPoint.NeighLinks.Add(NewLink);
+    Track.Links.Add(NewLink);
+  end else raise Exception.Create('Trying to connect already connected track point');
+end;
+
+procedure TTrackPoint.Disconnect(TrackPoint: TTrackPoint);
+var
+  Index: Integer;
+  Link: TTrackLink;
+begin
+  Index := NeighPoints.IndexOf(TrackPoint);
+  if NeighPoints.IndexOf(TrackPoint) <> -1 then begin
+    NeighPoints.Delete(Index);
+    TrackPoint.NeighPoints.Remove(Self);
+
+    // Remove link from both track points
+    Link := NeighLinks.SearchPoints(Self, TrackPoint);
+    NeighLinks.Remove(Link);
+    TrackPoint.NeighLinks.Remove(Link);
+    Track.Links.Remove(Link);
+  end else raise Exception.Create('Trying to disconnect not connected track point');
+end;
 
 function TTrackPoint.GetDown: TTrackPoint;
@@ -573 +637 @@
   NeighPoints := TTrackPoints.Create;
   NeighPoints.OwnsObjects := False;
+  NeighLinks := TTrackLinks.Create;
+  NeighLinks.OwnsObjects := False;
 end;
 
 destructor TTrackPoint.Destroy;
 begin
+  NeighLinks.Free;
   NeighPoints.Free;
   inherited Destroy;
@@ -667 +734 @@
   L := Step;
   repeat
-    Result.Position := Point(Trunc(Engine.Map.Size.X / 2 + Cos(Angle) * L),
+    Result.Position := Point(Trunc(Engine.Map.Size.X / 2 + Cos(Angle) * L * 1.5),
       Trunc(Engine.Map.Size.Y / 2 + Sin(Angle) * L));
     MinD := High(Integer);
@@ -772 +839 @@
 
   if Assigned(LineStationDown) then
-    RouteTrack(NewLineStation.TrackPoint.GetDown, NewLineStation.TrackPoint);
+    Track.RouteTrack(NewLineStation.TrackPoint.GetDown, NewLineStation.TrackPoint);
   if Assigned(LineStationUp) then
-    RouteTrack(NewLineStation.TrackPoint, NewLineStation.TrackPoint.GetUp);
+    Track.RouteTrack(NewLineStation.TrackPoint, NewLineStation.TrackPoint.GetUp);
 
   // Place one train if at least two stations present
@@ -836 +903 @@
 
   if ((Index - 1) >= 0) and (Index < Track.Points.Count) then
-    RouteTrack(TTrackPoint(Track.Points[Index - 1]), TTrackPoint(Track.Points[Index]));
+    Track.RouteTrack(TTrackPoint(Track.Points[Index - 1]), TTrackPoint(Track.Points[Index]));
 
   ALineStation.MapStation.Lines.Remove(Self);
@@ -860 +927 @@
 end;
 
-procedure TMetroLine.RouteTrack(TP1, TP2: TTrackPoint);
+procedure TTrack.RouteTrack(TP1, TP2: TTrackPoint);
 var
   NewTrackPoint: TTrackPoint;
@@ -868 +935 @@
 begin
   RemoveTrackBetween(TP1, TP2);
-  Index1 := Track.Points.IndexOf(TP1);
-  Index2 := Track.Points.IndexOf(TP2);
-  P1 := TTrackPoint(Track.Points[Index1]).Position;
-  P2 := TTrackPoint(Track.Points[Index2]).Position;
-  NewTrackPoint := Track.Points.AddNew;
+  Index1 := Points.IndexOf(TP1);
+  Index2 := Points.IndexOf(TP2);
+  P1 := TTrackPoint(Points[Index1]).Position;
+  P2 := TTrackPoint(Points[Index2]).Position;
+  NewTrackPoint := Points.AddNew;
   Delta := Point(P2.X - P1.X, P2.Y - P1.Y);
   if Abs(Delta.X) > Abs(Delta.Y) then begin
@@ -881 +948 @@
     NewTrackPoint.PositionDesigned := NewTrackPoint.Position;
   end;
-  Track.Points.Insert(Index1 + 1, NewTrackPoint);
-end;
-
-procedure TMetroLine.RemoveTrackBetween(TP1, TP2: TTrackPoint);
+  Points.Insert(Index1 + 1, NewTrackPoint);
+end;
+
+procedure TTrack.RemoveTrackBetween(TP1, TP2: TTrackPoint);
 var
   Index1, Index2: Integer;
@@ -890 +957 @@
   I: Integer;
 begin
-  Index1 := Track.Points.IndexOf(TP1);
-  Index2 := Track.Points.IndexOf(TP2);
+  Index1 := Points.IndexOf(TP1);
+  Index2 := Points.IndexOf(TP2);
   if (Index1 = -1) then
     raise Exception.Create('TrackPoint1 not found');
@@ -902 +969 @@
   end;
   for I := 1 to Index2 - Index1 - 1 do
-    Track.Points.Delete(Index1 + 1);
+    Points.Delete(Index1 + 1);
 end;
 
@@ -1056 +1123 @@
     if Index > 0 then begin
       NewTrack := TTrackLink.Create;
-      NewTrack.PointDown := TTrackPoint(Line.Track.Points[Index - 1]);
-      NewTrack.PointUp := TTrackPoint(Line.Track.Points[Index]);
+      NewTrack.Points.Count := 2;
+      NewTrack.Points[0] := TTrackPoint(Line.Track.Points[Index - 1]);
+      NewTrack.Points[1] := TTrackPoint(Line.Track.Points[Index]);
       Tracks.Add(NewTrack);
     end;
     if Index < (Line.Track.Points.Count - 1) then begin
       NewTrack := TTrackLink.Create;
-      NewTrack.PointDown := TTrackPoint(Line.Track.Points[Index + 1]);
-      NewTrack.PointUp := TTrackPoint(Line.Track.Points[Index]);
+      NewTrack.Points.Count := 2;
+      NewTrack.Points[0] := TTrackPoint(Line.Track.Points[Index + 1]);
+      NewTrack.Points[1] := TTrackPoint(Line.Track.Points[Index]);
       Tracks.Add(NewTrack);
     end;
@@ -1071 +1140 @@
   TPAngleGroup := TTrackPointsAngleGroup.Create;
   for I := 0 to Tracks.Count - 1 do begin
-    Angle := ArcTan2(TTrackLink(Tracks[I]).PointDown.PositionDesigned.Y - Position.Y,
-      TTrackLink(Tracks[I]).PointDown.PositionDesigned.X - Position.X);
+    Angle := ArcTan2(TTrackPoint(TTrackLink(Tracks[I]).Points[0]).PositionDesigned.Y - Position.Y,
+      TTrackPoint(TTrackLink(Tracks[I]).Points[0]).PositionDesigned.X - Position.X);
     GroupItem := TPAngleGroup.SearchAngle(Angle);
     if not Assigned(GroupItem) then begin
@@ -1092 +1161 @@
         Shift.X := Trunc(MetroLineThickness * Cos(HAngle) * (J - (Tracks.Count - 1) / 2));
         Shift.Y := Trunc(MetroLineThickness * Sin(HAngle) * (J - (Tracks.Count - 1) / 2));
-        PointDown.PositionShift := Shift;
-        PointUp.PositionShift := Shift;
+        TTrackPoint(Points[0]).PositionShift := Shift;
+        TTrackPoint(Points[1]).PositionShift := Shift;
       end;
   end;
@@ -1236 +1305 @@
 begin
   Result := TTrackLink.Create;
-  Result.PointDown := nil;
-  Result.PointUp := nil;
+  Result.Points.Count := 2;
+  Result.Points[0] := nil;
+  Result.Points[1] := nil;
   I := 0;
   MinD := High(Integer);
@@ -1246 +1316 @@
       if (D < MinD) and (D < TrackClickDistance) then begin
         MinD := D;
-        Result.PointDown := TTrackPoint(Track.Points[T - 1]);
-        Result.PointUp := TTrackPoint(Track.Points[T]);
+        Result.Points[0] := TTrackPoint(Track.Points[T - 1]);
+        Result.Points[1] := TTrackPoint(Track.Points[T]);
       end;
     end;
@@ -1849 +1919 @@
       end;
       FocusedTrack := GetTrackOnPos(View.PointDestToSrc(Position));
-      if Assigned(FocusedTrack.PointDown) then begin
-        SelectedTrain.Line := FocusedTrack.PointDown.Track.Line;
+      if Assigned(FocusedTrack.Points[0]) then begin
+        SelectedTrain.Line := TTrackPoint(FocusedTrack.Points[0]).Track.Line;
         SelectedTrain.Line.Trains.Add(SelectedTrain);
-        SelectedTrain.BaseTrackPoint := FocusedTrack.PointDown;
+        SelectedTrain.BaseTrackPoint := TTrackPoint(FocusedTrack.Points[0]);
       end else
-      if Assigned(FocusedTrack.PointDown) then begin
-        SelectedTrain.Line := FocusedTrack.PointUp.Track.Line;
+      if Assigned(FocusedTrack.Points[1]) then begin
+        SelectedTrain.Line := TTrackPoint(FocusedTrack.Points[1]).Track.Line;
         SelectedTrain.Line.Trains.Add(SelectedTrain);
-        SelectedTrain.BaseTrackPoint := FocusedTrack.PointUp;
+        SelectedTrain.BaseTrackPoint := TTrackPoint(FocusedTrack.Points[1]);
       end;
       FocusedTrack.Free;
@@ -1916 +1986 @@
     // Line selection
     Track := GetTrackOnPos(View.PointDestToSrc(Position));
-    if Assigned(Track) and Assigned(Track.PointDown) and Assigned(Track.PointUp) then begin
-      SelectedLine := Track.PointDown.Track.Line;
-
-      TrackStationDown := Track.PointDown;
+    if Assigned(Track) and Assigned(Track.Points[0]) and Assigned(Track.Points[1]) then begin
+      SelectedLine := TTrackPoint(Track.Points[0]).Track.Line;
+
+      TrackStationDown := TTrackPoint(Track.Points[0]);
       NewIndex := TrackStationDown.Track.Points.IndexOf(TrackStationDown);
       while Assigned(TrackStationDown) and (not Assigned(TrackStationDown.LineStation)) do begin
@@ -1926 +1996 @@
           else TrackStationDown := nil;
       end;
-      TrackStationUp := Track.PointUp;
+      TrackStationUp := TTrackPoint(Track.Points[1]);
       NewIndex := TrackStationUp.Track.Points.IndexOf(TrackStationDown);
       while Assigned(TrackStationUp) and (not Assigned(TrackStationUp.LineStation)) do begin