比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
7c0bfa5352 | ||
|
|
880a321e72 | ||
|
|
3b4c612edf | ||
|
|
f05cf05451 | ||
|
|
08d229b55b | ||
|
|
a458bbeb53 | ||
|
|
396ad5d1b2 | ||
|
|
03a1e2452e | ||
|
|
69040fd730 | ||
|
|
98d8c14048 | ||
|
|
b4ed141cb4 | ||
|
|
ea9884d266 | ||
|
|
2c2af3695b | ||
|
|
3c96507971 | ||
|
|
cf5954a927 | ||
|
|
dc56d0b321 | ||
|
|
0a1987572b | ||
|
|
4b73db8a17 | ||
|
|
3452f2344f | ||
|
|
e3a072324c |
没有与搜索条件相匹配的文件
@@ -0,0 +1,19 @@
|
||||
大鱼调色 1.17.0(102)
|
||||
|
||||
16 个独立效果分别使用对应功能的缩略图,包含功能名称及易辨识图形;整合版保留品牌图。
|
||||
|
||||
按本次确认的方式,检查器内全部模块展开,在交给 FCP 前计算完整高度。取消插件内部纵向滚动,使用 FCP 外层检查器浏览;独立插件只展示自己的根模块。为不同页签和颜色设置预留高度,较宽检查器底部可能有空余。大量追加层超出初始容量时,重新选择片段会重新测量。
|
||||
|
||||
颜色设置新增“全链路 · 输出转换层”:输出转换默认最后,可上下移动;调色按实际层序和当前工作空间执行,蒙版在线性空间混合。旧工程沿用原流程,需要显式选择新模式。创意 LUT、胶片及部分旧算法使用各自适配的参考域。
|
||||
|
||||
屏幕工具栏新增“局部马赛克”,检查器提供同名入口。可选择逐帧识别的人脸或已绘制蒙版,调整方块大小,并使用现有蒙版轨迹。空间马赛克需保存完整预设,不能由 Cube LUT 表达。
|
||||
|
||||
正式安装通过 951 项原生检查。FCP 12.4 实测覆盖全展开顶部与底部、追加一层、独立 HSL、输出层移动和撤销、人脸及矩形蒙版马赛克、冷启动读取。OSC 自动鼠标回调和运动视频实窗跟踪未完成复核,相关渲染和轨迹数据由原生检查覆盖。
|
||||
|
||||
适用于 Apple Silicon、macOS 14.6 或更高版本。APP 和 PKG 均由 B3W25FX5H5 Developer ID 签名,通过 Apple 公证及票据验证;PKG 通过 20 项展开检查。本机 APP 已独立安装并完成宿主验收,本轮未重复运行 PKG 安装脚本。
|
||||
正式位置:/Library/Plug-Ins/FxPlug/大鱼调色.app。
|
||||
|
||||
实际编译源码:03a1e2452ec665fe6574b07d1899988fd6852cf1。
|
||||
安装包:大鱼调色-1.17.0.pkg
|
||||
大小:46594729 字节
|
||||
SHA-256:f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e
|
||||
@@ -0,0 +1,23 @@
|
||||
# 大鱼调色 1.17.1(103)
|
||||
|
||||
检查器恢复折叠和内部滚动。新建整合效果默认展开一级调色、基础调整、蜘蛛盘,其他模块保留折叠标题;滚动容量按这组默认内容测量,展开更多模块或追加工具层后在内部滚动。独立效果默认展开自己的根模块。已保存的折叠选择继续读取,颜色设置可展开或收起。
|
||||
|
||||
手绘矩形、椭圆和钢笔的保存不再直接比较 FCP 画布回调与检视器 Action 的不同时间起点。草稿保留到保存完成;同一次手势内播放头变化、已有蒙版被外部修改、Esc 取消仍有保护。
|
||||
|
||||
马赛克全部人脸模式改用 640 像素长边的人脸框检测,肤色保护仍按其原有算法处理。需要指定人脸时:
|
||||
|
||||
1. 开启“全部人脸 · 快速逐帧识别”,暂停在目标画面。
|
||||
2. 再打开“局部马赛克”,选择“将本帧 N 张人脸转为可选跟踪蒙版”。
|
||||
3. 在菜单勾选需要遮挡的一个或多个人脸;在控制面板的蒙版页逐个选择,执行正向、反向或双向跟踪。
|
||||
|
||||
生成的人脸蒙版在跟踪前是静态区域;跟踪后按各自保存的轨迹运动,不用每帧的人脸序号判断身份。矩形、椭圆及钢笔蒙版也可多选用于马赛克。完整预设和工程保存保留选择及轨迹。
|
||||
|
||||
本版本提供代码集成、原生回归及正式安装检查;真实运动片段中的遮挡、交叉、漏检和播放流畅度待用户实测,不宣称已完成这些场景验收。
|
||||
|
||||
平台:Apple Silicon,macOS 14.6+,Final Cut Pro / Motion。
|
||||
正式安装位置:`/Library/Plug-Ins/FxPlug/大鱼调色.app`。
|
||||
|
||||
发行验证:实际编译源码 `3b4c612edf99c0ef2b972b7305cd7ba44244a7c6`,版本 1.17.1/构建 103,961 项正式原生检查通过。APP 与 PKG 均由团队 B3W25FX5H5 的 Developer ID 签名,Apple 公证 Accepted、票据及 Gatekeeper 验证通过;PKG 展开结构 20 项与 198 条 APP 载荷权限检查通过。本机正式 APP 已独立安装验收,未再次运行 PKG 的系统安装脚本。
|
||||
|
||||
安装包:`大鱼调色-1.17.1.pkg`,46,600,407 字节。
|
||||
SHA-256:`5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`。
|
||||
@@ -1,10 +1,40 @@
|
||||
# 2026-11-06 折叠检视器与指定人脸 1.17.1(103)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译源码 **`3b4c612edf99c0ef2b972b7305cd7ba44244a7c6`**。独立远端检出核对全部 714 个跟踪文件与 Git blob,`git fsck --full --strict` 通过,无 LFS 指针/子模块。发行标签将在安装包验证后记录。[恢复核验](verification/Recovery1.17.1.json)
|
||||
|
||||
构建环境:Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、Release;ThirdParty 的依赖源包/锁和 `tools/build_tracking_opencv.py` 沿用。克隆后 `git switch --detach <完整提交>`,使用 `tools/deliver.py` 完成正式构建、签名、公证、安装与原生检查;保持交互输入,在宿主验证后输入 complete。主 ID `com.dayu.color`、服务 `com.dayu.color.XPC`,团队 B3W25FX5H5。证书私钥、公证 profile 与 Git 登录须独立恢复,源码仓库不含秘密。
|
||||
|
||||
APP 公证 **`36ecb7e6-5cfc-4b85-8363-11272d880b18`** Accepted,票据和 Gatekeeper 通过。唯一正式路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app` 为 1.17.1(103),961 项正式原生检查通过;FCP 12.4 已确认默认三组、折叠标题、展开后内部滚动、收起后移除滚动以及当前帧转人脸蒙版入口。外层行高仍受 FCP 缓存限制,内部视窗收缩不代表宿主外框缩短。实鼠松手保存、真实多人运动/遮挡/交叉与播放性能由用户后续复测。[宿主检查](verification/HostInspectorMosaic1.17.1.json) · [专项回归](verification/InspectorMosaic1.17.1.json)
|
||||
|
||||
使用 `Packaging/build_pkg.py` 从已签名公证且正式安装验收的 APP 打包,随后 `Packaging/publish_release.py` 发布已验证标签的安装包。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.1.pkg`,46,600,407 字节,SHA-256 `5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`;PKG 公证 `8e122236-9ca6-4d92-ad6a-b9c2411280e7` Accepted,票据、Gatekeeper、20 项展开与 198 条载荷权限检查通过。本机没有重复运行系统 PKG 安装脚本。Release 上传准备中。[开发交接](开发交接.md)
|
||||
|
||||
---
|
||||
|
||||
# 2026-11-06 全链路输出、马赛克与全展开检查器 1.17.0(102)
|
||||
|
||||
远程 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。实际编译源码 **`03a1e2452ec665fe6574b07d1899988fd6852cf1`**;发行标签 **`v1.17.0-unified-mosaic-20261106`** 指向 **`a458bbeb5397153a458706b0bfbb4e8692108a65`**。克隆后按所需节点 `git switch --detach <完整提交>`。独立远端恢复核对编译节点 709 个、发行标签 711 个文件的 Git blob 和完整性;两者间差异仅为交付记录与说明,编译输入一致。没有 LFS 指针或子模块,未重复第三方依赖冷构建。[恢复核验](verification/Recovery1.17.0.json)
|
||||
|
||||
构建环境:Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、Release;沿用 ThirdParty 中的依赖源包/锁和 `tools/build_tracking_opencv.py`。用 `tools/deliver.py` 执行正式构建、签名、公证、固定位置安装及原生检查;保持交互输入,只有 FCP 实测通过后输入 complete。团队 B3W25FX5H5,唯一路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 Bundle ID `com.dayu.color`,服务 `com.dayu.color.XPC`。证书私钥和公证登录需独立恢复,Git 不含密钥。
|
||||
|
||||
APP 公证 `6143097e-7a1b-4e95-9388-434e82acf3bc` Accepted;票据、Gatekeeper、唯一 PluginKit 路径与 951 项正式原生检查通过。用户选择“全部模块展开,然后计算所需高度”,102 移除失败的动态重建方案,在返回自定义视图前测量全部展开内容。FCP 12.4 顶底、追加一层、旧独立 HSL、输出移动/撤销、人脸及矩形马赛克、冷重开通过。初始容量仍受宿主缓存约束,不承诺无限动态加层;OSC 自动鼠标和运动视频实窗跟踪仍未完成复核。[宿主报告](verification/HostUnified1.17.0.json)
|
||||
|
||||
通过 `Packaging/build_pkg.py` 从已验收正式 APP 打包;PKG 公证 `a9bba972-0743-469f-9869-13f94e1a1a83` Accepted、票据、20 项展开检查和 198 条载荷权限检查通过。本机未重复执行 PKG 安装脚本。正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.0.pkg`,**46,594,729 字节**,SHA-256 **`f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e`**。[安装包记录](verification/Package.json)
|
||||
|
||||
Release **399**/附件 **43** 已按原有公测标记发布,草稿下载和发布后完整下载均核对大小与哈希;没有更改仓库可见性。模板和独立功能缩略图一同打包;V4 仍需在颜色设置显式选择,默认输出末层;已有 nil/V2/V3 工程不自动迁移。[发行页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.0-unified-mosaic-20261106) · [下载安装包](https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg) · [发布回读](verification/Release.json)
|
||||
|
||||
本轮构建 APP、公证 ZIP、旧替换备份、包暂存、远端恢复 clone 和草稿下载副本已核验后清理;保留 QA 素材库、研究证据 JSON、正式发行包及用户历史包。[清理](verification/Cleanup1.17.0.json)。站点文章与主 APP 更新通道本轮未更新,最后状态见 [开发交接](开发交接.md)。
|
||||
|
||||
候选 98—101 的拒收历史仍可恢复:101 实际编译 `2c2af3695b6dbe661db7adf544a60c58766a4e73`,当时验收/回滚节点 `ea9884d266cc1326826ff5853cff49a2c4573075`,分别 704/707 个文件远端检出核对。[旧检查点报告](verification/Recovery1.17.0-checkpoint.json)。它们不是当前交付节点,不要再次发布失败的动态高度实验。
|
||||
|
||||
---
|
||||
|
||||
# 2026-11-06 全模块独立效果与水平参考线 1.16.0(97)
|
||||
|
||||
实际编译源码为 `27ba2b53ca6809081269f95ca6caaddeb3933c79`,远端 `https://dayu.media/git/dayu/dayu-color.git` 的 main 已回读。独立克隆检出核对全部 657 个跟踪文件与编译提交 Git 对象一致,`git fsck --full --strict` 通过;无 LFS 或子模块。依赖、Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、Release、macOS 14.6+ 及签名团队继续沿用。证书私钥和公证登录须单独恢复。
|
||||
|
||||
APP 公证 `2fcfe0e9-7694-49b3-90a5-4989415d82a4` Accepted,票据和正式位置验签通过;唯一安装在 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 ID `com.dayu.color.XPC`。通过 922 项原生检查,FCP 12.4 实测已记录,OSC 实鼠操作仍待复核,见 [宿主记录](verification/HostLevel1.16.0.json)。用 `tools/deliver.py` 构建交付;交互保持 stdin 可用,完成验收后输入 complete 清理旧版。其余情况保留 pending 状态和旧替换备份,不能据脚本退出码认定宿主已通过。
|
||||
|
||||
全部 16 独立模板随整合版共 51 个模板/预览文件。`tools/build_template.py --refresh-model --starters --overwrite` 生成并 `tools/verify_template.py` 检查。新的 CST 入口不表示输出转换可任意移动,分析见 [工作记录](research/LevelingModules1.16.0.md)。安装包使用 `Packaging/build_pkg.py`;正式 PKG `../发行包/大鱼调色-1.16.0.pkg`,55,485,504 字节,SHA-256 `99a571c5b2c43d0c4ce3080d3f1026b90b1a3f79356825e38a06a1a7021df52d`。Installer 签名、Apple 公证 Accepted、票据及 20 项验包通过;本轮未重复执行系统 PKG 安装,APP 已独立安装验收。Release 尚在交付,以下保留历史记录。
|
||||
全部 16 独立模板随整合版共 51 个模板/预览文件。`tools/build_template.py --refresh-model --starters --overwrite` 生成并 `tools/verify_template.py` 检查。新的 CST 入口不表示输出转换可任意移动,分析见 [工作记录](research/LevelingModules1.16.0.md)。安装包使用 `Packaging/build_pkg.py`;正式 PKG `../发行包/大鱼调色-1.16.0.pkg`,55,485,504 字节,SHA-256 `99a571c5b2c43d0c4ce3080d3f1026b90b1a3f79356825e38a06a1a7021df52d`。Installer 签名、Apple 公证 Accepted、票据及 20 项验包通过;本轮未重复执行系统 PKG 安装,APP 已独立安装验收。版本标签 `v1.16.0-leveling-modules-20261106` 指向 `0483e76a1762b1dc3d2e049453d4c85e473cfc50`。独立检出标签核对全部 660 个跟踪文件与 Git 对象一致,包记录一致、完整性检查通过。Release 398/附件 42 发布前后均完整下载校验大小和 SHA-256,草稿下载副本票据有效。临时恢复 clone、下载副本和本轮 APP 生成副本已清理;正式 APP、当前包、历史发行包和 QA 素材库保留。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.16.0-leveling-modules-20261106) · [发布核验](verification/Release.json) · [恢复](verification/Recovery1.16.0.json)。站点文章 15792 和主 APP 更新通道本轮未改。以下保留历史记录。
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# 1.17.1 检视器与马赛克
|
||||
|
||||
2026-11-06。基线 08d229b55b6e13e8d2086b03c4582322a2d6bd30(1.17.0 / 102)。工作区已有 project.pbxproj 的 Security 引用排序,不属于本任务;原差异保存在固定构建缓存的 task-1.17.1/preexisting.patch。
|
||||
|
||||
本轮用户要求:整合检查器恢复折叠与内部自适应滚动,初始化只展开一级调色、基础调整、蜘蛛盘,其余模块保留折叠标题;默认内容完整容纳,展开或追加后才滚动。修复手绘蒙版松手复位;降低人脸马赛克开销,并接入多人脸指定,实拍由用户继续验证。
|
||||
|
||||
实现约束:沿用 AppKit / FxPlug 原生检查器,不恢复失败的宿主参数删除重建路线。初始滚动上限从三个展开模块和其余折叠标题测量,独立效果按自己的根模块测量。折叠不改启用或调色值。完整文档保存蒙版与选择,指定人脸使用稳定蒙版 ID 和既有跟踪轨迹,不依赖逐帧人脸数组排序。
|
||||
|
||||
验证计划:已有原生自检补充不同 OSC/Action 时钟、松手保存、冲突/取消、默认无内部滚动、展开/追加滚动、多人脸选区与保存回读。仅从正式签名公证安装运行用户可见界面;最终实拍识别、遮挡、交叉和性能由用户复测。
|
||||
|
||||
## 实现与原生验证
|
||||
|
||||
- `DYInspector.mm` 按 280 pt 最窄宽度测量默认三组及全部折叠标题,上限 3501 pt;宽度变化、折叠、展开和追加均在内部 ScrollView 布局,默认文档可完整容纳。FCP 外层检查器仍自行滚动,并保留初次分配的行高;不宣称宿主本身可动态缩短,内部视窗可以收缩。
|
||||
- `DYToolCanvasEditing.inc.h` 异步记录手势开始时的 Action 时钟;提交比较同一 Action 时钟是否移动,蒙版几何/轨迹键继续使用 OSC 时间,非动画文档通过当前 Action 读写。重绘时间不同不再丢弃草稿,实际输入事件换帧、Esc、外部冲突仍拒绝覆盖。
|
||||
- `DYMosaicRender.inc.h` 使用独立 640 长边 Vision 人脸框检测及同像素缓存,不调用肤色保护的特征点分析。该选择不关闭用户已有的肤色保护;启用肤色保护时仍有其自身计算成本。[Apple API](https://developer.apple.com/documentation/vision/vndetectfacerectanglesrequest)
|
||||
- `DYViewerParameterBridge.inc.h` 支持当前帧多人脸一次转成独立共享蒙版,多选使用稳定 ID。每个人脸先生成静态框,用户在控制面板逐个运行现有 OpenCV 跟踪。无身份识别或全片自动人脸身份归并;重叠、遮挡和交叉仍需实拍检查。
|
||||
- 961 项原生 Release 预检通过。新增双时钟手绘保存/回读、默认无滚动、展开/追加滚动、多人脸导入一次撤销、单人选择区域外像素完全一致和完整文档回读检查。两个人脸来自公共 NASA 人像的并排合成,不能替代两名不同人物的运动视频测试。
|
||||
- 16 个独立效果及整合模板静态检查通过;仅刷新模型来源哈希,模板文件与上一版一致。独立远端恢复编译提交 714 个文件逐一校验,无 LFS 指针/子模块。
|
||||
@@ -0,0 +1,38 @@
|
||||
# 1.17.0 开发记录
|
||||
|
||||
2026-11-06,基线 `e3a072324c84715ff4b8e1408454c0aa55130c8b`,远端 main 已回读一致;正式安装 1.16.0(97)。工作区原有 project.pbxproj 的 Security 引用排序保留,不作为本轮改动提交。没有其他活动交付任务,产品锁空闲。
|
||||
|
||||
本轮范围:16 个功能缩略图;检视器移除内部纵向滚动并按内容高度伸缩;新增显式 V4 全链路颜色管理和可移动输出边界;人脸/共享蒙版局部马赛克。旧 nil/V2/V3 流程保持,新流程必须显式区分,既有工程不静默迁移。
|
||||
|
||||
验证要求:真实节点顺序;输出前负值、超白及宽色域不被通用工具无故裁切;LUT 和胶片的有限域明确;蒙版、混合和 Cube 导出一致;马赛克空选区不影响全画面,包含眼睛和嘴部,复用既有轨迹;展开/收起实窗高度和模板缩略图。阶段状态以之后的验证与交付记录为准。
|
||||
|
||||
## 实现检查点(尚未交付)
|
||||
|
||||
- 16 套原生矢量缩略图(两种尺寸)与独立打包路径;34 个预览哈希互异(含整合版),模板静态检查通过。
|
||||
- 检视器已移除内部纵向 ScrollView、取消高度上限;实际宿主自适应仍待正式版验收。
|
||||
- 新 V4 状态/顺序、独立输出卡片与移动写回、局部马赛克逐帧人脸和共享蒙版实现。V4 使用工作域码值模块,Rec.709 创意 LUT/胶片使用明确局部参考域;有界兼容算法以边界增量延拓并保留 float32 超范围残差。此实现不等同所有旧算法均已改写成场景线性算法。
|
||||
- Release 编译通过;新增生产渲染检查正在补齐。版本、公证、安装、宿主与 Release 尚未开始,正式安装仍 1.16.0。
|
||||
|
||||
## 原生验证与兼容决策
|
||||
|
||||
948 项 Release 原生检查中,新链路与马赛克检查全部通过;唯一失败是旧界面把输出卡片数量固定为零的断言,已按兼容隐藏/V4 独立卡片调整。新增场景曝光负值、超白翻倍检查纳入最终验证。输出层在控制面板使用同一渲染次序,一级旁路不再联动输入和输出,人脸肤色支持在 V4 当前节点参考图上重新生成。
|
||||
|
||||
原模板 custom dataValue 不能改成 V4 默认:FCP 会将其应用于已有 nil 状态效果,导致旧工程变化。继续保留旧载体,颜色设置中显式选择“全链路 · 输出转换层”;新流程输出默认为 tail。不得宣称所有旧效果自动迁移。版本准备为 1.17.0(98)。
|
||||
|
||||
## 宿主高度修复(99)
|
||||
|
||||
98 通过 950 项原生检查及公证,但 FCP 12.4 宿主验收发现初始 406 pt 槽位裁切,未发布,正式安装回滚到 97。只读检查 FxPlug 与 ProAppsFxSupport 的 arm64 发布二进制确认创建时仅传递一次 frame,updateCustomViews 只标记重绘。99 在返回自定义视图之前读取折叠状态并完成布局,随后同步服务容器尺寸。动态展开仍须实际宿主验证,不能用原生模拟容器替代。REA 证据快照保存在固定构建缓存,未复制 Apple 二进制或实现到项目。
|
||||
|
||||
## 101 宿主结论(未交付)
|
||||
|
||||
99 初始完整高度通过,折叠后槽位未缩小;100 同一轮隐藏/恢复自定义参数标志也未刷新。101 试验动态删除/重建参数 9000,接口不可用或条件不满足时延时 0.2 秒切换标志;实际折叠后出现空白,切换到其他片段再回来才重建为正确高度。未获得能够证明动态删除接口实际执行成功的日志,不能把 fallback 现象说成动态接口已成功重建。当前实验不可用于交付,也不能通过反复切换片段冒充自动高度。
|
||||
|
||||
候选 101 在唯一正式位置签名/公证/票据通过后测试,950 项原生检查通过。FCP 中人脸马赛克、共享矩形蒙版切换、输出默认末层、上移及一次撤销通过;自动鼠标未进入 OSC 的旧限制仍存在,同逻辑的检查器菜单已实测。相关证据见 `verification/HostUnified1.17.0-candidate101.json`。已回滚正式 97,候选 APP 删除;没有 1.17.0 包或 Release。
|
||||
|
||||
用户收到界面方式待选问题:独立自适应浮窗,或继续检查器内重构。尚未收到答复,不自行替换产品交互。下一步先替换失败的 `inspectorHeightChanged:` 方案,按所选方式完成真实宿主展开/收起/新增模块/颜色设置/冷重开,再进入正式打包发布。
|
||||
|
||||
## 102:按用户决定全部展开后一次测高
|
||||
|
||||
用户明确选择“把全部模块展开,然后计算所需高度”。保留 FCP 检查器,去掉 101 的参数删除/标志隐藏重建;整合版显示全部未删除的模块,独立模板仍保留其单一根模块。初始界面展开全部模块和颜色设置,读取完整文档后同步测高;展开只影响呈现,不改启用状态、参数或旧存档折叠字段。原生测量预留现有分页的最大内容及颜色设置模式高度,避免页签/V4 切换裁切;根界面没有内部 ScrollView。102 已从正式路径完成 FCP 12.4 实测:首次及冷重开全量显示、底部完整输出设置可达、上移和撤销不空白;追加一层镜头畸变后,两层控件及末尾输出卡片仍完整可达。独立 HSL 保持旧流程且完整展示。951 项正式原生检查通过。
|
||||
|
||||
当前交付 APP 为 1.17.0(102),编译提交 `03a1e2452ec665fe6574b07d1899988fd6852cf1`,公证 `6143097e-7a1b-4e95-9388-434e82acf3bc` Accepted。见 `verification/HostUnified1.17.0.json`。此实现是用户选定的全展开初始测高,不宣称宿主动态高度接口已修复;较宽检查器底部可能有用于模式和页签的预留空间,大量新增层超出初始容量时重新选择片段可重新测高。
|
||||
|
之后 宽度: | 高度: | 大小: 27 KiB |
|
之后 宽度: | 高度: | 大小: 8.3 KiB |
|
之后 宽度: | 高度: | 大小: 36 KiB |
|
之后 宽度: | 高度: | 大小: 9.6 KiB |
@@ -3715,13 +3715,13 @@
|
||||
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
|
||||
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
|
||||
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "d5901d6ac11d93f3f4438dd8d48bb3a123d06d9b79ed39e8dca38db4261bc87a",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "d9d2688f26a51d1131ee63b415e0c09989616312d31eb3b636fd299f475ece08",
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "1f435e32ee8b6f74fbc6c588f3564cc794ce100d1aae821075c115b33bb24412",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "0d2527b18589f63d63d16fd64c47a70c5973994fb3841a3246631c7e836ea8e8",
|
||||
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
|
||||
"大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "83e54959fe6161dee7a3a9c3afec7ca0872b52ad9c0fa286e7497a4a759f8e2f",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "e84646669d14a992b66fbfbf3c0ea1a9be9c7ffdc85529cd34ab44f78d107074",
|
||||
"大鱼调色/Plugin/DYToolState.h": "96eff1bd54be127e527595da7cbf38e58f4dfd4a16c9491d8630f7b1d1045c84",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "a0bf1a613e280a56ade97303e87f376878e459debd68f72adc0895d6bf67ad61",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
|
||||
@@ -0,0 +1,244 @@
|
||||
{
|
||||
"passed": true,
|
||||
"generator": "tools/build_module_previews.swift",
|
||||
"files": [
|
||||
{
|
||||
"source": "large.png",
|
||||
"bundle": "large.png",
|
||||
"installed": "大鱼调色/large.png",
|
||||
"bytes": 261628,
|
||||
"sha256": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a"
|
||||
},
|
||||
{
|
||||
"source": "small.png",
|
||||
"bundle": "small.png",
|
||||
"installed": "大鱼调色/small.png",
|
||||
"bytes": 42791,
|
||||
"sha256": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
{
|
||||
"source": "一级调色/large.png",
|
||||
"bundle": "一级调色/large.png",
|
||||
"installed": "一级调色/large.png",
|
||||
"bytes": 31953,
|
||||
"sha256": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b"
|
||||
},
|
||||
{
|
||||
"source": "一级调色/small.png",
|
||||
"bundle": "一级调色/small.png",
|
||||
"installed": "一级调色/small.png",
|
||||
"bytes": 8051,
|
||||
"sha256": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635"
|
||||
},
|
||||
{
|
||||
"source": "蜘蛛盘校色仪/large.png",
|
||||
"bundle": "蜘蛛盘校色仪/large.png",
|
||||
"installed": "蜘蛛盘校色仪/large.png",
|
||||
"bytes": 29077,
|
||||
"sha256": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040"
|
||||
},
|
||||
{
|
||||
"source": "蜘蛛盘校色仪/small.png",
|
||||
"bundle": "蜘蛛盘校色仪/small.png",
|
||||
"installed": "蜘蛛盘校色仪/small.png",
|
||||
"bytes": 8606,
|
||||
"sha256": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd"
|
||||
},
|
||||
{
|
||||
"source": "基础调整/large.png",
|
||||
"bundle": "基础调整/large.png",
|
||||
"installed": "基础调整/large.png",
|
||||
"bytes": 14561,
|
||||
"sha256": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43"
|
||||
},
|
||||
{
|
||||
"source": "基础调整/small.png",
|
||||
"bundle": "基础调整/small.png",
|
||||
"installed": "基础调整/small.png",
|
||||
"bytes": 4537,
|
||||
"sha256": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f"
|
||||
},
|
||||
{
|
||||
"source": "肤色保护/large.png",
|
||||
"bundle": "肤色保护/large.png",
|
||||
"installed": "肤色保护/large.png",
|
||||
"bytes": 15279,
|
||||
"sha256": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025"
|
||||
},
|
||||
{
|
||||
"source": "肤色保护/small.png",
|
||||
"bundle": "肤色保护/small.png",
|
||||
"installed": "肤色保护/small.png",
|
||||
"bytes": 5144,
|
||||
"sha256": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562"
|
||||
},
|
||||
{
|
||||
"source": "风格 LUT/large.png",
|
||||
"bundle": "风格 LUT/large.png",
|
||||
"installed": "风格 LUT/large.png",
|
||||
"bytes": 15637,
|
||||
"sha256": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692"
|
||||
},
|
||||
{
|
||||
"source": "风格 LUT/small.png",
|
||||
"bundle": "风格 LUT/small.png",
|
||||
"installed": "风格 LUT/small.png",
|
||||
"bytes": 5877,
|
||||
"sha256": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36"
|
||||
},
|
||||
{
|
||||
"source": "HSL/large.png",
|
||||
"bundle": "HSL/large.png",
|
||||
"installed": "HSL/large.png",
|
||||
"bytes": 36559,
|
||||
"sha256": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78"
|
||||
},
|
||||
{
|
||||
"source": "HSL/small.png",
|
||||
"bundle": "HSL/small.png",
|
||||
"installed": "HSL/small.png",
|
||||
"bytes": 9811,
|
||||
"sha256": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e"
|
||||
},
|
||||
{
|
||||
"source": "曲线/large.png",
|
||||
"bundle": "曲线/large.png",
|
||||
"installed": "曲线/large.png",
|
||||
"bytes": 14887,
|
||||
"sha256": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870"
|
||||
},
|
||||
{
|
||||
"source": "曲线/small.png",
|
||||
"bundle": "曲线/small.png",
|
||||
"installed": "曲线/small.png",
|
||||
"bytes": 4513,
|
||||
"sha256": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5"
|
||||
},
|
||||
{
|
||||
"source": "颜色分级/large.png",
|
||||
"bundle": "颜色分级/large.png",
|
||||
"installed": "颜色分级/large.png",
|
||||
"bytes": 30645,
|
||||
"sha256": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed"
|
||||
},
|
||||
{
|
||||
"source": "颜色分级/small.png",
|
||||
"bundle": "颜色分级/small.png",
|
||||
"installed": "颜色分级/small.png",
|
||||
"bytes": 9702,
|
||||
"sha256": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9"
|
||||
},
|
||||
{
|
||||
"source": "三原色/large.png",
|
||||
"bundle": "三原色/large.png",
|
||||
"installed": "三原色/large.png",
|
||||
"bytes": 19743,
|
||||
"sha256": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f"
|
||||
},
|
||||
{
|
||||
"source": "三原色/small.png",
|
||||
"bundle": "三原色/small.png",
|
||||
"installed": "三原色/small.png",
|
||||
"bytes": 6228,
|
||||
"sha256": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8"
|
||||
},
|
||||
{
|
||||
"source": "色阶/large.png",
|
||||
"bundle": "色阶/large.png",
|
||||
"installed": "色阶/large.png",
|
||||
"bytes": 13205,
|
||||
"sha256": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802"
|
||||
},
|
||||
{
|
||||
"source": "色阶/small.png",
|
||||
"bundle": "色阶/small.png",
|
||||
"installed": "色阶/small.png",
|
||||
"bytes": 4767,
|
||||
"sha256": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76"
|
||||
},
|
||||
{
|
||||
"source": "黑白混色/large.png",
|
||||
"bundle": "黑白混色/large.png",
|
||||
"installed": "黑白混色/large.png",
|
||||
"bytes": 12899,
|
||||
"sha256": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979"
|
||||
},
|
||||
{
|
||||
"source": "黑白混色/small.png",
|
||||
"bundle": "黑白混色/small.png",
|
||||
"installed": "黑白混色/small.png",
|
||||
"bytes": 3958,
|
||||
"sha256": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc"
|
||||
},
|
||||
{
|
||||
"source": "色彩平衡/large.png",
|
||||
"bundle": "色彩平衡/large.png",
|
||||
"installed": "色彩平衡/large.png",
|
||||
"bytes": 14637,
|
||||
"sha256": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e"
|
||||
},
|
||||
{
|
||||
"source": "色彩平衡/small.png",
|
||||
"bundle": "色彩平衡/small.png",
|
||||
"installed": "色彩平衡/small.png",
|
||||
"bytes": 6069,
|
||||
"sha256": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6"
|
||||
},
|
||||
{
|
||||
"source": "通道混合器/large.png",
|
||||
"bundle": "通道混合器/large.png",
|
||||
"installed": "通道混合器/large.png",
|
||||
"bytes": 27134,
|
||||
"sha256": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c"
|
||||
},
|
||||
{
|
||||
"source": "通道混合器/small.png",
|
||||
"bundle": "通道混合器/small.png",
|
||||
"installed": "通道混合器/small.png",
|
||||
"bytes": 7731,
|
||||
"sha256": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c"
|
||||
},
|
||||
{
|
||||
"source": "胶片模拟/large.png",
|
||||
"bundle": "胶片模拟/large.png",
|
||||
"installed": "胶片模拟/large.png",
|
||||
"bytes": 13409,
|
||||
"sha256": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7"
|
||||
},
|
||||
{
|
||||
"source": "胶片模拟/small.png",
|
||||
"bundle": "胶片模拟/small.png",
|
||||
"installed": "胶片模拟/small.png",
|
||||
"bytes": 4357,
|
||||
"sha256": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1"
|
||||
},
|
||||
{
|
||||
"source": "镜头畸变修复/large.png",
|
||||
"bundle": "镜头畸变修复/large.png",
|
||||
"installed": "镜头畸变修复/large.png",
|
||||
"bytes": 32470,
|
||||
"sha256": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1"
|
||||
},
|
||||
{
|
||||
"source": "镜头畸变修复/small.png",
|
||||
"bundle": "镜头畸变修复/small.png",
|
||||
"installed": "镜头畸变修复/small.png",
|
||||
"bytes": 10171,
|
||||
"sha256": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3"
|
||||
},
|
||||
{
|
||||
"source": "CST 色彩空间转换/large.png",
|
||||
"bundle": "CST 色彩空间转换/large.png",
|
||||
"installed": "CST 色彩空间转换/large.png",
|
||||
"bytes": 27622,
|
||||
"sha256": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306"
|
||||
},
|
||||
{
|
||||
"source": "CST 色彩空间转换/small.png",
|
||||
"bundle": "CST 色彩空间转换/small.png",
|
||||
"installed": "CST 色彩空间转换/small.png",
|
||||
"bytes": 8498,
|
||||
"sha256": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
之后 宽度: | 高度: | 大小: 31 KiB |
|
之后 宽度: | 高度: | 大小: 7.9 KiB |
|
之后 宽度: | 高度: | 大小: 19 KiB |
|
之后 宽度: | 高度: | 大小: 6.1 KiB |
|
之后 宽度: | 高度: | 大小: 14 KiB |
|
之后 宽度: | 高度: | 大小: 4.4 KiB |
|
之后 宽度: | 高度: | 大小: 15 KiB |
|
之后 宽度: | 高度: | 大小: 4.4 KiB |
|
之后 宽度: | 高度: | 大小: 15 KiB |
|
之后 宽度: | 高度: | 大小: 5.0 KiB |
|
之后 宽度: | 高度: | 大小: 13 KiB |
|
之后 宽度: | 高度: | 大小: 4.3 KiB |
|
之后 宽度: | 高度: | 大小: 14 KiB |
|
之后 宽度: | 高度: | 大小: 5.9 KiB |
|
之后 宽度: | 高度: | 大小: 13 KiB |
|
之后 宽度: | 高度: | 大小: 4.7 KiB |
|
之后 宽度: | 高度: | 大小: 28 KiB |
|
之后 宽度: | 高度: | 大小: 8.4 KiB |
|
之后 宽度: | 高度: | 大小: 26 KiB |
|
之后 宽度: | 高度: | 大小: 7.5 KiB |
|
之后 宽度: | 高度: | 大小: 32 KiB |
|
之后 宽度: | 高度: | 大小: 9.9 KiB |
|
之后 宽度: | 高度: | 大小: 30 KiB |
|
之后 宽度: | 高度: | 大小: 9.5 KiB |
|
之后 宽度: | 高度: | 大小: 15 KiB |
|
之后 宽度: | 高度: | 大小: 5.7 KiB |
|
之后 宽度: | 高度: | 大小: 13 KiB |
|
之后 宽度: | 高度: | 大小: 3.9 KiB |
@@ -0,0 +1,63 @@
|
||||
// Native vector artwork, rendered directly at both Motion browser sizes.
|
||||
import AppKit
|
||||
|
||||
let root = URL(fileURLWithPath: CommandLine.arguments[1])
|
||||
let names = ["一级调色", "蜘蛛盘校色仪", "基础调整", "肤色保护", "风格 LUT", "HSL", "曲线", "颜色分级", "三原色", "色阶", "黑白混色", "色彩平衡", "通道混合器", "胶片模拟", "镜头畸变修复", "CST 色彩空间转换"]
|
||||
let accents: [NSColor] = [.systemOrange,.systemCyan,.systemYellow,.systemPink,.systemPurple,.systemGreen,.systemCyan,.systemPurple,.systemRed,.systemOrange,.white,.systemTeal,.systemGreen,.systemOrange,.systemCyan,.systemBlue]
|
||||
func color(_ h: CGFloat) -> NSColor { NSColor(calibratedHue: h, saturation: 0.8, brightness: 1, alpha: 1) }
|
||||
func line(_ points: [NSPoint], _ c: NSColor, _ width: CGFloat = 6) {
|
||||
let p = NSBezierPath(); p.move(to: points[0]); for v in points.dropFirst() { p.line(to: v) }
|
||||
p.lineWidth=width; p.lineCapStyle = .round; p.lineJoinStyle = .round; c.setStroke();p.stroke()
|
||||
}
|
||||
func box(_ r: NSRect, _ c: NSColor, _ radius: CGFloat=12) {c.setFill();NSBezierPath(roundedRect:r,xRadius:radius,yRadius:radius).fill()}
|
||||
func circle(_ x: CGFloat, _ y: CGFloat, _ r: CGFloat, _ c: NSColor){c.setFill();NSBezierPath(ovalIn:NSRect(x:x-r,y:y-r,width:r*2,height:r*2)).fill()}
|
||||
func text(_ s: String, _ r: NSRect, _ size: CGFloat, _ c: NSColor, _ weight:NSFont.Weight = .semibold) {
|
||||
let p=NSMutableParagraphStyle();p.alignment = .center
|
||||
(s as NSString).draw(in:r,withAttributes:[.font:NSFont.systemFont(ofSize:size,weight:weight),.foregroundColor:c,.paragraphStyle:p])
|
||||
}
|
||||
func wheel(_ x:CGFloat,_ y:CGFloat,_ r:CGFloat) {
|
||||
for i in 0..<120 { let a=CGFloat(i)*2 * .pi/120,b=CGFloat(i+1)*2 * .pi/120
|
||||
let p=NSBezierPath();p.move(to:NSPoint(x:x,y:y));p.line(to:NSPoint(x:x+cos(a)*r,y:y+sin(a)*r));p.line(to:NSPoint(x:x+cos(b)*r,y:y+sin(b)*r));p.close();color(CGFloat(i)/120).setFill();p.fill()
|
||||
};circle(x,y,r*0.69,NSColor(calibratedWhite:0.09,alpha:1));circle(x,y,5,.white)
|
||||
}
|
||||
func art(_ n:Int) {
|
||||
let a=accents[n],muted=NSColor(calibratedWhite:0.30,alpha:1),ink=NSColor(calibratedWhite:0.94,alpha:1)
|
||||
switch n {
|
||||
case 0: wheel(215,205,64);for i in 0..<3 {let x=CGFloat(335+i*47);line([.init(x:x,y:140),.init(x:x,y:270)],muted,8);circle(x,CGFloat(170+i*30),10,[NSColor.systemOrange,.systemCyan,.systemPurple][i])}
|
||||
case 1:
|
||||
let center=NSPoint(x:320,y:208)
|
||||
for r in [CGFloat(40),70,100] {let p=(0...6).map { i in NSPoint(x:center.x+cos(CGFloat(i) * .pi/3)*r,y:center.y+sin(CGFloat(i) * .pi/3)*r)};line(p,muted,2)}
|
||||
let p=(0...6).map { i -> NSPoint in let r:CGFloat=[82,64,90,73,92,56,82][i]; return NSPoint(x:center.x+cos(CGFloat(i) * .pi/3)*r,y:center.y+sin(CGFloat(i) * .pi/3)*r)};line(p,a,5);for (i,q) in p.dropLast().enumerated(){circle(q.x,q.y,8,color(CGFloat(i)/6))}
|
||||
case 2:for i in 0..<4{let y=CGFloat(145+i*42);line([.init(x:180,y:y),.init(x:460,y:y)],muted,8);let x=CGFloat([260,382,302,418][i]);line([.init(x:180,y:y),.init(x:x,y:y)],a,8);circle(x,y,13,ink)}
|
||||
case 3:
|
||||
box(.init(x:258,y:133,width:124,height:154),NSColor(calibratedRed:0.8,green:0.51,blue:0.36,alpha:1),58)
|
||||
circle(296,222,6,ink);circle(344,222,6,ink);line([.init(x:301,y:177),.init(x:320,y:170),.init(x:339,y:177)],ink,4)
|
||||
for s:CGFloat in [-1,1]{let x:CGFloat=320+s*94;line([.init(x:x-s*22,y:293),.init(x:x,y:293),.init(x:x,y:270)],a,5);line([.init(x:x-s*22,y:125),.init(x:x,y:125),.init(x:x,y:148)],a,5)}
|
||||
case 4:for y in 0..<4{for x in 0..<8{box(.init(x:174+CGFloat(x)*37,y:137+CGFloat(y)*37,width:32,height:32),color(CGFloat(x)/8).blended(withFraction:CGFloat(y)*0.14,of:.black)!,4)}}
|
||||
case 5:wheel(320,207,87);text("H · S · L",.init(x:255,y:192,width:130,height:30),26,ink)
|
||||
case 6:for i in 0...4{let p=CGFloat(i)*38;line([.init(x:237+p,y:128),.init(x:237+p,y:280)],muted,1);line([.init(x:237,y:128+p),.init(x:389,y:128+p)],muted,1)}
|
||||
let p=NSBezierPath();p.move(to:.init(x:237,y:128));p.curve(to:.init(x:389,y:280),controlPoint1:.init(x:340,y:140),controlPoint2:.init(x:288,y:267));p.lineWidth=6;a.setStroke();p.stroke();for q in [NSPoint(x:237,y:128),.init(x:313,y:207),.init(x:389,y:280)]{circle(q.x,q.y,8,ink)}
|
||||
case 7:for i in 0..<3{wheel(CGFloat(196+i*124),210,50);text(["暗部","中间调","亮部"][i],.init(x:CGFloat(146+i*124),y:135,width:100,height:25),20,ink)}
|
||||
case 8:for (i,c) in [NSColor.systemRed,.systemGreen,.systemBlue].enumerated(){let x=CGFloat(240+i*80);circle(x,210,58,c.withAlphaComponent(0.8));text(["R","G","B"][i],.init(x:x-30,y:189,width:60,height:45),34,ink)}
|
||||
case 9:for i in 0..<48{let x=CGFloat(i)/47;let height=CGFloat(15+90*exp(-pow((Double(x)-0.32)/0.14,2))+120*exp(-pow((Double(x)-0.70)/0.18,2)));box(.init(x:171+CGFloat(i)*6.3,y:155,width:4.8,height:height),a,1)}
|
||||
for i in 0..<64{box(.init(x:171+CGFloat(i)*4.7,y:121,width:5,height:17),NSColor(calibratedWhite:CGFloat(i)/63,alpha:1),0)}
|
||||
case 10:for i in 0..<7{box(.init(x:181+CGFloat(i)*40,y:135,width:36,height:144),NSColor(calibratedWhite:CGFloat(i)/6,alpha:1),5)}
|
||||
case 11:for i in 0..<3{let y=CGFloat(155+i*51),c1:[NSColor]=[.systemCyan,.systemPurple,.systemYellow],c2:[NSColor]=[.systemRed,.systemGreen,.systemBlue];for k in 0..<50{box(.init(x:184+CGFloat(k)*5.4,y:y,width:6,height:12),c1[i].blended(withFraction:CGFloat(k)/49,of:c2[i])!,0)};circle(CGFloat([295,354,318][i]),y+6,12,ink)}
|
||||
case 12:for i in 0..<3{for j in 0..<3{line([.init(x:218,y:CGFloat(150+i*57)),.init(x:422,y:CGFloat(150+j*57))],color(CGFloat(i)/3).withAlphaComponent(i==j ? 0.9:0.45),i==j ? 5:2)}};for i in 0..<3{for x:CGFloat in [218,422]{circle(x,CGFloat(150+i*57),16,color(CGFloat(i)/3))}}
|
||||
case 13:box(.init(x:170,y:126,width:300,height:163),muted,10);for x in stride(from:CGFloat(180),to:460,by:28){box(.init(x:x,y:135,width:15,height:13),.black,2);box(.init(x:x,y:268,width:15,height:13),.black,2)};for i in 0..<3{box(.init(x:184+CGFloat(i)*92,y:157,width:84,height:100),[NSColor.systemOrange,.systemTeal,.systemPurple][i].withAlphaComponent(0.65),3)}
|
||||
case 14:for i in 0...6{let v=CGFloat(i)/6;let p=(0...32).map{k -> NSPoint in let t=CGFloat(k)/32;return .init(x:210+v*220+(v-0.5)*35*sin(t * .pi),y:125+t*165)};line(p,a,2);let q=(0...32).map{k -> NSPoint in let t=CGFloat(k)/32;return .init(x:210+t*220,y:125+v*165+(v-0.5)*35*sin(t * .pi))};line(q,a,2)}
|
||||
default:let c1=[NSPoint(x:184,y:142),.init(x:214,y:282),.init(x:296,y:175),.init(x:184,y:142)];line(c1,.systemPurple,6);let c2=[NSPoint(x:366,y:148),.init(x:409,y:269),.init(x:465,y:176),.init(x:366,y:148)];line(c2,.systemCyan,6);line([.init(x:302,y:211),.init(x:351,y:211),.init(x:339,y:221)],ink,5);line([.init(x:351,y:211),.init(x:339,y:201)],ink,5);text("LOG",.init(x:191,y:110,width:90,height:25),19,ink);text("709",.init(x:371,y:110,width:90,height:25),19,ink)
|
||||
}
|
||||
}
|
||||
func render(_ n:Int,_ width:Int,_ height:Int) -> Data {
|
||||
let b=NSBitmapImageRep(bitmapDataPlanes:nil,pixelsWide:width,pixelsHigh:height,bitsPerSample:8,samplesPerPixel:4,hasAlpha:true,isPlanar:false,colorSpaceName:.deviceRGB,bytesPerRow:0,bitsPerPixel:0)!
|
||||
NSGraphicsContext.saveGraphicsState();NSGraphicsContext.current=NSGraphicsContext(bitmapImageRep:b)
|
||||
let transform=NSAffineTransform();transform.scale(by:CGFloat(width)/640);transform.concat()
|
||||
box(.init(x:0,y:0,width:640,height:360),NSColor(calibratedWhite:0.065,alpha:1),0)
|
||||
box(.init(x:0,y:0,width:640,height:7),accents[n],0)
|
||||
text("大鱼调色",.init(x:20,y:316,width:110,height:24),18,NSColor(calibratedWhite:0.65,alpha:1),.medium)
|
||||
art(n);text(names[n],.init(x:16,y:35,width:608,height:50),names[n].count>10 ? 31:37,.white)
|
||||
NSGraphicsContext.restoreGraphicsState();return b.representation(using:.png,properties:[:])!
|
||||
}
|
||||
for (i,name) in names.enumerated(){let dir=root.appendingPathComponent("template").appendingPathComponent(name);try FileManager.default.createDirectory(at:dir,withIntermediateDirectories:true);for (file,w,h) in [("large.png",640,360),("small.png",240,135)]{try render(i,w,h).write(to:dir.appendingPathComponent(file))}}
|
||||
print("Rendered 16 distinct module previews at 640×360 and 240×135")
|
||||
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Isolated 1.17 host fixture, using the project's public-domain portrait."""
|
||||
from pathlib import Path
|
||||
import base64, json, plistlib, uuid
|
||||
import xml.etree.ElementTree as E
|
||||
root=Path(__file__).resolve().parent.parent
|
||||
qa=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/unified-1.17.0'
|
||||
qa.mkdir(parents=True,exist_ok=True)
|
||||
portrait=root/'tools/fixtures/astronaut.png'
|
||||
model=json.loads((root/'template/sources/RegisteredParameters.json').read_text())
|
||||
values={r['key']:r['default'] for r in model['parameters']}
|
||||
values.update(cmConfigured=1,cminputGamut=22,cminputTransfer=1003,cmworkingGamut=22,cmworkingTransfer=1003,cmoutputGamut=22,cmoutputTransfer=1003,cmtoneMapping=0,skinEnabled=0,inputProfile=0,preLUTStrength=0)
|
||||
assert set(values)<=set(r['key'] for r in model['parameters'])
|
||||
spider=json.loads((root/'research/cms-correction-20261104/neutral-spider.json').read_text())
|
||||
for name,mosaic in [('全链路中性',False),('人脸马赛克',True)]:
|
||||
tools=dict(schema=3,layers=[],baseMasks={},sharedMasks=[],outputAfter='tail')
|
||||
if mosaic:tools['mosaic']=dict(enabled=True,source='face',size=64)
|
||||
preset=dict(format='com.dayu.color.preset',version=7,colorManagement=dict(version=4,mode=5,engine='Dayu-CST-f32',config='ordered-working-domain-v1'),values=values,paths={},spider=spider,tools=base64.b64encode(plistlib.dumps(tools,fmt=plistlib.FMT_BINARY)).decode())
|
||||
(qa/(name+'.json')).write_text(json.dumps(preset,ensure_ascii=False,indent=2)+'\n')
|
||||
doc=E.Element('fcpxml',version='1.12');r=E.SubElement(doc,'resources')
|
||||
E.SubElement(r,'format',id='f1',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)')
|
||||
E.SubElement(r,'format',id='f2',width='512',height='512',name='FFVideoFormatRateUndefined')
|
||||
a=E.SubElement(r,'asset',id='a1',name='astronaut',start='0s',duration='0s',hasVideo='1',videoSources='1',format='f2')
|
||||
E.SubElement(a,'media-rep',kind='original-media',src=portrait.resolve().as_uri())
|
||||
template=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
|
||||
E.SubElement(r,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri())
|
||||
event=E.SubElement(E.SubElement(doc,'library'),'event',name='大鱼调色1.17.0全链路与马赛克验收',uid=str(uuid.uuid5(uuid.NAMESPACE_URL,'dayu-color/unified-1.17')).upper())
|
||||
for title in ['1.17.0 自适应与输出层','1.17.0 人脸与蒙版马赛克']:
|
||||
project=E.SubElement(event,'project',name=title,uid=str(uuid.uuid5(uuid.NAMESPACE_URL,title)).upper())
|
||||
sequence=E.SubElement(project,'sequence',format='f1',duration='4s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k')
|
||||
clip=E.SubElement(E.SubElement(sequence,'spine'),'video',ref='a1',name='astronaut',offset='0s',start='0s',duration='4s')
|
||||
E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1')
|
||||
E.indent(doc);output=qa/'全链路与马赛克验收.fcpxml'
|
||||
output.write_text('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE fcpxml>\n'+E.tostring(doc,encoding='unicode')+'\n')
|
||||
print(output)
|
||||
@@ -12,5 +12,5 @@ def template_files():
|
||||
installed = Path(effect) / name
|
||||
# Preserve the full effect's original flat bundle layout and artwork.
|
||||
bundled = Path(name) if effect == EFFECTS[0] else installed
|
||||
source = Path(name) if name in PREVIEWS else bundled
|
||||
source = bundled
|
||||
yield source, bundled, installed
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"status": "published-after-verified-draft-download",
|
||||
"releaseID": 392,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.13.1-pixel-clone-20261105",
|
||||
"tag": "v1.13.1-pixel-clone-20261105",
|
||||
"commit": "46153a26edfbf44c5f22fbad5953ec74c0d33883",
|
||||
"assetID": 36,
|
||||
"downloadURL": "https://dayu.media/git/attachments/ee0a09fc-58b0-4883-9923-d5eb8aced007",
|
||||
"bytes": 45352349,
|
||||
"sha256": "8a19afadda6317d186541f37a221c46261a22ddabcdddec90d02e1315b693965",
|
||||
"finalDownloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.13.1-pixel-clone-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.13.1.pkg"
|
||||
"status": "published-after-verified-download",
|
||||
"releaseID": 399,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.0-unified-mosaic-20261106",
|
||||
"tag": "v1.17.0-unified-mosaic-20261106",
|
||||
"commit": "a458bbeb5397153a458706b0bfbb4e8692108a65",
|
||||
"assetID": 43,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg",
|
||||
"bytes": 46594729,
|
||||
"sha256": "f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e",
|
||||
"publishedReport": "verification/Release.json"
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"version": "1.16.0",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"keptInstaller": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.16.0.pkg",
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.16.0",
|
||||
"/Volumes/备份/大鱼调色-1.16.0.pkg",
|
||||
"Release build app and loose pluginkit (delivery script)",
|
||||
"notarization-submission.zip (delivery script)",
|
||||
"same-volume previous APP replacement backup",
|
||||
"PKG input staging (packaging script)"
|
||||
],
|
||||
"auditScope": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Applications/大鱼调色.app",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug/大鱼调色.app"
|
||||
],
|
||||
"extraLooseProductAppsInAuditedTaskRoots": [],
|
||||
"pluginKitEntries": 1,
|
||||
"limits": "Task roots and known install paths only; no whole-disk uniqueness claim. Historical installers and QA project/media retained."
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"status": "candidate-rollback-cleanup-passed",
|
||||
"formalVersion": "1.16.0",
|
||||
"formalBuild": "97",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.17.0-jy59vrq1",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/FxPlug-arm64-analysis",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/ProAppsFxSupport-arm64-analysis"
|
||||
],
|
||||
"candidateApps": "98, 99, 100, 101 rejected generated apps removed after rollback verification",
|
||||
"notarizationSubmissionZIP": "removed by delivery script",
|
||||
"retained": [
|
||||
"source and checkpoints",
|
||||
"QA library and fixtures",
|
||||
"REA sizing evidence JSON",
|
||||
"historical formal PKG packages",
|
||||
"functional previews installed in Motion Templates"
|
||||
],
|
||||
"scope": "Only task-owned artifacts; no claim of a full-disk duplicate audit. No 1.17.0 PKG or Release.",
|
||||
"rollbackLaunchVerification": {
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"observedVersion": "1.16.0",
|
||||
"observedBuild": "97",
|
||||
"wrapperStatus": "插件注册成功",
|
||||
"gatekeeper": "accepted / Notarized Developer ID",
|
||||
"scope": "Launched exact formal app and observed wrapper version/registration; current QA FCP project contains candidate V4 state and was not reopened on legacy build."
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"version": "1.17.0",
|
||||
"build": "102",
|
||||
"formalApp": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"keptInstaller": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.0.pkg",
|
||||
"removed": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.17.0-final-fej13yjq",
|
||||
"/Volumes/备份/大鱼调色-1.17.0.pkg",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色.app",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/notarization-submission.zip",
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-jrnzspg4"
|
||||
],
|
||||
"replacementBackup": "Removed by successful delivery completion; no com.dayu.color previous app remains beside formal install.",
|
||||
"auditScope": [
|
||||
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
|
||||
"/Volumes/备份/大鱼调色",
|
||||
"/Applications/大鱼调色.app",
|
||||
"/Users/mac/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"/Library/Plug-Ins/FxPlug"
|
||||
],
|
||||
"extraLooseProductAppsInAuditedTaskRoots": [],
|
||||
"pluginKitEntries": 1,
|
||||
"retained": [
|
||||
"Formal app and package",
|
||||
"User historical packages",
|
||||
"Source and recovery checkpoints",
|
||||
"QA library and media",
|
||||
"REA evidence JSON",
|
||||
"Pre-existing pkg-inputs cache",
|
||||
"Other products including primary color and color panel"
|
||||
],
|
||||
"limits": "Only task roots and known installation paths audited; no whole-disk uniqueness claim. No other product files removed."
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.16.0",
|
||||
"build": "97",
|
||||
"version": "1.17.1",
|
||||
"build": "103",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "2fcfe0e9-7694-49b3-90a5-4989415d82a4",
|
||||
"notaryID": "36ecb7e6-5cfc-4b85-8363-11272d880b18",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "27ba2b53ca6809081269f95ca6caaddeb3933c79",
|
||||
"sourceCommit": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
@@ -16,55 +16,54 @@
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"一级调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"蜘蛛盘校色仪/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"基础调整/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"肤色保护/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"风格 LUT/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"HSL/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"曲线/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"颜色分级/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"三原色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"色阶/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"黑白混色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"色彩平衡/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"通道混合器/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"胶片模拟/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"镜头畸变修复/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"CST 色彩空间转换/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "dfb36a120cd4d3ba09c960ac5d5905f61b5dc6d2d5024444b49aebd3d3fd43f1",
|
||||
"hostVerification": "verification/HostLevel1.16.0.json",
|
||||
"hostGestureScope": "Native callback checks passed; live manual OSC interaction pending"
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"hostVerification": "verification/HostInspectorMosaic1.17.1.json"
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
"version": "1.17.1",
|
||||
"build": "103",
|
||||
"sourceCommit": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"status": "verified",
|
||||
"testedFrom": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"date": "2026-11-06",
|
||||
"scope": "Formal host loading, inspector interaction and mosaic menu; moving footage acceptance deferred to user",
|
||||
"actualHostChecks": [
|
||||
{
|
||||
"name": "cold loaded formal version",
|
||||
"passed": true,
|
||||
"scope": "FCP header 1.17.1, formal XPC executable path, restored static NASA portrait face mosaic"
|
||||
},
|
||||
{
|
||||
"name": "default compact disclosure",
|
||||
"passed": true,
|
||||
"scope": "Primary, spider and base open; all other headers collapsed; no inner scroll bar initially; FCP outer scroll remains"
|
||||
},
|
||||
{
|
||||
"name": "expanded module scrolling",
|
||||
"passed": true,
|
||||
"scope": "Opened film then curve: inner scroll area exposes vertical scroll bar, moved from 0 to 1; bottom output reachable. Collapsing curve removed inner scroll bar; film also restored collapsed. Outer FCP row retains initial allocation and trailing reserved space."
|
||||
},
|
||||
{
|
||||
"name": "person selection menu",
|
||||
"passed": true,
|
||||
"scope": "Fast face mode, convert this frame 1 face to selectable tracking mask, multiselect mask and per-mask tracking hint shown. Menu closed without converting; original mosaic preserved."
|
||||
}
|
||||
],
|
||||
"automatedChecks": {
|
||||
"report": "verification/InstalledSelfTest.json",
|
||||
"passed": 961,
|
||||
"failed": 0
|
||||
},
|
||||
"limitations": [
|
||||
"Real mouse shape-draw/release fix is covered by native OSC callback tests; actual host mouse drawing remains for user retest.",
|
||||
"Two-face selection tested with duplicated NASA public-domain portrait; real moving multiple persons, occlusion, crossing and performance unverified.",
|
||||
"Converted face rectangles are static until each is tracked; no face identity recognition across cuts.",
|
||||
"FCP outer inspector caches initial row height; only inner viewport contracts.",
|
||||
"Legacy saved folding choices are preserved."
|
||||
],
|
||||
"qaProject": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/level-1.15.0/未命名.fcpbundle",
|
||||
"qaEvent": "大鱼调色1.17.0全链路与马赛克验收",
|
||||
"processPaths": [
|
||||
"77303 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
"version": "1.17.0",
|
||||
"build": "101",
|
||||
"sourceCommit": "2c2af3695b6dbe661db7adf544a60c58766a4e73",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"status": "rejected-dynamic-inspector-height",
|
||||
"testedFrom": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"date": "2026-11-06",
|
||||
"actualHostChecks": [
|
||||
{
|
||||
"name": "independent functional thumbnails",
|
||||
"pass": true,
|
||||
"scope": "FCP Effects browser visibly shows distinct look, skin, blackwhite and base module artwork; all 16 sources separately verified by template hash report."
|
||||
},
|
||||
{
|
||||
"name": "face mosaic",
|
||||
"pass": true,
|
||||
"scope": "NASA public-domain astronaut portrait; local mosaic inspector menu -> face shows blocks across eyes, nose and mouth; outside background remains recognizable."
|
||||
},
|
||||
{
|
||||
"name": "shared rectangle mosaic",
|
||||
"pass": true,
|
||||
"scope": "Control panel created rectangle shared mask, feather changed to 0; mosaic menu switches from face to rectangle; rectangular central area pixelated and upper face outside mask restored."
|
||||
},
|
||||
{
|
||||
"name": "output placement and undo",
|
||||
"pass": true,
|
||||
"scope": "Explicit V4 preset loaded; output initially below HSL at tail; up moves it above HSL; one Command-Z restores it below HSL."
|
||||
},
|
||||
{
|
||||
"name": "dynamic custom inspector height",
|
||||
"pass": false,
|
||||
"scope": "First display measures complete content. Folding primary in standalone primary effect leaves blank custom view; switching to another clip then back recreates correct collapsed view. No automatic acceptable update."
|
||||
}
|
||||
],
|
||||
"limitations": [
|
||||
"No successful OSC pointer click callback from automation; mosaic menu verified through the added inspector entry using the identical bridge and state writer.",
|
||||
"Mask tracking interpolation and face movement covered by native renderer diagnostics, not moving-video GUI tracking in this run.",
|
||||
"V4 is explicit opt-in to preserve legacy nil/V2/V3 behavior. Unified mode output defaults to tail. Not every old algorithm has been rewritten as scene-linear.",
|
||||
"Build 101 rejected and removed; verified 1.16.0 build 97 restored. No 1.17.0 PKG, Release tag or upload created.",
|
||||
"Question pending: independent adaptive panel versus continued native-inspector redesign. No alternative UI adopted without user answer."
|
||||
],
|
||||
"qaProject": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/level-1.15.0/未命名.fcpbundle",
|
||||
"qaEvent": "大鱼调色1.17.0全链路与马赛克验收"
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
"version": "1.17.0",
|
||||
"build": "102",
|
||||
"sourceCommit": "03a1e2452ec665fe6574b07d1899988fd6852cf1",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"status": "verified",
|
||||
"testedFrom": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"date": "2026-11-06",
|
||||
"userDecision": "全部模块展开,在创建检查器视图前计算所需高度;不采用独立浮动面板替代。",
|
||||
"actualHostChecks": [
|
||||
{
|
||||
"name": "initial full inspector",
|
||||
"passed": true,
|
||||
"scope": "Cold launch preserved V4 and saved rectangle mosaic. All ordinary modules expanded; top and bottom controls visible using only FCP outer inspector scroll. Lens and complete output CST shown without reselecting clip."
|
||||
},
|
||||
{
|
||||
"name": "added repeated layer",
|
||||
"passed": true,
|
||||
"scope": "Added second lens layer to full module instance. Both lens bodies and complete trailing output CST remained reachable. One Command-Z removed added layer."
|
||||
},
|
||||
{
|
||||
"name": "output placement and undo",
|
||||
"passed": true,
|
||||
"scope": "Output initially after lens; up moved it before lens; one Command-Z restored tail. Inspector remained visible."
|
||||
},
|
||||
{
|
||||
"name": "face mosaic and saved mask mosaic",
|
||||
"passed": true,
|
||||
"scope": "NASA public-domain portrait: cold-loaded saved rectangle masks only central rectangle. Inspector menu -> face switches pixelation to eyes/nose/mouth and restores rectangle exterior."
|
||||
},
|
||||
{
|
||||
"name": "standalone legacy HSL",
|
||||
"passed": true,
|
||||
"scope": "Existing standalone HSL clip remains original workflow, only HSL body shown expanded with all three current-channel sliders. 1.17.0 header confirmed."
|
||||
},
|
||||
{
|
||||
"name": "independent functional previews",
|
||||
"passed": true,
|
||||
"scope": "FCP browser visibly distinguishes LUT, skin, blackwhite and base artwork. All 16 generated pairs additionally covered by ModulePreviews and installed payload hashes."
|
||||
},
|
||||
{
|
||||
"name": "host save and normal quit",
|
||||
"passed": true,
|
||||
"scope": "FCP quit normally after QA; inventory confirmed not running."
|
||||
}
|
||||
],
|
||||
"automatedChecks": {
|
||||
"report": "verification/InstalledSelfTest.json",
|
||||
"passed": 951,
|
||||
"failed": 0
|
||||
},
|
||||
"limitations": [
|
||||
"FCP 12.4 caches initial custom-view height. This release uses all-expanded initial measurement, including narrow-width and largest tab content. It does not promise arbitrary later growth of infinitely added layers; current host check covers one added lens layer. Re-selecting a clip recalculates its current content.",
|
||||
"Full measured height reserves capacity for tab/mode changes and can leave trailing empty space at wider inspector widths. FCP outer inspector scroll remains; custom inner scroll is removed.",
|
||||
"OSC grid control is implemented; automation did not obtain successful OSC mouse callbacks. Mosaic operation was verified through inspector entry sharing the same menu and state writer.",
|
||||
"Moving-video GUI face/mask tracking was not repeated; frame-key interpolation, moving face renderer, outside pixels and missing mask cases are covered by native diagnostics.",
|
||||
"V4 is explicitly selected under color settings for compatibility; output defaults to tail within V4. Existing nil/V2/V3 workflows are retained. Legacy bounded algorithms use defined reference domains and residual extension rather than all being rewritten scene-linear.",
|
||||
"Spatial mosaic cannot be represented by Cube LUT; use full preset."
|
||||
],
|
||||
"qaProject": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/level-1.15.0/未命名.fcpbundle",
|
||||
"qaEvent": "大鱼调色1.17.0全链路与马赛克验收"
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
{
|
||||
"pass": true,
|
||||
"checks": 961,
|
||||
"scope": "Release native diagnostics; host and real moving footage acceptance separate",
|
||||
"results": [
|
||||
{
|
||||
"name": "inspector-recreation-restores-independent-disclosure",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-mask-gesture-keeps-capture-when-crossing-the-open-viewer-panel",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-drag-updates-local-bbox-without-author-or-undo-write",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-release-commits-final-bbox-once-to-all-shared-modules",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-escape-keeps-author-and-all-shared-bindings",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-click-without-area-does-not-write-or-create-undo",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-playhead-change-cancels-before-write",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-keeps-draft-across-different-redraw-clock",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-mask-release-saves-with-different-action-clock",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-drawn-mask-persists-after-secure-reopen",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-add-pen-enters-empty-drawing-mode",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-parameter-burst-coalesces-to-one-deferred-refresh",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-baseline",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-shared-rectangle-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"inside": 0.39990234375,
|
||||
"name": "mosaic-changes-selection-and-preserves-outside",
|
||||
"outside": 0,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-follow-existing-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-tracked-selection-vacates-previous-region",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-missing-mask",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-missing-mask-does-not-cover-whole-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-refuses-incomplete-cube-export",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-invalid-block-size-rejected",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"height": 3501,
|
||||
"name": "inspector-default-opens-three-tools-and-retains-other-headers",
|
||||
"pass": true,
|
||||
"visibleModules": 15
|
||||
},
|
||||
{
|
||||
"name": "inspector-default-complete-stack-fits-without-inner-scroll",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-expansion-enters-scroll-with-stable-host-allocation",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-collapse-removes-scroll-and-clamps-former-bottom-offset",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-added-module-is-reachable-in-scroll",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-saved-disclosure-is-restored-without-grading-changes",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"backgroundChange": 0,
|
||||
"faceChange": 0.6928863525390625,
|
||||
"name": "mosaic-real-face-includes-feature-region-and-excludes-background",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"faces": 2,
|
||||
"name": "mosaic-fast-rectangles-detect-two-faces-without-landmarks",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-import-faces-creates-two-stable-masks-in-one-undo",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-imported-selection-matches-live-two-face-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-selects-one-person-with-other-person-pixel-identical",
|
||||
"pass": true,
|
||||
"selectedChange": 0.9094352722167969,
|
||||
"unselectedChange": 0
|
||||
},
|
||||
{
|
||||
"name": "mosaic-person-selection-survives-secure-save-and-reopen",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-duplicate-mask-identities-rejected",
|
||||
"pass": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 922,
|
||||
"checks": 961,
|
||||
"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,7 +12,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "runtime-directory",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -121,12 +121,12 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"modules": 15,
|
||||
"name": "default-only-primary-spider-base-hsl-visible-and-collapsed",
|
||||
"modules": 16,
|
||||
"name": "default-three-expanded-and-other-modules-folded",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "all-disclosure-actions-preserve-every-render-parameter",
|
||||
"name": "expanded-header-actions-preserve-every-render-parameter",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -898,7 +898,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -918,7 +918,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 63.300583336967975,
|
||||
"maximumGapMS": 86.95504162460566,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -1389,7 +1389,7 @@
|
||||
"closePixels": 128,
|
||||
"name": "workspace-offscreen-compact-icons-and-close-render-pixels",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/workspace-topbar.png",
|
||||
"toolbarPixels": 3867
|
||||
},
|
||||
{
|
||||
@@ -1460,7 +1460,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "970DB047-5690-4026-AD31-B2CE7AC2CCD1",
|
||||
"node": "46D9AE5A-65F4-42B7-9DEA-627A58B5B8B7",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1469,10 +1469,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -1677,7 +1677,7 @@
|
||||
"viewport": "{424, 235}"
|
||||
},
|
||||
{
|
||||
"document": "{{0, 0}, {424, 235}}",
|
||||
"document": "{{0, 0}, {1488, 235}}",
|
||||
"name": "workspace-horizontal-minimum-height-look",
|
||||
"outside": [],
|
||||
"pass": true,
|
||||
@@ -2799,7 +2799,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"coveredPixels": 16088,
|
||||
"coveredPixels": 17041,
|
||||
"name": "native-osc-real-metal-overlay-transparent-around-controls",
|
||||
"pass": true
|
||||
},
|
||||
@@ -2873,13 +2873,25 @@
|
||||
"name": "native-osc-ellipse-draws-reverse-direction-with-positive-shared-extents",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-shape-keeps-draft-across-different-redraw-clock",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-mask-release-saves-with-different-action-clock",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-drawn-mask-persists-after-secure-reopen",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "canvas-curve-histogram-updates-from-final-output-at-the-same-playhead",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "native-osc-renders-the-cropped-toolbar-on-a-transparent-texture",
|
||||
"opaquePixels": 12264,
|
||||
"opaquePixels": 13217,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -3861,35 +3873,168 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-color-settings-hidden-without-gap",
|
||||
"name": "unified-v4-valid-and-distinct-from-v3",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-color-settings-button-expands-panel",
|
||||
"name": "unified-default-output-is-last",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-preferred-height-follows-content-with-a-scroll-cap",
|
||||
"name": "unified-output-follows-stable-uuid",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-hosted-slot-keeps-header-visible-and-scrolls-only-overflow",
|
||||
"name": "unified-deleting-anchor-keeps-valid-output-order",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-color-settings-repeated-toggle-does-not-edit-grade",
|
||||
"name": "unified-rejects-unknown-output-anchor",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-settings-preserve-CMS-version-1",
|
||||
"error": "未提供错误信息",
|
||||
"name": "unified-neutral-wide-chain-renders",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-settings-preserve-CMS-version-2",
|
||||
"name": "unified-neutral-preserves-negative-and-superwhite",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "compact-settings-preserve-CMS-version-3",
|
||||
"error": "未提供错误信息",
|
||||
"name": "unified-scene-exposure",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"blue": 7.99609375,
|
||||
"name": "unified-scene-exposure-doubles-negative-and-superwhite",
|
||||
"pass": true,
|
||||
"red": -0.0799560546875
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "unified-HSL-before-output-accepts-linear-domain",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "unified-active-bounded-tool-carries-superwhite-residual",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "unified-zero-mask",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "unified-zero-mask-is-exact-neutral",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "unified-last-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "unified-middle-output",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"difference": 0.01904296875,
|
||||
"name": "unified-moving-output-changes-actual-domain-order",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "unified-inspector-output-visible-at-chain-tail",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "unified-output-arrow-persists-and-creates-one-undo",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-baseline",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-shared-rectangle-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"inside": 0.39990234375,
|
||||
"name": "mosaic-changes-selection-and-preserves-outside",
|
||||
"outside": 0,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-follow-existing-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-tracked-selection-vacates-previous-region",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "未提供错误信息",
|
||||
"name": "mosaic-missing-mask",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-missing-mask-does-not-cover-whole-frame",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-refuses-incomplete-cube-export",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-invalid-block-size-rejected",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"height": 3501,
|
||||
"name": "inspector-default-opens-three-tools-and-retains-other-headers",
|
||||
"pass": true,
|
||||
"visibleModules": 15
|
||||
},
|
||||
{
|
||||
"name": "inspector-default-complete-stack-fits-without-inner-scroll",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-expansion-enters-scroll-with-stable-host-allocation",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-collapse-removes-scroll-and-clamps-former-bottom-offset",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-added-module-is-reachable-in-scroll",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "inspector-saved-disclosure-is-restored-without-grading-changes",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "expanded-settings-preserve-CMS-version-1",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "expanded-settings-preserve-CMS-version-2",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "expanded-settings-preserve-CMS-version-3",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "expanded-settings-preserve-CMS-version-4",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -4128,7 +4273,7 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "viewer-lower-right-rail-has-seven-image-tools-and-three-persistent-mask-shapes",
|
||||
"name": "viewer-lower-right-rail-has-eight-image-tools-and-three-persistent-mask-shapes",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -4136,10 +4281,10 @@
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"canvasPixelFraction": 0.017447916666666667,
|
||||
"canvasPixelFraction": 0.018740354938271604,
|
||||
"name": "viewer-idle-4k-toolbar-rasterizes-under-five-percent-of-the-canvas",
|
||||
"overlayHeight": 134,
|
||||
"overlayWidth": 1080,
|
||||
"overlayWidth": 1160,
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
@@ -4269,7 +4414,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -4391,6 +4536,39 @@
|
||||
"name": "face-multiple-people-build-independent-support-regions",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"backgroundChange": 0,
|
||||
"faceChange": 0.6928863525390625,
|
||||
"name": "mosaic-real-face-includes-feature-region-and-excludes-background",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"faces": 2,
|
||||
"name": "mosaic-fast-rectangles-detect-two-faces-without-landmarks",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-import-faces-creates-two-stable-masks-in-one-undo",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-imported-selection-matches-live-two-face-render",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-selects-one-person-with-other-person-pixel-identical",
|
||||
"pass": true,
|
||||
"selectedChange": 0.9094352722167969,
|
||||
"unselectedChange": 0
|
||||
},
|
||||
{
|
||||
"name": "mosaic-person-selection-survives-secure-save-and-reopen",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "mosaic-duplicate-mask-identities-rejected",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"error": "",
|
||||
"name": "face-none-protected-render",
|
||||
@@ -4635,6 +4813,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C56E653E-BD84-4D1E-8346-229140D4F472",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.16.0.pkg",
|
||||
"sha256": "99a571c5b2c43d0c4ce3080d3f1026b90b1a3f79356825e38a06a1a7021df52d",
|
||||
"bytes": 55485504,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.17.1.pkg",
|
||||
"sha256": "5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710",
|
||||
"bytes": 46600407,
|
||||
"testUnsigned": false,
|
||||
"installationExecuted": false,
|
||||
"checks": [
|
||||
@@ -31,27 +31,27 @@
|
||||
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.16.0",
|
||||
"build": "97"
|
||||
"version": "1.17.1",
|
||||
"build": "103"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-b9_qept1/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.799ce2a1-7674-4b52-8bd6-8806d5986c50/AD5E036C-4E57-4DF1-B9F4-4921F7049D1C/大鱼调色"
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs-nf5zk7ii/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.11872d63-c02b-4e61-932f-b4f5ce5da14d/663E69E0-6C24-4560-9502-0086DA22CC8F/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.16.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-06 04:37:56 +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.16.0.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.17.1.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-06 08:12:29 +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.17.1.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.17.1.pkg",
|
||||
"status": "Accepted",
|
||||
"name": "大鱼调色-1.16.0.pkg",
|
||||
"id": "0384de2c-a9c4-46af-b0f0-5e79ab2d0c82",
|
||||
"createdDate": "2026-11-06T04:37:58.154Z",
|
||||
"message": "Successfully received submission info"
|
||||
"id": "8e122236-9ca6-4d92-ad6a-b9c2411280e7",
|
||||
"message": "Successfully received submission info",
|
||||
"createdDate": "2026-11-06T08:12:30.949Z"
|
||||
},
|
||||
"appCompiledSource": "27ba2b53ca6809081269f95ca6caaddeb3933c79",
|
||||
"appBuild": "97",
|
||||
"appCompiledSource": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"appBuild": "103",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
@@ -59,58 +59,58 @@
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"一级调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"蜘蛛盘校色仪/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"基础调整/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"肤色保护/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"风格 LUT/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"HSL/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"曲线/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"颜色分级/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"三原色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"色阶/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"黑白混色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"色彩平衡/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"通道混合器/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"胶片模拟/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"镜头畸变修复/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"CST 色彩空间转换/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"payloadBundleAccess": {
|
||||
"entries": 198,
|
||||
"scope": "Read/traverse modes for installer-owned app entries, from the package BOM"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostLevel1.16.0.json",
|
||||
"installedAppHostAcceptance": "verification/HostInspectorMosaic1.17.1.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -6,5 +6,11 @@
|
||||
"trackedContents": "all match compiled source Git objects",
|
||||
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.16.0",
|
||||
"submodules": false,
|
||||
"lfs": false
|
||||
"lfs": false,
|
||||
"releaseTag": "v1.16.0-leveling-modules-20261106",
|
||||
"releaseCommit": "0483e76a1762b1dc3d2e049453d4c85e473cfc50",
|
||||
"releaseFiles": 660,
|
||||
"releaseTreeMatches": true,
|
||||
"packageRecordMatches": true,
|
||||
"temporaryCloneRemoved": true
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"status": "passed-unreleased-source-checkpoint",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"branch": "main",
|
||||
"checkpoints": [
|
||||
{
|
||||
"commit": "2c2af3695b6dbe661db7adf544a60c58766a4e73",
|
||||
"trackedFilesVerified": 704,
|
||||
"lfsPointers": 0,
|
||||
"submodules": 0
|
||||
},
|
||||
{
|
||||
"commit": "ea9884d266cc1326826ff5853cff49a2c4573075",
|
||||
"trackedFilesVerified": 707,
|
||||
"lfsPointers": 0,
|
||||
"submodules": 0
|
||||
}
|
||||
],
|
||||
"scope": "Independent remote checkout and every tracked blob hash; not a fresh rebuild of third-party dependencies. Candidate 101 rejected for host dynamic height; formal install remains 97."
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"date": "2026-11-06",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"compiledSource": "03a1e2452ec665fe6574b07d1899988fd6852cf1",
|
||||
"compiledVerifiedFiles": 709,
|
||||
"tag": "v1.17.0-unified-mosaic-20261106",
|
||||
"tagCommit": "a458bbeb5397153a458706b0bfbb4e8692108a65",
|
||||
"tagVerifiedFiles": 711,
|
||||
"lfsPointers": [],
|
||||
"submodules": [],
|
||||
"gitIntegrity": true,
|
||||
"compiledInputDifferencesAtTag": [
|
||||
"Publishing/1.17.0/Release.md",
|
||||
"research/UnifiedPipeline1.17.0.md",
|
||||
"verification/Delivery.json",
|
||||
"verification/HostUnified1.17.0.json",
|
||||
"verification/InstalledSelfTest.json",
|
||||
"verification/Package.json"
|
||||
],
|
||||
"packageSHA256": "f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e",
|
||||
"scope": "Independent remote clone; all tracked Git blob bytes verified at compiled commit and release tag; source inputs unchanged between them. No cold rebuild of third-party dependencies.",
|
||||
"temporaryClone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/recovery-1.17.0-final-fej13yjq/source",
|
||||
"temporaryCloneRemoved": true
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"repository": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"branch": "main",
|
||||
"source": {
|
||||
"commit": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"files": 714,
|
||||
"lfs": [],
|
||||
"submodules": 0,
|
||||
"fsck": "passed"
|
||||
},
|
||||
"build": {
|
||||
"sourceCommit": "3b4c612edf99c0ef2b972b7305cd7ba44244a7c6",
|
||||
"certificateTeam": "B3W25FX5H5",
|
||||
"certificateValidUntilUTC": "2027-02-01T22:12:15Z",
|
||||
"preflightChecks": 961,
|
||||
"templateChecks": "16 standalone and full effect passed; existing templates byte-identical",
|
||||
"unrelatedDiff": "project.pbxproj three Security reference reorderings preserved"
|
||||
},
|
||||
"scope": "Independent remote checkout and all tracked blobs; no third-party cold rebuild; release tag recovery pending"
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
"status": "rejected-host-dynamic-height",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.0",
|
||||
"build": "100",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "4d8cdda2-daf4-4b1a-a4df-425b86dd472d",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "3c965079716c243ece946997ad8959f32ed2526a",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-6f8ee1ce80de4e3180d322265bf7f883.app",
|
||||
"reason": "Immediate flag hide/show did not retire the FCP custom-view row; initial full size works but fold leaves blank slot. Not released.",
|
||||
"restoredBuild": "97"
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
"status": "rejected-host-dynamic-height",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.0",
|
||||
"build": "101",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "4e9e5a94-a707-4733-b75c-846445d02ebd",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "2c2af3695b6dbe661db7adf544a60c58766a4e73",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-caa1bc07218e4b15844a5c574a0a7675.app",
|
||||
"reason": "FCP retains custom row geometry; delayed hide/show leaves blank view until clip reselection. Face and mask mosaic and output move/undo passed actual host UI. Not released.",
|
||||
"restoredBuild": "97"
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
"status": "host-layout-failed-rolled-back",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.0",
|
||||
"build": "98",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "8a8ce0ff-211a-4cca-bf2c-7b9a16c5cbd4",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "0a1987572b1f1f79a8fc4035a09206bcb7586350",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-14cdeebcaf5f47bda2b7bdb9400d120c.app",
|
||||
"reason": "FCP initial custom view slot remained 406 points; long view top clipped.",
|
||||
"restoredVersion": "1.16.0 (97)"
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
"status": "rejected-host-dynamic-height",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.0",
|
||||
"build": "99",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "7eee4b2c-4095-4cab-b8af-828473f4e211",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "dc56d0b321c2080565f9a2d21597a17923e7b4b5",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"installedTemplateSHA256": {
|
||||
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
|
||||
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
|
||||
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
|
||||
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
|
||||
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
|
||||
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
|
||||
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
|
||||
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
|
||||
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
|
||||
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
|
||||
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
|
||||
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
|
||||
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
|
||||
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
|
||||
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
|
||||
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
|
||||
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
|
||||
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
|
||||
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
|
||||
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
|
||||
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
|
||||
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
|
||||
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
|
||||
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
|
||||
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
|
||||
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
|
||||
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
|
||||
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
|
||||
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
|
||||
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
|
||||
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
|
||||
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
|
||||
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
|
||||
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
|
||||
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
|
||||
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
|
||||
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
|
||||
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
|
||||
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
|
||||
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
|
||||
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
|
||||
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
|
||||
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
|
||||
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
|
||||
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
|
||||
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
|
||||
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
|
||||
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
|
||||
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
|
||||
},
|
||||
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-6269d816ab0444c0bee5fde43edc61d2.app",
|
||||
"reason": "Initial complete height visible; folding resized service container only and left FCP host row unchanged; not released.",
|
||||
"restoredBuild": "97"
|
||||
}
|
||||
@@ -3,40 +3,24 @@
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.15.0-modular-leveling-20261106",
|
||||
"releaseCommit": "b85165b6e2586ff86cab8fbf13ee8474fb3356a0",
|
||||
"releaseID": 397,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.15.0-modular-leveling-20261106",
|
||||
"assetID": 41,
|
||||
"assetName": "大鱼调色-1.15.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.15.0-modular-leveling-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.15.0.pkg",
|
||||
"bytes": 46649171,
|
||||
"sha256": "3cf708b5fe3f42013b1c2ab4b714978068446cada167ef8d67ee9efdc449c257",
|
||||
"tag": "v1.17.0-unified-mosaic-20261106",
|
||||
"releaseCommit": "a458bbeb5397153a458706b0bfbb4e8692108a65",
|
||||
"releaseID": 399,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.17.0-unified-mosaic-20261106",
|
||||
"prerelease": true,
|
||||
"assetID": 43,
|
||||
"assetName": "大鱼调色-1.17.0.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg",
|
||||
"bytes": 46594729,
|
||||
"sha256": "f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Authenticated full download SHA-256 and byte count, then release/asset read-back.",
|
||||
"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",
|
||||
"draftDownload": {
|
||||
"method": "Authenticated Microsoft Edge download of the draft attachment",
|
||||
"bytes": 46649171,
|
||||
"sha256": "3cf708b5fe3f42013b1c2ab4b714978068446cada167ef8d67ee9efdc449c257",
|
||||
"url": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.15.0-modular-leveling-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.15.0.pkg",
|
||||
"releaseID": 397,
|
||||
"assetID": 41
|
||||
},
|
||||
"anonymousDownload": {
|
||||
"bytes": 46649171,
|
||||
"sha256": "3cf708b5fe3f42013b1c2ab4b714978068446cada167ef8d67ee9efdc449c257",
|
||||
"ticketValidated": true
|
||||
},
|
||||
"independentRemoteCheckout": {
|
||||
"releaseCommit": "b85165b6e2586ff86cab8fbf13ee8474fb3356a0",
|
||||
"files": 642,
|
||||
"gitFsck": "full --strict passed",
|
||||
"clean": true,
|
||||
"matched": [
|
||||
"verification/Package.json",
|
||||
"template/一级调色/一级调色.moef",
|
||||
"template/HSL/HSL.moef"
|
||||
]
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.17.0.pkg",
|
||||
"sha256": "f372ee6a421f833c4619dcc4891ae66f90b56f40b431ee75529806bec762157e",
|
||||
"bytes": 46594729,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg",
|
||||
"canonicalDownloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.17.0-unified-mosaic-20261106/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.17.0.pkg"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/unified-1.17.0/全链路与马赛克验收.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": 1,
|
||||
"missing": 0
|
||||
}
|
||||
},
|
||||
"version": "1.12",
|
||||
"summary": {
|
||||
"projects": 2,
|
||||
"assets": 1,
|
||||
"elements": 19
|
||||
},
|
||||
"host_validation": "not_performed_by_this_command"
|
||||
}
|
||||
@@ -56,6 +56,38 @@ if(faceFixture.length){
|
||||
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)});
|
||||
NSMutableDictionary *privacy=DYMutablePlist(DYInitialToolDocument(nil));privacy[@"mosaic"]=@{@"enabled":@YES,@"source":@"face",@"size":@64};DYUniforms privacyU=defaults;privacyU.primarySectionEnabled=0;privacyU.skinProtection.x=0;
|
||||
BOOL privacyOK=[face renderSource:src destination:dst uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels privateFrame=read(dst,gpu);
|
||||
privacy[@"mosaic"] = @{@"enabled":@NO,@"source":@"face",@"size":@64};BOOL privacyOff=[face renderSource:src destination:dst uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels privateReference=read(dst,gpu);
|
||||
double privateInside=0,privateOutside=0;for(NSUInteger y=85;y<145;y++)for(NSUInteger x=200;x<260;x++)for(int c=0;c<3;c++)privateInside=MAX(privateInside,fabs((float)privateFrame[(y*w+x)*4+c]-(float)privateReference[(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++)privateOutside=MAX(privateOutside,fabs((float)privateFrame[(y*w+x)*4+c]-(float)privateReference[(y*w+x)*4+c]));
|
||||
run.record(@"mosaic-real-face-includes-feature-region-and-excludes-background",privacyOK&&privacyOff&&privateInside>.05&&privateOutside==0,@{@"faceChange":@(privateInside),@"backgroundChange":@(privateOutside)});
|
||||
// The same production menu writer turns two detected faces into independent,
|
||||
// serializable masks, then toggles only one while preserving the other pixels.
|
||||
privacy[@"mosaic"]=@{@"enabled":@YES,@"source":@"face",@"size":@64};
|
||||
BOOL fastOK=[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:DYToolRenderSnapshot(privacy,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];
|
||||
NSDictionary *detected=[face mosaicFaceSnapshot];Pixels bothFaces=read(twoDest,gpu);
|
||||
run.record(@"mosaic-fast-rectangles-detect-two-faces-without-landmarks",fastOK&&[detected[@"boxes"]count]==2,@{@"faces":@([detected[@"boxes"]count])});
|
||||
if([detected[@"boxes"]count]==2){
|
||||
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);DYWriteTools(base,privacy,kCMTimeZero);
|
||||
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
|
||||
id bridge=[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host];[bridge setValue:face forKey:@"renderer"];
|
||||
NSMenuItem *item=[[[NSMenuItem alloc]init]autorelease];item.representedObject=@{@"importFaces":detected,@"actionTime":detected[@"time"]};
|
||||
int undo=base->_undoStarts;[bridge performSelector:@selector(applyMosaicMenu:) withObject:item];
|
||||
NSDictionary *saved=DYReadTools(host,kCMTimeZero).document;NSArray *IDs=saved[@"mosaic"][@"maskIDs"];
|
||||
run.record(@"mosaic-import-faces-creates-two-stable-masks-in-one-undo",IDs.count==2&&DYSharedMasks(saved).count==2&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
BOOL savedOK=[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:DYToolRenderSnapshot(saved,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];
|
||||
run.record(@"mosaic-imported-selection-matches-live-two-face-render",savedOK&&difference(bothFaces,read(twoDest,gpu)).maximum<.002);
|
||||
if(IDs.count==2){
|
||||
item.representedObject=@{@"toggleMask":IDs[1]};[bridge performSelector:@selector(applyMosaicMenu:) withObject:item];saved=DYReadTools(host,kCMTimeZero).document;
|
||||
[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:DYToolRenderSnapshot(saved,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels single=read(twoDest,gpu);
|
||||
privacy[@"mosaic"]=@{@"enabled":@NO,@"source":@"face",@"size":@64};[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels reference=read(twoDest,gpu);
|
||||
double left=0,right=0;for(NSUInteger y=0;y<512;y++)for(NSUInteger x=0;x<1024;x++)for(int c=0;c<3;c++){double delta=fabs((float)single[(y*1024+x)*4+c]-(float)reference[(y*1024+x)*4+c]);if(x<512)left=MAX(left,delta);else right=MAX(right,delta);}
|
||||
run.record(@"mosaic-selects-one-person-with-other-person-pixel-identical",left>.05&&right==0&&[saved[@"mosaic"][@"maskIDs"]count]==1,@{@"selectedChange":@(left),@"unselectedChange":@(right)});
|
||||
NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(host,kCMTimeZero) requiringSecureCoding:YES error:nil];DYToolDocument *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:archive error:nil];run.record(@"mosaic-person-selection-survives-secure-save-and-reopen",[restored.document isEqual:saved]);
|
||||
NSMutableDictionary *malformed=DYMutablePlist(saved);malformed[@"mosaic"][@"maskIDs"]=@[IDs[0],IDs[0]];run.record(@"mosaic-duplicate-mask-identities-rejected",!DYValidToolDocument(malformed));
|
||||
}
|
||||
[bridge invalidate];[bridge release];
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,26 +1,28 @@
|
||||
// Presentation-only changes must never rewrite a host's grading parameters.
|
||||
{
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[view refresh];[view setFrameSize:NSMakeSize(400,780)];[view layoutSubtreeIfNeeded];
|
||||
NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];NSView *first=cards.firstObject[@"view"];
|
||||
run.record(@"compact-color-settings-hidden-without-gap",panel.hidden&&first.frame.origin.y==8&&[settings.accessibilityLabel isEqual:@"颜色设置"]);
|
||||
CGFloat foldedHeight=view.intrinsicContentSize.height;
|
||||
NSView *hostSlot=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,400,406)]autorelease];
|
||||
view.frame=hostSlot.bounds;[hostSlot addSubview:view];
|
||||
|
||||
NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds;
|
||||
[settings performClick:nil];[view layoutSubtreeIfNeeded];run.record(@"compact-color-settings-button-expands-panel",!panel.hidden&&first.frame.origin.y>=NSMaxY(panel.frame)+12&&settings.state==NSControlStateValueOn);
|
||||
run.record(@"inspector-preferred-height-follows-content-with-a-scroll-cap",foldedHeight<780&&view.intrinsicContentSize.height>foldedHeight&&view.intrinsicContentSize.height<=780);
|
||||
double layoutDeadline=NSProcessInfo.processInfo.systemUptime+.02;
|
||||
while(NSProcessInfo.processInfo.systemUptime<layoutDeadline)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];
|
||||
NSView *brandLabel=[view valueForKey:@"brand"];NSScrollView *cardsScroll=[view valueForKey:@"scroll"];
|
||||
run.record(@"inspector-hosted-slot-keeps-header-visible-and-scrolls-only-overflow",NSEqualRects(view.frame,hostSlot.bounds)&&NSContainsRect(view.bounds,brandLabel.frame)&&cardsScroll.documentView.frame.size.height>cardsScroll.contentSize.height);
|
||||
|
||||
for(int i=0;i<9;i++){[settings performClick:nil];[view layoutSubtreeIfNeeded];}
|
||||
run.record(@"compact-color-settings-repeated-toggle-does-not-edit-grade",panel.hidden&&first.frame.origin.y==8&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds);
|
||||
for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults()]){
|
||||
DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil];[settings performClick:nil];
|
||||
run.record([NSString stringWithFormat:@"compact-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]);
|
||||
NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];(void)custom;int starts=host->_undoStarts,ends=host->_undoEnds;
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];
|
||||
NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];
|
||||
BOOL defaults=YES;NSUInteger visible=0,expanded=0;CGFloat bottom=0;
|
||||
for(NSDictionary *card in cards)if(![card[@"removed"]boolValue]){BOOL open=[@[@"primary",@"base",@"spider"]containsObject:card[@"section"][@"key"]];defaults&=[card[@"collapsed"]boolValue]!=open;expanded+=![card[@"collapsed"]boolValue];visible++;bottom=MAX(bottom,NSMaxY([card[@"view"]frame]));}
|
||||
NSView *document=[view valueForKey:@"document"],*brandLabel=[view valueForKey:@"brand"];NSScrollView *scroll=[view valueForKey:@"scroll"];
|
||||
run.record(@"inspector-default-opens-three-tools-and-retains-other-headers",defaults&&expanded==3&&visible==DYToolTypes().count&&panel.hidden,@{@"visibleModules":@(visible),@"height":@(view.frame.size.height)});
|
||||
run.record(@"inspector-default-complete-stack-fits-without-inner-scroll",scroll&&!scroll.hasVerticalScroller&&document.bounds.size.height<=scroll.contentSize.height+.5&&bottom<=document.bounds.size.height&&NSContainsRect(view.bounds,brandLabel.frame));
|
||||
CGFloat originalHeight=view.frame.size.height;
|
||||
for(NSDictionary *card in cards)if([card[@"collapsed"]boolValue])[card[@"header"]performClick:nil];[view layoutSubtreeIfNeeded];
|
||||
run.record(@"inspector-expansion-enters-scroll-with-stable-host-allocation",scroll.hasVerticalScroller&&document.bounds.size.height>scroll.contentSize.height&&view.frame.size.height==originalHeight);
|
||||
[document scrollPoint:NSMakePoint(0,document.bounds.size.height)];
|
||||
for(NSDictionary *card in cards)if(![@[@"primary",@"base",@"spider"]containsObject:card[@"section"][@"key"]])[card[@"header"]performClick:nil];[view layoutSubtreeIfNeeded];
|
||||
run.record(@"inspector-collapse-removes-scroll-and-clamps-former-bottom-offset",!scroll.hasVerticalScroller&&scroll.contentView.bounds.origin.y==0&&[values isEqual:host->_values]&&starts==host->_undoStarts&&ends==host->_undoEnds);
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYInsertTool(doc,@"spider",@"base:spider");DYWriteTools(host,doc,kCMTimeZero);[view refresh];[view layoutSubtreeIfNeeded];
|
||||
run.record(@"inspector-added-module-is-reachable-in-scroll",scroll.hasVerticalScroller&&view.frame.size.height==originalHeight&&[[view valueForKey:@"stackViews"]count]==1);
|
||||
DYInspectorToken *folds=[[[DYInspectorToken alloc]init]autorelease];folds.folds=@{@"primary":@YES,@"hsl":@NO};[host setCustomParameterValue:folds toParameter:DYInspectorParameterID atTime:kCMTimeZero];[view refresh];
|
||||
BOOL restored=YES;for(NSDictionary *card in cards){NSString *key=card[@"section"][@"key"];if([key isEqual:@"primary"])restored&=[card[@"collapsed"]boolValue];if([key isEqual:@"hsl"])restored&=![card[@"collapsed"]boolValue];}
|
||||
run.record(@"inspector-saved-disclosure-is-restored-without-grading-changes",restored&&[values isEqual:host->_values]);
|
||||
for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults(),DYUnifiedColorDefaults()]){
|
||||
DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil];
|
||||
run.record([NSString stringWithFormat:@"expanded-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]);
|
||||
}
|
||||
for(NSNumber *width in @[@280,@320,@400]){
|
||||
[view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES;
|
||||
|
||||
@@ -267,11 +267,11 @@ 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){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)});
|
||||
for(NSDictionary *card in cards){BOOL expected=![card[@"section"][@"key"]isEqual:@"output"];initialUI&=([card[@"collapsed"]boolValue]!=[@[@"primary",@"base",@"spider"]containsObject:card[@"section"][@"key"]])&&[card[@"removed"]boolValue]!=expected;}
|
||||
run.record(@"default-three-expanded-and-other-modules-folded",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);
|
||||
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(@"expanded-header-actions-preserve-every-render-parameter",foldingIndependent);
|
||||
NSDictionary *first=cards[0];if(![first[@"collapsed"]boolValue]){[(NSButton*)first[@"header"]performClick:nil];[inspector refresh];}BOOL wasFolded=[first[@"collapsed"]boolValue];[(NSButton*)first[@"enabled"]performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);
|
||||
run.record(@"eye-only-toggles-enable-retains-disclosure",[first[@"collapsed"]boolValue]==wasFolded&&uiAfter.inputSectionEnabled==0);
|
||||
[(NSButton*)first[@"header"]performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);
|
||||
@@ -290,7 +290,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==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"]];
|
||||
BOOL merged=cards.count==DYToolTypes().count+1&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)if([card[@"section"][@"key"]isEqual:@"output"])merged&=[card[@"view"]isHidden];
|
||||
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];};
|
||||
@@ -528,6 +528,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
#include "DYMaskPanelDiagnostics.inc.h"
|
||||
#include "DYManagedDiagnostics.inc.h"
|
||||
#include "DYPrimaryDiagnostics.inc.h"
|
||||
#include "DYUnifiedDiagnostics.inc.h"
|
||||
#include "DYCompactUIDiagnostics.inc.h"
|
||||
#include "DYViewerParameterDiagnostics.inc.h"
|
||||
#include "DYViewerControlsDiagnostics.inc.h"
|
||||
|
||||
@@ -17,6 +17,11 @@
|
||||
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;
|
||||
// Privacy coverage includes eyes, brows and mouth. Skin's feature holes must
|
||||
// never punch through the mosaic. A padded rectangle covers the full face.
|
||||
DYToolMaskEntry privacy{};privacy.section=-102;privacy.mask.parameters=dyDefaultMaskParameters();
|
||||
privacy.mask.parameters.kind=DYMaskRectangle;privacy.mask.parameters.centerX=CGRectGetMidX(box);privacy.mask.parameters.centerY=1-CGRectGetMidY(box);
|
||||
privacy.mask.parameters.width=box.size.width*1.2;privacy.mask.parameters.height=box.size.height*1.25;privacy.mask.parameters.feather=0;entries.push_back(privacy);
|
||||
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++;}
|
||||
|
||||
@@ -396,3 +396,41 @@ kernel void dyCloneStamps(texture2d<float,access::read> input [[texture(0)]],
|
||||
}
|
||||
output.write(color,gid);
|
||||
}
|
||||
|
||||
// Block-centre sampling is stable in image coordinates and never feeds back.
|
||||
kernel void dyLocalMosaic(texture2d<float,access::read> input [[texture(0)]],texture2d<float,access::write> output [[texture(1)]],device const DYToolMaskEntry* masks [[buffer(0)]],constant DYToolMaskHeader& h [[buffer(1)]],constant uint& block [[buffer(2)]],uint2 p [[thread_position_in_grid]]) {
|
||||
uint2 size=uint2(output.get_width(),output.get_height());if(any(p>=size))return;
|
||||
float4 original=input.read(p);float2 uv=(float2(p)+.5f)/float2(size);float3 code=dyToolEncode(original.a>0?original.rgb/original.a:float3(0));float coverage=0;
|
||||
if(h.section==-102){float x=h.offsetX+uv.x*h.scaleX,y=h.offsetY+uv.y*h.scaleY;for(uint i=0;i<h.count;i++)if(masks[i].section==-102)coverage=max(coverage,dyToolMask(x,y,code,masks[i].mask));}
|
||||
else if(h.count)coverage=dyToolCoverage(uv,code,masks,h,h.section);
|
||||
if(coverage<=0){output.write(original,p);return;}
|
||||
uint2 q=min((p/block)*block+block/2,size-1);float4 sample=input.read(q);
|
||||
// Preserve the pixel's original alpha and prevent transparent samples turning
|
||||
// into arbitrary RGB on an otherwise opaque face.
|
||||
float3 rgb=sample.a>0?sample.rgb/sample.a*original.a:original.rgb;
|
||||
output.write(float4(mix(original.rgb,rgb,coverage),original.a),p);
|
||||
}
|
||||
|
||||
// Extend bounded creative operators by their boundary delta. The float32
|
||||
// residual carries negative / above-one values around the historical bounded
|
||||
// kernels. Neutral tools skip this adapter entirely. This is a declared code
|
||||
// domain extension, not a tone map and not an intermediate output transform.
|
||||
kernel void dyUnifiedBridgeIn(texture2d<float,access::read> a [[texture(0)]],texture2d<float,access::write> b [[texture(1)]],uint2 p [[thread_position_in_grid]]){
|
||||
if(any(p>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(p);if(c.a>0)c.rgb=dyToolDecode(clamp(c.rgb/c.a,0.f,1.f))*c.a;b.write(c,p);
|
||||
}
|
||||
kernel void dyUnifiedBridgeOut(texture2d<float,access::read> raw [[texture(0)]],texture2d<float,access::read> changed [[texture(1)]],texture2d<float,access::write> out [[texture(2)]],uint2 p [[thread_position_in_grid]]){
|
||||
if(any(p>=uint2(out.get_width(),out.get_height())))return;float4 a=raw.read(p),b=changed.read(p);if(a.a>0&&b.a>0){float3 c=a.rgb/a.a;float3 delta=dyToolEncode(b.rgb/b.a)-clamp(c,0.f,1.f);a.rgb=(c+delta)*a.a;}out.write(a,p);
|
||||
}
|
||||
|
||||
struct DYUnifiedMix {CSTParams toLinear,fromLinear,originalTo709;float amount;};
|
||||
kernel void dyUnifiedBlend(texture2d<float,access::read> before [[texture(0)]],texture2d<float,access::read> after [[texture(1)]],texture2d<float,access::write> output [[texture(2)]],texture2d<float,access::read> original [[texture(3)]],device const DYToolMaskEntry* masks [[buffer(0)]],constant DYToolMaskHeader& h [[buffer(1)]],constant DYUnifiedMix& p [[buffer(2)]],uint2 xy [[thread_position_in_grid]]){
|
||||
if(any(xy>=uint2(output.get_width(),output.get_height())))return;float4 a=before.read(xy),b=after.read(xy),o=original.read(xy);if(!(a.a>0)||!(b.a>0)){output.write(a,xy);return;}
|
||||
float3 ac=cst_float_air(float4(a.rgb/a.a,1),p.toLinear).rgb,bc=cst_float_air(float4(b.rgb/b.a,1),p.toLinear).rgb;
|
||||
float3 code=dyToolEncode(cst_float_air(float4(ac,1),dyPrimaryAP1To709).rgb),source=o.a>0?dyToolEncode(cst_float_air(float4(o.rgb/o.a,1),p.originalTo709).rgb):float3(0);
|
||||
float2 uv=(float2(xy)+.5f)/float2(output.get_width(),output.get_height());float x=h.offsetX+uv.x*h.scaleX,y=h.offsetY+uv.y*h.scaleY;float coverage=1;bool found=false;
|
||||
for(uint i=0;i<h.count;i++)if(masks[i].section==h.section){float w=dyToolMask(x,y,masks[i].mask.parameters.sourceStage==DYMaskSourceOriginal?source:code,masks[i].mask);if(!found){coverage=masks[i].combine==1?1-w:w;found=true;}else if(masks[i].combine==1)coverage*=1-w;else if(masks[i].combine==2)coverage*=w;else coverage=1-(1-coverage)*(1-w);}
|
||||
float w=coverage*p.amount;if(w<=0){output.write(a,xy);return;}if(w>=1){output.write(b,xy);return;}output.write(float4(cst_float_air(float4(mix(ac,bc,w),1),p.fromLinear).rgb*a.a,a.a),xy);
|
||||
}
|
||||
kernel void dyUnifiedExposure(texture2d<float,access::read> a [[texture(0)]],texture2d<float,access::write> b [[texture(1)]],constant float& gain [[buffer(0)]],uint2 p [[thread_position_in_grid]]){
|
||||
if(any(p>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(p);if(c.a>0)c.rgb*=gain;b.write(c,p);
|
||||
}
|
||||
@@ -190,8 +190,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:r xRadius:7 yRadius:7];
|
||||
BOOL expanded=self.state==NSControlStateValueOn;DYDrawSoftControl(NSInsetRect(self.bounds,2,3),7,expanded,NO,self.cell.highlighted);
|
||||
NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk());
|
||||
[(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes];
|
||||
[self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes];
|
||||
[self.title drawInRect:NSMakeRect(10,7,MAX(0,r.size.width-18),16) withAttributes:attributes];
|
||||
}
|
||||
- (void)mouseDown:(NSEvent *)event {
|
||||
if(event.clickCount==2) [NSApp sendAction:self.doubleClickAction to:self.target from:self];
|
||||
@@ -211,12 +210,12 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
}
|
||||
@end
|
||||
|
||||
static NSArray *DYPresentationSections(BOOL cstOnly) {
|
||||
static NSArray *DYPresentationSections(BOOL cstOnly,BOOL splitOutput) {
|
||||
NSMutableDictionary *bySection=[NSMutableDictionary dictionary],*byKey=[NSMutableDictionary dictionary];
|
||||
for(NSDictionary *s in DYSections())bySection[s[@"key"]]=s;
|
||||
for(NSDictionary *d in DYDescriptors())byKey[d[@"key"]]=d;
|
||||
NSMutableDictionary *primary=[[bySection[@"primary"]mutableCopy]autorelease];NSMutableArray *cmRows=[NSMutableArray array];
|
||||
for(NSString *part in (cstOnly?@[@"input",@"output"]:@[@"input",@"primary",@"output"])){
|
||||
for(NSString *part in (splitOutput?(cstOnly?@[@"input"]:@[@"input",@"primary"]):(cstOnly?@[@"input",@"output"]:@[@"input",@"primary",@"output"]))){
|
||||
[cmRows addObject:@{@"key":[@"heading:" stringByAppendingString:part],@"title":[part isEqual:@"input"]?@"输入与工作空间":[part isEqual:@"output"]?@"输出转换":@"一级调色"}];
|
||||
for(NSDictionary *d in bySection[part][@"rows"]){NSString *key=d[@"key"];if([key hasPrefix:@"cmbypass"]||[key isEqual:@"cmbalanceStrength"])continue;
|
||||
if([key isEqual:@"cmbalanceAngle"])[cmRows addObject:@{@"key":@"primaryBalance",@"kind":@"balanceWheel",@"title":@"一级白平衡色轮"}];else[cmRows addObject:d];}
|
||||
@@ -227,7 +226,7 @@ static NSArray *DYPresentationSections(BOOL cstOnly) {
|
||||
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"],bySection[@"lens"]];
|
||||
NSMutableArray *presentation=[NSMutableArray arrayWithArray:@[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"]]];if(splitOutput)[presentation addObject:bySection[@"output"]];return presentation;
|
||||
}
|
||||
|
||||
|
||||
@@ -470,7 +469,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
DYManagedColorPanel *_managedPanel;
|
||||
NSTextField *_brand;
|
||||
NSTextField *_subtitle;
|
||||
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink;
|
||||
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink, *_mosaicButton;
|
||||
NSPopUpButton *_addModule;
|
||||
NSArray *_sections;
|
||||
NSMutableArray *_cards;
|
||||
@@ -488,7 +487,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
NSInteger _visibleLooks;
|
||||
NSButton *_colorSettings;BOOL _colorSettingsExpanded;
|
||||
BOOL _refreshing,_graphicUndoOpen,_graphicCancelled;CMTime _graphicTime;NSMutableDictionary *_graphicExpected;
|
||||
BOOL _embedded,_workspaceEditor;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight;
|
||||
BOOL _embedded,_workspaceEditor,_unified,_measuringDefaultHeight;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight,_maximumViewportHeight;
|
||||
DYSpiderPanel *_spiderPanel;
|
||||
NSMutableDictionary *_assetLoads,*_assetLoadIDs;
|
||||
NSUInteger _nextAssetLoadID;
|
||||
@@ -501,7 +500,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
|
||||
@implementation DYInspector
|
||||
#include "DYToolInspector.inc.h"
|
||||
- (void)removeWorkspaceTool {if(!_workspaceEditor||!_cards.count)return;NSButton *source=[[[NSButton alloc]init]autorelease];source.tag=0;[self removeTool:source];}
|
||||
- (void)removeWorkspaceTool {if(!_workspaceEditor||!_cards.count||[_cards[0][@"section"][@"key"]isEqual:@"output"])return;NSButton *source=[[[NSButton alloc]init]autorelease];source.tag=0;[self removeTool:source];}
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager {
|
||||
return [self initWithAPIManager:manager renderer:nil];
|
||||
}
|
||||
@@ -511,12 +510,12 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager renderer:(DYRenderer *)renderer workspaceType:(NSString *)workspaceType {
|
||||
uint64_t beta=DYBetaSpanBegin(@"inspector_create",nil);
|
||||
if((self=[super initWithFrame:NSMakeRect(0,0,360,406)])) {
|
||||
_assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=1;
|
||||
_assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=5;
|
||||
_workspaceEditor=workspaceType.length>0;_embedded=[manager isKindOfClass:DYToolManager.class];if(_embedded)[(id)_manager retain];
|
||||
_preferredHeight=(_embedded||_workspaceEditor)?780:406;
|
||||
BOOL cstOnly=NO;
|
||||
if(!_embedded){id<FxCustomParameterActionAPI_v4>action=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(action){[action startAction:self];@try{cstOnly=[DYReadTools(manager,action.currentTime).document[@"starterTool"]isEqual:@"cst"];}@finally{[action endAction:self];}}}
|
||||
NSArray *presentation=DYPresentationSections(cstOnly);if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;}
|
||||
NSArray *presentation=DYPresentationSections(cstOnly,!_embedded&&(!_workspaceEditor||[workspaceType isEqual:@"output"]));if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;}
|
||||
_sections=[presentation copy];_stackViews=[NSMutableDictionary new];_stackOrder=[@[]copy];
|
||||
_cards=[[NSMutableArray alloc] init]; _controls=[[NSMutableDictionary alloc] init];
|
||||
_assetButtons=[[NSMutableDictionary alloc] init]; _graphics=[[NSMutableArray alloc] init];
|
||||
@@ -534,18 +533,19 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
_save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain];
|
||||
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
|
||||
_export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain];
|
||||
_colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];[_colorSettings setButtonType:NSButtonTypePushOnPushOff];_colorSettings.toolTip=@"展开或收起高级颜色设置;默认使用原有流程";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已收起";
|
||||
_colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];_colorSettings.toolTip=@"展开或折叠颜色设置";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已折叠";_colorSettingsExpanded=NO;
|
||||
_save.identifier=@"primaryAction";
|
||||
_workspaceButton=[DYButton(@"控制面板",self,@selector(openWorkspace:))retain];_workspaceButton.accessibilityLabel=@"打开调色控制面板";
|
||||
_addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
|
||||
for(NSDictionary *section in DYPresentationSections(NO)){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
|
||||
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule,_workspaceButton]){[self addSubview:v];v.hidden=_embedded||_workspaceEditor;}
|
||||
for(NSDictionary *section in DYPresentationSections(NO,NO)){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
|
||||
_mosaicButton=[DYButton(@"局部马赛克",self,@selector(showMosaicMenu:))retain];_mosaicButton.accessibilityLabel=@"局部马赛克";_mosaicButton.toolTip=@"选择人脸或已绘制蒙版,并调整马赛克方块大小";
|
||||
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule,_workspaceButton,_mosaicButton]){[self addSubview:v];v.hidden=_embedded||_workspaceEditor;}
|
||||
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<DYThemeNames().count;i++){
|
||||
NSButton *b=DYButton(DYThemeNames()[i],self,@selector(selectTheme:));[b setButtonType:NSButtonTypePushOnPushOff];b.tag=i+7;b.identifier=@"appearanceToggle";
|
||||
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded||_workspaceEditor;[themes addObject:b];
|
||||
}_themeButtons=[themes copy];
|
||||
_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect];
|
||||
_scroll.hasVerticalScroller=!_embedded&&!_workspaceEditor; _scroll.hasHorizontalScroller=_workspaceEditor;_scroll.scrollerStyle=NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO;
|
||||
if(!_embedded||_workspaceEditor)_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect];
|
||||
_scroll.hasVerticalScroller=NO; _scroll.hasHorizontalScroller=_workspaceEditor;_scroll.scrollerStyle=NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO;
|
||||
_scroll.autohidesScrollers=YES; _scroll.borderType=NSNoBorder;
|
||||
_scroll.clipsToBounds=YES;_scroll.wantsLayer=YES;_scroll.layer.masksToBounds=YES;
|
||||
_scroll.contentView.clipsToBounds=YES;
|
||||
@@ -553,7 +553,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
_scroll.accessibilityLabel=@"调色参数滚动区";
|
||||
_document=[[DYFlippedView alloc] initWithFrame:NSMakeRect(0,0,360,1000)];
|
||||
_document.accessibilityLabel=@"调色参数";_document.identifier=@"inspectorBackground";
|
||||
_scroll.documentView=_document; [self addSubview:_scroll];
|
||||
if(_scroll){_scroll.documentView=_document;[self addSubview:_scroll];}
|
||||
else [self addSubview:_document];
|
||||
if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];}
|
||||
[self buildCards];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager];
|
||||
@@ -568,7 +569,20 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
}
|
||||
[self themeChanged:nil];
|
||||
[self setAccessibilityLabel:@"大鱼调色检查器"];
|
||||
[self setNeedsLayout:YES];
|
||||
[self refresh];
|
||||
if(!_embedded&&!_workspaceEditor){
|
||||
// FCP allocates the host row once. Measure the useful default stack
|
||||
// at the narrow width; later expansions scroll within that budget.
|
||||
CGFloat width=self.frame.size.width;
|
||||
_measuringDefaultHeight=YES;
|
||||
[self setFrameSize:NSMakeSize(280,406)];
|
||||
[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];
|
||||
_maximumViewportHeight=ceil(_stackHeight+212);
|
||||
_measuringDefaultHeight=NO;
|
||||
_preferredHeight=_maximumViewportHeight;
|
||||
[self setFrameSize:NSMakeSize(width,_preferredHeight)];
|
||||
}
|
||||
[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];
|
||||
}
|
||||
DYBetaSpanEnd(beta,nil);return self;
|
||||
}
|
||||
@@ -577,9 +591,9 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
for(id graphic in _graphics)if([graphic isKindOfClass:DYPrimaryBalanceWheel.class])[(DYPrimaryBalanceWheel*)graphic setDelegate:nil];
|
||||
for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release];
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
|
||||
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];
|
||||
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];[_renderOrder release];
|
||||
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_colorSettings release];[_addModule release];
|
||||
[_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
|
||||
[_mosaicButton release];[_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
|
||||
[_recentBrowser close];[_recentBrowser release];[_recentHost release];
|
||||
[_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];[_graphicExpected release];
|
||||
[super dealloc];
|
||||
@@ -605,11 +619,26 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if([NSThread isMainThread]) {[self refresh];NSString *ID=n.userInfo[@"scrollToTool"];if(!_embedded&&ID.length&&_stackViews[ID]){[self layoutSubtreeIfNeeded];NSView *child=_stackViews[ID];[_document scrollPoint:NSMakePoint(0,MAX(0,child.frame.origin.y-8))];}}
|
||||
else dispatch_async(dispatch_get_main_queue(),^{ [self refresh]; });
|
||||
}
|
||||
- (void)moveOutput:(NSButton*)button {
|
||||
id<FxCustomParameterActionAPI_v4>a=[self actionAPI];[a startAction:self];
|
||||
@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);NSMutableArray *visible=[NSMutableArray array];
|
||||
for(NSString *ID in DYUnifiedRenderOrder(doc)){BOOL shown=[ID isEqual:@"output"]||_stackViews[ID]!=nil;if([ID hasPrefix:@"base:"])for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:[ID substringFromIndex:5]])shown=![card[@"removed"]boolValue];if(shown)[visible addObject:ID];}
|
||||
NSInteger index=[visible indexOfObject:@"output"],target=index+button.tag;if(index==NSNotFound||target<0||target>=visible.count)return;
|
||||
[visible exchangeObjectAtIndex:index withObjectAtIndex:target];
|
||||
// Input interpretation remains at the front. Output may follow the first
|
||||
// grading node, but it cannot precede the declared input conversion.
|
||||
if(target==0)return;
|
||||
doc[@"outputAfter"]=target==visible.count-1?@"tail":visible[target-1];
|
||||
id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if([undo startUndoGroup:@"移动输出转换层"]){DYWriteTools(_manager,doc,a.currentTime);[undo endUndoGroup];}
|
||||
}@finally{[a endAction:self];}[self postChanged];
|
||||
}
|
||||
- (void)showMosaicMenu:(NSView*)sender {[NSNotificationCenter.defaultCenter postNotificationName:@"DYMosaicMenuRequested" object:_manager userInfo:@{@"anchor":sender}];}
|
||||
- (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);}
|
||||
- (void)toggleColorSettings:(id)sender {
|
||||
_colorSettingsExpanded=!_colorSettingsExpanded;_managedPanel.hidden=!_colorSettingsExpanded;_colorSettings.state=_colorSettingsExpanded?NSControlStateValueOn:NSControlStateValueOff;
|
||||
_colorSettings.accessibilityValue=_colorSettingsExpanded?@"已展开":@"已收起";[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];
|
||||
[_document scrollPoint:NSZeroPoint];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
|
||||
_colorSettingsExpanded=!_colorSettingsExpanded;
|
||||
_managedPanel.hidden=!_colorSettingsExpanded;
|
||||
_colorSettings.accessibilityValue=_colorSettingsExpanded?@"已展开":@"已折叠";
|
||||
[self setNeedsLayout:YES];
|
||||
}
|
||||
- (void)openWorkspace:(id)sender {
|
||||
if(_embedded||_workspaceEditor||!self.window||!_renderer)return;
|
||||
@@ -659,7 +688,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[header setButtonType:NSButtonTypePushOnPushOff];
|
||||
header.bordered=NO; header.alignment=NSTextAlignmentLeft; header.font=[NSFont boldSystemFontOfSize:12];
|
||||
header.identifier=section[@"key"];header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index;
|
||||
header.doubleClickAction=@selector(resetSection:); header.toolTip=@"展开或折叠界面;双击还原本组";
|
||||
header.doubleClickAction=@selector(resetSection:); header.toolTip=@"本模块已完整展开;双击还原本组";
|
||||
[card addSubview:header];
|
||||
NSButton *enabled=DYButton(@"",self,@selector(groupEnabled:));enabled.bordered=NO;[enabled setButtonType:NSButtonTypePushOnPushOff];enabled.image=[NSImage imageWithSystemSymbolName:@"eye" accessibilityDescription:@"启用本组"];
|
||||
enabled.tag=index; enabled.contentTintColor=DYAccent(); enabled.toolTip=@"启用或旁路本组";
|
||||
@@ -799,7 +828,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
NSString *key=row.identifier?:@"";NSInteger tab=[_tabs[section]integerValue];
|
||||
if(!_embedded&&[section isEqual:@"base"]&&[key isEqual:@"skinEnabled"])for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"skin"])return ![card[@"removed"]boolValue];
|
||||
if([key isEqual:@"legacyInput"])return ![_tabs[@"primaryCMS"]boolValue]&&![_tabs[@"managedColor"]boolValue]&&[_tabs[@"legacyInput"]boolValue];
|
||||
if([section isEqual:@"primary"]&&[_tabs[@"managedColor"]boolValue]){if([@[@"heading:input",@"heading:output"]containsObject:key])return NO;if([key isEqual:@"cmmix"])return YES;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key]&&d[@"cmTab"]&&[d[@"cmTab"]integerValue]!=1)return NO;}
|
||||
if([section isEqual:@"primary"]&&([_tabs[@"managedColor"]boolValue]||(_unified&&_embedded))){if([@[@"heading:input",@"heading:output"]containsObject:key])return NO;if([key isEqual:@"cmmix"])return YES;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key]&&d[@"cmTab"]&&[d[@"cmTab"]integerValue]!=1)return NO;}
|
||||
if(_unified&&_workspaceEditor&&[section isEqual:@"primary"]){if([key isEqual:@"heading:output"])return NO;for(NSDictionary*d in DYToolSection(@"output")[@"rows"])if([d[@"key"]isEqual:key])return NO;}
|
||||
if([section isEqual:@"curve"] && ![key isEqual:@"curveGraph"])return NO;
|
||||
if([section isEqual:@"hsl"]) {
|
||||
int axis=0,color=0;if(sscanf(key.UTF8String,"hsl%d_%d",&axis,&color)==2)return color==tab;
|
||||
@@ -822,12 +852,13 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
|
||||
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
|
||||
NSArray *actions=@[_save,_load,_export,_colorSettings];for(NSUInteger i=0;i<actions.count;i++)[actions[i]setFrame:NSMakeRect(16+(bw+gap)*(compact?i%2:i),74+(compact?i/2*34:0),bw,27)];
|
||||
CGFloat top=(compact?178:144)+34;_workspaceButton.frame=NSMakeRect(16,top-70,w-32,27);_addModule.frame=NSMakeRect(16,top-36,w-32,27);
|
||||
CGFloat top=(compact?178:144)+34;_workspaceButton.frame=NSMakeRect(16,top-70,w-32,27);_addModule.frame=NSMakeRect(16,top-36,w-145,27);_mosaicButton.frame=NSMakeRect(w-122,top-36,106,27);
|
||||
_scroll.frame=(_embedded||_workspaceEditor)?NSMakeRect(0,0,w,h):NSMakeRect(0,top,w,MAX(0,h-top));
|
||||
CGFloat cw=MAX(244,_scroll.contentSize.width-32),y=8;
|
||||
CGFloat cw=MAX(244,(_scroll?_scroll.contentSize.width:w)-32),y=8;
|
||||
if(_managedPanel&&!_managedPanel.hidden){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
|
||||
for(NSMutableDictionary *c in _cards) {
|
||||
DYCard *card=c[@"view"];BOOL collapsed=[c[@"collapsed"]boolValue];NSString *key=c[@"section"][@"key"];
|
||||
DYCard *card=c[@"view"];NSString *key=c[@"section"][@"key"];
|
||||
BOOL collapsed=_measuringDefaultHeight?![self initiallyExpandedSection:key]:[c[@"collapsed"]boolValue];
|
||||
card.hidden=[c[@"removed"]boolValue];if(card.hidden){y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w];continue;}
|
||||
NSArray *body=c[@"body"];CGFloat contentHeight=0;
|
||||
for(NSView *row in body)if([self showRow:row section:key]&&!collapsed)contentHeight+=[self heightForRow:row];
|
||||
@@ -905,24 +936,40 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
[r[@"choose"]setFrame:NSMakeRect(97,3,MAX(65,rw-152),26)];[r[@"folder"]setFrame:NSMakeRect(rw-51,4,24,24)];[r[@"remove"]setFrame:NSMakeRect(rw-23,4,22,24)];
|
||||
}
|
||||
y=[self layoutRepeatedToolsAfter:@"tail" y:y width:w];
|
||||
_stackHeight=y;CGFloat documentWidth=_scroll.contentSize.width;if(_workspaceEditor)for(NSDictionary *card in _cards)documentWidth=MAX(documentWidth,[card[@"view"]frame].size.width);[_document setFrameSize:NSMakeSize(documentWidth,_workspaceEditor?_scroll.contentSize.height:MAX(y,_scroll.contentSize.height))];
|
||||
if(_unified&&!_embedded&&!_workspaceEditor){
|
||||
NSMutableDictionary *views=[NSMutableDictionary dictionary];
|
||||
for(NSDictionary *card in _cards){NSString *key=card[@"section"][@"key"];NSView *view=card[@"view"];if(!view.hidden)views[[key isEqual:@"output"]?@"output":[@"base:" stringByAppendingString:key]]=view;}
|
||||
if(!_measuringDefaultHeight)[views addEntriesFromDictionary:_stackViews];y=(_managedPanel&&!_managedPanel.hidden)?NSMaxY(_managedPanel.frame)+12:8;
|
||||
for(NSString *ID in _renderOrder){NSView *view=views[ID];if(!view||view.hidden)continue;NSRect frame=view.frame;frame.origin.y=y;view.frame=frame;y+=frame.size.height+([ID hasPrefix:@"base:"]||[ID isEqual:@"output"]?12:0);}
|
||||
}
|
||||
for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"output"]){
|
||||
[card[@"maskButton"]setHidden:YES];[card[@"maskBadge"]setHidden:YES];
|
||||
NSButton *up=card[@"repeatButton"],*down=card[@"removeButton"];up.image=down.image=nil;up.title=@"↑";down.title=@"↓";up.tag=-1;down.tag=1;up.action=down.action=@selector(moveOutput:);up.toolTip=@"输出转换上移一层";down.toolTip=@"输出转换下移一层";up.accessibilityLabel=up.toolTip;down.accessibilityLabel=down.toolTip;
|
||||
}
|
||||
|
||||
_stackHeight=y;CGFloat documentWidth=_scroll?_scroll.contentSize.width:w;if(_workspaceEditor)for(NSDictionary *card in _cards)documentWidth=MAX(documentWidth,[card[@"view"]frame].size.width);
|
||||
_document.frame=NSMakeRect(0,0,documentWidth,_workspaceEditor?_scroll.contentSize.height:y);
|
||||
if(!_embedded&&!_workspaceEditor){
|
||||
CGFloat preferred=MIN(780,ceil(top+MAX(12,y)));
|
||||
if(preferred!=_preferredHeight){
|
||||
_preferredHeight=preferred;
|
||||
// FCP owns the attached custom parameter's slot. Resizing the
|
||||
// remote child there bottom-aligns it and clips the fixed header.
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
if(preferred!=self->_preferredHeight)return;
|
||||
[self invalidateIntrinsicContentSize];
|
||||
if(!self.superview&&!self.window&&self.frame.size.height!=preferred)
|
||||
[self setFrameSize:NSMakeSize(self.frame.size.width,preferred)];
|
||||
});
|
||||
}
|
||||
CGFloat budget=_maximumViewportHeight>0?_maximumViewportHeight:top+y;
|
||||
CGFloat viewport=MIN(MAX(12,y),MAX(12,MIN(h,budget)-top));
|
||||
_scroll.frame=NSMakeRect(0,top,w,viewport);
|
||||
_scroll.hasVerticalScroller=y>viewport+.5;
|
||||
NSPoint origin=_scroll.contentView.bounds.origin;
|
||||
origin.y=MAX(0,MIN(origin.y,MAX(0,y-viewport)));
|
||||
[_scroll.contentView scrollToPoint:origin];[_scroll reflectScrolledClipView:_scroll.contentView];
|
||||
// Keep the row allocation stable; only the inner viewport contracts.
|
||||
// Never hide/recreate the FxPlug parameter to force host resizing.
|
||||
[self invalidateIntrinsicContentSize];
|
||||
}
|
||||
[self curveOutputChanged:nil];
|
||||
}
|
||||
- (id<FxCustomParameterActionAPI_v4>)actionAPI { return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; }
|
||||
- (BOOL)initiallyExpandedSection:(NSString*)key {
|
||||
if(_embedded||_workspaceEditor)return YES;
|
||||
NSUInteger roots=0;NSString *only=nil;
|
||||
for(NSDictionary *card in _cards)if(![card[@"removed"]boolValue]&&![card[@"section"][@"key"]isEqual:@"output"]){roots++;only=card[@"section"][@"key"];}
|
||||
return (roots==1&&[only isEqual:key])||[@[@"primary",@"base",@"spider"]containsObject:key];
|
||||
}
|
||||
- (void)refresh {
|
||||
if(_refreshing||!_manager)return;
|
||||
id<FxCustomParameterActionAPI_v4> action=[self actionAPI]; if(!action)return;
|
||||
@@ -933,6 +980,16 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
@try {
|
||||
CMTime t=action.currentTime;
|
||||
id<FxParameterRetrievalAPI_v6> get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
_unified=DYUnifiedColorState(DYReadAssets(_embedded?[(DYToolManager*)_manager host]:_manager,t).colorManagement);
|
||||
if(!_embedded&&!_workspaceEditor){
|
||||
[_renderOrder release];_renderOrder=[DYUnifiedRenderOrder(DYReadTools(_manager,t).document)copy];
|
||||
NSMutableDictionary *primary=nil,*output=nil;for(NSMutableDictionary *card in _cards){if([card[@"section"][@"key"]isEqual:@"primary"])primary=card;if([card[@"section"][@"key"]isEqual:@"output"])output=card;}
|
||||
NSMutableArray *body=[NSMutableArray arrayWithArray:primary[@"body"]];
|
||||
for(NSView *row in output[@"body"]){if([row.identifier isEqual:@"toolMasks"])continue;[body removeObjectIdenticalTo:row];[(_unified?output:primary)[@"view"]addSubview:row];if(!_unified)[body addObject:row];}
|
||||
primary[@"body"]=body;
|
||||
}
|
||||
NSDictionary *initialTools=DYReadTools(_embedded?[(DYToolManager*)_manager host]:_manager,t).document;
|
||||
for(NSMutableDictionary *card in _cards){NSString *type=card[@"section"][@"key"];card[@"removed"]=@([type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(initialTools,type));}
|
||||
NSMutableDictionary *graphicValues=[NSMutableDictionary dictionary];
|
||||
for(NSNumber *pid in _controls) {
|
||||
NSDictionary *r=_controls[pid],*d=r[@"descriptor"]; double v=[d[@"default"] doubleValue];
|
||||
@@ -954,7 +1011,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
BOOL enabled=v>=.5||extraValue>=.5;
|
||||
DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];
|
||||
NSNumber *saved=[token isKindOfClass:DYInspectorToken.class]?token.folds[c[@"section"][@"key"]]:nil;
|
||||
BOOL collapsed=_workspaceEditor?NO:saved?saved.boolValue:[c[@"collapsed"]boolValue];groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed);
|
||||
BOOL collapsed=_workspaceEditor?NO:saved?saved.boolValue:![self initiallyExpandedSection:c[@"section"][@"key"]];
|
||||
groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed);
|
||||
[c[@"header"]setState:collapsed?NSControlStateValueOff:NSControlStateValueOn];
|
||||
[c[@"header"]setToolTip:collapsed?@"展开界面,不改变启用状态;双击还原本组":@"折叠界面,保持当前效果;双击还原本组"];
|
||||
[c[@"header"]setAccessibilityHelp:[c[@"header"]toolTip]];[c[@"header"]setNeedsDisplay:YES];
|
||||
@@ -964,18 +1022,15 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
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){
|
||||
NSString *type=card[@"section"][@"key"];BOOL visible=YES;
|
||||
if(!_embedded){DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];visible=[tools[@"starterTool"]isEqual:type]||[@[@"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)||(!_workspaceEditor&&!visible));groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed);
|
||||
NSString *type=card[@"section"][@"key"];
|
||||
BOOL removed=[type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(tools,type);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]:@"添加本工具的独立蒙版";
|
||||
[card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint];
|
||||
}
|
||||
DYAssetState *assets=DYReadAssets(_manager,t);NSDictionary *cms=_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement;_tabs[@"managedColor"]=@(cms.count>0&&!DYPrimaryColorState(cms));_tabs[@"primaryCMS"]=@(DYPrimaryColorState(cms));[_managedPanel refreshWithState:assets.colorManagement context:[_renderer colorContext]];[_managedPanel setInputLUTPath:assets.paths[@"input"]];for(NSDictionary *r in _controls.allValues)if([r[@"descriptor"][@"key"]isEqual:@"cmmix"])[r[@"label"]setStringValue:([_tabs[@"managedColor"]boolValue]||[_tabs[@"primaryCMS"]boolValue])?@"调色混合":@"CST 混合"];
|
||||
for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:[_tabs[@"managedColor"]boolValue]?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];}
|
||||
for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:([_tabs[@"managedColor"]boolValue]||_unified)?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];}
|
||||
[_spiderPanel setMesh:assets.spiderMesh linked:assets.spiderLinked];
|
||||
double profile=0,configured=0;[get getFloatValue:&profile fromParameter:2013 atTime:t];[get getFloatValue:&configured fromParameter:2236 atTime:t];
|
||||
DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t];
|
||||
@@ -1075,7 +1130,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
[set setFloatValue:enabled?1:0 toParameter:pid.unsignedIntValue atTime:action.currentTime];
|
||||
NSNumber *extra=section[@"extraEnabled"];if(extra)[set setFloatValue:enabled?1:0 toParameter:extra.unsignedIntValue atTime:action.currentTime];
|
||||
for(NSNumber *linked in section[@"enableParameters"])[set setFloatValue:enabled?1:0 toParameter:linked.unsignedIntValue atTime:action.currentTime];
|
||||
if(!(_unified&&[section[@"key"]isEqual:@"primary"]))for(NSNumber *linked in section[@"enableParameters"])[set setFloatValue:enabled?1:0 toParameter:linked.unsignedIntValue atTime:action.currentTime];
|
||||
|
||||
}
|
||||
@finally {[action endAction:self];}
|
||||
@@ -1085,16 +1140,17 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
- (void)toggleSection:(NSButton *)sender {
|
||||
if(sender.tag<0||sender.tag>=_cards.count)return;
|
||||
if(!_workspaceEditor){id host=_embedded?[(DYToolManager*)_manager host]:_manager;NSString *node=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:_cards[sender.tag][@"section"][@"key"]];[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:host userInfo:@{@"node":node,@"source":@"inspector"}];}
|
||||
id<FxCustomParameterActionAPI_v4> action=[self actionAPI];if(!action)return;[action startAction:self];
|
||||
@try {
|
||||
id<FxParameterRetrievalAPI_v6> get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
DYInspectorToken *old=nil;[get getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:action.currentTime];DYInspectorToken *token=[old isKindOfClass:DYInspectorToken.class]?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];
|
||||
NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];
|
||||
for(NSDictionary *card in _cards)folds[card[@"section"][@"key"]]=card[@"collapsed"];
|
||||
NSString *key=_cards[sender.tag][@"section"][@"key"];folds[key]=@(![_cards[sender.tag][@"collapsed"]boolValue]);token.folds=folds;
|
||||
[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime];
|
||||
id<FxCustomParameterActionAPI_v4> action=[self actionAPI];if(!action)return;
|
||||
[action startAction:self];@try{
|
||||
id<FxParameterRetrievalAPI_v6> get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
DYInspectorToken *old=nil;[get getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:action.currentTime];
|
||||
DYInspectorToken *token=[old isKindOfClass:DYInspectorToken.class]?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];
|
||||
NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];NSString *key=_cards[sender.tag][@"section"][@"key"];
|
||||
folds[key]=@(![_cards[sender.tag][@"collapsed"]boolValue]);token.folds=folds;
|
||||
[[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime];
|
||||
}@finally{[action endAction:self];}[self postChanged];
|
||||
}
|
||||
|
||||
- (void)useCST:(id)sender {
|
||||
id<FxCustomParameterActionAPI_v4> a=[self actionAPI];if(!a)return;[a startAction:self];
|
||||
@try{id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:1 toParameter:2236 atTime:a.currentTime];[self clearPrimaryBypasses:set time:a.currentTime];} @finally{[a endAction:self];}[self postChanged];
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
// Separate authoring state; absent state always selects the unchanged v1 renderer.
|
||||
FOUNDATION_EXPORT NSDictionary *DYManagedColorDefaults(void);
|
||||
FOUNDATION_EXPORT NSDictionary *DYPrimaryColorDefaults(void);
|
||||
FOUNDATION_EXPORT NSDictionary *DYUnifiedColorDefaults(void);
|
||||
FOUNDATION_EXPORT BOOL DYUnifiedColorState(NSDictionary *state);
|
||||
FOUNDATION_EXPORT BOOL DYPrimaryColorState(NSDictionary *state);
|
||||
FOUNDATION_EXPORT void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut);
|
||||
FOUNDATION_EXPORT BOOL DYManagedColorValid(id state,NSError **error);
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
#include <cmath>
|
||||
NSDictionary *DYManagedColorDefaults(void){return @{@"version":@2,@"mode":@1,@"input":@109,@"output":@1,@"gamutCompression":@YES,@"engine":@"OpenColorIO-2.5.2",@"config":@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"};}
|
||||
NSDictionary *DYPrimaryColorDefaults(void){return @{@"version":@3,@"mode":@4,@"engine":@"Dayu-CST-f32",@"config":@"primary-parameters-v1"};}
|
||||
BOOL DYPrimaryColorState(NSDictionary *s){return [s isKindOfClass:NSDictionary.class]&&[s[@"version"]isEqual:@3]&&[s[@"mode"]isEqual:@4];}
|
||||
NSDictionary *DYUnifiedColorDefaults(void){return @{@"version":@4,@"mode":@5,@"engine":@"Dayu-CST-f32",@"config":@"ordered-working-domain-v1"};}
|
||||
BOOL DYUnifiedColorState(NSDictionary *s){return [s isKindOfClass:NSDictionary.class]&&[s[@"version"]isEqual:@4]&&[s[@"mode"]isEqual:@5];}
|
||||
BOOL DYPrimaryColorState(NSDictionary *s){return DYUnifiedColorState(s)||([s isKindOfClass:NSDictionary.class]&&[s[@"version"]isEqual:@3]&&[s[@"mode"]isEqual:@4]);}
|
||||
void DYSeedPrimaryWorkingSpace(NSMutableDictionary *node,float transfer,float gamut){
|
||||
if(![node[@"type"]isEqual:@"primary"])return;NSMutableDictionary*v=node[@"values"];NSUInteger follow=[node[@"primaryFollow"]unsignedIntegerValue],bit=1;
|
||||
for(NSString *part in @[@"input",@"working",@"output"]){NSString*t=[NSString stringWithFormat:@"cm%@Transfer",part],*g=[NSString stringWithFormat:@"cm%@Gamut",part];if(!v[t]&&!v[g])follow|=bit;if(!v[t])v[t]=@(transfer);if(!v[g])v[g]=@(gamut);bit<<=1;}node[@"primaryFollow"]=@(follow);
|
||||
@@ -19,6 +21,7 @@ void DYPrimaryControlChanged(id<PROAPIAccessing> manager,CMTime time,NSString *k
|
||||
NSArray<NSDictionary*> *DYManagedInputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::spaces())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;}
|
||||
NSArray<NSDictionary*> *DYManagedOutputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::outputs())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;}
|
||||
BOOL DYManagedColorValid(id state,NSError **error){
|
||||
if(DYUnifiedColorState(state))return [state isEqual:DYUnifiedColorDefaults()];
|
||||
if(DYPrimaryColorState(state)){BOOL valid=[state isEqual:DYPrimaryColorDefaults()];if(!valid&&error)*error=[NSError errorWithDomain:@"com.dayu.color.cms" code:1 userInfo:@{NSLocalizedDescriptionKey:@"一级 CST 设置版本不匹配。"}];return valid;}
|
||||
BOOL valid=[state isKindOfClass:NSDictionary.class]&&[state count]==7&&[state[@"version"]isEqual:@2]&&[state[@"engine"]isEqual:@"OpenColorIO-2.5.2"]&&[state[@"config"]isEqual:@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"];
|
||||
for(NSString *key in @[@"mode",@"input",@"output",@"gamutCompression"]){id v=[state isKindOfClass:NSDictionary.class]?state[key]:nil;double n=[v isKindOfClass:NSNumber.class]?[v doubleValue]:NAN;valid&=std::isfinite(n)&&n==floor(n);}
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
NSDictionary *_state;NSString *_inputLUTPath;NSUInteger _selectionGeneration;BOOL _refreshing;
|
||||
}
|
||||
- (BOOL)isFlipped{return YES;}
|
||||
- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?82:(m==1||m==4)?110:238;}
|
||||
- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?82:(m==1||m>=4)?110:238;}
|
||||
static NSTextField *cmsLabel(NSString*s){NSTextField*l=[DYThemeLabel wrappingLabelWithString:s];l.font=[NSFont systemFontOfSize:11];l.textColor=DYThemeColor(@"text");return l;}
|
||||
- (instancetype)initWithManager:(id<PROAPIAccessing>)m renderer:(DYRenderer*)r assetTarget:(id)target {
|
||||
if((self=[super initWithFrame:NSZeroRect])){_manager=m;_renderer=[r retain];_assetTarget=target;self.identifier=@"managedColor";
|
||||
_mode=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"原有流程(默认)",@"1.8 兼容 · 跟随 FCP",@"1.8 兼容 · 相机 → ACES",@"1.8 兼容 · LUT → ACES",@"一级 CST · 延后输出"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
|
||||
_mode=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"原有流程(默认)",@"1.8 兼容 · 跟随 FCP",@"1.8 兼容 · 相机 → ACES",@"1.8 兼容 · LUT → ACES",@"1.9 兼容 · 一级与印片后输出",@"全链路 · 输出转换层"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
|
||||
_inputLabel=[cmsLabel(@"输入空间")retain];_outputLabel=[cmsLabel(@"输出目标")retain];
|
||||
_input=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedInputSpaces()){[_input addItemWithTitle:s[@"name"]];_input.lastItem.representedObject=s[@"id"];} _input.target=self;_input.action=@selector(settingsChanged:);_input.accessibilityLabel=@"新版输入空间";
|
||||
_output=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedOutputSpaces()){[_output addItemWithTitle:s[@"name"]];_output.lastItem.representedObject=s[@"id"];} _output.target=self;_output.action=@selector(settingsChanged:);_output.accessibilityLabel=@"新版输出目标";
|
||||
@@ -32,17 +32,17 @@ static NSTextField *cmsLabel(NSString*s){NSTextField*l=[DYThemeLabel wrappingLab
|
||||
- (void)refreshWithState:(NSDictionary*)s context:(NSDictionary*)context {
|
||||
_refreshing=YES;NSDictionary *saved=[s copy];[_state release];_state=saved;NSInteger mode=s.count?[s[@"mode"]integerValue]:0;[_mode selectItemAtIndex:mode];
|
||||
NSDictionary *values=s.count&&!DYPrimaryColorState(s)?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i];
|
||||
_input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2||mode==4;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
|
||||
_help.toolTip=mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
|
||||
_help.stringValue=mode==0?@"保留原有调色顺序。高级流程按需选择。":mode==4?@"使用一级 CST 设置,在一级与印片之后输出。":mode==1?@"保留 1.8 兼容流程,输入跟随 FCP。":mode==2?@"按所选相机编码解释输入;请核对上游转换。":@"按所选编码解释输入 LUT 的输出。";
|
||||
_context.stringValue=mode==4?@"输入 CST → 工作域调色与印片 → 输出 CST":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_context.toolTip=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主。请核对上游相机 LUT 与颜色符合;已裁切信息无法恢复。":_context.stringValue;_refreshing=NO;[self setNeedsLayout:YES];
|
||||
_input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2||mode>=4;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
|
||||
_help.toolTip=mode==5?@"输入由一级 CST 解释,调色按层序执行。输出层之前使用工作空间,之后使用输出空间;创意 LUT、胶片和肤色使用其专用参考域。输出层只转换一次,宿主显示适配保持在最后。":mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
|
||||
_help.stringValue=mode==5?@"按模块顺序调色,输出层默认最后,可上下移动。":mode==0?@"保留原有调色顺序。高级流程按需选择。":mode==4?@"使用一级 CST 设置,在一级与印片之后输出。":mode==1?@"保留 1.8 兼容流程,输入跟随 FCP。":mode==2?@"按所选相机编码解释输入;请核对上游转换。":@"按所选编码解释输入 LUT 的输出。";
|
||||
_context.stringValue=mode==5?@"输入 → 工作域节点 → 输出转换层 → 宿主":mode==4?@"输入 CST → 工作域调色与印片 → 输出 CST":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_context.toolTip=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主。请核对上游相机 LUT 与颜色符合;已裁切信息无法恢复。":_context.stringValue;_refreshing=NO;[self setNeedsLayout:YES];
|
||||
}
|
||||
- (void)setInputLUTPath:(NSString*)path{NSString *saved=[path copy];[_inputLUTPath release];_inputLUTPath=saved;_lut.title=path.length?path.lastPathComponent:@"选择输入 LUT…";_lut.toolTip=path.length?path:@"选择 LUT,并准确指定其输出编码";_lut.accessibilityLabel=path.length?[@"输入 LUT:" stringByAppendingString:path.lastPathComponent]:@"选择输入 LUT";}
|
||||
- (void)refreshContext{[self refreshWithState:_state context:[_renderer colorContext]];}
|
||||
- (void)writeState:(NSDictionary*)state {
|
||||
if(state&&!DYManagedColorValid(state,nil))return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"更改色彩管理方式"];DYAssetState*assets=[[DYReadAssets(_manager,a.currentTime)copy]autorelease];assets.colorManagement=state;DYWriteAssets(_manager,assets,a.currentTime);if(DYPrimaryColorState(state)&&!DYPrimaryColorState(_state)){DYUniforms u;DYReadUniforms(_manager,a.currentTime,&u);NSMutableDictionary*doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);for(NSMutableDictionary*node in doc[@"layers"])DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);DYFollowPrimaryWorkingSpace(doc,u.cm.workingTransfer,u.cm.workingGamut);DYWriteTools(_manager,doc,a.currentTime);}[undo endUndoGroup];}@finally{[a endAction:self];}[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];
|
||||
}
|
||||
- (void)modeChanged:(id)sender {if(_refreshing)return;NSInteger mode=_mode.indexOfSelectedItem;_selectionGeneration++;if(mode==3&&(!_inputLUTPath.length||![NSFileManager.defaultManager fileExistsAtPath:_inputLUTPath])){[self refreshWithState:_state context:[_renderer colorContext]];[self selectInputLUTAndEnable:YES];return;}if(!mode){[self writeState:nil];return;}if(mode==4){[self writeState:DYPrimaryColorDefaults()];return;}NSMutableDictionary *s=[[(_state&&!DYPrimaryColorState(_state)?_state:DYManagedColorDefaults())mutableCopy]autorelease];s[@"mode"]=@(mode);[self writeState:s];}
|
||||
- (void)modeChanged:(id)sender {if(_refreshing)return;NSInteger mode=_mode.indexOfSelectedItem;_selectionGeneration++;if(mode==3&&(!_inputLUTPath.length||![NSFileManager.defaultManager fileExistsAtPath:_inputLUTPath])){[self refreshWithState:_state context:[_renderer colorContext]];[self selectInputLUTAndEnable:YES];return;}if(!mode){[self writeState:nil];return;}if(mode==5){[self writeState:DYUnifiedColorDefaults()];return;}if(mode==4){[self writeState:DYPrimaryColorDefaults()];return;}NSMutableDictionary *s=[[(_state&&!DYPrimaryColorState(_state)?_state:DYManagedColorDefaults())mutableCopy]autorelease];s[@"mode"]=@(mode);[self writeState:s];}
|
||||
- (void)settingsChanged:(id)sender {if(_refreshing||!_state)return;NSMutableDictionary*s=[[_state mutableCopy]autorelease];s[@"input"]=_input.selectedItem.representedObject;s[@"output"]=_output.selectedItem.representedObject;s[@"gamutCompression"]=@(_gamut.state==NSControlStateValueOn);[self writeState:s];}
|
||||
- (void)selectInputLUTAndEnable:(BOOL)enable {
|
||||
NSUInteger generation=_selectionGeneration;NSOpenPanel *panel=[NSOpenPanel openPanel];panel.allowedFileTypes=@[@"cube"];panel.allowsMultipleSelection=NO;panel.canChooseDirectories=NO;panel.message=@"选择输入 LUT,再指定 LUT 的输出编码";
|
||||
|
||||
@@ -95,6 +95,12 @@
|
||||
- (BOOL)renderColorSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(state&&![state isKindOfClass:NSDictionary.class])return fail(error,@"色彩管理状态无效。");
|
||||
NSDictionary*context=DYHostColorContext(src,dst,primaries);@synchronized(_previewLock){[_colorContext release];_colorContext=[context copy];}
|
||||
if([tools[@"mosaic"][@"enabled"]boolValue]){
|
||||
if(!DYValidToolDocument(tools))return fail(error,@"局部马赛克设置无效。");
|
||||
FxImageTile *mosaic=[self sourceByApplyingMosaic:tools source:src registry:dst.deviceRegistryID error:error];if(!mosaic)return NO;
|
||||
NSMutableDictionary *remaining=[[tools mutableCopy]autorelease];[remaining removeObjectForKey:@"mosaic"];[remaining removeObjectForKey:@"mosaicRenderMask"];[remaining removeObjectForKey:@"mosaicRenderMasks"];
|
||||
return [self renderColorSource:mosaic destination:dst uniforms:u paths:paths spider:spider tools:remaining colorManagement:state hostPrimaries:primaries error:error];
|
||||
}
|
||||
if(tools[@"sharedMasks"]){
|
||||
if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
FxImageTile *stamped=[self sourceByApplyingStamps:DYSharedMasks(tools) source:src registry:dst.deviceRegistryID error:error];if(!stamped)return NO;
|
||||
@@ -103,6 +109,7 @@
|
||||
if(!state.count)return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
|
||||
if(!DYManagedColorValid(state,error))return NO;if(!tools)tools=@{@"schema":@2,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools);
|
||||
if(DYUnifiedColorState(state))return [self renderUnifiedSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools hostPrimaries:primaries error:error];
|
||||
if(DYPrimaryColorState(state))return [self renderPrimarySource:src destination:dst uniforms:u paths:paths spider:spider tools:tools hostPrimaries:primaries error:error];
|
||||
NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>source=[src metalTextureForDevice:d];if(!source)return fail(error,@"色彩管理输入纹理不可用。");
|
||||
uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过色彩管理内存预算。");
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
- (NSDictionary*)mask{for(NSDictionary *m in DYMasksForTool(_document,_nodeID))if([m[@"id"]isEqual:_maskID])return m;return nil;}
|
||||
- (void)refreshWithDocument:(NSDictionary*)doc time:(CMTime)time{
|
||||
_refreshing=YES;NSDictionary *saved=[doc copy];[_document release];_document=saved;_time=time;NSArray *masks=DYMasksForTool(doc,_nodeID);if(masks.count)[self buildControls];[_list removeAllItems];NSInteger selected=0,index=0;
|
||||
for(NSDictionary *m in masks){DYMaskParameters p=DYMaskAtTime(m,time);[_list addItemWithTitle:[NSString stringWithFormat:@"%@ %ld",m[@"stampSource"]?@"仿制图章":@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][p.kind],(long)index+1]];if([m[@"id"]isEqual:_maskID])selected=index;index++;}
|
||||
for(NSDictionary *m in masks){DYMaskParameters p=DYMaskAtTime(m,time);[_list addItemWithTitle:m[@"label"]?:[NSString stringWithFormat:@"%@ %ld",m[@"stampSource"]?@"仿制图章":@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][p.kind],(long)index+1]];if([m[@"id"]isEqual:_maskID])selected=index;index++;}
|
||||
if(!masks.count){_contentHeight=0;_drawing=_canvasActive=NO;[_maskID release];_maskID=nil;_refreshing=NO;return;}[_list selectItemAtIndex:selected];if(![_maskID isEqual:masks[selected][@"id"]])_drawing=_canvasActive=NO;[_maskID release];_maskID=[masks[selected][@"id"]copy];NSDictionary *m=[self mask];DYMaskParameters p=DYMaskAtTime(m,time);if(p.kind!=DYMaskBezier)_drawing=NO;
|
||||
BOOL stamp=m[@"stampSource"]!=nil;_combine.hidden=_invert.hidden=stamp;
|
||||
_eye.state=[m[@"enabled"]boolValue]?NSControlStateValueOn:NSControlStateValueOff;_eye.image=[NSImage imageWithSystemSymbolName:[m[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用蒙版"];[_combine selectItemAtIndex:[m[@"combine"]integerValue]];_invert.state=(p.flags&DYMaskInvert)?NSControlStateValueOn:NSControlStateValueOff;
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
// Privacy needs face boxes only. Keep the more expensive 76-point landmark
|
||||
// request exclusively for skin protection. Reuse boxes only for identical pixels.
|
||||
- (NSDictionary*)mosaicFaceSnapshot {@synchronized(_previewLock){return [[_mosaicFaceSnapshot retain]autorelease];}}
|
||||
- (NSData*)mosaicFaces:(FxImageTile*)source time:(NSDictionary*)time error:(NSError**)error {
|
||||
NSMutableDictionary *entry=[self device:source.deviceRegistryID error:error];if(!entry)return nil;
|
||||
id<MTLTexture>texture=[source metalTextureForDevice:entry[@"device"]];if(!texture)return nil;
|
||||
if(!_faceContext)_faceContext=[[CIContext contextWithMTLDevice:entry[@"device"] options:@{kCIContextCacheIntermediates:@NO}]retain];
|
||||
CGColorSpaceRef linear=CGColorSpaceCreateWithName(kCGColorSpaceLinearSRGB);
|
||||
CIImage *input=[CIImage imageWithMTLTexture:texture options:@{kCIImageColorSpace:(id)linear}];CGColorSpaceRelease(linear);if(!input)return nil;
|
||||
if(source.imageOrigin==kFxImageOrigin_TOP_LEFT)input=[input imageByApplyingTransform:CGAffineTransformMake(1,0,0,-1,0,input.extent.size.height)];
|
||||
CGFloat scale=MIN(1.,640./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 nil;
|
||||
CFDataRef raster=CGDataProviderCopyData(CGImageGetDataProvider(cg));BOOL same=raster&&[_mosaicRaster isEqual:(NSData*)raster];
|
||||
NSMutableArray *boxes=[NSMutableArray array];
|
||||
if(same){[boxes addObjectsFromArray:[self mosaicFaceSnapshot][@"boxes"]?:@[]];}
|
||||
else{
|
||||
VNDetectFaceRectanglesRequest *request=[VNDetectFaceRectanglesRequest new];request.revision=VNDetectFaceRectanglesRequestRevision3;
|
||||
VNImageRequestHandler *handler=[[VNImageRequestHandler alloc]initWithCGImage:cg orientation:kCGImagePropertyOrientationUp options:@{}];
|
||||
BOOL ok=[handler performRequests:@[request] error:error];
|
||||
if(ok)for(VNFaceObservation *face in request.results){CGRect box=face.boundingBox;if(boxes.count>=DYSharedMaskLimit||face.confidence<.5||box.size.width<.015||box.size.height<.015)continue;
|
||||
[boxes addObject:@[@(CGRectGetMidX(box)),@(1-CGRectGetMidY(box)),@(box.size.width*1.2),@(box.size.height*1.25)]];
|
||||
}
|
||||
[handler release];[request release];
|
||||
if(!ok){if(raster)CFRelease(raster);CGImageRelease(cg);return nil;}
|
||||
[boxes sortUsingComparator:^NSComparisonResult(NSArray *a,NSArray *b){NSComparisonResult x=[a[0]compare:b[0]];return x==NSOrderedSame?[a[1]compare:b[1]]:x;}];
|
||||
std::vector<DYToolMaskEntry> entries;
|
||||
for(NSArray *box in boxes){DYToolMaskEntry m{};m.section=-102;m.mask.parameters=dyDefaultMaskParameters();auto &p=m.mask.parameters;p.kind=DYMaskRectangle;p.centerX=[box[0]floatValue];p.centerY=[box[1]floatValue];p.width=[box[2]floatValue];p.height=[box[3]floatValue];p.feather=0;entries.push_back(m);}
|
||||
[_mosaicEntries release];_mosaicEntries=[[NSData alloc]initWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry)];
|
||||
[_mosaicRaster release];_mosaicRaster=raster?[(NSData*)raster copy]:nil;
|
||||
}
|
||||
if(raster)CFRelease(raster);CGImageRelease(cg);
|
||||
@synchronized(_previewLock){[_mosaicFaceSnapshot release];_mosaicFaceSnapshot=[@{@"boxes":boxes,@"time":time?:@{}}copy];}
|
||||
return _mosaicEntries;
|
||||
}
|
||||
// Runs on the original frame before grading, then follows the same spatial
|
||||
// transforms as the picture. Geometry has already been evaluated at render time.
|
||||
- (FxImageTile*)sourceByApplyingMosaic:(NSDictionary*)tools source:(FxImageTile*)src registry:(uint64_t)registry error:(NSError**)error {
|
||||
NSDictionary *settings=tools[@"mosaic"];if(![settings[@"enabled"]boolValue])return src;
|
||||
FxRect image=src.imagePixelBounds,bounds=src.tilePixelBounds;
|
||||
if(memcmp(&image,&bounds,sizeof(FxRect))!=0){fail(error,@"局部马赛克需要完整源画面。");return nil;}
|
||||
BOOL face=[settings[@"source"]isEqual:@"face"];
|
||||
NSMutableArray *masks=[NSMutableArray array];
|
||||
NSArray *selected=tools[@"mosaicRenderMasks"];
|
||||
if(!selected){NSMutableArray *raw=[NSMutableArray array];for(NSString *ID in settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[])){NSDictionary *m=DYSharedMaskWithID(tools,ID);if(m)[raw addObject:m];}selected=tools[@"mosaicRenderMask"]?@[tools[@"mosaicRenderMask"]]:raw;}
|
||||
for(NSDictionary *mask in selected)if(!mask[@"stampSource"]&&[mask[@"enabled"]boolValue]){NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"combine"]=@0;[masks addObject:m];}
|
||||
if(!face&&!masks.count)return src;
|
||||
NSMutableDictionary *entry=[self device:registry error:error];if(!entry)return nil;
|
||||
NSData *faces=face?[self mosaicFaces:src time:tools[@"renderTime"] error:error]:nil;if(face&&!faces){fail(error,@"当前帧人脸识别失败,请重试或改用跟踪蒙版。");return nil;}
|
||||
DYToolMaskHeader header{};header.section=face?-102:0;
|
||||
id<MTLDevice>device=entry[@"device"];id<MTLTexture>input=[src metalTextureForDevice:device];
|
||||
NSData *skinEntries=_faceEntries;_faceEntries=faces;
|
||||
id<MTLBuffer>buffer=[self maskBuffer:face?@{}:@{@"primary":masks} tile:src device:device header:&header];_faceEntries=skinEntries;
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
id<MTLTexture>output=[[device newTextureWithDescriptor:desc]autorelease];
|
||||
id<MTLComputePipelineState>pipeline=[self managedKernel:@"dyLocalMosaic" entry:entry error:error];
|
||||
if(!input||!buffer||!output||!pipeline){fail(error,@"局部马赛克缓冲区不可用。");return nil;}
|
||||
// Size is in 1080-line reference pixels, stable under proxy/viewer scaling.
|
||||
uint32_t block=(uint32_t)MAX(2,round([settings[@"size"]doubleValue]*input.height/1080.));
|
||||
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];
|
||||
[ce setComputePipelineState:pipeline];[ce setTexture:input atIndex:0];[ce setTexture:output atIndex:1];[ce setBuffer:buffer offset:0 atIndex:0];[ce setBytes:&header length:sizeof(header) atIndex:1];[ce setBytes:&block length:sizeof(block) atIndex:2];
|
||||
[ce dispatchThreads:MTLSizeMake(input.width,input.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];
|
||||
if(cb.status!=MTLCommandBufferStatusCompleted){fail(error,cb.error.localizedDescription);return nil;}
|
||||
DYExportTile *tile=[[[DYExportTile alloc]initWithTexture:output registry:registry]autorelease];[tile setBounds:bounds origin:src.imageOrigin];[tile setPixelAspect:src.pixelAspect];[tile inheritColorSpace:src.colorSpace];return tile;
|
||||
}
|
||||
@@ -31,7 +31,11 @@
|
||||
- (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;}
|
||||
- (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);}
|
||||
- (NSSet<Class>*)classesForCustomParameterID:(UInt32)pid{return pid==DYToolsParameterID?[NSSet setWithObjects:DYToolDocument.class,NSDictionary.class,NSArray.class,NSString.class,NSNumber.class,NSData.class,nil]:pid==DYAssetsParameterID?[NSSet setWithObjects:DYAssetState.class,NSDictionary.class,NSString.class,NSData.class,nil]:[NSSet setWithObjects:DYInspectorToken.class,NSDictionary.class,NSString.class,NSNumber.class,nil];}
|
||||
- (NSView*)createViewForParameterID:(UInt32)pid{[self scheduleToolCanvasRegistration];return pid==DYInspectorParameterID?[[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer]:[[NSView alloc]initWithFrame:NSZeroRect];}
|
||||
- (NSView*)createViewForParameterID:(UInt32)pid {
|
||||
[self scheduleToolCanvasRegistration];
|
||||
if(pid!=DYInspectorParameterID)return [[NSView alloc]initWithFrame:NSZeroRect];
|
||||
return [[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer];
|
||||
}
|
||||
- (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];// Many parameter callbacks arrive in one host transaction. Refresh the native
|
||||
// inspector once after the transaction unwinds, rather than queueing a full
|
||||
// remote parameter read and view rebuild for every scalar in the burst.
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider error:(NSError**)error;
|
||||
- (BOOL)renderSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error;
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error;
|
||||
// Latest full-frame face rectangles and render time, copied under a short lock.
|
||||
- (NSDictionary*)mosaicFaceSnapshot;
|
||||
- (NSData*)preview;
|
||||
/// Latest final-output bins for the inspector's visible curve controls.
|
||||
- (NSData*)outputHistogram;
|
||||
|
||||
@@ -118,7 +118,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;
|
||||
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;NSData *_mosaicRaster,*_mosaicEntries;NSDictionary *_mosaicFaceSnapshot;
|
||||
dispatch_queue_t _scopeQueue;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning,_outputHistogramObserved,_outputHistogramNotificationPending;
|
||||
NSUInteger _scopeGeneration;
|
||||
@@ -133,11 +133,13 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
#include "DYScopeCapture.inc.h"
|
||||
#include "DYFilmRender.inc.h"
|
||||
#include "DYPrimaryRender.inc.h"
|
||||
#include "DYUnifiedRender.inc.h"
|
||||
#include "DYMosaicRender.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{[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest 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];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest 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];[_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];
|
||||
|
||||
@@ -61,9 +61,20 @@
|
||||
run.record(@"native-osc-shape-escape-keeps-author-and-all-shared-bindings",handled&&[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo&&![[plugin toolCanvasMaskAtTime:kCMTimeZero][@"drawShape"]boolValue]);
|
||||
selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();run.record(@"native-osc-shape-click-without-area-does-not-write-or-create-undo",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo);
|
||||
selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];host->_time=CMTimeMake(1,24);[plugin toolCanvasMaskAtTime:host->_time];[osc mouseUpAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:host->_time];drain();run.record(@"native-osc-shape-playhead-change-cancels-before-write",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo&&![[plugin toolCanvasMaskAtTime:host->_time][@"drawShape"]boolValue]);host->_time=kCMTimeZero;
|
||||
selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];host->_time=CMTimeMake(1,24);drain();run.record(@"native-osc-queued-shape-commit-rechecks-host-playhead",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo);host->_time=kCMTimeZero;
|
||||
selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();[osc mouseUpAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];host->_time=CMTimeMake(1,24);drain();run.record(@"native-osc-queued-shape-commit-rechecks-host-playhead",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo);host->_time=kCMTimeZero;
|
||||
doc=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);NSMutableDictionary *ellipse=(id)DYSharedMaskWithID(doc,maskID);p=DYMaskAtTime(ellipse,kCMTimeZero);p.kind=DYMaskEllipse;ellipse[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];DYWriteTools(base,doc,kCMTimeZero);selectShape();undo=base->_undoStarts;
|
||||
[osc mouseDownAtPositionX:488 positionY:149.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:208 positionY:275.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();p=DYMaskAtTime(DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,maskID),kCMTimeZero);run.record(@"native-osc-ellipse-draws-reverse-direction-with-positive-shared-extents",p.kind==DYMaskEllipse&&fabs(p.centerX-.55)<1e-5&&fabs(p.centerY-.5)<1e-5&&fabs(p.width-.5)<1e-5&&fabs(p.height-.4)<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
// Reproduce FCP's action clock offset while OSC and redraw use different clocks.
|
||||
host->_time=CMTimeMake(39,25);selectShape();undo=base->_undoStarts;
|
||||
[osc mouseDownAtPositionX:152 positionY:307 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();
|
||||
[osc mouseDraggedAtPositionX:432 positionY:181 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
|
||||
[osc drawOSCWithWidth:640 height:400 activePart:1 destinationImage:overlay atTime:host->_time];
|
||||
run.record(@"native-osc-shape-keeps-draft-across-different-redraw-clock",[[plugin toolCanvasMaskAtTime:host->_time][@"shapeStarted"]boolValue]);
|
||||
[osc mouseUpAtPositionX:488 positionY:149.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();
|
||||
p=DYMaskAtTime(DYSharedMaskWithID(DYReadTools(base,host->_time).document,maskID),kCMTimeZero);
|
||||
run.record(@"native-osc-mask-release-saves-with-different-action-clock",fabs(p.centerX-.5)<1e-5&&fabs(p.centerY-.45)<1e-5&&fabs(p.width-.6)<1e-5&&fabs(p.height-.5)<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(base,host->_time) requiringSecureCoding:YES error:nil];DYToolDocument *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:archive error:nil];
|
||||
run.record(@"native-osc-drawn-mask-persists-after-secure-reopen",[restored.document isEqual:DYReadTools(base,host->_time).document]);
|
||||
[osc release];[plugin release];drain();
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,19 @@
|
||||
- (void)discardToolCanvasDraft {
|
||||
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
|
||||
}
|
||||
// OSC and custom actions can use different origins. Capture the action clock
|
||||
// after the first event, then compare that clock only with itself at commit.
|
||||
- (void)captureToolCanvasHostTime {
|
||||
_toolCanvasHostEditTime=kCMTimeInvalid;
|
||||
NSDictionary *original=[_toolCanvasOriginal retain];CMTime eventTime=_toolCanvasEditTime;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;
|
||||
[a startAction:self];@try{@synchronized(self){
|
||||
if(self->_toolCanvasOriginal==original&&CMTimeCompare(self->_toolCanvasEditTime,eventTime)==0)
|
||||
self->_toolCanvasHostEditTime=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime);
|
||||
}}@finally{[a endAction:self];}
|
||||
});[original release];
|
||||
}
|
||||
- (void)commitToolCanvasDraftAtTime:(CMTime)eventTime {
|
||||
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp;
|
||||
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
|
||||
@@ -20,10 +33,10 @@
|
||||
[a startAction:self];@try{
|
||||
CMTime actionTime=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime);
|
||||
os_log(OS_LOG_DEFAULT,"dayu_pen_commit stamp=%{public}d event=%{public}.9f action=%{public}.9f nodes=%{public}lu",stampEdit,CMTimeGetSeconds(time),CMTimeGetSeconds(actionTime),(unsigned long)([draft[@"nodes"]length]/sizeof(DYBezierNode)));
|
||||
if(!CMTIME_IS_NUMERIC(actionTime)||(!stampEdit&&CMTimeCompare(actionTime,time)!=0)){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;}
|
||||
// The stamp document is non-animatable. Preserve the canvas time for the
|
||||
// geometry and tracking key, and access the document at the host action time.
|
||||
CMTime writeTime=stampEdit?actionTime:time;
|
||||
if(!CMTIME_IS_NUMERIC(actionTime)||(!stampEdit&&(!CMTIME_IS_NUMERIC(self->_toolCanvasHostEditTime)||CMTimeCompare(actionTime,self->_toolCanvasHostEditTime)!=0))){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;}
|
||||
// The complete mask document is non-animatable. Key geometry keeps the
|
||||
// OSC time; document access uses the current host action time.
|
||||
CMTime writeTime=actionTime;
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,writeTime).document),*current=[self toolMask:maskID node:node document:doc];
|
||||
if(!current||![current isEqual:original]){os_log(OS_LOG_DEFAULT,"dayu_pen_commit conflict current=%{public}d",current!=nil);[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;}
|
||||
NSMutableDictionary *result=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft);
|
||||
@@ -34,7 +47,7 @@
|
||||
result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)];
|
||||
result[@"keys"]=current[@"keys"];
|
||||
}else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;}
|
||||
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else if(stampEdit)[self postToolCanvasStatus:@"宿主未保存图章修改,已保留上一次位置。"];}
|
||||
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
|
||||
}@finally{[a endAction:self];}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft));
|
||||
if(changed)[self postToolCanvasStatus:sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
|
||||
@@ -44,7 +57,7 @@
|
||||
- (void)toolCanvasCommand:(NSNotification*)notification {
|
||||
NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;}
|
||||
CMTime time=CMTimeMakeWithEpoch([info[@"timeValue"]longLongValue],[info[@"timeScale"]intValue],[info[@"timeEpoch"]longLongValue]);
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}@synchronized(self){if(_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime))time=_toolCanvasEditTime;}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
|
||||
if([command isEqual:@"finish"]||[command isEqual:@"cancel"])[self toolCanvasEvent:NSEventTypeKeyDown point:NSZeroPoint part:1 modifiers:0 key:[command isEqual:@"finish"]?13:27 time:time];
|
||||
}
|
||||
- (void)updateToolShapeDraftAtPoint:(NSPoint)point {
|
||||
@@ -88,11 +101,11 @@
|
||||
NSDictionary *stamp=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];
|
||||
if([stamp[@"stampSource"]count]!=4)return;
|
||||
[self discardToolCanvasDraft];
|
||||
_toolCanvasOriginal=[stamp mutableCopy];_toolCanvasDraft=[stamp mutableCopy];_toolCanvasEditTime=time;
|
||||
_toolCanvasOriginal=[stamp mutableCopy];_toolCanvasDraft=[stamp mutableCopy];_toolCanvasEditTime=time;[self captureToolCanvasHostTime];
|
||||
_toolDragStart=point;_toolDragPart=part;
|
||||
return;
|
||||
}
|
||||
if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];}
|
||||
if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;[self captureToolCanvasHostTime];_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];}
|
||||
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}
|
||||
_toolDragStart=point;_toolDragPart=part;_toolDragParameters=DYMaskAtTime(_toolCanvasDraft,time);
|
||||
if(_toolDrawingShape){[self updateToolShapeDraftAtPoint:point];[self postToolCanvasStatus:@"拖出蒙版区域,松开保存;Esc 取消。"];return;}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
NSMutableDictionary *_toolCanvasDraft,*_toolCanvasOriginal;NSDictionary *_toolCanvasDocument;
|
||||
NSPoint _toolCanvasHoverPoint;BOOL _toolCanvasHasHover;
|
||||
NSPoint _toolDragStart;DYMaskParameters _toolDragParameters;NSInteger _toolDragPart;
|
||||
CMTime _toolCanvasEditTime;uint64_t _toolCanvasRevision;
|
||||
CMTime _toolCanvasEditTime,_toolCanvasHostEditTime;uint64_t _toolCanvasRevision;
|
||||
dy::GrayFrame _toolSourceFrame,_trackingReferenceFrame;
|
||||
float _toolSourceAspect;
|
||||
CMTime _toolSourceTime,_trackingReferenceTime,_trackingFrameDuration,_trackingPreviousTime;
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
|
||||
@synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};}
|
||||
@synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};}
|
||||
}
|
||||
- (void)toolTrackRequested:(NSNotification*)notification {
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
|
||||
@@ -55,6 +55,6 @@
|
||||
// Synchronous notification here can re-enter the host's ViewBridge callback.
|
||||
}
|
||||
|
||||
- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;}
|
||||
- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor||_measuringDefaultHeight)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child setNeedsLayout:YES];[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;}
|
||||
|
||||
- (void)resetRepeatedTool{if(!_embedded)return;id<PROAPIAccessing>host=[(DYToolManager*)_manager host];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];}
|
||||
@@ -115,6 +115,7 @@
|
||||
}@finally{[originalReference release];[skinReference release];[tile release];}
|
||||
});}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
|
||||
if([tools[@"mosaic"][@"enabled"]boolValue])return fail(error,@"局部马赛克属于空间处理,请保存完整预设。");
|
||||
if(tools&&!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
|
||||
if(![tools[@"levelMeasureOnly"]boolValue]&&[tools[@"levelRotation"]doubleValue]!=0)return fail(error,@"水平校正属于空间处理,请保存完整预设。");
|
||||
for(NSDictionary *mask in DYSharedMasks(tools))if(mask[@"stampSource"]&&[mask[@"enabled"]boolValue])return fail(error,@"仿制图章属于空间处理,请保存完整预设。");
|
||||
|
||||
@@ -21,6 +21,7 @@ NSDictionary *DYNewTool(NSString *type);
|
||||
NSDictionary *DYInsertTool(NSMutableDictionary *document,NSString *type,NSString *afterID);
|
||||
BOOL DYRemoveTool(NSMutableDictionary *document,NSString *nodeID);
|
||||
NSArray *DYToolDisplayOrder(NSDictionary *document);
|
||||
NSArray *DYUnifiedRenderOrder(NSDictionary *document);
|
||||
NSString *DYToolRootAnchor(NSDictionary *document,NSString *nodeID);
|
||||
NSDictionary *DYNewMask(NSInteger kind);
|
||||
BOOL DYValidToolDocument(NSDictionary *document);
|
||||
|
||||
@@ -89,6 +89,7 @@ NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParam
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
BOOL DYValidToolMask(NSDictionary *mask){
|
||||
if(![mask isKindOfClass:NSDictionary.class]||!validID(mask[@"id"])||!finiteNumber(mask[@"enabled"])||!finiteNumber(mask[@"combine"])||[mask[@"combine"]integerValue]<0||[mask[@"combine"]integerValue]>2)return NO;
|
||||
if(mask[@"label"]&&(![mask[@"label"]isKindOfClass:NSString.class]||[mask[@"label"]length]>100))return NO;
|
||||
DYMaskParameters p;if(!readParameters(mask[@"parameters"],&p))return NO;NSData *nodes=mask[@"nodes"];if(![nodes isKindOfClass:NSData.class]||nodes.length%sizeof(DYBezierNode)||nodes.length>32*sizeof(DYBezierNode))return NO;
|
||||
id source=mask[@"stampSource"];
|
||||
if(source){
|
||||
@@ -112,6 +113,14 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return nil;
|
||||
if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2]&&![doc[@"schema"]isEqual:@3])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return nil;
|
||||
id starter=doc[@"starterTool"],level=doc[@"levelRotation"];
|
||||
id mosaic=doc[@"mosaic"];
|
||||
if(mosaic){
|
||||
if(![mosaic isKindOfClass:NSDictionary.class]||!finiteNumber(mosaic[@"enabled"])||![@[@0,@1]containsObject:mosaic[@"enabled"]]||![@[@"face",@"mask"]containsObject:mosaic[@"source"]]||!finiteNumber(mosaic[@"size"])||[mosaic[@"size"]doubleValue]<4||[mosaic[@"size"]doubleValue]>128)return nil;
|
||||
if(mosaic[@"maskID"]&&!validID(mosaic[@"maskID"]))return nil;
|
||||
if(mosaic[@"maskIDs"]){id ids=mosaic[@"maskIDs"];if(![ids isKindOfClass:NSArray.class]||[ids count]>DYSharedMaskLimit)return nil;NSMutableSet *seen=[NSMutableSet set];for(id ID in ids){if(!validID(ID)||[seen containsObject:ID])return nil;[seen addObject:ID];}}
|
||||
}
|
||||
if(doc[@"mosaicRenderMask"]&&!DYValidToolMask(doc[@"mosaicRenderMask"]))return nil;
|
||||
if(doc[@"mosaicRenderMasks"]){if(![doc[@"mosaicRenderMasks"]isKindOfClass:NSArray.class]||[doc[@"mosaicRenderMasks"]count]>DYSharedMaskLimit)return nil;for(id m in doc[@"mosaicRenderMasks"])if(!DYValidToolMask(m))return nil;}
|
||||
if(starter&&![DYToolTypes() containsObject:starter]&&![starter isEqual:@"cst"])return nil;
|
||||
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
|
||||
id measured=doc[@"levelMeasureOnly"],reference=doc[@"levelReference"];
|
||||
@@ -132,6 +141,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
// Anchors are stable identities, never an array index or a translated title.
|
||||
// Reject unknown anchors/cycles so layout, rendering and undo share one order.
|
||||
for(NSDictionary *node in doc[@"layers"]){id after=node[@"after"];if(!after)continue;if([doc[@"schema"]isEqual:@1]||![after isKindOfClass:NSString.class])return nil;NSMutableSet *seen=[NSMutableSet setWithObject:node[@"id"]];while(after){if([after hasPrefix:@"base:"]){if(![DYToolTypes()containsObject:[after substringFromIndex:5]])return nil;break;}if([seen containsObject:after])return nil;[seen addObject:after];NSDictionary *parent=DYToolWithID(doc,after);if(!parent)return nil;after=parent[@"after"];}}
|
||||
id outputAfter=doc[@"outputAfter"];if(outputAfter&&(![outputAfter isKindOfClass:NSString.class]||(![outputAfter isEqual:@"tail"]&&![DYToolDisplayOrder(doc)containsObject:outputAfter])))return nil;
|
||||
NSUInteger totalKeys=0;for(NSDictionary *mask in shared)totalKeys+=[mask[@"keys"]count];for(NSArray *masks in [doc[@"baseMasks"]allValues])for(NSDictionary *mask in masks)totalKeys+=[mask[@"keys"]count];for(NSDictionary *node in doc[@"layers"])for(NSDictionary *mask in node[@"masks"])totalKeys+=[mask[@"keys"]count];if(totalKeys>65536)return nil;NSData *bounded=[NSPropertyListSerialization dataWithPropertyList:doc format:NSPropertyListBinaryFormat_v1_0 options:0 error:nil];return bounded.length<=24*1024*1024?bounded:nil;
|
||||
}
|
||||
BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil;}
|
||||
@@ -154,8 +164,9 @@ NSDictionary *DYToolWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *n i
|
||||
static void DYAppendToolChildren(NSDictionary *doc,NSString *parent,NSMutableArray *order,NSMutableSet *seen){for(NSDictionary *node in doc[@"layers"])if([node[@"after"]isEqual:parent]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}}
|
||||
NSArray *DYToolDisplayOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray array];NSMutableSet *seen=[NSMutableSet set];for(NSString *type in DYToolTypes()){NSString *base=[@"base:" stringByAppendingString:type];[order addObject:base];DYAppendToolChildren(doc,base,order,seen);}for(NSDictionary *node in doc[@"layers"])if(!node[@"after"]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}return order;}
|
||||
NSString *DYToolRootAnchor(NSDictionary *doc,NSString *ID){NSMutableSet *seen=[NSMutableSet set];NSDictionary *node=DYToolWithID(doc,ID);while(node[@"after"]){NSString *after=node[@"after"];if([after hasPrefix:@"base:"])return after;if([seen containsObject:after])return nil;[seen addObject:after];node=DYToolWithID(doc,after);}return @"tail";}
|
||||
NSArray *DYUnifiedRenderOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray arrayWithArray:DYToolDisplayOrder(doc)];NSString *after=doc[@"outputAfter"]?:@"tail";NSUInteger index=[order indexOfObject:after];[order insertObject:@"output" atIndex:index==NSNotFound?order.count:index+1];return order;}
|
||||
NSDictionary *DYInsertTool(NSMutableDictionary *doc,NSString *type,NSString *after){if(!DYValidToolDocument(doc)||[doc[@"layers"]count]>=DYToolLimit)return nil;if(!([after hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[after substringFromIndex:5]])&&!DYToolWithID(doc,after))return nil;NSDictionary *fresh=DYNewTool(type);if(!fresh)return nil;NSMutableDictionary *node=DYMutablePlist(fresh);node[@"after"]=after;NSMutableArray *layers=doc[@"layers"];for(NSMutableDictionary *old in layers)if([old[@"after"]isEqual:after])old[@"after"]=node[@"id"];NSUInteger index=0;NSDictionary *parent=DYToolWithID(doc,after);if(parent)index=[layers indexOfObjectIdenticalTo:parent]+1;[layers insertObject:node atIndex:MIN(index,layers.count)];if(![doc[@"schema"]isEqual:@3])doc[@"schema"]=@2;return node;}
|
||||
BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];return YES;}
|
||||
BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];return YES;}
|
||||
NSArray *DYSharedMasks(NSDictionary *doc){return [doc[@"sharedMasks"]isKindOfClass:NSArray.class]?doc[@"sharedMasks"]:@[];}
|
||||
NSDictionary *DYSharedMaskWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *mask in DYSharedMasks(doc))if([mask[@"id"]isEqual:ID])return mask;return nil;}
|
||||
static NSArray *DYRawMasksForTool(NSDictionary *doc,NSString *ID){return [ID hasPrefix:@"base:"]?doc[@"baseMasks"][[ID substringFromIndex:5]]?:@[]:DYToolWithID(doc,ID)[@"masks"]?:@[];}
|
||||
@@ -362,6 +373,10 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
|
||||
return result;
|
||||
};
|
||||
NSMutableDictionary *out=[[doc mutableCopy]autorelease],*base=[NSMutableDictionary dictionary];
|
||||
NSArray *mosaicIDs=doc[@"mosaic"][@"maskIDs"]?: (doc[@"mosaic"][@"maskID"]?@[doc[@"mosaic"][@"maskID"]]:@[]);
|
||||
NSMutableArray *mosaicMasks=[NSMutableArray array];for(NSDictionary *mask in shared)if(!mask[@"stampSource"]&&[mosaicIDs containsObject:mask[@"id"]])[mosaicMasks addObject:mask];
|
||||
out[@"mosaicRenderMasks"]=resolve(mosaicMasks);[out removeObjectForKey:@"mosaicRenderMask"];
|
||||
if(CMTIME_IS_NUMERIC(t))out[@"renderTime"]=[(NSDictionary*)CMTimeCopyAsDictionary(t,kCFAllocatorDefault)autorelease];
|
||||
for(NSString *type in doc[@"baseMasks"])base[type]=resolve(doc[@"baseMasks"][type]);out[@"baseMasks"]=base;
|
||||
NSMutableArray *layers=[NSMutableArray array];
|
||||
for(NSDictionary *node in doc[@"layers"]){NSMutableDictionary *layer=[[node mutableCopy]autorelease];layer[@"masks"]=resolve(node[@"masks"]);[layers addObject:layer];}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
// Production render tests for the ordered chain and spatial privacy operator.
|
||||
{
|
||||
NSDictionary *v4=DYUnifiedColorDefaults();run.need(@"unified-v4-valid-and-distinct-from-v3",DYManagedColorValid(v4,nil)&&DYUnifiedColorState(v4)&&![v4 isEqual:DYPrimaryColorDefaults()]);
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYInitialToolDocument(nil));run.record(@"unified-default-output-is-last",[DYUnifiedRenderOrder(doc).lastObject isEqual:@"output"]);
|
||||
NSDictionary *node=DYInsertTool(doc,@"curve",@"base:hsl");doc[@"outputAfter"]=node[@"id"];
|
||||
NSArray *order=DYUnifiedRenderOrder(doc);run.record(@"unified-output-follows-stable-uuid",[order indexOfObject:@"output"]==[order indexOfObject:node[@"id"]]+1&&DYValidToolDocument(doc));
|
||||
DYRemoveTool(doc,node[@"id"]);run.record(@"unified-deleting-anchor-keeps-valid-output-order",DYValidToolDocument(doc)&&[doc[@"outputAfter"]isEqual:@"base:hsl"]);
|
||||
doc[@"outputAfter"]=@"unknown";run.record(@"unified-rejects-unknown-output-anchor",!DYValidToolDocument(doc));doc=DYMutablePlist(DYInitialToolDocument(nil));
|
||||
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];
|
||||
auto decode=[](float x){return x<=.04045f?x/12.92f:powf((x+.055f)/1.055f,2.4f);};
|
||||
Pixels chart(w*h*4);for(NSUInteger i=0;i<w*h;i++){chart[i*4]=decode(-.04f);chart[i*4+1]=decode(.18f+(i%w)/100.f);chart[i*4+2]=decode(4.f);chart[i*4+3]=1;}
|
||||
[[src metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:chart.data()bytesPerRow:w*8];
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];DYUniforms u=defaults;u.skinProtection.x=0;u.cm.configured=1;u.cm.inputTransfer=u.cm.workingTransfer=u.cm.outputTransfer=20;u.cm.inputGamut=u.cm.workingGamut=u.cm.outputGamut=22;u.cm.toneMapping=0;
|
||||
auto frame=[&](DYUniforms values,NSDictionary *document,NSString *name){NSError *e=nil;BOOL ok=[renderer renderSource:src destination:dst uniforms:values paths:@{} spider:nil tools:document colorManagement:v4 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.need(name,ok,@{@"error":reason(e)});return read(dst,gpu);};
|
||||
Pixels plain=frame(u,doc,@"unified-neutral-wide-chain-renders");run.record(@"unified-neutral-preserves-negative-and-superwhite",fabs((float)plain[0]+.04)<.002&&fabs((float)plain[2]-4)<.01&&difference(plain,plain).nonfinite==0);
|
||||
DYUniforms exposure=u;exposure.exposure=1;Pixels raised=frame(exposure,doc,@"unified-scene-exposure");run.record(@"unified-scene-exposure-doubles-negative-and-superwhite",fabs((float)raised[0]+.08)<.003&&fabs((float)raised[2]-8)<.03,@{@"red":@((float)raised[0]),@"blue":@((float)raised[2])});
|
||||
DYUniforms changed=u;changed.hslHueA.x=20;changed.hslHueB.x=20;Pixels modified=frame(changed,doc,@"unified-HSL-before-output-accepts-linear-domain");run.record(@"unified-active-bounded-tool-carries-superwhite-residual",modified[2]>2.9&&difference(plain,modified).nonfinite==0);
|
||||
NSMutableDictionary *zero=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(zero,kCMTimeZero);p.strength=0;zero[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];doc[@"baseMasks"][@"hsl"]=@[zero];
|
||||
Pixels masked=frame(changed,doc,@"unified-zero-mask");run.record(@"unified-zero-mask-is-exact-neutral",difference(masked,plain).maximum==0);[doc[@"baseMasks"]removeObjectForKey:@"hsl"];
|
||||
changed.cm.outputTransfer=1002;changed.cm.toneMapping=1;changed.hslSatA.x=40;Pixels last=frame(changed,doc,@"unified-last-output");doc[@"outputAfter"]=@"base:primary";Pixels middle=frame(changed,doc,@"unified-middle-output");run.record(@"unified-moving-output-changes-actual-domain-order",difference(last,middle).maximum>.001,@{@"difference":@(difference(last,middle).maximum)});
|
||||
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=v4;DYWriteAssets(host,assets,kCMTimeZero);
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[view refresh];[view setFrameSize:NSMakeSize(400,400)];[view layoutSubtreeIfNeeded];NSDictionary *output=nil;for(NSDictionary *card in [view valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"output"])output=card;
|
||||
run.record(@"unified-inspector-output-visible-at-chain-tail",output&&![output[@"view"]isHidden]&&NSMaxY([output[@"view"]frame])>NSMaxY([[[view valueForKey:@"cards"]firstObject][@"view"]frame]));
|
||||
[(NSButton*)output[@"repeatButton"]performClick:nil];run.record(@"unified-output-arrow-persists-and-creates-one-undo",[DYReadTools(host,kCMTimeZero).document[@"outputAfter"]isEqual:@"base:film"]&&host->_undoStarts==1&&host->_undoEnds==1);
|
||||
}
|
||||
{
|
||||
const NSUInteger w=128,h=96;DYDiagnosticTile *src=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease],*dst=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels chart(w*h*4);
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){NSUInteger i=(y*w+x)*4;chart[i]=x/double(w);chart[i+1]=y/double(h);chart[i+2]=(x%2)*.4;chart[i+3]=1;}
|
||||
[[src metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:chart.data()bytesPerRow:w*8];
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];DYUniforms u=defaults;u.primarySectionEnabled=0;u.skinProtection.x=0;
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYInitialToolDocument(nil));NSMutableDictionary *mask=(id)DYAddSharedMask(doc,DYMaskRectangle);DYMaskParameters p=DYMaskAtTime(mask,kCMTimeZero);p.width=p.height=.4;p.centerX=.25;p.centerY=.5;p.feather=0;mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
doc[@"mosaic"]=@{@"source":@"mask",@"maskID":mask[@"id"],@"enabled":@YES,@"size":@96};NSError *e=nil;
|
||||
auto frame=[&](NSDictionary *document,NSString *name){BOOL ok=[renderer renderSource:src destination:dst uniforms:u paths:@{} spider:nil tools:document colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.need(name,ok,@{@"error":reason(e)});return read(dst,gpu);};
|
||||
Pixels baseline=frame(DYInitialToolDocument(nil),@"mosaic-baseline");Pixels first=frame(DYToolRenderSnapshot(doc,kCMTimeZero),@"mosaic-shared-rectangle-render");
|
||||
double inside=0,outside=0;for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++)for(int c=0;c<3;c++){double delta=fabs((float)first[(y*w+x)*4+c]-(float)baseline[(y*w+x)*4+c]);if(x>15&&x<48&&y>35&&y<60)inside=MAX(inside,delta);if(x>75)outside=MAX(outside,delta);}
|
||||
run.record(@"mosaic-changes-selection-and-preserves-outside",inside>.05&&outside==0,@{@"inside":@(inside),@"outside":@(outside)});
|
||||
DYMaskParameters moved=p;moved.centerX=.75;mask[@"keys"]=@[DYMaskKey(kCMTimeZero,p,YES,1),DYMaskKey(CMTimeMake(1,1),moved,YES,1)];
|
||||
Pixels tracked=frame(DYToolRenderSnapshot(doc,CMTimeMake(1,1)),@"mosaic-follow-existing-tracking");run.record(@"mosaic-tracked-selection-vacates-previous-region",tracked[(48*w+31)*4+2]==baseline[(48*w+31)*4+2]&&tracked[(48*w+95)*4+2]!=baseline[(48*w+95)*4+2]);
|
||||
doc[@"mosaic"]=@{@"source":@"mask",@"maskID":NSUUID.UUID.UUIDString,@"enabled":@YES,@"size":@96};Pixels missing=frame(DYToolRenderSnapshot(doc,kCMTimeZero),@"mosaic-missing-mask");run.record(@"mosaic-missing-mask-does-not-cover-whole-frame",difference(missing,baseline).maximum==0);
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"mosaic-refused.cube"]];run.record(@"mosaic-refuses-incomplete-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc colorManagement:nil error:&e]&&e);
|
||||
NSMutableDictionary *bad=DYMutablePlist(doc);bad[@"mosaic"][@"size"]=@0;run.record(@"mosaic-invalid-block-size-rejected",!DYValidToolDocument(bad));
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
// V4: stable author order, one movable output boundary, explicit node domains.
|
||||
- (BOOL)renderUnifiedSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools hostPrimaries:(NSInteger)primaries error:(NSError**)error {
|
||||
if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools);
|
||||
NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;id<MTLDevice>d=entry[@"device"];id<MTLTexture>source=[src metalTextureForDevice:d];if(!source)return fail(error,@"一级 CST 输入纹理不可用。");
|
||||
uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过一级 CST 内存预算。");
|
||||
BOOL inputEnabled=u.inputSectionEnabled>.5;DYCMSettings global=u.cm;DYApplyRemovedBaseTools(&u,tools);u.cm=global;int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut);
|
||||
NSMutableArray*pool=[NSMutableArray array];NSCountedSet*pinned=[NSCountedSet set];id<MTLTexture>current=nil,originalWorking=nil;int initialGamut=wg,initialTransfer=wt;
|
||||
auto next=[&]()->id<MTLTexture>{for(id<MTLTexture>t in pool)if(t!=current&&![pinned containsObject:t])return t;MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:source.width height:source.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;id<MTLTexture>t=[d newTextureWithDescriptor:td];if(t){[pool addObject:t];[t release];}return t;};
|
||||
auto dispatch=[&](NSString*name,const void*params,NSUInteger length,const void*extra=nullptr,NSUInteger extraLength=0){id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级 CST 缓冲区。");BOOL ok=[self managedDispatch:name textures:@[current,out] data:params length:length extra:extra extraLength:extraLength entry:entry error:error];if(ok)current=out;return ok;};
|
||||
auto transform=[&](CSTParams p){if(p.inputTransfer==p.outputTransfer&&p.inputGamut==p.outputGamut&&!p.toneMapping)return YES;return dispatch(@"dyPrimaryCST",&p,sizeof(p));};
|
||||
auto tile=[&](id<MTLTexture>t){DYExportTile*v=[[[DYExportTile alloc]initWithTexture:t registry:d.registryID]autorelease];[v setBounds:src.tilePixelBounds origin:src.imageOrigin];[v setPixelAspect:src.pixelAspect];return v;};
|
||||
auto blend=[&](id<MTLTexture>before,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;id<MTLTexture>out=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};id<MTLBuffer>mb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];struct {CSTParams toLinear,fromLinear,originalTo709;float amount;}p={{wg,wt,2,20,0},{2,20,wg,wt,0},{initialGamut,initialTransfer,22,20,0},amount};id<MTLComputePipelineState>pipeline=[self managedKernel:@"dyUnifiedBlend" entry:entry error:error];if(!pipeline||!mb)return NO;id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setTexture:originalWorking?:before atIndex:3];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;};
|
||||
auto grade=[&](DYUniforms values,NSArray*masks,BOOL local){if(values.primarySectionEnabled<.5||values.cm.mix<=0)return YES;DYUniforms neutral=values;neutral.inputSectionEnabled=neutral.cm.outputEnabled=0;BOOL gradeNeutral=identityCM(neutral);if(!local&&gradeNeutral)return YES;if(local&&identityCM(values))return YES;
|
||||
DayuRenderParams p=DYCMRender(values.cm);p.input.toneMapping=0;if((int)lroundf(values.cm.workingTransfer)==20){p.reserved|=8;p.basis.colorspace=10;p.basisInput={(int)lroundf(values.cm.workingGamut),20,(int)lroundf(values.cm.workingGamut),10,0};p.basisOutput={(int)lroundf(values.cm.workingGamut),10,(int)lroundf(values.cm.workingGamut),20,0};}CSTParams back={wg,wt,wg,wt,0};
|
||||
if(local){p.stages=(values.inputSectionEnabled>.5?1:0)|(gradeNeutral?0:2)|(values.cm.outputEnabled>.5?4:0);back={values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputGamut):(int)lroundf(values.cm.workingGamut),values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputTransfer):(int)lroundf(values.cm.workingTransfer),wg,wt,0};}
|
||||
else{p.stages=2;}
|
||||
id<MTLTexture>before=current;[pinned addObject:before];BOOL ok=dispatch(@"dyPrimaryGrade",&p,sizeof(p),&back,sizeof(back));if(ok)ok=blend(before,masks,values.cm.mix,@"primary");[pinned removeObject:before];return ok;
|
||||
};
|
||||
auto print=[&](DYUniforms values,NSArray*masks){if(!DYFilmPrintActive(values))return YES;NSArray*names=@[@"",@"kodak_2383",@"kodak_2393",@"kodak_2302_bw",@"fuji_3510",@"fuji_3513",@"fuji_3519",@"fuji_3521",@"agfa_cp30"];NSString*path=[[NSBundle bundleForClass:self.class]pathForResource:names[(int)values.filmPrint.x] ofType:@"dylut" inDirectory:@"PrintLooks"];id<MTLTexture>cube=path?[self lut:path entry:entry error:error]:nil;if(!cube)return fail(error,@"印片资源不可用。");id<MTLTexture>before=current;[pinned addObject:before];BOOL ok=transform({wg,wt,2,1,0});float amount=values.filmPrint.y*values.film.mix;if(ok){id<MTLTexture>out=next();ok=out&&[self managedDispatch:@"dyManagedPrint" textures:@[current,cube,out] data:&amount length:4 extra:nullptr extraLength:0 entry:entry error:error];if(ok)current=out;}if(ok)ok=transform({2,1,wg,wt,0});if(ok)ok=blend(before,masks,1,@"film");[pinned removeObject:before];return ok;};
|
||||
// Recover only the pre-existing explicit code-value carrier. No display
|
||||
// transform or host-profile-to-709 conversion precedes the declared input.
|
||||
current=source;id<MTLTexture>carrier=next();uint32_t noLUT=0;if(!carrier||![self managedDispatch:@"dyManagedCarrier" textures:@[current,carrier,entry[@"identity"]] data:&noLUT length:4 extra:nullptr extraLength:0 entry:entry error:error])return NO;current=carrier;
|
||||
if(inputEnabled&&!transform({(int)lroundf(u.cm.inputGamut),(int)lroundf(u.cm.inputTransfer),wg,wt,0}))return NO;
|
||||
// Preserve the original working image for source-referenced operations.
|
||||
originalWorking=current;[pinned addObject:originalWorking];
|
||||
auto isolated=[&](NSString *type,DYUniforms values,NSDictionary *nodePaths,NSData *mesh,NSArray *masks){
|
||||
NSMutableDictionary *node=[NSMutableDictionary dictionaryWithDictionary:DYNewTool(type)];NSMutableDictionary *v=[NSMutableDictionary dictionary];
|
||||
for(NSDictionary *descriptor in DYBaseToolDescriptors(type))if([descriptor[@"offset"]integerValue]>=0)v[descriptor[@"key"]]=@(*(float*)((uint8_t*)&values+[descriptor[@"offset"]unsignedIntegerValue]));
|
||||
node[@"values"]=v;node[@"paths"]=nodePaths?:@{};node[@"masks"]=@[];if(mesh)node[@"spider"]=mesh;
|
||||
node[@"filmFrameKey"]=@(values.filmFrameKey);
|
||||
if(DYToolIsNeutral(node))return YES;
|
||||
id<MTLTexture>before=current;[pinned addObject:before];BOOL ok=YES;
|
||||
if([type isEqual:@"base"]&&values.baseSectionEnabled>.5&&values.exposureEnabled>.5&&values.exposure!=0){float gain=exp2f(values.exposure);ok=transform({wg,wt,wg,20,0})&&dispatch(@"dyUnifiedExposure",&gain,sizeof(gain))&&transform({wg,20,wg,wt,0});node[@"values"][@"exposure"]=@0;}
|
||||
if(!ok){[pinned removeObject:before];return NO;}
|
||||
if(DYToolIsNeutral(node)){}
|
||||
else if([type isEqual:@"lens"]){id<MTLTexture>out=next();ok=out&&[self renderLens:tile(current) destination:tile(out) uniforms:values masks:@[] entry:entry error:error];if(ok)current=out;}
|
||||
else {
|
||||
// Creative Rec.709 LUT/film and skin models declare a local reference domain.
|
||||
// All other legacy controls operate on the current working RGB code values.
|
||||
BOOL reference=[@[@"look",@"film",@"skin"]containsObject:type];
|
||||
int domainGamut=reference?22:wg,domainTransfer=reference?1002:wt;
|
||||
if(reference)ok=transform({wg,wt,domainGamut,domainTransfer,0});
|
||||
id<MTLTexture>raw=current;[pinned addObject:raw];
|
||||
if(ok)ok=dispatch(@"dyUnifiedBridgeIn",nullptr,0);
|
||||
id<MTLTexture>bounded=current;[pinned addObject:bounded];
|
||||
// A source-referenced skin node compares to the original image in this same
|
||||
// domain, never to a previous frame or an unrelated cached display image.
|
||||
id<MTLTexture>referenceTexture=bounded;
|
||||
if(ok&&[type isEqual:@"skin"]){if(!_exporting&&(values.skinFaceOnly>.5||values.skinVisualize>.5))[self prepareFaceSupport:tile(bounded)];else{[_faceEntries release];_faceEntries=nil;}current=originalWorking;ok=transform({initialGamut,initialTransfer,domainGamut,domainTransfer,0})&&dispatch(@"dyUnifiedBridgeIn",nullptr,0);referenceTexture=current;[pinned addObject:referenceTexture];current=bounded;}
|
||||
if(ok){id<MTLTexture>out=next();_managedFinishing=YES;@try{ok=out&&[self renderExtraTool:node source:tile(bounded) original:tile(referenceTexture) destination:tile(out) entry:entry error:error];}@finally{_managedFinishing=NO;}if(ok)current=out;}
|
||||
if(referenceTexture!=bounded)[pinned removeObject:referenceTexture];[pinned removeObject:bounded];
|
||||
if(ok){id<MTLTexture>out=next();ok=out&&[self managedDispatch:@"dyUnifiedBridgeOut" textures:@[raw,current,out] data:nullptr length:0 extra:nullptr extraLength:0 entry:entry error:error];if(ok)current=out;}
|
||||
[pinned removeObject:raw];
|
||||
if(ok&&reference)ok=transform({domainGamut,domainTransfer,wg,wt,0});
|
||||
}
|
||||
if(ok)ok=blend(before,masks,1,type);[pinned removeObject:before];return ok;
|
||||
};
|
||||
for(NSString *ID in DYUnifiedRenderOrder(tools)){
|
||||
if([ID isEqual:@"output"]){
|
||||
if(u.cm.outputEnabled>.5){CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0};
|
||||
if(u.cm.toneMapping>.5)output.toneMapping=(wt>1000?2:0)+(output.outputTransfer>1000?1:0);
|
||||
if(!transform(output))return NO;wg=output.outputGamut;wt=output.outputTransfer;
|
||||
}continue;
|
||||
}
|
||||
BOOL base=[ID hasPrefix:@"base:"];NSDictionary *node=base?nil:DYToolWithID(tools,ID);NSString *type=base?[ID substringFromIndex:5]:node[@"type"];
|
||||
if(base&&DYBaseToolRemoved(tools,type))continue;
|
||||
DYUniforms values=base?u:DYToolUniforms(node);NSArray *masks=base?tools[@"baseMasks"][type]:node[@"masks"];
|
||||
if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;continue;}
|
||||
if([type isEqual:@"film"]){if(!print(values,masks))return NO;values.filmPrint.x=0;}
|
||||
if(!isolated(type,values,base?DYVisibleBaseToolPaths(paths,tools):node[@"paths"],base?spider:node[@"spider"],masks))return NO;
|
||||
}
|
||||
[pinned removeObject:originalWorking];
|
||||
// Final host adaptation is separate from the movable output node. Cube uses
|
||||
// the exact current code domain after the same ordered operations.
|
||||
if(_exporting){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}
|
||||
else {
|
||||
if(!transform({wg,wt,22,20,0}))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];
|
||||
CGColorSpaceRef from=CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB),to=DYManagedTileSpace(dst,primaries);
|
||||
DYColorProfile *profile=to?[[[DYColorProfile alloc]initWithSource:from target:to error:error]autorelease]:nil;CGColorSpaceRelease(from);if(to)CGColorSpaceRelease(to);
|
||||
if(!profile)return fail(error,@"宿主未提供明确的目标颜色空间。");id<MTLTexture>out=next();if(!out||![self managedProfile:profile input:current output:out entry:entry error:error])return NO;current=out;
|
||||
}
|
||||
_managedFinishing=YES;@try{return [self copyTile:tile(current) to:dst entry:entry error:error];}@finally{_managedFinishing=NO;}
|
||||
}
|
||||
@@ -79,10 +79,10 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
if(_capture&&![_capture capturing])_capture=nil;
|
||||
[_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return;
|
||||
// Only tools that benefit from direct image interaction belong on the canvas.
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp",@"level"];
|
||||
CGFloat railScale=MIN(s,v.size.width/520.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-516*railScale;
|
||||
_rail=NSMakeRect(x,y,396*railScale,25*railScale);
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level",@"mosaic"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正",@"局部马赛克"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp",@"level",@"square.grid.3x3.fill"];
|
||||
CGFloat railScale=MIN(s,v.size.width/560.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-556*railScale;
|
||||
_rail=NSMakeRect(x,y,436*railScale,25*railScale);
|
||||
if(_levelMode){
|
||||
NSArray *labels=@[@"水平",@"垂直",@"重置",@"仅测量"];
|
||||
for(NSInteger i=0;i<4;i++){
|
||||
@@ -157,6 +157,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
- (void)activateTool:(NSString*)type{
|
||||
if([type isEqual:@"mosaic"]){[self finishCapture];_stampArmed=NO;_levelMode=0;[_bridge requestMosaicMenu];return;}
|
||||
if([type isEqual:@"level"]){[self finishCapture];_stampArmed=NO;_levelMode=_levelMode?0:1;return;}
|
||||
BOOL returningFromLevel=_levelMode!=0;_levelMode=0;
|
||||
if([type isEqual:@"cloneStamp"]){_stampArmed=!_stampArmed;return;}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
publish();int undo=base->_undoStarts;NSDictionary *initial=[[base->_values copy]autorelease];
|
||||
NSMutableSet *types=[NSMutableSet set];NSInteger masks=0;CGFloat lastX=-1,y=-1;BOOL horizontal=YES;
|
||||
for(NSDictionary *a in [controls valueForKey:@"areas"]){if([a[@"kind"]isEqual:@"mask"])masks++;if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(lastX>=0)horizontal&=r.origin.x>lastX&&r.origin.y==y;lastX=r.origin.x;y=r.origin.y;[types addObject:a[@"toolType"]];}}
|
||||
run.record(@"viewer-lower-right-rail-has-seven-image-tools-and-three-persistent-mask-shapes",horizontal&&lastX>size.width*.8&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0);
|
||||
run.record(@"viewer-lower-right-rail-has-eight-image-tools-and-three-persistent-mask-shapes",horizontal&&lastX>size.width*.8&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level",@"mosaic"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0);
|
||||
NSDictionary *stamp=areaFor(controls,@"tool",@"cloneStamp");
|
||||
click(stamp);BOOL armed=controls.stampArmed;click(stamp);
|
||||
run.record(@"viewer-stamp-arms-and-disarms-without-changing-the-grade",armed&&!controls.stampArmed&&[initial isEqual:base->_values]&&base->_undoStarts==undo);
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
// Call before the owning plug-in releases this object during teardown.
|
||||
- (void)invalidate;
|
||||
- (void)requestWorkspace;
|
||||
- (void)requestMosaicMenu;
|
||||
- (void)requestMosaicMenuFromView:(NSView*)anchor;
|
||||
- (void)requestWorkspacePage:(NSString *)page;
|
||||
- (void)requestMask:(NSInteger)kind;
|
||||
- (void)requestTool:(NSString*)type;
|
||||
@@ -78,7 +80,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
}
|
||||
@synthesize renderer=_renderer;
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager {
|
||||
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];}return self;
|
||||
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(mosaicMenuRequested:) name:@"DYMosaicMenuRequested" object:manager];}return self;
|
||||
}
|
||||
- (void)dealloc {
|
||||
// invalidate enqueues closure before the owner releases its final reference;
|
||||
@@ -104,6 +106,74 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
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)mosaicMessage:(NSString*)message {
|
||||
NSAlert *alert=[[[NSAlert alloc]init]autorelease];alert.messageText=@"局部马赛克";alert.informativeText=message;[alert runModal];
|
||||
}
|
||||
- (void)applyMosaicMenu:(NSMenuItem*)item {
|
||||
id manager=nil;@synchronized(self){if(!_invalidated)manager=_apiManager;}if(!manager)return;
|
||||
NSDictionary *command=item.representedObject;BOOL imported=NO,changed=NO;NSString *selected=nil,*failure=nil;
|
||||
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];
|
||||
@try{
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(manager,a.currentTime).document);
|
||||
NSMutableDictionary *settings=[NSMutableDictionary dictionaryWithDictionary:doc[@"mosaic"]?:@{@"enabled":@NO,@"source":@"face",@"size":@32}];
|
||||
if(command[@"importFaces"]){
|
||||
NSDictionary *snapshot=command[@"importFaces"];
|
||||
CMTime menuTime=CMTimeMakeFromDictionary((CFDictionaryRef)command[@"actionTime"]);
|
||||
CMTime frameTime=CMTimeMakeFromDictionary((CFDictionaryRef)snapshot[@"time"]);
|
||||
CMTime current=DYHostDisplayedFrameTime(manager,a.currentTime);
|
||||
if(!CMTIME_IS_NUMERIC(frameTime)||CMTimeCompare(menuTime,current)!=0||CMTimeCompare(frameTime,current)!=0){failure=@"播放头或识别画面已变化,请暂停画面后重新打开菜单。";return;}
|
||||
NSArray *boxes=snapshot[@"boxes"];if(!boxes.count){failure=@"本帧未识别到人脸,可用矩形或钢笔手动画出区域。";return;}
|
||||
if(DYSharedMasks(doc).count+boxes.count>DYSharedMaskLimit){failure=@"共享蒙版数量不足,请删除不需要的蒙版后重试。";return;}
|
||||
NSMutableArray *IDs=[NSMutableArray array];NSUInteger index=0;
|
||||
for(NSArray *box in boxes){NSMutableDictionary *mask=(id)DYAddSharedMask(doc,DYMaskRectangle);if(!mask){failure=@"未能创建人脸蒙版,原设置已保留。";return;}
|
||||
DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);p.centerX=[box[0]floatValue];p.centerY=[box[1]floatValue];p.width=[box[2]floatValue];p.height=[box[3]floatValue];p.feather=0;
|
||||
mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
mask[@"label"]=[NSString stringWithFormat:@"人脸 %lu · 横向 %.0f%%",(unsigned long)++index,p.centerX*100];
|
||||
[IDs addObject:mask[@"id"]];
|
||||
}
|
||||
settings[@"maskIDs"]=IDs;settings[@"source"]=@"mask";settings[@"enabled"]=@YES;[settings removeObjectForKey:@"maskID"];selected=IDs.firstObject;imported=YES;
|
||||
}else if(command[@"toggleMask"]){
|
||||
NSString *ID=command[@"toggleMask"];if(!DYSharedMaskWithID(doc,ID)){failure=@"这个蒙版已被删除,请重新选择。";return;}
|
||||
NSMutableArray *IDs=[NSMutableArray arrayWithArray:[settings[@"source"]isEqual:@"mask"]?(settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[])):@[]];
|
||||
if([IDs containsObject:ID])[IDs removeObject:ID];else{[IDs addObject:ID];selected=ID;}
|
||||
settings[@"source"]=@"mask";settings[@"maskIDs"]=IDs;settings[@"enabled"]=@(IDs.count>0);[settings removeObjectForKey:@"maskID"];
|
||||
}else [settings addEntriesFromDictionary:command];
|
||||
doc[@"mosaic"]=settings;id<FxUndoAPI>undo=[manager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
if([undo startUndoGroup:imported?@"创建可选人脸马赛克蒙版":@"局部马赛克"]){@try{changed=DYWriteTools(manager,doc,a.currentTime);}@finally{[undo endUndoGroup];}}
|
||||
if(!changed){failure=@"宿主未保存本次马赛克设置,请重试。";return;}
|
||||
if(selected)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:manager userInfo:@{@"node":@"shared",@"mask":selected,@"document":doc}];
|
||||
}@finally{[a endAction:self];if(failure)[self mosaicMessage:failure];}
|
||||
if(changed){[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:manager];}
|
||||
if(imported)[self requestWorkspacePage:@"masks"];
|
||||
}
|
||||
- (void)mosaicMenuRequested:(NSNotification*)note {[self requestMosaicMenuFromView:note.userInfo[@"anchor"]];}
|
||||
- (void)requestMosaicMenu {[self requestMosaicMenuFromView:nil];}
|
||||
- (void)requestMosaicMenuFromView:(NSView*)anchor {
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(!manager)return;
|
||||
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];NSDictionary *doc=nil;CMTime actionTime=kCMTimeInvalid;
|
||||
@try{doc=[DYReadTools(manager,a.currentTime).document retain];actionTime=DYHostDisplayedFrameTime(manager,a.currentTime);}@finally{[a endAction:self];}
|
||||
NSMenu *menu=[[[NSMenu alloc]initWithTitle:@"局部马赛克"]autorelease];NSDictionary *settings=doc[@"mosaic"];
|
||||
auto add=[&](NSString *title,NSDictionary *value,BOOL checked){NSMenuItem *item=[menu addItemWithTitle:title action:@selector(applyMosaicMenu:) keyEquivalent:@""];item.target=self;item.representedObject=value;item.state=checked?NSControlStateValueOn:NSControlStateValueOff;};
|
||||
add(@"全部人脸 · 快速逐帧识别",@{@"source":@"face",@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"face"]);
|
||||
NSDictionary *faces=[self->_renderer mosaicFaceSnapshot];
|
||||
CMTime faceTime=faces[@"time"]?CMTimeMakeFromDictionary((CFDictionaryRef)faces[@"time"]):kCMTimeInvalid;
|
||||
BOOL current=CMTIME_IS_NUMERIC(actionTime)&&CMTIME_IS_NUMERIC(faceTime)&&CMTimeCompare(faceTime,actionTime)==0&&[settings[@"source"]isEqual:@"face"]&&[settings[@"enabled"]boolValue];
|
||||
if(current&&[faces[@"boxes"]count])add([NSString stringWithFormat:@"将本帧 %lu 张人脸转为可选跟踪蒙版",(unsigned long)[faces[@"boxes"]count]],@{@"importFaces":faces,@"actionTime":[(NSDictionary*)CMTimeCopyAsDictionary(actionTime,kCFAllocatorDefault)autorelease]},NO);
|
||||
else {NSMenuItem *hint=[menu addItemWithTitle:current?@"本帧未识别到人脸":@"先开启全部人脸,暂停后再次打开以指定人脸" action:nil keyEquivalent:@""];hint.enabled=NO;}
|
||||
[menu addItem:NSMenuItem.separatorItem];
|
||||
NSMenuItem *hint=[menu addItemWithTitle:@"勾选要遮挡的蒙版(可多选);在控制面板逐个跟踪" action:nil keyEquivalent:@""];hint.enabled=NO;
|
||||
NSArray *IDs=settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[]);NSInteger count=0;
|
||||
for(NSDictionary *mask in DYSharedMasks(doc)){if(mask[@"stampSource"])continue;count++;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);NSString *shape=mask[@"label"]?:[NSString stringWithFormat:@"蒙版 %ld · %@",(long)count,@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]];
|
||||
add([shape stringByAppendingString:[mask[@"keys"]count]?@" · 已跟踪":@" · 静态"],@{@"toggleMask":mask[@"id"]},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"mask"]&&[IDs containsObject:mask[@"id"]]);
|
||||
}
|
||||
if(!count){NSMenuItem *empty=[menu addItemWithTitle:@"也可用矩形、椭圆或钢笔绘制蒙版" action:nil keyEquivalent:@""];empty.enabled=NO;}
|
||||
[menu addItem:NSMenuItem.separatorItem];
|
||||
for(NSNumber *size in @[@8,@16,@32,@64,@96,@128])add([NSString stringWithFormat:@"方块大小:%@",size],@{@"size":size},[settings[@"size"]isEqual:size]);
|
||||
[menu addItem:NSMenuItem.separatorItem];add(@"关闭局部马赛克",@{@"enabled":@NO},![settings[@"enabled"]boolValue]);
|
||||
[doc release];[menu popUpMenuPositioningItem:nil atLocation:anchor?NSMakePoint(0,NSMaxY(anchor.bounds)):NSEvent.mouseLocation inView:anchor];
|
||||
});
|
||||
}
|
||||
- (void)requestWorkspace{
|
||||
[self requestWorkspacePage:@"tools"];
|
||||
}
|
||||
|
||||
@@ -58,11 +58,12 @@
|
||||
NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array];NSMutableDictionary *numbers=[NSMutableDictionary dictionary],*titles=[NSMutableDictionary dictionary];for(NSString*ID in display){NSDictionary*node=DYToolWithID(document,ID);if(!node)continue;NSString*type=node[@"type"];NSInteger number=(numbers[type]?[numbers[type]integerValue]:(DYBaseToolRemoved(document,type)?0:1))+1;numbers[type]=@(number);titles[ID]=[NSString stringWithFormat:@"%@ %ld",DYToolSection(type)[@"title"],(long)number];}
|
||||
for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];}
|
||||
for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID];
|
||||
for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue;
|
||||
if(DYUnifiedColorState(DYReadAssets(host,_toolTime).colorManagement))ordered=[NSMutableArray arrayWithArray:DYUnifiedRenderOrder(document)];
|
||||
for(NSString*ID in [ordered reverseObjectEnumerator]){if([ID isEqual:@"output"]){[rows addObject:@{@"node":ID,@"type":@"output",@"title":@"输出转换",@"enabled":@(rootUniforms.cm.outputEnabled>.5),@"kind":@"output"}];continue;}NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue;
|
||||
NSString*title=titles[ID]?:([ID isEqual:@"base:primary"]&&[document[@"starterTool"]isEqual:@"cst"]?@"CST 色彩空间转换":DYToolSection(type)[@"title"]?:type);[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool",@"maskCount":@(DYMasksForTool(document,ID).count)}];
|
||||
for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];}
|
||||
for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=mask[@"label"]?:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];}
|
||||
}
|
||||
for(NSDictionary*mask in DYSharedMasks(document))if(!DYToolIDsForSharedMask(document,mask[@"id"]).count){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":mask[@"stampSource"]?@"◩ 仿制图章":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];}
|
||||
for(NSDictionary*mask in DYSharedMasks(document))if(!DYToolIDsForSharedMask(document,mask[@"id"]).count){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":mask[@"stampSource"]?@"◩ 仿制图章":[@"◩ " stringByAppendingString:mask[@"label"]?:[@"未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]]],@"kind":@"mask"}];}
|
||||
}@finally{[action endAction:self];}
|
||||
[_toolDocument release];_toolDocument=document;[_layerRows release];_layerRows=[rows copy];[_layerTable reloadData];
|
||||
NSString *requested=note.userInfo[@"scrollToTool"];if(requested.length){_hasUserSelection=YES;[_selectedNode release];_selectedNode=[requested copy];[_selectedMask release];_selectedMask=nil;}
|
||||
@@ -77,7 +78,7 @@
|
||||
- (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row {
|
||||
NSDictionary *item=_layerRows[row];DYWorkspaceCell *cell=[[[DYWorkspaceCell alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField *label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:11];label.textColor=[NSColor colorWithWhite:.87 alpha:1];label.lineBreakMode=NSLineBreakByTruncatingTail;[cell addSubview:label];cell.textField=label;
|
||||
NSImageView *glyph=[[[NSImageView alloc]init]autorelease];glyph.image=[NSImage imageWithSystemSymbolName:item[@"mask"]?@"circle.lefthalf.filled":DYWorkspaceSymbol(item[@"type"]) accessibilityDescription:item[@"title"]];glyph.contentTintColor=[NSColor colorWithWhite:.65 alpha:1];[cell addSubview:glyph];cell.glyph=glyph;
|
||||
if(!item[@"mask"]){NSButton *mask=DYWorkspaceButton(@"",self,@selector(editWorkspaceRowMask:));mask.bezelStyle=NSBezelStyleRegularSquare;mask.imagePosition=NSImageOnly;mask.image=[NSImage imageWithSystemSymbolName:[item[@"maskCount"]integerValue]?@"circle.lefthalf.filled":@"circle.dashed" accessibilityDescription:@"蒙版"];mask.tag=row;mask.toolTip=[item[@"maskCount"]integerValue]?@"编辑此图层蒙版":@"添加蒙版";mask.accessibilityLabel=[item[@"title"]stringByAppendingString:@"蒙版"];mask.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:mask];cell.maskButton=mask;}
|
||||
if(!item[@"mask"]&&![item[@"kind"]isEqual:@"output"]){NSButton *mask=DYWorkspaceButton(@"",self,@selector(editWorkspaceRowMask:));mask.bezelStyle=NSBezelStyleRegularSquare;mask.imagePosition=NSImageOnly;mask.image=[NSImage imageWithSystemSymbolName:[item[@"maskCount"]integerValue]?@"circle.lefthalf.filled":@"circle.dashed" accessibilityDescription:@"蒙版"];mask.tag=row;mask.toolTip=[item[@"maskCount"]integerValue]?@"编辑此图层蒙版":@"添加蒙版";mask.accessibilityLabel=[item[@"title"]stringByAppendingString:@"蒙版"];mask.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:mask];cell.maskButton=mask;}
|
||||
NSButton *eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.bezelStyle=NSBezelStyleRegularSquare;eye.focusRingType=NSFocusRingTypeNone;eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.imagePosition=NSImageOnly;eye.tag=row;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];eye.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:eye];cell.bypass=eye;[cell resizeSubviewsWithOldSize:cell.bounds.size];return cell;
|
||||
}
|
||||
- (void)editWorkspaceRowMask:(NSButton*)sender{
|
||||
@@ -89,7 +90,8 @@
|
||||
if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_editorMode=_selectedMask?1:[item[@"type"]isEqual:@"look"]?2:0;[self rebuildWorkspaceEditor];[self pageChanged:nil];
|
||||
}
|
||||
- (void)rebuildWorkspaceEditor {
|
||||
NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil;
|
||||
NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:[_selectedNode isEqual:@"output"]?@"output":nil;
|
||||
_addMask.enabled=![_selectedNode isEqual:@"output"];_deleteLayer.enabled=![_selectedNode isEqual:@"output"];
|
||||
if(_selectedMask)_editorMode=1;else if(![_editorNode isEqual:_selectedNode]||_editorMode==1)_editorMode=[type isEqual:@"look"]?2:0;
|
||||
BOOL stamp=DYSharedMaskWithID(_toolDocument,_selectedMask)[@"stampSource"]!=nil;
|
||||
_selectionTitle.stringValue=_selectedMask?(stamp?@"仿制图章 · 编辑与跟踪":@"蒙版 · 编辑与跟踪"):DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;}
|
||||
@@ -123,7 +125,7 @@
|
||||
- (void)addWorkspaceMaskKind:(NSMenuItem*)sender {[self createWorkspaceMask:sender.tag];}
|
||||
- (void)createWorkspaceMask:(NSInteger)kind {
|
||||
id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*ID=nil;
|
||||
[a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(_hasUserSelection&&node.length&&![node isEqual:@"shared"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];}
|
||||
[a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(_hasUserSelection&&node.length&&![node isEqual:@"shared"]&&![node isEqual:@"output"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];}
|
||||
if(!ID)return;[_selectedMask release];_selectedMask=ID;if(!_hasUserSelection||!_selectedNode){[_selectedNode release];_selectedNode=[@"shared" copy];}_editorMode=1;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"document":_toolDocument?:@{},@"draw":@(kind==2),@"drawShape":@(kind==0||kind==1)}];
|
||||
}
|
||||
@@ -156,7 +158,7 @@
|
||||
if(sender.tag<0||sender.tag>=_layerRows.count)return;NSDictionary*row=_layerRows[sender.tag];NSString*ID=row[@"node"];id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
|
||||
[a startAction:self];id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"启用或旁路模块与蒙版"];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);
|
||||
if(row[@"mask"]){NSMutableDictionary*mask=nil;for(NSMutableDictionary*m in DYMasksForTool(doc,ID))if([m[@"id"]isEqual:row[@"mask"]])mask=m;if(mask){mask[@"enabled"]=@(![mask[@"enabled"]boolValue]);changed=DYWriteTools(host,doc,a.currentTime);}}
|
||||
else {NSDictionary*node=DYToolWithID(doc,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];NSDictionary*section=DYWorkspaceSection(type);id<PROAPIAccessing>target=node?[[[DYToolManager alloc]initWithHost:host node:node]autorelease]:host;id<FxCustomParameterActionAPI_v4>action=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:self];@try{double value=0;[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[section[@"enabled"]unsignedIntValue]atTime:a.currentTime];double extra=0;if(section[@"extraEnabled"])[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&extra fromParameter:[section[@"extraEnabled"]unsignedIntValue]atTime:a.currentTime];value=MAX(value,extra);id<FxParameterSettingAPI_v6>set=[target apiForProtocol:@protocol(FxParameterSettingAPI_v6)];NSMutableArray*flags=[NSMutableArray array];if(section[@"enabled"])[flags addObject:section[@"enabled"]];if(section[@"extraEnabled"])[flags addObject:section[@"extraEnabled"]];[flags addObjectsFromArray:section[@"enableParameters"]?:@[]];for(NSNumber*pid in flags)changed=[set setFloatValue:value>=.5?0:1 toParameter:pid.unsignedIntValue atTime:a.currentTime]||changed;}@finally{[action endAction:self];}}
|
||||
else {NSDictionary*node=DYToolWithID(doc,ID);NSString*type=[ID isEqual:@"output"]?@"output":node?node[@"type"]:[ID substringFromIndex:5];NSDictionary*section=DYWorkspaceSection(type);id<PROAPIAccessing>target=node?[[[DYToolManager alloc]initWithHost:host node:node]autorelease]:host;id<FxCustomParameterActionAPI_v4>action=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:self];@try{double value=0;[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[section[@"enabled"]unsignedIntValue]atTime:a.currentTime];double extra=0;if(section[@"extraEnabled"])[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&extra fromParameter:[section[@"extraEnabled"]unsignedIntValue]atTime:a.currentTime];value=MAX(value,extra);id<FxParameterSettingAPI_v6>set=[target apiForProtocol:@protocol(FxParameterSettingAPI_v6)];NSMutableArray*flags=[NSMutableArray array];if(section[@"enabled"])[flags addObject:section[@"enabled"]];if(section[@"extraEnabled"])[flags addObject:section[@"extraEnabled"]];if(!([type isEqual:@"primary"]&&DYUnifiedColorState(DYReadAssets(host,a.currentTime).colorManagement)))[flags addObjectsFromArray:section[@"enableParameters"]?:@[]];for(NSNumber*pid in flags)changed=[set setFloatValue:value>=.5?0:1 toParameter:pid.unsignedIntValue atTime:a.currentTime]||changed;}@finally{[action endAction:self];}}
|
||||
}@finally{if(grouped)[undo endUndoGroup];[a endAction:self];}if(changed)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];
|
||||
}
|
||||
- (void)deleteWorkspaceSelection:(id)sender {
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.16.0</string>
|
||||
<string>1.17.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>97</string>
|
||||
<string>103</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.16.0</string>
|
||||
<string>1.17.1</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.16.0</string>
|
||||
<string>1.17.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>97</string>
|
||||
<string>103</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -4,13 +4,41 @@
|
||||
|
||||
## 当前基线
|
||||
|
||||
**1.17.1(103)已正式安装,PKG 已签名公证,Release 正在上传。** 本轮按用户要求恢复检视器折叠与内部滚动,默认只展开一级调色、基础调整、蜘蛛盘;修复手绘蒙版跨宿主时间起点写回,马赛克改用轻量人脸框检测,并接入多个人脸/蒙版选择。用户要求代码接入后自行实测,真实运动多人、遮挡和流畅度尚未验收。
|
||||
|
||||
| 项目 | 已核对状态 |
|
||||
| --- | --- |
|
||||
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`大鱼调色.xcodeproj`,`Wrapper Application` / Release。远程为 `https://dayu.media/git/dayu/dayu-color.git`,分支 `main`。1.16.0(97)实际编译节点为 `27ba2b53ca6809081269f95ca6caaddeb3933c79`。 |
|
||||
| 本机正式安装 | **1.16.0(97)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。公证、票据、Gatekeeper、唯一 PluginKit 路径及 922 项正式原生自检通过。FCP 12.4 已核对全部独立入口、CST 面板加层、水平校正与畸变共同渲染和冷重开。屏幕控件实鼠仍待复核。[交付](verification/Delivery.json) · [宿主验收](verification/HostLevel1.16.0.json) |
|
||||
| Git Release | **1.15.0(96)** 已签名公证并验包,正式包位于 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.15.0.pkg`。标签 `v1.15.0-modular-leveling-20261106` 指向 `b85165b6e2586ff86cab8fbf13ee8474fb3356a0`。Release 397/附件 41,草稿和正式链接均已完整下载校验。[发布页](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.15.0-modular-leveling-20261106) · [发布回读](verification/Release.json) · [安装包](verification/Package.json) |
|
||||
| 站点及自动更新 | 原文章 15792 的主下载已切换至 **1.14.4(95)**,正文顶部显示验签修复和重新下载安装提醒。站内附件 15865 已完整下载,内容与正式包逐字节一致。主 APP 公测通道上次回读为 **1.12.0(79)**。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.14.4.json) · [更新通道核验](verification/BetaPublication1.12.0.json) |
|
||||
| 本机开发与验收 | AppKit / Objective-C++ / FxPlug 4 / Metal,Apple Silicon,macOS 14.6+。交付记录使用 Xcode 27.1、FxPlug SDK 4.3.5 和 FCP 12.4。构建缓存为 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`,验收素材库位于其中的 `fcp-qa/大鱼调色_验收.fcpbundle`。产品交付锁为 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`,接手时重新检查。 |
|
||||
| 工程与源码 | `/Volumes/备份/大鱼调色/大鱼调色`,`Wrapper Application` / Release;远程 `https://dayu.media/git/dayu/dayu-color.git`,`main`。实际编译提交 **`3b4c612edf99c0ef2b972b7305cd7ba44244a7c6`**。 |
|
||||
| 本机正式安装 | **1.17.1(103)**,`/Library/Plug-Ins/FxPlug/大鱼调色.app`。Developer ID 签名、APP 公证 `36ecb7e6-5cfc-4b85-8363-11272d880b18` Accepted、票据、Gatekeeper、唯一 PluginKit 路径、961 项原生自检及 FCP 12.4 加载/折叠滚动/菜单验证通过。[交付](verification/Delivery.json) · [宿主范围](verification/HostInspectorMosaic1.17.1.json) |
|
||||
| Git Release | `大鱼调色-1.17.1.pkg`,46,600,407 字节,SHA-256 `5c1240d9f262c977495016cd9c19bd55cc0e374fcf9f99128e8cb2231309d710`。20 项展开验包、198 条权限检查、PKG 公证 Accepted 和票据通过;Release 上传准备中。上一版 Release 保留。 |
|
||||
| 站点及自动更新 | 本轮未操作。原文章 15792 主下载上次核对为 **1.14.4(95)**;主 APP 公测更新通道上次回读为 **1.12.0(79)**。[原文章](https://dayu.media/15792/) · [文章核验](verification/Article1.14.4.json) · [更新通道核验](verification/BetaPublication1.12.0.json) |
|
||||
| 环境与验收库 | Xcode 27.1、FxPlug SDK 4.3.5、Apple Silicon、macOS 14.6+、FCP 12.4。固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。QA 库 `fcp-qa/level-1.15.0/未命名.fcpbundle`,事件“大鱼调色1.17.0全链路与马赛克验收”。接手重新检查产品交付锁。 |
|
||||
|
||||
## 1.17.1:恢复折叠、手绘保存和指定人脸
|
||||
|
||||
- 检视器按窄宽测量默认三组与其余折叠标题,内部最大高度 3501 pt;默认无内部滚动,展开/追加超出容量才滚动。已保存的折叠状态继续读取,独立效果默认展开唯一根模块。FCP 外层仍保留首次分配的高度,内部视窗可缩短,较宽检视器末尾有预留空白;没有恢复失败的参数删除/重建方案。
|
||||
- 手绘草稿用 OSC 时钟保存几何,宿主 Action 时钟负责读取非动画文档与检查换帧。重绘时间不同不再丢掉草稿;真实输入换帧、Esc 和外部改动冲突仍取消。原生检查覆盖松手保存及安全回读;用户反馈的实鼠复位仍须在其问题素材复测。
|
||||
- 全部人脸模式改用长边 640 的 Vision 人脸框检测,独立同画面缓存,减少特征点开销。肤色保护原算法保留;本次没有同场景前后播放帧率基准,不能保证所有素材流畅。
|
||||
- 指定目标入口:开启“全部人脸 · 快速逐帧识别”→ 暂停目标画面 → 再开“局部马赛克”→“将本帧 N 张人脸转为可选跟踪蒙版”→ 勾选需要遮挡的人脸。在控制面板蒙版页逐个运行正向、反向或双向跟踪。每个框有稳定 UUID;生成后未跟踪前是静态,不是全片身份识别。矩形、椭圆和钢笔也能多选用于马赛克。
|
||||
- 961 项正式原生检查通过;双人测试使用 NASA 公有人像并排合成,取消一人后其像素变化为 0。16 个独立模板与整合模板静态检查通过。FCP 实窗看到初始三组、折叠标题、展开胶片和曲线产生内部滚动、收起后滚动条消失;本帧单人转换入口可用。[专项记录](research/InspectorMosaic1.17.1.md) · [回归](verification/InspectorMosaic1.17.1.json)
|
||||
- 编译节点独立远端恢复 714 个文件逐一校验,无 LFS/子模块;未重复第三方冷构建。原有 project.pbxproj 三处 Security 引用排序保持未提交。[恢复](verification/Recovery1.17.1.json)
|
||||
|
||||
接手第一步核对 1.17.1(103),按用户实拍反馈复测手绘松手、目标脸选择、轨迹及播放耗时;不要把原生回调测试或静态人像验证当作真实多人运动验收。下方为历史记录。
|
||||
|
||||
## 1.17.0:独立缩略图、全展开检查器、输出层与马赛克
|
||||
|
||||
- **缩略图**:`tools/build_module_previews.swift` 生成 16 套有功能名称和对应图形的缩略图,640×360 / 240×135。`tools/template_payload.py` 使用独立资源路径;MOEF 与旧版逐字节一致,整合版保留品牌图。FCP 效果浏览器实见风格 LUT、肤色、黑白、基础调整的不同图形;全部图片由 [缩略图报告](template/verification/ModulePreviews.json)、安装哈希和模板静态检查覆盖。
|
||||
- **全部展开并测高**:`DYInspector.mm` 在返回视图前同步布局,按 280 pt 窄宽和各页签最大内容测量,预留颜色设置及输出卡片需要的高度。整合版显示全部未删除模块,独立效果仍仅显示其根模块;仅改变呈现,不修改参数、启用状态或旧折叠存档。模块标题用于选择,双击仍可还原,不再折叠。FCP 外层检查器可滚动,插件内部没有纵向 ScrollView。实测冷启动顶部与底部完整、追加一层镜头畸变后输出设置仍可达、独立 HSL 完整展示;未复现 101 的整片空白。
|
||||
- **高度边界**:FCP 12.4 仍会缓存初始高度,本版采用用户选定的初次全量测高,并未修复宿主动态高度接口。较宽检查器底部可能留有页签/模式的预留空间。已实测追加一层,不能承诺任意数量新层都可无限增长;大量追加超出初始容量时,重新选择片段重新测量。其余行为和覆盖范围见 [宿主报告](verification/HostUnified1.17.0.json)。
|
||||
- **V4 全链路**:在颜色设置显式选择“全链路 · 输出转换层”,输出默认末层并可上下移动。保留 nil/V2/V3,避免静默改变旧工程;原模板 custom dataValue 也保留兼容值。`DYUnifiedRender.inc.h` 按真实节点顺序执行,统一输入/输出和当前节点工作域,一级旁路不关闭全局转换,蒙版在 AP1 线性域混合,保留负值与超白残差,曝光按场景线性处理。创意 LUT、胶片和旧有界工具仍使用明确局部参考域/增量延拓,不宣称全部旧算法都已改写成场景线性。FCP 实测输出末层、上移至镜头之前和一次撤销恢复。
|
||||
- **局部马赛克**:OSC 网格按钮与检查器同名按钮使用同一菜单和写入桥,可选逐帧人脸、任意已绘制共享蒙版及方块大小;复用现有识别和蒙版轨迹。人脸区域包含眼睛、鼻子、嘴。FCP NASA 公有人像实测人脸覆盖和矩形来源切换,冷启动保存状态正确。运动轨迹插值、无蒙版旁路、区域外像素和空间工具共存由原生检查覆盖。本轮未完成运动视频实窗跟踪,也未取得自动 OSC 鼠标点击回调,不能说这些已有人手验收。空间马赛克需保存完整预设,不能完整导出 Cube。
|
||||
- **正式交付与恢复**:APP 公证 `6143097e-7a1b-4e95-9388-434e82acf3bc`,PKG 公证 `a9bba972-0743-469f-9869-13f94e1a1a83`,均 Accepted;票据、Gatekeeper、20 项验包和 198 条载荷权限检查通过。APP 独立正式安装并完成 FCP 验收,本轮未重复运行 PKG 安装脚本。编译节点 709 个文件、发行标签 711 个文件已独立远端检出核对;没有 LFS 指针/子模块,未重复冷构建第三方依赖。[恢复](verification/Recovery1.17.0.json) · [清理](verification/Cleanup1.17.0.json)。工作区原有 `project.pbxproj` 三处 Security 引用排序未提交、未改动。
|
||||
|
||||
### 候选 98—101 的历史结果
|
||||
|
||||
98 移除内滚动后 FCP 固定初始 406 pt;99 提前布局使首次完整,但折叠留下空白;100 即时隐藏/恢复参数标志未刷新宿主;101 动态参数重建/延时标志切换仍导致空白,切换片段才恢复。因此四个候选均未发布,回滚 97 后清理;950 项原生检查和公证通过没有替代宿主验收。候选 101 编译提交 `2c2af3695b6dbe661db7adf544a60c58766a4e73`,公证 `4e9e5a94-a707-4733-b75c-846445d02ebd`;[拒收与回滚](verification/RejectedBuild101.json)、[候选宿主报告](verification/HostUnified1.17.0-candidate101.json) 和 [研究记录](research/UnifiedPipeline1.17.0.md) 保留。用户随后明确选择全展开测高,102 已删除 `inspectorHeightChanged:` 参数重建及标志切换实验,当前没有待答的浮窗方案问题。
|
||||
|
||||
接手第一步核对正式 1.17.0(102)和本段记录;若继续优化大量追加层高度或 OSC 实鼠操作,直接使用正式路径版本及既有 QA 库复核。不要恢复已拒收的参数隐藏/重建路线。
|
||||
|
||||
## 1.16.0 畸变切换修复、保留参考线与全部独立模块
|
||||
|
||||
@@ -19,7 +47,7 @@
|
||||
- 共 16 个独立 MOEF:一级调色、蜘蛛盘校色仪、基础调整、肤色保护、风格 LUT、HSL、曲线、颜色分级、三原色、色阶、黑白混色、色彩平衡、通道混合器、胶片模拟、镜头畸变修复、CST 色彩空间转换。每个保留屏幕工具、控制面板和追加模块,只发布自定界面;没有模板版权或网址发布项。CST 根模块隐藏一级调色参数并关闭根一级处理。原整合版、一级和 HSL 模板与 1.15.0 逐字节一致。
|
||||
- 新版本没有实现可移动输出转换层。现有 V3 会把一级调色和印片集中执行,部分后续算法也会裁切颜色;必须改为真实节点顺序并逐项定义工作域,才能可靠实现全栈宽色域、最后转 709。兼容和质量方案见 [分析](research/LevelingModules1.16.0.md)。
|
||||
- 922 项正式安装原生检查全部通过,16 个模板静态检查和独立远端恢复校验通过。FCP 自动指针点击没有进入 OSC 鼠标回调,故两点、拖线、参考线可见性和端点修改的实鼠验证仍待补充,不能把原生回调检查当成人手实测。接手打开独立验收库中的 `1.16.0 全独立模块`,镜头畸变片段已加载含参考线校正并设置畸变 80%;手动进入水平工具、拖线后切回畸变复核。4K→HD 的画质对照尚未实测。
|
||||
- APP 已正式安装;1.16.0 PKG 已签名公证、票据和 20 项验包通过,Release 正在完成。站点文章和主 APP 更新通道未变。
|
||||
- APP 已正式安装;1.16.0 PKG 已签名公证、票据和 20 项验包通过。Release 398/附件 42 已发布,发布前后两次完整下载校验通过。编译节点 657 个文件、发行标签 660 个文件独立远端检出一致。已清理构建 APP、公证 ZIP、旧替换备份、验包暂存、恢复 clone 和浏览器下载副本。[恢复](verification/Recovery1.16.0.json) · [清理](verification/Cleanup1.16.0.json)。站点文章仍为 1.14.4,主 APP 更新通道仍为上次核对的 1.12.0。
|
||||
|
||||
## 1.15.0 深色默认、独立效果与水平校正
|
||||
|
||||
|
||||