比较提交

..
共修改 53 个文件,包含 1157 行新增和 184 行删除

没有与搜索条件相匹配的文件

+13
查看文件
@@ -0,0 +1,13 @@
# 大鱼调色 1.11.0(73)
曲线、HSL 与蜘蛛盘现可在画布中直接编辑。曲线包含同区直方图,三个工具支持半透明面板、多面板移动、独立图层及一次拖动一次撤销。
主检查器默认保留一级、基础、蜘蛛、HSL 四张折叠卡;其它工具通过添加模块或画布工具条打开。新增当前帧人脸肤色限定及实际保护区域预览,并加入缩放、光学中心和蒙版可调的镜头径向畸变修复。旧调色参数 ID、已有图层及预设 v7 继续兼容。
需要 macOS 14.6 或更高、Apple Silicon Mac、Final Cut Pro 或 Motion。肤色范围在本机检测;未识别到人脸时不使用上一镜头蒙版。镜头修复由本项目独立实现,尚无与参考插件逐像素一致的证明。包含空间处理的调色可保存完整预设,静态 Cube 无法保存空间选区或几何变换。
APP 实际编译源码:49d35cb49ab93f5ab6ca3411eaea80f7219be346。APP 公证 Accepted、票据及 Gatekeeper 通过,正式安装 724 项原生检查通过。
PKG 已签名、公证 Accepted、粘附票据并通过 20 项展开验包。43,128,845 字节,SHA-256:2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e。
Final Cut Pro 12.4 已加载唯一正式安装版本;用户实鼠确认画布三工具及一次撤销、人脸肤色区域、畸变网格调整三项均正常。旧版恢复 APP 已在验收后清理。
+19 -3
查看文件
@@ -1,10 +1,26 @@
# 大鱼调色
原生 FxPlug 4 调色器。当前正式签名、公证并安装 **1.10.0(72)**,固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;FCP 中从“效果 → 大鱼调色”添加。
## 1.11.0 画布图形与空间工具
新版采用纵向工具条和多个可移动浮动面板,曲线可直接拖点,分级可直接调色轮;画布外工作区提供 sRGB 显示参考示波器和风格1 LUT 预览。695项正式安装原生检查与用户实鼠的曲线拖点/一次撤销、LUT预览、示波器更新均通过。完整PKG已签名公证、粘附票据并验包。
工具条可打开曲线、HSL 和蜘蛛盘的半透明编辑面板,拖动标题可移动,点击标题折叠,同一工具再次点击关闭。主检查器初始仅显示一级、蜘蛛、基础、HSL 四张折叠卡;其它工具通过“+ 添加模块”或画布入口进入,已有有效调色自动显示。
[原资源文章](https://dayu.media/15792/)已先行更新为“1.10.0 紧急 UI 更新”,替换新封面与用户提供的深浅色原始截图,主下载同步正式包,售价50元、有效会员免费保持。Git Release正在收尾,最终状态见后续 `verification/Release.json`;不可使用其中更早版本的历史记录宣称本版已发布。详见[交互说明](research/ViewerWorkspace-20261104.md)、[宿主验证](verification/HostWorkspace1.10.0.json)、[文章验证](verification/Article1.10.0.json)与[恢复说明](RECOVERY.md)。
- 曲线:同区显示直方图;切换 RGB/红/绿/蓝,点击加点、拖动调节、删除选中点。
- HSL:选择色相、饱和度或明亮度,上下拖动对应颜色点;参数页保留精确参数与自定义色选。
- 蜘蛛盘:拖点联动同列自由点,可固定、还原选中点、全盘复位及切换网格分辨率。
- 肤色:默认仅保护人脸肤色;“显示肤色保护区域”以灰度显示实际权重。无脸时为空,关闭人脸限定可使用旧的全图颜色筛选。
- 镜头畸变修复:正负强度调整径向畸变,配合缩放与光学中心;小画布通过工具条 ↕ 翻页找到“畸变”。
图形修改支持基础层与独立 UUID 层,一次拖动归入一次撤销。主题、面板位置和开合不改变调色。系统“降低透明度”开启时使用实色面板。完整预设保存空间参数与网格;Cube 无法保存空间选区和几何变换。
正式 1.11.0(73)已签名、公证、安装并通过 724 项原生检查;FCP 12.4 中画布三工具及一次撤销、人脸肤色区域、畸变调整已由用户实鼠确认正常。PKG 已通过签名、公证与 20 项展开验包,保存在上级发行包目录。Release 发布状态见 verification/Release.json。
继续完善画布自定控件请先读[自定控件开发交接](/Volumes/备份/大鱼调色/大鱼调色/自定控件开发交接.md),其中列出当前能力、源码入口、交互约定、建议顺序和验证方法。
原生 FxPlug 4 调色器。当前正式签名、公证并安装 **1.11.0(73)**,固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;FCP 中从“效果 → 大鱼调色”添加。
1.10.0 基线采用纵向工具条和多个可移动浮动面板,曲线可直接拖点,分级可直接调色轮;画布外工作区提供 sRGB 显示参考示波器和风格1 LUT 预览。该历史版本的695项正式安装原生检查与用户实鼠的曲线拖点/一次撤销、LUT预览、示波器更新均通过。
[原资源文章](https://dayu.media/15792/)此前更新为“1.10.0 紧急 UI 更新”,本轮未修改文章或站点下载。[历史 1.10.0 Git Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.10.0-canvas-workspace-20261104)保留原有草稿,因草稿附件下载核验未完成而未发布;源码与版本标签已推送并独立恢复核验。详见[交互说明](research/ViewerWorkspace-20261104.md)、[宿主验证](verification/HostWorkspace1.10.0.json)、[文章验证](verification/Article1.10.0.json)与[恢复说明](RECOVERY.md)。
1.8.4 收敛“霓虹炫彩”配色:所有模块统一使用用户已认可的低饱和近黑表面,去掉红绿橙色块。保存预设保留原粉紫到青色渐变;模块名称按钮以统一轻渐变、细边和更亮展开态强化显示,蒙版/删除/再加一层按钮增加克制的按钮底。原主题编号、功能、直方图、CMS及预设保持。
+12 -2
查看文件
@@ -10,11 +10,11 @@
按用户要求,公证后先更新原文章 https://dayu.media/15792/:标题及正文说明“紧急 UI 更新”,新生成封面,深色/浅色两张用户原图,主下载包更新为本版;50元、有效会员免费及其它商业/视频设置保留。前台SEO逐项一致、旧图移除、新图原始哈希与正式包完整下载校验通过。素材、正文、提示词与验证分别保存在 `Publishing/1.10.0/`、`verification/Article1.10.0.json`。未修改 NAS 源码、生产接口或自动更新清单。
远端 https://dayu.media/git/dayu/dayu-color.git,main。发行目标标签 `v1.10.0-canvas-workspace-20261104`;Git Release 仍待上传与完整下载核验,不能将旧版 `Release.json` 当作本版记录。标签包含最终 Package.json 与文章记录;发布后 Release.json 保存在后续 main,不移动已有标签。71 因实窗顶栏缺陷被72替代未发布,70包保留为历史未发布候选。
远端 https://dayu.media/git/dayu/dayu-color.git,main。版本标签 `v1.10.0-canvas-workspace-20261104` 已推送并回读,完整提交 `c0e6f3be0afc310125d2d045a96655db7524f24b`。Git Release387/附件31已上传草稿;草稿下载需要浏览器登录,而CUA因当前页面URL访问限制终止会话,未绕过限制、未发布Release。当前 `verification/Release.json` 与 `CMSReleaseDraft.json` 如实记录下载核验阻塞。原文章的下载包已另行完整下载校验通过,不能用它冒充Release附件下载证明。标签包含最终Package.json与文章记录;本轮发布状态在后续main,不移动既有标签。71 因实窗顶栏缺陷被72替代未发布,70包保留为历史未发布候选。
独立远程 checkout 已核对实际编译提交、526个跟踪文件、Git fsck、8个锁定依赖归档、插件/诊断/工作区/渲染器四个翻译单元 C++20 语法,见 `verification/WorkspaceRecovery1.10.0.json`。无 LFS/子模块,未重复完整重建 CMS 依赖。Xcode27.1、FxPlug SDK4.3.5、Apple Silicon/macOS14.6+;签名/公证凭据需独立恢复,不在 Git。
正式验收后已清理任务生成的70/71旧安装恢复APP、缓存生成APP和公证ZIP,见 `verification/WorkspacePendingCleanup1.10.0.json`;源码恢复checkout暂留供最终标签核验。源码、历史包和用户QA媒体保留。恢复具体步骤沿用下文,当前版本以本节和相应验证记录为准。
正式验收后已清理任务生成的70/71旧安装恢复APP、缓存生成APP和公证ZIP,见 `verification/WorkspacePendingCleanup1.10.0.json`;独立远程版本标签已核对源码、Git完整性、文章和三张素材哈希,实际编译源码未变;恢复checkout、网站验包下载副本及任务临时脚本核验后清理。源码、历史包和用户QA媒体保留。恢复具体步骤沿用下文,当前版本以本节和相应验证记录为准。
以下为上一完整发布版 1.8.5(67)及历史交接,供恢复参考。
@@ -472,3 +472,13 @@ python3 Packaging/build_pkg.py --pkg-forge-repo /实际/PKG工坊源码目录 --
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
## 1.11.0(73)画布与空间工具交付
实际编译 `49d35cb49ab93f5ab6ca3411eaea80f7219be346` 已推送并从大鱼远端独立恢复549文件,逐字节一致,full/strict fsck和模板合同通过。无LFS和子模块。固定安装仍为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。APP公证 `348c6e9b-f5d9-4661-bc7f-f192fa770ecf` Accepted,安装版724项原生回归通过。用户实鼠确认画布三工具及一次撤销、肤色区域、畸变三项正常,正式宿主验收记录见verification/HostCanvasTools1.11.0.json。Delivery状态verified,旧版恢复APP已清理。
新增Vision属于系统框架,无下载模型或服务端人脸上传。图像和短时人脸几何在本机处理;测试真人来源及公共领域说明见tools/fixtures/README.md。新增独立反向径向畸变采样,保留原Uniform1312字节完整前缀,扩展后1344字节。完整预设保存新数据;Cube不能保存空间选区和几何变换。
重建模板:`python3 tools/build_template.py --refresh-model --overwrite`;构建交付:`python3 tools/deliver.py`(先退出FCP/Motion);新宿主项目:`python3 tools/create_canvas_host_fixture.py`,随后通过FCP的文件→导入→XML打开生成的文件,不能直接编辑fcpbundle。仅签名公证或模拟宿主回归通过不足以完成实鼠验收。
1.11.0 PKG已完成Developer ID Installer签名、Apple公证Accepted(ffbdb4fb-f573-411e-99fc-166c4a829121)、票据/Gatekeeper和20项展开验包。43,128,845字节,SHA-256 `2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e`,正式包位于 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.11.0.pkg`。未执行PKG安装脚本;APP由交付流程独立正式安装验证。Release和完整下载核验以verification/Release.json为准。
+44
查看文件
@@ -0,0 +1,44 @@
# 画布工具与修复任务
日期:2026-11-05。基线 main `5224e404f54067eca11b9b749095d87fa980c535`,远程已核验,工作区干净。唯一正式产品 `com.dayu.color`,安装 `/Library/Plug-Ins/FxPlug/大鱼调色.app`。
用户验收范围:
- 曲线、HSL、蜘蛛盘为可移动半透明画布图形;曲线同区叠加直方图,保留精确参数页。
- 主检查器初始只展示一级、基础、蜘蛛、HSL 四张折叠卡。其它工具通过添加模块或画布工具条进入,已有工程的有效调色必须保留。
- 肤色保护增加区域显示;实时识别人脸,并将颜色筛选限制在人脸皮肤范围,无脸不得保护同色背景。参考用户指定 MIT 仓库 FCP-BeautyGirl,保留来源说明。
- 参考 mFilmLook 的变形/镜头畸变修复功能,接入真实渲染、模块、预设和撤销。
布局沿用 AppKit/Metal OSC 与原参数桥。图形、命中共用几何,基础层及 UUID 层均支持,一次拖动一次撤销,时间/节点/外部冲突时停止写入。半透明在降低透明度时使用实色。
演示 `/Volumes/备份/6524bdcd3a33f6bd0128a340b9c7fadc_raw.mp4`:4096×2584,120fps,45.65秒;只读抽帧存构建缓存,不把用户视频上传到源码仓库。
交付必须完成 Release、Developer ID、Apple Accepted、票据、唯一安装及正式路径自检、宿主功能验收、PKG 与 Release 下载校验、远端独立恢复。额度重置由用户手动操作。
状态:研究与实现中,尚未交付新版。
## 实现检查点
HSL八色三轴图形、蜘蛛网格拖动/固定/复位/分辨率、半透明绘制与降低透明度替代、曲线直方图已连接原参数。蜘蛛自定义资产扩展了主队列冲突保护。主面板按显示状态隐藏未使用的附加模块,保存过的有效参数自动显示;画布工具入口可以恢复已删除类型。
FCP-BeautyGirl 参考提交 `42fecaa3b55471fea928339127d53484663d4057`,MIT 许可证见同目录 FCPBeautyGirl-MIT.txt。参考 Vision revision 3、76点、皮肤支持区与五官排除的思路;未引入美颜、瘦脸或目标二进制。
mFilmLook 3.1.4 arm64 SHA-256 `b1cee1dffd3b490afa0c22db646404b018a0aaadf70d9a6827e95cb178c74357`。REA Ghidra 12.1.4 观察到 Lens Distortion、ParamLensDistortionEnable/Strength、RenderDistortionKernel,证据 `ev_77ca21689086d3b977243f1b81b3833a89b9e48aa5cd3e38594572abad5296a2`、`ev_5c4653c5bdd4316ec067c530085235c5c37733b2490065ed6d5ea855611057a7`。本项目独立编写反向径向采样,不宣称已证明目标GPU逐像素等价。
Uniform 仅在原1312字节之后追加32字节,旧参数ID与完整前缀不变;新增独立镜头模块、肤色范围预览及默认人脸限定。当前编译/验证中,未安装。
## 第二阶段验证
原生回归已扩展至719项,新增真实 OSC 图形手势、UUID网格资产、外部拓扑冲突、畸变GPU与独立CPU采样对照、NASA公共领域真人及同色背景检查。原695项按新15工具和四卡折叠布局更新展示预期,旧点颜色/Cube参照显式排除新空间人脸选区。
AddressSanitizer 发现旧 renderLegacy 的 C++ 引用捕获向异步通知泄漏栈 self 地址;改为独立 Objective-C 通知方法后完整内存检查运行结束,无该内存错误。先前未检测到问题的旧正式版695项仍通过,原栈布局偶然掩盖缺陷。
肤色预览改为在原生皮肤阶段读取同一个色选算法、同一预HSL参考、同一用户蒙版与人脸覆盖,白色代表保护权重。初次真人测试识别人脸但MTLTexture→CIImage上下相反,已按TOP_LEFT归一化修正,正在重跑;未通过前不交付。
曲线直方图由成功渲染的分析更新发布到同时间快照,播放头不匹配时不展示旧帧。人脸只缓存完全相同的标准化像素;无脸或输入失败时为空,不延续上一镜头。新增空间处理的Cube导出会明确拒绝,完整预设继续保存。
## 候选 1.11.0(73)
724项原生回归通过;真实人脸中心归一化坐标约(0.437,0.244),双人检测2张脸。上下原点输出最大误差0;同色背景差异0,人脸保护生效。独立层、零强度用户蒙版和无脸清空均通过。新的完整724项AddressSanitizer运行未报告内存错误;唯一失败为启用插桩后的旧主队列响应阈值(约226ms),无插桩Release该项通过,未放宽阈值。
最终交付脚本显式关闭ASAN并清理专用构建后重编译,正式安装自检自动提供版本化真人fixture。FCP已通过正常退出保存现有验收库;不修改库数据库。准备正式构建和宿主验收,尚未交付新版。
+21
查看文件
@@ -0,0 +1,21 @@
MIT License
Copyright (c) 2026 Dayu
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+80 -3
查看文件
@@ -1271,6 +1271,28 @@
"step": 1,
"title": "肤色色相"
},
{
"default": 1,
"key": "skinFaceOnly",
"kind": "bool",
"max": 1,
"min": 0,
"offset": 1332,
"pid": 2333,
"step": 0.01,
"title": "仅保护人脸肤色"
},
{
"default": 0,
"key": "skinVisualize",
"kind": "bool",
"max": 1,
"min": 0,
"offset": 1336,
"pid": 2334,
"step": 0.01,
"title": "显示肤色保护区域"
},
{
"default": 1,
"key": "skinEnabled",
@@ -3630,6 +3652,61 @@
"pid": 2292,
"step": 0.01,
"title": "胶片模拟"
},
{
"default": 0,
"key": "lensStrength",
"kind": "float",
"max": 100,
"min": -100,
"offset": 1316,
"pid": 2329,
"step": 1,
"title": "畸变校正"
},
{
"default": 1,
"key": "lensScale",
"kind": "float",
"max": 2,
"min": 1,
"offset": 1320,
"pid": 2330,
"step": 0.01,
"title": "画面缩放"
},
{
"default": 0.5,
"key": "lensCenterX",
"kind": "float",
"max": 1,
"min": 0,
"offset": 1324,
"pid": 2331,
"step": 0.01,
"title": "光学中心 X"
},
{
"default": 0.5,
"key": "lensCenterY",
"kind": "float",
"max": 1,
"min": 0,
"offset": 1328,
"pid": 2332,
"step": 0.01,
"title": "光学中心 Y"
},
{
"default": 1,
"key": "lensEnabled",
"kind": "bool",
"max": 1,
"min": 0,
"offset": 1312,
"pid": 2328,
"step": 0.01,
"title": "镜头畸变修复"
}
],
"sourceSHA256": {
@@ -3641,11 +3718,11 @@
"大鱼调色/Plugin/DYManagedColor.h": "d5901d6ac11d93f3f4438dd8d48bb3a123d06d9b79ed39e8dca38db4261bc87a",
"大鱼调色/Plugin/DYManagedColor.mm": "d9d2688f26a51d1131ee63b415e0c09989616312d31eb3b636fd299f475ece08",
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
"大鱼调色/Plugin/DYModel.mm": "29fea6064d3131119933401f554cc04e48cadf07d0c62f25b8d66795201396f8",
"大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1",
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
"大鱼调色/Plugin/DYToolState.h": "0a83109d2c02626d6b9e7340b74be6e6a74f366f31f9d7622b4a88000d5ad7b9",
"大鱼调色/Plugin/DYToolState.mm": "be984c73f5c4e563e3ac8de2b911e33071773f3d823b6b2d631444d3aa2baea2",
"大鱼调色/Plugin/DYUniforms.h": "207d36b5b53ab084fa8eb3813ccbbeb5193178e3468a37e9dc692ab196ffbb6a",
"大鱼调色/Plugin/DYToolState.mm": "49ccde836056123cc4912eaf43da11af1713db19add5e833d0287586554acd09",
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
"大鱼调色/Plugin/SpiderCore/DYColorMath.h": "bdd6278e17ff4208ad94a8b0e834c817c0a3475f205dd79898e8fd88e84a19c9",
+2 -2
查看文件
@@ -1,10 +1,10 @@
{
"passed": true,
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
"nativeFloatParameters": 278,
"nativeFloatParameters": 285,
"customParameters": 3,
"publications": [
{
+7
查看文件
@@ -306,6 +306,8 @@
<parameter name="白平衡与颜色" id="2035" flags="12889161760" default="1" value="1" />
<parameter name="保护程度" id="2117" flags="12889161760" default="60" value="60" />
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
@@ -513,6 +515,11 @@
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
<parameter name="畸变校正" id="2329" flags="12889161760" default="0" value="0" />
<parameter name="画面缩放" id="2330" flags="12889161760" default="1" value="1" />
<parameter name="光学中心 X" id="2331" flags="12889161760" default="0.5" value="0.5" />
<parameter name="光学中心 Y" id="2332" flags="12889161760" default="0.5" value="0.5" />
<parameter name="镜头畸变修复" id="2328" flags="12889161760" default="1" value="1" />
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
+26 -2
查看文件
@@ -8,7 +8,7 @@ import re
def masked_kernel(source):
original = re.search(r'define <4 x half> @dy_grade\(.*?\n\}', source, re.S).group()
body = original.replace('@dy_grade(', '@dy_gradeMasked(', 1)
args = ', '.join(f'float %dyWeight{i}' for i in range(12))
args = ', '.join(f'float %dyWeight{i}' for i in range(12)) + ', float %dySkinVisualize'
body = body.replace(') local_unnamed_addr #0 {', ', '+args+') local_unnamed_addr #0 {', 1)
# Each stage mixes against its actual input. Split basic adjustment has
# two native locations; both use the same per-module coverage.
@@ -58,6 +58,26 @@ def masked_kernel(source):
' %dyIncludesFinalLast = icmp uge i32 %dyStageLast, 11',
' %dyIncludesFinal = and i1 %dyIncludesFinalFirst, %dyIncludesFinalLast',
' %v672 = select i1 %dyIncludesFinal, <3 x float> %dyClamped672, <3 x float> %v669']), 1)
def preview(code, reference, ranged=False):
regular=next(line for line in code.splitlines() if line.startswith(' %v669 = tail call'))
extra=[regular.replace('%v669 = ', '%dySkinNormal = ', 1),
' %dySkinSelection = call float @dy_skinWeight(<3 x float> %v668, <3 x float> '+reference+', %struct.DYUniforms addrspace(2)* %v12)',
' %dySkinPointer = getelementptr inbounds %struct.DYUniforms, %struct.DYUniforms addrspace(2)* %v12, i64 0, i32 65',
' %dySkinVector = load <3 x float>, <3 x float> addrspace(2)* %dySkinPointer, align 16',
' %dySkinStrength = extractelement <3 x float> %dySkinVector, i64 1',
' %dySkinRatio = fmul float %dySkinStrength, 0x3F847AE140000000',
' %dySkinSelected = fmul float %dySkinSelection, %dyWeight3',
' %dySkinAmount = fmul float %dySkinSelected, %dySkinRatio',
' %dySkinGray0 = insertelement <3 x float> undef, float %dySkinAmount, i64 0',
' %dySkinGray = shufflevector <3 x float> %dySkinGray0, <3 x float> undef, <3 x i32> zeroinitializer',
' %dySkinShow = fcmp ogt float %dySkinVisualize, 5.000000e-01']
condition='%dySkinShow'
if ranged:
extra+=[' %dySkinShowActive = and i1 %dySkinShow, %dyStageActive669'];condition='%dySkinShowActive'
extra+=[' %v669 = select i1 '+condition+', <3 x float> %dySkinGray, <3 x float> %dySkinNormal']
return code.replace(regular, '\n'.join(extra), 1)
body=preview(body,'%v411')
segment=preview(segment,'%dySkinReference',True)
skin='''
define <3 x float> @dy_skinExtra(<3 x float> %color, <3 x float> %reference, %struct.DYUniforms addrspace(2)* %uniforms) {
entry:
@@ -65,4 +85,8 @@ entry:
ret <3 x float> %result
}
'''
return source+'\n'+body+'\n'+segment+'\n'+skin
# Expose the existing color-selection arithmetic for a matching preview.
weight = re.search(r'define internal fastcc <3 x float> @_ZL19applySkinProtection.*?\n\}', source, re.S).group()
weight = weight.replace('define internal fastcc <3 x float> @_ZL19applySkinProtectionDv3_fS_RU11MTLconstantK17DYUniforms', 'define float @dy_skinWeight', 1)
weight = weight[:weight.index('v135:')] + 'v135:\n br label %v153\nv153:\n %weight = phi float [ 0.000000e+00, %v3 ], [ %v133, %v135 ], [ 0.000000e+00, %v46 ]\n ret float %weight\n}\n'
return source+'\n'+body+'\n'+segment+'\n'+skin+'\n'+weight
+47
查看文件
@@ -0,0 +1,47 @@
#!/usr/bin/env python3
"""Prepare synthetic grid and public-domain portrait projects for native host QA."""
from pathlib import Path
import base64, json, plistlib, struct, uuid, zlib
import xml.etree.ElementTree as E
root=Path(__file__).resolve().parent.parent
qa=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/canvas-1.11.0'
qa.mkdir(parents=True,exist_ok=True)
portrait=root/'tools/fixtures/astronaut.png'
assert portrait.is_file()
def chunk(name,data):
return struct.pack('>I',len(data))+name+data+struct.pack('>I',zlib.crc32(name+data)&0xffffffff)
grid=qa/'lens-grid.png';w,h=1920,1080;rows=[]
for y in range(h):
row=bytearray(b'\0')
for x in range(w):
edge=x%120<3 or y%120<3
row+=bytes((225,225,225) if edge else (int(35+x/w*110),int(40+y/h*100),75))
rows.append(row)
grid.write_bytes(b'\x89PNG\r\n\x1a\n'+chunk(b'IHDR',struct.pack('>IIBBBBB',w,h,8,2,0,0,0))+chunk(b'sRGB',b'\0')+chunk(b'IDAT',zlib.compress(b''.join(rows)))+chunk(b'IEND',b''))
model=json.loads((root/'template/sources/RegisteredParameters.json').read_text())
defaults={r['key']:r['default'] for r in model['parameters']}
spider=json.loads((root/'research/cms-correction-20261104/neutral-spider.json').read_text())
def preset(name,changes):
values=dict(defaults);values.update(primaryMasterEnabled=0,inputEnabled=0,inputProfile=0,preLUTStrength=0,lookEnabled=0);values.update(changes)
payload=dict(format='com.dayu.color.preset',version=7,colorManagement={},values=values,paths={},spider=spider,tools=base64.b64encode(plistlib.dumps(dict(schema=2,layers=[],baseMasks={}),fmt=plistlib.FMT_BINARY)).decode())
(qa/name).write_text(json.dumps(payload,ensure_ascii=False,indent=2)+'\n')
preset('肤色区域预览.json',dict(skinEnabled=1,skinStrength=100,skinFaceOnly=1,skinVisualize=1,hslEnabled=1,**{f'hsl0_{i}':40 for i in range(8)}))
preset('镜头畸变修复.json',dict(skinEnabled=0,hslEnabled=0,lensEnabled=1,lensStrength=60,lensScale=1.12))
doc=E.Element('fcpxml',version='1.12');resources=E.SubElement(doc,'resources')
E.SubElement(resources,'format',id='f1',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
for n,path,size in [('face',portrait,(512,512)),('grid',grid,(1920,1080))]:
E.SubElement(resources,'format',id='format-'+n,name='FFVideoFormatRateUndefined',width=str(size[0]),height=str(size[1]))
a=E.SubElement(resources,'asset',id=n,name=path.stem,start='0s',duration='0s',hasVideo='1',videoSources='1',format='format-'+n)
E.SubElement(a,'media-rep',kind='original-media',src=path.resolve().as_uri())
template=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
E.SubElement(resources,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri())
event=E.SubElement(E.SubElement(doc,'library'),'event',name='大鱼调色_1.11.0_73_画布与空间工具',uid=str(uuid.uuid5(uuid.NAMESPACE_URL,'dayu-color/canvas-1.11.0-73')).upper())
for name,asset in [('1.11.0_画布曲线_HSL_蜘蛛盘','face'),('1.11.0_人脸肤色保护','face'),('1.11.0_镜头畸变修复','grid')]:
project=E.SubElement(event,'project',name=name,uid=str(uuid.uuid5(uuid.NAMESPACE_URL,name)).upper())
sequence=E.SubElement(project,'sequence',format='f1',duration='6s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k')
clip=E.SubElement(E.SubElement(sequence,'spine'),'video',ref=asset,name=name,offset='0s',start='0s',duration='6s')
E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
E.indent(doc);output=qa/'大鱼调色_1.11.0_73_验收.fcpxml'
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(doc,encoding='unicode')+'\n')
print(output)
+2 -2
查看文件
@@ -35,7 +35,7 @@ def unregister(path):
reg=run('pluginkit','-m','-A','-D','-v','-i','com.dayu.color.XPC')
if any(l.rstrip().endswith('\t'+str(path)) for l in reg.splitlines()):run('pluginkit','-r',str(path))
def self_test(executable,report):
result=subprocess.run([str(executable),'--self-test'],cwd=ROOT,text=True,capture_output=True)
result=subprocess.run([str(executable),'--self-test'],cwd=ROOT,text=True,capture_output=True,env=dict(os.environ,DY_DIAGNOSTIC_FACE_FIXTURE=str(ROOT/'tools/fixtures/astronaut.png')))
report.write_text(result.stdout)
report.with_suffix('.stderr').write_text(result.stderr)
try:parsed=json.loads(result.stdout)
@@ -53,7 +53,7 @@ def main():
if IDENTITY not in ids:raise RuntimeError('有效发布证书或私钥不可用')
if any(l.endswith('/Contents/MacOS/大鱼调色') for l in run('ps','-axo','comm=').splitlines()):raise RuntimeError('请先正常退出当前大鱼调色窗口')
print('Building final Release',flush=True)
run('xcodebuild','-project','大鱼调色.xcodeproj','-scheme','Wrapper Application','-configuration','Release','-derivedDataPath',str(CACHE/'DerivedData'),'build',log=CACHE/'release-build.log')
run('xcodebuild','-project','大鱼调色.xcodeproj','-scheme','Wrapper Application','-configuration','Release','-enableAddressSanitizer','NO','-derivedDataPath',str(CACHE/'DerivedData'),'clean','build',log=CACHE/'release-build.log')
b=APP/'Contents/Resources/FCP Templates/大鱼调色.moef';b.parent.mkdir(parents=True,exist_ok=True);shutil.copy2(ROOT/'template/大鱼调色.moef',b)
for name in ['large.png','small.png']:
if (ROOT/'template'/name).exists():shutil.copy2(ROOT/'template'/name,b.parent/name)
+9
查看文件
@@ -0,0 +1,9 @@
# Person mask regression fixture
`astronaut.png` is the 512×512 NASA photograph of Eileen Collins distributed by scikit-image v0.25.2. It is used solely as a local segmentation test fixture, not as a product asset or endorsement. It is not copied into the APP.
- Source: https://raw.githubusercontent.com/scikit-image/scikit-image/v0.25.2/skimage/data/astronaut.png
- Attribution and rights: https://scikit-image.org/docs/0.25.x/api/skimage.data.html#skimage.data.astronaut (NASA Great Images database; released into the public domain, no known copyright restrictions).
- SHA-256: `88431cd9653ccd539741b555fb0a46b61558b301d4110412b5bc28b5e3ea6cb5`
The tests derive a two-person composition, a shifted image, and an occluded image in memory. They check basic foreground/background separation and request independence; they do not establish broad segmentation accuracy or equivalence to Color Finale.
二进制文件未显示。

之后

宽度:  |  高度:  |  大小: 773 KiB

+4 -2
查看文件
@@ -44,7 +44,8 @@
"id": 15843,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793804690-fd9bae1dc96ee30.png",
"sha256": "c05470ec2b50de0cfdd246b26334aaa895bd288abdb080cad2d4312c120c9a5a",
"bytes": 1722606
"bytes": 1722606,
"alt": "大鱼调色 1.10.0 紧急 UI 更新:画布工具、曲线色轮与独立工作区"
},
"bodyImages": [
{
@@ -77,5 +78,6 @@
"sha256": "ee70461c9b2d2e0ddd78cbcb3371c3b1b36b7f0e5fc69bfccc7ac0f1a3e468d8",
"downloadVerified": true
},
"rawPrivateResponses": "Local build cache only; not committed"
"rawPrivateResponses": "Local build cache only; not committed",
"frontendCoverVerified": true
}
+8 -8
查看文件
@@ -1,11 +1,11 @@
{
"status": "draft-download-required",
"releaseID": 383,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104",
"tag": "v1.8.2-blackgold-20261104",
"commit": "f4bacfbd75404a69f51127356fc861a44c0c27e9",
"assetID": 27,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.2-blackgold-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.2.pkg",
"bytes": 43006067,
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded"
"releaseID": 387,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.10.0-canvas-workspace-20261104",
"tag": "v1.10.0-canvas-workspace-20261104",
"commit": "c0e6f3be0afc310125d2d045a96655db7524f24b",
"assetID": 31,
"downloadURL": "https://dayu.media/git/attachments/cb9b5516-0953-4993-99a1-360c1d92cb6d",
"bytes": 43090565,
"sha256": "ee70461c9b2d2e0ddd78cbcb3371c3b1b36b7f0e5fc69bfccc7ac0f1a3e468d8"
}
+22
查看文件
@@ -0,0 +1,22 @@
{
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/canvas-1.11.0/大鱼调色_1.11.0_73_验收.fcpxml",
"status": "pass",
"dtd": "/Applications/Final Cut Pro.app/Contents/Frameworks/Interchange.framework/Versions/A/Resources/FCPXMLv1_12.dtd",
"errors": [],
"warnings": [],
"checks": {
"dtd": true,
"xml": true,
"local_media": {
"checked": 2,
"missing": 0
}
},
"version": "1.12",
"summary": {
"projects": 3,
"assets": 2,
"elements": 27
},
"host_validation": "not_performed_by_this_command"
}
+58
查看文件
@@ -0,0 +1,58 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.11.0.pkg",
"sha256": "2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e",
"bytes": 43128845,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
"PKG Developer ID Installer signature",
"PKG stapled ticket and Gatekeeper install assessment",
"must-close attached to root-authorized payload",
"all four FCP/Motion host identifiers",
"bundle relocation disabled",
"desktop and Bundle ID preinstall guards",
"postinstall contains actual FxPlug verification invocations",
"GUI worker, registration repair and Finder reveal present",
"successful completion and consecutive registration checks",
"exact payload contents: 大鱼调色.app",
"fixed FxPlug outer APP install path",
"outer APP has one real verification action",
"service path/identifier/registration version: com.dayu.color.XPC",
"nonempty FxPlug service manifest",
"payload APP signature, independent ticket and Gatekeeper",
"exact payload contents: 大鱼调色",
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
"complete outer APP payload present",
"welcome warns to save work and close hosts",
"conclusion gives manual APP and host restart instructions"
],
"resources": [
{
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.11.0",
"build": "73"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.eb9ab973-a3e5-42c3-862f-658f5151d090/3257180A-BAC3-4EB9-A02B-91B15B093A2E/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.11.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 18:10:52 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.11.0.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"id": "ffbdb4fb-f573-411e-99fc-166c4a829121",
"status": "Accepted",
"name": "大鱼调色-1.11.0.pkg",
"createdDate": "2026-11-04T18:10:53.762Z"
},
"appCompiledSource": "49d35cb49ab93f5ab6ca3411eaea80f7219be346",
"appBuild": "73",
"hostAcceptance": "passed-user-actual-mouse",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"installScope": "Package expanded and verified; installation scripts were not run.",
"releaseStatus": "ready-for-release"
}
@@ -0,0 +1,9 @@
{
"commit": "49d35cb49ab93f5ab6ca3411eaea80f7219be346",
"remote": "https://dayu.media/git/dayu/dayu-color.git",
"trackedFilesCompared": 549,
"mismatches": [],
"lfs": false,
"submodules": false,
"fullStrictFsck": "passed"
}
+14
查看文件
@@ -0,0 +1,14 @@
{
"checks": 724,
"memoryError": false,
"stackUseAfterReturnEnabled": true,
"failedChecks": [
{
"heartbeats": 0,
"maximumGapMS": 226.45924999960698,
"name": "external-activation-main-loop-responsive",
"pass": false
}
],
"note": "Instrumented main-loop timing exceeds the unchanged release threshold; the non-instrumented Release check passes."
}
+8 -7
查看文件
@@ -2,15 +2,16 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.10.0",
"build": "72",
"version": "1.11.0",
"build": "73",
"team": "B3W25FX5H5",
"notaryID": "c0209032-38d2-4434-8e37-7f911414c3c6",
"notaryID": "348c6e9b-f5d9-4661-bc7f-f192fa770ecf",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "80dec904bedf5f704b29d16325fa95d639f3a250",
"sourceCommit": "49d35cb49ab93f5ab6ca3411eaea80f7219be346",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"shaderSHA256": "bedde862e59d92dc2b0af19eba39ae35f77400a8553973b9180637f73dbb92e3",
"hostVerification": "verification/HostWorkspace1.10.0.json"
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"shaderSHA256": "462afbfdfc8d79aefd17d0928151f4c981d4145e2ad6bc3486a27aa73177b128",
"hostVerification": "verification/HostCanvasTools1.11.0.json",
"hostAcceptance": "User actual mouse: 三项均正常"
}
+28
查看文件
@@ -0,0 +1,28 @@
{
"version": "1.11.0",
"build": "73",
"status": "passed",
"sourceCommit": "49d35cb49ab93f5ab6ca3411eaea80f7219be346",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"nativeChecks": 724,
"nativePass": true,
"host": "Final Cut Pro 12.4",
"event": "大鱼调色_1.11.0_73_画布与空间工具",
"projectsImported": 3,
"importWarningObserved": false,
"mainPanelObserved": "primary, spider, base, hsl collapsed",
"mappedExecutableVerified": true,
"servicePID": 81386,
"strictSignature": true,
"stapledTicket": true,
"noInstrumentedRuntime": true,
"manualAcceptance": {
"canvas": "passed",
"faceSelection": "passed",
"lens": "passed",
"source": "user actual-mouse confirmation",
"userReply": "三项均正常",
"confirmedAt": "2026-11-05T02:17:59.020148+08:00"
},
"automationLimit": "Coordinate input could not establish reliable native OSC mouse actions; final three-case acceptance is the user actual-mouse confirmation, separately from the 724 native checks."
}
+1 -1
查看文件
@@ -16,7 +16,7 @@
"Existing project image renders; no reset or LUT selection performed."
],
"automationLimit": "Native OSC/remote-view input is not reliably triggered by CUA; native model/GPU tests do not replace these physical host checks.",
"packageRelease": "Host accepted; signed/notarized PKG and article update verified. Git Release still pending final attachment download verification.",
"packageRelease": "Host accepted, final signed/notarized package and published article verified. Git Release 387 / asset 31 remains draft; authenticated draft download verification blocked.",
"dataPreservation": "Existing timeline and grade retained; ColorFinale effect was not toggled or removed.",
"physicalVerification": {
"source": "User actual mouse confirmation in this chat",
+167 -29
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 695,
"checks": 724,
"gpu": "Apple M4",
"limitations": [
"Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.",
@@ -12,14 +12,14 @@
"error": "未提供错误信息",
"name": "runtime-directory",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C"
},
{
"descriptors": 278,
"descriptors": 285,
"name": "descriptor-unique-id-offset-key",
"pass": true,
"sections": 17,
"uniformBytes": 1312
"sections": 18,
"uniformBytes": 1344
},
{
"name": "finite-real-model-defaults",
@@ -113,8 +113,8 @@
"pass": true
},
{
"modules": 14,
"name": "default-primary-spider-base-expanded-all-eyes-on",
"modules": 15,
"name": "default-only-primary-spider-base-hsl-visible-and-collapsed",
"pass": true
},
{
@@ -890,7 +890,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -910,7 +910,7 @@
},
{
"heartbeats": 0,
"maximumGapMS": 76.67800001217984,
"maximumGapMS": 62.63825000496581,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -1192,12 +1192,12 @@
"pass": true
},
{
"closePixels": 5468,
"headingPixels": 7980,
"closePixels": 3066,
"headingPixels": 51420,
"name": "workspace-offscreen-topbar-heading-pages-close-render-pixels",
"pagesPixels": 21772,
"pagesPixels": 1664,
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE/workspace-topbar.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/workspace-topbar.png"
},
{
"name": "workspace-content-and-scope-pane-explicitly-clip",
@@ -1212,10 +1212,10 @@
"pass": true
},
{
"closePixels": 5468,
"headingPixels": 7020,
"closePixels": 3066,
"headingPixels": 40380,
"name": "workspace-topbar-survives-resize-and-large-dirty-redraw",
"pagesPixels": 21772,
"pagesPixels": 1664,
"pass": true
},
{
@@ -1260,7 +1260,7 @@
},
{
"name": "workspace-independent-style-fixture-inserted",
"node": "76CAED9A-B4B1-4170-8249-57431BB1F01C",
"node": "DB95746F-DB9E-46E2-BA89-96FD043BA21B",
"pass": true,
"validDocument": true
},
@@ -1269,10 +1269,10 @@
"error": "none",
"name": "workspace-independent-style1-writes-target-node-inside-undo",
"nodePaths": {
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE/node.cube"
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/node.cube"
},
"pass": true,
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE/user-new.cube",
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/user-new.cube",
"undoStartsAfter": 3,
"undoStartsBefore": 2,
"written": true
@@ -1455,7 +1455,7 @@
"pass": true
},
{
"changedComponents": 1929,
"changedComponents": 1938,
"maxAbsoluteError": 0.0009765625,
"name": "anchored-split-retains-native-pre-hsl-skin-reference",
"nonfiniteComponents": 0,
@@ -1503,16 +1503,16 @@
"pass": true
},
{
"changedComponents": 2016,
"maxAbsoluteError": 0.0009765625,
"changedComponents": 1741,
"maxAbsoluteError": 0.00048828125,
"name": "anchored-bw-suffix-defers-color-mixture-until-after-native-skin",
"nonfiniteComponents": 0,
"nonzeroComponents": 9832,
"pass": true
},
{
"changedComponents": 1974,
"maxAbsoluteError": 0.001220703125,
"changedComponents": 1714,
"maxAbsoluteError": 0.00146484375,
"name": "anchored-look-suffix-keeps-bw-mixture-before-single-spider",
"nonfiniteComponents": 0,
"nonzeroComponents": 9832,
@@ -2260,7 +2260,7 @@
"pass": true
},
{
"coveredPixels": 24076,
"coveredPixels": 24613,
"name": "native-osc-real-metal-overlay-transparent-around-controls",
"pass": true
},
@@ -3442,7 +3442,7 @@
"pass": true
},
{
"name": "viewer-vertical-rail-exposes-fourteen-tools-without-a-parameter-panel",
"name": "viewer-vertical-rail-exposes-all-tools-without-a-parameter-panel",
"pass": true
},
{
@@ -3542,11 +3542,149 @@
"pass": true
},
{
"name": "viewer-real-osc-draws-vertical-rail-curves-and-wheels-offscreen",
"name": "viewer-real-osc-draws-curves-hsl-and-spider-offscreen",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE/viewer-workspace.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/viewer-workspace.png"
},
{
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
"pass": true
},
{
"name": "canvas-hsl-independent-uuid-does-not-edit-base",
"pass": true
},
{
"name": "canvas-spider-drags-real-mesh-and-closes-one-undo",
"pass": true
},
{
"name": "canvas-spider-uuid-persists-mesh-without-touching-base",
"pass": true
},
{
"name": "canvas-spider-external-topology-change-wins",
"pass": true
},
{
"name": "canvas-histogram-is-frozen-to-matching-frame",
"pass": true
},
{
"error": "",
"name": "lens-neutral-production-render",
"pass": true
},
{
"name": "lens-neutral-is-identity-with-existing-prefix",
"pass": true
},
{
"error": "",
"name": "lens-positive-production-render",
"pass": true
},
{
"error": "",
"name": "lens-negative-production-render",
"pass": true
},
{
"name": "lens-directions-move-source-in-opposite-directions",
"pass": true
},
{
"name": "lens-keeps-finite-premultiplied-border-alpha",
"pass": true
},
{
"maximumError": 0.00019232047872341784,
"name": "lens-gpu-matches-independent-inverse-radial-oracle",
"pass": true
},
{
"name": "lens-spatial-correction-is-refused-by-cube-export",
"pass": true
},
{
"name": "face-real-portrait-fixture-loaded",
"pass": true
},
{
"error": "",
"name": "face-protected-production-render",
"pass": true
},
{
"centerX": 0.43674153089523315,
"centerY": 0.24444662034511566,
"faces": 1,
"name": "face-vision-finds-real-portrait-and-builds-support",
"pass": true
},
{
"error": "",
"name": "face-unprotected-reference-render",
"pass": true
},
{
"backgroundDifference": 0,
"faceDifference": 0.13671875,
"name": "face-protects-face-color-without-same-hue-background",
"pass": true
},
{
"error": "",
"name": "face-actual-selection-preview-render",
"pass": true
},
{
"backgroundWeight": 0,
"faceWeight": 1,
"maximum": 1,
"maxX": 216,
"maxY": 71,
"name": "face-preview-shows-actual-weight-and-excludes-background",
"pass": true
},
{
"error": "",
"name": "face-bottom-origin-production-render",
"pass": true
},
{
"maximumError": 0,
"name": "face-top-and-bottom-origins-protect-identical-visual-region",
"pass": true
},
{
"name": "face-preview-respects-authored-zero-strength-mask",
"pass": true
},
{
"name": "face-independent-layer-uses-own-preview-and-face-mask",
"pass": true
},
{
"faces": 2,
"name": "face-multiple-people-build-independent-support-regions",
"pass": true
},
{
"error": "",
"name": "face-none-protected-render",
"pass": true
},
{
"error": "",
"name": "face-none-unprotected-reference",
"pass": true
},
{
"name": "face-no-detection-clears-prior-frame-and-fails-closed",
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/49D00F24-30A8-4E5C-B83B-6569DA0D71AE",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
+16 -22
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.10.0.pkg",
"sha256": "ee70461c9b2d2e0ddd78cbcb3371c3b1b36b7f0e5fc69bfccc7ac0f1a3e468d8",
"bytes": 43090565,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.11.0.pkg",
"sha256": "2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e",
"bytes": 43128845,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
@@ -31,34 +31,28 @@
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.10.0",
"build": "72"
"version": "1.11.0",
"build": "73"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.ae106381-cd3b-41eb-aad0-4c68bc644dbf/C6873B3A-3897-4DC7-BBB3-39146B102C22/大鱼调色"
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.eb9ab973-a3e5-42c3-862f-658f5151d090/3257180A-BAC3-4EB9-A02B-91B15B093A2E/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.10.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 14:43:02 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.10.0.pkg: accepted\nsource=Notarized Developer ID",
"signature": "Package \"大鱼调色-1.11.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 18:10:52 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.11.0.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"name": "大鱼调色-1.10.0.pkg",
"id": "ffbdb4fb-f573-411e-99fc-166c4a829121",
"status": "Accepted",
"id": "9604cc73-153c-4751-ac5b-2cca76b4c219",
"createdDate": "2026-11-04T14:43:04.427Z",
"message": "Successfully received submission info"
"name": "大鱼调色-1.11.0.pkg",
"createdDate": "2026-11-04T18:10:53.762Z"
},
"appCompiledSource": "80dec904bedf5f704b29d16325fa95d639f3a250",
"appBuild": "72",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"appCompiledSource": "49d35cb49ab93f5ab6ca3411eaea80f7219be346",
"appBuild": "73",
"hostAcceptance": "passed-user-actual-mouse",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
"大鱼调色.moef": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostWorkspace1.10.0.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
"installScope": "Package expanded and verified; installation scripts were not run.",
"releaseStatus": "ready-for-release"
}
+31 -21
查看文件
@@ -1,26 +1,36 @@
{
"passResult": true,
"passResult": false,
"status": "draft-download-verification-blocked",
"published": false,
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.8.5-light-dark-20261104",
"releaseCommit": "def8c2f6386a3d34453912b9e8f96e37e192796c",
"releaseID": 386,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.5-light-dark-20261104",
"prerelease": true,
"assetID": 30,
"assetName": "大鱼调色-1.8.5.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.5-light-dark-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.5.pkg",
"bytes": 43010987,
"sha256": "b4540c2be931d9e042ed1a6f2673c001e4b6e0ec67eef0bc22f4b3977af4952b",
"existingAssetReused": true,
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
"credentialSource": "macOS Keychain: dayu-git-api",
"draftBrowserDownload": {
"path": "/Volumes/备份/大鱼调色-1.8.5.pkg",
"sha256": "b4540c2be931d9e042ed1a6f2673c001e4b6e0ec67eef0bc22f4b3977af4952b",
"bytes": 43010987,
"sourceURL": "https://dayu.media/git/attachments/5730c6a8-ec4f-4700-bd0c-e7b3bc501462",
"downloadedVia": "Existing signed-in Edge session; distinct completed download file"
}
"tag": "v1.10.0-canvas-workspace-20261104",
"releaseCommit": "c0e6f3be0afc310125d2d045a96655db7524f24b",
"releaseID": 387,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.10.0-canvas-workspace-20261104",
"assetID": 31,
"downloadURL": "https://dayu.media/git/attachments/cb9b5516-0953-4993-99a1-360c1d92cb6d",
"bytes": 43090565,
"sha256": "ee70461c9b2d2e0ddd78cbcb3371c3b1b36b7f0e5fc69bfccc7ac0f1a3e468d8",
"draft": true,
"sourceAndTagRemotelyVerified": true,
"attachmentMetadataVerified": true,
"downloadVerified": false,
"reason": "Draft attachment HTTP download requires an authenticated browser session. CUA ended the browser session because the current browser URL is not allowed; no bypass or publication performed.",
"article": {
"id": 15792,
"url": "https://dayu.media/15792/",
"verified": true
},
"previousPublishedRelease": {
"tag": "v1.8.5-light-dark-20261104",
"releaseID": 386,
"releaseCommit": "def8c2f6386a3d34453912b9e8f96e37e192796c",
"history": "The full previous report remains in tag v1.10.0-canvas-workspace-20261104:verification/Release.json and earlier Git history."
},
"finalReadbackConfirmed": true,
"assetName": "大鱼调色-1.10.0.pkg",
"repositoryID": 52,
"repositoryVisibilityPreserved": true
}
@@ -1,5 +1,5 @@
{
"status": "accepted-app-copies-cleaned-package-notarized-article-updated-release-pending",
"status": "accepted-app-copies-and-verification-download-cleaned-release-draft-pending",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"formalBuild": 72,
"rollbackCopiesRetained": [],
@@ -7,9 +7,9 @@
"cacheAppPresent": false,
"looseXPCPresent": false,
"submissionZipPresent": false,
"package1100Created": false,
"package1100Created": true,
"release1100Published": false,
"scope": "User physical host checks passed. Only the two task-created, identity-verified, unused build70/71 recovery apps were removed under the product lock. Formal build72 and historical packages retained.",
"scope": "Formal build72 and all historical packages retained. Task-created unused build70/71 recovery apps, cache app/XPC/submission ZIP, two verified independent source recovery clones at the same fixed path, website package verification download and temporary acceptance script removed. Git Release 387 remains draft because authenticated attachment download verification was blocked.",
"rollbackCopiesRemoved": [
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-f5faa3ad9588406299fbc75187b487ba.app",
@@ -21,5 +21,20 @@
"build": "71",
"removed": true
}
]
],
"finalRemovedGeneratedArtifacts": [
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/osc-recovery",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/article-1.10.0-download.pkg",
"/tmp/dayu_accept_workspace.py"
],
"retainedGeneratedArtifacts": [],
"releaseDraft": {
"id": 387,
"assetID": 31,
"published": false,
"reason": "Browser download verification blocked"
},
"retainedFinalPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.10.0.pkg",
"sourceAndHistoricalPackagesPreserved": true,
"sourceRecoveryCheckoutRemoved": true
}
+11 -2
查看文件
@@ -1,5 +1,5 @@
{
"status": "compiled-source-remotely-recovered-host-accepted",
"status": "compiled-source-and-release-tag-remotely-recovered",
"remote": "https://dayu.media/git/dayu/dayu-color.git",
"commit": "80dec904bedf5f704b29d16325fa95d639f3a250",
"trackedFiles": 526,
@@ -36,5 +36,14 @@
],
"lfs": false,
"submodules": false,
"scope": "Independent remote checkout, source/object and eight pinned archive hashes verified; fresh syntax compilation of plugin, diagnostics, workspace and renderer. Full CMS dependency rebuild not repeated. Formal build72 passed 695 native checks; user physical curve drag/undo, LUT preview and live scope refresh checks passed."
"scope": "Independent remote checkout, source/object and eight pinned archive hashes verified; fresh syntax compilation of plugin, diagnostics, workspace and renderer. Full CMS dependency rebuild not repeated. Formal build72 passed 695 native checks; user physical curve drag/undo, LUT preview and live scope refresh checks passed.",
"tag": "v1.10.0-canvas-workspace-20261104",
"tagCommit": "c0e6f3be0afc310125d2d045a96655db7524f24b",
"tagTrackedFiles": 541,
"tagWorkingTreeClean": true,
"tagFsck": true,
"compiledSourcesIdentical": true,
"articleAndMediaHashesVerified": true,
"releaseState": "Release 387 / asset 31 uploaded as draft; authenticated draft download blocked by browser URL restrictions, not published.",
"tagRecoveryScope": "Fresh independent remote clone and tag checkout; clean tracked tree, fsck, exact Package/Article records and three publishing assets verified. All compiled-source code/dependencies unchanged from the separately syntax-checked source commit. No full dependency rebuild repeated."
}
+8
查看文件
@@ -387,6 +387,8 @@
"-framework",
MetalPerformanceShaders,
"-framework",
Vision,
"-framework",
QuartzCore,
"-lcompression",
"-lz",
@@ -421,6 +423,8 @@
"-framework",
MetalPerformanceShaders,
"-framework",
Vision,
"-framework",
QuartzCore,
"-lcompression",
"-lz",
@@ -449,6 +453,8 @@
"-framework",
MetalPerformanceShaders,
"-framework",
Vision,
"-framework",
QuartzCore,
"-lcompression",
"-lz",
@@ -476,6 +482,8 @@
"-framework",
MetalPerformanceShaders,
"-framework",
Vision,
"-framework",
QuartzCore,
"-lcompression",
"-lz",
@@ -0,0 +1,61 @@
// Exercise actual OSC hit geometry, host writes and production Metal output.
{
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
id<DYViewerParameterProbe>bridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host];
id<DYViewerControlsProbe>panel=(id)[NSClassFromString(@"DYViewerParameterPanel")new];panel.bridge=bridge;
auto drain=[](){double until=NSProcessInfo.processInfo.systemUptime+.06;while(NSProcessInfo.processInfo.systemUptime<until)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};
auto publish=[&](){DYUniforms u;DYReadUniforms(host,host->_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[bridge publishAssets:DYReadAssets(host,host->_time)histogram:nil atTime:host->_time];[panel prepareWithSize:NSMakeSize(1280,720)scale:1 atTime:host->_time];};
auto area=[&](NSString *kind)->NSDictionary*{for(NSDictionary*a in [(id)panel valueForKey:@"areas"])if([a[@"kind"]isEqual:kind])return [[a copy]autorelease];return nil;};
auto drag=[&](NSPoint a,NSPoint b){[panel event:NSEventTypeLeftMouseDown point:a atTime:host->_time];[panel event:NSEventTypeLeftMouseDragged point:b atTime:host->_time];drain();[panel event:NSEventTypeLeftMouseUp point:b atTime:host->_time];drain();publish();};
[(id)panel setValue:@"hsl" forKey:@"toolType"];publish();NSRect plot=[area(@"hslPlot")[@"rect"]rectValue];int undo=base->_undoStarts;
NSPoint a=NSMakePoint(NSMinX(plot)+plot.size.width*2.5/8,NSMidY(plot)),b=NSMakePoint(a.x,NSMinY(plot)-40);drag(a,b);
DYUniforms edited;DYReadUniforms(host,kCMTimeZero,&edited);run.record(@"canvas-hsl-plot-captures-outside-and-commits-one-undo",edited.hslHueA[2]==100&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);NSString *layerID=DYInsertTool(doc,@"hsl",@"base:hsl")[@"id"];DYWriteTools(host,doc,kCMTimeZero);publish();[(id)panel setValue:layerID forKey:@"nodeID"];publish();plot=[area(@"hslPlot")[@"rect"]rectValue];a=NSMakePoint(NSMinX(plot)+plot.size.width*2.5/8,NSMidY(plot));b=NSMakePoint(a.x,NSMidY(plot)-plot.size.height*.25);drag(a,b);DYReadUniforms(host,kCMTimeZero,&edited);
run.record(@"canvas-hsl-independent-uuid-does-not-edit-base",edited.hslHueA[2]==100&&fabs([DYToolWithID(DYReadTools(host,kCMTimeZero).document,layerID)[@"values"][@"hsl0_2"]doubleValue]-50)<1e-5);
[(id)panel setValue:@"spider" forKey:@"toolType"];publish();plot=[area(@"spiderPlot")[@"rect"]rectValue];auto mesh=dy::neutralMesh();int selected=dy::meshIndex(mesh,0,2);a=NSMakePoint(plot.origin.x+mesh.x[selected]*plot.size.width,plot.origin.y+mesh.y[selected]*plot.size.height);b=NSMakePoint(a.x+9,a.y-6);undo=base->_undoStarts;drag(a,b);
NSData *saved=DYReadAssets(host,kCMTimeZero).spiderMesh;auto changed=DYSpiderMesh(saved);run.record(@"canvas-spider-drags-real-mesh-and-closes-one-undo",saved.length&&fabs(changed.x[selected]-mesh.x[selected])>.001&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);NSString *spiderID=DYInsertTool(doc,@"spider",@"base:spider")[@"id"];DYWriteTools(host,doc,kCMTimeZero);publish();[(id)panel setValue:spiderID forKey:@"nodeID"];publish();plot=[area(@"spiderPlot")[@"rect"]rectValue];a=NSMakePoint(plot.origin.x+mesh.x[selected]*plot.size.width,plot.origin.y+mesh.y[selected]*plot.size.height);b=NSMakePoint(a.x-8,a.y+5);drag(a,b);
run.record(@"canvas-spider-uuid-persists-mesh-without-touching-base",[saved isEqual:DYReadAssets(host,kCMTimeZero).spiderMesh]&&[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]length]>0);
NSData *current=DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"];[bridge beginSpider:current node:spiderID enabled:1 atTime:kCMTimeZero];drain();doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);auto external=dy::neutralMesh(12,12);NSData *externalData=[NSData dataWithBytes:&external length:sizeof(external)];((NSMutableDictionary*)DYToolWithID(doc,spiderID))[@"spider"]=externalData;DYWriteTools(host,doc,kCMTimeZero);[bridge changeSpider:current];[bridge endGesture];drain();
run.record(@"canvas-spider-external-topology-change-wins",[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]isEqual:externalData]);
DYHistogram hist{};hist.samples=1;hist.bins[1][100]=1;NSData *histData=[NSData dataWithBytes:&hist length:sizeof(hist)];[bridge publishHistogram:histData atTime:kCMTimeZero];run.record(@"canvas-histogram-is-frozen-to-matching-frame",[[bridge snapshotAtTime:kCMTimeZero][@"histogram"]isEqual:histData]&&![bridge snapshotAtTime:CMTimeMake(1,24)]);
[panel finishCapture];panel.bridge=nil;[bridge invalidate];drain();[(id)panel release];[(id)bridge release];
}
{
const NSUInteger w=64,h=48;DYDiagnosticTile *src=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease],*dst=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels grid(w*h*4);
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){NSUInteger i=(y*w+x)*4;grid[i]=x/double(w-1)*.5;grid[i+1]=y/double(h-1)*.5;grid[i+2]=.1;grid[i+3]=1;}
[[src metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:grid.data()bytesPerRow:w*8];DYRenderer *lens=[[[DYRenderer alloc]init]autorelease];DYUniforms u=DYToolUniforms(@{@"type":@"lens"});
Pixels identity=render(run,lens,src,dst,gpu,u,@{},@"lens-neutral-production-render");run.record(@"lens-neutral-is-identity-with-existing-prefix",difference(identity,grid).maximum<.002&&offsetof(DYUniforms,lensSectionEnabled)==1312);
u.lensStrength=80;Pixels positive=render(run,lens,src,dst,gpu,u,@{},@"lens-positive-production-render");u.lensStrength=-80;Pixels negative=render(run,lens,src,dst,gpu,u,@{},@"lens-negative-production-render");NSUInteger sample=(h/2*w+w*3/4)*4;
run.record(@"lens-directions-move-source-in-opposite-directions",positive[sample]>identity[sample]&&negative[sample]<identity[sample]&&difference(positive,negative).maximum>.01);
BOOL finite=YES,alpha=YES;for(NSUInteger i=0;i<w*h;i++){for(int c=0;c<4;c++)finite&=std::isfinite((float)positive[i*4+c])&&std::isfinite((float)negative[i*4+c]);alpha&=positive[i*4+3]>=0&&positive[i*4+3]<=1;}
run.record(@"lens-keeps-finite-premultiplied-border-alpha",finite&&alpha&&positive[3]<1);
double worst=0;for(NSUInteger y=4;y<h-4;y+=5)for(NSUInteger x=4;x<w-4;x+=7){double aspect=w/double(h),qx=(x+.5)/w-.5,qy=(y+.5)/h-.5,r2=(qx*qx*aspect*aspect+qy*qy)/(.25*(aspect*aspect+1)),sx=.5+qx*(1-.2*r2),sy=.5+qy*(1-.2*r2);double expectedX=(sx*w-.5)/(w-1)*.5,expectedY=(sy*h-.5)/(h-1)*.5;worst=MAX(worst,fabs((float)negative[(y*w+x)*4]-expectedX));worst=MAX(worst,fabs((float)negative[(y*w+x)*4+1]-expectedY));}
run.record(@"lens-gpu-matches-independent-inverse-radial-oracle",worst<.003,@{@"maximumError":@(worst)});
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-lens.cube"]];NSError *failure=nil;run.record(@"lens-spatial-correction-is-refused-by-cube-export",![lens exportLUT:cube uniforms:u paths:@{}spider:nil tools:[[[DYToolDocument alloc]init]autorelease].document error:&failure]&&failure);
}
NSString *faceFixture=NSProcessInfo.processInfo.environment[@"DY_DIAGNOSTIC_FACE_FIXTURE"];
if(faceFixture.length){
NSBitmapImageRep *bitmap=[NSBitmapImageRep imageRepWithContentsOfFile:faceFixture];run.need(@"face-real-portrait-fixture-loaded",bitmap.pixelsWide==512&&bitmap.pixelsHigh==512);
const NSUInteger w=512,h=512;DYDiagnosticTile *src=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease],*dst=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels portrait(w*h*4);
auto linear=[](double c){return c<=.04045?c/12.92:pow((c+.055)/1.055,2.4);};
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){NSColor *c=[[bitmap colorAtX:x y:y]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];NSUInteger i=(y*w+x)*4;portrait[i]=linear(c.redComponent);portrait[i+1]=linear(c.greenComponent);portrait[i+2]=linear(c.blueComponent);portrait[i+3]=1;}
// Same hue as a cheek, deliberately outside the face, must remain unprotected.
for(NSUInteger y=400;y<480;y++)for(NSUInteger x=400;x<480;x++)for(int c=0;c<3;c++)portrait[(y*w+x)*4+c]=portrait[(115*w+220)*4+c];
auto upload=[&](const Pixels& pixels){[[src metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:pixels.data()bytesPerRow:w*8];};upload(portrait);
DYRenderer *face=[[[DYRenderer alloc]init]autorelease];DYUniforms u=DYToolUniforms(@{@"type":@"hsl"});u.hslHueA=(DYFloat4){40,40,40,40};u.hslHueB=(DYFloat4){40,40,40,40};u.skinProtection=(DYFloat3){1,100,28};u.skinFaceOnly=1;
Pixels protectedFrame=render(run,face,src,dst,gpu,u,@{},@"face-protected-production-render");NSData *entries=[face valueForKey:@"faceEntries"];NSInteger faces=0;const DYToolMaskEntry *values=(const DYToolMaskEntry*)entries.bytes;for(NSUInteger i=0;i<entries.length/sizeof(*values);i++)faces+=values[i].section==-100;
double faceX=0,faceY=0;for(NSUInteger i=0;i<entries.length/sizeof(*values);i++)if(values[i].section==-100){faceX=values[i].mask.parameters.centerX;faceY=values[i].mask.parameters.centerY;break;}run.record(@"face-vision-finds-real-portrait-and-builds-support",faces>=1,@{@"faces":@(faces),@"centerX":@(faceX),@"centerY":@(faceY)});u.skinProtection.x=0;Pixels unprotected=render(run,face,src,dst,gpu,u,@{},@"face-unprotected-reference-render");double inside=0,outside=0;
for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)for(int c=0;c<3;c++)inside=MAX(inside,fabs((float)protectedFrame[(y*w+x)*4+c]-(float)unprotected[(y*w+x)*4+c]));for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)for(int c=0;c<3;c++)outside=MAX(outside,fabs((float)protectedFrame[(y*w+x)*4+c]-(float)unprotected[(y*w+x)*4+c]));
run.record(@"face-protects-face-color-without-same-hue-background",inside>.005&&outside<.002,@{@"faceDifference":@(inside),@"backgroundDifference":@(outside)});
u.skinProtection.x=1;u.skinVisualize=1;Pixels selection=render(run,face,src,dst,gpu,u,@{},@"face-actual-selection-preview-render");double white=0,black=0;for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)white=MAX(white,(float)selection[(y*w+x)*4]);for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)black=MAX(black,(float)selection[(y*w+x)*4]);
double maximum=0;NSUInteger maxX=0,maxY=0;for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++)if(selection[(y*w+x)*4]>maximum){maximum=selection[(y*w+x)*4];maxX=x;maxY=y;}
run.record(@"face-preview-shows-actual-weight-and-excludes-background",white>.01&&black<.001,@{@"faceWeight":@(white),@"backgroundWeight":@(black),@"maximum":@(maximum),@"maxX":@(maxX),@"maxY":@(maxY)});
// Both FxPlug row conventions must resolve the same visual face.
Pixels flipped(portrait.size());for(NSUInteger y=0;y<h;y++)memcpy(flipped.data()+y*w*4,portrait.data()+(h-1-y)*w*4,w*8);upload(flipped);[src setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];[dst setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];u.skinVisualize=0;Pixels bottom=render(run,face,src,dst,gpu,u,@{},@"face-bottom-origin-production-render");double flipError=0;for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w*4;x++)flipError=MAX(flipError,fabs((float)bottom[(h-1-y)*w*4+x]-(float)protectedFrame[y*w*4+x]));run.record(@"face-top-and-bottom-origins-protect-identical-visual-region",flipError<.003,@{@"maximumError":@(flipError)});[src setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];[dst setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];upload(portrait);
NSMutableDictionary *masked=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *zero=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters zeroP=DYMaskAtTime(zero,kCMTimeZero);zeroP.strength=0;zero[@"parameters"]=[NSData dataWithBytes:&zeroP length:sizeof(zeroP)];masked[@"baseMasks"][@"skin"]=[NSMutableArray arrayWithObject:zero];u.skinVisualize=1;NSError *maskError=nil;BOOL maskOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:masked error:&maskError];Pixels empty=read(dst,gpu);double emptyMax=0;for(NSUInteger i=0;i<w*h;i++)emptyMax=MAX(emptyMax,(float)empty[i*4]);run.record(@"face-preview-respects-authored-zero-strength-mask",maskOK&&emptyMax<.001);
u.skinVisualize=0;u.skinProtection.x=0;NSMutableDictionary *layers=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *skin=(id)DYInsertTool(layers,@"skin",@"base:skin");skin[@"values"][@"skinStrength"]=@100;skin[@"values"][@"skinVisualize"]=@1;BOOL layerOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:layers error:&maskError];Pixels layerMask=read(dst,gpu);double layerFace=0,layerBackground=0;for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)layerFace=MAX(layerFace,(float)layerMask[(y*w+x)*4]);for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)layerBackground=MAX(layerBackground,(float)layerMask[(y*w+x)*4]);run.record(@"face-independent-layer-uses-own-preview-and-face-mask",layerOK&&layerFace>.01&&layerBackground<.001);
DYDiagnosticTile *twoSource=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:1024 height:512]autorelease],*twoDest=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:1024 height:512]autorelease];Pixels two(1024*512*4);for(NSUInteger y=0;y<512;y++)for(NSUInteger x=0;x<1024;x++)memcpy(two.data()+(y*1024+x)*4,portrait.data()+(y*512+x%512)*4,8);[[twoSource metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,1024,512)mipmapLevel:0 withBytes:two.data()bytesPerRow:1024*8];u.skinProtection.x=1;BOOL twoOK=[face renderSource:twoSource destination:twoDest uniforms:u paths:@{}error:&maskError];NSData *twoEntries=[face valueForKey:@"faceEntries"];const DYToolMaskEntry *twoMasks=(const DYToolMaskEntry*)twoEntries.bytes;NSInteger faceCount=0;for(NSUInteger i=0;i<twoEntries.length/sizeof(*twoMasks);i++)faceCount+=twoMasks[i].section==-100;run.record(@"face-multiple-people-build-independent-support-regions",twoOK&&faceCount==2,@{@"faces":@(faceCount)});
Pixels noFace(w*h*4);for(NSUInteger i=0;i<w*h;i++){noFace[i*4]=.35;noFace[i*4+1]=.18;noFace[i*4+2]=.1;noFace[i*4+3]=1;}upload(noFace);u.skinVisualize=0;Pixels noFaceProtected=render(run,face,src,dst,gpu,u,@{},@"face-none-protected-render");u.skinProtection.x=0;Pixels noFacePlain=render(run,face,src,dst,gpu,u,@{},@"face-none-unprotected-reference");run.record(@"face-no-detection-clears-prior-frame-and-fails-closed",difference(noFaceProtected,noFacePlain).maximum<.002);
}
+7 -3
查看文件
@@ -12,6 +12,7 @@
#import "DYInspector.h"
#import "DYTheme.h"
#include "DYSpiderState.h"
#include "DYToolGPU.h"
#include <string>
#import <CoreVideo/CoreVideo.h>
#import <IOSurface/IOSurface.h>
@@ -141,6 +142,7 @@ struct Run {
bool passed=true;
void record(NSString *name,bool ok,NSDictionary *details=nil) {
NSMutableDictionary *row=[NSMutableDictionary dictionaryWithDictionary:details?:@{}];
if(getenv("DAYU_DIAGNOSTICS_PROGRESS"))fprintf(stderr,"%s %s\n",ok?"PASS":"FAIL",name.UTF8String);
row[@"name"]=name;row[@"pass"]=@(ok);[rows addObject:row];if(!ok)passed=false;
}
void need(NSString *name,bool ok,NSDictionary *details=nil) {
@@ -249,8 +251,8 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
DYDiagnosticManager *uiHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(uiHost,nil);
DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:uiHost]autorelease];[inspector refresh];
NSArray *cards=[inspector valueForKey:@"cards"];BOOL initialUI=YES;
for(NSDictionary *card in cards)initialUI&=([card[@"collapsed"]boolValue]!=[@[@"primary",@"spider",@"base"]containsObject:card[@"section"][@"key"]])&&[(NSButton*)card[@"enabled"]state]==NSControlStateValueOn;
run.record(@"default-primary-spider-base-expanded-all-eyes-on",initialUI,@{@"modules":@(cards.count)});
for(NSDictionary *card in cards){BOOL expected=[@[@"primary",@"spider",@"base",@"hsl"]containsObject:card[@"section"][@"key"]];initialUI&=[card[@"collapsed"]boolValue]&&[card[@"removed"]boolValue]!=expected;}
run.record(@"default-only-primary-spider-base-hsl-visible-and-collapsed",initialUI,@{@"modules":@(cards.count)});
DYUniforms uiBefore,uiAfter;DYReadUniforms(uiHost,kCMTimeZero,&uiBefore);BOOL foldingIndependent=YES;
for(NSDictionary *card in cards){NSButton *header=card[@"header"];BOOL was=[card[@"collapsed"]boolValue];[header performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);foldingIndependent&=[card[@"collapsed"]boolValue]!=was&&memcmp(&uiBefore,&uiAfter,sizeof(uiBefore))==0;[header performClick:nil];[inspector refresh];}
run.record(@"all-disclosure-actions-preserve-every-render-parameter",foldingIndependent);
@@ -272,7 +274,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
NSWindow *interactionWindow=[[[NSWindow alloc]initWithContentRect:NSMakeRect(0,0,400,780) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]autorelease];interactionWindow.contentView=inspector;[inspector layoutSubtreeIfNeeded];
NSArray *graphics=[inspector valueForKey:@"graphics"];NSView *wheel=nil;for(NSView *graphic in graphics)if([NSStringFromClass(graphic.class)isEqual:@"DYPrimaryBalanceWheel"])wheel=graphic;
run.need(@"primary-balance-wheel-restored-and-palette-loaded",wheel&&[wheel valueForKey:@"wheel"]!=nil);
BOOL merged=cards.count==14&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)merged&=![@[@"input",@"output"]containsObject:card[@"section"][@"key"]];
BOOL merged=cards.count==DYToolTypes().count&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)merged&=![@[@"input",@"output"]containsObject:card[@"section"][@"key"]];
NSDictionary *controls=[inspector valueForKey:@"controls"];for(NSDictionary *record in controls.allValues)merged&=![[record[@"descriptor"]objectForKey:@"key"]hasPrefix:@"cmbypass"];
run.record(@"single-primary-card-no-bypass-checkboxes",merged);
auto mouseFor=[&](NSView *view,NSEventType type,NSPoint point,NSEventModifierFlags flags=0,NSInteger clicks=1){return [NSEvent mouseEventWithType:type location:[view convertPoint:point toView:nil] modifierFlags:flags timestamp:0 windowNumber:interactionWindow.windowNumber context:nil eventNumber:0 clickCount:clicks pressure:type==NSEventTypeLeftMouseUp?0:1];};
@@ -305,6 +307,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
[disc resetMesh];NSData *beforeCancel=[[disc.meshData copy]autorelease];NSPoint anchor=[disc point:2];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,anchor)];[disc mouseDragged:mouseFor(disc,NSEventTypeLeftMouseDragged,NSMakePoint(anchor.x+10,anchor.y+5))];[disc keyDown:[NSEvent keyEventWithType:NSEventTypeKeyDown location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:interactionWindow.windowNumber context:nil characters:@"\x1b" charactersIgnoringModifiers:@"\x1b" isARepeat:NO keyCode:53]];run.record(@"spider-escape-restores-coordinates-and-pins",[beforeCancel isEqual:disc.meshData]);
run.record(@"native-interaction-window-never-visible",!interactionWindow.visible);[inspector resetAll:nil];[inspector refresh];
id<MTLDevice> gpu=MTLCreateSystemDefaultDevice();run.need(@"metal-device",gpu!=nil);gpuName=gpu.name;
defaults.skinFaceOnly=0; // legacy point-color and Cube reference suite
const NSUInteger width=64,height=48;DYDiagnosticTile *source=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease],*destination=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease];
run.need(@"real-iosurface-image-tiles",source&&destination&&source.ioSurface&&destination.ioSurface);
Pixels input(width*height*4);for(NSUInteger y=0;y<height;y++)for(NSUInteger x=0;x<width;x++){size_t p=(y*width+x)*4;float alpha=float((x+y)%5)/4.f;input[p]=(__fp16)((.08f+.75f*float(x)/(width-1))*alpha);input[p+1]=(__fp16)((.05f+.8f*float(y)/(height-1))*alpha);input[p+2]=(__fp16)((.1f+.65f*float((x*7+y*3)%64)/63.f)*alpha);input[p+3]=(__fp16)alpha;}
@@ -511,6 +514,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
#include "DYCompactUIDiagnostics.inc.h"
#include "DYViewerParameterDiagnostics.inc.h"
#include "DYViewerControlsDiagnostics.inc.h"
#include "DYCanvasToolsDiagnostics.inc.h"
[gpu release];
} @catch(NSException *exception) {
run.record(@"diagnostic-exception",false,@{@"exception":exception.name?:@"unknown",@"message":exception.reason?:@"unknown"});
+43
查看文件
@@ -0,0 +1,43 @@
// Authored adaptation of Vision face support in FCP-BeautyGirl (MIT).
// Geometry is rebuilt from this input frame; no previous-shot mask is reused.
- (void)prepareFaceSupport:(FxImageTile*)source {
[_faceEntries release];_faceEntries=nil;std::vector<DYToolMaskEntry> entries;
FxRect image=source.imagePixelBounds,tile=source.tilePixelBounds;
if(image.left!=tile.left||image.right!=tile.right||image.top!=tile.top||image.bottom!=tile.bottom){[_faceEntries release];_faceEntries=nil;[_faceInput release];_faceInput=nil;return;}
NSMutableDictionary *device=[self device:source.deviceRegistryID error:nil];id<MTLTexture>texture=[source metalTextureForDevice:device[@"device"]];if(!texture)return;
if(!_faceContext)_faceContext=[[CIContext contextWithMTLDevice:device[@"device"] options:@{kCIContextCacheIntermediates:@NO}]retain];
CGColorSpaceRef linear=CGColorSpaceCreateWithName(kCGColorSpaceLinearSRGB);
CIImage *input=[CIImage imageWithMTLTexture:texture options:@{kCIImageColorSpace:(id)linear}];CGColorSpaceRelease(linear);if(!input)return;
// CIImage's MTLTexture coordinates are bottom-up; normalize FxPlug top-first rows.
if(source.imageOrigin==kFxImageOrigin_TOP_LEFT)input=[input imageByApplyingTransform:CGAffineTransformMake(1,0,0,-1,0,input.extent.size.height)];
CGFloat scale=MIN(1.,960./MAX(input.extent.size.width,input.extent.size.height));input=[input imageByApplyingTransform:CGAffineTransformMakeScale(scale,scale)];
CGColorSpaceRef srgb=CGColorSpaceCreateWithName(kCGColorSpaceSRGB);CGImageRef cg=[_faceContext createCGImage:input fromRect:input.extent format:kCIFormatRGBA8 colorSpace:srgb];CGColorSpaceRelease(srgb);if(!cg)return;
CFDataRef raster=CGDataProviderCopyData(CGImageGetDataProvider(cg));BOOL same=raster&&[_faceInput isEqual:(NSData*)raster];if(same){_faceEntries=[_faceCachedEntries retain];CFRelease(raster);CGImageRelease(cg);return;}[_faceInput release];_faceInput=raster?[(NSData*)raster copy]:nil;if(raster)CFRelease(raster);[_faceEntries release];_faceEntries=nil;
VNDetectFaceLandmarksRequest *request=[VNDetectFaceLandmarksRequest new];request.revision=VNDetectFaceLandmarksRequestRevision3;request.constellation=VNRequestFaceLandmarksConstellation76Points;
VNImageRequestHandler *handler=[[VNImageRequestHandler alloc]initWithCGImage:cg orientation:kCGImagePropertyOrientationUp options:@{}];CGImageRelease(cg);
if([handler performRequests:@[request] error:nil])for(VNFaceObservation *face in request.results){
if(entries.size()>64||face.confidence<.5||!face.landmarks.faceContour.pointCount)continue;CGRect box=face.boundingBox;if(box.size.width<.015||box.size.height<.015)continue;
DYToolMaskEntry support{};support.section=-100;support.mask.parameters=dyDefaultMaskParameters();auto &p=support.mask.parameters;p.kind=DYMaskBezier;p.centerX=CGRectGetMidX(box);p.centerY=1-CGRectGetMidY(box);p.width=box.size.width;p.height=box.size.height;p.feather=.1;
auto &path=support.mask.path;VNFaceLandmarkRegion2D *contour=face.landmarks.faceContour;
for(NSUInteger i=0;i<contour.pointCount;i++){CGPoint q=contour.normalizedPoints[i];path.x[path.count]=q.x-.5;path.y[path.count]=.5-q.y;path.count++;}
// Close the jaw along a soft forehead cap, instead of selecting the whole box.
BOOL forward=path.x[path.count-1]>path.x[0];for(int i=0;i<=12;i++){float t=i/12.f,x=forward?1-t:t;path.x[path.count]=x-.5;path.y[path.count]=-.28-.28*sinf(t*M_PI);path.count++;}entries.push_back(support);
for(VNFaceLandmarkRegion2D *region in @[face.landmarks.leftEye?:[NSNull null],face.landmarks.rightEye?:[NSNull null],face.landmarks.outerLips?:[NSNull null],face.landmarks.leftEyebrow?:[NSNull null],face.landmarks.rightEyebrow?:[NSNull null]]){
if(![region isKindOfClass:VNFaceLandmarkRegion2D.class]||!region.pointCount)continue;CGFloat loX=1,loY=1,hiX=0,hiY=0;for(NSUInteger i=0;i<region.pointCount;i++){CGPoint q=region.normalizedPoints[i];loX=MIN(loX,q.x);hiX=MAX(hiX,q.x);loY=MIN(loY,q.y);hiY=MAX(hiY,q.y);}
DYToolMaskEntry hole{};hole.section=-101;hole.mask.parameters=dyDefaultMaskParameters();auto &h=hole.mask.parameters;h.kind=DYMaskEllipse;h.centerX=box.origin.x+(loX+hiX)*.5*box.size.width;h.centerY=1-(box.origin.y+(loY+hiY)*.5*box.size.height);h.width=(hiX-loX)*box.size.width*1.2;h.height=MAX(.035,hiY-loY)*box.size.height*1.6;h.feather=.35;entries.push_back(hole);
}
}
[handler release];[request release];_faceEntries=[[NSData alloc]initWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry)];[_faceCachedEntries release];_faceCachedEntries=[_faceEntries copy];
}
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
DYUniforms effective=u;bypassNeutralTools(&effective);bypassIdleSkin(&effective);BOOL face=effective.skinProtection.x>.5&&(u.skinFaceOnly>.5||u.skinVisualize>.5);for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);face|=[node[@"type"]isEqual:@"skin"]&&layer.skinProtection.x>.5&&layer.skinFaceOnly>.5;}
if(face&&!_exporting)[self prepareFaceSupport:src];else{[_faceEntries release];_faceEntries=nil;}
BOOL ok=[self renderToolsSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
return ok;
}}
- (BOOL)renderLens:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)u masks:(NSArray*)masks entry:(NSDictionary*)entry error:(NSError**)error {
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)u.lensCenterY=1-u.lensCenterY;
id<MTLDevice>d=entry[@"device"];id<MTLTexture>before=[source metalTextureForDevice:d],output=[destination metalTextureForDevice:d];
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:entry[@"dyLensRepair"]];[ce setTexture:before atIndex:0];[ce setTexture:output atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];float aspect=before.width*source.pixelAspect/MAX(1.,(double)before.height);[ce setBytes:&aspect length:sizeof(aspect) atIndex:1];[ce dispatchThreads:MTLSizeMake(output.width,output.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
if(!masks.count)return YES;MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:output.pixelFormat width:output.width height:output.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>blend=[d newTextureWithDescriptor:desc];if(!blend)return fail(error,@"无法分配修复蒙版");DYToolMaskHeader h{};h.section=(int)[DYToolTypes()indexOfObject:@"lens"];id<MTLBuffer>buffer=[self maskBuffer:@{@"lens":masks}tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];[self encodeBlend:before after:output output:blend masks:buffer header:h entry:entry commands:cb];[cb commit];[cb waitUntilCompleted];DYExportTile *tile=[[DYExportTile alloc]initWithTexture:blend registry:d.registryID];[tile setBounds:destination.tilePixelBounds origin:destination.imageOrigin];[tile setPixelAspect:destination.pixelAspect];BOOL ok=cb.status==MTLCommandBufferStatusCompleted&&[self copyTile:tile to:destination entry:entry error:error];[tile release];[blend release];return ok;
}
+1 -1
查看文件
@@ -4,7 +4,7 @@
auto filmRender=[&](DYUniforms value,NSDictionary *tools,NSString *name){NSError *failure=nil;BOOL ok=[renderer renderSource:source destination:destination uniforms:value paths:@{} spider:nil tools:tools?:empty.document error:&failure];run.need(name,ok,@{@"error":reason(failure)});return read(destination,gpu);};
uploadFilm(input);DYUniforms neutral=DYToolUniforms(@{@"type":@"mixer"});neutral.mixerSectionEnabled=1;
Pixels before=filmRender(neutral,nil,@"film-neutral-production-render");
run.record(@"new-tools-default-to-neutral",!DYChannelMixerActive(neutral)&&!DYFilmActive(defaults.film)&&DYToolTypes().count==14&&DYToolIsNeutral(DYNewTool(@"film"))&&DYToolIsNeutral(DYNewTool(@"mixer")));
run.record(@"new-tools-default-to-neutral",!DYChannelMixerActive(neutral)&&!DYFilmActive(defaults.film)&&DYToolTypes().count==15&&DYToolIsNeutral(DYNewTool(@"lens"))&&DYToolIsNeutral(DYNewTool(@"film"))&&DYToolIsNeutral(DYNewTool(@"mixer")));
BOOL alpha=YES;for(size_t i=0;i<before.size()/4;i++)alpha&=before[i*4+3]==input[i*4+3];run.record(@"new-neutral-tools-preserve-existing-alpha",alpha);
DYUniforms matrix=neutral;matrix.mixerRed=(DYFloat4){.8,.25,-.05,0};matrix.mixerBlue=(DYFloat4){.1,0,.9,0};
Pixels mixed=filmRender(matrix,nil,@"channel-mixer-production-render");auto delta=difference(before,mixed);run.record(@"channel-mixer-affects-real-frame",delta.different>50&&delta.nonfinite==0,measure(delta));
+18 -11
查看文件
@@ -17,13 +17,13 @@ extern "C" half4 dy_gradeMasked(half4 sample, float2 uv, texture2d<half> source,
texture3d<float> look3, texture3d<float> look4, texture3d<float> look5,
texture3d<float> hslMixer, texture3d<float> whiteBalance,
texture3d<float> colorGrading, constant DYUniforms& uniforms,
constant float& sceneLevel,float w0,float w1,float w2,float w3,float w4,float w5,float w6,float w7,float w8,float w9,float w10,float w11);
constant float& sceneLevel,float w0,float w1,float w2,float w3,float w4,float w5,float w6,float w7,float w8,float w9,float w10,float w11,float skinVisualize);
extern "C" half4 dy_gradeSegment(half4 sample, float2 uv, texture2d<half> source,
texture3d<float> preLUT, texture3d<float> look1, texture3d<float> look2,
texture3d<float> look3, texture3d<float> look4, texture3d<float> look5,
texture3d<float> hslMixer, texture3d<float> whiteBalance,
texture3d<float> colorGrading, constant DYUniforms& uniforms,
constant float& sceneLevel,float w0,float w1,float w2,float w3,float w4,float w5,float w6,float w7,float w8,float w9,float w10,float w11,uint stageFirst,uint stageLast,float3 skinReference,float3 originalReference);
constant float& sceneLevel,float w0,float w1,float w2,float w3,float w4,float w5,float w6,float w7,float w8,float w9,float w10,float w11,float skinVisualize,uint stageFirst,uint stageLast,float3 skinReference,float3 originalReference);
struct DYRaster {
float4 position [[position]];
@@ -65,7 +65,7 @@ fragment half4 dyFragment(DYRaster in [[stage_in]],
half4 color=dy_grade(sample,in.uv,source,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel);
result.rgb=mix(color.rgb,result.rgb,half(options.blackWhiteMix));
}
if(spiderSize.x>0 && uniforms.spiderSectionEnabled>.5f && uniforms.spiderMix>0.0f){
if(uniforms.skinVisualize<.5f && spiderSize.x>0 && uniforms.spiderSectionEnabled>.5f && uniforms.spiderMix>0.0f){
float3 color=float3(result.rgb);float3 warped=dyVariableSpider(color,spiderSize.x,spiderSize.y,spiderSamples);
result.rgb=half3(dyLimit(mix(color,warped,uniforms.spiderMix)));
}
@@ -145,7 +145,7 @@ inline float dyToolCoverage(float2 uv,float3 source,device const DYToolMaskEntry
float a=dyToolMask(x,y,source,masks[i].mask);
if(!found){coverage=masks[i].combine==1?1-a:a;found=true;}
else if(masks[i].combine==1)coverage*=1-a;else if(masks[i].combine==2)coverage*=a;else coverage=1-(1-coverage)*(1-a);
}return clamp(coverage,0.f,1.f);
}if(section==3&&h.faceOnly){float face=0;for(uint i=0;i<h.count;i++)if(masks[i].section==-100)face=1-(1-face)*(1-dyToolMask(x,y,source,masks[i].mask));for(uint i=0;i<h.count;i++)if(masks[i].section==-101)face*=1-dyToolMask(x,y,source,masks[i].mask);coverage*=face;}return clamp(coverage,0.f,1.f);
}
fragment half4 dyMaskedFragment(DYRaster in [[stage_in]],
@@ -173,12 +173,12 @@ fragment half4 dyMaskedFragment(DYRaster in [[stage_in]],
float weights[12];float3 encoded=dyToolEncode(float3(sample.rgb));
for(int i=0;i<12;i++)weights[i]=dyToolCoverage(in.uv,encoded,masks,maskHeader,i);
half4 result = dy_gradeMasked(sample, in.uv, source, preLUT, look1, look2, look3,
look4, look5, hslMixer, whiteBalance, colorGrading, uniforms, sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11]);
look4, look5, hslMixer, whiteBalance, colorGrading, uniforms, sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],(uniforms.skinProtection.x>.5?uniforms.skinVisualize:0));
if(options.blackWhiteMix>0.0f && options.blackWhiteMix<1.0f) {
half4 color=dy_gradeMasked(sample,in.uv,source,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11]);
half4 color=dy_gradeMasked(sample,in.uv,source,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],(uniforms.skinProtection.x>.5?uniforms.skinVisualize:0));
result.rgb=mix(color.rgb,result.rgb,half(options.blackWhiteMix));
}
if(spiderSize.x>0 && uniforms.spiderSectionEnabled>.5f && uniforms.spiderMix>0.0f){
if(uniforms.skinVisualize<.5f && spiderSize.x>0 && uniforms.spiderSectionEnabled>.5f && uniforms.spiderMix>0.0f){
float3 color=float3(result.rgb);float3 warped=dyVariableSpider(color,spiderSize.x,spiderSize.y,spiderSamples);
result.rgb=half3(dyLimit(mix(color,warped,uniforms.spiderMix*weights[1])));
}
@@ -219,9 +219,9 @@ fragment half4 dySegmentFragment(DYRaster in [[stage_in]],
half4 reference=skinReference.sample(sampleFilter,in.uv);
float3 skinEncoded=dyToolEncode(reference.a>half(0)?float3(reference.rgb/reference.a):float3(0));
half4 result = dy_gradeSegment(sample, in.uv, nativeSource, preLUT, look1, look2, look3,
look4, look5, hslMixer, whiteBalance, colorGrading, uniforms, sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],uint(stages.first),uint(stages.last),skinEncoded,encoded);
look4, look5, hslMixer, whiteBalance, colorGrading, uniforms, sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],(uniforms.skinProtection.x>.5?uniforms.skinVisualize:0),uint(stages.first),uint(stages.last),skinEncoded,encoded);
if(stages.first<=9 && stages.last>=9 && options.blackWhiteMix>0.0f && options.blackWhiteMix<1.0f) {
half4 color=dy_gradeSegment(sample,in.uv,nativeSource,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],uint(stages.first),uint(stages.last),skinEncoded,encoded);
half4 color=dy_gradeSegment(sample,in.uv,nativeSource,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],(uniforms.skinProtection.x>.5?uniforms.skinVisualize:0),uint(stages.first),uint(stages.last),skinEncoded,encoded);
result.rgb=mix(color.rgb,result.rgb,half(options.blackWhiteMix));
}
result.a = sample.a;
@@ -327,11 +327,12 @@ kernel void dyColorManagement(texture2d<float,access::read> source [[texture(0)]
// Premultiplication is preserved by mixing the two equally-alpha images.
kernel void dyToolBlend(texture2d<float,access::read> before [[texture(0)]],texture2d<float,access::read> after [[texture(1)]],texture2d<half,access::write> output [[texture(2)]],device const DYToolMaskEntry* masks [[buffer(0)]],constant DYToolMaskHeader& h [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;float4 a=before.read(pos),b=after.read(pos);float2 uv=(float2(pos)+.5f)/float2(output.get_width(),output.get_height());float amount=dyToolCoverage(uv,dyToolEncode(a.a>0?(h.premultiplied?a.rgb/a.a:a.rgb):float3(0)),masks,h,h.section);output.write(half4(mix(a,b,amount)),pos);
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;float4 a=before.read(pos),b=after.read(pos);float2 uv=(float2(pos)+.5f)/float2(output.get_width(),output.get_height());float amount=dyToolCoverage(uv,dyToolEncode(a.a>0?(h.premultiplied?a.rgb/a.a:a.rgb):float3(0)),masks,h,h.section);output.write(half4(h.skinPreview?float4(b.rgb*amount,a.a):mix(a,b,amount)),pos);
}
extern "C" float dy_skinWeight(float3 color,float3 reference,constant DYUniforms& uniforms);
extern "C" float3 dy_skinExtra(float3 color,float3 reference,constant DYUniforms& uniforms);
kernel void dyToolSkin(texture2d<float,access::read> before [[texture(0)]],texture2d<float> reference [[texture(1)]],texture2d<half,access::write> output [[texture(2)]],constant DYUniforms& u [[buffer(0)]],uint2 pos [[thread_position_in_grid]]){
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);float4 a=before.read(pos),b=reference.sample(f,(float2(pos)+.5f)/float2(output.get_width(),output.get_height()));if(a.a>0){float3 c=dy_skinExtra(dyToolEncode(a.rgb/a.a),dyToolEncode(b.a>0?b.rgb/b.a:float3(0)),u);a.rgb=dyToolDecode(c)*a.a;}output.write(half4(a),pos);
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);float4 a=before.read(pos),b=reference.sample(f,(float2(pos)+.5f)/float2(output.get_width(),output.get_height()));if(a.a>0){float3 c=dy_skinExtra(dyToolEncode(a.rgb/a.a),dyToolEncode(b.a>0?b.rgb/b.a:float3(0)),u);a.rgb=u.skinProtection.x>.5&&u.skinVisualize>.5?float3(dy_skinWeight(float3(0),dyToolEncode(b.a>0?b.rgb/b.a:float3(0)),u)*clamp(u.skinProtection.y*.01f,0.f,1.f)*a.a):dyToolDecode(c)*a.a;}output.write(half4(a),pos);
}
fragment half4 dyToolCopyFragment(DYRaster in [[stage_in]],texture2d<half> source [[texture(0)]]){constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);return source.sample(f,in.uv);}
@@ -339,3 +340,9 @@ fragment half4 dyToolCopyFragment(DYRaster in [[stage_in]],texture2d<half> sourc
#include "DYFilmKernels.inc.h"
#include "DYManagedKernels.inc.h"
#include "DYPrimaryKernels.inc.h"
// Inverse radial sampling; alpha stays premultiplied through interpolation.
kernel void dyLensRepair(texture2d<float> source [[texture(0)]],texture2d<float,access::write> output [[texture(1)]],constant DYUniforms& u [[buffer(0)]],constant float& aspect [[buffer(1)]],uint2 p [[thread_position_in_grid]]){
if(p.x>=output.get_width()||p.y>=output.get_height())return;float2 uv=(float2(p)+.5f)/float2(output.get_width(),output.get_height()),center=float2(u.lensCenterX,u.lensCenterY);float2 q=(uv-center)/max(1.f,u.lensScale),metric=q*float2(aspect,1);float2 corner=max(center,1-center)*float2(aspect,1);float radius=dot(metric,metric)/max(1e-6f,dot(corner,corner));float2 sample=center+q*(1+clamp(u.lensStrength,-100.f,100.f)*.0025f*radius);
constexpr sampler f(coord::normalized,address::clamp_to_zero,filter::linear);output.write(source.sample(f,sample),p);
}
+9 -4
查看文件
@@ -217,7 +217,7 @@ static NSArray *DYPresentationSections(void) {
for(NSString *key in @[@"temperature",@"tint",@"exposure",@"contrast",@"highlights",@"shadows",@"whites",@"blacks",@"texture",@"clarity",@"dehaze",@"vibrance",@"saturation",@"skinEnabled",@"copyAutoGrade"]){NSDictionary*d=byKey[key];if(d)[rows addObject:d];}
base[@"rows"]=rows;base[@"extraEnabled"]=bySection[@"color"][@"enabled"];
base[@"title"]=@"基础调整";
return @[primary,bySection[@"spider"],base,bySection[@"skin"],bySection[@"look"],bySection[@"hsl"],bySection[@"curve"],bySection[@"grading"],bySection[@"primaries"],bySection[@"levels"],bySection[@"blackwhite"],bySection[@"balance"],bySection[@"mixer"],bySection[@"film"]];
return @[primary,bySection[@"spider"],base,bySection[@"skin"],bySection[@"look"],bySection[@"hsl"],bySection[@"curve"],bySection[@"grading"],bySection[@"primaries"],bySection[@"levels"],bySection[@"blackwhite"],bySection[@"balance"],bySection[@"mixer"],bySection[@"film"],bySection[@"lens"]];
}
@@ -527,6 +527,7 @@ static NSImage *DYWheelImage(void) {
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager];
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil];
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
if(!_embedded)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(revealViewerTool:) name:@"DYViewerToolRequested" object:_manager];
if(!_embedded)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(openWorkspace:) name:@"DYColorWorkspaceRequested" object:_manager];
if(_renderer)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
[self themeChanged:nil];
@@ -708,7 +709,7 @@ static NSImage *DYWheelImage(void) {
}
for(NSView *row in body)if(![ordered containsObject:row])row.hidden=YES;body=ordered;
}
NSMutableDictionary *record=[NSMutableDictionary dictionaryWithDictionary:@{@"section":section,@"view":card,@"header":header,@"enabled":enabled,@"reset":reset,@"body":body,@"collapsed":@(![@[@"primary",@"spider",@"base"]containsObject:key])}];
NSMutableDictionary *record=[NSMutableDictionary dictionaryWithDictionary:@{@"section":section,@"view":card,@"header":header,@"enabled":enabled,@"reset":reset,@"body":body,@"collapsed":@YES}];
if([key isEqual:@"look"]){NSButton *add=DYButton(@"+",self,@selector(addLook:));add.bordered=NO;add.font=[NSFont boldSystemFontOfSize:20];add.accessibilityLabel=@"添加风格 LUT";[card addSubview:add];record[@"add"]=add;}
id<PROAPIAccessing> host=_embedded?[(DYToolManager*)_manager host]:_manager;
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:key];
@@ -852,7 +853,11 @@ static NSImage *DYWheelImage(void) {
for(NSView *row in c[@"body"])row.alphaValue=enabled?1:.45;
}
id<PROAPIAccessing> maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;NSDictionary *tools=DYReadTools(maskHost,t).document;for(NSDictionary *card in _cards){
BOOL removed=!_embedded&&DYBaseToolRemoved(tools,card[@"section"][@"key"]);groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed);
NSString *type=card[@"section"][@"key"];BOOL visible=YES;
if(!_embedded){DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];visible=[@[@"primary",@"base",@"spider",@"hsl"]containsObject:type]||[token.folds[[@"visible:" stringByAppendingString:type]]boolValue];
if(!visible){for(NSDictionary*d in DYBaseToolDescriptors(type)){double value=[d[@"default"]doubleValue];[get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:t];if(std::isfinite(value)&&fabs(value-[d[@"default"]doubleValue])>1e-6){visible=YES;break;}}if([tools[@"baseMasks"][type]count])visible=YES;if([type isEqual:@"look"])for(NSString *assetKey in DYReadAssets(_manager,t).paths)if([assetKey hasPrefix:@"look"])visible=YES;}
}
BOOL removed=!_embedded&&(DYBaseToolRemoved(tools,type)||!visible);groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed);
[card[@"maskPanel"]refreshWithDocument:tools time:t];
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:card[@"section"][@"key"]];NSUInteger count=[DYMasksForTool(tools,nodeID) count];
[(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版";
@@ -1019,7 +1024,7 @@ static NSImage *DYWheelImage(void) {
NSError *failure=nil;if(!DYResetToolParameters(_manager,DYDescriptors(),t,&failure)){dispatch_async(dispatch_get_main_queue(),^{[self showError:failure.localizedDescription?:@"未能完整还原参数。"];});return;}
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,[[[DYToolDocument alloc]init]autorelease].document,t);
[set setCustomParameterValue:[[[DYInspectorToken alloc]init]autorelease] toParameter:DYInspectorParameterID atTime:t];
for(NSMutableDictionary *card in _cards)card[@"collapsed"]=@(![@[@"primary",@"spider",@"base"]containsObject:card[@"section"][@"key"]]);
for(NSMutableDictionary *card in _cards)card[@"collapsed"]=@YES;
} @finally {if(grouped)[undo endUndoGroup];[action endAction:self];}
[self postChanged];
}
+2 -1
查看文件
@@ -136,7 +136,7 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
section(@"spider",@"蜘蛛盘校色仪",offsetof(DYUniforms,spiderSectionEnabled),@[scalar(@"spiderMix",@"蜘蛛盘混合",offsetof(DYUniforms,spiderMix),0,1,1)]);
section(@"base",@"基础调色",136,[[[base subarrayWithRange:NSMakeRange(0,6)]arrayByAddingObjectsFromArray:[base subarrayWithRange:NSMakeRange(10,3)]]arrayByAddingObject:copyAuto],1);
section(@"color",@"白平衡与颜色",140,@[base[6],base[7],base[9],base[8]],1);
section(@"skin",@"肤色保护",464,@[scalar(@"skinStrength",@"保护程度",468,0,100,60),scalar(@"skinHue",@"肤色色相",472,0,60,28)],1);
section(@"skin",@"肤色保护",464,@[scalar(@"skinStrength",@"保护程度",468,0,100,60),scalar(@"skinHue",@"肤色色相",472,0,60,28),row(@"skinFaceOnly",@"仅保护人脸肤色",offsetof(DYUniforms,skinFaceOnly),0,1,1,@"bool"),row(@"skinVisualize",@"显示肤色保护区域",offsetof(DYUniforms,skinVisualize),0,1,0,@"bool")],1);
NSMutableArray*look=[NSMutableArray arrayWithObject:scalar(@"postLUTStrength",@"风格 1 强度",60,0,1,1)];
for(int i=0;i<4;i++){[look addObject:row([NSString stringWithFormat:@"look%dEnabled",i+2],[NSString stringWithFormat:@"风格 %d 启用",i+2],160+i*4,0,1,1,@"bool")];[look addObject:scalar([NSString stringWithFormat:@"look%dStrength",i+2],[NSString stringWithFormat:@"风格 %d 强度",i+2],64+i*4,0,1,1)];}
section(@"look",@"风格 LUT",144,look);
@@ -189,6 +189,7 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:printLook];[film addObject:printLook];
NSMutableDictionary *printStrength=[[row(@"filmPrintStrength",@"印片强度",offsetof(DYUniforms,filmPrint)+sizeof(float),0,1,1,@"float")mutableCopy]autorelease];printStrength[@"filmTab"]=@5;[descriptors replaceObjectAtIndex:descriptors.count-1 withObject:printStrength];[film addObject:printStrength];
section(@"film",@"胶片模拟",offsetof(DYUniforms,film)+offsetof(DYFilmSettings,enabled),film);
section(@"lens",@"镜头畸变修复",offsetof(DYUniforms,lensSectionEnabled),@[scalar(@"lensStrength",@"畸变校正",offsetof(DYUniforms,lensStrength),-100,100,0),scalar(@"lensScale",@"画面缩放",offsetof(DYUniforms,lensScale),1,2,1),scalar(@"lensCenterX",@"光学中心 X",offsetof(DYUniforms,lensCenterX),0,1,.5),scalar(@"lensCenterY",@"光学中心 Y",offsetof(DYUniforms,lensCenterY),0,1,.5)]);
#undef FR
#undef FE
});}
+2 -2
查看文件
@@ -30,12 +30,12 @@
- (NSView*)createViewForParameterID:(UInt32)pid{[self scheduleToolCanvasRegistration];return pid==DYInspectorParameterID?[[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer]:[[NSView alloc]initWithFrame:NSZeroRect];}
- (BOOL)parameterChanged:(UInt32)pid atTime:(CMTime)t error:(NSError**)e{if(pid==DYToolsParameterID)[self adoptToolCanvasDocument:DYReadTools(_apiManager,t).document];if(pid==DYToolsParameterID||pid==2013||pid==2014||(pid>=2236&&pid<2400)||pid==DYAssetsParameterID)[_renderer invalidatePreview];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self.apiManager];});return YES;}
- (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&copyAuto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a histogram:nil atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&copyAuto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
}
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;NSData *previousHistogram=[_renderer histogram];BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){NSData *histogram=[_renderer histogram];if(histogram&&histogram!=previousHistogram)[_viewerParameterBridge publishHistogram:histogram atTime:t];[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
}
- (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});}
- (void)exportRequested:(NSNotification*)n{
+10 -5
查看文件
@@ -11,6 +11,8 @@
#include "DYToolGPU.h"
#include "DYFilmMath.h"
#import <CoreImage/CoreImage.h>
#import <Vision/Vision.h>
#import <ImageIO/ImageIO.h>
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
#import "DYColorTables.h"
#import "DYLUTLibrary.h"
@@ -66,6 +68,7 @@ static void bypassNeutralTools(DYUniforms *u){
}
}
static void bypassIdleSkin(DYUniforms *u){
if(u->skinVisualize>.5)return;
if(u->curveSectionEnabled>.5||u->hslSectionEnabled>.5||u->colorGradingSectionEnabled>.5||u->primariesSectionEnabled>.5||u->levelsSectionEnabled>.5||u->blackWhiteSectionEnabled>.5||u->colorBalanceSectionEnabled>.5)return;
if(u->preLUTStrength!=0||u->postLUTStrength!=0||simd_any(u->extraPostLUTStrengths!=0))return;
const float *values=&u->exposure,*enabled=&u->exposureEnabled;
@@ -112,7 +115,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
CFTimeInterval _lastPreview;
BOOL _exporting;
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
BOOL _managedFinishing;
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;
dispatch_queue_t _scopeQueue;
BOOL _scopeEnabled,_scopeWorkerRunning;
NSUInteger _scopeGeneration;
@@ -127,9 +130,10 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
#include "DYFilmRender.inc.h"
#include "DYPrimaryRender.inc.h"
#include "DYManagedRender.inc.h"
#include "DYFaceRender.inc.h"
#include "DYToolRender.inc.h"
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;}
- (void)dealloc{[_scopePending release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];}
- (void)dealloc{[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];}
- (void)trimPreparedLUTsKeeping:(NSString *)path {
if(_preparedLUTs.count<=12)return;
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
@@ -152,6 +156,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
progress.completedUnitCount=2;dispatch_async(dispatch_get_main_queue(),^{NSError *result=progress.cancelled?[NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]:error;if(completion)completion(result);});
}});return progress;
}
- (void)notifyPreviewChanged{dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;[_histogram release];_histogram=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
- (NSData*)histogram{@synchronized(_previewLock){return [[_histogram retain]autorelease];}}
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
@@ -163,7 +168,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
NSURL*url=[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"];
id<MTLLibrary>lib=[d newLibraryWithURL:url error:err];if(!lib){[d release];return nil;}
id<MTLCommandQueue>q=[d newCommandQueue];entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"library":lib,@"queue":q,@"pipelines":[NSMutableDictionary dictionary]}];
for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyScopeSample",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}uint64_t pipelineSpan=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":fn,@"gpu":d.name?:@"unknown"});id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];DYBetaSpanEnd(pipelineSpan,@{@"status":p?@"passed":@"failed"});[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
for(NSString*fn in @[@"dyLensRepair",@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyScopeSample",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){id<MTLFunction>f=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}uint64_t pipelineSpan=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":fn,@"gpu":d.name?:@"unknown"});id<MTLComputePipelineState>p=[d newComputePipelineStateWithFunction:f error:err];DYBetaSpanEnd(pipelineSpan,@{@"status":p?@"passed":@"failed"});[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];}
float identity[32];for(int z=0;z<2;z++)for(int y=0;y<2;y++)for(int x=0;x<2;x++){int i=((z*2+y)*2+x)*4;identity[i]=x;identity[i+1]=y;identity[i+2]=z;identity[i+3]=1;}id<MTLTexture>neutral=texture3D(d,identity,2);if(!neutral){fail(err,@"无法分配中性 LUT");return nil;}entry[@"identity"]=neutral;
// Preparing before the first frame may use registry 0. Reuse those pipelines
// when the host subsequently supplies that device's actual registry ID.
@@ -214,7 +219,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
}
if([e[@"spiderActive"]boolValue]){spiderBuffer=e[@"spiderBuffer"];spiderSize={ [e[@"spiderHues"]intValue],[e[@"spiderRings"]intValue]};}
}
DYToolMaskHeader maskHeader{};id<MTLBuffer>maskBuffer=(masks.count||segmented)?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;BOOL hasMasks=maskHeader.count>0;if((hasMasks||segmented)&&!maskBuffer)return fail(err,@"无法分配蒙版缓冲区");
DYToolMaskHeader maskHeader{};id<MTLBuffer>maskBuffer=(masks.count||segmented||u.skinFaceOnly>.5||_faceEntries.length)?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;maskHeader.faceOnly=u.skinFaceOnly>.5;BOOL hasMasks=maskHeader.count>0||maskHeader.faceOnly;if((hasMasks||segmented)&&!maskBuffer)return fail(err,@"无法分配蒙版缓冲区");
NSMutableDictionary*ps=e[@"pipelines"];NSString*format=[NSString stringWithFormat:@"%lu-%d-%d",(unsigned long)output.pixelFormat,hasMasks,segmented];id<MTLRenderPipelineState>pipeline=ps[format];if(!pipeline){MTLRenderPipelineDescriptor*p=[MTLRenderPipelineDescriptor new];p.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];p.fragmentFunction=[e[@"library"]newFunctionWithName:segmented?@"dySegmentFragment":hasMasks?@"dyMaskedFragment":@"dyFragment"];p.colorAttachments[0].pixelFormat=output.pixelFormat;pipeline=[d newRenderPipelineStateWithDescriptor:p error:err];[p.vertexFunction release];[p.fragmentFunction release];[p release];if(!pipeline)return NO;ps[format]=pipeline;[pipeline release];}
MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;id<MTLTexture>straight=[d newTextureWithDescriptor:td];if(!straight)return fail(err,@"无法分配调色缓冲区");
id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyUnpremultiply"]];[ce setTexture:input atIndex:0];[ce setTexture:straight atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];
@@ -250,7 +255,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)topFirst.mutableBytes+y*rowBytes,(const uint8_t*)_preview.bytes+(179-y)*rowBytes,rowBytes);
_lookLUTPreview=[topFirst copy];
}else _lookLUTPreview=[_preview retain];
_lastPreview=CACurrentMediaTime();dispatch_async(dispatch_get_main_queue(),^{[[NSNotificationCenter defaultCenter]postNotificationName:@"DYPreviewDidChange" object:self];});
_lastPreview=CACurrentMediaTime();[self notifyPreviewChanged];
}}
if(!ok)fail(err,cb.error.localizedDescription);[pb release];[straight release];[scene release];return ok;
});}}
+1 -1
查看文件
@@ -1,5 +1,5 @@
#pragma once
#include "MaskCore/DYMaskOperator.h"
struct DYToolMaskEntry {DYResolvedMask mask;int section,combine;};
struct DYToolMaskHeader {unsigned count;float offsetX,offsetY,scaleX,scaleY;int section,premultiplied;};
struct DYToolMaskHeader {unsigned count;float offsetX,offsetY,scaleX,scaleY;int section,premultiplied,faceOnly,skinPreview;};
struct DYToolStageRange {int first,last,suppressBlackWhite;};
@@ -8,7 +8,7 @@
DYToolDocument *authored=[[[DYToolDocument alloc]init]autorelease];authored.document=doc;NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:authored requiringSecureCoding:YES error:&error];DYToolDocument *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:archive error:&error];run.record(@"inserted-order-secure-archive-roundtrip",[restored isEqual:authored]&&[DYToolDisplayOrder(restored.document)isEqual:order]);
NSMutableDictionary *bad=DYMutablePlist(doc);bad[@"layers"][0][@"after"]=@"base:unknown";run.record(@"insertion-rejects-unknown-base-anchor",!DYValidToolDocument(bad));bad=DYMutablePlist(doc);bad[@"layers"][0][@"after"]=bad[@"layers"][0][@"id"];run.record(@"insertion-rejects-cyclic-anchor",!DYValidToolDocument(bad));
BOOL removed=DYRemoveTool(doc,one[@"id"]);order=DYToolDisplayOrder(doc);hslIndex=[order indexOfObject:@"base:hsl"];run.record(@"delete-reconnects-child-without-moving-to-bottom",removed&&DYValidToolDocument(doc)&&[order[hslIndex+1]isEqual:newest[@"id"]]&&[order[hslIndex+2]isEqual:two[@"id"]]);
DYWriteTools(manager,doc,kCMTimeZero);DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:manager renderer:renderer]autorelease];[inspector refresh];[inspector setFrameSize:NSMakeSize(360,780)];[inspector layoutSubtreeIfNeeded];NSDictionary *views=[inspector valueForKey:@"_stackViews"];NSArray *cards=[inspector valueForKey:@"_cards"];NSView *baseHSL=nil,*baseCurve=nil;for(NSDictionary *card in cards){if([card[@"section"][@"key"]isEqual:@"hsl"])baseHSL=card[@"view"];if([card[@"section"][@"key"]isEqual:@"curve"])baseCurve=card[@"view"];}NSView *newView=views[newest[@"id"]],*secondView=views[two[@"id"]];run.record(@"new-native-card-is-laid-out-between-its-source-and-next-module",newView&&secondView&&NSMinY(newView.frame)>=NSMaxY(baseHSL.frame)&&NSMinY(secondView.frame)>=NSMaxY(newView.frame)&&NSMinY(baseCurve.frame)>=NSMaxY(secondView.frame));
DYWriteTools(manager,doc,kCMTimeZero);DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:manager renderer:renderer]autorelease];[inspector refresh];[inspector setFrameSize:NSMakeSize(360,780)];[inspector layoutSubtreeIfNeeded];NSDictionary *views=[inspector valueForKey:@"_stackViews"];NSArray *cards=[inspector valueForKey:@"_cards"];NSView *baseHSL=nil,*baseCurve=nil;for(NSDictionary *card in cards){if([card[@"section"][@"key"]isEqual:@"hsl"])baseHSL=card[@"view"];if([card[@"section"][@"key"]isEqual:@"curve"])baseCurve=card[@"view"];}NSView *newView=views[newest[@"id"]],*secondView=views[two[@"id"]];run.record(@"new-native-card-is-laid-out-between-its-source-and-next-module",newView&&secondView&&NSMinY(newView.frame)>=NSMaxY(baseHSL.frame)&&NSMinY(secondView.frame)>=NSMaxY(newView.frame)&&(baseCurve.hidden||NSMinY(baseCurve.frame)>=NSMaxY(secondView.frame)));
doc=DYMutablePlist(empty.document);NSMutableDictionary *legacy=DYMutablePlist(DYNewTool(@"hsl"));[doc[@"layers"]addObject:legacy];NSDictionary *child=DYInsertTool(doc,@"hsl",legacy[@"id"]);run.record(@"schema-one-tail-layer-retains-tail-root-with-new-child",[DYToolRootAnchor(doc,legacy[@"id"])isEqual:@"tail"]&&[DYToolRootAnchor(doc,child[@"id"])isEqual:@"tail"]&&[DYToolDisplayOrder(doc).lastObject isEqual:child[@"id"]]);
auto renderInserted=[&](NSDictionary *tools,DYUniforms u,NSString *name){NSError *failure=nil;BOOL ok=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:tools error:&failure];run.need(name,ok,@{@"error":reason(failure)});return read(destination,gpu);};
auto upload=[&](DYDiagnosticTile *tile,const Pixels &pixels){[[tile metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:width*8];};
+7 -1
查看文件
@@ -14,6 +14,11 @@
if(sender.tag<0||sender.tag>=_cards.count)return;id<PROAPIAccessing>host=_embedded?[(DYToolManager*)_manager host]:_manager;id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];
NSString *addedID=nil;@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if([doc[@"layers"]count]>=DYToolLimit){[self showError:@"最多可添加 32 个独立工具层。"];return;}NSString *type=_cards[sender.tag][@"section"][@"key"],*anchor=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:type];NSMutableDictionary *node=(id)DYInsertTool(doc,type,anchor);if(!node)return;if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}addedID=[node[@"id"]copy];id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"再加一层初始化工具"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":addedID?:@""}];[addedID release];
}
- (void)revealViewerTool:(NSNotification*)note {
if(_embedded||![DYToolTypes()containsObject:note.userInfo[@"type"]])return;NSString *type=note.userInfo[@"type"];id<FxCustomParameterActionAPI_v4>a=[self actionAPI];[a startAction:self];@try{DYInspectorToken *old=nil;[[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:a.currentTime];DYInspectorToken *token=old?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];folds[[@"visible:" stringByAppendingString:type]]=@YES;token.folds=folds;[[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:a.currentTime];
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);if(DYBaseToolRemoved(doc,type)){BOOL existing=NO;for(NSDictionary*n in doc[@"layers"])if([n[@"type"]isEqual:type])existing=YES;if(!existing){id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if([undo startUndoGroup:@"添加画布工具"]){DYInsertTool(doc,type,[@"base:" stringByAppendingString:type]);DYWriteTools(_manager,doc,a.currentTime);[undo endUndoGroup];}}}
}@finally{[a endAction:self];}[self refresh];[self setNeedsLayout:YES];
}
- (void)addModule:(NSMenuItem *)sender{
if(_embedded)return;NSString *type=sender.representedObject;for(NSUInteger i=0;i<_cards.count;i++)if([_cards[i][@"section"][@"key"]isEqual:type]){NSButton *source=[[[NSButton alloc]init]autorelease];source.tag=i;[self repeatTool:source];return;}
}
@@ -43,7 +48,8 @@
}@finally{
if(grouped)[undo endUndoGroup];[a endAction:self];
if(attempted&&!changed&&!failure)failure=[NSError errorWithDomain:@"com.dayu.color.ToolRemoval" code:1 userInfo:@{NSLocalizedDescriptionKey:@"未能完成删除,模块已保留。可撤销本次参数还原。"}];
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];if(failure)[self showError:failure.localizedDescription];});
id retainedHost=[(id)host retain];NSError *retainedFailure=[failure retain];
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:retainedHost];if(retainedFailure)[self showError:retainedFailure.localizedDescription];[retainedHost release];[retainedFailure release];});
}
// Model refresh posts accessibility changes after the remote action unwinds.
// Synchronous notification here can re-enter the host's ViewBridge callback.
+9 -6
查看文件
@@ -7,7 +7,7 @@
h->premultiplied=1;
for(NSString *type in groups){NSInteger section=[DYToolTypes()indexOfObject:type];if(section==NSNotFound)continue;
for(NSDictionary *m in groups[type]){if(![m[@"enabled"]boolValue])continue;DYToolMaskEntry entry{};entry.section=(int)section;entry.combine=[m[@"combine"]intValue];[m[@"parameters"]getBytes:&entry.mask.parameters length:sizeof(DYMaskParameters)];entry.mask.parameters.imageAspect=w/ht;NSData *nodes=m[@"nodes"];entry.mask.path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));entries.push_back(entry);}
}h->count=(unsigned)entries.size();if(entries.empty())entries.push_back({});return [[device newBufferWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry) options:MTLResourceStorageModeShared]autorelease];
}if(_faceEntries.length){const DYToolMaskEntry *faces=(const DYToolMaskEntry*)_faceEntries.bytes;entries.insert(entries.end(),faces,faces+_faceEntries.length/sizeof(DYToolMaskEntry));}h->count=(unsigned)entries.size();if(entries.empty())entries.push_back({});return [[device newBufferWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry) options:MTLResourceStorageModeShared]autorelease];
}
- (void)encodeBlend:(id<MTLTexture>)before after:(id<MTLTexture>)after output:(id<MTLTexture>)output masks:(id<MTLBuffer>)masks header:(DYToolMaskHeader)h entry:(NSDictionary*)entry commands:(id<MTLCommandBuffer>)commands {
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"dyToolBlend"]];[encoder setTexture:before atIndex:0];[encoder setTexture:after atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBuffer:masks offset:0 atIndex:0];[encoder setBytes:&h length:sizeof(h) atIndex:1];[encoder dispatchThreads:MTLSizeMake(output.width,output.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
@@ -31,21 +31,22 @@
BOOL found=NO;float low=1,high=1;for(NSDictionary *mask in node[@"masks"]){if(![mask[@"enabled"]boolValue])continue;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);float a=0,b=p.strength==0?0:1;NSInteger combine=[mask[@"combine"]integerValue];if(!found){low=combine==1?1-b:a;high=combine==1?1-a:b;found=YES;}else if(combine==1){low*=1-b;high*=1-a;}else if(combine==2){low*=a;high*=b;}else{low=1-(1-low)*(1-a);high=1-(1-high)*(1-b);}}
if(found&&high==0)return [self copyTile:source to:destination entry:entry error:error];
DYUniforms layer=DYToolUniforms(node);NSString *type=node[@"type"];
if([type isEqual:@"lens"])return [self renderLens:source destination:destination uniforms:layer masks:node[@"masks"] entry:entry error:error];
if([type isEqual:@"mixer"]||[type isEqual:@"film"]){layer.filmFrameKey=[node[@"filmFrameKey"]unsignedIntValue];return [self renderFilmTool:type source:source destination:destination uniforms:layer masks:node[@"masks"] entry:entry error:error];}
if(![type isEqual:@"skin"])return [self renderLegacy:source destination:destination uniforms:layer paths:node[@"paths"] spider:node[@"spider"] masks:@{type:node[@"masks"]} error:error];
id<MTLDevice>d=entry[@"device"];id<MTLTexture>before=[source metalTextureForDevice:d],input=[original metalTextureForDevice:d],after=[destination metalTextureForDevice:d];
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:entry[@"dyToolSkin"]];[ce setTexture:before atIndex:0];[ce setTexture:input atIndex:1];[ce setTexture:after atIndex:2];[ce setBytes:&layer length:sizeof(layer) atIndex:0];[ce dispatchThreads:MTLSizeMake(after.width,after.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);
if(![node[@"masks"]count])return YES;
if(![node[@"masks"]count]&&layer.skinFaceOnly<.5&&layer.skinVisualize<.5)return YES;
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:after.width height:after.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;id<MTLTexture>blend=[d newTextureWithDescriptor:desc];if(!blend)return fail(error,@"无法分配新增工具蒙版缓冲区");
DYToolMaskHeader h{};h.section=3;id<MTLBuffer>buffer=[self maskBuffer:@{type:node[@"masks"]} tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];[self encodeBlend:before after:after output:blend masks:buffer header:h entry:entry commands:cb];[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
DYToolMaskHeader h{};h.section=3;h.faceOnly=layer.skinFaceOnly>.5;h.skinPreview=layer.skinProtection.x>.5&&layer.skinVisualize>.5;id<MTLBuffer>buffer=[self maskBuffer:@{type:node[@"masks"]} tile:source device:d header:&h];cb=[entry[@"queue"]commandBuffer];[self encodeBlend:before after:after output:blend masks:buffer header:h entry:entry commands:cb];[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
DYExportTile *blended=[[DYExportTile alloc]initWithTexture:blend registry:d.registryID];[blended setBounds:source.tilePixelBounds origin:source.imageOrigin];[blended setPixelAspect:source.pixelAspect];[blend release];if(ok)ok=[self copyTile:blended to:destination entry:entry error:error];else fail(error,cb.error.localizedDescription);[blended release];return ok;
}
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
- (BOOL)renderToolsSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
NSArray *layers=tools[@"layers"];BOOL active=NO,anchored=NO;for(NSDictionary *node in layers)if(!DYToolIsNeutral(node)){active=YES;anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"];}
// No active extra tool keeps the exact historical fused path, including HDR.
if(!active&&!DYChannelMixerActive(u)&&!DYFilmToolActive(u))return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error];
if(!active&&!DYChannelMixerActive(u)&&!DYFilmToolActive(u)&&(u.lensSectionEnabled<.5||(u.lensStrength==0&&u.lensScale==1)))return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error];
NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>input=[src metalTextureForDevice:d];if(!input)return fail(error,@"宿主图像纹理不可用");
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
DYExportTile *tile=nil,*skinReference=nil,*originalReference=nil;NSArray *order=DYToolDisplayOrder(tools);NSMutableDictionary *groups=[NSMutableDictionary dictionary];for(NSString *ID in order){NSDictionary *node=DYToolWithID(tools,ID);if(!node||DYToolIsNeutral(node))continue;NSString *root=DYToolRootAnchor(tools,ID);if(!groups[root])groups[root]=[NSMutableArray array];[groups[root]addObject:node];}
@@ -91,7 +92,7 @@
if(!apply(@"base:spider"))return NO;
}
// New end-of-chain base tools do not move any historical color stages.
for(NSString *type in @[@"mixer",@"film"]){BOOL enabled=[type isEqual:@"mixer"]?DYChannelMixerActive(u):DYFilmToolActive(u);if(enabled){DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配胶片工具缓冲区");BOOL ok=[self renderFilmTool:type source:tile destination:next uniforms:u masks:tools[@"baseMasks"][type]?:@[] entry:entry error:error];if(!ok){[next release];return NO;}replace(next);}if(!apply([@"base:" stringByAppendingString:type]))return NO;}
for(NSString *type in @[@"mixer",@"film",@"lens"]){BOOL enabled=[type isEqual:@"lens"]?u.lensSectionEnabled>.5&&(u.lensStrength!=0||u.lensScale!=1):[type isEqual:@"mixer"]?DYChannelMixerActive(u):DYFilmToolActive(u);if(enabled){DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配胶片工具缓冲区");BOOL ok=[type isEqual:@"lens"]?[self renderLens:tile destination:next uniforms:u masks:tools[@"baseMasks"][type]?:@[] entry:entry error:error]:[self renderFilmTool:type source:tile destination:next uniforms:u masks:tools[@"baseMasks"][type]?:@[] entry:entry error:error];if(!ok){[next release];return NO;}replace(next);}if(!apply([@"base:" stringByAppendingString:type]))return NO;}
// Schema 1 extra layers (and children inserted after those layers) retain
// their old end-of-chain order. Saving does not silently migrate old looks.
if(!apply(@"tail"))return NO;return [self copyTile:tile to:dst entry:entry error:error];
@@ -99,6 +100,8 @@
});}}
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
if(tools&&!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
if((u.lensSectionEnabled>.5&&(u.lensStrength!=0||u.lensScale!=1))||(u.skinProtection.x>.5&&u.skinVisualize>.5))return fail(error,@"镜头修复与肤色区域显示无法保存到 Cube,请保存完整预设。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"lens"]&&!DYToolIsNeutral(node))return fail(error,@"镜头畸变属于空间处理,请保存完整预设。");}
DYUniforms effective=u;if(![paths[@"input"]length]&&effective.inputProfile==0)effective.preLUTStrength=0;if(![paths[@"look0"]length])effective.postLUTStrength=0;for(int i=0;i<4;i++)if(![paths[[NSString stringWithFormat:@"look%d",i+1]]length])effective.extraPostLUTStrengths[i]=0;bypassNeutralTools(&effective);bypassIdleSkin(&effective);if(effective.skinFaceOnly>.5&&effective.skinProtection.x>.5&&effective.skinProtection.y>0)return fail(error,@"人脸限定肤色保护属于空间选区,Cube 无法保存。请保存完整预设,或关闭人脸限定后导出。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"skin"]&&layer.skinProtection.x>.5&&layer.skinProtection.y>0&&(layer.skinFaceOnly>.5||layer.skinVisualize>.5))return fail(error,@"新增肤色层含人脸空间选区,请保存完整预设。");}
if(DYFilmToolActive(u)&&DYFilmSpatialActive(u.film))return fail(error,@"当前胶片含晕光、辉光、颗粒或暗角,无法完整保存到静态 Cube。请保存完整预设,或关闭这些处理后再导出。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"]&&DYFilmToolActive(layer)&&DYFilmSpatialActive(layer.film))return fail(error,@"新增胶片层含空间或时间处理,无法完整保存到静态 Cube。请保存完整预设。");}
for(NSArray *masks in [tools[@"baseMasks"]allValues])if(masks.count)return fail(error,@"当前调色含空间蒙版或跟踪,Cube 无法保存这些信息。请先保存完整预设,或移除蒙版后导出。");for(NSDictionary *node in tools[@"layers"])if([node[@"masks"]count])return fail(error,@"新增工具含蒙版,无法完整导出为 Cube。请保存完整预设。");
_toolDocument=tools;BOOL ok=NO;@try{ok=[self exportLUT:url uniforms:u paths:paths spider:spider error:error];}@finally{_toolDocument=nil;}return ok;
+2 -2
查看文件
@@ -4,7 +4,7 @@
#include <set>
#import <objc/runtime.h>
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film"];}
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film",@"lens"];}
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
static NSArray *DYBaseToolParts(NSString *type){return [type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];}
static NSArray<NSDictionary *> *DYBuildBaseToolDescriptors(NSString *type){
@@ -124,7 +124,7 @@ DYUniforms DYToolUniforms(NSDictionary *node){DYUniforms u;DYDefaultUniforms(&u)
// new layers explicitly disable mapping so adding a neutral layer is identity.
if([type isEqual:@"primary"]){u.primarySectionEnabled=1;u.cm.configured=1;u.cm.inputTransfer=u.cm.outputTransfer;u.cm.inputGamut=u.cm.outputGamut;u.cm.toneMapping=0;}
for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if(v&&[d[@"offset"]integerValue]>=0)*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=v.floatValue;}return u;}
BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms u=DYToolUniforms(node);NSDictionary *section=DYToolSection(type);BOOL enabled=YES;if([type isEqual:@"primary"])enabled=u.primarySectionEnabled>.5;else if([type isEqual:@"base"])enabled=u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;else for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:section[@"enabled"]])enabled=*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;if(!enabled)return YES;if([type isEqual:@"primary"]&&u.cm.toneMapping>.5)return NO;if([type isEqual:@"mixer"])return !DYChannelMixerActive(u);if([type isEqual:@"film"])return !DYFilmToolActive(u);if([type isEqual:@"skin"])return u.skinProtection.y==0;if([node[@"type"]isEqual:@"spider"]&&[node[@"spider"]length]){auto mesh=DYSpiderMesh(node[@"spider"]);for(float v:dy::meshSamples(mesh))if(v!=0)return NO;}if([node[@"paths"]count])return NO;for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if([type isEqual:@"primary"]&&[d[@"key"]isEqual:@"cmtoneMapping"]&&v.floatValue==0)continue;if(v&&v.floatValue!=[d[@"default"]floatValue])return NO;}return YES;}
BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms u=DYToolUniforms(node);NSDictionary *section=DYToolSection(type);BOOL enabled=YES;if([type isEqual:@"primary"])enabled=u.primarySectionEnabled>.5;else if([type isEqual:@"base"])enabled=u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;else for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:section[@"enabled"]])enabled=*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;if(!enabled)return YES;if([type isEqual:@"primary"]&&u.cm.toneMapping>.5)return NO;if([type isEqual:@"lens"])return u.lensStrength==0&&u.lensScale==1;if([type isEqual:@"mixer"])return !DYChannelMixerActive(u);if([type isEqual:@"film"])return !DYFilmToolActive(u);if([type isEqual:@"skin"])return u.skinProtection.y==0&&u.skinVisualize<.5;if([node[@"type"]isEqual:@"spider"]&&[node[@"spider"]length]){auto mesh=DYSpiderMesh(node[@"spider"]);for(float v:dy::meshSamples(mesh))if(v!=0)return NO;}if([node[@"paths"]count])return NO;for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if([type isEqual:@"primary"]&&[d[@"key"]isEqual:@"cmtoneMapping"]&&v.floatValue==0)continue;if(v&&v.floatValue!=[d[@"default"]floatValue])return NO;}return YES;}
@implementation DYToolManager {
id<PROAPIAccessing> _host;NSString *_nodeID,*_type;NSInteger _depth;CMTime _time;NSMutableDictionary *_pending;DYInspectorToken *_token;
+5 -1
查看文件
@@ -132,6 +132,9 @@ typedef struct DYUniforms {
DYFilmSettings film;
DYUInt filmFrameKey; // frozen render time, never an author parameter
DYFloat4 filmPrint; // appended after the complete 1.5.0 prefix: look, strength, reserved, reserved
// Append-only 1.11 extension; every historical offset remains unchanged.
float lensSectionEnabled,lensStrength,lensScale,lensCenterX;
float lensCenterY,skinFaceOnly,skinVisualize,extensionReserved;
} DYUniforms;
typedef struct DYVertex2D { DYFloat2 position; DYFloat2 textureCoordinate; } DYVertex2D;
@@ -152,7 +155,8 @@ DY_ABI_ASSERT(offsetof(DYUniforms, mixerRed) == 1104, "complete 1.4.3 prefix sta
DY_ABI_ASSERT(offsetof(DYUniforms, film) == 1168, "1.5.0 film settings stay fixed");
DY_ABI_ASSERT(offsetof(DYUniforms, filmFrameKey) == 1284, "1.5.0 frozen frame key stays fixed");
DY_ABI_ASSERT(offsetof(DYUniforms, filmPrint) == 1296, "complete 1.5.0 prefix stays fixed");
DY_ABI_ASSERT(sizeof(DYUniforms) == 1312, "1.6.0 uniform size");
DY_ABI_ASSERT(offsetof(DYUniforms, lensSectionEnabled) == 1312, "complete 1.10 prefix stays fixed");
DY_ABI_ASSERT(sizeof(DYUniforms) == 1344, "1.11 append-only extension size");
DY_ABI_ASSERT(offsetof(DYUniforms, exposure) == 0, "exposure offset");
DY_ABI_ASSERT(offsetof(DYUniforms, contrast) == 4, "contrast offset");
DY_ABI_ASSERT(offsetof(DYUniforms, highlights) == 8, "highlights offset");
+5 -5
查看文件
@@ -31,11 +31,11 @@ static const NSInteger DYViewerPartBase=20000;
for(DYViewerParameterPanel*p in [[_panels copy]autorelease]){if(!p.visible){if(p==_capture){[p finishCapture];_capture=nil;}p.bridge=nil;[_panels removeObjectIdenticalTo:p];continue;}[p setViewport:v];[p prepareWithSize:size scale:s atTime:time];}
if(_capture&&![_capture capturing])_capture=nil;
[_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return;
NSInteger cap=MAX(1,MIN(14,(NSInteger)floor((v.size.height-72*s)/(30*s))));if(cap<14)cap=MAX(1,MIN(13,(NSInteger)floor((v.size.height-96*s)/(30*s))));NSInteger pages=(14+cap-1)/cap;_railPage=MAX(0,_railPage)%pages;
NSInteger toolCount=DYToolTypes().count;NSInteger cap=MAX(1,MIN(toolCount,(NSInteger)floor((v.size.height-72*s)/(30*s))));if(cap<toolCount)cap=MAX(1,MIN(toolCount-1,(NSInteger)floor((v.size.height-96*s)/(30*s))));NSInteger pages=(toolCount+cap-1)/cap;_railPage=MAX(0,_railPage)%pages;
CGFloat x=NSMinX(v)+8*s,y=NSMinY(v)+8*s,w=40*s;
_rail=NSMakeRect(x,y,w,(30*MIN(cap,14-_railPage*cap)+54+(pages>1?24:0))*s);
NSArray*titles=@[@"一级",@"蜘蛛",@"基础",@"肤色",@"LUT",@"HSL",@"曲线",@"分级",@"原色",@"色阶",@"黑白",@"平衡",@"通道",@"胶片"];
for(NSInteger j=0;j<cap&&j+_railPage*cap<14;j++){NSInteger i=j+_railPage*cap;[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":DYToolTypes()[i],@"title":titles[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,y+5*s+j*30*s,w-8*s,26*s)]}];}
_rail=NSMakeRect(x,y,w,(30*MIN(cap,toolCount-_railPage*cap)+54+(pages>1?24:0))*s);
NSArray*titles=@[@"一级",@"蜘蛛",@"基础",@"肤色",@"LUT",@"HSL",@"曲线",@"分级",@"原色",@"色阶",@"黑白",@"平衡",@"通道",@"胶片",@"畸变"];
for(NSInteger j=0;j<cap&&j+_railPage*cap<toolCount;j++){NSInteger i=j+_railPage*cap;[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":DYToolTypes()[i],@"title":titles[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,y+5*s+j*30*s,w-8*s,26*s)]}];}
CGFloat end=NSMaxY(_rail)-47*s;if(pages>1){[_areas addObject:@{@"part":@20003,@"kind":@"railPage",@"title":@"↕",@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,end-24*s,w-8*s,22*s)]}];}
[_areas addObject:@{@"part":@20001,@"kind":@"workspace",@"title":@"◫",@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,end,w-8*s,26*s)]}];
[_areas addObject:@{@"part":@20002,@"kind":@"hidePanels",@"title":@"收",@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,end+27*s,w-8*s,18*s)]}];
@@ -59,7 +59,7 @@ static const NSInteger DYViewerPartBase=20000;
}
- (void)activateTool:(NSString*)type{
for(DYViewerParameterPanel*p in [[_panels copy]autorelease])if([p.toolType isEqual:type]){[p finishCapture];p.bridge=nil;[_panels removeObjectIdenticalTo:p];return;}
DYViewerParameterPanel*p=[[[DYViewerParameterPanel alloc]init]autorelease];p.toolType=type;p.bridge=_bridge;
[_bridge requestTool:type];DYViewerParameterPanel*p=[[[DYViewerParameterPanel alloc]init]autorelease];p.toolType=type;p.bridge=_bridge;
CGFloat x=(_rail.size.width+24*_scale)/MAX(1.,_viewport.size.width),offset=(_panels.count%4)*22*_scale;
[p setInitialPosition:NSMakePoint(x+offset/MAX(1.,_viewport.size.width),(8*_scale+offset)/MAX(1.,_viewport.size.height))];[_panels addObject:p];
}
@@ -13,9 +13,9 @@
publish();int undo=base->_undoStarts;NSDictionary*initial=[[base->_values copy]autorelease];
NSMutableSet*types=[NSMutableSet set];CGFloat x=-1,lastY=-1;BOOL vertical=YES;
for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(x>=0)vertical&=r.origin.x==x&&r.origin.y>lastY;x=r.origin.x;lastY=r.origin.y;[types addObject:a[@"toolType"]];}
run.record(@"viewer-vertical-rail-exposes-fourteen-tools-without-a-parameter-panel",vertical&&types.count==14&&[[controls valueForKey:@"panels"]count]==0);
run.record(@"viewer-vertical-rail-exposes-all-tools-without-a-parameter-panel",vertical&&types.count==DYToolTypes().count&&[[controls valueForKey:@"panels"]count]==0);
BOOL allOpen=YES;for(NSString*type in DYToolTypes()){click(areaFor(controls,@"tool",type));allOpen&=panelFor(type)!=nil;}
run.record(@"viewer-tools-open-independent-panels-without-editing-the-grade",allOpen&&[[controls valueForKey:@"panels"]count]==14&&[initial isEqual:base->_values]&&base->_undoStarts==undo);
run.record(@"viewer-tools-open-independent-panels-without-editing-the-grade",allOpen&&[[controls valueForKey:@"panels"]count]==DYToolTypes().count&&[initial isEqual:base->_values]&&base->_undoStarts==undo);
click(areaFor(controls,@"hidePanels",nil));click(areaFor(controls,@"tool",@"base"));id panel=panelFor(@"base");
NSRect before=[[panel valueForKey:@"panel"]rectValue],header=[areaFor(panel,@"open",nil)[@"rect"]rectValue];NSPoint hp=NSMakePoint(NSMidX(header),NSMidY(header));
[controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(hp.x+90,hp.y+20) atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(hp.x+140,hp.y+30) atTime:host->_time];NSRect after=[[panel valueForKey:@"panel"]rectValue];
@@ -74,11 +74,11 @@
[controls setViewport:NSMakeRect(40,30,1160,650)];[controls prepareWithSize:size scale:1 atTime:host->_time];NSRect rail=[[controls valueForKey:@"rail"]rectValue];run.record(@"viewer-rail-is-anchored-to-image-and-not-letterbox",NSContainsRect(NSMakeRect(40,30,1160,650),rail)&&[controls partAtPoint:NSMakePoint(NSMidX(rail),20)]==0);
// Offscreen drawing checks the actual OSC renderer, without opening an APP.
[controls setViewport:NSMakeRect(0,0,1280,720)];[controls prepareWithSize:size scale:1 atTime:host->_time];
for(NSString*type in @[@"base",@"curve",@"grading"]){click(areaFor(controls,@"tool",type));id p=panelFor(type);CGFloat px=[type isEqual:@"base"]?.05:[type isEqual:@"curve"]?.32:.59;[p setValue:[NSValue valueWithPoint:NSMakePoint(px,.1)]forKey:@"position"];}
for(NSString*type in @[@"hsl",@"curve",@"spider"]){click(areaFor(controls,@"tool",type));id p=panelFor(type);CGFloat px=[type isEqual:@"hsl"]?.05:[type isEqual:@"curve"]?.32:.59;[p setValue:[NSValue valueWithPoint:NSMakePoint(px,.1)]forKey:@"position"];}
[controls prepareWithSize:size scale:1 atTime:host->_time];
NSBitmapImageRep*bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:1280 pixelsHigh:720 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:1280*4 bitsPerPixel:32]autorelease];
[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];NSAffineTransform*flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:720];[flip scaleXBy:1 yBy:-1];[flip concat];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:NSGraphicsContext.currentContext.CGContext flipped:YES]];
[[NSColor colorWithCalibratedWhite:.2 alpha:1]setFill];NSRectFill(NSMakeRect(0,0,1280,720));[controls draw];[NSGraphicsContext restoreGraphicsState];NSString*png=[runtime stringByAppendingPathComponent:@"viewer-workspace.png"];
run.record(@"viewer-real-osc-draws-vertical-rail-curves-and-wheels-offscreen",[[bitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:png atomically:YES],@{@"path":png});
run.record(@"viewer-real-osc-draws-curves-hsl-and-spider-offscreen",[[bitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:png atomically:YES],@{@"path":png});
[controls finishCapture];controls.bridge=nil;[bridge invalidate];drain();[controls release];[bridge release];
}
+42 -2
查看文件
@@ -1,4 +1,14 @@
// Methods of DYViewerParameterPanel. Geometry is shared by drawing and input.
- (BOOL)graphicKind:(NSString*)kind{return [@[@"curvePlot",@"wheel",@"hslPlot",@"spiderPlot"]containsObject:kind];}
- (NSData*)spiderData {if(_spiderDraft)return _spiderDraft;return [_nodeID hasPrefix:@"base:"]?_snapshot[@"spider"]:[self node][@"layer"][@"spider"];}
- (void)beginSpiderData {[_bridge beginSpider:[self spiderData] node:_nodeID enabled:[self graphicValue:@"spiderEnabled"] atTime:_time];}
- (void)spiderAction:(NSInteger)action {
auto mesh=DYSpiderMesh([self spiderData]);if(action==0){mesh=dy::neutralMesh(mesh.hues,mesh.rings+1);}
else if(action==3||action==4){int count=action==3?mesh.hues:mesh.rings+1;int next=count<12?12:count<24?24:6;mesh=dy::resampleMesh(mesh,action==3?next:mesh.hues,action==4?next:mesh.rings+1);_selectedSpider=-1;}
else if(_selectedSpider>=0&&_selectedSpider<dy::meshCount(mesh)){if(action==1)mesh.pins[_selectedSpider]=dy::meshBoundary(mesh,(int)_selectedSpider)||!mesh.pins[_selectedSpider];else {auto neutral=dy::neutralMesh(mesh.hues,mesh.rings+1);mesh.x[_selectedSpider]=neutral.x[_selectedSpider];mesh.y[_selectedSpider]=neutral.y[_selectedSpider];}}
else return;
[self beginSpiderData];[_bridge changeSpider:[NSData dataWithBytes:&mesh length:sizeof(mesh)]];[_bridge endGesture];
}
- (double)graphicValue:(NSString*)key{return [self valueForDescriptor:[self descriptorForKey:key]];}
- (NSArray*)curveSlots{
NSMutableArray*slots=[NSMutableArray array];NSInteger n=_channel==0?4:2;
@@ -11,7 +21,14 @@
}
- (void)layoutGraphicAt:(CGFloat)y{
if(!_snapshot||![self node]||_panel.size.width<180*_scale||_panel.size.height<180*_scale)return;CGFloat s=_scale,x=_panel.origin.x,w=_panel.size.width;
if([_toolType isEqual:@"curve"]){
if([_toolType isEqual:@"hsl"]){
for(NSInteger axis=0;axis<3;axis++)[self addArea:NSMakeRect(x+12*s+axis*(w-24*s)/3,y,(w-30*s)/3,23*s)part:22210+axis kind:@"hslAxis" title:@[@"色相",@"饱和度",@"明亮度"][axis]descriptor:nil index:axis];
[self addArea:NSMakeRect(x+18*s,y+34*s,w-36*s,MAX(40*s,NSMaxY(_panel)-y-85*s))part:22200 kind:@"hslPlot" title:@"" descriptor:nil index:0];
}else if([_toolType isEqual:@"spider"]){
CGFloat d=MAX(30*s,MIN(w-36*s,NSMaxY(_panel)-y-67*s));[self addArea:NSMakeRect(x+(w-d)/2,y,d,d)part:22300 kind:@"spiderPlot" title:@"" descriptor:nil index:0];
auto mesh=DYSpiderMesh([self spiderData]);NSArray *titles=@[@"全盘还原",@"固定点",@"还原点",[NSString stringWithFormat:@"色相 %d",mesh.hues],[NSString stringWithFormat:@"环数 %d",mesh.rings+1]];
for(NSInteger i=0;i<5;i++)[self addArea:NSMakeRect(x+8*s+i*(w-16*s)/5,NSMaxY(_panel)-53*s,(w-20*s)/5,23*s)part:22310+i kind:@"spiderAction" title:titles[i] descriptor:nil index:i];
}else if([_toolType isEqual:@"curve"]){
for(NSInteger c=0;c<4;c++)[self addArea:NSMakeRect(x+12*s+c*(w-24*s)/4,y,(w-30*s)/4,23*s)part:22010+c kind:@"channel" title:@[@"RGB",@"红",@"绿",@"蓝"][c] descriptor:nil index:c];
NSRect graph=NSMakeRect(x+18*s,y+31*s,w-36*s,MAX(45*s,NSMaxY(_panel)-y-84*s));[self addArea:graph part:22000 kind:@"curvePlot" title:@"" descriptor:nil index:0];
if(_selectedX)[self addArea:NSMakeRect(x+12*s,NSMaxY(_panel)-47*s,90*s,20*s)part:22020 kind:@"deletePoint" title:@"删除选中点" descriptor:nil index:0];
@@ -23,6 +40,23 @@
- (NSPoint)curvePosition:(NSDictionary*)p rect:(NSRect)r{return NSMakePoint(r.origin.x+[p[@"x"]doubleValue]*r.size.width,r.origin.y+(1-[p[@"y"]doubleValue])*r.size.height);}
- (void)drawGraphic:(NSDictionary*)area{
CGFloat s=_scale;NSRect r=[area[@"rect"]rectValue];NSColor*ink=DYThemeColor(@"text"),*accent=DYThemeColor(@"accent");
if([area[@"kind"]isEqual:@"hslPlot"]){
[NSGraphicsContext saveGraphicsState];NSRectClip(r);[[ink colorWithAlphaComponent:.18]setStroke];NSBezierPath *mid=[NSBezierPath bezierPath];[mid moveToPoint:NSMakePoint(NSMinX(r),NSMidY(r))];[mid lineToPoint:NSMakePoint(NSMaxX(r),NSMidY(r))];[mid stroke];
NSBezierPath *curve=[NSBezierPath bezierPath];curve.lineWidth=1.5*s;
for(int i=0;i<8;i++){double v=[self graphicValue:[NSString stringWithFormat:@"hsl%ld_%d",(long)_hslAxis,i]];CGFloat xx=NSMinX(r)+(i+.5)*r.size.width/8,yy=NSMidY(r)-v/200*r.size.height;NSPoint point=NSMakePoint(xx,yy);if(i==0)[curve moveToPoint:point];else[curve lineToPoint:point];}
[accent setStroke];[curve stroke];
for(int i=0;i<8;i++){double v=[self graphicValue:[NSString stringWithFormat:@"hsl%ld_%d",(long)_hslAxis,i]];CGFloat xx=NSMinX(r)+(i+.5)*r.size.width/8,yy=NSMidY(r)-v/200*r.size.height;NSColor *c=[NSColor colorWithHue:i/8. saturation:.7 brightness:.95 alpha:.9];[c setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(xx-5*s,yy-5*s,10*s,10*s)]fill];[self text:[NSString stringWithFormat:@"%.0f",v]rect:NSMakeRect(xx-15*s,MIN(NSMaxY(r)-15*s,yy+7*s),30*s,15*s)size:8 color:ink alignment:NSTextAlignmentCenter];}
[NSGraphicsContext restoreGraphicsState];[self text:@"红 橙 黄 绿 青 蓝 紫 洋红" rect:NSMakeRect(r.origin.x,NSMaxY(r)+3*s,r.size.width,15*s)size:9 color:ink alignment:NSTextAlignmentCenter];return;
}
if([area[@"kind"]isEqual:@"spiderPlot"]){
auto mesh=DYSpiderMesh([self spiderData]);CGFloat rad=r.size.width/2;NSPoint center=NSMakePoint(NSMidX(r),NSMidY(r));
for(int i=0;i<64;i++){double a=i*2*M_PI/64,b=(i+1)*2*M_PI/64;NSBezierPath *wedge=[NSBezierPath bezierPath];[wedge moveToPoint:center];[wedge lineToPoint:NSMakePoint(center.x+cos(a)*rad,center.y+sin(a)*rad)];[wedge lineToPoint:NSMakePoint(center.x+cos(b)*rad,center.y+sin(b)*rad)];[wedge closePath];[[NSColor colorWithHue:i/64. saturation:.8 brightness:.8 alpha:.24]setFill];[wedge fill];}
auto point=[&](int i){return NSMakePoint(r.origin.x+mesh.x[i]*r.size.width,r.origin.y+mesh.y[i]*r.size.height);};NSBezierPath *net=[NSBezierPath bezierPath];net.lineWidth=.6*s;
for(int ring=1;ring<=mesh.rings;ring++)for(int hue=0;hue<=mesh.hues;hue++){NSPoint q=point(dy::meshIndex(mesh,hue%mesh.hues,ring));if(hue==0)[net moveToPoint:q];else[net lineToPoint:q];}
for(int hue=0;hue<mesh.hues;hue++){[net moveToPoint:point(dy::meshCount(mesh)-1)];for(int ring=1;ring<=mesh.rings;ring++)[net lineToPoint:point(dy::meshIndex(mesh,hue,ring))];}
[[ink colorWithAlphaComponent:.5]setStroke];[net stroke];
for(int i=0;i<dy::meshCount(mesh);i++){NSPoint q=point(i);CGFloat rr=(i==_selectedSpider?4:2)*s;[(i==_selectedSpider?accent:ink)setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-rr,q.y-rr,2*rr,2*rr)]fill];if(mesh.pins[i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(q.x-s,q.y-s,2*s,2*s));}}return;
}
if([area[@"kind"]isEqual:@"wheel"]){
NSInteger index=[area[@"index"]integerValue];[self text:area[@"title"]rect:NSMakeRect(r.origin.x,r.origin.y-19*s,r.size.width,17*s)size:10 color:ink alignment:NSTextAlignmentCenter];
// Cached raster is generated from the same HSV convention as the renderer controls.
@@ -34,7 +68,9 @@
NSPoint p=NSMakePoint(NSMidX(r)+cos(angle)*rad,NSMidY(r)-sin(angle)*rad);[NSColor.blackColor setStroke];NSBezierPath*knob=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-5*s,p.y-5*s,10*s,10*s)];knob.lineWidth=3*s;[knob stroke];[NSColor.whiteColor setStroke];knob.lineWidth=1.4*s;[knob stroke];
return;
}
DYDrawSoftControl(r,4*s,YES,NO,NO);[NSGraphicsContext saveGraphicsState];NSRectClip(r);
[[ink colorWithAlphaComponent:.06]setFill];[[NSBezierPath bezierPathWithRect:r]fill];[NSGraphicsContext saveGraphicsState];NSRectClip(r);
NSData *rawHistogram=_snapshot[@"histogram"];const DYHistogram *hist=rawHistogram.length==sizeof(DYHistogram)?(const DYHistogram*)rawHistogram.bytes:nullptr;
if(hist&&hist->samples){uint32_t peak=1;for(int c=0;c<4;c++)if(_channel==0||c==_channel)for(int b=0;b<256;b++)peak=MAX(peak,hist->bins[c][b]);NSArray *colors=@[ink,NSColor.systemRedColor,NSColor.systemGreenColor,NSColor.systemBlueColor];for(int c=3;c>=0;c--){if(_channel&&c!=_channel)continue;NSBezierPath *area=[NSBezierPath bezierPath];[area moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];for(int b=0;b<256;b++)[area lineToPoint:NSMakePoint(NSMinX(r)+b/255.*r.size.width,NSMaxY(r)-sqrt(hist->bins[c][b]/double(peak))*r.size.height*.86)];[area lineToPoint:NSMakePoint(NSMaxX(r),NSMaxY(r))];[area closePath];[[colors[c]colorWithAlphaComponent:c==0?.08:.2]setFill];[area fill];}}
[[ink colorWithAlphaComponent:.16]setStroke];NSBezierPath*grid=[NSBezierPath bezierPath];grid.lineWidth=.5*s;
for(int i=0;i<5;i++){CGFloat x=r.origin.x+r.size.width*i/4,y=r.origin.y+r.size.height*i/4;[grid moveToPoint:NSMakePoint(x,NSMinY(r))];[grid lineToPoint:NSMakePoint(x,NSMaxY(r))];[grid moveToPoint:NSMakePoint(NSMinX(r),y)];[grid lineToPoint:NSMakePoint(NSMaxX(r),y)];}[grid stroke];
[[ink colorWithAlphaComponent:.2]setStroke];NSBezierPath*diagonal=[NSBezierPath bezierPath];[diagonal moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];[diagonal lineToPoint:NSMakePoint(NSMaxX(r),NSMinY(r))];[diagonal stroke];
@@ -51,6 +87,8 @@
}
- (void)beginGraphicAt:(NSPoint)p{
if(!_snapshot||![self node])return;NSMutableDictionary*c=[[_captured mutableCopy]autorelease];NSRect r=[c[@"rect"]rectValue];NSString*xKey=nil,*yKey=nil;
if([c[@"kind"]isEqual:@"spiderPlot"]){auto mesh=DYSpiderMesh([self spiderData]);double best=12*_scale;NSInteger chosen=-1;for(int i=0;i<dy::meshCount(mesh);i++){double distance=hypot(p.x-(r.origin.x+mesh.x[i]*r.size.width),p.y-(r.origin.y+mesh.y[i]*r.size.height));if(distance<best){best=distance;chosen=i;}}if(chosen<0)return;_selectedSpider=chosen;c[@"meshStart"]=[NSData dataWithBytes:&mesh length:sizeof(mesh)];[_captured release];_captured=[c copy];[self beginSpiderData];return;}
if([c[@"kind"]isEqual:@"hslPlot"]){NSInteger color=MAX(0,MIN(7,(NSInteger)((p.x-r.origin.x)/r.size.width*8)));NSString *key=[NSString stringWithFormat:@"hsl%ld_%ld",(long)_hslAxis,(long)color];c[@"hslKey"]=key;[_captured release];_captured=[c copy];[_bridge beginParameter:[self descriptorForKey:key]node:_nodeID value:[self graphicValue:key]atTime:_time];return;}
if([c[@"kind"]isEqual:@"curvePlot"]){NSDictionary*nearest=nil;double distance=12*_scale;for(NSDictionary*point in [self curvePoints]){NSPoint q=[self curvePosition:point rect:r];double d=hypot(q.x-p.x,q.y-p.y);if(d<distance){distance=d;nearest=point;}}
if(!nearest)for(NSDictionary*slot in [self curveSlots])if([self graphicValue:slot[@"xKey"]]<0){nearest=slot;break;}
if(!nearest)return;xKey=nearest[@"xKey"];yKey=nearest[@"yKey"];[_selectedX release];_selectedX=[xKey copy];c[@"newPoint"]=@([self graphicValue:xKey]<0);
@@ -60,6 +98,8 @@
if([c[@"newPoint"]boolValue]||[c[@"kind"]isEqual:@"wheel"])[self updateGraphicAt:p];
}
- (void)updateGraphicAt:(NSPoint)p{
if([_captured[@"kind"]isEqual:@"spiderPlot"]){NSData *start=_captured[@"meshStart"];if(!start||_selectedSpider<0)return;NSRect r=[_captured[@"rect"]rectValue];auto mesh=DYSpiderMesh(start);std::bitset<dy::SpiderMeshCapacity> selected;selected[_selectedSpider]=true;auto moved=dy::moveMesh(mesh,selected,(p.x-_down.x)/r.size.width,(p.y-_down.y)/r.size.height);[_spiderDraft release];_spiderDraft=[[NSData alloc]initWithBytes:&moved length:sizeof(moved)];[_bridge changeSpider:_spiderDraft];return;}
if([_captured[@"kind"]isEqual:@"hslPlot"]){NSString *key=_captured[@"hslKey"];if(!key)return;NSRect r=[_captured[@"rect"]rectValue];double v=MAX(-100.,MIN(100.,(NSMidY(r)-p.y)/r.size.height*200));_draftValues[key]=@(v);[_bridge changeValue:v];return;}
NSString*xKey=_captured[@"xKey"],*yKey=_captured[@"yKey"];if(!xKey||!yKey)return;NSRect r=[_captured[@"rect"]rectValue];double x,y;
if([_captured[@"kind"]isEqual:@"curvePlot"]){x=MAX(.001,MIN(.999,(p.x-r.origin.x)/MAX(1.,r.size.width)));double output=MAX(0.,MIN(1.,1-(p.y-r.origin.y)/MAX(1.,r.size.height)));
for(NSDictionary*point in [self curvePoints])if(![point[@"xKey"]isEqual:xKey]){double other=[point[@"x"]doubleValue];if(fabs(x-other)<.001)x=x<other?other-.001:other+.001;}x=MAX(.001,MIN(.999,x));y=(output-x)*100;
@@ -1,3 +1,6 @@
#include "DYSpiderState.h"
#import "DYHistogram.h"
// The OSC side publishes values and enqueues intent. Only the main queue enters
// host actions; no OSC/render callback waits for AppKit or a host model write.
@interface DYViewerParameterBridge : NSObject
@@ -14,6 +17,11 @@
// Call before the owning plug-in releases this object during teardown.
- (void)invalidate;
- (void)requestWorkspace;
- (void)requestTool:(NSString*)type;
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time;
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
- (void)changeSpider:(NSData*)mesh;
- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time;
@end
static BOOL DYViewerSameValue(double a,double b) {
@@ -59,7 +67,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
NSString *_writerNode,*_writerType;
CMTime _writerTime;
uint64_t _writerGesture;
BOOL _writerUndoOpen;
BOOL _writerUndoOpen,_writerSpider; NSData *_writerLastMesh;
}
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager {
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;}return self;
@@ -71,6 +79,16 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release];
[_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[super dealloc];
}
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time {
@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"spider"]=assets.spiderMesh?:[NSData data];if(histogram)next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];}
}
- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time {
if(histogram.length!=sizeof(DYHistogram))return;@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];}
}
- (void)requestTool:(NSString*)type {
if(![DYToolTypes()containsObject:type])return;
dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerToolRequested" object:manager userInfo:@{@"type":type}];});
}
- (void)requestWorkspace{
dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!_invalidated)manager=_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:manager];});
}
@@ -88,7 +106,9 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
NSData *bytes=[NSData dataWithBytes:uniforms length:sizeof(*uniforms)];BOOL validate=NO;
@synchronized(self){
if(!_invalidated){
NSData *sameHistogram=CMTimeCompare(_snapshotTime,time)==0?[_snapshot[@"histogram"]retain]:nil;
[_snapshot release];_snapshot=[@{@"uniforms":bytes,@"document":frozen,@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch)}copy];
if(sameHistogram){NSMutableDictionary *withHistogram=[[_snapshot mutableCopy]autorelease];withHistogram[@"histogram"]=sameHistogram;[_snapshot release];_snapshot=[withHistogram copy];[sameHistogram release];}
[_sourceDocument release];_sourceDocument=[document retain];_snapshotTime=time;
if(_requestedGesture&&!_validationScheduled){_validationScheduled=YES;validate=YES;}
}
@@ -111,7 +131,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
id<FxCustomParameterActionAPI_v4>action=[_writerHost apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
[action startAction:self];@try{[[_writerHost apiForProtocol:@protocol(FxUndoAPI)]endUndoGroup];}@finally{[action endAction:self];}
}
_writerUndoOpen=NO;_writerGesture=0;_writerTime=kCMTimeInvalid;
_writerUndoOpen=NO;_writerSpider=NO;[_writerLastMesh release];_writerLastMesh=nil;_writerGesture=0;_writerTime=kCMTimeInvalid;
[_writerHost release];_writerHost=nil;[_writerTarget release];_writerTarget=nil;
[_writerDescriptors release];_writerDescriptors=nil;[_writerLastValues release];_writerLastValues=nil;
[_writerCompanions release];_writerCompanions=nil;
@@ -124,6 +144,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
}
- (BOOL)writerValueMatches {
if(![self writerNodeExists])return NO;
if(_writerSpider){NSData *current=DYReadAssets(_writerTarget,_writerTime).spiderMesh?:[NSData data];if(![current isEqual:_writerLastMesh])return NO;}
id<FxParameterRetrievalAPI_v6>get=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
for(NSDictionary *d in _writerDescriptors){double value=NAN;
if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!DYViewerSameValue(value,[_writerLastValues[d[@"key"]]doubleValue]))return NO;
@@ -180,6 +201,33 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
});
[node release];[selected release];[initial release];
}
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time {
if(mesh.length&&!DYSpiderMeshIsValid(mesh))return;NSDictionary *descriptor=nil;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"spiderEnabled"])descriptor=d;
if(!descriptor)return;[self beginParameter:descriptor node:node value:enabled atTime:time];uint64_t gesture;@synchronized(self){gesture=_requestedGesture;}NSData *original=[mesh copy]?:[NSData new];
dispatch_async(dispatch_get_main_queue(),^{if(self->_writerGesture==gesture&&[self->_writerType isEqual:@"spider"]){self->_writerSpider=YES;self->_writerLastMesh=[original copy];if(![self writerStillValid])[self closeWriter];}});[original release];
}
- (void)changeSpider:(NSData*)mesh {
if(!DYSpiderMeshIsValid(mesh))return;NSData *frozen=[mesh copy];uint64_t gesture;@synchronized(self){gesture=_invalidated?0:_requestedGesture;}
if(gesture)dispatch_async(dispatch_get_main_queue(),^{
if(self->_writerGesture!=gesture||!self->_writerSpider)return;
if(![self writerStillValid]){[self closeWriter];return;}
if([frozen isEqual:self->_writerLastMesh])return;
id<FxCustomParameterActionAPI_v4>a=[self->_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL changed=NO,failed=NO;
[a startAction:self];@try{
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(a.currentTime,self->_writerTime)!=0||![self writerValueMatches]){failed=YES;}
else{
if(!self->_writerUndoOpen)self->_writerUndoOpen=[[self->_writerHost apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"画面调整 · 蜘蛛盘"];
if(self->_writerUndoOpen){DYAssetState *old=DYReadAssets(self->_writerTarget,self->_writerTime);DYAssetState *next=[[old copy]autorelease];next.spiderMesh=frozen;
failed=!DYWriteAssets(self->_writerTarget,next,self->_writerTime);
if(failed)DYWriteAssets(self->_writerTarget,old,self->_writerTime);else changed=YES;
}
}
}@finally{[a endAction:self];}
// Re-read after DYToolManager commits its document at the outer boundary.
if(changed){[a startAction:self];NSData *actual=nil;@try{actual=[DYReadAssets(self->_writerTarget,self->_writerTime).spiderMesh retain];}@finally{[a endAction:self];}BOOL saved=[actual isEqual:frozen];[actual release];if(!saved)failed=YES;else{[self->_writerLastMesh release];self->_writerLastMesh=[frozen copy];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];}}
if(failed)[self closeWriter];
});[frozen release];
}
- (void)writeValues:(NSDictionary<NSString*,NSNumber*>*)values gesture:(uint64_t)gesture {
NSCAssert(NSThread.isMainThread,@"Host writes require the main queue");
if(!_writerGesture||gesture!=_writerGesture||values.count!=_writerDescriptors.count)return;
@@ -18,17 +18,17 @@
@end
@implementation DYViewerParameterPanel {
DYViewerParameterBridge *_bridge;NSDictionary *_snapshot;NSArray *_nodes,*_rows;NSMutableArray *_areas;
NSString *_nodeID,*_toolType,*_selectedX;NSMutableDictionary *_draftValues;NSInteger _channel;BOOL _graphMode,_visible;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft,_positioned,_movingPanel;NSPoint _position,_panelStart;
NSString *_nodeID,*_toolType,*_selectedX;NSMutableDictionary *_draftValues;NSInteger _channel,_hslAxis,_selectedSpider;NSData *_spiderDraft;BOOL _graphMode,_visible;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft,_positioned,_movingPanel;NSPoint _position,_panelStart;
NSInteger _page,_catalogPage,_capacity,_catalogCapacity,_hover,_pressed;NSPoint _down;NSDictionary *_captured;
double _draftValue,_downValue;CGFloat _knobOffset;CMTime _time,_downTime;
}
@synthesize bridge=_bridge,toolType=_toolType,visible=_visible;
- (void)setInitialPosition:(NSPoint)p{_position=p;_positioned=YES;}
- (instancetype)init{if((self=[super init])){_areas=[NSMutableArray new];_nodeID=[@"base:base" copy];_scale=1;_open=YES;_visible=YES;_graphMode=YES;_draftValues=[NSMutableDictionary new];_time=_downTime=kCMTimeInvalid;}return self;}
- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_toolType release];[_selectedX release];[_draftValues release];[_captured release];[super dealloc];}
- (instancetype)init{if((self=[super init])){_areas=[NSMutableArray new];_nodeID=[@"base:base" copy];_scale=1;_open=YES;_visible=YES;_graphMode=YES;_selectedSpider=-1;_draftValues=[NSMutableDictionary new];_time=_downTime=kCMTimeInvalid;}return self;}
- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_spiderDraft release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_toolType release];[_selectedX release];[_draftValues release];[_captured release];[super dealloc];}
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;if(_pressed)[_bridge endGesture];[_bridge release];_bridge=[bridge retain];_pressed=0;_dragging=NO;_movingPanel=NO;[_captured release];_captured=nil;}
- (BOOL)capturing{return _pressed!=0;}
- (BOOL)finishCapture{BOOL had=_pressed!=0;if(had)[_bridge endGesture];_pressed=0;_hasDraft=NO;[_draftValues removeAllObjects];_movingPanel=NO;_dragging=NO;[_captured release];_captured=nil;return had;}
- (BOOL)finishCapture{BOOL had=_pressed!=0;if(had)[_bridge endGesture];_pressed=0;_hasDraft=NO;[_spiderDraft release];_spiderDraft=nil;[_draftValues removeAllObjects];_movingPanel=NO;_dragging=NO;[_captured release];_captured=nil;return had;}
- (NSDictionary*)descriptorForKey:(NSString*)key{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;}
- (NSDictionary*)node{for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:_nodeID])return n;return nil;}
- (double)valueForDescriptor:(NSDictionary*)d{
@@ -62,7 +62,7 @@
CGFloat s=_scale,margin=8*s,w=MIN(300*s,size.width-2*margin);_capacity=MAX(1,MIN(5,(NSInteger)floor((size.height-124*s)/(46*s))));
_catalogCapacity=MAX(1,MIN(7,(NSInteger)floor((size.height-124*s)/(32*s))));
_page=MIN(MAX(0,_page),MAX(0,((NSInteger)_rows.count-1)/_capacity));_catalogPage=MIN(MAX(0,_catalogPage),MAX(0,((NSInteger)_nodes.count-1)/_catalogCapacity));
BOOL graph=_graphMode&&([type isEqual:@"curve"]||[type isEqual:@"grading"]);
BOOL graph=_graphMode&&([@[@"curve",@"grading",@"hsl",@"spider"]containsObject:type]);
CGFloat body=_catalog?32*MIN(_catalogCapacity,(NSInteger)_nodes.count):graph?([type isEqual:@"curve"]?236:278):46*MIN(_capacity,(NSInteger)_rows.count);
CGFloat h=_open?(100+body)*s:30*s,panelHeight=MIN(h,size.height-2*margin),x=viewport.origin.x+margin,top=viewport.origin.y+margin;
if(_positioned){x=MAX(viewport.origin.x+margin,MIN(NSMaxX(viewport)-margin-w,viewport.origin.x+_position.x*size.width));top=MAX(viewport.origin.y+margin,MIN(NSMaxY(viewport)-margin-panelHeight,viewport.origin.y+_position.y*size.height));}
@@ -85,7 +85,7 @@
[self addArea:NSMakeRect(x+10*s,y+i*46*s,w-46*s,40*s) part:21000+i*3 kind:valueKind title:d[@"title"] descriptor:d index:i];
[self addArea:NSMakeRect(NSMaxX(_panel)-31*s,y+i*46*s+5*s,23*s,29*s) part:21001+i*3 kind:@"reset" title:@"↺" descriptor:d index:i];}y+=MIN(_capacity,(NSInteger)_rows.count)*46*s;
}
if([type isEqual:@"curve"]||[type isEqual:@"grading"])[self addArea:NSMakeRect(NSMaxX(_panel)-110*s,NSMaxY(_panel)-23*s,66*s,19*s) part:20008 kind:@"graphMode" title:_graphMode?@"参数 ›":@"图形 ›" descriptor:nil index:0];
if([@[@"curve",@"grading",@"hsl",@"spider"]containsObject:type])[self addArea:NSMakeRect(NSMaxX(_panel)-110*s,NSMaxY(_panel)-23*s,66*s,19*s) part:20008 kind:@"graphMode" title:_graphMode?@"参数 ›":@"图形 ›" descriptor:nil index:0];
NSInteger total=_catalog?_nodes.count:_rows.count,cap=_catalog?_catalogCapacity:_capacity;
if(total>cap&&(_catalog||!graph)){[self addArea:NSMakeRect(x+8*s,y,29*s,23*s) part:20004 kind:@"previous" title:@"‹" descriptor:nil index:0];[self addArea:NSMakeRect(NSMaxX(_panel)-37*s,y,29*s,23*s) part:20005 kind:@"next" title:@"›" descriptor:nil index:0];}
}
@@ -102,22 +102,23 @@
}
- (void)draw{
if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height)));CGFloat s=_scale;NSColor*ink=DYThemeColor(@"text")?:NSColor.whiteColor,*accent=DYThemeColor(@"accent")?:NSColor.systemCyanColor;
NSBezierPath*panel=[NSBezierPath bezierPathWithRoundedRect:_panel xRadius:9*s yRadius:9*s];DYDrawThemeSurface(panel,YES);
NSBezierPath*panel=[NSBezierPath bezierPathWithRoundedRect:_panel xRadius:9*s yRadius:9*s];BOOL solid=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
[[DYThemeColor(@"surface")?:DYThemeColor(@"background")?:NSColor.blackColor colorWithAlphaComponent:solid?1:.66]setFill];[panel fill];[[ink colorWithAlphaComponent:.32]setStroke];panel.lineWidth=s;[panel stroke];
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];NSInteger part=[a[@"part"]integerValue];NSString*kind=a[@"kind"];BOOL pressed=_pressed==part,hover=_hover==part;NSDictionary*d=a[@"descriptor"];
if([kind isEqual:@"curvePlot"]||[kind isEqual:@"wheel"]){[self drawGraphic:a];continue;}
if([self graphicKind:kind]){[self drawGraphic:a];continue;}
if([kind isEqual:@"slider"]){double v=[self valueForDescriptor:d],lo=[d[@"min"]doubleValue],hi=[d[@"max"]doubleValue];CGFloat ratio=hi>lo?MAX(0.,MIN(1.,(v-lo)/(hi-lo))):0;NSRect track=[self trackForArea:a];
[self text:a[@"title"] rect:NSMakeRect(r.origin.x,r.origin.y,r.size.width-68*s,18*s) size:11 color:ink alignment:NSTextAlignmentLeft];[self text:[self valueText:d value:v] rect:NSMakeRect(NSMaxX(r)-68*s,r.origin.y,68*s,18*s) size:11 color:hover||pressed?accent:ink alignment:NSTextAlignmentRight];
DYDrawSoftControl(NSInsetRect(track,-2*s,-3*s),5*s,YES,NO,NO);[accent setFill];[[NSBezierPath bezierPathWithRoundedRect:NSMakeRect(track.origin.x,track.origin.y,MAX(2*s,track.size.width*ratio),track.size.height) xRadius:2*s yRadius:2*s]fill];
CGFloat marker=MAX(0.,MIN(1.,([d[@"default"]doubleValue]-lo)/(hi-lo)));[ink setStroke];NSBezierPath*tick=[NSBezierPath bezierPath];[tick moveToPoint:NSMakePoint(track.origin.x+marker*track.size.width,NSMidY(track)-5*s)];[tick lineToPoint:NSMakePoint(track.origin.x+marker*track.size.width,NSMidY(track)+5*s)];tick.lineWidth=.7*s;[tick stroke];
DYDrawSoftControl(NSMakeRect(track.origin.x+ratio*track.size.width-6*s,NSMidY(track)-6*s,12*s,12*s),6*s,NO,hover||pressed,pressed);
}else{
BOOL selected=([kind isEqual:@"channel"]&&[a[@"index"]integerValue]==_channel)||([kind isEqual:@"module"]&&[a[@"nodeID"]isEqual:_nodeID])||([kind isEqual:@"tool"]&&[a[@"toolType"]isEqual:[self node][@"type"]]);BOOL on=([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])&&[self valueForDescriptor:d]>.5;
BOOL selected=(([kind isEqual:@"channel"]&&[a[@"index"]integerValue]==_channel)||([kind isEqual:@"hslAxis"]&&[a[@"index"]integerValue]==_hslAxis))||([kind isEqual:@"module"]&&[a[@"nodeID"]isEqual:_nodeID])||([kind isEqual:@"tool"]&&[a[@"toolType"]isEqual:[self node][@"type"]]);BOOL on=([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])&&[self valueForDescriptor:d]>.5;
DYDrawSoftControl(r,5*s,NO,hover||selected||on,pressed);NSString*title=a[@"title"];
if(d&&![kind isEqual:@"reset"]){NSString*value=[self valueText:d value:[self valueForDescriptor:d]];title=[kind isEqual:@"headerBool"]?(title.length?title:([self valueForDescriptor:d]>.5?@"●":@"○")):[NSString stringWithFormat:@"%@ %@%@",title,value,[kind isEqual:@"choice"]?@" ›":@""];}
[self text:title rect:NSInsetRect(r,5*s,5*s) size:[kind isEqual:@"open"]?12:11 color:[kind isEqual:@"toolUnavailable"]?[ink colorWithAlphaComponent:.35]:ink alignment:NSTextAlignmentCenter];
}
}
if(_open){NSString*hint=_catalog?@"选择当前工具的图层":(_graphMode&&[_toolType isEqual:@"curve"])?@"点击加点 · 拖动调整":(_graphMode&&[_toolType isEqual:@"grading"])?@"拖动色轮 · 参数查看亮度":@"拖动调节 · ↺ 还原";if(_hover==20000||_movingPanel)hint=@"拖动标题移动 · 单击折叠";[self text:hint rect:NSMakeRect(_panel.origin.x+40*s,NSMaxY(_panel)-22*s,_panel.size.width-168*s,18*s) size:9 color:ink alignment:NSTextAlignmentCenter];}
if(_open){NSString*hint=_catalog?@"选择当前工具的图层":(_graphMode&&[_toolType isEqual:@"curve"])?@"点击加点 · 拖动调整":(_graphMode&&[_toolType isEqual:@"grading"])?@"拖动色轮 · 参数查看亮度":@"拖动调节 · ↺ 还原";if(_graphMode&&[_toolType isEqual:@"hsl"])hint=@"拖动色点 · 参数精调";if(_graphMode&&[_toolType isEqual:@"spider"])hint=@"拖点联动 · 固定与还原选中点";if(_hover==20000||_movingPanel)hint=@"拖动标题移动 · 单击折叠";[self text:hint rect:NSMakeRect(_panel.origin.x+40*s,NSMaxY(_panel)-22*s,_panel.size.width-168*s,18*s) size:9 color:ink alignment:NSTextAlignmentCenter];}
[NSGraphicsContext restoreGraphicsState];
}
- (NSInteger)partAtPoint:(NSPoint)p{if(!_visible||!std::isfinite(p.x)||!std::isfinite(p.y)||!_bridge||!NSPointInRect(p,NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height))))return 0;for(NSDictionary*a in [_areas reverseObjectEnumerator])if(![a[@"kind"]isEqual:@"toolUnavailable"]&&NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];return _open&&NSPointInRect(p,_panel)?20006:0;}
@@ -126,7 +127,7 @@
NSRect t=[self trackForArea:_captured];NSDictionary*d=_captured[@"descriptor"];double ratio=MAX(0.,MIN(1.,(p.x-_knobOffset-t.origin.x)/MAX(1.,t.size.width)));_draftValue=[d[@"min"]doubleValue]+ratio*([d[@"max"]doubleValue]-[d[@"min"]doubleValue]);[_bridge changeValue:_draftValue];
}
- (void)clickArea:(NSDictionary*)a{
NSString*kind=a[@"kind"];if([kind isEqual:@"close"]){_visible=NO;return;}if([kind isEqual:@"open"]){_open=!_open;_catalog=NO;return;}if([kind isEqual:@"graphMode"]){_graphMode=!_graphMode;return;}if([kind isEqual:@"channel"]){_channel=[a[@"index"]integerValue];[_selectedX release];_selectedX=nil;return;}if([kind isEqual:@"deletePoint"]){[self deleteSelectedPoint];return;}if([kind isEqual:@"catalog"]){_catalog=!_catalog;return;}
NSString*kind=a[@"kind"];if([kind isEqual:@"hslAxis"]){_hslAxis=[a[@"index"]integerValue];return;}if([kind hasPrefix:@"spiderAction"]){[self spiderAction:[a[@"index"]integerValue]];return;}if([kind isEqual:@"close"]){_visible=NO;return;}if([kind isEqual:@"open"]){_open=!_open;_catalog=NO;return;}if([kind isEqual:@"graphMode"]){_graphMode=!_graphMode;return;}if([kind isEqual:@"channel"]){_channel=[a[@"index"]integerValue];[_selectedX release];_selectedX=nil;return;}if([kind isEqual:@"deletePoint"]){[self deleteSelectedPoint];return;}if([kind isEqual:@"catalog"]){_catalog=!_catalog;return;}
if([kind isEqual:@"module"]||[kind isEqual:@"tool"]){for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:a[@"nodeID"]]){[_nodeID release];_nodeID=[a[@"nodeID"]copy];_catalog=NO;_page=0;break;}return;}
if([kind isEqual:@"previous"]||[kind isEqual:@"next"]){NSInteger total=_catalog?_nodes.count:_rows.count,cap=_catalog?_catalogCapacity:_capacity,count=MAX(1,(total+cap-1)/cap),delta=[kind isEqual:@"next"]?1:-1;if(_catalog)_catalogPage=(_catalogPage+delta+count)%count;else _page=(_page+delta+count)%count;return;}
NSDictionary*d=a[@"descriptor"];if(!d||!_snapshot)return;double old=[self valueForDescriptor:d],v=old;
@@ -141,14 +142,14 @@
- (BOOL)event:(NSEventType)type point:(NSPoint)p atTime:(CMTime)time{
if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time];NSInteger hit=[self partAtPoint:p];
if(type==NSEventTypeLeftMouseDown){if(!hit)return NO;[_bridge endGesture];_hasDraft=NO;_pressed=hit;_down=p;_panelStart=_panel.origin;_downTime=time;_dragging=NO;_movingPanel=NO;[_captured release];_captured=[[self areaForPart:hit]copy];NSDictionary*d=_captured[@"descriptor"];
if([_captured[@"kind"]isEqual:@"curvePlot"]||[_captured[@"kind"]isEqual:@"wheel"]){[self beginGraphicAt:p];return YES;}
if([self graphicKind:_captured[@"kind"]]){[self beginGraphicAt:p];return YES;}
if([_captured[@"kind"]isEqual:@"slider"]&&_snapshot){NSRect t=[self trackForArea:_captured];if(NSPointInRect(p,NSInsetRect(t,-8*_scale,-8*_scale))){_downValue=[self valueForDescriptor:d];_draftValue=_downValue;_hasDraft=YES;[_bridge beginParameter:d node:_nodeID value:_downValue atTime:time];CGFloat knob=t.origin.x+(_downValue-[d[@"min"]doubleValue])/([d[@"max"]doubleValue]-[d[@"min"]doubleValue])*t.size.width;_knobOffset=fabs(p.x-knob)<=8*_scale?p.x-knob:0;if(fabs(p.x-knob)>8*_scale)[self applySliderPoint:p];}}return YES;
}
if(!_pressed)return NO;
if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&[_captured[@"kind"]isEqual:@"open"])[self movePanelToPointer:p];if(_dragging&&([_captured[@"kind"]isEqual:@"curvePlot"]||[_captured[@"kind"]isEqual:@"wheel"]))[self updateGraphicAt:p];if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;}
if(type==NSEventTypeLeftMouseUp){if([_captured[@"kind"]isEqual:@"open"]&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL graphic=[_captured[@"kind"]isEqual:@"curvePlot"]||[_captured[@"kind"]isEqual:@"wheel"];if(graphic){if(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)[self updateGraphicAt:p];[_bridge endGesture];}BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed;
if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&[_captured[@"kind"]isEqual:@"open"])[self movePanelToPointer:p];if(_dragging&&([self graphicKind:_captured[@"kind"]]))[self updateGraphicAt:p];if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;}
if(type==NSEventTypeLeftMouseUp){if([_captured[@"kind"]isEqual:@"open"]&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL graphic=[self graphicKind:_captured[@"kind"]];if(graphic){if(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)[self updateGraphicAt:p];[_bridge endGesture];}BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed;
if(slider){if(_hasDraft&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self applySliderPoint:p];[_bridge endGesture];}
_pressed=0;_dragging=NO;_movingPanel=NO;_hasDraft=NO;[_captured release];_captured=nil;[_draftValues removeAllObjects];if(!moved&&!slider&&!graphic&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;}
_pressed=0;_dragging=NO;_movingPanel=NO;_hasDraft=NO;[_captured release];_captured=nil;[_spiderDraft release];_spiderDraft=nil;[_draftValues removeAllObjects];if(!moved&&!slider&&!graphic&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;}
return NO;
}
#include "DYViewerGraphics.inc.h"
@@ -7,6 +7,10 @@
- (void)changeValue:(double)value;
- (void)beginParameters:(NSArray<NSDictionary*>*)descriptors node:(NSString*)nodeID values:(NSDictionary<NSString*,NSNumber*>*)values atTime:(CMTime)time;
- (void)changeValues:(NSDictionary<NSString*,NSNumber*>*)values;
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time;
- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time;
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
- (void)changeSpider:(NSData*)mesh;
- (void)endGesture;
- (void)invalidate;
@end
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.10.0</string>
<string>1.11.0</string>
<key>CFBundleVersion</key>
<string>72</string>
<string>73</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
@@ -71,7 +71,7 @@
<key>uuid</key>
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
<key>version</key>
<string>1.10.0</string>
<string>1.11.0</string>
</dict>
<dict>
<key>className</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.10.0</string>
<string>1.11.0</string>
<key>CFBundleVersion</key>
<string>72</string>
<string>73</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+4 -2
查看文件
@@ -1,5 +1,7 @@
# 2026-11-04 画布工具与辅助工作区:1.10.0(72)验收完成
下一阶段完善自定控件,先读[自定控件开发交接](/Volumes/备份/大鱼调色/大鱼调色/自定控件开发交接.md)。该文件集中说明当前代码、尚未补齐的专用图形和后续验证方式;本文件保留完整产品交付与历史。
当前正式安装 **1.10.0(72)**,固定位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,XPC `com.dayu.color.XPC`。实际编译源码 `80dec904bedf5f704b29d16325fa95d639f3a250`;Developer ID 团队 B3W25FX5H5,APP 公证 `c0209032-38d2-4434-8e37-7f911414c3c6` Accepted。票据、Gatekeeper、唯一 PluginKit 正式路径、正式安装的 **695 项原生检查**与用户实鼠验收通过。
画布侧改为纵向十四工具入口,支持多个独立移动、折叠和关闭的浮动工具面板。曲线直接添加、拖动、删除点并切 RGB 通道;颜色分级提供四个实际色轮,二者可切换参数页。其它工具继续使用原有参数和图层 UUID;移动面板与切换编辑视图不进入调色撤销。
@@ -10,11 +12,11 @@
按用户要求,公证后先更新原文章 https://dayu.media/15792/:标题及正文说明“紧急 UI 更新”,新生成封面,深色/浅色两张用户原图,主下载包更新为本版;50元、有效会员免费及其它商业/视频设置保留。前台SEO逐项一致、旧图移除、新图原始哈希与正式包完整下载校验通过。素材、正文、提示词与验证分别保存在 `Publishing/1.10.0/`、`verification/Article1.10.0.json`。未修改 NAS 源码、生产接口或自动更新清单。
远端 https://dayu.media/git/dayu/dayu-color.git,main。发行目标标签 `v1.10.0-canvas-workspace-20261104`;Git Release 仍待上传与完整下载核验,不能将旧版 `Release.json` 当作本版记录。标签包含最终 Package.json 与文章记录;发布后 Release.json 保存在后续 main,不移动已有标签。71 因实窗顶栏缺陷被72替代未发布,70包保留为历史未发布候选。
远端 https://dayu.media/git/dayu/dayu-color.git,main。版本标签 `v1.10.0-canvas-workspace-20261104` 已推送并回读,完整提交 `c0e6f3be0afc310125d2d045a96655db7524f24b`。Git Release387/附件31已上传草稿;草稿下载需要浏览器登录,而CUA因当前页面URL访问限制终止会话,未绕过限制、未发布Release。当前 `verification/Release.json` 与 `CMSReleaseDraft.json` 如实记录下载核验阻塞。原文章的下载包已另行完整下载校验通过,不能用它冒充Release附件下载证明。标签包含最终Package.json与文章记录;本轮发布状态在后续main,不移动既有标签。71 因实窗顶栏缺陷被72替代未发布,70包保留为历史未发布候选。
独立远程 checkout 已核对实际编译提交、526个跟踪文件、Git fsck、8个锁定依赖归档、插件/诊断/工作区/渲染器四个翻译单元 C++20 语法,见 `verification/WorkspaceRecovery1.10.0.json`。无 LFS/子模块,未重复完整重建 CMS 依赖。Xcode27.1、FxPlug SDK4.3.5、Apple Silicon/macOS14.6+;签名/公证凭据需独立恢复,不在 Git。
正式验收后已清理任务生成的70/71旧安装恢复APP、缓存生成APP和公证ZIP,见 `verification/WorkspacePendingCleanup1.10.0.json`;源码恢复checkout暂留供最终标签核验。源码、历史包和用户QA媒体保留。恢复具体步骤沿用下文,当前版本以本节和相应验证记录为准。
正式验收后已清理任务生成的70/71旧安装恢复APP、缓存生成APP和公证ZIP,见 `verification/WorkspacePendingCleanup1.10.0.json`;独立远程版本标签已核对源码、Git完整性、文章和三张素材哈希,实际编译源码未变;恢复checkout、网站验包下载副本及任务临时脚本核验后清理。源码、历史包和用户QA媒体保留。恢复具体步骤沿用下文,当前版本以本节和相应验证记录为准。
以下为上一完整发布版 1.8.5(67)及历史交接,供恢复参考。
+163
查看文件
@@ -0,0 +1,163 @@
# 大鱼调色自定控件开发交接
更新日期:2026-11-05,Asia/Shanghai。
## 本轮 1.11.0(73)交付状态
本轮已实现曲线直方图、HSL八色三轴、蜘蛛网格的半透明画布编辑;主检查器默认只显示一级、蜘蛛、基础、HSL四张折叠卡,其它模块由添加菜单或画布入口显示。已有非默认调色和蒙版自动保留为可见模块。全部还原也恢复四卡折叠布局。
肤色保护增加默认开启的人脸限定和“显示肤色保护区域”,使用当前帧 Vision revision3/76点、人脸轮廓、额头及五官排除,并与原色选及用户蒙版相乘;灰度显示实际保护权重。无脸与失败帧为空,不沿用上一镜头。基础与UUID独立层均支持。参考FCP-BeautyGirl的思路与MIT许可见research/FCPBeautyGirl-MIT.txt。
新增“镜头畸变修复”工具,支持正反径向校正、缩放与光学中心,接入独立层、蒙版、预设和撤销。其采样由本项目独立编写,尚无目标GPU逐像素等价证明。人脸选区和镜头修复不能导出到静态Cube,完整预设可保存。
APP正式编译SHA `49d35cb49ab93f5ab6ca3411eaea80f7219be346`,Apple公证 `348c6e9b-f5d9-4661-bc7f-f192fa770ecf` Accepted,票据/Gatekeeper/唯一位置安装及724项正式安装自检通过。用户已实鼠确认画布/肤色/畸变“三项均正常”,详见verification/HostCanvasTools1.11.0.json。交付脚本已完成,Delivery为 **verified**;旧版恢复APP已清理,交付锁已释放。PKG容器签名、公证Accepted、票据及20项展开验包通过,保存在上级发行包目录,见verification/Package.json。Release最终发布及下载核验见verification/Release.json。
FCP 12.4已成功导入三个验收项目,无导入错误;实际主检查器四张折叠卡与图像已观察到,服务进程使用正式安装路径。事件“大鱼调色_1.11.0_73_画布与空间工具”。工具 `tools/create_canvas_host_fixture.py` 可重建FCPXML、两项测试预设与网格;真人fixture随源码保存于tools/fixtures,仅用于验收。静态DTD/素材检查通过不等于鼠标功能验收。
新增代码入口:DYFaceRender.inc.h(Vision与镜头渲染),DYCanvasToolsDiagnostics.inc.h(新增29项回归),DYToolGPU.h(人脸覆盖元数据),DYGrade.metal及tools/build_masked_kernel.py(实际肤色选区输出)。旧Uniform完整1312字节前缀不变,仅追加32字节;旧参数ID和预设v7不变。蜘蛛写入使用DYViewerParameterBridge的beginSpider/changeSpider,必须保持冲突检查和一次撤销。
AddressSanitizer完整724项无内存错误,插桩下唯一旧性能阈值失败;正常Release全部通过。修复旧渲染C++引用捕获向异步通知泄漏self栈地址的问题,通知必须通过独立Objective-C方法调度,避免恢复旧写法。
源码和阶段记录已持续推送;实际编译SHA从远端独立恢复549个文件逐字节一致、full/strict fsck及模板合同验证通过。最新明细见research/CanvasTools-20261105.md及verification/CanvasSourceRecovery1.11.0.json。旧1.10.0 Release387草稿不属于本轮新发行,保持原状。
## 以下为1.10.0基线交接
更新日期:2026-11-04,Asia/Shanghai。下一阶段继续完善「大鱼调色」的画布自定控件与画布外辅助工作区。当前正式版本为 **1.10.0(72)**,曲线拖点与一次撤销、LUT 预览、示波器随播放头更新已由用户实鼠确认。后续可以在这个版本上继续开发。
当前十四个工具都有画布入口,专用图形编辑已覆盖曲线和颜色分级;其它工具主要通过通用参数面板调整。下一阶段的具体控件样式和功能范围尚未确定,下文将现有能力、实现约定与建议顺序分别说明。本次交接只新增文档,不修改插件功能、版本或线上文章。
## 工程与版本基线
| 项目 | 当前记录 |
| --- | --- |
| 工程根目录 | `/Volumes/备份/大鱼调色/大鱼调色`,不是上一级同名目录 |
| 工程与方案 | `大鱼调色.xcodeproj`,`Wrapper Application`,Release |
| 技术 | AppKit、Objective-C++、FxPlug 4、Metal;现有工程不以 SwiftUI 实现控件 |
| 仓库 | <https://dayu.media/git/dayu/dayu-color.git>,分支 `main`;保持已有仓库可见性 |
| 交接前 main | `302b75710b24c52e7c535faa1a5cf92790359272`;交接文档另作后续提交 |
| 正式 APP 实际编译源码 | `80dec904bedf5f704b29d16325fa95d639f3a250`;后续提交为文档、验证和发布记录 |
| 版本标签 | `v1.10.0-canvas-workspace-20261104` → `c0e6f3be0afc310125d2d045a96655db7524f24b`,已推送并独立恢复核验 |
| 唯一正式安装 | `/Library/Plug-Ins/FxPlug/大鱼调色.app`,1.10.0(72) |
| 产品身份 | 主 Bundle ID `com.dayu.color`;内嵌服务 `com.dayu.color.XPC` |
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`,其中 `DerivedData` 用于 Release 构建 |
| 产品交付锁 | `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`;本次交接读取时未占用 |
| 构建与宿主基线 | Xcode 27.1、FxPlug SDK 4.3.5;Apple Silicon、macOS 14.6+;已验收宿主 FCP 12.4 |
接手时先盘点工作区、分支、远程引用和产品锁,再修改明确属于本任务的文件。保留完整 Git 历史和既有标签;不要在源码提交中保存密码、令牌或签名私钥。
## 用户已经明确的交互方向
- 画布侧边使用纵向工具排列,工具入口需要直接可见。
- 曲线等图形控件可以叠在画面上,调整应直接作用于画布里的控件。
- 工具面板能够拖动位置;可同时打开多个不同工具,保留现有检查器作为参数入口。
- 画布外需要独立组件承载示波器、LUT 预览等,可参考 Color Finale 的内外分工。
- 保留现有浅色、深色两种模式。界面主题、面板位置等显示状态与调色数据分开。
- mFilmLook 和 Color Finale 作为交互参考;产品中的控件由本项目独立实现。
此前“只有一个基础调色”“整个面板不能拖动”对应 69 及更早阶段。70 已加入面板移动与十四工具切换,用户确认正常;随后根据新要求发展为 72 的纵向工具条和独立工作区。继续开发应以 72 为起点。历史过程见[屏幕控件研究](/Volumes/备份/大鱼调色/大鱼调色/research/mFilmLookOSC-20261104.md)与[工作区实现说明](/Volumes/备份/大鱼调色/大鱼调色/research/ViewerWorkspace-20261104.md)。
## 当前控件的实际能力
| 区域 | 已有能力 | 继续开发时需要知道的边界 |
| --- | --- | --- |
| 纵向工具条 | 一级、蜘蛛、基础、肤色、LUT、HSL、曲线、分级、原色、色阶、黑白、平衡、通道、胶片;小画布分页;工作区入口和收起面板 | 工具条锚定图像可见区域左侧;同一工具按钮再次点击会关闭并移除其面板 |
| 浮动面板 | 标题点击折叠、拖动移动、关闭、置顶;同类图层选择;参数分页 | 每个工具类型最多一个浮动面板;同类独立层通过图层菜单切换。位置只存在于当前面板对象,未实现关闭重建或重启后恢复布局 |
| 曲线 | RGB/红/绿/蓝切换,选点、加点、拖点、删除点,图形和参数页切换 | 使用已有有限参数槽,不是无限点曲线;固定端点另行绘制 |
| 颜色分级 | 阴影、中间调、高光、全局四个色轮;图形和参数页切换 | 画布色轮直接修改色相与饱和度,其它分级参数继续使用参数页 |
| 通用参数 | 已公开参数的滑杆、开关、循环选项、单项复位和数值显示 | 当前画布数值显示不是完整文本输入框;选项主要通过点击循环。并未自动覆盖检查器里的资产选择、蜘蛛网格等全部自定义操作 |
| 画布外工作区 | FxRemoteWindow 宿主窗口,亮度波形、RGB 分列、直方图,风格1 LUT 浏览与真实帧预览 | LUT 页目标为当前 manager 对应的 `look0`,即风格1;不是任意 LUT 槽或任意浮动面板图层选择器 |
十四工具类型顺序来自 `DYToolTypes()`:`primary, spider, base, skin, look, hsl, curve, grading, primaries, levels, blackwhite, balance, mixer, film`。工具条名称与类型顺序需要同步维护。
## 代码入口
下表文件均在本工程内。多数 `*.inc.h` 是在 `.mm` 中展开的实现片段,不能当作独立编译单元重复加入目标。
| 要完善的部分 | 文件 | 主要入口 |
| --- | --- | --- |
| FxPlug 画布坐标、绘制、命中及输入路由 | [DYToolOSC.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYToolOSC.inc.h) | `DYToolOSC`,`drawOSC`、`partAtPoint:`、鼠标回调;同时保留原蒙版与钢笔路由 |
| 纵向工具条、面板开关、置顶与捕获 | [DYViewerControls.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYViewerControls.inc.h) | `prepareWithSize:scale:atTime:`、`activateTool:`、`event:point:atTime:` |
| 浮动面板布局、图层目录、滑杆和标题拖动 | [DYViewerParameterPanel.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYViewerParameterPanel.inc.h) | `prepareWithSize:`、`clickArea:`、`movePanelToPointer:`、`finishCapture` |
| 曲线与四个色轮的图形交互 | [DYViewerGraphics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYViewerGraphics.inc.h) | `curveSlots`、`layoutGraphicAt:`、`drawGraphic:`、`beginGraphicAt:`、`updateGraphicAt:` |
| 快照、主队列写回、撤销与冲突保护 | [DYViewerParameterBridge.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYViewerParameterBridge.inc.h) | `publishUniforms:`、`snapshotAtTime:`、`beginParameters:`、`changeValues:`、`endGesture`、`invalidate` |
| 插件发布快照及采集最终输出 | [DYPlugIn.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPlugIn.mm) | `pluginState:atTime:` 发布 uniforms/工具文档;成功渲染后调用 `captureScopeTile:atTime:` |
| OSC 与插件实例绑定 | [DYToolHostMethods.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYToolHostMethods.inc.h) | `initializeToolHost`、`tearDownToolHost`、`scheduleToolCanvasRegistration`、`viewerParameterBridge` |
| 检查器、工作区按钮及现有原生图形控件 | [DYInspector.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYInspector.mm) | `openWorkspace:`;`DYCurvePanel`、`DYColorWheel`、`DYWheelPanel`;原图形手势接口 |
| 蜘蛛盘的现有原生实现 | [DYSpiderDisc.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYSpiderDisc.inc.h) | `DYSpiderPanel`;网格状态另见 `DYSpiderState.h` 与 `SpiderCore/` |
| 画布外窗口和 LUT 应用 | [DYColorWorkspace.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYColorWorkspace.mm) | `showRelativeToView:`、`layoutWorkspace`、`pageChanged:`、`selectionContextAtTime:`、`selectLUT:`、`commitLUT:expected:error:`、`close` |
| 示波器采样与异步统计 | [DYScopeCapture.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYScopeCapture.inc.h) | `setScopeEnabled:`、`captureScopeTile:atTime:`、`processPendingScopeSamples`;统计和 GPU 采样见 `DYScopeMath.hpp`、`DYScopeSample.mm` |
| 参数定义与独立图层 | [DYModel.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYModel.mm)、[DYToolState.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYToolState.mm) | `DYDescriptors()`、`DYSections()`、`DYToolTypes()`、`DYToolDisplayOrder()`、`DYToolManager` |
| 深浅模式与控件表面绘制 | [DYTheme.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYTheme.mm) | `DYThemeColor`、`DYDrawThemeSurface`、`DYDrawSoftControl`;尽量复用现有主题能力 |
画布侧基本链路为:宿主 OSC 输入 → `DYToolOSC` → `DYViewerControls` → 对应 `DYViewerParameterPanel`/图形方法 → `DYViewerParameterBridge` → 主队列宿主 action → 原参数或稳定 UUID 对应的 `DYToolManager`。渲染状态再通过快照回到面板。外部工作区通过绑定 manager 的通知打开,由检查器管理生命周期。
## 新控件必须保留的交互约定
**坐标与命中。** 布局以真实 OBJECT→CANVAS 图像矩形和画布的交集为准。绘制、命中、拖动应共用几何数据;控件在宿主黑边能画出来不代表能接收鼠标。工具条绘制与命中优先,面板逆序命中,按下面板后置顶。原有蒙版和钢笔仍从同一 OSC 根路由。
**捕获与释放。** 按下记录目标、时间、起点和原值;超过 `2 × scale` 的位移后进入拖动。滑杆或图形捕获后,移出轨道继续处理,松开补算最终位置并结束手势。普通按钮在原命中区释放才触发;拖标题后松开不能再折叠面板。`mouseExited` 清悬停,不直接中止仍捕获的拖动。
**线程与快照。** OSC 回调读取当前帧的不可变快照,不同步等待主队列,也不直接改宿主模型。`snapshotAtTime:` 只返回同一时间的快照;缺帧时保留原 UUID 选择并暂缓编辑。主队列写入前复核当前时间、目标节点、原值和关联开关;发现外部修改或目标消失时结束手势,保留最新外部设置。
**多字段写入与撤销。** 曲线 X/Y、色轮 H/S 通过 `beginParameters:` 和完整 `changeValues:` 成组提交,放在同一次宿主 action 内;一次手势只打开一个撤销组。不要拆成两个单字段手势。宿主拒绝写入时尝试还原受影响字段并结束该组;宿主 API 没有 `abortAction`。单击开关、复位和删除点也需完整收尾。空闲面板不能结束另一面板的共享写入手势。
**参数与显示状态。** 面板移动、开合、置顶、分页、通道切换只改变显示状态,不写调色参数、不制造撤销项。基础层使用 `base:<type>`;独立层使用真实 UUID,不能按面板下标或当前列表序号写参数。保留参数 ID、uniform 布局、预设 v7、CMS nil/v2/v3 的既有兼容约定;本轮图形扩展优先连接现有数据。
**生命周期。** 播放头变化、插件或面板销毁、manager 失效时必须结束捕获并关闭撤销组。异步操作使用序号/会话校验,关闭窗口后不得继续提交。项目使用手动内存管理,新增 retain/release 和异步 block 时沿用现有生命周期处理。
## 曲线和色轮的参数映射
曲线显示输出值为 `output = x + curveY × 0.01`;拖点写回 `curveY = (output - x) × 100`。`curveY` 保存的是相对对角线偏移,不能直接填绝对输出值。RGB 主曲线为4个基础槽加4个额外槽,单色通道为2个基础槽加4个额外槽;`x < 0` 表示未启用槽,删除点写 `x = -1, y = 0`。绘制使用与现有编辑器一致的单调 Hermite 插值和固定首尾端点。
色轮使用 `grade{i}_0` 表示角度制色相、`grade{i}_1` 表示0–100饱和度,`i = 0..3` 分别为阴影、中间调、高光、全局。画布坐标 Y 轴与色轮数学坐标方向相反,新增圆盘控件时需要同时核对绘制和输入变换。
蜘蛛网格属于自定义资产/图层数据,不能直接套用当前 float 描述符桥接。若将蜘蛛盘搬入画布,应先明确基础层 `DYAssetState.spiderMesh` 与独立层 `spider` 数据的目标路由,再扩展安全写入通道、冲突检测和一次撤销。
## 外部工作区的约定
工作区由 FxRemoteWindow 托管并绑定当前插件实例;`DYColorWorkspaceRequested` 通知的 object 是对应 manager。LUT 异步准备完成后检查播放头、原风格1选择、全局颜色管理及目标图层是否仍有效,且在 `DYToolManager` 结束 action 后回读真实保存结果。关闭窗口要取消准备并关闭示波器采样。
工作区示波器采样**当前效果的处理输出**,不含后续其它效果或宿主显示转换。320×180 采样在已知 ICC 配置下转扩展 sRGB;空间未知时明确显示宿主 RGB 原值参考。波形、RGB 分列、直方图属于显示参考,不替代 HDR/IRE 精密测量。宿主仅提供分块时须保留分块标注。
`DYScopeCapture.inc.h` 与原 `_renderer histogram` 分开:后者属于较早的分析/曲线参考缓存,不能直接拿来充当最终输出示波器。宿主输出纹理可能在 render 返回后被复用,因此小幅 GPU 读回在其所有权仍有效时完成;CPU 颜色转换和统计放在后台队列,待处理帧合并为最新帧。
71 曾出现绘图区越界覆盖工作区顶栏,72 已加入根视图、面板裁剪和顶栏位图回归。修改工作区布局时保留这些检查,特别核对窗口缩放和大片 dirty rect 重绘。
## 建议的后续开发顺序
以下是接手建议,具体工具及样式以用户下一次要求为准。
1. 先确定要完善的一个工具,检查其在原检查器里的现有实现与数据结构。蜘蛛盘、HSL 等尚无专用画布图形,可作为后续候选;不要把十四个入口当作十四套图形控件均已完成。
2. 在现有画布框架内实现该工具的布局、绘制和命中。保留通用参数页作为精确参数入口;若新增数值输入、菜单、键盘或修饰键操作,补齐焦点、宿主快捷键和钢笔工具之间的路由约定。
3. 连接真实参数或自定义资产,覆盖基础层与独立 UUID 层,验证一次撤销/重做和检查器同步。需要修改多项数据时成组提交。
4. 再完善多面板布局、面板位置恢复或同类多图层同时显示。这些会改变当前“一类型一面板”的行为,需独立设计;纯显示布局不要进入调色预设和撤销历史。
5. 逐项检查浅深两种模式、窄画布、不同缩放、面板重叠与外窗按钮可读性。现有三项功能验收不能覆盖所有新增交互或后续视觉修改。
## 验证与正式交付
已通过的基线包括:正式安装版695项原生检查;用户实鼠的曲线拖点与一次撤销、风格1 LUT 真实预览、移动播放头后示波器更新。用户原话为“三项都正常”,见[宿主验收](/Volumes/备份/大鱼调色/大鱼调色/verification/HostWorkspace1.10.0.json)。原生检查使用真实 Metal/IOSurface 和模拟 FxPlug 宿主选择器,不能代替真实 FCP 文档操作。
新增图形控件的原生回归主要放在 [DYViewerControlsDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h);参数批量写入和冲突保护放在 [DYViewerParameterDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h);外窗、LUT 提交与越界重绘见 [DYWorkspaceDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h)。这些检查由 `DYDiagnostics.mm` 集成,测试辅助协议见对应 Probe 文件。
需要重跑正式安装自检时,入口为:
```sh
'/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service' --self-test
```
功能改动后的交付流程沿用 [tools/deliver.py](/Volumes/备份/大鱼调色/大鱼调色/tools/deliver.py):先保存并正常退出宿主,Release 构建、正式签名、公证 Accepted、票据验证,再替换唯一正式位置并运行正式安装自检,最后进入宿主验收。脚本会在正式安装后等待 `complete` 或 `leave`;只有真实验收通过才输入 `complete`,否则保留诊断和恢复状态。最终还需核验 PluginKit/实际宿主进程路径并清理本任务生成的多余 APP、提交 ZIP 和旧版恢复副本,不能仅凭脚本退出宣称交付完成。
新增控件至少实测:拖动与释放位置、移出控件继续捕获、一次撤销及重做、独立层目标、切换片段/播放头、拖动期间外部改值、面板开合与位置变化、工程重开、深浅模式和缩放。已有缺陷对应的回归按改动范围运行,不为纯文档修改重复构建或验收插件。
代码修改分阶段用 [tools/checkpoint.py](/Volumes/备份/大鱼调色/大鱼调色/tools/checkpoint.py) 对明确文件提交、推送并核验远程;脚本自带仓库锁,不要套同一把锁造成死锁。完整恢复、签名与打包约定见[恢复说明](/Volumes/备份/大鱼调色/大鱼调色/RECOVERY.md)。
## 已完成的发布与遗留事项
- 正式 APP 和 PKG 均已签名、公证、粘附票据并验证。PKG 位于 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.10.0.pkg`,43,090,565字节,SHA-256 `ee70461c9b2d2e0ddd78cbcb3371c3b1b36b7f0e5fc69bfccc7ac0f1a3e468d8`。PKG 通过20项展开验包,本轮未重复运行系统安装脚本。详情见 [Package.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Package.json)。
- [资源文章15792](https://dayu.media/15792/)已更新为“1.10.0 紧急 UI 更新”,使用新封面和用户提供的深色、浅色两张原始截图,主下载同步新版。50元、有效会员免费及其他商业设置保留。文章图片、SEO及安装包完整下载已验证,见 [Article1.10.0.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Article1.10.0.json)。发布素材在 `/Volumes/备份/大鱼调色/大鱼调色/Publishing/1.10.0/`。
- **Git Release387/附件31仍为草稿,未发布。** 安装包已上传,但草稿下载需要已登录浏览器;上一会话的电脑操作工具因当前浏览器页面 URL 访问限制终止。尚未取得该 Release 附件的完整下载证明,不可把网站文章的包下载证明替代它。后续恢复正常访问后,复用既有草稿与附件,完整下载核对上述大小和哈希,再由 `Packaging/publish_beta.py --verified-download` 完成发布与发布后再次下载核验。不要重复上传、删除旧附件或移动现有标签。当前记录见 [Release.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Release.json) 与 [CMSReleaseDraft.json](/Volumes/备份/大鱼调色/大鱼调色/verification/CMSReleaseDraft.json)。
- 任务生成的70/71旧安装恢复APP、缓存生成APP、公证ZIP、验证下载副本和源码恢复 checkout 已按记录清理。源码、用户工程/QA媒体及历史发行包保留,见 [清理记录](/Volumes/备份/大鱼调色/大鱼调色/verification/WorkspacePendingCleanup1.10.0.json)。未修改 NAS 后端源码或网站自动更新清单。
## 给下一会话的接续说明
继续完善大鱼调色的画布自定控件。先读取本文件,再读取工作区研究与对应源码。基于 main 和已验收的正式1.10.0(72),保留纵向工具条、多个可拖动面板、画布内曲线/色轮及画布外示波器/LUT工作区。按用户指定工具继续补齐交互,保留参数、独立图层UUID、一次手势一次撤销和主队列安全写入。已有三项实鼠验收通过,不用退回69或70阶段。新功能仍按正式Release签名、公证、唯一安装、宿主验收、源码推送和安装包Release规则交付。上一版Release草稿的下载核验阻塞另有记录,不要宣称已发布。