Changeset 29 for trunk

Timestamp:

Apr 18, 2015, 11:28:16 AM (9 years ago)

Author:

chronos

Message:

• Added: Not finished support for map rivers.
• Added: Design a prototype of better track structure in UTrack.
• Added: To allow zooming of graphic canvas should store drawing elements in abstract structure TMetaCanvas.

Location:

trunk

Files:

• BigMetro.lpi (modified) (2 diffs)
• BigMetro.lpr (modified) (1 diff)
• UEngine.pas (modified) (11 diffs)
• UGeometric.pas (modified) (2 diffs)
• UMetaCanvas.pas (added)
• UTrack.pas (added)

trunk/BigMetro.lpi

@@ -69 +69 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="5">
+    <Units Count="6">
       <Unit0>
         <Filename Value="BigMetro.lpr"/>
@@ -97 +97 @@
         <UnitName Value="UTrack"/>
       </Unit4>
+      <Unit5>
+        <Filename Value="UMetaCanvas.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UMetaCanvas"/>
+      </Unit5>
     </Units>
   </ProjectOptions>

trunk/BigMetro.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, SysUtils, UFormMain, UEngine, UGeometric, UTrack
+  Forms, SysUtils, UFormMain, UEngine, UGeometric, UTrack, UMetaCanvas
   { you can add units after this };
 

trunk/UEngine.pas

@@ -43 +43 @@
   TMapStations = class(TObjectList)
     Engine: TEngine;
+    function GetRect: TRect;
     function AddNew: TMapStation;
   end;
@@ -186 +187 @@
   end;
 
+  { TRiver }
+
+  TRiver = class
+    Points: array of TPoint;
+    procedure Paint(Canvas: TCanvas);
+  end;
+
+  TRivers = class(TObjectList)
+  end;
+
   TMap = class
     Size: TPoint;
+    Rivers: TRivers;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -267 +281 @@
   clOrange = TColor($0080ff);
   clBrown = TColor($003090);
-  LineColors: array[0..7] of TColor = (clBlue, clRed, clDarkYellow, clGreen,
-    clPurple, clGray, clOrange, clBrown);
+  clCyan = TColor($FFFF00);
+  LineColors: array[0..8] of TColor = (clBlue, clRed, clDarkYellow, clGreen,
+    clPurple, clGray, clOrange, clBrown, clCyan);
   StationSize = 30;
   StationOverloadSize = 60;
@@ -303 +318 @@
   SZeroZoomNotAlowed = 'Zero zoom not allowed';
 
+{ TRiver }
+
+procedure TRiver.Paint(Canvas: TCanvas);
+begin
+  Canvas.Brush.Color := $ffffe0;
+  Canvas.Brush.Style := bsSolid;
+  Canvas.Polygon(Points);
+end;
+
+{ TMap }
+
+constructor TMap.Create;
+begin
+  Rivers := TRivers.Create;
+end;
+
+destructor TMap.Destroy;
+begin
+  Rivers.Free;
+  inherited Destroy;
+end;
+
 { TView }
 
@@ -486 +523 @@
 
 { TMapStations }
+
+function TMapStations.GetRect: TRect;
+var
+  I: Integer;
+begin
+  if Count > 0 then begin
+    with TMapStation(Items[0]) do
+      Result := Rect(Position.X, Position.Y, Position.X, Position.Y);
+    for I := 1 to Count - 1 do
+    with TMapStation(Items[I]) do begin
+      if Position.X < Result.Left then Result.Left := Position.X;
+      if Position.X > Result.Right then Result.Right := Position.X;
+      if Position.Y < Result.Top then Result.Top := Position.Y;
+      if Position.Y > Result.Bottom then Result.Bottom := Position.Y;
+    end;
+  end else Result := Rect(0, 0, 0, 0);
+end;
 
 function TMapStations.AddNew: TMapStation;
@@ -1564 +1618 @@
     LastNewStationTime := Time;
     Stations.AddNew;
+    // Need to see all stations on screen
+    View.SourceRect := RectEnlarge(Stations.GetRect, 70);
   end;
 
@@ -1579 +1635 @@
       while (Passenger.Shape = Passenger.Station.Shape) or not (Passenger.Shape in GetExistStationShapes) do
         Passenger.Shape := TStationShape((Integer(Passenger.Shape) + 1) mod Integer(ShapeCount));
-
     end;
   end;
@@ -1684 +1739 @@
         SelectedTrain.BaseTrackPoint := FocusedTrack.PointUp;
       end;
+      FocusedTrack.Free;
     end;
 
@@ -1761 +1817 @@
       Exit;
     end;
+    if Assigned(Track) then Track.Free;
 
     // New track creation from selected station as start
@@ -1792 +1849 @@
 
   // Start with 3 stations with each different shape
-  InitialStationCount := 30;
+  InitialStationCount := 3;
   for I := 0 to InitialStationCount - 1 do begin
     NewStation := Stations.AddNew;
@@ -1800 +1857 @@
   end;
 
-  for I := 0 to 7 do begin
+  for I := 0 to 8 do begin
     Lines.AddNew;
     NewTrain := TMetroTrain.Create;

trunk/UGeometric.pas

@@ -23 +23 @@
 function ArcTanPoint(Point: TPoint): Float;
 function RectEquals(A, B: TRect): Boolean;
+function RectEnlarge(Rect: TRect; Value: Integer): TRect;
 
 implementation
@@ -132 +133 @@
 end;
 
+function RectEnlarge(Rect: TRect; Value: Integer): TRect;
+begin
+  Rect.Left := Rect.Left - Value;
+  Rect.Right := Rect.Right + Value;
+  Rect.Top := Rect.Top - Value;
+  Rect.Bottom := Rect.Bottom + Value;
+end;
+
 
 end.