fix: graphgen

Author: Torwent

osrs/map/mapdebugger.simba

@@ -28,7 +28,7 @@ begin
   Self.ImageBox.SetImage(Self.Images[TLazComboBox(sender).ItemIndex], False);
 end;
 
-
+{$H-}
 procedure TMapDebugger.ImgBoxPaint(sender: TImageBox; canvas: TImageBoxCanvas; r: TLazRect);
 var
   p: TPoint;
@@ -57,15 +57,15 @@ begin
   tpa := tpa.Connect().Difference(tpa);
   canvas.DrawPoints(tpa, $F7AA4E);
 end;
+{$H+}
 
-procedure TMapDebugger.ImgBoxMouseMove(sender: TImageBox; shift: ELazShiftStates; x, y: Integer);
+procedure TMapDebugger.ImgBoxMouseMove(sender: TImageBox; {$H-}shift: ELazShiftStates;{$H+} x, y: Integer);
 var
   p: TPoint;
-  canvas: TImageBoxCanvas;
 begin
   p := Self.GetGlobal([x,y]);
   Self.Coordinate.Caption := 'Coordinate: ' + ToStr(p.X) + ' X ' + ToStr(p.Y) + ' Y';
-  Sender.Repaint();
+  sender.Repaint();
 end;
 
 

osrs/map/maploader.simba

@@ -447,41 +447,17 @@ end;
 
 function TRSMapLoader.SetupGraph(name: String; idx, plane, padding: Integer; collision: TImage): TWebGraph;
 var
-  gray, white, merged, graySubset: TPointArray;
-  whiteClusters, grayClusters, mergedClusters: T2DPointArray;
-  i, j: Integer;
+  i: Integer;
 begin
   Result := Self.GetGraph(name, plane, collision);
   Result.Nodes := Self.GetGlobal(idx, Result.Nodes, [padding,padding]);
 
-  white := collision.FindColor($FFFFFF, 0);
-  gray := collision.FindColor($333333, 0);
-
-  white := Self.GetGlobal(idx, white, [padding,padding]);
-  gray  := Self.GetGlobal(idx, gray, [padding,padding]);
-
-  whiteClusters := white.Cluster(1.0);
-  grayClusters := gray.Cluster(1.0);
-
-  for i := 0 to High(whiteClusters) do
-  begin
-    if Length(whiteClusters[i]) <= 6 then
-      Continue;
-
-    graySubset := gray.ExtractBox(whiteclusters[i].Bounds().Expand(80));
-    merged := whiteclusters[i] + graySubset;
-    mergedClusters := merged.Cluster(1.0);
-
-    for j := 0 to high(mergedClusters) do
-      if mergedClusters[j].Contains(whiteClusters[i][0]) then
-      begin
-        Result.WalkableClusters += mergedClusters[j];
-        Break;
-      end;
-  end;
+  Result.WalkableSpace := Self.GetGlobal(idx, Result.WalkableSpace, [padding,padding]);
+  for i := 0 to High(Result.WalkableClusters) do
+    Result.WalkableClusters[i] := Self.GetGlobal(idx, Result.WalkableClusters[i], [padding,padding]);
 
-  Result.WalkableSpace    := white + gray;
-  Result.ObjectClusters   := grayClusters;
+  for i := 0 to High(Result.ObjectClusters) do
+    Result.ObjectClusters[i] := Self.GetGlobal(idx, Result.ObjectClusters[i], [padding,padding]);
 
   for i := 0 to High(Result.Doors) do
   begin

utils/math/geometry.simba

@@ -68,14 +68,14 @@ begin
 end;
 
 
-function TPointArray.Cluster(dist: Single): T2DPointArray; overload;
+function TPointArray.ClusterEx(dist: Single): T2DPointArray; overload;
 begin
   if (Length(Self) < 700) then
     Exit(NRSplitTPA(Self, dist, dist));
   Result := NRClusterTPA(Self, dist);
 end;
 
-function TPointArray.Cluster(distX, distY: Single): T2DPointArray; overload;
+function TPointArray.ClusterEx(distX, distY: Single): T2DPointArray; overload;
 begin
   Result := NRSplitTPA(Self, distX, distY);
 end;

utils/misc.simba

@@ -91,7 +91,7 @@ begin
 end;
 
 
-function TImage.ColorsInLine(start, stop: TPoint; colors: TIntegerArray): Boolean;
+function TImage.ColorsInLineEx(start, stop: TPoint; colors: TIntegerArray): Boolean;
 var
   x, y: Integer;
   pXCross, pYCross, qXCross, qYCross: Boolean;
@@ -112,3 +112,64 @@ begin
 
   Result := (pXCross and pYCross) or (qXCross and qYCross);
 end;
+
+//credits: Simba1400/Source/MML/simba.tpa.pas#L2440C10-L2440C21
+function TImage.ColorsInLine(start, stop: TPoint; colors: TIntegerArray): Boolean;
+var
+  Xinc, YInc: Int32;
+  TwoDxAccumulatedError, TwoDyAccumulatedError: Integer;
+  current, d, twoD: TPoint;
+begin
+  d := [(stop.X-start.X), (stop.Y-start.Y)];
+  twoD := [d.X + d.X, d.Y + d.Y];
+  current := start;
+  Xinc := 1;
+  Yinc := 1;
+
+  if (d.X < 0) then
+  begin
+    Xinc := -1;
+    d.X := - d.X;
+    twoD.X := - twoD.X;
+  end;
+
+  if (d.Y < 0) then
+  begin
+    Yinc := -1;
+    d.Y := -d.Y;
+    twoD.Y := - twoD.Y;
+  end;
+
+  if ((d.X = 0) and (D.Y = 0)) then
+    Exit;
+
+  if (d.Y <= d.X) then
+  begin
+    repeat
+      Inc(current.X, Xinc);
+      Inc(TwoDxAccumulatedError, twoD.Y);
+      if (TwoDxAccumulatedError > d.X) then
+      begin
+        Inc(current.Y, Yinc);
+        Dec(TwoDxAccumulatedError, twoD.X);
+      end;
+
+      if Self.Pixel[current.X, current.Y] in colors then Exit(True);
+    until (current.X = stop.X);
+
+    Exit;
+  end;
+
+  repeat
+    Inc(current.Y, Yinc);
+    Inc(TwoDyAccumulatedError, twoD.X);
+
+    if (TwoDyAccumulatedError > d.Y) then
+    begin
+      Inc(current.X, Xinc);
+      Dec(TwoDyAccumulatedError, twoD.Y);
+    end;
+
+    if Self.Pixel[current.X, current.Y] in colors then Exit(True);
+  until (current.Y = stop.Y);
+end;

utils/webgraph.simba

@@ -292,7 +292,7 @@ var
   i, bestLength, tempLength: Integer;
 begin
   pArea := TPointArray.CreateFromCircle(p, 20, True).Intersection(Self.WalkableSpace);
-  pAreaClusters := pArea.Cluster(1.0);
+  pAreaClusters := pArea.ClusterEx(1);
 
   if Self.ObjectClusters = [] then Exit(pArea.NearestPoint(p));