WIP: implement module artwork, adaptive inspector, ordered CMS and local mosaic; host validation pending
这个提交包含在:
1 父节点
3452f2344f
当前提交
4b73db8a17
57 个文件已更改
+631
-38
没有与搜索条件相匹配的文件
@@ -20,6 +20,7 @@
|
||||
// Call before the owning plug-in releases this object during teardown.
|
||||
- (void)invalidate;
|
||||
- (void)requestWorkspace;
|
||||
- (void)requestMosaicMenu;
|
||||
- (void)requestWorkspacePage:(NSString *)page;
|
||||
- (void)requestMask:(NSInteger)kind;
|
||||
- (void)requestTool:(NSString*)type;
|
||||
@@ -104,6 +105,38 @@ 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)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];
|
||||
@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;
|
||||
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];
|
||||
}
|
||||
- (void)requestMosaicMenu {
|
||||
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];}
|
||||
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"]]);
|
||||
}
|
||||
if(!count){NSMenuItem *hint=[menu addItemWithTitle:@"先用矩形、椭圆或钢笔绘制蒙版" action:nil keyEquivalent:@""];hint.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]);
|
||||
[doc release];[menu popUpMenuPositioningItem:nil atLocation:NSEvent.mouseLocation inView:nil];
|
||||
});
|
||||
}
|
||||
- (void)requestWorkspace{
|
||||
[self requestWorkspacePage:@"tools"];
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户