保存仿制图章修复与前轮发布诊断,待正式验收

这个提交包含在:
mac 于 2026-11-14 22:54:31 +08:00 提交
1 父节点 5a10408557
当前提交 ca9936ee3c
25 个文件已更改
+1354 -58

没有与搜索条件相匹配的文件

+1 -2
查看文件
@@ -201,8 +201,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
- (void)trackingPreviewChanged:(NSNotification *)note {
NSDictionary *info=note.userInfo;
if(!info[@"tracking"]||(!_visible&&!_opening))return;
BOOL active=[info[@"tracking"] boolValue];
if(active&&_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
if(_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
if(!_trackingPreview.hidden)[_trackingPreview applyUpdate:info];
}
- (void)trackingPreviewAction:(id)sender {
+38 -11
查看文件
@@ -11,6 +11,7 @@
@end
@implementation DYToolMaskPanel {
id<PROAPIAccessing> _host;NSString *_nodeID,*_maskID;NSDictionary *_document;CMTime _time;
NSPopUpButton *_stampMode;NSButton *_reference,*_referenceReset,*_manualKey,*_lastTrusted;NSTextField *_stampGuide;BOOL _trackingBusy;
NSPopUpButton *_list,*_combine;NSButton *_eye,*_add,*_remove,*_invert,*_canvas,*_clear,*_penRedraw,*_penFinish,*_penCancel;NSMutableArray *_rows,*_tracking;NSTextField *_trackingTitle,*_status;BOOL _refreshing,_drawing,_canvasActive,_workspaceMode;CGFloat _contentHeight;
}
@synthesize workspaceMode=_workspaceMode;
@@ -18,11 +19,11 @@
- (void)setWorkspaceMode:(BOOL)workspaceMode{if(_workspaceMode==workspaceMode)return;_workspaceMode=workspaceMode;[self setNeedsLayout:YES];}
- (CGFloat)contentHeight{return _workspaceMode?self.bounds.size.height:_contentHeight;}
- (CGFloat)contentWidth{
if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actions=216;if(pen&&shape&&self.bounds.size.height<242)actions+=216;return MAX(536,16+ceil(double(count)/perColumn)*184+actions);
if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actions=shape&&self.bounds.size.height<240?432:216;if(_stampMode&&!_stampMode.hidden)actions+=240;if(pen&&shape&&self.bounds.size.height<242)actions+=216;return MAX(536,16+ceil(double(count)/perColumn)*184+actions);
}
- (void)selectMaskID:(NSString*)maskID{
if([_maskID isEqual:maskID]){if(!_canvasActive)[self canvas:nil];return;}BOOL found=NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID]){found=YES;break;}if(!found)return;
[_maskID release];_maskID=[maskID copy];_drawing=_canvasActive=NO;[self refreshWithDocument:_document time:_time];[self canvas:nil];
[_maskID release];_maskID=[maskID copy];_drawing=_canvasActive=_trackingBusy=NO;[self refreshWithDocument:_document time:_time];[self canvas:nil];
}
- (instancetype)initWithManager:(id<PROAPIAccessing>)manager nodeID:(NSString*)nodeID{
if((self=[super initWithFrame:NSZeroRect])){_host=manager;_nodeID=[nodeID copy];_rows=[NSMutableArray new];_tracking=[NSMutableArray new];self.identifier=@"toolMasks";
@@ -49,15 +50,26 @@
for(int i=0;i<6;i++){NSButton *b=DYButton(titles[i],self,@selector(track:));b.tag=((int[]){-2,-1,0,1,2,9})[i];b.font=[NSFont systemFontOfSize:13 weight:NSFontWeightMedium];b.controlSize=NSControlSizeRegular;b.accessibilityLabel=@[@"反向跟踪一帧",@"反向蒙版跟踪",@"双向蒙版跟踪",@"正向蒙版跟踪",@"正向跟踪一帧",@"取消蒙版跟踪"][i];[self addSubview:b];[_tracking addObject:b];}
for(NSButton *b in @[_eye,_add,_remove,_canvas,_clear,_penRedraw,_penFinish,_penCancel]){b.controlSize=NSControlSizeRegular;b.font=[NSFont systemFontOfSize:(b==_add||b==_remove)?18:13 weight:NSFontWeightMedium];}
_trackingTitle=[DYLabel(@"运动跟踪",13)retain];_trackingTitle.font=[NSFont systemFontOfSize:13 weight:NSFontWeightSemibold];[self addSubview:_trackingTitle];
_stampMode=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_stampMode addItemsWithTitles:@[@"取样跟随修复区移动",@"取样区独立跟踪"]];_stampMode.target=self;_stampMode.action=@selector(stampModeChanged:);_stampMode.accessibilityLabel=@"图章取样跟踪方式";_stampMode.toolTip=@"同一表面上的纯色取样区请选择跟随模式;取样区和修复区分别运动时才使用独立跟踪。";[self addSubview:_stampMode];
_reference=[DYButton(@"选择跟踪参考",self,@selector(stampCommand:))retain];_reference.identifier=@"reference";_reference.toolTip=@"在画面拖框选择同一表面的纹理,绿色参考框不会扩大黄色修复范围。";
_referenceReset=[DYButton(@"重置参考",self,@selector(stampCommand:))retain];_referenceReset.identifier=@"clearReference";
_manualKey=[DYButton(@"手工关键帧",self,@selector(stampCommand:))retain];_manualKey.identifier=@"manual";_manualKey.toolTip=@"先保存当前帧,再移到其它帧拖动修复区/取样点,帧间自动过渡。";
_lastTrusted=[DYButton(@"最后可信帧",self,@selector(stampCommand:))retain];_lastTrusted.identifier=@"return";
for(NSButton *button in @[_reference,_referenceReset,_manualKey,_lastTrusted]){button.font=[NSFont systemFontOfSize:11];[self addSubview:button];}
_stampGuide=[DYLabel(@"",11)retain];_stampGuide.maximumNumberOfLines=4;_stampGuide.lineBreakMode=NSLineBreakByWordWrapping;[self addSubview:_stampGuide];
_status=[DYLabel(@"",12)retain];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[self addSubview:_status];_contentHeight=0;
}
- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[_maskID release];[_document release];[_list release];[_combine release];[_eye release];[_add release];[_remove release];[_invert release];[_canvas release];[_clear release];[_penRedraw release];[_penFinish release];[_penCancel release];[_rows release];[_tracking release];[_trackingTitle release];[_status release];[super dealloc];}
- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[_maskID release];[_document release];[_list release];[_combine release];[_eye release];[_add release];[_remove release];[_invert release];[_canvas release];[_clear release];[_penRedraw release];[_penFinish release];[_penCancel release];[_rows release];[_tracking release];[_trackingTitle release];[_status release];[_stampMode release];[_reference release];[_referenceReset release];[_manualKey release];[_lastTrusted release];[_stampGuide release];[super dealloc];}
- (NSDictionary*)mask{for(NSDictionary *m in DYMasksForTool(_document,_nodeID))if([m[@"id"]isEqual:_maskID])return m;return nil;}
- (void)refreshWithDocument:(NSDictionary*)doc time:(CMTime)time{
_refreshing=YES;NSDictionary *saved=[doc copy];[_document release];_document=saved;_time=time;NSArray *masks=DYMasksForTool(doc,_nodeID);if(masks.count)[self buildControls];[_list removeAllItems];NSInteger selected=0,index=0;
for(NSDictionary *m in masks){DYMaskParameters p=DYMaskAtTime(m,time);[_list addItemWithTitle:m[@"label"]?:[NSString stringWithFormat:@"%@ %ld",m[@"stampSource"]?@"仿制图章":@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][p.kind],(long)index+1]];if([m[@"id"]isEqual:_maskID])selected=index;index++;}
if(!masks.count){_contentHeight=0;_drawing=_canvasActive=NO;[_maskID release];_maskID=nil;_refreshing=NO;return;}[_list selectItemAtIndex:selected];if(![_maskID isEqual:masks[selected][@"id"]])_drawing=_canvasActive=NO;[_maskID release];_maskID=[masks[selected][@"id"]copy];NSDictionary *m=[self mask];DYMaskParameters p=DYMaskAtTime(m,time);if(p.kind!=DYMaskBezier)_drawing=NO;
if(!masks.count){_contentHeight=0;_drawing=_canvasActive=NO;[_maskID release];_maskID=nil;_refreshing=NO;return;}[_list selectItemAtIndex:selected];if(![_maskID isEqual:masks[selected][@"id"]])_drawing=_canvasActive=_trackingBusy=NO;[_maskID release];_maskID=[masks[selected][@"id"]copy];NSDictionary *m=[self mask];DYMaskParameters p=DYMaskAtTime(m,time);if(p.kind!=DYMaskBezier)_drawing=NO;
BOOL stamp=m[@"stampSource"]!=nil;_combine.hidden=_invert.hidden=stamp;
for(NSView *v in @[_stampMode,_reference,_referenceReset,_manualKey,_lastTrusted,_stampGuide])v.hidden=!stamp;
[_stampMode selectItemAtIndex:DYStampUsesLinkedTracking(m)?0:1];
_stampGuide.stringValue=@"固定污点可直接覆盖。移动瑕疵先选同一表面的纹理作参考;纯色取样区用跟随模式。";_stampGuide.toolTip=_stampGuide.stringValue;
_lastTrusted.enabled=CMTIME_IS_NUMERIC(DYTrackingRecordedTime(m,@"trackingLastTime"));
_eye.state=[m[@"enabled"]boolValue]?NSControlStateValueOn:NSControlStateValueOff;_eye.image=[NSImage imageWithSystemSymbolName:[m[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用蒙版"];[_combine selectItemAtIndex:[m[@"combine"]integerValue]];_invert.state=(p.flags&DYMaskInvert)?NSControlStateValueOn:NSControlStateValueOff;
float values[]={p.strength,p.feather,p.centerX,p.centerY,p.width,p.height,float(p.angle*180.f/M_PI),p.gradientWidth,p.hueCenterTurns*360.f,p.hueCoreHalfWidth*360.f,p.hueSoftWidth*360.f,p.saturationRange.low,p.saturationRange.high,p.lightnessRange.low,p.lightnessRange.high,p.inputBlack,p.inputWhite,p.inputGamma};
NSInteger visible=0;for(NSInteger i=0;i<_rows.count;i++){BOOL show=i==0||(i==1&&p.kind<3)||(i>=2&&i<=6&&p.kind<4&&(!stamp||i!=6))||(i==7&&p.kind==3)||(i>=8&&i<=14&&p.kind==4)||(i>=15&&p.kind>=4);NSDictionary *row=_rows[i];for(NSView *v in row.allValues)v.hidden=!show;if(!show)continue;visible++;double lo=0,hi=1;if(i==2||i==3)lo=-1,hi=2;if(i==4||i==5||i==7)lo=.001,hi=2;if(i==6)lo=-180,hi=180;if(i==8)hi=360;if(i==9||i==10)hi=180;if(i==15)hi=.99;if(i==16)lo=.01,hi=2;if(i==17)lo=.01,hi=4;NSSlider *slider=row[@"slider"];slider.minValue=lo;slider.maxValue=hi;slider.doubleValue=values[i];[row[@"field"]setStringValue:[NSString stringWithFormat:@"%.3f",values[i]]];}
@@ -66,10 +78,11 @@
[self updateDrawingControls];
_status.stringValue=m[@"status"]?:([m[@"keys"]count]?[NSString stringWithFormat:@"%lu 个轨迹键 · 修改几何会在当前帧建立手工键",(unsigned long)[m[@"keys"]count]]:pen?@"重画钢笔后,点击起点或“完成绘制”闭合;取消或 Esc 保留原路径。":@"各蒙版只影响当前工具层");
if([_nodeID isEqual:@"shared"]){_list.accessibilityLabel=@"共享蒙版";_add.toolTip=@"添加共享蒙版";_remove.toolTip=@"删除此共享蒙版及其模块关联,可撤销";if(!m[@"status"]&&!pen&&![m[@"keys"]count])_status.stringValue=[NSString stringWithFormat:@"共享给 %lu 个模块 · 编辑与跟踪同步更新所有关联模块",(unsigned long)DYToolIDsForSharedMask(doc,_maskID).count];}
if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=@"分别跟踪取样与覆盖区域的位置和缩放。";}
if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=DYStampUsesLinkedTracking(m)?@"取样随修复区移动,取样区无需纹理;黄色椭圆仅覆盖瑕疵。":@"独立跟踪要求取样区和覆盖区都有纹理;纯色取样请切换跟随模式。";}
_status.toolTip=_status.stringValue;
// Keep every scalar readable at the narrowest native inspector width. A
// label/value line and a separate full-width slider avoid compressed controls.
_contentHeight=136+(pen?84:0)+visible*58+(shape?184:0)+58;[self setNeedsLayout:YES];_refreshing=NO;
_contentHeight=136+(stamp?168:0)+(pen?84:0)+visible*58+(shape?184:0)+58;[self setNeedsLayout:YES];_refreshing=NO;
}
- (void)layout{
[super layout];CGFloat w=self.bounds.size.width;
@@ -78,15 +91,20 @@
NSInteger perColumn=MAX(1,NSInteger((h-48)/44));NSUInteger index=0;
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*184,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,100,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+108,y,66,22)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,174,18)];index++;}
CGFloat x=16+ceil(double(index)/perColumn)*184,y=42,aw=200;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;
if(_stampMode&&!_stampMode.hidden){
_stampMode.frame=NSMakeRect(x,y,224,26);_reference.frame=NSMakeRect(x,y+32,114,25);_referenceReset.frame=NSMakeRect(x+120,y+32,104,25);_manualKey.frame=NSMakeRect(x,y+64,114,25);_lastTrusted.frame=NSMakeRect(x+120,y+64,104,25);_stampGuide.frame=NSMakeRect(x,y+96,224,MAX(18,MIN(76,h-y-100)));x+=240;
}
if(pen){_penRedraw.frame=NSMakeRect(x,y,aw,25);y+=29;_penFinish.frame=NSMakeRect(x,y,97,25);_penCancel.frame=NSMakeRect(x+103,y,97,25);y+=33;}
if(shape){if(y+135>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*28,97,25)];y+=87;_clear.frame=NSMakeRect(x,y,aw,25);y+=28;}
if(shape){if(y>42&&y+126>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*26,97,23)];y+=78;_clear.frame=NSMakeRect(x,y,aw,22);y+=26;}
// Pen and tracking actions get adjacent columns when the short strip cannot
// hold both; no vertical clipping and no hidden controls below the viewport.
if(y+32>h){x+=216;y=42;}_status.font=[NSFont systemFontOfSize:10];_status.frame=NSMakeRect(x,y,aw,MIN(54,MAX(26,h-y-4)));return;
}
_eye.frame=NSMakeRect(0,4,32,34);_list.frame=NSMakeRect(38,4,MAX(60,w-114),34);_add.frame=NSMakeRect(w-70,4,32,34);_remove.frame=NSMakeRect(w-32,4,32,34);
CGFloat combineWidth=MIN(112,MAX(90,w*.45));_combine.frame=NSMakeRect(0,46,combineWidth,34);_invert.frame=NSMakeRect(combineWidth+12,49,MAX(70,w-combineWidth-12),28);_canvas.frame=NSMakeRect(0,88,w,36);
CGFloat y=136;if(_penRedraw&&!_penRedraw.hidden){CGFloat bw=(w-8)/2;_penRedraw.frame=NSMakeRect(0,y,bw,34);_penFinish.frame=NSMakeRect(bw+8,y,bw,34);_penCancel.frame=NSMakeRect(0,y+40,w,34);y+=84;}for(NSDictionary *r in _rows){NSTextField *label=r[@"label"];if(label.hidden)continue;label.frame=NSMakeRect(2,y+6,MAX(60,w-100),22);[r[@"field"]setFrame:NSMakeRect(w-90,y,88,32)];[r[@"slider"]setFrame:NSMakeRect(0,y+32,w,24)];y+=58;}
CGFloat y=136;
if(_stampMode&&!_stampMode.hidden){CGFloat half=(w-8)/2;_stampMode.frame=NSMakeRect(0,y,w,28);_reference.frame=NSMakeRect(0,y+34,half,28);_referenceReset.frame=NSMakeRect(half+8,y+34,half,28);_manualKey.frame=NSMakeRect(0,y+68,half,28);_lastTrusted.frame=NSMakeRect(half+8,y+68,half,28);_stampGuide.frame=NSMakeRect(0,y+102,w,58);y+=168;}
if(_penRedraw&&!_penRedraw.hidden){CGFloat bw=(w-8)/2;_penRedraw.frame=NSMakeRect(0,y,bw,34);_penFinish.frame=NSMakeRect(bw+8,y,bw,34);_penCancel.frame=NSMakeRect(0,y+40,w,34);y+=84;}for(NSDictionary *r in _rows){NSTextField *label=r[@"label"];if(label.hidden)continue;label.frame=NSMakeRect(2,y+6,MAX(60,w-100),22);[r[@"field"]setFrame:NSMakeRect(w-90,y,88,32)];[r[@"slider"]setFrame:NSMakeRect(0,y+32,w,24)];y+=58;}
if(_tracking.count&&![_tracking[0]isHidden]){_trackingTitle.frame=NSMakeRect(2,y+2,w-4,20);y+=28;CGFloat bw=(w-8)/2;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect((i%2)*(bw+8),y+(i/2)*38,bw,34)];y+=114;_clear.frame=NSMakeRect(0,y,w,34);y+=42;}
_status.frame=NSMakeRect(2,y+2,w-4,52);
}
@@ -102,7 +120,16 @@
- (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];}
- (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([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){BOOL stamp=m[@"stampSource"]!=nil,position=i==2||i==3;DYMaskParameters p=DYMaskAtTime(m,stamp&&!position?kCMTimeInvalid: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(stamp&&(i==4||i==5)){DYStampMotion motion=DYStampMotionAtTime(m,self->_time);*fields[i]/=i==4?motion.targetScaleX:motion.targetScaleY;}if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&(stamp?position: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:DYStampKey(self->_time,p,YES,1,DYStampMotionAtTime(m,self->_time))];[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)updateDrawingControls{
if(!_list)return;
for(NSButton *button in _tracking)button.enabled=!_drawing&&(!_trackingBusy||button.tag==9);
_clear.enabled=!_drawing&&!_trackingBusy&&[[self mask][@"keys"]count]>0;
for(NSControl *control in @[_stampMode,_reference,_referenceReset,_manualKey])control.enabled=!_drawing&&!_trackingBusy;
_lastTrusted.enabled=!_drawing&&!_trackingBusy&&CMTIME_IS_NUMERIC(DYTrackingRecordedTime([self mask],@"trackingLastTime"));
_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;
}
- (void)stampModeChanged:(id)sender{[self edit:@"切换图章跟踪方式" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"stampTrackMode"]=self->_stampMode.indexOfSelectedItem==0?@"linked":@"independent";[m removeObjectsForKeys:@[@"status",@"trackingStopped"]];}];}
- (void)stampCommand:(NSButton*)sender{[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"command":sender.identifier,@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];}
- (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];}
@@ -125,9 +152,9 @@
}
m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
m[@"keys"]=@[];
[m removeObjectForKey:@"status"];
[m removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
}];
}
- (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"]?:@"";}
- (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"]?:@"";_status.toolTip=_status.stringValue;if(n.userInfo[@"tracking"]){_trackingBusy=[n.userInfo[@"tracking"]boolValue];[self updateDrawingControls];}}}
@end
+1
查看文件
@@ -15,6 +15,7 @@
#import <os/log.h>
#include "MaskCore/DYTracker.hpp"
#include "MaskCore/DYVisionRegionTracker.hpp"
#include "MaskCore/DYCloneTracking.hpp"
#include "MaskCore/DYObjectTracker.hpp"
#include <atomic>
#include "DYViewerParameterBridge.inc.h"
+65 -8
查看文件
@@ -2,10 +2,11 @@
// deferred until the gesture has finished and the callback has returned.
- (void)postToolCanvasStatus:(NSString*)message {
NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;}
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;if(message&&![message isEqual:@"已选中本层蒙版"]&&DYSharedMaskWithID(self->_toolCanvasDocument,maskID)[@"stampSource"])self->_toolTrackingMessages[maskID]=message;
drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
}
- (void)discardToolCanvasDraft {
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
}
// OSC and custom actions can use different origins. Capture the action clock
// after the first event, then compare that clock only with itself at commit.
@@ -21,12 +22,12 @@
});[original release];
}
- (void)commitToolCanvasDraftAtTime:(CMTime)eventTime {
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp;
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp,referenceEdit;
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;referenceEdit=_toolDragPart==DYCloneReferencePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
// Keep the completed path visible until the authoritative write returns.
// Discarding it here exposed the new pen mask's default rectangular nodes
// during the OSC redraw that immediately follows the closing click.
_toolDrawingPen=_toolDrawingShape=_toolCanvasHasHover=NO;revision=++_toolCanvasRevision;_toolCanvasCommitPending=YES;}
_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=_toolCanvasHasHover=NO;revision=++_toolCanvasRevision;_toolCanvasCommitPending=YES;}
dispatch_async(dispatch_get_main_queue(),^{@try{
@synchronized(self){if(self->_trackingActive.load()||revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
@@ -40,17 +41,28 @@
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,writeTime).document),*current=[self toolMask:maskID node:node document:doc];
if(!current||![current isEqual:original]){os_log(OS_LOG_DEFAULT,"dayu_pen_commit conflict current=%{public}d",current!=nil);[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;}
NSMutableDictionary *result=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft);
if(resizeStamp){
if(referenceEdit){
result=DYMutablePlist(current);result[@"stampReference"]=draft[@"stampReference"];
}else if(sourceEdit&&[current[@"keys"]count]){
NSArray *baseSource=current[@"stampSource"],*changedSource=draft[@"stampSource"];
DYStampMotion motion=DYStampMotionAtTime(current,time);motion.active=true;
motion.sourceOffsetX+=[changedSource[0]floatValue]-[baseSource[0]floatValue];
motion.sourceOffsetY+=[changedSource[1]floatValue]-[baseSource[1]floatValue];
result=DYMutablePlist(current);NSMutableArray *keys=result[@"keys"];
[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)!=0;}]];
if(!DYMergeTracking(result,@[DYStampKey(time,DYMaskAtTime(current,time),YES,1,motion)]))return;
}else if(resizeStamp){
DYMaskParameters p=DYMaskAtTime(result,kCMTimeInvalid),authored=DYMaskAtTime(current,kCMTimeInvalid);
DYStampMotion motion=DYStampMotionAtTime(current,time);
authored.width=p.width/motion.targetScaleX;authored.height=p.height/motion.targetScaleY;
result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)];
result[@"keys"]=current[@"keys"];
}else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;}
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
[result removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:referenceEdit?@"设置图章跟踪参考":sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
}@finally{[a endAction:self];}
os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft));
if(changed)[self postToolCanvasStatus:sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
if(changed)[self postToolCanvasStatus:referenceEdit?@"跟踪参考已保存 · 绿色区域只用于跟踪,黄色修复范围保持不变":sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
}@finally{@synchronized(self){if(revision==self->_toolCanvasRevision){[self->_toolCanvasDraft release];self->_toolCanvasDraft=nil;[self->_toolCanvasOriginal release];self->_toolCanvasOriginal=nil;self->_toolCanvasEditTime=kCMTimeInvalid;}self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release];
}
@@ -58,6 +70,7 @@
NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;}
CMTime time=CMTimeMakeWithEpoch([info[@"timeValue"]longLongValue],[info[@"timeScale"]intValue],[info[@"timeEpoch"]longLongValue]);
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}@synchronized(self){if(_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime))time=_toolCanvasEditTime;}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
if([@[@"reference",@"clearReference",@"manual",@"return"]containsObject:command]){[self cloneStampCommand:command mask:info[@"mask"] atTime:time];return;}
if([command isEqual:@"finish"]||[command isEqual:@"cancel"])[self toolCanvasEvent:NSEventTypeKeyDown point:NSZeroPoint part:1 modifiers:0 key:[command isEqual:@"finish"]?13:27 time:time];
}
- (void)updateToolShapeDraftAtPoint:(NSPoint)point {
@@ -68,6 +81,21 @@
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {
if(!CMTIME_IS_NUMERIC(time)||!std::isfinite(point.x)||!std::isfinite(point.y))return;
@synchronized(self){if(_trackingActive.load()||!_selectedToolNode||!_selectedToolMask)return;if(_toolCanvasCommitPending){NSString *node=[_selectedToolNode copy],*maskID=[_selectedToolMask copy];dispatch_async(dispatch_get_main_queue(),^{@synchronized(self){if(![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}[self toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];});[node release];[maskID release];return;}
if(_toolDrawingStampReference){
if(type==NSEventTypeKeyDown&&key==27){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"已取消跟踪参考选择,保留原图章。"];return;}
if(type==NSEventTypeLeftMouseDown&&part==DYCloneReferencePart){
NSDictionary *stamp=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!stamp[@"stampSource"])return;
_toolCanvasOriginal=[DYMutablePlist(stamp)retain];_toolCanvasDraft=[DYMutablePlist(stamp)retain];_toolCanvasEditTime=time;_toolDragStart=point;_toolDragPart=DYCloneReferencePart;
}
if(_toolCanvasDraft&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp)){
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新选择跟踪参考。"];return;}
double x0=std::clamp(MIN(point.x,_toolDragStart.x),0.,1.),y0=std::clamp(MIN(point.y,_toolDragStart.y),0.,1.);
double x1=std::clamp(MAX(point.x,_toolDragStart.x),0.,1.),y1=std::clamp(MAX(point.y,_toolDragStart.y),0.,1.);
BOOL valid=DYSetStampReference(_toolCanvasDraft,NSMakeRect(x0,y0,x1-x0,y1-y0),time);
if(type==NSEventTypeLeftMouseUp){if(valid)[self commitToolCanvasDraftAtTime:time];else{[self discardToolCanvasDraft];[self postToolCanvasStatus:@"参考区域太小或离修复区过远,请重新框选。"];}}
}
return;
}
if(part>=10000&&type==NSEventTypeLeftMouseDown){
NSInteger item=part-10000;
if(item==7){_toolShowCoverage=!_toolShowCoverage;return;}
@@ -131,3 +159,32 @@
if(type==NSEventTypeLeftMouseUp&&!_toolDrawingPen)[self commitToolCanvasDraftAtTime:time];
}
}
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)eventTime {
if(!maskID.length)return;
dispatch_async(dispatch_get_main_queue(),^{
@synchronized(self){if(self->_trackingActive.load()||![maskID isEqual:self->_selectedToolMask]||self->_toolCanvasCommitPending)return;}
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a){[self toolStatus:@"宿主暂时无法编辑图章,请重试。"];return;}
[a startAction:self];@try{
CMTime time=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime);if(!CMTIME_IS_NUMERIC(time))return;
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document),*stamp=(id)DYSharedMaskWithID(doc,maskID);if(!stamp[@"stampSource"])return;
if([command isEqual:@"return"]){
CMTime last=DYTrackingRecordedTime(stamp,@"trackingLastTime"),timeline=kCMTimeInvalid;
if(CMTIME_IS_NUMERIC(last))[[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)]timelineTime:&timeline fromInputTime:last];
NSError *error=nil;
if(!CMTIME_IS_NUMERIC(timeline)||![[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)]movePlayheadToTime:timeline error:&error])[self toolStatus:@"暂时无法定位最后可信帧,请按提示中的片段时间定位。"];return;
}
BOOL cancelReference=[command isEqual:@"reference"]&&self->_toolDrawingStampReference;
[self discardToolCanvasDraft];
if(cancelReference){[self postToolCanvasStatus:@"已取消参考选择,保留原图章。"];return;}
if([command isEqual:@"reference"]){@synchronized(self){self->_toolDrawingStampReference=YES;self->_toolCanvasHidden=NO;}[self postToolCanvasStatus:@"拖框选择同一表面上有纹理的跟踪参考;Esc 取消。"];return;}
if([command isEqual:@"clearReference"]){[stamp removeObjectForKey:@"stampReference"];[stamp removeObjectForKey:@"status"];}
else if([command isEqual:@"manual"]){if(!DYAddStampManualKey(stamp,time)){[self toolStatus:@"无法建立手工关键帧,请检查轨迹数量或重新定位。"];return;}}
else return;
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:[command isEqual:@"manual"]?@"设置图章手工关键帧":@"重置图章跟踪参考"];
BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];
if(written){[self adoptToolCanvasDocument:doc];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];[self postToolCanvasStatus:[command isEqual:@"manual"]?@"手工关键帧已保存 · 移到另一帧拖动黄色修复区或青色取样点,帧间自动过渡。":@"已使用修复区域作为跟踪参考。"];}
else [self toolStatus:@"宿主未保存图章修改,请重试。"];
}@finally{[a endAction:self];}
});
}
@@ -1,4 +1,5 @@
static const NSInteger DYCloneSourcePart=7;
static const NSInteger DYCloneReferencePart=8;
@class DYPlugIn;
static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static dispatch_once_t once;dispatch_once(&once,^{map=[[NSMapTable strongToWeakObjectsMapTable]retain];});return map;}
@interface DYPlugIn (ToolCanvas)
@@ -11,4 +12,5 @@ static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static disp
- (void)saveCanvasLevel:(NSDictionary *)state replacing:(NSDictionary *)previous completion:(void (^)(NSString *failure))completion;
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion;
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction;
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)time;
@end
@@ -29,3 +29,8 @@
BOOL _trackingObjectMode;
NSUInteger _trackingObjectPending,_trackingObjectRepaired;
NSMutableDictionary *_toolCaptureDevices;
NSMutableDictionary *_toolTrackingMessages;
BOOL _toolDrawingStampReference,_trackingStampLinked,_trackingStopped;
dy::TrackerROI _trackingStampTargetSeed;
CMTime _trackingCurrentTime;
std::atomic<double> _trackingHeartbeat;
+82 -25
查看文件
@@ -1,15 +1,17 @@
- (void)initializeToolHost {
_viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager];_viewerParameterBridge.renderer=_renderer;
_toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid;
_toolTrackingMessages=[NSMutableDictionary new];_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];
}
- (void)tearDownToolHost {
[_viewerParameterBridge invalidate];[_viewerParameterBridge release];_viewerParameterBridge=nil;
[_toolAnalysisTimer invalidate];[_toolAnalysisTimer release];@synchronized(DYToolCanvasSessions()){if(_toolSession)[DYToolCanvasSessions()removeObjectForKey:_toolSession];}
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];[_toolTrackingMessages release];
}
- (void)adoptToolCanvasDocument:(NSDictionary*)document {
if(!document)return;@synchronized(self){[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
if(!document)return;@synchronized(self){
for(NSString *ID in [[_toolTrackingMessages.allKeys copy]autorelease])if(![DYSharedMaskWithID(document,ID)isEqual:DYSharedMaskWithID(_toolCanvasDocument,ID)])[_toolTrackingMessages removeObjectForKey:ID];
[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
}
- (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];}});
@@ -17,9 +19,12 @@
#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?:@""}];});
NSString *node=nil,*mask=nil;
@synchronized(self){node=[(_trackingActive.load()?_trackingNode:_selectedToolNode)copy];mask=[(_trackingActive.load()?_trackingMaskID:_selectedToolMask)copy];if(mask)_toolTrackingMessages[mask]=message?:@"";}
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});[node release];[mask release];
}
- (void)postTrackingPreview:(NSDictionary*)frame active:(BOOL)active message:(NSString*)message {
@synchronized(self){if(_trackingMaskID)_toolTrackingMessages[_trackingMaskID]=message?:@"";}
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:frame?:@{}];
info[@"node"]=_trackingNode?:@"";info[@"mask"]=_trackingMaskID?:@"";
info[@"tracking"]=@(active);info[@"message"]=message;
@@ -52,7 +57,7 @@
});
}
- (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");
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;@synchronized(self){if(![mask isEqual:_selectedToolMask])_toolDrawingStampReference=NO;}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(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 取消。":@"已选中本层蒙版"];
}
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion {
@@ -80,6 +85,7 @@
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
stamp[@"stampTrackMode"]=@"linked";
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
@try{
@@ -149,11 +155,25 @@
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
@synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};}
@synchronized(self){
if(_toolCanvasHidden||!_selectedToolMask)return nil;
BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;
NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;
DYMaskParameters p=DYMaskAtTime(m,time);
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:@{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())}];
if(m[@"stampSource"]){
info[@"referenceDrawing"]=@(_toolDrawingStampReference);
info[@"status"]=_toolDrawingStampReference?@"拖框选择同一表面上有纹理的参考区 · 不改变修复范围 · Esc 取消":(_toolTrackingMessages[m[@"id"]]?:m[@"status"]?:@"拖动青色十字调整取样;黄色椭圆覆盖瑕疵。纯色区域可先选择跟踪参考;固定污点无需跟踪。");
info[@"trackingStopped"]=m[@"trackingStopped"]?:@NO;
info[@"canReturn"]=@(CMTIME_IS_NUMERIC(DYTrackingRecordedTime(m,@"trackingLastTime")));
if(m[@"stampReference"]){DYMaskParameters ref=DYStampReferenceAtTime(m,time);info[@"referenceShape"]=[NSData dataWithBytes:&ref length:sizeof(ref)];}
}
return info;
}
}
- (void)toolTrackRequested:(NSNotification*)notification {
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolDrawingStampReference||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a){[self toolStatus:@"宿主暂时无法开始分析,请重新选择片段后重试。"];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;
if(!CMTIME_IS_NUMERIC(time)){[self toolStatus:@"请在时间线定位到有效画面后再开始跟踪"];return;}
@@ -173,7 +193,11 @@
std::min(8.f,[source[2] floatValue]*_trackingStampMotion.sourceScaleX),
std::min(8.f,[source[3] floatValue]*_trackingStampMotion.sourceScaleY),0};
}
_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;_trackingRunStart=_trackingStarted=NSProcessInfo.processInfo.systemUptime;
_trackingStampLinked=source&&DYStampUsesLinkedTracking(mask);
if(source){DYMaskParameters ref=DYStampReferenceAtTime(mask,time);_trackingStampTargetSeed={ref.centerX,ref.centerY,ref.width,ref.height,0};}
_trackingStopped=NO;_trackingCurrentTime=_trackingPreviousTime=kCMTimeInvalid;
@synchronized(self){[_toolTrackingMessages removeObjectForKey:mask[@"id"]];}
_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;_trackingRunStart=_trackingStarted=NSProcessInfo.processInfo.systemUptime;_trackingHeartbeat.store(_trackingStarted);
_trackingPreviewInputRange=kCMTimeRangeInvalid;_trackingPreviewTotal=_trackingPreviewCompleted=0;
@synchronized(self){[_trackingPreviewFrame release];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;}
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
@@ -191,10 +215,13 @@
}@finally{[a endAction:self];}
}
- (void)pollToolAnalysis:(NSTimer*)timer {
if(!_trackingActive.load()||_trackingFinishing.load()||_trackingInFrame.load())return;id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxAnalysisAPI>api=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[api analysisStateForEffect];if(state==kFxAnalysisState_AnalysisCompleted||state==kFxAnalysisState_AnalysisInterrupted||(state==kFxAnalysisState_NotAnalyzing&&NSProcessInfo.processInfo.systemUptime-_trackingStarted>2))[self cleanupAnalysis:nil];}@finally{[a endAction:self];}
if(!_trackingActive.load()||_trackingFinishing.load()||_trackingInFrame.load())return;
if(_trackingCancelled.load()){[self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:nil];return;}
if(NSProcessInfo.processInfo.systemUptime-_trackingHeartbeat.load()>30){[self finishToolAnalysis:@"宿主超过 30 秒未返回新画面,跟踪已停止;请重新选择片段或使用手工关键帧。" error:nil];return;}
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxAnalysisAPI>api=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[api analysisStateForEffect];if(state==kFxAnalysisState_AnalysisCompleted||state==kFxAnalysisState_AnalysisInterrupted||(state==kFxAnalysisState_NotAnalyzing&&NSProcessInfo.processInfo.systemUptime-_trackingStarted>2))[self cleanupAnalysis:nil];}@finally{[a endAction:self];}
}
- (BOOL)stopToolAnalysis:(NSString*)message error:(NSError**)error {
if(message){[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
if(message){_trackingStopped=YES;[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
}
- (BOOL)finishToolAnalysis:(NSString*)message error:(NSError**)error {
// FxAnalyzer's quiet cancellation is an explicit SDK error sentinel. A bare
@@ -220,11 +247,14 @@
}
std::vector<dy::FlowPoint>polygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i<path.count;i++)polygon.push_back({path.x[i],path.y[i]});}else if(_trackingSeed.kind==DYMaskRectangle)polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};else for(int i=0;i<128;i++){float angle=i*(2.f*M_PI/128);polygon.push_back({.5f*std::cos(angle),.5f*std::sin(angle)});}
if(_trackingStampMotion.active)_stampSourceTracker.setMask(polygon);
_trackingShapePolygon=polygon;_toolTracker.setMask(std::move(polygon));return YES;
_trackingShapePolygon=polygon;
if(_trackingStampMotion.active&&_trackingFrozenMask[@"stampReference"])polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};
_toolTracker.setMask(std::move(polygon));return YES;
}
- (BOOL)finishToolTrackingLoss:(const dy::TrackResult&)lost region:(NSString*)region atTime:(CMTime)time error:(NSError**)error {
NSString *reason=@"区域内运动不一致";
switch(lost.failure){
case dy::TrackFailure::InsufficientTexture:reason=@"区域纹理不足";break;
case dy::TrackFailure::InsufficientMatches:reason=@"可用特征点不足";break;
case dy::TrackFailure::LowConfidence:reason=@"运动可信度不足";break;
case dy::TrackFailure::OutsideFrame:reason=@"目标已离开画面";break;
@@ -233,14 +263,16 @@
default:break;
}
os_log(OS_LOG_DEFAULT,"dayu_tool_track_loss region=%{public}@ time=%{public}.6f reason=%{public}d features=%{public}d matches=%{public}d inliers=%{public}d confidence=%{public}.3f residual=%{public}.3f",region?:@"蒙版",CMTimeGetSeconds(time),(int)lost.failure,lost.features,lost.matches,lost.inliers,lost.confidence,lost.medianError);
NSString *detail=region?[NSString stringWithFormat:@"%@失去跟踪(%@)",region,reason]:reason;
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整区域后从此处继续",detail,(unsigned long)_trackingSamples.count] error:error];
NSString *detail=region?[NSString stringWithFormat:@"%@%@(%@)",region,_trackingSamples.count?@"失去跟踪":@"无法开始跟踪",reason]:reason;
NSString *next=_trackingStampMotion.active?@"选择同一表面上有纹理的跟踪参考,或设置手工关键帧。":@"调整蒙版后从最后可信帧继续。";
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@。%@",detail,next] error:error];
}
- (BOOL)analyzeFrame:(FxImageTile*)tile atTime:(CMTime)time error:(NSError**)error {
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);uint64_t trackingSpan=DYBetaSpanBegin(@"tracking_frame",nil);@try{
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
NSDictionary *preview=nil;
_trackingCurrentTime=time;_trackingHeartbeat.store(NSProcessInfo.processInfo.systemUptime);
dy::GrayFrame frame;
const bool stamp=_trackingStampMotion.active;
const bool objectMode=_trackingObjectMode&&!stamp;
@@ -278,21 +310,28 @@
if(!target.valid)return [self finishToolAnalysis:@"目标未能重新确认,已停止;请调整蒙版后继续" error:error];
}else if(!_trackingSamples.count){
os_log(OS_LOG_DEFAULT,"dayu_vision_region_worker main=%{public}d stamp=%{public}d",(int)NSThread.isMainThread,(int)stamp);
dy::TrackerROI targetROI={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
dy::TrackerROI targetROI=stamp?_trackingStampTargetSeed:dy::TrackerROI{_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
if(!_toolTracker.reset(frame,targetROI))
return [self finishToolAnalysis:stamp?@"覆盖区域内纹理不足,原图章已保留":@"蒙版内纹理不足,原蒙版已保留" error:error];
if(stamp&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
return [self finishToolAnalysis:@"取样区域内纹理不足,原图章已保留" error:error];
return [self finishToolTrackingLoss:_toolTracker.result() region:stamp?@"跟踪参考区域":@"蒙版区域" atTime:time error:error];
if(stamp&&!_trackingStampLinked&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
return [self finishToolTrackingLoss:_stampSourceTracker.result() region:@"独立取样区域(可切换为随修复区移动)" atTime:time error:error];
target=_toolTracker.result();
if(stamp)source=_stampSourceTracker.result();
if(stamp&&!_trackingStampLinked)source=_stampSourceTracker.result();
}else{
target=_toolTracker.track(frame);
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"覆盖区域":nil atTime:time error:error];
if(stamp){
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"跟踪参考区域":nil atTime:time error:error];
if(stamp&&!_trackingStampLinked){
source=_stampSourceTracker.track(frame);
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
}
}
if(stamp){
dy::TrackResult reference=target;float aspect=float(frame.width)/frame.height;
target=dy::cloneRegionFollowing(reference,_trackingStampTargetSeed,_trackingSeed.centerX,_trackingSeed.centerY,aspect);
if(!target.valid)return [self finishToolTrackingLoss:target region:@"修复区域" atTime:time error:error];
if(_trackingStampLinked)source=dy::cloneRegionFollowing(reference,_trackingStampTargetSeed,_trackingStampSourceSeed.cx,_trackingStampSourceSeed.cy,aspect);
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
}
DYMaskParameters p=DYMaskAtTime(_trackingFrozenMask,stamp?kCMTimeInvalid:time);
p.centerX=target.cx;p.centerY=target.cy;
float confidence=target.confidence;
@@ -331,6 +370,7 @@
sampled.width=_trackingStampSourceSeed.width*source.scaleX;
sampled.height=_trackingStampSourceSeed.height*source.scaleY;
packet[@"sourceShape"]=[NSData dataWithBytes:&sampled length:sizeof(sampled)];
if(_trackingFrozenMask[@"stampReference"]){auto tracked=_toolTracker.result();DYMaskParameters ref=covered;ref.kind=DYMaskRectangle;ref.centerX=tracked.cx;ref.centerY=tracked.cy;ref.width=_trackingStampTargetSeed.width*tracked.scaleX;ref.height=_trackingStampTargetSeed.height*tracked.scaleY;ref.angle=tracked.rotation;packet[@"referenceShape"]=[NSData dataWithBytes:&ref length:sizeof(ref)];}
}
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];packet[@"predicted"]=@(objectStep.predicted);
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
@@ -356,13 +396,27 @@
_objectTracker.stop();
_toolTracker.stop();
if(_trackingStampMotion.active)_stampSourceTracker.stop();
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard;
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard&&!_trackingStopped;
dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return;
if(!self->_trackingSingle)[self publishTrackingPreview];
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);}
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;self->_trackingHeartbeat.store(self->_trackingStarted);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(self->_trackingObjectRepaired)message=[message stringByAppendingFormat:@" · 补齐 %lu 帧短暂遮挡,请复核",(unsigned long)self->_trackingObjectRepaired];
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:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
BOOL failedStamp=self->_trackingStopped&&self->_trackingFrozenMask[@"stampSource"];
if(failedStamp){
double stopped=CMTIME_IS_NUMERIC(self->_trackingCurrentTime)?CMTimeGetSeconds(self->_trackingCurrentTime):CMTimeGetSeconds(self->_trackingReferenceTime);
NSString *position=CMTIME_IS_NUMERIC(self->_trackingPreviousTime)?[NSString stringWithFormat:@"最后可信帧 %.3fs",CMTimeGetSeconds(self->_trackingPreviousTime)]:@"未生成新轨迹,原图章已保留";
message=[NSString stringWithFormat:@"已停止 · %.3fs · %@。%@",stopped,position,message];
}
if((hasResults||failedStamp)&&!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;
if(mask[@"stampSource"]){
self->_trackingCandidate[@"trackingStopped"]=@(self->_trackingStopped);
for(NSString *field in @[@"trackingLastTime",@"trackingStopTime"])[self->_trackingCandidate removeObjectForKey:field];
CMTime last=self->_trackingPreviousTime,stop=self->_trackingCurrentTime;
if(CMTIME_IS_NUMERIC(last))self->_trackingCandidate[@"trackingLastTime"]=@[@(last.value),@(last.timescale),@(last.epoch)];
if(CMTIME_IS_NUMERIC(stop))self->_trackingCandidate[@"trackingStopTime"]=@[@(stop.value),@(stop.timescale),@(stop.epoch)];
}
[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受跟踪结果,原图章/蒙版已保留,请重试。";else [self adoptToolCanvasDocument:doc];}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",@"previewBuffer",@"visionPool",@"visionWidth",@"visionHeight"]];}
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;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
@@ -372,7 +426,10 @@
(unsigned long)self->_trackingDirectFrames,(unsigned long)self->_trackingCopiedFrames,
(unsigned long)[self->_trackingCandidate[@"keys"]count]);
if(self->_trackingSingle)[self toolStatus:message];
else [self postTrackingPreview:nil active:NO message:message];
else {
[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:self->_apiManager userInfo:@{@"page":@"tracking"}];
[self postTrackingPreview:nil active:NO message:message];
}
});return YES;
}
+22 -1
查看文件
@@ -161,6 +161,14 @@
[NSColor.blackColor setStroke];mark.lineWidth=3.5*_uiScale;[mark stroke];
[NSColor.systemCyanColor setStroke];mark.lineWidth=1.5*_uiScale;[mark stroke];
}
- (NSRect)stampActionRect:(NSInteger)index{return NSOffsetRect([self stampControlRect:index],0,-30*_uiScale);}
- (void)drawStampReference {
NSData *data=_mask[@"referenceShape"];if(data.length!=sizeof(DYMaskParameters))return;
DYMaskParameters p;[data getBytes:&p length:sizeof(p)];NSBezierPath *path=[NSBezierPath bezierPath];
const float xy[][2]={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
for(int i=0;i<4;i++){NSPoint q=[self canvasStampSource:NSMakePoint(p.centerX+xy[i][0]*p.width,p.centerY+xy[i][1]*p.height)];if(i)[path lineToPoint:q];else[path moveToPoint:q];}
[path closePath];path.lineWidth=3*_uiScale;[NSColor.blackColor setStroke];[path stroke];CGFloat dash[]={5*_uiScale,3*_uiScale};[path setLineDash:dash count:2 phase:0];path.lineWidth=1.5*_uiScale;[NSColor.systemGreenColor setStroke];[path stroke];
}
- (void)drawStampControls{
NSArray *source=_mask[@"stampSource"];
if(_viewerControls.stampArmed){
@@ -181,9 +189,17 @@
[outline closePath];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
}
}else if(source.count==4){
[self drawStampReference];
[self drawStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
BOOL tracking=[_mask[@"tracking"]boolValue];
NSArray *titles=tracking?@[@"停止跟踪"]:@[@"向后跟踪",@"双向跟踪",@"向前跟踪"];
NSString *status=_mask[@"status"];
if(status.length){
NSRect box=NSMakeRect(NSMinX(_imageRect)+8*_uiScale,NSMinY(_imageRect)+10*_uiScale,MAX(1,MIN(NSWidth(_imageRect)-16*_uiScale,680*_uiScale)),64*_uiScale);
DYDrawSoftControl(box,4,NO,NO,NO);NSMutableParagraphStyle *style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.lineBreakMode=NSLineBreakByWordWrapping;
[status drawInRect:NSInsetRect(box,7*_uiScale,5*_uiScale) withAttributes:@{NSForegroundColorAttributeName:[_mask[@"trackingStopped"]boolValue]?NSColor.systemOrangeColor:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:11*_uiScale],NSParagraphStyleAttributeName:style}];
}
if(!tracking){NSArray *actions=@[[_mask[@"referenceDrawing"]boolValue]?@"取消参考选择":@"选择跟踪参考",@"手工关键帧",@"最后可信帧"];for(NSInteger i=0;i<3;i++){NSRect cell=[self stampActionRect:i];DYDrawSoftControl(cell,4,NO,NO,NO);[actions[i]drawInRect:NSInsetRect(cell,4,4) withAttributes:@{NSForegroundColorAttributeName:i==2&&![_mask[@"canReturn"]boolValue]?NSColor.grayColor:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.45)]}];}}
NSArray *titles=tracking?@[@"停止跟踪"]:[_mask[@"referenceDrawing"]boolValue]?@[]:@[@"向后跟踪",@"双向跟踪",@"向前跟踪"];
for(NSUInteger i=0;i<titles.count;i++){
NSRect cell=[self stampControlRect:i];DYDrawSoftControl(cell,4,NO,NO,NO);
[titles[i] drawInRect:NSInsetRect(cell,6,4) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.48)]}];
@@ -240,6 +256,8 @@
NSArray *source=_mask[@"stampSource"];
if(source.count==4){
BOOL tracking=[_mask[@"tracking"]boolValue];
if(!tracking)for(NSInteger i=0;i<3;i++)if(NSPointInRect(point,[self stampActionRect:i]))return 10018+i;
if(!tracking&&[_mask[@"referenceDrawing"]boolValue])return NSPointInRect(point,_imageRect)?DYCloneReferencePart:0;
NSInteger count=tracking?1:3;
for(NSInteger i=0;i<count;i++)if(NSPointInRect(point,[self stampControlRect:i]))return 10011+i;
NSPoint cross=[self canvasStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
@@ -262,6 +280,9 @@
if(type==NSEventTypeKeyDown&&key==27&&_viewerControls.stampArmed){
_viewerControls.stampArmed=NO;[self clearStampCreation];return YES;
}
if(type==NSEventTypeLeftMouseDown&&part>=10018&&part<=10020){
[plugin cloneStampCommand:@[@"reference",@"manual",@"return"][part-10018] mask:_mask[@"id"] atTime:time];return YES;
}
if(type==NSEventTypeLeftMouseDown&&part>=10011&&part<=10013){
NSInteger direction=[_mask[@"tracking"]boolValue]?9:part-10012;
[plugin trackCloneStamp:_mask[@"id"] direction:direction];return YES;
+5
查看文件
@@ -55,6 +55,11 @@ struct DYStampMotion {
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time);
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time);
NSArray *DYStampSamplingScaleAtTime(NSDictionary *stamp,CMTime time);
BOOL DYStampUsesLinkedTracking(NSDictionary *stamp);
DYMaskParameters DYStampReferenceAtTime(NSDictionary *stamp,CMTime time);
BOOL DYSetStampReference(NSMutableDictionary *stamp,NSRect rect,CMTime time);
BOOL DYAddStampManualKey(NSMutableDictionary *stamp,CMTime time);
CMTime DYTrackingRecordedTime(NSDictionary *mask,NSString *key);
NSDictionary *DYStampKey(CMTime time,DYMaskParameters parameters,BOOL manual,float confidence,DYStampMotion motion);
BOOL DYMergeTracking(NSMutableDictionary *mask,NSArray *samples,CMTime frameDuration=kCMTimeInvalid);
BOOL DYMosaicTracksMask(NSDictionary *document,NSString *maskID);
+50 -1
查看文件
@@ -98,10 +98,24 @@ BOOL DYValidToolMask(NSDictionary *mask){
}
id samplingScale=mask[@"stampSamplingScale"];
if(samplingScale&&(!source||!validStampValues(samplingScale,2,0,1./256,256)))return NO;
id mode=mask[@"stampTrackMode"],reference=mask[@"stampReference"];
if(mode&&(!source||![@[@"linked",@"independent"]containsObject:mode]))return NO;
if(reference){
if(!source||![reference isKindOfClass:NSArray.class]||[reference count]!=4)return NO;
for(NSUInteger i=0;i<4;i++)if(!finiteNumber(reference[i])||
(i<2?fabs([reference[i]doubleValue])>2048:[reference[i]doubleValue]<.001||[reference[i]doubleValue]>2048))return NO;
}
if(mask[@"status"]&&(![mask[@"status"]isKindOfClass:NSString.class]||[mask[@"status"]length]>2000))return NO;
if(mask[@"trackingStopped"]&&![@[@YES,@NO]containsObject:mask[@"trackingStopped"]])return NO;
for(NSString *field in @[@"trackingLastTime",@"trackingStopTime"]){
id value=mask[field];if(value&&(![value isKindOfClass:NSArray.class]||[value count]!=3))return NO;
if(value){for(id n in value)if(!finiteNumber(n))return NO;if(!CMTIME_IS_NUMERIC(DYTrackingRecordedTime(mask,field)))return NO;}
}
const float *n=(const float*)nodes.bytes;for(NSUInteger i=0;i<nodes.length/4;i++)if(!std::isfinite(n[i])||fabs(n[i])>1000)return NO;
NSArray *keys=mask[@"keys"];if(![keys isKindOfClass:NSArray.class]||keys.count>DYToolKeyLimit)return NO;CMTime last=kCMTimeInvalid;
for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO;
if(k[@"stampMotion"]&&(!source||!validStampValues(k[@"stampMotion"],6,2,1./16,16)))return NO;
if(k[@"stampManualSource"]&&(!source||!k[@"stampMotion"]||![k[@"manual"]boolValue]||![@[@YES,@NO]containsObject:k[@"stampManualSource"]]))return NO;
last=t;
}return YES;
}
@@ -236,6 +250,36 @@ static DYStampMotion stampMotionInSpan(DYMaskKeySpan span){
blend(a.targetScaleX,b.targetScaleX),blend(a.targetScaleY,b.targetScaleY),a.active||b.active};
}
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time){return stampMotionInSpan(maskKeySpan(stamp,time));}
BOOL DYStampUsesLinkedTracking(NSDictionary *stamp){return stamp[@"stampSource"]&&[stamp[@"stampTrackMode"]isEqual:@"linked"];}
CMTime DYTrackingRecordedTime(NSDictionary *mask,NSString *key){
NSArray *v=mask[key];if(![v isKindOfClass:NSArray.class]||v.count!=3)return kCMTimeInvalid;
for(id n in v)if(!finiteNumber(n))return kCMTimeInvalid;
double scale=[v[1]doubleValue];if(scale<1||scale>INT32_MAX||scale!=std::floor(scale))return kCMTimeInvalid;
return CMTimeMakeWithEpoch([v[0]longLongValue],(int32_t)scale,[v[2]longLongValue]);
}
DYMaskParameters DYStampReferenceAtTime(NSDictionary *stamp,CMTime time){
DYMaskParameters p=DYMaskAtTime(stamp,time);NSArray *ref=stamp[@"stampReference"];
if(ref.count==4){p.centerX+=[ref[0]floatValue]*p.width;p.centerY+=[ref[1]floatValue]*p.height;p.width*=[ref[2]floatValue];p.height*=[ref[3]floatValue];p.kind=DYMaskRectangle;}
p.feather=0;p.angle=0;return p;
}
BOOL DYSetStampReference(NSMutableDictionary *stamp,NSRect rect,CMTime time){
if(!stamp[@"stampSource"]||!CMTIME_IS_NUMERIC(time)||!std::isfinite(NSMidX(rect))||!std::isfinite(NSMidY(rect))||
!std::isfinite(NSWidth(rect))||!std::isfinite(NSHeight(rect))||NSWidth(rect)<.001||NSHeight(rect)<.001||
NSMinX(rect)<0||NSMinY(rect)<0||NSMaxX(rect)>1||NSMaxY(rect)>1)return NO;
DYMaskParameters p=DYMaskAtTime(stamp,time);
NSArray *ref=@[@((NSMidX(rect)-p.centerX)/p.width),@((NSMidY(rect)-p.centerY)/p.height),@(NSWidth(rect)/p.width),@(NSHeight(rect)/p.height)];
NSMutableDictionary *candidate=DYMutablePlist(stamp);candidate[@"stampReference"]=ref;
if(!DYValidToolMask(candidate))return NO;stamp[@"stampReference"]=ref;[stamp removeObjectForKey:@"status"];return YES;
}
BOOL DYAddStampManualKey(NSMutableDictionary *stamp,CMTime time){
if(!stamp[@"stampSource"]||!CMTIME_IS_NUMERIC(time))return NO;
DYMaskParameters p=DYMaskAtTime(stamp,time);DYStampMotion motion=DYStampMotionAtTime(stamp,time);motion.active=true;
NSMutableDictionary *candidate=DYMutablePlist(stamp);
NSMutableArray *keys=candidate[@"keys"];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){return CMTimeCompare(keyTime(key),time)!=0;}]];
if(!DYMergeTracking(candidate,@[DYStampKey(time,p,YES,1,motion)]))return NO;
[candidate removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
[stamp setDictionary:candidate];return YES;
}
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time){
NSArray *source=stamp[@"stampSource"];
DYStampMotion motion=DYStampMotionAtTime(stamp,time);
@@ -278,6 +322,7 @@ NSDictionary *DYStampKey(CMTime time,DYMaskParameters p,BOOL manual,float confid
NSMutableDictionary *paired=[[key mutableCopy]autorelease];
paired[@"stampMotion"]=@[@(motion.sourceOffsetX),@(motion.sourceOffsetY),@(motion.sourceScaleX),
@(motion.sourceScaleY),@(motion.targetScaleX),@(motion.targetScaleY)];
if(manual)paired[@"stampManualSource"]=@YES;
return paired;
}
// Analysis supplies a contiguous pass in either time direction. A symmetric
@@ -369,7 +414,11 @@ BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples,CMTime frameDuratio
if(key[@"stampMotion"]){
NSUInteger slot=index.unsignedIntegerValue;
NSMutableDictionary *authored=[[all[slot] mutableCopy]autorelease];
authored[@"stampMotion"]=key[@"stampMotion"];
if([authored[@"stampManualSource"]boolValue]&&![key[@"manual"]boolValue]){
NSMutableArray *motion=[[key[@"stampMotion"]mutableCopy]autorelease];
motion[0]=authored[@"stampMotion"][0];motion[1]=authored[@"stampMotion"][1];
authored[@"stampMotion"]=motion;
}else authored[@"stampMotion"]=key[@"stampMotion"];
all[slot]=authored;
}
}
@@ -216,6 +216,59 @@
run.record(@"host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame",
paired&&ended&&[saved[@"keys"] count]==3&&[sourceLoss.domain isEqual:FxPlugErrorDomain]&&
sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]);
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"document":DYReadTools(base,kCMTimeZero).document}];
int beforeReturn=host->_seekCount;
[plugin cloneStampCommand:@"return" mask:stampID atTime:timeAt(2)];drain();
run.record(@"clone-last-trusted-button-maps-input-time-to-host-timeline",host->_seekCount==beforeReturn+1&&CMTimeCompare(host->_time,timeAt(2))==0);
stamp[@"stampTrackMode"]=@"linked";DYWriteTools(base,stampDoc,kCMTimeZero);paired=requestStamp(0);
for(int i=0;i<6&&paired;i++){pairedFrame(i,true);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}finish();
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);motion=DYStampMotionAtTime(saved,timeAt(5));covered=DYMaskAtTime(saved,timeAt(5));sampled=DYStampSourceAtTime(saved,timeAt(5));
run.record(@"linked-clone-tracks-with-completely-flat-clean-source",paired&&[saved[@"keys"]count]==6&&fabs([sampled[0]doubleValue]-(covered.centerX-.5*motion.targetScaleX))<1e-5&&fabs(motion.sourceScaleX-motion.targetScaleX)<1e-6);
// A tiny flat repair ellipse follows a separate textured rectangle without
// increasing the pixels that the repair covers.
NSMutableDictionary *referenceDoc=DYMutablePlist(stampDoc),*referenceStamp=(id)DYSharedMaskWithID(referenceDoc,stampID);
DYMaskParameters tiny=target;tiny.centerX=.86;tiny.width=.02;tiny.height=.04;referenceStamp[@"parameters"]=[NSData dataWithBytes:&tiny length:sizeof(tiny)];
BOOL referenceOK=DYSetStampReference(referenceStamp,NSMakeRect(.6,.25,.2,.5),kCMTimeZero);
DYWriteTools(base,referenceDoc,kCMTimeZero);paired=requestStamp(0);
for(int i=0;i<6&&paired;i++){
pairedFrame(i,true);Pixels repairPixels=read(frame,gpu);float scale=1+i*.035f,cx=.75f+i*2.f/tw+(.86f-.75f)*scale,cy=.5f-i*.75f/th;
for(NSUInteger y=0;y<th;y++)for(NSUInteger x=0;x<tw;x++)if(fabs(float(x)/tw-cx)<.035*scale&&fabs(float(y)/th-cy)<.08*scale){auto index=(y*tw+x)*4;repairPixels[index]=repairPixels[index+1]=repairPixels[index+2]=.1;}
[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:repairPixels.data() bytesPerRow:tw*8];
paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];
}finish();saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);covered=DYMaskAtTime(saved,timeAt(5));
run.record(@"flat-small-repair-can-follow-separate-surface-reference",referenceOK&&paired&&[saved[@"keys"]count]==6&&fabs(covered.centerX-(.75+10./tw+(.86-.75)*1.175))<.008&&covered.width<.026&&covered.height<.052);
DYWriteTools(base,stampDoc,kCMTimeZero);host->_time=kCMTimeZero;host->_state=kFxAnalysisState_NotAnalyzing;int backwardBeforeLoss=host->_backwardStarts;
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@0}]];
paired=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:flat.data() bytesPerRow:tw*8];
BOOL failedSeed=![plugin analyzeFrame:frame atTime:kCMTimeZero error:nil];finish();saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"document":DYReadTools(base,kCMTimeZero).document}];
NSDictionary *canvas=[(id<DYToolCanvasHostProbe>)plugin toolCanvasMaskAtTime:kCMTimeZero];
run.record(@"clone-first-frame-failure-persists-canvas-reason-without-keys",paired&&failedSeed&&![saved[@"keys"]count]&&[saved[@"trackingStopped"]boolValue]&&[canvas[@"status"]containsString:@"纹理不足"]&&![canvas[@"tracking"]boolValue]&&[canvas[@"status"]containsString:@"手工关键帧"]);
run.record(@"clone-bidirectional-first-loss-is-not-labelled-forward-complete",host->_backwardStarts==backwardBeforeLoss&&[saved[@"status"]containsString:@"已停止"]);
[plugin cloneStampCommand:@"manual" mask:stampID atTime:kCMTimeZero];drain();saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
run.record(@"clone-manual-key-command-starts-after-zero-frame-failure",[saved[@"keys"]count]==1&&[saved[@"keys"][0][@"manual"]boolValue]&&!saved[@"trackingStopped"]);
host->_time=timeAt(5);id<DYToolCanvasHostProbe>canvasHost=(id)plugin;
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDown point:NSMakePoint(.25,.5) part:7 modifiers:0 key:0 time:timeAt(5)];
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDragged point:NSMakePoint(.3,.53) part:7 modifiers:0 key:0 time:timeAt(5)];
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseUp point:NSMakePoint(.3,.53) part:7 modifiers:0 key:0 time:timeAt(5)];drain();
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
run.record(@"clone-manual-source-drag-keys-current-frame-without-moving-earlier-source",[saved[@"keys"]count]==2&&fabs([DYStampSourceAtTime(saved,kCMTimeZero)[0]doubleValue]-.25)<1e-6&&fabs([DYStampSourceAtTime(saved,timeAt(5))[0]doubleValue]-.3)<1e-6&&fabs([saved[@"stampSource"][0]doubleValue]-.25)<1e-6);
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDown point:NSMakePoint(.75,.5) part:1 modifiers:0 key:0 time:timeAt(5)];
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDragged point:NSMakePoint(.8,.52) part:1 modifiers:0 key:0 time:timeAt(5)];
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseUp point:NSMakePoint(.8,.52) part:1 modifiers:0 key:0 time:timeAt(5)];drain();
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
run.record(@"clone-manual-target-correction-preserves-source-key-at-same-frame",[saved[@"keys"]count]==2&&fabs(DYMaskAtTime(saved,timeAt(5)).centerX-.8)<1e-6&&fabs([DYStampSourceAtTime(saved,timeAt(5))[0]doubleValue]-.3)<1e-6);
host->_time=kCMTimeZero;DYMaskParameters beforeReference=DYMaskAtTime(saved,kCMTimeZero);
[plugin cloneStampCommand:@"reference" mask:stampID atTime:kCMTimeZero];drain();
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDown point:NSMakePoint(.4,.2) part:8 modifiers:0 key:0 time:kCMTimeZero];
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDragged point:NSMakePoint(.7,.7) part:8 modifiers:0 key:0 time:kCMTimeZero];
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseUp point:NSMakePoint(.7,.7) part:8 modifiers:0 key:0 time:kCMTimeZero];drain();
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);DYMaskParameters afterReference=DYMaskAtTime(saved,kCMTimeZero),selectedReference=DYStampReferenceAtTime(saved,kCMTimeZero);
run.record(@"clone-reference-draw-gesture-preserves-repair-and-manual-keys",saved[@"stampReference"]&&[saved[@"keys"]count]==2&&beforeReference.centerX==afterReference.centerX&&beforeReference.width==afterReference.width&&fabs(selectedReference.centerX-.55)<1e-6&&fabs(selectedReference.height-.5)<1e-6);
}
{
NSMutableDictionary *objectDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document),*objectMask=(id)DYAddSharedMask(objectDoc,DYMaskRectangle);
@@ -27,6 +27,7 @@
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error;
- (BOOL)analyzeFrame:(FxImageTile*)frame atTime:(CMTime)time error:(NSError**)error;
- (BOOL)cleanupAnalysis:(NSError**)error;
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)time;
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error;
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error;
- (BOOL)captureTrackingTile:(FxImageTile*)tile gray:(dy::GrayFrame*)gray preview:(NSDictionary**)preview error:(NSError**)error;
@@ -49,4 +50,5 @@
- (void)scheduleToolCanvasRegistration;
- (void)adoptToolCanvasDocument:(NSDictionary*)document;
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time;
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time;
@end
+10 -9
查看文件
@@ -42,7 +42,7 @@
frame[@"sourceShape"]?@"取样与覆盖区域":@"蒙版轮廓"]:@"等待源帧";
[self setNeedsDisplay:YES];
}
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source {
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source reference:(BOOL)reference {
if(shape.length!=sizeof(DYMaskParameters))return;
DYMaskParameters p;[shape getBytes:&p length:sizeof(p)];
double aspect=rect.size.width/rect.size.height,c=cos(p.angle),s=sin(p.angle);
@@ -64,7 +64,7 @@
}
[path closePath];path.lineWidth=3.5;[NSColor.blackColor setStroke];[path stroke];
if(source){CGFloat dashes[]={4,3};[path setLineDash:dashes count:2 phase:0];}
[(source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
[(reference?NSColor.systemGreenColor:source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
}
- (void)drawRect:(NSRect)dirty {
[NSColor.blackColor setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));
@@ -81,8 +81,9 @@
}
[_image drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
if([_frame[@"flip"] boolValue])[NSGraphicsContext restoreGraphicsState];
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO];
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES];
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO reference:NO];
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES reference:NO];
if(_frame[@"referenceShape"]){[self drawShape:_frame[@"referenceShape"] nodes:nil inRect:picture source:YES reference:YES];}
[NSGraphicsContext restoreGraphicsState];
}
@end
@@ -140,7 +141,7 @@
self.identifier=@"DYTrackingPreview";
_title=[DYThemeLabel labelWithString:@"跟踪预览"];_title.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];
_detail=[DYThemeLabel labelWithString:@""];_detail.font=[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular];
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=2;_status.lineBreakMode=NSLineBreakByWordWrapping;
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=4;_status.lineBreakMode=NSLineBreakByWordWrapping;
_action=DYWorkspaceButton(@"停止跟踪",target,action);
_progress=[[[DYTrackingProgressBar alloc]init]autorelease];_progress.accessibilityLabel=@"跟踪进度";
_preview=[[[DYTrackingPreviewImage alloc]init]autorelease];[_preview showFrame:nil];
@@ -155,9 +156,9 @@
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
_progress.frame=NSMakeRect(8,28,body,10);
_status.frame=NSMakeRect(8,43,body,32);
_preview.frame=NSMakeRect(8,80,body,MAX(1,h-106));
_detail.frame=NSMakeRect(8,MAX(80,h-22),body,18);
_status.frame=NSMakeRect(8,43,body,64);
_preview.frame=NSMakeRect(8,112,body,MAX(1,h-138));
_detail.frame=NSMakeRect(8,MAX(112,h-22),body,18);
}
- (void)applyUpdate:(NSDictionary *)info {
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
@@ -167,7 +168,7 @@
BOOL stamp=info[@"sourceShape"]!=nil;
_title.stringValue=stamp?@"图章跟踪预览":@"蒙版跟踪预览";
[_preview showFrame:info];
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?@"青色取样 · 黄色覆盖":@"黄色轮廓"];
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?(info[@"referenceShape"]?@"青色取样 · 黄色覆盖 · 绿色参考":@"青色取样 · 黄色覆盖"):@"黄色轮廓"];
}
NSUInteger total=[info[@"total"] unsignedIntegerValue];
if(active)_progress.doubleValue=total?[info[@"completed"] doubleValue]/total:0;
@@ -0,0 +1,22 @@
#pragma once
#include "DYTracker.hpp"
namespace dy {
// Map a repair/sample centre through the motion of a separate reference on
// the same surface. Normalized X and Y have different pixel units.
inline TrackResult cloneRegionFollowing(const TrackResult& reference, TrackerROI seed,
float cx, float cy, float aspect) {
TrackResult result=reference;
if(!reference.valid||!std::isfinite(aspect)||aspect<=0){result.valid=false;return result;}
float x=(cx-seed.cx)*aspect*reference.scaleX;
float y=(cy-seed.cy)*reference.scaleY;
float c=std::cos(reference.rotation),s=std::sin(reference.rotation);
result.cx=reference.cx+(x*c-y*s)/aspect;
result.cy=reference.cy+x*s+y*c;
if(!std::isfinite(result.cx)||!std::isfinite(result.cy)||
result.cx<0||result.cx>1||result.cy<0||result.cy>1){
result.valid=false;result.failure=TrackFailure::OutsideFrame;
}
return result;
}
}