From eb2dc311cb248810f6f54b2e14ab71b90e799bd3 Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 20:28:19 +0800 Subject: [PATCH] verify: notarized 1.3.0 installation and independent source/shader recovery; host persistence pending --- research/SpiderAndBalanceIntegration.md | 25 +++ verification/Delivery.json | 16 +- verification/InstalledSelfTest.json | 238 ++++++++++++++++++++++-- verification/SpiderAndBalance.json | 12 +- verification/SpiderRecovery.json | 11 ++ 5 files changed, 276 insertions(+), 26 deletions(-) create mode 100644 research/SpiderAndBalanceIntegration.md create mode 100644 verification/SpiderRecovery.json diff --git a/research/SpiderAndBalanceIntegration.md b/research/SpiderAndBalanceIntegration.md new file mode 100644 index 0000000..97afbe2 --- /dev/null +++ b/research/SpiderAndBalanceIntegration.md @@ -0,0 +1,25 @@ +# 蜘蛛盘和一级白平衡色轮的移植 + +参考仓库只读,来源节点及逐文件 SHA-256 在 `SpiderAndBalanceSources.json`;生产构建只使用当前仓库内的源码、图像与 Metal 资源。 + +## 蜘蛛盘 + +复用“大鱼调色盘”的可变网格、交互和 CPU/Metal 数学。新实例为 6×6(31 个节点),色相与饱和度点数可联动或独立选择 6、8、12、16、24。保留单点同列自由点联动、固定点仍可直接拖动、⌘ 多选、Shift 固定、框选、整环/整列选择、右键复位与键盘微调。 + +本项目的 AppKit 适配遵循原工程的手动内存管理,网格仍使用原始结构。中性网格在生产渲染中精确直通;变形网格在既有调色链后运行原始 `dyVariableSpider` 和 `dyLimit`,透明度按原预乘边界处理。眼睛和混合控制独立于折叠,Cube 导出复用相同路径。 + +网格、固定点、密度及联动状态保存在现有 DYAssetState 自定义参数中。预设 schema 3 增加 JSON 蜘蛛盘数据,旧预设恢复为中性新盘;旧模型和参数 ID 继续注册。主线程只写小型状态,渲染侧按 Metal device 缓存样本网格。 + +## 一级白平衡 + +复用“大鱼 CST”的色轮图像和交互换算:+104° 方位校正、拖动距离 /5、圆形强度约束、双击归零。一级色轮直接写原 BASIS 的方向与强度参数,取代可见的两根滑块;角度参数范围修正为 0–360°,旧存储数值保持原解释。原 BASIS 的强度平方后乘 4 换算不变。 + +色轮与蜘蛛盘每次拖动都由 FxUndoAPI 合并成一次宿主撤销;视图移除或释放时结束未完成动作。 + +## 面板与兼容 + +输入转换、工作空间、一级参数、输出转换合并为一个一级调色卡片。移除可见的四个旧旁路选项,一级眼睛统一启停;旧阶段开关和旁路参数仍保留注册,避免仅打开旧工程就改变画面。用户明确编辑 CST/色轮或复位时才清理旧旁路。 + +新实例与全部还原默认展开一级调色、蜘蛛盘校色仪、基础调整,其他模块折叠,所有眼睛开启。折叠状态仍由 InspectorToken schema 2 保存,与渲染状态分离。 + +验证分为原生数学/像素检查、AppKit 回调检查和正式 FCP 操作记录。数学覆盖见 `verification/SpiderMath.json`,原生集成见 `verification/SpiderAndBalance.json`;正式宿主记录单独保存,不以离屏回调代替用户界面验收。 diff --git a/verification/Delivery.json b/verification/Delivery.json index 01d9f0d..8dab3b1 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -1,16 +1,16 @@ { - "status": "verified", + "status": "installed-awaiting-host-verification", "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", - "version": "1.2.0", - "build": "17", + "version": "1.3.0", + "build": "18", "team": "B3W25FX5H5", - "notaryID": "f25ae46e-92da-4470-842e-128bdb232aa8", + "notaryID": "5de714ac-dd28-4d2b-926f-6c0f424d0e5d", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "48b00c85799b0226ba32aba3f2e5397aa0e509ed", + "sourceCommit": "c2818cbb1157093f80efd2a85cea0cf1509f565e", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", - "templateSHA256": "f245f1543b6ae4b8ce9dbdf899ee436b73aec44e3d9f2fbae8a1eb524aac97e5", - "shaderSHA256": "47b7c184e6f243406f0482b1a4a0312f0d0700a0b51196e51ab17a90ef0f29cc", - "hostVerification": "verification/HostCSTAndDisclosure.json" + "templateSHA256": "f027524f35c827baf746d2d7e52869644e7d601d556d8e6bf060ab27fcb49806", + "shaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2", + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-5c88ebc431764cb3be6f2bd4a5d7dbcd.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 86d2150..365489a 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -1,6 +1,6 @@ { "bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", - "checks": 110, + "checks": 155, "gpu": "Apple M4", "limitations": [ "Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.", @@ -12,14 +12,14 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AEC0E670-35B5-4811-8CF0-0EB517E6BE17" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/74AF8892-3D73-4112-967C-E3F8436C9310" }, { - "descriptors": 231, + "descriptors": 234, "name": "descriptor-unique-id-offset-key", "pass": true, - "sections": 14, - "uniformBytes": 1088 + "sections": 15, + "uniformBytes": 1104 }, { "name": "finite-real-model-defaults", @@ -47,7 +47,7 @@ "pass": true }, { - "archiveBytes": 620, + "archiveBytes": 659, "error": "未提供错误信息", "name": "secure-asset-archive-roundtrip", "pass": true @@ -61,8 +61,8 @@ "pass": true }, { - "modules": 13, - "name": "default-primary-base-expanded-all-eyes-on", + "modules": 12, + "name": "default-primary-spider-base-expanded-all-eyes-on", "pass": true }, { @@ -102,6 +102,101 @@ "name": "unsupported-basis-curve-adapts-through-intermediate", "pass": true }, + { + "name": "primary-balance-wheel-restored-and-palette-loaded", + "pass": true + }, + { + "name": "single-primary-card-no-bypass-checkboxes", + "pass": true + }, + { + "angleDegrees": 277.8014221191406, + "name": "balance-wheel-reference-orientation-and-fine-drag", + "pass": true, + "strength": 0.1196703314781189 + }, + { + "name": "balance-drag-one-host-undo-group", + "pass": true + }, + { + "name": "balance-double-click-neutral", + "pass": true + }, + { + "name": "spider-default-six-by-six-31-nodes", + "pass": true + }, + { + "name": "spider-single-drag-spoke-following-and-pin", + "pass": true + }, + { + "name": "spider-drag-one-host-undo-group", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "spider-archive-retains-mesh-pins-and-lut-paths", + "pass": true + }, + { + "name": "complete-version-three-preset-includes-mesh", + "pass": true + }, + { + "name": "spider-json-preset-exact-roundtrip", + "pass": true + }, + { + "name": "spider-json-rejects-unsupported-topology", + "pass": true + }, + { + "name": "spider-archive-rejects-nonfinite-coordinates", + "pass": true + }, + { + "name": "spider-independent-resolution-and-resample", + "pass": true + }, + { + "name": "spider-reset-preserves-density", + "pass": true + }, + { + "name": "spider-command-multiselect", + "pass": true + }, + { + "name": "spider-ring-selection", + "pass": true + }, + { + "name": "spider-spoke-selection", + "pass": true + }, + { + "name": "spider-shift-pin", + "pass": true + }, + { + "name": "spider-pinned-anchor-still-draggable", + "pass": true + }, + { + "name": "spider-right-click-reset-unpins", + "pass": true + }, + { + "name": "spider-escape-restores-coordinates-and-pins", + "pass": true + }, + { + "name": "native-interaction-window-never-visible", + "pass": true + }, { "name": "metal-device", "pass": true @@ -154,6 +249,119 @@ "name": "blackwhite-eye-bypasses-retained-mix", "pass": true }, + { + "affectedComponents": 1288, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-6-6", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-6-6", + "pass": true + }, + { + "affectedComponents": 1240, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-6-8", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-6-8", + "pass": true + }, + { + "affectedComponents": 1161, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-6-24", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-6-24", + "pass": true + }, + { + "affectedComponents": 612, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-12-6", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-12-6", + "pass": true + }, + { + "affectedComponents": 604, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-12-8", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-12-8", + "pass": true + }, + { + "affectedComponents": 571, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-12-24", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-12-24", + "pass": true + }, + { + "affectedComponents": 315, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-24-6", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-24-6", + "pass": true + }, + { + "affectedComponents": 314, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-24-8", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-24-8", + "pass": true + }, + { + "affectedComponents": 309, + "error": "未提供错误信息", + "maximumError": 0, + "name": "spider-production-cpu-parity-24-24", + "pass": true + }, + { + "name": "spider-eye-retains-but-bypasses-24-24", + "pass": true + }, + { + "error": "", + "name": "primary-master-active-render", + "pass": true + }, + { + "error": "", + "name": "primary-master-inactive-render", + "pass": true + }, + { + "name": "primary-master-controls-complete-cst-pipeline", + "pass": true + }, { "invalidComponents": 0, "name": "renderer-alpha-contract", @@ -206,6 +414,12 @@ "pass": true, "triples": 35937 }, + { + "error": "未提供错误信息", + "name": "cube-export-includes-spider-warp", + "pass": true, + "triples": 35937 + }, { "error": "", "name": "renderer-exposure-pass", @@ -590,7 +804,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AEC0E670-35B5-4811-8CF0-0EB517E6BE17/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/74AF8892-3D73-4112-967C-E3F8436C9310/diagnostic-export.cube" }, { "bytes": 1186074, @@ -609,8 +823,8 @@ "pass": true }, { - "heartbeats": 4, - "maximumGapMS": 5.9790832456201315, + "heartbeats": 0, + "maximumGapMS": 78.40712508186698, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -649,6 +863,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AEC0E670-35B5-4811-8CF0-0EB517E6BE17", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/74AF8892-3D73-4112-967C-E3F8436C9310", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/verification/SpiderAndBalance.json b/verification/SpiderAndBalance.json index 504f0e3..c15ab6a 100644 --- a/verification/SpiderAndBalance.json +++ b/verification/SpiderAndBalance.json @@ -1,5 +1,5 @@ { - "bundlePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/DerivedData/Build/Products/Release/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", + "bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", "checks": 198, "gpu": "Apple M4", "limitations": [ @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5AF8CE34-989A-4370-8611-D2DF3D3A59A3" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/CCFC8F5B-B120-4EB6-8296-AC6E2B96C627" }, { "descriptors": 234, @@ -1167,7 +1167,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5AF8CE34-989A-4370-8611-D2DF3D3A59A3/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/CCFC8F5B-B120-4EB6-8296-AC6E2B96C627/diagnostic-export.cube" }, { "bytes": 1186074, @@ -1187,7 +1187,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 87.83329161815345, + "maximumGapMS": 77.71479152143002, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -1226,8 +1226,8 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/5AF8CE34-989A-4370-8611-D2DF3D3A59A3", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/CCFC8F5B-B120-4EB6-8296-AC6E2B96C627", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document.", "candidateShaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2", - "referenceSHA256": "dc6191682c73c5ae88484af3ef2b38499880c1ccafc78e5c0ab7141612ebe458" + "independentCSTReferenceSHA256": "dc6191682c73c5ae88484af3ef2b38499880c1ccafc78e5c0ab7141612ebe458" } diff --git a/verification/SpiderRecovery.json b/verification/SpiderRecovery.json new file mode 100644 index 0000000..276b0f7 --- /dev/null +++ b/verification/SpiderRecovery.json @@ -0,0 +1,11 @@ +{ + "passResult": true, + "repository": "https://dayu.media/git/dayu/dayu-color.git", + "sourceCommit": "c2818cbb1157093f80efd2a85cea0cf1509f565e", + "restoredFiles": 168, + "fsck": "full strict passed", + "rebuiltShaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2", + "clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/spider-remote-restore-_wlti6wz", + "cloneCleaned": true, + "formalShaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2" +}