Changeset 35 for trunk

Timestamp:

May 7, 2015, 12:20:50 AM (10 years ago)

Author:

chronos

Message:

• Added: More station shapes.

Location:

trunk

Files:

• UEngine.pas (modified) (4 diffs)
• UFormMain.pas (modified) (1 diff)

trunk/UEngine.pas

@@ -11 +11 @@
 type
   TStationShape = (ssCircle, ssSquare, ssTriangle, ssStar, ssPlus, ssPentagon,
-    ssDiamond);
+    ssDiamond, ssQuarterCircle, ssHexagon, ssCross, ssHalfCircle, ssHeptagon);
   TStationShapeSet = set of TStationShape;
   TEngine = class;
@@ -1426 +1426 @@
       Canvas.Polygon(Points);
     end;
+    ssHexagon: begin
+      SetLength(Points, 6);
+      for I := 0 to 5 do begin
+        Angle2 := I / 6 * 2 * Pi - Pi / 2;
+        Points[I] := Point(Round(Position.X + Cos(Angle2) * Size / 2),
+          Round(Position.Y + Sin(Angle2) * Size / 2));
+      end;
+      Points := RotatePoints(Position, Points, Angle);
+      Canvas.Polygon(Points);
+    end;
     ssDiamond: begin
       SetLength(Points, 4);
@@ -1432 +1442 @@
       Points[2] := Point(Position.X, Position.Y + Size div 2);
       Points[3] := Point(Position.X - Size div 2, Position.Y);
+      Points := RotatePoints(Position, Points, Angle);
+      Canvas.Polygon(Points);
+    end;
+    ssCross: 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);
+      Points := RotatePoints(Position, Points, Angle + Pi / 4);
+      Canvas.Polygon(Points);
+    end;
+    ssHalfCircle: Canvas.Pie(
+      Position.X - Size div 2, Position.Y - Size div 2,
+      Position.X + Size div 2, Position.Y + Size div 2,
+      Position.X - Size div 2, Position.Y,
+      Position.X + Size div 2, Position.Y);
+    ssQuarterCircle: Canvas.Pie(
+      Position.X - Size div 2 - Size, Position.Y - Size div 2,
+      Position.X + Size div 2, Position.Y + Size div 2 + Size,
+      Position.X + Size div 2, Position.Y + Size div 2,
+      Position.X - Size div 2, Position.Y - Size div 2);
+    ssHeptagon: begin
+      SetLength(Points, 8);
+      for I := 0 to High(Points) do begin
+        Angle2 := I / Length(Points) * 2 * Pi - Pi / 2;
+        Points[I] := Point(Round(Position.X + Cos(Angle2) * Size / 2),
+          Round(Position.Y + Sin(Angle2) * Size / 2));
+      end;
       Points := RotatePoints(Position, Points, Angle);
       Canvas.Polygon(Points);
@@ -2316 +2363 @@
   // Status interface
   Text := IntToStr(ServedPassengerCount);
-  TargetCanvas.Draw(TargetCanvas.Width - 100, TargetCanvas.Height - 60, ImagePassenger.Picture.Bitmap);
+  TargetCanvas.Draw(TargetCanvas.Width - 50, TargetCanvas.Height - 60, ImagePassenger.Picture.Bitmap);
   TargetCanvas.Brush.Style := bsClear;
-  TargetCanvas.TextOut(TargetCanvas.Width - 50 - TargetCanvas.TextWidth(Text), TargetCanvas.Height - 55, Text);
+  TargetCanvas.TextOut(TargetCanvas.Width - 70 - TargetCanvas.TextWidth(Text), TargetCanvas.Height - 55, Text);
 
   DrawClock(TargetCanvas);

trunk/UFormMain.pas

@@ -51 +51 @@
 begin
   Engine := TEngine.Create;
-  PaintBox1.ControlStyle := [csOpaque];
+  //PaintBox1.ControlStyle := [csOpaque];
 end;