Changeset 19 for trunk

Timestamp:

Apr 1, 2015, 1:21:27 AM (9 years ago)

Author:

chronos

Message:

• Modified: User can now enlarge line from both ends as well as between stations.

File:

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

trunk/UEngine.pas

@@ -56 +56 @@
   end;
 
+  { TTrackPoint }
+
   TTrackPoint = class
     Line: TMetroLine;
@@ -61 +63 @@
     Point: TPoint;
     Pending: Boolean;
+    function GetDown: TTrackPoint;
+    function GetUp: TTrackPoint;
   end;
 
@@ -75 +79 @@
 
   TMetroLine = class
+  private
+    procedure UpdateEndingLines;
+  public
     Engine: TEngine;
     Color: TColor;
@@ -80 +87 @@
     Trains: TMetroTrains;
     TrackPoints: TTrackPoints;
-    procedure ConnectStation(Station: TMapStation);
-    procedure DisconnectStation(Station: TMapStation);
+    procedure ConnectStation(Station: TMapStation; LineStationDown, LineStationUp: TLineStation);
+    procedure DisconnectStation(LineStation: TLineStation);
     procedure RouteTrack(TP1, TP2: TTrackPoint);
+    procedure RemoteTrackBetween(TP1, TP2: TTrackPoint);
     function GetTrackLength: Integer;
     function GetStationTrackPos(LineStation: TLineStation): Integer;
@@ -219 +227 @@
   MetroLineThickness = 13;
   TrackClickDistance = 20;
+  EndStationLength = 50;
 
 implementation
@@ -224 +233 @@
 uses
   UGeometric;
+
+{ TTrackPoint }
+
+function TTrackPoint.GetDown: TTrackPoint;
+var
+  NewIndex: Integer;
+begin
+  NewIndex := LineStation.Line.LineStations.IndexOf(LineStation) - 1;
+  if NewIndex >= 0 then Result := TLineStation(LineStation.Line.LineStations[NewIndex]).TrackPoint
+    else Result := nil;
+end;
+
+function TTrackPoint.GetUp: TTrackPoint;
+var
+  NewIndex: Integer;
+begin
+  NewIndex := LineStation.Line.LineStations.IndexOf(LineStation) + 1;
+  if NewIndex < LineStation.Line.LineStations.Count then
+    Result := TLineStation(LineStation.Line.LineStations[NewIndex]).TrackPoint
+    else Result := nil;
+end;
 
 { TLineStations }
@@ -332 +362 @@
 { TMetroLine }
 
-procedure TMetroLine.ConnectStation(Station: TMapStation);
+procedure TMetroLine.UpdateEndingLines;
+var
+  Index: Integer;
+  NewTrackPoint: TTrackPoint;
+  Angle: Double;
+  EndPoint: TPoint;
+begin
+  if LineStations.Count >= 2 then begin
+    Index := TrackPoints.IndexOf(TLineStation(LineStations.First).TrackPoint);
+    if Index = 0 then begin
+      NewTrackPoint := TTrackPoint.Create;
+      NewTrackPoint.Line := Self;
+      TrackPoints.Insert(0, NewTrackPoint);
+    end;
+    Index := TrackPoints.IndexOf(TLineStation(LineStations.Last).TrackPoint);
+    if Index = TrackPoints.Count - 1 then begin
+      NewTrackPoint := TTrackPoint.Create;
+      NewTrackPoint.Line := Self;
+      TrackPoints.Insert(TrackPoints.Count, NewTrackPoint);
+    end;
+
+    Angle := arctan2((TTrackPoint(TrackPoints[2]).Point.Y - TTrackPoint(TrackPoints[1]).Point.Y),
+      (TTrackPoint(TrackPoints[2]).Point.X - TTrackPoint(TrackPoints[1]).Point.X));
+    EndPoint := Point(Round(TTrackPoint(TrackPoints[1]).Point.X - EndStationLength * Cos(Angle)),
+      Round(TTrackPoint(TrackPoints[1]).Point.Y - EndStationLength * Sin(Angle)));
+    TTrackPoint(TrackPoints.First).Point := EndPoint;
+
+    Angle := arctan2((TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Point.Y - TTrackPoint(TrackPoints[TrackPoints.Count - 3]).Point.Y),
+      (TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Point.X - TTrackPoint(TrackPoints[TrackPoints.Count - 3]).Point.X));
+    EndPoint := Point(Round(TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Point.X + EndStationLength * Cos(Angle)),
+      Round(TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Point.Y + EndStationLength * Sin(Angle)));
+    TTrackPoint(TrackPoints.Last).Point := EndPoint;
+  end;
+end;
+
+procedure TMetroLine.ConnectStation(Station: TMapStation; LineStationDown, LineStationUp: TLineStation);
 var
   Train: TMetroTrain;
   NewTrackPoint: TTrackPoint;
   NewLineStation: TLineStation;
