diff --git a/verification/DYScopeGPUChecks.mm b/verification/DYScopeGPUChecks.mm new file mode 100644 index 0000000..9150b23 --- /dev/null +++ b/verification/DYScopeGPUChecks.mm @@ -0,0 +1,18 @@ +#import +#import +#include +#include +struct Pixel{float r,g,b,a;}; +int main(int argc,const char **argv){@autoreleasepool{ + assert(argc==2);iddevice=MTLCreateSystemDefaultDevice();assert(device);NSError *error=nil;idlib=[device newLibraryWithURL:[NSURL fileURLWithPath:@(argv[1])] error:&error];assert(lib); + idpipeline=[device newComputePipelineStateWithFunction:[lib newFunctionWithName:@"dyScopeSample"] error:&error];assert(pipeline); + auto td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:2 height:2 mipmapped:NO];td.storageMode=MTLStorageModeShared;td.usage=MTLTextureUsageShaderRead;idsource=[device newTextureWithDescriptor:td]; + Pixel pixels[]={{4,-.25,.5,.5},{0,1,0,1},{0,0,1,1},{NAN,0,0,0}};[source replaceRegion:MTLRegionMake2D(0,0,2,2) mipmapLevel:0 withBytes:pixels bytesPerRow:sizeof(Pixel)*2]; + idbuffer=[device newBufferWithLength:320*180*sizeof(Pixel) options:MTLResourceStorageModeShared];idqueue=[device newCommandQueue]; + for(uint32_t flip=0;flip<2;flip++){ + auto cb=[queue commandBuffer];auto ce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:source atIndex:0];[ce setBuffer:buffer offset:0 atIndex:0];[ce setBytes:&flip length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];assert(cb.status==MTLCommandBufferStatusCompleted); + auto result=(const Pixel*)buffer.contents;if(!flip){assert(result[0].r==4&&result[0].g==-.25f&&result[0].a==.5f);assert(result[319].g==1);assert(result[179*320].b==1);assert(std::isnan(result[180*320-1].r));} + else{assert(result[0].b==1);assert(std::isnan(result[319].r));assert(result[179*320].r==4&&result[179*320].a==.5f);assert(result[180*320-1].g==1);} + } + return 0; +}} diff --git a/verification/DYScopeMathDiagnostics.cpp b/verification/DYScopeMathDiagnostics.cpp new file mode 100644 index 0000000..18e3f83 --- /dev/null +++ b/verification/DYScopeMathDiagnostics.cpp @@ -0,0 +1,11 @@ +#include "../大鱼调色/Plugin/DYScopeMath.hpp" +#include +#include +int main(){ + using namespace dyscope;RGBA pixels[]={{1,0,0,1},{0,1,0,1},{0,0,1,1},{1.3f,-.2f,.5f,.5f},{2,2,2,0},{NAN,0,0,1}}; + auto r=measure(pixels,3,2);assert(r.valid==4&&r.transparent==1&&r.nonfinite==1);assert(r.above==1&&r.below==1);assert(r.minimum==-.2f&&r.maximum==1.3f); + assert(r.histogram[bin(.2126f)]==1);assert(r.histogram[bin(.7152f)]==1);assert(r.histogram[bin(.0722f)]==1);assert(r.wave[(Bins-1-bin(.2126f))*Width]==1); + assert(bin(-100)==0&&bin(100)==Bins-1);assert(bin(std::numeric_limits::max())==Bins-1&&bin(-std::numeric_limits::max())==0);auto im=densityImage(r.wave,false);assert(im.size()==size_t(Width)*Bins*4);assert(im[((Bins-1-bin(.2126f))*Width)*4]>0); + auto rgb=densityImage(r.parade,true);assert(rgb.size()==size_t(3)*Width*Bins*4);assert(rgb[(Bins-1-bin(1.f))*3*Width*4]>0); + assert(measure(pixels,0,0).valid==0);return 0; +} diff --git a/大鱼调色.xcodeproj/project.pbxproj b/大鱼调色.xcodeproj/project.pbxproj index aa4dfc3..17a71d5 100644 --- a/大鱼调色.xcodeproj/project.pbxproj +++ b/大鱼调色.xcodeproj/project.pbxproj @@ -57,6 +57,7 @@ "/Localized: Plugin/Localizable.strings", Plugin/DYAutoGrade.mm, Plugin/DYColorTables.mm, + Plugin/DYColorWorkspace.mm, Plugin/DYDiagnostics.mm, Plugin/DYGrade.metal, Plugin/DYInspector.mm, @@ -67,6 +68,7 @@ Plugin/DYModel.mm, Plugin/DYPlugIn.mm, Plugin/DYRenderer.mm, + Plugin/DYScopeSample.mm, Plugin/DYTheme.mm, Plugin/DYToolState.mm, Plugin/DYTracking.metal, diff --git a/大鱼调色/Plugin/DYColorWorkspace.h b/大鱼调色/Plugin/DYColorWorkspace.h new file mode 100644 index 0000000..7534027 --- /dev/null +++ b/大鱼调色/Plugin/DYColorWorkspace.h @@ -0,0 +1,14 @@ +#pragma once +#import +#import +@class DYRenderer,DYLUTLibrary; +/// One host-owned auxiliary window, bound to the supplied clip/layer manager. +/// Close before that manager's underlying host/inspector is released. +@interface DYColorWorkspace : NSObject +- (instancetype)initWithManager:(id)manager renderer:(DYRenderer *)renderer library:(DYLUTLibrary *)library title:(NSString *)title; +- (void)showRelativeToView:(NSView *)anchor; +- (void)close; +@property(nonatomic,readonly) BOOL visible; +@property(nonatomic,readonly) NSString *lastError; +- (void)updatePalette; +@end diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm new file mode 100644 index 0000000..4874494 --- /dev/null +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -0,0 +1,223 @@ +#import "DYColorWorkspace.h" +#import "DYRenderer.h" +#import "DYLUTBrowser.h" +#import "DYLUTLibrary.h" +#import "DYTheme.h" +#import "DYToolState.h" +#include "DYScopeMath.hpp" +#include + +@class DYWorkspaceRoot; +@interface DYColorWorkspace (Internal) +- (void)layoutWorkspace; +- (void)scopeChanged:(NSNotification *)notification; +@end +@interface DYWorkspaceLifetime:NSObject +@property(nonatomic,assign) DYColorWorkspace *owner; +@end +@implementation DYWorkspaceLifetime @end +@interface DYWorkspaceRoot:NSView +@property(nonatomic,assign) DYColorWorkspace *owner; +@end +@implementation DYWorkspaceRoot +- (BOOL)isFlipped{return YES;} +- (BOOL)isOpaque{return YES;} +- (void)drawRect:(NSRect)dirty{[DYThemeColor(@"background")setFill];NSRectFill(dirty);} +- (void)resizeSubviewsWithOldSize:(NSSize)old{[super resizeSubviewsWithOldSize:old];[_owner layoutWorkspace];} +@end +@interface DYScopePlot:NSView +@property(nonatomic,copy) NSDictionary *metadata; +@property(nonatomic) NSInteger mode; +@end +@implementation DYScopePlot { + NSImage *_wave,*_parade; +} +- (BOOL)isFlipped{return YES;} +- (BOOL)isOpaque{return YES;} +- (void)dealloc{[_metadata release];[_wave release];[_parade release];[super dealloc];} +- (NSImage *)imageForData:(NSData *)data width:(NSUInteger)width{ + if(data.length!=width*dyscope::Bins*4)return nil; + NSBitmapImageRep *rep=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:nil pixelsWide:width pixelsHigh:dyscope::Bins bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:width*4 bitsPerPixel:32]autorelease]; + if(!rep)return nil;memcpy(rep.bitmapData,data.bytes,data.length);NSImage *image=[[[NSImage alloc]initWithSize:NSMakeSize(width,dyscope::Bins)]autorelease];[image addRepresentation:rep];return image; +} +- (void)setMetadata:(NSDictionary *)metadata{ + if(_metadata==metadata)return;[_metadata release];_metadata=[metadata copy];[_wave release];_wave=[[self imageForData:metadata[@"waveform"] width:dyscope::Width]retain];[_parade release];_parade=[[self imageForData:metadata[@"parade"] width:3*dyscope::Width]retain]; + self.accessibilityLabel=[NSString stringWithFormat:@"%@,有效取样 %@,低于显示范围 %@,高于显示范围 %@",metadata[@"domain"]?:@"等待最终输出",metadata[@"valid"]?:@0,metadata[@"below"]?:@0,metadata[@"above"]?:@0];[self setNeedsDisplay:YES]; +} +- (void)setMode:(NSInteger)mode{_mode=mode;[self setNeedsDisplay:YES];} +- (void)drawRect:(NSRect)dirty{ + [[NSColor colorWithCalibratedWhite:.025 alpha:1]setFill];NSRectFill(self.bounds); + NSRect plot=NSMakeRect(48,24,MAX(1,self.bounds.size.width-66),MAX(1,self.bounds.size.height-52)); + NSDictionary *text=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular],NSForegroundColorAttributeName:[NSColor colorWithWhite:.64 alpha:1]}; + if(_mode<2){NSImage *image=_mode==1?_parade:_wave;[NSGraphicsContext saveGraphicsState];NSGraphicsContext.currentContext.imageInterpolation=NSImageInterpolationNone;[image drawInRect:plot fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];[NSGraphicsContext restoreGraphicsState]; + for(int percent : {-10,0,25,50,75,100,110}){CGFloat y=NSMaxY(plot)-(percent+10)/120.0*plot.size.height;[[NSColor colorWithWhite:(percent==0||percent==100)?.48:.3 alpha:.55]setStroke];NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:NSMakePoint(plot.origin.x,y)];[line lineToPoint:NSMakePoint(NSMaxX(plot),y)];[line stroke];[[NSString stringWithFormat:@"%d%%",percent]drawAtPoint:NSMakePoint(5,y-6) withAttributes:text];} + if(_mode==1){for(int i=0;i<3;i++){CGFloat x=plot.origin.x+i*plot.size.width/3;[[@[@"R",@"G",@"B"]objectAtIndex:i]drawAtPoint:NSMakePoint(x+8,NSMaxY(plot)+7) withAttributes:text];if(i){[[NSColor colorWithWhite:.4 alpha:.6]setStroke];NSBezierPath *p=[NSBezierPath bezierPath];[p moveToPoint:NSMakePoint(x,plot.origin.y)];[p lineToPoint:NSMakePoint(x,NSMaxY(plot))];[p stroke];}}} + else [@"画面横向位置" drawAtPoint:NSMakePoint(plot.origin.x,NSMaxY(plot)+7) withAttributes:text]; + }else{ + NSData *hist=_metadata[@"histogram"];if(hist.length==4*dyscope::Bins*sizeof(uint32_t)){ + const auto *bins=(const uint32_t*)hist.bytes;uint32_t maximum=1;for(unsigned i=0;i<4*dyscope::Bins;i++)maximum=std::max(maximum,bins[i]); + NSArray *colors=@[[NSColor colorWithWhite:.82 alpha:.8],NSColor.systemRedColor,NSColor.systemGreenColor,NSColor.systemBlueColor]; + for(unsigned c=0;c<4;c++){[colors[c]setStroke];NSBezierPath *line=[NSBezierPath bezierPath];for(unsigned b=0;b _manager; + DYRenderer *_renderer;DYLUTLibrary *_library;DYLUTBrowser *_browser; + DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane; + DYScopePlot *_plot; + NSTextField *_heading,*_description,*_status,*_lutExplanation; + NSSegmentedControl *_pages;NSPopUpButton *_scopeMode;NSButton *_close,*_hostScopes; + DYWorkspaceLifetime *_lifetime; + NSProgress *_selectionTask; + NSView *_remoteParent;NSWindow *_presentationWindow; + NSString *_title,*_lastError; + BOOL _visible,_opening,_closed,_closing; + NSUInteger _session,_selectionID; +} +@end +@implementation DYColorWorkspace +- (instancetype)initWithManager:(id)manager renderer:(DYRenderer *)renderer library:(DYLUTLibrary *)library title:(NSString *)title{ + if((self=[super init])){ + _manager=[manager retain];_renderer=[renderer retain];_library=[library retain];_title=[(title.length?title:@"大鱼调色")copy];_lifetime=[DYWorkspaceLifetime new];_lifetime.owner=self; + _root=[[DYWorkspaceRoot alloc]initWithFrame:NSMakeRect(0,0,1000,650)];_root.identifier=@"DYColorWorkspace";_root.owner=self;_root.accessibilityLabel=@"大鱼调色辅助工作区"; + _heading=[[DYThemeLabel alloc]init];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading]; + _pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=2;[_pages setLabel:@"示波器" forSegment:0];[_pages setLabel:@"风格1 LUT" forSegment:1];_pages.selectedSegment=0;_pages.target=self;_pages.action=@selector(pageChanged:);_pages.accessibilityLabel=@"辅助工作区页面";[_root addSubview:_pages]; + _close=[[DYThemeButton alloc]init];_close.title=@"关闭";_close.target=self;_close.action=@selector(closePressed:);_close.bezelStyle=NSBezelStyleRounded;[_root addSubview:_close]; + _scopePane=[[DYWorkspaceRoot alloc]init];[_root addSubview:_scopePane];_lutPane=[[NSView alloc]init];[_root addSubview:_lutPane];_lutPane.hidden=YES; + _scopeMode=[[DYThemePopUpButton alloc]init];[_scopeMode addItemsWithTitles:@[@"亮度波形",@"RGB 分列",@"直方图"]];_scopeMode.target=self;_scopeMode.action=@selector(scopeModeChanged:);_scopeMode.accessibilityLabel=@"示波器类型";[_scopePane addSubview:_scopeMode]; + _hostScopes=[[DYThemeButton alloc]init];_hostScopes.title=@"FCP 示波器";_hostScopes.bezelStyle=NSBezelStyleRounded;_hostScopes.target=self;_hostScopes.action=@selector(toggleHostScopes:);_hostScopes.toolTip=@"打开或关闭 Final Cut Pro 自带的视频示波器;下方是大鱼的显示参考示波器";[_scopePane addSubview:_hostScopes]; + _description=[[DYThemeLabel alloc]init];_description.font=[NSFont systemFontOfSize:11];[_scopePane addSubview:_description]; + _plot=[[DYScopePlot alloc]init];_plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:_plot]; + _status=[[DYThemeLabel alloc]init];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status]; + _lutExplanation=[[DYThemeLabel alloc]init];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(scopeChanged:) name:@"DYScopeDidChange" object:_renderer]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil]; + [self updatePalette];[self scopeChanged:nil];[self layoutWorkspace]; + }return self; +} +- (void)dealloc{ + [self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil; + [_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_pages release];[_scopeMode release];[_close release];[_hostScopes release];[_title release];[_lastError release];[_lifetime release];[super dealloc]; +} +- (BOOL)visible{return _visible||_opening;} +- (NSString *)lastError{return _lastError;} +- (id)actionAPI{return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];} +- (void)reportError:(NSString *)message{ + [_lastError release];_lastError=[(message?:@"辅助工作区操作未完成")copy];_status.stringValue=_lastError;_status.toolTip=_lastError; + [NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceError" object:self userInfo:@{@"message":_lastError}]; +} +- (void)showRelativeToView:(NSView *)anchor{ + if(!NSThread.isMainThread){DYWorkspaceLifetime *token=_lifetime;dispatch_async(dispatch_get_main_queue(),^{[token.owner showRelativeToView:anchor];});return;} + if(_opening)return;_closed=NO;_lifetime.owner=self;_opening=YES;NSUInteger session=++_session; + [_lastError release];_lastError=nil;id action=[self actionAPI]; + if(!action){_opening=NO;[self reportError:@"宿主暂时无法打开辅助工作区,请重新选择当前效果后重试"];return;} + DYWorkspaceLifetime *token=_lifetime;[action startAction:self]; + @try{ + id v3=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v3)];id sizable=v3?:[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v2)];id remote=sizable?:[_manager apiForProtocol:@protocol(FxRemoteWindowAPI)]; + void(^reply)(FxXPView *,NSError *)=^(FxXPView *parent,NSError *error){void(^attach)(void)=^{DYColorWorkspace *owner=token.owner;if(!owner||owner->_closed||owner->_session!=session)return;owner->_opening=NO; + if(!parent){[owner reportError:error.localizedDescription?:@"宿主未能创建辅助窗口"];return;}[owner attachToParent:parent]; + };if(NSThread.isMainThread)attach();else dispatch_sync(dispatch_get_main_queue(),attach);}; + if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(760,520) maximumSize:NSMakeSize(1800,1200) reply:reply]; + else if(remote)[remote remoteWindowOfSize:NSMakeSize(1000,650) reply:reply]; + else{_opening=NO;[self reportError:@"当前宿主未提供外部工具窗口接口"];} + }@finally{[action endAction:self];} +} +- (void)attachToParent:(NSView *)parent{ + if(_remoteParent!=parent){if(_remoteParent)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[NSNotificationCenter.defaultCenter removeObserver:self name:name object:_remoteParent];_remoteParent=parent; + parent.postsFrameChangedNotifications=YES;parent.postsBoundsChangedNotifications=YES;for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(parentChanged:) name:name object:parent]; + } + [_root removeFromSuperview];_root.frame=parent.bounds;_root.autoresizingMask=NSViewWidthSizable|NSViewHeightSizable;[parent addSubview:_root];_visible=YES;_root.hidden=NO;[_renderer setScopeEnabled:_pages.selectedSegment==0];[self scopeChanged: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];} + [owner parentChanged:nil]; + }); +} +- (void)parentChanged:(NSNotification *)notification{ + if(!_visible||!_remoteParent)return;NSWindow *window=_remoteParent.window; + if(window&&_remoteParent==window.contentView&&_remoteParent.superview){NSRect content=[window convertRectFromScreen:[window contentRectForFrameRect:window.frame]];NSPoint origin=[_remoteParent.superview convertPoint:content.origin fromView:nil];if(std::isfinite(origin.x)&&std::isfinite(origin.y)&&!NSEqualPoints(_remoteParent.frame.origin,origin))[_remoteParent setFrameOrigin:origin];} + _root.frame=_remoteParent.bounds;[self layoutWorkspace]; +} +- (void)layoutWorkspace{ + CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height; + _heading.frame=NSMakeRect(18,14,MAX(100,w-360),23);_pages.frame=NSMakeRect(MAX(150,w-320),12,228,27);_close.frame=NSMakeRect(MAX(0,w-80),12,64,27); + _scopePane.frame=NSMakeRect(0,52,w,MAX(1,h-52));_lutPane.frame=NSMakeRect(0,80,w,MAX(1,h-80));_lutExplanation.frame=NSMakeRect(18,52,MAX(1,w-36),24); + CGFloat ph=_scopePane.bounds.size.height;_scopeMode.frame=NSMakeRect(18,0,160,27);_hostScopes.frame=NSMakeRect(184,0,122,27);_description.frame=NSMakeRect(320,4,MAX(1,w-338),22);_plot.frame=NSMakeRect(18,39,MAX(1,w-36),MAX(1,ph-114));_status.frame=NSMakeRect(18,MAX(40,ph-64),MAX(1,w-36),58); +} +- (void)pageChanged:(id)sender{ + BOOL lut=_pages.selectedSegment==1;_scopePane.hidden=lut;_lutPane.hidden=!lut;_lutExplanation.hidden=!lut;[_renderer setScopeEnabled:_visible&&!lut];if(lut)[self ensureBrowser];else[self scopeChanged:nil]; +} +- (void)toggleHostScopes:(id)sender{ + id action=[self actionAPI];NSError *error=nil;BOOL done=NO;if(action){[action startAction:self];@try{id commands=[_manager apiForProtocol:@protocol(FxCommandAPI)];done=[commands performCommand:kFxCommand_ToggleWaveforms error:&error];}@finally{[action endAction:self];}} + if(!done)[self reportError:error.localizedDescription?:@"当前宿主无法切换 FCP 示波器"]; +} +- (void)scopeModeChanged:(id)sender{_plot.mode=_scopeMode.indexOfSelectedItem;} +- (void)scopeChanged:(NSNotification *)notification{ + if(notification&&!_visible)return;NSDictionary *data=[_renderer scopeMetadata];_plot.metadata=data; + _description.toolTip=data?[NSString stringWithFormat:@"宿主输出配置:%@\n%@",data[@"source"],data[@"note"]]:nil; + _description.stringValue=data?[NSString stringWithFormat:@"%@ · %@ · 320 × 180",data[@"domain"],data[@"region"]]:@"最终输出 · 等待宿主渲染"; + if(data){double t=[data[@"time"]doubleValue];NSString *frame=std::isfinite(t)?[NSString stringWithFormat:@"%.3f 秒",t]:@"静帧"; + _status.stringValue=[NSString stringWithFormat:@"%@\n%@ · 有效 %@ · 透明 %@ · 非有限 %@ · 超出 −10%%/110%% %@/%@",([data[@"converted"]boolValue]?@"最终画面 · sRGB 显示参考;非 HDR / IRE 精密测量":@"空间未知:显示宿主 RGB 数值参考;不用于 HDR / IRE 测量"),frame,data[@"valid"],data[@"transparent"],data[@"nonfinite"],data[@"below"],data[@"above"]]; + }else _status.stringValue=@"示波器采集当前效果的最终输出。播放、移动时间线或调整颜色后更新;透明像素不计入。"; +} +- (void)previewChanged:(NSNotification *)notification{if(_visible&&_pages.selectedSegment==1)[_browser updatePreview:[_renderer lookLUTPreview]];} +- (void)themeChanged:(NSNotification *)notification{[self updatePalette];} +- (void)updatePalette{ + [_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYThemePalette()]; +} +- (void)ensureBrowser{ + if(_browser.visible)return;[_browser release];_browser=nil;id action=[self actionAPI];if(!action){[self reportError:@"宿主暂时无法读取风格1"];return;} + NSString *selected=nil;[action startAction:self];@try{selected=[DYReadAssets(_manager,action.currentTime).paths[@"look0"]copy];}@finally{[action endAction:self];} + DYWorkspaceLifetime *token=_lifetime; + _browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:selected palette:DYThemePalette() selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closed)return [owner selectLUT:path completion:completion];if(completion)completion([NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]);return nil;}];[selected release]; + [_browser embedInView:_lutPane close:^{DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closing&&!owner->_closed){owner->_pages.selectedSegment=0;[owner pageChanged:nil];}}]; +} +- (NSDictionary *)selectionContextAtTime:(CMTime)time{ + id host=[_manager isKindOfClass:DYToolManager.class]?[(DYToolManager*)_manager host]:_manager; + DYAssetState *local=DYReadAssets(_manager,time),*global=DYReadAssets(host,time);DYUniforms uniforms;DYReadUniforms(host,time,&uniforms); + NSMutableDictionary *cm=[NSMutableDictionary dictionary];for(NSDictionary *descriptor in DYDescriptors()){NSString *key=descriptor[@"key"];NSInteger offset=[descriptor[@"offset"]integerValue];if(offset>=0&&([key hasPrefix:@"cm"]||[key isEqual:@"inputProfile"]||[key isEqual:@"inputSectionEnabled"]))cm[key]=@(*(float*)((uint8_t*)&uniforms+offset));} + NSDictionary *state=@{@"look":local.paths[@"look0"]?:NSNull.null,@"colorManagement":global.colorManagement?:NSNull.null,@"inputPath":global.paths[@"input"]?:NSNull.null,@"colorParameters":cm}; + return @{@"time":[NSData dataWithBytes:&time length:sizeof(time)],@"state":state}; +} +- (NSDictionary *)selectionContext{ + id action=[self actionAPI];if(!action)return nil;NSDictionary *context=nil;[action startAction:self];@try{context=[[self selectionContextAtTime:action.currentTime]copy];}@finally{[action endAction:self];}return [context autorelease]; +} +- (NSProgress *)selectLUT:(NSString *)path completion:(void(^)(NSError *))completion{ + [_selectionTask cancel];[_selectionTask release];_selectionTask=nil;NSUInteger selection=++_selectionID,session=_session;DYWorkspaceLifetime *token=_lifetime;NSDictionary *expected=[self selectionContext]; + void(^prepared)(NSError *)=^(NSError *error){DYColorWorkspace *owner=token.owner;if(!owner||owner->_closed||owner->_session!=session||owner->_selectionID!=selection){if(completion)completion([NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]);return;} + [owner->_selectionTask release];owner->_selectionTask=nil;NSError *result=error;if(!result)[owner commitLUT:path expected:expected error:&result];if(result)[owner reportError:result.localizedDescription];if(completion)completion(result); + }; + if(!path.length||!expected){NSProgress *done=[NSProgress discreteProgressWithTotalUnitCount:1];done.completedUnitCount=1;dispatch_async(dispatch_get_main_queue(),^{prepared(nil);});return done;} + _selectionTask=[[_renderer prepareLUTPath:path completion:prepared]retain];return _selectionTask; +} +- (BOOL)commitLUT:(NSString *)path error:(NSError **)error{return [self commitLUT:path expected:[self selectionContext] error:error];} +- (BOOL)commitLUT:(NSString *)path expected:(NSDictionary *)expected error:(NSError **)error{ + id action=[self actionAPI];BOOL written=NO;NSString *failure=nil;if(!action)failure=@"宿主暂时无法应用 LUT,请重新选择当前效果后重试"; + else{id outer=[_manager isKindOfClass:DYToolManager.class]?[[(DYToolManager*)_manager host]apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]:nil; + if(outer)[outer startAction:self];[action startAction:self];id undo=nil;BOOL grouped=NO;@try{ + CMTime time=action.currentTime,original=kCMTimeInvalid;NSData *encodedTime=expected[@"time"];if(encodedTime.length==sizeof(original))memcpy(&original,encodedTime.bytes,sizeof(original)); + if(!CMTIME_IS_NUMERIC(time)||!CMTIME_IS_NUMERIC(original)||CMTimeCompare(time,original)!=0)failure=@"播放头已改变,未将先前的 LUT 选择写到新画面;请重新选择"; + else if(![[self selectionContextAtTime:time][@"state"]isEqual:expected[@"state"]])failure=@"载入期间风格1或色彩管理已改变,已保留最新设置;请重新选择 LUT"; + if(!failure&&[_manager isKindOfClass:DYToolManager.class]){DYToolManager *node=(DYToolManager*)_manager;if(![node.type isEqual:@"look"]||!DYToolWithID(DYReadTools(node.host,time).document,node.nodeID)){failure=@"此风格图层已删除或不再可编辑,未修改其它图层";}} + if(!failure&&![_manager isKindOfClass:DYToolManager.class]&&DYBaseToolRemoved(DYReadTools(_manager,time).document,@"look"))failure=@"基础风格工具已移除,请先恢复风格工具;未修改其它图层"; + if(!failure){DYAssetState *assets=[[DYReadAssets(_manager,time)copy]autorelease];if(!assets)assets=[[[DYAssetState alloc]init]autorelease];NSMutableDictionary *paths=[[assets.paths mutableCopy]autorelease]?:[NSMutableDictionary dictionary];if(path.length)paths[@"look0"]=path;else[paths removeObjectForKey:@"look0"];assets.paths=paths; + undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];grouped=[undo startUndoGroup:@"选择风格1 LUT"];written=DYWriteAssets(_manager,assets,time);if(!written)failure=@"宿主未接受此 LUT,原来的选择已保留"; + } + }@finally{if(outer){[action endAction:self];if(grouped)[undo endUndoGroup];[outer endAction:self];}else{if(grouped)[undo endUndoGroup];[action endAction:self];}}} + if(written){if(path.length)[_library recordUsedPath:path];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:[_manager isKindOfClass:DYToolManager.class]?[(DYToolManager*)_manager host]:_manager];} + else if(error)*error=[NSError errorWithDomain:@"com.dayu.color.workspace" code:1 userInfo:@{NSLocalizedDescriptionKey:failure?:@"LUT 操作未完成"}];return written; +} +- (void)closePressed:(id)sender{[self close];} +- (void)remoteClosed:(NSNotification *)notification{_closing=YES;[self close];_closing=NO;} +- (void)close{ + if(_closed)return;BOOL hadPresentation=_visible||_opening||_remoteParent;_closed=YES;_visible=NO;_opening=NO;_session++;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_renderer setScopeEnabled:NO]; + BOOL wasClosing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil; + if(_remoteParent)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[NSNotificationCenter.defaultCenter removeObserver:self name:name object:_remoteParent];_remoteParent=nil; + if(_presentationWindow)[NSNotificationCenter.defaultCenter removeObserver:self name:NSWindowWillCloseNotification object:_presentationWindow];[_presentationWindow release];_presentationWindow=nil;[_root removeFromSuperview]; + if(hadPresentation&&!wasClosing){id action=[self actionAPI];if(action){[action startAction:self];@try{id api=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v3)];[api closeRemoteWindow];}@finally{[action endAction:self];}}}_closing=wasClosing; +} +@end diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index b0afbdc..0133bf1 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -92,6 +92,8 @@ if(!_custom[@(pid)]||!value)return NO;_custom[@(pid)]=[[value copy]autorelease];return YES; } @end +#include "DYWorkspaceDiagnosticHost.inc.h" + @interface DYDiagnosticTile : FxImageTile { id _texture; @@ -496,6 +498,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { run.record(@"user-folder-all-luts-prepared-and-rendered",userCount>0&&allUserFrames,@{@"files":@(userCount),@"sourceFolder":userFolder,@"sourceFilesModified":@NO}); } #include "DYToolDiagnostics.inc.h" + #include "DYWorkspaceDiagnostics.inc.h" #include "DYToolInsertionDiagnostics.inc.h" #include "DYToolDeletionDiagnostics.inc.h" #include "DYFilmDiagnostics.inc.h" diff --git a/大鱼调色/Plugin/DYGrade.metal b/大鱼调色/Plugin/DYGrade.metal index 7b91b55..d36fd28 100644 --- a/大鱼调色/Plugin/DYGrade.metal +++ b/大鱼调色/Plugin/DYGrade.metal @@ -272,6 +272,18 @@ kernel void dyAnalysis(texture2d source [[texture(0)]], outRGBA[pixel.y * 320 + pixel.x] = float4(encoded, float(sample.a)); } +// Sample the actual final host destination before returning its tile. Point +// sampling avoids blending away nonfinite/out-of-range pixels. This is a +// bounded display-reference sample, not a full-resolution precision scope. +kernel void dyScopeSample(texture2d source [[texture(0)]], + device float4* outRGBA [[buffer(0)]],constant uint& flip [[buffer(1)]], + uint2 pixel [[thread_position_in_grid]]) { + if(pixel.x>=320||pixel.y>=180)return; + uint2 xy=min(uint2((float2(pixel)+.5f)*float2(source.get_width(),source.get_height())/float2(320,180)),uint2(source.get_width()-1,source.get_height()-1)); + if(flip)xy.y=source.get_height()-1-xy.y; + outRGBA[pixel.y*320+pixel.x]=source.read(xy); +} + // Native auto-grade statistics consume the input-converted RGB8 preview. // Quantization before and after the LUT mirrors the reference NSImage path. kernel void dyInputAnalysis(texture2d source [[texture(0)]], diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index aa5b06e..ad287f6 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -11,6 +11,7 @@ #import "DYLUTLibrary.h" #import "DYLUTBrowser.h" #import "DYRenderer.h" +#import "DYColorWorkspace.h" #include "DYSpiderState.h" #import #include @@ -456,6 +457,7 @@ static NSImage *DYWheelImage(void) { DYRenderer *_renderer; DYLUTLibrary *_library; DYLUTBrowser *_browser; + DYColorWorkspace *_workspace;NSButton *_workspaceButton; NSArray *_themeButtons; NSMutableDictionary *_tabs; NSInteger _visibleLooks; @@ -502,9 +504,10 @@ static NSImage *DYWheelImage(void) { _export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain]; _colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];[_colorSettings setButtonType:NSButtonTypePushOnPushOff];_colorSettings.toolTip=@"展开或收起高级颜色设置;默认使用原有流程";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已收起"; _save.identifier=@"primaryAction"; + _workspaceButton=[DYButton(@"◫ 工作区 · 示波器 / LUT",self,@selector(openWorkspace:))retain];_workspaceButton.accessibilityLabel=@"打开示波器与 LUT 工作区"; _addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"]; for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];} - for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule]){[self addSubview:v];v.hidden=_embedded;} + for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule,_workspaceButton]){[self addSubview:v];v.hidden=_embedded;} NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i a=[self actionAPI];if(!a)return;[a startAction:self];NSString *selected=nil;@try{selected=[DYReadAssets(_manager,a.currentTime).paths[sender.identifier]copy];}@finally{[a endAction:self];} __block DYInspector *owner=self;NSString *key=[[sender.identifier copy]autorelease]; diff --git a/大鱼调色/Plugin/DYLUTBrowser.h b/大鱼调色/Plugin/DYLUTBrowser.h index cff58cd..491aad1 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.h +++ b/大鱼调色/Plugin/DYLUTBrowser.h @@ -19,6 +19,9 @@ typedef NSProgress * (^DYLUTSelectionHandler)(NSString *path,void (^completion)( /// Attach to the FxRemoteWindow API's supplied parent; the caller owns that API. /// Completion, double-click and close dismiss through closeAction exactly once. - (void)showInRemoteParent:(NSView *)parent close:(void (^)(void))closeAction; +/// Embedded content inside another remote tool workspace. It follows only the +/// supplied container and does not take ownership of the enclosing window. +- (void)embedInView:(NSView *)parent close:(void (^)(void))closeAction; - (void)updatePalette:(NSDictionary *)palette; /// Replace the source frame after the renderer captures a new playhead image. /// Passing identical bytes keeps the current thumbnail jobs and cache intact. diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index d6f14df..11639ee 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -163,7 +163,7 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){ NSCache *_thumbnailCache; dispatch_queue_t _previewQueue; DYBrowserWork *_work; - BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut,_detached; + BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut,_detached,_embedded; NSProgress *_libraryTask,*_selectionTask; NSTimer *_progressTimer; NSUInteger _libraryGeneration,_selectionGeneration; @@ -271,6 +271,9 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b if([NSUserDefaults.standardUserDefaults boolForKey:@"DYBrowserGeometryDiagnostics"])dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC),dispatch_get_main_queue(),^{if(!_closed)DYBrowserGeometrySample(_root,@"settled");}); NSAccessibilityPostNotification(parent,NSAccessibilityLayoutChangedNotification); } +- (void)embedInView:(NSView *)parent close:(void (^)(void))closeAction{ + _embedded=YES;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回示波器"; +} - (void)fitRemoteParent{ NSView *parent=_root.superview;if(_closed||!_remoteMode||!parent)return; // A scaled-display ViewBridge service can hand us its top-level content @@ -279,7 +282,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b // container. Align that content origin using AppKit's coordinate APIs; // leave the host's window, content size and bridge resize policy intact. NSWindow *window=parent.window; - if(window&&parent==window.contentView&&parent.superview){ + if(!_embedded&&window&&parent==window.contentView&&parent.superview){ NSRect screenContent=[window contentRectForFrameRect:window.frame]; NSRect windowContent=[window convertRectFromScreen:screenContent]; NSPoint origin=[parent.superview convertPoint:windowContent.origin fromView:nil]; @@ -293,6 +296,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b DYBrowserGeometrySample(_root,notification.name); } - (void)configurePresentationWindow{ + if(_embedded)return; NSWindow *window=_root.window;if(!window||window==self.window)return; if(_presentationWindow!=window){[_presentationWindow release];_presentationWindow=[window retain]; for(NSNotificationName name in @[NSWindowDidMoveNotification,NSWindowDidResizeNotification])[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(presentationGeometryChanged:) name:name object:window]; diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index 1b41223..012ab5b 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -35,7 +35,7 @@ - (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;} - (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;} - (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{ - if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok; + if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){dy::GrayFrame frame=[self toolGrayFrame:src[0] error:nil];if(frame.valid()){@synchronized(self){_toolSourceFrame=std::move(frame);_toolSourceTime=t;}}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok; } - (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});} - (void)exportRequested:(NSNotification*)n{ diff --git a/大鱼调色/Plugin/DYRenderer.h b/大鱼调色/Plugin/DYRenderer.h index e37db2c..cb5bb52 100644 --- a/大鱼调色/Plugin/DYRenderer.h +++ b/大鱼调色/Plugin/DYRenderer.h @@ -20,6 +20,16 @@ /// Analysis preview retains the host texture's original row order separately. - (NSData*)lookLUTPreview; - (void)invalidatePreview; +/// Final-output scopes run only while the auxiliary workspace is visible. +- (void)setScopeEnabled:(BOOL)enabled; +/// Call after the final destination render succeeds, while the tile is valid. +/// Only the small GPU readback waits here; conversion/statistics are coalesced +/// on a worker. No main-queue wait or host API is performed by this method. +- (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time; +/// Straight float RGBA, 320x180, visually top row first. Consult metadata domain. +- (NSData *)scopePreview; +/// Includes waveform/parade RGBA8 rasters, histogram and honest color-domain labels. +- (NSDictionary *)scopeMetadata; - (NSDictionary*)colorContext; - (BOOL)renderSource:(FxImageTile*)source destination:(FxImageTile*)destination uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error; - (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)uniforms paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state error:(NSError**)error; diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm index ea291b8..37bd33d 100644 --- a/大鱼调色/Plugin/DYRenderer.mm +++ b/大鱼调色/Plugin/DYRenderer.mm @@ -18,6 +18,8 @@ #include #include #include +#include "DYScopeMath.hpp" +#import "DYScopeSample.h" static BOOL fail(NSError**e,NSString*m){if(e)*e=[NSError errorWithDomain:@"com.dayu.color" code:1 userInfo:@{NSLocalizedDescriptionKey:m?:@"Metal 调色失败"}];return NO;} // MRC NSError out-parameters must outlive every nested render pool. Preserve // the same pointer across nested closures, then autorelease in the caller pool. @@ -111,15 +113,23 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData BOOL _exporting; NSDictionary *_toolDocument,*_colorContext,*_exportManagedState; BOOL _managedFinishing; + dispatch_queue_t _scopeQueue; + BOOL _scopeEnabled,_scopeWorkerRunning; + NSUInteger _scopeGeneration; + DYScopeSample *_scopePending; + NSData *_scopePreview; + NSDictionary *_scopeMetadata; + DYColorProfile *_scopeProfile; } @end @implementation DYRenderer +#include "DYScopeCapture.inc.h" #include "DYFilmRender.inc.h" #include "DYPrimaryRender.inc.h" #include "DYManagedRender.inc.h" #include "DYToolRender.inc.h" -- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;} -- (void)dealloc{[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];} +- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;} +- (void)dealloc{[_scopePending release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_histogram release];[_colorContext release];[_previewLock release];[super dealloc];} - (void)trimPreparedLUTsKeeping:(NSString *)path { if(_preparedLUTs.count<=12)return; for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key]; @@ -153,7 +163,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData NSURL*url=[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]; idlib=[d newLibraryWithURL:url error:err];if(!lib){[d release];return nil;} idq=[d newCommandQueue];entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"library":lib,@"queue":q,@"pipelines":[NSMutableDictionary dictionary]}]; - for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){idf=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}uint64_t pipelineSpan=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":fn,@"gpu":d.name?:@"unknown"});idp=[d newComputePipelineStateWithFunction:f error:err];DYBetaSpanEnd(pipelineSpan,@{@"status":p?@"passed":@"failed"});[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];} + for(NSString*fn in @[@"dyUnpremultiply",@"dyWhitesSceneStatistics",@"dyLUTExportKernel",@"dyInputAnalysis",@"dyScopeSample",@"dyColorManagement",@"dyToolBlend",@"dyToolSkin",@"dyFilmPoint",@"dyFilmNoise",@"dyFilmSparseBlur",@"dyFilmBloomEdges",@"dyFilmMix",@"dyFilmPrint"]){idf=[lib newFunctionWithName:fn];if(!f){fail(err,[fn stringByAppendingString:@" 缺失"]);[lib release];[q release];[d release];return nil;}uint64_t pipelineSpan=DYBetaSpanBegin(@"gpu_pipeline",@{@"pipeline":fn,@"gpu":d.name?:@"unknown"});idp=[d newComputePipelineStateWithFunction:f error:err];DYBetaSpanEnd(pipelineSpan,@{@"status":p?@"passed":@"failed"});[f release];if(!p){[lib release];[q release];[d release];return nil;}entry[fn]=p;[p release];} float identity[32];for(int z=0;z<2;z++)for(int y=0;y<2;y++)for(int x=0;x<2;x++){int i=((z*2+y)*2+x)*4;identity[i]=x;identity[i+1]=y;identity[i+2]=z;identity[i+3]=1;}idneutral=texture3D(d,identity,2);if(!neutral){fail(err,@"无法分配中性 LUT");return nil;}entry[@"identity"]=neutral; // Preparing before the first frame may use registry 0. Reuse those pipelines // when the host subsequently supplies that device's actual registry ID. diff --git a/大鱼调色/Plugin/DYScopeCapture.inc.h b/大鱼调色/Plugin/DYScopeCapture.inc.h new file mode 100644 index 0000000..3c81be5 --- /dev/null +++ b/大鱼调色/Plugin/DYScopeCapture.inc.h @@ -0,0 +1,61 @@ +// Included in DYRenderer's implementation; final destination sampling is kept +// separate from the earlier input-analysis thumbnail used by auto-grade/LUTs. +- (void)setScopeEnabled:(BOOL)enabled{ + @synchronized(_previewLock){if(_scopeEnabled==enabled)return;_scopeEnabled=enabled;_scopeGeneration++;[_scopePending release];_scopePending=nil;if(enabled){[_scopePreview release];_scopePreview=nil;[_scopeMetadata release];_scopeMetadata=nil;}} +} +- (NSData *)scopePreview{@synchronized(_previewLock){return [[_scopePreview retain]autorelease];}} +- (NSDictionary *)scopeMetadata{@synchronized(_previewLock){return [[_scopeMetadata retain]autorelease];}} +- (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time{ + NSUInteger generation;@synchronized(_previewLock){if(!_scopeEnabled||_exporting||!tile)return;generation=_scopeGeneration;} + @autoreleasepool{@try{ + NSDictionary *entry=nil,*context=nil;@synchronized(self){entry=[[self device:tile.deviceRegistryID error:nil]retain];context=[_colorContext copy];} + iddevice=entry[@"device"];idtexture=[tile metalTextureForDevice:device]; + if(!entry||!texture||!texture.width||!texture.height||texture.framebufferOnly){[entry release];[context release];return;} + idbuffer=[device newBufferWithLength:dyscope::Width*dyscope::Height*sizeof(dyscope::RGBA) options:MTLResourceStorageModeShared]; + idcommand=[entry[@"queue"]commandBuffer];idencoder=[command computeCommandEncoder]; + if(!buffer||!encoder){[buffer release];[entry release];[context release];return;} + uint32_t flip=tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT;[encoder setComputePipelineState:entry[@"dyScopeSample"]];[encoder setTexture:texture atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&flip length:sizeof(flip) atIndex:1]; + [encoder dispatchThreads:MTLSizeMake(dyscope::Width,dyscope::Height,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[encoder endEncoding];[command commit]; + // The host may recycle its destination as soon as render returns. Complete + // only this 320x180 readback while that ownership is still guaranteed. + // CPU profile conversion, plotting and UI notification do not block render. + [command waitUntilCompleted]; + if(command.status!=MTLCommandBufferStatusCompleted){[buffer release];[entry release];[context release];return;} + DYScopeSample *sample=[DYScopeSample new];sample.pixels=[NSData dataWithBytes:buffer.contents length:buffer.length];sample.generation=generation; + CGColorSpaceRef sourceSpace=DYManagedTileSpace(tile,[context[@"primaries"]integerValue]);sample.space=sourceSpace;if(sourceSpace)CGColorSpaceRelease(sourceSpace); + FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;BOOL whole=bounds.left==image.left&&bounds.right==image.right&&bounds.top==image.top&&bounds.bottom==image.bottom; + sample.metadata=@{@"time":@(CMTimeGetSeconds(time)),@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"source":context[@"destination"]?:@"宿主 RGB",@"wholeImage":@(whole),@"region":whole?@"整帧取样":@"仅当前宿主输出分块",@"width":@(dyscope::Width),@"height":@(dyscope::Height)}; + [buffer release];[entry release];[context release]; + BOOL start=NO;@synchronized(_previewLock){if(_scopeEnabled&&generation==_scopeGeneration){[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}}[sample release]; + if(start)dispatch_async(_scopeQueue,^{[self processPendingScopeSamples];}); + }@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}} +} +- (void)processPendingScopeSamples{ + for(;;){@autoreleasepool{ + DYScopeSample *sample=nil;@synchronized(_previewLock){sample=_scopePending;_scopePending=nil;if(!sample){_scopeWorkerRunning=NO;return;}} + const auto *raw=(const dyscope::RGBA*)sample.pixels.bytes;size_t count=sample.pixels.length/sizeof(dyscope::RGBA);std::vector pixels(count);uint64_t invalid=0; + for(size_t i=0;i reference;reference.reserve(pixels.size());for(const auto&p:pixels)reference.push_back({p.r,p.g,p.b,p.a}); + auto measurements=dyscope::measure(reference);measurements.nonfinite+=invalid; + auto wave=dyscope::densityImage(measurements.wave,false),parade=dyscope::densityImage(measurements.parade,true); + NSMutableDictionary *metadata=[[sample.metadata mutableCopy]autorelease]; + metadata[@"domain"]=converted?@"sRGB 显示参考":@"宿主 RGB(未换算)"; + metadata[@"note"]=converted?@"最终输出 · ICC 转扩展 sRGB · R′G′B′ 百分比;非 HDR / IRE 精密测量":(error?[NSString stringWithFormat:@"RGB 原值参考 · %@;波形按 709 权重参考,非 IRE",error.localizedDescription]:@"最终输出 · 空间未知;RGB 原值 / 709 权重波形参考,非显示 / HDR / IRE 测量"); + metadata[@"converted"]=@(converted);metadata[@"minimum"]=@(measurements.minimum);metadata[@"maximum"]=@(measurements.maximum);metadata[@"valid"]=@(measurements.valid);metadata[@"transparent"]=@(measurements.transparent>=invalid?measurements.transparent-invalid:0);metadata[@"nonfinite"]=@(measurements.nonfinite);metadata[@"below"]=@(measurements.below);metadata[@"above"]=@(measurements.above); + metadata[@"waveform"]=[NSData dataWithBytes:wave.data() length:wave.size()];metadata[@"parade"]=[NSData dataWithBytes:parade.data() length:parade.size()];metadata[@"histogram"]=[NSData dataWithBytes:measurements.histogram.data() length:sizeof(measurements.histogram)]; + BOOL publish=NO;@synchronized(_previewLock){if(_scopeEnabled&&sample.generation==_scopeGeneration){[_scopePreview release];_scopePreview=[[NSData alloc]initWithBytes:pixels.data() length:pixels.size()*sizeof(DYCompositeRGBA)];[_scopeMetadata release];_scopeMetadata=[metadata copy];publish=YES;}} + NSUInteger generation=sample.generation;[sample release]; + if(publish)dispatch_async(dispatch_get_main_queue(),^{BOOL active=NO;@synchronized(_previewLock){active=_scopeEnabled&&generation==_scopeGeneration;}if(active)[NSNotificationCenter.defaultCenter postNotificationName:@"DYScopeDidChange" object:self];}); + }} +} diff --git a/大鱼调色/Plugin/DYScopeMath.hpp b/大鱼调色/Plugin/DYScopeMath.hpp new file mode 100644 index 0000000..7f1becb --- /dev/null +++ b/大鱼调色/Plugin/DYScopeMath.hpp @@ -0,0 +1,49 @@ +#pragma once +#include +#include +#include +#include +#include +#include + +// Display-reference measurements only. Values remain unclipped; the plot +// covers -10%...110% and explicitly counts samples beyond that range. +namespace dyscope { +inline constexpr unsigned Width=320,Height=180,Bins=256; +inline constexpr float Low=-.1f,High=1.1f; +struct RGBA { float r,g,b,a; }; +struct Result { + std::vector wave=std::vector(Width*Bins),parade=std::vector(3*Width*Bins); + std::array histogram{}; + uint64_t valid=0,transparent=0,nonfinite=0,below=0,above=0; + float minimum=0,maximum=0; +}; +inline unsigned bin(float v){if(!(v>Low))return 0;if(v>=High)return Bins-1;return unsigned(std::clamp(std::lround((v-Low)/(High-Low)*(Bins-1)),0l,long(Bins-1)));} +inline Result measure(std::span pixels,unsigned width=Width,unsigned height=Height){ + Result r;if(!width||!height||pixels.size()!=size_t(width)*height)return r;bool first=true; + for(unsigned y=0;yHigh;r.valid++; + } + return r; +} +inline std::vector densityImage(std::span counts,bool parade){ + std::vector out(counts.size()*4);uint32_t maximum=0;for(uint32_t n:counts)maximum=std::max(maximum,n); + float divisor=std::log1p(float(maximum));unsigned width=parade?3*Width:Width; + for(size_t i=0;i0?std::pow(std::log1p(float(counts[i]))/divisor,.65f):0; + unsigned channel=parade?unsigned(i%width)/Width:3;uint8_t v=uint8_t(std::lround(intensity*255)); + out[i*4]=channel==0||channel==3?v:uint8_t(v*.14f);out[i*4+1]=channel==1||channel==3?v:uint8_t(v*.14f);out[i*4+2]=channel==2||channel==3?v:uint8_t(v*.14f);out[i*4+3]=255; + } + return out; +} +} diff --git a/大鱼调色/Plugin/DYScopeSample.h b/大鱼调色/Plugin/DYScopeSample.h new file mode 100644 index 0000000..2104759 --- /dev/null +++ b/大鱼调色/Plugin/DYScopeSample.h @@ -0,0 +1,9 @@ +#pragma once +#import +#import +@interface DYScopeSample : NSObject +@property(nonatomic,copy) NSData *pixels; +@property(nonatomic,copy) NSDictionary *metadata; +@property(nonatomic) NSUInteger generation; +@property(nonatomic) CGColorSpaceRef space; +@end diff --git a/大鱼调色/Plugin/DYScopeSample.mm b/大鱼调色/Plugin/DYScopeSample.mm new file mode 100644 index 0000000..f902832 --- /dev/null +++ b/大鱼调色/Plugin/DYScopeSample.mm @@ -0,0 +1,5 @@ +#import "DYScopeSample.h" +@implementation DYScopeSample +- (void)setSpace:(CGColorSpaceRef)space{if(_space==space)return;if(_space)CGColorSpaceRelease(_space);_space=space?CGColorSpaceRetain(space):nil;} +- (void)dealloc{[_pixels release];[_metadata release];if(_space)CGColorSpaceRelease(_space);[super dealloc];} +@end diff --git a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h index b3d3ec8..e1c86fd 100644 --- a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h @@ -16,7 +16,11 @@ 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+.06;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];BOOL update=NO;NSInteger part=0; - [osc hitTestOSCAtMousePositionX:480 mousePositionY:375 activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:480 positionY:345 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:480 positionY:345 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; + // Open the curve from the vertical rail, then place its editor across the + // mask drag destination. The ongoing mask gesture must retain ownership. + id viewer=[(id)osc valueForKey:@"viewerControls"];NSDictionary*curveButton=nil;for(NSDictionary*a in [viewer valueForKey:@"areas"])if([a[@"toolType"]isEqual:@"curve"])curveButton=a; + NSRect br=[curveButton[@"rect"]rectValue];double bx=NSMidX(br),by=400-NSMidY(br);[osc hitTestOSCAtMousePositionX:bx mousePositionY:by activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:bx positionY:by activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:bx positionY:by activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; + id panel=[[viewer valueForKey:@"panels"]lastObject];[panel setValue:[NSValue valueWithPoint:NSMakePoint(.63,.03)]forKey:@"position"]; [osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];int undo=base->_undoStarts; [osc hitTestOSCAtMousePositionX:260 mousePositionY:212.5 activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:260 positionY:212.5 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; [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(); diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index 0e39b76..b9e3cf2 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -14,7 +14,11 @@ float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return NSMakePoint(_imageRect.origin.x+u*_imageRect.size.width,_imageRect.origin.y+v*_imageRect.size.height); } - (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];} -- (NSRect)toolbarRectForItem:(NSInteger)item{CGFloat scale=_uiScale,x=MAX(8*scale,_imageRect.origin.x+12*scale),y=MAX(8*scale,_imageRect.origin.y+12*scale);NSInteger rows=MAX(1,_toolbarRows);return NSMakeRect(x+(item/rows)*38*scale,y+(item%rows)*39*scale,32*scale,34*scale);} +- (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); +} - (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]; @@ -38,7 +42,7 @@ for(NSDictionary *handle in _handles){NSPoint point=[handle[@"point"]pointValue];NSRect rect=NSMakeRect(point.x-4*_uiScale,point.y-4*_uiScale,8*_uiScale,8*_uiScale);[[NSColor colorWithWhite:.1 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:rect]fill];[NSColor.whiteColor setStroke];[[NSBezierPath bezierPathWithOvalInRect:rect]stroke];} NSArray *symbols=@[@"cursorarrow",@"point.topleft.down.to.point.bottomright.curvepath",@"rectangle",@"circle",@"line.diagonal",@"eyedropper",@"circle.lefthalf.filled",@"eye",@"xmark",@"checkmark",@"xmark.circle"]; NSInteger buttonCount=[mask[@"drawing"]boolValue]?11:9; - for(NSInteger i=0;i=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];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/DYViewerControls.inc.h b/大鱼调色/Plugin/DYViewerControls.inc.h index a5b41bb..3ea7516 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -1,5 +1,7 @@ -// Independently authored canvas UI. Hit geometry and drawing share the same layout. +// One OSC root owns a vertical tool rail and independent movable editors. +// Positions are view state; opening, moving and channel selection never edit a grade. #import "DYTheme.h" +#include "DYViewerParameterPanel.inc.h" static const NSInteger DYViewerPartBase=20000; @interface DYViewerControls : NSObject @property(nonatomic,retain) DYViewerParameterBridge *bridge; @@ -12,138 +14,69 @@ static const NSInteger DYViewerPartBase=20000; - (BOOL)mouseExited; - (BOOL)capturing; - (BOOL)finishCapture; +- (BOOL)headerAtPoint:(NSPoint)point; @end @implementation DYViewerControls { - DYViewerParameterBridge *_bridge;NSDictionary *_snapshot;NSArray *_nodes,*_rows;NSMutableArray *_areas; - NSString *_nodeID;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft,_positioned,_movingPanel;NSPoint _position,_panelStart; - NSInteger _page,_catalogPage,_capacity,_catalogCapacity,_hover,_pressed;NSPoint _down;NSDictionary *_captured; - double _draftValue,_downValue;CGFloat _knobOffset;CMTime _time,_downTime; + DYViewerParameterBridge *_bridge;NSMutableArray *_panels,*_areas;DYViewerParameterPanel *_capture; + NSRect _viewport,_rail;NSSize _size;CGFloat _scale;CMTime _time;NSInteger _pressed,_hover,_railPage;BOOL _hasViewport; } @synthesize bridge=_bridge; -- (instancetype)init{if((self=[super init])){_areas=[NSMutableArray new];_nodeID=[@"base:base" copy];_scale=1;_time=_downTime=kCMTimeInvalid;}return self;} -- (void)dealloc{[_bridge endGesture];[_bridge release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_captured release];[super dealloc];} -- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[_bridge endGesture];[_bridge release];_bridge=[bridge retain];_pressed=0;_dragging=NO;_movingPanel=NO;[_captured release];_captured=nil;} -- (BOOL)capturing{return _pressed!=0;} -- (BOOL)finishCapture{BOOL had=_pressed!=0;[_bridge endGesture];_pressed=0;_hasDraft=NO;_movingPanel=NO;_dragging=NO;[_captured release];_captured=nil;return had;} -- (NSDictionary*)descriptorForKey:(NSString*)key{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;} -- (NSDictionary*)node{for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:_nodeID])return n;return nil;} -- (double)valueForDescriptor:(NSDictionary*)d{ - if(_hasDraft&&_captured&&[_captured[@"descriptor"][@"pid"]isEqual:d[@"pid"]]&&_pressed)return _draftValue; - NSDictionary*n=[self node];DYUniforms u;NSData*raw=_snapshot[@"uniforms"];if(raw.length!=sizeof(u))return [d[@"default"]doubleValue]; - if([_nodeID hasPrefix:@"base:"])[raw getBytes:&u length:sizeof(u)];else u=DYToolUniforms(n[@"layer"]); - NSInteger offset=[d[@"offset"]integerValue];return offset>=0&&offset+sizeof(float)<=sizeof(u)?*(float*)((uint8_t*)&u+offset):[d[@"default"]doubleValue]; -} -- (void)addArea:(NSRect)rect part:(NSInteger)part kind:(NSString*)kind title:(NSString*)title descriptor:(NSDictionary*)d index:(NSInteger)index{ - NSMutableDictionary*a=[NSMutableDictionary dictionaryWithDictionary:@{@"rect":[NSValue valueWithRect:rect],@"part":@(part),@"kind":kind,@"title":title?:@"",@"index":@(index)}];if(d)a[@"descriptor"]=d;if([kind isEqual:@"module"]&&index<(NSInteger)_nodes.count)a[@"nodeID"]=_nodes[index][@"id"];[_areas addObject:a]; -} +- (instancetype)init{if((self=[super init])){_panels=[NSMutableArray new];_areas=[NSMutableArray new];_scale=1;_time=kCMTimeInvalid;}return self;} +- (void)dealloc{[self finishCapture];[_bridge release];[_panels release];[_areas release];[super dealloc];} +- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];} - (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;} -- (void)prepareWithSize:(NSSize)canvasSize scale:(CGFloat)scale atTime:(CMTime)time{ - _size=canvasSize;NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,canvasSize.width,canvasSize.height)):NSMakeRect(0,0,canvasSize.width,canvasSize.height);NSSize size=viewport.size;_scale=MAX(.6,MIN(MAX(1.,scale),MIN(size.width/360.,size.height/230.)));_time=time; - if(_pressed&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_downTime)!=0)){[self finishCapture];} - [_snapshot release];_snapshot=[[_bridge snapshotAtTime:time]retain];NSDictionary*doc=_snapshot[@"document"]; - NSMutableArray*nodes=[NSMutableArray array];NSMutableDictionary*counts=[NSMutableDictionary dictionary]; - for(NSString*ID in DYToolDisplayOrder(doc?:@{})){ - BOOL base=[ID hasPrefix:@"base:"];NSDictionary*layer=base?nil:DYToolWithID(doc,ID);NSString*type=base?[ID substringFromIndex:5]:layer[@"type"];if(!type||(base&&DYBaseToolRemoved(doc,type)))continue; - NSString*title=DYToolSection(type)[@"title"]?:type;if([type isEqual:@"base"])title=@"基础调整"; - NSInteger count=[counts[type]integerValue];counts[type]=@(count+1);if(!base)title=[title stringByAppendingFormat:@" · %ld",(long)(count+1)]; - [nodes addObject:@{@"id":ID,@"type":type,@"title":title,@"layer":layer?:@{}}]; - }[_nodes release];_nodes=[nodes copy]; - if(![self node]&&_nodes.count){[self finishCapture];[_nodeID release];_nodeID=[_nodes[0][@"id"]copy];_page=0;} - NSString*type=[self node][@"type"];NSMutableArray*rows=[NSMutableArray array]; - // These are the existing public scalar controls, never hidden curve-slot metadata. - NSArray*sections=[type isEqual:@"base"]?@[@"base",@"color"]:type?@[type]:@[]; - for(NSString*part in sections)for(NSDictionary*d in DYToolSection(part)[@"rows"]){NSString*k=d[@"key"];if(!d[@"pid"]||[k hasPrefix:@"cmbypass"]||[k isEqual:@"copyAutoGrade"]||([type isEqual:@"curve"]&&![k hasPrefix:@"curveY"]))continue;[rows addObject:d];} - [_rows release];_rows=[rows copy];[_areas removeAllObjects];if(!_bridge||size.width<120||size.height<80)return; - CGFloat s=_scale,margin=10*s,w=MIN(286*s,size.width-2*margin),x=viewport.origin.x+MAX(margin,size.width-w-margin);_capacity=MAX(1,MIN(5,(NSInteger)floor((size.height-192*s)/(46*s)))); - _catalogCapacity=MAX(2,MIN(8,2*(NSInteger)floor((size.height-2*margin-164*s)/(35*s))));if(size.width<200*s||size.height<230*s)_open=NO; - _page=MIN(MAX(0,_page),MAX(0,((NSInteger)_rows.count-1)/_capacity));_catalogPage=MIN(MAX(0,_catalogPage),MAX(0,((NSInteger)_nodes.count-1)/_catalogCapacity)); - CGFloat h=!_open?30*s:_catalog?(164+35*ceil(MIN((double)_catalogCapacity,MAX(0.,(double)_nodes.count-_catalogPage*_catalogCapacity))/2))*s:(164+46*MIN(_capacity,(NSInteger)_rows.count))*s; - CGFloat panelHeight=MIN(h,size.height-2*margin),top=viewport.origin.y+margin; - if(_positioned){x=MAX(viewport.origin.x+margin,MIN(NSMaxX(viewport)-margin-w,viewport.origin.x+_position.x*size.width));top=MAX(viewport.origin.y+margin,MIN(NSMaxY(viewport)-margin-panelHeight,viewport.origin.y+_position.y*size.height));_position=NSMakePoint((x-viewport.origin.x)/MAX(1.,size.width),(top-viewport.origin.y)/MAX(1.,size.height));} - _panel=NSMakeRect(x,top,w,panelHeight); - [self addArea:NSMakeRect(x,top,w,30*s) part:20000 kind:@"open" title:_open?@"⠿ 画面调色 ▴":@"⠿ 画面调色 ▾" descriptor:nil index:0];if(!_open)return; - CGFloat y=top+36*s;NSArray*shortTitles=@[@"一级",@"蜘蛛",@"基础",@"肤色",@"LUT",@"HSL",@"曲线",@"分级",@"原色",@"色阶",@"黑白",@"平衡",@"通道",@"胶片"]; - CGFloat toolWidth=(w-40*s)/7; - for(NSUInteger i=0;icap){[self addArea:NSMakeRect(x+8*s,y,29*s,23*s) part:20004 kind:@"previous" title:@"‹" descriptor:nil index:0];[self addArea:NSMakeRect(NSMaxX(_panel)-37*s,y,29*s,23*s) part:20005 kind:@"next" title:@"›" descriptor:nil index:0];} +- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{ + _size=size;_time=time;NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersectionRect(_viewport,bounds):bounds;_viewport=v; + _scale=MAX(.6,MIN(MAX(1.,scale),MIN(v.size.width/420.,v.size.height/350.)));CGFloat s=_scale; + for(DYViewerParameterPanel*p in [[_panels copy]autorelease]){if(!p.visible){if(p==_capture){[p finishCapture];_capture=nil;}p.bridge=nil;[_panels removeObjectIdenticalTo:p];continue;}[p setViewport:v];[p prepareWithSize:size scale:s atTime:time];} + if(_capture&&![_capture capturing])_capture=nil; + [_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return; + NSInteger cap=MAX(1,MIN(14,(NSInteger)floor((v.size.height-72*s)/(30*s))));NSInteger pages=(14+cap-1)/cap;_railPage=MAX(0,_railPage)%pages; + CGFloat x=NSMinX(v)+8*s,y=NSMinY(v)+8*s,w=40*s; + _rail=NSMakeRect(x,y,w,(30*MIN(cap,14-_railPage*cap)+54+(pages>1?24:0))*s); + NSArray*titles=@[@"一级",@"蜘蛛",@"基础",@"肤色",@"LUT",@"HSL",@"曲线",@"分级",@"原色",@"色阶",@"黑白",@"平衡",@"通道",@"胶片"]; + for(NSInteger j=0;j1){[_areas addObject:@{@"part":@20003,@"kind":@"railPage",@"title":@"↕",@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,end-24*s,w-8*s,22*s)]}];} + [_areas addObject:@{@"part":@20001,@"kind":@"workspace",@"title":@"◫",@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,end,w-8*s,26*s)]}]; + [_areas addObject:@{@"part":@20002,@"kind":@"hidePanels",@"title":@"收",@"rect":[NSValue valueWithRect:NSMakeRect(x+4*s,end+27*s,w-8*s,18*s)]}]; } -- (NSRect)trackForArea:(NSDictionary*)area{NSRect r=[area[@"rect"]rectValue];return NSMakeRect(r.origin.x+5*_scale,r.origin.y+28*_scale,r.size.width-10*_scale,4*_scale);} -- (void)text:(NSString*)text rect:(NSRect)rect size:(CGFloat)size color:(NSColor*)color alignment:(NSTextAlignment)alignment{ - NSMutableParagraphStyle*p=[[[NSMutableParagraphStyle alloc]init]autorelease];p.lineBreakMode=NSLineBreakByTruncatingTail;p.alignment=alignment; - [text drawInRect:rect withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size*_scale weight:NSFontWeightMedium],NSForegroundColorAttributeName:color,NSParagraphStyleAttributeName:p}]; -} -- (NSString*)valueText:(NSDictionary*)d value:(double)v{ - if([d[@"kind"]isEqual:@"bool"])return v>.5?@"开启":@"关闭"; - if([d[@"kind"]isEqual:@"popup"]){NSArray*values=d[@"values"],*options=d[@"options"];NSInteger i=values?[values indexOfObject:@((NSInteger)llround(v))]:(NSInteger)llround(v);return i>=0&&i<(NSInteger)options.count?options[i]:@"—";} - return [NSString stringWithFormat:[d[@"max"]doubleValue]-[d[@"min"]doubleValue]>20?@"%.1f":@"%.2f",v]; +- (NSInteger)partAtPoint:(NSPoint)p{ + if(!_bridge||!std::isfinite(p.x)||!std::isfinite(p.y)||!NSPointInRect(p,_viewport))return 0; + for(NSDictionary*a in _areas)if(NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];if(NSPointInRect(p,_rail))return 20000; + for(NSInteger i=_panels.count-1;i>=0;i--){NSInteger part=[_panels[i]partAtPoint:p];if(part)return 100000+(i+1)*10000+(part-20000);} + return 0; } +- (BOOL)headerAtPoint:(NSPoint)p{if(NSPointInRect(p,_rail))return NO;for(DYViewerParameterPanel*panel in [_panels reverseObjectEnumerator]){NSInteger part=[panel partAtPoint:p];if(part)return part==20000;}return NO;} - (void)draw{ - if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height)));CGFloat s=_scale;NSColor*ink=DYThemeColor(@"ink")?:NSColor.whiteColor,*accent=DYThemeColor(@"accent")?:NSColor.systemCyanColor; - NSBezierPath*panel=[NSBezierPath bezierPathWithRoundedRect:_panel xRadius:9*s yRadius:9*s];DYDrawThemeSurface(panel,YES); - for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];NSInteger part=[a[@"part"]integerValue];NSString*kind=a[@"kind"];BOOL pressed=_pressed==part,hover=_hover==part;NSDictionary*d=a[@"descriptor"]; - if([kind isEqual:@"slider"]){double v=[self valueForDescriptor:d],lo=[d[@"min"]doubleValue],hi=[d[@"max"]doubleValue];CGFloat ratio=hi>lo?MAX(0.,MIN(1.,(v-lo)/(hi-lo))):0;NSRect track=[self trackForArea:a]; - [self text:a[@"title"] rect:NSMakeRect(r.origin.x,r.origin.y,r.size.width-68*s,18*s) size:11 color:ink alignment:NSTextAlignmentLeft];[self text:[self valueText:d value:v] rect:NSMakeRect(NSMaxX(r)-68*s,r.origin.y,68*s,18*s) size:11 color:hover||pressed?accent:ink alignment:NSTextAlignmentRight]; - DYDrawSoftControl(NSInsetRect(track,-2*s,-3*s),5*s,YES,NO,NO);[accent setFill];[[NSBezierPath bezierPathWithRoundedRect:NSMakeRect(track.origin.x,track.origin.y,MAX(2*s,track.size.width*ratio),track.size.height) xRadius:2*s yRadius:2*s]fill]; - CGFloat marker=MAX(0.,MIN(1.,([d[@"default"]doubleValue]-lo)/(hi-lo)));[ink setStroke];NSBezierPath*tick=[NSBezierPath bezierPath];[tick moveToPoint:NSMakePoint(track.origin.x+marker*track.size.width,NSMidY(track)-5*s)];[tick lineToPoint:NSMakePoint(track.origin.x+marker*track.size.width,NSMidY(track)+5*s)];tick.lineWidth=.7*s;[tick stroke]; - DYDrawSoftControl(NSMakeRect(track.origin.x+ratio*track.size.width-6*s,NSMidY(track)-6*s,12*s,12*s),6*s,NO,hover||pressed,pressed); - }else{ - BOOL selected=([kind isEqual:@"module"]&&[a[@"nodeID"]isEqual:_nodeID])||([kind isEqual:@"tool"]&&[a[@"toolType"]isEqual:[self node][@"type"]]);BOOL on=([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])&&[self valueForDescriptor:d]>.5; - DYDrawSoftControl(r,5*s,NO,hover||selected||on,pressed);NSString*title=a[@"title"]; - if(d&&![kind isEqual:@"reset"]){NSString*value=[self valueText:d value:[self valueForDescriptor:d]];title=[kind isEqual:@"headerBool"]?[title stringByAppendingString:[self valueForDescriptor:d]>.5?@"●":@"○"]:[NSString stringWithFormat:@"%@ %@%@",title,value,[kind isEqual:@"choice"]?@" ›":@""];} - [self text:title rect:NSInsetRect(r,5*s,5*s) size:[kind isEqual:@"open"]?12:11 color:[kind isEqual:@"toolUnavailable"]?[ink colorWithAlphaComponent:.35]:ink alignment:NSTextAlignmentCenter]; - } + if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(_viewport);CGFloat s=_scale;NSColor*ink=DYThemeColor(@"text"),*accent=DYThemeColor(@"accent");for(DYViewerParameterPanel*p in _panels)[p draw];DYDrawThemeSurface([NSBezierPath bezierPathWithRoundedRect:_rail xRadius:8*s yRadius:8*s],YES); + for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=NO;for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES; + BOOL hover=_hover==[a[@"part"]integerValue];DYDrawSoftControl(r,5*s,NO,selected||hover,_pressed==[a[@"part"]integerValue]); + NSMutableParagraphStyle*style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter; + [a[@"title"]drawInRect:NSInsetRect(r,1*s,4*s) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:([a[@"kind"]isEqual:@"workspace"]?16:10)*s weight:NSFontWeightMedium],NSForegroundColorAttributeName:selected?accent:ink,NSParagraphStyleAttributeName:style}]; } - if(_open){NSInteger cap=_catalog?_catalogCapacity:_capacity,total=_catalog?_nodes.count:_rows.count,page=_catalog?_catalogPage:_page;NSString*hint=total>cap?[NSString stringWithFormat:@"%ld / %ld",(long)(page+1),(long)((total+cap-1)/cap)]:(_snapshot?@"拖动调节 · ↺ 还原此项":@"请移动播放头以读取画面");NSDictionary*hoverArea=[self areaForPart:_hover];if(_hover==20000||_movingPanel)hint=@"按住标题拖动位置 · 单击收起";else if(hoverArea[@"help"])hint=hoverArea[@"help"];[self text:hint rect:NSMakeRect(_panel.origin.x+40*s,NSMaxY(_panel)-23*s,_panel.size.width-80*s,18*s) size:10 color:ink alignment:NSTextAlignmentCenter];} + for(NSDictionary*a in _areas)if(_hover==[a[@"part"]integerValue]){NSString*help=[a[@"kind"]isEqual:@"workspace"]?@"打开示波器与 LUT 工作区":[a[@"kind"]isEqual:@"hidePanels"]?@"收起所有画布面板":a[@"toolType"]?DYToolSection(a[@"toolType"])[@"title"]:@"下一组工具";NSRect r=[a[@"rect"]rectValue];NSRect tip=NSMakeRect(NSMaxX(_rail)+6*s,NSMinY(r),MIN(200*s,NSMaxX(_viewport)-NSMaxX(_rail)-10*s),25*s);if(tip.size.width>40*s){DYDrawThemeSurface([NSBezierPath bezierPathWithRoundedRect:tip xRadius:4*s yRadius:4*s],YES);[help drawInRect:NSInsetRect(tip,6*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:ink}];}break;} [NSGraphicsContext restoreGraphicsState]; } -- (NSInteger)partAtPoint:(NSPoint)p{if(!std::isfinite(p.x)||!std::isfinite(p.y)||!_bridge||!NSPointInRect(p,NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height))))return 0;for(NSDictionary*a in [_areas reverseObjectEnumerator])if(![a[@"kind"]isEqual:@"toolUnavailable"]&&NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];return _open&&NSPointInRect(p,_panel)?20006:0;} -- (NSDictionary*)areaForPart:(NSInteger)part{for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==part)return a;return nil;} -- (void)applySliderPoint:(NSPoint)p{ - NSRect t=[self trackForArea:_captured];NSDictionary*d=_captured[@"descriptor"];double ratio=MAX(0.,MIN(1.,(p.x-_knobOffset-t.origin.x)/MAX(1.,t.size.width)));_draftValue=[d[@"min"]doubleValue]+ratio*([d[@"max"]doubleValue]-[d[@"min"]doubleValue]);[_bridge changeValue:_draftValue]; -} -- (void)clickArea:(NSDictionary*)a{ - NSString*kind=a[@"kind"];if([kind isEqual:@"open"]||[kind isEqual:@"close"]){_open=!_open;_catalog=NO;return;}if([kind isEqual:@"catalog"]){_catalog=!_catalog;return;} - if([kind isEqual:@"module"]||[kind isEqual:@"tool"]){for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:a[@"nodeID"]]){[_nodeID release];_nodeID=[a[@"nodeID"]copy];_catalog=NO;_page=0;break;}return;} - if([kind isEqual:@"previous"]||[kind isEqual:@"next"]){NSInteger total=_catalog?_nodes.count:_rows.count,cap=_catalog?_catalogCapacity:_capacity,count=MAX(1,(total+cap-1)/cap),delta=[kind isEqual:@"next"]?1:-1;if(_catalog)_catalogPage=(_catalogPage+delta+count)%count;else _page=(_page+delta+count)%count;return;} - NSDictionary*d=a[@"descriptor"];if(!d||!_snapshot)return;double old=[self valueForDescriptor:d],v=old; - if([kind isEqual:@"reset"])v=[d[@"default"]doubleValue];else if([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])v=old>.5?0:1;else if([kind isEqual:@"choice"]){NSArray*values=d[@"values"],*options=d[@"options"];NSInteger i=values?[values indexOfObject:@((NSInteger)llround(old))]:(NSInteger)llround(old);if(!options.count)return;i=(i+1)%options.count;v=values?[values[i]doubleValue]:i;} - [_bridge beginParameter:d node:_nodeID value:old atTime:_time];[_bridge changeValue:v];[_bridge endGesture]; -} -- (void)movePanelToPointer:(NSPoint)p{ - NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,_size.width,_size.height)):NSMakeRect(0,0,_size.width,_size.height);CGFloat margin=10*_scale; - CGFloat x=MAX(NSMinX(viewport)+margin,MIN(NSMaxX(viewport)-margin-_panel.size.width,_panelStart.x+p.x-_down.x)),y=MAX(NSMinY(viewport)+margin,MIN(NSMaxY(viewport)-margin-_panel.size.height,_panelStart.y+p.y-_down.y)); - _position=NSMakePoint((x-viewport.origin.x)/MAX(1.,viewport.size.width),(y-viewport.origin.y)/MAX(1.,viewport.size.height));_positioned=YES;_movingPanel=YES;[self prepareWithSize:_size scale:_scale atTime:_time]; +- (void)activateTool:(NSString*)type{ + for(DYViewerParameterPanel*p in [[_panels copy]autorelease])if([p.toolType isEqual:type]){[p finishCapture];p.bridge=nil;[_panels removeObjectIdenticalTo:p];return;} + DYViewerParameterPanel*p=[[[DYViewerParameterPanel alloc]init]autorelease];p.toolType=type;p.bridge=_bridge; + CGFloat x=(_rail.size.width+24*_scale)/MAX(1.,_viewport.size.width),offset=(_panels.count%4)*22*_scale; + [p setInitialPosition:NSMakePoint(x+offset/MAX(1.,_viewport.size.width),(8*_scale+offset)/MAX(1.,_viewport.size.height))];[_panels addObject:p]; } - (BOOL)event:(NSEventType)type point:(NSPoint)p atTime:(CMTime)time{ - if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time];NSInteger hit=[self partAtPoint:p]; - if(type==NSEventTypeLeftMouseDown){if(!hit)return NO;[_bridge endGesture];_hasDraft=NO;_pressed=hit;_down=p;_panelStart=_panel.origin;_downTime=time;_dragging=NO;_movingPanel=NO;[_captured release];_captured=[[self areaForPart:hit]copy];NSDictionary*d=_captured[@"descriptor"]; - if([_captured[@"kind"]isEqual:@"slider"]&&_snapshot){NSRect t=[self trackForArea:_captured];if(NSPointInRect(p,NSInsetRect(t,-8*_scale,-8*_scale))){_downValue=[self valueForDescriptor:d];_draftValue=_downValue;_hasDraft=YES;[_bridge beginParameter:d node:_nodeID value:_downValue atTime:time];CGFloat knob=t.origin.x+(_downValue-[d[@"min"]doubleValue])/([d[@"max"]doubleValue]-[d[@"min"]doubleValue])*t.size.width;_knobOffset=fabs(p.x-knob)<=8*_scale?p.x-knob:0;if(fabs(p.x-knob)>8*_scale)[self applySliderPoint:p];}}return YES; + if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time]; + if(_capture){BOOL used=[_capture event:type point:p atTime:time];if(![_capture capturing]){_capture=nil;[self prepareWithSize:_size scale:_scale atTime:time];}return used;} + NSInteger hit=[self partAtPoint:p]; + if(type==NSEventTypeLeftMouseDown){ + if(hit>=100000){NSInteger index=(hit-100000)/10000-1;if(index<0||index>=(NSInteger)_panels.count)return NO;DYViewerParameterPanel*panel=[[_panels[index]retain]autorelease];[_panels removeObjectIdenticalTo:panel];[_panels addObject:panel];_capture=panel;return [panel event:type point:p atTime:time];} + if(!hit)return NO;_pressed=hit;return YES; } if(!_pressed)return NO; - if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&[_captured[@"kind"]isEqual:@"open"])[self movePanelToPointer:p];if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;} - if(type==NSEventTypeLeftMouseUp){if([_captured[@"kind"]isEqual:@"open"]&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed; - if(slider){if(_hasDraft&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self applySliderPoint:p];[_bridge endGesture];} - _pressed=0;_dragging=NO;_movingPanel=NO;_hasDraft=NO;[_captured release];_captured=nil;if(!moved&&!slider&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;} - return NO; + if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"workspace"])[_bridge requestWorkspace];else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_scale atTime:time];} + return YES; } -- (BOOL)mouseMoved:(NSPoint)p{NSInteger part=[self partAtPoint:p];BOOL changed=part!=_hover;_hover=part;return changed;} -- (BOOL)mouseExited{BOOL changed=_hover!=0;_hover=0;return changed;} +- (BOOL)capturing{return _pressed||[_capture capturing];} +- (BOOL)finishCapture{BOOL had=[self capturing];for(DYViewerParameterPanel*p in _panels)[p finishCapture];_capture=nil;_pressed=0;return had;} +- (BOOL)mouseMoved:(NSPoint)p{NSInteger h=[self partAtPoint:p];BOOL changed=h!=_hover;_hover=h;for(DYViewerParameterPanel*panel in _panels)changed=[panel mouseMoved:p]||changed;return changed;} +- (BOOL)mouseExited{BOOL changed=_hover!=0;_hover=0;for(DYViewerParameterPanel*p in _panels)changed=[p mouseExited]||changed;return changed;} @end diff --git a/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h b/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h index 9c68d44..2b6b855 100644 --- a/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h @@ -3,67 +3,68 @@ DYToolCanvasProbe*host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero; idbridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host]; idcontrols=(id)[NSClassFromString(@"DYViewerControls")new];controls.bridge=bridge; - auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.03;while(NSProcessInfo.processInfo.systemUptime_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[controls prepareWithSize:NSMakeSize(640,400) scale:1 atTime:host->_time];}; - auto areaFor=[&](NSString*kind,NSString*key)->NSDictionary*{for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"kind"]isEqual:kind]&&(!key||[a[@"descriptor"][@"key"]isEqual:key]))return [[a copy]autorelease];return nil;}; - auto click=[&](NSDictionary*a){NSRect r=[a[@"rect"]rectValue];NSPoint p=NSMakePoint(NSMidX(r),NSMidY(r));[controls event:NSEventTypeLeftMouseDown point:p atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:p atTime:host->_time];}; + NSSize size=NSMakeSize(1280,720); + auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.04;while(NSProcessInfo.processInfo.systemUptime_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[controls prepareWithSize:size scale:1 atTime:host->_time];}; + auto areaFor=[&](id owner,NSString*kind,NSString*key)->NSDictionary*{for(NSDictionary*a in [owner valueForKey:@"areas"])if([a[@"kind"]isEqual:kind]&&(!key||[a[@"descriptor"][@"key"]isEqual:key]||[a[@"toolType"]isEqual:key]||[a[@"nodeID"]isEqual:key]))return [[a copy]autorelease];return nil;}; + auto click=[&](NSDictionary*a){if(!a)return;NSRect r=[a[@"rect"]rectValue];NSPoint p=NSMakePoint(NSMidX(r),NSMidY(r));[controls event:NSEventTypeLeftMouseDown point:p atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:p atTime:host->_time];}; + auto panelFor=[&](NSString*type)->id{for(id panel in [controls valueForKey:@"panels"])if([[panel valueForKey:@"toolType"]isEqual:type])return panel;return nil;}; auto value=[&](NSString*key)->double{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return [base->_values[d[@"pid"]]doubleValue];return NAN;}; publish();int undo=base->_undoStarts;NSDictionary*initial=[[base->_values copy]autorelease]; - run.record(@"viewer-controls-start-collapsed-without-hidden-slider-hit",[[controls valueForKey:@"areas"]count]==1&&[controls partAtPoint:NSMakePoint(450,200)]==0); - NSRect header=[areaFor(@"open",nil)[@"rect"]rectValue];NSPoint hp=NSMakePoint(NSMidX(header),NSMidY(header)); - [controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(10,390) atTime:host->_time]; - NSRect movedHeader=[areaFor(@"open",nil)[@"rect"]rectValue];run.record(@"viewer-controls-collapsed-header-drag-moves-position-without-expanding",[[controls valueForKey:@"areas"]count]==1&&![controls capturing]&&fabs(movedHeader.origin.x-header.origin.x)>5&&[initial isEqual:base->_values]&&base->_undoStarts==undo); - click(areaFor(@"open",nil)); - run.record(@"viewer-controls-expand-is-separate-from-effect-enabling",areaFor(@"slider",@"exposure")!=nil&&[initial isEqual:base->_values]&&base->_undoStarts==undo); - NSMutableSet*visibleTypes=[NSMutableSet set];BOOL allSwitch=YES;for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"kind"]isEqual:@"tool"])[visibleTypes addObject:a[@"toolType"]]; - run.record(@"viewer-controls-show-all-fourteen-existing-tools-directly",visibleTypes.count==DYToolTypes().count&&[visibleTypes isEqual:[NSSet setWithArray:DYToolTypes()]]); - for(NSString*type in DYToolTypes()){NSDictionary*tool=nil;for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"toolType"]isEqual:type]){tool=[[a copy]autorelease];break;}NSString*ID=[[tool[@"nodeID"]copy]autorelease];click(tool);allSwitch&=[[controls valueForKey:@"nodeID"]isEqual:ID]&&[[controls valueForKey:@"rows"]count]>0;} - run.record(@"viewer-controls-direct-tool-switches-never-write-grading-parameters",allSwitch&&[initial isEqual:base->_values]&&base->_undoStarts==undo); - for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"toolType"]isEqual:@"base"]){click([[a copy]autorelease]);break;} - NSRect beforePanel=[[controls valueForKey:@"panel"]rectValue];NSMutableDictionary*beforeAreas=[NSMutableDictionary dictionary];for(NSDictionary*a in [controls valueForKey:@"areas"])beforeAreas[a[@"part"]]=a[@"rect"]; - header=[areaFor(@"open",nil)[@"rect"]rectValue];hp=NSMakePoint(NSMidX(header),NSMidY(header));[controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(hp.x+80,hp.y-5) atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(hp.x+130,hp.y-10) atTime:host->_time]; - NSRect afterPanel=[[controls valueForKey:@"panel"]rectValue];CGFloat dx=afterPanel.origin.x-beforePanel.origin.x,dy=afterPanel.origin.y-beforePanel.origin.y;BOOL groupMoves=fabs(dx-130)<1e-5&&fabs(dy+10)<1e-5; - for(NSDictionary*a in [controls valueForKey:@"areas"]){NSRect before=[beforeAreas[a[@"part"]]rectValue],after=[a[@"rect"]rectValue];groupMoves&=fabs(after.origin.x-before.origin.x-dx)<1e-5&&fabs(after.origin.y-before.origin.y-dy)<1e-5;} - run.record(@"viewer-controls-expanded-header-drag-moves-all-tool-and-parameter-hit-regions-together",groupMoves&&areaFor(@"slider",@"exposure")!=nil&&[initial isEqual:base->_values]&&base->_undoStarts==undo&&![controls capturing]); - header=[areaFor(@"open",nil)[@"rect"]rectValue];hp=NSMakePoint(NSMidX(header),NSMidY(header));[controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(hp.x+10,hp.y+5) atTime:host->_time];[controls prepareWithSize:NSMakeSize(640,400) scale:1 atTime:CMTimeMake(1,24)]; - run.record(@"viewer-controls-playhead-interruption-clears-all-panel-drag-state",![controls capturing]&&![[controls valueForKey:@"movingPanel"]boolValue]&&![[controls valueForKey:@"dragging"]boolValue]&&base->_undoStarts==undo);publish(); - NSRect resetRect=[areaFor(@"reset",@"exposure")[@"rect"]rectValue];NSPoint resetPoint=NSMakePoint(NSMidX(resetRect),NSMidY(resetRect));[controls event:NSEventTypeLeftMouseDown point:resetPoint atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(-1,-1) atTime:host->_time];drain(); - run.record(@"viewer-controls-ordinary-button-release-outside-still-cancels-action",[initial isEqual:base->_values]&&base->_undoStarts==undo); - - click(areaFor(@"headerBool",@"baseEnabled"));drain();publish(); - run.record(@"viewer-controls-tone-eye-does-not-misrepresent-the-separate-color-eye",value(@"baseEnabled")==0&&value(@"colorEnabled")==1&&areaFor(@"headerBool",@"colorEnabled")!=nil); - click(areaFor(@"headerBool",@"baseEnabled"));drain();publish();undo=base->_undoStarts; - NSDictionary*exposure=areaFor(@"slider",@"exposure");NSRect row=[exposure[@"rect"]rectValue];NSPoint label=NSMakePoint(row.origin.x+10,row.origin.y+5); + NSMutableSet*types=[NSMutableSet set];CGFloat x=-1,lastY=-1;BOOL vertical=YES; + for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(x>=0)vertical&=r.origin.x==x&&r.origin.y>lastY;x=r.origin.x;lastY=r.origin.y;[types addObject:a[@"toolType"]];} + run.record(@"viewer-vertical-rail-exposes-fourteen-tools-without-a-parameter-panel",vertical&&types.count==14&&[[controls valueForKey:@"panels"]count]==0); + BOOL allOpen=YES;for(NSString*type in DYToolTypes()){click(areaFor(controls,@"tool",type));allOpen&=panelFor(type)!=nil;} + run.record(@"viewer-tools-open-independent-panels-without-editing-the-grade",allOpen&&[[controls valueForKey:@"panels"]count]==14&&[initial isEqual:base->_values]&&base->_undoStarts==undo); + click(areaFor(controls,@"hidePanels",nil));click(areaFor(controls,@"tool",@"base"));id panel=panelFor(@"base"); + NSRect before=[[panel valueForKey:@"panel"]rectValue],header=[areaFor(panel,@"open",nil)[@"rect"]rectValue];NSPoint hp=NSMakePoint(NSMidX(header),NSMidY(header)); + [controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(hp.x+90,hp.y+20) atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(hp.x+140,hp.y+30) atTime:host->_time];NSRect after=[[panel valueForKey:@"panel"]rectValue]; + run.record(@"viewer-dragging-header-moves-panel-with-final-release-point-and-no-undo",fabs(after.origin.x-before.origin.x-140)<1e-5&&fabs(after.origin.y-before.origin.y-30)<1e-5&&![controls capturing]&&[initial isEqual:base->_values]&&base->_undoStarts==undo); + NSDictionary*exposure=areaFor(panel,@"slider",@"exposure");NSRect row=[exposure[@"rect"]rectValue],track=NSMakeRect(row.origin.x+5,row.origin.y+28,row.size.width-10,4);NSPoint knob=NSMakePoint(NSMidX(track),NSMidY(track)),label=NSMakePoint(row.origin.x+10,row.origin.y+5); [controls event:NSEventTypeLeftMouseDown point:label atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:label atTime:host->_time];drain(); - run.record(@"viewer-controls-clicking-a-label-does-not-change-the-grade",value(@"exposure")==0&&base->_undoStarts==undo); - NSRect track=NSMakeRect(row.origin.x+5,row.origin.y+28,row.size.width-10,4);NSPoint knob=NSMakePoint(NSMidX(track),NSMidY(track)); - [controls event:NSEventTypeLeftMouseDown point:knob atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(knob.x+1,knob.y+1) atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(knob.x+1,knob.y+1) atTime:host->_time];drain(); - run.record(@"viewer-controls-slider-deadzone-does-not-create-an-edit",value(@"exposure")==0&&base->_undoStarts==undo); - [controls event:NSEventTypeLeftMouseDown point:NSMakePoint(knob.x+5,knob.y) atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(knob.x+5+track.size.width*.1,knob.y) atTime:host->_time];drain(); - run.record(@"viewer-controls-knob-grab-preserves-offset-and-writes-live",fabs(value(@"exposure")-1)<1e-5&&[controls capturing]&&base->_undoStarts==undo+1&&base->_undoEnds==undo); - [controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(1000,500) atTime:host->_time];drain(); - run.record(@"viewer-controls-drag-remains-captured-outside-the-panel-and-clamps",value(@"exposure")==5&&[controls capturing]); - [controls event:NSEventTypeLeftMouseUp point:NSMakePoint(-100,500) atTime:host->_time];drain(); - run.record(@"viewer-controls-mouse-up-applies-final-position-and-closes-one-undo",value(@"exposure")==-5&&![controls capturing]&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);publish(); - click(areaFor(@"reset",@"exposure"));drain();publish();run.record(@"viewer-controls-explicit-reset-uses-existing-parameter-default",value(@"exposure")==0); - click(areaFor(@"catalog",nil));BOOL catalog=areaFor(@"module",nil)!=nil; - run.record(@"viewer-controls-hidden-parameter-subtree-has-no-hit-areas",catalog&&!areaFor(@"slider",@"exposure")); - initial=[[base->_values copy]autorelease];undo=base->_undoStarts;click(areaFor(@"module",nil));drain(); - run.record(@"viewer-controls-module-selection-does-not-write-grade-or-undo",[initial isEqual:base->_values]&&base->_undoStarts==undo); - NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,host->_time).document);NSDictionary*layer=DYInsertTool(doc,@"base",@"base:base");NSString*layerID=[[layer[@"id"]copy]autorelease];DYWriteTools(host,doc,host->_time);publish();click(areaFor(@"catalog",nil)); - NSDictionary*module=nil;for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"nodeID"]isEqual:layerID])module=[[a copy]autorelease];NSString*selected=[[[controls valueForKey:@"nodeID"]copy]autorelease];NSRect mr=[module[@"rect"]rectValue];NSPoint mp=NSMakePoint(NSMidX(mr),NSMidY(mr)); - [controls event:NSEventTypeLeftMouseDown point:mp atTime:host->_time];doc=DYMutablePlist(DYReadTools(host,host->_time).document);DYRemoveTool(doc,layerID);DYWriteTools(host,doc,host->_time);publish();[controls event:NSEventTypeLeftMouseUp point:mp atTime:host->_time]; - run.record(@"viewer-controls-module-button-retains-identity-when-a-layer-is-deleted-during-press",module&&[[controls valueForKey:@"nodeID"]isEqual:selected]);click(areaFor(@"catalog",nil)); - NSDictionary*open=areaFor(@"open",nil);NSRect openRect=[open[@"rect"]rectValue];NSPoint hover=NSMakePoint(NSMidX(openRect),NSMidY(openRect)); - run.record(@"viewer-controls-hover-and-exit-request-redraw-only-when-state-changes",[controls mouseMoved:hover]&&![controls mouseMoved:hover]&&[controls mouseExited]&&![controls mouseExited]); - click(open);run.record(@"viewer-controls-collapse-hides-the-entire-interactive-subtree",[[controls valueForKey:@"areas"]count]==1); - BOOL bounded=YES;for(NSSize size:{NSMakeSize(120,80),NSMakeSize(200,130),NSMakeSize(320,240),NSMakeSize(1280,720)})for(CGFloat scale:{1.,2.}){ - [controls prepareWithSize:size scale:scale atTime:host->_time];click(areaFor(@"open",nil)); - bounded&=[controls partAtPoint:NSMakePoint(-1,20)]==0&&[controls partAtPoint:NSMakePoint(size.width+1,20)]==0&&[controls partAtPoint:NSMakePoint(50,size.height+1)]==0; - for(NSDictionary*a in [controls valueForKey:@"areas"]){NSRect r=[a[@"rect"]rectValue];NSPoint center=NSMakePoint(NSMidX(r),NSMidY(r));if(center.x<0||center.y<0||center.x>=size.width||center.y>=size.height)bounded&=[controls partAtPoint:center]==0;} - } - run.record(@"viewer-controls-small-and-retina-canvases-never-hit-outside-visible-bounds",bounded); - [controls setViewport:NSMakeRect(40,30,560,315)];[controls prepareWithSize:NSMakeSize(640,400) scale:1 atTime:host->_time];NSRect anchored=[areaFor(@"open",nil)[@"rect"]rectValue]; - run.record(@"viewer-controls-entry-is-anchored-inside-the-host-image-not-letterbox",NSContainsRect(NSMakeRect(40,30,560,315),anchored)&&[controls partAtPoint:NSMakePoint(NSMidX(anchored),NSMidY(anchored))]==20000&&[controls partAtPoint:NSMakePoint(NSMidX(anchored),20)]==0); + [controls event:NSEventTypeLeftMouseDown point:knob atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(knob.x+1,knob.y+1)atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(knob.x+1,knob.y+1)atTime:host->_time];drain(); + run.record(@"viewer-label-and-knob-deadzone-do-not-create-edits",value(@"exposure")==0&&base->_undoStarts==undo); + [controls event:NSEventTypeLeftMouseDown point:NSMakePoint(knob.x+5,knob.y)atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(knob.x+5+track.size.width*.1,knob.y)atTime:host->_time];drain(); + run.record(@"viewer-slider-preserves-grab-offset-and-updates-live",fabs(value(@"exposure")-1)<1e-5&&[controls capturing]&&base->_undoStarts==undo+1&&base->_undoEnds==undo); + [controls event:NSEventTypeLeftMouseUp point:NSMakePoint(-100,1000)atTime:host->_time];drain();publish(); + run.record(@"viewer-slider-captures-outside-and-closes-one-undo",value(@"exposure")==-5&&![controls capturing]&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);click(areaFor(panel,@"reset",@"exposure"));drain();publish(); + click(areaFor(panel,@"headerBool",@"baseEnabled"));drain();publish();run.record(@"viewer-base-tone-and-color-eyes-remain-independent",value(@"baseEnabled")==0&&value(@"colorEnabled")==1);click(areaFor(panel,@"headerBool",@"baseEnabled"));drain();publish(); + click(areaFor(controls,@"tool",@"curve"));id curve=panelFor(@"curve"); + run.record(@"viewer-curve-opens-an-editable-graph-beside-existing-panel",curve&&panelFor(@"base")&&areaFor(curve,@"curvePlot",nil)&&!areaFor(curve,@"slider",nil)); + NSRect plot=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue];NSPoint point=NSMakePoint(plot.origin.x+.43*plot.size.width,plot.origin.y+.18*plot.size.height);undo=base->_undoStarts; + [controls event:NSEventTypeLeftMouseDown point:point atTime:host->_time];NSString*xKey=[[[curve valueForKey:@"captured"][@"xKey"]copy]autorelease],*yKey=[[[curve valueForKey:@"captured"][@"yKey"]copy]autorelease];drain(); + [controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(plot.origin.x+.54*plot.size.width,plot.origin.y+.23*plot.size.height)atTime:host->_time];drain(); + run.record(@"viewer-curve-point-is-live-xy-not-a-scalar-only-control",xKey&&yKey&&fabs(value(xKey)-.54)<1e-5&&fabs(value(yKey)-23)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo); + [controls event:NSEventTypeLeftMouseUp point:NSMakePoint(plot.origin.x+.61*plot.size.width,plot.origin.y+.3*plot.size.height)atTime:host->_time];drain();publish(); + run.record(@"viewer-curve-final-release-commits-both-axes-with-one-undo",fabs(value(xKey)-.61)<1e-5&&fabs(value(yKey)-9)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + undo=base->_undoStarts;NSDictionary*deleteArea=areaFor(curve,@"deletePoint",nil);click(deleteArea);drain();publish(); + run.record(@"viewer-curve-delete-deactivates-the-selected-slot",deleteArea&&value(xKey)==-1&&value(yKey)==0&&base->_undoStarts==undo+1); + NSDictionary*red=nil;for(NSDictionary*a in [curve valueForKey:@"areas"])if([a[@"kind"]isEqual:@"channel"]&&[a[@"index"]integerValue]==1)red=[[a copy]autorelease];undo=base->_undoStarts;click(red);drain(); + run.record(@"viewer-curve-channel-switch-is-view-state-with-no-undo",[[curve valueForKey:@"channel"]integerValue]==1&&base->_undoStarts==undo); + click(areaFor(controls,@"tool",@"grading"));id grading=panelFor(@"grading");NSDictionary*wheel=areaFor(grading,@"wheel",nil);NSRect wr=[wheel[@"rect"]rectValue];NSPoint wp=NSMakePoint(NSMidX(wr)+wr.size.width*.2,NSMidY(wr));undo=base->_undoStarts; + [controls event:NSEventTypeLeftMouseDown point:wp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(NSMidX(wr),NSMidY(wr)-wr.size.width*.3)atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(NSMidX(wr),NSMidY(wr)-wr.size.width*.4)atTime:host->_time];drain();publish(); + run.record(@"viewer-grading-wheel-edits-hue-and-saturation-in-one-gesture",wheel&&fabs(value(@"grade0_0")-90)<1e-5&&fabs(value(@"grade0_1")-80)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1&&[[controls valueForKey:@"panels"]count]==3); + click(areaFor(grading,@"graphMode",nil));run.record(@"viewer-graph-panel-retains-precise-parameter-view",areaFor(grading,@"slider",nil)&&!areaFor(grading,@"wheel",nil)); + click(areaFor(grading,@"close",nil));run.record(@"viewer-closing-one-panel-preserves-other-graph-and-controls",!panelFor(@"grading")&&panelFor(@"curve")&&panelFor(@"base")); + // A repeated curve layer selects its UUID, rather than redirecting writes to root. + NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,host->_time).document);NSDictionary*layer=DYInsertTool(doc,@"curve",@"base:curve");NSString*layerID=[[layer[@"id"]copy]autorelease];DYWriteTools(host,doc,host->_time);publish(); + // Raise curve with an inert header click twice (collapse/reopen), then layer menu. + click(areaFor(curve,@"open",nil));click(areaFor(curve,@"open",nil));click(areaFor(curve,@"catalog",nil));NSDictionary*module=areaFor(curve,@"module",layerID);click(module); + run.record(@"viewer-floating-editor-layer-menu-selects-only-its-tool-type",module&&[[curve valueForKey:@"nodeID"]isEqual:layerID]&&[[curve valueForKey:@"nodes"]count]==2); + plot=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue];point=NSMakePoint(NSMidX(plot),NSMidY(plot));[controls event:NSEventTypeLeftMouseDown point:point atTime:host->_time];[controls prepareWithSize:size scale:1 atTime:CMTimeMake(1,24)]; + run.record(@"viewer-playhead-change-clears-graphic-capture",![controls capturing]);publish(); + doc=DYMutablePlist(DYReadTools(host,host->_time).document);DYRemoveTool(doc,layerID);DYWriteTools(host,doc,host->_time);publish();run.record(@"viewer-deleted-layer-falls-back-to-surviving-same-tool",[[curve valueForKey:@"nodeID"]isEqual:@"base:curve"]); + click(areaFor(controls,@"hidePanels",nil));BOOL bounded=YES; + for(NSSize next:{NSMakeSize(120,80),NSMakeSize(320,240),NSMakeSize(1280,720)})for(CGFloat scale:{1.,2.}){[controls setViewport:NSMakeRect(0,0,next.width,next.height)];[controls prepareWithSize:next scale:scale atTime:host->_time];bounded&=[controls partAtPoint:NSMakePoint(-1,20)]==0&&[controls partAtPoint:NSMakePoint(next.width+1,20)]==0&&[controls partAtPoint:NSMakePoint(30,next.height+1)]==0;} + run.record(@"viewer-small-and-retina-canvases-never-hit-outside-visible-image",bounded); + [controls setViewport:NSMakeRect(40,30,1160,650)];[controls prepareWithSize:size scale:1 atTime:host->_time];NSRect rail=[[controls valueForKey:@"rail"]rectValue];run.record(@"viewer-rail-is-anchored-to-image-and-not-letterbox",NSContainsRect(NSMakeRect(40,30,1160,650),rail)&&[controls partAtPoint:NSMakePoint(NSMidX(rail),20)]==0); + // Offscreen drawing checks the actual OSC renderer, without opening an APP. + [controls setViewport:NSMakeRect(0,0,1280,720)];[controls prepareWithSize:size scale:1 atTime:host->_time]; + for(NSString*type in @[@"base",@"curve",@"grading"]){click(areaFor(controls,@"tool",type));id p=panelFor(type);CGFloat px=[type isEqual:@"base"]?.05:[type isEqual:@"curve"]?.32:.59;[p setValue:[NSValue valueWithPoint:NSMakePoint(px,.1)]forKey:@"position"];} + [controls prepareWithSize:size scale:1 atTime:host->_time]; + NSBitmapImageRep*bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:1280 pixelsHigh:720 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:1280*4 bitsPerPixel:32]autorelease]; + [NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];NSAffineTransform*flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:720];[flip scaleXBy:1 yBy:-1];[flip concat];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:NSGraphicsContext.currentContext.CGContext flipped:YES]]; + [[NSColor colorWithCalibratedWhite:.2 alpha:1]setFill];NSRectFill(NSMakeRect(0,0,1280,720));[controls draw];[NSGraphicsContext restoreGraphicsState];NSString*png=[runtime stringByAppendingPathComponent:@"viewer-workspace.png"]; + run.record(@"viewer-real-osc-draws-vertical-rail-curves-and-wheels-offscreen",[[bitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:png atomically:YES],@{@"path":png}); [controls finishCapture];controls.bridge=nil;[bridge invalidate];drain();[controls release];[bridge release]; } diff --git a/大鱼调色/Plugin/DYViewerControlsProbe.h b/大鱼调色/Plugin/DYViewerControlsProbe.h index a842919..549d5b5 100644 --- a/大鱼调色/Plugin/DYViewerControlsProbe.h +++ b/大鱼调色/Plugin/DYViewerControlsProbe.h @@ -3,6 +3,7 @@ @property(nonatomic,retain) id bridge; - (void)setViewport:(NSRect)viewport; - (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time; +- (void)draw; - (NSInteger)partAtPoint:(NSPoint)point; - (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time; - (BOOL)mouseMoved:(NSPoint)point; diff --git a/大鱼调色/Plugin/DYViewerGraphics.inc.h b/大鱼调色/Plugin/DYViewerGraphics.inc.h new file mode 100644 index 0000000..fd80156 --- /dev/null +++ b/大鱼调色/Plugin/DYViewerGraphics.inc.h @@ -0,0 +1,71 @@ +// Methods of DYViewerParameterPanel. Geometry is shared by drawing and input. +- (double)graphicValue:(NSString*)key{return [self valueForDescriptor:[self descriptorForKey:key]];} +- (NSArray*)curveSlots{ + NSMutableArray*slots=[NSMutableArray array];NSInteger n=_channel==0?4:2; + for(NSInteger i=0;i p;p.push_back(NSMakePoint(0,0));for(NSDictionary*point in points)p.push_back(NSMakePoint([point[@"x"]doubleValue],[point[@"y"]doubleValue]));p.push_back(NSMakePoint(1,1)); + for(size_t i=1;islopes(p.size()-1),m(p.size());for(size_t i=0;i0?(slopes[i-1]+slopes[i])*.5:0; + for(size_t i=0;i3){m[i]=3*slopes[i]*a/v;m[i+1]=3*slopes[i]*b/v;}}} + NSBezierPath*curve=[NSBezierPath bezierPath];curve.lineWidth=1.8*s;size_t segment=0; + for(int sample=0;sample<=256;sample++){double x=sample/256.;while(segment+2p[segment+1].x)segment++;double width=MAX(.0001,p[segment+1].x-p[segment].x),t=MAX(0.,MIN(1.,(x-p[segment].x)/width)),t2=t*t,t3=t2*t;double y=(2*t3-3*t2+1)*p[segment].y+(t3-2*t2+t)*width*m[segment]+(-2*t3+3*t2)*p[segment+1].y+(t3-t2)*width*m[segment+1];NSPoint q=NSMakePoint(r.origin.x+x*r.size.width,r.origin.y+(1-MAX(0.,MIN(1.,y)))*r.size.height);if(sample==0)[curve moveToPoint:q];else[curve lineToPoint:q];} + NSColor*color=_channel==0?accent:_channel==1?NSColor.systemRedColor:_channel==2?NSColor.systemGreenColor:NSColor.systemBlueColor;[color setStroke];[curve stroke]; + for(NSDictionary*point in points){NSPoint q=[self curvePosition:point rect:r];BOOL selected=[point[@"xKey"]isEqual:_selectedX];[color setFill];NSBezierPath*dot=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4*s,q.y-4*s,8*s,8*s)];[dot fill];[(selected?NSColor.whiteColor:ink)setStroke];dot.lineWidth=(selected?2:1)*s;[dot stroke];} + [NSGraphicsContext restoreGraphicsState];[self text:@"0 输入 → 1" rect:NSMakeRect(r.origin.x,NSMaxY(r)+2*s,r.size.width,14*s)size:8 color:ink alignment:NSTextAlignmentCenter]; +} +- (void)beginGraphicAt:(NSPoint)p{ + if(!_snapshot||![self node])return;NSMutableDictionary*c=[[_captured mutableCopy]autorelease];NSRect r=[c[@"rect"]rectValue];NSString*xKey=nil,*yKey=nil; + if([c[@"kind"]isEqual:@"curvePlot"]){NSDictionary*nearest=nil;double distance=12*_scale;for(NSDictionary*point in [self curvePoints]){NSPoint q=[self curvePosition:point rect:r];double d=hypot(q.x-p.x,q.y-p.y);if(dr.size.width*.5)return;NSInteger i=[c[@"index"]integerValue];xKey=[NSString stringWithFormat:@"grade%ld_0",(long)i];yKey=[NSString stringWithFormat:@"grade%ld_1",(long)i];} + NSDictionary*xd=[self descriptorForKey:xKey],*yd=[self descriptorForKey:yKey];if(!xd||!yd)return;c[@"xKey"]=xKey;c[@"yKey"]=yKey; + [_captured release];_captured=[c copy];NSDictionary*values=@{xKey:@([self graphicValue:xKey]),yKey:@([self graphicValue:yKey])};[_bridge beginParameters:@[xd,yd]node:_nodeID values:values atTime:_time]; + if([c[@"newPoint"]boolValue]||[c[@"kind"]isEqual:@"wheel"])[self updateGraphicAt:p]; +} +- (void)updateGraphicAt:(NSPoint)p{ + NSString*xKey=_captured[@"xKey"],*yKey=_captured[@"yKey"];if(!xKey||!yKey)return;NSRect r=[_captured[@"rect"]rectValue];double x,y; + if([_captured[@"kind"]isEqual:@"curvePlot"]){x=MAX(.001,MIN(.999,(p.x-r.origin.x)/MAX(1.,r.size.width)));double output=MAX(0.,MIN(1.,1-(p.y-r.origin.y)/MAX(1.,r.size.height))); + for(NSDictionary*point in [self curvePoints])if(![point[@"xKey"]isEqual:xKey]){double other=[point[@"x"]doubleValue];if(fabs(x-other)<.001)x=x*)descriptors node:(NSString*)nodeID values:(NSDictionary*)values atTime:(CMTime)time; +// Every sample supplies every key selected by beginParameters. Invalid or +// incomplete samples are rejected as a unit, before the first host write. +- (void)changeValues:(NSDictionary*)values; - (void)endGesture; // Call before the owning plug-in releases this object during teardown. - (void)invalidate; +- (void)requestWorkspace; @end static BOOL DYViewerSameValue(double a,double b) { @@ -49,10 +54,10 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { // The fields below are confined to the main queue. id _writerHost,_writerTarget; - NSDictionary *_writerDescriptor,*_writerCompanions; + NSArray *_writerDescriptors; + NSDictionary *_writerLastValues,*_writerCompanions; NSString *_writerNode,*_writerType; CMTime _writerTime; - double _writerLastValue; uint64_t _writerGesture; BOOL _writerUndoOpen; } @@ -64,7 +69,10 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { // the queued block keeps the bridge alive until its host group is closed. NSCAssert(!_writerUndoOpen,@"Viewer parameter group must be closed before teardown"); [_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release]; - [_writerDescriptor release];[_writerCompanions release];[_writerNode release];[_writerType release];[super dealloc]; + [_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[super dealloc]; +} +- (void)requestWorkspace{ + dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!_invalidated)manager=_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:manager];}); } - (void)publishUniforms:(const DYUniforms*)uniforms document:(NSDictionary*)document atTime:(CMTime)time { if(!uniforms||!document||!CMTIME_IS_NUMERIC(time))return; @@ -105,7 +113,8 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { } _writerUndoOpen=NO;_writerGesture=0;_writerTime=kCMTimeInvalid; [_writerHost release];_writerHost=nil;[_writerTarget release];_writerTarget=nil; - [_writerDescriptor release];_writerDescriptor=nil;[_writerCompanions release];_writerCompanions=nil; + [_writerDescriptors release];_writerDescriptors=nil;[_writerLastValues release];_writerLastValues=nil; + [_writerCompanions release];_writerCompanions=nil; [_writerNode release];_writerNode=nil;[_writerType release];_writerType=nil; } - (BOOL)writerNodeExists { @@ -115,12 +124,12 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { } - (BOOL)writerValueMatches { if(![self writerNodeExists])return NO; - double value=NAN; - BOOL read=[[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[_writerDescriptor[@"pid"]unsignedIntValue] atTime:_writerTime]; - if(!read||!DYViewerSameValue(value,_writerLastValue))return NO; + idget=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + for(NSDictionary *d in _writerDescriptors){double value=NAN; + if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!DYViewerSameValue(value,[_writerLastValues[d[@"key"]]doubleValue]))return NO; + } // Primary scalar edits also touch configuration/bypass switches. A later // external change to any of those switches must win over this live drag. - idget=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; for(NSNumber *pid in _writerCompanions){double companion=NAN;if(![get getFloatValue:&companion fromParameter:pid.unsignedIntValue atTime:_writerTime]||!DYViewerSameValue(companion,[_writerCompanions[pid]doubleValue]))return NO;} return YES; } @@ -134,10 +143,19 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { }@finally{[action endAction:self];}return valid; } - (void)beginParameter:(NSDictionary*)descriptor node:(NSString*)nodeID value:(double)value atTime:(CMTime)time { - NSDictionary *canonical=DYViewerCanonicalDescriptor(descriptor);double sanitized=0; - if(!canonical||![nodeID isKindOfClass:NSString.class]||!CMTIME_IS_NUMERIC(time)||!DYViewerSanitizeValue(canonical,value,&sanitized))return; - NSString *node=[nodeID copy];NSDictionary *d=[canonical retain];uint64_t gesture; - @synchronized(self){if(_invalidated){[node release];[d release];return;}_requestedGesture=gesture=++_requestSequence;} + NSDictionary *d=DYViewerCanonicalDescriptor(descriptor);if(!d)return; + [self beginParameters:@[d] node:nodeID values:@{d[@"key"]:@(value)} atTime:time]; +} +- (void)beginParameters:(NSArray*)descriptors node:(NSString*)nodeID values:(NSDictionary*)values atTime:(CMTime)time { + if(![descriptors isKindOfClass:NSArray.class]||!descriptors.count||descriptors.count>DYDescriptors().count||![values isKindOfClass:NSDictionary.class]||values.count!=descriptors.count||![nodeID isKindOfClass:NSString.class]||!CMTIME_IS_NUMERIC(time))return; + NSMutableArray *canonical=[NSMutableArray array];NSMutableDictionary *original=[NSMutableDictionary dictionary];NSMutableSet *pids=[NSMutableSet set]; + for(NSDictionary *candidate in descriptors){ + NSDictionary *d=DYViewerCanonicalDescriptor(candidate);NSNumber *number=d?values[d[@"key"]]:nil;double sanitized=0; + if(!d||original[d[@"key"]]||[pids containsObject:d[@"pid"]]||![number isKindOfClass:NSNumber.class]||!DYViewerSanitizeValue(d,number.doubleValue,&sanitized))return; + [canonical addObject:d];[pids addObject:d[@"pid"]];original[d[@"key"]]=@(sanitized); + } + NSString *node=[nodeID copy];NSArray *selected=[canonical copy];NSDictionary *initial=[original copy];uint64_t gesture; + @synchronized(self){if(_invalidated){[node release];[selected release];[initial release];return;}_requestedGesture=gesture=++_requestSequence;} dispatch_async(dispatch_get_main_queue(),^{ [self closeWriter];idhost=nil; @synchronized(self){if(!self->_invalidated)host=[self->_apiManager retain];} @@ -150,49 +168,77 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { NSDictionary *doc=DYReadTools(host,time).document; if([node hasPrefix:@"base:"]){type=[node substringFromIndex:5];if([DYToolTypes()containsObject:type]&&!DYBaseToolRemoved(doc,type))target=[host retain];} else{NSDictionary *layer=DYToolWithID(doc,node);if(layer){type=layer[@"type"];target=[[DYToolManager alloc]initWithHost:host node:layer];}} - if(!DYViewerDescriptorBelongsToType(d,type)){[target release];target=nil;} + for(NSDictionary *d in selected)if(!DYViewerDescriptorBelongsToType(d,type)){[target release];target=nil;break;} type=[type copy]; } }@finally{[action endAction:self];} if(target){ - self->_writerHost=host;self->_writerTarget=target;self->_writerDescriptor=[d retain];self->_writerNode=[node copy];self->_writerType=type; - self->_writerTime=time;self->_writerGesture=gesture;self->_writerLastValue=sanitized; + self->_writerHost=host;self->_writerTarget=target;self->_writerDescriptors=[selected retain];self->_writerLastValues=[initial retain];self->_writerNode=[node copy];self->_writerType=type; + self->_writerTime=time;self->_writerGesture=gesture; if(![self writerStillValid])[self closeWriter]; }else{[type release];[host release];} }); - [node release];[d release]; + [node release];[selected release];[initial release]; } -- (void)writeValue:(double)value gesture:(uint64_t)gesture { +- (void)writeValues:(NSDictionary*)values gesture:(uint64_t)gesture { NSCAssert(NSThread.isMainThread,@"Host writes require the main queue"); - if(!_writerGesture||gesture!=_writerGesture)return;double v=0; - if(!DYViewerSanitizeValue(_writerDescriptor,value,&v))return; + if(!_writerGesture||gesture!=_writerGesture||values.count!=_writerDescriptors.count)return; + NSMutableDictionary *desired=[NSMutableDictionary dictionary];BOOL anyChanged=NO,primaryValue=NO,blackWhite=NO;NSString *workingKey=nil; + NSMutableSet *explicitPids=[NSMutableSet set]; + for(NSDictionary *d in _writerDescriptors){ + NSString *key=d[@"key"];NSNumber *number=values[key];double v=0; + if(![number isKindOfClass:NSNumber.class]||!DYViewerSanitizeValue(d,number.doubleValue,&v))return; + desired[key]=@(v);[explicitPids addObject:d[@"pid"]]; + if(!DYViewerSameValue(v,[_writerLastValues[key]doubleValue])){ + anyChanged=YES; + primaryValue|=[key hasPrefix:@"cm"]&&![key hasPrefix:@"cmbypass"]&&![key isEqual:@"cmConfigured"]&&![key hasSuffix:@"Enabled"]; + blackWhite|=[key isEqual:@"blackWhiteMix"]; + if([@[@"cmworkingTransfer",@"cmworkingGamut"]containsObject:key])workingKey=key; + } + } BOOL active;@synchronized(self){active=!_invalidated;}if(!active){[self closeWriter];return;} idaction=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; - if(!action){[self closeWriter];return;}BOOL conflict=NO,changed=NO; + if(!action){[self closeWriter];return;}BOOL conflict=NO,changed=NO,failed=NO; [action startAction:self];@try{ conflict=!CMTIME_IS_NUMERIC(action.currentTime)||CMTimeCompare(action.currentTime,_writerTime)!=0||![self writerValueMatches]; - if(!conflict&&!DYViewerSameValue(v,_writerLastValue)){ + if(!conflict&&anyChanged){ idundo=[_writerHost apiForProtocol:@protocol(FxUndoAPI)]; - if(!_writerUndoOpen)_writerUndoOpen=[undo startUndoGroup:[@"画面调整 · " stringByAppendingString:_writerDescriptor[@"title"]?:@"调色"]]; + NSString *title=_writerDescriptors.count==1?_writerDescriptors[0][@"title"]:@"图形控件"; + if(!_writerUndoOpen)_writerUndoOpen=[undo startUndoGroup:[@"画面调整 · " stringByAppendingString:title?:@"调色"]]; if(_writerUndoOpen){ idset=[_writerTarget apiForProtocol:@protocol(FxParameterSettingAPI_v6)]; - NSString *key=_writerDescriptor[@"key"]; - changed=[set setFloatValue:v toParameter:[_writerDescriptor[@"pid"]unsignedIntValue] atTime:_writerTime]; - if(changed){ - // Mirror scalarChanged in the inspector. Eye/bypass switches remain - // literal switches and are never cleared by their own click. - BOOL primaryValue=[key hasPrefix:@"cm"]&&![key hasPrefix:@"cmbypass"]&&![key isEqual:@"cmConfigured"]&&![key hasSuffix:@"Enabled"]; - if(primaryValue||[key isEqual:@"blackWhiteMix"]){ - idget=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];DYInspectorToken *old=nil; - [get getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:_writerTime]; - if(primaryValue){[set setFloatValue:1 toParameter:2236 atTime:_writerTime];for(NSDictionary *r in DYDescriptors())if([r[@"key"]hasPrefix:@"cmbypass"])[set setFloatValue:0 toParameter:[r[@"pid"]unsignedIntValue] atTime:_writerTime];} - else if(old.schema<2){double configured=0;[get getFloatValue:&configured fromParameter:2236 atTime:_writerTime];if(configured<.5)[set setFloatValue:-1 toParameter:2236 atTime:_writerTime];} - if(old&&old.schema<2){DYInspectorToken *token=[[old copy]autorelease];token.schema=2;[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:_writerTime];} - } - DYPrimaryControlChanged(_writerTarget,_writerTime,key); - double actual=v;[[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&actual fromParameter:[_writerDescriptor[@"pid"]unsignedIntValue] atTime:_writerTime];_writerLastValue=actual; - if(primaryValue||[key isEqual:@"blackWhiteMix"]){ - NSMutableDictionary *companions=[NSMutableDictionary dictionary];idget=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + idget=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + NSMutableDictionary *before=[NSMutableDictionary dictionary]; + for(NSDictionary *d in _writerDescriptors)before[d[@"pid"]]=_writerLastValues[d[@"key"]]; + DYInspectorToken *old=nil; + if(primaryValue||blackWhite){ + [get getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:_writerTime]; + for(NSDictionary *r in DYDescriptors())if([r[@"key"]isEqual:@"cmConfigured"]||(primaryValue&&[r[@"key"]hasPrefix:@"cmbypass"])){double previous=NAN;if([get getFloatValue:&previous fromParameter:[r[@"pid"]unsignedIntValue] atTime:_writerTime]&&std::isfinite(previous))before[r[@"pid"]]=@(previous);} + } + // Prevalidation and conflict checks cover the entire batch. Both axes are + // set inside this one action; an independent layer commits one document. + for(NSDictionary *d in _writerDescriptors)if(![set setFloatValue:[desired[d[@"key"]]doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]){failed=YES;break;} + if(!failed&&(primaryValue||blackWhite)){ + // Explicit switches in the batch remain literal switches. Automatic CST + // companions never overwrite a requested eye/configuration/bypass value. + if(primaryValue){ + if(![explicitPids containsObject:@2236])failed|=![set setFloatValue:1 toParameter:2236 atTime:_writerTime]; + for(NSDictionary *r in DYDescriptors())if([r[@"key"]hasPrefix:@"cmbypass"]&&![explicitPids containsObject:r[@"pid"]])failed|=![set setFloatValue:0 toParameter:[r[@"pid"]unsignedIntValue] atTime:_writerTime]; + }else if(old.schema<2&&![explicitPids containsObject:@2236]){double configured=0;[get getFloatValue:&configured fromParameter:2236 atTime:_writerTime];if(configured<.5)failed|=![set setFloatValue:-1 toParameter:2236 atTime:_writerTime];} + if(!failed&&old&&old.schema<2){DYInspectorToken *token=[[old copy]autorelease];token.schema=2;failed|=![set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:_writerTime];} + } + if(failed){ + // The host API has no abortAction. Restore all affected fields before + // ending the action rather than leaving half a graphic update behind. + for(NSNumber *pid in before)[set setFloatValue:[before[pid]doubleValue] toParameter:pid.unsignedIntValue atTime:_writerTime]; + if(old)[set setCustomParameterValue:old toParameter:DYInspectorParameterID atTime:_writerTime]; + }else{ + if(workingKey)DYPrimaryControlChanged(_writerTarget,_writerTime,workingKey); + NSMutableDictionary *actual=[NSMutableDictionary dictionary]; + for(NSDictionary *d in _writerDescriptors){double v=[desired[d[@"key"]]doubleValue];[get getFloatValue:&v fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime];actual[d[@"key"]]=@(v);} + [_writerLastValues release];_writerLastValues=[actual copy];changed=YES; + if(primaryValue||blackWhite){ + NSMutableDictionary *companions=[NSMutableDictionary dictionary]; for(NSDictionary *r in DYDescriptors())if([r[@"key"]isEqual:@"cmConfigured"]||(primaryValue&&[r[@"key"]hasPrefix:@"cmbypass"])){double related=NAN;if([get getFloatValue:&related fromParameter:[r[@"pid"]unsignedIntValue] atTime:_writerTime]&&std::isfinite(related))companions[r[@"pid"]]=@(related);} [_writerCompanions release];_writerCompanions=[companions copy]; } @@ -200,13 +246,23 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { } } }@finally{[action endAction:self];} - if(conflict)[self closeWriter]; + if(conflict||failed)[self closeWriter]; if(changed)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_apiManager]; } - (void)changeValue:(double)value { if(!std::isfinite(value))return;uint64_t gesture; @synchronized(self){if(_invalidated)return;gesture=_requestedGesture;} - if(gesture)dispatch_async(dispatch_get_main_queue(),^{[self writeValue:value gesture:gesture];}); + if(gesture)dispatch_async(dispatch_get_main_queue(),^{if(self->_writerGesture==gesture&&self->_writerDescriptors.count==1)[self writeValues:@{self->_writerDescriptors[0][@"key"]:@(value)} gesture:gesture];}); +} +- (void)changeValues:(NSDictionary*)values { + if(![values isKindOfClass:NSDictionary.class]||!values.count)return; + // Copy only validated primitive input, so callers may reuse mutable samples. + NSMutableDictionary *sample=[NSMutableDictionary dictionary]; + for(id key in values){id value=values[key];if(![key isKindOfClass:NSString.class]||![value isKindOfClass:NSNumber.class]||!std::isfinite([value doubleValue]))return;sample[[[key copy]autorelease]]=@([value doubleValue]);} + NSDictionary *frozen=[sample copy];uint64_t gesture; + @synchronized(self){if(_invalidated){[frozen release];return;}gesture=_requestedGesture;} + if(gesture)dispatch_async(dispatch_get_main_queue(),^{[self writeValues:frozen gesture:gesture];}); + [frozen release]; } - (void)endGesture { uint64_t gesture;@synchronized(self){gesture=_requestedGesture;_requestedGesture=0;} diff --git a/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h b/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h index e8ed06d..6326e3c 100644 --- a/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h @@ -81,3 +81,51 @@ run.record(@"viewer-bridge-teardown-closes-a-live-undo-and-rejects-further-writes",fabs(value(exposure)-2.5)<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1&&![bridge snapshotAtTime:kCMTimeZero]); [bridge release]; } +{ + DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,&error); + DYViewerBatchActionProbe *host=[[[DYViewerBatchActionProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero; + idbridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host]; + auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.025;while(NSProcessInfo.processInfo.systemUptimeNSDictionary*{for(NSDictionary *d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;}; + auto value=[&](NSDictionary *d)->double{double v=NAN;[base getFloatValue:&v fromParameter:[d[@"pid"]unsignedIntValue] atTime:host->_time];return v;}; + NSDictionary *x=descriptor(@"masterX0"),*y=descriptor(@"curveY0"),*exposure=descriptor(@"exposure");NSArray *pair=@[x,y]; + host->_pairIDs=[@[x[@"pid"],y[@"pid"]]copy];int undo=base->_undoStarts; + [bridge beginParameters:pair node:@"base:curve" values:@{@"masterX0":@(-1),@"curveY0":@0} atTime:kCMTimeZero];drain(); + run.record(@"viewer-bridge-batch-begin-only-reads-and-preserves-unused-curve-slot",value(x)==-1&&value(y)==0&&base->_undoStarts==undo&&host->_committedPairs.count==0); + [bridge changeValues:@{@"masterX0":@.3,@"curveY0":@20}];drain(); + NSArray *first=host->_committedPairs.lastObject; + run.record(@"viewer-bridge-curve-xy-are-live-in-one-host-action-before-mouse-up",fabs(value(x)-.3)<1e-6&&value(y)==20&&host->_committedPairs.count==1&&first.count==2&&fabs([first[0]doubleValue]-.3)<1e-6&&[first[1]doubleValue]==20&&host->_allWritesInsideAction&&base->_undoStarts==undo+1&&base->_undoEnds==undo); + [bridge changeValues:@{@"masterX0":@.4,@"curveY0":@30}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-batch-continuous-xy-drag-uses-one-undo",fabs(value(x)-.4)<1e-6&&value(y)==30&&host->_committedPairs.count==2&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + undo=base->_undoStarts;NSUInteger commits=host->_committedPairs.count; + [bridge beginParameters:pair node:@"base:curve" values:@{@"masterX0":@.4,@"curveY0":@30} atTime:kCMTimeZero]; + [bridge changeValues:@{@"masterX0":@.5}];[bridge changeValues:@{@"masterX0":@.5,@"curveY0":@(NAN)}];[bridge changeValues:@{@"masterX0":@.5,@"wrong-key":@40}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-incomplete-nonfinite-and-foreign-key-samples-reject-the-entire-batch",fabs(value(x)-.4)<1e-6&&value(y)==30&&host->_committedPairs.count==commits&&base->_undoStarts==undo); + [bridge beginParameters:pair node:@"base:curve" values:@{@"masterX0":@.4,@"curveY0":@30} atTime:kCMTimeZero];[bridge changeValues:@{@"masterX0":@.4,@"curveY0":@30}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-batch-no-op-does-not-create-an-undo",base->_undoStarts==undo&&host->_committedPairs.count==commits); + [bridge beginParameters:pair node:@"base:curve" values:@{@"masterX0":@.4,@"curveY0":@30} atTime:kCMTimeZero];[bridge changeValues:@{@"masterX0":@.5,@"curveY0":@35}];drain(); + [base setFloatValue:45 toParameter:[y[@"pid"]unsignedIntValue] atTime:kCMTimeZero];commits=host->_committedPairs.count; + [bridge changeValues:@{@"masterX0":@.6,@"curveY0":@40}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-external-y-edit-stops-both-axes-of-the-graphic-gesture",fabs(value(x)-.5)<1e-6&&value(y)==45&&host->_committedPairs.count==commits&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + undo=base->_undoStarts; + [bridge beginParameters:pair node:@"base:curve" values:@{@"masterX0":@.4,@"curveY0":@45} atTime:kCMTimeZero];[bridge changeValues:@{@"masterX0":@.8,@"curveY0":@60}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-one-stale-original-value-rejects-the-entire-graphic-gesture",fabs(value(x)-.5)<1e-6&&value(y)==45&&base->_undoStarts==undo); + [bridge beginParameters:@[x,exposure] node:@"base:curve" values:@{@"masterX0":@.5,@"exposure":@0} atTime:kCMTimeZero];[bridge changeValues:@{@"masterX0":@.8,@"exposure":@1}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-mixed-module-batch-is-rejected-before-any-write",fabs(value(x)-.5)<1e-6&&value(exposure)==0&&base->_undoStarts==undo); + NSMutableDictionary *doc=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);NSDictionary *layer=DYInsertTool(doc,@"curve",@"base:curve");NSString *layerID=layer[@"id"];DYWriteTools(base,doc,kCMTimeZero); + [bridge beginParameters:pair node:layerID values:@{@"masterX0":@(-1),@"curveY0":@0} atTime:kCMTimeZero];[bridge changeValues:@{@"masterX0":@.2,@"curveY0":@(-10)}];[bridge endGesture];drain(); + NSDictionary *saved=DYToolWithID(DYReadTools(base,kCMTimeZero).document,layerID); + run.record(@"viewer-bridge-independent-curve-xy-commit-together-with-root-isolation",fabs([saved[@"values"][@"masterX0"]doubleValue]-.2)<1e-6&&[saved[@"values"][@"curveY0"]doubleValue]==-10&&fabs(value(x)-.5)<1e-6&&value(y)==45&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + undo=base->_undoStarts; + [bridge beginParameter:exposure node:@"base:base" value:0 atTime:kCMTimeZero];[bridge changeValue:.25];[bridge endGesture];drain(); + run.record(@"viewer-bridge-single-value-entry-points-remain-compatible-after-batch-extension",fabs(value(exposure)-.25)<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + undo=base->_undoStarts;host->_rejectParameterID=[y[@"pid"]unsignedIntValue];host->_rejectNextWrite=YES; + [bridge beginParameters:pair node:@"base:curve" values:@{@"masterX0":@.5,@"curveY0":@45} atTime:kCMTimeZero];[bridge changeValues:@{@"masterX0":@.7,@"curveY0":@50}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-rejected-second-field-restores-first-field-within-the-same-action",fabs(value(x)-.5)<1e-6&&value(y)==45&&host->_allWritesInsideAction&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + NSDictionary *h=descriptor(@"cmbalanceAngle"),*s=descriptor(@"cmbalanceStrength");undo=base->_undoStarts; + [bridge beginParameters:@[h,s] node:@"base:primary" values:@{@"cmbalanceAngle":@0,@"cmbalanceStrength":@0} atTime:kCMTimeZero];[bridge changeValues:@{@"cmbalanceAngle":@30,@"cmbalanceStrength":@.4}];drain(); + [base setFloatValue:0 toParameter:2236 atTime:kCMTimeZero]; + [bridge changeValues:@{@"cmbalanceAngle":@45,@"cmbalanceStrength":@.6}];[bridge endGesture];drain(); + run.record(@"viewer-bridge-external-cst-configuration-conflict-stops-the-whole-color-wheel",value(h)==30&&fabs(value(s)-.4)<1e-6&&[base->_values[@2236]doubleValue]==0&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + [bridge invalidate];drain();[bridge release]; +} diff --git a/大鱼调色/Plugin/DYViewerParameterPanel.inc.h b/大鱼调色/Plugin/DYViewerParameterPanel.inc.h new file mode 100644 index 0000000..fef4b88 --- /dev/null +++ b/大鱼调色/Plugin/DYViewerParameterPanel.inc.h @@ -0,0 +1,157 @@ +// Independently authored canvas UI. Hit geometry and drawing share the same layout. +#import "DYTheme.h" + +@interface DYViewerParameterPanel : NSObject +@property(nonatomic,retain) DYViewerParameterBridge *bridge; +@property(nonatomic,copy) NSString *toolType; +@property(nonatomic) BOOL visible; +- (void)setInitialPosition:(NSPoint)position; +- (void)setViewport:(NSRect)viewport; +- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time; +- (void)draw; +- (NSInteger)partAtPoint:(NSPoint)point; +- (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time; +- (BOOL)mouseMoved:(NSPoint)point; +- (BOOL)mouseExited; +- (BOOL)capturing; +- (BOOL)finishCapture; +@end +@implementation DYViewerParameterPanel { + DYViewerParameterBridge *_bridge;NSDictionary *_snapshot;NSArray *_nodes,*_rows;NSMutableArray *_areas; + NSString *_nodeID,*_toolType,*_selectedX;NSMutableDictionary *_draftValues;NSInteger _channel;BOOL _graphMode,_visible;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft,_positioned,_movingPanel;NSPoint _position,_panelStart; + NSInteger _page,_catalogPage,_capacity,_catalogCapacity,_hover,_pressed;NSPoint _down;NSDictionary *_captured; + double _draftValue,_downValue;CGFloat _knobOffset;CMTime _time,_downTime; +} +@synthesize bridge=_bridge,toolType=_toolType,visible=_visible; +- (void)setInitialPosition:(NSPoint)p{_position=p;_positioned=YES;} +- (instancetype)init{if((self=[super init])){_areas=[NSMutableArray new];_nodeID=[@"base:base" copy];_scale=1;_open=YES;_visible=YES;_graphMode=YES;_draftValues=[NSMutableDictionary new];_time=_downTime=kCMTimeInvalid;}return self;} +- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_toolType release];[_selectedX release];[_draftValues release];[_captured release];[super dealloc];} +- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;if(_pressed)[_bridge endGesture];[_bridge release];_bridge=[bridge retain];_pressed=0;_dragging=NO;_movingPanel=NO;[_captured release];_captured=nil;} +- (BOOL)capturing{return _pressed!=0;} +- (BOOL)finishCapture{BOOL had=_pressed!=0;if(had)[_bridge endGesture];_pressed=0;_hasDraft=NO;[_draftValues removeAllObjects];_movingPanel=NO;_dragging=NO;[_captured release];_captured=nil;return had;} +- (NSDictionary*)descriptorForKey:(NSString*)key{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;} +- (NSDictionary*)node{for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:_nodeID])return n;return nil;} +- (double)valueForDescriptor:(NSDictionary*)d{ + if(_pressed&&_draftValues[d[@"key"]])return [_draftValues[d[@"key"]]doubleValue]; + if(_hasDraft&&_captured&&[_captured[@"descriptor"][@"pid"]isEqual:d[@"pid"]]&&_pressed)return _draftValue; + NSDictionary*n=[self node];DYUniforms u;NSData*raw=_snapshot[@"uniforms"];if(raw.length!=sizeof(u))return [d[@"default"]doubleValue]; + if([_nodeID hasPrefix:@"base:"])[raw getBytes:&u length:sizeof(u)];else u=DYToolUniforms(n[@"layer"]); + NSInteger offset=[d[@"offset"]integerValue];return offset>=0&&offset+sizeof(float)<=sizeof(u)?*(float*)((uint8_t*)&u+offset):[d[@"default"]doubleValue]; +} +- (void)addArea:(NSRect)rect part:(NSInteger)part kind:(NSString*)kind title:(NSString*)title descriptor:(NSDictionary*)d index:(NSInteger)index{ + NSMutableDictionary*a=[NSMutableDictionary dictionaryWithDictionary:@{@"rect":[NSValue valueWithRect:rect],@"part":@(part),@"kind":kind,@"title":title?:@"",@"index":@(index)}];if(d)a[@"descriptor"]=d;if([kind isEqual:@"module"]&&index<(NSInteger)_nodes.count)a[@"nodeID"]=_nodes[index][@"id"];[_areas addObject:a]; +} +- (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;} +- (void)prepareWithSize:(NSSize)canvasSize scale:(CGFloat)scale atTime:(CMTime)time{ + _size=canvasSize;NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,canvasSize.width,canvasSize.height)):NSMakeRect(0,0,canvasSize.width,canvasSize.height);NSSize size=viewport.size;_scale=MAX(.6,MIN(MAX(1.,scale),MIN(size.width/360.,size.height/230.)));_time=time; + if(_pressed&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_downTime)!=0)){[self finishCapture];} + [_snapshot release];_snapshot=[[_bridge snapshotAtTime:time]retain];NSDictionary*doc=_snapshot[@"document"]; + if(doc){NSMutableArray*nodes=[NSMutableArray array];NSMutableDictionary*counts=[NSMutableDictionary dictionary]; + for(NSString*ID in DYToolDisplayOrder(doc?:@{})){ + BOOL base=[ID hasPrefix:@"base:"];NSDictionary*layer=base?nil:DYToolWithID(doc,ID);NSString*type=base?[ID substringFromIndex:5]:layer[@"type"];if(!type||![_toolType isEqual:type]||(base&&DYBaseToolRemoved(doc,type)))continue; + NSString*title=DYToolSection(type)[@"title"]?:type;if([type isEqual:@"base"])title=@"基础调整"; + NSInteger count=[counts[type]integerValue];counts[type]=@(count+1);if(!base)title=[title stringByAppendingFormat:@" · %ld",(long)(count+1)]; + [nodes addObject:@{@"id":ID,@"type":type,@"title":title,@"layer":layer?:@{}}]; + }[_nodes release];_nodes=[nodes copy]; + if(![self node]){[self finishCapture];[_nodeID release];_nodeID=_nodes.count?[_nodes[0][@"id"]copy]:nil;_page=0;[_selectedX release];_selectedX=nil;}} + NSString*type=[self node][@"type"]?:_toolType;NSMutableArray*rows=[NSMutableArray array]; + // These are the existing public scalar controls, never hidden curve-slot metadata. + NSArray*sections=[type isEqual:@"base"]?@[@"base",@"color"]:type?@[type]:@[]; + if(doc)for(NSString*part in sections)for(NSDictionary*d in DYToolSection(part)[@"rows"]){NSString*k=d[@"key"];if(!d[@"pid"]||[k hasPrefix:@"cmbypass"]||[k isEqual:@"copyAutoGrade"]||([type isEqual:@"curve"]&&![k hasPrefix:@"curveY"]))continue;[rows addObject:d];} + [_rows release];_rows=[rows copy];[_areas removeAllObjects];if(!_bridge||size.width<120||size.height<80)return; + CGFloat s=_scale,margin=8*s,w=MIN(300*s,size.width-2*margin);_capacity=MAX(1,MIN(5,(NSInteger)floor((size.height-124*s)/(46*s)))); + _catalogCapacity=MAX(1,MIN(7,(NSInteger)floor((size.height-124*s)/(32*s)))); + _page=MIN(MAX(0,_page),MAX(0,((NSInteger)_rows.count-1)/_capacity));_catalogPage=MIN(MAX(0,_catalogPage),MAX(0,((NSInteger)_nodes.count-1)/_catalogCapacity)); + BOOL graph=_graphMode&&([type isEqual:@"curve"]||[type isEqual:@"grading"]); + CGFloat body=_catalog?32*MIN(_catalogCapacity,(NSInteger)_nodes.count):graph?([type isEqual:@"curve"]?236:278):46*MIN(_capacity,(NSInteger)_rows.count); + CGFloat h=_open?(100+body)*s:30*s,panelHeight=MIN(h,size.height-2*margin),x=viewport.origin.x+margin,top=viewport.origin.y+margin; + if(_positioned){x=MAX(viewport.origin.x+margin,MIN(NSMaxX(viewport)-margin-w,viewport.origin.x+_position.x*size.width));top=MAX(viewport.origin.y+margin,MIN(NSMaxY(viewport)-margin-panelHeight,viewport.origin.y+_position.y*size.height));} + _position=NSMakePoint((x-viewport.origin.x)/MAX(1.,size.width),(top-viewport.origin.y)/MAX(1.,size.height));_positioned=YES; + _panel=NSMakeRect(x,top,w,panelHeight); + [self addArea:NSMakeRect(x,top,w-34*s,30*s) part:20000 kind:@"open" title:[@"⠿ " stringByAppendingString:DYToolSection(type)[@"title"]?:@"调色"] descriptor:nil index:0]; + [self addArea:NSMakeRect(NSMaxX(_panel)-30*s,top+3*s,26*s,24*s) part:20001 kind:@"close" title:@"×" descriptor:nil index:0];if(!_open)return; + CGFloat y=top+36*s; + [self addArea:NSMakeRect(x+8*s,y,w-([type isEqual:@"base"]?126:84)*s,28*s) part:20002 kind:@"catalog" title:!doc?@"等待当前帧…":[self node]?[[self node][@"title"] stringByAppendingString:@" ▾"]:@"此工具已移除" descriptor:nil index:0]; + NSDictionary*enabled=[self descriptorForKey:[type isEqual:@"primary"]?@"primaryMasterEnabled":[type stringByAppendingString:@"Enabled"]]; + if(enabled&&_snapshot)[self addArea:NSMakeRect(NSMaxX(_panel)-36*s,y,27*s,28*s) part:20003 kind:@"headerBool" title:[type isEqual:@"base"]?@"调":@"" descriptor:enabled index:0]; + if([type isEqual:@"base"]&&_snapshot)[self addArea:NSMakeRect(NSMaxX(_panel)-76*s,y,36*s,28*s) part:20007 kind:@"headerBool" title:@"色" descriptor:[self descriptorForKey:@"colorEnabled"] index:0]; + y+=36*s; + if(_catalog){ + for(NSInteger i=0;i<_catalogCapacity&&_catalogPage*_catalogCapacity+i<(NSInteger)_nodes.count;i++){NSDictionary*n=_nodes[_catalogPage*_catalogCapacity+i];[self addArea:NSMakeRect(x+8*s,y+i*32*s,w-16*s,27*s) part:20100+i kind:@"module" title:n[@"title"] descriptor:nil index:_catalogPage*_catalogCapacity+i];}y+=MIN(_catalogCapacity,(NSInteger)_nodes.count)*32*s; + }else if(graph){ + [self layoutGraphicAt:y];y=NSMaxY(_panel)-25*s; + }else{ + for(NSInteger i=0;i<_capacity&&_page*_capacity+i<(NSInteger)_rows.count;i++){NSDictionary*d=_rows[_page*_capacity+i];NSString*kind=d[@"kind"]?:@"float";NSString*valueKind=[kind isEqual:@"bool"]?@"bool":[kind isEqual:@"popup"]?@"choice":@"slider"; + [self addArea:NSMakeRect(x+10*s,y+i*46*s,w-46*s,40*s) part:21000+i*3 kind:valueKind title:d[@"title"] descriptor:d index:i]; + [self addArea:NSMakeRect(NSMaxX(_panel)-31*s,y+i*46*s+5*s,23*s,29*s) part:21001+i*3 kind:@"reset" title:@"↺" descriptor:d index:i];}y+=MIN(_capacity,(NSInteger)_rows.count)*46*s; + } + if([type isEqual:@"curve"]||[type isEqual:@"grading"])[self addArea:NSMakeRect(NSMaxX(_panel)-110*s,NSMaxY(_panel)-23*s,66*s,19*s) part:20008 kind:@"graphMode" title:_graphMode?@"参数 ›":@"图形 ›" descriptor:nil index:0]; + NSInteger total=_catalog?_nodes.count:_rows.count,cap=_catalog?_catalogCapacity:_capacity; + if(total>cap&&(_catalog||!graph)){[self addArea:NSMakeRect(x+8*s,y,29*s,23*s) part:20004 kind:@"previous" title:@"‹" descriptor:nil index:0];[self addArea:NSMakeRect(NSMaxX(_panel)-37*s,y,29*s,23*s) part:20005 kind:@"next" title:@"›" descriptor:nil index:0];} +} + +- (NSRect)trackForArea:(NSDictionary*)area{NSRect r=[area[@"rect"]rectValue];return NSMakeRect(r.origin.x+5*_scale,r.origin.y+28*_scale,r.size.width-10*_scale,4*_scale);} +- (void)text:(NSString*)text rect:(NSRect)rect size:(CGFloat)size color:(NSColor*)color alignment:(NSTextAlignment)alignment{ + NSMutableParagraphStyle*p=[[[NSMutableParagraphStyle alloc]init]autorelease];p.lineBreakMode=NSLineBreakByTruncatingTail;p.alignment=alignment; + [text drawInRect:rect withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size*_scale weight:NSFontWeightMedium],NSForegroundColorAttributeName:color,NSParagraphStyleAttributeName:p}]; +} +- (NSString*)valueText:(NSDictionary*)d value:(double)v{ + if([d[@"kind"]isEqual:@"bool"])return v>.5?@"开启":@"关闭"; + if([d[@"kind"]isEqual:@"popup"]){NSArray*values=d[@"values"],*options=d[@"options"];NSInteger i=values?[values indexOfObject:@((NSInteger)llround(v))]:(NSInteger)llround(v);return i>=0&&i<(NSInteger)options.count?options[i]:@"—";} + return [NSString stringWithFormat:[d[@"max"]doubleValue]-[d[@"min"]doubleValue]>20?@"%.1f":@"%.2f",v]; +} +- (void)draw{ + if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height)));CGFloat s=_scale;NSColor*ink=DYThemeColor(@"text")?:NSColor.whiteColor,*accent=DYThemeColor(@"accent")?:NSColor.systemCyanColor; + NSBezierPath*panel=[NSBezierPath bezierPathWithRoundedRect:_panel xRadius:9*s yRadius:9*s];DYDrawThemeSurface(panel,YES); + for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];NSInteger part=[a[@"part"]integerValue];NSString*kind=a[@"kind"];BOOL pressed=_pressed==part,hover=_hover==part;NSDictionary*d=a[@"descriptor"]; + if([kind isEqual:@"curvePlot"]||[kind isEqual:@"wheel"]){[self drawGraphic:a];continue;} + if([kind isEqual:@"slider"]){double v=[self valueForDescriptor:d],lo=[d[@"min"]doubleValue],hi=[d[@"max"]doubleValue];CGFloat ratio=hi>lo?MAX(0.,MIN(1.,(v-lo)/(hi-lo))):0;NSRect track=[self trackForArea:a]; + [self text:a[@"title"] rect:NSMakeRect(r.origin.x,r.origin.y,r.size.width-68*s,18*s) size:11 color:ink alignment:NSTextAlignmentLeft];[self text:[self valueText:d value:v] rect:NSMakeRect(NSMaxX(r)-68*s,r.origin.y,68*s,18*s) size:11 color:hover||pressed?accent:ink alignment:NSTextAlignmentRight]; + DYDrawSoftControl(NSInsetRect(track,-2*s,-3*s),5*s,YES,NO,NO);[accent setFill];[[NSBezierPath bezierPathWithRoundedRect:NSMakeRect(track.origin.x,track.origin.y,MAX(2*s,track.size.width*ratio),track.size.height) xRadius:2*s yRadius:2*s]fill]; + CGFloat marker=MAX(0.,MIN(1.,([d[@"default"]doubleValue]-lo)/(hi-lo)));[ink setStroke];NSBezierPath*tick=[NSBezierPath bezierPath];[tick moveToPoint:NSMakePoint(track.origin.x+marker*track.size.width,NSMidY(track)-5*s)];[tick lineToPoint:NSMakePoint(track.origin.x+marker*track.size.width,NSMidY(track)+5*s)];tick.lineWidth=.7*s;[tick stroke]; + DYDrawSoftControl(NSMakeRect(track.origin.x+ratio*track.size.width-6*s,NSMidY(track)-6*s,12*s,12*s),6*s,NO,hover||pressed,pressed); + }else{ + BOOL selected=([kind isEqual:@"channel"]&&[a[@"index"]integerValue]==_channel)||([kind isEqual:@"module"]&&[a[@"nodeID"]isEqual:_nodeID])||([kind isEqual:@"tool"]&&[a[@"toolType"]isEqual:[self node][@"type"]]);BOOL on=([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])&&[self valueForDescriptor:d]>.5; + DYDrawSoftControl(r,5*s,NO,hover||selected||on,pressed);NSString*title=a[@"title"]; + if(d&&![kind isEqual:@"reset"]){NSString*value=[self valueText:d value:[self valueForDescriptor:d]];title=[kind isEqual:@"headerBool"]?(title.length?title:([self valueForDescriptor:d]>.5?@"●":@"○")):[NSString stringWithFormat:@"%@ %@%@",title,value,[kind isEqual:@"choice"]?@" ›":@""];} + [self text:title rect:NSInsetRect(r,5*s,5*s) size:[kind isEqual:@"open"]?12:11 color:[kind isEqual:@"toolUnavailable"]?[ink colorWithAlphaComponent:.35]:ink alignment:NSTextAlignmentCenter]; + } + } + if(_open){NSString*hint=_catalog?@"选择当前工具的图层":(_graphMode&&[_toolType isEqual:@"curve"])?@"点击加点 · 拖动调整":(_graphMode&&[_toolType isEqual:@"grading"])?@"拖动色轮 · 参数查看亮度":@"拖动调节 · ↺ 还原";if(_hover==20000||_movingPanel)hint=@"拖动标题移动 · 单击折叠";[self text:hint rect:NSMakeRect(_panel.origin.x+40*s,NSMaxY(_panel)-22*s,_panel.size.width-168*s,18*s) size:9 color:ink alignment:NSTextAlignmentCenter];} + [NSGraphicsContext restoreGraphicsState]; +} +- (NSInteger)partAtPoint:(NSPoint)p{if(!_visible||!std::isfinite(p.x)||!std::isfinite(p.y)||!_bridge||!NSPointInRect(p,NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height))))return 0;for(NSDictionary*a in [_areas reverseObjectEnumerator])if(![a[@"kind"]isEqual:@"toolUnavailable"]&&NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];return _open&&NSPointInRect(p,_panel)?20006:0;} +- (NSDictionary*)areaForPart:(NSInteger)part{for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==part)return a;return nil;} +- (void)applySliderPoint:(NSPoint)p{ + NSRect t=[self trackForArea:_captured];NSDictionary*d=_captured[@"descriptor"];double ratio=MAX(0.,MIN(1.,(p.x-_knobOffset-t.origin.x)/MAX(1.,t.size.width)));_draftValue=[d[@"min"]doubleValue]+ratio*([d[@"max"]doubleValue]-[d[@"min"]doubleValue]);[_bridge changeValue:_draftValue]; +} +- (void)clickArea:(NSDictionary*)a{ + NSString*kind=a[@"kind"];if([kind isEqual:@"close"]){_visible=NO;return;}if([kind isEqual:@"open"]){_open=!_open;_catalog=NO;return;}if([kind isEqual:@"graphMode"]){_graphMode=!_graphMode;return;}if([kind isEqual:@"channel"]){_channel=[a[@"index"]integerValue];[_selectedX release];_selectedX=nil;return;}if([kind isEqual:@"deletePoint"]){[self deleteSelectedPoint];return;}if([kind isEqual:@"catalog"]){_catalog=!_catalog;return;} + if([kind isEqual:@"module"]||[kind isEqual:@"tool"]){for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:a[@"nodeID"]]){[_nodeID release];_nodeID=[a[@"nodeID"]copy];_catalog=NO;_page=0;break;}return;} + if([kind isEqual:@"previous"]||[kind isEqual:@"next"]){NSInteger total=_catalog?_nodes.count:_rows.count,cap=_catalog?_catalogCapacity:_capacity,count=MAX(1,(total+cap-1)/cap),delta=[kind isEqual:@"next"]?1:-1;if(_catalog)_catalogPage=(_catalogPage+delta+count)%count;else _page=(_page+delta+count)%count;return;} + NSDictionary*d=a[@"descriptor"];if(!d||!_snapshot)return;double old=[self valueForDescriptor:d],v=old; + if([kind isEqual:@"reset"])v=[d[@"default"]doubleValue];else if([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])v=old>.5?0:1;else if([kind isEqual:@"choice"]){NSArray*values=d[@"values"],*options=d[@"options"];NSInteger i=values?[values indexOfObject:@((NSInteger)llround(old))]:(NSInteger)llround(old);if(!options.count)return;i=(i+1)%options.count;v=values?[values[i]doubleValue]:i;} + [_bridge beginParameter:d node:_nodeID value:old atTime:_time];[_bridge changeValue:v];[_bridge endGesture]; +} +- (void)movePanelToPointer:(NSPoint)p{ + NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,_size.width,_size.height)):NSMakeRect(0,0,_size.width,_size.height);CGFloat margin=10*_scale; + CGFloat x=MAX(NSMinX(viewport)+margin,MIN(NSMaxX(viewport)-margin-_panel.size.width,_panelStart.x+p.x-_down.x)),y=MAX(NSMinY(viewport)+margin,MIN(NSMaxY(viewport)-margin-_panel.size.height,_panelStart.y+p.y-_down.y)); + _position=NSMakePoint((x-viewport.origin.x)/MAX(1.,viewport.size.width),(y-viewport.origin.y)/MAX(1.,viewport.size.height));_positioned=YES;_movingPanel=YES;[self prepareWithSize:_size scale:_scale atTime:_time]; +} +- (BOOL)event:(NSEventType)type point:(NSPoint)p atTime:(CMTime)time{ + if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time];NSInteger hit=[self partAtPoint:p]; + if(type==NSEventTypeLeftMouseDown){if(!hit)return NO;[_bridge endGesture];_hasDraft=NO;_pressed=hit;_down=p;_panelStart=_panel.origin;_downTime=time;_dragging=NO;_movingPanel=NO;[_captured release];_captured=[[self areaForPart:hit]copy];NSDictionary*d=_captured[@"descriptor"]; + if([_captured[@"kind"]isEqual:@"curvePlot"]||[_captured[@"kind"]isEqual:@"wheel"]){[self beginGraphicAt:p];return YES;} + if([_captured[@"kind"]isEqual:@"slider"]&&_snapshot){NSRect t=[self trackForArea:_captured];if(NSPointInRect(p,NSInsetRect(t,-8*_scale,-8*_scale))){_downValue=[self valueForDescriptor:d];_draftValue=_downValue;_hasDraft=YES;[_bridge beginParameter:d node:_nodeID value:_downValue atTime:time];CGFloat knob=t.origin.x+(_downValue-[d[@"min"]doubleValue])/([d[@"max"]doubleValue]-[d[@"min"]doubleValue])*t.size.width;_knobOffset=fabs(p.x-knob)<=8*_scale?p.x-knob:0;if(fabs(p.x-knob)>8*_scale)[self applySliderPoint:p];}}return YES; + } + if(!_pressed)return NO; + if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&[_captured[@"kind"]isEqual:@"open"])[self movePanelToPointer:p];if(_dragging&&([_captured[@"kind"]isEqual:@"curvePlot"]||[_captured[@"kind"]isEqual:@"wheel"]))[self updateGraphicAt:p];if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;} + if(type==NSEventTypeLeftMouseUp){if([_captured[@"kind"]isEqual:@"open"]&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL graphic=[_captured[@"kind"]isEqual:@"curvePlot"]||[_captured[@"kind"]isEqual:@"wheel"];if(graphic){if(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)[self updateGraphicAt:p];[_bridge endGesture];}BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed; + if(slider){if(_hasDraft&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self applySliderPoint:p];[_bridge endGesture];} + _pressed=0;_dragging=NO;_movingPanel=NO;_hasDraft=NO;[_captured release];_captured=nil;[_draftValues removeAllObjects];if(!moved&&!slider&&!graphic&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;} + return NO; +} +#include "DYViewerGraphics.inc.h" +- (BOOL)mouseMoved:(NSPoint)p{NSInteger part=[self partAtPoint:p];BOOL changed=part!=_hover;_hover=part;return changed;} +- (BOOL)mouseExited{BOOL changed=_hover!=0;_hover=0;return changed;} +@end diff --git a/大鱼调色/Plugin/DYViewerParameterProbe.h b/大鱼调色/Plugin/DYViewerParameterProbe.h index efacf70..516a287 100644 --- a/大鱼调色/Plugin/DYViewerParameterProbe.h +++ b/大鱼调色/Plugin/DYViewerParameterProbe.h @@ -5,6 +5,43 @@ - (NSDictionary*)snapshotAtTime:(CMTime)time; - (void)beginParameter:(NSDictionary*)descriptor node:(NSString*)nodeID value:(double)value atTime:(CMTime)time; - (void)changeValue:(double)value; +- (void)beginParameters:(NSArray*)descriptors node:(NSString*)nodeID values:(NSDictionary*)values atTime:(CMTime)time; +- (void)changeValues:(NSDictionary*)values; - (void)endGesture; - (void)invalidate; @end + +// Test-only host wrapper: sample paired values at each outer action boundary. +// This verifies that an OSC graph never exposes an x-only intermediate action. +@interface DYViewerBatchActionProbe : DYToolCanvasProbe { +@public + NSArray *_pairIDs; + NSMutableArray *_committedPairs; + NSInteger _actionDepth; + BOOL _writesInAction,_allWritesInsideAction,_rejectNextWrite; + UInt32 _rejectParameterID; +} +@end +@implementation DYViewerBatchActionProbe +- (instancetype)init{if((self=[super init])){_committedPairs=[NSMutableArray new];_allWritesInsideAction=YES;}return self;} +- (void)dealloc{[_pairIDs release];[_committedPairs release];[super dealloc];} +- (id)apiForProtocol:(Protocol*)protocol{if([NSStringFromProtocol(protocol)isEqual:@"FxParameterSettingAPI_v6"])return self;return [super apiForProtocol:protocol];} +- (void)startAction:(id)sender{[super startAction:sender];++_actionDepth;} +- (void)endAction:(id)sender{ + if(_actionDepth==1&&_writesInAction){ + NSMutableArray *sample=[NSMutableArray array];idget=(id)_base; + for(NSNumber *pid in _pairIDs){double value=NAN;[get getFloatValue:&value fromParameter:pid.unsignedIntValue atTime:_time];[sample addObject:@(value)];} + [_committedPairs addObject:sample];_writesInAction=NO; + } + --_actionDepth;[super endAction:sender]; +} +- (BOOL)setFloatValue:(double)value toParameter:(UInt32)pid atTime:(CMTime)time{ + _allWritesInsideAction&=_actionDepth>0&&NSThread.isMainThread; + if(_rejectNextWrite&&pid==_rejectParameterID){_rejectNextWrite=NO;return NO;} + _writesInAction=YES;return [(id)_base setFloatValue:value toParameter:pid atTime:time]; +} +- (BOOL)setCustomParameterValue:(NSObject*)value toParameter:(UInt32)pid atTime:(CMTime)time{ + _allWritesInsideAction&=_actionDepth>0&&NSThread.isMainThread;_writesInAction=YES; + return [(id)_base setCustomParameterValue:value toParameter:pid atTime:time]; +} +@end diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h new file mode 100644 index 0000000..dec4bb3 --- /dev/null +++ b/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h @@ -0,0 +1,31 @@ +#import "DYColorWorkspace.h" +// Offscreen fixtures: no window is ordered onto the user's screen. +@interface DYColorWorkspace (DiagnosticActions) +- (NSDictionary *)selectionContext; +- (BOOL)commitLUT:(NSString *)path expected:(NSDictionary *)expected error:(NSError **)error; +- (NSProgress *)selectLUT:(NSString *)path completion:(void(^)(NSError *))completion; +@end +@interface DYWorkspaceDiagnosticHost : DYDiagnosticManager { +@public NSView *_parent;CMTime _workspaceTime;NSUInteger _requests,_closes;NSInteger _actionDepth;BOOL _permissionFailure,_nodeCommitHadUndo; +} +@end +@implementation DYWorkspaceDiagnosticHost +- (instancetype)init{if((self=[super init]))_workspaceTime=kCMTimeZero;return self;} +- (id)apiForProtocol:(Protocol *)p{NSString *name=NSStringFromProtocol(p);if([@[@"FxRemoteWindowAPI",@"FxRemoteWindowAPI_v2",@"FxRemoteWindowAPI_v3"]containsObject:name]){if(!_actionDepth)_permissionFailure=YES;return self;}return [super apiForProtocol:p];} +- (void)startAction:(id)sender{_actionDepth++;} +- (void)endAction:(id)sender{_actionDepth--;if(_actionDepth<0)_permissionFailure=YES;} +- (CMTime)currentTime{return _workspaceTime;} +- (void)remoteWindowWithMinimumSize:(CGSize)minimum maximumSize:(CGSize)maximum reply:(void(^)(FxXPView*,NSError*))reply{if(!_actionDepth)_permissionFailure=YES;_requests++;reply((FxXPView*)_parent,nil);} +- (void)closeRemoteWindow{if(!_actionDepth)_permissionFailure=YES;_closes++;} +- (BOOL)setCustomParameterValue:(NSObject *)value toParameter:(UInt32)pid atTime:(CMTime)time{if(pid==DYToolsParameterID)_nodeCommitHadUndo=_undoActive;return [super setCustomParameterValue:value toParameter:pid atTime:time];} +@end +@interface DYWorkspaceDiagnosticRenderer : DYRenderer{ +@public NSProgress *_preparedTask;void(^_preparedReply)(NSError*); +} +- (void)completePreparation; +@end +@implementation DYWorkspaceDiagnosticRenderer +- (void)dealloc{[_preparedTask release];[_preparedReply release];[super dealloc];} +- (NSProgress *)prepareLUTPath:(NSString *)path completion:(void(^)(NSError*))completion{[_preparedTask release];_preparedTask=[[NSProgress discreteProgressWithTotalUnitCount:1]retain];[_preparedReply release];_preparedReply=[completion copy];return _preparedTask;} +- (void)completePreparation{void(^reply)(NSError*)=[_preparedReply copy];[_preparedReply release];_preparedReply=nil;if(reply)reply(nil);[reply release];} +@end diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h new file mode 100644 index 0000000..2833cce --- /dev/null +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -0,0 +1,40 @@ +{ + auto workspaceDrain=[](){double end=NSProcessInfo.processInfo.systemUptime+.04;while(NSProcessInfo.processInfo.systemUptime_parent=fixture.contentView; + DYColorWorkspace *workspace=[[[DYColorWorkspace alloc]initWithManager:host renderer:scopeRenderer library:scopeLibrary title:@"原片段"]autorelease]; + [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); + [host->_parent setFrameSize:NSMakeSize(800,540)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds)); + [workspace showRelativeToView:nil];workspaceDrain();run.record(@"workspace-reopens-existing-host-remote-window",host->_requests==2&&workspace.visible&&root.superview==host->_parent); + [workspace close];[workspace close];run.record(@"workspace-closes-host-window-once-and-stops-scopes",host->_closes==1&&!workspace.visible&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&!host->_permissionFailure&&host->_actionDepth==0); + [workspace showRelativeToView:nil];workspaceDrain();[NSNotificationCenter.defaultCenter postNotificationName:NSWindowWillCloseNotification object:fixture];run.record(@"workspace-host-close-cleans-without-recursive-close",!workspace.visible&&host->_closes==1&&!root.superview); + [scopeRenderer setScopeEnabled:NO];[scopeRenderer setValue:@{@"time":@99} forKey:@"scopeMetadata"];[scopeRenderer setValue:[NSMutableData dataWithLength:16] forKey:@"scopePreview"];[scopeRenderer setScopeEnabled:YES]; + run.record(@"workspace-new-scope-session-clears-old-frame",!scopeRenderer.scopeMetadata&&!scopeRenderer.scopePreview);[scopeRenderer setScopeEnabled:NO]; + // A new active session is needed before delivering asynchronous selections. + [workspace showRelativeToView:nil];workspaceDrain(); + DYAssetState *before=[[DYReadAssets(host,kCMTimeZero)copy]autorelease];before.paths=@{@"look0":@"old.cube",@"look1":@"retain.cube"};DYWriteAssets(host,before,kCMTimeZero); + int starts=host->_undoStarts,ends=host->_undoEnds;NSError *workspaceError=nil; + BOOL wrote=[workspace commitLUT:@"new.cube" expected:[workspace selectionContext] error:&workspaceError]; + run.record(@"workspace-style1-preserves-other-lut-slots-one-undo",wrote&&[DYReadAssets(host,kCMTimeZero).paths[@"look0"]isEqual:@"new.cube"]&&[DYReadAssets(host,kCMTimeZero).paths[@"look1"]isEqual:@"retain.cube"]&&host->_undoStarts==starts+1&&host->_undoEnds==ends+1); + __block BOOL completed=NO;__block NSError *selectionError=nil;starts=host->_undoStarts; + [workspace selectLUT:nil completion:^(NSError *e){completed=YES;selectionError=e;}];workspaceDrain(); + run.record(@"workspace-remove-style1-applies-once-after-async-boundary",completed&&!selectionError&&!DYReadAssets(host,kCMTimeZero).paths[@"look0"]&&host->_undoStarts==starts+1); + completed=NO;selectionError=nil;[workspace selectLUT:@"late.cube" completion:^(NSError *e){completed=YES;selectionError=e;}];host->_workspaceTime=CMTimeMake(1,24);[scopeRenderer completePreparation]; + run.record(@"workspace-async-playhead-change-keeps-new-frame-untouched",completed&&selectionError&&!DYReadAssets(host,kCMTimeZero).paths[@"look0"]);host->_workspaceTime=kCMTimeZero; + completed=NO;selectionError=nil;[workspace selectLUT:@"late.cube" completion:^(NSError *e){completed=YES;selectionError=e;}];DYAssetState *external=[[DYReadAssets(host,kCMTimeZero)copy]autorelease];external.paths=@{@"look0":@"user-new.cube"};DYWriteAssets(host,external,kCMTimeZero);[scopeRenderer completePreparation]; + run.record(@"workspace-async-lut-conflict-preserves-user-change",completed&&selectionError&&[DYReadAssets(host,kCMTimeZero).paths[@"look0"]isEqual:@"user-new.cube"]); + completed=NO;selectionError=nil;[workspace selectLUT:@"late.cube" completion:^(NSError *e){completed=YES;selectionError=e;}];for(NSDictionary *d in DYDescriptors())if([d[@"key"]isEqual:@"cmworkingTransfer"])[host setFloatValue:3 toParameter:[d[@"pid"]unsignedIntValue] atTime:kCMTimeZero];[scopeRenderer completePreparation]; + run.record(@"workspace-async-color-context-conflict-preserves-state",completed&&selectionError&&[DYReadAssets(host,kCMTimeZero).paths[@"look0"]isEqual:@"user-new.cube"]); + completed=NO;selectionError=nil;NSProgress *pending=[workspace selectLUT:@"late.cube" completion:^(NSError *e){completed=YES;selectionError=e;}];[workspace close];[scopeRenderer completePreparation]; + run.record(@"workspace-close-cancels-pending-selection-without-write",pending.cancelled&&completed&&selectionError&&[DYReadAssets(host,kCMTimeZero).paths[@"look0"]isEqual:@"user-new.cube"]); + NSMutableDictionary *document=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);NSDictionary *look=DYInsertTool(document,@"look",nil);NSString *nodeID=[[look[@"id"]copy]autorelease];DYWriteTools(host,document,kCMTimeZero); + DYToolManager *node=[[[DYToolManager alloc]initWithHost:host node:look]autorelease];DYColorWorkspace *nodeWorkspace=[[[DYColorWorkspace alloc]initWithManager:node renderer:scopeRenderer library:scopeLibrary title:@"独立风格"]autorelease];starts=host->_undoStarts;host->_nodeCommitHadUndo=NO; + wrote=[nodeWorkspace commitLUT:@"node.cube" expected:[nodeWorkspace selectionContext] error:&workspaceError]; + run.record(@"workspace-independent-style1-writes-target-node-inside-undo",wrote&&[DYToolWithID(DYReadTools(host,kCMTimeZero).document,nodeID)[@"paths"][@"look0"]isEqual:@"node.cube"]&&[DYReadAssets(host,kCMTimeZero).paths[@"look0"]isEqual:@"user-new.cube"]&&host->_nodeCommitHadUndo&&host->_undoStarts==starts+1); + document=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);DYRemoveTool(document,nodeID);DYWriteTools(host,document,kCMTimeZero);starts=host->_undoStarts;workspaceError=nil; + wrote=[nodeWorkspace commitLUT:@"deleted.cube" expected:[nodeWorkspace selectionContext] error:&workspaceError];run.record(@"workspace-deleted-node-does-not-write-another-layer",!wrote&&workspaceError&&host->_undoStarts==starts&&[DYReadAssets(host,kCMTimeZero).paths[@"look0"]isEqual:@"user-new.cube"]); + [nodeWorkspace close];run.record(@"workspace-offscreen-fixtures-never-presented",!fixture.visible&&!host->_permissionFailure&&host->_actionDepth==0); +}