fix: align tracker preprocessing and shared object lifecycle with native evidence
这个提交包含在:
1 父节点
9ba6eeb00a
当前提交
a0a97dfd88
14 个文件已更改
+312
-47
没有与搜索条件相匹配的文件
@@ -9,7 +9,7 @@
|
||||
#include "DYScopeMath.hpp"
|
||||
#include <cmath>
|
||||
|
||||
static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[DYThemeButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;}
|
||||
static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;}
|
||||
static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;}
|
||||
static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"base"])return u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;if([type isEqual:@"primary"])return u.primarySectionEnabled>.5;for(NSDictionary*d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(type)[@"enabled"]]&&[d[@"offset"]integerValue]>=0)return *(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;return YES;}
|
||||
@interface DYWorkspaceList:NSView @end
|
||||
@@ -101,16 +101,16 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
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,1120,360)];_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];
|
||||
_heading=[[DYThemeLabel labelWithString:@""]retain];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading];
|
||||
_pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=4;for(NSInteger i=0;i<4;i++)[_pages setLabel:@[@"调整",@"蒙版",@"LUT",@"示波器"][i]forSegment:i];_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];_scopePane.clipsToBounds=YES;[_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];
|
||||
_description=[[DYThemeLabel labelWithString:@""]retain];_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;
|
||||
_status=[[DYThemeLabel labelWithString:@""]retain];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status];
|
||||
_lutExplanation=[[DYThemeLabel labelWithString:@""]retain];_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];
|
||||
@@ -165,7 +165,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height;
|
||||
_heading.frame=NSMakeRect(12,9,MAX(100,w-430),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-398),7,306,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27);
|
||||
_toolbarScroll.frame=NSMakeRect(8,39,MAX(1,w-16),40);
|
||||
_split.frame=NSMakeRect(0,80,w,MAX(1,h-80));[self layoutToolWorkspace];
|
||||
_sizingSplit=YES;_split.frame=NSMakeRect(0,80,w,MAX(1,h-80));_sizingSplit=NO;[self layoutToolWorkspace];
|
||||
_scopePane.frame=_editorHost.bounds;_lutPane.frame=NSMakeRect(0,25,_editorHost.bounds.size.width,MAX(1,_editorHost.bounds.size.height-25));_lutExplanation.frame=NSMakeRect(8,2,MAX(1,_editorHost.bounds.size.width-16),22);
|
||||
w=_scopePane.bounds.size.width;
|
||||
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);
|
||||
|
||||
@@ -103,13 +103,15 @@
|
||||
- (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
|
||||
- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
|
||||
- (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;}
|
||||
- (void)canvasSelected:(NSNotification*)n{_canvasActive=[n.userInfo[@"node"]isEqual:_nodeID]&&[n.userInfo[@"mask"]length];if(_canvasActive){NSString *ID=[n.userInfo[@"mask"]copy];[_maskID release];_maskID=ID;_drawing=[n.userInfo[@"draw"]boolValue];}else _drawing=NO;[self updateDrawingControls];}
|
||||
- (void)canvasState:(NSNotification*)n{if(!_canvasActive||![n.userInfo[@"node"]isEqual:_nodeID]||![n.userInfo[@"mask"]isEqual:_maskID])return;_drawing=[n.userInfo[@"drawing"]boolValue];[self updateDrawingControls];}
|
||||
- (void)sendCanvasDrawing:(BOOL)drawing{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"document":_document?:@{},@"draw":@(drawing)}];}
|
||||
- (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;}
|
||||
- (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return NO;}
|
||||
- (void)canvasSelected:(NSNotification*)n{_canvasActive=[self representsCanvasMask:n.userInfo];if(_canvasActive){NSString *ID=[n.userInfo[@"mask"]copy];[_maskID release];_maskID=ID;_drawing=[n.userInfo[@"draw"]boolValue];}else _drawing=NO;[self updateDrawingControls];}
|
||||
- (void)canvasState:(NSNotification*)n{if(!_canvasActive||![self representsCanvasMask:n.userInfo]||![n.userInfo[@"mask"]isEqual:_maskID])return;_drawing=[n.userInfo[@"drawing"]boolValue];[self updateDrawingControls];}
|
||||
- (void)sendCanvasDrawing:(BOOL)drawing{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"document":_document?:@{},@"draw":@(drawing)}];}
|
||||
- (void)canvas:(id)sender{[self sendCanvasDrawing:NO];}
|
||||
- (void)redrawPen:(id)sender{[self sendCanvasDrawing:YES];}
|
||||
- (void)penCommand:(NSButton*)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"command":sender==_penFinish?@"finish":@"cancel",@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];}
|
||||
- (void)penCommand:(NSButton*)sender{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"command":sender==_penFinish?@"finish":@"cancel",@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];}
|
||||
- (void)clear:(id)sender{if(_drawing)return;[self edit:@"清除蒙版轨迹" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];m[@"keys"]=@[];[m removeObjectForKey:@"status"];}];}
|
||||
- (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":_nodeID,@"mask":_maskID?:@"",@"direction":@(sender.tag)}];}
|
||||
- (void)trackingStatus:(NSNotification*)n{if([n.userInfo[@"node"]isEqual:_nodeID]&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";}
|
||||
- (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"direction":@(sender.tag)}];}
|
||||
- (void)trackingStatus:(NSNotification*)n{BOOL target=n.userInfo[@"mask"]?[self representsCanvasMask:n.userInfo]:[n.userInfo[@"node"]isEqual:_nodeID];if(target&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";}
|
||||
@end
|
||||
+2
-1
@@ -9,6 +9,7 @@
|
||||
#import "DYToolState.h"
|
||||
#include "DYFilmTime.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#import <os/log.h>
|
||||
#include "MaskCore/DYTracker.hpp"
|
||||
#include "MaskCore/DYOpenCVTracker.hpp"
|
||||
@@ -36,7 +37,7 @@
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)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<FxImageTile*>*)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<FxImageTile*>*)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()){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;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;
|
||||
}
|
||||
- (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{
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
if(type==NSEventTypeLeftMouseDown){
|
||||
_toolCanvasHasHover=NO;
|
||||
if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];return;}
|
||||
if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceFrame.valid()?float(_toolSourceFrame.width)/_toolSourceFrame.height:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];}
|
||||
if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceAspect>0?_toolSourceAspect:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];}
|
||||
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}
|
||||
_toolDragStart=point;_toolDragPart=part;_toolDragParameters=DYMaskAtTime(_toolCanvasDraft,time);
|
||||
if(_toolDrawingShape){[self updateToolShapeDraftAtPoint:point];[self postToolCanvasStatus:@"拖出蒙版区域,松开保存;Esc 取消。"];return;}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
// Analysis only. The color renderer continues to use the original linear input.
|
||||
// CF asks the host for video gamma 2.2, then Lanczos-scales to RGBA8 before
|
||||
// OpenCV gray conversion. Adapt our linear host contract in a separate texture.
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
|
||||
@synchronized(_toolCaptureDevices){
|
||||
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;
|
||||
if(bounds.left!=image.left||bounds.right!=image.right||bounds.bottom!=image.bottom||bounds.top!=image.top)return {};
|
||||
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];
|
||||
if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>device=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)device=candidate;
|
||||
if(device){id<MTLLibrary>library=[device newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>gray=[library newFunctionWithName:@"dyToolCapture"],gamma=[library newFunctionWithName:@"dyToolEncodeGamma22"];id<MTLComputePipelineState>grayPipeline=gray?[device newComputePipelineStateWithFunction:gray error:error]:nil,gammaPipeline=gamma?[device newComputePipelineStateWithFunction:gamma error:error]:nil;id<MTLCommandQueue>queue=[device newCommandQueue];MPSImageLanczosScale *scale=[[MPSImageLanczosScale alloc]initWithDevice:device];
|
||||
if(grayPipeline&&gammaPipeline&&queue&&scale){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":device,@"gray":grayPipeline,@"gamma":gammaPipeline,@"queue":queue,@"scale":scale}];_toolCaptureDevices[key]=entry;}
|
||||
[scale release];[queue release];[grayPipeline release];[gammaPipeline release];[gray release];[gamma release];[library release];
|
||||
}[devices release];if(!entry)return {};
|
||||
}
|
||||
id<MTLDevice>device=entry[@"device"];id<MTLTexture>source=[tile metalTextureForDevice:device];if(!source||source.framebufferOnly||!source.width||!source.height)return {};
|
||||
double factor=MIN(1.,MIN(3840./source.width,2160./source.height));NSUInteger width=floor(source.width*factor),height=floor(source.height*factor);if(width<16||height<16||width>3840||height>2160)return {};
|
||||
MTLPixelFormat format=source.pixelFormat==MTLPixelFormatRGBA32Float?MTLPixelFormatRGBA32Float:MTLPixelFormatRGBA16Float;
|
||||
id<MTLTexture>encoded=entry[@"encoded"],bytes=entry[@"bytes"];
|
||||
if(!encoded||encoded.width!=source.width||encoded.height!=source.height||encoded.pixelFormat!=format){MTLTextureDescriptor*d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:format width:source.width height:source.height mipmapped:NO];d.storageMode=MTLStorageModePrivate;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;encoded=[[device newTextureWithDescriptor:d]autorelease];if(!encoded)return {};entry[@"encoded"]=encoded;}
|
||||
if(!bytes||bytes.width!=width||bytes.height!=height){MTLTextureDescriptor*d=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA8Unorm width:width height:height mipmapped:NO];d.storageMode=MTLStorageModePrivate;d.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;bytes=[[device newTextureWithDescriptor:d]autorelease];if(!bytes)return {};entry[@"bytes"]=bytes;}
|
||||
id<MTLBuffer>buffer=entry[@"buffer"];if(!buffer||buffer.length!=width*height*sizeof(float)){buffer=[[device newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared]autorelease];if(!buffer)return {};entry[@"buffer"]=buffer;}
|
||||
id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gamma"]];[encoder setTexture:source atIndex:0];[encoder setTexture:encoded atIndex:1];[encoder dispatchThreads:MTLSizeMake(source.width,source.height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
[entry[@"scale"]encodeToCommandBuffer:commands sourceTexture:encoded destinationTexture:bytes];
|
||||
vector_uint3 info={(unsigned)width,(unsigned)height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"gray"]];[encoder setTexture:bytes atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info)atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1)threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];[commands commit];[commands waitUntilCompleted];
|
||||
if(commands.status!=MTLCommandBufferStatusCompleted){if(error)*error=commands.error;return {};}
|
||||
dy::GrayFrame result{int(width),int(height),std::vector<float>(width*height)};memcpy(result.pixels.data(),buffer.contents,width*height*sizeof(float));return result;
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
NSPoint _toolDragStart;DYMaskParameters _toolDragParameters;NSInteger _toolDragPart;
|
||||
CMTime _toolCanvasEditTime;uint64_t _toolCanvasRevision;
|
||||
dy::GrayFrame _toolSourceFrame,_trackingReferenceFrame;
|
||||
float _toolSourceAspect;
|
||||
CMTime _toolSourceTime,_trackingReferenceTime,_trackingFrameDuration,_trackingPreviousTime;
|
||||
std::atomic_bool _trackingActive,_trackingFinishing,_trackingInFrame,_trackingCancelled;
|
||||
BOOL _trackingBackward,_trackingBoth,_trackingSingle,_trackingFlip,_trackingDiscard;
|
||||
|
||||
@@ -14,20 +14,14 @@
|
||||
- (void)scheduleToolCanvasRegistration {
|
||||
_toolCaptureEnabled=YES;dispatch_async(dispatch_get_main_queue(),^{id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{if(!self->_toolSession){NSString *session=NSUUID.UUID.UUIDString;id<FxParameterSettingAPI_v6>s=[self->_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];BOOL accepted=[s setStringParameterValue:session toParameter:DYCanvasSessionParameterID];os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_registered accepted=%{public}d",(int)accepted);{self->_toolSession=[session copy];@synchronized(DYToolCanvasSessions()){[DYToolCanvasSessions()setObject:self forKey:session];}}}}@finally{[a endAction:self];}});
|
||||
}
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error {
|
||||
@synchronized(_toolCaptureDevices){FxRect b=tile.tilePixelBounds,image=tile.imagePixelBounds;if(b.left!=image.left||b.right!=image.right||b.bottom!=image.bottom||b.top!=image.top)return {};
|
||||
NSNumber *key=@(tile.deviceRegistryID);NSMutableDictionary *entry=_toolCaptureDevices[key];if(!entry){NSArray *devices=MTLCopyAllDevices();id<MTLDevice>d=nil;for(id<MTLDevice>candidate in devices)if(candidate.registryID==tile.deviceRegistryID)d=candidate;if(d){id<MTLLibrary>library=[d newLibraryWithURL:[[NSBundle bundleForClass:self.class]URLForResource:@"default" withExtension:@"metallib"]error:error];id<MTLFunction>function=[library newFunctionWithName:@"dyToolCapture"];id<MTLComputePipelineState>pipeline=function?[d newComputePipelineStateWithFunction:function error:error]:nil;id<MTLCommandQueue>queue=[d newCommandQueue];if(pipeline&&queue){entry=[NSMutableDictionary dictionaryWithDictionary:@{@"device":d,@"pipeline":pipeline,@"queue":queue}];_toolCaptureDevices[key]=entry;}[pipeline release];[queue release];[function release];[library release];}[devices release];if(!entry)return {};}
|
||||
id<MTLTexture>texture=[tile metalTextureForDevice:entry[@"device"]];if(!texture)return {};double aspect=tile.pixelAspect;if(!std::isfinite(aspect)||aspect<=0)return {};aspect=MAX(.01,aspect);double displayHeight=texture.height/aspect,scale=MIN(1.,MIN(3840./texture.width,2160./displayHeight));unsigned width=(unsigned)floor(texture.width*scale),height=(unsigned)floor(displayHeight*scale);if(width<16||height<16||height>2160||width>3840)return {};
|
||||
id<MTLBuffer>buffer=[entry[@"device"]newBufferWithLength:width*height*sizeof(float) options:MTLResourceStorageModeShared];if(!buffer)return {};vector_uint3 info={width,height,(unsigned)(tile.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)};id<MTLCommandBuffer>commands=[entry[@"queue"]commandBuffer];id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"pipeline"]];[encoder setTexture:texture atIndex:0];[encoder setBuffer:buffer offset:0 atIndex:0];[encoder setBytes:&info length:sizeof(info) atIndex:1];[encoder dispatchThreads:MTLSizeMake(width,height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];[commands commit];[commands waitUntilCompleted];dy::GrayFrame frame;if(commands.status==MTLCommandBufferStatusCompleted){frame={int(width),int(height),std::vector<float>(width*height)};memcpy(frame.pixels.data(),buffer.contents,width*height*sizeof(float));}[buffer release];return frame;
|
||||
}
|
||||
}
|
||||
#include "DYToolGrayCapture.inc.h"
|
||||
- (NSMutableDictionary*)toolMask:(NSString*)maskID node:(NSString*)nodeID document:(NSDictionary*)doc {for(NSMutableDictionary *m in DYMasksForTool(doc,nodeID))if([m[@"id"]isEqual:maskID])return m;return nil;}
|
||||
- (void)toolStatus:(NSString*)message {
|
||||
NSString *node=[[_trackingNode?:_selectedToolNode copy]autorelease],*mask=[[_trackingMaskID?:_selectedToolMask copy]autorelease];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});
|
||||
}
|
||||
- (void)toolCanvasSelection:(NSNotification*)notification {
|
||||
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected");
|
||||
@synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
|
||||
@synchronized(self){if(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
|
||||
}
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
|
||||
@@ -38,13 +32,13 @@
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{
|
||||
id<FxAnalysisAPI>analysis=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[analysis analysisStateForEffect];if(!analysis||state==kFxAnalysisState_AnalysisRequested||state==kFxAnalysisState_AnalysisStarted){[self toolStatus:@"宿主未就绪,请等待当前分析结束"];return;}
|
||||
CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:notification.userInfo[@"node"] document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;}
|
||||
CMTime time=a.currentTime;NSDictionary *doc=DYReadTools(_apiManager,time).document;NSString *node=DYSharedMaskWithID(doc,notification.userInfo[@"mask"])?@"shared":notification.userInfo[@"node"];NSDictionary *mask=[self toolMask:notification.userInfo[@"mask"] node:node document:doc];if(!mask||![mask[@"enabled"]boolValue]){[self toolStatus:@"请先选择当前工具的启用蒙版"];return;}DYMaskParameters seed=DYMaskAtTime(mask,time);if(seed.kind>DYMaskBezier||(seed.kind==DYMaskBezier&&[mask[@"nodes"]length]<3*sizeof(DYBezierNode))){[self toolStatus:@"跟踪需要矩形、椭圆或闭合钢笔区域"];return;}
|
||||
// The host may reuse an already rendered frame without calling our renderer.
|
||||
// Analyzer input is authoritative; a matching preview is only an optional
|
||||
// orientation check, never a prerequisite for starting at the playhead.
|
||||
@synchronized(self){_trackingReferenceFrame={};if(_toolSourceFrame.valid()&&CMTIME_IS_NUMERIC(_toolSourceTime)&&CMTimeCompare(_toolSourceTime,time)==0)_trackingReferenceFrame=_toolSourceFrame;}
|
||||
id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];NSUInteger numerator=[timing timelineFpsNumeratorForEffect:self],denominator=[timing timelineFpsDenominatorForEffect:self];_trackingFrameDuration=numerator&&denominator&&numerator<=INT32_MAX?CMTimeMake(denominator,(int32_t)numerator):kCMTimeInvalid;if(!CMTIME_IS_NUMERIC(_trackingFrameDuration)||_trackingFrameDuration.value<=0){[self toolStatus:@"宿主未提供精确帧长,跟踪未启动"];return;}
|
||||
[_trackingNode release];_trackingNode=[notification.userInfo[@"node"]copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil;
|
||||
[_trackingNode release];_trackingNode=[node copy];[_trackingMaskID release];_trackingMaskID=[notification.userInfo[@"mask"]copy];[_trackingFrozenMask release];_trackingFrozenMask=[mask copy];[_trackingCandidate release];_trackingCandidate=[DYMutablePlist(mask)retain];[_trackingSamples release];_trackingSamples=[NSMutableArray new];[_trackingMessage release];_trackingMessage=nil;
|
||||
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingStarted=NSProcessInfo.processInfo.systemUptime;
|
||||
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
|
||||
NSError *error=nil;BOOL started=_trackingBackward?[analysis startBackwardAnalysis:kFxAnalysisLocation_GPU error:&error]:[analysis startForwardAnalysis:kFxAnalysisLocation_GPU error:&error];if(!started){_trackingActive.store(false);[self toolStatus:error.localizedDescription?:@"宿主未启动逐帧分析"];return;}
|
||||
@@ -88,8 +82,9 @@
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return;
|
||||
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);}
|
||||
BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]];
|
||||
if(hasResults&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:self->_trackingNode document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
|
||||
if(hasResults&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
|
||||
CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
|
||||
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer"]];}
|
||||
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[self toolStatus:message];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
});return YES;
|
||||
}
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
auto timeAt=[](int frame){return CMTimeMake(frame*1001,24000);};auto capture=[&](int step){setFrame(step);host->_time=timeAt(step);NSData *state=nil;[plugin pluginState:&state atTime:host->_time quality:(FxQuality)0 error:&error];return [plugin renderDestinationImage:out sourceImages:@[frame] pluginState:state atTime:host->_time error:&error];};
|
||||
auto request=[&](int direction){if(direction!=9)host->_state=kFxAnalysisState_NotAnalyzing;[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":mask[@"id"],@"direction":@(direction)}]];};
|
||||
auto drain=[&](){double end=NSProcessInfo.processInfo.systemUptime+.15;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];};CMTimeRange inputRange=CMTimeRangeMake(kCMTimeZero,CMTimeMake(6*1001,24000)),desired;
|
||||
run.need(@"tracking-captures-real-full-input-texture",capture(0));int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error];
|
||||
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-metal-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
|
||||
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
|
||||
run.need(@"tracking-renders-valid-source-before-analysis",capture(0));run.record(@"inactive-tracking-avoids-full-frame-motion-readback",[[plugin valueForKey:@"toolCaptureDevices"]count]==0);int undoBefore=base->_undoStarts;request(1);BOOL callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:&error]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:&error];
|
||||
for(int i=0;i<6&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:&error];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];DYMaskParameters end=DYMaskAtTime(tracked,timeAt(5));run.record(@"host-callback-opencv-tracking-six-exact-frames",callbacks&&[tracked[@"keys"]count]==6&&fabs(end.centerX-(.5+10./tw))<.004&&fabs(end.centerY-(.5+5./th))<.004,@{@"keyCount":@([tracked[@"keys"]count]),@"centerX":@(end.centerX),@"centerY":@(end.centerY),@"error":reason(error)});
|
||||
run.record(@"tracking-results-use-one-undo-action",base->_undoStarts==undoBefore+1&&base->_undoStarts==base->_undoEnds);BOOL captureFreed=YES;for(NSDictionary *entry in [[plugin valueForKey:@"toolCaptureDevices"]allValues])captureFreed&=!entry[@"encoded"]&&!entry[@"bytes"]&&!entry[@"buffer"];run.record(@"completed-tracking-releases-4k-gpu-analysis-working-images",captureFreed);int writes=base->_undoStarts;[plugin cleanupAnalysis:nil];[plugin cleanupAnalysis:nil];drain();run.record(@"duplicate-analysis-cleanup-never-commits-twice",base->_undoStarts==writes);
|
||||
// Mid-analysis author edits must reject the result rather than clobber them.
|
||||
capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}NSMutableDictionary *changed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);changed[@"baseMasks"][@"hsl"][0][@"enabled"]=@NO;DYWriteTools(base,changed,kCMTimeZero);[plugin cleanupAnalysis:nil];drain();run.record(@"stale-analysis-cannot-overwrite-edited-mask",[DYReadTools(base,kCMTimeZero).document isEqual:changed]&&base->_undoStarts==writes);
|
||||
DYWriteTools(base,doc,kCMTimeZero);capture(0);request(1);callbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];for(int i=0;i<3&&callbacks;i++){setFrame(i);callbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}request(9);setFrame(3);NSError *cancelError=nil;BOOL stopped=![plugin analyzeFrame:frame atTime:timeAt(3) error:&cancelError];drain();tracked=DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0];run.record(@"cancel-keeps-only-contiguous-trusted-segment",callbacks&&stopped&&[tracked[@"keys"]count]==3&&base->_undoStarts==writes+1);run.record(@"cancel-sends-sdk-quiet-analysis-termination",[cancelError.domain isEqual:FxPlugErrorDomain]&&cancelError.code==kFxError_UserCancelled);
|
||||
@@ -40,8 +40,31 @@
|
||||
{
|
||||
const NSUInteger w=3840,h=2160;DYDiagnosticTile *fine=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];Pixels pixels(w*h*4);
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){float encoded=x%3==1?.8f:.2f,linear=powf((encoded+.055f)/1.055f,2.4f);auto i=(y*w+x)*4;pixels[i]=pixels[i+1]=pixels[i+2]=linear;pixels[i+3]=1;}
|
||||
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){float expected=x%3==1?.8f:.2f;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
[[fine metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h) mipmapLevel:0 withBytes:pixels.data() bytesPerRow:w*8];auto gray=[plugin toolGrayFrame:fine error:nil];double maximum=0;for(NSUInteger y=0;y<(NSUInteger)gray.height;y++)for(NSUInteger x=0;x<(NSUInteger)gray.width;x++){double code=x%3==1?.8:.2;double expected=std::round(std::pow(std::pow((code+.055)/1.055,2.4),1/2.2)*255)/255.;maximum=std::max(maximum,fabs(double(gray.pixels[y*gray.width+x])-expected));}
|
||||
run.record(@"tracking-4k-frame-preserves-full-detail-for-opencv",gray.valid()&&gray.width==3840&&gray.height==2160&&maximum<.002,@{@"width":@(gray.width),@"height":@(gray.height),@"maximumError":@(maximum)});
|
||||
}
|
||||
// UI aliases of a shared object are one tracking target. Switching from the
|
||||
// global editor to either linked module must not cancel a valid analysis.
|
||||
{
|
||||
NSMutableDictionary *sharedDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document),*sharedMask=(id)DYAddSharedMask(sharedDoc,DYMaskRectangle);NSString *sharedID=sharedMask[@"id"];DYMaskParameters shape=DYMaskAtTime(sharedMask,kCMTimeZero);shape.width=shape.height=.65;shape.feather=0;sharedMask[@"parameters"]=[NSData dataWithBytes:&shape length:sizeof(shape)];DYSetSharedMaskAssigned(sharedDoc,sharedID,@"base:hsl",YES);DYSetSharedMaskAssigned(sharedDoc,sharedID,@"base:spider",YES);
|
||||
DYWriteTools(base,sharedDoc,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"base:hsl",@"mask":sharedID,@"direction":@1}]];int beforeShared=base->_undoStarts;
|
||||
BOOL sharedCallbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
for(int i=0;i<3&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
|
||||
for(NSString *alias in @[@"shared",@"base:spider",@"base:hsl"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":alias,@"mask":sharedID,@"document":DYReadTools(base,kCMTimeZero).document,@"draw":@NO}];
|
||||
for(int i=3;i<6&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();NSDictionary *saved=DYReadTools(base,kCMTimeZero).document;
|
||||
run.record(@"shared-tracking-same-mask-switches-global-hsl-spider-without-interruption",sharedCallbacks&&[DYSharedMaskWithID(saved,sharedID)[@"keys"]count]==6&&DYMasksForTool(saved,@"base:hsl").firstObject==DYMasksForTool(saved,@"base:spider").firstObject&&base->_undoStarts==beforeShared+1&&base->_undoStarts==base->_undoEnds);
|
||||
// Removing the original UUID binding cannot delete or invalidate the shared
|
||||
// object while another module still references it.
|
||||
NSMutableDictionary *deletable=DYMutablePlist(sharedDoc);NSDictionary *extra=DYInsertTool(deletable,@"hsl",@"base:hsl");NSString *extraID=extra[@"id"];DYSetSharedMaskAssigned(deletable,sharedID,@"base:hsl",NO);DYSetSharedMaskAssigned(deletable,sharedID,extraID,YES);DYWriteTools(base,deletable,kCMTimeZero);capture(0);host->_state=kFxAnalysisState_NotAnalyzing;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":extraID,@"mask":sharedID,@"direction":@1}]];beforeShared=base->_undoStarts;sharedCallbacks=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
for(int i=0;i<3&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}
|
||||
NSMutableDictionary *removed=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);BOOL removedAlias=DYRemoveTool(removed,extraID);DYWriteTools(base,removed,kCMTimeZero);[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"base:spider",@"mask":sharedID,@"document":removed,@"draw":@NO}];
|
||||
for(int i=3;i<6&&sharedCallbacks;i++){setFrame(i);sharedCallbacks&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}host->_state=kFxAnalysisState_AnalysisCompleted;[plugin cleanupAnalysis:nil];drain();saved=DYReadTools(base,kCMTimeZero).document;
|
||||
run.record(@"shared-tracking-survives-removing-original-module-and-commits-one-object",removedAlias&&sharedCallbacks&&!DYToolWithID(saved,extraID)&&[DYSharedMaskWithID(saved,sharedID)[@"keys"]count]==6&&[DYMasksForTool(saved,@"base:spider").firstObject[@"id"]isEqual:sharedID]&&DYToolIDsForSharedMask(saved,sharedID).count==1&&base->_undoStarts==beforeShared+1&&base->_undoStarts==base->_undoEnds);
|
||||
id panel=[[[NSClassFromString(@"DYToolMaskPanel")alloc]initWithManager:host nodeID:@"base:spider"]autorelease];[panel refreshWithDocument:saved time:kCMTimeZero];[panel performSelector:@selector(canvas:)withObject:nil];BOOL aliasActive=[[panel valueForKey:@"_canvasActive"]boolValue];
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:host userInfo:@{@"node":@"shared",@"mask":sharedID,@"message":@"共享跟踪状态"}];BOOL statusVisible=[[[panel valueForKey:@"_status"]stringValue]isEqual:@"共享跟踪状态"];
|
||||
run.record(@"shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",aliasActive&&statusVisible&&[[(NSObject*)plugin valueForKey:@"_selectedToolNode"]isEqual:@"shared"]);
|
||||
}
|
||||
[plugin release];
|
||||
}
|
||||
@@ -50,11 +50,11 @@ kernel void dyTrackFlow(device const float*prev[[buffer(0)]],device const float*
|
||||
if(lane==0)results[idx]=float4(q,error,ok?1.f:0.f);
|
||||
}
|
||||
|
||||
// Full host frame -> top-first display luma. Low-pass the source footprint
|
||||
// before decimation so 4K fabric detail cannot alias into inconsistent motion.
|
||||
// This analysis-only image never changes the full-resolution color render.
|
||||
kernel void dyToolEncodeGamma22(texture2d<float,access::read> source [[texture(0)]],texture2d<float,access::write> output [[texture(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=output.get_width()||pos.y>=output.get_height())return;float4 pixel=source.read(pos);float alpha=max(pixel.a,0.f);float3 straight=alpha>0?pixel.rgb/alpha:float3(0);output.write(float4(pow(max(straight,float3(0)),float3(1.f/2.2f))*alpha,alpha),pos);
|
||||
}
|
||||
// Lanczos RGBA8 -> top-first OpenCV Gray8. Analysis never changes color output.
|
||||
kernel void dyToolCapture(texture2d<float> source [[texture(0)]],device float* pixels [[buffer(0)]],constant uint3& info [[buffer(1)]],uint2 pos [[thread_position_in_grid]]){
|
||||
if(pos.x>=info.x||pos.y>=info.y)return;constexpr sampler f(coord::normalized,address::clamp_to_edge,filter::linear);uint2 taps=clamp(uint2(ceil(float2(source.get_width(),source.get_height())/float2(info.xy))),uint2(1),uint2(8));float sum=0;
|
||||
for(uint y=0;y<taps.y;y++)for(uint x=0;x<taps.x;x++){float2 uv=(float2(pos)+(float2(x,y)+.5f)/float2(taps))/float2(info.xy);if(info.z)uv.y=1-uv.y;float4 sample=source.sample(f,uv);float3 linear=sample.a>0?sample.rgb/sample.a:float3(0);float3 encoded=select(1.055f*pow(max(linear,float3(0)),float3(1.f/2.4f))-.055f,linear*12.92f,linear<=.0031308f);sum+=dot(clamp(encoded,0.f,1.f),float3(.299f,.587f,.114f));}
|
||||
pixels[pos.y*info.x+pos.x]=sum/float(taps.x*taps.y);
|
||||
if(pos.x>=info.x||pos.y>=info.y)return;uint2 point=uint2(pos.x,info.z?info.y-1-pos.y:pos.y);uint3 rgb=uint3(rint(source.read(point).rgb*255.f));
|
||||
pixels[pos.y*info.x+pos.x]=float((rgb.r*9798u+rgb.g*19235u+rgb.b*3735u+16384u)>>15)/255.f;
|
||||
}
|
||||
@@ -92,6 +92,7 @@
|
||||
BOOL selectedA=chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];BOOL wroteA=[stack commitLUT:pathA expected:[stack selectionContext]error:&failure];
|
||||
BOOL selectedB=chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];BOOL wroteB=[stack commitLUT:pathB expected:[stack selectionContext]error:&failure];tools=DYReadTools(stackHost,kCMTimeZero).document;
|
||||
run.record(@"workspace-lut-segment-rebinds-from-layer-a-to-b-without-cross-writing",selectedA&&selectedB&&wroteA&&wroteB&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]&&[basePaths isEqual:DYReadAssets(stackHost,kCMTimeZero).paths]&&[[[stack valueForKey:@"lutTarget"]nodeID]isEqual:lookB]);
|
||||
run.record(@"workspace-switching-lut-target-stays-on-visible-browser-page",pages.selectedSegment==2&&[[stack valueForKey:@"browser"]visible]);
|
||||
chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document;
|
||||
run.record(@"workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",pending.cancelled&&completed&&cancelled&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]);
|
||||
BOOL choseHSL=chooseNode(@"base:hsl");undo=stackHost->_undoStarts;[stack createWorkspaceMask:1];workspaceDrain();NSString *sharedID=[[[stack valueForKey:@"selectedMask"]copy]autorelease];
|
||||
|
||||
@@ -2,17 +2,17 @@
|
||||
- (id<PROAPIAccessing>)rootHost {return [_manager isKindOfClass:DYToolManager.class]?[(DYToolManager*)_manager host]:_manager;}
|
||||
- (id<PROAPIAccessing>)lutManager {return _lutTarget?:_manager;}
|
||||
- (void)buildToolWorkspace {
|
||||
_splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction"];if(_splitFraction<.12||_splitFraction>.45)_splitFraction=.21;_toolTime=kCMTimeInvalid;
|
||||
_splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v2"];if(_splitFraction<.12||_splitFraction>.45)_splitFraction=.21;_toolTime=kCMTimeInvalid;_sizingSplit=YES;
|
||||
_toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO;
|
||||
_toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll];
|
||||
CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];CGFloat width=MAX(58,MIN(150,[title sizeWithAttributes:@{NSFontAttributeName:button.font}].width+22));button.frame=NSMakeRect(x,0,width,28);[_toolbar addSubview:button];x+=width+4;}_toolbar.frame=NSMakeRect(0,0,x,30);
|
||||
CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];NSDictionary *icons=@{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"};button.image=[NSImage imageWithSystemSymbolName:icons[type] accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=34;button.frame=NSMakeRect(x,0,width,28);[_toolbar addSubview:button];x+=width+4;}_toolbar.frame=NSMakeRect(0,0,x,30);
|
||||
_split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split];
|
||||
_toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost];
|
||||
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=YES;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
|
||||
_layerTable=[[NSTableView alloc]init];NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
|
||||
_addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask];
|
||||
_deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer];
|
||||
_selectionTitle=[[DYThemeLabel alloc]init];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle];
|
||||
_selectionTitle=[[DYThemeLabel labelWithString:@""]retain];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle];
|
||||
_maskPane=[[DYWorkspaceList alloc]init];_maskPane.clipsToBounds=YES;[_editorHost addSubview:_maskPane];_maskPane.hidden=YES;
|
||||
_maskScroll=[[NSScrollView alloc]init];_maskScroll.hasVerticalScroller=YES;_maskScroll.autohidesScrollers=YES;_maskScroll.drawsBackground=NO;[_maskPane addSubview:_maskScroll];
|
||||
_assignmentScroll=[[NSScrollView alloc]init];_assignmentScroll.hasVerticalScroller=YES;_assignmentScroll.autohidesScrollers=YES;_assignmentScroll.drawsBackground=NO;_assignmentScroll.accessibilityLabel=@"共享蒙版生效模块";[_maskPane addSubview:_assignmentScroll];
|
||||
@@ -20,19 +20,20 @@
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshToolWorkspace:) name:DYModelChanged object:[self rootHost]];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceCanvasSelection:) name:@"DYToolCanvasSelection" object:[self rootHost]];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(externalWorkspaceToolSelection:) name:@"DYWorkspaceToolSelection" object:[self rootHost]];
|
||||
_sizingSplit=NO;
|
||||
}
|
||||
- (void)layoutToolWorkspace {
|
||||
if(!_split||_sizingSplit)return;_sizingSplit=YES;
|
||||
CGFloat w=_split.bounds.size.width,h=_split.bounds.size.height,left=MAX(174,MIN(w-320,w*_splitFraction));
|
||||
_toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+_split.dividerThickness,0,MAX(1,w-left-_split.dividerThickness),h);
|
||||
_layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28);
|
||||
_layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));_layerTable.frame=NSMakeRect(0,0,_layerScroll.contentSize.width,MAX(_layerScroll.contentSize.height,_layerRows.count*30));[_layerTable.tableColumns.firstObject setWidth:_layerScroll.contentSize.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28);
|
||||
CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29));
|
||||
_maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(230,MAX(160,ew*.25));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height);
|
||||
if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,_maskScroll.contentSize.width,MAX(_maskScroll.contentSize.height,_maskEditor.contentHeight));[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,_maskScroll.contentSize.width,MAX(_maskScroll.contentSize.height,_maskEditor.contentHeight));}
|
||||
_sizingSplit=NO;
|
||||
}
|
||||
- (CGFloat)splitView:(NSSplitView*)split constrainSplitPosition:(CGFloat)position ofSubviewAt:(NSInteger)index {return MAX(174,MIN(split.bounds.size.width-320,position));}
|
||||
- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction"];[self layoutWorkspace];}
|
||||
- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;if(NSApp.currentEvent.type!=NSEventTypeLeftMouseDragged&&NSApp.currentEvent.type!=NSEventTypeLeftMouseUp)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction.v2"];[self layoutWorkspace];}
|
||||
- (BOOL)workspaceBaseVisible:(NSString*)type document:(NSDictionary*)document time:(CMTime)time {
|
||||
if(DYBaseToolRemoved(document,type))return NO;
|
||||
if([@[@"primary",@"spider",@"base",@"hsl"]containsObject:type])return YES;
|
||||
@@ -51,11 +52,11 @@
|
||||
// Legacy base operators keep their real insertion-stage order. UUID children
|
||||
// use the same traversal as the renderer, including cross-type insertion.
|
||||
NSArray *bases=@[@"primary",@"primaries",@"curve",@"levels",@"balance",@"hsl",@"grading",@"base",@"blackwhite",@"look",@"skin",@"spider",@"mixer",@"film",@"lens"];
|
||||
NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array];
|
||||
NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array];NSMutableDictionary *numbers=[NSMutableDictionary dictionary],*titles=[NSMutableDictionary dictionary];for(NSString*ID in display){NSDictionary*node=DYToolWithID(document,ID);if(!node)continue;NSString*type=node[@"type"];NSInteger number=(numbers[type]?[numbers[type]integerValue]:(DYBaseToolRemoved(document,type)?0:1))+1;numbers[type]=@(number);titles[ID]=[NSString stringWithFormat:@"%@ %ld",DYToolSection(type)[@"title"],(long)number];}
|
||||
for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];}
|
||||
for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID];
|
||||
for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue;
|
||||
NSString*title=DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool"}];
|
||||
NSString*title=titles[ID]?:DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool"}];
|
||||
for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];}
|
||||
}
|
||||
for(NSDictionary*mask in DYSharedMasks(document))if(![assignedMasks containsObject:mask[@"id"]]){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];}
|
||||
@@ -70,15 +71,15 @@
|
||||
}
|
||||
- (NSInteger)numberOfRowsInTableView:(NSTableView*)table {return _layerRows.count;}
|
||||
- (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row {
|
||||
NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]init]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label;
|
||||
NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell;
|
||||
NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label;
|
||||
NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell;
|
||||
}
|
||||
- (void)tableViewSelectionDidChange:(NSNotification*)note {
|
||||
if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil];
|
||||
}
|
||||
- (void)rebuildWorkspaceEditor {
|
||||
NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil;
|
||||
_selectionTitle.stringValue=_selectedMask?@"共享蒙版 · 编辑与跟踪":DYToolSection(type)[@"title"]?:@"从上方添加模块";
|
||||
_selectionTitle.stringValue=_selectedMask?@"蒙版 · 编辑与跟踪":DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;}
|
||||
if(![_editorNode isEqual:_selectedNode]){[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){id<PROAPIAccessing>target=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}}
|
||||
[_toolEditor refresh];
|
||||
if(_selectedNode.length&&![_selectedNode isEqual:@"shared"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:[self rootHost]userInfo:@{@"node":_selectedNode}];
|
||||
@@ -95,7 +96,7 @@
|
||||
- (void)bindLUTTarget {
|
||||
NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);id<PROAPIAccessing>target=[node[@"type"]isEqual:@"look"]?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];
|
||||
NSString*old=[_lutTarget isKindOfClass:DYToolManager.class]?[(DYToolManager*)_lutTarget nodeID]:@"base:look",*next=[target isKindOfClass:DYToolManager.class]?[(DYToolManager*)target nodeID]:@"base:look";
|
||||
if([old isEqual:next]&&_lutTarget)return;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_browser close];[_browser release];_browser=nil;[(id)_lutTarget release];_lutTarget=[(id)target retain];
|
||||
if([old isEqual:next]&&_lutTarget)return;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;BOOL wasClosing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;_closing=wasClosing;[(id)_lutTarget release];_lutTarget=[(id)target retain];
|
||||
}
|
||||
- (void)addWorkspaceTool:(NSButton*)sender {
|
||||
NSString*type=sender.identifier;if(![DYToolTypes()containsObject:type])return;id<PROAPIAccessing>host=[self rootHost];id<FxCustomParameterActionAPI_v4>a=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*added=nil;
|
||||
|
||||
在新工单中引用
屏蔽一个用户