-begin
+  Index: Integer;
+begin
+  if not Assigned(LineStationDown) and not Assigned(LineStationUp) and (LineStations.Count > 0) then
+    raise Exception.Create('No old line station to connect new station');
   NewLineStation := TLineStation.Create;
   NewLineStation.Line := Self;
   NewLineStation.MapStation := Station;
-  LineStations.Add(NewLineStation);
+  Index := 0;
+  if Assigned(LineStationDown) then Index := LineStations.IndexOf(LineStationDown) + 1
+    else if Assigned(LineStationDown) then Index := LineStations.IndexOf(LineStationUp);
+  LineStations.Insert(Index, NewLineStation);
   Station.Lines.Add(Self);
 
@@ -348 +419 @@
   NewTrackPoint.Point := Station.Position;
   NewTrackPoint.Line := TrackPoints.Line;
-  TrackPoints.Add(NewTrackPoint);
-
+  Index := 0;
+  if Assigned(LineStationDown) then Index := TrackPoints.IndexOf(LineStationDown.TrackPoint) + 1
+    else if Assigned(LineStationUp) then Index := TrackPoints.IndexOf(LineStationUp.TrackPoint);
+  TrackPoints.Insert(Index, NewTrackPoint);
   NewLineStation.TrackPoint := NewTrackPoint;
 
-  if LineStations.Count >= 2 then
-    RouteTrack(TLineStation(LineStations[LineStations.Count - 2]).TrackPoint, NewLineStation.TrackPoint);
+  if Assigned(LineStationDown) then
+    RouteTrack(NewLineStation.TrackPoint.GetDown, NewLineStation.TrackPoint);
+  if Assigned(LineStationUp) then
+    RouteTrack(NewLineStation.TrackPoint, NewLineStation.TrackPoint.GetUp);
 
   // Place one train if at least two stations present
@@ -364 +439 @@
     end;
   end;
+  UpdateEndingLines;
   Engine.ComputeShapeDistance;
 end;
 
-procedure TMetroLine.DisconnectStation(Station: TMapStation);
-var
-  I: Integer;
-  StationIndex: Integer;
-begin
-  if (LineStations.Count > 0) and (TLineStation(LineStations.Last).MapStation = Station) then begin
-    StationIndex := LineStations.Count - 1;
-    LineStations.Delete(StationIndex);
-    Station.Lines.Remove(Self);
-    if LineStations.Count > 0 then begin
-      while (TrackPoints.Count > 0) and (not ComparePoint(TTrackPoint(TrackPoints.Last).Point,
-        TLineStation(LineStations.Last).MapStation.Position)) do
-        TrackPoints.Delete(TrackPoints.Count - 1);
-    end else TrackPoints.Clear;
-
-    // Remove trains if less then two stations
-    if LineStations.Count < 2 then
-      for I := Trains.Count - 1 downto 0 do begin
-        TMetroTrain(Trains[I]).Line := nil;
-        Trains.Delete(I);
-      end;
-  end;
+procedure TMetroLine.DisconnectStation(LineStation: TLineStation);
+var
+  I: Integer;
+  Index: Integer;
+begin
+  // Delete old trackpoints
+
+  Index := TrackPoints.IndexOf(LineStation.TrackPoint) - 1;
+  while (Index >= 0) and (not Assigned(TTrackPoint(TrackPoints[Index]).LineStation)) do begin
+    TrackPoints.Delete(Index);
+    Dec(Index);
+  end;
+  Index := Index + 1;
+  TrackPoints.Delete(Index);
+  while (Index < TrackPoints.Count) and (not Assigned(TTrackPoint(TrackPoints[Index]).LineStation)) do
+    TrackPoints.Delete(Index);
+
+  LineStation.MapStation.Lines.Remove(Self);
+  Index := LineStations.IndexOf(LineStation);
+  LineStations.Delete(Index);
+
+  // Remove trains if less then two stations
+  if LineStations.Count < 2 then
+  for I := Trains.Count - 1 downto 0 do begin
+    TMetroTrain(Trains[I]).Line := nil;
+    Trains.Delete(I);
+  end;
+  UpdateEndingLines;
   Engine.ComputeShapeDistance;
 end;
