Changeset 106 for trunk

Timestamp:

Oct 4, 2022, 3:40:36 PM (2 years ago)

Author:

chronos

Message:

• Added: Show train direction before placement on track.

Location:

trunk

Files:

• UEngine.pas (modified) (9 diffs)
• UTrack.pas (modified) (4 diffs)

trunk/UEngine.pas

@@ -128 +128 @@
     procedure FindTargetStation;
     function GetTargetStationDistance: Integer;
-    function GetPosition: TPoint;
-    function GetAngle: Double;
-    function GetVector: TVector;
     constructor Create;
     destructor Destroy; override;
@@ -190 +187 @@
     CarriageCountVisible: Boolean;
     TerminalCountVisible: Boolean;
+    GrabbedTrainLastTrackPosition: TTrackPosition;
+    GrabbedTrainDirection: Integer;
     function GetServedDaysCount: Integer;
     procedure ResizeView;
@@ -326 +325 @@
   MaxPassengersOveloadTime = 2;
   MetroLineThickness = 13;
-  TrackClickDistance = 20;
+  TrackClickDistance = 10;
   EndStationLength = 50;
   ShowDistances = False;
@@ -404 +403 @@
 function TMetroCarriage.GetVector: TVector;
 begin
-  Result := Train.GetVector;
+  Result := Train.TrackPosition.GetVector;
   Result.Position := AddPoint(Result.Position, Point(TrainSize, TrainSize));
 end;
@@ -829 +828 @@
       Result := Result + Trunc(TrackPosition.RelPos);
     end else Result := Trunc(TrackPosition.RelPos);
-  end;
-end;
-
-function TMetroTrain.GetPosition: TPoint;
-var
-  D: Integer;
-  Delta: TPoint;
-  UpPoint: TTrackPoint;
-begin
-  Result := Point(0, 0);
-  if Assigned(TrackPosition.BaseTrackPoint) then
-  with TrackPosition.BaseTrackPoint do begin
-    UpPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
-    if Assigned(UpPoint) then begin
-      D := Distance(UpPoint.Position, Position);
-      if D > 0 then begin
-        Delta := SubPoint(UpPoint.Position, Position);
-        Result := Point(Trunc(Position.X + Delta.X * TrackPosition.RelPos / D),
-          Trunc(Position.Y + Delta.Y * TrackPosition.RelPos / D));
-      end;
-    end;
-  end;
-end;
-
-function TMetroTrain.GetAngle: Double;
-var
-  UpPoint: TTrackPoint;
-begin
-  Result := 0;
-  if Assigned(TrackPosition.BaseTrackPoint) then
-  with TrackPosition.BaseTrackPoint do begin
-    UpPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
-    if Assigned(UpPoint) then begin
-      Result := ArcTan2(UpPoint.Position.Y - Position.Y,
-        UpPoint.Position.X - Position.X);
-    end;
-  end;
-end;
-
-function TMetroTrain.GetVector: TVector;
-var
-  D: Integer;
-  UpPoint: TTrackPoint;
-begin
-  Result.Position := Point(0, 0);
-  if Assigned(TrackPosition.BaseTrackPoint) then
-  with TrackPosition.BaseTrackPoint do begin
-    UpPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
-    if Assigned(UpPoint) then begin
-      D := Distance(UpPoint.Position, Position);
-      if D > 0 then begin
-        Result.Direction := SubPoint(UpPoint.Position, Position);
-        Result.Position := Point(Trunc(Position.X + Result.Direction.X * TrackPosition.RelPos / D),
-          Trunc(Position.Y + Result.Direction.Y * TrackPosition.RelPos / D));
-      end;
-    end;
   end;
 end;
@@ -1183 +1126 @@
   MinDistance := High(Integer);
   for I := 0 to Trains.Count - 1 do
-  with Trains[I] do begin
-    D := Distance(GetPosition, Pos);
+  with TMetroTrain(Trains[I]) do begin
+    D := Distance(TrackPosition.GetVector.Position, Pos);
     if (D < (TrainSize div 2)) and (D < MinDistance) then begin
       Result := Trains[I];
@@ -2196 +2139 @@
       Canvas.Brush.Style := bsSolid;
       Canvas.Pen.Style := psClear;
