Changeset 171 for trunk/UGame.pas

Timestamp:

Nov 23, 2017, 7:05:37 PM (7 years ago)

Author:

chronos

Message:

• Modified: Use specialized TPointF type from generic class.
• Modified: Part of fixes for Voronoi map generation.

File:

• trunk/UGame.pas (modified) (5 diffs)

trunk/UGame.pas

@@ -30 +30 @@
   TMapArea = class;
   TClient = class;
-
-  TFloatPoint = record
-    X, Y: Double;
-  end;
 
   TTerrainType = (ttVoid, ttNormal, ttCity);
@@ -525 +521 @@
 
 procedure InitStrings;
-function FloatPoint(AX, AY: Double): TFloatPoint;
 
 resourcestring
@@ -554 +549 @@
   PlayerModeText[pmHuman] := SHuman;
   PlayerModeText[pmComputer] := SComputer;
-end;
-
-function FloatPoint(AX, AY: Double): TFloatPoint;
-begin
-  Result.X := AX;
-  Result.Y := AY;
 end;
 
@@ -1393 +1382 @@
 var
   Points: array of Classes.TPoint;
-  FPoints: array of TFloatPoint;
+  FPoints: array of TPointF;
   I: Integer;
   ArrowSize: TPoint;
@@ -1403 +1392 @@
   ArrowSize := TPoint.Create(Trunc(DefaultCellSize.X / 3 * View.Zoom),
     Trunc(DefaultCellSize.Y / 3 * View.Zoom));
-  FPoints[0] := FloatPoint(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
-  FPoints[1] := FloatPoint(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
-  FPoints[2] := FloatPoint(+0 * ArrowSize.X, +0.25 * ArrowSize.Y);
-  FPoints[3] := FloatPoint(-0.5 * ArrowSize.X, +0.25 * ArrowSize.Y);
-  FPoints[4] := FloatPoint(-0.5 * ArrowSize.X, -0.25 * ArrowSize.Y);
-  FPoints[5] := FloatPoint(+0 * ArrowSize.X, -0.25 * ArrowSize.Y);
-  FPoints[6] := FloatPoint(+0 * ArrowSize.X, -0.5 * ArrowSize.Y);
-  FPoints[7] := FloatPoint(+0.5 * ArrowSize.X, 0 * ArrowSize.Y);
+  FPoints[0] := TPointF.Create(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
+  FPoints[1] := TPointF.Create(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
+  FPoints[2] := TPointF.Create(+0 * ArrowSize.X, +0.25 * ArrowSize.Y);
+  FPoints[3] := TPointF.Create(-0.5 * ArrowSize.X, +0.25 * ArrowSize.Y);
+  FPoints[4] := TPointF.Create(-0.5 * ArrowSize.X, -0.25 * ArrowSize.Y);
+  FPoints[5] := TPointF.Create(+0 * ArrowSize.X, -0.25 * ArrowSize.Y);
+  FPoints[6] := TPointF.Create(+0 * ArrowSize.X, -0.5 * ArrowSize.Y);
+  FPoints[7] := TPointF.Create(+0.5 * ArrowSize.X, 0 * ArrowSize.Y);
   // Rotate
   for I := 0 to Length(Points) - 1 do
-    FPoints[I] := FloatPoint(FPoints[I].X * Cos(Angle) - FPoints[I].Y * Sin(Angle),
+    FPoints[I] := TPointF.Create(FPoints[I].X * Cos(Angle) - FPoints[I].Y * Sin(Angle),
       FPoints[I].X * Sin(Angle) + FPoints[I].Y * Cos(Angle));
   // Shift