@@ -399 +481 @@
   Index1, Index2: Integer;
 begin
+  RemoteTrackBetween(TP1, TP2);
   Index1 := TrackPoints.IndexOf(TP1);
   Index2 := TrackPoints.IndexOf(TP2);
-  if Index2 <> Index1 + 1 then
-    raise Exception.Create('Supported only two neighbor track points for routing');
   P1 := TTrackPoint(TrackPoints[Index1]).Point;
   P2 := TTrackPoint(TrackPoints[Index2]).Point;
@@ -414 +495 @@
   end;
   TrackPoints.Insert(Index1 + 1, NewTrackPoint);
+end;
+
+procedure TMetroLine.RemoteTrackBetween(TP1, TP2: TTrackPoint);
+var
+  Index1, Index2: Integer;
+  Temp: Integer;
+  I: Integer;
+begin
+  Index1 := TrackPoints.IndexOf(TP1);
+  Index2 := TrackPoints.IndexOf(TP2);
+  if (Index1 = -1) then
+    raise Exception.Create('TrackPoint1 not found');
+  if (Index2 = -1) then
+    raise Exception.Create('TrackPoint2 not found');
+  if Index1 > Index2 then begin
+    Temp := Index1;
+    Index1 := Index2;
+    Index2 := Temp;
+  end;
+  for I := 1 to Index2 - Index1 - 1 do
+    TrackPoints.Delete(Index1 + 1);
 end;
 
@@ -997 +1099 @@
 procedure TEngine.Tick;
 const
-  NewStationPeriod = OneSecond * 20;
-  NewPassengerPeriod = OneSecond;
-  NewPassengerProbability = 0.1;
+  NewStationPeriod = 20 * OneSecond;
+  NewPassengerPeriod = 0.3 * OneSecond;
+  NewPassengerProbability = 0.01;
 var
   Passenger: TMetroPassenger;
@@ -1058 +1160 @@
   FocusedStation: TMapStation;
   Line: TMetroLine;
+  LineStationDown: TLineStation;
+  LineStationUp: TLineStation;
+  CurrentTrackPoint: TTrackPoint;
 begin
   LastMousePos := Position;
   if MouseHold then begin
-    if Assigned(TrackStationDown) then begin
       FocusedStation := GetStationOnPos(Position);
+      if Assigned(TrackStationDown) then Line := TrackStationDown.Line;
+      if Assigned(TrackStationUp) then Line := TrackStationUp.Line;
       if not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
-        if (TrackStationDown.Line.LineStations.SearchMapStation(FocusedStation) = nil) then begin
-          TrackStationDown.Line.ConnectStation(FocusedStation);
-          TrackStationDown := TTrackPoint(TrackStationDown.Line.TrackPoints.Last);
+        if Assigned(TrackStationDown) and (TrackStationDown.LineStation.MapStation = FocusedStation) then begin
+          // Disconnect down
+          CurrentTrackPoint := TrackStationDown;
+          TrackStationDown := TrackStationDown.GetDown;
+          Line.DisconnectStation(CurrentTrackPoint.LineStation);
         end else
