fix: MainScreen.NormalizeDistance

Author: Torwent

osrs/colorfinder.simba

@@ -0,0 +1,81 @@
+(*
+# ColorFinder
+Methods to interact with the mainscreen.
+*)
+
+{$DEFINE SRLT_COLORFINDER_INCLUDED}
+{$INCLUDE_ONCE SRLT/osrs.simba}
+
+type
+  TColorFinder = record
+    Colors: array of TColorTolerance;
+    Distance, Erode, Grow: Integer;
+    LongSide, ShortSide: record Min, Max: Integer; end;
+  end;
+
+function TColorFinder.Find(area: TBox; atpa: T2DPointArray): Boolean;
+var
+  tpa: TPointArray;
+  i, l, s: Integer;
+  finder: TColorFinder;
+  tmp: T2DPointArray;
+begin
+  // Translate distances
+  finder.Distance  := MainScreen.NormalizeDistance(Self.Distance);
+  finder.Erode     := MainScreen.NormalizeDistance(Self.Erode);
+  finder.Grow      := MainScreen.NormalizeDistance(Self.Grow);
+
+  finder.LongSide.Min  := MainScreen.NormalizeDistance(Self.LongSide.Min);
+  finder.ShortSide.Min := MainScreen.NormalizeDistance(Self.ShortSide.Min);
+
+  if Self.LongSide.Max = 0 then
+    finder.LongSide.Max := $FFFFFF
+  else
+    finder.LongSide.Max  := MainScreen.NormalizeDistance(Self.LongSide.Max);
+
+  if Self.ShortSide.Max = 0 then
+    finder.ShortSide.Max := $FFFFFF
+  else
+    finder.ShortSide.Max := MainScreen.NormalizeDistance(Self.ShortSide.Max);
+
+  // Find colors
+  for i := 0 to High(Self.Colors) do
+    tpa += Target.FindColor(Self.Colors[i], area);
+
+  // Process TPA
+  if tpa <> [] then Exit;
+
+  if finder.Grow > 0 then
+    tpa := tpa.Grow(finder.Grow);
+  if finder.Erode > 0 then
+    tpa := tpa.Erode(finder.Erode);
+
+  if tpa = [] then Exit;
+
+  Result := True;
+  tmp := tpa.Cluster(finder.Distance);
+
+  if (finder.ShortSide.Min > 0) or (finder.ShortSide.Max > 0) or
+     (finder.LongSide.Min > 0) or (finder.LongSide.Max > 0) then
+  begin
+    for i := 0 to High(tmp) do
+    begin
+      with tmp[i].Edges().MinAreaRect() do
+      begin
+        l := LongSideLen;
+        s := ShortSideLen;
+      end;
+
+      if ((finder.ShortSide.Min > 0) or (finder.ShortSide.Max > 0)) and (not InRange(s, finder.ShortSide.Min, finder.ShortSide.Max)) then
+        Continue;
+      if ((finder.LongSide.Min > 0) or (finder.LongSide.Max > 0)) and (not InRange(l, finder.LongSide.Min, finder.LongSide.Max)) then
+        Continue;
+
+      atpa += tmp[I];
+    end;
+  end else
+    atpa := tmp;
+
+  atpa := atpa.SortBySize(True);
+end;
+

osrs/interfaces/mm2ms.simba

@@ -22,18 +22,14 @@ Main record responsible for minimap to mainscreen (mm2ms) conversion.
     ZoomQuads: array [0..100] of TQuad;
     PlayerBoxes: array [0..100] of TBox;
     Projector: TMM2MSProjector;
-    Normalization: record
-      Projector: TMM2MSProjector;
-      Base: TPoint;
-    end;
+    Normalizer: TMM2MSProjector;
   end;
 
 procedure TMM2MS.Setup();
 begin
