diff --git a/template/sources/RegisteredParameters.json b/template/sources/RegisteredParameters.json index 68f5726..f501878 100644 --- a/template/sources/RegisteredParameters.json +++ b/template/sources/RegisteredParameters.json @@ -3720,8 +3720,8 @@ "大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c", "大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1", "大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9", - "大鱼调色/Plugin/DYToolState.h": "0a83109d2c02626d6b9e7340b74be6e6a74f366f31f9d7622b4a88000d5ad7b9", - "大鱼调色/Plugin/DYToolState.mm": "49ccde836056123cc4912eaf43da11af1713db19add5e833d0287586554acd09", + "大鱼调色/Plugin/DYToolState.h": "bf22a9c1b29afaa6d411fae48ffd7de919947af1c626cc5d491218dd8065b293", + "大鱼调色/Plugin/DYToolState.mm": "ed99f24cceef8bbad66c562f027acd7a22b7d20f4386e04370fde2bb01f43f8c", "大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0", "大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16", "大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2", diff --git a/tools/create_workspace_host_fixture.py b/tools/create_workspace_host_fixture.py new file mode 100644 index 0000000..cccab3a --- /dev/null +++ b/tools/create_workspace_host_fixture.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +"""Create isolated workspace/shared-mask acceptance projects using known fixtures.""" +from pathlib import Path +import base64,json,plistlib,struct,subprocess,uuid +import xml.etree.ElementTree as E + +ROOT=Path(__file__).resolve().parent.parent +OUT=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/workspace-1.12.0' +OUT.mkdir(parents=True,exist_ok=True) +portrait=ROOT/'tools/fixtures/astronaut.png' +motion=OUT.parent/'大鱼调色_蒙版合成运动.mov' +if not motion.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(motion)],check=True) +model=json.loads((ROOT/'template/sources/RegisteredParameters.json').read_text()) +values={p['key']:p['default'] for p in model['parameters']} +values.update(primaryMasterEnabled=0,inputEnabled=0,skinEnabled=0,skinFaceOnly=0,lookEnabled=0,hslEnabled=1,hsl0_0=25) +maskid=str(uuid.uuid5(uuid.NAMESPACE_URL,'dayu/workspace-1.12.0/shared-rectangle')).upper() +parameters=struct.pack('<4I28f',1,1,0,0,.5,.5,.55,.55,0,.1,1,.3,16/9,0,0,1/12,1/24,.002,.02,0,1,0,0,0,1,0,0,0,1,1,0,1) +tools=dict(schema=3,layers=[],baseMasks={'hsl':[{'sharedID':maskid}],'spider':[{'sharedID':maskid}]},sharedMasks=[dict(id=maskid,enabled=True,combine=0,parameters=parameters,nodes=b'',keys=[])]) +preset=dict(format='com.dayu.color.preset',version=7,colorManagement={},values=values,paths={},spider=json.loads((ROOT/'research/cms-correction-20261104/neutral-spider.json').read_text()),tools=base64.b64encode(plistlib.dumps(tools,fmt=plistlib.FMT_BINARY)).decode()) +(OUT/'共享矩形_HSL_蜘蛛盘.json').write_text(json.dumps(preset,ensure_ascii=False,indent=2)+'\n') +doc=E.Element('fcpxml',version='1.12');res=E.SubElement(doc,'resources') +E.SubElement(res,'format',id='timeline',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)') +for ID,path,size,duration in [('face',portrait,(512,512),'0s'),('motion',motion,(960,540),'4s')]: + fmt=ID+'Format';attrs=dict(id=fmt,width=str(size[0]),height=str(size[1])) + if ID=='motion':attrs.update(frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)') + E.SubElement(res,'format',**attrs) + asset=E.SubElement(res,'asset',id=ID,name=path.stem,start='0s',duration=duration,hasVideo='1',videoSources='1',format=fmt) + E.SubElement(asset,'media-rep',kind='original-media',src=path.resolve().as_uri()) +template=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef' +E.SubElement(res,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri()) +event=E.SubElement(E.SubElement(doc,'library'),'event',name='大鱼调色_1.12.0_74_统一工作区与共享蒙版') +for name,ID,duration in [('1.12.0_控制面板与共享蒙版','face','6s'),('1.12.0_OpenCV真实帧跟踪','motion','4s')]: + project=E.SubElement(event,'project',name=name);seq=E.SubElement(project,'sequence',format='timeline',duration=duration,tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k');spine=E.SubElement(seq,'spine') + clip=E.SubElement(spine,'video' if ID=='face' else 'asset-clip',ref=ID,name=name,offset='0s',start='0s',duration=duration) + E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1') +E.indent(doc);output=OUT/'大鱼调色_1.12.0_74_验收.fcpxml' +output.write_text('\n\n'+E.tostring(doc,encoding='unicode')+'\n') +print(output) diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index 60bd72a..a67df12 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -10,6 +10,8 @@ #include static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[DYThemeButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;} +static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;} +static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"base"])return u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;if([type isEqual:@"primary"])return u.primarySectionEnabled>.5;for(NSDictionary*d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(type)[@"enabled"]]&&[d[@"offset"]integerValue]>=0)return *(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;return YES;} @interface DYWorkspaceList:NSView @end @implementation DYWorkspaceList - (BOOL)isFlipped{return YES;} @@ -90,7 +92,7 @@ static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButto NSSplitView *_split;NSTableView *_layerTable;DYInspector *_toolEditor;NSView *_maskEditor; NSTextField *_selectionTitle;NSButton *_addMask,*_deleteLayer; NSArray *_layerRows;NSDictionary *_toolDocument;NSString *_selectedNode,*_selectedMask,*_maskNode,*_editorNode; - id _lutTarget;CMTime _toolTime;BOOL _refreshingStack,_sizingSplit;CGFloat _splitFraction; + id _lutTarget;CMTime _toolTime;BOOL _refreshingStack,_sizingSplit,_hasUserSelection;CGFloat _splitFraction; } @end @implementation DYColorWorkspace @@ -151,6 +153,7 @@ static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButto [_root removeFromSuperview];_root.frame=parent.bounds;_root.autoresizingMask=NSViewWidthSizable|NSViewHeightSizable;[parent addSubview:_root];_visible=YES;_root.hidden=NO;[self refreshToolWorkspace:nil];[self pageChanged:nil];[self parentChanged:nil]; DYWorkspaceLifetime *token=_lifetime;NSUInteger session=_session;dispatch_async(dispatch_get_main_queue(),^{DYColorWorkspace *owner=token.owner;if(!owner||owner->_closed||owner->_session!=session)return;NSWindow *window=owner->_root.window; if(window!=owner->_presentationWindow){if(owner->_presentationWindow)[NSNotificationCenter.defaultCenter removeObserver:owner name:NSWindowWillCloseNotification object:owner->_presentationWindow];[owner->_presentationWindow release];owner->_presentationWindow=[window retain];if(window)[NSNotificationCenter.defaultCenter addObserver:owner selector:@selector(remoteClosed:) name:NSWindowWillCloseNotification object:window];} + if(window.visible){NSRect screen=(window.screen?:NSScreen.mainScreen).visibleFrame;window.contentMinSize=NSMakeSize(720,300);if(![window setFrameUsingName:@"DayuColorWorkspace"]){CGFloat width=MIN(1280,screen.size.width*.76),height=MIN(380,screen.size.height*.32);NSRect content=NSMakeRect(NSMaxX(screen)-width-12,NSMinY(screen)+24,width,MAX(300,height));[window setFrame:[window frameRectForContentRect:content]display:YES];}[window setFrameAutosaveName:@"DayuColorWorkspace"];} [owner parentChanged:nil]; }); } @@ -171,6 +174,7 @@ static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButto - (void)pageChanged:(id)sender{ if(_pages.selectedSegment==2)[self bindLUTTarget]; NSInteger page=_pages.selectedSegment;_scopePane.hidden=page!=3;_lutPane.hidden=page!=2;_lutExplanation.hidden=page!=2;_toolEditor.hidden=page!=0;_maskPane.hidden=page!=1; + _selectionTitle.hidden=page>1; [_renderer setScopeEnabled:_visible&&page==3];if(page==2)[self ensureBrowser];if(page==3)[self scopeChanged:nil];[self layoutWorkspace]; } - (void)toggleHostScopes:(id)sender{ diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 16f39e7..819b0f3 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -42,6 +42,8 @@ - (void)removeTool:(NSButton *)sender; - (void)addModule:(NSMenuItem *)sender; - (NSDictionary *)presetSnapshot; +- (void)graphicGesture:(BOOL)begin title:(NSString *)title; +- (void)writeGraphicValues:(NSDictionary *)values; @end @protocol DYSpiderProbe @property(nonatomic,copy) NSData *meshData; diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 880a7f6..2f0bbb9 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -349,10 +349,11 @@ static NSArray *DYPresentationSections(void) { - (void)mouseDown:(NSEvent *)event { NSPoint p=[self convertPoint:event.locationInWindow fromView:nil];if(!NSPointInRect(p,[self plotRect]))return; [self.window makeFirstResponder:self];NSDictionary *point=[self pointNear:p]; - if(point&&(event.clickCount==2||(event.modifierFlags&NSEventModifierFlagOption))) {[self removePoint:point];return;} + if(point&&(event.clickCount==2||(event.modifierFlags&NSEventModifierFlagOption))) {[self.delegate graphicGesture:YES title:@"删除曲线点"];[self removePoint:point];[self.delegate graphicGesture:NO title:nil];return;} + [self.delegate graphicGesture:YES title:@"调整曲线"]; if(!point) { NSDictionary *freeSlot=nil;for(NSDictionary *slot in [self slots]) {NSNumber *v=_values[slot[@"xKey"]];if(!v||v.doubleValue<0){freeSlot=slot;break;}} - if(!freeSlot){NSBeep();return;} + if(!freeSlot){[self.delegate graphicGesture:NO title:nil];NSBeep();return;} [_dragXKey release];_dragXKey=[freeSlot[@"xKey"] copy];[_dragYKey release];_dragYKey=[freeSlot[@"yKey"] copy]; [self updateDragAt:p];return; } @@ -364,8 +365,8 @@ static NSArray *DYPresentationSections(void) { x=fmax(.001,fmin(.999,x));[self sendValues:@{_dragXKey:@(x),_dragYKey:@((y-x)*100)}]; } - (void)mouseDragged:(NSEvent *)event { [self updateDragAt:[self convertPoint:event.locationInWindow fromView:nil]]; } -- (void)mouseUp:(NSEvent *)event { if(_dragXKey)[self updateDragAt:[self convertPoint:event.locationInWindow fromView:nil]];[_dragXKey release];_dragXKey=nil;[_dragYKey release];_dragYKey=nil; } -- (void)rightMouseDown:(NSEvent *)event { [self removePoint:[self pointNear:[self convertPoint:event.locationInWindow fromView:nil]]]; } +- (void)mouseUp:(NSEvent *)event { if(_dragXKey)[self updateDragAt:[self convertPoint:event.locationInWindow fromView:nil]];[_dragXKey release];_dragXKey=nil;[_dragYKey release];_dragYKey=nil;[self.delegate graphicGesture:NO title:nil]; } +- (void)rightMouseDown:(NSEvent *)event {NSDictionary *point=[self pointNear:[self convertPoint:event.locationInWindow fromView:nil]];if(point){[self.delegate graphicGesture:YES title:@"删除曲线点"];[self removePoint:point];[self.delegate graphicGesture:NO title:nil];}} - (void)keyDown:(NSEvent *)event { if(event.keyCode==51&&_dragXKey)[self sendValues:@{_dragXKey:@(-1),_dragYKey:@0}];else[super keyDown:event]; } @end @@ -472,12 +473,12 @@ NSView *DYCreateWorkspaceMaskEditor(id DYRenderer *_renderer; DYLUTLibrary *_library; DYLUTBrowser *_browser; - DYColorWorkspace *_workspace;NSButton *_workspaceButton; + DYColorWorkspace *_workspace;NSButton *_workspaceButton;NSString *_workspaceSelectedNode; NSArray *_themeButtons; NSMutableDictionary *_tabs; NSInteger _visibleLooks; NSButton *_colorSettings;BOOL _colorSettingsExpanded; - BOOL _refreshing,_graphicUndoOpen; + BOOL _refreshing,_graphicUndoOpen,_graphicCancelled;CMTime _graphicTime;NSMutableDictionary *_graphicExpected; BOOL _embedded,_workspaceEditor;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight; DYSpiderPanel *_spiderPanel; NSMutableDictionary *_assetLoads,*_assetLoadIDs; @@ -548,6 +549,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil]; if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(revealViewerTool:) name:@"DYViewerToolRequested" object:_manager]; if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(openWorkspace:) name:@"DYColorWorkspaceRequested" object:_manager]; + if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(rememberWorkspaceSelection:) name:@"DYWorkspaceToolSelection" object:_manager]; if(_renderer)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer]; [self themeChanged:nil]; [self setAccessibilityLabel:@"大鱼调色检查器"]; @@ -556,14 +558,14 @@ NSView *DYCreateWorkspaceMaskEditor(id DYBetaSpanEnd(beta,nil);return self; } - (void)dealloc { - [self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;[_workspace close];[_workspace release];[_workspaceButton release]; + [self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;[_workspace close];[_workspace release];[_workspaceButton release];[_workspaceSelectedNode release]; for(id graphic in _graphics)if([graphic isKindOfClass:DYPrimaryBalanceWheel.class])[(DYPrimaryBalanceWheel*)graphic setDelegate:nil]; for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release]; [[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self]; if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release]; [_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_colorSettings release];[_addModule release]; [_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release]; - [_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release]; + [_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];[_graphicExpected release]; [super dealloc]; } - (BOOL)isFlipped { return YES; } @@ -597,9 +599,11 @@ NSView *DYCreateWorkspaceMaskEditor(id if(_embedded||_workspaceEditor||!self.window||!_renderer)return; [_browser close]; if(!_workspace)_workspace=[[DYColorWorkspace alloc]initWithManager:_manager renderer:_renderer library:_library title:@"大鱼调色 · 当前片段"]; + if(_workspaceSelectedNode.length)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:_manager userInfo:@{@"node":_workspaceSelectedNode,@"source":@"inspector"}]; [_workspace showRelativeToView:self]; if([sender isKindOfClass:NSNotification.class])[_workspace showPage:[sender userInfo][@"page"]?:@"tools" maskKind:[sender userInfo][@"maskKind"]]; } +- (void)rememberWorkspaceSelection:(NSNotification*)note {NSString*node=note.userInfo[@"node"];if(!node.length)return;NSString*saved=[node copy];[_workspaceSelectedNode release];_workspaceSelectedNode=saved;} - (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];} - (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; } - (void)themeChanged:(NSNotification *)notification { @@ -966,7 +970,9 @@ NSView *DYCreateWorkspaceMaskEditor(id [action startAction:self]; @try { CMTime t=action.currentTime;id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]; + if(_graphicUndoOpen){if(_graphicCancelled||CMTimeCompare(t,_graphicTime)!=0){_graphicCancelled=YES;return;}idget=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];for(NSString*key in values){NSDictionary*d=byKey[key];double actual=NAN;if(d&&_graphicExpected[key]&&(![get getFloatValue:&actual fromParameter:[d[@"pid"]unsignedIntValue]atTime:t]||!std::isfinite(actual)||fabs(actual-[_graphicExpected[key]doubleValue])>1e-6*MAX(1.,fabs(actual)))){_graphicCancelled=YES;return;}}} BOOL primaryEdit=NO;for(NSString *key in values) {NSDictionary *d=byKey[key];primaryEdit|=[key hasPrefix:@"cm"];double v=[values[key] doubleValue];if(!d||!std::isfinite(v))continue;v=fmax([d[@"min"]doubleValue],fmin([d[@"max"]doubleValue],v));[set setFloatValue:v toParameter:[d[@"pid"]unsignedIntValue] atTime:t];} + if(_graphicUndoOpen)for(NSString*key in values)_graphicExpected[key]=values[key]; if(primaryEdit){[set setFloatValue:1 toParameter:2236 atTime:t];[self clearPrimaryBypasses:set time:t];} } @finally {[action endAction:self];} [self postChanged]; @@ -974,7 +980,7 @@ NSView *DYCreateWorkspaceMaskEditor(id - (void)clearPrimaryBypasses:(id)set time:(CMTime)t{for(NSDictionary *d in DYDescriptors())if([d[@"key"]hasPrefix:@"cmbypass"])[set setFloatValue:0 toParameter:[d[@"pid"]unsignedIntValue] atTime:t];} - (void)graphicGesture:(BOOL)begin title:(NSString *)title{ if(begin==_graphicUndoOpen)return;ida=[self actionAPI];if(!a)return;[a startAction:self]; - @try{idundo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if(begin)_graphicUndoOpen=[undo startUndoGroup:title?:@"调整颜色"];else{[undo endUndoGroup];_graphicUndoOpen=NO;}}@finally{[a endAction:self];} + @try{idundo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if(begin){_graphicTime=a.currentTime;_graphicCancelled=NO;[_graphicExpected release];_graphicExpected=[NSMutableDictionary new];idget=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];for(NSDictionary*r in _controls.allValues){NSDictionary*d=r[@"descriptor"];double value=NAN;if([get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:_graphicTime]&&std::isfinite(value))_graphicExpected[d[@"key"]]=@(value);}_graphicUndoOpen=[undo startUndoGroup:title?:@"调整颜色"];}else{[undo endUndoGroup];_graphicUndoOpen=NO;_graphicCancelled=NO;[_graphicExpected removeAllObjects];}}@finally{[a endAction:self];} } - (void)writeSpiderMesh:(NSData *)mesh linked:(BOOL)linked{ if(mesh.length&&!DYSpiderMeshIsValid(mesh))return;ida=[self actionAPI];if(!a)return;[a startAction:self]; @@ -999,6 +1005,7 @@ NSView *DYCreateWorkspaceMaskEditor(id - (void)groupEnabled:(NSButton *)sender { [self setSectionEnabled:sender.state==NSControlStateValueOn atIndex:sender.tag]; } - (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"}];} id action=[self actionAPI];if(!action)return;[action startAction:self]; @try { id get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]; diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 11639ee..b350bd0 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -272,7 +272,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b NSAccessibilityPostNotification(parent,NSAccessibilityLayoutChangedNotification); } - (void)embedInView:(NSView *)parent close:(void (^)(void))closeAction{ - _embedded=YES;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回示波器"; + _embedded=YES;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回调整"; } - (void)fitRemoteParent{ NSView *parent=_root.superview;if(_closed||!_remoteMode||!parent)return; @@ -367,6 +367,15 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b _sizeLabel.frame=NSMakeRect(211,h-39,74,18);_sizeSlider.frame=NSMakeRect(288,h-41,MIN(150,MAX(80,w-550)),20); _done.frame=NSMakeRect(w-98,h-44,78,27); CGFloat statusX=NSMaxX(_sizeSlider.frame)+14;_statusLabel.frame=NSMakeRect(statusX,h-39,MAX(0,w-statusX-112),18); + if(_embedded){ + _search.frame=NSMakeRect(12,36,MAX(125,w-310),24); + _importFiles.frame=NSMakeRect(w-284,34,88,28);_importFolder.frame=NSMakeRect(w-192,34,100,28);_refresh.frame=NSMakeRect(w-88,34,76,28); + _splitView.frame=NSMakeRect(8,68,MAX(1,w-16),MAX(1,h-108));[_splitView adjustSubviews]; + _reveal.hidden=w<620;_titleLabel.frame=NSMakeRect(12,8,152,20);_countLabel.frame=NSMakeRect(166,10,100,18); + _none.frame=NSMakeRect(10,h-34,70,27);_layoutMenu.frame=NSMakeRect(86,h-34,80,27);_done.frame=NSMakeRect(w-88,h-34,78,27); + BOOL small=w<650;_sizeLabel.hidden=small;_sizeSlider.hidden=small;_statusLabel.hidden=small; + if(!small){_sizeLabel.frame=NSMakeRect(174,h-29,68,18);_sizeSlider.frame=NSMakeRect(246,h-31,100,20);_statusLabel.frame=NSMakeRect(354,h-29,MAX(0,w-454),18);} + } CGFloat fw=MAX(100,_folderScroll.contentSize.width); _folderDocument.frame=NSMakeRect(0,0,fw,MAX(_folderPaths.count*35+4,_folderScroll.contentSize.height)); [self updateVisibleFolders]; diff --git a/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h b/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h index c28beaf..48f7605 100644 --- a/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h @@ -36,3 +36,30 @@ } run.record(@"workspace-six-mask-editors-fit-377-600-860-1200-point-widths",compactFits&&compactRows); } + +// Exercise the actual IOSurface/Metal path against independently owned masks. +// This reference never uses the shared-reference expander to construct masks. +{ + [[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0 withBytes:input.data() bytesPerRow:width*8]; + DYUniforms active=defaults;active.skinProtection.x=0;active.hslSectionEnabled=1;active.spiderSectionEnabled=1;active.spiderMix=1; + active.hslHueA=active.hslHueB=(DYFloat4){24,24,24,24};active.hslSatA=active.hslSatB=(DYFloat4){25,25,25,25}; + auto mesh=dy::neutralMesh(6,6);std::bitsetselected;for(int i=0;i10&&difference(first,spiderFrame).different>10); + geometry.centerX=.72;sharedMask[@"parameters"]=[NSData dataWithBytes:&geometry length:sizeof(geometry)];Pixels edited=renderAt(sharedDocument,kCMTimeZero,active,@"gpu-shared-edited-rectangle-render"),editedReference=renderAt(independentDocument(),kCMTimeZero,active,@"gpu-independent-edited-rectangle-reference");Difference editedError=difference(edited,editedReference),editedChange=difference(first,edited); + run.record(@"gpu-editing-unique-shared-geometry-updates-both-operations",editedError.nonfinite==0&&editedError.maximum<.0001&&editedChange.different>20&&alphaPreserved(edited),@{@"maximumReferenceError":@(editedError.maximum),@"changedComponents":@(editedChange.different),@"uniqueAuthorObjects":@(DYSharedMasks(sharedDocument).count)}); + DYMaskParameters tracked=geometry;tracked.centerX=.28;BOOL merged=DYMergeTracking(sharedMask,@[DYMaskKey(kCMTimeZero,geometry,YES,1),DYMaskKey(CMTimeMake(2,24),tracked,NO,.93)]);CMTime middle=CMTimeMake(1,24);Pixels animated=renderAt(sharedDocument,middle,active,@"gpu-shared-tracking-middle-render"),animatedReference=renderAt(independentDocument(),middle,active,@"gpu-independent-tracking-middle-reference");Difference trackingError=difference(animated,animatedReference),trackingChange=difference(edited,animated); + run.record(@"gpu-one-shared-trajectory-drives-hsl-and-spider-per-frame",merged&&trackingError.nonfinite==0&&trackingError.maximum<.0001&&trackingChange.different>20&&alphaPreserved(animated)&&DYSharedMasks(sharedDocument).count==1&&[DYMasksForTool(sharedDocument,@"base:hsl").firstObject[@"keys"]count]==2&&DYMasksForTool(sharedDocument,@"base:hsl").firstObject==DYMasksForTool(sharedDocument,@"base:spider").firstObject,@{@"maximumReferenceError":@(trackingError.maximum),@"changedComponents":@(trackingChange.different),@"evaluatedCenterX":@(DYMaskAtTime(sharedMask,middle).centerX)}); + // Use the real preset serializer, then the same JSON/base64-plist path that + // loadPreset validates, with a separate manager so other fixtures stay intact. + DYDiagnosticManager *presetHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(presetHost,&error);DYWriteTools(presetHost,sharedDocument,kCMTimeZero);DYAssetState *presetAssets=[[[DYAssetState alloc]init]autorelease];presetAssets.spiderMesh=meshData;presetAssets.spiderLinked=YES;DYWriteAssets(presetHost,presetAssets,kCMTimeZero);DYInspector *presetInspector=[[[DYInspector alloc]initWithAPIManager:presetHost renderer:renderer]autorelease];NSDictionary *preset=[presetInspector performSelector:@selector(presetSnapshot)];NSData *json=[NSJSONSerialization dataWithJSONObject:preset options:0 error:&error];NSDictionary *loaded=json?[NSJSONSerialization JSONObjectWithData:json options:0 error:&error]:nil;NSData *toolBytes=[loaded[@"tools"]isKindOfClass:NSString.class]?[[[NSData alloc]initWithBase64EncodedString:loaded[@"tools"] options:0]autorelease]:nil;NSDictionary *restored=toolBytes?[NSPropertyListSerialization propertyListWithData:toolBytes options:NSPropertyListImmutable format:NULL error:&error]:nil; + run.record(@"preset-v7-json-roundtrip-preserves-unique-shared-object-and-trajectory",[loaded[@"version"]isEqual:@7]&&[loaded[@"format"]isEqual:@"com.dayu.color.preset"]&&DYValidToolDocument(restored)&&[restored isEqual:sharedDocument]&&DYSharedMasks(restored).count==1&&DYToolIDsForSharedMask(restored,sharedID).count==2&&[DYSpiderFromJSON(loaded[@"spider"])isEqual:meshData]); +} diff --git a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h index 337a304..6288607 100644 --- a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h @@ -26,9 +26,36 @@ [osc hitTestOSCAtMousePositionX:450 mousePositionY:200 activePart:&part atTime:kCMTimeZero];BOOL insideViewer=part>=20000;[osc mouseDraggedAtPositionX:450 positionY:200 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:450 positionY:200 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain(); DYMaskParameters p=DYMaskAtTime(DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0],kCMTimeZero); run.record(@"native-osc-mask-gesture-keeps-capture-when-crossing-the-open-viewer-panel",insideViewer&&fabs(p.centerX-(.5+190./560))<1e-5&&fabs(p.centerY-(.5+12.5/315))<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); - BOOL toolbarBounded=YES;for(NSRect view:{NSMakeRect(400,310,480,100),NSMakeRect(0,0,120,80),NSMakeRect(-100,-50,400,300)}){ - [(id)osc setValue:[NSValue valueWithRect:view]forKey:@"imageRect"];[(id)osc setValue:@2 forKey:@"uiScale"];NSRect visible=NSIntersectionRect(view,NSMakeRect(0,0,640,400)); - for(NSInteger i=0;i<9;i++)toolbarBounded&=NSContainsRect(visible,[(id)osc toolbarRectForItem:i]);} - run.record(@"native-osc-mask-toolbar-stays-inside-small-letterboxed-image",toolbarBounded); + BOOL oldToolbarRemoved=YES;for(NSInteger i=0;i<9;i++)oldToolbarRemoved&=NSIsEmptyRect([(id)osc toolbarRectForItem:i]); + run.record(@"native-osc-removes-all-nine-background-mask-toolbar-buttons",oldToolbarRemoved); + [(id)osc setValue:@{@"drawing":@YES}forKey:@"mask"];BOOL penActionsBounded=YES; + for(NSRect view:{NSMakeRect(400,310,480,100),NSMakeRect(0,0,120,80),NSMakeRect(-100,-50,400,300)}){ + [(id)osc setValue:[NSValue valueWithRect:view]forKey:@"imageRect"];[(id)osc setValue:@2 forKey:@"uiScale"];NSRect visible=NSIntersectionRect(view,NSMakeRect(0,0,640,400)); + for(NSInteger i=9;i<=10;i++)penActionsBounded&=NSContainsRect(visible,[(id)osc toolbarRectForItem:i]);} + run.record(@"native-osc-keeps-only-two-pen-actions-bounded-at-bottom",penActionsBounded); + [osc release];[plugin release];drain(); +} +{ + // Rectangle and ellipse creation use a frozen author object and a live local + // draft. The one saved geometry is shared by every assigned module. + DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,&error);DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero; + NSMutableDictionary *doc=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);NSDictionary *mask=DYAddSharedMask(doc,DYMaskRectangle);NSString *maskID=[[mask[@"id"]copy]autorelease];DYSetSharedMaskAssigned(doc,maskID,@"base:hsl",YES);DYSetSharedMaskAssigned(doc,maskID,@"base:spider",YES);DYWriteTools(base,doc,kCMTimeZero); + idplugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];[plugin scheduleToolCanvasRegistration];NSData *state=nil;[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error]; + auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.07;while(NSProcessInfo.processInfo.systemUptimeosc=(id)[[NSClassFromString(@"DYToolOSC")alloc]initWithAPIManager:host];DYDiagnosticTile *overlay=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:640 height:400]autorelease];[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];NSInteger part=0;BOOL update=NO,handled=NO; + [osc hitTestOSCAtMousePositionX:152 mousePositionY:307 activePart:&part atTime:kCMTimeZero];NSDictionary *snapshot=[plugin toolCanvasMaskAtTime:kCMTimeZero];run.record(@"native-osc-new-shape-can-start-anywhere-and-hides-default-box",part==1&&[snapshot[@"drawShape"]boolValue]&&![snapshot[@"shapeStarted"]boolValue]&&[[(id)osc valueForKey:@"handles"]count]==0); + NSDictionary *before=[[DYReadTools(base,kCMTimeZero).document copy]autorelease];int undo=base->_undoStarts; + [osc mouseDownAtPositionX:152 positionY:307 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:432 positionY:181 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];snapshot=[plugin toolCanvasMaskAtTime:kCMTimeZero];DYMaskParameters p;[snapshot[@"parameters"]getBytes:&p length:sizeof(p)]; + run.record(@"native-osc-shape-drag-updates-local-bbox-without-author-or-undo-write",[snapshot[@"shapeStarted"]boolValue]&&fabs(p.centerX-.45)<1e-5&&fabs(p.centerY-.4)<1e-5&&fabs(p.width-.5)<1e-5&&fabs(p.height-.4)<1e-5&&[before isEqual:DYReadTools(base,kCMTimeZero).document]&&base->_undoStarts==undo); + [osc mouseUpAtPositionX:488 positionY:149.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();NSDictionary *saved=DYReadTools(base,kCMTimeZero).document;NSDictionary *hsl=DYMasksForTool(saved,@"base:hsl").firstObject,*spider=DYMasksForTool(saved,@"base:spider").firstObject;p=DYMaskAtTime(hsl,kCMTimeZero); + run.record(@"native-osc-shape-release-commits-final-bbox-once-to-all-shared-modules",hsl==spider&&fabs(p.centerX-.5)<1e-5&&fabs(p.centerY-.45)<1e-5&&fabs(p.width-.6)<1e-5&&fabs(p.height-.5)<1e-5&&p.kind==DYMaskRectangle&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1&&![[plugin toolCanvasMaskAtTime:kCMTimeZero][@"drawShape"]boolValue]); + before=[[saved copy]autorelease];undo=base->_undoStarts;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];[osc keyDownAtPositionX:400 positionY:160 keyPressed:27 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];drain(); + 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; + 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); [osc release];[plugin release];drain(); } diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index e1c3170..edaca4c 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -2,10 +2,10 @@ // deferred until the gesture has finished and the callback has returned. - (void)postToolCanvasStatus:(NSString*)message { NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;} - dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release]; + dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release]; } - (void)discardToolCanvasDraft { - @synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; + @synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; } - (void)commitToolCanvasDraftAtTime:(CMTime)eventTime { NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision; @@ -14,6 +14,7 @@ @synchronized(self){if(self->_trackingActive.load()||revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;} ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO; [a startAction:self];@try{ + if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(a.currentTime,time)!=0){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;} NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document),*current=[self toolMask:maskID node:node document:doc]; if(!current||![current isEqual:original]){[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;} NSMutableDictionary *result=DYMutablePlist(draft); @@ -30,6 +31,11 @@ ida=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=a.currentTime;}@finally{[a endAction:self];}}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 { + if(!_toolDrawingShape||!_toolCanvasDraft)return;DYMaskParameters p=_toolDragParameters; + p.centerX=(_toolDragStart.x+point.x)*.5;p.centerY=(_toolDragStart.y+point.y)*.5;p.width=MAX(.001f,float(fabs(point.x-_toolDragStart.x)));p.height=MAX(.001f,float(fabs(point.y-_toolDragStart.y)));p.angle=0; + if(dyValidMaskParameters(p))_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)]; +} - (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time { if(!CMTIME_IS_NUMERIC(time)||!std::isfinite(point.x)||!std::isfinite(point.y))return; @synchronized(self){if(_trackingActive.load()||!_selectedToolNode||!_selectedToolMask)return;if(_toolCanvasCommitPending){NSString *node=[_selectedToolNode copy],*maskID=[_selectedToolMask copy];dispatch_async(dispatch_get_main_queue(),^{@synchronized(self){if(![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}[self toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];});[node release];[maskID release];return;} @@ -58,17 +64,19 @@ if(count<=3){[self postToolCanvasStatus:@"闭合路径至少保留三个点;可使用重画钢笔重新绘制。"];return;} [self toolCanvasEvent:NSEventTypeLeftMouseDown point:point part:_toolDragPart modifiers:modifiers key:0 time:time];NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];[nodes replaceBytesInRange:NSMakeRange(index*sizeof(DYBezierNode),sizeof(DYBezierNode)) withBytes:NULL length:0];_toolCanvasDraft[@"nodes"]=nodes;[self commitToolCanvasDraftAtTime:time];return; } - if(type==NSEventTypeMouseMoved){if(_toolDrawingPen){if(_toolCanvasDraft&&CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;}_toolCanvasHoverPoint=point;_toolCanvasHasHover=[_toolCanvasDraft[@"nodes"]length]>0;}return;} + if(type==NSEventTypeMouseMoved){if(_toolDrawingShape&&_toolCanvasDraft&&CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;}if(_toolDrawingPen){if(_toolCanvasDraft&&CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;}_toolCanvasHoverPoint=point;_toolCanvasHasHover=[_toolCanvasDraft[@"nodes"]length]>0;}return;} if(type==NSEventTypeLeftMouseDown){ _toolCanvasHasHover=NO; if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];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=_toolSourceFrame.valid()?float(_toolSourceFrame.width)/_toolSourceFrame.height: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;} if(_toolDrawingPen){DYMaskParameters p=_toolDragParameters;float a=p.imageAspect,dx=(point.x-p.centerX)*a,dy=point.y-p.centerY,c=cos(p.angle),s=sin(p.angle),x=(dx*c+dy*s)/(p.width*a),y=(-dx*s+dy*c)/p.height;DYBezierNode n={x,y,x,y,x,y};NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];if(nodes.length>=32*sizeof(n)){[self postToolCanvasStatus:@"已达到32个钢笔点,请完成绘制。"];return;}[nodes appendBytes:&n length:sizeof(n)];_toolCanvasDraft[@"nodes"]=nodes;[self postToolCanvasStatus:[NSString stringWithFormat:@"钢笔已放置%lu个点 · 拖出曲柄;点首节点或完成绘制闭合。",(unsigned long)(nodes.length/sizeof(n))]];}return; } if(!_toolCanvasDraft)return; if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;} + if(_toolDrawingShape&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp)){[self updateToolShapeDraftAtPoint:point];if(type==NSEventTypeLeftMouseUp){DYMaskParameters p=DYMaskAtTime(_toolCanvasDraft,time);if(p.width<=.001f||p.height<=.001f){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"未拖出有效区域,原蒙版已保留。"];return;}[self commitToolCanvasDraftAtTime:time];}return;} if(type==NSEventTypeLeftMouseDragged){_toolCanvasHasHover=NO;DYMaskParameters p=_toolDragParameters;float dx=point.x-_toolDragStart.x,dy=point.y-_toolDragStart.y; if(_toolDrawingPen||_toolDragPart>=1000){NSMutableData *data=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];NSUInteger count=data.length/sizeof(DYBezierNode);if(count){auto *nodes=(DYBezierNode*)data.mutableBytes;NSUInteger index=_toolDrawingPen?count-1:(_toolDragPart-1000)/3,handle=_toolDrawingPen?2:(_toolDragPart-1000)%3;float a=p.imageAspect,c=cos(p.angle),s=sin(p.angle),x=((point.x-p.centerX)*a*c+(point.y-p.centerY)*s)/(p.width*a),y=(-(point.x-p.centerX)*a*s+(point.y-p.centerY)*c)/p.height;if(indexa=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{ idanalysis=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[analysis analysisStateForEffect];if(!analysis||state==kFxAnalysisState_AnalysisRequested||state==kFxAnalysisState_AnalysisStarted){[self toolStatus:@"宿主未就绪,请等待当前分析结束"];return;} CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:notification.userInfo[@"node"] document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;} diff --git a/大鱼调色/Plugin/DYToolInspector.inc.h b/大鱼调色/Plugin/DYToolInspector.inc.h index c33f632..9ccf973 100644 --- a/大鱼调色/Plugin/DYToolInspector.inc.h +++ b/大鱼调色/Plugin/DYToolInspector.inc.h @@ -9,7 +9,7 @@ for(NSString *ID in [[_stackViews.allKeys copy]autorelease])if(![order containsObject:ID]){[_stackViews[ID]removeFromSuperview];[_stackViews removeObjectForKey:ID];} [_stackOrder release];_stackOrder=[order copy];[_stackRoots release];_stackRoots=[roots copy];[document release];[self setNeedsLayout:YES]; } -- (void)toolMask:(NSButton*)sender{if(sender.tag<0||sender.tag>=_cards.count)return;[(DYToolMaskPanel*)_cards[sender.tag][@"maskPanel"]addMenu:sender];} +- (void)toolMask:(NSButton*)sender{if(sender.tag<0||sender.tag>=_cards.count)return;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"}];[(DYToolMaskPanel*)_cards[sender.tag][@"maskPanel"]addMenu:sender];} - (void)repeatTool:(NSButton*)sender{ if(sender.tag<0||sender.tag>=_cards.count)return;idhost=_embedded?[(DYToolManager*)_manager host]:_manager;ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self]; NSString *addedID=nil;@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if([doc[@"layers"]count]>=DYToolLimit){[self showError:@"最多可添加 32 个独立工具层。"];return;}NSString *type=_cards[sender.tag][@"section"][@"key"],*anchor=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:type];NSMutableDictionary *node=(id)DYInsertTool(doc,type,anchor);if(!node)return;if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}addedID=[node[@"id"]copy];idundo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"再加一层初始化工具"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":addedID?:@""}];[addedID release]; diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index b9e3cf2..a70de95 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -4,9 +4,9 @@ @end @implementation DYToolOSC { id _device;id _queue;CIContext *_context; - DYViewerControls *_viewerControls;CGFloat _height,_canvasWidth,_uiScale;NSInteger _toolbarRows;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics; + DYViewerControls *_viewerControls;CGFloat _height,_canvasWidth,_uiScale;BOOL _maskCapturing;DYPlugIn *_maskCaptureOwner;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics; } -- (instancetype)initWithAPIManager:(id)manager{if((self=[super init])){_apiManager=manager;_viewerControls=[DYViewerControls new];_handles=[NSMutableArray new];_lastRoute=-1;_uiScale=1;_toolbarRows=9;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_init");}return self;} +- (instancetype)initWithAPIManager:(id)manager{if((self=[super init])){_apiManager=manager;_viewerControls=[DYViewerControls new];_handles=[NSMutableArray new];_lastRoute=-1;_uiScale=1;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_init");}return self;} - (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[super dealloc];} - (FxDrawingCoordinates)drawingCoordinates{return kFxDrawingCoordinates_CANVAS;} - (DYPlugIn*)pluginAtTime:(CMTime)time{NSString *value=nil;idget=[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];[get getStringParameterValue:&value fromParameter:DYCanvasSessionParameterID];@synchronized(DYToolCanvasSessions()){return [DYToolCanvasSessions()objectForKey:value];}} @@ -15,42 +15,45 @@ } - (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];} - (NSRect)toolbarRectForItem:(NSInteger)item{ - NSRect v=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));NSInteger count=[_mask[@"drawing"]boolValue]?11:9,bestRows=1;CGFloat scale=0; - for(NSInteger rows=count;rows>=1;rows--){NSInteger columns=(count+rows-1)/rows;CGFloat candidate=MIN(_uiScale,MIN(v.size.width/(38*columns+16),v.size.height/(39*rows+16)));if(candidate>scale){scale=candidate;bestRows=rows;}} - scale=MAX(.01,scale);return NSMakeRect(NSMaxX(v)-40*scale-(item/bestRows)*38*scale,NSMinY(v)+8*scale+(item%bestRows)*39*scale,32*scale,34*scale); + // Only the two temporary pen actions remain. The permanent tools live in the + // transparent left rail; the middle of the bottom edge opens the workspace. + if(![_mask[@"drawing"]boolValue]||(item!=9&&item!=10))return NSZeroRect; + NSRect v=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));CGFloat scale=MAX(.01,MIN(_uiScale,MIN(v.size.width/300.,v.size.height/100.))); + return NSMakeRect(NSMidX(v)+(item==9?-144:80)*scale,NSMaxY(v)-32*scale,64*scale,24*scale); } - (void)drawOSCWithWidth:(NSInteger)width height:(NSInteger)height activePart:(NSInteger)activePart destinationImage:(FxImageTile*)destination atTime:(CMTime)time {@synchronized(self){@autoreleasepool{ if(!_device||_device.registryID!=destination.deviceRegistryID){[_device release];_device=nil;NSArray *devices=MTLCopyAllDevices();for(idd in devices)if(d.registryID==destination.deviceRegistryID)_device=[d retain];[devices release];[_queue release];_queue=[_device newCommandQueue];[_context release];_context=_device?[[CIContext contextWithMTLDevice:_device options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}]retain]:nil;} idtexture=[destination metalTextureForDevice:_device];if(!texture||!_queue)return;idcommands=[_queue commandBuffer];MTLRenderPassDescriptor *pass=[MTLRenderPassDescriptor renderPassDescriptor];pass.colorAttachments[0].texture=texture;pass.colorAttachments[0].loadAction=MTLLoadActionClear;pass.colorAttachments[0].storeAction=MTLStoreActionStore;pass.colorAttachments[0].clearColor=MTLClearColorMake(0,0,0,0);idencoder=[commands renderCommandEncoderWithDescriptor:pass];[encoder endEncoding]; _height=destination.imagePixelBounds.top-destination.imagePixelBounds.bottom;CGFloat canvasWidth=destination.imagePixelBounds.right-destination.imagePixelBounds.left;_canvasWidth=canvasWidth; - idapi=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.;_toolbarRows=MAX(1,MIN(11,(NSInteger)floor((_height-MAX(8*_uiScale,_imageRect.origin.y+12*_uiScale)-8*_uiScale)/(39*_uiScale)))); + idapi=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.; DYPlugIn *plugin=[self pluginAtTime:time];NSDictionary *mask=[plugin toolCanvasMaskAtTime:time];NSInteger route=(plugin?1:0)+(mask?2:0);if(route!=_lastRoute||_drawCount++<2){_lastRoute=route;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_route plugin=%{public}d mask=%{public}d width=%{public}.2f height=%{public}.2f",plugin!=nil,mask!=nil,_imageRect.size.width,_imageRect.size.height);}[_mask release];_mask=[mask copy];[_handles removeAllObjects];[_outline release];_outline=nil; [_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time]; if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){ NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:(NSInteger)canvasWidth pixelsHigh:(NSInteger)_height bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:(NSInteger)canvasWidth*4 bitsPerPixel:32]autorelease];memset(bitmap.bitmapData,0,bitmap.bytesPerRow*bitmap.pixelsHigh);[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];NSAffineTransform *flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:_height];[flip scaleXBy:1 yBy:-1];[flip concat]; // Match AppKit text/image drawing to the top-down canvas CTM. [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:NSGraphicsContext.currentContext.CGContext flipped:YES]]; - if(mask){DYMaskParameters p;[mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/_imageRect.size.height;_outline=[[NSBezierPath bezierPath]retain]; + if(mask){BOOL blankShape=[mask[@"drawShape"]boolValue]&&![mask[@"shapeStarted"]boolValue];DYMaskParameters p;[mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/_imageRect.size.height;_outline=[[NSBezierPath bezierPath]retain]; if(p.kind==DYMaskBezier){NSData *data=mask[@"nodes"];auto *nodes=(const DYBezierNode*)data.bytes;NSUInteger count=data.length/sizeof(DYBezierNode);for(NSUInteger i=0;i3){NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:anchor];[line lineToPoint:handle];[[NSColor colorWithWhite:1 alpha:.55]setStroke];[line stroke];[self addHandle:handle part:1000+i*3+j+1];}}} NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=NSMakePoint(_imageRect.origin.x+[hover[0]doubleValue]*_imageRect.size.width,_imageRect.origin.y+[hover[1]doubleValue]*_imageRect.size.height);[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];} if(count>=3&&![mask[@"drawing"]boolValue]){auto a=nodes[count-1],b=nodes[0];[_outline curveToPoint:[self canvasPoint:b.x y:b.y parameters:p] controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];[_outline closePath];} - }else if(p.kind<2){int count=p.kind==DYMaskEllipse?96:4;for(int i=0;i=3*sizeof(DYBezierNode)){const DYBezierNode *nodes=(const DYBezierNode*)data.bytes;NSPoint first=[self canvasPoint:nodes[0].x y:nodes[0].y parameters:p];if(hypot(point.x-first.x,point.y-first.y)<=10*_uiScale)return 1000;}return NSPointInRect(point,_imageRect)?1:0;} for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];} @@ -58,14 +61,22 @@ } - (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}} - (BOOL)event:(NSEventType)type x:(double)x y:(double)y part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {@synchronized(self){ - DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y);if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];if(type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0)return NO;NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];return YES; + DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y); + if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;} + BOOL ownedMask=_maskCapturing&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp); + if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture]; + if(!ownedMask&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES; + if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0){_maskCapturing=NO;return NO;} + NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height); + if(type==NSEventTypeLeftMouseDown){_maskCapturing=part>0&&part<10000;_maskCaptureOwner=_maskCapturing?plugin:nil;} + [plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];if(type==NSEventTypeLeftMouseUp||(type==NSEventTypeKeyDown&&key==27)){_maskCapturing=NO;_maskCaptureOwner=nil;}return YES; }} - (void)mouseDownAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseDown x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (void)mouseDraggedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseDragged x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (void)mouseUpAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseUp x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (void)keyDownAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{BOOL result=(key==27||key==13||key==10||key==3||key==8||key==127)&&[self event:NSEventTypeKeyDown x:x y:y part:1 modifiers:m key:key time:t];if(update)*update=result;if(handled)*handled=result;} - (void)mouseMovedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){ - DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(drawing&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||drawing; + DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(drawing&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||drawing; }} - (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{[self mouseMovedAtPositionX:x positionY:y activePart:0 modifiers:m forceUpdate:update atTime:t];} - (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){BOOL changed=[_viewerControls mouseExited];if(update)*update=changed;}} diff --git a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h index c0f3e18..a735b2c 100644 --- a/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h @@ -40,7 +40,7 @@ { const NSUInteger w=3840,h=2160;DYDiagnosticTile *fine=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels pixels(w*h*4); for(NSUInteger y=0;y *)value toParameter:(UInt32)pid atTime:(CMTime)time{if(pid==DYToolsParameterID){_nodeCommitHadUndo=_undoActive;if(_rejectToolsWrites)return NO;}return [super setCustomParameterValue:value toParameter:pid atTime:time];} +- (BOOL)setFloatValue:(double)value toParameter:(UInt32)pid atTime:(CMTime)time{if(_verifyWritesInAction)_writesInAction&=_actionDepth>0&&NSThread.isMainThread;return [super setFloatValue:value toParameter:pid atTime:time];} +- (BOOL)setCustomParameterValue:(NSObject *)value toParameter:(UInt32)pid atTime:(CMTime)time{if(_verifyWritesInAction)_writesInAction&=_actionDepth>0&&NSThread.isMainThread;if(pid==DYToolsParameterID){_nodeCommitHadUndo=_undoActive;if(_rejectToolsWrites)return NO;}return [super setCustomParameterValue:value toParameter:pid atTime:time];} @end @interface DYWorkspaceDiagnosticRenderer : DYRenderer{ @public NSProgress *_preparedTask;void(^_preparedReply)(NSError*); @@ -47,7 +55,7 @@ static BOOL DYWorkspaceLargeDirtyPreservesHeader(NSBitmapImageRep *bitmap,NSView // Map the pane's flipped local coordinates into the cached top-strip pixels. // Intentionally bypass AppKit's clipping here: the draw implementation must // itself stay within its bounds even for a deliberately oversized dirty rect. - CGContextTranslateCTM(cg,0,bitmap.pixelsHigh);CGContextScaleCTM(cg,bitmap.pixelsWide/root.bounds.size.width,-bitmap.pixelsHigh/52.0);CGContextTranslateCTM(cg,pane.frame.origin.x,pane.frame.origin.y); + CGContextTranslateCTM(cg,0,bitmap.pixelsHigh);CGContextScaleCTM(cg,bitmap.pixelsWide/root.bounds.size.width,-bitmap.pixelsHigh/52.0);NSPoint origin=[pane convertRect:pane.bounds toView:root].origin;CGContextTranslateCTM(cg,origin.x,origin.y); [pane drawRect:NSInsetRect(pane.bounds,-200,-200)];[NSGraphicsContext restoreGraphicsState]; NSData *after=[NSData dataWithBytes:bitmap.bitmapData length:bitmap.bytesPerRow*bitmap.pixelsHigh];return [before isEqual:after]; } diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index e891497..8cde6ef 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -9,6 +9,8 @@ [workspace showRelativeToView:nil];workspaceDrain();NSView *root=[workspace valueForKey:@"root"]; run.record(@"workspace-remote-attaches-within-host-permissions",workspace.visible&&host->_requests==1&&!host->_permissionFailure&&root.superview==host->_parent&&!fixture.visible); NSView *scopePane=[workspace valueForKey:@"scopePane"],*heading=[workspace valueForKey:@"heading"],*pages=[workspace valueForKey:@"pages"],*closeButton=nil;for(NSView *control in root.subviews)if([control isKindOfClass:NSButton.class]&&[[(NSButton*)control title]isEqual:@"关闭"])closeButton=control; + run.record(@"workspace-opens-on-adjustments-with-four-pages-and-no-background-scope-capture",[(NSSegmentedControl*)pages segmentCount]==4&&[(NSSegmentedControl*)pages selectedSegment]==0&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&host->_minimumRequested.height<=300); + [workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scopes-page-enables-only-visible-output-capture",[(NSSegmentedControl*)pages selectedSegment]==3&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]); NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger headingInk=DYWorkspaceHeaderInk(headerBitmap,root,heading),pagesInk=DYWorkspaceHeaderInk(headerBitmap,root,pages),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); NSString *headerPNG=[runtime stringByAppendingPathComponent:@"workspace-topbar.png"];BOOL headerSaved=[[headerBitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:headerPNG atomically:YES]; run.record(@"workspace-offscreen-topbar-heading-pages-close-render-pixels",headerSaved&&headingInk>20&&pagesInk>50&&closeInk>20,@{@"headingPixels":@(headingInk),@"pagesPixels":@(pagesInk),@"closePixels":@(closeInk),@"path":headerPNG}); @@ -60,3 +62,48 @@ run.record(@"workspace-final-output-worker-publishes-real-scope-rasters",[scopeData[@"waveform"]length]==320*256*4&&[scopeData[@"parade"]length]==3*320*256*4&&[scopeData[@"histogram"]length]==4*256*4&&[scopeData[@"wholeImage"]boolValue]); [scopeRenderer setScopeEnabled:NO];[scopeRenderer captureScopeTile:finalTile atTime:CMTimeMake(8,24)];workspaceDrain();run.record(@"workspace-hidden-scope-capture-does-no-work",[scopeRenderer.scopeMetadata isEqual:scopeData]); } +// Exercise the new stack workspace against the same authoritative host document +// as the regular inspector. Every view stays in an unpresented native fixture. +{ + auto workspaceDrain=[](){double end=NSProcessInfo.processInfo.systemUptime+.04;while(NSProcessInfo.processInfo.systemUptime_verifyWritesInAction=YES; + DYWorkspaceDiagnosticRenderer *stackRenderer=[[[DYWorkspaceDiagnosticRenderer alloc]init]autorelease];DYLUTLibrary *stackLibrary=[[[DYLUTLibrary alloc]initWithRootURL:[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"stack-workspace-library"]]]autorelease]; + NSPanel *fixture=[[[NSPanel alloc]initWithContentRect:NSMakeRect(20,30,1120,360) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable backing:NSBackingStoreBuffered defer:NO]autorelease];stackHost->_parent=fixture.contentView; + DYColorWorkspace *stack=[[[DYColorWorkspace alloc]initWithManager:stackHost renderer:stackRenderer library:stackLibrary title:@"图层同步"]autorelease]; + DYInspector *mainInspector=[[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer]autorelease];[stack showRelativeToView:nil];workspaceDrain(); + NSView *toolbar=[stack valueForKey:@"toolbar"];NSSegmentedControl *pages=[stack valueForKey:@"pages"];NSTableView *table=[stack valueForKey:@"layerTable"]; + auto toolbarButton=[&](NSString *type)->NSButton *{for(NSButton *button in toolbar.subviews)if([button.identifier isEqual:type])return button;return nil;}; + auto chooseNode=[&](NSString *node)->BOOL{NSArray *rows=[stack valueForKey:@"layerRows"];for(NSUInteger i=0;iprevious&&button.frame.origin.y==0;previous=button.frame.origin.x;} + run.record(@"workspace-toolbar-lists-every-tool-in-one-horizontal-scroll-strip",toolbar.subviews.count==DYToolTypes().count&&horizontal); + NSUInteger originalLayers=[DYReadTools(stackHost,kCMTimeZero).document[@"layers"]count];int undo=stackHost->_undoStarts; + [stack addWorkspaceTool:toolbarButton(@"curve")];workspaceDrain();NSString *curveID=[[[stack valueForKey:@"selectedNode"]copy]autorelease];NSDictionary *tools=DYReadTools(stackHost,kCMTimeZero).document; + run.record(@"workspace-toolbar-adds-real-uuid-and-synchronizes-regular-inspector",[tools[@"layers"]count]==originalLayers+1&&[DYToolWithID(tools,curveID)[@"type"]isEqual:@"curve"]&&[[mainInspector valueForKey:@"stackViews"]objectForKey:curveID]&&stackHost->_undoStarts==undo+1&&stackHost->_undoEnds==stackHost->_undoStarts); + DYInspector *curveEditor=[stack valueForKey:@"toolEditor"];undo=stackHost->_undoStarts;[curveEditor graphicGesture:YES title:@"测试曲线手势"];[curveEditor writeGraphicValues:@{@"masterX0":@.3,@"curveY0":@12}];[curveEditor writeGraphicValues:@{@"masterX0":@.35,@"curveY0":@16}];[curveEditor graphicGesture:NO title:nil]; + run.record(@"workspace-curve-xy-samples-use-one-undo-and-exact-uuid",stackHost->_undoStarts==undo+1&&stackHost->_undoEnds==stackHost->_undoStarts&&fabs([DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,curveID)[@"values"][@"curveY0"]doubleValue]-16)<1e-6); + [curveEditor graphicGesture:YES title:@"测试播放头变化"];stackHost->_workspaceTime=CMTimeMake(1,25);[curveEditor writeGraphicValues:@{@"curveY0":@33}];[curveEditor graphicGesture:NO title:nil];stackHost->_workspaceTime=kCMTimeZero; + run.record(@"workspace-curve-gesture-rejects-a-changed-playhead",[DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,curveID)[@"values"][@"curveY0"]doubleValue]==16); + [curveEditor graphicGesture:YES title:@"测试外部改值"];[stackHost startAction:stack];NSMutableDictionary *externalCurve=DYMutablePlist(DYReadTools(stackHost,kCMTimeZero).document);((NSMutableDictionary*)DYToolWithID(externalCurve,curveID))[@"values"][@"curveY0"]=@22;DYWriteTools(stackHost,externalCurve,kCMTimeZero);[stackHost endAction:stack];[curveEditor writeGraphicValues:@{@"curveY0":@44}];[curveEditor graphicGesture:NO title:nil]; + run.record(@"workspace-curve-gesture-preserves-an-external-parameter-edit",[DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,curveID)[@"values"][@"curveY0"]doubleValue]==22); + NSView *workspaceRoot=[stack valueForKey:@"root"];[workspaceRoot layoutSubtreeIfNeeded];NSBitmapImageRep *workspaceImage=[workspaceRoot bitmapImageRepForCachingDisplayInRect:workspaceRoot.bounds];[workspaceRoot cacheDisplayInRect:workspaceRoot.bounds toBitmapImageRep:workspaceImage];[[workspaceImage representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:[runtime stringByAppendingPathComponent:@"workspace-adjustments.png"]atomically:YES]; + [stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookA=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookB=[[[stack valueForKey:@"selectedNode"]copy]autorelease]; + run.need(@"workspace-two-independent-lut-layer-fixtures-exist",lookA&&lookB&&![lookA isEqual:lookB]&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookA)&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookB)); + NSString *pathA=[runtime stringByAppendingPathComponent:@"workspace-A.cube"],*pathB=[runtime stringByAppendingPathComponent:@"workspace-B.cube"],*late=[runtime stringByAppendingPathComponent:@"workspace-late.cube"];NSDictionary *basePaths=[[DYReadAssets(stackHost,kCMTimeZero).paths copy]autorelease];NSError *failure=nil; + BOOL selectedA=chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];BOOL wroteA=[stack commitLUT:pathA expected:[stack selectionContext]error:&failure]; + BOOL selectedB=chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];BOOL wroteB=[stack commitLUT:pathB expected:[stack selectionContext]error:&failure];tools=DYReadTools(stackHost,kCMTimeZero).document; + run.record(@"workspace-lut-segment-rebinds-from-layer-a-to-b-without-cross-writing",selectedA&&selectedB&&wroteA&&wroteB&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]&&[basePaths isEqual:DYReadAssets(stackHost,kCMTimeZero).paths]&&[[[stack valueForKey:@"lutTarget"]nodeID]isEqual:lookB]); + chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document; + run.record(@"workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",pending.cancelled&&completed&&cancelled&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]); + BOOL choseHSL=chooseNode(@"base:hsl");undo=stackHost->_undoStarts;[stack createWorkspaceMask:1];workspaceDrain();NSString *sharedID=[[[stack valueForKey:@"selectedMask"]copy]autorelease]; + NSButton *assign=[NSButton checkboxWithTitle:@"蜘蛛调色" target:nil action:nil];assign.identifier=@"base:spider";assign.state=NSControlStateValueOn;[stack maskAssignmentChanged:assign];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSArray *hslMasks=DYMasksForTool(tools,@"base:hsl"),*spiderMasks=DYMasksForTool(tools,@"base:spider"); + BOOL mainHasShared=NO;for(NSDictionary *card in [mainInspector valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"hsl"]){NSDictionary *document=[card[@"maskPanel"]valueForKey:@"document"];mainHasShared=[DYMasksForTool(document,@"base:hsl").firstObject[@"id"]isEqual:sharedID];} + run.record(@"workspace-shared-mask-links-hsl-and-spider-as-one-author-object",choseHSL&&sharedID&&DYSharedMasks(tools).count==1&&hslMasks.count==1&&spiderMasks.count==1&&hslMasks.firstObject==spiderMasks.firstObject&&[hslMasks.firstObject[@"id"]isEqual:sharedID]&&DYToolIDsForSharedMask(tools,sharedID).count==2&&mainHasShared&&stackHost->_undoStarts==undo+2&&stackHost->_undoEnds==stackHost->_undoStarts); + [stack deleteWorkspaceSelection:nil];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSView *maskEditor=[stack valueForKey:@"maskEditor"]; + run.record(@"workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings",!DYSharedMaskWithID(tools,sharedID)&&!DYMasksForTool(tools,@"base:hsl").count&&!DYMasksForTool(tools,@"base:spider").count&&![[stack valueForKey:@"selectedMask"]length]&&(!maskEditor||!maskEditor.superview||maskEditor.hidden)); + chooseNode(@"base:hsl");[stack createWorkspaceMask:0];workspaceDrain();NSString *oldMask=[[[stack valueForKey:@"selectedMask"]copy]autorelease];[stack close]; + __block NSInteger canvasSelections=0,toolSelections=0;id canvasObserver=[NSNotificationCenter.defaultCenter addObserverForName:@"DYToolCanvasSelection" object:stackHost queue:nil usingBlock:^(NSNotification *note){canvasSelections++;}];id toolObserver=[NSNotificationCenter.defaultCenter addObserverForName:@"DYWorkspaceToolSelection" object:stackHost queue:nil usingBlock:^(NSNotification *note){toolSelections++;}]; + [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:stackHost userInfo:@{@"node":@"base:spider",@"mask":@"another-selected-mask",@"document":DYReadTools(stackHost,kCMTimeZero).document,@"draw":@NO}];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:stackHost];workspaceDrain(); + run.record(@"workspace-closed-panel-never-steals-canvas-or-module-selection",oldMask&&canvasSelections==1&&toolSelections==0&&!stack.visible); + [NSNotificationCenter.defaultCenter removeObserver:canvasObserver];[NSNotificationCenter.defaultCenter removeObserver:toolObserver]; + run.record(@"workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo",stackHost->_writesInAction&&!stackHost->_permissionFailure&&stackHost->_actionDepth==0&&stackHost->_undoStarts==stackHost->_undoEnds&&!fixture.visible); +} diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index fd5fdcc..a7e7f10 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -2,7 +2,7 @@ - (id)rootHost {return [_manager isKindOfClass:DYToolManager.class]?[(DYToolManager*)_manager host]:_manager;} - (id)lutManager {return _lutTarget?:_manager;} - (void)buildToolWorkspace { - _splitFraction=.21;_toolTime=kCMTimeInvalid; + _splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction"];if(_splitFraction<.12||_splitFraction>.45)_splitFraction=.21;_toolTime=kCMTimeInvalid; _toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO; _toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll]; CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];CGFloat width=MAX(58,MIN(150,[title sizeWithAttributes:@{NSFontAttributeName:button.font}].width+22));button.frame=NSMakeRect(x,0,width,28);[_toolbar addSubview:button];x+=width+4;}_toolbar.frame=NSMakeRect(0,0,x,30); @@ -19,6 +19,7 @@ [_scopePane removeFromSuperview];[_editorHost addSubview:_scopePane];[_lutPane removeFromSuperview];[_editorHost addSubview:_lutPane];[_lutExplanation removeFromSuperview];[_editorHost addSubview:_lutExplanation]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshToolWorkspace:) name:DYModelChanged object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceCanvasSelection:) name:@"DYToolCanvasSelection" object:[self rootHost]]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(externalWorkspaceToolSelection:) name:@"DYWorkspaceToolSelection" object:[self rootHost]]; } - (void)layoutToolWorkspace { if(!_split||_sizingSplit)return;_sizingSplit=YES; @@ -31,7 +32,7 @@ _sizingSplit=NO; } - (CGFloat)splitView:(NSSplitView*)split constrainSplitPosition:(CGFloat)position ofSubviewAt:(NSInteger)index {return MAX(174,MIN(split.bounds.size.width-320,position));} -- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[self layoutWorkspace];} +- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction"];[self layoutWorkspace];} - (BOOL)workspaceBaseVisible:(NSString*)type document:(NSDictionary*)document time:(CMTime)time { if(DYBaseToolRemoved(document,type))return NO; if([@[@"primary",@"spider",@"base",@"hsl"]containsObject:type])return YES; @@ -46,7 +47,7 @@ idhost=[self rootHost];idaction=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action){_refreshingStack=NO;return;} NSMutableArray *rows=[NSMutableArray array];NSMutableSet *assignedMasks=[NSMutableSet set];NSDictionary *document=nil; [action startAction:self];@try { - _toolTime=action.currentTime;document=[DYReadTools(host,_toolTime).document copy]; + _toolTime=action.currentTime;DYUniforms rootUniforms;DYReadUniforms(host,_toolTime,&rootUniforms);document=[DYReadTools(host,_toolTime).document copy]; // Legacy base operators keep their real insertion-stage order. UUID children // use the same traversal as the renderer, including cross-type insertion. NSArray *bases=@[@"primary",@"primaries",@"curve",@"levels",@"balance",@"hsl",@"grading",@"base",@"blackwhite",@"look",@"skin",@"spider",@"mixer",@"film",@"lens"]; @@ -54,14 +55,15 @@ for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];} for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID]; for(NSString*ID in [ordered reverseObjectEnumerator]){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=DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"kind":@"tool"}]; - 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"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];} + NSString*title=DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool"}]; + 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 DYSharedMasks(document))if(![assignedMasks containsObject:mask[@"id"]]){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"title":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];} + for(NSDictionary*mask in DYSharedMasks(document))if(![assignedMasks containsObject:mask[@"id"]]){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@"◩ 未分配 · " 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){[_selectedNode release];_selectedNode=[requested copy];[_selectedMask release];_selectedMask=nil;} + NSString *requested=note.userInfo[@"scrollToTool"];if(requested.length){_hasUserSelection=YES;[_selectedNode release];_selectedNode=[requested copy];[_selectedMask release];_selectedMask=nil;} NSInteger selected=-1;for(NSUInteger i=0;i<_layerRows.count;i++){NSDictionary*row=_layerRows[i];if([row[@"node"]isEqual:_selectedNode]&&(_selectedMask?[row[@"mask"]isEqual:_selectedMask]:!row[@"mask"])){selected=i;break;}} + if(selected<0&&_selectedMask)for(NSUInteger i=0;i<_layerRows.count;i++)if([_layerRows[i][@"mask"]isEqual:_selectedMask]){selected=i;[_selectedNode release];_selectedNode=[_layerRows[i][@"node"]copy];break;} if(selected<0&&_layerRows.count){selected=0;NSDictionary*first=_layerRows[0];[_selectedNode release];_selectedNode=[first[@"node"]copy];[_selectedMask release];_selectedMask=[first[@"mask"]copy];} if(selected>=0)[_layerTable selectRowIndexes:[NSIndexSet indexSetWithIndex:selected]byExtendingSelection:NO];else {[_selectedNode release];_selectedNode=nil;[_selectedMask release];_selectedMask=nil;} _refreshingStack=NO;[self rebuildWorkspaceEditor]; @@ -69,10 +71,10 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView*)table {return _layerRows.count;} - (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row { NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]init]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label; - NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:@"eye" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell; + NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell; } - (void)tableViewSelectionDidChange:(NSNotification*)note { - if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil]; + if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil]; } - (void)rebuildWorkspaceEditor { NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil; @@ -104,9 +106,9 @@ - (void)addWorkspaceMaskKind:(NSMenuItem*)sender {[self createWorkspaceMask:sender.tag];} - (void)createWorkspaceMask:(NSInteger)kind { idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*ID=nil; - [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(node.length&&![node isEqual:@"shared"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} - if(!ID)return;[_selectedMask release];_selectedMask=ID;if(!_selectedNode){_selectedNode=[@"shared" copy];}_pages.selectedSegment=1;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; - [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"document":_toolDocument?:@{},@"draw":@(kind==2)}]; + [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(_hasUserSelection&&node.length&&![node isEqual:@"shared"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} + if(!ID)return;[_selectedMask release];_selectedMask=ID;if(!_hasUserSelection||!_selectedNode){[_selectedNode release];_selectedNode=[@"shared" copy];}_pages.selectedSegment=1;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; + [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"document":_toolDocument?:@{},@"draw":@(kind==2),@"drawShape":@(kind==0||kind==1)}]; } - (void)rebuildMaskAssignments { DYWorkspaceList*list=[[[DYWorkspaceList alloc]init]autorelease];CGFloat y=8;NSTextField*heading=[DYThemeLabel labelWithString:_selectedMask?@"应用到模块":@"选择或绘制一个蒙版"];heading.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];heading.frame=NSMakeRect(8,y,210,24);[list addSubview:heading];y+=30; @@ -122,11 +124,14 @@ - (void)workspaceCanvasSelection:(NSNotification*)note { if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_pages.selectedSegment=1;[self rebuildWorkspaceEditor]; } +- (void)externalWorkspaceToolSelection:(NSNotification*)note { + if(![note.userInfo[@"source"]isEqual:@"inspector"]||![note.userInfo[@"node"]length])return;_hasUserSelection=YES;[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];[_selectedMask release];_selectedMask=nil;if(_visible){_pages.selectedSegment=0;[self refreshToolWorkspace:nil];} +} - (void)toggleWorkspaceRow:(NSButton*)sender { if(sender.tag<0||sender.tag>=_layerRows.count)return;NSDictionary*row=_layerRows[sender.tag];NSString*ID=row[@"node"];idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO; [a startAction:self];idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"启用或旁路模块与蒙版"];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document); if(row[@"mask"]){NSMutableDictionary*mask=nil;for(NSMutableDictionary*m in DYMasksForTool(doc,ID))if([m[@"id"]isEqual:row[@"mask"]])mask=m;if(mask){mask[@"enabled"]=@(![mask[@"enabled"]boolValue]);changed=DYWriteTools(host,doc,a.currentTime);}} - else {NSDictionary*node=DYToolWithID(doc,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];NSDictionary*section=DYToolSection(type);idtarget=node?[[[DYToolManager alloc]initWithHost:host node:node]autorelease]:host;idaction=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:self];@try{double value=0;[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[section[@"enabled"]unsignedIntValue]atTime:a.currentTime];idset=[target apiForProtocol:@protocol(FxParameterSettingAPI_v6)];NSMutableArray*flags=[NSMutableArray array];if(section[@"enabled"])[flags addObject:section[@"enabled"]];if(section[@"extraEnabled"])[flags addObject:section[@"extraEnabled"]];[flags addObjectsFromArray:section[@"enableParameters"]?:@[]];for(NSNumber*pid in flags)changed=[set setFloatValue:value>=.5?0:1 toParameter:pid.unsignedIntValue atTime:a.currentTime]||changed;}@finally{[action endAction:self];}} + else {NSDictionary*node=DYToolWithID(doc,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];NSDictionary*section=DYWorkspaceSection(type);idtarget=node?[[[DYToolManager alloc]initWithHost:host node:node]autorelease]:host;idaction=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:self];@try{double value=0;[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[section[@"enabled"]unsignedIntValue]atTime:a.currentTime];double extra=0;if(section[@"extraEnabled"])[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&extra fromParameter:[section[@"extraEnabled"]unsignedIntValue]atTime:a.currentTime];value=MAX(value,extra);idset=[target apiForProtocol:@protocol(FxParameterSettingAPI_v6)];NSMutableArray*flags=[NSMutableArray array];if(section[@"enabled"])[flags addObject:section[@"enabled"]];if(section[@"extraEnabled"])[flags addObject:section[@"extraEnabled"]];[flags addObjectsFromArray:section[@"enableParameters"]?:@[]];for(NSNumber*pid in flags)changed=[set setFloatValue:value>=.5?0:1 toParameter:pid.unsignedIntValue atTime:a.currentTime]||changed;}@finally{[action endAction:self];}} }@finally{if(grouped)[undo endUndoGroup];[a endAction:self];}if(changed)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; } - (void)deleteWorkspaceSelection:(id)sender { diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 03913ad..5486530 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.11.0 + 1.12.0 CFBundleVersion - 73 + 74 NSHumanReadableCopyright PlugInKit @@ -71,7 +71,7 @@ uuid 1C17B73B-F229-4C09-A434-EAF6DFF5F22A version - 1.11.0 + 1.12.0 className diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index c144bac..bf45c8e 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.11.0 + 1.12.0 CFBundleVersion - 73 + 74 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright