Add on-header deletion with parameter reset and persistent removal of native modules (WIP 1.7.4)
这个提交包含在:
1 父节点
4d2a71d9e2
当前提交
48b3e2d033
7 个文件已更改
+107
-20
没有与搜索条件相匹配的文件
@@ -6,6 +6,47 @@
|
||||
|
||||
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film"];}
|
||||
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
|
||||
static NSArray *DYBaseToolParts(NSString *type){return [type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];}
|
||||
NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){
|
||||
if(![DYToolTypes()containsObject:type])return @[];NSMutableSet *pids=[NSMutableSet set];
|
||||
for(NSString *part in DYBaseToolParts(type)){NSDictionary *section=DYToolSection(part);if(section[@"enabled"])[pids addObject:section[@"enabled"]];for(NSDictionary *row in section[@"rows"]){if(row[@"pid"])[pids addObject:row[@"pid"]];if(row[@"enabled"])[pids addObject:row[@"enabled"]];}}
|
||||
NSMutableArray *result=[NSMutableArray array];for(NSDictionary *d in DYDescriptors()){
|
||||
NSString *key=d[@"key"];BOOL extra=([type isEqual:@"primary"]&&([key hasPrefix:@"cm"]||[@[@"primaryMasterEnabled",@"inputProfile",@"preLUTStrength"]containsObject:key]))||([type isEqual:@"base"]&&[@[@"skinEnabled",@"copyAutoGrade"]containsObject:key])||([type isEqual:@"look"]&&([key hasPrefix:@"look"]||[key isEqual:@"postLUTStrength"]))||([type isEqual:@"film"]&&[key hasPrefix:@"film"]);
|
||||
if(extra||[pids containsObject:d[@"pid"]])[result addObject:d];
|
||||
}return result;
|
||||
}
|
||||
BOOL DYBaseToolRemoved(NSDictionary *doc,NSString *type){return [doc[@"removedBase"]containsObject:type];}
|
||||
BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){
|
||||
if(!DYValidToolDocument(doc)||![DYToolTypes()containsObject:type])return NO;
|
||||
NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];}
|
||||
if(types.count)doc[@"removedBase"]=types;else[doc removeObjectForKey:@"removedBase"];return YES;
|
||||
}
|
||||
void DYApplyRemovedBaseTools(DYUniforms *u,NSDictionary *doc){
|
||||
for(NSString *type in doc[@"removedBase"]){
|
||||
for(NSDictionary *d in DYBaseToolDescriptors(type))if([d[@"offset"]integerValue]>=0)*(float*)((uint8_t*)u+[d[@"offset"]unsignedIntegerValue])=[d[@"default"]floatValue];
|
||||
for(NSString *part in DYBaseToolParts(type))for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(part)[@"enabled"]])*(float*)((uint8_t*)u+[d[@"offset"]unsignedIntegerValue])=0;
|
||||
if([type isEqual:@"primary"]){u->primarySectionEnabled=0;u->inputProfile=0;u->preLUTStrength=0;}
|
||||
if([type isEqual:@"base"])u->skinProtection.x=0;
|
||||
}
|
||||
}
|
||||
NSDictionary *DYVisibleBaseToolPaths(NSDictionary *paths,NSDictionary *doc){
|
||||
if(!DYBaseToolRemoved(doc,@"primary")&&!DYBaseToolRemoved(doc,@"look"))return paths;
|
||||
NSMutableDictionary *result=[[paths mutableCopy]autorelease]?:[NSMutableDictionary dictionary];if(DYBaseToolRemoved(doc,@"primary"))[result removeObjectForKey:@"input"];
|
||||
if(DYBaseToolRemoved(doc,@"look"))for(NSInteger i=0;i<5;i++)[result removeObjectForKey:[NSString stringWithFormat:@"look%ld",(long)i]];return result;
|
||||
}
|
||||
BOOL DYResetToolParameters(id<PROAPIAccessing> host,NSArray<NSDictionary *> *rows,CMTime time,NSError **error){
|
||||
id<FxKeyframeAPI_v3> animation=[host apiForProtocol:@protocol(FxKeyframeAPI_v3)];NSMutableArray *channels=[NSMutableArray array];
|
||||
// Query every affected channel before making the first edit. Deleted base
|
||||
// tools also stay excluded by document state if a host lacks this API.
|
||||
if(animation)for(NSDictionary *d in rows)if(![d[@"notAnimatable"]boolValue]){
|
||||
NSUInteger count=0;NSError *failure=[animation channelCount:&count forParameter:[d[@"pid"]unsignedIntegerValue]];if(failure){if(error)*error=failure;return NO;}
|
||||
for(NSUInteger channel=0;channel<count;channel++){NSUInteger keys=0;failure=[animation keyframeCount:&keys forParameter:[d[@"pid"]unsignedIntegerValue] andChannel:channel];if(failure){if(error)*error=failure;return NO;}if(keys)[channels addObject:@[d[@"pid"],@(channel)]];}
|
||||
}
|
||||
for(NSArray *channel in channels){NSError *failure=[animation removeAllKeyframesForParameter:[channel[0]unsignedIntegerValue] andChannel:[channel[1]unsignedIntegerValue]];if(failure){if(error)*error=failure;return NO;}}
|
||||
id<FxParameterSettingAPI_v6> set=[host apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
for(NSDictionary *d in rows)if(![set setFloatValue:[d[@"default"]doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:time]){if(error)*error=[NSError errorWithDomain:@"com.dayu.color.ToolReset" code:1 userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"未能还原“%@”,模块已保留。",d[@"title"]?:d[@"key"]]}];return NO;}
|
||||
return YES;
|
||||
}
|
||||
NSMutableDictionary *DYMutablePlist(NSDictionary *value){if(!value)return [NSMutableDictionary dictionary];NSData *data=[NSPropertyListSerialization dataWithPropertyList:value format:NSPropertyListBinaryFormat_v1_0 options:0 error:nil];return [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListMutableContainersAndLeaves format:NULL error:nil];}
|
||||
static NSDictionary *DYEmptyTools(){return @{@"schema":@1,@"layers":@[],@"baseMasks":@{}};}
|
||||
static BOOL finiteNumber(id v){return [v isKindOfClass:NSNumber.class]&&std::isfinite([v doubleValue]);}
|
||||
@@ -26,6 +67,7 @@ static BOOL validMasks(id masks,NSMutableSet *ids){if(![masks isKindOfClass:NSAr
|
||||
BOOL DYValidToolDocument(NSDictionary *doc){
|
||||
if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return NO;
|
||||
if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return NO;
|
||||
id removed=doc[@"removedBase"];if(removed){if(![removed isKindOfClass:NSArray.class]||[removed count]>DYToolTypes().count)return NO;NSMutableSet *unique=[NSMutableSet set];for(id type in removed){if(![type isKindOfClass:NSString.class]||![DYToolTypes()containsObject:type]||[unique containsObject:type]||[doc[@"baseMasks"][type]count])return NO;[unique addObject:type];}}
|
||||
NSMutableSet *ids=[NSMutableSet set];for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids))return NO;}
|
||||
NSMutableDictionary *descriptors=[NSMutableDictionary dictionary];for(NSDictionary *d in DYDescriptors())descriptors[d[@"key"]]=d;
|
||||
for(NSDictionary *node in doc[@"layers"]){if(![node isKindOfClass:NSDictionary.class]||!validID(node[@"id"])||[ids containsObject:node[@"id"]]||![DYToolTypes()containsObject:node[@"type"]]||![node[@"values"]isKindOfClass:NSDictionary.class]||[node[@"values"]count]>descriptors.count||![node[@"paths"]isKindOfClass:NSDictionary.class]||[node[@"paths"]count]>6||!validMasks(node[@"masks"],ids))return NO;[ids addObject:node[@"id"]];
|
||||
|
||||
在新工单中引用
屏蔽一个用户