Changeset 18 for trunk

Timestamp:

Mar 27, 2015, 11:36:33 PM (9 years ago)

Author:

chronos

Message:

• Added: If track line is grabbed then design time floating track attached to mouse is displayed.

File:

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

trunk/UEngine.pas

@@ -65 +65 @@
   TTrackPoints = class(TObjectList)
     Line: TMetroLine;
+  end;
+
+  TTrack = record
+    PointDown: TTrackPoint;
+    PointUp: TTrackPoint;
   end;
 
@@ -150 +155 @@
   private
     LastMousePos: TPoint;
-    LastSelectedStation: TMapStation;
+    LastFocusedStation: TMapStation;
     MouseHold: Boolean;
     LastNewStationTime: TDateTime;
@@ -162 +167 @@
     function GetExistStationShapes: TStationShapeSet;
     function GetStationOnPos(Pos: TPoint): TMapStation;
-    function GetLineOnPos(Pos: TPoint): TMetroLine;
+    function GetTrackOnPos(Pos: TPoint): TTrack;
     procedure DrawLine(Canvas: TCanvas; Pos: TPoint);
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
@@ -182 +187 @@
     View: TView;
     SelectedLine: TMetroLine;
-    SelectedStation: TMapStation;
+    TrackStationDown: TTrackPoint;
+    TrackStationUp: TTrackPoint;
     ServedPassengerCount: Integer;
     State: TGameState;
@@ -620 +626 @@
 end;
 
-function TEngine.GetLineOnPos(Pos: TPoint): TMetroLine;
+function TEngine.GetTrackOnPos(Pos: TPoint): TTrack;
 var
   I: Integer;
@@ -626 +632 @@
   D: Integer;
   MinD: Integer;
-const
-  Distance = 30;
-begin
-  Result := nil;
+begin
+  Result.PointDown := nil;
+  Result.PointUp := nil;
   I := 0;
   MinD := High(Integer);
@@ -638 +643 @@
       if (D < MinD) and (D < TrackClickDistance) then begin
         MinD := D;
-        Result := TMetroLine(Lines[I]);
+        Result.PointDown := TTrackPoint(TrackPoints[T - 1]);
+        Result.PointUp := TTrackPoint(TrackPoints[T]);
       end;
     end;
@@ -1050 +1056 @@
 procedure TEngine.MouseMove(Position: TPoint);
 var
-  Station: TMapStation;
+  FocusedStation: TMapStation;
+  Line: TMetroLine;
 begin
   LastMousePos := Position;
   if MouseHold then begin
-    if Assigned(SelectedLine) then begin
-      Station := GetStationOnPos(Position);
-      if not Assigned(LastSelectedStation) and Assigned(Station) then begin
-        if (SelectedLine.LineStations.SearchMapStation(Station) = nil) then begin
-          SelectedLine.ConnectStation(Station);
-          SelectedStation := Station;
+    if Assigned(TrackStationDown) then begin
+      FocusedStation := GetStationOnPos(Position);
+      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);
         end else
-        if (SelectedLine.LineStations.Count > 0) and (TLineStation(SelectedLine.LineStations.Last).MapStation = Station) then begin
-          SelectedLine.DisconnectStation(Station);
-          if SelectedLine.LineStations.Count > 0 then
-            SelectedStation := TLineStation(SelectedLine.LineStations.Last).MapStation
-            else SelectedStation := nil;
-        end else if (SelectedLine.LineStations.Count > 0) and (TLineStation(SelectedLine.LineStations.First).MapStation = Station) then begin
-          SelectedLine.ConnectStation(Station);
-          SelectedStation := Station;
+        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);
+          TrackStationDown := TTrackPoint(TrackStationDown.Line.TrackPoints.Last);
         end;
       end;
-      LastSelectedStation := Station;
+      LastFocusedStation := FocusedStation;
     end;
   end;
@@ -1083 +1089 @@
 begin
   MouseHold := False;
+  TrackStationDown := nil;
+  TrackStationUp := nil;
+
   if Button = mbLeft then begin
-    SelectedStation := nil;
 
     // Line color selection
@@ -1105 +1113 @@
   I: Integer;
   NewLine: TMetroLine;
+  Track: TTrack;
+  NewIndex: Integer;
 begin
   if Button = mbLeft then begin
     MouseHold := True;
-    LastSelectedStation := nil;
-
-    // Station selection
-    Station := GetStationOnPos(Position);
-    if Assigned(Station) then begin
-      SelectedStation := Station;
-      if not Assigned(SelectedLine) then
-      for I := 0 to Lines.Count - 1 do
-      if TMetroLine(Lines[I]).LineStations.Count = 0 then begin
-        SelectedLine := TMetroLine(Lines[I]);
-        Break;
+    LastFocusedStation := nil;
+
+    // Line selection
+    Track := GetTrackOnPos(Position);
+    if Assigned(Track.PointDown) and Assigned(Track.PointUp) then begin
+      SelectedLine := Track.PointDown.Line;
+
+      TrackStationDown := Track.PointDown;
+      NewIndex := TrackStationDown.Line.TrackPoints.IndexOf(TrackStationDown);
+      while Assigned(TrackStationDown) and (not Assigned(TrackStationDown.LineStation)) do begin
+        NewIndex := NewIndex - 1;
+        if NewIndex >= 0 then TrackStationDown := TTrackPoint(TrackStationDown.Line.TrackPoints[NewIndex])
+          else TrackStationDown := nil;
       end;
-    end;
-
-    // Line selection
-    Line := GetLineOnPos(Position);
-    if Assigned(Line) then begin
-      SelectedLine := Line;
+      TrackStationUp := Track.PointUp;
+      NewIndex := TrackStationUp.Line.TrackPoints.IndexOf(TrackStationDown);
+      while Assigned(TrackStationUp) and (not Assigned(TrackStationUp.LineStation)) do begin
+        NewIndex := NewIndex + 1;
+        if NewIndex < TrackStationUp.Line.TrackPoints.Count then
+          TrackStationUp := TTrackPoint(TrackStationUp.Line.TrackPoints[NewIndex])
+          else TrackStationUp := nil;
+      end;
+
       Exit;
     end;
@@ -1135 +1150 @@
       if Assigned(NewLine) then begin
         NewLine.ConnectStation(Station);
-        SelectedStation := Station;
-        LastSelectedStation := Station;
+        TrackStationDown := TTrackPoint(NewLine.TrackPoints.Last);
+        TrackStationUp := nil;
+        LastFocusedStation := Station;
       end;
     end;
@@ -1270 +1286 @@
       Canvas.Pen.EndCap := pecRound;
     end;
-
-    // Draw design line
-    if (SelectedLine = TMetroLine(Lines[I])) and Assigned(SelectedStation) then begin
-      Canvas.MoveTo(SelectedStation.Position);
-      DrawLine(Canvas, LastMousePos);
-    end;
+  end;
+
+  // Draw design time lines
+  if Assigned(TrackStationDown) and Assigned(TrackStationDown.LineStation) then begin
+    Canvas.Pen.Color := TrackStationDown.Line.Color;
+    Canvas.MoveTo(TrackStationDown.LineStation.TrackPoint.Point);
+    DrawLine(Canvas, LastMousePos);
+  end;
+  if Assigned(TrackStationUp) and Assigned(TrackStationUp.LineStation) then begin
+    Canvas.Pen.Color := TrackStationUp.Line.Color;
+    Canvas.MoveTo(TrackStationUp.LineStation.TrackPoint.Point);
+    DrawLine(Canvas, LastMousePos);
   end;