mm2ms debugger

Author: Torwent

osrs/interfaces/mm2ms.simba

@@ -650,8 +650,8 @@ begin
   radians := Self.CompassRadians;
   img.DrawColor := $00FF00;
 
-  for pt.X := Self.Center.X - 100 to Self.Center.X + 100 with 4 do
-    for pt.Y := Self.Center.Y - 100 to Self.Center.Y + 100 with 4 do
+  for pt.X := Self.Center.X - 120 to Self.Center.X + 120 with 4 do
+    for pt.Y := Self.Center.Y - 120 to Self.Center.Y + 120 with 4 do
     begin
       vector := pt.ToVec3().Rotate(radians, Self.Center);
       if not Self.PointOnZoomQuad(vector.ToPoint()) then Continue;
@@ -679,7 +679,7 @@ begin
   img.DrawColor := $FF0000;
   vector := Self.Center.ToVec3();
   quad := Self.Vector2MSQuad(vector, radians, [1,1]);
-  tpa := quad.Corners.Connect().Grow(1);
+  tpa := quad.Corners.Connect();
   img.DrawTPA(tpa);
 end;
 

osrs/interfaces/mm2ms_projector.simba

@@ -57,8 +57,9 @@ Main record responsible for {ref}`MM2MS` projection.
     View, Projection, InvertedView, InvertedProjection: TMatrix4;
     Transformer: TVector3;
 
-    ViewEye, ViewTarget, ViewUp: TVector3;
+    ViewEye, CustomEye, ViewTarget, ViewUp: TVector3;
     ProjectionHeight, ProjectionWidth: Integer;
+    MinScaleMultiplier, MaxScaleMultiplier, FOV, ZNear, ZFar: Double;
   end;
 
 (*
@@ -220,18 +221,25 @@ begin
   case mode of
     ERSMode.FIXED:
     begin
-      Self.ScaleMin := 0.83 * MainScreen.Bounds.Height / Self.ProjectionHeight;
-      Self.ScaleMax := 6.32 * MainScreen.Bounds.Height / Self.ProjectionHeight;
+      if Self.MinScaleMultiplier = 0 then Self.MinScaleMultiplier := 0.8;
+      if Self.MaxScaleMultiplier = 0 then Self.MaxScaleMultiplier := 6.32;
     end;
 
     ERSMode.RESIZABLE, ERSMode.MODERN_COMPACT, ERSMode.MODERN_WIDE:
     begin
-      Self.ScaleMin := 0.635 * MainScreen.Bounds.Height / Self.ProjectionHeight;
-      Self.ScaleMax := 4.90 * MainScreen.Bounds.Height / Self.ProjectionHeight;
+      if Self.MinScaleMultiplier = 0 then Self.MinScaleMultiplier := 0.635;
+      if Self.MaxScaleMultiplier = 0 then Self.MaxScaleMultiplier := 4.90;
     end;
   end;
 
-  Self.Projection := TMatrix4.PerspectiveFovRH(Sqrt(2), Self.ProjectionWidth / Self.ProjectionHeight, 0.01, 1.0);
+  Self.ScaleMin := Self.MinScaleMultiplier * MainScreen.Bounds.Height / Self.ProjectionHeight;
+  Self.ScaleMax := Self.MaxScaleMultiplier * MainScreen.Bounds.Height / Self.ProjectionHeight;
+
+  if Self.FOV = 0 then Self.FOV := Sqrt(2);
+  if Self.ZNear = 0 then Self.ZNear := 0.0;
+  if Self.ZFar = 0 then Self.ZFar := 1.0;
+
+  Self.Projection := TMatrix4.PerspectiveFovRH(Self.FOV, Self.ProjectionWidth / Self.ProjectionHeight, 0.01, 1.0);
   Self.InvertedProjection := Self._InvertProjection(Self.Projection);
 
   Self.ViewTarget := [0.0, 0.0, 1.0];

osrs/position/map/map.simba

@@ -549,8 +549,8 @@ begin
        Self.Height(loc + [3,1], False) + Self.Height(loc - [1,1], False);
   h := h/4;
 
-  for x := Minimap.Center.X - 100 to Minimap.Center.X + 100 with 4 do
-    for y := Minimap.Center.Y - 100 to Minimap.Center.Y + 100 with 4 do
+  for x := Minimap.Center.X - 120 to Minimap.Center.X + 120 with 4 do
+    for y := Minimap.Center.Y - 120 to Minimap.Center.Y + 120 with 4 do
     begin
       vector := Point(x,y).ToVec3().Rotate(angle, Minimap.Center);
       pt := vector.ToPoint();
@@ -610,7 +610,7 @@ begin
     end;
 
     img.DrawColor := DOT_COLORS[dot];
-    img.DrawTPA(MainScreen.Filter(tpa).Grow(1));
+    img.DrawTPA(MainScreen.Filter(tpa));
   end;
 end;