Cache module-removal descriptor ownership and verify hidden shared skin shortcut
这个提交包含在:
1 父节点
72a0269fe7
当前提交
c18a0890ed
2 个文件已更改
+14
-4
没有与搜索条件相匹配的文件
+11
-3
@@ -7,14 +7,22 @@
|
||||
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){
|
||||
static NSArray<NSDictionary *> *DYBuildBaseToolDescriptors(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"]&&[key isEqual:@"copyAutoGrade"])||([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;
|
||||
}return [[result copy]autorelease];
|
||||
}
|
||||
static NSDictionary *DYToolRemovalCatalog(){
|
||||
static NSDictionary *catalog;static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSMutableDictionary *values=[NSMutableDictionary dictionary],*switches=[NSMutableDictionary dictionary];
|
||||
for(NSString *type in DYToolTypes()){NSArray *owned=DYBuildBaseToolDescriptors(type);values[type]=owned;NSMutableArray *offsets=[NSMutableArray array];for(NSString *part in DYBaseToolParts(type))for(NSDictionary *d in owned)if([d[@"pid"]isEqual:DYToolSection(part)[@"enabled"]])[offsets addObject:d[@"offset"]];switches[type]=[[offsets copy]autorelease];}
|
||||
catalog=[@{@"values":values,@"switches":switches}copy];
|
||||
});return catalog;
|
||||
}
|
||||
NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){return DYToolRemovalCatalog()[@"values"][type]?:@[];}
|
||||
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;
|
||||
@@ -24,7 +32,7 @@ BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){
|
||||
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;
|
||||
for(NSNumber *offset in DYToolRemovalCatalog()[@"switches"][type])*(float*)((uint8_t*)u+offset.unsignedIntegerValue)=0;
|
||||
if([type isEqual:@"primary"]){u->primarySectionEnabled=0;u->inputProfile=0;u->preLUTStrength=0;}
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户