GXM: Support danmaku mask

xfangfang · Feb 6, 2025 · d3a2e64 · d3a2e64
1 parent 68ad8e9
commit d3a2e64
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/wiliwili/include/view/danmaku_core.hpp b/wiliwili/include/view/danmaku_core.hpp
@@ -15,6 +15,10 @@
 
 #include "utils/event_helper.hpp"
 
+#if defined(BOREALIS_USE_D3D11) || defined(BOREALIS_USE_OPENGL) && !defined(__PSV__) || defined(BOREALIS_USE_GXM)
+#define DRAW_DANMAKU_MASK
+#endif
+
 // 每个分片内的svg数据，一般 1/30 s 一帧
 class MaskSvg {
 public:

diff --git a/wiliwili/source/fragment/player_danmaku_setting.cpp b/wiliwili/source/fragment/player_danmaku_setting.cpp
@@ -36,7 +36,7 @@ PlayerDanmakuSetting::PlayerDanmakuSetting() {
 
     auto& conf = ProgramConfig::instance();
 
-#if defined(BOREALIS_USE_D3D11) || defined(BOREALIS_USE_OPENGL) && !defined(__PSV__)
+#ifdef DRAW_DANMAKU_MASK
     this->cellMask->init("wiliwili/player/danmaku/filter/mask"_i18n, DanmakuCore::DANMAKU_SMART_MASK, [](bool data) {
         DanmakuCore::DANMAKU_SMART_MASK = data;
         DanmakuCore::save();

diff --git a/wiliwili/source/presenter/video_detail.cpp b/wiliwili/source/presenter/video_detail.cpp
@@ -521,7 +521,7 @@ void VideoDetail::requestVideoPageDetail(const std::string& bvid, uint64_t cid,
     BILI::get_page_detail(
         bvid, cid,
         [ASYNC_TOKEN, requestVideoHistory](const bilibili::VideoPageResult& result) {
-#if defined(BOREALIS_USE_D3D11) || defined(BOREALIS_USE_OPENGL) && !defined(__PSV__)
+#ifdef DRAW_DANMAKU_MASK
             if (!result.mask_url.empty()) {
                 brls::Logger::debug("获取防遮挡数据: {}", result.mask_url);
                 DanmakuCore::instance().loadMaskData(result.mask_url);

diff --git a/wiliwili/source/view/danmaku_core.cpp b/wiliwili/source/view/danmaku_core.cpp
@@ -429,7 +429,7 @@ std::vector<DanmakuItem> DanmakuCore::getDanmakuData() {
 }
 
 void DanmakuCore::drawMask(NVGcontext *vg, float x, float y, float width, float height) {
-#if defined(BOREALIS_USE_OPENGL) || defined(BOREALIS_USE_D3D11)
+#ifdef DRAW_DANMAKU_MASK
     if (!DANMAKU_SMART_MASK || !maskData.isLoaded()) return;
     double playbackTime = MPVCore::instance().playback_time;
     /// 1. 先根据时间选择分片
@@ -533,7 +533,8 @@ void DanmakuCore::drawMask(NVGcontext *vg, float x, float y, float width, float
 }
 
 void DanmakuCore::clearMask(NVGcontext *vg, float x, float y, float width, float height) {
-#if !defined(DEBUG_MASK) && (defined(BOREALIS_USE_OPENGL) || defined(BOREALIS_USE_D3D11))
+#if !defined(DEBUG_MASK) && defined(DRAW_DANMAKU_MASK)
+    if (!DANMAKU_SMART_MASK || !maskData.isLoaded()) return;
     if (maskTex > 0) {
         nvgBeginPath(vg);
         nvgRect(vg, x, y, width, height);