Changeset 187 for trunk

Timestamp:

Feb 17, 2018, 11:39:36 PM (7 years ago)

Author:

chronos

Message:

• Added: TGPoint multiply operator to avoid FPC internal error.

Location:

trunk

Files:

• Packages/Common/UGeometry.pas (modified) (2 diffs)
• UMap.pas (modified) (1 diff)

trunk/Packages/Common/UGeometry.pas

@@ -23 +23 @@
     class operator LessThanOrEqual(const A, B: TGPoint<T>): Boolean;
     class operator Equal(const A, B: TGPoint<T>): Boolean;
+    class operator Multiply(const A, B: TGPoint<T>): TGPoint<T>;
     function Min(const A, B: TGPoint<T>): TGPoint<T>;
     function Max(const A, B: TGPoint<T>): TGPoint<T>;
@@ -417 +418 @@
 end;
 
+class operator TGPoint<T>.Multiply(const A, B: TGPoint<T>): TGPoint<T>;
+begin
+  Result.X := A.X * B.X;
+  Result.Y := A.Y * B.Y;
+end;
+
 class operator TGPoint<T>.GreaterThan(const A, B: TGPoint<T>): Boolean;
 begin

trunk/UMap.pas

@@ -64 +64 @@
 var
   Shift: TPointF;
-begin
-  Shift := TPointF.Create(0.5 * cos(30 / 180 * Pi), 0.5 * sin(30 / 180 * Pi));
+  Angle: Double;
+begin
+  Angle := 30 / 180 * Pi;
+  Shift := TPointF.Create(0.5, 0.5) * TPointF.Create(Cos(Angle), Sin(Angle));
   SetLength(Result.Points, 6);
   Result.Points[0] := TPoint.Create(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y - 0.5 * Size.Y));