diff --git a/ColorManagement/build_runtime.py b/ColorManagement/build_runtime.py
index dd935a5..5e92783 100644
--- a/ColorManagement/build_runtime.py
+++ b/ColorManagement/build_runtime.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
"""Build the pinned, ARC-isolated CMS bridge and a deterministic Xcode link file."""
from pathlib import Path
-import hashlib, json, os, subprocess, sys, fcntl
+import hashlib, json, os, subprocess, sys, fcntl, shutil
ROOT=Path(__file__).resolve().parent
sys.path.insert(0,str(ROOT/'Tools'))
from build_ocio import build
@@ -22,9 +22,16 @@ def prepare():
subprocess.run(args,check=True);objects.append(str(obj))
subprocess.run(['xcrun','libtool','-static','-o',str(library),*objects],check=True)
stamp.write_text(json.dumps(dict(key=key,librarySHA256=hashlib.sha256(library.read_bytes()).hexdigest()),indent=2)+'\n')
- frameworks=['CoreGraphics','CoreImage','ColorSync','IOKit']
- args=['-ObjC',str(library),*runtime['libraries']]
+ frameworks=['Metal','CoreGraphics','CoreImage','ColorSync','IOKit']
+ args=['-Wl,-ObjC',str(library),*runtime['libraries']]
for name in frameworks:args+=['-framework',name]
response=CACHE/'bridge-link.rsp';response.write_text('\n'.join('"'+s.replace('"','\\"')+'"' for s in args)+'\n')
return str(response)
-if __name__=='__main__':print(prepare())
+if __name__=='__main__':
+ print(prepare())
+ if len(sys.argv)>1:
+ destination=Path(sys.argv[1])/'ColorManagement';destination.mkdir(parents=True,exist_ok=True)
+ source=ROOT/'ThirdParty/ColorManagement'
+ shutil.copytree(source/'licenses',destination/'licenses',dirs_exist_ok=True,ignore=shutil.ignore_patterns('._*'))
+ for name in ['dependencies.lock.json','README.md']:shutil.copy2(source/name,destination/name)
+ shutil.copy2(ROOT/'PROVENANCE.json',destination/'PROVENANCE.json')
diff --git a/README.md b/README.md
index 383982d..82a99cb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,24 @@
原生 FxPlug 4 调色器,当前正式安装的公测版本 **1.7.4(52)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
-2026-11-03完成BASIS、Colour Space Transform和Color Finale的只读色彩管理调查,含原版GPU曝光/映射及当前一级颜色内核的有限检查。宿主边界、重复映射、工具工作域和旧工程迁移的改进方案见[研究报告与实施方案](research/cms-audit-20261103/report.md)。本轮仅增加研究资料和探针,正式产品仍为1.7.4(52)。
+2026-11-03完成BASIS、Colour Space Transform和Color Finale的只读色彩管理调查,含原版GPU曝光/映射及当前一级颜色内核的有限检查。宿主边界、重复映射、工具工作域和旧工程迁移的改进方案见[研究报告与实施方案](research/cms-audit-20261103/report.md)。1.8.0(53)候选已按方案接入新版 CMS,正式交付状态以 verification/Delivery.json 为准。
+
+
+## 1.8.0 色彩管理
+
+在调色参数顶部选择管理方式;色彩管理独立于可删除的调色模块。旧工程与 v1–v6 预设缺省仍走原有渲染,不自动改变原画面。新增一级层默认关闭额外色调映射,旧层明确保存的开关保留。
+
+- **跟随 FCP**:按实际源/目标颜色配置转换,不重复还原相机,不加显示映射。内部一级工作空间固定为 ACEScct/AP1。
+- **相机编码 → ACES**:明确指定输入曲线/原色,再经过一次所选输出变换。此方式保留旧版 sRGB 码值载体约定,使用前须关闭上游相机还原和重复的颜色符合。
+- **输入 LUT → ACES**:明确选择输入 LUT 及其输出编码,然后进入同一工作链。
+
+引擎固定 OpenColorIO 2.5.2 / ACES 1.3 studio-config v2.2.0,源码、依赖源包、摘要与许可证保存在 ColorManagement/,不依赖兄弟 APP 的安装。宿主颜色配置用实际 CGColorSpace 描述及指纹分别缓存;只有已知 RGB Linear / Rec.709 或 Rec.2020 才允许缺失配置的回退。
+
+新版处理顺序固定:所有一级层 → 所有印片(ACEScct)→ 一次输出变换 → SDR 修饰工具 → 实际宿主目标。一级混合、蒙版及印片强度在 AP1 线性域混合。核心图像传输、OCIO 与配置转换采用 float32;沿用的 BASIS 入口及活跃旧工具仍有 half 精度。SDR 修饰域明确为 Rec.709 线性/sRGB,物理色域转换后接入;新版减色用有界效果差量延伸保留超范围残差,旧版限幅保持。
+
+PQ/HLG 输出或跟随 Rec.2020 宿主暂只接受一级与印片;存在活跃 SDR 修饰时返回明确错误,不静默进入有界 LUT。此版本没有把全部旧工具改写成场景/HDR 算法。
+
+完整预设为 v7,包含独立 CMS 状态,兼容 v1–v6。新版 Cube 为 65³,输入为声明的相机/LUT 码值,跟随宿主方式导出时输入约定为 sRGB;输出固定为 sRGB/Rec.709 编码。它不保存工程的宿主上下文。HDR、蒙版、空间/时间处理和画面分析应保存完整预设。旧兼容方式维持原有 33³ 导出。
交接与恢复入口:[大鱼调色FxPlug4交接.md](大鱼调色FxPlug4交接.md)。
@@ -32,7 +49,7 @@
349项原生检查、四种尺寸184项原版组件对照通过。FCP12.4验证旧234参数、LUT路径、蜘蛛盘和全部287键蒙版载荷不变;新增层默认值、蒙版数量、折叠、删除撤销/重做、冷重开通过。1920×1080正式导出验证“两帧保持”,组合预设8987字节及颗粒预设8420字节重开前后逐字节一致。见[研究与边界](research/ColorFinaleFilmMixer.md)、[组件对照](verification/FilmMixerReference.json)、[宿主验收](verification/HostFilmMixer1.5.0.json)。
-FCP新实例、全部还原及新加一级层的自动色调映射默认开启;旧独立一级层的缺省关闭保持;FCP沿用模板默认值的旧主效果会跟随为开启,新版中手动关闭后可独立保存并在冷重开后保留。在主标题区增加可点击的“更多插件访问 https://dayu.media”。
+历史 1.6–1.7 的 FCP 新实例、全部还原及新加一级层的自动色调映射默认开启;旧独立一级层的缺省关闭保持;FCP沿用模板默认值的旧主效果会跟随为开启,新版中手动关闭后可独立保存并在冷重开后保留。在主标题区增加可点击的“更多插件访问 https://dayu.media”。
## 1.6.0 八种印片与简洁模板
diff --git a/template/sources/RegisteredParameters.json b/template/sources/RegisteredParameters.json
index acddacf..413ec6b 100644
--- a/template/sources/RegisteredParameters.json
+++ b/template/sources/RegisteredParameters.json
@@ -1,7 +1,7 @@
{
"archivesBase64": {
"9000": "AAAAAAAAAisqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBa2JwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAaULDBMZH1UkbnVsbNMNDg8QERJVZm9sZHNWc2NoZW1hViRjbGFzc4ACEAKABNMUFQ8WFxhXTlMua2V5c1pOUy5vYmplY3RzoKCAA9IaGxwdWiRjbGFzc25hbWVYJGNsYXNzZXNcTlNEaWN0aW9uYXJ5ohweWE5TT2JqZWN00hobICFfEBBEWUluc3BlY3RvclRva2VuoiIeXxAQRFlJbnNwZWN0b3JUb2tlbgAIABEAGgAkACkAMgA3AEkATABYAFoAYABmAG0AcwB6AIEAgwCFAIcAjgCWAKEAogCjAKUAqgC1AL4AywDOANcA3ADvAPIAAAAAAAACAQAAAAAAAAAjAAAAAAAAAAAAAAAAAAABBQgACAARABoAJAApADIANwBJAE4AWwBtAG8AcQB1AHsB6gAAAAAAAAIBAAAAAAAAABAAAAAAAAAAAAAAAAAAAAHrAA==",
- "9001": "AAAAAAAAAjcqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBd2JwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAaULDBUbIVUkbnVsbNQNDg8QERITFFVwYXRoc1YkY2xhc3Ncc3BpZGVyTGlua2VkWnNwaWRlck1lc2iAAoAECYAA0xYXDhgZGldOUy5rZXlzWk5TLm9iamVjdHOgoIAD0hwdHh9aJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiHiBYTlNPYmplY3TSHB0iI1xEWUFzc2V0U3RhdGWiJCBcRFlBc3NldFN0YXRlAAgAEQAaACQAKQAyADcASQBMAFgAWgBgAGYAbwB1AHwAiQCUAJYAmACZAJsAogCqALUAtgC3ALkAvgDJANIA3wDiAOsA8AD9AQAAAAAAAAACAQAAAAAAAAAlAAAAAAAAAAAAAAAAAAABDQgACAARABoAJAApADIANwBJAE4AWwBtAG8AcQB1AHsB9gAAAAAAAAIBAAAAAAAAABAAAAAAAAAAAAAAAAAAAAH3AA==",
+ "9001": "AAAAAAAAAlEqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBkWJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAaULDBcdI1UkbnVsbNUNDg8QERITFBUVVXBhdGhzViRjbGFzc1xzcGlkZXJMaW5rZWRfEA9jb2xvck1hbmFnZW1lbnRac3BpZGVyTWVzaIACgAQJgACAANMYGQ4aGxxXTlMua2V5c1pOUy5vYmplY3RzoKCAA9IeHyAhWiRjbGFzc25hbWVYJGNsYXNzZXNcTlNEaWN0aW9uYXJ5oiAiWE5TT2JqZWN00h4fJCVcRFlBc3NldFN0YXRloiYiXERZQXNzZXRTdGF0ZQAIABEAGgAkACkAMgA3AEkATABYAFoAYABmAHEAdwB+AIsAnQCoAKoArACtAK8AsQC4AMAAywDMAM0AzwDUAN8A6AD1APgBAQEGARMBFgAAAAAAAAIBAAAAAAAAACcAAAAAAAAAAAAAAAAAAAEjCAAIABEAGgAkACkAMgA3AEkATgBbAG0AbwBxAHUAewIQAAAAAAAAAgEAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAhEA",
"9002": "AAAAAAAAApUqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEB1WJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAawLDBEdHh8gJCotMDFVJG51bGzSDQ4PEFhkb2N1bWVudFYkY2xhc3OAAoAL0xITDhQYHFdOUy5rZXlzWk5TLm9iamVjdHOjFRYXgAOABIAFoxkaG4AGgAiACoAHWWJhc2VNYXNrc1ZsYXllcnNWc2NoZW1h0xITDiEiHKCggAfSJSYnKFokY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaInKVhOU09iamVjdNITDissoIAJ0iUmLi9XTlNBcnJheaIuKRAB0iUmMjNeRFlUb29sRG9jdW1lbnSiNCleRFlUb29sRG9jdW1lbnQACAARABoAJAApADIANwBJAEwAWABaAGcAbQByAHsAggCEAIYAjQCVAKAApACmAKgAqgCuALAAsgC0ALYAwADHAM4A1QDWANcA2QDeAOkA8gD/AQIBCwEQAREBEwEYASABIwElASoBOQE8AAAAAAAAAgEAAAAAAAAANQAAAAAAAAAAAAAAAAAAAUsIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7AlQAAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAACVQA="
},
"parameters": [
@@ -3638,11 +3638,13 @@
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
"大鱼调色/Plugin/DYFilmTypes.h": "c35a43b5b93988e8517e5db8f281da0dfd1e02f5b0e7bfb62e7345cec444a36d",
- "大鱼调色/Plugin/DYModel.h": "80e88add97deeac7a9dc47d12f68b0245905786297de2e6553b3da15c729da6e",
- "大鱼调色/Plugin/DYModel.mm": "bde987e48f79e5cf8e2e6bccc49cac27d420979d27e0e6859a27e98d0bd7bad7",
+ "大鱼调色/Plugin/DYManagedColor.h": "616c7919bf0889f767ebb68d4b37b775183451b213b8d2d979eeb293be69010c",
+ "大鱼调色/Plugin/DYManagedColor.mm": "7e7fc5633d88d2c626f2561fc9f02440da464a7b9531b8c2d635745077548d0a",
+ "大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
+ "大鱼调色/Plugin/DYModel.mm": "29fea6064d3131119933401f554cc04e48cadf07d0c62f25b8d66795201396f8",
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
- "大鱼调色/Plugin/DYToolState.h": "28088ec819307a60f2e52334fd807a514c3ff8a550bc0efbe7069b68a6242320",
- "大鱼调色/Plugin/DYToolState.mm": "7b113450ae43e0e5d478d8f0e4212b7d25e47d3cc8bc0d4d868ab58c98d3c56c",
+ "大鱼调色/Plugin/DYToolState.h": "0a83109d2c02626d6b9e7340b74be6e6a74f366f31f9d7622b4a88000d5ad7b9",
+ "大鱼调色/Plugin/DYToolState.mm": "3be23fd6e50f1137a2d5f2c087fd5724d0c41ca0aabb8e3b43dbb0ed7ec6b578",
"大鱼调色/Plugin/DYUniforms.h": "207d36b5b53ab084fa8eb3813ccbbeb5193178e3468a37e9dc692ab196ffbb6a",
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
diff --git a/template/verification/Compatibility.json b/template/verification/Compatibility.json
index 9386fc8..bc2e733 100644
--- a/template/verification/Compatibility.json
+++ b/template/verification/Compatibility.json
@@ -1,6 +1,6 @@
{
"passed": true,
- "sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
+ "sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"version": "5.11",
"displayversion": "5.4.5",
"nativeReference": {
@@ -18,7 +18,7 @@
},
"staticContract": {
"passed": true,
- "sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
+ "sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
@@ -55,7 +55,7 @@
},
"savedSelection": {
"passed": true,
- "sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
+ "sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"version": "5.11",
"selectionMask": "0x10000001",
"projectID": "10000",
diff --git a/template/verification/SavedSelection.json b/template/verification/SavedSelection.json
index aa45a8a..54540cd 100644
--- a/template/verification/SavedSelection.json
+++ b/template/verification/SavedSelection.json
@@ -1,6 +1,6 @@
{
"passed": true,
- "sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
+ "sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"version": "5.11",
"selectionMask": "0x10000001",
"projectID": "10000",
diff --git a/template/verification/StaticContract.json b/template/verification/StaticContract.json
index 2423adb..e9e85d2 100644
--- a/template/verification/StaticContract.json
+++ b/template/verification/StaticContract.json
@@ -1,6 +1,6 @@
{
"passed": true,
- "sha256": "fe6b9ed9a59e1e00de7bcad4526bc98fa2d5fde5cab490fd65ec999835ab2250",
+ "sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"version": "5.11",
"displayversion": "5.4.5",
"filterCount": 1,
diff --git a/template/大鱼调色.moef b/template/大鱼调色.moef
index 605f558..41c01a4 100644
--- a/template/大鱼调色.moef
+++ b/template/大鱼调色.moef
@@ -227,8 +227,8 @@
0
- *********XQeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-Rq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-IP6JIYPbJgPBEB1UwE2F6H33JkMLFcQpMYMqlVQrBQQr-dN4JmH4ZiOqJYKbBkOKFZQYpZQqW**c*20M**olML1VUN4ZRCImtfNLZnKYtH9axWOaJXR5CUc6*1oVkR5VxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW5W-MHZBDMadZMrHG5-oW6pl2KI3nQqJoIrFVR4KW70-QF3Z-QrBZR3BoMLFZ**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-U*4M*Pk-p*5k*WE0I*7M*a*0N*7g*cU0e*9I*hU0r*9Y*jU17*B6*rk1W*Cg*w*1x*E*********0*E*********Z*******************-1EU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-xU********6-*********-********************5r**
- *********XQeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-Rq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-IP6JIYPbJgPBEB1UwE2F6H33JkMLFcQpMYMqlVQrBQQr-dN4JmH4ZiOqJYKbBkOKFZQYpZQqW**c*20M**olML1VUN4ZRCImtfNLZnKYtH9axWOaJXR5CUc6*1oVkR5VxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW5W-MHZBDMadZMrHG5-oW6pl2KI3nQqJoIrFVR4KW70-QF3Z-QrBZR3BoMLFZ**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-U*4M*Pk-p*5k*WE0I*7M*a*0N*7g*cU0e*9I*hU0r*9Y*jU17*B6*rk1W*Cg*w*1x*E*********0*E*********Z*******************-1EU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-xU********6-*********-********************5r**
+ *********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*
+ *********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*
0
diff --git a/tools/build_template.py b/tools/build_template.py
index 9a6b873..49b90eb 100644
--- a/tools/build_template.py
+++ b/tools/build_template.py
@@ -22,14 +22,15 @@ CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
def sha(data):return hashlib.sha256(data).hexdigest()
def model_identity():
- files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','大鱼调色/Plugin/DYSpiderState.h','大鱼调色/Plugin/SpiderCore/DYColorMath.h','大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp','template/tools/dump_model.mm','大鱼调色/Plugin/DYFilmTypes.h','大鱼调色/Plugin/DYFilmMath.h','大鱼调色/Plugin/DYToolState.h','大鱼调色/Plugin/DYToolState.mm','大鱼调色/Plugin/MaskCore/DYMaskOperator.h','大鱼调色/Plugin/MaskCore/DYMask.h']
+ files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYManagedColor.h','大鱼调色/Plugin/DYManagedColor.mm','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','大鱼调色/Plugin/DYSpiderState.h','大鱼调色/Plugin/SpiderCore/DYColorMath.h','大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp','template/tools/dump_model.mm','大鱼调色/Plugin/DYFilmTypes.h','大鱼调色/Plugin/DYFilmMath.h','大鱼调色/Plugin/DYToolState.h','大鱼调色/Plugin/DYToolState.mm','大鱼调色/Plugin/MaskCore/DYMaskOperator.h','大鱼调色/Plugin/MaskCore/DYMask.h']
return {name:sha((ROOT/name).read_bytes()) for name in files}
def refresh_metadata():
cache=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/template-model')
cache.mkdir(parents=True,exist_ok=True)
executable=cache/'dump_model'
- command=['xcrun','clang++','-std=c++17','-fno-objc-arc','-fblocks','-F','/Library/Developer/SDKs/FxPlug.sdk/Library/Frameworks','-F','/Library/Developer/Frameworks','-framework','Foundation','-framework','AppKit','-framework','FxPlug','-framework','CoreMedia','-Wl,-rpath,/Library/Developer/Frameworks','-I',str(ROOT/'大鱼调色/Plugin'),str(TEMPLATE/'tools/dump_model.mm'),str(ROOT/'大鱼调色/Plugin/DYModel.mm'),str(ROOT/'大鱼调色/Plugin/DYToolState.mm'),'-o',str(executable)]
+ subprocess.run(['/usr/bin/python3',str(ROOT/'ColorManagement/build_runtime.py')],check=True)
+ command=['xcrun','clang++','-std=c++20','-fno-objc-arc','-fblocks','-F','/Library/Developer/SDKs/FxPlug.sdk/Library/Frameworks','-F','/Library/Developer/Frameworks','-framework','Foundation','-framework','AppKit','-framework','FxPlug','-framework','CoreMedia','-Wl,-rpath,/Library/Developer/Frameworks','-I',str(ROOT/'大鱼调色/Plugin'),str(TEMPLATE/'tools/dump_model.mm'),str(ROOT/'大鱼调色/Plugin/DYModel.mm'),str(ROOT/'大鱼调色/Plugin/DYManagedColor.mm'),str(ROOT/'大鱼调色/Plugin/DYToolState.mm'),'@/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/cms-runtime/bridge-link.rsp','-o',str(executable)]
subprocess.run(command,check=True)
result=json.loads(subprocess.check_output([str(executable)],text=True))
result['sourceSHA256']=model_identity()
diff --git a/大鱼调色.xcodeproj/project.pbxproj b/大鱼调色.xcodeproj/project.pbxproj
index 3878a1b..aa4dfc3 100644
--- a/大鱼调色.xcodeproj/project.pbxproj
+++ b/大鱼调色.xcodeproj/project.pbxproj
@@ -325,7 +325,7 @@
shellPath = /bin/sh;
shellScript = (
"set -eu",
- "/usr/bin/python3 \"$SRCROOT/ColorManagement/build_runtime.py\"",
+ "/usr/bin/python3 \"$SRCROOT/ColorManagement/build_runtime.py\" \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"",
"/usr/bin/python3 \"$SRCROOT/tools/build_kernels.py\" --output \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/default.metallib\" --intermediates \"$DERIVED_FILE_DIR/DayuKernels\"",
"/usr/bin/python3 - \"$SRCROOT/大鱼调色/Plugin/Resources\" \"$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\" <<'PYBUILD'",
"import pathlib,shutil,sys",
diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm
index eed1266..e2b76fe 100644
--- a/大鱼调色/Plugin/DYDiagnostics.mm
+++ b/大鱼调色/Plugin/DYDiagnostics.mm
@@ -3,6 +3,8 @@
#import "DYDiagnostics.h"
#import "DYModel.h"
#import "DYRenderer.h"
+#import "DYManagedColor.h"
+#import "../../ColorManagement/Sources/DYColorProfile.h"
#import "DYAutoGrade.h"
#import "DYLUTLibrary.h"
#import "DYLUTBrowser.h"
@@ -93,9 +95,11 @@
FxRect _bounds;
uint64_t _registry;
FxImageOrigin _diagnosticOrigin;
+ CGColorSpaceRef _diagnosticSpace;
}
- (instancetype)initWithDevice:(id)device width:(NSUInteger)width height:(NSUInteger)height;
- (void)setDiagnosticImageOrigin:(FxImageOrigin)origin;
+- (void)setDiagnosticColorSpace:(CGColorSpaceRef)space;
@end
@implementation DYDiagnosticTile
- (instancetype)initWithDevice:(id)device width:(NSUInteger)width height:(NSUInteger)height {
@@ -111,12 +115,14 @@
if(!_surface||!_texture){[self release];return nil;}
}return self;
}
-- (void)dealloc {[_texture release];if(_surface)CFRelease(_surface);[super dealloc];}
+- (void)dealloc {if(_diagnosticSpace)CGColorSpaceRelease(_diagnosticSpace);[_texture release];if(_surface)CFRelease(_surface);[super dealloc];}
- (id)metalTextureForDevice:(id)device {return device.registryID==_registry?_texture:nil;}
- (IOSurface *)ioSurface {return (IOSurface *)_surface;}
- (FxRect)tilePixelBounds {return _bounds;}
- (FxRect)imagePixelBounds {return _bounds;}
- (uint64_t)deviceRegistryID {return _registry;}
+- (CGColorSpaceRef)colorSpace{return _diagnosticSpace;}
+- (void)setDiagnosticColorSpace:(CGColorSpaceRef)s{if(_diagnosticSpace)CGColorSpaceRelease(_diagnosticSpace);_diagnosticSpace=s?CGColorSpaceRetain(s):nil;}
- (FxImageOrigin)imageOrigin {return _diagnosticOrigin;}
- (double)pixelAspect{return 1;}
- (void)setDiagnosticImageOrigin:(FxImageOrigin)origin {_diagnosticOrigin=origin;}
@@ -282,7 +288,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
run.record(@"spider-single-drag-spoke-following-and-pin",dragged.x[0]>initialMesh.x[0]&&dragged.x[1]>initialMesh.x[1]&&dragged.x[3]>initialMesh.x[3]&&dragged.x[4]==initialMesh.x[4]&&dragged.x[5]==initialMesh.x[5]&&dragged.pins[2]);
run.record(@"spider-drag-one-host-undo-group",uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1&&!uiHost->_undoActive);
error=nil;NSData *spiderArchive=[NSKeyedArchiver archivedDataWithRootObject:spiderSaved requiringSecureCoding:YES error:&error];DYAssetState *decodedSpider=[NSKeyedUnarchiver unarchivedObjectOfClass:DYAssetState.class fromData:spiderArchive error:&error];run.record(@"spider-archive-retains-mesh-pins-and-lut-paths",decodedSpider&&[decodedSpider isEqual:spiderSaved],@{@"error":reason(error)});
- NSDictionary *snapshot=[inspector performSelector:@selector(presetSnapshot)];NSData *presetJSON=[NSJSONSerialization dataWithJSONObject:snapshot options:0 error:&error];NSDictionary *decodedPreset=[NSJSONSerialization JSONObjectWithData:presetJSON options:0 error:&error];run.record(@"complete-version-six-preset-includes-mesh",[decodedPreset[@"version"]isEqual:@6]&&[DYSpiderFromJSON(decodedPreset[@"spider"])isEqual:spiderSaved.spiderMesh]);
+ NSDictionary *snapshot=[inspector performSelector:@selector(presetSnapshot)];NSData *presetJSON=[NSJSONSerialization dataWithJSONObject:snapshot options:0 error:&error];NSDictionary *decodedPreset=[NSJSONSerialization JSONObjectWithData:presetJSON options:0 error:&error];run.record(@"complete-version-seven-preset-includes-mesh",[decodedPreset[@"version"]isEqual:@7]&&[DYSpiderFromJSON(decodedPreset[@"spider"])isEqual:spiderSaved.spiderMesh]);
NSDictionary *portable=DYSpiderJSON(spiderSaved.spiderMesh,spiderSaved.spiderLinked);NSData *decodedPortable=DYSpiderFromJSON(portable);run.record(@"spider-json-preset-exact-roundtrip",[decodedPortable isEqual:spiderSaved.spiderMesh]);
NSMutableDictionary *badJSON=[[portable mutableCopy]autorelease];badJSON[@"hues"]=@7;run.record(@"spider-json-rejects-unsupported-topology",!DYSpiderFromJSON(badJSON));auto corrupt=dragged;corrupt.x[0]=NAN;run.record(@"spider-archive-rejects-nonfinite-coordinates",!DYSpiderMeshIsValid([NSData dataWithBytes:&corrupt length:sizeof(corrupt)]));
[disc changeHueCount:12 saturationCount:8];spiderSaved=DYReadAssets(uiHost,kCMTimeZero);auto dense=DYSpiderMesh(spiderSaved.spiderMesh);run.record(@"spider-independent-resolution-and-resample",dense.hues==12&&dense.rings==7&&fabs(dy::meshDelta(dense,0,.6).x)>0);
@@ -493,6 +499,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
#include "DYToolCanvasDiagnostics.inc.h"
#include "DYToolPenDiagnostics.inc.h"
#include "DYMaskPanelDiagnostics.inc.h"
+ #include "DYManagedDiagnostics.inc.h"
[gpu release];
} @catch(NSException *exception) {
run.record(@"diagnostic-exception",false,@{@"exception":exception.name?:@"unknown",@"message":exception.reason?:@"unknown"});
diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm
index a7ffebb..9e7ac8e 100644
--- a/大鱼调色/Plugin/DYInspector.mm
+++ b/大鱼调色/Plugin/DYInspector.mm
@@ -417,6 +417,7 @@ static NSImage *DYWheelImage(void) {
id _manager;
NSScrollView *_scroll;
DYFlippedView *_document;
+ DYManagedColorPanel *_managedPanel;
NSTextField *_brand;
NSTextField *_subtitle;
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink;
@@ -490,6 +491,7 @@ static NSImage *DYWheelImage(void) {
_document=[[DYFlippedView alloc] initWithFrame:NSMakeRect(0,0,360,1000)];
_document.accessibilityLabel=@"调色参数";
_scroll.documentView=_document; [self addSubview:_scroll];
+ if(!_embedded){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];[_document addSubview:_managedPanel];}
[self buildCards];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager];
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil];
@@ -507,7 +509,7 @@ static NSImage *DYWheelImage(void) {
[[NSNotificationCenter defaultCenter] removeObserver:self];
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_addModule release];
- [_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
+ [_managedPanel 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];
}
@@ -546,7 +548,7 @@ 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 {if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];}
+- (void)previewChanged:(NSNotification *)note {[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];}
- (void)buildCards {
NSInteger index=0;
for(NSDictionary *section in _sections) {
@@ -571,7 +573,6 @@ static NSImage *DYWheelImage(void) {
NSMutableArray *body=[NSMutableArray array];
NSString *key=section[@"key"]?:@"";
if([key isEqual:@"primary"]) {
- if(!_embedded){DYManagedColorPanel *cms=[[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self]autorelease];[card addSubview:cms];[body addObject:cms];}
NSButton *migrate=DYButton(@"旧版输入 → 改用 CST",self,@selector(useCST:));migrate.identifier=@"legacyInput";migrate.toolTip=@"保留旧工程输入效果;点击后改用上方 CST 设置,可撤销";[card addSubview:migrate];[body addObject:migrate];
}
if([key localizedCaseInsensitiveContainsString:@"look"]) {
@@ -717,6 +718,7 @@ static NSImage *DYWheelImage(void) {
_addModule.frame=NSMakeRect(16,108,w-32,27);
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,144,w,MAX(80,h-144));
CGFloat cw=MAX(244,_scroll.contentSize.width-32),y=8;
+ if(_managedPanel){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
for(NSMutableDictionary *c in _cards) {
DYCard *card=c[@"view"];BOOL collapsed=[c[@"collapsed"]boolValue];NSString *key=c[@"section"][@"key"];
card.hidden=[c[@"removed"]boolValue];if(card.hidden){y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w];continue;}
@@ -808,7 +810,9 @@ static NSImage *DYWheelImage(void) {
[(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版";
[card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint];
}
- DYAssetState *assets=DYReadAssets(_manager,t);_tabs[@"managedColor"]=@((_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement).count>0);for(NSDictionary*card in _cards)for(NSView*row in card[@"body"])if([row isKindOfClass:DYManagedColorPanel.class]){[(DYManagedColorPanel*)row refreshWithState:assets.colorManagement context:[_renderer colorContext]];row.alphaValue=1;}[_spiderPanel setMesh:assets.spiderMesh linked:assets.spiderLinked];
+ DYAssetState *assets=DYReadAssets(_manager,t);_tabs[@"managedColor"]=@((_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement).count>0);[_managedPanel refreshWithState:assets.colorManagement context:[_renderer colorContext]];for(NSDictionary *r in _controls.allValues)if([r[@"descriptor"][@"key"]isEqual:@"cmmix"])[r[@"label"]setStringValue:[_tabs[@"managedColor"]boolValue]?@"调色混合":@"CST 混合"];
+ if([_tabs[@"managedColor"]boolValue])for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:@"启停此层一级调色;全局色彩管理保持当前方式"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];}
+ [_spiderPanel setMesh:assets.spiderMesh linked:assets.spiderLinked];
double profile=0,configured=0;[get getFloatValue:&profile fromParameter:2013 atTime:t];[get getFloatValue:&configured fromParameter:2236 atTime:t];
DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t];
_tabs[@"legacyInput"]=@(configured<.5&&(configured<0||profile>.5||[assets.paths[@"input"]length]||oldToken.schema<2));
diff --git a/大鱼调色/Plugin/DYManagedColor.mm b/大鱼调色/Plugin/DYManagedColor.mm
index aa6d99c..366943d 100644
--- a/大鱼调色/Plugin/DYManagedColor.mm
+++ b/大鱼调色/Plugin/DYManagedColor.mm
@@ -6,7 +6,7 @@ NSDictionary *DYManagedColorDefaults(void){return @{@"version":@2,@"mode":@1,@"i
NSArray *DYManagedInputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::spaces())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;}
NSArray *DYManagedOutputSpaces(void){NSMutableArray *a=[NSMutableArray array];for(const auto&s:dycm::outputs())[a addObject:@{@"id":@(unsigned(s.id)),@"name":@(s.label)}];return a;}
BOOL DYManagedColorValid(id state,NSError **error){
- BOOL valid=[state isKindOfClass:NSDictionary.class]&&[state count]<=8&&[state[@"version"]isEqual:@2]&&[state[@"engine"]isEqual:@"OpenColorIO-2.5.2"]&&[state[@"config"]isEqual:@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"];
+ BOOL valid=[state isKindOfClass:NSDictionary.class]&&[state count]==7&&[state[@"version"]isEqual:@2]&&[state[@"engine"]isEqual:@"OpenColorIO-2.5.2"]&&[state[@"config"]isEqual:@"studio-config-v2.2.0_aces-v1.3_ocio-v2.4"];
for(NSString *key in @[@"mode",@"input",@"output",@"gamutCompression"]){id v=[state isKindOfClass:NSDictionary.class]?state[key]:nil;double n=[v isKindOfClass:NSNumber.class]?[v doubleValue]:NAN;valid&=std::isfinite(n)&&n==floor(n);}
if(valid){valid=[@[@1,@2,@3]containsObject:state[@"mode"]]&&[@[@0,@1]containsObject:state[@"gamutCompression"]];BOOL input=NO,output=NO;for(NSDictionary *s in DYManagedInputSpaces())input|=[s[@"id"]isEqual:state[@"input"]];for(NSDictionary *s in DYManagedOutputSpaces())output|=[s[@"id"]isEqual:state[@"output"]];valid&=input&&output;}
if(!valid&&error)*error=[NSError errorWithDomain:@"com.dayu.color.cms" code:1 userInfo:@{NSLocalizedDescriptionKey:@"色彩管理设置无效或组件版本不匹配,未修改工程。"}];return valid;
@@ -19,4 +19,4 @@ CGColorSpaceRef DYManagedTileSpace(FxImageTile *tile,NSInteger primaries){
return nil;
}
static NSString *profileKey(CGColorSpaceRef space){if(!space)return @"unknown";CFPropertyListRef p=CGColorSpaceCopyPropertyList(space);NSData *d=p?[NSPropertyListSerialization dataWithPropertyList:(id)p format:NSPropertyListBinaryFormat_v1_0 options:0 error:nil]:nil;if(p)CFRelease(p);if(!d)return @"unknown";unsigned char hash[CC_SHA256_DIGEST_LENGTH];CC_SHA256(d.bytes,(CC_LONG)d.length,hash);NSMutableString*s=[NSMutableString string];for(auto c:hash)[s appendFormat:@"%02x",c];return s;}
-NSDictionary *DYHostColorContext(FxImageTile *source,FxImageTile *destination,NSInteger primaries){CGColorSpaceRef a=DYManagedTileSpace(source,primaries),b=DYManagedTileSpace(destination,primaries);NSString *an=a?[(id)CGColorSpaceCopyName(a)autorelease]:nil,*bn=b?[(id)CGColorSpaceCopyName(b)autorelease]:nil;NSDictionary *d=@{@"primaries":@(primaries),@"source":an?:@"未知空间",@"destination":bn?:@"未知空间",@"sourceKey":profileKey(a),@"destinationKey":profileKey(b),@"processing":@"RGB Linear",@"alpha":@"premultiplied"};if(a)CGColorSpaceRelease(a);if(b)CGColorSpaceRelease(b);return d;}
+NSDictionary *DYHostColorContext(FxImageTile *source,FxImageTile *destination,NSInteger primaries){CGColorSpaceRef a=DYManagedTileSpace(source,primaries),b=DYManagedTileSpace(destination,primaries);NSString *an=a?[(id)CGColorSpaceCopyName(a)autorelease]:nil,*bn=b?[(id)CGColorSpaceCopyName(b)autorelease]:nil;NSDictionary *d=@{@"primaries":@(primaries),@"source":an?:(a?@"自定义 RGB 配置":@"未知空间"),@"destination":bn?:(b?@"自定义 RGB 配置":@"未知空间"),@"sourceKey":profileKey(a),@"destinationKey":profileKey(b),@"processing":@"RGB Linear",@"alpha":@"premultiplied"};if(a)CGColorSpaceRelease(a);if(b)CGColorSpaceRelease(b);return d;}
diff --git a/大鱼调色/Plugin/DYManagedColorPanel.h b/大鱼调色/Plugin/DYManagedColorPanel.h
index bcca670..715c7e1 100644
--- a/大鱼调色/Plugin/DYManagedColorPanel.h
+++ b/大鱼调色/Plugin/DYManagedColorPanel.h
@@ -4,6 +4,7 @@
@class DYRenderer;
@interface DYManagedColorPanel : NSView
- (instancetype)initWithManager:(id)manager renderer:(DYRenderer*)renderer assetTarget:(id)target;
+- (void)refreshContext;
- (void)refreshWithState:(NSDictionary*)state context:(NSDictionary*)context;
- (CGFloat)contentHeight;
@end
diff --git a/大鱼调色/Plugin/DYManagedColorPanel.mm b/大鱼调色/Plugin/DYManagedColorPanel.mm
index 41bda7e..17d1435 100644
--- a/大鱼调色/Plugin/DYManagedColorPanel.mm
+++ b/大鱼调色/Plugin/DYManagedColorPanel.mm
@@ -9,11 +9,11 @@
NSDictionary *_state;BOOL _refreshing;
}
- (BOOL)isFlipped{return YES;}
-- (CGFloat)contentHeight{return 268;}
+- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?112:m==1?190:302;}
static NSTextField *cmsLabel(NSString*s){NSTextField*l=[NSTextField wrappingLabelWithString:s];l.font=[NSFont systemFontOfSize:11];l.textColor=DYThemeColor(@"text");return l;}
- (instancetype)initWithManager:(id)m renderer:(DYRenderer*)r assetTarget:(id)target {
if((self=[super initWithFrame:NSZeroRect])){_manager=m;_renderer=[r retain];_assetTarget=target;self.identifier=@"managedColor";
- _mode=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"旧版兼容",@"跟随 FCP 色彩管理",@"相机编码 → ACES",@"输入 LUT → ACES"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
+ _mode=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"色彩管理 · 旧版兼容",@"色彩管理 · 跟随 FCP",@"相机编码 → ACES",@"输入 LUT → ACES"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
_inputLabel=[cmsLabel(@"输入空间")retain];_outputLabel=[cmsLabel(@"输出目标")retain];
_input=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedInputSpaces()){[_input addItemWithTitle:s[@"name"]];_input.lastItem.representedObject=s[@"id"];} _input.target=self;_input.action=@selector(settingsChanged:);_input.accessibilityLabel=@"新版输入空间";
_output=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedOutputSpaces()){[_output addItemWithTitle:s[@"name"]];_output.lastItem.representedObject=s[@"id"];} _output.target=self;_output.action=@selector(settingsChanged:);_output.accessibilityLabel=@"新版输出目标";
@@ -24,14 +24,15 @@ static NSTextField *cmsLabel(NSString*s){NSTextField*l=[NSTextField wrappingLabe
}return self;
}
- (void)dealloc{[_renderer release];[_state release];for(id v in @[_mode,_input,_output,_gamut,_lut,_inputLabel,_outputLabel,_help,_context])[v release];[super dealloc];}
-- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_mode.frame=NSMakeRect(0,3,w,26);_inputLabel.frame=NSMakeRect(2,36,70,22);_input.frame=NSMakeRect(72,32,w-72,26);_outputLabel.frame=NSMakeRect(2,67,70,22);_output.frame=NSMakeRect(72,63,w-72,26);_gamut.frame=NSMakeRect(0,94,w,22);_lut.frame=NSMakeRect(0,120,w,25);_help.frame=NSMakeRect(2,152,w-4,65);_context.frame=NSMakeRect(2,220,w-4,45);}
+- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_mode.frame=NSMakeRect(0,3,w,26);_inputLabel.frame=NSMakeRect(2,36,70,22);_input.frame=NSMakeRect(72,32,w-72,26);_outputLabel.frame=NSMakeRect(2,67,70,22);_output.frame=NSMakeRect(72,63,w-72,26);_gamut.frame=NSMakeRect(0,94,w,22);_lut.frame=NSMakeRect(0,120,w,25);_help.frame=NSMakeRect(2,152,w-4,96);_context.frame=NSMakeRect(2,252,w-4,47);if([_state[@"mode"]integerValue]<2){_help.frame=NSMakeRect(2,36,w-4,90);_context.frame=NSMakeRect(2,132,w-4,54);}}
- (void)refreshWithState:(NSDictionary*)s context:(NSDictionary*)context {
- _refreshing=YES;[_state release];_state=[s copy];NSInteger mode=s.count?[s[@"mode"]integerValue]:0;[_mode selectItemAtIndex:mode];
+ _refreshing=YES;NSDictionary *saved=[s copy];[_state release];_state=saved;NSInteger mode=s.count?[s[@"mode"]integerValue]:0;[_mode selectItemAtIndex:mode];
NSDictionary *values=s.count?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i];
- _input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
- _help.stringValue=mode==0?@"保留当前工程的原有颜色。选择新版后,一级层在 ACEScct 中调色,印片位于输出之前;可撤销或切回兼容方式。":mode==1?@"使用宿主实际颜色空间,不再次还原相机或执行显示映射。内部 ACEScct;旧式风格工具在明确的 Rec.709 修饰域运行。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
+ _input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
+ _help.stringValue=mode==0?@"保留当前工程的原有颜色。选择新版后,一级层在 ACEScct 中调色,印片位于输出之前;可撤销或切回兼容方式。":mode==1?@"按宿主实际空间处理,不重复还原或映射。顺序:一级层 → 印片 → SDR 修饰。Rec.2020 宿主暂限一级与印片。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
_context.stringValue=context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_refreshing=NO;[self setNeedsLayout:YES];
}
+- (void)refreshContext{[self refreshWithState:_state context:[_renderer colorContext]];}
- (void)writeState:(NSDictionary*)state {
if(state&&!DYManagedColorValid(state,nil))return;ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{idundo=[_manager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"更改色彩管理方式"];DYAssetState*assets=[[DYReadAssets(_manager,a.currentTime)copy]autorelease];assets.colorManagement=state;DYWriteAssets(_manager,assets,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];
}
diff --git a/大鱼调色/Plugin/DYManagedDiagnostics.inc.h b/大鱼调色/Plugin/DYManagedDiagnostics.inc.h
new file mode 100644
index 0000000..6659d54
--- /dev/null
+++ b/大鱼调色/Plugin/DYManagedDiagnostics.inc.h
@@ -0,0 +1,51 @@
+// Actual production entry points and independent CPU/profile reference vectors.
+{
+ DYRenderer *cmsRenderer=[[[DYRenderer alloc]init]autorelease];DYToolDocument *empty=[[[DYToolDocument alloc]init]autorelease];
+ NSMutableDictionary *state=[[DYManagedColorDefaults()mutableCopy]autorelease];
+ run.need(@"cms-versioned-state-valid",DYManagedColorValid(state,nil)&&!DYManagedColorValid(@"bad",nil));
+ DYAssetState *saved=[[[DYAssetState alloc]init]autorelease];saved.colorManagement=state;NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:saved requiringSecureCoding:YES error:&error];DYAssetState *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYAssetState.class fromData:archive error:&error];
+ run.record(@"cms-secure-archive-independent-opt-in",[saved isEqual:restored]&&[restored.colorManagement isEqual:state]&&![[[DYAssetState alloc]init]autorelease].colorManagement);
+ NSMutableDictionary *invalid=[[state mutableCopy]autorelease];invalid[@"output"]=@999;run.record(@"cms-rejects-unknown-output",!DYManagedColorValid(invalid,nil));
+ DYUniforms u=defaults;u.skinProtection.x=0; // No grade is applied by default in the new working domain.
+ Pixels probe(width*height*4);float vectors[][4]={{.18,.18,.18,1},{2,1.2,.3,1},{-.03,.1,.2,1},{.03,.01,.005,.1},{0,0,0,0},{.7,.2,.05,1}};
+ for(size_t i=0;ireference(width*height);for(size_t i=0;i20&&difference(exposed,exposed).nonfinite==0&&exposed[3]==host[3]);
+ NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters mp=DYMaskAtTime(mask,kCMTimeZero);mp.strength=0;mask[@"parameters"]=[NSData dataWithBytes:&mp length:sizeof(mp)];NSMutableDictionary *masked=DYMutablePlist(empty.document);masked[@"baseMasks"][@"primary"]=@[mask];Pixels zero=managed(state,grade,masked,@"cms-zero-mask");run.record(@"cms-zero-primary-mask-preserves-input",difference(zero,host).maximum==0);
+ // Frame orientation is normalized at the actual host destination boundary.
+ [destination setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];Pixels flipped=managed(state,u,empty.document,@"cms-opposite-origin");BOOL orientation=YES;for(NSUInteger y=0;y OCIO input -> exactly one ODT -> physical host output.
+ // CPU reference omits all renderer code; this catches repeated display mapping.
+ Pixels codes(width*height*4);for(size_t i=0;ir(width*height);for(size_t i=0;ir,int output){dycm::Transform::display(dycm::Space::ACEScct,dycm::Output(output),true).apply(r,dycm::Alpha::Premultiplied);CGColorSpaceRef target=CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);DYColorProfile *profile=[[[DYColorProfile alloc]initWithDisplayOutput:dycm::Output(output) target:target error:&error]autorelease];CGColorSpaceRelease(target);auto out=[profile convertPixels:r alpha:dycm::Alpha::Premultiplied budget:64*1024*1024 cancelled:nullptr error:&error];Pixels result(codes.size());if(out)for(size_t i=0;i20);
+ // A CPU tetrahedral lookup in AP1/ACEScct, mixed in AP1 linear, then ODT.
+ std::vectorlook;NSUInteger lookSide=0;NSString *lookPath=[[NSBundle bundleForClass:renderer.class]pathForResource:@"kodak_2383" ofType:@"dylut" inDirectory:@"PrintLooks"];
+ BOOL readLook=DYLUTReadCube(lookPath,look,lookSide,&error);auto scene=cpuInput();
+ if(readLook)for(auto &pixel:scene){if(!(pixel.a>0))continue;float c[3]={pixel.r/pixel.a,pixel.g/pixel.a,pixel.b/pixel.a},f[3];int cell[3],axis[3]={0,1,2};for(int k=0;k<3;k++){float x=fmaxf(0,fminf(1,c[k]))*(lookSide-1);cell[k]=MIN((int)floorf(x),(int)lookSide-2);f[k]=x-cell[k];}std::sort(axis,axis+3,[&](int x,int y){return f[x]>f[y];});
+ float weights[4]={1-f[axis[0]],f[axis[0]]-f[axis[1]],f[axis[1]]-f[axis[2]],f[axis[2]]},value[3]={};for(int j=0;j<4;j++){size_t offset=((cell[2]*lookSide+cell[1])*lookSide+cell[0])*4;for(int k=0;k<3;k++)value[k]+=look[offset+k]*weights[j];if(j<3)cell[axis[j]]++;}float out[3];for(int k=0;k<3;k++)out[k]=dyPrintCCTEncode(dyPrintCCTDecode(c[k])*.52f+dyPrintCCTDecode(value[k])*.48f)*pixel.a;pixel.r=out[0];pixel.g=out[1];pixel.b=out[2];}
+ Difference printDelta=difference(printed,cpuOutput(scene,3));run.record(@"cms-print-cpu-reference-before-ODT-linear-mix",readLook&&printDelta.maximum<.01&&printDelta.nonfinite==0,measure(printDelta));
+ state[@"output"]=@6;DYUniforms bounded=u;bounded.hslHueA.x=20;NSError *blocked=nil;BOOL hdr=[cmsRenderer renderSource:source destination:destination uniforms:bounded paths:@{} spider:nil tools:empty.document colorManagement:state hostPrimaries:kFxColorPrimaries_Rec709 error:&blocked];run.record(@"cms-hdr-refuses-unvalidated-bounded-finishing",!hdr&&blocked!=nil);
+ state[@"output"]=@1;NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"cms-v2.cube"]];error=nil;BOOL exportOK=[cmsRenderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:empty.document colorManagement:state error:&error];std::vectortable;NSUInteger size=0;BOOL parse=exportOK&&DYLUTReadCube(cube.path,table,size,&error);run.record(@"cms-v2-cube-65-declared-output-contract",parse&&size==65,@{@"error":reason(error),@"size":@(size)});
+ // Static Cube interpolation at off-grid values must match the complete path.
+ Pixels direct=managed(state,u,empty.document,@"cms-cube-off-grid-direct-reference");double cubeError=0;
+ if(parse)for(size_t i=0;i=16)[cache removeAllObjects];cache[profile.key]=p;}return [p renderInput:input output:output alpha:dycm::Alpha::Premultiplied workspaceBudget:2ull*1024*1024*1024 cancelled:nullptr error:error];
}
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){@autoreleasepool{
+ if(state&&![state isKindOfClass:NSDictionary.class])return fail(error,@"色彩管理状态无效。");
NSDictionary*context=DYHostColorContext(src,dst,primaries);@synchronized(_previewLock){[_colorContext release];_colorContext=[context copy];}
if(!state.count)return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
if(!DYManagedColorValid(state,error))return NO;if(!tools)tools=@{@"schema":@2,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
@@ -59,11 +60,11 @@
// measured HDR implementations; never silently clip them through old LUTs.
NSDictionary *finishPaths=DYVisibleBaseToolPaths(paths,finishing);
NSArray *activeFinish=DYManagedActiveFinishing(u,finishPaths,spider,finishing);
- if(mode!=1&&(output==6||output==7)&&activeFinish.count)return fail(error,@"HDR 输出目前支持一级调色与印片。请关闭基础、曲线、风格、胶片空间等 SDR 修饰工具,或选择 SDR 输出。");
+ if(((mode!=1&&(output==6||output==7))||(mode==1&&primaries==kFxColorPrimaries_Rec2020))&&activeFinish.count)return fail(error,@"HDR 输出或跟随 Rec.2020 宿主时,目前支持一级调色与印片。请关闭 SDR 修饰工具;需要这些工具时,请明确选择 SDR 输出。");
[self managedPreview:current origin:src.imageOrigin entry:entry];
if(activeFinish.count){idout=next();if(!out)return fail(error,@"无法分配显示域修饰缓冲区。");_managedFinishing=YES;BOOL ok=NO;@try{ok=[self renderSource:tile(current) destination:tile(out) uniforms:u paths:finishPaths spider:spider tools:finishing error:error];}@finally{_managedFinishing=NO;}if(!ok)return NO;current=out;}
DYColorProfile*returnProfile=[[[DYColorProfile alloc]initWithSource:linear709 target:dstSpace error:error]autorelease];if(!profile(returnProfile))return NO;
_managedFinishing=YES;@try{return [self copyTile:tile(current) to:dst entry:entry error:error];}@finally{_managedFinishing=NO;}
}catch(const std::exception&e){return fail(error,@(e.what()));}}@finally{if(srcSpace)CGColorSpaceRelease(srcSpace);if(dstSpace)CGColorSpaceRelease(dstSpace);if(aces)CGColorSpaceRelease(aces);if(linear709)CGColorSpaceRelease(linear709);}
}}}
-- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state error:(NSError**)error {@synchronized(self){if(state.count&&!DYManagedColorValid(state,error))return NO;if(state.count&&[state[@"mode"]integerValue]!=1&&[@[@6,@7]containsObject:state[@"output"]])return fail(error,@"PQ/HLG 交付需要明确的亮度与范围,请保存完整预设;当前静态 Cube 输出为 sRGB。");_exportManagedState=state.count?state:nil;@try{return [self exportLUT:url uniforms:u paths:paths spider:spider tools:tools error:error];}@finally{_exportManagedState=nil;}}}
+- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state error:(NSError**)error {@synchronized(self){if(state&&![state isKindOfClass:NSDictionary.class])return fail(error,@"色彩管理状态无效。");if(state.count&&!DYManagedColorValid(state,error))return NO;if(state.count&&[state[@"mode"]integerValue]!=1&&[@[@6,@7]containsObject:state[@"output"]])return fail(error,@"PQ/HLG 交付需要明确的亮度与范围,请保存完整预设;当前静态 Cube 输出为 sRGB。");if(state.count){auto spatial=[](DYUniforms v){return v.baseSectionEnabled>.5&&((v.textureEnabled>.5&&v.texture!=0)||(v.clarityEnabled>.5&&v.clarity!=0)||(v.dehazeEnabled>.5&&v.dehaze!=0));};BOOL unsupported=spatial(u);for(NSDictionary *node in tools[@"layers"])unsupported|=spatial(DYToolUniforms(node));if(unsupported)return fail(error,@"纹理、清晰度或去朦胧依赖画面内容,不能完整保存到 Cube;请保存完整预设。");}_exportManagedState=state.count?state:nil;@try{return [self exportLUT:url uniforms:u paths:paths spider:spider tools:tools error:error];}@finally{_exportManagedState=nil;}}}
diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm
index ffc7d33..7d6acd5 100644
--- a/大鱼调色/Plugin/DYRenderer.mm
+++ b/大鱼调色/Plugin/DYRenderer.mm
@@ -221,17 +221,17 @@ static NSArray *DYManagedActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider error:(NSError**)err{@synchronized(self){
if(DYFilmToolActive(u)&&DYFilmSpatialActive(u.film))return fail(err,@"胶片空间和颗粒处理不能保存到静态 Cube,请保存完整预设。");
NSMutableDictionary *e=[self device:0 error:err];if(!e)return NO;idd=e[@"device"];const NSUInteger n=_exportManagedState?65:33,count=n*n*n,width=n*n,height=n;
- MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:width height:height mipmapped:NO];desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;
+ MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:(_exportManagedState?MTLPixelFormatRGBA32Float:MTLPixelFormatRGBA16Float) width:width height:height mipmapped:NO];desc.storageMode=MTLStorageModeShared;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;
idinput=[d newTextureWithDescriptor:desc],output=[d newTextureWithDescriptor:desc];if(!input||!output){[input release];[output release];return fail(err,@"无法分配 LUT 色格");}
- std::vector<__fp16>values(count*4);for(NSUInteger i=0;ivalues(count*4);std::vectorprecise(_exportManagedState?count*4:0);for(NSUInteger i=0;idevice=e[@"device"];ida=[source metalTextureForDevice:device],b=[dest metalTextureForDevice:device];
- NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%lu",(unsigned long)b.pixelFormat];idpipeline=pipelines[key];
- if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
+ NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",_managedFinishing,(unsigned long)b.pixelFormat];idpipeline=pipelines[key];
+ if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:_managedFinishing?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
FxRect s=source.tilePixelBounds,t=dest.tilePixelBounds;float width=s.right-s.left,height=s.top-s.bottom,l=(t.left-s.left)/width,r=(t.right-s.left)/width,top=(s.top-t.top)/height,bottom=(s.top-t.bottom)/height;
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){top=1-top;bottom=1-bottom;}
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(auto &vertex:v)vertex.position.y=-vertex.position.y;
diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm
index 0bc99ea..d767384 100644
--- a/大鱼调色/Plugin/DYToolState.mm
+++ b/大鱼调色/Plugin/DYToolState.mm
@@ -123,7 +123,7 @@ DYUniforms DYToolUniforms(NSDictionary *node){DYUniforms u;DYDefaultUniforms(&u)
// new layers explicitly disable mapping so adding a neutral layer is identity.
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:@"primary"]&&u.cm.toneMapping>.5)return NO;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;}
+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:@"primary"]&&u.cm.toneMapping>.5)return NO;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([type isEqual:@"primary"]&&[d[@"key"]isEqual:@"cmtoneMapping"]&&v.floatValue==0)continue;if(v&&v.floatValue!=[d[@"default"]floatValue])return NO;}return YES;}
@implementation DYToolManager {
id _host;NSString *_nodeID,*_type;NSInteger _depth;CMTime _time;NSMutableDictionary *_pending;DYInspectorToken *_token;
diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist
index 582ef8c..1c1434a 100644
--- a/大鱼调色/Plugin/Info.plist
+++ b/大鱼调色/Plugin/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 1.7.4
+ 1.8.0
CFBundleVersion
- 52
+ 53
NSHumanReadableCopyright
PlugInKit
@@ -71,7 +71,7 @@
uuid
1C17B73B-F229-4C09-A434-EAF6DFF5F22A
version
- 1.7.4
+ 1.8.0
className
diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist
index adfbac8..51ec4ba 100644
--- a/大鱼调色/Wrapper Application/Info.plist
+++ b/大鱼调色/Wrapper Application/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.7.4
+ 1.8.0
CFBundleVersion
- 52
+ 53
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
NSHumanReadableCopyright