-        if (SelectedLine.TrackPoints.Count > 0) and (TLineStation(TrackStationDown.Line.LineStations.Last).MapStation = FocusedStation) then begin
-          Line := TrackStationDown.Line;
-          TrackStationDown.Line.DisconnectStation(FocusedStation);
-          TrackStationDown := TTrackPoint(Line.TrackPoints.Last);
-        end else if (TrackStationDown.Line.LineStations.Count > 0) and (TLineStation(TrackStationDown.Line.LineStations.Last).MapStation = FocusedStation) then begin
-          TrackStationDown.Line.ConnectStation(FocusedStation);
+        if Assigned(TrackStationUp) and (TrackStationUp.LineStation.MapStation = FocusedStation) then begin
+          // Disconnect up
+          CurrentTrackPoint := TrackStationUp;
+          if Assigned(TrackStationUp) then
+            TrackStationUp := TrackStationUp.GetUp;
+          Line.DisconnectStation(CurrentTrackPoint.LineStation);
+        end else
+        if Assigned(Line) and (Line.LineStations.SearchMapStation(FocusedStation) = nil) then begin
+          if Assigned(TrackStationDown) then LineStationDown := TrackStationDown.LineStation
+            else LineStationDown := nil;
+          if Assigned(TrackStationUp) then LineStationUp := TrackStationUp.LineStation
+            else LineStationUp := nil;
+          Line.ConnectStation(FocusedStation, LineStationDown, LineStationUp);
+          if Assigned(TrackStationDown) then TrackStationDown := TrackStationDown.GetUp
+            else if Assigned(TrackStationUp) then TrackStationUp := TrackStationUp.GetDown;
+        end;
+        {else
+        if (TrackStationDown.Line.LineStations.Count > 0) and (TLineStation(TrackStationDown.Line.LineStations.Last).MapStation = FocusedStation) then begin
+          Line.ConnectStation(FocusedStation, TrackStationDown, TrackStationUp);
           TrackStationDown := TTrackPoint(TrackStationDown.Line.TrackPoints.Last);
         end;
+        }
       end;
       LastFocusedStation := FocusedStation;
-    end;
   end;
 end;
@@ -1149 +1270 @@
       NewLine := GetUnusedLine;
       if Assigned(NewLine) then begin
-        NewLine.ConnectStation(Station);
+        NewLine.ConnectStation(Station, nil, nil);
         TrackStationDown := TTrackPoint(NewLine.TrackPoints.Last);
         TrackStationUp := nil;
@@ -1173 +1294 @@
 
   // Start with 3 stations with each different shape
-  InitialStationCount := 30;
+  InitialStationCount := 3;
   for I := 0 to InitialStationCount - 1 do begin
     NewStation := Stations.AddNew;
@@ -1187 +1308 @@
   end;
 
-  SelectedLine := TMetroLine(Lines[0]);
+  SelectedLine := nil;
   LastNewStationTime := Now;
   LastNewPassengerTime := Now;
@@ -1243 +1364 @@
   GameOverReason = 'Overcrowding at this station has forced you to resign as metro manager.';
   GameOverStatistic = '%d passengers travelled on your metro over %d days.';
-  EndStationLength = 50;
 begin
   Canvas.Brush.Color := $eff0e0;
@@ -1258 +1378 @@
     for S := 1 to TrackPoints.Count - 1 do begin
       Canvas.LineTo(TTrackPoint(TrackPoints[S]).Point);
-      if (S = TrackPoints.Count - 1) then begin
+{      if (S = TrackPoints.Count - 1) then begin
         Canvas.Pen.EndCap := pecSquare;
         Angle := arctan2((TTrackPoint(TrackPoints[S]).Point.Y - TTrackPoint(TrackPoints[S - 1]).Point.Y),
@@ -1270 +1390 @@
           Round(EndPoint.Y + Sin(Angle - Pi / 2) * EndStationLength / 3)));
         Canvas.Pen.EndCap := pecRound;
-      end;
-    end;
+      end;}
+    end;
+    {
     if (TrackPoints.Count > 1) then begin
       Canvas.Pen.EndCap := pecSquare;
@@ -1285 +1406 @@
         Round(EndPoint.Y - Sin(Angle - Pi / 2) * EndStationLength / 3)));
       Canvas.Pen.EndCap := pecRound;
-    end;
+    end;  }
   end;