-  Self.Projector.SetupProjection();
-  Self.Normalization.Projector.SetupProjection();
-  Self.Normalization.Projector.UpdateZoom(0);
-  Self.Normalization.Base := Self.Normalization.Projector.Run([0, 0, 0], [0, 0, 0]);
+  Self.Projector.SetupProjection(RSClient.Mode);
+  Self.Normalizer.SetupProjection(ERSMode.FIXED);
+  Self.Normalizer.UpdateZoom(50);
 end;
 
 (*
@@ -464,14 +460,17 @@ WriteLn(MainScreen.TranslateDistance(20));
 ```
 *)
 function TRSMainScreen.NormalizeDistance(dist: Integer; accuracy: Single = 1.05): Integer;
+const
+  BASE: TPoint = [260,181];
+
   function _SearchUp(value: Single; target: Single; inc: Single): Single;
   var
     pt: TPoint;
   begin
     while True do
     begin
-      pt := MM2MS.Normalization.Projector.Run([value, 0, 0], [0, 0, 0]);
-      if MM2MS.Normalization.Base.DistanceTo(pt) > target then
+      pt := MM2MS.Normalizer.Run([value, 0, 0], [0, 0, 0]);
+      if BASE.DistanceTo(pt) > target then
         Exit(value);
 
       value *= inc;
@@ -484,8 +483,8 @@ function TRSMainScreen.NormalizeDistance(dist: Integer; accuracy: Single = 1.05)
   begin
     while True do
     begin
-      pt := MM2MS.Normalization.Projector.Run([value, 0, 0], [0, 0, 0]);
-      if MM2MS.Normalization.Base.DistanceTo(pt) < target then
+      pt := MM2MS.Normalizer.Run([value, 0, 0], [0, 0, 0]);
+      if BASE.DistanceTo(pt) < target then
         Exit(value);
 
       value /= dec;
@@ -494,6 +493,7 @@ function TRSMainScreen.NormalizeDistance(dist: Integer; accuracy: Single = 1.05)
 
 var
   lo, hi, mean: Single;
+  arr: TPointArray;
 begin
   if dist = 0 then Exit;
 
@@ -506,10 +506,9 @@ begin
   mean := lo + ((hi - lo) / 2);
 
   with Minimap.Center do
-    Result := Round(
-                Minimap.Vector2MS([X, Y, 0], 0).DistanceTo(
-                Minimap.Vector2MS([X + mean, Y, 0], 0)
-              ));
+    arr := MM2MS.Run([[X,Y], [X+mean,Y]], 0);
+
+  Result := Round(arr[0].DistanceTo(arr[1]));
 
   if Result < 1 then Result := 1;
 end;

osrs/interfaces/mm2ms_projector.simba

@@ -17,9 +17,9 @@ type
 const
   ZOOM2RSZOOM: TSingleArray = [0.0000, 0.0025, 0.0065, 0.0100, 0.0130, 0.0165, 0.0205, 0.0235, 0.0280, 0.0310, 0.0350, 0.0390, 0.0430, 0.0430, 0.0465, 0.0515, 0.0555, 0.0605, 0.0645, 0.0690, 0.0740, 0.0785, 0.0835, 0.0885, 0.0935, 0.0990, 0.1045, 0.1095, 0.1150, 0.1205, 0.1260, 0.1325, 0.1385, 0.1455, 0.1505, 0.1585, 0.1635, 0.1635, 0.1705, 0.1775, 0.1845, 0.1925, 0.1995, 0.2055, 0.2145, 0.2215, 0.2305, 0.2365, 0.2465, 0.2545, 0.2635, 0.2725, 0.2825, 0.2905, 0.3005, 0.3105, 0.3195, 0.3285, 0.3405, 0.3555, 0.3615, 0.3705, 0.3825, 0.3825, 0.3945, 0.4065, 0.4185, 0.4305, 0.4425, 0.4575, 0.4695, 0.4815, 0.4965, 0.5115, 0.5265, 0.5385, 0.5535, 0.5685, 0.5835, 0.5985, 0.6165, 0.6315, 0.6495, 0.6645, 0.6825, 0.7035, 0.7215, 0.7215, 0.7395, 0.7575, 0.7815, 0.7995, 0.8175, 0.8355, 0.8595, 0.8835, 0.9015, 0.9255, 0.9495, 0.9735, 1.000];
 
-procedure TMM2MSProjector.SetupProjection();
+procedure TMM2MSProjector.SetupProjection(mode: ERSMode);
 begin
-  case RSClient.Mode of
+  case mode of
     ERSMode.FIXED:
     begin
       Self.ScaleMin := 0.83 * MainScreen.Bounds.Height / 503; // fixed client height