feat: more fixes to rscamera

- now caches zoom and compass

Author: Torwent

osrs/projection/camera.simba

@@ -13,6 +13,7 @@ Record responsible of handling projection, similar to {ref}`MM2MS`.
     X, Y, Z, Pitch, Yaw, Scale, MinScale, MaxScale, ZOffset: Integer;
     Player, Center, Camera, Offset, ViewportOffset, Origin: TPoint;
     Sines, Cosines: array [0..2047] of Int32;
+    ZoomScale, Radians: Single;
     const MIN_PITCH: Integer = 128;
     const MAX_PITCH: Integer = 383;
   end;
@@ -22,6 +23,9 @@ var
   i: Integer;
   percent: Double;
 begin
+  Self.ZoomScale := -1;
+  Self.Radians := -1;
+
   Self.Pitch := 383;
 
   for i := 0 to 2047 do
@@ -71,19 +75,27 @@ begin
   Self.Y := Self.Player.Y - 674 - Round(235 * (Self.MAX_PITCH - value) / (Self.MAX_PITCH - Self.MIN_PITCH));
 end;
 
-procedure TRSCamera.Update(zoom: Integer; rads: Double);
+procedure TRSCamera.Update(zoom: Integer; rads: Single);
 begin
-  Self.Z := Self.ZOffset + Round(1237 * (Self.MAX_PITCH - Self.Pitch) / (Self.MAX_PITCH - Self.MIN_PITCH) - (zoom/100) * 75);
-  Self.Yaw := Trunc((rads / TAU) * 2047);
-  Self.Scale := Round(Self.MinScale + ZOOM2RSZOOM[zoom] * (Self.MaxScale-Self.MinScale));
-
-  Self.Camera.X := Round(Self.Center.X + Cos(rads) * (Self.X - Self.Center.X) - Sin(rads) * (Self.Y - Self.Center.Y));
-  Self.Camera.Y := Round(Self.Center.Y + Sin(rads) * (Self.X - Self.Center.X) + Cos(rads) * (Self.Y - Self.Center.Y));
-  Self.Origin.X := Self.Camera.X - Self.Player.X;
-  Self.Origin.Y := Self.Camera.Y - Self.Player.Y;
-end;
+  if Self.ZoomScale <> ZOOM2RSZOOM[zoom] then
+  begin
+    Self.Z := Self.ZOffset + Round(1237 * (Self.MAX_PITCH - Self.Pitch) / (Self.MAX_PITCH - Self.MIN_PITCH) - (zoom/100) * 75);
+    Self.ZoomScale := ZOOM2RSZOOM[zoom];
+    Self.Scale := Round(Self.MinScale + Self.ZoomScale * (Self.MaxScale-Self.MinScale));
+  end;
 
+  if Self.Radians <> rads then
+  begin
+    Self.Yaw := Trunc((rads / TAU) * 2047);
+    Self.Camera.X := Round(Self.Center.X + Cos(rads) * (Self.X - Self.Center.X) - Sin(rads) * (Self.Y - Self.Center.Y));
+    Self.Camera.Y := Round(Self.Center.Y + Sin(rads) * (Self.X - Self.Center.X) + Cos(rads) * (Self.Y - Self.Center.Y));
+    Self.Origin.X := Self.Camera.X - Self.Player.X;
+    Self.Origin.Y := Self.Camera.Y - Self.Player.Y;
+    Self.Radians := rads;
+  end;
+end;
 
+//MM2MS
 function TRSCamera.MinimapOffset(constref coordinate: TVector3): TVector3;
 begin
   Result.X := (coordinate.X-Minimap.Center.X)/4*128 - Self.Origin.X;
@@ -103,8 +115,8 @@ begin
   y1 := Sar(y * Self.Cosines[Self.Yaw] - x * Self.Sines[Self.Yaw], 16);
   z1 := Sar(y1 * Self.Cosines[Self.Pitch] + z * Self.Sines[Self.Pitch], 16);
 
-  if z1 < 50 then
-    Exit;
+  //if z1 < 50 then Exit;
+  if z1 = 0 then z1 := 1;
 
   x1 := Sar(x * Self.Cosines[Self.Yaw] + y * Self.Sines[Self.Yaw], 16);
   y2 := Sar(z * Self.Cosines[Self.Pitch] - y1 * Self.Sines[Self.Pitch], 16);
@@ -136,6 +148,7 @@ begin
 end;
 
 
+//MS2MM not working
 function TRSCamera.ReverseMinimapOffset(constref transformed: TVector3): TVector3;
 begin
   Result.X := (transformed.X + Self.Origin.X)*4/128 + Minimap.Center.X;

osrs/projection/projection.simba

@@ -61,7 +61,7 @@ end.
 {$INCLUDE_ONCE WaspLib/osrs.simba}
 
 type
-  EProjector = enum(MM2MS, CAMERA);
+  EProjector = enum(CAMERA, MM2MS);
 (*
 ## TProjection
 Main record responsible for projection.
@@ -121,7 +121,7 @@ begin
   end;
 end;
 
-function TProjection.InvertedRun(arr: TVector3Array): TPointArray;
+function TProjection.ReverseRun(arr: TVector3Array): TPointArray;
 var
   v: TVector2;
 begin
@@ -252,12 +252,8 @@ var
   v1, v2: TVector2;
   arr: TPointArray;
 begin
-  size.X := 2 * size.X;
-  size.Y := 2 * size.Y;
-
-  vector.X += offset.X;
-  vector.Y += offset.Y;
-  vector.Z += offset.Z;
+  size.X := 2 * size.X; size.Y := 2 * size.Y;
+  vector.X += offset.X; vector.Y += offset.Y; vector.Z += offset.Z;
 
   with Self.NormalizeEx([vector.X, vector.Y], radians) do
   begin
@@ -352,7 +348,7 @@ This is not an exact reversion of what `MM2MS` does but it's very accurate.
 *)
 function TRSMainScreen.Point2MM(pt: TPoint; height: Single): TPoint;
 begin
-  Result := Projection.InvertedRun([[pt.X, pt.Y, height]])[0];
+  Result := Projection.ReverseRun([[pt.X, pt.Y, height]])[0];
 end;
 
 
@@ -387,7 +383,7 @@ begin
   if Projection.ZoomQuads[Options.GetZoomLevel(True)] <> Default(TQuad) then
     Exit(Projection.ZoomQuads[Options.ZoomLevel]);
 
-  tpa := Projection.InvertedRun([
+  tpa := Projection.ReverseRun([
            MainScreen.TopLeft.ToVec3(),
            MainScreen.TopRight.ToVec3(),
            MainScreen.BottomRight.ToVec3(),
@@ -699,6 +695,7 @@ begin
   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
+      //if not Self.PointOnZoomQuad(pt) then Continue;
       vector := pt.ToVec3().Rotate(radians, Self.Center);
       quad := Self.Vector2MSQuad(vector, radians, [1,1]);
       tpa += quad.Corners.Connect();