Implement adaptive inspector, mask clock repair, and selectable face mosaic; validation pending

这个提交包含在:
mac 于 2026-11-06 15:56:42 +08:00 提交
1 父节点 f05cf05451
当前提交 3b4c612edf
19 个文件已更改
+245 -103

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

@@ -106,34 +106,68 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
if(![DYToolTypes()containsObject:type])return;
dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerToolRequested" object:manager userInfo:@{@"type":type}];});
}
- (void)mosaicMessage:(NSString*)message {
NSAlert *alert=[[[NSAlert alloc]init]autorelease];alert.messageText=@"局部马赛克";alert.informativeText=message;[alert runModal];
}
- (void)applyMosaicMenu:(NSMenuItem*)item {
id manager=nil;@synchronized(self){if(!_invalidated)manager=_apiManager;}if(!manager)return;
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];
NSDictionary *command=item.representedObject;BOOL imported=NO,changed=NO;NSString *selected=nil,*failure=nil;
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];
@try{
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(manager,a.currentTime).document);
NSMutableDictionary *settings=[NSMutableDictionary dictionaryWithDictionary:doc[@"mosaic"]?:@{@"enabled":@NO,@"source":@"face",@"size":@32}];
[settings addEntriesFromDictionary:item.representedObject];
if([settings[@"source"]isEqual:@"mask"]&&!DYSharedMaskWithID(doc,settings[@"maskID"]))return;
if(command[@"importFaces"]){
NSDictionary *snapshot=command[@"importFaces"];
CMTime menuTime=CMTimeMakeFromDictionary((CFDictionaryRef)command[@"actionTime"]);
CMTime frameTime=CMTimeMakeFromDictionary((CFDictionaryRef)snapshot[@"time"]);
CMTime current=DYHostDisplayedFrameTime(manager,a.currentTime);
if(!CMTIME_IS_NUMERIC(frameTime)||CMTimeCompare(menuTime,current)!=0||CMTimeCompare(frameTime,current)!=0){failure=@"播放头或识别画面已变化,请暂停画面后重新打开菜单。";return;}
NSArray *boxes=snapshot[@"boxes"];if(!boxes.count){failure=@"本帧未识别到人脸,可用矩形或钢笔手动画出区域。";return;}
if(DYSharedMasks(doc).count+boxes.count>DYSharedMaskLimit){failure=@"共享蒙版数量不足,请删除不需要的蒙版后重试。";return;}
NSMutableArray *IDs=[NSMutableArray array];NSUInteger index=0;
for(NSArray *box in boxes){NSMutableDictionary *mask=(id)DYAddSharedMask(doc,DYMaskRectangle);if(!mask){failure=@"未能创建人脸蒙版,原设置已保留。";return;}
DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);p.centerX=[box[0]floatValue];p.centerY=[box[1]floatValue];p.width=[box[2]floatValue];p.height=[box[3]floatValue];p.feather=0;
mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
mask[@"label"]=[NSString stringWithFormat:@"人脸 %lu · 横向 %.0f%%",(unsigned long)++index,p.centerX*100];
[IDs addObject:mask[@"id"]];
}
settings[@"maskIDs"]=IDs;settings[@"source"]=@"mask";settings[@"enabled"]=@YES;[settings removeObjectForKey:@"maskID"];selected=IDs.firstObject;imported=YES;
}else if(command[@"toggleMask"]){
NSString *ID=command[@"toggleMask"];if(!DYSharedMaskWithID(doc,ID)){failure=@"这个蒙版已被删除,请重新选择。";return;}
NSMutableArray *IDs=[NSMutableArray arrayWithArray:[settings[@"source"]isEqual:@"mask"]?(settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[])):@[]];
if([IDs containsObject:ID])[IDs removeObject:ID];else{[IDs addObject:ID];selected=ID;}
settings[@"source"]=@"mask";settings[@"maskIDs"]=IDs;settings[@"enabled"]=@(IDs.count>0);[settings removeObjectForKey:@"maskID"];
}else [settings addEntriesFromDictionary:command];
doc[@"mosaic"]=settings;id<FxUndoAPI>undo=[manager apiForProtocol:@protocol(FxUndoAPI)];
if([undo startUndoGroup:@"局部马赛克"]){DYWriteTools(manager,doc,a.currentTime);[undo endUndoGroup];}
}@finally{[a endAction:self];}
[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:manager];
if([undo startUndoGroup:imported?@"创建可选人脸马赛克蒙版":@"局部马赛克"]){@try{changed=DYWriteTools(manager,doc,a.currentTime);}@finally{[undo endUndoGroup];}}
if(!changed){failure=@"宿主未保存本次马赛克设置,请重试。";return;}
if(selected)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:manager userInfo:@{@"node":@"shared",@"mask":selected,@"document":doc}];
}@finally{[a endAction:self];if(failure)[self mosaicMessage:failure];}
if(changed){[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:manager];}
if(imported)[self requestWorkspacePage:@"masks"];
}
- (void)mosaicMenuRequested:(NSNotification*)note {[self requestMosaicMenuFromView:note.userInfo[@"anchor"]];}
- (void)requestMosaicMenu {[self requestMosaicMenuFromView:nil];}
- (void)requestMosaicMenuFromView:(NSView*)anchor {
dispatch_async(dispatch_get_main_queue(),^{
id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(!manager)return;
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];NSDictionary *doc=nil;
@try{doc=[DYReadTools(manager,a.currentTime).document retain];}@finally{[a endAction:self];}
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];NSDictionary *doc=nil;CMTime actionTime=kCMTimeInvalid;
@try{doc=[DYReadTools(manager,a.currentTime).document retain];actionTime=DYHostDisplayedFrameTime(manager,a.currentTime);}@finally{[a endAction:self];}
NSMenu *menu=[[[NSMenu alloc]initWithTitle:@"局部马赛克"]autorelease];NSDictionary *settings=doc[@"mosaic"];
auto add=[&](NSString *title,NSDictionary *value,BOOL checked){NSMenuItem *item=[menu addItemWithTitle:title action:@selector(applyMosaicMenu:) keyEquivalent:@""];item.target=self;item.representedObject=value;item.state=checked?NSControlStateValueOn:NSControlStateValueOff;};
add(@"应用到人脸(逐帧识别)",@{@"source":@"face",@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"face"]);
NSInteger count=0;
for(NSDictionary *mask in DYSharedMasks(doc)){if(mask[@"stampSource"])continue;count++;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);NSString *shape=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];
add([NSString stringWithFormat:@"应用到蒙版 %ld · %@%@",(long)count,shape,[mask[@"keys"]count]?@" · 已跟踪":@""],@{@"source":@"mask",@"maskID":mask[@"id"],@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"mask"]&&[settings[@"maskID"]isEqual:mask[@"id"]]);
add(@"全部人脸 · 快速逐帧识别",@{@"source":@"face",@"enabled":@YES},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"face"]);
NSDictionary *faces=[self->_renderer mosaicFaceSnapshot];
CMTime faceTime=faces[@"time"]?CMTimeMakeFromDictionary((CFDictionaryRef)faces[@"time"]):kCMTimeInvalid;
BOOL current=CMTIME_IS_NUMERIC(actionTime)&&CMTIME_IS_NUMERIC(faceTime)&&CMTimeCompare(faceTime,actionTime)==0&&[settings[@"source"]isEqual:@"face"]&&[settings[@"enabled"]boolValue];
if(current&&[faces[@"boxes"]count])add([NSString stringWithFormat:@"将本帧 %lu 张人脸转为可选跟踪蒙版",(unsigned long)[faces[@"boxes"]count]],@{@"importFaces":faces,@"actionTime":[(NSDictionary*)CMTimeCopyAsDictionary(actionTime,kCFAllocatorDefault)autorelease]},NO);
else {NSMenuItem *hint=[menu addItemWithTitle:current?@"本帧未识别到人脸":@"先开启全部人脸,暂停后再次打开以指定人脸" action:nil keyEquivalent:@""];hint.enabled=NO;}
[menu addItem:NSMenuItem.separatorItem];
NSMenuItem *hint=[menu addItemWithTitle:@"勾选要遮挡的蒙版(可多选);在控制面板逐个跟踪" action:nil keyEquivalent:@""];hint.enabled=NO;
NSArray *IDs=settings[@"maskIDs"]?: (settings[@"maskID"]?@[settings[@"maskID"]]:@[]);NSInteger count=0;
for(NSDictionary *mask in DYSharedMasks(doc)){if(mask[@"stampSource"])continue;count++;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);NSString *shape=mask[@"label"]?:[NSString stringWithFormat:@"蒙版 %ld · %@",(long)count,@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]];
add([shape stringByAppendingString:[mask[@"keys"]count]?@" · 已跟踪":@" · 静态"],@{@"toggleMask":mask[@"id"]},[settings[@"enabled"]boolValue]&&[settings[@"source"]isEqual:@"mask"]&&[IDs containsObject:mask[@"id"]]);
}
if(!count){NSMenuItem *hint=[menu addItemWithTitle:@"先用矩形、椭圆或钢笔绘制蒙版" action:nil keyEquivalent:@""];hint.enabled=NO;}
if(!count){NSMenuItem *empty=[menu addItemWithTitle:@"也可用矩形、椭圆或钢笔绘制蒙版" action:nil keyEquivalent:@""];empty.enabled=NO;}
[menu addItem:NSMenuItem.separatorItem];
for(NSNumber *size in @[@8,@16,@32,@64,@96,@128])add([NSString stringWithFormat:@"方块大小:%@",size],@{@"size":size},[settings[@"size"]isEqual:size]);
[menu addItem:NSMenuItem.separatorItem];add(@"关闭局部马赛克",@{@"enabled":@NO},![settings[@"enabled"]boolValue]);