Skip to content

Commit d5bc8b3

Browse files
committed
feat: read notes
- fixed a bug in WLAssets where fallback link wasn't used properly - TRSCamera has now the MM2MS functionality, MS2MM is still not complete though - `MM2MS` was renamed to `Projection` - `MM2MSProjector` was renamed to `MM2MS` - `Projection now has a `System: EProjector` variable where you can change which projector will be used. The default for now is still MM2MS until it's finished but once TRSCamera has MS2MM functionality it will become the default.
1 parent 502887c commit d5bc8b3

File tree

11 files changed

+331
-326
lines changed

11 files changed

+331
-326
lines changed

osrs.simba

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ Summary: It includes this file until the current file is reached.
114114
{$IFNDEF WL_DOTFILTERS_INCLUDED} {$INCLUDE_ONCE osrs/dotfilters.simba}
115115

116116

117-
{$IFNDEF WL_MM2MS_PROJECTOR_INCLUDED} {$INCLUDE_ONCE osrs/interfaces/mm2ms_projector.simba}
118-
{$IFNDEF WL_CAMERA_INCLUDED} {$INCLUDE_ONCE osrs/camera.simba}
119-
{$IFNDEF WL_MM2MS_INCLUDED} {$INCLUDE_ONCE osrs/interfaces/mm2ms.simba}
117+
{$IFNDEF WL_MM2MS_INCLUDED} {$INCLUDE_ONCE osrs/projection/mm2ms.simba}
118+
{$IFNDEF WL_CAMERA_INCLUDED} {$INCLUDE_ONCE osrs/projection/camera.simba}
119+
{$IFNDEF WL_PROJECTION_INCLUDED} {$INCLUDE_ONCE osrs/projection/projection.simba}
120120

121121
{$IFNDEF WL_ANTIBAN_INCLUDED} {$INCLUDE_ONCE osrs/antiban/antiban.simba}
122122

osrs/camera.simba

Lines changed: 0 additions & 226 deletions
This file was deleted.

osrs/interfaces/setup.simba

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ begin
3232
Emotes.SetupGameTab();
3333
Music.SetupGameTab();
3434

35-
MM2MS.Setup();
36-
RSCamera.Setup();
35+
Projection.Setup();
3736

3837
Chat.SetupInterface();
3938
Make.SetupInterface();
@@ -80,9 +79,9 @@ begin
8079
if RSClient.Mode = ERSMode.UNKNOWN then
8180
RSClient.Mode := ERSMode.FIXED;
8281

83-
MM2MS.Projector.SetupProjection(RSClient.Mode);
82+
Projection.MM2MSProjector.SetupProjection(RSClient.Mode);
8483
if Options.ZoomLevel > -1 then
85-
MM2MS.Projector.UpdateZoom(Options.ZoomLevel);
84+
Projection.MM2MSProjector.UpdateZoom(Options.ZoomLevel);
8685
SetupInterfaces();
8786
end;
8887
{$H+}
@@ -166,7 +165,7 @@ begin
166165
SetLength(Minimap.Orbs, Ord(High(ERSMinimapOrb))+1);
167166

168167
Options.Setup();
169-
MM2MS.Projector.RSZoom := -1;
168+
Projection.MM2MSProjector.RSZoom := -1;
170169
RSMouseZoom.ZoomLevel := -1;
171170
RSMouseZoom.Enabled := True;
172171
WorldSwitcher.Setup();

osrs/position/map/entities.simba

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ begin
209209
[vector.X-size.X, vector.Y+size.Y, Self.Walker^.Height(pt - [1,1], False) - height+size.Z]
210210
];
211211

212-
arr := MM2MS.Run(corners, radians);
212+
arr := Projection.Run(corners, radians);
213213
Result := [
214214
[arr[4], arr[5], arr[6], arr[7]], [arr[0], arr[1], arr[2], arr[3]]
215215
];

osrs/position/map/map.simba

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ begin
572572
[vector.X-2, vector.Y+2, Self.Height(currLoc - [1,1], False) - h]
573573
];
574574

575-
arr := MM2MS.Run(corners, angle);
575+
arr := Projection.Run(corners, angle);
576576
quad := [arr[0], arr[1], arr[2], arr[3]];
577577
tpa += quad.Corners.Connect();
578578
end;
@@ -604,7 +604,7 @@ begin
604604
[vector.X-2, vector.Y+2, Self.Height(currLoc - [1,1], False) - h]
605605
];
606606

607-
arr := MM2MS.Run(corners, angle);
607+
arr := Projection.Run(corners, angle);
608608
quad := [arr[0], arr[1], arr[2], arr[3]];
609609
tpa += quad.Corners.Connect();
610610
end;
@@ -653,7 +653,7 @@ begin
653653
[vector.X-2, vector.Y+2, Self.Height(currLoc - [1,1], False) - h]
654654
];
655655

656-
arr := MM2MS.Run(corners, angle);
656+
arr := Projection.Run(corners, angle);
657657
Result := [arr[0], arr[1], arr[2], arr[3]];
658658
end;
659659

osrs/position/map/objects.simba

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ begin
219219
[vector.X-size.X, vector.Y+size.Y, Self.Walker^.Height(pt - [1,1], False) - height+size.Z]
220220
];
221221

222-
arr := MM2MS.Run(corners, radians);
222+
arr := Projection.Run(corners, radians);
223223
Result := [
224224
[arr[4], arr[5], arr[6], arr[7]], [arr[0], arr[1], arr[2], arr[3]]
225225
];

0 commit comments

Comments
 (0)