Changeset 165 for trunk/Packages/Common

Timestamp:

Nov 22, 2017, 4:48:33 PM (7 years ago)

Author:

chronos

Message:

• Added: Optimization phase for voronoi map generation.

File:

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

trunk/Packages/Common/UGeometry.pas

@@ -14 +14 @@
 
   TLine = record
+  private
+    function GetDistance: Double;
+    procedure SetDistance(AValue: Double);
+  public
     P1: TPoint;
     P2: TPoint;
     function Create(P1, P2: TPoint): TLine;
-    function Distance: Double;
     function GetMiddle: TPoint;
     function GetAngle: Double;
@@ -25 +28 @@
     procedure Rotate(Angle: Double);
     class operator Equal(A, B: TLine): Boolean;
+    property Distance: Double read GetDistance write SetDistance;
   end;
 
@@ -56 +60 @@
 function PointInRect(P: TPoint; aRect: TRect): Boolean;
 function HalfDistancePoint(P1, P2: TPoint): TPoint;
+function NormalizeAngle(Angle: Double): Double;
+function SubAngle(A1, A2: Double): Double;
 
 implementation
@@ -208 +214 @@
 begin
   Result := Point(P1.X + (P2.X - P1.X) div 2, P1.Y + (P2.Y - P1.Y) div 2)
+end;
+
+function NormalizeAngle(Angle: Double): Double;
+begin
+  if Angle < 0 then Result := Angle + (Trunc(Angle / (2 * Pi)) + 1) * (2 * Pi)
+  else if Angle > 2 * Pi then Result := Angle - Trunc(Angle / (2 * Pi)) * (2 * Pi)
+  else Result := Angle;
+end;
+
+function SubAngle(A1, A2: Double): Double;
+begin
+  A1 := NormalizeAngle(A1);
+  A2 := NormalizeAngle(A2);
+  if A1 < A2 then Result := A1 + 2 * Pi - A2
+    else Result := A1 - A2;
 end;
 
@@ -310 +331 @@
       end else begin
         // Crossing line, end polygon. If point NewPolygonStarted, the use polygon as result
+        NewPoly.AddPoint(Points[I]);
         NewPoly.AddPoint(Intersection);
         if NewPoly.IsPointInside(PointInside) then begin
@@ -326 +348 @@
     if PointsChecked > 2 * Length(Points) then Break;
   end;
-  if Success then Points := NewPoly.Points
-    else Clear;
+  if Success then Points := NewPoly.Points;
 end;
 
 { TLine }
+
+function TLine.GetDistance: Double;
+begin
+  Result := Sqrt(Sqr(P2.X - P1.X) + Sqr(P2.Y - P1.Y));
+end;
+
+procedure TLine.SetDistance(AValue: Double);
+var
+  Angle: Double;
+begin
+  Angle := GetAngle;
+  P2 := Point(Round(P1.X + Cos(Angle) * AValue),
+    Round(P1.Y + Sin(Angle) * AValue));
+end;
 
 function TLine.Create(P1, P2: TPoint): TLine;
@@ -336 +371 @@
   Result.P1 := P1;
   Result.P2 := P2;
-end;
-
-function TLine.Distance: Double;
-begin
-  Result := Sqrt(Sqr(P2.X - P1.X) + Sqr(P2.Y - P1.Y));
 end;