From 585c83c8a12afe13af0cbcd00a17fbdaadecacb4 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Nov 2026 17:01:00 +0800 Subject: [PATCH] Implement adaptive inspector and responsive canvas controls for 1.12.1 --- .../Plugin/DYCanvasToolsDiagnostics.inc.h | 3 +- 大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h | 2 + 大鱼调色/Plugin/DYHistogram.h | 13 +-- 大鱼调色/Plugin/DYInspector.mm | 21 ++++- 大鱼调色/Plugin/DYPlugIn.mm | 60 ++++++++++++-- 大鱼调色/Plugin/DYRenderer.h | 2 + 大鱼调色/Plugin/DYScopeCapture.inc.h | 10 +++ 大鱼调色/Plugin/DYScopeSample.h | 2 + 大鱼调色/Plugin/DYScopeSample.mm | 13 ++- 大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h | 28 +++++++ 大鱼调色/Plugin/DYToolHostMethods.inc.h | 2 +- 大鱼调色/Plugin/DYToolOSC.inc.h | 12 +-- 大鱼调色/Plugin/DYToolState.mm | 15 +++- 大鱼调色/Plugin/DYViewerControls.inc.h | 47 ++++++++--- .../Plugin/DYViewerControlsDiagnostics.inc.h | 24 +++++- 大鱼调色/Plugin/DYViewerGraphics.inc.h | 4 +- 大鱼调色/Plugin/DYViewerParameterBridge.inc.h | 80 ++++++++++++++++--- 大鱼调色/Plugin/DYViewerParameterPanel.inc.h | 32 +++++--- 大鱼调色/Plugin/DYViewerParameterProbe.h | 4 +- 大鱼调色/Plugin/Info.plist | 6 +- 大鱼调色/Wrapper Application/Info.plist | 4 +- 21 files changed, 316 insertions(+), 68 deletions(-) diff --git a/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h b/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h index ecc1209..5b67b88 100644 --- a/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYCanvasToolsDiagnostics.inc.h @@ -5,7 +5,7 @@ idbridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host]; idpanel=(id)[NSClassFromString(@"DYViewerParameterPanel")new];panel.bridge=bridge; auto drain=[](){double until=NSProcessInfo.processInfo.systemUptime+.06;while(NSProcessInfo.processInfo.systemUptime_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[bridge publishAssets:DYReadAssets(host,host->_time)histogram:nil atTime:host->_time];[panel prepareWithSize:NSMakeSize(1280,720)scale:1 atTime:host->_time];}; + auto publish=[&](){DYUniforms u;DYReadUniforms(host,host->_time,&u);[bridge publishUniforms:&u document:DYReadTools(host,host->_time).document atTime:host->_time];[bridge publishAssets:DYReadAssets(host,host->_time)atTime:host->_time];[panel prepareWithSize:NSMakeSize(1280,720)scale:1 atTime:host->_time];}; auto area=[&](NSString *kind)->NSDictionary*{for(NSDictionary*a in [(id)panel valueForKey:@"areas"])if([a[@"kind"]isEqual:kind])return [[a copy]autorelease];return nil;}; auto drag=[&](NSPoint a,NSPoint b){[panel event:NSEventTypeLeftMouseDown point:a atTime:host->_time];[panel event:NSEventTypeLeftMouseDragged point:b atTime:host->_time];drain();[panel event:NSEventTypeLeftMouseUp point:b atTime:host->_time];drain();publish();}; [(id)panel setValue:@"hsl" forKey:@"toolType"];publish();NSRect plot=[area(@"hslPlot")[@"rect"]rectValue];int undo=base->_undoStarts; @@ -19,7 +19,6 @@ run.record(@"canvas-spider-uuid-persists-mesh-without-touching-base",[saved isEqual:DYReadAssets(host,kCMTimeZero).spiderMesh]&&[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]length]>0); NSData *current=DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"];[bridge beginSpider:current node:spiderID enabled:1 atTime:kCMTimeZero];drain();doc=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);auto external=dy::neutralMesh(12,12);NSData *externalData=[NSData dataWithBytes:&external length:sizeof(external)];((NSMutableDictionary*)DYToolWithID(doc,spiderID))[@"spider"]=externalData;DYWriteTools(host,doc,kCMTimeZero);[bridge changeSpider:current];[bridge endGesture];drain(); run.record(@"canvas-spider-external-topology-change-wins",[DYToolWithID(DYReadTools(host,kCMTimeZero).document,spiderID)[@"spider"]isEqual:externalData]); - DYHistogram hist{};hist.samples=1;hist.bins[1][100]=1;NSData *histData=[NSData dataWithBytes:&hist length:sizeof(hist)];[bridge publishHistogram:histData atTime:kCMTimeZero];run.record(@"canvas-histogram-is-frozen-to-matching-frame",[[bridge snapshotAtTime:kCMTimeZero][@"histogram"]isEqual:histData]&&![bridge snapshotAtTime:CMTimeMake(1,24)]); [panel finishCapture];panel.bridge=nil;[bridge invalidate];drain();[(id)panel release];[(id)bridge release]; } { diff --git a/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h b/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h index 6927443..05afead 100644 --- a/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h @@ -4,8 +4,10 @@ DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[view refresh];[view setFrameSize:NSMakeSize(400,780)];[view layoutSubtreeIfNeeded]; NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];NSView *first=cards.firstObject[@"view"]; run.record(@"compact-color-settings-hidden-without-gap",panel.hidden&&first.frame.origin.y==8&&[settings.accessibilityLabel isEqual:@"颜色设置"]); + CGFloat foldedHeight=view.intrinsicContentSize.height; NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds; [settings performClick:nil];[view layoutSubtreeIfNeeded];run.record(@"compact-color-settings-button-expands-panel",!panel.hidden&&first.frame.origin.y>=NSMaxY(panel.frame)+12&&settings.state==NSControlStateValueOn); + run.record(@"inspector-preferred-height-follows-content-with-a-scroll-cap",foldedHeight<780&&view.intrinsicContentSize.height>foldedHeight&&view.intrinsicContentSize.height<=780); for(int i=0;i<9;i++){[settings performClick:nil];[view layoutSubtreeIfNeeded];} run.record(@"compact-color-settings-repeated-toggle-does-not-edit-grade",panel.hidden&&first.frame.origin.y==8&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds); for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults()]){ diff --git a/大鱼调色/Plugin/DYHistogram.h b/大鱼调色/Plugin/DYHistogram.h index fde91cd..2ce7dcd 100644 --- a/大鱼调色/Plugin/DYHistogram.h +++ b/大鱼调色/Plugin/DYHistogram.h @@ -3,21 +3,22 @@ #include #include -// Immutable renderer-owned snapshot. Channel 0 is Rec.709 luma of the existing -// display-encoded analysis samples, not scene-linear luminance or an HDR scope. +// Immutable renderer-owned snapshot. Channel 0 uses Rec.709 weights in the +// supplied RGB domain. struct DYHistogram { uint32_t bins[4][256]{}; uint32_t samples=0; }; -static inline NSData *DYHistogramFromRGBA(NSData *rgba) { +static inline NSData *DYHistogramFromRGBA(NSData *rgba, bool premultiplied=false) { DYHistogram h; if(rgba.length%sizeof(float[4]))return nil; const float *p=(const float *)rgba.bytes; auto bin=[](double v){return (int)std::lround(std::fmax(0.,std::fmin(1.,v))*255.);}; for(NSUInteger i=0;i *DYCreateWorkspaceMaskEditor(id NSInteger _visibleLooks; NSButton *_colorSettings;BOOL _colorSettingsExpanded; BOOL _refreshing,_graphicUndoOpen,_graphicCancelled;CMTime _graphicTime;NSMutableDictionary *_graphicExpected; - BOOL _embedded,_workspaceEditor;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight; + BOOL _embedded,_workspaceEditor;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight; DYSpiderPanel *_spiderPanel; NSMutableDictionary *_assetLoads,*_assetLoadIDs; NSUInteger _nextAssetLoadID; @@ -509,9 +509,10 @@ NSView *DYCreateWorkspaceMaskEditor(id } - (instancetype)initWithAPIManager:(id)manager renderer:(DYRenderer *)renderer workspaceType:(NSString *)workspaceType { uint64_t beta=DYBetaSpanBegin(@"inspector_create",nil); - if((self=[super initWithFrame:NSMakeRect(0,0,360,780)])) { + if((self=[super initWithFrame:NSMakeRect(0,0,360,406)])) { _assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=1; _workspaceEditor=workspaceType.length>0;_embedded=[manager isKindOfClass:DYToolManager.class];if(_embedded)[(id)_manager retain]; + _preferredHeight=(_embedded||_workspaceEditor)?780:406; NSArray *presentation=DYPresentationSections();if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;} _sections=[presentation copy];_stackViews=[NSMutableDictionary new];_stackOrder=[@[]copy]; _cards=[[NSMutableArray alloc] init]; _controls=[[NSMutableDictionary alloc] init]; @@ -585,7 +586,7 @@ NSView *DYCreateWorkspaceMaskEditor(id - (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); } - (NSArray *)accessibilityVisibleChildren { return DYAccessibleSubviews(self,YES); } - (NSArray *)accessibilityChildrenInNavigationOrder { return self.accessibilityChildren; } -- (NSSize)intrinsicContentSize { return NSMakeSize(360,780); } +- (NSSize)intrinsicContentSize { return NSMakeSize(360,_preferredHeight); } - (void)viewDidMoveToWindow { [super viewDidMoveToWindow]; if(!self.window){[self graphicGesture:NO title:nil];[self cancelAssetLoads];[_workspace close];} @@ -807,7 +808,7 @@ NSView *DYCreateWorkspaceMaskEditor(id CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4); NSArray *actions=@[_save,_load,_export,_colorSettings];for(NSUInteger i=0;i *DYCreateWorkspaceMaskEditor(id } y=[self layoutRepeatedToolsAfter:@"tail" y:y width:w]; _stackHeight=y;CGFloat documentWidth=_scroll.contentSize.width;if(_workspaceEditor)for(NSDictionary *card in _cards)documentWidth=MAX(documentWidth,[card[@"view"]frame].size.width);[_document setFrameSize:NSMakeSize(documentWidth,_workspaceEditor?_scroll.contentSize.height:MAX(y,_scroll.contentSize.height))]; + if(!_embedded&&!_workspaceEditor){ + CGFloat preferred=MIN(780,ceil(top+MAX(12,y))); + if(preferred!=_preferredHeight){ + _preferredHeight=preferred; + // Update the remote view after the host's current layout pass. + dispatch_async(dispatch_get_main_queue(),^{ + if(preferred!=self->_preferredHeight)return; + [self invalidateIntrinsicContentSize]; + if(self.frame.size.height!=preferred)[self setFrameSize:NSMakeSize(self.frame.size.width,preferred)]; + }); + } + } } - (id)actionAPI { return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; } - (void)refresh { diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index fe318ab..35b6e74 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -19,13 +19,14 @@ #include "DYToolFlow.inc.h" @implementation DYPlugIn { DYRenderer *_renderer; + NSColorSampler *_canvasSampler; BOOL _copyAnalyzed; std::atomic_bool _betaFirstRenderStarted,_modelRefreshPending; #include "DYToolHostIvars.inc.h" } #include "DYToolHostMethods.inc.h" -- (instancetype)initWithAPIManager:(id)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}DYBetaSpanEnd(beta,nil);return self;} -- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[super dealloc];} +- (instancetype)initWithAPIManager:(id)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];}DYBetaSpanEnd(beta,nil);return self;} +- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_canvasSampler release];[_renderer release];[super dealloc];} - (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;} - (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);} - (NSSet*)classesForCustomParameterID:(UInt32)pid{return pid==DYToolsParameterID?[NSSet setWithObjects:DYToolDocument.class,NSDictionary.class,NSArray.class,NSString.class,NSNumber.class,NSData.class,nil]:pid==DYAssetsParameterID?[NSSet setWithObjects:DYAssetState.class,NSDictionary.class,NSString.class,NSData.class,nil]:[NSSet setWithObjects:DYInspectorToken.class,NSDictionary.class,NSString.class,NSNumber.class,nil];} @@ -35,12 +36,12 @@ // remote parameter read and view rebuild for every scalar in the burst. if(!_modelRefreshPending.exchange(true)){id host=_apiManager;dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];});}return YES;} - (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{ - DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;idtiming=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a histogram:nil atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;idgamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil; + DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;idtiming=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;idgamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil; } - (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;NSData *previousHistogram=[_renderer histogram];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){NSData *histogram=[_renderer histogram];if(histogram&&histogram!=previousHistogram)[_viewerParameterBridge publishHistogram:histogram atTime:t];[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_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()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_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{ @@ -48,7 +49,56 @@ } - (void)applyValues:(NSDictionary*)values{if(!values){[self alert:@"尚未拿到当前片段画面,请移动播放头后重试。"];return;}ida=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];@try{ids=[_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];for(NSDictionary*r in DYDescriptors()){NSNumber*v=values[r[@"key"]];if(v)[s setFloatValue:v.doubleValue toParameter:[r[@"pid"]unsignedIntValue] atTime:a.currentTime];}}@finally{[a endAction:self];}[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_apiManager];} - (void)autoRequested:(NSNotification*)n{NSData*frame=[_renderer preview];[self applyValues:[n.name isEqual:@"DYAutoGrade"]?DYAutoGrade(frame):DYAutoWhiteBalance(frame)];} -- (void)whiteBalanceRequested:(NSNotification*)n{NSColor*c=[n.userInfo[@"color"]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];if(!c)return;float temp=0,tint=0;if([DYColorTables neutralizeColor:(vector_float3){(float)c.redComponent,(float)c.greenComponent,(float)c.blueComponent} temperature:&temp tint:&tint])[self applyValues:@{@"temperature":@(temp),@"tint":@(tint)}];else [self alert:@"所选颜色过暗,请选择白色或中性灰区域。"];} +- (void)canvasWhiteBalanceRequested:(NSNotification*)note { + CMTime time=[note.userInfo[@"time"] CMTimeValue]; + if(_canvasSampler||!CMTIME_IS_NUMERIC(time))return; + _canvasSampler=[NSColorSampler new]; + [_canvasSampler showSamplerWithSelectionHandler:^(NSColor *color){ + [self->_canvasSampler release];self->_canvasSampler=nil; + if(color)[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:self->_apiManager userInfo:@{@"color":color,@"time":[NSValue valueWithCMTime:time]}]; + }]; +} +- (void)applyCanvasWhiteBalance:(NSDictionary*)values atTime:(CMTime)time { + id action=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; + if(!action)return; + NSMutableArray *descriptors=[NSMutableArray array]; + for(NSDictionary *d in DYDescriptors())if(values[d[@"key"]])[descriptors addObject:d]; + NSString *node=nil; + NSMutableDictionary *original=[NSMutableDictionary dictionary]; + [action startAction:self];@try{ + if(CMTimeCompare(DYHostDisplayedFrameTime(_apiManager,action.currentTime),time)!=0)return; + NSDictionary *document=DYReadTools(_apiManager,time).document; + NSString *selected=[_viewerParameterBridge snapshotAtTime:time][@"selectedNode"]; + NSDictionary *layer=DYToolWithID(document,selected); + if([layer[@"type"]isEqual:@"base"])node=selected; + else if(!DYBaseToolRemoved(document,@"base"))node=@"base:base"; + else for(NSString *ID in DYToolDisplayOrder(document))if([DYToolWithID(document,ID)[@"type"]isEqual:@"base"]){node=ID;break;} + if(node){ + DYUniforms uniforms=DYToolUniforms(DYToolWithID(document,node)); + id get=[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + for(NSDictionary *d in descriptors){ + double value=[d[@"default"]doubleValue]; + if([node isEqual:@"base:base"]){if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:time])return;} + else value=*(float*)((uint8_t*)&uniforms+[d[@"offset"]unsignedIntegerValue]); + original[d[@"key"]]=@(value); + } + } + }@finally{[action endAction:self];} + if(!node){[self alert:@"请先添加基础调整模块,再吸取白点。"];return;} + [_viewerParameterBridge beginParameters:descriptors node:node values:original atTime:time]; + [_viewerParameterBridge changeValues:values];[_viewerParameterBridge endGesture]; +} +- (void)whiteBalanceRequested:(NSNotification*)n { + NSColor *color=[n.userInfo[@"color"] colorUsingColorSpace:NSColorSpace.sRGBColorSpace]; + if(!color)return; + float temperature=0,tint=0; + if(![DYColorTables neutralizeColor:(vector_float3){(float)color.redComponent,(float)color.greenComponent,(float)color.blueComponent} temperature:&temperature tint:&tint]){ + [self alert:@"所选颜色过暗,请选择白色或中性灰区域。"];return; + } + NSDictionary *values=@{@"temperature":@(temperature),@"tint":@(tint)}; + if(n.userInfo[@"time"])[self applyCanvasWhiteBalance:values atTime:[n.userInfo[@"time"] CMTimeValue]]; + else [self applyValues:values]; +} @end #include "DYViewerControls.inc.h" #include "DYToolOSC.inc.h" diff --git a/大鱼调色/Plugin/DYRenderer.h b/大鱼调色/Plugin/DYRenderer.h index ba3e8bf..836b6ba 100644 --- a/大鱼调色/Plugin/DYRenderer.h +++ b/大鱼调色/Plugin/DYRenderer.h @@ -16,6 +16,8 @@ - (NSData*)preview; /// 256-bin luma/R/G/B of the existing 320×180 analysis preview. - (NSData*)histogram; +/// Bins from this instance's most recent final output at the requested time. +- (NSData*)canvasHistogramAtTime:(CMTime)time; /// Display-encoded float RGBA, 320×180, with the visually top row first. /// Analysis preview retains the host texture's original row order separately. - (NSData*)lookLUTPreview; diff --git a/大鱼调色/Plugin/DYScopeCapture.inc.h b/大鱼调色/Plugin/DYScopeCapture.inc.h index 9149993..20845ab 100644 --- a/大鱼调色/Plugin/DYScopeCapture.inc.h +++ b/大鱼调色/Plugin/DYScopeCapture.inc.h @@ -16,6 +16,16 @@ } - (NSData *)scopePreview{@synchronized(_previewLock){return [[_scopePreview retain]autorelease];}} - (NSDictionary *)scopeMetadata{@synchronized(_previewLock){return [[_scopeMetadata retain]autorelease];}} +- (NSData *)canvasHistogramAtTime:(CMTime)time{ + if(!CMTIME_IS_NUMERIC(time))return nil; + DYScopeSample *sample=nil; + @synchronized(_previewLock){sample=[_scopeLatest retain];} + NSDictionary *metadata=sample.metadata; + CMTime captured=CMTimeMakeWithEpoch([metadata[@"timeValue"]longLongValue],[metadata[@"timeScale"]intValue],[metadata[@"timeEpoch"]longLongValue]); + NSData *histogram=metadata&&CMTimeCompare(time,captured)==0?sample.canvasHistogram:nil; + [sample release]; + return histogram; +} - (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time{ NSUInteger generation;uint64_t serial;@synchronized(_previewLock){if(_exporting||!tile)return;generation=_scopeGeneration;serial=++_scopeCaptureSerial;} @autoreleasepool{@try{ diff --git a/大鱼调色/Plugin/DYScopeSample.h b/大鱼调色/Plugin/DYScopeSample.h index 2104759..eaa48a2 100644 --- a/大鱼调色/Plugin/DYScopeSample.h +++ b/大鱼调色/Plugin/DYScopeSample.h @@ -6,4 +6,6 @@ @property(nonatomic,copy) NSDictionary *metadata; @property(nonatomic) NSUInteger generation; @property(nonatomic) CGColorSpaceRef space; +/// Final-output bins in the host RGB domain, calculated only if requested. +@property(nonatomic,readonly) NSData *canvasHistogram; @end diff --git a/大鱼调色/Plugin/DYScopeSample.mm b/大鱼调色/Plugin/DYScopeSample.mm index f902832..f885e4b 100644 --- a/大鱼调色/Plugin/DYScopeSample.mm +++ b/大鱼调色/Plugin/DYScopeSample.mm @@ -1,5 +1,14 @@ #import "DYScopeSample.h" -@implementation DYScopeSample +#import "DYHistogram.h" +@implementation DYScopeSample { + NSData *_canvasHistogram; +} +- (NSData *)canvasHistogram{ + @synchronized(self){ + if(!_canvasHistogram)_canvasHistogram=[DYHistogramFromRGBA(_pixels,true) retain]; + return [[_canvasHistogram retain]autorelease]; + } +} - (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];} +- (void)dealloc{[_pixels release];[_metadata release];[_canvasHistogram release];if(_space)CGColorSpaceRelease(_space);[super dealloc];} @end diff --git a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h index 6288607..6eedda7 100644 --- a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h @@ -33,6 +33,13 @@ [(id)osc setValue:[NSValue valueWithRect:view]forKey:@"imageRect"];[(id)osc setValue:@2 forKey:@"uiScale"];NSRect visible=NSIntersectionRect(view,NSMakeRect(0,0,640,400)); for(NSInteger i=9;i<=10;i++)penActionsBounded&=NSContainsRect(visible,[(id)osc toolbarRectForItem:i]);} run.record(@"native-osc-keeps-only-two-pen-actions-bounded-at-bottom",penActionsBounded); + NSColor *white=[NSColor colorWithSRGBRed:.82 green:.64 blue:.52 alpha:1]; + auto whiteBalance=[&](CMTime time){[NSNotificationCenter.defaultCenter postNotificationName:@"DYWhiteBalanceColor" object:host userInfo:@{@"time":[NSValue valueWithCMTime:time],@"color":white}];drain();}; + NSDictionary *beforeWhite=[[base->_values copy]autorelease];undo=base->_undoStarts;whiteBalance(CMTimeMake(1,24)); + run.record(@"canvas-white-balance-cannot-write-after-the-playhead-moves",[beforeWhite isEqual:base->_values]&&base->_undoStarts==undo); + whiteBalance(kCMTimeZero);DYUniforms balanced;DYReadUniforms(host,kCMTimeZero,&balanced); + float temp=0,tint=0;[DYColorTables neutralizeColor:(vector_float3){.82f,.64f,.52f} temperature:&temp tint:&tint]; + run.record(@"canvas-white-balance-uses-existing-solver-and-one-undo",fabs(balanced.temperature-temp)<1e-4&&fabs(balanced.tint-tint)<1e-4&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); [osc release];[plugin release];drain(); } { @@ -59,3 +66,24 @@ [osc mouseDownAtPositionX:488 positionY:149.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:208 positionY:275.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();p=DYMaskAtTime(DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,maskID),kCMTimeZero);run.record(@"native-osc-ellipse-draws-reverse-direction-with-positive-shared-extents",p.kind==DYMaskEllipse&&fabs(p.centerX-.55)<1e-5&&fabs(p.centerY-.5)<1e-5&&fabs(p.width-.5)<1e-5&&fabs(p.height-.4)<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); [osc release];[plugin release];drain(); } + +{ + DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil); + DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero; + id plugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host]; + DYDiagnosticTile *src=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:16 height:16]autorelease],*dst=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:16 height:16]autorelease]; + Pixels pixels(16*16*4);for(size_t i=0;i bridge=[(id)plugin valueForKey:@"viewerParameterBridge"]; + auto histogram=[&]()->NSData*{NSData *state=nil;NSError *failure=nil; + if(![plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&failure])return nil; + if(![(id)plugin renderDestinationImage:dst sourceImages:@[src] pluginState:state atTime:kCMTimeZero error:&failure])return nil; + return [bridge canvasHistogramAtTime:kCMTimeZero]; + }; + NSData *before=histogram(); + for(NSDictionary *d in DYDescriptors())if([@[@"masterX0",@"curveY0"]containsObject:d[@"key"]]) + [(id)base setFloatValue:[d[@"key"]isEqual:@"masterX0"]?.5:32 toParameter:[d[@"pid"]unsignedIntValue] atTime:kCMTimeZero]; + NSData *after=histogram(); + run.record(@"canvas-curve-histogram-updates-from-final-output-at-the-same-playhead",before.length==sizeof(DYHistogram)&&after.length==sizeof(DYHistogram)&&![before isEqual:after]&&![bridge canvasHistogramAtTime:CMTimeMake(1,24)]); + [plugin release]; +} diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index 7706aa7..362767e 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -1,5 +1,5 @@ - (void)initializeToolHost { - _viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager]; + _viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager];_viewerParameterBridge.renderer=_renderer; _toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid; NSNotificationCenter *n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(toolCanvasSelection:) name:@"DYToolCanvasSelection" object:_apiManager];[n addObserver:self selector:@selector(toolCanvasCommand:) name:@"DYToolCanvasCommand" object:_apiManager];[n addObserver:self selector:@selector(toolTrackRequested:) name:@"DYToolTrack" object:_apiManager]; } diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index a70de95..106b85a 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -15,11 +15,10 @@ } - (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];} - (NSRect)toolbarRectForItem:(NSInteger)item{ - // Only the two temporary pen actions remain. The permanent tools live in the - // transparent left rail; the middle of the bottom edge opens the workspace. + // Keep the temporary pen actions clear of the permanent tool rail. if(![_mask[@"drawing"]boolValue]||(item!=9&&item!=10))return NSZeroRect; NSRect v=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));CGFloat scale=MAX(.01,MIN(_uiScale,MIN(v.size.width/300.,v.size.height/100.))); - return NSMakeRect(NSMidX(v)+(item==9?-144:80)*scale,NSMaxY(v)-32*scale,64*scale,24*scale); + return NSMakeRect(NSMinX(v)+(item==9?8:76)*scale,NSMaxY(v)-61*scale,64*scale,24*scale); } - (void)drawOSCWithWidth:(NSInteger)width height:(NSInteger)height activePart:(NSInteger)activePart destinationImage:(FxImageTile*)destination atTime:(CMTime)time {@synchronized(self){@autoreleasepool{ if(!_device||_device.registryID!=destination.deviceRegistryID){[_device release];_device=nil;NSArray *devices=MTLCopyAllDevices();for(idd in devices)if(d.registryID==destination.deviceRegistryID)_device=[d retain];[devices release];[_queue release];_queue=[_device newCommandQueue];[_context release];_context=_device?[[CIContext contextWithMTLDevice:_device options:@{kCIContextWorkingColorSpace:NSNull.null,kCIContextOutputColorSpace:NSNull.null}]retain]:nil;} @@ -52,8 +51,10 @@ }[commands commit];[commands waitUntilCompleted]; }}} - (NSInteger)partAtPoint:(NSPoint)point { + BOOL drawing=[_mask[@"drawing"]boolValue]; + if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i; NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit; - if(!_mask)return 0;BOOL drawing=[_mask[@"drawing"]boolValue];if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;if([_mask[@"drawShape"]boolValue])return NSPointInRect(point,_imageRect)?1:0; + if(!_mask)return 0;if([_mask[@"drawShape"]boolValue])return NSPointInRect(point,_imageRect)?1:0; DYMaskParameters p;[_mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/MAX(1.,_imageRect.size.height); if(drawing){NSData *data=_mask[@"nodes"];if(data.length>=3*sizeof(DYBezierNode)){const DYBezierNode *nodes=(const DYBezierNode*)data.bytes;NSPoint first=[self canvasPoint:nodes[0].x y:nodes[0].y parameters:p];if(hypot(point.x-first.x,point.y-first.y)<=10*_uiScale)return 1000;}return NSPointInRect(point,_imageRect)?1:0;} for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];} @@ -65,7 +66,8 @@ if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;} BOOL ownedMask=_maskCapturing&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp); if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture]; - if(!ownedMask&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES; + BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010); + if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES; if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0){_maskCapturing=NO;return NO;} NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height); if(type==NSEventTypeLeftMouseDown){_maskCapturing=part>0&&part<10000;_maskCaptureOwner=_maskCapturing?plugin:nil;} diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm index ad5ddaa..a54cb23 100644 --- a/大鱼调色/Plugin/DYToolState.mm +++ b/大鱼调色/Plugin/DYToolState.mm @@ -4,6 +4,7 @@ #include #import #import +#import NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film",@"lens"];} NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;} @@ -173,7 +174,19 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms - (void)dealloc{[_nodeID release];[_type release];[_pending release];[_token release];[super dealloc];} - (id)apiForProtocol:(Protocol*)p{if(protocol_isEqual(p,@protocol(FxParameterRetrievalAPI_v6))||protocol_isEqual(p,@protocol(FxParameterSettingAPI_v6))||protocol_isEqual(p,@protocol(FxCustomParameterActionAPI_v4)))return self;return [_host apiForProtocol:p];} - (void)startAction:(id)sender{if(_depth++==0){[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]startAction:sender];_time=[(id)[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]currentTime];[_pending release];_pending=[DYMutablePlist(DYReadTools(_host,_time).document)retain];}} -- (void)endAction:(id)sender{if(_depth<=0)return;if(--_depth==0){NSDictionary *original=DYReadTools(_host,_time).document;if(![_pending isEqual:original])DYWriteTools(_host,_pending,_time);if(_token)[[_host apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:_token toParameter:DYInspectorParameterID atTime:_time];[_token release];_token=nil;[[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]endAction:sender];}} +- (void)endAction:(id)sender{ + if(_depth<=0||--_depth>0)return; + @try{ + NSDictionary *original=DYReadTools(_host,_time).document; + if(![_pending isEqual:original]&&!DYWriteTools(_host,_pending,_time)) + os_log_error(OS_LOG_DEFAULT,"dayu_tool_save_rejected kind=document"); + if(_token&&![[_host apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:_token toParameter:DYInspectorParameterID atTime:_time]) + os_log_error(OS_LOG_DEFAULT,"dayu_tool_save_rejected kind=inspector"); + }@finally{ + [_token release];_token=nil; + [[_host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]endAction:sender]; + } +} - (CMTime)currentTime{return _time;} - (NSDictionary*)node{return DYToolWithID(_pending?:DYReadTools(_host,_time).document,_nodeID);} - (BOOL)getFloatValue:(double*)out fromParameter:(UInt32)pid atTime:(CMTime)t{NSDictionary *n=[self node];DYUniforms u=DYToolUniforms(n?:@{@"type":_type});for(NSDictionary *d in DYDescriptors())if([d[@"pid"]unsignedIntValue]==pid){*out=[d[@"offset"]integerValue]>=0?*(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue]):[d[@"default"]doubleValue];return YES;}return NO;} diff --git a/大鱼调色/Plugin/DYViewerControls.inc.h b/大鱼调色/Plugin/DYViewerControls.inc.h index 818cee8..7bedaa1 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -1,8 +1,25 @@ -// One OSC root owns a lower-left tool rail and independent movable editors. +// One OSC root owns a lower-right 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; +static void DYDrawDistortionGrid(NSRect rect,NSColor *color){ + CGFloat side=MIN(rect.size.width,rect.size.height); + auto point=[&](CGFloat x,CGFloat y){ + CGFloat scale=side*(.34+.075*(x*x+y*y)); + return NSMakePoint(NSMidX(rect)+scale*x,NSMidY(rect)+scale*y); + }; + NSBezierPath *grid=[NSBezierPath bezierPath]; + grid.lineWidth=MAX(.75,side*.067); + for(CGFloat edge:{-1.,0.,1.})for(BOOL vertical:{NO,YES}){ + for(int i=0;i<=12;i++){ + CGFloat t=(i-6)/6.; + NSPoint p=vertical?point(edge,t):point(t,edge); + if(i==0)[grid moveToPoint:p];else [grid lineToPoint:p]; + } + } + [color setStroke];[grid stroke]; +} @interface DYViewerControls : NSObject @property(nonatomic,retain) DYViewerParameterBridge *bridge; - (void)setViewport:(NSRect)viewport; @@ -34,11 +51,12 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti if(_capture&&![_capture capturing])_capture=nil; [_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return; // Only tools that benefit from direct image interaction belong on the canvas. - NSArray *types=@[@"curve",@"lens",@"skin",@"look"],*titles=@[@"曲线",@"畸变",@"肤色",@"LUT"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"camera.aperture",@"person.crop.circle",@"square.stack.3d.up"]; - CGFloat railScale=MIN(s,MIN((v.size.width-24)/388.,(v.size.height-16)/27.));CGFloat x=NSMinX(v)+8*railScale,y=NSMaxY(v)-33*railScale,w=36*railScale; - _rail=NSMakeRect(x,y,276*railScale,25*railScale); + NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper"]; + CGFloat railScale=MIN(s,v.size.width/440.),y=NSMaxY(v)-33*railScale,w=36*railScale; + CGFloat x=NSMaxX(v)-436*railScale; + _rail=NSMakeRect(x,y,316*railScale,25*railScale); for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x+i*40*railScale,y,w,25*railScale)]}]; - for(NSInteger i=0;i<4;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}]; + for(NSInteger i=0;i_undoStarts;NSDictionary *initial=[[base->_values copy]autorelease]; NSMutableSet *types=[NSMutableSet set];NSInteger masks=0;CGFloat lastX=-1,y=-1;BOOL horizontal=YES; for(NSDictionary *a in [controls valueForKey:@"areas"]){if([a[@"kind"]isEqual:@"mask"])masks++;if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(lastX>=0)horizontal&=r.origin.x>lastX&&r.origin.y==y;lastX=r.origin.x;y=r.origin.y;[types addObject:a[@"toolType"]];}} - run.record(@"viewer-lower-left-rail-has-only-four-image-tools-and-three-persistent-mask-shapes",horizontal&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0); + run.record(@"viewer-lower-right-rail-has-five-image-tools-and-three-persistent-mask-shapes",horizontal&&lastX>size.width*.8&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look",@"whiteBalance"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0); NSDictionary *workspace=areaFor(controls,@"workspace",nil);NSRect workspaceRect=[workspace[@"rect"]rectValue]; run.record(@"viewer-control-panel-entry-is-labelled-and-anchored-at-bottom",[workspace[@"title"]isEqual:@"控制面板"]&&NSMidY(workspaceRect)>size.height*.9); __block NSInteger workspaceRequests=0;__block NSString *requestedPage=nil;__block NSInteger requestedMask=-1; @@ -23,16 +23,34 @@ BOOL maskRoutes=YES;for(NSDictionary *a in [[[controls valueForKey:@"areas"]copy]autorelease])if([a[@"kind"]isEqual:@"mask"]){click(a);drain();maskRoutes&=[requestedPage isEqual:@"masks"]&&requestedMask==[a[@"index"]integerValue];} run.record(@"viewer-persistent-mask-entries-route-shapes-to-shared-workspace",maskRoutes&&base->_undoStarts==undo); [NSNotificationCenter.defaultCenter removeObserver:observer];[requestedPage release]; + __block NSInteger eyedropperRequests=0;__block CMTime eyedropperTime=kCMTimeInvalid; + id sampleObserver=[NSNotificationCenter.defaultCenter addObserverForName:@"DYViewerWhiteBalanceRequested" object:host queue:nil usingBlock:^(NSNotification *note){eyedropperRequests++;eyedropperTime=[note.userInfo[@"time"] CMTimeValue];}]; + click(areaFor(controls,@"tool",@"whiteBalance"));drain(); + run.record(@"viewer-white-balance-icon-routes-a-single-time-bound-pick",eyedropperRequests==1&&CMTimeCompare(eyedropperTime,host->_time)==0&&!panelFor(@"whiteBalance")&&[initial isEqual:base->_values]); + [NSNotificationCenter.defaultCenter removeObserver:sampleObserver]; + run.record(@"viewer-distortion-entry-uses-pincushion-grid", [areaFor(controls,@"tool",@"lens")[@"symbol"]isEqual:@"pincushion-grid"]); + click(areaFor(controls,@"tool",@"skin"));drain();publish(); run.record(@"viewer-skin-entry-toggles-actual-protection-preview-without-parameter-card",value(@"skinVisualize")==1&&!panelFor(@"skin")&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); click(areaFor(controls,@"tool",@"skin"));drain();publish();run.record(@"viewer-skin-preview-toggle-restores-review-image",value(@"skinVisualize")==0&&!panelFor(@"skin")); click(areaFor(controls,@"tool",@"curve"));id curve=panelFor(@"curve"); run.record(@"viewer-curve-is-graph-only-without-title-catalog-or-parameter-page",curve&&areaFor(curve,@"curvePlot",nil)&&!areaFor(curve,@"open",nil)&&!areaFor(curve,@"catalog",nil)&&!areaFor(curve,@"graphMode",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; + NSRect plot=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue],grip=[areaFor(curve,@"curveGrip",nil)[@"rect"]rectValue]; + run.record(@"viewer-curve-opens-above-the-lower-right-controls",NSMidX(plot)>size.width*.8&&NSMaxY(plot)size.height*.8&&!NSIsEmptyRect(grip)); + NSPoint gripStart=NSMakePoint(NSMidX(grip),NSMidY(grip)),gripEnd=NSMakePoint(gripStart.x-70,gripStart.y-52); + undo=base->_undoStarts;[controls event:NSEventTypeLeftMouseDown point:gripStart atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:gripEnd atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:gripEnd atTime:host->_time];drain(); + NSRect shifted=[areaFor(curve,@"curvePlot",nil)[@"rect"]rectValue]; + run.record(@"viewer-curve-grip-moves-both-axes-without-a-grade-or-undo",fabs(NSMinX(shifted)-NSMinX(plot)+70)<.1&&fabs(NSMinY(shifted)-NSMinY(plot)+52)<.1&&base->_undoStarts==undo); + plot=shifted;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(); + [controls event:NSEventTypeLeftMouseUp point:NSMakePoint(plot.origin.x+.61*plot.size.width,plot.origin.y+.3*plot.size.height)atTime:host->_time]; + auto visibleCurveX=[&](NSString *key)->double{for(NSDictionary *p in [curve performSelector:@selector(curvePoints)])if([p[@"xKey"]isEqual:key])return [p[@"x"]doubleValue];return NAN;}; + BOOL pendingStays=fabs(visibleCurveX(xKey)-.61)<1e-5; + drain();[controls prepareWithSize:size scale:1 atTime:host->_time]; + run.record(@"viewer-curve-release-never-exposes-the-stale-plot-before-or-after-write",pendingStays&&fabs(visibleCurveX(xKey)-.61)<1e-5); + 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); diff --git a/大鱼调色/Plugin/DYViewerGraphics.inc.h b/大鱼调色/Plugin/DYViewerGraphics.inc.h index 9f2e132..2ed4503 100644 --- a/大鱼调色/Plugin/DYViewerGraphics.inc.h +++ b/大鱼调色/Plugin/DYViewerGraphics.inc.h @@ -81,7 +81,7 @@ return; } [NSGraphicsContext saveGraphicsState];NSRectClip(r); - NSData *rawHistogram=_snapshot[@"histogram"];const DYHistogram *hist=rawHistogram.length==sizeof(DYHistogram)?(const DYHistogram*)rawHistogram.bytes:nullptr; + NSData *rawHistogram=[_bridge canvasHistogramAtTime:_time];const DYHistogram *hist=rawHistogram.length==sizeof(DYHistogram)?(const DYHistogram*)rawHistogram.bytes:nullptr; if(hist&&hist->samples){uint32_t peak=1;for(int c=0;c<4;c++)if(_channel==0||c==_channel)for(int b=0;b<256;b++)peak=MAX(peak,hist->bins[c][b]);NSArray *colors=@[ink,NSColor.systemRedColor,NSColor.systemGreenColor,NSColor.systemBlueColor];for(int c=3;c>=0;c--){if(_channel&&c!=_channel)continue;NSBezierPath *area=[NSBezierPath bezierPath];[area moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];for(int b=0;b<256;b++)[area lineToPoint:NSMakePoint(NSMinX(r)+b/255.*r.size.width,NSMaxY(r)-sqrt(hist->bins[c][b]/double(peak))*r.size.height*.86)];[area lineToPoint:NSMakePoint(NSMaxX(r),NSMaxY(r))];[area closePath];[[colors[c]colorWithAlphaComponent:c==0?.08:.2]setFill];[area fill];}} [[ink colorWithAlphaComponent:.16]setStroke];NSBezierPath*grid=[NSBezierPath bezierPath];grid.lineWidth=.5*s; for(int i=0;i<5;i++){CGFloat x=r.origin.x+r.size.width*i/4,y=r.origin.y+r.size.height*i/4;[grid moveToPoint:NSMakePoint(x,NSMinY(r))];[grid lineToPoint:NSMakePoint(x,NSMaxY(r))];[grid moveToPoint:NSMakePoint(NSMinX(r),y)];[grid lineToPoint:NSMakePoint(NSMaxX(r),y)];}[grid stroke]; @@ -130,5 +130,5 @@ NSDictionary*values=@{xKey:@(x),yKey:@(y)};[_draftValues addEntriesFromDictionary:values];[_bridge changeValues:values]; } - (void)deleteSelectedPoint{ - if(!_selectedX)return;for(NSDictionary*point in [self curvePoints])if([point[@"xKey"]isEqual:_selectedX]){NSString*x=point[@"xKey"],*y=point[@"yKey"];[_bridge beginParameters:@[[self descriptorForKey:x],[self descriptorForKey:y]]node:_nodeID values:@{x:@([self graphicValue:x]),y:@([self graphicValue:y])}atTime:_time];[_bridge changeValues:@{x:@(-1),y:@0}];[_bridge endGesture];break;}[_selectedX release];_selectedX=nil; + if(!_selectedX)return;for(NSDictionary*point in [self curvePoints])if([point[@"xKey"]isEqual:_selectedX]){NSString*x=point[@"xKey"],*y=point[@"yKey"];[_bridge beginParameters:@[[self descriptorForKey:x],[self descriptorForKey:y]]node:_nodeID values:@{x:@([self graphicValue:x]),y:@([self graphicValue:y])}atTime:_time];NSDictionary *values=@{x:@(-1),y:@0};[_bridge changeValues:values];[self finishCurveWithValues:values];break;}[_selectedX release];_selectedX=nil; } diff --git a/大鱼调色/Plugin/DYViewerParameterBridge.inc.h b/大鱼调色/Plugin/DYViewerParameterBridge.inc.h index dce476a..a07687e 100644 --- a/大鱼调色/Plugin/DYViewerParameterBridge.inc.h +++ b/大鱼调色/Plugin/DYViewerParameterBridge.inc.h @@ -15,16 +15,20 @@ // incomplete samples are rejected as a unit, before the first host write. - (void)changeValues:(NSDictionary*)values; - (void)endGesture; +- (uint64_t)endCurveGesture; +- (BOOL)gesturePending:(uint64_t)gesture; // Call before the owning plug-in releases this object during teardown. - (void)invalidate; - (void)requestWorkspace; - (void)requestWorkspacePage:(NSString *)page; - (void)requestMask:(NSInteger)kind; - (void)requestTool:(NSString*)type; -- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time; +- (void)requestWhiteBalanceAtTime:(CMTime)time; +@property(nonatomic,retain) DYRenderer *renderer; +- (NSData*)canvasHistogramAtTime:(CMTime)time; +- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time; - (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time; - (void)changeSpider:(NSData*)mesh; -- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time; @end static BOOL DYViewerSameValue(double a,double b) { @@ -61,7 +65,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { NSDictionary *_snapshot,*_sourceDocument;NSString *_selectedNode; CMTime _snapshotTime; BOOL _invalidated,_validationScheduled; - uint64_t _requestSequence,_requestedGesture; + uint64_t _requestSequence,_requestedGesture,_completedGesture; // The fields below are confined to the main queue. id _writerHost,_writerTarget; @@ -72,6 +76,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { uint64_t _writerGesture; BOOL _writerUndoOpen,_writerSpider; NSData *_writerLastMesh; } +@synthesize renderer=_renderer; - (instancetype)initWithAPIManager:(id)manager { if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];}return self; } @@ -79,14 +84,21 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { // invalidate enqueues closure before the owner releases its final reference; // the queued block keeps the bridge alive until its host group is closed. NSCAssert(!_writerUndoOpen,@"Viewer parameter group must be closed before teardown"); - [NSNotificationCenter.defaultCenter removeObserver:self];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release]; + [NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release]; [_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[super dealloc]; } -- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time { - @synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"spider"]=assets.spiderMesh?:[NSData data];if(histogram)next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];} +- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time { + @synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"spider"]=assets.spiderMesh?:[NSData data];[_snapshot release];_snapshot=[next copy];} } -- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time { - if(histogram.length!=sizeof(DYHistogram))return;@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];} +- (NSData*)canvasHistogramAtTime:(CMTime)time { + return [_renderer canvasHistogramAtTime:time]; +} +- (void)requestWhiteBalanceAtTime:(CMTime)time { + if(!CMTIME_IS_NUMERIC(time))return; + dispatch_async(dispatch_get_main_queue(),^{ + id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;} + if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerWhiteBalanceRequested" object:manager userInfo:@{@"time":[NSValue valueWithCMTime:time]}]; + }); } - (void)requestTool:(NSString*)type { if(![DYToolTypes()containsObject:type])return; @@ -121,9 +133,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { NSData *bytes=[NSData dataWithBytes:uniforms length:sizeof(*uniforms)];BOOL validate=NO; @synchronized(self){ if(!_invalidated){ - NSData *sameHistogram=CMTimeCompare(_snapshotTime,time)==0?[_snapshot[@"histogram"]retain]:nil; [_snapshot release];_snapshot=[@{@"uniforms":bytes,@"document":frozen,@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch)}copy]; - if(sameHistogram){NSMutableDictionary *withHistogram=[[_snapshot mutableCopy]autorelease];withHistogram[@"histogram"]=sameHistogram;[_snapshot release];_snapshot=[withHistogram copy];[sameHistogram release];} [_sourceDocument release];_sourceDocument=[document retain];_snapshotTime=time; if(_requestedGesture&&!_validationScheduled){_validationScheduled=YES;validate=YES;} } @@ -329,9 +339,55 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { if(gesture)dispatch_async(dispatch_get_main_queue(),^{[self writeValues:frozen gesture:gesture];}); [frozen release]; } -- (void)endGesture { +- (void)refreshSavedCurve { + if(![_writerType isEqual:@"curve"])return; + id action=[_writerHost apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; + id get=[_writerHost apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + BOOL base=[_writerNode hasPrefix:@"base:"]; + NSMutableDictionary *values=[NSMutableDictionary dictionary]; + NSDictionary *document=nil; + [action startAction:self];@try{ + if(CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0)return; + if(base)for(NSDictionary *d in _writerDescriptors){ + double value=NAN; + if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!std::isfinite(value))return; + values[d[@"offset"]]=@(value); + }else document=DYReadTools(_writerHost,_writerTime).document; + }@finally{[action endAction:self];} + @synchronized(self){ + if(_invalidated||!_snapshot||CMTimeCompare(_snapshotTime,_writerTime)!=0)return; + NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease]; + if(base){ + DYUniforms uniforms; + [next[@"uniforms"] getBytes:&uniforms length:sizeof(uniforms)]; + for(NSNumber *offset in values)*(float*)((uint8_t*)&uniforms+offset.unsignedIntegerValue)=[values[offset]floatValue]; + next[@"uniforms"]=[NSData dataWithBytes:&uniforms length:sizeof(uniforms)]; + }else if(document){ + next[@"document"]=document; + [_sourceDocument release];_sourceDocument=nil; + } + [_snapshot release];_snapshot=[next copy]; + } +} +- (uint64_t)finishGestureRefreshingCurve:(BOOL)refresh { uint64_t gesture;@synchronized(self){gesture=_requestedGesture;_requestedGesture=0;} - if(gesture)dispatch_async(dispatch_get_main_queue(),^{if(self->_writerGesture==gesture)[self closeWriter];}); + if(gesture)dispatch_async(dispatch_get_main_queue(),^{ + if(self->_writerGesture==gesture){ + if(refresh)[self refreshSavedCurve]; + [self closeWriter]; + } + @synchronized(self){self->_completedGesture=MAX(self->_completedGesture,gesture);} + }); + return gesture; +} +- (void)endGesture { + [self finishGestureRefreshingCurve:NO]; +} +- (uint64_t)endCurveGesture { + return [self finishGestureRefreshingCurve:YES]; +} +- (BOOL)gesturePending:(uint64_t)gesture { + @synchronized(self){return !_invalidated&&gesture>_completedGesture;} } - (void)invalidate { @synchronized(self){if(_invalidated)return;_invalidated=YES;_requestedGesture=0;_apiManager=nil;} diff --git a/大鱼调色/Plugin/DYViewerParameterPanel.inc.h b/大鱼调色/Plugin/DYViewerParameterPanel.inc.h index 69db829..cd08b37 100644 --- a/大鱼调色/Plugin/DYViewerParameterPanel.inc.h +++ b/大鱼调色/Plugin/DYViewerParameterPanel.inc.h @@ -5,7 +5,6 @@ @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; @@ -21,18 +20,26 @@ NSString *_nodeID,*_toolType,*_selectedX;NSMutableDictionary *_draftValues;NSInteger _channel,_hslAxis,_selectedSpider;NSData *_spiderDraft;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; + NSDictionary *_releasedCurveValues;uint64_t _curveCommit;CMTime _curveCommitTime; } @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;_selectedSpider=-1;_draftValues=[NSMutableDictionary new];_time=_downTime=kCMTimeInvalid;}return self;} -- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_spiderDraft 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;} +- (void)dealloc{if(_pressed)[_bridge endGesture];[_bridge release];[_spiderDraft release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_toolType release];[_selectedX release];[_draftValues release];[_releasedCurveValues release];[_captured release];[super dealloc];} +- (void)clearReleasedCurve{[_releasedCurveValues release];_releasedCurveValues=nil;_curveCommit=0;} +- (void)finishCurveWithValues:(NSDictionary*)values{ + [self clearReleasedCurve]; + _releasedCurveValues=[values copy];_curveCommitTime=_time; + _curveCommit=[_bridge endCurveGesture]; +} +- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];[self clearReleasedCurve];[_bridge release];_bridge=[bridge retain];} - (BOOL)capturing{return _pressed!=0;} - (BOOL)finishCapture{BOOL had=_pressed!=0;if(had)[_bridge endGesture];_pressed=0;_hasDraft=NO;[_spiderDraft release];_spiderDraft=nil;[_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]; + NSNumber *released=_releasedCurveValues[d[@"key"]]; + if(released)return released.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"]); @@ -45,6 +52,7 @@ - (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];} + if(_releasedCurveValues&&(!_curveCommit||CMTimeCompare(time,_curveCommitTime)!=0||![_bridge gesturePending:_curveCommit]))[self clearReleasedCurve]; [_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?:@{})){ @@ -53,8 +61,8 @@ 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]; - NSString *selected=_snapshot[@"selectedNode"];for(NSDictionary *candidate in _nodes)if([candidate[@"id"]isEqual:selected]&&![_nodeID isEqual:selected]){[self finishCapture];[_nodeID release];_nodeID=[selected copy];[_selectedX release];_selectedX=nil;break;} - if(![self node]){[self finishCapture];[_nodeID release];_nodeID=_nodes.count?[_nodes[0][@"id"]copy]:nil;_page=0;[_selectedX release];_selectedX=nil;}} + NSString *selected=_snapshot[@"selectedNode"];for(NSDictionary *candidate in _nodes)if([candidate[@"id"]isEqual:selected]&&![_nodeID isEqual:selected]){[self finishCapture];[self clearReleasedCurve];[_nodeID release];_nodeID=[selected copy];[_selectedX release];_selectedX=nil;break;} + if(![self node]){[self finishCapture];[self clearReleasedCurve];[_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]:@[]; @@ -71,10 +79,13 @@ [self addArea:NSMakeRect(center.x-11*s,center.y-11*s,22*s,22*s) part:22401 kind:@"lensCenter" title:@"" descriptor:nil index:0]; [self addArea:NSMakeRect(strength.x-11*s,strength.y-11*s,22*s,22*s) part:22402 kind:@"lensStrength" title:@"" descriptor:nil index:0];return; } - w=MIN(260*s,size.width-2*margin);CGFloat h=MIN(214*s,size.height-2*margin),x=viewport.origin.x+margin,top=viewport.origin.y+margin; + w=MIN(260*s,size.width-2*margin); + CGFloat h=MIN(214*s,size.height-2*margin-33*s); + CGFloat x=NSMaxX(viewport)-margin-w,top=NSMaxY(viewport)-margin-33*s-h; 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-h,viewport.origin.y+_position.y*size.height));} _panel=NSMakeRect(x,top,w,h);if(!_snapshot||![self node]||w<100*s||h<65*s)return; for(NSInteger c=0;c<4;c++)[self addArea:NSMakeRect(x+c*24*s,top,23*s,18*s)part:22010+c kind:@"channel" title:@[@"Y",@"R",@"G",@"B"][c] descriptor:nil index:c]; + [self addArea:NSMakeRect(x+98*s,top,MAX(1,w-121*s),20*s)part:20000 kind:@"curveGrip" title:@"⠿" descriptor:nil index:0]; [self addArea:NSMakeRect(x,top+22*s,w,MAX(24*s,h-22*s))part:22000 kind:@"curvePlot" title:@"" descriptor:nil index:0]; if(_selectedX)[self addArea:NSMakeRect(NSMaxX(_panel)-19*s,top,19*s,18*s)part:22020 kind:@"deletePoint" title:@"×" descriptor:nil index:0];return; } @@ -165,8 +176,11 @@ 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&&([self graphicKind:_captured[@"kind"]]))[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=[self graphicKind:_captured[@"kind"]];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; + NSString *kind=_captured[@"kind"]; + BOOL moveHandle=[kind isEqual:@"open"]||[kind isEqual:@"curveGrip"]; + BOOL movedPointer=_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale; + if(type==NSEventTypeLeftMouseDragged){_dragging=movedPointer;if(_dragging&&moveHandle)[self movePanelToPointer:p];if(_dragging&&[self graphicKind:kind])[self updateGraphicAt:p];if(_dragging&&_hasDraft&&[kind isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;} + if(type==NSEventTypeLeftMouseUp){if(moveHandle&&movedPointer)[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL graphic=[self graphicKind:kind];if(graphic){if(movedPointer)[self updateGraphicAt:p];if([kind isEqual:@"curvePlot"]&&_draftValues.count)[self finishCurveWithValues:_draftValues];else [_bridge endGesture];}BOOL slider=[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;[_spiderDraft release];_spiderDraft=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; diff --git a/大鱼调色/Plugin/DYViewerParameterProbe.h b/大鱼调色/Plugin/DYViewerParameterProbe.h index 1442b63..b7d1aa1 100644 --- a/大鱼调色/Plugin/DYViewerParameterProbe.h +++ b/大鱼调色/Plugin/DYViewerParameterProbe.h @@ -7,8 +7,8 @@ - (void)changeValue:(double)value; - (void)beginParameters:(NSArray*)descriptors node:(NSString*)nodeID values:(NSDictionary*)values atTime:(CMTime)time; - (void)changeValues:(NSDictionary*)values; -- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time; -- (void)publishHistogram:(NSData*)histogram atTime:(CMTime)time; +- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time; +- (NSData*)canvasHistogramAtTime:(CMTime)time; - (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time; - (void)changeSpider:(NSData*)mesh; - (void)endGesture; diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index f432510..7a54c77 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.12.0 + 1.12.1 CFBundleVersion - 79 + 80 NSHumanReadableCopyright PlugInKit @@ -71,7 +71,7 @@ uuid 1C17B73B-F229-4C09-A434-EAF6DFF5F22A version - 1.12.0 + 1.12.1 className diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index d507e43..fbc38d1 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.12.0 + 1.12.1 CFBundleVersion - 79 + 80 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright