DanmakuRenderer: skip drawing if danmaku is filtered by FILTER_TYPE_O…

…VERLAPPING|FILTER_TYPE_MAXIMUM_LINES(ignore priority)
bilibili · Sep 11, 2015 · ee79ef6 · ee79ef6
1 parent 5429291
commit ee79ef6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/model/BaseDanmaku.java b/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/model/BaseDanmaku.java
@@ -236,7 +236,11 @@ public boolean hasPassedFilter() {
     }
 
     public boolean isFiltered() {
-        return mFilterParam != 0 && filterResetFlag == GlobalFlagValues.FILTER_RESET_FLAG;
+        return filterResetFlag == GlobalFlagValues.FILTER_RESET_FLAG && mFilterParam != 0;
+    }
+
+    public boolean isFilteredBy(int flag) {
+        return filterResetFlag == GlobalFlagValues.FILTER_RESET_FLAG && (mFilterParam & flag) == flag;
     }
 
     public void setVisibility(boolean b) {

diff --git a/...meMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakuRenderer.java b/...meMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakuRenderer.java
@@ -76,7 +76,9 @@ public RenderingState draw(IDisplayer disp, IDanmakus danmakus, long startRender
             }
 
             if (drawItem.time < startRenderTime
-                    || (drawItem.priority == 0 && drawItem.isFiltered())) {
+                    || (drawItem.priority == 0 && drawItem.isFiltered())
+                    || drawItem.isFilteredBy(DanmakuFilters.FILTER_TYPE_OVERLAPPING)
+                    || drawItem.isFilteredBy(DanmakuFilters.FILTER_TYPE_MAXIMUM_LINES)) {
                 continue;
             }