Changeset 235 for trunk/UGeometry.pas

Timestamp:

Sep 20, 2018, 11:44:42 AM (6 years ago)

Author:

chronos

Message:

• Added: Show map multiple times side by side in cyclic mode.

File:

• trunk/UGeometry.pas (modified) (6 diffs)

trunk/UGeometry.pas

@@ -24 +24 @@
     class operator Equal(const A, B: TGPoint<T>): Boolean;
     class operator Multiply(const A, B: TGPoint<T>): TGPoint<T>;
+    //class operator Divide(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>;
@@ -119 +120 @@
   TPolygonF = TGPolygon<TPointF>;
 
-function Divide(Divident, Divisor: Integer): Integer; overload;
-function Divide(Divident, Divisor: Double): Double; overload;
+function TypedDivide(Divident, Divisor: Integer): Integer; overload;
+function TypedDivide(Divident, Divisor: Single): Single; overload;
 function TypedRound(Value: Double): Integer; overload;
 function TypedRound(Value: Double): Double; overload;
@@ -129 +130 @@
 implementation
 
-function Divide(Divident, Divisor: Integer): Integer;
+function TypedDivide(Divident, Divisor: Integer): Integer;
 begin
   Result := Divident div Divisor;
 end;
 
-function Divide(Divident, Divisor: Double): Double;
+function TypedDivide(Divident, Divisor: Single): Single;
 begin
   Result := Divident / Divisor;
@@ -334 +335 @@
 function TGLine<T>.GetMiddle: T;
 begin
-  Result := T.Create(P1.X + Divide((P2.X - P1.X), 2), P1.Y + Divide((P2.Y - P1.Y), 2));
+  Result := T.Create(P1.X + TypedDivide((P2.X - P1.X), 2), P1.Y + TypedDivide((P2.Y - P1.Y), 2));
 end;
 
@@ -437 +438 @@
 end;
 
+{class operator TGPoint<T>.Divide(const A, B: TGPoint<T>): TGPoint<T>;
+begin
+  Result.X := TypedDivide(A.X, B.X);
+  Result.Y := TypedDivide(A.Y, B.Y);
+end;
+}
+
 class operator TGPoint<T>.GreaterThan(const A, B: TGPoint<T>): Boolean;
 begin
@@ -508 +516 @@
 function TGRect<T>.Center: T;
 begin
-  Result.X := Divide(P2.X - P1.X, 2);
-  Result.Y := Divide(P2.Y - P1.Y, 2);
+  Result.X := TypedDivide(P2.X - P1.X, 2);
+  Result.Y := TypedDivide(P2.Y - P1.Y, 2);
 end;