mainscreen mask

Author: Torwent

osrs/interfaces/chat/chat.simba

@@ -88,6 +88,8 @@ begin
   Self.Scroll.Setup();
 
   Self.Colors := [RSFonts.BLACK, $7F0000, RSFonts.BLUE, $7F007F, $2010EF, RSFonts.RED, RSFonts.WHITE, $FF9090, RSFonts.DARK_BLUE, $005F00];
+  MainScreen.Mask.DrawColor := $0000FF;
+  MainScreen.Mask.DrawBoxFilled(Self.Bounds);
 end;
 
 (*

osrs/interfaces/chat/chattabs.simba

@@ -81,7 +81,8 @@ begin
       Self.Tabs[i].Button.Bounds := Box(X1 + 3 + (i * 62), Y1, X1 + 58 + (i * 62), Y2 - 1);
     end;
 
-  MainScreen.AddMask(Self.Bounds);
+  MainScreen.Mask.DrawColor := $FFFFFF;
+  MainScreen.Mask.DrawBoxFilled(Self.Bounds);
 end;
 
 (*

osrs/interfaces/gametabs/gametabs.simba

@@ -65,13 +65,16 @@ begin
   bounds := RSClient.Bounds;
   Self.Bounds.Y2 := bounds.Y2;
 
+  MainScreen.Mask.DrawColor := $FFFFFF;
+
   case RSClient.Mode of
     ERSMode.FIXED:
     begin
       Self.Bounds.X1 := bounds.X2 - 242;
       Self.Bounds.X2 := bounds.X2 - 2;
       Self.Bounds.Y1 := bounds.Y2 - 334;
       Self.Tabs := TBoxArray.Create(Self.Bounds.TopLeft.Offset(6,1), 7, 2, 30, 33, [3, 265]);
+      MainScreen.Mask.DrawBoxFilled(Self.Bounds);
     end;
 
     ERSMode.RESIZABLE:
@@ -80,6 +83,7 @@ begin
       Self.Bounds.X2 := bounds.X2;
       Self.Bounds.Y1 := bounds.Y2 - 334;
       Self.Tabs := TBoxArray.Create(Self.Bounds.TopLeft.Offset(6,1), 7, 2, 30, 33, [3, 265]);
+      MainScreen.Mask.DrawBoxFilled(Self.Bounds);
     end;
 
     ERSMode.MODERN_COMPACT:
@@ -95,6 +99,8 @@ begin
       Self.Tabs[10].Y1 := bounds.Y1 + 9;
       Self.Tabs[10].X2 := bounds.X2 - 10;
       Self.Tabs[10].Y2 := bounds.Y1 + 18;
+      MainScreen.Mask.DrawBoxFilled(Self.Bounds);
+      MainScreen.Mask.DrawBoxFilled(Self.Tabs[10].Expand(8));
     end;
 
     ERSMode.MODERN_WIDE:
@@ -113,8 +119,11 @@ begin
       Self.Tabs[10].Y1 := bounds.Y1 + 9;
       Self.Tabs[10].X2 := bounds.X2 - 10;
       Self.Tabs[10].Y2 := bounds.Y1 + 18;
+      MainScreen.Mask.DrawBoxFilled(Self.Bounds);
+      MainScreen.Mask.DrawBoxFilled(Self.Tabs[10].Expand(8));
     end;
   end;
+
 end;
 
 (*
@@ -334,6 +343,9 @@ begin
         Self.Bounds.X2 := X2 - 10;
         Self.Bounds.Y1 := GameTabs.Bounds.Y1 - 269;
         Self.Bounds.Y2 := GameTabs.Bounds.Y1 - 7;
+
+        MainScreen.Mask.DrawColor := $00FFFF;
+        MainScreen.Mask.DrawBoxFilled(Self.Bounds.Expand(10, 6));
       end;
   end;
 

osrs/interfaces/mainscreen/mainscreen.simba

@@ -22,7 +22,7 @@ Main record to handle the mainscreen and methods relating to it.
 
     HighestPitch: Boolean;
 
-    Mask: TBooleanMatrix;
+    Mask: TImage;
   end;
 
 (*
@@ -36,8 +36,6 @@ coordinates.
 This is called automatically for you on the {ref}`MainScreen variable`.
 *)
 procedure TRSMainScreen.SetupInterface();
-var
-  y, x: Integer;
 begin
   case RSClient.Mode of
     ERSMode.FIXED:
@@ -74,42 +72,13 @@ begin
   Self.ServerMsgBounds.X2 := Self.ServerMsgBounds.X1 + 129;
   Self.ServerMsgBounds.Y2 := Self.ServerMsgBounds.Y1 + 20;
 
-  Self.Mask := [];
-  SetLength(Self.Mask, Self.Bounds.Y2+1, Self.Bounds.X2+1);
-  for y := Self.Bounds.Y1 to Self.Bounds.Y2 do
-    for x := Self.Bounds.X1 to Self.Bounds.X2 do
-      Self.Mask[y,x] := True;
-end;
-
-
-(*
-## MainScreen.AddMask
-```pascal
-procedure TRSMainScreen.AddMask(tpa: TPointArray);
-procedure TRSMainScreen.AddMask(box: TBox); overload;
-procedure TRSMainScreen.AddMask(circle: TCircle); overload;
-```
-Helper methods to help building the `TRSMainScreen.Mask`.
-`TRSMainScreen.Mask` is a helper variable used by {ref}`MainScreen.IsVisible`
-and {ref}`MainScreen.Filter` to reduce computation it would require without a mask.
-This is only useful for resizable modes.
-*)
-procedure TRSMainScreen.AddMask(tpa: TPointArray);
-var
-  pt: TPoint;
-begin
-  for pt in tpa.ExtractBox(Self.Bounds) do
-    Self.Mask[pt.Y, pt.X] := False;
-end;
-
-procedure TRSMainScreen.AddMask(box: TBox); overload;
-begin
-  Self.AddMask(TPointArray.CreateFromBox(box, True));
-end;
-
-procedure TRSMainScreen.AddMask(circle: TCircle); overload;
-begin
-  Self.AddMask(TPointArray.CreateFromCircle(circle.Center, circle.Radius, True));
+  Self.Mask := new TImage(Target.Width+1, Target.Height+1);
+  Self.Mask.Fill($FFFFFF);
+  Self.Mask.DrawColor := $0;
+  Self.Mask.DrawBoxFilled(Self.Bounds);
+  Self.Mask.SetAlphas(TPointArray.CreateFromBox(Self.Bounds, True), $0);
+  Self.Mask.DrawColor := $FFFFFF;
+  Self.Mask.DrawAlpha := $FF;
 end;
 
 
@@ -354,12 +323,31 @@ begin
   Self.HighestPitch := True;
 end;
 
+{$R-}
+function TRSMainScreen._IsVisible(pt: TPoint; tabNone, xpbarClosed, chatClose: Boolean): Boolean;
+var
+  color: TColor;
+begin
+  if not Self.Bounds.Contains(pt) then
+    Exit;
+  color := Self.Mask.Pixel[pt.X, pt.Y];
+
+  case color of
+    $0: Exit(True);
+    $00FFFF: Exit(tabNone);
+    $00FF00: Exit(xpbarClosed);
+    $0000FF: Exit(chatClose);
+    $FFFFFF: Exit;
+    else Exit;
+  end;
+end;
 
 (*
 ## MainScreen.IsVisible
 ```pascal
 function TRSMainScreen.IsVisible(pt: TPoint): Boolean;
-function TRSMainScreen.IsVisible(tpa: TPointArray): Boolean; overload;
+function TRSMainScreen.AnyVisible(tpa: TPointArray): Boolean;
+function TRSMainScreen.AllVisible(tpa: TPointArray): Boolean;
 ```
 Returns `True` if a point `pt` is visible on the mainscreen.
 This also checks for open interfaces to check if the point is not behind them.
@@ -371,16 +359,17 @@ WriteLn MainScreen.IsVisible([100,100]);
 *)
 function TRSMainScreen.IsVisible(pt: TPoint): Boolean;
 begin
-  Result := pt <> pt;
+  Result := pt <> pt; //overriden, check overrides.
 end;
 
-function TRSMainScreen.IsVisible(tpa: TPointArray): Boolean; overload;
-var
-  pt: TPoint;
+function TRSMainScreen.AnyVisible(tpa: TPointArray): Boolean;
 begin
-  for pt in tpa do
-    if Self.IsVisible(pt) then
-      Exit(True);
+  Result := tpa <> tpa; //overriden, check overrides.
+end;
+
+function TRSMainScreen.AllVisible(tpa: TPointArray): Boolean;
+begin
+  Result := tpa <> tpa; //overriden, check overrides.
 end;
 
 
@@ -394,9 +383,9 @@ This also checks for open interfaces to check if the points are not behind them.
 *)
 function TRSMainScreen.Filter(tpa: TPointArray): TPointArray;
 begin
-  Result := tpa;
+  Result := tpa.Copy(); //overriden, check overrides.
 end;
-
+{$R+}
 
 function TRSMainScreen._RedClicked(area: TBox): Boolean;
 begin

osrs/interfaces/minimap.simba

@@ -77,6 +77,8 @@ var
   tpa: TPointArray;
   i: Integer;
 begin
+  MainScreen.Mask.DrawColor := $FFFFFF;
+
   case RSClient.Mode of
     ERSMode.RESIZABLE, ERSMode.MODERN_COMPACT, ERSMode.MODERN_WIDE:
     begin
@@ -134,30 +136,28 @@ begin
       end;
     end;
 
-  MainScreen.AddMask(Self.Compass.Circle.Expand(4));
-  MainScreen.AddMask(TPointArray.CreateFromCircle(Self.Center, 82, True));
+  MainScreen.Mask.DrawCircleFilled(Self.Compass.Circle.Expand(4));
 
   for i := 0 to High(Self.Orbs) do
+  begin
     with Self.Orbs[i].Circle do
-    begin
       Self.Orbs[i].Bounds := TBox.Create(X-35, Y-1, X-15, Y+9);
-      MainScreen.AddMask(TPointArray.CreateFromCircle(Center, Radius+5, True));
-    end;
+    MainScreen.Mask.DrawCircleFilled(Self.Orbs[i].Circle.Expand(6));
+  end;
 
   with Self.Orbs[ERSMinimapOrb.HITPOINTS].Bounds do
-    MainScreen.AddMask([X1 - 5, Y1 - 5, X2 + 7, Y2 + 6]);
-
+    MainScreen.Mask.DrawBoxFilled([X1 - 5, Y1 - 6, X2 + 7, Y2 + 5]);
   with Self.Orbs[ERSMinimapOrb.PRAYER].Bounds do
-    MainScreen.AddMask([X1 - 5, Y1 - 6, X2 + 7, Y2 + 5]);
-
+    MainScreen.Mask.DrawBoxFilled([X1 - 4, Y1 - 5, X2 + 7, Y2 + 6]);
   with Self.Orbs[ERSMinimapOrb.ENERGY].Bounds do
-    MainScreen.AddMask([X1 - 5, Y1 - 5, X2 + 7, Y2 + 6]);
-
+    MainScreen.Mask.DrawBoxFilled([X1 - 5, Y1 - 6, X2 + 7, Y2 + 5]);
   with Self.Orbs[ERSMinimapOrb.SPECIAL].Bounds do
-    MainScreen.AddMask([X1 - 5, Y1 - 7, X2 + 7, Y2 + 4]);
+    MainScreen.Mask.DrawBoxFilled([X1 - 4, Y1 - 6, X2 + 7, Y2 + 5]);
 
   Self.Center := Self.Bounds.Center;
   Self.Polygon := tpa.Offset(Self.Center);
+  MainScreen.Mask.DrawPolygonFilled(Self.Polygon.Expand(9));
+  MainScreen.Mask.DrawCircleFilled(Self.Center.Offset(63,56), 14);
 end;
 
 (*

osrs/interfaces/mm2ms.simba

@@ -657,21 +657,24 @@ begin
       vector := p.ToVec3().Rotate(radians, Self.Center);
       if not Self.PointOnZoomQuad(vector.ToPoint()) then Continue;
       quad := Self.Vector2MSQuad(vector, radians, [1,1]);
-      tpa := quad.Corners.Connect().ExtractBox(MainScreen.Bounds);
-      img.DrawTPA(tpa);
+      tpa += quad.Corners.Connect();
     end;
 
+  img.DrawTPA(MainScreen.Filter(tpa));
+
   for dot in dots do
   begin
-    img.DrawColor := DOT_COLORS[dot];
+    tpa := [];
     for p in Self.GetDots(dot) do
     begin
       vector := p.ToVec3();
       if not Self.PointOnZoomQuad(vector.ToPoint()) then Continue;
       quad := Self.Vector2MSQuad(vector, radians, [1,1]);
-      tpa := quad.Corners.Connect().ExtractBox(MainScreen.Bounds);
-      img.DrawTPA(tpa);
+      tpa += quad.Corners.Connect();
     end;
+
+    img.DrawColor := DOT_COLORS[dot];
+    img.DrawTPA(MainScreen.Filter(tpa));
   end;
 
   img.DrawColor := $FF0000;

osrs/interfaces/setup.simba

@@ -64,7 +64,8 @@ end;
 {$H-}
 procedure TargetResized(sender: TTarget; data: TTargetEventData);
 begin
-  WriteLn(GetDebugLn('RSClient', 'Client was resized, updating coordinates.', ELogLevel.SUCCESS));
+  WriteLn(GetDebugLn('RSClient', 'Client was resized, updating coordinates.'));
+  RSClient.Mode := ERSMode.UNKNOWN;
 
   {$IFNDEF WL_DISABLE_FAKE_INPUT}
   RSClient.Canvas.Clear();
@@ -73,7 +74,10 @@ begin
   Lobby.Setup();
   Login.Setup();
 
-  if RSClient.Mode = ERSMode.UNKNOWN then Exit;
+  Sleep(80);
+  RSClient.IsLoggedIn();
+  if RSClient.Mode = ERSMode.UNKNOWN then
+    RSClient.Mode := ERSMode.FIXED;
   SetupInterfaces();
 end;
 {$H+}

osrs/interfaces/xpbar.simba

@@ -88,8 +88,9 @@ begin
   if Self.Position <> ERSXPBarPosition.UNKNOWN then
     Self.Bounds := Self.AvailableBounds[Self.Position-1];
 
+  MainScreen.Mask.DrawColor := $00FF00;
   with Self.Bounds do
-    MainScreen.AddMask([X1, Y1, X2, Y2+1]);
+    MainScreen.Mask.DrawBoxFilled([X1, Y1, X2, Y2+1]);
 end;
 
 (*
@@ -106,15 +107,14 @@ begin
   case RSClient.Mode of
     ERSMode.RESIZABLE, ERSMode.MODERN_COMPACT, ERSMode.MODERN_WIDE:
       Self.Button := [Minimap.Bounds.X1 - 40, Minimap.Bounds.Y1 + 32,  11];
-
     ERSMode.FIXED:
       Self.Button := [Minimap.Bounds.X1 - 40, Minimap.Bounds.Y1 + 26,  11];
   end;
 
-  MainScreen.AddMask(TPointArray.CreateFromCircle(Self.Button.Center, Self.Button.Radius + 2, True));
+  MainScreen.Mask.DrawColor := $FFFFFF;
+  MainScreen.Mask.DrawCircleFilled(Self.Button.Expand(2));
 
   SetLength(Self.AvailableBounds, 3);
-
   with Self.AvailableBounds[ERSXPBarPosition.LEFT-1] do
   begin
     X1 := MainScreen.Bounds.X1 + 2;