DrawTask: check if verifer-enabled before DanmakuRetainer.fix

ctiao · Sep 21, 2015 · daf4af1 · daf4af1
1 parent 57fbaa5
commit daf4af1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/DanmakuFlameMaster/src/main/java/master/flame/danmaku/controller/DrawTask.java b/DanmakuFlameMaster/src/main/java/master/flame/danmaku/controller/DrawTask.java
@@ -16,7 +16,6 @@
 
 package master.flame.danmaku.controller;
 
-import android.content.Context;
 import android.graphics.Canvas;
 
 import master.flame.danmaku.danmaku.model.AbsDisplayer;
@@ -76,6 +75,7 @@ public DrawTask(DanmakuTimer timer, AbsDisplayer<?> disp,
             TaskListener taskListener) {
         mTaskListener = taskListener;
         mRenderer = new DanmakuRenderer();
+        mRenderer.setVerifierEnabled(DanmakuGlobalConfig.DEFAULT.isPreventOverlappingEnabled() || DanmakuGlobalConfig.DEFAULT.isMaxLinesLimited());
         mDisp = disp;
         initTimer(timer);
         Boolean enable = DanmakuGlobalConfig.DEFAULT.isDuplicateMergingEnabled();
@@ -302,6 +302,11 @@ protected boolean handleOnDanmakuConfigChanged(DanmakuGlobalConfig config, Danma
         } else if (DanmakuConfigTag.SCALE_TEXTSIZE.equals(tag) || DanmakuConfigTag.SCROLL_SPEED_FACTOR.equals(tag)) {
             requestClearRetainer();
             handled = false;
+        } else if (DanmakuConfigTag.MAXIMUN_LINES.equals(tag) || DanmakuConfigTag.OVERLAPPING_ENABLE.equals(tag)) {
+            if (mRenderer != null) {
+                mRenderer.setVerifierEnabled(values != null);
+            }
+            handled = true;
         }
         return handled;
     }

diff --git a/...eMaster/src/main/java/master/flame/danmaku/danmaku/model/android/DanmakuGlobalConfig.java b/...eMaster/src/main/java/master/flame/danmaku/danmaku/model/android/DanmakuGlobalConfig.java
@@ -112,6 +112,10 @@ public enum BorderType {
 
     private BaseCacheStuffer mCacheStuffer;
 
+    private boolean mIsMaxLinesLimited;
+
+    private boolean mIsPreventOverlappingEnabled;
+
     /**
      * set typeface
      * 
@@ -559,6 +563,7 @@ public boolean isDuplicateMergingEnabled() {
      * @return
      */
     public DanmakuGlobalConfig setMaximumLines(Map<Integer, Integer> pairs) {
+        mIsMaxLinesLimited = (pairs != null);
         if (pairs == null) {
             DanmakuFilters.getDefault()
                     .unregisterFilter(DanmakuFilters.TAG_MAXIMUN_LINES_FILTER, false);
@@ -583,6 +588,7 @@ public DanmakuGlobalConfig setOverlapping(Map<Integer, Boolean> pairs) {
      * @return
      */
     public DanmakuGlobalConfig preventOverlapping(Map<Integer, Boolean> pairs) {
+        mIsPreventOverlappingEnabled = (pairs != null);
         if (pairs == null) {
             DanmakuFilters.getDefault()
                     .unregisterFilter(DanmakuFilters.TAG_OVERLAPPING_FILTER, false);
@@ -594,6 +600,14 @@ public DanmakuGlobalConfig preventOverlapping(Map<Integer, Boolean> pairs) {
         return this;
     }
 
+    public boolean isMaxLinesLimited() {
+        return mIsMaxLinesLimited;
+    }
+
+    public boolean isPreventOverlappingEnabled() {
+        return mIsPreventOverlappingEnabled;
+    }
+
     /**
      * 设置缓存绘制填充器，默认使用{@link SimpleTextCacheStuffer}只支持纯文字显示, 如果需要图文混排请设置{@link SpannedCacheStuffer}
      * 如果需要定制其他样式请扩展{@link SimpleTextCacheStuffer}|{@link SpannedCacheStuffer}

diff --git a/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/renderer/IRenderer.java b/DanmakuFlameMaster/src/main/java/master/flame/danmaku/danmaku/renderer/IRenderer.java
@@ -25,7 +25,7 @@ public interface IRenderer {
 
     public static final int NOTHING_RENDERING = 0;
     public static final int CACHE_RENDERING = 1;
-    public static final int TEXT_RENDERING = 2;    
+    public static final int TEXT_RENDERING = 2;
 
     public class Area {
 
@@ -131,4 +131,6 @@ public void set(RenderingState other) {
 
     public void release();
 
+    public void setVerifierEnabled(boolean enabled);
+
 }
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
@@ -41,6 +41,7 @@ public boolean skipLayout(BaseDanmaku danmaku, float fixedTop, int lines, boolea
             return false;
         }
     };
+    private boolean mVerifierEnabled;
 
     @Override
     public void clear() {
@@ -53,7 +54,12 @@ public void release() {
         DanmakusRetainer.release();
         DanmakuFilters.getDefault().clear();
     }
-
+
+    @Override
+    public void setVerifierEnabled(boolean enabled) {
+        mVerifierEnabled = enabled;
+    }
+
     @Override
     public RenderingState draw(IDisplayer disp, IDanmakus danmakus, long startRenderTime) {
         int lastTotalDanmakuCount = mRenderingState.totalDanmakuCount;
@@ -91,7 +97,7 @@ public RenderingState draw(IDisplayer disp, IDanmakus danmakus, long startRender
             }
 
             // layout
-            DanmakusRetainer.fix(drawItem, disp, mVerifier);
+            DanmakusRetainer.fix(drawItem, disp, mVerifierEnabled ? mVerifier : null);
 
             // draw
             if (!drawItem.isOutside() && drawItem.isShown()) {