ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #265 from deathbeam/fix-broken-plugins

Browse Source 
Fix overlay renderer cache
This commit is contained in:
Adam
2017-12-16 20:52:55 -05:00
committed by GitHub
parent a1c74c2e21 69deaa5b4a
commit 3a9e1ecb62
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -95,6 +95,7 @@ public class OverlayRenderer
if (event.getGameState().equals(GameState.LOGIN_SCREEN) || event.getGameState().equals(GameState.LOGGED_IN)) if (event.getGameState().equals(GameState.LOGIN_SCREEN) || event.getGameState().equals(GameState.LOGGED_IN))
{ {
refreshPlugins();
updateSurface(); updateSurface();
} }
} }
@@ -102,10 +103,19 @@ public class OverlayRenderer
@Subscribe @Subscribe
public void onPluginChanged(PluginChanged event) public void onPluginChanged(PluginChanged event)
{ {
if (event.isLoaded())
{
overlays.addAll(event.getPlugin().getOverlays());
}
else
{
overlays.removeAll(event.getPlugin().getOverlays());
}
sortOverlays(); sortOverlays();
} }
private void sortOverlays() private void refreshPlugins()
{ {
overlays.clear(); overlays.clear();
overlays.addAll(Stream overlays.addAll(Stream
@@ -114,25 +124,30 @@ public class OverlayRenderer
.stream() .stream()
.flatMap(plugin -> plugin.getOverlays().stream()), .flatMap(plugin -> plugin.getOverlays().stream()),
Stream.of(infoBoxOverlay, tooltipOverlay)) Stream.of(infoBoxOverlay, tooltipOverlay))
.sorted((a, b) ->
{
if (a.getPosition() != b.getPosition())
{
// This is so non-dynamic overlays render after dynamic
// overlays, which are generally in the scene
return a.getPosition().compareTo(b.getPosition());
}
// For dynamic overlays, higher priority means to
// draw *later* so it is on top.
// For non-dynamic overlays, higher priority means
// draw *first* so that they are closer to their
// defined position.
return a.getPosition() == OverlayPosition.DYNAMIC
? a.getPriority().compareTo(b.getPriority())
: b.getPriority().compareTo(a.getPriority());
})
.collect(Collectors.toList())); .collect(Collectors.toList()));
sortOverlays();
}
private void sortOverlays()
{
overlays.sort((a, b) ->
{
if (a.getPosition() != b.getPosition())
{
// This is so non-dynamic overlays render after dynamic
// overlays, which are generally in the scene
return a.getPosition().compareTo(b.getPosition());
}
// For dynamic overlays, higher priority means to
// draw *later* so it is on top.
// For non-dynamic overlays, higher priority means
// draw *first* so that they are closer to their
// defined position.
return a.getPosition() == OverlayPosition.DYNAMIC
? a.getPriority().compareTo(b.getPriority())
: b.getPriority().compareTo(a.getPriority());
});
} }
private void updateSurface() private void updateSurface()