Implement adaptive inspector, mask clock repair, and selectable face mosaic; validation pending
这个提交包含在:
1 父节点
f05cf05451
当前提交
3b4c612edf
19 个文件已更改
+245
-103
没有与搜索条件相匹配的文件
@@ -89,6 +89,7 @@ NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParam
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
BOOL DYValidToolMask(NSDictionary *mask){
|
||||
if(![mask isKindOfClass:NSDictionary.class]||!validID(mask[@"id"])||!finiteNumber(mask[@"enabled"])||!finiteNumber(mask[@"combine"])||[mask[@"combine"]integerValue]<0||[mask[@"combine"]integerValue]>2)return NO;
|
||||
if(mask[@"label"]&&(![mask[@"label"]isKindOfClass:NSString.class]||[mask[@"label"]length]>100))return NO;
|
||||
DYMaskParameters p;if(!readParameters(mask[@"parameters"],&p))return NO;NSData *nodes=mask[@"nodes"];if(![nodes isKindOfClass:NSData.class]||nodes.length%sizeof(DYBezierNode)||nodes.length>32*sizeof(DYBezierNode))return NO;
|
||||
id source=mask[@"stampSource"];
|
||||
if(source){
|
||||
@@ -116,8 +117,10 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
if(mosaic){
|
||||
if(![mosaic isKindOfClass:NSDictionary.class]||!finiteNumber(mosaic[@"enabled"])||![@[@0,@1]containsObject:mosaic[@"enabled"]]||![@[@"face",@"mask"]containsObject:mosaic[@"source"]]||!finiteNumber(mosaic[@"size"])||[mosaic[@"size"]doubleValue]<4||[mosaic[@"size"]doubleValue]>128)return nil;
|
||||
if(mosaic[@"maskID"]&&!validID(mosaic[@"maskID"]))return nil;
|
||||
if(mosaic[@"maskIDs"]){id ids=mosaic[@"maskIDs"];if(![ids isKindOfClass:NSArray.class]||[ids count]>DYSharedMaskLimit)return nil;NSMutableSet *seen=[NSMutableSet set];for(id ID in ids){if(!validID(ID)||[seen containsObject:ID])return nil;[seen addObject:ID];}}
|
||||
}
|
||||
if(doc[@"mosaicRenderMask"]&&!DYValidToolMask(doc[@"mosaicRenderMask"]))return nil;
|
||||
if(doc[@"mosaicRenderMasks"]){if(![doc[@"mosaicRenderMasks"]isKindOfClass:NSArray.class]||[doc[@"mosaicRenderMasks"]count]>DYSharedMaskLimit)return nil;for(id m in doc[@"mosaicRenderMasks"])if(!DYValidToolMask(m))return nil;}
|
||||
if(starter&&![DYToolTypes() containsObject:starter]&&![starter isEqual:@"cst"])return nil;
|
||||
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
|
||||
id measured=doc[@"levelMeasureOnly"],reference=doc[@"levelReference"];
|
||||
@@ -370,8 +373,10 @@ NSDictionary *DYToolRenderSnapshot(NSDictionary *doc,CMTime t){
|
||||
return result;
|
||||
};
|
||||
NSMutableDictionary *out=[[doc mutableCopy]autorelease],*base=[NSMutableDictionary dictionary];
|
||||
NSString *mosaicID=doc[@"mosaic"][@"maskID"];
|
||||
for(NSDictionary *mask in shared)if(!mask[@"stampSource"]&&[mask[@"id"]isEqual:mosaicID])out[@"mosaicRenderMask"]=resolve(@[mask]).firstObject;
|
||||
NSArray *mosaicIDs=doc[@"mosaic"][@"maskIDs"]?: (doc[@"mosaic"][@"maskID"]?@[doc[@"mosaic"][@"maskID"]]:@[]);
|
||||
NSMutableArray *mosaicMasks=[NSMutableArray array];for(NSDictionary *mask in shared)if(!mask[@"stampSource"]&&[mosaicIDs containsObject:mask[@"id"]])[mosaicMasks addObject:mask];
|
||||
out[@"mosaicRenderMasks"]=resolve(mosaicMasks);[out removeObjectForKey:@"mosaicRenderMask"];
|
||||
if(CMTIME_IS_NUMERIC(t))out[@"renderTime"]=[(NSDictionary*)CMTimeCopyAsDictionary(t,kCFAllocatorDefault)autorelease];
|
||||
for(NSString *type in doc[@"baseMasks"])base[type]=resolve(doc[@"baseMasks"][type]);out[@"baseMasks"]=base;
|
||||
NSMutableArray *layers=[NSMutableArray array];
|
||||
for(NSDictionary *node in doc[@"layers"]){NSMutableDictionary *layer=[[node mutableCopy]autorelease];layer[@"masks"]=resolve(node[@"masks"]);[layers addObject:layer];}
|
||||
|
||||
在新工单中引用
屏蔽一个用户