From 3b4c612edf99c0ef2b972b7305cd7ba44244a7c6 Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 6 Nov 2026 15:56:42 +0800 Subject: [PATCH] Implement adaptive inspector, mask clock repair, and selectable face mosaic; validation pending --- .../Plugin/DYCanvasToolsDiagnostics.inc.h | 27 +++++ 大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h | 30 +++--- 大鱼调色/Plugin/DYDiagnostics.mm | 6 +- 大鱼调色/Plugin/DYInspector.mm | 98 ++++++++++--------- 大鱼调色/Plugin/DYManagedRender.inc.h | 2 +- 大鱼调色/Plugin/DYMaskPanel.inc.h | 2 +- 大鱼调色/Plugin/DYMosaicRender.inc.h | 46 ++++++++- 大鱼调色/Plugin/DYRenderer.h | 2 + 大鱼调色/Plugin/DYRenderer.mm | 4 +- 大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h | 13 ++- 大鱼调色/Plugin/DYToolCanvasEditing.inc.h | 29 ++++-- 大鱼调色/Plugin/DYToolHostIvars.inc.h | 2 +- 大鱼调色/Plugin/DYToolHostMethods.inc.h | 2 +- 大鱼调色/Plugin/DYToolInspector.inc.h | 2 +- 大鱼调色/Plugin/DYToolState.mm | 9 +- 大鱼调色/Plugin/DYViewerParameterBridge.inc.h | 60 +++++++++--- 大鱼调色/Plugin/DYWorkspaceTools.inc.h | 4 +- 大鱼调色/Plugin/Info.plist | 6 +- 大鱼调色/Wrapper Application/Info.plist | 4 +- 19 files changed, 245 insertions(+), 103 deletions(-) diff --git a/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h b/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h index 9dbc2ea..d7a461e 100644 --- a/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h @@ -61,6 +61,33 @@ if(faceFixture.length){ privacy[@"mosaic"] = @{@"enabled":@NO,@"source":@"face",@"size":@64};BOOL privacyOff=[face renderSource:src destination:dst uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels privateReference=read(dst,gpu); double privateInside=0,privateOutside=0;for(NSUInteger y=85;y<145;y++)for(NSUInteger x=200;x<260;x++)for(int c=0;c<3;c++)privateInside=MAX(privateInside,fabs((float)privateFrame[(y*w+x)*4+c]-(float)privateReference[(y*w+x)*4+c]));for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)for(int c=0;c<3;c++)privateOutside=MAX(privateOutside,fabs((float)privateFrame[(y*w+x)*4+c]-(float)privateReference[(y*w+x)*4+c])); run.record(@"mosaic-real-face-includes-feature-region-and-excludes-background",privacyOK&&privacyOff&&privateInside>.05&&privateOutside==0,@{@"faceChange":@(privateInside),@"backgroundChange":@(privateOutside)}); + // The same production menu writer turns two detected faces into independent, + // serializable masks, then toggles only one while preserving the other pixels. + privacy[@"mosaic"]=@{@"enabled":@YES,@"source":@"face",@"size":@64}; + BOOL fastOK=[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:DYToolRenderSnapshot(privacy,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError]; + NSDictionary *detected=[face mosaicFaceSnapshot];Pixels bothFaces=read(twoDest,gpu); + run.record(@"mosaic-fast-rectangles-detect-two-faces-without-landmarks",fastOK&&[detected[@"boxes"]count]==2,@{@"faces":@([detected[@"boxes"]count])}); + if([detected[@"boxes"]count]==2){ + DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);DYWriteTools(base,privacy,kCMTimeZero); + DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero; + id bridge=[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host];[bridge setValue:face forKey:@"renderer"]; + NSMenuItem *item=[[[NSMenuItem alloc]init]autorelease];item.representedObject=@{@"importFaces":detected,@"actionTime":detected[@"time"]}; + int undo=base->_undoStarts;[bridge performSelector:@selector(applyMosaicMenu:) withObject:item]; + NSDictionary *saved=DYReadTools(host,kCMTimeZero).document;NSArray *IDs=saved[@"mosaic"][@"maskIDs"]; + run.record(@"mosaic-import-faces-creates-two-stable-masks-in-one-undo",IDs.count==2&&DYSharedMasks(saved).count==2&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + BOOL savedOK=[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:DYToolRenderSnapshot(saved,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError]; + run.record(@"mosaic-imported-selection-matches-live-two-face-render",savedOK&&difference(bothFaces,read(twoDest,gpu)).maximum<.002); + if(IDs.count==2){ + item.representedObject=@{@"toggleMask":IDs[1]};[bridge performSelector:@selector(applyMosaicMenu:) withObject:item];saved=DYReadTools(host,kCMTimeZero).document; + [face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:DYToolRenderSnapshot(saved,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels single=read(twoDest,gpu); + privacy[@"mosaic"]=@{@"enabled":@NO,@"source":@"face",@"size":@64};[face renderSource:twoSource destination:twoDest uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels reference=read(twoDest,gpu); + double left=0,right=0;for(NSUInteger y=0;y<512;y++)for(NSUInteger x=0;x<1024;x++)for(int c=0;c<3;c++){double delta=fabs((float)single[(y*1024+x)*4+c]-(float)reference[(y*1024+x)*4+c]);if(x<512)left=MAX(left,delta);else right=MAX(right,delta);} + run.record(@"mosaic-selects-one-person-with-other-person-pixel-identical",left>.05&&right==0&&[saved[@"mosaic"][@"maskIDs"]count]==1,@{@"selectedChange":@(left),@"unselectedChange":@(right)}); + NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(host,kCMTimeZero) requiringSecureCoding:YES error:nil];DYToolDocument *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:archive error:nil];run.record(@"mosaic-person-selection-survives-secure-save-and-reopen",[restored.document isEqual:saved]); + NSMutableDictionary *malformed=DYMutablePlist(saved);malformed[@"mosaic"][@"maskIDs"]=@[IDs[0],IDs[0]];run.record(@"mosaic-duplicate-mask-identities-rejected",!DYValidToolDocument(malformed)); + } + [bridge invalidate];[bridge release]; + } Pixels noFace(w*h*4);for(NSUInteger i=0;i_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds; + NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];(void)custom;int starts=host->_undoStarts,ends=host->_undoEnds; DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease]; NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"]; - BOOL expanded=YES;NSUInteger visible=0;CGFloat bottom=0; - for(NSDictionary *card in cards)if(![card[@"removed"]boolValue]){expanded&=![card[@"collapsed"]boolValue];visible++;bottom=MAX(bottom,NSMaxY([card[@"view"]frame]));} - NSView *document=[view valueForKey:@"document"];NSView *brandLabel=[view valueForKey:@"brand"]; - run.record(@"inspector-all-existing-modules-expanded-before-host-creation",expanded&&visible==DYToolTypes().count&&!panel.hidden,@{@"visibleModules":@(visible),@"height":@(view.frame.size.height)}); - run.record(@"inspector-returned-frame-contains-complete-expanded-document",NSMaxY(document.frame)<=view.frame.size.height&&bottom<=document.bounds.size.height&&view.frame.size.height==view.intrinsicContentSize.height); - run.record(@"inspector-complete-content-has-no-inner-scroll-view",[view valueForKey:@"scroll"]==nil&&NSContainsRect(view.bounds,brandLabel.frame)); - for(int i=0;i<10;i++){[settings performClick:nil];for(NSDictionary *card in cards)[card[@"header"]performClick:nil];[view layoutSubtreeIfNeeded];} - expanded=YES;for(NSDictionary *card in cards)expanded&=![card[@"collapsed"]boolValue]; - run.record(@"inspector-headers-keep-modules-expanded-without-editing-grade",expanded&&!panel.hidden&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds); - DYInspectorToken *folds=[[[DYInspectorToken alloc]init]autorelease];folds.folds=@{@"primary":@YES,@"hsl":@YES};[host setCustomParameterValue:folds toParameter:DYInspectorParameterID atTime:kCMTimeZero]; - [view refresh];expanded=YES;for(NSDictionary *card in cards)expanded&=![card[@"collapsed"]boolValue]; - run.record(@"inspector-old-fold-state-does-not-collapse-new-presentation",expanded&&[DYReadTools(host,kCMTimeZero).document isKindOfClass:NSDictionary.class]); + BOOL defaults=YES;NSUInteger visible=0,expanded=0;CGFloat bottom=0; + for(NSDictionary *card in cards)if(![card[@"removed"]boolValue]){BOOL open=[@[@"primary",@"base",@"spider"]containsObject:card[@"section"][@"key"]];defaults&=[card[@"collapsed"]boolValue]!=open;expanded+=![card[@"collapsed"]boolValue];visible++;bottom=MAX(bottom,NSMaxY([card[@"view"]frame]));} + NSView *document=[view valueForKey:@"document"],*brandLabel=[view valueForKey:@"brand"];NSScrollView *scroll=[view valueForKey:@"scroll"]; + run.record(@"inspector-default-opens-three-tools-and-retains-other-headers",defaults&&expanded==3&&visible==DYToolTypes().count&&panel.hidden,@{@"visibleModules":@(visible),@"height":@(view.frame.size.height)}); + run.record(@"inspector-default-complete-stack-fits-without-inner-scroll",scroll&&!scroll.hasVerticalScroller&&document.bounds.size.height<=scroll.contentSize.height+.5&&bottom<=document.bounds.size.height&&NSContainsRect(view.bounds,brandLabel.frame)); + CGFloat originalHeight=view.frame.size.height; + for(NSDictionary *card in cards)if([card[@"collapsed"]boolValue])[card[@"header"]performClick:nil];[view layoutSubtreeIfNeeded]; + run.record(@"inspector-expansion-enters-scroll-with-stable-host-allocation",scroll.hasVerticalScroller&&document.bounds.size.height>scroll.contentSize.height&&view.frame.size.height==originalHeight); + [document scrollPoint:NSMakePoint(0,document.bounds.size.height)]; + for(NSDictionary *card in cards)if(![@[@"primary",@"base",@"spider"]containsObject:card[@"section"][@"key"]])[card[@"header"]performClick:nil];[view layoutSubtreeIfNeeded]; + run.record(@"inspector-collapse-removes-scroll-and-clamps-former-bottom-offset",!scroll.hasVerticalScroller&&scroll.contentView.bounds.origin.y==0&&[values isEqual:host->_values]&&starts==host->_undoStarts&&ends==host->_undoEnds); + NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYInsertTool(doc,@"spider",@"base:spider");DYWriteTools(host,doc,kCMTimeZero);[view refresh];[view layoutSubtreeIfNeeded]; + run.record(@"inspector-added-module-is-reachable-in-scroll",scroll.hasVerticalScroller&&view.frame.size.height==originalHeight&&[[view valueForKey:@"stackViews"]count]==1); + DYInspectorToken *folds=[[[DYInspectorToken alloc]init]autorelease];folds.folds=@{@"primary":@YES,@"hsl":@NO};[host setCustomParameterValue:folds toParameter:DYInspectorParameterID atTime:kCMTimeZero];[view refresh]; + BOOL restored=YES;for(NSDictionary *card in cards){NSString *key=card[@"section"][@"key"];if([key isEqual:@"primary"])restored&=[card[@"collapsed"]boolValue];if([key isEqual:@"hsl"])restored&=![card[@"collapsed"]boolValue];} + run.record(@"inspector-saved-disclosure-is-restored-without-grading-changes",restored&&[values isEqual:host->_values]); for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults(),DYUnifiedColorDefaults()]){ DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil]; run.record([NSString stringWithFormat:@"expanded-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]); diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 86741f4..3058df9 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -267,10 +267,10 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { DYDiagnosticManager *uiHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(uiHost,nil); DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:uiHost]autorelease];[inspector refresh]; NSArray *cards=[inspector valueForKey:@"cards"];BOOL initialUI=YES; - for(NSDictionary *card in cards){BOOL expected=![card[@"section"][@"key"]isEqual:@"output"];initialUI&=![card[@"collapsed"]boolValue]&&[card[@"removed"]boolValue]!=expected;} - run.record(@"default-all-available-modules-visible-and-expanded",initialUI,@{@"modules":@(cards.count)}); + for(NSDictionary *card in cards){BOOL expected=![card[@"section"][@"key"]isEqual:@"output"];initialUI&=([card[@"collapsed"]boolValue]!=[@[@"primary",@"base",@"spider"]containsObject:card[@"section"][@"key"]])&&[card[@"removed"]boolValue]!=expected;} + run.record(@"default-three-expanded-and-other-modules-folded",initialUI,@{@"modules":@(cards.count)}); DYUniforms uiBefore,uiAfter;DYReadUniforms(uiHost,kCMTimeZero,&uiBefore);BOOL foldingIndependent=YES; - for(NSDictionary *card in cards){NSButton *header=card[@"header"];[header performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);foldingIndependent&=![card[@"collapsed"]boolValue]&&memcmp(&uiBefore,&uiAfter,sizeof(uiBefore))==0;[header performClick:nil];[inspector refresh];} + for(NSDictionary *card in cards){NSButton *header=card[@"header"];BOOL was=[card[@"collapsed"]boolValue];[header performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);foldingIndependent&=([card[@"collapsed"]boolValue]!=was)&&memcmp(&uiBefore,&uiAfter,sizeof(uiBefore))==0;[header performClick:nil];[inspector refresh];} run.record(@"expanded-header-actions-preserve-every-render-parameter",foldingIndependent); NSDictionary *first=cards[0];if(![first[@"collapsed"]boolValue]){[(NSButton*)first[@"header"]performClick:nil];[inspector refresh];}BOOL wasFolded=[first[@"collapsed"]boolValue];[(NSButton*)first[@"enabled"]performClick:nil];[inspector refresh];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter); run.record(@"eye-only-toggles-enable-retains-disclosure",[first[@"collapsed"]boolValue]==wasFolded&&uiAfter.inputSectionEnabled==0); diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 2c99c17..73d6cd1 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -487,7 +487,7 @@ NSView *DYCreateWorkspaceMaskEditor(id NSInteger _visibleLooks; NSButton *_colorSettings;BOOL _colorSettingsExpanded; BOOL _refreshing,_graphicUndoOpen,_graphicCancelled;CMTime _graphicTime;NSMutableDictionary *_graphicExpected; - BOOL _embedded,_workspaceEditor,_unified,_measuringFullHeight;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight; + BOOL _embedded,_workspaceEditor,_unified,_measuringDefaultHeight;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight,_maximumViewportHeight; DYSpiderPanel *_spiderPanel; NSMutableDictionary *_assetLoads,*_assetLoadIDs; NSUInteger _nextAssetLoadID; @@ -533,7 +533,7 @@ NSView *DYCreateWorkspaceMaskEditor(id _save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain]; _load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain]; _export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain]; - _colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];_colorSettings.toolTip=@"颜色设置已完整展开;点击定位";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已展开";_colorSettingsExpanded=YES; + _colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];_colorSettings.toolTip=@"展开或折叠颜色设置";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已折叠";_colorSettingsExpanded=NO; _save.identifier=@"primaryAction"; _workspaceButton=[DYButton(@"控制面板",self,@selector(openWorkspace:))retain];_workspaceButton.accessibilityLabel=@"打开调色控制面板"; _addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"]; @@ -544,7 +544,7 @@ NSView *DYCreateWorkspaceMaskEditor(id NSButton *b=DYButton(DYThemeNames()[i],self,@selector(selectTheme:));[b setButtonType:NSButtonTypePushOnPushOff];b.tag=i+7;b.identifier=@"appearanceToggle"; b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded||_workspaceEditor;[themes addObject:b]; }_themeButtons=[themes copy]; - if(_workspaceEditor)_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect]; + if(!_embedded||_workspaceEditor)_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect]; _scroll.hasVerticalScroller=NO; _scroll.hasHorizontalScroller=_workspaceEditor;_scroll.scrollerStyle=NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO; _scroll.autohidesScrollers=YES; _scroll.borderType=NSNoBorder; _scroll.clipsToBounds=YES;_scroll.wantsLayer=YES;_scroll.layer.masksToBounds=YES; @@ -555,7 +555,7 @@ NSView *DYCreateWorkspaceMaskEditor(id _document.accessibilityLabel=@"调色参数";_document.identifier=@"inspectorBackground"; if(_scroll){_scroll.documentView=_document;[self addSubview:_scroll];} else [self addSubview:_document]; - if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=NO;[_document addSubview:_managedPanel];} + if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_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]; @@ -569,21 +569,20 @@ NSView *DYCreateWorkspaceMaskEditor(id } [self themeChanged:nil]; [self setAccessibilityLabel:@"大鱼调色检查器"]; - // FxPlug snapshots the returned frame when it allocates the host row. - // Supply the document's actual height before that snapshot is taken. [self refresh]; - [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; if(!_embedded&&!_workspaceEditor){ - // FCP samples the frame once. Measure all expanded modules at the - // narrow supported width and reserve the largest existing tab body. + // FCP allocates the host row once. Measure the useful default stack + // at the narrow width; later expansions scroll within that budget. CGFloat width=self.frame.size.width; - _measuringFullHeight=YES;[self setFrameSize:NSMakeSize(280,_preferredHeight)]; + _measuringDefaultHeight=YES; + [self setFrameSize:NSMakeSize(280,406)]; [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; - CGFloat measured=_preferredHeight; - _measuringFullHeight=NO;[self setFrameSize:NSMakeSize(width,measured)]; - [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; - _preferredHeight=measured;[self setFrameSize:NSMakeSize(width,measured)]; + _maximumViewportHeight=ceil(_stackHeight+212); + _measuringDefaultHeight=NO; + _preferredHeight=_maximumViewportHeight; + [self setFrameSize:NSMakeSize(width,_preferredHeight)]; } + [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; } DYBetaSpanEnd(beta,nil);return self; } @@ -636,7 +635,10 @@ NSView *DYCreateWorkspaceMaskEditor(id - (void)showMosaicMenu:(NSView*)sender {[NSNotificationCenter.defaultCenter postNotificationName:@"DYMosaicMenuRequested" object:_manager userInfo:@{@"anchor":sender}];} - (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);} - (void)toggleColorSettings:(id)sender { - [_managedPanel scrollRectToVisible:_managedPanel.bounds]; + _colorSettingsExpanded=!_colorSettingsExpanded; + _managedPanel.hidden=!_colorSettingsExpanded; + _colorSettings.accessibilityValue=_colorSettingsExpanded?@"已展开":@"已折叠"; + [self setNeedsLayout:YES]; } - (void)openWorkspace:(id)sender { if(_embedded||_workspaceEditor||!self.window||!_renderer)return; @@ -855,19 +857,11 @@ NSView *DYCreateWorkspaceMaskEditor(id CGFloat cw=MAX(244,(_scroll?_scroll.contentSize.width:w)-32),y=8; if(_managedPanel&&!_managedPanel.hidden){_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"]; + DYCard *card=c[@"view"];NSString *key=c[@"section"][@"key"]; + BOOL collapsed=_measuringDefaultHeight?![self initiallyExpandedSection:key]:[c[@"collapsed"]boolValue]; card.hidden=[c[@"removed"]boolValue];if(card.hidden){y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w];continue;} NSArray *body=c[@"body"];CGFloat contentHeight=0; for(NSView *row in body)if([self showRow:row section:key]&&!collapsed)contentHeight+=[self heightForRow:row]; - if(_measuringFullHeight){ - NSNumber *selected=[[_tabs[key]retain]autorelease]; - for(NSInteger tab=0;tab<9;tab++){ - _tabs[key]=@(tab);CGFloat candidate=0; - for(NSView *row in body)if([self showRow:row section:key])candidate+=[self heightForRow:row]; - contentHeight=MAX(contentHeight,candidate); - } - if(selected)_tabs[key]=selected;else[_tabs removeObjectForKey:key]; - } [c[@"enabled"]setFrame:NSMakeRect(12,12,20,20)]; BOOL narrow=cw<300;CGFloat titleWidth=MIN(cw-(narrow?60:171),MAX(94,[[(NSButton *)c[@"header"]title]sizeWithAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:12]}].width+36)); [c[@"header"]setFrame:NSMakeRect(42,8,titleWidth,28)]; @@ -945,7 +939,7 @@ NSView *DYCreateWorkspaceMaskEditor(id if(_unified&&!_embedded&&!_workspaceEditor){ NSMutableDictionary *views=[NSMutableDictionary dictionary]; for(NSDictionary *card in _cards){NSString *key=card[@"section"][@"key"];NSView *view=card[@"view"];if(!view.hidden)views[[key isEqual:@"output"]?@"output":[@"base:" stringByAppendingString:key]]=view;} - [views addEntriesFromDictionary:_stackViews];y=(_managedPanel&&!_managedPanel.hidden)?NSMaxY(_managedPanel.frame)+12:8; + if(!_measuringDefaultHeight)[views addEntriesFromDictionary:_stackViews];y=(_managedPanel&&!_managedPanel.hidden)?NSMaxY(_managedPanel.frame)+12:8; for(NSString *ID in _renderOrder){NSView *view=views[ID];if(!view||view.hidden)continue;NSRect frame=view.frame;frame.origin.y=y;view.frame=frame;y+=frame.size.height+([ID hasPrefix:@"base:"]||[ID isEqual:@"output"]?12:0);} } for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"output"]){ @@ -954,24 +948,28 @@ NSView *DYCreateWorkspaceMaskEditor(id } _stackHeight=y;CGFloat documentWidth=_scroll?_scroll.contentSize.width:w;if(_workspaceEditor)for(NSDictionary *card in _cards)documentWidth=MAX(documentWidth,[card[@"view"]frame].size.width); - _document.frame=NSMakeRect(0,(_embedded||_workspaceEditor)?0:top,documentWidth,_workspaceEditor?_scroll.contentSize.height:y); + _document.frame=NSMakeRect(0,0,documentWidth,_workspaceEditor?_scroll.contentSize.height:y); if(!_embedded&&!_workspaceEditor){ - CGFloat preferred=ceil(top+MAX(12,y)); - if(_measuringFullHeight){ - if(_managedPanel)preferred+=MAX(0,238-_managedPanel.contentHeight); - // Switching into V4 adds a separate output header. Reserve that - // existing module's measured rows even while legacy mode hides it. - for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"output"]&&[card[@"removed"]boolValue]){ - CGFloat output=69+8+12;for(NSView *row in card[@"body"])if([self showRow:row section:@"output"])output+=[self heightForRow:row];preferred+=output; - } - } - // Never delete/re-create a published parameter to resize its host row. - // The host owns attached geometry; detached/new views can be measured. - if(!self.window){_preferredHeight=MAX(_preferredHeight,preferred);[self invalidateIntrinsicContentSize];} + CGFloat budget=_maximumViewportHeight>0?_maximumViewportHeight:top+y; + CGFloat viewport=MIN(MAX(12,y),MAX(12,MIN(h,budget)-top)); + _scroll.frame=NSMakeRect(0,top,w,viewport); + _scroll.hasVerticalScroller=y>viewport+.5; + NSPoint origin=_scroll.contentView.bounds.origin; + origin.y=MAX(0,MIN(origin.y,MAX(0,y-viewport))); + [_scroll.contentView scrollToPoint:origin];[_scroll reflectScrolledClipView:_scroll.contentView]; + // Keep the row allocation stable; only the inner viewport contracts. + // Never hide/recreate the FxPlug parameter to force host resizing. + [self invalidateIntrinsicContentSize]; } [self curveOutputChanged:nil]; } - (id)actionAPI { return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; } +- (BOOL)initiallyExpandedSection:(NSString*)key { + if(_embedded||_workspaceEditor)return YES; + NSUInteger roots=0;NSString *only=nil; + for(NSDictionary *card in _cards)if(![card[@"removed"]boolValue]&&![card[@"section"][@"key"]isEqual:@"output"]){roots++;only=card[@"section"][@"key"];} + return (roots==1&&[only isEqual:key])||[@[@"primary",@"base",@"spider"]containsObject:key]; +} - (void)refresh { if(_refreshing||!_manager)return; id action=[self actionAPI]; if(!action)return; @@ -990,6 +988,8 @@ NSView *DYCreateWorkspaceMaskEditor(id for(NSView *row in output[@"body"]){if([row.identifier isEqual:@"toolMasks"])continue;[body removeObjectIdenticalTo:row];[(_unified?output:primary)[@"view"]addSubview:row];if(!_unified)[body addObject:row];} primary[@"body"]=body; } + NSDictionary *initialTools=DYReadTools(_embedded?[(DYToolManager*)_manager host]:_manager,t).document; + for(NSMutableDictionary *card in _cards){NSString *type=card[@"section"][@"key"];card[@"removed"]=@([type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(initialTools,type));} NSMutableDictionary *graphicValues=[NSMutableDictionary dictionary]; for(NSNumber *pid in _controls) { NSDictionary *r=_controls[pid],*d=r[@"descriptor"]; double v=[d[@"default"] doubleValue]; @@ -1009,11 +1009,12 @@ NSView *DYCreateWorkspaceMaskEditor(id NSNumber *extra=c[@"section"][@"extraEnabled"];double extraValue=0; if(extra)[get getFloatValue:&extraValue fromParameter:extra.unsignedIntValue atTime:t]; BOOL enabled=v>=.5||extraValue>=.5; - // Presentation only: retain archived folds for old versions, but - // this inspector opens every existing module before host sizing. - BOOL collapsed=NO;groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed); + DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t]; + NSNumber *saved=[token isKindOfClass:DYInspectorToken.class]?token.folds[c[@"section"][@"key"]]:nil; + BOOL collapsed=_workspaceEditor?NO:saved?saved.boolValue:![self initiallyExpandedSection:c[@"section"][@"key"]]; + groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed); [c[@"header"]setState:collapsed?NSControlStateValueOff:NSControlStateValueOn]; - [c[@"header"]setToolTip:@"本模块已完整展开;双击还原本组"]; + [c[@"header"]setToolTip:collapsed?@"展开界面,不改变启用状态;双击还原本组":@"折叠界面,保持当前效果;双击还原本组"]; [c[@"header"]setAccessibilityHelp:[c[@"header"]toolTip]];[c[@"header"]setNeedsDisplay:YES]; [c[@"enabled"]setState:enabled?NSControlStateValueOn:NSControlStateValueOff]; [c[@"enabled"]setImage:[NSImage imageWithSystemSymbolName:enabled?@"eye":@"eye.slash" accessibilityDescription:enabled?@"停用本组":@"启用本组"]]; @@ -1139,8 +1140,15 @@ NSView *DYCreateWorkspaceMaskEditor(id - (void)toggleSection:(NSButton *)sender { if(sender.tag<0||sender.tag>=_cards.count)return; if(!_workspaceEditor){id host=_embedded?[(DYToolManager*)_manager host]:_manager;NSString *node=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:_cards[sender.tag][@"section"][@"key"]];[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:host userInfo:@{@"node":node,@"source":@"inspector"}];} - // All modules stay expanded so their initial measured host row remains valid. - [sender setState:NSControlStateValueOn]; + id action=[self actionAPI];if(!action)return; + [action startAction:self];@try{ + id get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + DYInspectorToken *old=nil;[get getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:action.currentTime]; + DYInspectorToken *token=[old isKindOfClass:DYInspectorToken.class]?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease]; + NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease];NSString *key=_cards[sender.tag][@"section"][@"key"]; + folds[key]=@(![_cards[sender.tag][@"collapsed"]boolValue]);token.folds=folds; + [[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime]; + }@finally{[action endAction:self];}[self postChanged]; } - (void)useCST:(id)sender { diff --git a/大鱼调色/Plugin/DYManagedRender.inc.h b/大鱼调色/Plugin/DYManagedRender.inc.h index 8447750..5c1cc89 100644 --- a/大鱼调色/Plugin/DYManagedRender.inc.h +++ b/大鱼调色/Plugin/DYManagedRender.inc.h @@ -98,7 +98,7 @@ if([tools[@"mosaic"][@"enabled"]boolValue]){ if(!DYValidToolDocument(tools))return fail(error,@"局部马赛克设置无效。"); FxImageTile *mosaic=[self sourceByApplyingMosaic:tools source:src registry:dst.deviceRegistryID error:error];if(!mosaic)return NO; - NSMutableDictionary *remaining=[[tools mutableCopy]autorelease];[remaining removeObjectForKey:@"mosaic"];[remaining removeObjectForKey:@"mosaicRenderMask"]; + NSMutableDictionary *remaining=[[tools mutableCopy]autorelease];[remaining removeObjectForKey:@"mosaic"];[remaining removeObjectForKey:@"mosaicRenderMask"];[remaining removeObjectForKey:@"mosaicRenderMasks"]; return [self renderColorSource:mosaic destination:dst uniforms:u paths:paths spider:spider tools:remaining colorManagement:state hostPrimaries:primaries error:error]; } if(tools[@"sharedMasks"]){ diff --git a/大鱼调色/Plugin/DYMaskPanel.inc.h b/大鱼调色/Plugin/DYMaskPanel.inc.h index 3ad98fa..485645c 100644 --- a/大鱼调色/Plugin/DYMaskPanel.inc.h +++ b/大鱼调色/Plugin/DYMaskPanel.inc.h @@ -55,7 +55,7 @@ - (NSDictionary*)mask{for(NSDictionary *m in DYMasksForTool(_document,_nodeID))if([m[@"id"]isEqual:_maskID])return m;return nil;} - (void)refreshWithDocument:(NSDictionary*)doc time:(CMTime)time{ _refreshing=YES;NSDictionary *saved=[doc copy];[_document release];_document=saved;_time=time;NSArray *masks=DYMasksForTool(doc,_nodeID);if(masks.count)[self buildControls];[_list removeAllItems];NSInteger selected=0,index=0; - for(NSDictionary *m in masks){DYMaskParameters p=DYMaskAtTime(m,time);[_list addItemWithTitle:[NSString stringWithFormat:@"%@ %ld",m[@"stampSource"]?@"仿制图章":@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][p.kind],(long)index+1]];if([m[@"id"]isEqual:_maskID])selected=index;index++;} + for(NSDictionary *m in masks){DYMaskParameters p=DYMaskAtTime(m,time);[_list addItemWithTitle:m[@"label"]?:[NSString stringWithFormat:@"%@ %ld",m[@"stampSource"]?@"仿制图章":@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][p.kind],(long)index+1]];if([m[@"id"]isEqual:_maskID])selected=index;index++;} if(!masks.count){_contentHeight=0;_drawing=_canvasActive=NO;[_maskID release];_maskID=nil;_refreshing=NO;return;}[_list selectItemAtIndex:selected];if(![_maskID isEqual:masks[selected][@"id"]])_drawing=_canvasActive=NO;[_maskID release];_maskID=[masks[selected][@"id"]copy];NSDictionary *m=[self mask];DYMaskParameters p=DYMaskAtTime(m,time);if(p.kind!=DYMaskBezier)_drawing=NO; BOOL stamp=m[@"stampSource"]!=nil;_combine.hidden=_invert.hidden=stamp; _eye.state=[m[@"enabled"]boolValue]?NSControlStateValueOn:NSControlStateValueOff;_eye.image=[NSImage imageWithSystemSymbolName:[m[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用蒙版"];[_combine selectItemAtIndex:[m[@"combine"]integerValue]];_invert.state=(p.flags&DYMaskInvert)?NSControlStateValueOn:NSControlStateValueOff; diff --git a/大鱼调色/Plugin/DYMosaicRender.inc.h b/大鱼调色/Plugin/DYMosaicRender.inc.h index 4024e4b..2627fcb 100644 --- a/大鱼调色/Plugin/DYMosaicRender.inc.h +++ b/大鱼调色/Plugin/DYMosaicRender.inc.h @@ -1,3 +1,37 @@ +// Privacy needs face boxes only. Keep the more expensive 76-point landmark +// request exclusively for skin protection. Reuse boxes only for identical pixels. +- (NSDictionary*)mosaicFaceSnapshot {@synchronized(_previewLock){return [[_mosaicFaceSnapshot retain]autorelease];}} +- (NSData*)mosaicFaces:(FxImageTile*)source time:(NSDictionary*)time error:(NSError**)error { + NSMutableDictionary *entry=[self device:source.deviceRegistryID error:error];if(!entry)return nil; + idtexture=[source metalTextureForDevice:entry[@"device"]];if(!texture)return nil; + if(!_faceContext)_faceContext=[[CIContext contextWithMTLDevice:entry[@"device"] options:@{kCIContextCacheIntermediates:@NO}]retain]; + CGColorSpaceRef linear=CGColorSpaceCreateWithName(kCGColorSpaceLinearSRGB); + CIImage *input=[CIImage imageWithMTLTexture:texture options:@{kCIImageColorSpace:(id)linear}];CGColorSpaceRelease(linear);if(!input)return nil; + if(source.imageOrigin==kFxImageOrigin_TOP_LEFT)input=[input imageByApplyingTransform:CGAffineTransformMake(1,0,0,-1,0,input.extent.size.height)]; + CGFloat scale=MIN(1.,640./MAX(input.extent.size.width,input.extent.size.height));input=[input imageByApplyingTransform:CGAffineTransformMakeScale(scale,scale)]; + CGColorSpaceRef srgb=CGColorSpaceCreateWithName(kCGColorSpaceSRGB);CGImageRef cg=[_faceContext createCGImage:input fromRect:input.extent format:kCIFormatRGBA8 colorSpace:srgb];CGColorSpaceRelease(srgb);if(!cg)return nil; + CFDataRef raster=CGDataProviderCopyData(CGImageGetDataProvider(cg));BOOL same=raster&&[_mosaicRaster isEqual:(NSData*)raster]; + NSMutableArray *boxes=[NSMutableArray array]; + if(same){[boxes addObjectsFromArray:[self mosaicFaceSnapshot][@"boxes"]?:@[]];} + else{ + VNDetectFaceRectanglesRequest *request=[VNDetectFaceRectanglesRequest new];request.revision=VNDetectFaceRectanglesRequestRevision3; + VNImageRequestHandler *handler=[[VNImageRequestHandler alloc]initWithCGImage:cg orientation:kCGImagePropertyOrientationUp options:@{}]; + BOOL ok=[handler performRequests:@[request] error:error]; + if(ok)for(VNFaceObservation *face in request.results){CGRect box=face.boundingBox;if(boxes.count>=DYSharedMaskLimit||face.confidence<.5||box.size.width<.015||box.size.height<.015)continue; + [boxes addObject:@[@(CGRectGetMidX(box)),@(1-CGRectGetMidY(box)),@(box.size.width*1.2),@(box.size.height*1.25)]]; + } + [handler release];[request release]; + if(!ok){if(raster)CFRelease(raster);CGImageRelease(cg);return nil;} + [boxes sortUsingComparator:^NSComparisonResult(NSArray *a,NSArray *b){NSComparisonResult x=[a[0]compare:b[0]];return x==NSOrderedSame?[a[1]compare:b[1]]:x;}]; + std::vector entries; + for(NSArray *box in boxes){DYToolMaskEntry m{};m.section=-102;m.mask.parameters=dyDefaultMaskParameters();auto &p=m.mask.parameters;p.kind=DYMaskRectangle;p.centerX=[box[0]floatValue];p.centerY=[box[1]floatValue];p.width=[box[2]floatValue];p.height=[box[3]floatValue];p.feather=0;entries.push_back(m);} + [_mosaicEntries release];_mosaicEntries=[[NSData alloc]initWithBytes:entries.data() length:entries.size()*sizeof(DYToolMaskEntry)]; + [_mosaicRaster release];_mosaicRaster=raster?[(NSData*)raster copy]:nil; + } + if(raster)CFRelease(raster);CGImageRelease(cg); + @synchronized(_previewLock){[_mosaicFaceSnapshot release];_mosaicFaceSnapshot=[@{@"boxes":boxes,@"time":time?:@{}}copy];} + return _mosaicEntries; +} // Runs on the original frame before grading, then follows the same spatial // transforms as the picture. Geometry has already been evaluated at render time. - (FxImageTile*)sourceByApplyingMosaic:(NSDictionary*)tools source:(FxImageTile*)src registry:(uint64_t)registry error:(NSError**)error { @@ -5,13 +39,17 @@ FxRect image=src.imagePixelBounds,bounds=src.tilePixelBounds; if(memcmp(&image,&bounds,sizeof(FxRect))!=0){fail(error,@"局部马赛克需要完整源画面。");return nil;} BOOL face=[settings[@"source"]isEqual:@"face"]; - NSDictionary *mask=tools[@"mosaicRenderMask"]?:DYSharedMaskWithID(tools,settings[@"maskID"]); - if(!face&&(!mask||mask[@"stampSource"]||![mask[@"enabled"]boolValue]))return src; + NSMutableArray *masks=[NSMutableArray array]; + NSArray *selected=tools[@"mosaicRenderMasks"]; + if(!selected){NSMutableArray *raw=[NSMutableArray array];for(NSString *ID in settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[])){NSDictionary *m=DYSharedMaskWithID(tools,ID);if(m)[raw addObject:m];}selected=tools[@"mosaicRenderMask"]?@[tools[@"mosaicRenderMask"]]:raw;} + for(NSDictionary *mask in selected)if(!mask[@"stampSource"]&&[mask[@"enabled"]boolValue]){NSMutableDictionary *m=[[mask mutableCopy]autorelease];m[@"combine"]=@0;[masks addObject:m];} + if(!face&&!masks.count)return src; NSMutableDictionary *entry=[self device:registry error:error];if(!entry)return nil; - if(face)[self prepareFaceSupport:src];else{[_faceEntries release];_faceEntries=nil;} + NSData *faces=face?[self mosaicFaces:src time:tools[@"renderTime"] error:error]:nil;if(face&&!faces){fail(error,@"当前帧人脸识别失败,请重试或改用跟踪蒙版。");return nil;} DYToolMaskHeader header{};header.section=face?-102:0; iddevice=entry[@"device"];idinput=[src metalTextureForDevice:device]; - idbuffer=[self maskBuffer:face?@{}:@{@"primary":@[mask]} tile:src device:device header:&header]; + NSData *skinEntries=_faceEntries;_faceEntries=faces; + idbuffer=[self maskBuffer:face?@{}:@{@"primary":masks} tile:src device:device header:&header];_faceEntries=skinEntries; MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite; idoutput=[[device newTextureWithDescriptor:desc]autorelease]; idpipeline=[self managedKernel:@"dyLocalMosaic" entry:entry error:error]; diff --git a/大鱼调色/Plugin/DYRenderer.h b/大鱼调色/Plugin/DYRenderer.h index 9c97b20..3afcedb 100644 --- a/大鱼调色/Plugin/DYRenderer.h +++ b/大鱼调色/Plugin/DYRenderer.h @@ -13,6 +13,8 @@ - (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider error:(NSError**)error; - (BOOL)renderSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error; - (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error; +// Latest full-frame face rectangles and render time, copied under a short lock. +- (NSDictionary*)mosaicFaceSnapshot; - (NSData*)preview; /// Latest final-output bins for the inspector's visible curve controls. - (NSData*)outputHistogram; diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm index 8bfa6fe..6287a2e 100644 --- a/大鱼调色/Plugin/DYRenderer.mm +++ b/大鱼调色/Plugin/DYRenderer.mm @@ -118,7 +118,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData CFTimeInterval _lastPreview; BOOL _exporting; NSDictionary *_toolDocument,*_colorContext,*_exportManagedState; - BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext; + BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;NSData *_mosaicRaster,*_mosaicEntries;NSDictionary *_mosaicFaceSnapshot; dispatch_queue_t _scopeQueue; BOOL _scopeEnabled,_scopeWorkerRunning,_outputHistogramObserved,_outputHistogramNotificationPending; NSUInteger _scopeGeneration; @@ -139,7 +139,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData #include "DYFaceRender.inc.h" #include "DYToolRender.inc.h" - (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;} -- (void)dealloc{[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];} +- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];} - (void)trimPreparedLUTsKeeping:(NSString *)path { if(_preparedLUTs.count<=12)return; for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key]; diff --git a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h index 4fd719f..f63746f 100644 --- a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h @@ -61,9 +61,20 @@ run.record(@"native-osc-shape-escape-keeps-author-and-all-shared-bindings",handled&&[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo&&![[plugin toolCanvasMaskAtTime:kCMTimeZero][@"drawShape"]boolValue]); selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();run.record(@"native-osc-shape-click-without-area-does-not-write-or-create-undo",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo); selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];host->_time=CMTimeMake(1,24);[plugin toolCanvasMaskAtTime:host->_time];[osc mouseUpAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:host->_time];drain();run.record(@"native-osc-shape-playhead-change-cancels-before-write",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo&&![[plugin toolCanvasMaskAtTime:host->_time][@"drawShape"]boolValue]);host->_time=kCMTimeZero; - selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];host->_time=CMTimeMake(1,24);drain();run.record(@"native-osc-queued-shape-commit-rechecks-host-playhead",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo);host->_time=kCMTimeZero; + selectShape();[osc mouseDownAtPositionX:180 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();[osc mouseUpAtPositionX:400 positionY:160 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];host->_time=CMTimeMake(1,24);drain();run.record(@"native-osc-queued-shape-commit-rechecks-host-playhead",[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo);host->_time=kCMTimeZero; doc=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);NSMutableDictionary *ellipse=(id)DYSharedMaskWithID(doc,maskID);p=DYMaskAtTime(ellipse,kCMTimeZero);p.kind=DYMaskEllipse;ellipse[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];DYWriteTools(base,doc,kCMTimeZero);selectShape();undo=base->_undoStarts; [osc mouseDownAtPositionX:488 positionY:149.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:208 positionY:275.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();p=DYMaskAtTime(DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,maskID),kCMTimeZero);run.record(@"native-osc-ellipse-draws-reverse-direction-with-positive-shared-extents",p.kind==DYMaskEllipse&&fabs(p.centerX-.55)<1e-5&&fabs(p.centerY-.5)<1e-5&&fabs(p.width-.5)<1e-5&&fabs(p.height-.4)<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + // Reproduce FCP's action clock offset while OSC and redraw use different clocks. + host->_time=CMTimeMake(39,25);selectShape();undo=base->_undoStarts; + [osc mouseDownAtPositionX:152 positionY:307 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain(); + [osc mouseDraggedAtPositionX:432 positionY:181 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; + [osc drawOSCWithWidth:640 height:400 activePart:1 destinationImage:overlay atTime:host->_time]; + run.record(@"native-osc-shape-keeps-draft-across-different-redraw-clock",[[plugin toolCanvasMaskAtTime:host->_time][@"shapeStarted"]boolValue]); + [osc mouseUpAtPositionX:488 positionY:149.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain(); + p=DYMaskAtTime(DYSharedMaskWithID(DYReadTools(base,host->_time).document,maskID),kCMTimeZero); + run.record(@"native-osc-mask-release-saves-with-different-action-clock",fabs(p.centerX-.5)<1e-5&&fabs(p.centerY-.45)<1e-5&&fabs(p.width-.6)<1e-5&&fabs(p.height-.5)<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + NSData *archive=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(base,host->_time) requiringSecureCoding:YES error:nil];DYToolDocument *restored=[NSKeyedUnarchiver unarchivedObjectOfClass:DYToolDocument.class fromData:archive error:nil]; + run.record(@"native-osc-drawn-mask-persists-after-secure-reopen",[restored.document isEqual:DYReadTools(base,host->_time).document]); [osc release];[plugin release];drain(); } diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index c3543d8..d20f0c0 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -7,6 +7,19 @@ - (void)discardToolCanvasDraft { @synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; } +// OSC and custom actions can use different origins. Capture the action clock +// after the first event, then compare that clock only with itself at commit. +- (void)captureToolCanvasHostTime { + _toolCanvasHostEditTime=kCMTimeInvalid; + NSDictionary *original=[_toolCanvasOriginal retain];CMTime eventTime=_toolCanvasEditTime; + dispatch_async(dispatch_get_main_queue(),^{ + ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return; + [a startAction:self];@try{@synchronized(self){ + if(self->_toolCanvasOriginal==original&&CMTimeCompare(self->_toolCanvasEditTime,eventTime)==0) + self->_toolCanvasHostEditTime=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime); + }}@finally{[a endAction:self];} + });[original release]; +} - (void)commitToolCanvasDraftAtTime:(CMTime)eventTime { NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp; @synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5; @@ -20,10 +33,10 @@ [a startAction:self];@try{ CMTime actionTime=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime); os_log(OS_LOG_DEFAULT,"dayu_pen_commit stamp=%{public}d event=%{public}.9f action=%{public}.9f nodes=%{public}lu",stampEdit,CMTimeGetSeconds(time),CMTimeGetSeconds(actionTime),(unsigned long)([draft[@"nodes"]length]/sizeof(DYBezierNode))); - if(!CMTIME_IS_NUMERIC(actionTime)||(!stampEdit&&CMTimeCompare(actionTime,time)!=0)){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;} - // The stamp document is non-animatable. Preserve the canvas time for the - // geometry and tracking key, and access the document at the host action time. - CMTime writeTime=stampEdit?actionTime:time; + if(!CMTIME_IS_NUMERIC(actionTime)||(!stampEdit&&(!CMTIME_IS_NUMERIC(self->_toolCanvasHostEditTime)||CMTimeCompare(actionTime,self->_toolCanvasHostEditTime)!=0))){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;} + // The complete mask document is non-animatable. Key geometry keeps the + // OSC time; document access uses the current host action time. + CMTime writeTime=actionTime; NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,writeTime).document),*current=[self toolMask:maskID node:node document:doc]; if(!current||![current isEqual:original]){os_log(OS_LOG_DEFAULT,"dayu_pen_commit conflict current=%{public}d",current!=nil);[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;} NSMutableDictionary *result=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft); @@ -34,7 +47,7 @@ result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)]; result[@"keys"]=current[@"keys"]; }else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;} - if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];idundo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else if(stampEdit)[self postToolCanvasStatus:@"宿主未保存图章修改,已保留上一次位置。"];} + if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];idundo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];} }@finally{[a endAction:self];} os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft)); if(changed)[self postToolCanvasStatus:sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"]; @@ -44,7 +57,7 @@ - (void)toolCanvasCommand:(NSNotification*)notification { NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;} CMTime time=CMTimeMakeWithEpoch([info[@"timeValue"]longLongValue],[info[@"timeScale"]intValue],[info[@"timeEpoch"]longLongValue]); - ida=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"]; + ida=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}@synchronized(self){if(_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime))time=_toolCanvasEditTime;}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"]; if([command isEqual:@"finish"]||[command isEqual:@"cancel"])[self toolCanvasEvent:NSEventTypeKeyDown point:NSZeroPoint part:1 modifiers:0 key:[command isEqual:@"finish"]?13:27 time:time]; } - (void)updateToolShapeDraftAtPoint:(NSPoint)point { @@ -88,11 +101,11 @@ NSDictionary *stamp=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument]; if([stamp[@"stampSource"]count]!=4)return; [self discardToolCanvasDraft]; - _toolCanvasOriginal=[stamp mutableCopy];_toolCanvasDraft=[stamp mutableCopy];_toolCanvasEditTime=time; + _toolCanvasOriginal=[stamp mutableCopy];_toolCanvasDraft=[stamp mutableCopy];_toolCanvasEditTime=time;[self captureToolCanvasHostTime]; _toolDragStart=point;_toolDragPart=part; return; } - if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];} + if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;[self captureToolCanvasHostTime];_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];} if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;} _toolDragStart=point;_toolDragPart=part;_toolDragParameters=DYMaskAtTime(_toolCanvasDraft,time); if(_toolDrawingShape){[self updateToolShapeDraftAtPoint:point];[self postToolCanvasStatus:@"拖出蒙版区域,松开保存;Esc 取消。"];return;} diff --git a/大鱼调色/Plugin/DYToolHostIvars.inc.h b/大鱼调色/Plugin/DYToolHostIvars.inc.h index 53c0424..0903df5 100644 --- a/大鱼调色/Plugin/DYToolHostIvars.inc.h +++ b/大鱼调色/Plugin/DYToolHostIvars.inc.h @@ -5,7 +5,7 @@ NSMutableDictionary *_toolCanvasDraft,*_toolCanvasOriginal;NSDictionary *_toolCanvasDocument; NSPoint _toolCanvasHoverPoint;BOOL _toolCanvasHasHover; NSPoint _toolDragStart;DYMaskParameters _toolDragParameters;NSInteger _toolDragPart; - CMTime _toolCanvasEditTime;uint64_t _toolCanvasRevision; + CMTime _toolCanvasEditTime,_toolCanvasHostEditTime;uint64_t _toolCanvasRevision; dy::GrayFrame _toolSourceFrame,_trackingReferenceFrame; float _toolSourceAspect; CMTime _toolSourceTime,_trackingReferenceTime,_trackingFrameDuration,_trackingPreviousTime; diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index 7b4734b..b8f3426 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -148,7 +148,7 @@ - (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}} - (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;} - (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time { - @synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};} + @synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};} } - (void)toolTrackRequested:(NSNotification*)notification { NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;} diff --git a/大鱼调色/Plugin/DYToolInspector.inc.h b/大鱼调色/Plugin/DYToolInspector.inc.h index 6da7ee8..9c3ed3c 100644 --- a/大鱼调色/Plugin/DYToolInspector.inc.h +++ b/大鱼调色/Plugin/DYToolInspector.inc.h @@ -55,6 +55,6 @@ // Synchronous notification here can re-enter the host's ViewBridge callback. } -- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child->_measuringFullHeight=_measuringFullHeight;child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child setNeedsLayout:YES];[child layoutSubtreeIfNeeded];child->_measuringFullHeight=NO;CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;} +- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor||_measuringDefaultHeight)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child setNeedsLayout:YES];[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;} - (void)resetRepeatedTool{if(!_embedded)return;idhost=[(DYToolManager*)_manager host];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;idundo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];} diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm index b6fed50..a4241dc 100644 --- a/大鱼调色/Plugin/DYToolState.mm +++ b/大鱼调色/Plugin/DYToolState.mm @@ -89,6 +89,7 @@ NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParam 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":@0}:@{},@"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; + if(mask[@"label"]&&(![mask[@"label"]isKindOfClass:NSString.class]||[mask[@"label"]length]>100))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; id source=mask[@"stampSource"]; if(source){ @@ -116,8 +117,10 @@ static NSData *DYValidatedToolData(NSDictionary *doc){ if(mosaic){ if(![mosaic isKindOfClass:NSDictionary.class]||!finiteNumber(mosaic[@"enabled"])||![@[@0,@1]containsObject:mosaic[@"enabled"]]||![@[@"face",@"mask"]containsObject:mosaic[@"source"]]||!finiteNumber(mosaic[@"size"])||[mosaic[@"size"]doubleValue]<4||[mosaic[@"size"]doubleValue]>128)return nil; if(mosaic[@"maskID"]&&!validID(mosaic[@"maskID"]))return nil; + if(mosaic[@"maskIDs"]){id ids=mosaic[@"maskIDs"];if(![ids isKindOfClass:NSArray.class]||[ids count]>DYSharedMaskLimit)return nil;NSMutableSet *seen=[NSMutableSet set];for(id ID in ids){if(!validID(ID)||[seen containsObject:ID])return nil;[seen addObject:ID];}} } if(doc[@"mosaicRenderMask"]&&!DYValidToolMask(doc[@"mosaicRenderMask"]))return nil; + if(doc[@"mosaicRenderMasks"]){if(![doc[@"mosaicRenderMasks"]isKindOfClass:NSArray.class]||[doc[@"mosaicRenderMasks"]count]>DYSharedMaskLimit)return nil;for(id m in doc[@"mosaicRenderMasks"])if(!DYValidToolMask(m))return nil;} if(starter&&![DYToolTypes() containsObject:starter]&&![starter isEqual:@"cst"])return nil; if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil; id measured=doc[@"levelMeasureOnly"],reference=doc[@"levelReference"]; @@ -370,8 +373,10 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){ return result; }; NSMutableDictionary *out=[[doc mutableCopy]autorelease],*base=[NSMutableDictionary dictionary]; - NSString *mosaicID=doc[@"mosaic"][@"maskID"]; - for(NSDictionary *mask in shared)if(!mask[@"stampSource"]&&[mask[@"id"]isEqual:mosaicID])out[@"mosaicRenderMask"]=resolve(@[mask]).firstObject; + NSArray *mosaicIDs=doc[@"mosaic"][@"maskIDs"]?: (doc[@"mosaic"][@"maskID"]?@[doc[@"mosaic"][@"maskID"]]:@[]); + NSMutableArray *mosaicMasks=[NSMutableArray array];for(NSDictionary *mask in shared)if(!mask[@"stampSource"]&&[mosaicIDs containsObject:mask[@"id"]])[mosaicMasks addObject:mask]; + out[@"mosaicRenderMasks"]=resolve(mosaicMasks);[out removeObjectForKey:@"mosaicRenderMask"]; + if(CMTIME_IS_NUMERIC(t))out[@"renderTime"]=[(NSDictionary*)CMTimeCopyAsDictionary(t,kCFAllocatorDefault)autorelease]; for(NSString *type in doc[@"baseMasks"])base[type]=resolve(doc[@"baseMasks"][type]);out[@"baseMasks"]=base; NSMutableArray *layers=[NSMutableArray array]; for(NSDictionary *node in doc[@"layers"]){NSMutableDictionary *layer=[[node mutableCopy]autorelease];layer[@"masks"]=resolve(node[@"masks"]);[layers addObject:layer];} diff --git a/大鱼调色/Plugin/DYViewerParameterBridge.inc.h b/大鱼调色/Plugin/DYViewerParameterBridge.inc.h index 5d99f18..49fa58b 100644 --- a/大鱼调色/Plugin/DYViewerParameterBridge.inc.h +++ b/大鱼调色/Plugin/DYViewerParameterBridge.inc.h @@ -106,34 +106,68 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { if(![DYToolTypes()containsObject:type])return; dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerToolRequested" object:manager userInfo:@{@"type":type}];}); } +- (void)mosaicMessage:(NSString*)message { + NSAlert *alert=[[[NSAlert alloc]init]autorelease];alert.messageText=@"局部马赛克";alert.informativeText=message;[alert runModal]; +} - (void)applyMosaicMenu:(NSMenuItem*)item { id manager=nil;@synchronized(self){if(!_invalidated)manager=_apiManager;}if(!manager)return; - ida=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self]; + NSDictionary *command=item.representedObject;BOOL imported=NO,changed=NO;NSString *selected=nil,*failure=nil; + ida=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self]; @try{ NSMutableDictionary *doc=DYMutablePlist(DYReadTools(manager,a.currentTime).document); NSMutableDictionary *settings=[NSMutableDictionary dictionaryWithDictionary:doc[@"mosaic"]?:@{@"enabled":@NO,@"source":@"face",@"size":@32}]; - [settings addEntriesFromDictionary:item.representedObject]; - if([settings[@"source"]isEqual:@"mask"]&&!DYSharedMaskWithID(doc,settings[@"maskID"]))return; + if(command[@"importFaces"]){ + NSDictionary *snapshot=command[@"importFaces"]; + CMTime menuTime=CMTimeMakeFromDictionary((CFDictionaryRef)command[@"actionTime"]); + CMTime frameTime=CMTimeMakeFromDictionary((CFDictionaryRef)snapshot[@"time"]); + CMTime current=DYHostDisplayedFrameTime(manager,a.currentTime); + if(!CMTIME_IS_NUMERIC(frameTime)||CMTimeCompare(menuTime,current)!=0||CMTimeCompare(frameTime,current)!=0){failure=@"播放头或识别画面已变化,请暂停画面后重新打开菜单。";return;} + NSArray *boxes=snapshot[@"boxes"];if(!boxes.count){failure=@"本帧未识别到人脸,可用矩形或钢笔手动画出区域。";return;} + if(DYSharedMasks(doc).count+boxes.count>DYSharedMaskLimit){failure=@"共享蒙版数量不足,请删除不需要的蒙版后重试。";return;} + NSMutableArray *IDs=[NSMutableArray array];NSUInteger index=0; + for(NSArray *box in boxes){NSMutableDictionary *mask=(id)DYAddSharedMask(doc,DYMaskRectangle);if(!mask){failure=@"未能创建人脸蒙版,原设置已保留。";return;} + DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);p.centerX=[box[0]floatValue];p.centerY=[box[1]floatValue];p.width=[box[2]floatValue];p.height=[box[3]floatValue];p.feather=0; + mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)]; + mask[@"label"]=[NSString stringWithFormat:@"人脸 %lu · 横向 %.0f%%",(unsigned long)++index,p.centerX*100]; + [IDs addObject:mask[@"id"]]; + } + settings[@"maskIDs"]=IDs;settings[@"source"]=@"mask";settings[@"enabled"]=@YES;[settings removeObjectForKey:@"maskID"];selected=IDs.firstObject;imported=YES; + }else if(command[@"toggleMask"]){ + NSString *ID=command[@"toggleMask"];if(!DYSharedMaskWithID(doc,ID)){failure=@"这个蒙版已被删除,请重新选择。";return;} + NSMutableArray *IDs=[NSMutableArray arrayWithArray:[settings[@"source"]isEqual:@"mask"]?(settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[])):@[]]; + if([IDs containsObject:ID])[IDs removeObject:ID];else{[IDs addObject:ID];selected=ID;} + settings[@"source"]=@"mask";settings[@"maskIDs"]=IDs;settings[@"enabled"]=@(IDs.count>0);[settings removeObjectForKey:@"maskID"]; + }else [settings addEntriesFromDictionary:command]; doc[@"mosaic"]=settings;idundo=[manager apiForProtocol:@protocol(FxUndoAPI)]; - if([undo startUndoGroup:@"局部马赛克"]){DYWriteTools(manager,doc,a.currentTime);[undo endUndoGroup];} - }@finally{[a endAction:self];} - [_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:manager]; + if([undo startUndoGroup:imported?@"创建可选人脸马赛克蒙版":@"局部马赛克"]){@try{changed=DYWriteTools(manager,doc,a.currentTime);}@finally{[undo endUndoGroup];}} + if(!changed){failure=@"宿主未保存本次马赛克设置,请重试。";return;} + if(selected)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:manager userInfo:@{@"node":@"shared",@"mask":selected,@"document":doc}]; + }@finally{[a endAction:self];if(failure)[self mosaicMessage:failure];} + if(changed){[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:manager];} + if(imported)[self requestWorkspacePage:@"masks"]; } - (void)mosaicMenuRequested:(NSNotification*)note {[self requestMosaicMenuFromView:note.userInfo[@"anchor"]];} - (void)requestMosaicMenu {[self requestMosaicMenuFromView:nil];} - (void)requestMosaicMenuFromView:(NSView*)anchor { dispatch_async(dispatch_get_main_queue(),^{ id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(!manager)return; - ida=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];NSDictionary *doc=nil; - @try{doc=[DYReadTools(manager,a.currentTime).document retain];}@finally{[a endAction:self];} + ida=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];NSDictionary *doc=nil;CMTime actionTime=kCMTimeInvalid; + @try{doc=[DYReadTools(manager,a.currentTime).document retain];actionTime=DYHostDisplayedFrameTime(manager,a.currentTime);}@finally{[a endAction:self];} NSMenu *menu=[[[NSMenu alloc]initWithTitle:@"局部马赛克"]autorelease];NSDictionary *settings=doc[@"mosaic"]; auto add=[&](NSString *title,NSDictionary *value,BOOL checked){NSMenuItem *item=[menu addItemWithTitle:title action:@selector(applyMosaicMenu:) keyEquivalent:@""];item.target=self;item.representedObject=value;item.state=checked?NSControlStateValueOn:NSControlStateValueOff;}; - add(@"应用到人脸(逐帧识别)",@{@"source":@"face",@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"face"]); - NSInteger count=0; - for(NSDictionary *mask in DYSharedMasks(doc)){if(mask[@"stampSource"])continue;count++;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);NSString *shape=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]; - add([NSString stringWithFormat:@"应用到蒙版 %ld · %@%@",(long)count,shape,[mask[@"keys"]count]?@" · 已跟踪":@""],@{@"source":@"mask",@"maskID":mask[@"id"],@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"mask"]&&[settings[@"maskID"]isEqual:mask[@"id"]]); + add(@"全部人脸 · 快速逐帧识别",@{@"source":@"face",@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"face"]); + NSDictionary *faces=[self->_renderer mosaicFaceSnapshot]; + CMTime faceTime=faces[@"time"]?CMTimeMakeFromDictionary((CFDictionaryRef)faces[@"time"]):kCMTimeInvalid; + BOOL current=CMTIME_IS_NUMERIC(actionTime)&&CMTIME_IS_NUMERIC(faceTime)&&CMTimeCompare(faceTime,actionTime)==0&&[settings[@"source"]isEqual:@"face"]&&[settings[@"enabled"]boolValue]; + if(current&&[faces[@"boxes"]count])add([NSString stringWithFormat:@"将本帧 %lu 张人脸转为可选跟踪蒙版",(unsigned long)[faces[@"boxes"]count]],@{@"importFaces":faces,@"actionTime":[(NSDictionary*)CMTimeCopyAsDictionary(actionTime,kCFAllocatorDefault)autorelease]},NO); + else {NSMenuItem *hint=[menu addItemWithTitle:current?@"本帧未识别到人脸":@"先开启全部人脸,暂停后再次打开以指定人脸" action:nil keyEquivalent:@""];hint.enabled=NO;} + [menu addItem:NSMenuItem.separatorItem]; + NSMenuItem *hint=[menu addItemWithTitle:@"勾选要遮挡的蒙版(可多选);在控制面板逐个跟踪" action:nil keyEquivalent:@""];hint.enabled=NO; + NSArray *IDs=settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[]);NSInteger count=0; + for(NSDictionary *mask in DYSharedMasks(doc)){if(mask[@"stampSource"])continue;count++;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);NSString *shape=mask[@"label"]?:[NSString stringWithFormat:@"蒙版 %ld · %@",(long)count,@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]]; + add([shape stringByAppendingString:[mask[@"keys"]count]?@" · 已跟踪":@" · 静态"],@{@"toggleMask":mask[@"id"]},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"mask"]&&[IDs containsObject:mask[@"id"]]); } - if(!count){NSMenuItem *hint=[menu addItemWithTitle:@"先用矩形、椭圆或钢笔绘制蒙版" action:nil keyEquivalent:@""];hint.enabled=NO;} + if(!count){NSMenuItem *empty=[menu addItemWithTitle:@"也可用矩形、椭圆或钢笔绘制蒙版" action:nil keyEquivalent:@""];empty.enabled=NO;} [menu addItem:NSMenuItem.separatorItem]; for(NSNumber *size in @[@8,@16,@32,@64,@96,@128])add([NSString stringWithFormat:@"方块大小:%@",size],@{@"size":size},[settings[@"size"]isEqual:size]); [menu addItem:NSMenuItem.separatorItem];add(@"关闭局部马赛克",@{@"enabled":@NO},![settings[@"enabled"]boolValue]); diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index 5d4c7a2..7f5e0de 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -61,9 +61,9 @@ if(DYUnifiedColorState(DYReadAssets(host,_toolTime).colorManagement))ordered=[NSMutableArray arrayWithArray:DYUnifiedRenderOrder(document)]; for(NSString*ID in [ordered reverseObjectEnumerator]){if([ID isEqual:@"output"]){[rows addObject:@{@"node":ID,@"type":@"output",@"title":@"输出转换",@"enabled":@(rootUniforms.cm.outputEnabled>.5),@"kind":@"output"}];continue;}NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue; NSString*title=titles[ID]?:([ID isEqual:@"base:primary"]&&[document[@"starterTool"]isEqual:@"cst"]?@"CST 色彩空间转换":DYToolSection(type)[@"title"]?:type);[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool",@"maskCount":@(DYMasksForTool(document,ID).count)}]; - for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];} + for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=mask[@"label"]?:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];} } - for(NSDictionary*mask in DYSharedMasks(document))if(!DYToolIDsForSharedMask(document,mask[@"id"]).count){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":mask[@"stampSource"]?@"◩ 仿制图章":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];} + for(NSDictionary*mask in DYSharedMasks(document))if(!DYToolIDsForSharedMask(document,mask[@"id"]).count){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":mask[@"stampSource"]?@"◩ 仿制图章":[@"◩ " stringByAppendingString:mask[@"label"]?:[@"未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]]],@"kind":@"mask"}];} }@finally{[action endAction:self];} [_toolDocument release];_toolDocument=document;[_layerRows release];_layerRows=[rows copy];[_layerTable reloadData]; NSString *requested=note.userInfo[@"scrollToTool"];if(requested.length){_hasUserSelection=YES;[_selectedNode release];_selectedNode=[requested copy];[_selectedMask release];_selectedMask=nil;} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 75f5ccf..f4051be 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.17.0 + 1.17.1 CFBundleVersion - 102 + 103 NSHumanReadableCopyright PlugInKit @@ -71,7 +71,7 @@ uuid 1C17B73B-F229-4C09-A434-EAF6DFF5F22A version - 1.17.0 + 1.17.1 className diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 17b3334..f04cbc3 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.17.0 + 1.17.1 CFBundleVersion - 102 + 103 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright