From 8f9041c6ab6808cb30c74b9d63701507a5fa5d8d Mon Sep 17 00:00:00 2001 From: ctiao Date: Wed, 16 Sep 2015 18:56:38 +0800 Subject: [PATCH] DanmakuRenderer: apply priority for MaximumLinesFilter|OverlappingFilter --- .../danmaku/danmaku/renderer/android/DanmakuRenderer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakuRenderer.java b/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakuRenderer.java index dc64ea1c..5732bfc6 100644 --- a/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakuRenderer.java +++ b/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakuRenderer.java @@ -34,7 +34,7 @@ public class DanmakuRenderer extends Renderer { private DanmakusRetainer.Verifier mVerifier = new DanmakusRetainer.Verifier() { @Override public boolean skipLayout(BaseDanmaku danmaku, float fixedTop, int lines, boolean willHit) { - if (DanmakuFilters.getDefault().filterSecondary(danmaku, lines, 0, mStartTimer, willHit)) { + if (danmaku.priority == 0 && DanmakuFilters.getDefault().filterSecondary(danmaku, lines, 0, mStartTimer, willHit)) { danmaku.setVisibility(false); return true; } @@ -76,9 +76,7 @@ public RenderingState draw(IDisplayer disp, IDanmakus danmakus, long startRender } if (drawItem.time < startRenderTime - || (drawItem.priority == 0 && drawItem.isFiltered()) - || drawItem.isFilteredBy(DanmakuFilters.FILTER_TYPE_OVERLAPPING) - || drawItem.isFilteredBy(DanmakuFilters.FILTER_TYPE_MAXIMUM_LINES)) { + || (drawItem.priority == 0 && drawItem.isFiltered())) { continue; }