Enable primary automatic mapping by default and add header website link

这个提交包含在:
mac 于 2026-11-02 15:12:04 +08:00 提交
1 父节点 1a33ab335b
当前提交 1e7b7682c1
18 个文件已更改
+233 -30

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

+4 -2
查看文件
@@ -1,6 +1,6 @@
# 大鱼调色
原生 FxPlug 4 调色器,当前正式安装版本 **1.6.0(36)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
原生 FxPlug 4 调色器,当前正式安装版本 **1.6.0(37)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
交接与恢复入口:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
@@ -16,6 +16,8 @@
349项原生检查、四种尺寸184项原版组件对照通过。FCP12.4验证旧234参数、LUT路径、蜘蛛盘和全部287键蒙版载荷不变;新增层默认值、蒙版数量、折叠、删除撤销/重做、冷重开通过。1920×1080正式导出验证“两帧保持”,组合预设8987字节及颗粒预设8420字节重开前后逐字节一致。见[研究与边界](research/ColorFinaleFilmMixer.md)、[组件对照](verification/FilmMixerReference.json)、[宿主验收](verification/HostFilmMixer1.5.0.json)。
新实例、全部还原及新加一级层的自动色调映射默认开启;已保存的关闭设置和旧独立一级层的缺省关闭保持。在主标题区增加可点击的“更多插件访问 https://dayu.media”。
## 1.6.0 八种印片与简洁模板
正式安装393项原生检查和四尺寸136项原版印片颜色函数对照通过,最大线性RGB绝对差0.000004828。FCP12.4逐个选择八种外观、独立印片层、100帧椭圆蒙版跟踪、折叠计数、删除/撤销/重做通过;彩色、黑白、蒙版叠层三段ProRes共300帧完整解码,黑白RGB通道完全一致。冷重开后8474、8456、32554字节三份预设分别逐字节一致;升级前276个用户参数及既有路径/蜘蛛盘/蒙版载荷保持。
@@ -40,7 +42,7 @@
前段已改为 **输入转换 → 工作空间一级调色 → 输出转换**,复用大鱼 CST 仓库的固定源码与原生 GPU 数学。曲线和色域独立选择,工作空间统一供一级调色及输出使用,不经相机还原 LUT 近似。
新实例输入为 Sony S-Log3 / S-Gamut3.Cine,输出为 Gamma 2.4 / Rec.709,工作空间为 DaVinci Intermediate / DaVinci Wide Gamut,自动色调映射关闭。请按素材实际编码选择相机输入;不会根据片段或曲线名称猜测、覆盖手选色域。一级调色包含曝光、色彩平衡、饱和度、对比度与轴心、分区影调、黑白点、趾部/肩部压缩。输入、工作空间和输出已合并到一级调色卡片,四个旁路选项移除,由一级眼睛统一启停。一级白平衡改用原 CST 色轮,支持精细拖动、方向键微调、双击复位,以及可见的“复位”按钮;按钮只重置一级白平衡。
新实例输入为 Sony S-Log3 / S-Gamut3.Cine,输出为 Gamma 2.4 / Rec.709,工作空间为 DaVinci Intermediate / DaVinci Wide Gamut,自动色调映射默认开启。请按素材实际编码选择相机输入;不会根据片段或曲线名称猜测、覆盖手选色域。一级调色包含曝光、色彩平衡、饱和度、对比度与轴心、分区影调、黑白点、趾部/肩部压缩。输入、工作空间和输出已合并到一级调色卡片,四个旁路选项移除,由一级眼睛统一启停。一级白平衡改用原 CST 色轮,支持精细拖动、方向键微调、双击复位,以及可见的“复位”按钮;按钮只重置一级白平衡。
CST 后的基础调整、HSL、曲线、色轮、五层风格 LUT 等仍属于既有显示域调色链。保留肤色保护、三原色、色阶、黑白、自动调色、吸管、预设和 Cube 导出。Cube 导出包含 CST、一级调色(含白平衡色轮)、蜘蛛盘及其它已启用的逐像素颜色操作。折叠不影响导出,眼睛关闭的模块不计入;纹理、清晰度、去朦胧和逐画面统计不写入 LUT。导出为 33³ Cube,应应用于与导出时相同编码的输入,避免重复叠加 CST/一级处理。
+3 -3
查看文件
@@ -852,7 +852,7 @@
},
{
"cmTab": 2,
"default": 0,
"default": 1,
"key": "cmtoneMapping",
"kind": "popup",
"max": 1,
@@ -3638,10 +3638,10 @@
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
"大鱼调色/Plugin/DYModel.h": "80e88add97deeac7a9dc47d12f68b0245905786297de2e6553b3da15c729da6e",
"大鱼调色/Plugin/DYModel.mm": "b992f2bfff754eccc3ed9f591bc6a8f80ccdd3f6108d2720d6dd6fe34d1556dd",
"大鱼调色/Plugin/DYModel.mm": "60c60bfbddeaaa23083e0283714248b60e3952dcda9acb6a65cd6b7fa15fd893",
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
"大鱼调色/Plugin/DYToolState.h": "28088ec819307a60f2e52334fd807a514c3ff8a550bc0efbe7069b68a6242320",
"大鱼调色/Plugin/DYToolState.mm": "f0a0f09863de52837ed962a72f2ea6098b8a5a0f43f285f9a21aebcd62c89c8d",
"大鱼调色/Plugin/DYToolState.mm": "5df0cbe265f13844b80fbf952561505ef04a0286f930079fa826551d70c3927c",
"大鱼调色/Plugin/DYUniforms.h": "207d36b5b53ab084fa8eb3813ccbbeb5193178e3468a37e9dc692ab196ffbb6a",
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
+3 -3
查看文件
@@ -1,6 +1,6 @@
{
"passed": true,
"sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"sha256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"version": "5.11",
"displayversion": "5.4.5",
"nativeReference": {
@@ -18,7 +18,7 @@
},
"staticContract": {
"passed": true,
"sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"sha256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
@@ -55,7 +55,7 @@
},
"savedSelection": {
"passed": true,
"sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"sha256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"version": "5.11",
"selectionMask": "0x10000001",
"projectID": "10000",
+6 -6
查看文件
@@ -5,11 +5,11 @@
"sources/NativeFactories.xml": "5db79ab22e948ca2bdf9162beb60d8380a95ceff6c74e86ff095804ae1d832b6",
"sources/NativeFxPlugShell.xml": "5d2a1e807fb7148e5a682c83ba30d7022c8680d2ca8309c502d30f4b12efad64",
"sources/Provenance.json": "9cfa41fd1f02b35b99cad56a4a048bafa1c627da181006f5b9186a104664f421",
"sources/RegisteredParameters.json": "010627d22f8b8041d5787be0b2a57a27789c2ae9f5bc743df5d75212dc3e0008",
"sources/RegisteredParameters.json": "145bcf31ef792ba6076a57a1652e9b0ed9fef5a5aa70a72e6cee74fec35e5c63",
"tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
"verification/SavedSelection.json": "d28a73af67af295b4b0201768c7d2d34ec5de56d7029d1fc3dc4a2d2e1bb5755",
"verification/SkillAudit.json": "d8d7d39263d9b1e9cb12d56bf0a7e007477f12ff49bd5230088d18c166d52c54",
"verification/StaticContract.json": "ef04830b5216ae4cf1e4987c08d055ffc0f4e2b820ce41dd3429975a9bf74386",
"大鱼调色.moef": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"verification/Compatibility.json": "77bc5da2deab8567b0cc7e5006ea671662ccfb7ec7f73c00d2ca264534143304"
"verification/SavedSelection.json": "6a182996deea48a975c1954d71e90e84d3aacb0443f2472578a6c425166ce674",
"verification/SkillAudit.json": "4d5bb2abbc4d502b2455b0c6a6be6d750bbc090fd12fa440e5aa624e92416fab",
"verification/StaticContract.json": "a1df90a64a103c0ec36cc641eca274a9584387b70dd02fe1a8557f504260b627",
"大鱼调色.moef": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"verification/Compatibility.json": "f2db568f806cdfb29a7bab3c6ea5e4a404b780d0468f079f30dfbd75a2875d9d"
}
+1 -1
查看文件
@@ -1,6 +1,6 @@
{
"passed": true,
"sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"sha256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"version": "5.11",
"selectionMask": "0x10000001",
"projectID": "10000",
+1 -1
查看文件
@@ -16,7 +16,7 @@
},
"savedSelection": {
"passed": false,
"sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"sha256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"selectionMask": "0x10000001",
"nativeUIVerified": false,
"scope": "Saved selection fields for observed schema; no rendering or GUI operation",
+1 -1
查看文件
@@ -1,6 +1,6 @@
{
"passed": true,
"sha256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"sha256": "6368e0026bb0270f507e7595852fba3c39a25743ccfe56a7f8f47cfd0872fed2",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
+1 -1
查看文件
@@ -270,7 +270,7 @@
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="0" />
<parameter name="自动色调映射" id="2246" flags="12889161776" default="1" value="1" />
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
+20
查看文件
@@ -0,0 +1,20 @@
{
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.6.0",
"build": "36",
"team": "B3W25FX5H5",
"notaryID": "91224ae2-68d3-4776-a9b7-2fdf8ffaea4f",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "f97320bbee6d469596f2db72a48436b73a41b324",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"shaderSHA256": "6ec98b85aeb841f9988a4b66e3e5fba9e34d5ab3d7542c9205b0480c77f9ac6d",
"hostVerification": "verification/HostPrintLooks1.6.0.json",
"nativeChecks": 393,
"printReferenceChecks": 136,
"hostAcceptanceCompleted": "2026-11-02T07:09:11.437885+00:00",
"completionNote": "Delivery worker stdin ended after formal installation; finalization resumed under the product lock after cold-reopen host acceptance."
}
+102
查看文件
@@ -0,0 +1,102 @@
{
"status": "passed",
"version": "1.6.0",
"build": "36",
"compiledSource": "f97320bbee6d469596f2db72a48436b73a41b324",
"host": "Final Cut Pro 12.4",
"userCompatibility": {
"beforePresetVersion": 5,
"afterPresetVersion": 6,
"oldValues": 276,
"newValues": 278,
"allExistingValuesUnchanged": true,
"pathsSpiderAndToolsUnchanged": true,
"printDefaultNone": true,
"beforeBytes": 8669,
"afterBytes": 8723,
"beforeSHA256": "b7c2f31e763b641b86eea4a4a94100e9aa953fd0c56741b97f26c428370f6351",
"afterSHA256": "96e886f2fe5b3b79630d5ec9d392ef2075f4dd44f6f109757e8634fef2e795f9"
},
"template": {
"version": "5.11",
"displayversion": "5.4.5",
"authorAndWebsiteRowsAbsentInExistingInstance": true,
"authorAndWebsiteRowsAbsentInFreshInstance": true,
"currentFCPHostVerified": true,
"olderFCPActuallyTested": false
},
"nativeChecks": 393,
"referenceChecks": 136,
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"privacy": "Full presets and media remain local; aggregate counts and hashes only",
"exports": [
{
"name": "print-agfa-1.6.mov",
"bytes": 14402174,
"codec": "prores",
"width": 1920,
"height": 1080,
"fps": "25/1",
"frames": 100,
"allFramesDecoded": true
},
{
"name": "print-bw-1.6.mov",
"bytes": 9634782,
"codec": "prores",
"width": 1920,
"height": 1080,
"fps": "25/1",
"frames": 100,
"allFramesDecoded": true
},
{
"name": "print-layer-mask-1.6.mov",
"bytes": 24182892,
"codec": "prores",
"width": 960,
"height": 540,
"fps": "25/1",
"frames": 100,
"allFramesDecoded": true
}
],
"bwExportChannelMaxDifference16bit": 0,
"hostChecks": {
"allEightMenuSelections": true,
"newLayerDefaultNone": true,
"baseLook": 1,
"repeatLook": 5,
"repeatStrength": 0.4,
"filmMaskCount": 1,
"trackKeyCount": 100,
"foldHidesMaskKeepsBadge": true,
"layerDeleteUndoRedoRestored": true
},
"preReopenLayerPreset": {
"bytes": 32554,
"sha256": "3713101dee2937c4a0730bca9dd1a667d2aa43c16f3c1114af5924ea706ea6ff"
},
"passResult": true,
"coldReopen": {
"agfa": {
"byteIdentical": true,
"bytes": 8474,
"sha256": "3e21a09a4710709a75b09320928522864fa9facfcdf0cb3910588f7de64294b0"
},
"bw": {
"byteIdentical": true,
"bytes": 8456,
"sha256": "c0fb7408b15231c96a7af0e6baab17ec433e90afdf3478476701063e40246be0"
},
"layer-mask": {
"byteIdentical": true,
"bytes": 32554,
"sha256": "3713101dee2937c4a0730bca9dd1a667d2aa43c16f3c1114af5924ea706ea6ff"
}
},
"completed": "2026-11-02T07:08:36.959977+00:00",
"formalRuntime": [
"27940 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
]
}
+64
查看文件
@@ -0,0 +1,64 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.6.0.pkg",
"sha256": "4ede128d78c2438aaeaf3e22926dfc5fcd584035e9574bea4110c2b5d01c7c2a",
"bytes": 40832822,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
"PKG Developer ID Installer signature",
"PKG stapled ticket and Gatekeeper install assessment",
"must-close attached to root-authorized payload",
"all four FCP/Motion host identifiers",
"bundle relocation disabled",
"desktop and Bundle ID preinstall guards",
"postinstall contains actual FxPlug verification invocations",
"GUI worker, registration repair and Finder reveal present",
"successful completion and consecutive registration checks",
"exact payload contents: 大鱼调色.app",
"fixed FxPlug outer APP install path",
"outer APP has one real verification action",
"service path/identifier/registration version: com.dayu.color.XPC",
"nonempty FxPlug service manifest",
"payload APP signature, independent ticket and Gatekeeper",
"exact payload contents: 大鱼调色",
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
"complete outer APP payload present",
"welcome warns to save work and close hosts",
"conclusion gives manual APP and host restart instructions"
],
"resources": [
{
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.6.0",
"build": "36"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.4c82157b-b550-46a2-b491-bb86c9e054ed/CD46DBA3-A872-4706-BDAC-4250D66E83D1/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.6.0.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-02 07:09:18 +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.6.0.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"id": "90d7ba03-2fac-4bd0-ae4a-32780ae7ae75",
"name": "大鱼调色-1.6.0.pkg",
"createdDate": "2026-11-02T07:09:19.757Z",
"message": "Successfully received submission info",
"status": "Accepted"
},
"appCompiledSource": "f97320bbee6d469596f2db72a48436b73a41b324",
"appBuild": "36",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
"大鱼调色.moef": "a7e671bab3a55ba413395d91d710c7b5893cd24e1cd63c84d8c7572d4e527152",
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostPrintLooks1.6.0.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+1 -1
查看文件
@@ -175,7 +175,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
for(NSDictionary *row in descriptors)if([row[@"offset"]integerValue]>=0){float value=*field(&defaults,row);finite&=std::isfinite(value);matches&=value==[row[@"default"]floatValue];}
for(int c=0;c<3;c++)finite&=std::isfinite(defaults.primariesM0[c])&&std::isfinite(defaults.primariesM1[c])&&std::isfinite(defaults.primariesM2[c]);
run.need(@"finite-real-model-defaults",finite&&matches);
run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22);
run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22&&defaults.cm.toneMapping==1);
bool initialGroups=true;
for(NSDictionary *section in sections){BOOL base=YES;for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;}
run.record(@"all-module-eyes-enabled-by-default",initialGroups);
+16 -5
查看文件
@@ -26,6 +26,11 @@ static NSButton *DYButton(NSString *title,id target,SEL action) {
b.bezelStyle=NSBezelStyleRounded; b.font=[NSFont systemFontOfSize:11];
b.contentTintColor=DYAccent(); return b;
}
@interface DYWebsiteLink : NSButton @end
@implementation DYWebsiteLink
- (NSAccessibilityRole)accessibilityRole {return NSAccessibilityLinkRole;}
- (void)resetCursorRects {[self addCursorRect:self.bounds cursor:NSCursor.pointingHandCursor];}
@end
// Header status stays visible while the body is folded and never intercepts clicks.
@interface DYMaskCountBadge : NSView
@property(nonatomic) NSUInteger count;
@@ -411,7 +416,7 @@ static NSImage *DYWheelImage(void) {
DYFlippedView *_document;
NSTextField *_brand;
NSTextField *_subtitle;
NSButton *_resetAll, *_save, *_load, *_export;
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink;
NSArray *_sections;
NSMutableArray *_cards;
NSMutableDictionary *_controls;
@@ -456,11 +461,14 @@ static NSImage *DYWheelImage(void) {
self.appearance=[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
_brand=[DYLabel(@"◒ 大鱼调色",16) retain]; _brand.font=[NSFont boldSystemFontOfSize:16];_brand.textColor=DYInk();
_subtitle=[DYLabel([[NSBundle bundleForClass:self.class]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"1.1.5",9) retain]; _subtitle.textColor=DYThemeColor(@"secondary");
_websiteLink=[[DYWebsiteLink alloc]initWithFrame:NSZeroRect];_websiteLink.title=@"更多插件访问 https://dayu.media";
_websiteLink.font=[NSFont systemFontOfSize:11];_websiteLink.bordered=NO;_websiteLink.alignment=NSTextAlignmentLeft;
_websiteLink.target=self;_websiteLink.action=@selector(openWebsite:);_websiteLink.toolTip=@"https://dayu.media";_websiteLink.accessibilityLabel=_websiteLink.title;
_resetAll=[DYButton(@"↺",self,@selector(resetAll:)) retain];_resetAll.bordered=NO; _resetAll.toolTip=@"恢复全部调色参数与 LUT";_resetAll.accessibilityLabel=@"全部还原";
_save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain];
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
_export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain];
for(NSView *v in @[_brand,_subtitle,_resetAll,_save,_load,_export]){[self addSubview:v];v.hidden=_embedded;}
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export]){[self addSubview:v];v.hidden=_embedded;}
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<5;i++){
DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=DYThemeSwatch(i);b.tag=i;b.target=self;b.action=@selector(selectTheme:);b.title=@"";b.bordered=NO;
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded;[themes addObject:b];
@@ -491,7 +499,7 @@ static NSImage *DYWheelImage(void) {
for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];
[_brand release]; [_subtitle release]; [_resetAll release]; [_save release]; [_load release]; [_export release];
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];
[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
[_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];
[super dealloc];
@@ -516,10 +524,12 @@ static NSImage *DYWheelImage(void) {
else dispatch_async(dispatch_get_main_queue(),^{ [self refresh]; });
}
- (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);}
- (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 {
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:@{NSFontAttributeName:_websiteLink.font,NSForegroundColorAttributeName:DYAccent(),NSUnderlineStyleAttributeName:@(NSUnderlineStyleSingle)}]autorelease];
for(NSDictionary *r in _controls.allValues)[r[@"field"] setBackgroundColor:DYThemeColor(@"field")];
[_browser updatePalette:DYThemePalette()];[self redrawTree:self];
}
@@ -691,9 +701,10 @@ static NSImage *DYWheelImage(void) {
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);
for(NSInteger i=0;i<5;i++)[_themeButtons[i]setFrame:NSMakeRect(w-146+i*22,17,21,22)];
_resetAll.frame=NSMakeRect(w-33,16,23,24);
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
CGFloat gap=7,bw=(w-32-gap*2)/3;
_save.frame=NSMakeRect(16,50,bw,27); _load.frame=NSMakeRect(16+bw+gap,50,bw,27); _export.frame=NSMakeRect(16+(bw+gap)*2,50,bw,27);
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,88,w,MAX(80,h-88));
_save.frame=NSMakeRect(16,74,bw,27); _load.frame=NSMakeRect(16+bw+gap,74,bw,27); _export.frame=NSMakeRect(16+(bw+gap)*2,74,bw,27);
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,112,w,MAX(80,h-112));
CGFloat cw=MAX(244,_scroll.contentSize.width-32),y=8;
for(NSMutableDictionary *c in _cards) {
DYCard *card=c[@"view"];BOOL collapsed=[c[@"collapsed"]boolValue];NSString *key=c[@"section"][@"key"];
+1 -1
查看文件
@@ -110,7 +110,7 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
CM(white,@"白点",.5,1.5,1,1);CM(shoulder,@"肩部压缩",0,1,.5,1);CM(highlights,@"一级高光",-1,1,0,1);CM(midtones,@"一级中间调",-1,1,0,1);CM(shadows,@"一级阴影",-1,1,0,1);CM(black,@"黑点",-1,1,0,1);CM(toe,@"趾部压缩",0,1,.5,1);CM(chromaMix,@"色度混合",0,1,.5,1);
CM(bypassExposure,@"旁路一级曝光",0,1,0,1);CM(bypassBalance,@"旁路一级色彩",0,1,0,1);CM(bypassContrast,@"旁路一级对比",0,1,0,1);CM(bypassTone,@"旁路一级影调",0,1,0,1);
CM(outputEnabled,@"输出转换启用",0,1,1,2);CH(outputTransfer,@"输出曲线",1002,2,transfers);CH(outputGamut,@"输出色域",22,2,DYCMGamuts());
[cm addObject:cmRow(@"cmtoneMapping",@"自动色调映射",offsetof(DYCMSettings,toneMapping),0,1,0,2,@[@{@"id":@0,@"name":@"关闭"},@{@"id":@1,@"name":@"开启"}])];
[cm addObject:cmRow(@"cmtoneMapping",@"自动色调映射",offsetof(DYCMSettings,toneMapping),0,1,1,2,@[@{@"id":@0,@"name":@"关闭"},@{@"id":@1,@"name":@"开启"}])];
#undef CM
#undef CH
NSMutableArray *input=[NSMutableArray array],*primary=[NSMutableArray array],*output=[NSMutableArray array];
+3 -1
查看文件
@@ -18,7 +18,9 @@
auto renderTools=[&](NSDictionary *tools,DYUniforms u,NSData *mesh,NSString *name){NSError *failure=nil;BOOL ok=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:mesh tools:tools error:&failure];run.need(name,ok,@{@"error":reason(failure)});return read(destination,gpu);};
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8];
Pixels baseline=renderTools(empty.document,defaults,nil,@"empty-tool-document-render");run.record(@"empty-tool-document-preserves-legacy-pixels-exactly",difference(baseline,neutral).maximum==0);
doc=DYMutablePlist(empty.document);for(NSString *type in DYToolTypes())[doc[@"layers"]addObject:DYNewTool(type)];Pixels initialized=renderTools(doc,defaults,nil,@"all-twelve-initialized-tool-types-render");run.record(@"initialized-repeated-tools-are-exactly-neutral",difference(initialized,neutral).maximum==0);
DYUniforms newPrimary=DYToolUniforms(DYNewTool(@"primary")),oldPrimary=DYToolUniforms(@{@"type":@"primary",@"values":@{}});
run.record(@"new-primary-layer-auto-mapping-on-old-omitted-default-stays-off",newPrimary.cm.toneMapping==1&&oldPrimary.cm.toneMapping==0);
doc=DYMutablePlist(empty.document);for(NSString *type in DYToolTypes()){NSMutableDictionary *n=DYMutablePlist(DYNewTool(type));if([type isEqual:@"primary"])n[@"values"][@"cmtoneMapping"]=@0;[doc[@"layers"]addObject:n];}Pixels initialized=renderTools(doc,defaults,nil,@"all-initialized-tool-types-with-legacy-primary-mapping-render");run.record(@"legacy-neutral-repeated-tools-preserve-pixels",difference(initialized,neutral).maximum==0);
// Reference is two explicit isolated native operations, which catches shared
// uniform or lookup caches, ordering, repeated CST and accidental base replay.
DYUniforms layerOne=DYToolUniforms(first),layerTwo=DYToolUniforms(second);render(run,renderer,source,destination,gpu,layerOne,@{},@"hsl-stack-first-reference");DYDiagnosticTile *intermediate=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease];Pixels single=read(destination,gpu);[[intermediate metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:single.data() bytesPerRow:width*8];Pixels expected=render(run,renderer,intermediate,destination,gpu,layerTwo,@{},@"hsl-stack-second-reference");
+4 -2
查看文件
@@ -14,7 +14,7 @@ static NSData *parameterData(DYMaskParameters p){return [NSData dataWithBytes:&p
static BOOL readParameters(id data,DYMaskParameters *p){if(![data isKindOfClass:NSData.class]||[data length]!=sizeof(*p))return NO;[data getBytes:p length:sizeof(*p)];return dyValidMaskParameters(*p);}
static CMTime keyTime(NSDictionary *key){return CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);}
NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParameters p=dyDefaultMaskParameters();p.kind=(DYMaskKind)kind;p.width=.5;p.height=.5;p.sourceStage=DYMaskSourceOriginal;if(kind==DYMaskHSLKey)p.flags=DYMaskHueEnabled;NSData *nodes=[NSData data];if(kind==DYMaskBezier){DYBezierNode n[4]={};float x[4]={-.5,.5,.5,-.5},y[4]={-.5,-.5,.5,.5};for(int i=0;i<4;i++)n[i]={x[i],y[i],x[i],y[i],x[i],y[i]};nodes=[NSData dataWithBytes:n length:sizeof(n)];}return @{@"id":NSUUID.UUID.UUIDString,@"enabled":@YES,@"combine":@0,@"parameters":parameterData(p),@"nodes":nodes,@"keys":@[]};}
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@1}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
BOOL DYValidToolMask(NSDictionary *mask){
if(![mask isKindOfClass:NSDictionary.class]||!validID(mask[@"id"])||!finiteNumber(mask[@"enabled"])||!finiteNumber(mask[@"combine"])||[mask[@"combine"]integerValue]<0||[mask[@"combine"]integerValue]>2)return NO;
DYMaskParameters p;if(!readParameters(mask[@"parameters"],&p))return NO;NSData *nodes=mask[@"nodes"];if(![nodes isKindOfClass:NSData.class]||nodes.length%sizeof(DYBezierNode)||nodes.length>32*sizeof(DYBezierNode))return NO;
@@ -70,7 +70,9 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
}
DYUniforms DYToolUniforms(NSDictionary *node){DYUniforms u;DYDefaultUniforms(&u);NSString *type=node[@"type"];for(NSDictionary *s in DYSections())for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:s[@"enabled"]])*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=0;u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.skinProtection.x=0;
NSArray *parts=[type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];for(NSString *part in parts){NSDictionary *s=DYToolSection(part);for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:s[@"enabled"]])*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=1;}
if([type isEqual:@"primary"]){u.primarySectionEnabled=1;u.cm.configured=1;u.cm.inputTransfer=u.cm.outputTransfer;u.cm.inputGamut=u.cm.outputGamut;}
// Old independent layers omitted the former zero default. Keep their image;
// new layers explicitly store the user's new automatic-mapping default.
if([type isEqual:@"primary"]){u.primarySectionEnabled=1;u.cm.configured=1;u.cm.inputTransfer=u.cm.outputTransfer;u.cm.inputGamut=u.cm.outputGamut;u.cm.toneMapping=0;}
for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if(v&&[d[@"offset"]integerValue]>=0)*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])=v.floatValue;}return u;}
BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms u=DYToolUniforms(node);NSDictionary *section=DYToolSection(type);BOOL enabled=YES;if([type isEqual:@"primary"])enabled=u.primarySectionEnabled>.5;else if([type isEqual:@"base"])enabled=u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;else for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:section[@"enabled"]])enabled=*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;if(!enabled)return YES;if([type isEqual:@"mixer"])return !DYChannelMixerActive(u);if([type isEqual:@"film"])return !DYFilmToolActive(u);if([type isEqual:@"skin"])return u.skinProtection.y==0;if([node[@"type"]isEqual:@"spider"]&&[node[@"spider"]length]){auto mesh=DYSpiderMesh(node[@"spider"]);for(float v:dy::meshSamples(mesh))if(v!=0)return NO;}if([node[@"paths"]count])return NO;for(NSDictionary *d in DYDescriptors()){NSNumber *v=node[@"values"][d[@"key"]];if(v&&v.floatValue!=[d[@"default"]floatValue])return NO;}return YES;}
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.6.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.6.0</string>
<key>CFBundleVersion</key>
<string>36</string>
<string>37</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>