Changeset 172 for trunk/Packages

Timestamp:

Nov 24, 2017, 10:11:54 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Rectangle points were not normalized.
• Fixed: Error in rect to polygon conversion.

File:

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

trunk/Packages/Common/UGeometry.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Math, typinfo;
+  Classes, SysUtils, Math;
 
 type
@@ -51 +51 @@
     function Center: T;
     procedure SetEmpty;
+    procedure Normalize;
     class operator Equal(const A, B: TGRect<T>): Boolean;
     constructor Create(const P1, P2: T);
@@ -201 +202 @@
   Self.Points[0] := Rect.P1;
   Self.Points[1] := T.Create(Rect.P2.X, Rect.P1.Y);
-  Self.Points[2] := Rect.P1;
+  Self.Points[2] := Rect.P2;
   Self.Points[3] := T.Create(Rect.P1.X, Rect.P2.Y);
 end;
@@ -320 +321 @@
 function TGLine<T>.ToRect: TGRect<T>;
 begin
-  Result.P1 := P1;
-  Result.P2 := P2;
+  Result := TGRect<T>.Create(P1, P2);
 end;
 
@@ -461 +461 @@
 end;
 
+procedure TGRect<T>.Normalize;
+var
+  NewP1: T;
+  NewP2: T;
+begin
+  NewP1 := P1.Min(P1, P2);
+  NewP2 := P1.Max(P1, P2);
+  P1 := NewP1;
+  P2 := NewP2;
+end;
+
 function TGRect<T>.Center: T;
 begin
@@ -481 +492 @@
   Self.P1 := P1;
   Self.P2 := P2;
+  Normalize;
 end;