比较提交

..
共修改 42 个文件,包含 831 行新增和 161 行删除

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

+20
查看文件
@@ -0,0 +1,20 @@
{
"status": "publish",
"title": "大鱼调色 1.12.0 公测版|统一调色工作区与共享蒙版",
"content": "<!-- wp:paragraph -->\n<p>大鱼调色 1.12.0 公测版适用于 Final Cut Pro 与 Motion。这个版本把图层、调色参数、LUT 浏览和示波器放到同一个可调整大小的控制面板里。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">1.12.0 公测更新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>统一调色工作区</strong>。从画布右下角或检视器点击“控制面板”。左侧管理图层,中间调节选中的模块,右侧同时显示亮度波形、RGB 分列、直方图和带肤色参考线的矢量图。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>画布工具与共享蒙版</strong>。左下角可直接绘制矩形、椭圆和钢笔蒙版,也能打开曲线、畸变、肤色范围或 LUT。一个蒙版可同时作用于 HSL、蜘蛛盘等多个图层。点击图层上的蒙版图标即可编辑形状或运行跟踪。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>最近使用 LUT</strong>。风格 LUT 参数下方显示最近使用的缩略图,点击即可应用到当前图层。浏览库按窗口宽度自动换行,保留文件夹和画面预览。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>编辑与加载</strong>。改善切换片段、重新打开检视器及停在片尾时的加载,修正钢笔闭合和画布曲线调整的保存问题。已在本机 Final Cut Pro 验证。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">在时间线里完成调色</h2>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p><strong>色彩管理与基础调整</strong>:支持 CST 输入、工作空间和输出转换,并提供曝光、白平衡、曲线、HSL、色轮及蜘蛛盘等调节工具。首次使用时,请在一级调色中选择与素材相符的输入曲线和色域。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>LUT 与风格管理</strong>:通过缩略图浏览、收藏和预览管理常用 LUT,支持自选 LUT 文件与文件夹。完整预设用于保存组合调节;适合静态颜色变换的处理可导出 Cube LUT,颗粒、晕光、蒙版等时间或空间效果不属于静态 LUT 的保存范围。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>胶片模拟与印片外观</strong>:包含减色、颗粒、晕光、辉光、暗角及通道混合器,提供 Kodak 2383、Fuji 3513 等八种印片外观,可独立调整强度。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>局部蒙版与工具叠层</strong>:可针对单独工具添加蒙版、建立相邻叠层,并使用关键帧与跟踪处理局部区域,方便细调画面的不同部分。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:heading -->\n<h2 class=\"wp-block-heading\">历史更新</h2>\n<!-- /wp:heading -->\n\n<!-- wp:heading {\"level\":3} -->\n<h3 class=\"wp-block-heading\">1.10.0 画布工具与独立工作区</h3>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>下方为 1.10.0 的深色与浅色界面记录。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":15840,\"sizeSlug\":\"full\",\"linkDestination\":\"none\"} -->\n<figure class=\"wp-block-image size-full\"><img src=\"https://dayu.media/wp-content/uploads/2026/11/1793804584-5bc2fbe021e0e8f.png\" alt=\"大鱼调色 1.10.0 深色模式:画布左侧纵向工具条、检查器与画布外示波器工作区\" class=\"wp-image-15840\" width=\"1628\" height=\"1258\" /><figcaption class=\"wp-element-caption\">大鱼调色 1.10.0 深色模式:纵向画布工具与独立示波器工作区</figcaption></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":15841,\"sizeSlug\":\"full\",\"linkDestination\":\"none\"} -->\n<figure class=\"wp-block-image size-full\"><img src=\"https://dayu.media/wp-content/uploads/2026/11/1793804588-7ea8d6f6f860d66.png\" alt=\"大鱼调色 1.10.0 浅色模式:浅色纵向工具条、调色检查器与画布外直方图工作区\" class=\"wp-image-15841\" width=\"1664\" height=\"1068\" /><figcaption class=\"wp-element-caption\">大鱼调色 1.10.0 浅色模式:纵向画布工具与独立示波器工作区</figcaption></figure>\n<!-- /wp:image -->\n\n\n<!-- wp:heading {\"level\":3} -->\n<h3 class=\"wp-block-heading\">1.7.4:删除模块与图层</h3>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph -->\n<p>每个模块和新增图层的标题增加减号按钮,可删除不需要的层并让它从界面消失。删除时一并还原该模块的参数、清除关键帧及所属 LUT、蒙版等设置,避免隐藏后仍影响画面;其他模块保持原设置。误删可通过 Final Cut Pro 的一次撤销恢复。</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>顶部“添加模块”菜单可重新添加任意模块,新层从初始参数开始,不继承已删除层的设置。原有“再加一层”继续保留,删除状态随工程和完整预设保存。Line truncated
"excerpt": "统一调色工作区、共享蒙版、最近使用 LUT 与四宫格示波器。大鱼调色 1.12.0 公测版完整安装包已签名公证,站内有效会员免费。",
"seo": {
"title": {
"enabled": true,
"value": "大鱼调色 1.12.0 公测版|统一调色工作区与共享蒙版"
},
"description": {
"enabled": true,
"value": "大鱼调色 1.12.0 是适用于 Final Cut Pro 与 Motion 的原生调色插件。新版控制面板集中管理图层、共享蒙版、最近使用 LUT 和四宫格示波器,画布工具移至左下角。适用于 Apple Silicon 和 macOS 14.6 及以上,完整安装包已签名公证。"
},
"keywords": {
"enabled": true,
"value": "大鱼调色,Final Cut Pro,调色插件,FxPlug4,统一工作区,共享蒙版,LUT,示波器"
}
}
}
+12
查看文件
@@ -0,0 +1,12 @@
{
"article_id": 15792,
"article_url": "https://dayu.media/15792/",
"request_id": "dayu-color-1120-build79-article-20261105",
"cover_source": "template/large.png",
"cover_sha256": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"update_baseline_sha256": "30c92debf91de7ab8215b35dc64a4ddb764e53450c327ae53fb41a4c2f7a26c0",
"compiled_source": "beccf2fc01f8dc06c5d3d505f88289885d209bc8",
"release_tag": "v1.12.0-unified-workspace-20261105",
"package_bytes": 45329742,
"package_sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe"
}
+13
查看文件
@@ -0,0 +1,13 @@
{
"bundle_id": "com.dayu.color",
"channel": "beta",
"version": "1.12.0",
"build": 79,
"package_type": "pkg",
"install_mode": "pkg_installer",
"size": 45329742,
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"download_url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-12-0-79.pkg",
"minimum_system_version": "14.6",
"notes": "1.12.0 公测版加入统一调色工作区、共享蒙版、最近使用 LUT 和四宫格示波器。画布工具移至左下角,改善检视器重开与片尾示波器加载。请保存项目并退出 Final Cut Pro 和 Motion 后安装。"
}
+22 -4
查看文件
@@ -1,12 +1,30 @@
# 2026-11-05 统一工作区与共享蒙版:1.12.0(74)
# 2026-11-05 检视器与画布控件 1.12.1(81)
当前版本正在正式候选验收,不能按下方历史版本状态判断已完成交付。实际编译SHA、公证ID、正式路径和待清理恢复APP见verification/Delivery.json;宿主、PKG、Release、远程恢复分别记录本轮验证,未完成项需如实保留。
正式 APP 位于 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主 ID `com.dayu.color`,服务 ID `com.dayu.color.XPC`。实际编译源码为 `43320c7ccdfc6738ba3c380888bb7f3ea75ebb87`,已推送至 `https://dayu.media/git/dayu/dayu-color.git` 的 main。恢复编译时检出该提交,沿用下节的 Xcode 27.1、FxPlug SDK 4.3.5、Release 和锁定依赖流程。正式签名及公证凭据独立恢复。
源码远程https://dayu.media/git/dayu/dayu-color.git,main;唯一正式位置`/Library/Plug-Ins/FxPlug/大鱼调色.app`。技术与构建要求沿用下文:Xcode27.1、FxPlug SDK4.3.5、Apple Silicon、Release,Team B3W25FX5H5。签名私钥/公证登录需独立恢复,Git不含密钥。
APP 公证 `8a070adc-a38c-44df-a8b6-ee36198a0cbc` Accepted,签名、票据、唯一 PluginKit 路径及 844 项正式原生检查通过。FCP 12.4 冷重开后检视器顶部完整显示,曲线读取 57,600 个输出样本,已有色温及调色状态可读。80 版的检视器裁切在 81 版修正,画布曲线与直方图的实鼠反馈见验收记录。白平衡吸管复用基础调整的求解和宿主写入,系统取样交互的实机覆盖范围见 [宿主记录](verification/HostCanvasInspector1.12.1.json)。
保存弹窗在内置 APFS 验收库未复现。故障排查以素材库卷、库数据库和特定插件写入三个方向分别核对,见 [保存告警排查](research/FinalCutSaveFailure-20261105.md)。
正式 PKG `../发行包/大鱼调色-1.12.1.pkg` 为 45,337,206 字节,SHA-256 `ae65ac0dcaf7cead701b8ac543ee60ae62e55fd9e19646877d5ef9d9d7351b6f`。Installer 签名、公证 `ffefbde6-10f2-40e3-a8c4-ef4123053c74` Accepted、票据及 20 项展开验包通过。发行标签为 `v1.12.1-canvas-inspector-20261105`,安装包与发布附件的核验分别见 [Package.json](verification/Package.json) 和 [Release.json](verification/Release.json)。
# 2026-11-05 统一工作区与共享蒙版:1.12.0(79)
当前唯一正式安装为1.12.0(79),实际编译源码 `beccf2fc01f8dc06c5d3d505f88289885d209bc8`,APP公证 `f66d9934-b015-49d1-bada-717d7399e673` Accepted,票据、Gatekeeper、唯一PluginKit路径、834项正式原生检查和FCP反馈验收通过。实际记录为verification/Delivery.json、HostFeedback78.json和HostFeedback79.json。
正式PKG `../发行包/大鱼调色-1.12.0.pkg`,45,329,742字节,SHA-256 `d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe`。Installer签名、公证 `e57b2649-ca38-46df-afed-c50442bf6227` Accepted、票据、Gatekeeper和20项展开验包通过。本轮未重复执行系统PKG安装,APP已有独立正式安装验收。
源码远程https://dayu.media/git/dayu/dayu-color.git,main;发行标签 `v1.12.0-unified-workspace-20261105` 指向含正式Package.json的 `b72e6b31724def5c174b692ef0a46b76992e780b`。恢复精确编译输入可克隆后 `git switch --detach beccf2fc01f8dc06c5d3d505f88289885d209bc8`;发行标签保留验包及发布说明,后续main保留最终Release下载与清理记录。唯一正式位置`/Library/Plug-Ins/FxPlug/大鱼调色.app`。构建要求:Xcode27.1、FxPlug SDK4.3.5、Apple Silicon、Release,Team B3W25FX5H5。签名私钥/公证登录需独立恢复,Git不含密钥。
新增OpenCV4.5.1官方源码锁在ThirdParty/OpenCV/source-lock.json,构建脚本tools/build_tracking_opencv.py会校验下载并静态编译必要模块,缓存和link.rsp在固定产品缓存tracking-opencv;完整许可随APP资源复制。恢复不需要安装ColorFinale或商业跟踪库,研究缓存和原版二进制不是构建依赖。已有色彩管理依赖锁和源包仍保留,Uniform1344字节、预设v7和旧工具schema2兼容。
共享工具文档schema3是编辑权威源,渲染展开副本不得写回。新宿主验收辅助资料由tools/create_workspace_host_fixture.py重建。窗口和实际交互边界、代码入口、跟踪证据/缺口见自定控件开发交接.md和research/UnifiedWorkspace-20261105.md。恢复后仍按Release签名、公证、票据、唯一正式安装、真实宿主验收和Release附件完整下载交付。
共享工具文档schema3是编辑权威源,渲染展开副本不得写回。新宿主验收辅助资料由tools/create_workspace_host_fixture.py重建。最近LUT快捷区、左下画布栏、HSL/蜘蛛盘排版、肤色线及片尾时间修复见research/WorkspaceFeedback-20261105.md。真实CF与大鱼共同99帧最大位置差约0.008源像素、角度差约0.015度;原版导出缺最后一帧,完整100帧报告保留缺失,不宣称任意素材或分组/插值完全等价,详见HostTracking78两份报告及ColorFinaleTrackSemantics78.json。FCP项目和媒体留在本机,没有上传为软件源码备份。工作区仍为宿主托管浮窗,公开FxPlug接口没有原生FCP停靠入口。独立远程检出596个编译节点跟踪文件逐字节一致,未宣称全部依赖冷构建。恢复后仍按Release签名、公证、票据、唯一正式安装、真实宿主验收和Release附件完整下载交付。
Release389/附件33已发布,保留原有公开仓库和公测标记;草稿浏览器真实下载及发布后API再次完整下载均为45,329,742字节,SHA-256与正式PKG一致。发布页:https://dayu.media/git/dayu/dayu-color/releases/tag/v1.12.0-unified-workspace-20261105 。本轮5个已确认生成的旧APP恢复副本、临时下载和独立恢复检出已清理;唯一正式APP与当前发行包保留,历史用户发行包不清理。详见Release.json、UnifiedWorkspaceFinalRecovery79.json与UnifiedWorkspaceCleanup79.json。
2026-11-05 已更新原站点文章 15792 的 1.12.0 说明、特色封面和主下载包。原有售价、会员免费设置及历史界面图均已回读。文章资源和公测更新通道的完整下载均为 45,329,742 字节,SHA-256 与正式 PKG 一致。正文和清单的可复用输入见 `Publishing/1.12.0/`,前台和资源核验见 [Article1.12.0.json](verification/Article1.12.0.json)。
主 APP 公测通道已从 1.7.0(45)更新到 1.12.0(79)。旧版本可收到提示,79 及以上不重复提示。现有更新器已实测从线上检查、下载、校验到可安装状态。NAS 同步了更新目录中的 `dayu-color-1-12-0-79.pkg` 与 `beta.json`,旧包及同目录的 `beta-202611051601.jsonbak` 保留,备份与旧清单逐字节一致。详细部署路径、摘要和线上回读见 [BetaPublication1.12.0.json](verification/BetaPublication1.12.0.json)。
以下为历史恢复记录,以本节及当前验证报告为准。
+15
查看文件
@@ -0,0 +1,15 @@
# Final Cut Pro 保存告警排查
用户截图显示 Final Cut Pro 检测到阻止更改保存的错误。当前线索包括弹窗文字。触发操作、软件版本、素材库卷和宿主日志待反馈。
| 排查方向 | 可用于区分的证据 |
| --- | --- |
| 素材库所在卷无法写入 | 记录实际素材库位置、剩余空间、磁盘格式、写权限和当时的断连情况。宿主日志中的空间不足、只读、权限或 I/O 错误可缩小范围。外置卷使用 APFS 是 Apple 的建议。 |
| 单个素材库或工程异常 | 保留原素材库与自动备份,在内置 APFS 的新测试库里复制或重建同一小段,比较同一操作是否只在原库触发。若原库连普通剪辑也无法保存,优先检查素材库与其备份。 |
| 插件参数写入触发 | 在本机测试库对同一段片分别做普通剪辑、大鱼调色参数修改、撤销、关闭和重开。若只有特定插件操作触发,记录操作、时间与版本,核对 FxPlug 的参数写入拒绝或序列化错误。 |
大鱼调色通过 FxPlug 的自定义参数接口保存图层、蒙版和跟踪数据,素材库由 Final Cut Pro 写入。共享蒙版和跟踪的文档写入会先校验结构、数值和大小。此次在独立图层提交处增加本机日志 `dayu_tool_save_rejected`,只记录被拒绝的参数类别,并确保宿主动作能收尾。该日志与 Final Cut Pro 的素材库保存结果分别核对。
本机独立验收库位于内置 APFS。初查本机 30 分钟日志未发现匹配的素材库保存错误。第三方反馈的具体根因仍待复现或日志确认。
如反馈者已经遇到提示,先按提示正常退出,保留原素材库和自动备份,再用独立测试库复现。Final Cut Pro 的自动备份主要保存数据库,恢复时还需要原媒体。[Apple 的项目保存与备份说明](https://support.apple.com/en-nz/guide/final-cut-pro/ver79aa3d71/mac) · [外置存储格式说明](https://support.apple.com/en-us/102116)
+78
查看文件
@@ -0,0 +1,78 @@
{
"passResult": true,
"articleID": 15792,
"url": "https://dayu.media/15792/",
"status": "publish",
"title": "大鱼调色 1.12.0 公测版|统一调色工作区与共享蒙版",
"requestID": "dayu-color-1120-build79-article-20261105",
"changedResourceFields": [
"cao_downurl",
"cao_original_filename"
],
"commercialAndVideoFieldsPreserved": true,
"authorCategoriesTagsPreserved": true,
"fcpxSettingsPreserved": true,
"seo": {
"title": {
"enabled": true,
"value": "大鱼调色 1.12.0 公测版|统一调色工作区与共享蒙版"
},
"description": {
"enabled": true,
"value": "大鱼调色 1.12.0 是适用于 Final Cut Pro 与 Motion 的原生调色插件。新版控制面板集中管理图层、共享蒙版、最近使用 LUT 和四宫格示波器,画布工具移至左下角。适用于 Apple Silicon 和 macOS 14.6 及以上,完整安装包已签名公证。"
},
"keywords": {
"enabled": true,
"value": "大鱼调色,Final Cut Pro,调色插件,FxPlug4,统一工作区,共享蒙版,LUT,示波器"
}
},
"frontendChecks": [
{
"url": "https://dayu.media/15792/",
"titleAndSEOExact": true,
"updateNotesPresent": true,
"historicalScreenshotsInOrder": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"featuredCoverVerified": true,
"paidPackageURLAbsentFromHTML": true
},
{
"url": "https://dayu.media/15792/?release-check=1.12.0-79",
"titleAndSEOExact": true,
"updateNotesPresent": true,
"historicalScreenshotsInOrder": true,
"priceYuan": 50,
"memberPriceYuan": 0,
"featuredCoverVerified": true,
"paidPackageURLAbsentFromHTML": true
}
],
"featuredMedia": {
"id": 15854,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793865756-f106faae77b9559.png",
"source": "template/large.png",
"http": 200,
"bytes": 261628,
"sha256": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a"
},
"historicalBodyImages": [
{
"id": 15840,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793804584-5bc2fbe021e0e8f.png"
},
{
"id": 15841,
"url": "https://dayu.media/wp-content/uploads/2026/11/1793804588-7ea8d6f6f860d66.png"
}
],
"package": {
"version": "1.12.0",
"build": 79,
"downloadVerified": true,
"http": 200,
"bytes": 45329742,
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe"
},
"rawPrivateResponses": "Local build cache only"
}
+78
查看文件
@@ -0,0 +1,78 @@
{
"version": "1.12.0",
"build": 79,
"date": "2026-11-05T16:01:49.958647+08:00",
"localProject": "/Users/mac/Downloads/dayumedia/dayu-color-beta",
"nasRoot": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media",
"paths": [
"wp-content/uploads/dayu-color-beta/updates/dayu-color-1-12-0-79.pkg",
"wp-content/uploads/dayu-color-beta/updates/beta.json"
],
"package": {
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-12-0-79.pkg",
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"backup": null,
"size": 45329742
},
"manifest": {
"path": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta.json",
"sha256": "82b65c0f73cb03eec6be645d7a8be548eed050170e7883375c2f46db9673f323",
"backup": "/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media/wp-content/uploads/dayu-color-beta/updates/beta-202611051601.jsonbak",
"size": 656
},
"baseline_sha256": "30c92debf91de7ab8215b35dc64a4ddb764e53450c327ae53fb41a4c2f7a26c0",
"production_manifest_mode": "0o700",
"pre_activation_download": {
"http": 200,
"bytes": 45329742,
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"url": "https://dayu.media/wp-content/uploads/dayu-color-beta/updates/dayu-color-1-12-0-79.pkg"
},
"previousVersion": "1.7.0",
"previousBuild": 45,
"previousPackageRetainedAndVerified": true,
"manifestMatchesRepositoryAndLocalMirror": true,
"backupByteIdenticalToBaseline": true,
"backendCodeUnchanged": true,
"liveAPI": [
{
"currentBuild": 45,
"offered": true,
"feedBuild": 79
},
{
"currentBuild": 73,
"offered": true,
"feedBuild": 79
},
{
"currentBuild": 78,
"offered": true,
"feedBuild": 79
},
{
"currentBuild": 79,
"offered": false,
"feedBuild": 79
},
{
"currentBuild": 80,
"offered": false,
"feedBuild": 79
}
],
"nativeUpdater": {
"passed": true,
"source": "production HTTPS beta endpoint and download",
"phases": [
"checking",
"available",
"downloading",
"validating",
"ready"
],
"installation_performed": false
},
"installedAppBuild": 79,
"temporaryVerificationCopiesCleaned": true
}
+11 -10
查看文件
@@ -1,12 +1,13 @@
{
"status": "published-download-verified",
"releaseID": 388,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.11.0-canvas-spatial-20261105",
"tag": "v1.11.0-canvas-spatial-20261105",
"commit": "5f8fb13fceb0c4d4ead447b8b5694ce269e95749",
"assetID": 32,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.11.0-canvas-spatial-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.11.0.pkg",
"bytes": 43128845,
"sha256": "2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e",
"releaseVerification": "verification/Release.json"
"status": "resolved-published-and-download-verified",
"releaseID": 389,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.12.0-unified-workspace-20261105",
"tag": "v1.12.0-unified-workspace-20261105",
"commit": "b72e6b31724def5c174b692ef0a46b76992e780b",
"assetID": 33,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.12.0-unified-workspace-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.12.0.pkg",
"bytes": 45329742,
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"resolvedBy": "verification/Release.json",
"draftBrowserCopyRemovedAfterVerification": true
}
+5 -5
查看文件
@@ -2,15 +2,15 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.12.0",
"build": "79",
"version": "1.12.1",
"build": "81",
"team": "B3W25FX5H5",
"notaryID": "f66d9934-b015-49d1-bada-717d7399e673",
"notaryID": "8a070adc-a38c-44df-a8b6-ee36198a0cbc",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "beccf2fc01f8dc06c5d3d505f88289885d209bc8",
"sourceCommit": "43320c7ccdfc6738ba3c380888bb7f3ea75ebb87",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"shaderSHA256": "7d05797e5e68ec8c23886c74d37a32826843c541e13a3f35424c1903e28bff56",
"hostVerification": "verification/HostFeedback79.json"
"hostVerification": "verification/HostCanvasInspector1.12.1.json"
}
@@ -0,0 +1,20 @@
{
"status": "passed",
"version": "1.12.1",
"build": "81",
"compiledSource": "43320c7ccdfc6738ba3c380888bb7f3ea75ebb87",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"host": "Final Cut Pro 12.4, isolated APFS QA library",
"hostPID": 21214,
"actualServicePID": 21237,
"nativeChecks": 844,
"observations": {
"build80UserFeedback": "User confirmed canvas curve interaction and real-time canvas histogram. Reported inspector histogram stalling and clipped top.",
"build81Inspector": "Cold reopened after normal quit. Full title, theme controls, preset actions and add-module control were visible at top with base and curve cards expanded. Only the parameter list occupied the internal scroll area.",
"build81Histogram": "Real inspector reported 57600 output samples after reopen. The same-time output change and the actual view refresh passed native tests with real Metal readback.",
"saveRoundTrip": "Existing edited test project reopened with the expanded groups, colour grade and visible temperature value 26. No library-save alert during the test.",
"whiteBalance": "Native canvas-button dispatch, time-change protection, solver result, host parameter writes and single undo group verified. System eyedropper selection was not independently confirmed in live host.",
"cleanup": "Both generated older app backups were cleaned after build 81 host verification. Historic release packages were retained."
},
"saveReport": "research/FinalCutSaveFailure-20261105.md"
}
+58 -18
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 834,
"checks": 844,
"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/C5C4EE81-DAE8-446A-9235-F9655D0EDC62"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2"
},
{
"descriptors": 285,
@@ -898,7 +898,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C5C4EE81-DAE8-446A-9235-F9655D0EDC62/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -918,7 +918,7 @@
},
{
"heartbeats": 0,
"maximumGapMS": 62.29583334061317,
"maximumGapMS": 74.71933332271874,
"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/C5C4EE81-DAE8-446A-9235-F9655D0EDC62/workspace-topbar.png",
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2/workspace-topbar.png",
"toolbarPixels": 3557
},
{
@@ -1452,7 +1452,7 @@
},
{
"name": "workspace-independent-style-fixture-inserted",
"node": "DEDA868A-8DF1-478E-9C3D-B9F3BCEC7754",
"node": "02DF4028-91F1-4670-8E46-BE0625FEC949",
"pass": true,
"validDocument": true
},
@@ -1461,10 +1461,10 @@
"error": "none",
"name": "workspace-independent-style1-writes-target-node-inside-undo",
"nodePaths": {
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C5C4EE81-DAE8-446A-9235-F9655D0EDC62/node.cube"
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2/node.cube"
},
"pass": true,
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C5C4EE81-DAE8-446A-9235-F9655D0EDC62/user-new.cube",
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2/user-new.cube",
"undoStartsAfter": 3,
"undoStartsBefore": 2,
"written": true
@@ -2747,7 +2747,7 @@
"pass": true
},
{
"coveredPixels": 13216,
"coveredPixels": 14182,
"name": "native-osc-real-metal-overlay-transparent-around-controls",
"pass": true
},
@@ -2781,6 +2781,14 @@
"name": "native-osc-keeps-only-two-pen-actions-bounded-at-bottom",
"pass": true
},
{
"name": "canvas-white-balance-cannot-write-after-the-playhead-moves",
"pass": true
},
{
"name": "canvas-white-balance-uses-existing-solver-and-one-undo",
"pass": true
},
{
"name": "native-osc-new-shape-can-start-anywhere-and-hides-default-box",
"pass": true
@@ -2813,6 +2821,10 @@
"name": "native-osc-ellipse-draws-reverse-direction-with-positive-shared-extents",
"pass": true
},
{
"name": "canvas-curve-histogram-updates-from-final-output-at-the-same-playhead",
"pass": true
},
{
"name": "inspector-add-pen-enters-empty-drawing-mode",
"pass": true
@@ -3746,6 +3758,14 @@
"name": "compact-color-settings-button-expands-panel",
"pass": true
},
{
"name": "inspector-preferred-height-follows-content-with-a-scroll-cap",
"pass": true
},
{
"name": "inspector-hosted-slot-keeps-header-visible-and-scrolls-only-overflow",
"pass": true
},
{
"name": "compact-color-settings-repeated-toggle-does-not-edit-grade",
"pass": true
@@ -3838,7 +3858,7 @@
"pass": true
},
{
"name": "histogram-new-inspector-uses-renderer-cached-snapshot",
"name": "histogram-open-inspector-uses-cached-effect-output",
"pass": true
},
{
@@ -3850,7 +3870,11 @@
"pass": true
},
{
"name": "histogram-invalidation-clears-view-and-renderer",
"name": "histogram-keeps-final-output-while-a-new-render-is-pending",
"pass": true
},
{
"name": "histogram-open-inspector-refreshes-after-a-new-output-at-the-same-time",
"pass": true
},
{
@@ -3994,7 +4018,7 @@
"pass": true
},
{
"name": "viewer-lower-left-rail-has-only-four-image-tools-and-three-persistent-mask-shapes",
"name": "viewer-lower-right-rail-has-five-image-tools-and-three-persistent-mask-shapes",
"pass": true
},
{
@@ -4013,6 +4037,14 @@
"name": "viewer-persistent-mask-entries-route-shapes-to-shared-workspace",
"pass": true
},
{
"name": "viewer-white-balance-icon-routes-a-single-time-bound-pick",
"pass": true
},
{
"name": "viewer-distortion-entry-uses-pincushion-grid",
"pass": true
},
{
"name": "viewer-skin-entry-toggles-actual-protection-preview-without-parameter-card",
"pass": true
@@ -4025,10 +4057,22 @@
"name": "viewer-curve-is-graph-only-without-title-catalog-or-parameter-page",
"pass": true
},
{
"name": "viewer-curve-opens-above-the-lower-right-controls",
"pass": true
},
{
"name": "viewer-curve-grip-moves-both-axes-without-a-grade-or-undo",
"pass": true
},
{
"name": "viewer-curve-point-is-live-xy-not-a-scalar-only-control",
"pass": true
},
{
"name": "viewer-curve-release-never-exposes-the-stale-plot-before-or-after-write",
"pass": true
},
{
"name": "viewer-curve-final-release-commits-both-axes-with-one-undo",
"pass": true
@@ -4096,7 +4140,7 @@
{
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C5C4EE81-DAE8-446A-9235-F9655D0EDC62/viewer-workspace.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2/viewer-workspace.png"
},
{
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
@@ -4118,10 +4162,6 @@
"name": "canvas-spider-external-topology-change-wins",
"pass": true
},
{
"name": "canvas-histogram-is-frozen-to-matching-frame",
"pass": true
},
{
"error": "",
"name": "lens-neutral-production-render",
@@ -4237,6 +4277,6 @@
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C5C4EE81-DAE8-446A-9235-F9655D0EDC62",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4CFD9CD2-4D6C-48E1-B497-34BFE79CC4F2",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
+14 -14
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.12.0.pkg",
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"bytes": 45329742,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.12.1.pkg",
"sha256": "ae65ac0dcaf7cead701b8ac543ee60ae62e55fd9e19646877d5ef9d9d7351b6f",
"bytes": 45337206,
"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.12.0",
"build": "79"
"version": "1.12.1",
"build": "81"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.fce6a551-4990-4102-b290-e6511f4a7fa2/37C920B8-34AA-4766-A277-8285B88499A0/大鱼调色"
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.a3191f75-292a-4884-ace5-bdf0cce7e6e1/56195A87-1454-4E1A-B1FC-7F3E323F8B99/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.12.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-05 04:38:21 +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.12.0.pkg: accepted\nsource=Notarized Developer ID",
"signature": "Package \"大鱼调色-1.12.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-05 10:13:24 +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.12.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.12.0.pkg",
"createdDate": "2026-11-05T10:13:26.454Z",
"name": "大鱼调色-1.12.1.pkg",
"id": "ffefbde6-10f2-40e3-a8c4-ef4123053c74",
"message": "Successfully received submission info",
"createdDate": "2026-11-05T04:38:23.194Z",
"id": "e57b2649-ca38-46df-afed-c50442bf6227",
"status": "Accepted"
},
"appCompiledSource": "beccf2fc01f8dc06c5d3d505f88289885d209bc8",
"appBuild": "79",
"appCompiledSource": "43320c7ccdfc6738ba3c380888bb7f3ea75ebb87",
"appBuild": "81",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
@@ -59,6 +59,6 @@
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostFeedback79.json",
"installedAppHostAcceptance": "verification/HostCanvasInspector1.12.1.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+13 -14
查看文件
@@ -3,24 +3,23 @@
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.11.0-canvas-spatial-20261105",
"releaseCommit": "5f8fb13fceb0c4d4ead447b8b5694ce269e95749",
"releaseID": 388,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.11.0-canvas-spatial-20261105",
"tag": "v1.12.0-unified-workspace-20261105",
"releaseCommit": "b72e6b31724def5c174b692ef0a46b76992e780b",
"releaseID": 389,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.12.0-unified-workspace-20261105",
"prerelease": true,
"assetID": 32,
"assetName": "大鱼调色-1.11.0.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.11.0-canvas-spatial-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.11.0.pkg",
"bytes": 43128845,
"sha256": "2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e",
"assetID": 33,
"assetName": "大鱼调色-1.12.0.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.12.0-unified-workspace-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.12.0.pkg",
"bytes": 45329742,
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"existingAssetReused": true,
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
"credentialSource": "macOS Keychain: dayu-git-api",
"draftBrowserDownload": {
"path": "/Volumes/备份/大鱼调色-1.11.0.pkg",
"sha256": "2dd5166902ebdaae50dd897057459cbe7e5ea611dbdeb571bd688e843c59768e",
"bytes": 43128845,
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.11.0-canvas-spatial-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.11.0.pkg",
"removedAfterVerification": true
"path": "/Users/mac/Downloads/大鱼调色-1.12.0.pkg",
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe",
"bytes": 45329742,
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.12.0-unified-workspace-20261105/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.12.0.pkg"
}
}
@@ -0,0 +1,54 @@
{
"pass_": true,
"version": "1.12.0",
"build": "79",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"retainedPackage": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.12.0.pkg",
"removed": [
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-4717c30742ce4299b4796e06a9097579.app",
"build": "76",
"creationHistory": "8bbd386abb8fe5429715bdac0eeebf6792d87dba"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-80dd0728de5d4b8ea651d4de529c4583.app",
"build": "74",
"creationHistory": "411900b928b362f54fa55281af58ecd70a7c0df7"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-94ced90dbe78482dac41fc8eedc6e972.app",
"build": "73",
"creationHistory": "2d162a8fc5872d501044b09073b4bcb461af813c"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-8147ad025755463e97ed0b794bdf80da.app",
"build": "75",
"creationHistory": "dad77aff77e58c554bd40740ef971e2f41719464"
},
{
"path": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-6b3a3828ed464ca5835d97e6593f61e5.app",
"build": "74",
"creationHistory": "331e3ff3158c68a41411feb0b934ce2c5b5b59d1"
},
{
"path": "/Users/mac/Downloads/大鱼调色-1.12.0.pkg",
"kind": "actual browser verification download",
"sha256": "d4b557fec283f5e06f605bc6b1d99a0c8649f9d65e405eba452f525e8454cdfe"
},
{
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/workspace-recovery-1.12.0-nv52vsyz",
"kind": "verified temporary remote recovery checkout"
}
],
"registry": " com.dayu.color.XPC(1.1)\t393ABE88-5D81-45AE-B3DE-EECDDF53DA21\t2026-11-05 04:31:09 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)\n",
"scanRoots": [
"/Volumes/备份/大鱼调色",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color",
"/Users/mac/Desktop",
"/Users/mac/Downloads",
"/Applications",
"/Library/Plug-Ins/FxPlug",
"/Users/mac/Library/Plug-Ins/FxPlug"
],
"scope": "Only this product identified by bundleID, signing team and recorded creation history; no whole-disk uniqueness claim. Historical user distribution packages preserved."
}
@@ -0,0 +1,23 @@
{
"pass_": true,
"releaseTag": "v1.12.0-unified-workspace-20261105",
"releaseCommit": "b72e6b31724def5c174b692ef0a46b76992e780b",
"compiledSource": "beccf2fc01f8dc06c5d3d505f88289885d209bc8",
"trackedFiles": 598,
"fsck": "strict passed",
"byteMismatches": 0,
"compiledProductInputsUnchanged": true,
"documentationAndVerificationChanges": [
"Packaging/Release-1.12.0.md",
"research/WorkspaceFeedback-20261105.md",
"verification/CompiledSourceRecovery79.json",
"verification/Delivery.json",
"verification/HostFeedback79.json",
"verification/InstalledSelfTest.json",
"verification/Package.json",
"verification/WorkspaceUIRevision1.12.0.json",
"\"\\350\\207\\252\\345\\256\\232\\346\\216\\247\\344\\273\\266\\345\\274\\200\\345\\217\\221\\344\\272\\244\\346\\216\\245.md\""
],
"scope": "Independent remote tag checkout and exact tracked bytes verified. Dependencies were not rebuilt from a cold cache.",
"temporaryClone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/workspace-recovery-1.12.0-nv52vsyz"
}
+6 -5
查看文件
@@ -1,6 +1,6 @@
{
"date": "2026-11-05T02:22:40.436257+00:00",
"status": "formal-install-and-focused-host-feedback-passed",
"status": "formal-delivery-complete",
"version": "1.12.0",
"build": "79",
"checks": 834,
@@ -18,14 +18,15 @@
"Default wide mask strip shows entire tracking area and numeric fields are editable.",
"All four scope images expose accessible titles."
],
"remaining": [
"PKG and Release completion recorded separately in Package.json/Release.json; do not infer from this UI report."
],
"remaining": [],
"buildIsolation": "XPC-only scheme does not execute RegisterWithLaunchServices; PluginKit retains one formal installed path.",
"uiAudit": "SwiftUI audit not applicable: existing native interface is AppKit, no Swift source.",
"compiledSource": "beccf2fc01f8dc06c5d3d505f88289885d209bc8",
"actualHostReports": [
"verification/HostFeedback78.json",
"verification/HostFeedback79.json"
]
],
"packageVerification": "verification/Package.json",
"releaseVerification": "verification/Release.json",
"cleanupVerification": "verification/UnifiedWorkspaceCleanup79.json"
}
@@ -5,7 +5,7 @@
id<DYViewerParameterProbe>bridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host];
id<DYViewerControlsProbe>panel=(id)[NSClassFromString(@"DYViewerParameterPanel")new];panel.bridge=bridge;
auto drain=[](){double until=NSProcessInfo.processInfo.systemUptime+.06;while(NSProcessInfo.processInfo.systemUptime<until)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};
auto publish=[&](){DYUniforms u;DYReadUniforms(host,host->_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[bridge publishAssets:DYReadAssets(host,host->_time)histogram:nil atTime:host->_time];[panel prepareWithSize:NSMakeSize(1280,720)scale:1 atTime:host->_time];};
auto publish=[&](){DYUniforms u;DYReadUniforms(host,host->_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[bridge publishAssets:DYReadAssets(host,host->_time)atTime:host->_time];[panel prepareWithSize:NSMakeSize(1280,720)scale:1 atTime:host->_time];};
auto area=[&](NSString *kind)->NSDictionary*{for(NSDictionary*a in [(id)panel valueForKey:@"areas"])if([a[@"kind"]isEqual:kind])return [[a copy]autorelease];return nil;};
auto drag=[&](NSPoint a,NSPoint b){[panel event:NSEventTypeLeftMouseDown point:a atTime:host->_time];[panel event:NSEventTypeLeftMouseDragged point:b atTime:host->_time];drain();[panel event:NSEventTypeLeftMouseUp point:b atTime:host->_time];drain();publish();};
[(id)panel setValue:@"hsl" forKey:@"toolType"];publish();NSRect plot=[area(@"hslPlot")[@"rect"]rectValue];int undo=base->_undoStarts;
@@ -19,7 +19,6 @@
run.record(@"canvas-spider-uuid-persists-mesh-without-touching-base",[saved isEqual:DYReadAssets(host,kCMTimeZero).spiderMesh]&&[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]length]>0);
NSData *current=DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"];[bridge beginSpider:current node:spiderID enabled:1 atTime:kCMTimeZero];drain();doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);auto external=dy::neutralMesh(12,12);NSData *externalData=[NSData dataWithBytes:&external length:sizeof(external)];((NSMutableDictionary*)DYToolWithID(doc,spiderID))[@"spider"]=externalData;DYWriteTools(host,doc,kCMTimeZero);[bridge changeSpider:current];[bridge endGesture];drain();
run.record(@"canvas-spider-external-topology-change-wins",[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]isEqual:externalData]);
DYHistogram hist{};hist.samples=1;hist.bins[1][100]=1;NSData *histData=[NSData dataWithBytes:&hist length:sizeof(hist)];[bridge publishHistogram:histData atTime:kCMTimeZero];run.record(@"canvas-histogram-is-frozen-to-matching-frame",[[bridge snapshotAtTime:kCMTimeZero][@"histogram"]isEqual:histData]&&![bridge snapshotAtTime:CMTimeMake(1,24)]);
[panel finishCapture];panel.bridge=nil;[bridge invalidate];drain();[(id)panel release];[(id)bridge release];
}
{
@@ -4,8 +4,18 @@
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()]){
@@ -58,11 +68,14 @@
BOOL totals=YES;for(int c=0;c<4;c++){uint32_t total=0;for(int b=0;b<256;b++)total+=h->bins[c][b];totals&=total==6;}
run.record(@"histogram-each-channel-conserves-valid-samples",totals);
run.record(@"histogram-malformed-and-empty-safe",!DYHistogramFromRGBA([NSData dataWithBytes:pixels length:3])&&((const DYHistogram*)DYHistogramFromRGBA([NSData data]).bytes)->samples==0);
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];[renderer setValue:data forKey:@"histogram"];
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];
DYScopeSample *sample=[[[DYScopeSample alloc]init]autorelease];sample.pixels=input;[renderer setValue:sample forKey:@"scopeLatest"];
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host renderer:renderer]autorelease];[view refresh];NSDictionary *before=[view presetSnapshot];
for(NSMutableDictionary *card in [view valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"curve"]){card[@"removed"]=@NO;card[@"collapsed"]=@NO;}
[view setNeedsLayout:YES];[view layoutSubtreeIfNeeded];
NSView *graph=nil;for(NSView *v in [view valueForKey:@"graphics"])if([v.identifier isEqual:@"curveGraph"])graph=v;
NSButton *toggle=[graph valueForKey:@"histogramToggle"];NSSegmentedControl *channels=[graph valueForKey:@"channels"];
run.record(@"histogram-new-inspector-uses-renderer-cached-snapshot",[[graph valueForKey:@"histogram"]isEqual:data]&&toggle.state==NSControlStateValueOn);
run.record(@"histogram-open-inspector-uses-cached-effect-output",[[graph valueForKey:@"histogram"]isEqual:data]&&toggle.state==NSControlStateValueOn);
NSMutableSet *images=[NSMutableSet set];
for(NSInteger c=0;c<4;c++){
channels.selectedSegment=c;[graph performSelector:@selector(channelChanged:) withObject:channels];[graph setFrameSize:NSMakeSize(320,240)];[graph layoutSubtreeIfNeeded];
@@ -72,8 +85,16 @@
[toggle performClick:nil];[toggle performClick:nil];
run.record(@"histogram-four-channel-drawings-distinct",images.count==4);
run.record(@"histogram-channel-and-overlay-presentation-does-not-edit-grade",[before isEqual:[view presetSnapshot]]&&host->_undoStarts==0&&host->_undoEnds==0);
[renderer invalidatePreview];[view performSelector:@selector(previewChanged:) withObject:nil];
run.record(@"histogram-invalidation-clears-view-and-renderer",![renderer histogram]&&![graph valueForKey:@"histogram"]);
[renderer invalidatePreview];
run.record(@"histogram-keeps-final-output-while-a-new-render-is-pending",[[graph valueForKey:@"histogram"]isEqual:data]);
DYDiagnosticTile *updated=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:2 height:2]autorelease];
const __fp16 colors[16]={.25f,.4f,.6f,1,.25f,.4f,.6f,1,.25f,.4f,.6f,1,.25f,.4f,.6f,1};
[[updated metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,2,2)mipmapLevel:0 withBytes:colors bytesPerRow:16];
[renderer captureScopeTile:updated atTime:kCMTimeZero];
double until=NSProcessInfo.processInfo.systemUptime+1;
while([[graph valueForKey:@"histogram"]isEqual:data]&&NSProcessInfo.processInfo.systemUptime<until)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
NSData *latest=[graph valueForKey:@"histogram"];
run.record(@"histogram-open-inspector-refreshes-after-a-new-output-at-the-same-time",latest.length==sizeof(DYHistogram)&&![latest isEqual:data]&&[latest isEqual:[renderer canvasHistogramAtTime:kCMTimeZero]]);
NSInteger previous=DYThemeIndex();DYSetThemeIndex(8);
run.record(@"relief-only-two-choices-and-no-text-glow",DYThemeNames().count==2&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]);
DYSetThemeIndex(previous);
+1
查看文件
@@ -9,6 +9,7 @@
#import "DYManagedColor.h"
#import "../../ColorManagement/Sources/DYColorProfile.h"
#import "DYAutoGrade.h"
#import "DYColorTables.h"
#import "DYLUTLibrary.h"
#import "DYLUTBrowser.h"
#import "DYInspector.h"
+7 -6
查看文件
@@ -3,21 +3,22 @@
#include <cmath>
#include <cstdint>
// Immutable renderer-owned snapshot. Channel 0 is Rec.709 luma of the existing
// display-encoded analysis samples, not scene-linear luminance or an HDR scope.
// Immutable renderer-owned snapshot. Channel 0 uses Rec.709 weights in the
// supplied RGB domain.
struct DYHistogram {
uint32_t bins[4][256]{};
uint32_t samples=0;
};
static inline NSData *DYHistogramFromRGBA(NSData *rgba) {
static inline NSData *DYHistogramFromRGBA(NSData *rgba, bool premultiplied=false) {
DYHistogram h;
if(rgba.length%sizeof(float[4]))return nil;
const float *p=(const float *)rgba.bytes;
auto bin=[](double v){return (int)std::lround(std::fmax(0.,std::fmin(1.,v))*255.);};
for(NSUInteger i=0;i<rgba.length/sizeof(float[4]);i++,p+=4){
if(!std::isfinite(p[0])||!std::isfinite(p[1])||!std::isfinite(p[2])||!std::isfinite(p[3])||p[3]<=0)continue;
h.bins[0][bin(.2126*p[0]+.7152*p[1]+.0722*p[2])]++;
for(int c=0;c<3;c++)h.bins[c+1][bin(p[c])]++;
if(!std::isfinite(p[0])||!std::isfinite(p[1])||!std::isfinite(p[2])||!std::isfinite(p[3])||p[3]<=(premultiplied?1e-6f:0))continue;
double alpha=premultiplied?p[3]:1.;
h.bins[0][bin((.2126*p[0]+.7152*p[1]+.0722*p[2])/alpha)]++;
for(int c=0;c<3;c++)h.bins[c+1][bin(p[c]/alpha)]++;
h.samples++;
}
return [NSData dataWithBytes:&h length:sizeof(h)];
+36 -10
查看文件
@@ -258,7 +258,7 @@ static NSArray *DYPresentationSections(void) {
_values=[@{} copy];
_channels=[[NSSegmentedControl segmentedControlWithLabels:@[@"RGB",@"红",@"绿",@"蓝"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(channelChanged:)] retain];
_channels.selectedSegment=0; _channels.controlSize=NSControlSizeSmall; [self addSubview:_channels];
_histogramToggle=[[NSButton checkboxWithTitle:@"直方图" target:self action:@selector(histogramToggled:)]retain];_histogramToggle.state=NSControlStateValueOn;_histogramToggle.font=[NSFont systemFontOfSize:10];_histogramToggle.accessibilityLabel=@"显示曲线直方图叠层";_histogramToggle.toolTip=@"亮度与 RGB,256 档、320×180 采样;高度按共同峰值平方根缩放。源为分析画面:原流程在一级 CST/输入 LUT 后,新 CMS 在显示输出转换后、SDR 修饰前;不是最终输出示波器,也不是每个曲线层的即时输入。播放或移动播放头时刷新(最多每秒2次)。";[self addSubview:_histogramToggle];
_histogramToggle=[[NSButton checkboxWithTitle:@"直方图" target:self action:@selector(histogramToggled:)]retain];_histogramToggle.state=NSControlStateValueOn;_histogramToggle.font=[NSFont systemFontOfSize:10];_histogramToggle.accessibilityLabel=@"显示曲线直方图叠层";_histogramToggle.toolTip=@"亮度与 RGB,256 档、320×180 采样。来自当前效果的输出,曲线调整后随画面刷新。";[self addSubview:_histogramToggle];
self.accessibilityLabel=@"曲线点编辑器";self.toolTip=@"点击添加点;拖动调整;双击、右键或按住 Option 点击已有点可删除";
}
return self;
@@ -268,7 +268,7 @@ static NSArray *DYPresentationSections(void) {
- (void)setValues:(NSDictionary *)values { [_values release];_values=[values copy];[self setNeedsDisplay:YES]; }
- (void)layout { [super layout];_channels.frame=NSMakeRect(12,4,MAX(100,self.bounds.size.width-112),24);_histogramToggle.frame=NSMakeRect(self.bounds.size.width-88,5,80,22); }
- (void)setFixedWorkspaceChannel:(NSInteger)channel {_fixedWorkspaceChannel=YES;_channel=channel;_channels.hidden=YES;_histogramToggle.hidden=YES;}
- (void)setHistogram:(NSData *)histogram {if(_histogram==histogram)return;[_histogram release];_histogram=[histogram copy];const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;_histogramToggle.accessibilityValueDescription=h&&h->samples?[NSString stringWithFormat:@"分析画面,%u 个有效采样",h->samples]:@"等待画面;请移动播放头";[self setNeedsDisplay:YES];}
- (void)setHistogram:(NSData *)histogram {if(_histogram==histogram)return;[_histogram release];_histogram=[histogram copy];const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;_histogramToggle.accessibilityValueDescription=h&&h->samples?[NSString stringWithFormat:@"效果输出,%u 个有效采样",h->samples]:@"等待画面;请移动播放头";[self setNeedsDisplay:YES];}
- (void)histogramToggled:(id)sender {[self setNeedsDisplay:YES];}
- (void)channelChanged:(NSSegmentedControl *)sender { _channel=sender.selectedSegment;[self setNeedsDisplay:YES]; }
- (NSRect)plotRect {if(_fixedWorkspaceChannel){CGFloat side=MAX(50,MIN(self.bounds.size.width-16,self.bounds.size.height-42));return NSMakeRect((self.bounds.size.width-side)/2,MAX(8,(self.bounds.size.height-side-34)/2),side,side);}return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-76));}
@@ -487,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;
BOOL _embedded,_workspaceEditor;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight;
DYSpiderPanel *_spiderPanel;
NSMutableDictionary *_assetLoads,*_assetLoadIDs;
NSUInteger _nextAssetLoadID;
@@ -509,9 +509,10 @@ 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,780)])) {
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;
_workspaceEditor=workspaceType.length>0;_embedded=[manager isKindOfClass:DYToolManager.class];if(_embedded)[(id)_manager retain];
_preferredHeight=(_embedded||_workspaceEditor)?780:406;
NSArray *presentation=DYPresentationSections();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];
@@ -558,7 +559,10 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(revealViewerTool:) name:@"DYViewerToolRequested" object:_manager];
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(openWorkspace:) name:@"DYColorWorkspaceRequested" object:_manager];
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(rememberWorkspaceSelection:) name:@"DYWorkspaceToolSelection" object:_manager];
if(_renderer)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
if(_renderer){
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(curveOutputChanged:) name:@"DYOutputHistogramDidChange" object:_renderer];
}
[self themeChanged:nil];
[self setAccessibilityLabel:@"大鱼调色检查器"];
[self setNeedsLayout:YES];
@@ -585,7 +589,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
- (NSArray *)accessibilityVisibleChildren { return DYAccessibleSubviews(self,YES); }
- (NSArray *)accessibilityChildrenInNavigationOrder { return self.accessibilityChildren; }
- (NSSize)intrinsicContentSize { return NSMakeSize(360,780); }
- (NSSize)intrinsicContentSize { return NSMakeSize(360,_preferredHeight); }
- (void)viewDidMoveToWindow {
[super viewDidMoveToWindow];
if(!self.window){[self graphicGesture:NO title:nil];[self cancelAssetLoads];[_workspace close];}
@@ -630,7 +634,14 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
[self setNeedsLayout:YES];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
}
- (void)addLook:(id)sender {_visibleLooks=MIN(5,_visibleLooks+1);[self setNeedsLayout:YES];}
- (void)previewChanged:(NSNotification *)note {for(id graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class])[graphic setHistogram:[_renderer histogram]];[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];}
- (void)curveOutputChanged:(NSNotification *)note {
NSData *histogram=nil;BOOL loaded=NO;
for(NSView *graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class]&&!graphic.hiddenOrHasHiddenAncestor){
if(!loaded){histogram=[_renderer outputHistogram];loaded=YES;}
[(DYCurvePanel *)graphic setHistogram:histogram];
}
}
- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];}
- (void)buildCards {
NSInteger index=0;
for(NSDictionary *section in _sections) {
@@ -685,8 +696,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
NSSegmentedControl *tabs=[NSSegmentedControl segmentedControlWithLabels:[key isEqual:@"mixer"]?@[@"红输出",@"绿输出",@"蓝输出"]:@[@"减色",@"晕光",@"辉光",@"颗粒",@"暗角",@"印片"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(tabChanged:)];tabs.identifier=key;tabs.selectedSegment=0;tabs.controlSize=NSControlSizeSmall;tabs.accessibilityLabel=[section[@"title"]stringByAppendingString:@"分组"];[card addSubview:tabs];[body addObject:tabs];
}
if([key isEqual:@"curve"]) {
if(_workspaceEditor){DYWorkspaceCurveStrip *strip=[[[DYWorkspaceCurveStrip alloc]init]autorelease];strip.identifier=@"curveGraph";for(NSInteger channel=0;channel<4;channel++){DYCurvePanel *graph=[[[DYCurvePanel alloc]init]autorelease];graph.delegate=self;[graph setFixedWorkspaceChannel:channel];[graph setHistogram:[_renderer histogram]];[strip addSubview:graph];[_graphics addObject:graph];}[card addSubview:strip];[body addObject:strip];}
else {DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;[graph setHistogram:[_renderer histogram]];graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];}
if(_workspaceEditor){DYWorkspaceCurveStrip *strip=[[[DYWorkspaceCurveStrip alloc]init]autorelease];strip.identifier=@"curveGraph";for(NSInteger channel=0;channel<4;channel++){DYCurvePanel *graph=[[[DYCurvePanel alloc]init]autorelease];graph.delegate=self;[graph setFixedWorkspaceChannel:channel];[strip addSubview:graph];[_graphics addObject:graph];}[card addSubview:strip];[body addObject:strip];}
else {DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];}
}
if([key isEqual:@"grading"]) {
DYWheelPanel *wheels=[[[DYWheelPanel alloc]initWithFrame:NSZeroRect]autorelease];wheels.delegate=self;wheels.identifier=@"gradingWheels";[card addSubview:wheels];[body addObject:wheels];[_graphics addObject:wheels];
@@ -807,7 +818,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
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);
_scroll.frame=(_embedded||_workspaceEditor)?NSMakeRect(0,0,w,h):NSMakeRect(0,top,w,MAX(80,h-top));
_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;
if(_managedPanel&&!_managedPanel.hidden){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
for(NSMutableDictionary *c in _cards) {
@@ -890,6 +901,21 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
}
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(!_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)];
});
}
}
[self curveOutputChanged:nil];
}
- (id<FxCustomParameterActionAPI_v4>)actionAPI { return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; }
- (void)refresh {
+1 -1
查看文件
@@ -3,7 +3,7 @@
id<MTLComputePipelineState>p=[self managedKernel:@"dyManagedPreview" entry:entry error:nil];if(!p)return;
id<MTLBuffer>b=[entry[@"device"]newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];if(!b)return;
id<MTLCommandBuffer>cb=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>ce=[cb computeCommandEncoder];[ce setComputePipelineState:p];[ce setTexture:texture atIndex:0];[ce setBuffer:b offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_histogram release];_histogram=[DYHistogramFromRGBA(_preview) retain];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
if(cb.status==MTLCommandBufferStatusCompleted){@synchronized(_previewLock){[_preview release];_preview=[[NSData alloc]initWithBytes:b.contents length:b.length];[_lookLUTPreview release];if(origin==kFxImageOrigin_BOTTOM_LEFT){NSMutableData *flipped=[NSMutableData dataWithLength:b.length];for(NSUInteger y=0;y<180;y++)memcpy((uint8_t*)flipped.mutableBytes+y*320*16,(uint8_t*)b.contents+(179-y)*320*16,320*16);_lookLUTPreview=[flipped copy];}else _lookLUTPreview=[_preview retain];_lastPreview=CACurrentMediaTime();}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}[b release];
}
// Included in DYRenderer. V1 callers and their ABI remain on renderSource:...tools:error:.
- (NSDictionary*)colorContext {@synchronized(_previewLock){return [[_colorContext copy]autorelease];}}
+57 -5
查看文件
@@ -19,13 +19,14 @@
#include "DYToolFlow.inc.h"
@implementation DYPlugIn {
DYRenderer *_renderer;
NSColorSampler *_canvasSampler;
BOOL _copyAnalyzed;
std::atomic_bool _betaFirstRenderStarted,_modelRefreshPending;
#include "DYToolHostIvars.inc.h"
}
#include "DYToolHostMethods.inc.h"
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}DYBetaSpanEnd(beta,nil);return self;}
- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[super dealloc];}
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];}DYBetaSpanEnd(beta,nil);return self;}
- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_canvasSampler release];[_renderer release];[super dealloc];}
- (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];}
@@ -35,12 +36,12 @@
// remote parameter read and view rebuild for every scalar in the burst.
if(!_modelRefreshPending.exchange(true)){id host=_apiManager;dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];});}return YES;}
- (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a histogram:nil atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&copyAuto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&copyAuto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
}
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;NSData *previousHistogram=[_renderer histogram];BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){NSData *histogram=[_renderer histogram];if(histogram&&histogram!=previousHistogram)[_viewerParameterBridge publishHistogram:histogram atTime:t];[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_toolSourceTime=t;}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_toolSourceTime=t;}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
}
- (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});}
- (void)exportRequested:(NSNotification*)n{
@@ -48,7 +49,58 @@
}
- (void)applyValues:(NSDictionary*)values{if(!values){[self alert:@"尚未拿到当前片段画面,请移动播放头后重试。"];return;}id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];@try{id<FxParameterSettingAPI_v6>s=[_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];for(NSDictionary*r in DYDescriptors()){NSNumber*v=values[r[@"key"]];if(v)[s setFloatValue:v.doubleValue toParameter:[r[@"pid"]unsignedIntValue] atTime:a.currentTime];}}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_apiManager];}
- (void)autoRequested:(NSNotification*)n{NSData*frame=[_renderer preview];[self applyValues:[n.name isEqual:@"DYAutoGrade"]?DYAutoGrade(frame):DYAutoWhiteBalance(frame)];}
- (void)whiteBalanceRequested:(NSNotification*)n{NSColor*c=[n.userInfo[@"color"]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];if(!c)return;float temp=0,tint=0;if([DYColorTables neutralizeColor:(vector_float3){(float)c.redComponent,(float)c.greenComponent,(float)c.blueComponent} temperature:&temp tint:&tint])[self applyValues:@{@"temperature":@(temp),@"tint":@(tint)}];else [self alert:@"所选颜色过暗,请选择白色或中性灰区域。"];}
- (void)canvasWhiteBalanceRequested:(NSNotification*)note {
CMTime time=CMTimeMakeFromDictionary((CFDictionaryRef)note.userInfo[@"time"]);
if(_canvasSampler||!CMTIME_IS_NUMERIC(time))return;
_canvasSampler=[NSColorSampler new];
[_canvasSampler showSamplerWithSelectionHandler:^(NSColor *color){
[self->_canvasSampler release];self->_canvasSampler=nil;
if(color)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:self->_apiManager userInfo:@{@"color":color,@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}];
}];
}
- (void)applyCanvasWhiteBalance:(NSDictionary*)values atTime:(CMTime)time {
id<FxCustomParameterActionAPI_v4> action=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
if(!action)return;
NSMutableArray *descriptors=[NSMutableArray array];
for(NSDictionary *d in DYDescriptors())if(values[d[@"key"]])[descriptors addObject:d];
NSString *node=nil;
NSMutableDictionary *original=[NSMutableDictionary dictionary];
[action startAction:self];@try{
if(CMTimeCompare(DYHostDisplayedFrameTime(_apiManager,action.currentTime),time)!=0)return;
NSDictionary *document=DYReadTools(_apiManager,time).document;
NSString *selected=[_viewerParameterBridge snapshotAtTime:time][@"selectedNode"];
NSDictionary *layer=DYToolWithID(document,selected);
if([layer[@"type"]isEqual:@"base"])node=selected;
else if(!DYBaseToolRemoved(document,@"base"))node=@"base:base";
else for(NSString *ID in DYToolDisplayOrder(document))if([DYToolWithID(document,ID)[@"type"]isEqual:@"base"]){node=ID;break;}
if(node){
BOOL base=[node isEqual:@"base:base"];
DYUniforms uniforms{};
if(!base)uniforms=DYToolUniforms(DYToolWithID(document,node));
id<FxParameterRetrievalAPI_v6> get=[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
for(NSDictionary *d in descriptors){
double value=[d[@"default"]doubleValue];
if(base){if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:time])return;}
else value=*(float*)((uint8_t*)&uniforms+[d[@"offset"]unsignedIntegerValue]);
original[d[@"key"]]=@(value);
}
}
}@finally{[action endAction:self];}
if(!node){[self alert:@"请先添加基础调整模块,再吸取白点。"];return;}
[_viewerParameterBridge beginParameters:descriptors node:node values:original atTime:time];
[_viewerParameterBridge changeValues:values];[_viewerParameterBridge endGesture];
}
- (void)whiteBalanceRequested:(NSNotification*)n {
NSColor *color=[n.userInfo[@"color"] colorUsingColorSpace:NSColorSpace.sRGBColorSpace];
if(!color)return;
float temperature=0,tint=0;
if(![DYColorTables neutralizeColor:(vector_float3){(float)color.redComponent,(float)color.greenComponent,(float)color.blueComponent} temperature:&temperature tint:&tint]){
[self alert:@"所选颜色过暗,请选择白色或中性灰区域。"];return;
}
NSDictionary *values=@{@"temperature":@(temperature),@"tint":@(tint)};
if(n.userInfo[@"time"])[self applyCanvasWhiteBalance:values atTime:CMTimeMakeFromDictionary((CFDictionaryRef)n.userInfo[@"time"])];
else [self applyValues:values];
}
@end
#include "DYViewerControls.inc.h"
#include "DYToolOSC.inc.h"
+4 -2
查看文件
@@ -14,8 +14,10 @@
- (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;
- (NSData*)preview;
/// 256-bin luma/R/G/B of the existing 320×180 analysis preview.
- (NSData*)histogram;
/// Latest final-output bins for the inspector's visible curve controls.
- (NSData*)outputHistogram;
/// Bins from this instance's most recent final output at the requested time.
- (NSData*)canvasHistogramAtTime:(CMTime)time;
/// Display-encoded float RGBA, 320×180, with the visually top row first.
/// Analysis preview retains the host texture's original row order separately.
- (NSData*)lookLUTPreview;
+4 -7
查看文件
@@ -1,5 +1,4 @@
#import <os/log.h>
#import "DYHistogram.h"
#import "DYManagedColor.h"
#import "../../ColorManagement/Sources/DYColorManagementGPU.h"
#import "../../ColorManagement/Sources/DYColorProfile.h"
@@ -112,13 +111,13 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
dispatch_queue_t _lutPreparationQueue;
DYColorTables *_tables;
NSObject *_previewLock;
NSData *_preview,*_lookLUTPreview,*_histogram;
NSData *_preview,*_lookLUTPreview;
CFTimeInterval _lastPreview;
BOOL _exporting;
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;
dispatch_queue_t _scopeQueue;
BOOL _scopeEnabled,_scopeWorkerRunning;
BOOL _scopeEnabled,_scopeWorkerRunning,_outputHistogramObserved,_outputHistogramNotificationPending;
NSUInteger _scopeGeneration;
DYScopeSample *_scopePending,*_scopeLatest;
uint64_t _scopeCaptureSerial,_scopeLatestSerial;CMTime _scopeRequestedTime;
@@ -135,7 +134,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
#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];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];}
- (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)trimPreparedLUTsKeeping:(NSString *)path {
if(_preparedLUTs.count<=12)return;
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
@@ -159,8 +158,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
}});return progress;
}
- (void)notifyPreviewChanged{dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;[_histogram release];_histogram=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
- (NSData*)histogram{@synchronized(_previewLock){return [[_histogram retain]autorelease];}}
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
@@ -248,7 +246,6 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
vector_uint2 vp={(unsigned)output.width,(unsigned)output.height};[re setVertexBytes:vs length:sizeof(vs) atIndex:0];[re setVertexBytes:&vp length:sizeof(vp) atIndex:1];[re setViewport:(MTLViewport){0,0,w,h,0,1}];[re setFragmentTexture:straight atIndex:0];for(NSUInteger i=0;i<ts.count;i++)[re setFragmentTexture:ts[i] atIndex:i+1];[re setFragmentBytes:&u length:sizeof(u) atIndex:0];[re setFragmentBuffer:scene offset:0 atIndex:1];DYRenderOptions options={1,bwMix,0,0};[re setFragmentBytes:&options length:sizeof(options) atIndex:2];DYUniforms color=u;color.blackWhiteSectionEnabled=0;[re setFragmentBytes:&color length:sizeof(color) atIndex:3];if(spiderBuffer)[re setFragmentBuffer:spiderBuffer offset:0 atIndex:4];else{float empty[2]={0,0};[re setFragmentBytes:empty length:sizeof(empty) atIndex:4];}[re setFragmentBytes:&spiderSize length:sizeof(spiderSize) atIndex:5];if(hasMasks||segmented){[re setFragmentBuffer:maskBuffer offset:0 atIndex:6];[re setFragmentBytes:&maskHeader length:sizeof(maskHeader) atIndex:7];}if(segmented){DYToolStageRange range={(int)stageFirst,(int)stageLast,(int)suppressBlackWhite};[re setFragmentBytes:&range length:sizeof(range) atIndex:8];[re setFragmentTexture:skinReference?[skinReference metalTextureForDevice:d]:input atIndex:10];[re setFragmentTexture:nativeSource atIndex:11];}[re drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[re endEncoding];[cb commit];[cb waitUntilCompleted];BOOL ok=cb.status==MTLCommandBufferStatusCompleted;
if(ok&&pb){@synchronized(_previewLock){
[_preview release];_preview=[[NSData alloc]initWithBytes:pb.contents length:320*180*16];
[_histogram release];_histogram=[DYHistogramFromRGBA(_preview) retain];
// The analysis kernel reads physical texture rows. Its result remains intact
// for auto grade; only the browser copy is normalized to top-first bitmap rows.
[_lookLUTPreview release];
+29 -1
查看文件
@@ -16,6 +16,27 @@
}
- (NSData *)scopePreview{@synchronized(_previewLock){return [[_scopePreview retain]autorelease];}}
- (NSDictionary *)scopeMetadata{@synchronized(_previewLock){return [[_scopeMetadata retain]autorelease];}}
- (NSData*)outputHistogram{
DYScopeSample *sample=nil;
@synchronized(_previewLock){_outputHistogramObserved=YES;sample=[[_scopeLatest retain]autorelease];}
return sample.canvasHistogram;
}
- (void)queueOutputHistogramNotification{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
@synchronized(_previewLock){_outputHistogramNotificationPending=NO;}
[NSNotificationCenter.defaultCenter postNotificationName:@"DYOutputHistogramDidChange" object:self];
});
}
- (NSData *)canvasHistogramAtTime:(CMTime)time{
if(!CMTIME_IS_NUMERIC(time))return nil;
DYScopeSample *sample=nil;
@synchronized(_previewLock){sample=[_scopeLatest retain];}
NSDictionary *metadata=sample.metadata;
CMTime captured=CMTimeMakeWithEpoch([metadata[@"timeValue"]longLongValue],[metadata[@"timeScale"]intValue],[metadata[@"timeEpoch"]longLongValue]);
NSData *histogram=metadata&&CMTimeCompare(time,captured)==0?sample.canvasHistogram:nil;
[sample release];
return histogram;
}
- (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time{
NSUInteger generation;uint64_t serial;@synchronized(_previewLock){if(_exporting||!tile)return;generation=_scopeGeneration;serial=++_scopeCaptureSerial;}
@autoreleasepool{@try{
@@ -37,7 +58,14 @@
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;BOOL whole=bounds.left==image.left&&bounds.right==image.right&&bounds.top==image.top&&bounds.bottom==image.bottom;
sample.metadata=@{@"time":@(CMTimeGetSeconds(time)),@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch),@"source":context[@"destination"]?:@"宿主 RGB",@"wholeImage":@(whole),@"region":whole?@"整帧取样":@"仅当前宿主输出分块",@"width":@(dyscope::Width),@"height":@(dyscope::Height)};
[buffer release];[entry release];[context release];
BOOL start=NO;@synchronized(_previewLock){if(serial>=_scopeLatestSerial){[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=serial;}if(_scopeEnabled&&serial==_scopeLatestSerial&&(generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}}[sample release];
BOOL start=NO,notifyHistogram=NO;@synchronized(_previewLock){
if(serial>=_scopeLatestSerial){
[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=serial;
if(_outputHistogramObserved&&!_outputHistogramNotificationPending){_outputHistogramNotificationPending=YES;notifyHistogram=YES;}
}
if(_scopeEnabled&&serial==_scopeLatestSerial&&(generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}
}[sample release];
if(notifyHistogram)[self queueOutputHistogramNotification];
if(start)dispatch_async(_scopeQueue,^{[self processPendingScopeSamples];});
}@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}}
}
+2
查看文件
@@ -6,4 +6,6 @@
@property(nonatomic,copy) NSDictionary *metadata;
@property(nonatomic) NSUInteger generation;
@property(nonatomic) CGColorSpaceRef space;
/// Final-output bins in the host RGB domain, calculated only if requested.
@property(nonatomic,readonly) NSData *canvasHistogram;
@end
+11 -2
查看文件
@@ -1,5 +1,14 @@
#import "DYScopeSample.h"
@implementation DYScopeSample
#import "DYHistogram.h"
@implementation DYScopeSample {
NSData *_canvasHistogram;
}
- (NSData *)canvasHistogram{
@synchronized(self){
if(!_canvasHistogram)_canvasHistogram=[DYHistogramFromRGBA(_pixels,true) retain];
return [[_canvasHistogram retain]autorelease];
}
}
- (void)setSpace:(CGColorSpaceRef)space{if(_space==space)return;if(_space)CGColorSpaceRelease(_space);_space=space?CGColorSpaceRetain(space):nil;}
- (void)dealloc{[_pixels release];[_metadata release];if(_space)CGColorSpaceRelease(_space);[super dealloc];}
- (void)dealloc{[_pixels release];[_metadata release];[_canvasHistogram release];if(_space)CGColorSpaceRelease(_space);[super dealloc];}
@end
@@ -33,6 +33,13 @@
[(id)osc setValue:[NSValue valueWithRect:view]forKey:@"imageRect"];[(id)osc setValue:@2 forKey:@"uiScale"];NSRect visible=NSIntersectionRect(view,NSMakeRect(0,0,640,400));
for(NSInteger i=9;i<=10;i++)penActionsBounded&=NSContainsRect(visible,[(id)osc toolbarRectForItem:i]);}
run.record(@"native-osc-keeps-only-two-pen-actions-bounded-at-bottom",penActionsBounded);
NSColor *white=[NSColor colorWithSRGBRed:.82 green:.64 blue:.52 alpha:1];
auto whiteBalance=[&](CMTime time){[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:host userInfo:@{@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease],@"color":white}];drain();};
NSDictionary *beforeWhite=[[base->_values copy]autorelease];undo=base->_undoStarts;whiteBalance(CMTimeMake(1,24));
run.record(@"canvas-white-balance-cannot-write-after-the-playhead-moves",[beforeWhite isEqual:base->_values]&&base->_undoStarts==undo);
whiteBalance(kCMTimeZero);DYUniforms balanced;DYReadUniforms(host,kCMTimeZero,&balanced);
float temp=0,tint=0;[DYColorTables neutralizeColor:(vector_float3){.82f,.64f,.52f} temperature:&temp tint:&tint];
run.record(@"canvas-white-balance-uses-existing-solver-and-one-undo",fabs(balanced.temperature-temp)<1e-4&&fabs(balanced.tint-tint)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
[osc release];[plugin release];drain();
}
{
@@ -59,3 +66,24 @@
[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);
[osc release];[plugin release];drain();
}
{
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
id<DYToolCanvasHostProbe> plugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];
DYDiagnosticTile *src=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:16 height:16]autorelease],*dst=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:16 height:16]autorelease];
Pixels pixels(16*16*4);for(size_t i=0;i<pixels.size();i++)pixels[i]=i%4==3?1:.18f;
[[src metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,16,16)mipmapLevel:0 withBytes:pixels.data()bytesPerRow:16*8];
id<DYViewerParameterProbe> bridge=[(id)plugin valueForKey:@"viewerParameterBridge"];
auto histogram=[&]()->NSData*{NSData *state=nil;NSError *failure=nil;
if(![plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&failure])return nil;
if(![(id<FxTileableEffect>)plugin renderDestinationImage:dst sourceImages:@[src] pluginState:state atTime:kCMTimeZero error:&failure])return nil;
return [bridge canvasHistogramAtTime:kCMTimeZero];
};
NSData *before=histogram();
for(NSDictionary *d in DYDescriptors())if([@[@"masterX0",@"curveY0"]containsObject:d[@"key"]])
[(id<FxParameterSettingAPI_v6>)base setFloatValue:[d[@"key"]isEqual:@"masterX0"]?.5:32 toParameter:[d[@"pid"]unsignedIntValue] atTime:kCMTimeZero];
NSData *after=histogram();
run.record(@"canvas-curve-histogram-updates-from-final-output-at-the-same-playhead",before.length==sizeof(DYHistogram)&&after.length==sizeof(DYHistogram)&&![before isEqual:after]&&![bridge canvasHistogramAtTime:CMTimeMake(1,24)]);
[plugin release];
}
+1 -1
查看文件
@@ -1,5 +1,5 @@
- (void)initializeToolHost {
_viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager];
_viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager];_viewerParameterBridge.renderer=_renderer;
_toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid;
NSNotificationCenter *n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(toolCanvasSelection:) name:@"DYToolCanvasSelection" object:_apiManager];[n addObserver:self selector:@selector(toolCanvasCommand:) name:@"DYToolCanvasCommand" object:_apiManager];[n addObserver:self selector:@selector(toolTrackRequested:) name:@"DYToolTrack" object:_apiManager];
}
+1 -1
查看文件
@@ -15,7 +15,7 @@
NSString *addedID=nil;@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if([doc[@"layers"]count]>=DYToolLimit){[self showError:@"最多可添加 32 个独立工具层。"];return;}NSString *type=_cards[sender.tag][@"section"][@"key"],*anchor=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:type];NSMutableDictionary *node=(id)DYInsertTool(doc,type,anchor);if(!node)return;if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}addedID=[node[@"id"]copy];id<FxUndoAPI>undo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"再加一层初始化工具"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":addedID?:@""}];[addedID release];
}
- (void)revealViewerTool:(NSNotification*)note {
if(_embedded||![DYToolTypes()containsObject:note.userInfo[@"type"]])return;NSString *type=note.userInfo[@"type"];id<FxCustomParameterActionAPI_v4>a=[self actionAPI];[a startAction:self];@try{DYInspectorToken *old=nil;[[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:a.currentTime];DYInspectorToken *token=old?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];folds[[@"visible:" stringByAppendingString:type]]=@YES;token.folds=folds;[[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:a.currentTime];
if(_embedded||![DYToolTypes()containsObject:note.userInfo[@"type"]])return;NSString *type=note.userInfo[@"type"];id<FxCustomParameterActionAPI_v4>a=[self actionAPI];[a startAction:self];@try{DYInspectorToken *old=nil;[[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:a.currentTime];DYInspectorToken *token=old?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease];NSString *visible=[@"visible:" stringByAppendingString:type];if(![token.folds[visible]boolValue]){NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];folds[visible]=@YES;token.folds=folds;[[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:a.currentTime];}
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);if(DYBaseToolRemoved(doc,type)){BOOL existing=NO;for(NSDictionary*n in doc[@"layers"])if([n[@"type"]isEqual:type])existing=YES;if(!existing){id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if([undo startUndoGroup:@"添加画布工具"]){DYInsertTool(doc,type,[@"base:" stringByAppendingString:type]);DYWriteTools(_manager,doc,a.currentTime);[undo endUndoGroup];}}}
}@finally{[a endAction:self];}[self refresh];[self setNeedsLayout:YES];
}
+7 -5
查看文件
@@ -15,11 +15,10 @@
}
- (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];}
- (NSRect)toolbarRectForItem:(NSInteger)item{
// Only the two temporary pen actions remain. The permanent tools live in the
// transparent left rail; the middle of the bottom edge opens the workspace.
// Keep the temporary pen actions clear of the permanent tool rail.
if(![_mask[@"drawing"]boolValue]||(item!=9&&item!=10))return NSZeroRect;
NSRect v=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));CGFloat scale=MAX(.01,MIN(_uiScale,MIN(v.size.width/300.,v.size.height/100.)));
return NSMakeRect(NSMidX(v)+(item==9?-144:80)*scale,NSMaxY(v)-32*scale,64*scale,24*scale);
return NSMakeRect(NSMinX(v)+(item==9?8:76)*scale,NSMaxY(v)-61*scale,64*scale,24*scale);
}
- (void)drawOSCWithWidth:(NSInteger)width height:(NSInteger)height activePart:(NSInteger)activePart destinationImage:(FxImageTile*)destination atTime:(CMTime)time {@synchronized(self){@autoreleasepool{
if(!_device||_device.registryID!=destination.deviceRegistryID){[_device release];_device=nil;NSArray *devices=MTLCopyAllDevices();for(id<MTLDevice>d in devices)if(d.registryID==destination.deviceRegistryID)_device=[d retain];[devices release];[_queue release];_queue=[_device newCommandQueue];[_context release];_context=_device?[[CIContext contextWithMTLDevice:_device options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}]retain]:nil;}
@@ -52,8 +51,10 @@
}[commands commit];[commands waitUntilCompleted];
}}}
- (NSInteger)partAtPoint:(NSPoint)point {
BOOL drawing=[_mask[@"drawing"]boolValue];
if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit;
if(!_mask)return 0;BOOL drawing=[_mask[@"drawing"]boolValue];if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;if([_mask[@"drawShape"]boolValue])return NSPointInRect(point,_imageRect)?1:0;
if(!_mask)return 0;if([_mask[@"drawShape"]boolValue])return NSPointInRect(point,_imageRect)?1:0;
DYMaskParameters p;[_mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/MAX(1.,_imageRect.size.height);
if(drawing){NSData *data=_mask[@"nodes"];if(data.length>=3*sizeof(DYBezierNode)){const DYBezierNode *nodes=(const DYBezierNode*)data.bytes;NSPoint first=[self canvasPoint:nodes[0].x y:nodes[0].y parameters:p];if(hypot(point.x-first.x,point.y-first.y)<=10*_uiScale)return 1000;}return NSPointInRect(point,_imageRect)?1:0;}
for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];}
@@ -65,7 +66,8 @@
if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;}
BOOL ownedMask=_maskCapturing&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp);
if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];
if(!ownedMask&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;
BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010);
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;
if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0){_maskCapturing=NO;return NO;}
NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);
if(type==NSEventTypeLeftMouseDown){_maskCapturing=part>0&&part<10000;_maskCaptureOwner=_maskCapturing?plugin:nil;}
+14 -1
查看文件
@@ -4,6 +4,7 @@
#include <set>
#import <objc/runtime.h>
#import <CommonCrypto/CommonDigest.h>
#import <os/log.h>
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film",@"lens"];}
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
@@ -173,7 +174,19 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
- (void)dealloc{[_nodeID release];[_type release];[_pending release];[_token release];[super dealloc];}
- (id)apiForProtocol:(Protocol*)p{if(protocol_isEqual(p,@protocol(FxParameterRetrievalAPI_v6))||protocol_isEqual(p,@protocol(FxParameterSettingAPI_v6))||protocol_isEqual(p,@protocol(FxCustomParameterActionAPI_v4)))return self;return [_host apiForProtocol:p];}
- (void)startAction:(id)sender{if(_depth++==0){[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]startAction:sender];_time=[(id<FxCustomParameterActionAPI_v4>)[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]currentTime];[_pending release];_pending=[DYMutablePlist(DYReadTools(_host,_time).document)retain];}}
- (void)endAction:(id)sender{if(_depth<=0)return;if(--_depth==0){NSDictionary *original=DYReadTools(_host,_time).document;if(![_pending isEqual:original])DYWriteTools(_host,_pending,_time);if(_token)[[_host apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:_token toParameter:DYInspectorParameterID atTime:_time];[_token release];_token=nil;[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]endAction:sender];}}
- (void)endAction:(id)sender{
if(_depth<=0||--_depth>0)return;
@try{
NSDictionary *original=DYReadTools(_host,_time).document;
if(![_pending isEqual:original]&&!DYWriteTools(_host,_pending,_time))
os_log_error(OS_LOG_DEFAULT,"dayu_tool_save_rejected kind=document");
if(_token&&![[_host apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:_token toParameter:DYInspectorParameterID atTime:_time])
os_log_error(OS_LOG_DEFAULT,"dayu_tool_save_rejected kind=inspector");
}@finally{
[_token release];_token=nil;
[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]endAction:sender];
}
}
- (CMTime)currentTime{return _time;}
- (NSDictionary*)node{return DYToolWithID(_pending?:DYReadTools(_host,_time).document,_nodeID);}
- (BOOL)getFloatValue:(double*)out fromParameter:(UInt32)pid atTime:(CMTime)t{NSDictionary *n=[self node];DYUniforms u=DYToolUniforms(n?:@{@"type":_type});for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){*out=[d[@"offset"]integerValue]>=0?*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue]):[d[@"default"]doubleValue];return YES;}return NO;}
+38 -9
查看文件
@@ -1,8 +1,25 @@
// One OSC root owns a lower-left tool rail and independent movable editors.
// One OSC root owns a lower-right tool rail and independent movable editors.
// Positions are view state; opening, moving and channel selection never edit a grade.
#import "DYTheme.h"
#include "DYViewerParameterPanel.inc.h"
static const NSInteger DYViewerPartBase=20000;
static void DYDrawDistortionGrid(NSRect rect,NSColor *color){
CGFloat side=MIN(rect.size.width,rect.size.height);
auto point=[&](CGFloat x,CGFloat y){
CGFloat scale=side*(.34+.075*(x*x+y*y));
return NSMakePoint(NSMidX(rect)+scale*x,NSMidY(rect)+scale*y);
};
NSBezierPath *grid=[NSBezierPath bezierPath];
grid.lineWidth=MAX(.75,side*.067);
for(CGFloat edge:{-1.,0.,1.})for(BOOL vertical:{NO,YES}){
for(int i=0;i<=12;i++){
CGFloat t=(i-6)/6.;
NSPoint p=vertical?point(edge,t):point(t,edge);
if(i==0)[grid moveToPoint:p];else [grid lineToPoint:p];
}
}
[color setStroke];[grid stroke];
}
@interface DYViewerControls : NSObject
@property(nonatomic,retain) DYViewerParameterBridge *bridge;
- (void)setViewport:(NSRect)viewport;
@@ -34,11 +51,12 @@ 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"],*titles=@[@"曲线",@"畸变",@"肤色",@"LUT"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"camera.aperture",@"person.crop.circle",@"square.stack.3d.up"];
CGFloat railScale=MIN(s,MIN((v.size.width-24)/388.,(v.size.height-16)/27.));CGFloat x=NSMinX(v)+8*railScale,y=NSMaxY(v)-33*railScale,w=36*railScale;
_rail=NSMakeRect(x,y,276*railScale,25*railScale);
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper"];
CGFloat railScale=MIN(s,v.size.width/440.),y=NSMaxY(v)-33*railScale,w=36*railScale;
CGFloat x=NSMaxX(v)-436*railScale;
_rail=NSMakeRect(x,y,316*railScale,25*railScale);
for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x+i*40*railScale,y,w,25*railScale)]}];
for(NSInteger i=0;i<4;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
for(NSInteger i=0;i<types.count;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
CGFloat buttonWidth=100*railScale,buttonHeight=27*railScale;
[_areas addObject:@{@"part":@20001,@"kind":@"workspace",@"title":@"控制面板",@"rect":[NSValue valueWithRect:NSMakeRect(NSMaxX(v)-buttonWidth-8*railScale,NSMaxY(v)-buttonHeight-8*railScale,buttonWidth,buttonHeight)]}];
}
@@ -71,7 +89,18 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=[a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled];for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
BOOL hover=_hover==[a[@"part"]integerValue];
BOOL pressed=_pressed==[a[@"part"]integerValue];DYDrawSoftControl(r,4*s,NO,selected||hover,pressed);
if(a[@"symbol"]){NSImage *icon=[NSImage imageWithSystemSymbolName:a[@"symbol"] accessibilityDescription:a[@"title"]];NSImageSymbolConfiguration *configuration=[[NSImageSymbolConfiguration configurationWithPointSize:14*s weight:NSFontWeightRegular]configurationByApplyingConfiguration:[NSImageSymbolConfiguration configurationWithPaletteColors:@[selected?NSColor.systemCyanColor:NSColor.whiteColor]]];icon=[icon imageWithSymbolConfiguration:configuration];CGFloat side=MIN(17*s,r.size.height-6*s);[icon drawInRect:NSMakeRect(NSMidX(r)-side/2,NSMidY(r)-side/2,side,side) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];continue;}
if(a[@"symbol"]){
NSColor *ink=selected?NSColor.systemCyanColor:NSColor.whiteColor;
CGFloat side=MIN(17*s,r.size.height*.7);
NSRect glyph=NSMakeRect(NSMidX(r)-side/2,NSMidY(r)-side/2,side,side);
if([a[@"symbol"]isEqual:@"pincushion-grid"])DYDrawDistortionGrid(NSInsetRect(glyph,1,1),ink);
else{
NSImage *icon=[NSImage imageWithSystemSymbolName:a[@"symbol"] accessibilityDescription:a[@"title"]];
NSImageSymbolConfiguration *configuration=[[NSImageSymbolConfiguration configurationWithPointSize:14*s weight:NSFontWeightRegular]configurationByApplyingConfiguration:[NSImageSymbolConfiguration configurationWithPaletteColors:@[ink]]];
[[icon imageWithSymbolConfiguration:configuration]drawInRect:glyph fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
}
continue;
}
// The bottom workspace entry keeps its explicit text label.
NSMutableParagraphStyle*style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter;
NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[NSColor colorWithWhite:0 alpha:.95];shadow.shadowBlurRadius=2;shadow.shadowOffset=NSMakeSize(0,-1);
@@ -79,16 +108,16 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
[a[@"title"]drawInRect:NSInsetRect(r,1,MAX(1.,(r.size.height-fontSize-3)/2)) withAttributes:attributes];
if(selected){NSBezierPath *mark=[NSBezierPath bezierPath];[mark moveToPoint:NSMakePoint(NSMinX(r),NSMidY(r)-3*s)];[mark lineToPoint:NSMakePoint(NSMinX(r),NSMidY(r)+3*s)];[NSColor.systemCyanColor setStroke];mark.lineWidth=2*s;[mark stroke];}
}
for(NSDictionary *a in _areas)if(a[@"symbol"]&&_hover==[a[@"part"]integerValue]){NSRect r=[a[@"rect"]rectValue],tip=NSMakeRect(NSMaxX(r)+6*s,NSMinY(r),72*s,25*s);DYDrawSoftControl(tip,4*s,NO,NO,NO);[a[@"title"]drawInRect:NSInsetRect(tip,5*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:NSColor.whiteColor}];break;}
for(NSDictionary *a in _areas)if(a[@"symbol"]&&_hover==[a[@"part"]integerValue]){NSRect r=[a[@"rect"]rectValue],tip=NSMakeRect(NSMidX(r)-36*s,NSMinY(r)-28*s,72*s,25*s);DYDrawSoftControl(tip,4*s,NO,NO,NO);[a[@"title"]drawInRect:NSInsetRect(tip,5*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:NSColor.whiteColor}];break;}
[NSGraphicsContext restoreGraphicsState];
}
- (void)activateTool:(NSString*)type{
if([type isEqual:@"look"]){[_bridge requestWorkspacePage:@"lut"];return;}
if([type isEqual:@"skin"]){[self toggleSkinPreview];return;}
if([type isEqual:@"whiteBalance"]){[_bridge requestWhiteBalanceAtTime:_time];return;}
for(DYViewerParameterPanel*p in [[_panels copy]autorelease])if([p.toolType isEqual:type]){[p finishCapture];p.bridge=nil;[_panels removeObjectIdenticalTo:p];return;}
[_bridge requestTool:type];DYViewerParameterPanel*p=[[[DYViewerParameterPanel alloc]init]autorelease];p.toolType=type;p.bridge=_bridge;
CGFloat x=16*_scale/MAX(1.,_viewport.size.width),offset=0;
[p setInitialPosition:NSMakePoint(x+offset/MAX(1.,_viewport.size.width),(8*_scale+offset)/MAX(1.,_viewport.size.height))];[_panels addObject:p];
[_panels addObject:p];
}
- (BOOL)event:(NSEventType)type point:(NSPoint)p atTime:(CMTime)time{
if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time];
@@ -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-left-rail-has-only-four-image-tools-and-three-persistent-mask-shapes",horizontal&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0);
run.record(@"viewer-lower-right-rail-has-five-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"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0);
NSDictionary *workspace=areaFor(controls,@"workspace",nil);NSRect workspaceRect=[workspace[@"rect"]rectValue];
run.record(@"viewer-control-panel-entry-is-labelled-and-anchored-at-bottom",[workspace[@"title"]isEqual:@"控制面板"]&&NSMidY(workspaceRect)>size.height*.9);
__block NSInteger workspaceRequests=0;__block NSString *requestedPage=nil;__block NSInteger requestedMask=-1;
@@ -23,16 +23,34 @@
BOOL maskRoutes=YES;for(NSDictionary *a in [[[controls valueForKey:@"areas"]copy]autorelease])if([a[@"kind"]isEqual:@"mask"]){click(a);drain();maskRoutes&=[requestedPage isEqual:@"masks"]&&requestedMask==[a[@"index"]integerValue];}
run.record(@"viewer-persistent-mask-entries-route-shapes-to-shared-workspace",maskRoutes&&base->_undoStarts==undo);
[NSNotificationCenter.defaultCenter removeObserver:observer];[requestedPage release];
__block NSInteger eyedropperRequests=0;__block CMTime eyedropperTime=kCMTimeInvalid;
id sampleObserver=[NSNotificationCenter.defaultCenter addObserverForName:@"DYViewerWhiteBalanceRequested" object:host queue:nil usingBlock:^(NSNotification *note){eyedropperRequests++;eyedropperTime=CMTimeMakeFromDictionary((CFDictionaryRef)note.userInfo[@"time"]);}];
click(areaFor(controls,@"tool",@"whiteBalance"));drain();
run.record(@"viewer-white-balance-icon-routes-a-single-time-bound-pick",eyedropperRequests==1&&CMTimeCompare(eyedropperTime,host->_time)==0&&!panelFor(@"whiteBalance")&&[initial isEqual:base->_values]);
[NSNotificationCenter.defaultCenter removeObserver:sampleObserver];
run.record(@"viewer-distortion-entry-uses-pincushion-grid", [areaFor(controls,@"tool",@"lens")[@"symbol"]isEqual:@"pincushion-grid"]);
click(areaFor(controls,@"tool",@"skin"));drain();publish();
run.record(@"viewer-skin-entry-toggles-actual-protection-preview-without-parameter-card",value(@"skinVisualize")==1&&!panelFor(@"skin")&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
click(areaFor(controls,@"tool",@"skin"));drain();publish();run.record(@"viewer-skin-preview-toggle-restores-review-image",value(@"skinVisualize")==0&&!panelFor(@"skin"));
click(areaFor(controls,@"tool",@"curve"));id curve=panelFor(@"curve");
run.record(@"viewer-curve-is-graph-only-without-title-catalog-or-parameter-page",curve&&areaFor(curve,@"curvePlot",nil)&&!areaFor(curve,@"open",nil)&&!areaFor(curve,@"catalog",nil)&&!areaFor(curve,@"graphMode",nil)&&!areaFor(curve,@"slider",nil));
NSRect plot=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue];NSPoint point=NSMakePoint(plot.origin.x+.43*plot.size.width,plot.origin.y+.18*plot.size.height);undo=base->_undoStarts;
NSRect plot=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue],grip=[areaFor(curve,@"curveGrip",nil)[@"rect"]rectValue];
run.record(@"viewer-curve-opens-above-the-lower-right-controls",NSMidX(plot)>size.width*.8&&NSMaxY(plot)<NSMinY(workspaceRect)&&NSMaxY(plot)>size.height*.8&&!NSIsEmptyRect(grip));
NSPoint gripStart=NSMakePoint(NSMidX(grip),NSMidY(grip)),gripEnd=NSMakePoint(gripStart.x-70,gripStart.y-52);
undo=base->_undoStarts;[controls event:NSEventTypeLeftMouseDown point:gripStart atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:gripEnd atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:gripEnd atTime:host->_time];drain();
NSRect shifted=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue];
run.record(@"viewer-curve-grip-moves-both-axes-without-a-grade-or-undo",fabs(NSMinX(shifted)-NSMinX(plot)+70)<.1&&fabs(NSMinY(shifted)-NSMinY(plot)+52)<.1&&base->_undoStarts==undo);
plot=shifted;NSPoint point=NSMakePoint(plot.origin.x+.43*plot.size.width,plot.origin.y+.18*plot.size.height);undo=base->_undoStarts;
[controls event:NSEventTypeLeftMouseDown point:point atTime:host->_time];NSString *xKey=[[[curve valueForKey:@"captured"][@"xKey"]copy]autorelease],*yKey=[[[curve valueForKey:@"captured"][@"yKey"]copy]autorelease];drain();
[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(plot.origin.x+.54*plot.size.width,plot.origin.y+.23*plot.size.height)atTime:host->_time];drain();
run.record(@"viewer-curve-point-is-live-xy-not-a-scalar-only-control",xKey&&yKey&&fabs(value(xKey)-.54)<1e-5&&fabs(value(yKey)-23)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo);
[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(plot.origin.x+.61*plot.size.width,plot.origin.y+.3*plot.size.height)atTime:host->_time];drain();publish();
[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(plot.origin.x+.61*plot.size.width,plot.origin.y+.3*plot.size.height)atTime:host->_time];
auto visibleCurveX=[&](NSString *key)->double{for(NSDictionary *p in [curve performSelector:@selector(curvePoints)])if([p[@"xKey"]isEqual:key])return [p[@"x"]doubleValue];return NAN;};
BOOL pendingStays=fabs(visibleCurveX(xKey)-.61)<1e-5;
drain();[controls prepareWithSize:size scale:1 atTime:host->_time];
run.record(@"viewer-curve-release-never-exposes-the-stale-plot-before-or-after-write",pendingStays&&fabs(visibleCurveX(xKey)-.61)<1e-5);
publish();
run.record(@"viewer-curve-final-release-commits-both-axes-with-one-undo",fabs(value(xKey)-.61)<1e-5&&fabs(value(yKey)-9)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
undo=base->_undoStarts;NSDictionary *deleteArea=areaFor(curve,@"deletePoint",nil);click(deleteArea);drain();publish();
run.record(@"viewer-curve-delete-deactivates-the-selected-slot",deleteArea&&value(xKey)==-1&&value(yKey)==0&&base->_undoStarts==undo+1);
+2 -2
查看文件
@@ -81,7 +81,7 @@
return;
}
[NSGraphicsContext saveGraphicsState];NSRectClip(r);
NSData *rawHistogram=_snapshot[@"histogram"];const DYHistogram *hist=rawHistogram.length==sizeof(DYHistogram)?(const DYHistogram*)rawHistogram.bytes:nullptr;
NSData *rawHistogram=[_bridge canvasHistogramAtTime:_time];const DYHistogram *hist=rawHistogram.length==sizeof(DYHistogram)?(const DYHistogram*)rawHistogram.bytes:nullptr;
if(hist&&hist->samples){uint32_t peak=1;for(int c=0;c<4;c++)if(_channel==0||c==_channel)for(int b=0;b<256;b++)peak=MAX(peak,hist->bins[c][b]);NSArray *colors=@[ink,NSColor.systemRedColor,NSColor.systemGreenColor,NSColor.systemBlueColor];for(int c=3;c>=0;c--){if(_channel&&c!=_channel)continue;NSBezierPath *area=[NSBezierPath bezierPath];[area moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];for(int b=0;b<256;b++)[area lineToPoint:NSMakePoint(NSMinX(r)+b/255.*r.size.width,NSMaxY(r)-sqrt(hist->bins[c][b]/double(peak))*r.size.height*.86)];[area lineToPoint:NSMakePoint(NSMaxX(r),NSMaxY(r))];[area closePath];[[colors[c]colorWithAlphaComponent:c==0?.08:.2]setFill];[area fill];}}
[[ink colorWithAlphaComponent:.16]setStroke];NSBezierPath*grid=[NSBezierPath bezierPath];grid.lineWidth=.5*s;
for(int i=0;i<5;i++){CGFloat x=r.origin.x+r.size.width*i/4,y=r.origin.y+r.size.height*i/4;[grid moveToPoint:NSMakePoint(x,NSMinY(r))];[grid lineToPoint:NSMakePoint(x,NSMaxY(r))];[grid moveToPoint:NSMakePoint(NSMinX(r),y)];[grid lineToPoint:NSMakePoint(NSMaxX(r),y)];}[grid stroke];
@@ -130,5 +130,5 @@
NSDictionary*values=@{xKey:@(x),yKey:@(y)};[_draftValues addEntriesFromDictionary:values];[_bridge changeValues:values];
}
- (void)deleteSelectedPoint{
if(!_selectedX)return;for(NSDictionary*point in [self curvePoints])if([point[@"xKey"]isEqual:_selectedX]){NSString*x=point[@"xKey"],*y=point[@"yKey"];[_bridge beginParameters:@[[self descriptorForKey:x],[self descriptorForKey:y]]node:_nodeID values:@{x:@([self graphicValue:x]),y:@([self graphicValue:y])}atTime:_time];[_bridge changeValues:@{x:@(-1),y:@0}];[_bridge endGesture];break;}[_selectedX release];_selectedX=nil;
if(!_selectedX)return;for(NSDictionary*point in [self curvePoints])if([point[@"xKey"]isEqual:_selectedX]){NSString*x=point[@"xKey"],*y=point[@"yKey"];[_bridge beginParameters:@[[self descriptorForKey:x],[self descriptorForKey:y]]node:_nodeID values:@{x:@([self graphicValue:x]),y:@([self graphicValue:y])}atTime:_time];NSDictionary *values=@{x:@(-1),y:@0};[_bridge changeValues:values];[self finishCurveWithValues:values];break;}[_selectedX release];_selectedX=nil;
}
@@ -15,16 +15,20 @@
// incomplete samples are rejected as a unit, before the first host write.
- (void)changeValues:(NSDictionary<NSString*,NSNumber*>*)values;
- (void)endGesture;
- (uint64_t)endCurveGesture;
- (BOOL)gesturePending:(uint64_t)gesture;
// Call before the owning plug-in releases this object during teardown.
- (void)invalidate;
- (void)requestWorkspace;
- (void)requestWorkspacePage:(NSString *)page;
- (void)requestMask:(NSInteger)kind;
- (void)requestTool:(NSString*)type;
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time;
- (void)requestWhiteBalanceAtTime:(CMTime)time;
@property(nonatomic,retain) DYRenderer *renderer;
- (NSData*)canvasHistogramAtTime:(CMTime)time;
- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time;
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
- (void)changeSpider:(NSData*)mesh;
- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time;
@end
static BOOL DYViewerSameValue(double a,double b) {
@@ -61,7 +65,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
NSDictionary *_snapshot,*_sourceDocument;NSString *_selectedNode;
CMTime _snapshotTime;
BOOL _invalidated,_validationScheduled;
uint64_t _requestSequence,_requestedGesture;
uint64_t _requestSequence,_requestedGesture,_completedGesture;
// The fields below are confined to the main queue.
id<PROAPIAccessing> _writerHost,_writerTarget;
@@ -72,6 +76,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
uint64_t _writerGesture;
BOOL _writerUndoOpen,_writerSpider; NSData *_writerLastMesh;
}
@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;
}
@@ -79,14 +84,21 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
// invalidate enqueues closure before the owner releases its final reference;
// the queued block keeps the bridge alive until its host group is closed.
NSCAssert(!_writerUndoOpen,@"Viewer parameter group must be closed before teardown");
[NSNotificationCenter.defaultCenter removeObserver:self];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release];
[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release];
[_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[super dealloc];
}
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time {
@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"spider"]=assets.spiderMesh?:[NSData data];if(histogram)next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];}
- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time {
@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"spider"]=assets.spiderMesh?:[NSData data];[_snapshot release];_snapshot=[next copy];}
}
- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time {
if(histogram.length!=sizeof(DYHistogram))return;@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];}
- (NSData*)canvasHistogramAtTime:(CMTime)time {
return [_renderer canvasHistogramAtTime:time];
}
- (void)requestWhiteBalanceAtTime:(CMTime)time {
if(!CMTIME_IS_NUMERIC(time))return;
dispatch_async(dispatch_get_main_queue(),^{
id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}
if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerWhiteBalanceRequested" object:manager userInfo:@{@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}];
});
}
- (void)requestTool:(NSString*)type {
if(![DYToolTypes()containsObject:type])return;
@@ -121,9 +133,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
NSData *bytes=[NSData dataWithBytes:uniforms length:sizeof(*uniforms)];BOOL validate=NO;
@synchronized(self){
if(!_invalidated){
NSData *sameHistogram=CMTimeCompare(_snapshotTime,time)==0?[_snapshot[@"histogram"]retain]:nil;
[_snapshot release];_snapshot=[@{@"uniforms":bytes,@"document":frozen,@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch)}copy];
if(sameHistogram){NSMutableDictionary *withHistogram=[[_snapshot mutableCopy]autorelease];withHistogram[@"histogram"]=sameHistogram;[_snapshot release];_snapshot=[withHistogram copy];[sameHistogram release];}
[_sourceDocument release];_sourceDocument=[document retain];_snapshotTime=time;
if(_requestedGesture&&!_validationScheduled){_validationScheduled=YES;validate=YES;}
}
@@ -329,9 +339,55 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
if(gesture)dispatch_async(dispatch_get_main_queue(),^{[self writeValues:frozen gesture:gesture];});
[frozen release];
}
- (void)endGesture {
- (void)refreshSavedCurve {
if(![_writerType isEqual:@"curve"])return;
id<FxCustomParameterActionAPI_v4> action=[_writerHost apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
id<FxParameterRetrievalAPI_v6> get=[_writerHost apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
BOOL base=[_writerNode hasPrefix:@"base:"];
NSMutableDictionary *values=[NSMutableDictionary dictionary];
NSDictionary *document=nil;
[action startAction:self];@try{
if(CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0)return;
if(base)for(NSDictionary *d in _writerDescriptors){
double value=NAN;
if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!std::isfinite(value))return;
values[d[@"offset"]]=@(value);
}else document=DYReadTools(_writerHost,_writerTime).document;
}@finally{[action endAction:self];}
@synchronized(self){
if(_invalidated||!_snapshot||CMTimeCompare(_snapshotTime,_writerTime)!=0)return;
NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];
if(base){
DYUniforms uniforms;
[next[@"uniforms"] getBytes:&uniforms length:sizeof(uniforms)];
for(NSNumber *offset in values)*(float*)((uint8_t*)&uniforms+offset.unsignedIntegerValue)=[values[offset]floatValue];
next[@"uniforms"]=[NSData dataWithBytes:&uniforms length:sizeof(uniforms)];
}else if(document){
next[@"document"]=document;
[_sourceDocument release];_sourceDocument=nil;
}
[_snapshot release];_snapshot=[next copy];
}
}
- (uint64_t)finishGestureRefreshingCurve:(BOOL)refresh {
uint64_t gesture;@synchronized(self){gesture=_requestedGesture;_requestedGesture=0;}
if(gesture)dispatch_async(dispatch_get_main_queue(),^{if(self->_writerGesture==gesture)[self closeWriter];});
if(gesture)dispatch_async(dispatch_get_main_queue(),^{
if(self->_writerGesture==gesture){
if(refresh)[self refreshSavedCurve];
[self closeWriter];
}
@synchronized(self){self->_completedGesture=MAX(self->_completedGesture,gesture);}
});
return gesture;
}
- (void)endGesture {
[self finishGestureRefreshingCurve:NO];
}
- (uint64_t)endCurveGesture {
return [self finishGestureRefreshingCurve:YES];
}
- (BOOL)gesturePending:(uint64_t)gesture {
@synchronized(self){return !_invalidated&&gesture>_completedGesture;}
}
- (void)invalidate {
@synchronized(self){if(_invalidated)return;_invalidated=YES;_requestedGesture=0;_apiManager=nil;}
@@ -5,7 +5,6 @@
@property(nonatomic,retain) DYViewerParameterBridge *bridge;
@property(nonatomic,copy) NSString *toolType;
@property(nonatomic) BOOL visible;
- (void)setInitialPosition:(NSPoint)position;
- (void)setViewport:(NSRect)viewport;
- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time;
- (void)draw;
@@ -21,18 +20,26 @@
NSString *_nodeID,*_toolType,*_selectedX;NSMutableDictionary *_draftValues;NSInteger _channel,_hslAxis,_selectedSpider;NSData *_spiderDraft;BOOL _graphMode,_visible;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft,_positioned,_movingPanel;NSPoint _position,_panelStart;
NSInteger _page,_catalogPage,_capacity,_catalogCapacity,_hover,_pressed;NSPoint _down;NSDictionary *_captured;
double _draftValue,_downValue;CGFloat _knobOffset;CMTime _time,_downTime;
NSDictionary *_releasedCurveValues;uint64_t _curveCommit;CMTime _curveCommitTime;
}
@synthesize bridge=_bridge,toolType=_toolType,visible=_visible;
- (void)setInitialPosition:(NSPoint)p{_position=p;_positioned=YES;}
- (instancetype)init{if((self=[super init])){_areas=[NSMutableArray new];_nodeID=[@"base:base" copy];_scale=1;_open=YES;_visible=YES;_graphMode=YES;_selectedSpider=-1;_draftValues=[NSMutableDictionary new];_time=_downTime=kCMTimeInvalid;}return self;}
- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_spiderDraft release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_toolType release];[_selectedX release];[_draftValues release];[_captured release];[super dealloc];}
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;if(_pressed)[_bridge endGesture];[_bridge release];_bridge=[bridge retain];_pressed=0;_dragging=NO;_movingPanel=NO;[_captured release];_captured=nil;}
- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_spiderDraft release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_toolType release];[_selectedX release];[_draftValues release];[_releasedCurveValues release];[_captured release];[super dealloc];}
- (void)clearReleasedCurve{[_releasedCurveValues release];_releasedCurveValues=nil;_curveCommit=0;}
- (void)finishCurveWithValues:(NSDictionary*)values{
[self clearReleasedCurve];
_releasedCurveValues=[values copy];_curveCommitTime=_time;
_curveCommit=[_bridge endCurveGesture];
}
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];[self clearReleasedCurve];[_bridge release];_bridge=[bridge retain];}
- (BOOL)capturing{return _pressed!=0;}
- (BOOL)finishCapture{BOOL had=_pressed!=0;if(had)[_bridge endGesture];_pressed=0;_hasDraft=NO;[_spiderDraft release];_spiderDraft=nil;[_draftValues removeAllObjects];_movingPanel=NO;_dragging=NO;[_captured release];_captured=nil;return had;}
- (NSDictionary*)descriptorForKey:(NSString*)key{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;}
- (NSDictionary*)node{for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:_nodeID])return n;return nil;}
- (double)valueForDescriptor:(NSDictionary*)d{
if(_pressed&&_draftValues[d[@"key"]])return [_draftValues[d[@"key"]]doubleValue];
NSNumber *released=_releasedCurveValues[d[@"key"]];
if(released)return released.doubleValue;
if(_hasDraft&&_captured&&[_captured[@"descriptor"][@"pid"]isEqual:d[@"pid"]]&&_pressed)return _draftValue;
NSDictionary*n=[self node];DYUniforms u;NSData*raw=_snapshot[@"uniforms"];if(raw.length!=sizeof(u))return [d[@"default"]doubleValue];
if([_nodeID hasPrefix:@"base:"])[raw getBytes:&u length:sizeof(u)];else u=DYToolUniforms(n[@"layer"]);
@@ -45,6 +52,7 @@
- (void)prepareWithSize:(NSSize)canvasSize scale:(CGFloat)scale atTime:(CMTime)time{
_size=canvasSize;NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,canvasSize.width,canvasSize.height)):NSMakeRect(0,0,canvasSize.width,canvasSize.height);NSSize size=viewport.size;_scale=MAX(.6,MIN(MAX(1.,scale),MIN(size.width/360.,size.height/230.)));_time=time;
if(_pressed&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_downTime)!=0)){[self finishCapture];}
if(_releasedCurveValues&&(!_curveCommit||CMTimeCompare(time,_curveCommitTime)!=0||![_bridge gesturePending:_curveCommit]))[self clearReleasedCurve];
[_snapshot release];_snapshot=[[_bridge snapshotAtTime:time]retain];NSDictionary*doc=_snapshot[@"document"];
if(doc){NSMutableArray*nodes=[NSMutableArray array];NSMutableDictionary*counts=[NSMutableDictionary dictionary];
for(NSString*ID in DYToolDisplayOrder(doc?:@{})){
@@ -53,8 +61,8 @@
NSInteger count=[counts[type]integerValue];counts[type]=@(count+1);if(!base)title=[title stringByAppendingFormat:@" · %ld",(long)(count+1)];
[nodes addObject:@{@"id":ID,@"type":type,@"title":title,@"layer":layer?:@{}}];
}[_nodes release];_nodes=[nodes copy];
NSString *selected=_snapshot[@"selectedNode"];for(NSDictionary *candidate in _nodes)if([candidate[@"id"]isEqual:selected]&&![_nodeID isEqual:selected]){[self finishCapture];[_nodeID release];_nodeID=[selected copy];[_selectedX release];_selectedX=nil;break;}
if(![self node]){[self finishCapture];[_nodeID release];_nodeID=_nodes.count?[_nodes[0][@"id"]copy]:nil;_page=0;[_selectedX release];_selectedX=nil;}}
NSString *selected=_snapshot[@"selectedNode"];for(NSDictionary *candidate in _nodes)if([candidate[@"id"]isEqual:selected]&&![_nodeID isEqual:selected]){[self finishCapture];[self clearReleasedCurve];[_nodeID release];_nodeID=[selected copy];[_selectedX release];_selectedX=nil;break;}
if(![self node]){[self finishCapture];[self clearReleasedCurve];[_nodeID release];_nodeID=_nodes.count?[_nodes[0][@"id"]copy]:nil;_page=0;[_selectedX release];_selectedX=nil;}}
NSString*type=[self node][@"type"]?:_toolType;NSMutableArray*rows=[NSMutableArray array];
// These are the existing public scalar controls, never hidden curve-slot metadata.
NSArray*sections=[type isEqual:@"base"]?@[@"base",@"color"]:type?@[type]:@[];
@@ -71,10 +79,13 @@
[self addArea:NSMakeRect(center.x-11*s,center.y-11*s,22*s,22*s) part:22401 kind:@"lensCenter" title:@"" descriptor:nil index:0];
[self addArea:NSMakeRect(strength.x-11*s,strength.y-11*s,22*s,22*s) part:22402 kind:@"lensStrength" title:@"" descriptor:nil index:0];return;
}
w=MIN(260*s,size.width-2*margin);CGFloat h=MIN(214*s,size.height-2*margin),x=viewport.origin.x+margin,top=viewport.origin.y+margin;
w=MIN(260*s,size.width-2*margin);
CGFloat h=MIN(214*s,size.height-2*margin-33*s);
CGFloat x=NSMaxX(viewport)-margin-w,top=NSMaxY(viewport)-margin-33*s-h;
if(_positioned){x=MAX(viewport.origin.x+margin,MIN(NSMaxX(viewport)-margin-w,viewport.origin.x+_position.x*size.width));top=MAX(viewport.origin.y+margin,MIN(NSMaxY(viewport)-margin-h,viewport.origin.y+_position.y*size.height));}
_panel=NSMakeRect(x,top,w,h);if(!_snapshot||![self node]||w<100*s||h<65*s)return;
for(NSInteger c=0;c<4;c++)[self addArea:NSMakeRect(x+c*24*s,top,23*s,18*s)part:22010+c kind:@"channel" title:@[@"Y",@"R",@"G",@"B"][c] descriptor:nil index:c];
[self addArea:NSMakeRect(x+98*s,top,MAX(1,w-121*s),20*s)part:20000 kind:@"curveGrip" title:@"⠿" descriptor:nil index:0];
[self addArea:NSMakeRect(x,top+22*s,w,MAX(24*s,h-22*s))part:22000 kind:@"curvePlot" title:@"" descriptor:nil index:0];
if(_selectedX)[self addArea:NSMakeRect(NSMaxX(_panel)-19*s,top,19*s,18*s)part:22020 kind:@"deletePoint" title:@"×" descriptor:nil index:0];return;
}
@@ -165,8 +176,11 @@
if([_captured[@"kind"]isEqual:@"slider"]&&_snapshot){NSRect t=[self trackForArea:_captured];if(NSPointInRect(p,NSInsetRect(t,-8*_scale,-8*_scale))){_downValue=[self valueForDescriptor:d];_draftValue=_downValue;_hasDraft=YES;[_bridge beginParameter:d node:_nodeID value:_downValue atTime:time];CGFloat knob=t.origin.x+(_downValue-[d[@"min"]doubleValue])/([d[@"max"]doubleValue]-[d[@"min"]doubleValue])*t.size.width;_knobOffset=fabs(p.x-knob)<=8*_scale?p.x-knob:0;if(fabs(p.x-knob)>8*_scale)[self applySliderPoint:p];}}return YES;
}
if(!_pressed)return NO;
if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&[_captured[@"kind"]isEqual:@"open"])[self movePanelToPointer:p];if(_dragging&&([self graphicKind:_captured[@"kind"]]))[self updateGraphicAt:p];if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;}
if(type==NSEventTypeLeftMouseUp){if([_captured[@"kind"]isEqual:@"open"]&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL graphic=[self graphicKind:_captured[@"kind"]];if(graphic){if(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)[self updateGraphicAt:p];[_bridge endGesture];}BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed;
NSString *kind=_captured[@"kind"];
BOOL moveHandle=[kind isEqual:@"open"]||[kind isEqual:@"curveGrip"];
BOOL movedPointer=_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale;
if(type==NSEventTypeLeftMouseDragged){_dragging=movedPointer;if(_dragging&&moveHandle)[self movePanelToPointer:p];if(_dragging&&[self graphicKind:kind])[self updateGraphicAt:p];if(_dragging&&_hasDraft&&[kind isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;}
if(type==NSEventTypeLeftMouseUp){if(moveHandle&&movedPointer)[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL graphic=[self graphicKind:kind];if(graphic){if(movedPointer)[self updateGraphicAt:p];if([kind isEqual:@"curvePlot"]&&_draftValues.count)[self finishCurveWithValues:_draftValues];else [_bridge endGesture];}BOOL slider=[kind isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed;
if(slider){if(_hasDraft&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self applySliderPoint:p];[_bridge endGesture];}
_pressed=0;_dragging=NO;_movingPanel=NO;_hasDraft=NO;[_captured release];_captured=nil;[_spiderDraft release];_spiderDraft=nil;[_draftValues removeAllObjects];if(!moved&&!slider&&!graphic&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;}
return NO;
+2 -2
查看文件
@@ -7,8 +7,8 @@
- (void)changeValue:(double)value;
- (void)beginParameters:(NSArray<NSDictionary*>*)descriptors node:(NSString*)nodeID values:(NSDictionary<NSString*,NSNumber*>*)values atTime:(CMTime)time;
- (void)changeValues:(NSDictionary<NSString*,NSNumber*>*)values;
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time;
- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time;
- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time;
- (NSData*)canvasHistogramAtTime:(CMTime)time;
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
- (void)changeSpider:(NSData*)mesh;
- (void)endGesture;
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.12.0</string>
<string>1.12.1</string>
<key>CFBundleVersion</key>
<string>79</string>
<string>81</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.12.0</string>
<string>1.12.1</string>
</dict>
<dict>
<key>className</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.12.0</string>
<string>1.12.1</string>
<key>CFBundleVersion</key>
<string>79</string>
<string>81</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+1 -1
查看文件
@@ -2,7 +2,7 @@
更新日期:2026-11-05,Asia/Shanghai。
当前正式安装为 **1.12.0(79)统一工作区与共享蒙版**,编译源码beccf2fc01f8dc06c5d3d505f88289885d209bc8,834项正式原生检查及本轮FCP反馈验收通过。实际交付进度以 `verification/Delivery.json`、`HostFeedback78.json`、`HostFeedback79.json`、`Package.json`、`Release.json` 为准;安装包及Release完成前不宣称整体交付完成。新增最近LUT快捷缩略图与左下横排画布图标,肤色线、片尾时间修复和真实跟踪误差见research/WorkspaceFeedback-20261105.md。
当前正式安装为 **1.12.0(79)统一工作区与共享蒙版**,编译源码beccf2fc01f8dc06c5d3d505f88289885d209bc8,834项正式原生检查及本轮FCP反馈验收通过。实际交付进度以 `verification/Delivery.json`、`HostFeedback78.json`、`HostFeedback79.json`、`Package.json`、`Release.json` 为准;正式安装包签名、公证、20项验包、Release389草稿与发布后完整下载校验均完成。新增最近LUT快捷缩略图与左下横排画布图标,肤色线、片尾时间修复和真实跟踪误差见research/WorkspaceFeedback-20261105.md。
画布**左侧**常驻矩形、椭圆、钢笔蒙版入口,另有曲线、畸变、肤色、LUT;底部“控制面板”打开统一工作区。HSL、蜘蛛盘、色轮和通用参数浮卡已退出画布。曲线只显示透明曲线/直方图及必要通道,畸变直接操作网格,肤色切换真实保护范围显示,LUT直接进入原缩略图浏览器。