比较提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
fe7ddbd6f8 | ||
|
|
8c62e4b5bd | ||
|
|
55b66a358c | ||
|
|
2ba0a415ae | ||
|
|
998a983884 | ||
|
|
8e00968bf0 | ||
|
|
0328399f52 | ||
|
|
a06a3a3914 | ||
|
|
c55f3343ea | ||
|
|
3fd0152240 | ||
|
|
94151cad7d | ||
|
|
335ef7a5ee | ||
|
|
386e6d228b | ||
|
|
bea51d2297 | ||
|
|
3373a5365e | ||
|
|
fa82014266 | ||
|
|
504e6d98e3 |
没有与搜索条件相匹配的文件
@@ -0,0 +1,16 @@
|
||||
大鱼调色 1.8.3(62)公测
|
||||
|
||||
新增“霓虹炫彩”主题:分模块的多色渐变:一级紫红、蜘蛛盘青蓝、基础珊瑚玫红、HSL绿青、曲线青蓝等;大面积卡片、标题及图标均跟随各模块配色。洋红到青色渐变重点按钮与滑杆,白色文字。未设置主题时默认使用炫彩;原六种主题和编号保留,可随时切换。
|
||||
|
||||
曲线编辑器新增真实分析画面的直方图叠层,显示亮度与 RGB 分布;RGB 页叠加四通道,红、绿、蓝页只显示对应通道。支持“直方图”开关,曲线控制点仍可直接添加、拖动、删除。主题、通道和叠层显示不改变调色参数或预设。
|
||||
|
||||
直方图复用 320×180 分析缓存、256 档,最多每秒2次更新,播放或移动播放头时刷新。透明与非有限像素不计,范围外值归到端点,共同峰值平方根缩放。原流程取一级 CST/输入 LUT 后,新 CMS 取显示输出转换后、SDR修饰前;它不是最终输出示波器,也不是每个独立曲线层的即时输入。工具提示可查看来源与范围。
|
||||
|
||||
色彩管理、调色数学和模板默认保持不变。系统要求 Apple Silicon、macOS14.6 或更新。唯一正式位置 /Library/Plug-Ins/FxPlug/大鱼调色.app。
|
||||
|
||||
605项正式原生检查与FCP12.4实机通过;真实视频与色块分布、四通道/显隐、冷重开与8,590字节原预设一致验证完成。APP与PKG均已正式签名、公证Accepted、粘附票据;PKG通过20项展开验包。本轮APP独立正式安装验收,未重复执行PKG安装脚本。
|
||||
|
||||
安装包:大鱼调色-1.8.3.pkg
|
||||
字节数:43010609
|
||||
SHA-256:518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53
|
||||
实际编译源码:3fd015224037df944b428684c43ec8ec7accea85
|
||||
@@ -0,0 +1,14 @@
|
||||
大鱼调色 1.8.4(64)公测
|
||||
|
||||
重新收敛“霓虹炫彩”配色。移除各模块独立的红、绿、橙等高饱和色块,卡片和标题统一为接近黑色、轻微暖紫倾向的低饱和表面,图标使用统一的柔和银灰紫色。使用者认可的“保存预设”按钮继续保留原有粉紫到青色渐变,渐变强调集中在主按钮、滑杆和顶部细线。
|
||||
|
||||
在用户认可的近黑底色上,模块名称按钮以统一的轻粉青渐变、细边及更亮展开态强化显示;蒙版、删除、再加一层按钮增加低对比按钮底与清晰图标。
|
||||
|
||||
不改变现有功能、参数、色彩管理、模板或直方图算法。亮度/RGB直方图继续使用320×180分析画面、256档、最多2Hz刷新,支持单通道与显隐;仍不是最终输出或HDR示波器。
|
||||
|
||||
适用Apple Silicon,macOS14.6或更新。唯一正式安装 /Library/Plug-Ins/FxPlug/大鱼调色.app。605项正式原生检查通过;FCP12.4实际检查模块按钮展开/折叠、图层操作辨识与直方图数据,前后8,590字节预设逐字节一致。用户认可的候选63底色代码完整保留。APP与PKG均已正式签名、公证Accepted并粘附票据,PKG通过20项展开验包。本轮APP独立正式安装验收,没有重复执行PKG安装脚本。
|
||||
|
||||
包名:大鱼调色-1.8.4.pkg
|
||||
字节数:43009859
|
||||
SHA-256:59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660
|
||||
实际编译源码:55b66a358cf4c52eeb6ad89acde822cb73be3137
|
||||
@@ -1,8 +1,14 @@
|
||||
# 大鱼调色
|
||||
|
||||
原生 FxPlug 4 调色器,当前公测版本 **1.8.2(59)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
原生 FxPlug 4 调色器,当前公测版本 **1.8.4(64)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
|
||||
|
||||
1.8.2 将高级色彩管理收进顶部“颜色设置”按钮,默认收起且不占调色区域;展开和收起只改变显示,不写调色参数、不产生撤销项。新增“黑金渐变”主题:黑色与深炭色背景、亮金文字和小范围静态光晕;未设置主题时默认黑金,已明确保存的五种旧主题继续保留,可随时切换。增加对比度或减少透明度时不绘制文字光晕。窄栏使用两排操作按钮。
|
||||
1.8.4 收敛“霓虹炫彩”配色:所有模块统一使用用户已认可的低饱和近黑表面,去掉红绿橙色块。保存预设保留原粉紫到青色渐变;模块名称按钮以统一轻渐变、细边和更亮展开态强化显示,蒙版/删除/再加一层按钮增加克制的按钮底。原主题编号、功能、直方图、CMS及预设保持。
|
||||
|
||||
[1.8.4安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.4-refined-neon-20261104)。正式验证见 verification/HostRefined1.8.4.json。
|
||||
|
||||
1.8.3加入的曲线直方图继续使用真实320×180分析缓存、256档、最多2Hz,RGB叠加亮度和三个色彩通道;可切单通道及显隐。原流程源为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前,非最终输出/HDR示波器或每层的即时曲线输入。用户已否定1.8.3的分模块彩虹色块,后续不要恢复该视觉方案。
|
||||
|
||||
历史1.8.2 将高级色彩管理收进顶部“颜色设置”按钮,默认收起且不占调色区域;展开和收起只改变显示,不写调色参数、不产生撤销项。新增“黑金渐变”主题:黑色与深炭色背景、亮金文字和小范围静态光晕;未设置主题时默认黑金,已明确保存的五种旧主题继续保留,可随时切换。增加对比度或减少透明度时不绘制文字光晕。窄栏使用两排操作按钮。
|
||||
|
||||
默认色彩流程仍为“原有流程”,已保存的 v2/v3 工程继续使用原设置。下文的高级色彩流程均从“颜色设置”展开选择。色轮与通道曲线保留实际色相,界面主题不改变图像颜色。
|
||||
|
||||
|
||||
+27
@@ -1,3 +1,28 @@
|
||||
# 1.8.4(64)统一底色与模块按钮强化
|
||||
|
||||
仓库 https://dayu.media/git/dayu/dayu-color.git,main。实际编译源码55b66a358cf4c52eeb6ad89acde822cb73be3137,发行标签v1.8.4-refined-neon-20261104;完整标签SHA和下载校验见Release.json。正式位置/身份/依赖沿用下文,完整当前交接见大鱼调色FxPlug4交接.md。
|
||||
|
||||
用户否定1.8.3的红绿橙色块;候选63的统一低饱和近黑底色已获认可,最终64保持底色代码不变,只强化模块名称轻渐变/细边/展开态及右侧图层操作按钮。保存预设保留原粉紫到青色渐变。不要恢复历史彩虹卡片或深蓝灰方案。
|
||||
|
||||
605项正式原生检查和FCP12.4界面/预设前后一致检查通过;详见HostRefined1.8.4.json。正式APP公证34af6e05-cba5-4031-9184-762f758c0889,PKG公证2632037d-733a-4092-8323-12dcf264c022均Accepted;票据及Gatekeeper通过,PKG20项展开验包。APP独立正式替换验收,未重复运行安装脚本。
|
||||
|
||||
发行包../发行包/大鱼调色-1.8.4.pkg,43009859字节,SHA-256 59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660。源码、安装包、标签、完整下载与恢复范围见对应verification报告。未修改网站文章或自动更新清单。
|
||||
|
||||
---
|
||||
|
||||
# 1.8.3(62)多色渐变与曲线直方图
|
||||
|
||||
仓库 https://dayu.media/git/dayu/dayu-color.git,main。编译源码3fd015224037df944b428684c43ec8ec7accea85;发行标签v1.8.3-neon-histogram-20261104。正式位置、身份、依赖及恢复步骤沿用下文;当前详细交接见大鱼调色FxPlug4交接.md。标签/附件最终完整SHA见verification/Release.json,包校验见Package.json。
|
||||
|
||||
最终主题ID6为分模块饱和双色渐变,无统一紫底或深蓝灰底;候选60/61未发布包。605项正式原生检查、FCP真实视频直方图与冷重开、原8,590字节预设逐字节一致通过。APP公证706a58bb-2fa4-4b1e-b392-de60d93aef49为Accepted。独立远程源码与版本标签恢复范围见NeonRecovery1.8.3.json;本轮未宣称独立重编全部依赖。
|
||||
|
||||
直方图为320×180分析缓存、256档、最多2Hz,非最终输出/HDR示波器或每层即时输入;来源和显示范围见检查框工具提示。源码/模板数学和CMS默认保持。APP独立正式替换并验收,PKG按展开验包记录,本轮未重复执行安装脚本。网站与自动更新清单未修改。
|
||||
|
||||
|
||||
Release384/附件28已发布,草稿浏览器完整下载和发布后再次完整下载均校验通过;版本标签提交a06a3a3914efb6970858baa9cfc6bed62549f09e。安装包43,010,609字节,SHA-256 518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53。远程独立检出验证475个跟踪文件及8个依赖归档,编译输入与标签一致;临时clone、下载副本、生成APP和三个候选/旧安装备份已按记录清理。
|
||||
|
||||
---
|
||||
|
||||
# 1.8.2(59)黑金界面与高级颜色设置
|
||||
|
||||
仓库 https://dayu.media/git/dayu/dayu-color.git,main。实际编译源码 da03d16c7efa87a5d230467334ec73f9a3a12e54;发行标签 v1.8.2-blackgold-20261104。标签包括最终 Package.json;发布后的 Release.json 和最后恢复/清理核验保存在后续 main,标签中的旧 Release.json 属于上版历史。本版安装包以本版 Release 页面和后续 main 的发布记录为准。
|
||||
@@ -10,6 +35,8 @@
|
||||
|
||||
安装包:../发行包/大鱼调色-1.8.2.pkg,43006067 字节,SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded。网站文章与自动更新后端未改。
|
||||
|
||||
正式 Release383/附件27已发布,标签完整 SHA:f4bacfbd75404a69f51127356fc861a44c0c27e9。草稿浏览器下载及发布后完整下载均为43,006,067字节,SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded。下载副本和独立恢复副本在验证后清理;完整记录见 verification/Release.json、CompactUICleanup1.8.2.json。
|
||||
|
||||
---
|
||||
|
||||
# 1.8.1(57)CST 修正交付
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
# 大鱼调色 FxPlug4 交接
|
||||
|
||||
2026-11-02 当前正式安装为 **1.7.3(49)**。本机已复现“更多空间”灰色区域并定位到SDK提供的外层contentView原点偏移;新增坐标对齐修正,首次打开无需绿色按钮。411项原生、27项几何、23项浏览库检查及本机FCP12.4热/冷重开和缩放通过,目标MacBook/FCP12.3仍待使用者复测。详见[修复与边界](research/BrowserMoreSpace1.7.3.md)、[RECOVERY.md](RECOVERY.md)及 `verification/Delivery.json` / `Package.json` / `Release.json`。保留1.7.1 Cube文字行兼容及1.7.0更新/公测诊断。以下保留1.6.0交接历史。
|
||||
|
||||
## 1.6.0交接历史
|
||||
|
||||
后续主 APP 优化入口:[大鱼调色主APP开发交接.md](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md),包含自动更新、登录验证、生产接口只读盘点与待定产品规则;其中自动更新与公测诊断已在1.7.0完成,登录与授权仍未实施。
|
||||
|
||||
2026-11-02,最终正式版 **1.6.0(39)**。本次完成Color Finale本机胶片五组、通道混合器及用户补充的全部八种印片;去掉MOEF作者/网站两行、降低模板格式,并追加一级自动映射默认开启和主标题链接。
|
||||
|
||||
## 正式身份与恢复
|
||||
|
||||
- 唯一APP:`/Library/Plug-Ins/FxPlug/大鱼调色.app`;ID `com.dayu.color` / `com.dayu.color.XPC`,团队B3W25FX5H5。
|
||||
- 实际编译源码:`e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted;签名、票据、Gatekeeper及正式进程路径通过。
|
||||
- 远程:`https://dayu.media/git/dayu/dayu-color.git`,main,最终标签 `v1.6.0-print-looks-20261102`。完整标签SHA及PKG/Release元数据以 `verification/Release.json` 为准;实际编译SHA与文档交付SHA分别记录。
|
||||
- 模板:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`,ozml5.11 / Motion5.4.5,SHA `fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250`。
|
||||
- Apple Silicon/macOS14.6或更新;FCP12.4已验收,旧FCP未实机覆盖。不依赖ColorFinale安装、REA缓存或父插件;无LFS/子模块。
|
||||
|
||||
## 行为与参数
|
||||
|
||||
胶片为减色、晕光、辉光、颗粒、暗角、印片六页。印片默认无:Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30,独立强度。通道混合器为RGB三输出×三输入,保持亮度/饱和度和混合强度。两工具沿用启停、折叠、复位、蒙版、数量标记、区域跟踪、相邻独立层;旧索引、Uniform前缀、LUT、蜘蛛盘和轨迹保留。
|
||||
|
||||
印片追加在五处理后、全胶片混合/原蒙版前;Rec.709线性→AP1/D60→ACEScct→65³原LMT四面体→线性Rec.709。不包含原版任意完整CMS/ODT迁移。旧1296字节前缀保留,追加filmPrint共1312字节;预设v6读v1–v5。纯印片、矩阵和减色可导出Cube;空间/时间效果和蒙版限制保留。原版CI半透明链与产品预乘合同的已测差异详见研究和完整对照报告。
|
||||
|
||||
MOEF仅发布自定义检查器与混合,无作者/网站Rig。全局技能检查器对5.11返回未知版本guard,如实保存;项目级真实原生样本字段验证与当前FCP加载/渲染分别通过。
|
||||
|
||||
FCP新效果、新加一级层及全部还原的自动映射为开启;主标题链接为“更多插件访问 https://dayu.media”,点击已实际打开网站。原生注册默认维持历史0,新MOEF显式value1/default0;旧独立一级层省略值保持0。FCP沿用模板默认的旧主效果实测会变为开启,三组旧预设仅此0→1,其余277项及全部paths/spider/tools载荷保持。不能宣称更改模板默认后旧主效果完全逐字节不变;新手动关闭后已验证冷重开保持。
|
||||
|
||||
## 验收证据
|
||||
|
||||
正式395项原生检查、四尺寸136项原版印片对照通过,固定容差0.0001,最大线性RGB绝对差0.000004828。最终Metal与完整八外观验收的36候选相同。36候选逐个选择八种印片、两层不同印片/强度、椭圆蒙版100键跟踪、折叠标记、删除撤销重做及三段300帧ProRes通过;最终39保留全部自定义载荷,并完成新默认、实际链接、手动开关冷重开8668字节一致及新增1080p100帧正式导出。完整用户文件只在本机fcp-qa缓存,不进Git或PKG。
|
||||
|
||||
- 最终安装:`verification/Delivery.json` / `InstalledSelfTest.json`。
|
||||
- 最终汇总:`verification/HostPrintLooks1.6.0.json`。
|
||||
- 默认/链接/保存:`verification/HostPrimaryDefaults1.6.0.json`。
|
||||
- 八外观完整宿主操作:`verification/HostPrintLooksBuild36.json`。
|
||||
- 算法/原版边界:`research/PrintLooks1.6.0.md` / `verification/PrintLooksReference.json`。
|
||||
- 独立恢复:`verification/PrintLooksRecovery.json`,最终编译节点294文件全字节、full/strict fsck、Release构建395项和模板重建通过。
|
||||
- 最终安装包/上传/标签恢复/清理:`verification/Package.json`、`Release.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
|
||||
最终PKG由PKG工坊签名、公证、票据与20项展开验包;不再运行系统安装器,APP已有独立正式安装和宿主验收。包与Release下载校验值以Package/Release报告为准。
|
||||
|
||||
## 接续方法
|
||||
|
||||
固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。更改模型后运行 `python3 tools/build_template.py --refresh-model --overwrite`,再 `python3 tools/verify_template.py`;更新SkillAudit及摘要。Release用Wrapper Application方案,按全局产品锁/仓库锁约定交付;仅正式已公证位置做用户可见测试。证书/私钥需独立恢复。
|
||||
|
||||
历史35/37/38候选未发布;36的已验PKG在新需求到达后移除,未上传。37公证等待中停止了本地等待,保留ID查询,未重新上传相同产物。38正式验收发现FCP默认行为,39已记录实际边界。既有历史发行包与标签保留。1.5完整交接归档见 `research/handoffs/DayuColorThrough1.5.0-20261102.md`。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
@@ -0,0 +1,160 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
交接日期:2026年11月4日,Asia/Shanghai;本机用户 mac,Mac mini M4。新对话从已交付的 **1.8.2(59)** 继续开发。色彩管理修正、黑金界面、签名公证、正式安装、PKG和Release均已完成,没有挂起的发布步骤;下一轮具体优化以用户的新需求为准。
|
||||
|
||||
先读本文件、[README](/Volumes/备份/大鱼调色/大鱼调色/README.md)和[恢复说明](/Volumes/备份/大鱼调色/大鱼调色/RECOVERY.md)。开发与交付遵循 `/Users/mac/.codex/AGENTS.md` 及用户最新说明。旧交接已逐字节归档到[1.7.3及之前历史](/Volumes/备份/大鱼调色/大鱼调色/research/handoffs/DayuColorThrough1.7.3-20261104.md),其中旧版本号、检查数量和原始规划不是当前状态。
|
||||
|
||||
## 工程和正式版本
|
||||
|
||||
| 项目 | 已核验内容 |
|
||||
| --- | --- |
|
||||
| 实际工程根目录 | `/Volumes/备份/大鱼调色/大鱼调色`,有两层“大鱼调色” |
|
||||
| 工程和方案 | 根目录下 `大鱼调色.xcodeproj`;Wrapper Application,Release |
|
||||
| 平台 | Apple Silicon,最低macOS14.6;本机Xcode27.1、FxPlug SDK4.3.5、Metal Toolchain |
|
||||
| 唯一正式APP | `/Library/Plug-Ins/FxPlug/大鱼调色.app`,1.8.2(59) |
|
||||
| Bundle ID | 外层 `com.dayu.color`;服务 `com.dayu.color.XPC` |
|
||||
| 内部服务 | `/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit` |
|
||||
| 固定构建缓存 | `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color` |
|
||||
| 正式模板 | `/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef` |
|
||||
| 远程和分支 | `https://dayu.media/git/dayu/dayu-color.git`,main,保持现有可见性 |
|
||||
| 实际编译源码 | `da03d16c7efa87a5d230467334ec73f9a3a12e54` |
|
||||
| 发行标签 | `v1.8.2-blackgold-20261104` |
|
||||
| 标签提交 | `f4bacfbd75404a69f51127356fc861a44c0c27e9` |
|
||||
| 交接整理前main | `504e6d98e3a820cc7a896db0a32cd6dcc5741081`,已推送核验;本交接另作后续提交,接手时读取实际HEAD |
|
||||
|
||||
无LFS或子模块。OCIO2.5.2 / ACES1.3 studio-config v2.2.0及8个锁定依赖源码归档保存在仓库;私钥和认证不进Git。外置卷会产生 `._*` 元数据文件,不要混入提交。
|
||||
|
||||
## 用户确定的产品要求
|
||||
|
||||
- 高级色彩管理收进独立“颜色设置”按钮,普通用户默认看不到说明区;收起后不留空白。
|
||||
- 默认继续“原有流程”。已保存的nil、v2、v3工程保持各自处理,展开界面不能改写状态或产生调色撤销项。
|
||||
- 一级CST的输入、工作曲线/色域、输出必须生效。用户明确反对先将Log素材显示还原为Rec.709,再让后续一级转换失去意义。
|
||||
- 黑金为新增默认配色:黑色和深色渐变背景、亮金文字、柔和光晕,保留原来五种主题。
|
||||
- 产品名称、Bundle ID和正式路径保持稳定。用户可见验收使用正式安装位置的已公证版本。
|
||||
|
||||
## 1.8.2界面实现
|
||||
|
||||
检查器为 **AppKit / Objective-C++**,不是SwiftUI。采用FxPlug原位展开区域,没有新增浮动设置窗口。
|
||||
|
||||
顶部四个按钮为保存预设、载入预设、导出LUT、颜色设置。宽度小于320时排成两行;六枚主题色块占原标题区,窄栏隐藏版本小字以免重叠。
|
||||
|
||||
`_colorSettingsExpanded` 是检查器实例内的临时布尔状态。打开和关闭不写模型、不产生宿主撤销项;新建检查器默认收起。隐藏的 `DYManagedColorPanel` 不参与布局高度。说明已缩短,完整条件在工具提示中。
|
||||
|
||||
主题ID0–4依次为深空灰、冰川蓝、薰衣草紫、翡翠绿、琥珀橙;追加ID5黑金渐变。偏好域 `com.dayu.color.preferences`、键 `themeIndex`。没有明确保存偏好或索引非法时使用5;明确保存过的旧选择保留。本机已经通过界面选中黑金。
|
||||
|
||||
黑金背景为不透明静态渐变,金色细边与亮金文字。NSShadow模糊半径1.8、alpha0.30;系统增加对比度或减少透明度时去掉光晕。色轮、通道曲线和媒体预览保留真实色相。
|
||||
|
||||
候选58在FCP实机发现“添加模块”标题漏绘:pullsDown菜单的selectedItem可能为nil。正式59从第一项取标题,并增加实际像素绘制检查。候选58已回滚清理,未制作或发布安装包。后续改共用控件时保留普通按钮、弹出选择器和下拉菜单的差别。
|
||||
|
||||
| 入口 | 职责 |
|
||||
| --- | --- |
|
||||
| [DYInspector.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYInspector.mm) | 顶部按钮、展开状态、卡片、参数控件和窄栏布局 |
|
||||
| [DYManagedColorPanel.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYManagedColorPanel.mm) | 色彩方式、帮助、输入输出字段及有撤销的状态写入 |
|
||||
| [DYTheme.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYTheme.h)、[DYTheme.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYTheme.mm) | 六主题、动态颜色、渐变、光晕、共用AppKit控件 |
|
||||
| [DYCompactUIDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h) | 隐藏高度、模型不变、三栏宽、主题、对比度、文字绘制 |
|
||||
| [界面约定](/Volumes/备份/大鱼调色/大鱼调色/research/ui-blackgold-20261104/brief.md) | 本轮需求及实现选择 |
|
||||
|
||||
## 色彩管理的当前合同
|
||||
|
||||
完整预设格式仍为v7,色彩管理有独立版本。全局方式和一级可见参数各自的责任不要混淆。
|
||||
|
||||
| 状态 | 界面方式 | 行为 |
|
||||
| --- | --- | --- |
|
||||
| nil | 原有流程(默认) | 保留历史链,不自动迁移 |
|
||||
| v2 mode1–3 | 1.8兼容,跟随FCP、相机或LUT输入 | 固定ACEScct/AP1,保护1.8.0已存画面 |
|
||||
| v3 mode4 | 一级CST · 延后输出 | 采用原一级输入、工作域和输出,主输出放在一级层与印片之后 |
|
||||
|
||||
v3严格状态为:
|
||||
|
||||
```json
|
||||
{"version":3,"mode":4,"engine":"Dayu-CST-f32","config":"primary-parameters-v1"}
|
||||
```
|
||||
|
||||
v3主链:**声明的素材编码 → 一级输入CST → 所选工作域一级调色 → 独立一级层 → 印片 → 主输出CST及可选映射 → SDR修饰 → 实际宿主空间**。主输入做曲线与色域转换,不先做Rec.709显示映射。工作空间由原一级工作曲线和工作色域选择,可用DWG/DaVinci Intermediate、ACEScct/AP1等现有组合。
|
||||
|
||||
新增独立一级默认继承主工作空间,输入和输出相同、额外映射关闭。`primaryFollow` 为输入/工作/输出三段跟随位,初始7;手动更改某段曲线或色域后该段退出跟随。主工作域变化时,将跟随值写入作者状态,并形成一个宿主撤销组。渲染使用可见参数,不能暗中覆盖。局部CST后按声明的输出域回到主工作域,混合和蒙版在AP1线性中执行。
|
||||
|
||||
印片按需要往返ACEScct/AP1再返回用户工作域。新流程CST/BASIS边界和图像传输为float32;线性工作曲线有明确DI适配。新流程Cube为65³,保留一级声明的输入/输出Gamma或Log编码。旧兼容方式有不同导出合同,不要混用。
|
||||
|
||||
旧基础、HSL等工具仍作为输出后的SDR修饰,没有全部改成场景域或HDR算法。Log/线性码值输出拒绝活跃的SDR修饰;停用项和强度为零的LUT不能误触发拒绝。FxPlug接收到的是上游FCP像素,无法恢复相机LUT、颜色符合或上游裁切已丢失的信息。显式sRGB编解码桥可以是可逆码值载体,不能单凭出现该公式判定链路错误。
|
||||
|
||||
**模板兼容教训:**1.8.1候选56只改模板dataValue,即便defaultVal和原生注册缺省仍为nil,实际FCP也将旧nil实例改成v3。自动启用已回滚,候选56未发布安装包。当前模板与注册缺省均保留原nil,新流程由用户明确选择。不要为了默认启用v3再次直接改模板归档。
|
||||
|
||||
| 入口 | 用途 |
|
||||
| --- | --- |
|
||||
| [DYManagedColor.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYManagedColor.mm) | 状态校验、v3默认值和独立层跟随 |
|
||||
| [DYPrimaryRender.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPrimaryRender.inc.h) | v3工作域、顺序、主输出及SDR接续 |
|
||||
| [DYPrimaryKernels.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPrimaryKernels.inc.h) | v3内核与边界 |
|
||||
| [DYManagedRender.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYManagedRender.inc.h) | v2兼容链 |
|
||||
| [DYRenderer.mm](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYRenderer.mm) | 管线分派、Cube与宿主接入 |
|
||||
| [DYPrimaryDiagnostics.inc.h](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYPrimaryDiagnostics.inc.h) | 高光、局部CST、线性域、负值、导出与旧链回归 |
|
||||
| [float_air_boundary.py](/Volumes/备份/大鱼调色/大鱼调色/tools/float_air_boundary.py) | float32入口出口生成,原入口保留 |
|
||||
| [1.8.1修正设计](/Volumes/备份/大鱼调色/大鱼调色/research/cms-correction-20261104/design.md) | 当前设计依据与模板问题 |
|
||||
| [三款插件调查](/Volumes/备份/大鱼调色/大鱼调色/research/cms-audit-20261103/report.md) | 历史只读分析,当时待办不能直接当作当前未完成项 |
|
||||
|
||||
此前调查对象为 `/Library/Plug-Ins/FxPlug/BASIS.app`、`/Library/Plug-Ins/FxPlug/Colour Space Transform.app`、`/Applications/ColorFinale.app`。已交付运行时不依赖这三款APP或研究缓存。继续研究发行二进制时使用reverse-engineer-anything技能;普通大鱼源码开发直接读仓库。
|
||||
|
||||
## 验证结果和边界
|
||||
|
||||
1.8.2正式安装版595项原生检查通过,含1.8.1的581项及14项界面检查。FCP12.4实机检查六种主题、10次开关、关闭不留空白、原nil项目仍为原流程、v3保持、添加模块菜单可打开及Escape关闭;冷重开后黑金保留、设置收起。
|
||||
|
||||
更新前、操作后和冷重开后三份完整v3预设均为8,590字节、逐字节一致,SHA-256为 `1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982`。1.8.2没有改渲染算法、模板或预设格式。
|
||||
|
||||
1.8.1另有独立高光参考、负值/超白、局部CST、独立层跟随与撤销重做、两代预设、65³ Cube、1080p25四秒100帧ProRes、两个项目XML1.12回读。受控宿主Log样本为带sRGB标签的16-bit PNG码值载体,不代表任意真实相机的上游路由或完整HDR监看链。1.8.2实际FCP为正常栏宽,280/320/400布局由原生假宿主验证;没有切换系统辅助显示选项。
|
||||
|
||||
独立远程克隆Release重建通过595项,8个依赖归档的大小和摘要通过;复用已验证静态依赖缓存,没有全依赖冷构建。最终标签独立检出,编译输入与实际编译提交一致。临时恢复目录、生成APP、旧安装备份、提交ZIP和浏览器下载副本均已清理。
|
||||
|
||||
| 证据 | 文件 |
|
||||
| --- | --- |
|
||||
| 正式安装、签名、公证及实际源码 | [Delivery.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Delivery.json) |
|
||||
| 595项原生结果 | [InstalledSelfTest.json](/Volumes/备份/大鱼调色/大鱼调色/verification/InstalledSelfTest.json) |
|
||||
| 当前FCP验收 | [HostCompactUI1.8.2.json](/Volumes/备份/大鱼调色/大鱼调色/verification/HostCompactUI1.8.2.json) |
|
||||
| CST数值与宿主 | [PrimaryCSTNumerical1.8.1.json](/Volumes/备份/大鱼调色/大鱼调色/verification/PrimaryCSTNumerical1.8.1.json)、[HostPrimaryCST1.8.1.json](/Volumes/备份/大鱼调色/大鱼调色/verification/HostPrimaryCST1.8.1.json) |
|
||||
| 独立恢复与清理 | [CompactUIRecovery1.8.2.json](/Volumes/备份/大鱼调色/大鱼调色/verification/CompactUIRecovery1.8.2.json)、[CompactUICleanup1.8.2.json](/Volumes/备份/大鱼调色/大鱼调色/verification/CompactUICleanup1.8.2.json) |
|
||||
| 安装包及下载 | [Package.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Package.json)、[Release.json](/Volumes/备份/大鱼调色/大鱼调色/verification/Release.json) |
|
||||
|
||||
## 发布与恢复
|
||||
|
||||
发行包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.2.pkg`,43,006,067字节,SHA-256为 `cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded`。[在线Release383](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104),附件27,保留公测标记。草稿和发布后完整下载均已校验。
|
||||
|
||||
APP公证 `11fcf84b-680e-415e-87d2-bcf4ee8cdb78`;PKG公证 `26361685-6bdd-4c59-bc2c-4824ea190e05`,均Accepted并完成票据验证。PKG通过20项展开验包;APP已独立替换和宿主验收,本轮没有再次运行PKG系统安装脚本。
|
||||
|
||||
标签包含本版最终Package.json,发布后的Release.json在后续main。标签内旧Release.json属于上一版历史。实际编译、标签、最终文档提交不同,不移动标签或改写历史来强求SHA一致。
|
||||
|
||||
签名团队B3W25FX5H5,Application/Installer身份为zhong luo;当前证书有效至2027年2月2日06:12:15(上海),发布时重新核实身份、私钥与有效期。公证profile为 `codex-dayu-notary-B3W25FX5H5`,钥匙串 `/Users/mac/Library/Keychains/login.keychain-db`。不打印或提交凭据,密钥恢复按全局规则。
|
||||
|
||||
## 下一轮开发步骤
|
||||
|
||||
接手先核对工作区、分支、远程、正式版本和用户新需求。交接整理前工作区干净、main已推送。本轮只更新文档,不重编APP。若收到新截图或问题,在当前实现上定位,避免照旧交接重做已完成的CMS或自动更新。
|
||||
|
||||
1. 读取全局及新增项目规则,保护其他对话的修改,先保存本任务基线。
|
||||
2. 使用[checkpoint.py](/Volumes/备份/大鱼调色/大鱼调色/tools/checkpoint.py)提交明确审查过的路径,参数为提交说明和路径;脚本持有仓库锁、推送并核验main,不在外层重复持有同一锁。
|
||||
3. UI修改验证正常/窄栏、主题、展示不改参数和撤销。渲染修改按问题补数值与宿主验证,保护nil/v2/v3。更改模型才按需要刷新模板,不能借刷新自动启用v3。
|
||||
4. 新发布更新外层与内部Info.plist版本和构建,当前为1.8.2(59)。正常保存退出FCP/Motion,不能强杀有未保存工作的宿主。
|
||||
5. 在工程根目录以保持输入会话的终端运行 `python3 tools/deliver.py`。它完成Release、签名、自检、公证、票据、正式替换和发现路径核验。保持HEAD固定直到Delivery.json记录实际sourceCommit。
|
||||
6. 显示FORMAL_INSTALLED后,在正式位置验收。全部通过才向原会话输入 `complete`;`leave`仅保留待验收状态。complete会重写Delivery.json,之后补本版hostVerification路径;失败保留诊断并按可恢复流程处理旧版。
|
||||
7. `python3 Packaging/build_pkg.py`使用PKG工坊制作签名公证包和展开验包。要求Delivery.json为verified,拒绝覆盖已有同版发行包;验包不等于执行系统安装脚本。
|
||||
8. 提交推送记录并创建新的不可变版本标签;`python3 Packaging/publish_beta.py --tag <新标签> --notes <本版说明文件>`创建草稿、上传及下载校验。脚本自带仓库锁。
|
||||
9. 遇到draft-download-required,先确认附件已存在,别重复POST。用已登录Edge打开API返回的真实附件URL;本机下载目录为 `/Volumes/备份`。用独立副本传 `--verified-download`,通过后发布并再次完整下载校验,记录真实URL、附件ID和摘要。
|
||||
10. 独立验证远程源码/标签恢复,清理本任务生成的APP、提交ZIP、旧安装备份和验证副本;保留正式包、源码、历史发行包与私人QA资料。提交推送最终记录并核验远端引用。
|
||||
|
||||
完整路径入口:[deliver.py](/Volumes/备份/大鱼调色/大鱼调色/tools/deliver.py)、[build_pkg.py](/Volumes/备份/大鱼调色/大鱼调色/Packaging/build_pkg.py)、[publish_beta.py](/Volumes/备份/大鱼调色/大鱼调色/Packaging/publish_beta.py)。这些命令均在上述工程根目录执行,不能将构建缓存当源码。
|
||||
|
||||
产品锁为 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock`;Git锁在 `/Users/mac/.codex/git-backup-locks`,以不含凭据的小写完整HTTPS仓库地址SHA-256命名。先核对owner.json进程,不能删除仍在工作的锁。
|
||||
|
||||
正式服务可执行文件加 `--self-test` 可做无界面检查:
|
||||
`/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service`。构建目录只做编译与原生无界面检查,用户可见功能验收使用正式已公证位置。Xcode会登记生成内部服务,独立恢复构建在宿主关闭时执行,随后解除生成副本登记,避免宿主误载。
|
||||
|
||||
## 本机验收资料与后续范围
|
||||
|
||||
私人资料位于 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa`,不进Git或PKG。资源库为该目录下 `大鱼调色_验收.fcpbundle`;本轮项目为1.8.1_Log高光恢复和1.8.1_工作空间与独立层。项目名称不保证当前参数值,比较应以实际完整预设为准。
|
||||
|
||||
三份一致预设为该目录的ui58-before.json、ui59-after.json、ui59-cold-reopened.json。较早Cube、ProRes和XML的范围见1.8.1记录。缓存不是远程恢复资源,合成素材可由原生诊断和[create_primary_host_fixture.py](/Volumes/备份/大鱼调色/大鱼调色/tools/create_primary_host_fixture.py)重建。
|
||||
|
||||
交付结束时FCP为黑金、颜色设置收起,QA项目为1.8.1_Log高光恢复。此前Motion文稿已恢复打开,未编辑。新对话重新获取当前窗口和进程,不沿用历史UI元素编号、PID或工具会话。
|
||||
|
||||
真实相机Log上游路由、HDR/SDR工具域、更广宿主版本及界面细节均可作为后续方向,用户尚未指定优先级。不要把“所有工具已场景化”或“任意HDR链已验证”当作现状。
|
||||
|
||||
主APP自动更新与云端公测诊断已在1.7.0实现;登录、授权、业务加密尚未实施,详见[主APP交接](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md)和[后端说明](/Volumes/备份/大鱼调色/大鱼调色/Backend/README.md)。1.8.0至1.8.2没有同步网站文章或自动更新清单,源码Release发布不等于网站已上新版。
|
||||
|
||||
以后涉及后台,按全局规则先核对NAS生产共享 `/Volumes/dayumedia (存储空间1)/wwwroot/dayu_media` 与本地专项副本的映射、基线和旁路备份;不要把工程内Backend或下载目录当生产源。若优化LUT浏览器,保留1.7.3的FxPlug宿主contentView原点适配,历史记录见[BrowserMoreSpace1.7.3.md](/Volumes/备份/大鱼调色/大鱼调色/research/BrowserMoreSpace1.7.3.md)。
|
||||
@@ -0,0 +1,37 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
2026年11月4日,Asia/Shanghai。本轮正式版本 **1.8.3(62)**,在1.8.2基础上新增炫彩主题与曲线直方图。此前完整CMS、黑金及发布流程交接已逐字节归档到 research/handoffs/DayuColorThrough1.8.2-20261104.md;其旧版本号与黑金默认要求属于历史,用户本轮视觉反馈优先。
|
||||
|
||||
实际工程 /Volumes/备份/大鱼调色/大鱼调色;Xcode工程“大鱼调色.xcodeproj”,Wrapper Application / Release;检查器为Objective-C++/AppKit。平台Apple Silicon/macOS14.6+,本机Xcode27.1、FxPlug4.3.5。唯一正式安装 /Library/Plug-Ins/FxPlug/大鱼调色.app,主ID com.dayu.color,内部 com.dayu.color.XPC。固定缓存 /Users/mac/Library/Caches/CodexBuilds/com.dayu.color。
|
||||
|
||||
源码远程 https://dayu.media/git/dayu/dayu-color.git,main;实际编译源码 **3fd015224037df944b428684c43ec8ec7accea85**。版本标签 v1.8.3-neon-histogram-20261104;完整标签提交及PKG/Release摘要见最终 verification/Package.json、Release.json、NeonRecovery1.8.3.json。标签包含Package.json,后续发布回读另作main提交,不移动已有标签。无LFS/子模块。
|
||||
|
||||
## 用户最新视觉要求
|
||||
|
||||
用户否决了候选60“大片紫色”,又否决候选61“深蓝灰与青色主题近似”。最终62使用分模块双色渐变表面:一级紫红、蜘蛛盘青蓝、基础珊瑚玫红、肤色橙红、HSL绿青、曲线青蓝等。卡片、标题与图标都跟随模块色相;背景为有色相的紫/蓝/青渐变,不再使用深蓝灰方案。白色正文,洋红到青色的重点按钮与滑杆。不要在后续调整中自动恢复全紫或统一蓝灰。
|
||||
|
||||
主题追加ID6“霓虹炫彩”;旧0–5不改编号,未保存偏好默认6,明确旧选择保留。本机已在正式FCP切到6,冷重开保持。偏好域com.dayu.color.preferences/themeIndex;主题不写入工程或预设。大面积表面均为不透明静态渐变,无持续动画,炫彩文字不发光。
|
||||
|
||||
## 直方图实现与边界
|
||||
|
||||
DYHistogram.h统计既有320×180浮点分析缓存,在渲染工作线程生成不可变256档亮度/R/G/B快照,主线程只绘制。透明、NaN、无穷像素不计;范围外归端点;各通道共用峰值并作平方根高度。RGB页叠加4通道,单色页只绘对应通道,直方图默认开启、可显隐;新建检查器重置显示开关,不写参数/撤销/预设。
|
||||
|
||||
原流程分析源为一级CST/输入LUT后;新CMS为显示输出转换后、SDR修饰前。**不是最终输出示波器,不保证每个局部曲线层的即时输入。** 显示编码亮度是Rec.709系数加权码值,并非场景线性亮度/HDR测量。最多每0.5秒更新,依赖宿主渲染;无缓存显示“等待画面”。工具提示列明来源/采样范围。没有改变GPU数学、Uniform、参数ID、CMS、模板或预设格式。
|
||||
|
||||
关键文件:DYTheme.mm、DYInspector.mm、DYHistogram.h、DYRenderer.h/mm、DYManagedRender.inc.h、DYCompactUIDiagnostics.inc.h。独立层共用renderer且各自观察其通知,缓存按renderer隔离,失效时清空旧直方图。勿新增定时器、全分辨率读取或UI线程像素统计。
|
||||
|
||||
## 正式验证
|
||||
|
||||
605项正式原生检查通过;FCP12.4实看最终多色表面、RGB/红/绿/蓝及显隐、色块与真实运动视频的分布更新;最终冷重开主题保持、颜色设置收起、直方图拿到57,600有效采样。完整原预设8,590字节在恢复测试点及最终冷重开后逐字节一致,SHA-256 1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982。
|
||||
|
||||
候选60期间在图表中心添加的masterX0=0.5点在61冷重开后仍保留,最终通过原生载入预设恢复;不能把该主动交互产生的参数差异算作主题修改。拖动/删除没有单独完整验收,不宣称全手势覆盖。无VoiceOver、辅助显示选项矩阵或Instruments全性能采样。SwiftUI扫描器无Swift文件,记录不适用。详细证据见 HostNeon1.8.3.json及 research/ui-neon-20261104/validation.md。
|
||||
|
||||
APP公证706a58bb-2fa4-4b1e-b392-de60d93aef49,Accepted;正式安装签名/票据/Gatekeeper和实际FCP服务路径通过。发行包由PKG工坊制作并展开验包;本轮APP直接正式安装验收,没有再次执行PKG系统安装脚本。PKG公证5666e466-7ec5-49fb-beac-f7fc5b4e080c为Accepted,20项展开验包通过。Release384/附件28已发布,草稿和发布后完整下载均校验43,010,609字节、SHA-256 518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53。标签提交a06a3a3914efb6970858baa9cfc6bed62549f09e,独立恢复475个跟踪文件和8个依赖归档通过;生成APP、旧安装备份、提交ZIP、下载副本及恢复clone已清理。未更改NAS后端、网站文章或自动更新清单。
|
||||
|
||||
## 继续开发与交付
|
||||
|
||||
保护nil/v2/v3色彩流程、预设v7及模板默认,不因UI改动修改CMS。高级“颜色设置”仍默认收起,开关不改模型。详细数学与恢复依赖按上述历史完整交接和RECOVERY.md。
|
||||
|
||||
tools/checkpoint.py对明确文件提交/推送并核验main,自带仓库锁。tools/deliver.py取得产品锁,保持HEAD直到Delivery.json写入实际编译SHA;正式安装验收通过才输入complete。Packaging/build_pkg.py与Packaging/publish_beta.py复用PKG工坊,最终版本包不进入Git。草稿附件404先确认已上传,使用正常已登录浏览器完整下载后传--verified-download,不重复POST、不提前发布。
|
||||
|
||||
源代码、历史发行包、私人QA媒体与预设保留。只清理本任务识别的生成APP、旧安装备份、提交ZIP、恢复clone与下载副本;不能扩大为整盘清理。密钥/证书不在Git,发布时重新验证,身份与锁按本机全局约定。
|
||||
@@ -0,0 +1,17 @@
|
||||
# 炫彩界面与曲线直方图
|
||||
|
||||
基线 fa8201426647e2728c9bd344da7823f09a500871,1.8.2(59)。AppKit/FxPlug,macOS14.6+。
|
||||
|
||||
用户要求:参照紫蓝、洋红与青色界面替换黑金观感,曲线叠加真实 RGB/亮度直方图。
|
||||
|
||||
保持现有宿主检查器结构、模块状态、预设、撤销和色彩算法。主题追加编号6,旧0–5保持;新默认为6,本机原黑金选择在正式验收切换为6。背景与卡片不透明静态渐变,正文白色,重点按钮和滑杆用紫青渐变;原生焦点与动作保留,无持续动画。
|
||||
|
||||
直方图复用每0.5秒更新的320×180浮点分析缓存,在渲染工作线程统计256档RGB与亮度,检查器只绘制不可变快照。使用共同最大值与平方根高度,透明区域、非有限像素不计;超范围归到端点。RGB页叠加四通道,单色页显示对应通道。叠层默认开启,支持显隐,不写参数或预设。
|
||||
|
||||
分析画面沿用既有流程:原流程为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前。它不是最终输出示波器,也不保证每个独立曲线层的即时输入。UI工具提示说明来源及采样精度,不误标为最终输出。
|
||||
|
||||
验证:数值分布、透明/NaN/超范围、缓存隔离与失效、四通道绘制与曲线交互、280/320/400栏宽、旧预设不变;正式Release签名公证安装、FCP实测与冷重开、PKG/Release下载校验及远程恢复。
|
||||
|
||||
用户中途视觉反馈:候选60的卡片与图标仍以紫色为主。最终改为中性深蓝灰大面积表面、青色默认强调,按模块使用青/蓝/洋红/绿等细边与标题标记,保留紫青重点按钮及滑杆;不用紫色铺满背景。候选60公证并正式安装用于验收,未制作PKG或发布。
|
||||
|
||||
用户再次反馈:深蓝灰与现有青色主题近似,不要深蓝灰。最终取消中性深蓝灰方案,改为饱和的多色环境渐变和分模块双色渐变表面;紫色仅是其中一种,不再统一铺满所有卡片。候选61未制作PKG或发布。
|
||||
@@ -0,0 +1,13 @@
|
||||
# 炫彩界面验证边界
|
||||
|
||||
选用 expressive 配色,沿用原生 AppKit 控件与现有布局,不增加持续动画、模糊或透明玻璃层。系统增加对比度/减少透明度时,炫彩面板仍为不透明静态表面,炫彩文字不使用光晕。
|
||||
|
||||
SwiftUI 风险扫描器返回 no Swift files,因本产品为 Objective-C++/AppKit,记录为不适用而非通过。Release 构建与原生集成自检覆盖模型、Metal渲染和假宿主;本版新增统计透明/NaN/无穷/范围外像素、亮度系数、采样守恒、缓存初始化/失效、四通道绘制及无参数写入检查。
|
||||
|
||||
布局280/320/400及CMS nil/v2/v3不变沿用并执行已有原生检查。FCP实机使用正常检查器栏宽。AX能发现7个主题按钮、RGB/红/绿/蓝切换、直方图复选框和数据来源/采样量说明;本轮没有启用VoiceOver或改变系统显示辅助选项,也未做Instruments采样,不宣称覆盖全部辅助技术或测得60fps。
|
||||
|
||||
视觉评分暂定84/100:平台14/15、布局13/15、视觉13/15、交互17/20、材质13/15、辅助6/10、实现8/10。此为受证据限制的暂定评价,不作为“Apple品质”或全覆盖承诺;用户的配色反馈优先。
|
||||
|
||||
候选60大量紫色与候选61深蓝灰均在用户实看后被否决,保留各自源码和公证证据,不发布安装包。最终62改为有饱和色相的分模块双色渐变。
|
||||
|
||||
验收中用图表中心单击添加的masterX0=0.5曲线点在61冷重开仍保留,证明曲线编辑与持久化;最终62已通过载入neon60-before.json还原验收工程,neon62-restored.json与neon62-cold.json均与原8,590字节预设逐字节一致。该操作造成的差异与纯主题/直方图显隐不改参数分别记录。
|
||||
@@ -0,0 +1,11 @@
|
||||
# 炫彩配色收敛
|
||||
|
||||
基线0328399f52a57493f2e56290c52a2b59b51a9598,正式1.8.3(62)。本轮用户明确否定模块各自的大红大绿,仅认可“保存预设”按钮。
|
||||
|
||||
最终方向:保留已认可保存按钮的原粉紫—青色渐变;所有模块统一为接近黑色的石墨底,轻微暖紫偏色,不恢复之前被否定的深蓝灰底。卡片只用低饱和近黑渐变、低对比细边;标题与图标统一银白/淡灰紫,不再给不同模块分配红、绿、橙等色。大面积颜色保持安静,粉紫—青色只用于主按钮、滑杆和顶部细线。颜色/曲线本身的语义RGB、色轮及真实媒体保持原色。
|
||||
|
||||
沿用已应用的界面设计技能;本次主要收敛色彩,使用克制的视觉系统,不新增动画、模糊或结构改动。参数、CMS、模板、直方图统计和显示合同不变。沿用605项既有检查,正式签名公证后在FCP检查真实界面、按钮/文字、直方图及预设不变。保留旧主题0–5、炫彩ID6和唯一正式路径。
|
||||
|
||||
不要用先前交接中“分模块饱和多色”的描述覆盖用户本轮新要求;它现在是被否定的历史方案。
|
||||
|
||||
候选63实看后用户明确认可底色,要求仅强化模块/图层按钮。保持底色与保存预设渐变不变,在模块标题小按钮加入统一、低强度粉青渐变和清晰细边,展开态更亮;三个右侧蒙版/删除/再加一层操作增加克制的按钮底和稍亮图标。不恢复大面积彩色卡片或按模块分配颜色。候选63未打包/发布。
|
||||
@@ -0,0 +1,11 @@
|
||||
# 1.8.4 配色与模块按钮验证
|
||||
|
||||
1.8.3的红/绿/橙模块表面被用户否定,候选63的统一低饱和近黑底色已由用户明确认可。最终64逐字保留63的完整paletteRGB与DYDrawThemeSurface,实现范围只追加模块标题的小面积轻粉青渐变/细边/更亮展开态,以及三个图层操作按钮的低对比底板与更亮图标。保存预设继续使用原渐变端点,未新增动画、透明玻璃或模糊。
|
||||
|
||||
选择克制视觉系统,保留同一套原生AppKit动作、标签、焦点与布局。605项已有检查用于验证模型、CMS、Metal与检查器回归;本轮无新增调色算法,也不为纯配色添加镜像测试。SwiftUI扫描不适用,因为检查器为Objective-C++/AppKit。
|
||||
|
||||
原生检查覆盖280/320/400栏宽、CMS nil/v2/v3不变、所有主题编号、直方图统计/通道/缓存。FCP实机检查正常栏宽的实际颜色、文本、模块展开/折叠、图层按钮可辨识和直方图显隐,完整预设按改动前后逐字节比较。
|
||||
|
||||
炫彩面板为不透明静态表面,正文不使用光晕。新按钮不改变颜色语义或仅靠颜色表示功能,保留眼睛/加号/减号及文字与帮助。未启用VoiceOver、改变系统显示辅助选项或进行Instruments采样;不声称全设备/全辅助技术覆盖或测得帧率。视觉满意度以用户实看反馈为准。
|
||||
|
||||
Apple Fidelity暂定84/100,受辅助技术证据上限约束:平台14、布局13、视觉13、交互17、材质13、辅助6、实现8;不是用户美学满意度分数,也不作为“Apple品质”宣称。相较前版已按用户反馈再次收敛,剩余辅助技术覆盖限制如上。
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"status": "draft-download-required",
|
||||
"releaseID": 382,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104",
|
||||
"tag": "v1.8.1-cst-correction-20261104",
|
||||
"commit": "d0eadccc29782aa30301fff6dbf71c84b5758f59",
|
||||
"assetID": 26,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.1-cst-correction-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.1.pkg",
|
||||
"bytes": 42999475,
|
||||
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd"
|
||||
"releaseID": 383,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104",
|
||||
"tag": "v1.8.2-blackgold-20261104",
|
||||
"commit": "f4bacfbd75404a69f51127356fc861a44c0c27e9",
|
||||
"assetID": 27,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.2-blackgold-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.2.pkg",
|
||||
"bytes": 43006067,
|
||||
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded"
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"version": "1.8.2",
|
||||
"build": "59",
|
||||
"removed": [
|
||||
"restore-1.8.2",
|
||||
"restore-build-1.8.2",
|
||||
"unaccepted candidate58 APP",
|
||||
"notarization submission ZIPs",
|
||||
"previous install backup after acceptance"
|
||||
],
|
||||
"retained": [
|
||||
"unique formal APP",
|
||||
"current signed PKG",
|
||||
"previous user release packages",
|
||||
"source and verification records"
|
||||
],
|
||||
"recoveryCloneRemovedAfterValidation": true,
|
||||
"motionPreviousDocumentRestored": true,
|
||||
"scope": "Only task-created product outputs; no whole-disk uniqueness claim.",
|
||||
"passResult": true,
|
||||
"browserDownloadedCopyRemovedAfterBothChecks": true,
|
||||
"generatedAppInventory": {
|
||||
"projectRootAndProductCache": [],
|
||||
"hiddenInstallBackups": [],
|
||||
"ApplicationsOrUserFxPlugAlternate": []
|
||||
},
|
||||
"submissionZIPAbsent": true
|
||||
}
|
||||
@@ -34,5 +34,9 @@
|
||||
"nativeChecksPassed": true,
|
||||
"dependenciesBuild": "Eight archived dependencies verified; reuse verified static runtime cache, not a full dependency cold build.",
|
||||
"generatedCopiesNeverShown": true,
|
||||
"generatedRegistrationRemoved": true
|
||||
"generatedRegistrationRemoved": true,
|
||||
"releaseTag": "v1.8.2-blackgold-20261104",
|
||||
"releaseTagCommit": "f4bacfbd75404a69f51127356fc861a44c0c27e9",
|
||||
"releaseTagCheckedOut": true,
|
||||
"compiledInputsMatchTag": true
|
||||
}
|
||||
@@ -2,15 +2,15 @@
|
||||
"status": "verified",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.2",
|
||||
"build": "59",
|
||||
"version": "1.8.4",
|
||||
"build": "64",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "11fcf84b-680e-415e-87d2-bcf4ee8cdb78",
|
||||
"notaryID": "34af6e05-cba5-4031-9184-762f758c0889",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
|
||||
"sourceCommit": "55b66a358cf4c52eeb6ad89acde822cb73be3137",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"hostVerification": "verification/HostCompactUI1.8.2.json"
|
||||
"hostVerification": "verification/HostRefined1.8.4.json"
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
"version": "1.8.3",
|
||||
"build": "62",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "3fd015224037df944b428684c43ec8ec7accea85",
|
||||
"nativeChecks": 605,
|
||||
"checks": {
|
||||
"multicolorModuleSurfacesObserved": true,
|
||||
"noUniformPurpleOrBlueGrayTheme": true,
|
||||
"nativeThemeChoicePersisted": true,
|
||||
"realVideoAndColorBarsHistogramsObserved": true,
|
||||
"liveVideoPlaybackObservedFrom": "00:00:04:00",
|
||||
"liveVideoPlaybackObservedTo": "00:00:11:12",
|
||||
"distributionChangedWithVideoFrame": true,
|
||||
"RGBAndIndividualChannelsAndOverlayToggle": true,
|
||||
"coldReopenHistogramReceives57600Samples": true,
|
||||
"coldReopenSettingsCollapsed": true,
|
||||
"originalV3CMSPreserved": true,
|
||||
"originalPresetRestoredAndColdReopenedByteIdentically": true
|
||||
},
|
||||
"preset": {
|
||||
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/neon60-before.json",
|
||||
"restored": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/neon62-restored.json",
|
||||
"cold": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/neon62-cold.json",
|
||||
"bytes": 8590,
|
||||
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982"
|
||||
},
|
||||
"curveInteraction": "A center point added during candidate60 QA persisted in candidate61 cold reopen; final62 restored baseline through the native preset loader. Original curve math/gesture handlers unchanged. Drag/delete not independently accepted in this pass.",
|
||||
"limitations": [
|
||||
"Histogram uses sampled analysis preview, not final output or every local curve input; details in checkbox help.",
|
||||
"280/320/400 layout and nil/v2/v3 invariance use native fake-host diagnostics; FCP observed at normal inspector width.",
|
||||
"No VoiceOver, system display switch matrix or Instruments profiling; AppKit source has no Swift files.",
|
||||
"Final APP installed and tested directly; package scripts are verified by expansion, not reinstalled."
|
||||
],
|
||||
"passResult": true
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"version": "1.8.4",
|
||||
"build": "64",
|
||||
"host": "Final Cut Pro 12.4",
|
||||
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"compiledSource": "55b66a358cf4c52eeb6ad89acde822cb73be3137",
|
||||
"nativeChecks": 605,
|
||||
"checks": {
|
||||
"approvedCandidate63PaletteAndSurfaceCodeByteIdentical": true,
|
||||
"uniformGraphiteSurfacesObserved": true,
|
||||
"smallPinkCyanModuleHeadersAndExpandedStateObserved": true,
|
||||
"layerActionBackplatesVisible": true,
|
||||
"primaryActionGradientPreserved": true,
|
||||
"headerExpandCollapse": true,
|
||||
"themePersistedAcrossFormalHostRestart": true,
|
||||
"histogram57600SamplesAvailable": true,
|
||||
"settingsInitiallyCollapsed": true,
|
||||
"presetBeforeAfterByteIdentical": true
|
||||
},
|
||||
"preset": {
|
||||
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/refined63-before.json",
|
||||
"after": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/refined64-after.json",
|
||||
"bytes": 8590,
|
||||
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982"
|
||||
},
|
||||
"limitations": [
|
||||
"AppKit normal-width FCP observation; 280/320/400 layouts and CMS nil/v2/v3 invariance use existing native diagnostics.",
|
||||
"No separate same-build cold reopen, VoiceOver/display-setting matrix or Instruments profiling this cosmetic pass. Formal host was restarted into this installed build.",
|
||||
"No rendering, histogram algorithm, template, CMS, parameter or preset-format changes; prior histogram and rendering acceptance retained.",
|
||||
"Package expansion will verify installer structure; APP independently installed, not reinstalled from PKG."
|
||||
],
|
||||
"passResult": true
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
|
||||
"checks": 595,
|
||||
"checks": 605,
|
||||
"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/377C95AC-EBB8-43A8-A90C-1C9AA3E7A0E5"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7B69411A-894E-4372-A7AC-4264B6778A8C"
|
||||
},
|
||||
{
|
||||
"descriptors": 278,
|
||||
@@ -890,7 +890,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/377C95AC-EBB8-43A8-A90C-1C9AA3E7A0E5/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7B69411A-894E-4372-A7AC-4264B6778A8C/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -910,7 +910,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 0,
|
||||
"maximumGapMS": 101.97175000212155,
|
||||
"maximumGapMS": 76.63062500068918,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -3124,8 +3124,48 @@
|
||||
{
|
||||
"name": "compact-gold-glow-respects-system-display-options",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-rejects-transparent-and-nonfinite",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-rgb-endpoints-and-clamped-headroom",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-luma-primary-coefficients",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-each-channel-conserves-valid-samples",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-malformed-and-empty-safe",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-new-inspector-uses-renderer-cached-snapshot",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-four-channel-drawings-distinct",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-channel-and-overlay-presentation-does-not-edit-grade",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "histogram-invalidation-clears-view-and-renderer",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "neon-stable-theme-id-and-no-text-glow",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/377C95AC-EBB8-43A8-A90C-1C9AA3E7A0E5",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7B69411A-894E-4372-A7AC-4264B6778A8C",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.3",
|
||||
"build": "60",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "6ee7bd89-98b5-46f4-8db4-39491f67385c",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "bea51d2297d813683448c6b15f9049d3f9d42d8b",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-451eaad980494571b90ac2679f1fa80f.app"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.3",
|
||||
"build": "61",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "7989722c-6688-493b-aabf-772158527bed",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "335ef7a5ee310ed8bb1f31dd67098e38e7f31ed7",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-e7645188ecbb400ab7d3efe13cf5b8bb.app"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"removedPriorCandidateBackups": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-451eaad980494571b90ac2679f1fa80f.app",
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-e7645188ecbb400ab7d3efe13cf5b8bb.app"
|
||||
],
|
||||
"scope": "Only generated backups identified by candidate delivery records; final build app and loose plugin cleaned by deliver.py. Formal PKG retained; user QA media and historical packages preserved.",
|
||||
"passResult": true,
|
||||
"downloadCopiesRemoved": [
|
||||
"/Volumes/备份/大鱼调色-1.8.3.pkg"
|
||||
],
|
||||
"temporaryRecoveryCloneRemoved": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-neon-mv8fobx6",
|
||||
"generatedBuildAppRemaining": [],
|
||||
"generatedInstallBackupsRemaining": [],
|
||||
"formalPackage": "大鱼调色-1.8.3.pkg",
|
||||
"formalPackagePath": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.3.pkg",
|
||||
"releaseID": 384,
|
||||
"assetID": 28
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-neon-mv8fobx6",
|
||||
"compiledSource": "3fd015224037df944b428684c43ec8ec7accea85",
|
||||
"gitFsck": "full strict passed",
|
||||
"trackedFilesVerified": 475,
|
||||
"scope": "Independent remote checkout and byte verification of all tracked files; build and live host acceptance use the fixed product build directory. No independent rebuild claimed.",
|
||||
"passResult": true,
|
||||
"releaseTag": "v1.8.3-neon-histogram-20261104",
|
||||
"releaseTagCommit": "a06a3a3914efb6970858baa9cfc6bed62549f09e",
|
||||
"dependencyArchivesVerified": [
|
||||
"OpenColorIO-2.5.2.tar.gz",
|
||||
"expat-2.7.2.tar.gz",
|
||||
"yaml-cpp-0.8.0.tar.gz",
|
||||
"Imath-3.2.1.tar.gz",
|
||||
"pystring-1.1.4.tar.gz",
|
||||
"minizip-ng-4.0.10.tar.gz",
|
||||
"zlib-1.3.1.tar.gz",
|
||||
"sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz"
|
||||
],
|
||||
"compiledInputsMatchTag": true,
|
||||
"releaseTagCheckedOut": true,
|
||||
"temporaryCloneRemoved": true
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"status": "draft-download-required",
|
||||
"releaseID": 384,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.3-neon-histogram-20261104",
|
||||
"tag": "v1.8.3-neon-histogram-20261104",
|
||||
"commit": "a06a3a3914efb6970858baa9cfc6bed62549f09e",
|
||||
"assetID": 28,
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.3-neon-histogram-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.3.pkg",
|
||||
"bytes": 43010609,
|
||||
"sha256": "518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53"
|
||||
}
|
||||
+15
-15
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.2.pkg",
|
||||
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded",
|
||||
"bytes": 43006067,
|
||||
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.4.pkg",
|
||||
"sha256": "59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660",
|
||||
"bytes": 43009859,
|
||||
"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.8.2",
|
||||
"build": "59"
|
||||
"version": "1.8.4",
|
||||
"build": "64"
|
||||
},
|
||||
{
|
||||
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.20452a40-e96f-4a01-9191-82412995e286/89DECFA7-D24D-462F-912E-9503BB73B5E6/大鱼调色"
|
||||
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.5f127ca5-ab52-4b24-8006-4fc4584bc076/F4731F90-B2A4-4BD5-9158-90261C542B28/大鱼调色"
|
||||
}
|
||||
],
|
||||
"signature": "Package \"大鱼调色-1.8.2.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 02:55:41 +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.8.2.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"signature": "Package \"大鱼调色-1.8.4.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 04:56:07 +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.8.4.pkg: accepted\nsource=Notarized Developer ID",
|
||||
"pass": true,
|
||||
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
|
||||
"notarization": {
|
||||
"id": "26361685-6bdd-4c59-bc2c-4824ea190e05",
|
||||
"status": "Accepted",
|
||||
"createdDate": "2026-11-04T02:55:43.274Z",
|
||||
"name": "大鱼调色-1.8.2.pkg",
|
||||
"message": "Successfully received submission info"
|
||||
"id": "2632037d-733a-4092-8323-12dcf264c022",
|
||||
"message": "Successfully received submission info",
|
||||
"createdDate": "2026-11-04T04:56:09.310Z",
|
||||
"name": "大鱼调色-1.8.4.pkg"
|
||||
},
|
||||
"appCompiledSource": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
|
||||
"appBuild": "59",
|
||||
"appCompiledSource": "55b66a358cf4c52eeb6ad89acde822cb73be3137",
|
||||
"appBuild": "64",
|
||||
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
|
||||
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
|
||||
"templateSHA256": {
|
||||
@@ -59,6 +59,6 @@
|
||||
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
|
||||
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
|
||||
},
|
||||
"installedAppHostAcceptance": "verification/HostCompactUI1.8.2.json",
|
||||
"installedAppHostAcceptance": "verification/HostRefined1.8.4.json",
|
||||
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"status": "installed-awaiting-host-verification",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.8.4",
|
||||
"build": "63",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "319b2d03-2afc-4fed-bd0a-f3949fffc4f8",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "998a9838849da62440e50d4232c3be6c18f504b4",
|
||||
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
|
||||
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
|
||||
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-63e3ea59f6744c2ea3d226642d4bef75.app"
|
||||
}
|
||||
文件差异过大,未显示。
加载差异
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"removedPreviousCandidateBackups": [
|
||||
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-63e3ea59f6744c2ea3d226642d4bef75.app"
|
||||
],
|
||||
"scope": "Generated backups from this task only; user QA media and historical packages preserved.",
|
||||
"passResult": true
|
||||
}
|
||||
+13
-15
@@ -3,25 +3,23 @@
|
||||
"repository": "dayu/dayu-color",
|
||||
"repositoryID": 52,
|
||||
"private": false,
|
||||
"tag": "v1.8.1-cst-correction-20261104",
|
||||
"releaseCommit": "d0eadccc29782aa30301fff6dbf71c84b5758f59",
|
||||
"releaseID": 382,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104",
|
||||
"tag": "v1.8.3-neon-histogram-20261104",
|
||||
"releaseCommit": "a06a3a3914efb6970858baa9cfc6bed62549f09e",
|
||||
"releaseID": 384,
|
||||
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.3-neon-histogram-20261104",
|
||||
"prerelease": true,
|
||||
"assetID": 26,
|
||||
"assetName": "大鱼调色-1.8.1.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.1-cst-correction-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.1.pkg",
|
||||
"bytes": 42999475,
|
||||
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd",
|
||||
"assetID": 28,
|
||||
"assetName": "大鱼调色-1.8.3.pkg",
|
||||
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.3-neon-histogram-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.3.pkg",
|
||||
"bytes": 43010609,
|
||||
"sha256": "518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53",
|
||||
"existingAssetReused": true,
|
||||
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
|
||||
"credentialSource": "macOS Keychain: dayu-git-api",
|
||||
"draftBrowserDownload": {
|
||||
"path": "/Volumes/备份/大鱼调色-1.8.1.pkg",
|
||||
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd",
|
||||
"bytes": 42999475,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.1-cst-correction-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.1.pkg",
|
||||
"actualVisitedURL": "https://dayu.media/git/attachments/033747bf-5f82-4cfd-9af0-ef2c89fe4108",
|
||||
"temporaryCopyCleaned": true
|
||||
"path": "/Volumes/备份/大鱼调色-1.8.3.pkg",
|
||||
"sha256": "518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53",
|
||||
"bytes": 43010609,
|
||||
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.3-neon-histogram-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.3.pkg"
|
||||
}
|
||||
}
|
||||
@@ -15,13 +15,13 @@
|
||||
for(NSNumber *width in @[@280,@320,@400]){
|
||||
[view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES;
|
||||
for(NSView *button in buttons){fit&=NSMinX(button.frame)>=0&&NSMaxX(button.frame)<=width.doubleValue&&button.frame.size.width>=66;for(NSView *other in buttons)if(button!=other)fit&=!NSIntersectsRect(button.frame,other.frame);}
|
||||
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==6&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
|
||||
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==7&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
|
||||
run.record([NSString stringWithFormat:@"compact-header-controls-fit-%@",width],fit);
|
||||
}
|
||||
DYDiagnosticManager *fresh=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(fresh,nil);run.record(@"compact-new-host-stays-original-flow",!DYReadAssets(fresh,kCMTimeZero).colorManagement);
|
||||
NSInteger previous=DYThemeIndex();@try{
|
||||
BOOL colors=DYThemeNames().count==6&&[DYThemeNames()[5]isEqual:@"黑金渐变"];
|
||||
for(NSInteger i=0;i<6;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
|
||||
BOOL colors=DYThemeNames().count==7&&[DYThemeNames()[5]isEqual:@"黑金渐变"];
|
||||
for(NSInteger i=0;i<7;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
|
||||
run.record(@"compact-six-stable-theme-choices",colors);
|
||||
DYSetThemeIndex(5);auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);};
|
||||
double minimum=100;for(NSString *text in @[@"text",@"secondary"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop"])minimum=std::min(minimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05));
|
||||
@@ -35,3 +35,33 @@
|
||||
run.record(@"compact-gold-glow-respects-system-display-options",reduced?DYThemeTextShadow()==nil:DYThemeTextShadow().shadowBlurRadius<=2);
|
||||
}@finally{DYSetThemeIndex(previous);}
|
||||
}
|
||||
// Histogram math is independent of UI palettes and never edits a host document.
|
||||
{
|
||||
float pixels[][4]={{0,0,0,1},{1,1,1,1},{1,0,0,1},{0,1,0,1},{0,0,1,1},{-.5,2,.5,1},{1,1,1,0},{NAN,0,0,1},{0,0,0,INFINITY}};
|
||||
NSData *input=[NSData dataWithBytes:pixels length:sizeof(pixels)];NSData *data=DYHistogramFromRGBA(input);const DYHistogram *h=(const DYHistogram*)data.bytes;
|
||||
run.record(@"histogram-rejects-transparent-and-nonfinite",h->samples==6);
|
||||
run.record(@"histogram-rgb-endpoints-and-clamped-headroom",h->bins[1][0]==4&&h->bins[1][255]==2&&h->bins[2][255]==3&&h->bins[3][128]==1);
|
||||
run.record(@"histogram-luma-primary-coefficients",h->bins[0][54]==1&&h->bins[0][182]==1&&h->bins[0][18]==1);
|
||||
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"];
|
||||
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host renderer:renderer]autorelease];[view refresh];NSDictionary *before=[view presetSnapshot];
|
||||
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);
|
||||
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];
|
||||
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:320 pixelsHigh:240 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0]autorelease];
|
||||
[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];[graph drawRect:graph.bounds];[NSGraphicsContext restoreGraphicsState];[images addObject:[NSData dataWithBytes:bitmap.bitmapData length:bitmap.bytesPerRow*bitmap.pixelsHigh]];
|
||||
}
|
||||
[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"]);
|
||||
NSInteger previous=DYThemeIndex();DYSetThemeIndex(6);
|
||||
run.record(@"neon-stable-theme-id-and-no-text-glow",[DYThemeNames()[6]isEqual:@"霓虹炫彩"]&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]);
|
||||
DYSetThemeIndex(previous);
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
#import "DYHistogram.h"
|
||||
#include "DYFilmMath.h"
|
||||
#include "DYFilmTime.h"
|
||||
#import "DYDiagnostics.h"
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
#pragma once
|
||||
#import <Foundation/Foundation.h>
|
||||
#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.
|
||||
struct DYHistogram {
|
||||
uint32_t bins[4][256]{};
|
||||
uint32_t samples=0;
|
||||
};
|
||||
static inline NSData *DYHistogramFromRGBA(NSData *rgba) {
|
||||
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])]++;
|
||||
h.samples++;
|
||||
}
|
||||
return [NSData dataWithBytes:&h length:sizeof(h)];
|
||||
}
|
||||
+52
-20
@@ -1,3 +1,4 @@
|
||||
#import "DYHistogram.h"
|
||||
#import "DYManagedColorPanel.h"
|
||||
#import "DYManagedColor.h"
|
||||
#import "DYInspector.h"
|
||||
@@ -86,7 +87,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
|
||||
NSArray *colors=[self trackColors];if(colors){NSGradient *g=[[[NSGradient alloc]initWithColors:colors]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5] angle:0];return;}
|
||||
NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];NSGradient *base=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot8"] endingColor:DYThemePalette()[@"slot9"]]autorelease];[base drawInBezierPath:bar angle:90];[[NSColor colorWithWhite:0 alpha:.28]setStroke];bar.lineWidth=.6;[bar stroke];
|
||||
double fraction=(self.doubleValue-self.minValue)/fmax(.000001,self.maxValue-self.minValue);
|
||||
NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:90];
|
||||
NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:DYThemeIndex()==6?0:90];
|
||||
}
|
||||
- (void)drawKnob:(NSRect)knobRect {
|
||||
NSRect circle=NSInsetRect(knobRect,1,1);
|
||||
@@ -161,7 +162,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
@implementation DYCard
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,.5,.5) xRadius:11 yRadius:11];
|
||||
DYDrawThemeSurface(path,YES); [DYThemeColor(@"border") setStroke];
|
||||
DYDrawThemeSurface(path,YES);[DYThemeColor(@"border")setStroke];
|
||||
path.lineWidth=1; [path stroke];
|
||||
[[NSColor colorWithWhite:.52 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill];
|
||||
}
|
||||
@@ -173,8 +174,16 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
@implementation DYHeader
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=NSInsetRect(self.bounds,.5,2);
|
||||
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];
|
||||
[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:r xRadius:8 yRadius:8] angle:90];
|
||||
NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:r xRadius:7 yRadius:7];
|
||||
if(DYThemeIndex()==6){
|
||||
NSDictionary *palette=DYThemePalette();BOOL expanded=self.state==NSControlStateValueOn;
|
||||
NSColor *left=[palette[@"headerTop"]blendedColorWithFraction:expanded?.32:.22 ofColor:palette[@"activeTop"]];
|
||||
NSColor *right=[palette[@"headerBottom"]blendedColorWithFraction:expanded?.26:.18 ofColor:palette[@"activeBottom"]];
|
||||
NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:left endingColor:right]autorelease];[gradient drawInBezierPath:pill angle:0];
|
||||
[[NSColor colorWithCalibratedRed:.72 green:.67 blue:.88 alpha:expanded?.65:.40]setStroke];pill.lineWidth=1;[pill stroke];
|
||||
}else{
|
||||
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];[g drawInBezierPath:pill angle:90];
|
||||
}
|
||||
NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk());
|
||||
[(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes];
|
||||
[self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes];
|
||||
@@ -192,7 +201,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
- (void)dealloc {[_swatch release];[super dealloc];}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=NSInsetRect(self.bounds,3,3);[_swatch setFill];NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:r xRadius:5 yRadius:5];[p fill];
|
||||
if([self.identifier isEqual:@"themeSwatch"]&&self.tag==5){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:NSColor.blackColor endingColor:DYThemeSwatch(5)]autorelease];[g drawInBezierPath:p angle:45];}
|
||||
if([self.identifier isEqual:@"themeSwatch"]&&self.tag>=5){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:self.tag==6?[NSColor colorWithSRGBRed:.8 green:.12 blue:1 alpha:1]:NSColor.blackColor endingColor:self.tag==6?NSColor.cyanColor:DYThemeSwatch(5)]autorelease];[g drawInBezierPath:p angle:45];}
|
||||
if([self.identifier isEqual:@"customColorSwatch"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[NSColor.systemRedColor,NSColor.systemYellowColor,NSColor.systemGreenColor,NSColor.systemCyanColor,NSColor.systemBlueColor,NSColor.systemPurpleColor]]autorelease];[g drawInBezierPath:p angle:45];[@"⌾" drawInRect:NSInsetRect(r,3,1) withAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:16],NSForegroundColorAttributeName:NSColor.whiteColor}];}
|
||||
if(self.state==NSControlStateValueOn){[DYInk() setStroke];p.lineWidth=2;[p stroke];}
|
||||
}
|
||||
@@ -227,11 +236,14 @@ static NSArray *DYPresentationSections(void) {
|
||||
@interface DYCurvePanel : DYFlippedView {
|
||||
NSDictionary *_values;
|
||||
NSSegmentedControl *_channels;
|
||||
NSData *_histogram;
|
||||
NSButton *_histogramToggle;
|
||||
NSInteger _channel;
|
||||
NSString *_dragXKey,*_dragYKey;
|
||||
}
|
||||
@property(nonatomic,assign) id<DYGraphicDelegate> delegate;
|
||||
- (void)setValues:(NSDictionary *)values;
|
||||
- (void)setHistogram:(NSData *)histogram;
|
||||
@end
|
||||
|
||||
@implementation DYCurvePanel
|
||||
@@ -240,16 +252,19 @@ 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];
|
||||
self.accessibilityLabel=@"曲线点编辑器";self.toolTip=@"点击添加点;拖动调整;双击、右键或按住 Option 点击已有点可删除";
|
||||
}
|
||||
return self;
|
||||
}
|
||||
- (void)dealloc { [_values release];[_channels release];[_dragXKey release];[_dragYKey release];[super dealloc]; }
|
||||
- (void)dealloc { [_histogram release];[_histogramToggle release];[_values release];[_channels release];[_dragXKey release];[_dragYKey release];[super dealloc]; }
|
||||
- (BOOL)acceptsFirstResponder { return YES; }
|
||||
- (void)setValues:(NSDictionary *)values { [_values release];_values=[values copy];[self setNeedsDisplay:YES]; }
|
||||
- (void)layout { [super layout];_channels.frame=NSMakeRect(12,4,self.bounds.size.width-24,24); }
|
||||
- (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)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 { return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-56)); }
|
||||
- (NSRect)plotRect { return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-76)); }
|
||||
- (NSArray *)slots {
|
||||
NSMutableArray *result=[NSMutableArray array];
|
||||
NSInteger n=_channel==0?4:2;
|
||||
@@ -282,7 +297,20 @@ static NSArray *DYPresentationSections(void) {
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=[self plotRect];
|
||||
[(DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
|
||||
[(DYThemeIndex()==6?[NSColor colorWithSRGBRed:.025 green:.02 blue:.06 alpha:1]:DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
|
||||
if(_histogramToggle.state==NSControlStateValueOn){
|
||||
const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;
|
||||
if(h&&h->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,h->bins[c][b]);
|
||||
NSArray *colors=@[NSColor.whiteColor,[NSColor colorWithSRGBRed:1 green:.23 blue:.37 alpha:1],[NSColor colorWithSRGBRed:.23 green:.94 blue:.50 alpha:1],[NSColor colorWithSRGBRed:.19 green:.51 blue:1 alpha:1]];
|
||||
[NSGraphicsContext saveGraphicsState];NSRectClip(r);
|
||||
for(int c=3;c>=0;c--){if(_channel!=0&&c!=_channel)continue;
|
||||
NSBezierPath *area=[NSBezierPath bezierPath],*line=[NSBezierPath bezierPath];[area moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];
|
||||
for(int b=0;b<256;b++){NSPoint q=NSMakePoint(NSMinX(r)+b/255.*r.size.width,NSMaxY(r)-sqrt(h->bins[c][b]/double(peak))*r.size.height*.86);[area lineToPoint:q];if(b==0)[line moveToPoint:q];else[line lineToPoint:q];}
|
||||
[area lineToPoint:NSMakePoint(NSMaxX(r),NSMaxY(r))];[area closePath];[[colors[c]colorWithAlphaComponent:c==0?.08:.19]setFill];[area fill];[[colors[c]colorWithAlphaComponent:c==0?.65:.62]setStroke];line.lineWidth=.8;[line stroke];
|
||||
}[NSGraphicsContext restoreGraphicsState];
|
||||
}else [@"等待画面 · 请移动播放头" drawAtPoint:NSMakePoint(r.origin.x+8,NSMaxY(r)-20) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}];
|
||||
}
|
||||
[[NSColor colorWithWhite:1 alpha:.1] setStroke];NSBezierPath *grid=[NSBezierPath bezierPath];grid.lineWidth=.5;
|
||||
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];
|
||||
std::vector<NSPoint> p; p.push_back(NSMakePoint(0,0));
|
||||
@@ -306,8 +334,10 @@ static NSArray *DYPresentationSections(void) {
|
||||
NSPoint q=NSMakePoint(r.origin.x+x*r.size.width,r.origin.y+(1-fmax(0,fmin(1,y)))*r.size.height);
|
||||
if(sample==0)[curve moveToPoint:q];else[curve lineToPoint:q];
|
||||
}
|
||||
NSColor *color=_channel==0?DYAccent():_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
|
||||
NSColor *color=_channel==0?(DYThemeIndex()==6?NSColor.whiteColor:DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
|
||||
for(NSDictionary *point in points) {NSPoint q=[self positionOfPoint:point];[color setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] fill];[DYInk() setStroke];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] stroke];}
|
||||
NSDictionary *axis=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:8 weight:NSFontWeightRegular],NSForegroundColorAttributeName:DYThemeColor(@"secondary")};
|
||||
[@"0" drawAtPoint:NSMakePoint(NSMinX(r),NSMaxY(r)+2) withAttributes:axis];[@"128" drawAtPoint:NSMakePoint(NSMidX(r)-7,NSMaxY(r)+2) withAttributes:axis];[@"255" drawAtPoint:NSMakePoint(NSMaxX(r)-14,NSMaxY(r)+2) withAttributes:axis];
|
||||
[@"点击添加 · 拖动调整 · 双击删除" drawAtPoint:NSMakePoint(16,self.bounds.size.height-16) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:9],NSForegroundColorAttributeName:[NSColor colorWithWhite:.7 alpha:1]}];
|
||||
}
|
||||
- (void)sendValues:(NSDictionary *)values {
|
||||
@@ -477,6 +507,7 @@ static NSImage *DYWheelImage(void) {
|
||||
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
|
||||
_export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain];
|
||||
_colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];[_colorSettings setButtonType:NSButtonTypePushOnPushOff];_colorSettings.toolTip=@"展开或收起高级颜色设置;默认使用原有流程";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已收起";
|
||||
_save.identifier=@"primaryAction";
|
||||
_addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
|
||||
for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
|
||||
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule]){[self addSubview:v];v.hidden=_embedded;}
|
||||
@@ -518,7 +549,7 @@ static NSImage *DYWheelImage(void) {
|
||||
[super dealloc];
|
||||
}
|
||||
- (BOOL)isFlipped { return YES; }
|
||||
- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);}
|
||||
- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);if(DYThemeIndex()==6&&![self.identifier isEqual:@"inspectorBackground"]){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInRect:NSMakeRect(0,0,self.bounds.size.width,2) angle:0];}}
|
||||
- (BOOL)isAccessibilityElement { return YES; }
|
||||
- (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; }
|
||||
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
|
||||
@@ -546,6 +577,7 @@ static NSImage *DYWheelImage(void) {
|
||||
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
|
||||
- (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; }
|
||||
- (void)themeChanged:(NSNotification *)notification {
|
||||
for(NSDictionary *card in _cards){NSColor *accent=DYThemeIndex()==6?DYThemeColor(@"slot15"):DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];}
|
||||
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
|
||||
for(NSButton *b in _themeButtons)b.state=b.tag==DYThemeIndex()?NSControlStateValueOn:NSControlStateValueOff;
|
||||
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:DYThemeTextAttributes(_websiteLink.font,DYAccent())]autorelease];
|
||||
@@ -558,18 +590,18 @@ static NSImage *DYWheelImage(void) {
|
||||
[self setNeedsLayout:YES];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
|
||||
}
|
||||
- (void)addLook:(id)sender {_visibleLooks=MIN(5,_visibleLooks+1);[self setNeedsLayout:YES];}
|
||||
- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];}
|
||||
- (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]];}
|
||||
- (void)buildCards {
|
||||
NSInteger index=0;
|
||||
for(NSDictionary *section in _sections) {
|
||||
DYCard *card=[[[DYCard alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
card.accessibilityLabel=section[@"title"];
|
||||
card.accessibilityLabel=section[@"title"];card.identifier=section[@"key"];
|
||||
[_document addSubview:card];
|
||||
DYHeader *header=[[[DYHeader alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
header.title=[section[@"key"] isEqual:@"skin"]?@"肤色保护设置":section[@"title"];
|
||||
[header setButtonType:NSButtonTypePushOnPushOff];
|
||||
header.bordered=NO; header.alignment=NSTextAlignmentLeft; header.font=[NSFont boldSystemFontOfSize:12];
|
||||
header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index;
|
||||
header.identifier=section[@"key"];header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index;
|
||||
header.doubleClickAction=@selector(resetSection:); header.toolTip=@"展开或折叠界面;双击还原本组";
|
||||
[card addSubview:header];
|
||||
NSButton *enabled=DYButton(@"",self,@selector(groupEnabled:));enabled.bordered=NO;[enabled setButtonType:NSButtonTypePushOnPushOff];enabled.image=[NSImage imageWithSystemSymbolName:@"eye" accessibilityDescription:@"启用本组"];
|
||||
@@ -612,7 +644,7 @@ static NSImage *DYWheelImage(void) {
|
||||
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"]) {
|
||||
DYCurvePanel *graph=[[[DYCurvePanel alloc]initWithFrame:NSZeroRect]autorelease];graph.delegate=self;graph.identifier=@"curveGraph";[card addSubview:graph];[body addObject:graph];[_graphics addObject:graph];
|
||||
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([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];
|
||||
@@ -675,10 +707,10 @@ static NSImage *DYWheelImage(void) {
|
||||
id<PROAPIAccessing> host=_embedded?[(DYToolManager*)_manager host]:_manager;
|
||||
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:key];
|
||||
DYToolMaskPanel *maskPanel=[[[DYToolMaskPanel alloc]initWithManager:host nodeID:nodeID]autorelease];[card addSubview:maskPanel];[body insertObject:maskPanel atIndex:0];record[@"maskPanel"]=maskPanel;
|
||||
NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask;
|
||||
NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.identifier=@"layerAction";mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask;
|
||||
DYMaskCountBadge *maskBadge=[[[DYMaskCountBadge alloc]initWithFrame:NSZeroRect]autorelease];maskBadge.hidden=YES;maskBadge.accessibilityLabel=[section[@"title"] stringByAppendingString:@"蒙版数量"];[card addSubview:maskBadge];record[@"maskBadge"]=maskBadge;
|
||||
NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat;
|
||||
NSButton *remove=DYButton(@"",self,@selector(removeTool:));remove.tag=index;remove.bordered=NO;remove.image=[NSImage imageWithSystemSymbolName:@"minus.square" accessibilityDescription:@"删除此层"];remove.toolTip=@"删除此层并还原参数、LUT 与蒙版";remove.accessibilityLabel=[section[@"title"]stringByAppendingString:_embedded?@"删除此层":@"删除模块"];[card addSubview:remove];record[@"removeButton"]=remove;
|
||||
NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.identifier=@"layerAction";repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat;
|
||||
NSButton *remove=DYButton(@"",self,@selector(removeTool:));remove.tag=index;remove.bordered=NO;remove.identifier=@"layerAction";remove.image=[NSImage imageWithSystemSymbolName:@"minus.square" accessibilityDescription:@"删除此层"];remove.toolTip=@"删除此层并还原参数、LUT 与蒙版";remove.accessibilityLabel=[section[@"title"]stringByAppendingString:_embedded?@"删除此层":@"删除模块"];[card addSubview:remove];record[@"removeButton"]=remove;
|
||||
[_cards addObject:record];
|
||||
index++;
|
||||
}
|
||||
@@ -719,8 +751,8 @@ static NSImage *DYWheelImage(void) {
|
||||
- (void)layout {
|
||||
[super layout];
|
||||
CGFloat w=MAX(280,self.bounds.size.width),h=self.bounds.size.height;
|
||||
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);_subtitle.hidden=_embedded||w<340;
|
||||
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*19,17,19,22)];
|
||||
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);_subtitle.hidden=_embedded||w<380;
|
||||
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*16,17,16,22)];
|
||||
_resetAll.frame=NSMakeRect(w-33,16,23,24);
|
||||
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
|
||||
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
|
||||
|
||||
@@ -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];[_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];[_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];
|
||||
}
|
||||
// Included in DYRenderer. V1 callers and their ABI remain on renderSource:...tools:error:.
|
||||
- (NSDictionary*)colorContext {@synchronized(_previewLock){return [[_colorContext copy]autorelease];}}
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
- (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;
|
||||
/// 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;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#import "DYHistogram.h"
|
||||
#import "DYManagedColor.h"
|
||||
#import "../../ColorManagement/Sources/DYColorManagementGPU.h"
|
||||
#import "../../ColorManagement/Sources/DYColorProfile.h"
|
||||
@@ -105,7 +106,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
dispatch_queue_t _lutPreparationQueue;
|
||||
DYColorTables *_tables;
|
||||
NSObject *_previewLock;
|
||||
NSData *_preview,*_lookLUTPreview;
|
||||
NSData *_preview,*_lookLUTPreview,*_histogram;
|
||||
CFTimeInterval _lastPreview;
|
||||
BOOL _exporting;
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
@@ -118,7 +119,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
#include "DYManagedRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_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{[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)trimPreparedLUTsKeeping:(NSString *)path {
|
||||
if(_preparedLUTs.count<=12)return;
|
||||
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
|
||||
@@ -141,7 +142,8 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
progress.completedUnitCount=2;dispatch_async(dispatch_get_main_queue(),^{NSError *result=progress.cancelled?[NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]:error;if(completion)completion(result);});
|
||||
}});return progress;
|
||||
}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;_lastPreview=0;}}
|
||||
- (void)invalidatePreview{@synchronized(_previewLock){[_preview release];_preview=nil;[_lookLUTPreview release];_lookLUTPreview=nil;[_histogram release];_histogram=nil;_lastPreview=0;}dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYPreviewDidChange" object:self];});}
|
||||
- (NSData*)histogram{@synchronized(_previewLock){return [[_histogram retain]autorelease];}}
|
||||
- (NSData*)preview{@synchronized(_previewLock){return [[_preview retain]autorelease];}}
|
||||
- (NSData*)lookLUTPreview{@synchronized(_previewLock){return [[_lookLUTPreview retain]autorelease];}}
|
||||
- (NSMutableDictionary*)device:(uint64_t)registry error:(NSError**)err{
|
||||
@@ -229,6 +231,7 @@ 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];
|
||||
|
||||
+24
-15
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
|
||||
- (instancetype)init {
|
||||
if((self=[super init])) {
|
||||
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@5}];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@6}];
|
||||
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
|
||||
}
|
||||
return self;
|
||||
@@ -23,26 +23,27 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
|
||||
}
|
||||
@end
|
||||
static DYThemeStore *store(void){static DYThemeStore *s;static dispatch_once_t once;dispatch_once(&once,^{s=[DYThemeStore new];});return s;}
|
||||
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变"];}
|
||||
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<6?i:5;}
|
||||
static const double paletteRGB[6][17][3]={
|
||||
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变",@"霓虹炫彩"];}
|
||||
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<7?i:6;}
|
||||
static const double paletteRGB[7][17][3]={
|
||||
{{0.11,0.12,0.14},{0.075,0.08,0.095},{0.17,0.18,0.21},{0.12,0.13,0.15},{0.27,0.29,0.33},{0.2,0.22,0.25},{0.36,0.39,0.44},{0.25,0.28,0.32},{0.21,0.23,0.26},{0.15,0.17,0.2},{0.78,0.83,0.9},{0.55,0.61,0.7},{1.0,1.0,1.0},{0.78,0.82,0.88},{0.96,0.97,0.98},{0.86,0.89,0.92},{0.67,0.72,0.77}},
|
||||
{{0.031,0.086,0.148},{0.025,0.075,0.13},{0.07,0.155,0.235},{0.045,0.12,0.19},{0.115,0.22,0.33},{0.07,0.15,0.24},{0.15,0.33,0.5},{0.08,0.24,0.36},{0.23,0.32,0.41},{0.18,0.26,0.35},{0.38,0.76,1.0},{0.23,0.64,0.97},{0.96,0.98,1.0},{0.62,0.7,0.76},{0.88,0.96,1.0},{0.82,0.9,0.96},{0.58,0.7,0.78}},
|
||||
{{0.11,0.09,0.17},{0.07,0.06,0.12},{0.18,0.14,0.28},{0.13,0.1,0.21},{0.27,0.22,0.42},{0.2,0.16,0.31},{0.43,0.34,0.68},{0.31,0.23,0.52},{0.22,0.18,0.31},{0.15,0.12,0.23},{0.78,0.71,1.0},{0.5,0.42,0.93},{0.95,0.9,1.0},{0.63,0.5,0.95},{0.98,0.95,1.0},{0.9,0.86,0.97},{0.7,0.66,0.82}},
|
||||
{{0.08,0.17,0.1},{0.05,0.12,0.07},{0.12,0.27,0.15},{0.09,0.2,0.11},{0.16,0.35,0.2},{0.12,0.27,0.15},{0.21,0.57,0.31},{0.14,0.4,0.21},{0.14,0.27,0.16},{0.1,0.2,0.11},{0.54,0.96,0.64},{0.22,0.75,0.35},{0.91,1.0,0.93},{0.28,0.8,0.42},{0.95,1.0,0.96},{0.86,0.96,0.88},{0.66,0.8,0.68}},
|
||||
{{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}},
|
||||
{{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}}
|
||||
{{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}},
|
||||
{{.11,.10,.13},{.045,.040,.055},{.16,.14,.20},{.083,.073,.103},{.115,.104,.139},{.15,.135,.18},{.16,.145,.19},{.105,.10,.13},{.24,.22,.28},{.14,.125,.17},{.90,.20,.83},{.02,.79,.94},{.93,.97,1},{.75,.72,.82},{.95,.97,1},{.86,.86,.91},{.67,.64,.73}}
|
||||
};
|
||||
NSColor *DYThemeSwatch(NSInteger index){static const double values[6][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36}};index=MAX(0,MIN(5,index));return rgb(values[index][0],values[index][1],values[index][2]);}
|
||||
void DYSetThemeIndex(NSInteger index){if(index<0||index>5)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
|
||||
NSColor *DYThemeSwatch(NSInteger index){static const double values[7][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36},{.65,.38,1}};index=MAX(0,MIN(6,index));return rgb(values[index][0],values[index][1],values[index][2]);}
|
||||
void DYSetThemeIndex(NSInteger index){if(index<0||index>6)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
|
||||
NSDictionary<NSString *,NSColor *> *DYThemePalette(void){
|
||||
static NSArray *palettes;static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSMutableArray *all=[NSMutableArray array];
|
||||
for(NSInteger index=0;index<6;index++){
|
||||
for(NSInteger index=0;index<7;index++){
|
||||
const double (*p)[3]=paletteRGB[index];NSMutableDictionary *d=[NSMutableDictionary dictionary];
|
||||
for(int i=0;i<17;i++)d[[NSString stringWithFormat:@"slot%d",i]]=rgb(p[i][0],p[i][1],p[i][2]);
|
||||
NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):DYThemeSwatch(index);
|
||||
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];[all addObject:[[d copy]autorelease]];
|
||||
NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):index==6?rgb(.78,.75,.87):DYThemeSwatch(index);
|
||||
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];if(index==6){d[@"backgroundEnd"]=rgb(.065,.060,.080);d[@"cardEnd"]=rgb(.093,.090,.110);d[@"border"]=[rgb(.36,.33,.43)colorWithAlphaComponent:.40];} [all addObject:[[d copy]autorelease]];
|
||||
}palettes=[all copy];
|
||||
});return palettes[DYThemeIndex()];
|
||||
}
|
||||
@@ -63,7 +64,7 @@ NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) {
|
||||
}
|
||||
void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
|
||||
NSDictionary *palette=DYThemePalette();NSString *role=card?@"card":@"background";
|
||||
if(DYThemeIndex()==5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];}
|
||||
if(DYThemeIndex()>=5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];}
|
||||
else {[palette[role]setFill];[path fill];}
|
||||
}
|
||||
@implementation DYThemeLabel
|
||||
@@ -72,20 +73,28 @@ void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
|
||||
@interface DYThemeButtonCell : NSButtonCell @end
|
||||
@implementation DYThemeButtonCell
|
||||
- (NSRect)drawTitle:(NSAttributedString*)title withFrame:(NSRect)frame inView:(NSView*)view {
|
||||
if(DYThemeIndex()!=5)return [super drawTitle:title withFrame:frame inView:view];
|
||||
if(DYThemeIndex()<5)return [super drawTitle:title withFrame:frame inView:view];
|
||||
NSMutableAttributedString *gold=[[title mutableCopy]autorelease];[gold addAttributes:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,gold.length)];return [super drawTitle:gold withFrame:frame inView:view];
|
||||
}
|
||||
- (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view {
|
||||
if(DYThemeIndex()!=5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
|
||||
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:6 yRadius:6];DYDrawThemeSurface(path,YES);[[DYThemeColor(@"accent")colorWithAlphaComponent:self.highlighted?.8:.32]setStroke];path.lineWidth=self.highlighted?1.5:1;[path stroke];
|
||||
if(DYThemeIndex()<5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
|
||||
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:6 yRadius:6];if(DYThemeIndex()==6&&[view.identifier isEqual:@"primaryAction"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[DYThemePalette()[@"activeTop"],DYThemePalette()[@"activeBottom"]]]autorelease];[g drawInBezierPath:path angle:0];}else DYDrawThemeSurface(path,YES);[[DYThemeColor(@"accent")colorWithAlphaComponent:self.highlighted?.8:.32]setStroke];path.lineWidth=self.highlighted?1.5:1;[path stroke];
|
||||
}
|
||||
@end
|
||||
@implementation DYThemeButton
|
||||
+ (Class)cellClass {return DYThemeButtonCell.class;}
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
if(DYThemeIndex()==6&&[self.identifier isEqual:@"layerAction"]){
|
||||
NSBezierPath *plate=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,1,1) xRadius:5 yRadius:5];
|
||||
[[NSColor colorWithWhite:1 alpha:self.cell.highlighted?.12:.055]setFill];[plate fill];
|
||||
[[NSColor colorWithWhite:1 alpha:self.cell.highlighted?.30:.14]setStroke];plate.lineWidth=.7;[plate stroke];
|
||||
}
|
||||
[super drawRect:rect];
|
||||
}
|
||||
@end
|
||||
@implementation DYThemePopUpButton
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
if(DYThemeIndex()!=5){[super drawRect:rect];return;}
|
||||
if(DYThemeIndex()<5){[super drawRect:rect];return;}
|
||||
NSRect bounds=NSInsetRect(self.bounds,1,2);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawThemeSurface(path,YES);
|
||||
[[DYThemeColor(@"accent")colorWithAlphaComponent:self.enabled?.38:.18]setStroke];path.lineWidth=1;[path stroke];
|
||||
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45])];NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.lineBreakMode=NSLineBreakByTruncatingTail;attributes[NSParagraphStyleAttributeName]=paragraph;
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.2</string>
|
||||
<string>1.8.4</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>59</string>
|
||||
<string>64</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.8.2</string>
|
||||
<string>1.8.4</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.2</string>
|
||||
<string>1.8.4</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>59</string>
|
||||
<string>64</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
+17
-35
@@ -1,51 +1,33 @@
|
||||
# 大鱼调色 FxPlug4 交接
|
||||
# 大鱼调色开发交接
|
||||
|
||||
2026-11-02 当前正式安装为 **1.7.3(49)**。本机已复现“更多空间”灰色区域并定位到SDK提供的外层contentView原点偏移;新增坐标对齐修正,首次打开无需绿色按钮。411项原生、27项几何、23项浏览库检查及本机FCP12.4热/冷重开和缩放通过,目标MacBook/FCP12.3仍待使用者复测。详见[修复与边界](research/BrowserMoreSpace1.7.3.md)、[RECOVERY.md](RECOVERY.md)及 `verification/Delivery.json` / `Package.json` / `Release.json`。保留1.7.1 Cube文字行兼容及1.7.0更新/公测诊断。以下保留1.6.0交接历史。
|
||||
2026-11-04,Asia/Shanghai。本轮正式版本1.8.4(64),实际编译源码55b66a358cf4c52eeb6ad89acde822cb73be3137。远程 https://dayu.media/git/dayu/dayu-color.git,main。实际工程 /Volumes/备份/大鱼调色/大鱼调色,Wrapper Application / Release,Objective-C++/AppKit;Apple Silicon,macOS14.6+,本机Xcode27.1/FxPlug4.3.5。
|
||||
|
||||
## 1.6.0交接历史
|
||||
唯一正式APP /Library/Plug-Ins/FxPlug/大鱼调色.app;ID com.dayu.color / com.dayu.color.XPC。固定缓存 /Users/mac/Library/Caches/CodexBuilds/com.dayu.color。签名团队B3W25FX5H5,公证profile codex-dayu-notary-B3W25FX5H5;具体Accepted记录见verification/Delivery.json。不要另建/Applications副本。交付/仓库锁按本机全局规则。
|
||||
|
||||
后续主 APP 优化入口:[大鱼调色主APP开发交接.md](/Volumes/备份/大鱼调色/大鱼调色/大鱼调色主APP开发交接.md),包含自动更新、登录验证、生产接口只读盘点与待定产品规则;其中自动更新与公测诊断已在1.7.0完成,登录与授权仍未实施。
|
||||
## 本轮明确的视觉反馈
|
||||
|
||||
2026-11-02,最终正式版 **1.6.0(39)**。本次完成Color Finale本机胶片五组、通道混合器及用户补充的全部八种印片;去掉MOEF作者/网站两行、降低模板格式,并追加一级自动映射默认开启和主标题链接。
|
||||
用户否定1.8.3“大红大绿”的分模块彩虹色块,只认可保存预设的渐变。候选63改为统一低饱和近黑、轻微暖紫的表面,**该底色已获用户明确认可**。用户随后要求模块/图层按钮强化显示。最终64完整保留63的paletteRGB和DYDrawThemeSurface,不再改底色;只给模块名称小按钮添加统一轻粉青渐变、细边和更亮展开态,给蒙版/删除/再加一层按钮增加低对比底板与更亮图标。保存预设保留原粉紫—青色渐变。
|
||||
|
||||
## 正式身份与恢复
|
||||
后续不要恢复统一大紫底、深蓝灰方案或按模块分配红绿橙色。底色认可不等于用户已对每个按钮细节作最终美学评价。当前默认炫彩ID6,旧0–5及明确保存的旧选择不改编号;偏好域com.dayu.color.preferences/themeIndex。主题/按钮外观不写调色参数或预设。
|
||||
|
||||
- 唯一APP:`/Library/Plug-Ins/FxPlug/大鱼调色.app`;ID `com.dayu.color` / `com.dayu.color.XPC`,团队B3W25FX5H5。
|
||||
- 实际编译源码:`e5affd3f097fc96f87f41be8e1a3f131ed01daeb`,APP公证 `5d74c04c-8a30-47e9-822d-4f616dfdee56` Accepted;签名、票据、Gatekeeper及正式进程路径通过。
|
||||
- 远程:`https://dayu.media/git/dayu/dayu-color.git`,main,最终标签 `v1.6.0-print-looks-20261102`。完整标签SHA及PKG/Release元数据以 `verification/Release.json` 为准;实际编译SHA与文档交付SHA分别记录。
|
||||
- 模板:`~/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef`,ozml5.11 / Motion5.4.5,SHA `fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250`。
|
||||
- Apple Silicon/macOS14.6或更新;FCP12.4已验收,旧FCP未实机覆盖。不依赖ColorFinale安装、REA缓存或父插件;无LFS/子模块。
|
||||
关键修改仅DYTheme.mm、DYInspector.mm及两个Info.plist。没有改变调色数学、GPU、Uniform、参数ID、CMS、模板或预设格式。模块标题按原state绘更亮展开态;右侧操作仅增加identifier=layerAction用于绘制,原tag/target/action不变。不同主题继续使用既有配色。
|
||||
|
||||
## 行为与参数
|
||||
## 验证与交付
|
||||
|
||||
胶片为减色、晕光、辉光、颗粒、暗角、印片六页。印片默认无:Kodak2383、Kodak2393、Kodak2302 BW、Fuji3510、Fuji3513、Fuji3519、Fuji3521、AgfaCP30,独立强度。通道混合器为RGB三输出×三输入,保持亮度/饱和度和混合强度。两工具沿用启停、折叠、复位、蒙版、数量标记、区域跟踪、相邻独立层;旧索引、Uniform前缀、LUT、蜘蛛盘和轨迹保留。
|
||||
605项正式原生检查通过。FCP12.4从正式位置加载1.8.4(64),实看统一底色、强化标题/图层操作底板,展开/折叠正常,直方图拿到57,600采样。前后完整预设均8,590字节、逐字节一致,SHA-256 1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982。详见HostRefined1.8.4.json、InstalledSelfTest.json及research/ui-refined-20261104/validation.md。
|
||||
|
||||
印片追加在五处理后、全胶片混合/原蒙版前;Rec.709线性→AP1/D60→ACEScct→65³原LMT四面体→线性Rec.709。不包含原版任意完整CMS/ODT迁移。旧1296字节前缀保留,追加filmPrint共1312字节;预设v6读v1–v5。纯印片、矩阵和减色可导出Cube;空间/时间效果和蒙版限制保留。原版CI半透明链与产品预乘合同的已测差异详见研究和完整对照报告。
|
||||
本轮正式宿主退出后载入新安装版本;未另做相同64版的第二次冷重开、VoiceOver/系统辅助显示矩阵或Instruments采样。280/320/400栏宽及CMS nil/v2/v3不变使用既有原生检查。源码确认用户认可的底色与表面绘制逐字保留。不要把数值检查/暂定评分当作用户美学认可。
|
||||
|
||||
MOEF仅发布自定义检查器与混合,无作者/网站Rig。全局技能检查器对5.11返回未知版本guard,如实保存;项目级真实原生样本字段验证与当前FCP加载/渲染分别通过。
|
||||
APP公证34af6e05-cba5-4031-9184-762f758c0889为Accepted,签名、票据、Gatekeeper及唯一发现路径通过。候选63公证记录保存在RefinedCandidate63.json,仅用于视觉沟通,未发布包。正式PKG/Release最终状态见Package.json、Release.json;标签v1.8.4-refined-neon-20261104关联最终包记录,发布后回读另作main提交,不移动标签。APP独立正式安装验收;PKG展开验包不代表重复运行安装脚本。
|
||||
|
||||
FCP新效果、新加一级层及全部还原的自动映射为开启;主标题链接为“更多插件访问 https://dayu.media”,点击已实际打开网站。原生注册默认维持历史0,新MOEF显式value1/default0;旧独立一级层省略值保持0。FCP沿用模板默认的旧主效果实测会变为开启,三组旧预设仅此0→1,其余277项及全部paths/spider/tools载荷保持。不能宣称更改模板默认后旧主效果完全逐字节不变;新手动关闭后已验证冷重开保持。
|
||||
## 保持的技术合同
|
||||
|
||||
## 验收证据
|
||||
直方图沿用320×180浮点分析缓存、256档、最多2Hz;透明/非有限像素不计,范围外归端点,共同峰值平方根缩放。RGB页叠亮度与三色,单色页仅相应通道。原流程分析源为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前;不是最终输出/HDR示波器,不保证每个曲线层即时输入。统计在工作线程,UI只画快照;缓存按renderer隔离,失效清空。不要增加全尺寸读取或UI线程像素统计。
|
||||
|
||||
正式395项原生检查、四尺寸136项原版印片对照通过,固定容差0.0001,最大线性RGB绝对差0.000004828。最终Metal与完整八外观验收的36候选相同。36候选逐个选择八种印片、两层不同印片/强度、椭圆蒙版100键跟踪、折叠标记、删除撤销重做及三段300帧ProRes通过;最终39保留全部自定义载荷,并完成新默认、实际链接、手动开关冷重开8668字节一致及新增1080p100帧正式导出。完整用户文件只在本机fcp-qa缓存,不进Git或PKG。
|
||||
完整预设v7,nil/v2/v3 CMS及模板原默认保持,高级颜色设置默认收起、展开不改参数。完整CMS、UI和恢复历史见research/handoffs/DayuColorThrough1.8.3-20261104.md及其引用的更早交接。源码依赖归档/许可证在ColorManagement,无LFS/子模块;证书/密钥不在Git。本轮未修改NAS后端、网站文章或自动更新清单。
|
||||
|
||||
- 最终安装:`verification/Delivery.json` / `InstalledSelfTest.json`。
|
||||
- 最终汇总:`verification/HostPrintLooks1.6.0.json`。
|
||||
- 默认/链接/保存:`verification/HostPrimaryDefaults1.6.0.json`。
|
||||
- 八外观完整宿主操作:`verification/HostPrintLooksBuild36.json`。
|
||||
- 算法/原版边界:`research/PrintLooks1.6.0.md` / `verification/PrintLooksReference.json`。
|
||||
- 独立恢复:`verification/PrintLooksRecovery.json`,最终编译节点294文件全字节、full/strict fsck、Release构建395项和模板重建通过。
|
||||
- 最终安装包/上传/标签恢复/清理:`verification/Package.json`、`Release.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
## 后续流程
|
||||
|
||||
最终PKG由PKG工坊签名、公证、票据与20项展开验包;不再运行系统安装器,APP已有独立正式安装和宿主验收。包与Release下载校验值以Package/Release报告为准。
|
||||
读取当前工作区与实际正式版本,保护其他任务改动。tools/checkpoint.py仅对明确路径提交/推送并核验main,自带仓库锁。tools/deliver.py持有产品交付锁直到宿主验收,保持HEAD以记录实际编译SHA,通过后输入complete。Packaging/build_pkg.py和Packaging/publish_beta.py复用PKG工坊制作、展开校验和Release完整下载;草稿404按历史指南用已登录浏览器下载真实附件后传--verified-download,不重复上传/提前发布。
|
||||
|
||||
## 接续方法
|
||||
|
||||
固定缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`。更改模型后运行 `python3 tools/build_template.py --refresh-model --overwrite`,再 `python3 tools/verify_template.py`;更新SkillAudit及摘要。Release用Wrapper Application方案,按全局产品锁/仓库锁约定交付;仅正式已公证位置做用户可见测试。证书/私钥需独立恢复。
|
||||
|
||||
历史35/37/38候选未发布;36的已验PKG在新需求到达后移除,未上传。37公证等待中停止了本地等待,保留ID查询,未重新上传相同产物。38正式验收发现FCP默认行为,39已记录实际边界。既有历史发行包与标签保留。1.5完整交接归档见 `research/handoffs/DayuColorThrough1.5.0-20261102.md`。
|
||||
|
||||
正式PKG `大鱼调色-1.6.0.pkg`,40833847字节,SHA-256 `13821631b5d54f1b9c1934c513a9cc7e92641208e20219839a63e23865f21cca`;PKG公证 `4716e3c7-8199-4dc1-940c-2376dd647e9b` Accepted,签名、票据、Gatekeeper和20项展开验包通过。发行包未再次运行系统安装器。
|
||||
|
||||
最终[Release373](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.6.0-print-looks-20261102) / 附件18已发布并回读确认。标签 `v1.6.0-print-looks-20261102` 对应完整SHA `0cc51149a6f21ebe09465b4fd7130451bedd57bb`;草稿正常浏览器下载与发布后完整下载均校验40,833,847字节及SHA-256一致。发行标签296文件逐字节恢复和full/strict fsck通过,与实际编译SHA的程序源码完全一致。恢复clone、独立构建和下载副本清理完成;已知相关位置仅正式39版APP,历史发行包和私人验收数据保留。记录见 `verification/Release.json`、`ReleaseDraftDownload1.6.0.json`、`PrintLooksReleaseRecovery.json`、`PrintLooksCleanup.json`。
|
||||
只清理本任务生成APP、旧安装备份、提交ZIP、下载和恢复clone;保留正式包、源码、历史包、私人QA媒体。恢复说明RECOVERY.md及对应最终验证报告;Git不替代证书的独立安全备份。
|
||||
在新工单中引用
屏蔽一个用户