-      Vector := GetVector;
+      Vector := TrackPosition.GetVector;
       Pos := Vector.Position;
       Angle := Vector.GetAngle;
@@ -2781 +2724 @@
   Pos: TPoint;
   Angle: Double;
+  FocusedTrack: TTrackLink;
+  Vector: TVector;
+  Intersect: TPoint;
+  TrackPosition: TTrackPosition;
 begin
   // Show train grabbed by mouse
+  Angle := 0;
+  Pos := LastMousePos;
+
   if Assigned(SelectedTrain) then begin
+    FocusedTrack := GetTrackOnPos(View.PointDestToSrc(Pos), Intersect);
+    if Assigned(FocusedTrack.Points[0]) then begin
+      TrackPosition.BaseTrackPoint := FocusedTrack.Points[0];
+      TrackPosition.RelPos := Distance(FocusedTrack.Points[0].Position,
+        Intersect);
+      Vector := TrackPosition.GetVector;
+      Angle := Vector.GetAngle;
+
+      if TrackPosition.GetTrackPosition >
+        GrabbedTrainLastTrackPosition.GetTrackPosition then
+          GrabbedTrainDirection := 1
+      else
+      if TrackPosition.GetTrackPosition <
+        GrabbedTrainLastTrackPosition.GetTrackPosition then
+        GrabbedTrainDirection := -1;
+
+      GrabbedTrainLastTrackPosition := TrackPosition;
+    end;
+    FocusedTrack.Free;
+
+    if GrabbedTrainDirection = -1 then Angle := Angle + Pi;
     Canvas.Brush.Color := Colors.Text; //SelectedTrain.Line.Color;
     Canvas.Brush.Style := bsSolid;
     Canvas.Pen.Style := psClear;
-    Pos := LastMousePos;
-    Angle := 0;
-
     Canvas.Polygon([
       RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y - TrainSize div 3), Angle),
-      RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y - TrainSize div 3), Angle),
-      RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y + TrainSize div 3), Angle),
+      RotatePoint(Pos, Point(Pos.X + TrainSize div 2 - 10, Pos.Y - TrainSize div 3), Angle),
+      RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y), Angle),
+      RotatePoint(Pos, Point(Pos.X + TrainSize div 2 - 10, Pos.Y + TrainSize div 3), Angle),
       RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle)
     ]);
@@ -3029 +2998 @@
           SelectedTrain.TrackPosition.RelPos := Distance(FocusedTrack.Points[0].Position,
             Intersect);
-          if (SelectedTrain.Direction <> 1) and (SelectedTrain.Direction <> -1) then
-            SelectedTrain.Direction := 1
-            else SelectedTrain.Direction := -SelectedTrain.Direction;
+          SelectedTrain.Direction := GrabbedTrainDirection;
           SelectedTrain.FindTargetStation;
           SelectedTrain.LastTrainMoveTime := Time;

trunk/UTrack.pas

@@ -18 +18 @@
     BaseTrackPoint: TTrackPoint;
     RelPos: Double;
+    function GetTrackPosition: Integer;
     function GetVector: TVector;
     procedure Move(Distance: Double);
@@ -43 +44 @@
     function GetLinkDown: TTrackLink;
     function GetLinkUp: TTrackLink;
+    function GetTrackPosition: Integer;
+
     // Move to TTrackLink later
     function GetDistance: Integer;
@@ -109 +112 @@
 
 { TTrackPosition }
+
+function TTrackPosition.GetTrackPosition: Integer;
+begin
+  Result := Round(RelPos);
+  if Assigned(BaseTrackPoint) then
+    Result := Result + BaseTrackPoint.GetTrackPosition;
+end;
 
 function TTrackPosition.GetVector: TVector;
@@ -411 +421 @@
 end;
 
+function TTrackPoint.GetTrackPosition: Integer;
+var
+  Index: Integer;
+  I: Integer;
+begin
+  Result := 0;
+  Index := Track.Points.IndexOf(Self);
+  for I := 0 to Index - 1 do
+    Result := Result + Track.Points[I].GetDistance;
+end;
+
 function TTrackPoint.GetDistance: Integer;
 var