Changeset 12 for trunk

Timestamp:

Mar 26, 2015, 11:16:38 PM (9 years ago)

Author:

chronos

Message:

• Added: 4 more station shapes.

File:

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

trunk/UEngine.pas

@@ -134 +134 @@
     LastNewPassengerTime: TDateTime;
     LastNewWeekTime: TDateTime;
+    LastNewShapeTime: TDateTime;
     ImagePassenger: TImage;
     ImageLocomotive: TImage;
@@ -142 +143 @@
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
       Size: Integer);
+    procedure DrawClock(Canvas: TCanvas);
     procedure ComputeShapeDistance;
     procedure ComputeShapeDistanceStation(Station: TMetroStation;
       UpdatedShape: TStationShape; Distance: Integer);
     function GetTime: TDateTime;
-    procedure DrawClock(Canvas: TCanvas);
   public
     Passengers: TMetroPassengers;
@@ -590 +591 @@
 var
   Points: array of TPoint;
+  I: Integer;
+  Angle: Double;
 begin
   case Shape of
@@ -603 +606 @@
       Points[1] := Point(Position.X + Size div 2, Position.Y + Size div 2);
       Points[2] := Point(Position.X - Size div 2, Position.Y + Size div 2);
+      Canvas.Polygon(Points);
+    end;
+    ssStar: begin
+      SetLength(Points, 10);
+      for I := 0 to 9 do begin
+        Angle := I / 10 * 2 * Pi - Pi / 2;
+        if (I mod 2) = 0 then
+        Points[I] := Point(Round(Position.X + Cos(Angle) * Size / 2),
+          Round(Position.Y + Sin(Angle) * Size / 2))
+        else
+        Points[I] := Point(Round(Position.X + Cos(Angle) * Size / 5),
+          Round(Position.Y + Sin(Angle) * Size / 5));
+      end;
+      Canvas.Polygon(Points);
+    end;
+    ssPlus: begin
+      SetLength(Points, 12);
+      Points[0] := Point(Position.X + Size div 6, Position.Y - Size div 6);
+      Points[1] := Point(Position.X + Size div 2, Position.Y - Size div 6);
+      Points[2] := Point(Position.X + Size div 2, Position.Y + Size div 6);
+      Points[3] := Point(Position.X + Size div 6, Position.Y + Size div 6);
+      Points[4] := Point(Position.X + Size div 6, Position.Y + Size div 2);
+      Points[5] := Point(Position.X - Size div 6, Position.Y + Size div 2);
+      Points[6] := Point(Position.X - Size div 6, Position.Y + Size div 6);
+      Points[7] := Point(Position.X - Size div 2, Position.Y + Size div 6);
+      Points[8] := Point(Position.X - Size div 2, Position.Y - Size div 6);
+      Points[9] := Point(Position.X - Size div 6, Position.Y - Size div 6);
+      Points[10] := Point(Position.X - Size div 6, Position.Y - Size div 2);
+      Points[11] := Point(Position.X + Size div 6, Position.Y - Size div 2);
+      Canvas.Polygon(Points);
+    end;
+    ssPentagon: begin
+      SetLength(Points, 5);
+      for I := 0 to 4 do begin
+        Angle := I / 5 * 2 * Pi - Pi / 2;
+        Points[I] := Point(Round(Position.X + Cos(Angle) * Size / 2),
+          Round(Position.Y + Sin(Angle) * Size / 2));
+      end;
+      Canvas.Polygon(Points);
+    end;
+    ssDiamond: begin
+      SetLength(Points, 4);
+      Points[0] := Point(Position.X, Position.Y - Size div 2);
+      Points[1] := Point(Position.X + Size div 2, Position.Y);
+      Points[2] := Point(Position.X, Position.Y + Size div 2);
+      Points[3] := Point(Position.X - Size div 2, Position.Y);
       Canvas.Polygon(Points);
     end;
@@ -729 +778 @@
   if State = gsRunning then begin
 
-  // Add new stations
+  // Add new trains
   if (Now - LastNewWeekTime) > 7 then begin
     LastNewWeekTime := Now;
     Trains.AddNew;
     // TODO: Show notification screen with confirmation
+  end;
+
+  // Add new shape
+  if (Now - LastNewShapeTime) > 10 then begin
+    LastNewShapeTime := Now;
+    if ShapeCount <= Integer(High(TStationShape)) then Inc(ShapeCount);
   end;
 
@@ -956 +1011 @@
   ServedPassengerCount := 0;
 
+  // Start with 3 stations with each different shape
   NewStation := Stations.AddNew;
   NewStation.Shape := ssSquare;
@@ -973 +1029 @@
   LastNewPassengerTime := Now;
   LastNewWeekTime := Now;
+  LastNewShapeTime := Now;
   State := gsRunning;
   StartTime := Now;
@@ -1111 +1168 @@
     end;
 
+{
     Canvas.Brush.Style := bsClear;
     Text := '';
@@ -1116 +1174 @@
       Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
     Canvas.TextOut(Position.X + StationSize div 2, Position.Y + StationSize div 2, Text);
+    }
   end;