From 3fc32f3e1913c9887a6c6d1c384ed0297930c600 Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 21:58:43 +0800 Subject: [PATCH] fix: publish native OSC in FCP template, synchronize canvas targets and advance exact single-step playhead; prepare build 21 --- research/ToolMaskImplementation.md | 4 +- template/verification/StaticContract.json | 2 +- template/大鱼调色.moef | 2 +- tools/build_template.py | 5 +- tools/create_mask_host_fixture.py | 6 +- verification/Delivery.json | 16 +- verification/InstalledSelfTest.json | 283 +++++++++++++++++++++- verification/ToolMaskHostBuild20.json | 20 ++ 大鱼调色/Plugin/DYMaskPanel.inc.h | 4 +- 大鱼调色/Plugin/DYRenderer.mm | 4 +- 大鱼调色/Plugin/DYToolHostMethods.inc.h | 5 +- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 13 files changed, 327 insertions(+), 28 deletions(-) create mode 100644 verification/ToolMaskHostBuild20.json diff --git a/research/ToolMaskImplementation.md b/research/ToolMaskImplementation.md index 423c91a..0e324ee 100644 --- a/research/ToolMaskImplementation.md +++ b/research/ToolMaskImplementation.md @@ -1,6 +1,6 @@ # 每工具蒙版与初始化叠层(1.4 开发记录) -基线:`edfb74b171f51d4beaa9926e27d2d80791fbf43c`,原正式版本 1.3.1(19)。本阶段尚待正式宿主验收和发行;以 verification/Delivery.json 为实际交付状态。 +基线:`edfb74b171f51d4beaa9926e27d2d80791fbf43c`,原正式版本 1.3.1(19)。本阶段尚待21版画面控件及最终正式宿主验收和发行;以 verification/Delivery.json 为实际交付状态。 ## 界面与顺序 @@ -27,3 +27,5 @@ `--self-test` 增加实际IOSurface/Metal多HSL独立顺序参照、六类型CPU/GPU覆盖对照、alpha、空/默认直通、归档/非法数据、原生面板复用和实际插件分析回调(模拟宿主调度,使用真实Metal运动帧)的检查。它不代替实机宿主验证。 `python3 tools/create_mask_host_fixture.py` 生成本产品专用合成运动和两个独立FCP项目;不修改旧项目或用户媒体。最终验收必须在唯一正式安装的已公证版本中进行,并另存结果。 + +20版已公证正式路径实测:第二HSL从0到32独立保存、椭圆蒙版、真实单帧2键、一次Undo到0键、一次Redo到2键且完整预设逐字节一致。模板10005关闭导致OSC不可见,20版未作为最终交付;21版开启发布并继续验收。既有FCP保存的旧模板实例可能保留10005=0;画面控件需保存完整预设后重新应用新版效果,旧实例调色数学不自动迁移或覆盖。 diff --git a/template/verification/StaticContract.json b/template/verification/StaticContract.json index f3f3945..a97479a 100644 --- a/template/verification/StaticContract.json +++ b/template/verification/StaticContract.json @@ -1,6 +1,6 @@ { "passed": true, - "sha256": "3fa725f9d6f7de662afe9f6aa1269a39187457077c86afa8af5c09df9d3205b8", + "sha256": "e6f3fe538e4ef4e1ea2946d360120747a53c088a2c872330f6d79275d253ea5e", "version": "5.13", "displayversion": "5.6.7", "filterCount": 1, diff --git a/template/大鱼调色.moef b/template/大鱼调色.moef index 5469e37..aea4f1b 100644 --- a/template/大鱼调色.moef +++ b/template/大鱼调色.moef @@ -543,7 +543,7 @@ - + 1 diff --git a/tools/build_template.py b/tools/build_template.py index 32dacdc..0ea9040 100644 --- a/tools/build_template.py +++ b/tools/build_template.py @@ -83,7 +83,9 @@ def build(model): for row in model['parameters']: value=format(float(row['default']),'.17g') E.SubElement(filt,'parameter',name=row['title'],id=str(row['pid']),flags='12889161776' if row.get('notAnimatable') else '12889161760',default=value,value=value) - for node in host:filt.append(node) + for node in host: + if node.get("id")=="10005":node.set("value","1");node.set("default","1") + filt.append(node) source.append(filt) copyright=E.parse(SOURCES/'CopyrightRig.xml').getroot() entity_map={'3356608241':'10080','3356608243':'10081','3356608245':'10082'} @@ -118,6 +120,7 @@ def verify(data,model): assert len(filters)==1 and filters[0].get('pluginUUID')==PLUGIN_UUID f=filters[0];params={p.get('id'):p for p in f.findall('parameter')} assert len(params)==len(list(f.findall('parameter'))) + assert params["10005"].get("value")==params["10005"].get("default")=="1" for row in model['parameters']: p=params[str(row['pid'])];assert float(p.get('default'))==float(row['default'])==float(p.get('value')) assert all(not v in data for v in (b'CameraRawTables',b'1.png',b'relativeURL')) diff --git a/tools/create_mask_host_fixture.py b/tools/create_mask_host_fixture.py index 43cd4ba..00ad160 100644 --- a/tools/create_mask_host_fixture.py +++ b/tools/create_mask_host_fixture.py @@ -6,7 +6,7 @@ out=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa');out.mkdi media=out/'大鱼调色_蒙版合成运动.mov' if not media.exists(): subprocess.run(['/opt/homebrew/bin/ffmpeg','-v','error','-f','lavfi','-i',"nullsrc=s=1080x640:r=25:d=4,geq=lum='128+70*sin(X/11)*cos(Y/9)+35*sin((X+Y)/4)':cb='128+35*sin(X/17)':cr='128+35*cos(Y/21)',crop=960:540:'40+10*t':'40+5*t'",'-c:v','prores_ks','-profile:v','2','-pix_fmt','yuv422p10le','-color_primaries','bt709','-color_trc','bt709','-colorspace','bt709',str(media)],check=True) -root=E.Element('fcpxml',version='1.12');res=E.SubElement(root,'resources');E.SubElement(res,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)');a=E.SubElement(res,'asset',id='a1',name='合成运动纹理',start='0s',duration='4s',format='f1',hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=media.as_uri());template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef');E.SubElement(res,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri());lib=E.SubElement(root,'library');event=E.SubElement(lib,'event',name='大鱼调色_1.4_蒙版与工具层验收') -for name in ['大鱼调色_1.4_独立工具与蒙版','大鱼调色_1.4_逐帧跟踪']: +root=E.Element('fcpxml',version='1.12');res=E.SubElement(root,'resources');E.SubElement(res,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)');a=E.SubElement(res,'asset',id='a1',name='合成运动纹理',start='0s',duration='4s',format='f1',hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=media.as_uri());template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef');E.SubElement(res,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri());lib=E.SubElement(root,'library');event=E.SubElement(lib,'event',name='大鱼调色_1.4_21_蒙版与工具层验收') +for name in ['大鱼调色_1.4_21_独立工具与蒙版','大鱼调色_1.4_21_逐帧跟踪']: project=E.SubElement(event,'project',name=name);seq=E.SubElement(project,'sequence',format='f1',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k',duration='4s');spine=E.SubElement(seq,'spine');clip=E.SubElement(spine,'asset-clip',ref='a1',name=name,offset='0s',start='0s',duration='4s');E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1') -E.indent(root);xml=out/'大鱼调色_1.4_蒙版与工具层.fcpxml';xml.write_text('\n\n'+E.tostring(root,encoding='unicode')+'\n');print(xml) +E.indent(root);xml=out/'大鱼调色_1.4_21_蒙版与工具层.fcpxml';xml.write_text('\n\n'+E.tostring(root,encoding='unicode')+'\n');print(xml) diff --git a/verification/Delivery.json b/verification/Delivery.json index d456fe5..3f8f4a2 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.3.1", - "build": "19", + "version": "1.4.0", + "build": "20", "team": "B3W25FX5H5", - "notaryID": "9e93dc7f-04a3-44f9-a1e4-792bd7b31533", + "notaryID": "f3a3ff9e-91e6-4d7f-9e3b-12cb19e74e31", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "dbb7ca4a995ef832178a32f35939aed7d3a85012", + "sourceCommit": "659a8c540db47ed593059127ab7c5ab018c359c0", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", - "templateSHA256": "86d62016bf9089d1eda07cc6a533bcb82d905df18351f48e73d6fb87945e09de", - "shaderSHA256": "034fdf3de0c8ab0ac8eacc8f8a4bd6fbb8ee8c8c93ed3af61363c8175f0196e2", - "hostVerification": "verification/HostBrowserAndReset.json" + "templateSHA256": "3fa725f9d6f7de662afe9f6aa1269a39187457077c86afa8af5c09df9d3205b8", + "shaderSHA256": "df82ed0310281e854085063276ab161db7c623511751a1c1c63607b4072c8097", + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-793570296f434520b48336b9fc33da85.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index a387ebd..d76ed65 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": 158, + "checks": 216, "gpu": "Apple M4", "limitations": [ "Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.", @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/6821FF9D-5C7C-4DF8-9087-EB12C14C98FD" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4AA64968-A886-4BB3-8D20-C24A575A601D" }, { "descriptors": 234, @@ -154,7 +154,7 @@ "pass": true }, { - "name": "complete-version-three-preset-includes-mesh", + "name": "complete-version-four-preset-includes-mesh", "pass": true }, { @@ -816,7 +816,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/6821FF9D-5C7C-4DF8-9087-EB12C14C98FD/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4AA64968-A886-4BB3-8D20-C24A575A601D/diagnostic-export.cube" }, { "bytes": 1186074, @@ -836,7 +836,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 82.96920848079026, + "maximumGapMS": 84.198874887079, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -873,8 +873,279 @@ { "name": "external-preparation-cancellation", "pass": true + }, + { + "name": "tool-document-two-independent-hsl", + "pass": true + }, + { + "name": "tool-document-secure-archive-roundtrip", + "pass": true + }, + { + "name": "instance-proxy-batches-multiple-fields-without-clobber", + "pass": true + }, + { + "name": "two-native-hsl-panels-with-mask-and-repeat-buttons", + "pass": true + }, + { + "name": "tool-document-rejects-duplicate-identity", + "pass": true + }, + { + "name": "tool-document-rejects-nonfinite", + "pass": true + }, + { + "name": "mask-rational-time-interpolates-independent-geometry", + "pass": true + }, + { + "name": "tracking-merge-preserves-manual-keys", + "pass": true + }, + { + "name": "render-snapshot-freezes-time-without-author-keys", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "empty-tool-document-render", + "pass": true + }, + { + "name": "empty-tool-document-preserves-legacy-pixels-exactly", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "all-twelve-initialized-tool-types-render", + "pass": true + }, + { + "name": "initialized-repeated-tools-are-exactly-neutral", + "pass": true + }, + { + "error": "", + "name": "hsl-stack-first-reference", + "pass": true + }, + { + "error": "", + "name": "hsl-stack-second-reference", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "two-hsl-stack-render", + "pass": true + }, + { + "changedComponents": 0, + "maxAbsoluteError": 0, + "name": "two-hsl-stack-matches-independent-sequential-reference", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "error": "", + "name": "mask-hsl-active-reference", + "pass": true + }, + { + "error": "", + "name": "mask-hsl-bypass-reference", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-type-0-gpu", + "pass": true + }, + { + "name": "mask-type-0-preserves-alpha-finite", + "pass": true + }, + { + "maximumError": 6.105005741119385e-05, + "name": "mask-type-0-independent-cpu-coverage", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-type-1-gpu", + "pass": true + }, + { + "name": "mask-type-1-preserves-alpha-finite", + "pass": true + }, + { + "maximumError": 6.105005741119385e-05, + "name": "mask-type-1-independent-cpu-coverage", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-type-2-gpu", + "pass": true + }, + { + "name": "mask-type-2-preserves-alpha-finite", + "pass": true + }, + { + "maximumError": 6.105005741119385e-05, + "name": "mask-type-2-independent-cpu-coverage", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-type-3-gpu", + "pass": true + }, + { + "name": "mask-type-3-preserves-alpha-finite", + "pass": true + }, + { + "maximumError": 0.00043123960494995117, + "name": "mask-type-3-independent-cpu-coverage", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-type-4-gpu", + "pass": true + }, + { + "name": "mask-type-4-preserves-alpha-finite", + "pass": true + }, + { + "maximumError": 0.0005036592483520508, + "name": "mask-type-4-independent-cpu-coverage", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-type-5-gpu", + "pass": true + }, + { + "name": "mask-type-5-preserves-alpha-finite", + "pass": true + }, + { + "maximumError": 0.0005541741847991943, + "name": "mask-type-5-independent-cpu-coverage", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "hsl-rectangle-isolated-render", + "pass": true + }, + { + "maximumError": 6.103515625e-05, + "name": "per-tool-mask-affects-only-own-region", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mask-eye-disabled-render", + "pass": true + }, + { + "name": "disabled-mask-restores-unmasked-tool", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "all-one-mask-render", + "pass": true + }, + { + "name": "all-one-mask-preserves-native-operation", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "all-zero-mask-render", + "pass": true + }, + { + "changedComponents": 91, + "maxAbsoluteError": 6.103515625e-05, + "name": "all-zero-mask-bypasses-only-own-tool", + "nonfiniteComponents": 0, + "nonzeroComponents": 9832, + "pass": true + }, + { + "name": "cube-export-refuses-spatial-mask-with-clear-error", + "pass": true + }, + { + "error": "", + "name": "primary-mask-full-reference", + "pass": true + }, + { + "error": "", + "name": "primary-mask-bypass-reference", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "primary-cst-mask-render", + "pass": true + }, + { + "name": "primary-mask-blends-cst-only-in-selected-region", + "pass": true + }, + { + "name": "tracking-captures-real-full-input-texture", + "pass": true + }, + { + "centerX": 0.5312505960464478, + "centerY": 0.5260424017906189, + "error": "未提供错误信息", + "keyCount": 6, + "name": "host-callback-metal-tracking-six-exact-frames", + "pass": true + }, + { + "name": "tracking-results-use-one-undo-action", + "pass": true + }, + { + "name": "duplicate-analysis-cleanup-never-commits-twice", + "pass": true + }, + { + "name": "stale-analysis-cannot-overwrite-edited-mask", + "pass": true + }, + { + "name": "cancel-keeps-only-contiguous-trusted-segment", + "pass": true + }, + { + "name": "bidirectional-passes-share-reference-and-merge-once", + "pass": true + }, + { + "name": "backward-single-step-includes-reference-and-one-neighbor", + "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/6821FF9D-5C7C-4DF8-9087-EB12C14C98FD", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/4AA64968-A886-4BB3-8D20-C24A575A601D", "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/ToolMaskHostBuild20.json b/verification/ToolMaskHostBuild20.json new file mode 100644 index 0000000..fbf0628 --- /dev/null +++ b/verification/ToolMaskHostBuild20.json @@ -0,0 +1,20 @@ +{ + "status": "superseded-before-release", + "version": "1.4.0", + "build": "20", + "sourceCommit": "659a8c540db47ed593059127ab7c5ab018c359c0", + "notaryID": "f3a3ff9e-91e6-4d7f-9e3b-12cb19e74e31", + "nativeChecks": 216, + "liveFCP": { + "addedInitializedSecondHSL": true, + "changedSecondHueTo32": true, + "perInstanceEllipse": true, + "singleStepRealHostKeys": 2, + "undoKeyCount": 0, + "redoKeyCount": 2, + "redoCompletePresetBytesEqual": true, + "oscVerified": false, + "oscBlocker": "Motion wrapper parameter 10005 remained zero; fixed to publish native OSC for build21." + }, + "userMediaModified": false +} diff --git a/大鱼调色/Plugin/DYMaskPanel.inc.h b/大鱼调色/Plugin/DYMaskPanel.inc.h index d5610df..ddad503 100644 --- a/大鱼调色/Plugin/DYMaskPanel.inc.h +++ b/大鱼调色/Plugin/DYMaskPanel.inc.h @@ -13,6 +13,7 @@ - (instancetype)initWithManager:(id)manager nodeID:(NSString*)nodeID{ if((self=[super initWithFrame:NSZeroRect])){_host=manager;_nodeID=[nodeID copy];_rows=[NSMutableArray new];_tracking=[NSMutableArray new];self.identifier=@"toolMasks"; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(trackingStatus:) name:@"DYToolTrackingStatus" object:_host]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(canvasSelected:) name:@"DYToolCanvasSelection" object:_host]; }return self; } - (void)buildControls{if(_list)return; @@ -51,11 +52,12 @@ - (void)addKind:(NSMenuItem*)sender{ ida=[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_host,a.currentTime).document);NSMutableArray *masks=[[DYMasksForTool(doc,_nodeID)mutableCopy]autorelease];if(masks.count>=DYToolMaskLimit){NSBeep();return;}NSDictionary *mask=DYNewMask(sender.tag);[masks addObject:mask];if(!DYSetToolMasks(doc,_nodeID,masks))return;idundo=[_host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"添加工具蒙版"];DYWriteTools(_host,doc,a.currentTime);[undo endUndoGroup];[_maskID release];_maskID=[mask[@"id"]copy];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_host];[self canvas:nil];} - (void)selection:(id)sender{NSArray *m=DYMasksForTool(_document,_nodeID);if(_list.indexOfSelectedItem<0||_list.indexOfSelectedItem>=m.count)return;[_maskID release];_maskID=[m[_list.indexOfSelectedItem][@"id"]copy];[self refreshWithDocument:_document time:_time];[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_host];} -- (void)remove:(id)sender{[self edit:@"删除工具蒙版" block:^(NSMutableDictionary *doc,NSMutableDictionary *mask){NSMutableArray *masks=[[DYMasksForTool(doc,self->_nodeID)mutableCopy]autorelease];[masks removeObject:mask];DYSetToolMasks(doc,self->_nodeID,masks);}];} +- (void)remove:(id)sender{[self edit:@"删除工具蒙版" block:^(NSMutableDictionary *doc,NSMutableDictionary *mask){NSMutableArray *masks=[[DYMasksForTool(doc,self->_nodeID)mutableCopy]autorelease];[masks removeObject:mask];DYSetToolMasks(doc,self->_nodeID,masks);}];[self canvas:nil];} - (void)enabled:(NSButton*)sender{[self edit:@"启停蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"enabled"]=@(sender.state==NSControlStateValueOn);}];} - (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];} - (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} - (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} +- (void)canvasSelected:(NSNotification*)n{if([n.userInfo[@"node"]isEqual:_nodeID]&&[n.userInfo[@"mask"]length]){NSString *ID=[n.userInfo[@"mask"]copy];[_maskID release];_maskID=ID;}} - (void)canvas:(id)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@""}];} - (void)clear:(id)sender{[self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];m[@"keys"]=@[];[m removeObjectForKey:@"status"];}];} - (void)track:(NSButton*)sender{[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"direction":@(sender.tag)}];} diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm index 7f61cdb..bc8d990 100644 --- a/大鱼调色/Plugin/DYRenderer.mm +++ b/大鱼调色/Plugin/DYRenderer.mm @@ -147,14 +147,14 @@ static void bypassIdleSkin(DYUniforms *u){ } if([e[@"spiderActive"]boolValue]){spiderBuffer=e[@"spiderBuffer"];spiderSize={ [e[@"spiderHues"]intValue],[e[@"spiderRings"]intValue]};} } - DYToolMaskHeader maskHeader{};idmaskBuffer=masks.count?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;BOOL hasMasks=maskHeader.count>0; + DYToolMaskHeader maskHeader{};idmaskBuffer=masks.count?[self maskBuffer:masks tile:src device:d header:&maskHeader]:nil;BOOL hasMasks=maskHeader.count>0;if(hasMasks&&!maskBuffer)return fail(err,@"无法分配蒙版缓冲区"); NSMutableDictionary*ps=e[@"pipelines"];NSString*format=[NSString stringWithFormat:@"%lu-%d",(unsigned long)output.pixelFormat,hasMasks];idpipeline=ps[format];if(!pipeline){MTLRenderPipelineDescriptor*p=[MTLRenderPipelineDescriptor new];p.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];p.fragmentFunction=[e[@"library"]newFunctionWithName:hasMasks?@"dyMaskedFragment":@"dyFragment"];p.colorAttachments[0].pixelFormat=output.pixelFormat;pipeline=[d newRenderPipelineStateWithDescriptor:p error:err];[p.vertexFunction release];[p.fragmentFunction release];[p release];if(!pipeline)return NO;ps[format]=pipeline;[pipeline release];} MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;idstraight=[d newTextureWithDescriptor:td];if(!straight)return fail(err,@"无法分配调色缓冲区"); idcb=[e[@"queue"]commandBuffer];idce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyUnpremultiply"]];[ce setTexture:input atIndex:0];[ce setTexture:straight atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding]; if(useCM&&!identityCM(u)&&u.cm.mix>0){ DayuRenderParams cm=DYCMRender(u.cm);cm.stages=(cm.stages&~1)|(u.inputSectionEnabled>.5?1:0); if(cm.stages){idconverted=[d newTextureWithDescriptor:td];if(!converted){[straight release];return fail(err,@"无法分配 CST 缓冲区");} - ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyColorManagement"]];[ce setTexture:straight atIndex:0];[ce setTexture:converted atIndex:1];[ce setBytes:&cm length:sizeof(cm) atIndex:0];[ce setBytes:&u.cm.mix length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];if(hasMasks){idblended=[d newTextureWithDescriptor:td];maskHeader.section=0;maskHeader.premultiplied=0;[self encodeBlend:straight after:converted output:blended masks:maskBuffer header:maskHeader entry:e commands:cb];[converted release];converted=blended;}[straight release];straight=converted; + ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyColorManagement"]];[ce setTexture:straight atIndex:0];[ce setTexture:converted atIndex:1];[ce setBytes:&cm length:sizeof(cm) atIndex:0];[ce setBytes:&u.cm.mix length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];if(hasMasks){idblended=[d newTextureWithDescriptor:td];if(!blended){[converted release];[straight release];return fail(err,@"无法分配一级蒙版缓冲区");}maskHeader.section=0;maskHeader.premultiplied=0;[self encodeBlend:straight after:converted output:blended masks:maskBuffer header:maskHeader entry:e commands:cb];[converted release];converted=blended;}[straight release];straight=converted; } } float level=.5;idscene=[d newBufferWithBytes:&level length:4 options:MTLResourceStorageModeShared]; diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index b6d0da9..eea6d66 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -74,7 +74,8 @@ if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);} BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]]; if(hasResults&&!self->_trackingDiscard){ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:self->_trackingNode document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];idundo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}} - self->_trackingActive.store(false);[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager]; + CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&hasResults&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime); + self->_trackingActive.store(false);if(advance){idseek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{idcommand=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];[command movePlayheadToTime:stepTime error:nil];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager]; });return YES; } @@ -84,7 +85,7 @@ dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingActive.load()||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return; if(type==NSEventTypeKeyDown&&key==27){@synchronized(self){[self->_toolCanvasDraft release];self->_toolCanvasDraft=nil;[self->_toolCanvasOriginal release];self->_toolCanvasOriginal=nil;self->_toolDrawingPen=NO;}return;} if(part>=10000&&type==NSEventTypeLeftMouseDown){NSInteger item=part-10000;if(item==7){self->_toolShowCoverage=!self->_toolShowCoverage;return;}if(item==8){self->_toolCanvasHidden=YES;return;}if(item==0){self->_toolDrawingPen=NO;return;} - ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document);NSMutableArray *masks=[[DYMasksForTool(doc,node)mutableCopy]autorelease];if(masks.count>=DYToolMaskLimit)return;NSInteger kind=((int[]){0,2,1,0,3,4,5})[MIN(6,item)];NSDictionary *m=DYNewMask(kind);[masks addObject:m];if(!DYSetToolMasks(doc,node,masks))return;idu=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[u startUndoGroup:@"添加工具蒙版"];DYWriteTools(self->_apiManager,doc,time);[u endUndoGroup];[self->_selectedToolMask release];self->_selectedToolMask=[m[@"id"]copy];self->_toolDrawingPen=kind==2;}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];return; + ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document);NSMutableArray *masks=[[DYMasksForTool(doc,node)mutableCopy]autorelease];if(masks.count>=DYToolMaskLimit)return;NSInteger kind=((int[]){0,2,1,0,3,4,5})[MIN(6,item)];NSDictionary *m=DYNewMask(kind);[masks addObject:m];if(!DYSetToolMasks(doc,node,masks))return;idu=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[u startUndoGroup:@"添加工具蒙版"];DYWriteTools(self->_apiManager,doc,time);[u endUndoGroup];[self->_selectedToolMask release];self->_selectedToolMask=[m[@"id"]copy];self->_toolDrawingPen=kind==2;[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:self->_apiManager userInfo:@{@"node":node,@"mask":m[@"id"],@"draw":@(kind==2)}];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];return; } BOOL commit=NO; if(type==NSEventTypeLeftMouseDown){ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSDictionary *m=[self toolMask:maskID node:node document:DYReadTools(self->_apiManager,time).document];if(!m)return;@synchronized(self){if(!self->_toolCanvasDraft){self->_toolCanvasOriginal=[DYMutablePlist(m)retain];self->_toolCanvasDraft=[DYMutablePlist(m)retain];self->_toolDragParameters=DYMaskAtTime(m,time);self->_toolDragParameters.imageAspect=self->_toolSourceFrame.valid()?float(self->_toolSourceFrame.width)/self->_toolSourceFrame.height:1;self->_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&self->_toolDragParameters length:sizeof(DYMaskParameters)];self->_toolCanvasDraft[@"keys"]=@[];if(self->_toolDrawingPen)self->_toolCanvasDraft[@"nodes"]=[NSData data];}self->_toolDragStart=point;self->_toolDragPart=part;self->_toolDragParameters=DYMaskAtTime(self->_toolCanvasDraft,time); diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 76f5d42..6020a65 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.4.0 CFBundleVersion - 20 + 21 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 1cfda1e..7d8439a 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.4.0 CFBundleVersion - 20 + 21 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright