WIP: reconstruct color kernels, camera tables and native inspector; integration checks pending
这个提交包含在:
1 父节点
10987dd6bc
当前提交
2f11e8bd0f
52 个文件已更改
+11421
-835
没有与搜索条件相匹配的文件
@@ -0,0 +1,82 @@
|
||||
#import "DYModel.h"
|
||||
#include <cmath>
|
||||
NSString *const DYModelChanged=@"DYModelChanged";
|
||||
static NSMutableArray *sections,*descriptors;
|
||||
static UInt32 PID(NSUInteger offset){return 2000+(UInt32)offset/4;}
|
||||
static NSDictionary *row(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double d,NSString*kind){
|
||||
NSMutableDictionary*r=[@{@"key":k,@"title":t,@"pid":@(PID(o)),@"offset":@(o),@"min":@(lo),@"max":@(hi),@"default":@(d),@"step":@(hi-lo>10?1:.01),@"kind":kind?:@"float"}mutableCopy];
|
||||
[descriptors addObject:r];return [r autorelease];
|
||||
}
|
||||
static void section(NSString*k,NSString*t,NSUInteger offset,NSArray*rows,double def=1){
|
||||
NSDictionary*e=row([k stringByAppendingString:@"Enabled"],t,offset,0,1,def,@"bool");
|
||||
[sections addObject:@{@"key":k,@"title":t,@"enabled":e[@"pid"],@"rows":rows}];
|
||||
}
|
||||
static NSDictionary *scalar(NSString*k,NSString*t,NSUInteger o,double lo=-100,double hi=100,double def=0){return row(k,t,o,lo,hi,def,@"float");}
|
||||
static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
|
||||
sections=[[NSMutableArray alloc]init];descriptors=[[NSMutableArray alloc]init];
|
||||
NSMutableDictionary*profile=[[scalar(@"inputProfile",@"相机输入",52,0,17)mutableCopy]autorelease];profile[@"kind"]=@"popup";profile[@"options"]=@[@"无",@"Apple Log",@"ARRI LogC3",@"ARRI LogC4",@"Blackmagic Film Gen5",@"Canon C-Log",@"Canon C-Log2",@"Canon C-Log3",@"DJI D-Log",@"DJI D-Log M",@"Fujifilm F-Log",@"Fujifilm F-Log2",@"Nikon N-Log",@"Panasonic V-Log",@"RED Log3G10",@"Sony S-Log2",@"Sony S-Log3",@"Sony HLG"];
|
||||
[descriptors replaceObjectAtIndex:0 withObject:profile];
|
||||
section(@"input",@"输入 / LUT",132,@[profile,scalar(@"preLUTStrength",@"输入强度",56,0,1,1)]);
|
||||
NSMutableArray*base=[NSMutableArray array];
|
||||
NSArray*names=@[@"曝光",@"对比度",@"高光",@"阴影",@"白色色阶",@"黑色色阶",@"色温",@"色调",@"饱和度",@"鲜艳度",@"纹理",@"清晰度",@"去朦胧"];
|
||||
NSArray*keys=@[@"exposure",@"contrast",@"highlights",@"shadows",@"whites",@"blacks",@"temperature",@"tint",@"saturation",@"vibrance",@"texture",@"clarity",@"dehaze"];
|
||||
for(NSUInteger i=0;i<keys.count;i++){
|
||||
NSMutableDictionary*r=[[scalar(keys[i],names[i],i*4,i==0?-5:-100,i==0?5:100)mutableCopy]autorelease];
|
||||
NSDictionary*e=row([keys[i]stringByAppendingString:@"Enabled"],[names[i]stringByAppendingString:@" 启用"],80+i*4,0,1,1,@"bool");r[@"enabled"]=e[@"pid"];
|
||||
[descriptors replaceObjectAtIndex:[descriptors indexOfObjectPassingTest:^BOOL(id obj,NSUInteger idx,BOOL*stop){return [obj[@"key"]isEqual:keys[i]];}] withObject:r];[base addObject:r];
|
||||
}
|
||||
section(@"base",@"基础调色",136,[base subarrayWithRange:NSMakeRange(0,8)]);
|
||||
section(@"color",@"颜色",140,@[base[9],base[8],base[10],base[11],base[12],row(@"skinProtection",@"肤色保护",464,0,1,0,@"bool"),scalar(@"skinHueRange",@"肤色色相范围",468,5,100,40),scalar(@"skinChromaRange",@"肤色饱和度范围",472,5,100,40)]);
|
||||
NSMutableArray*look=[NSMutableArray arrayWithObject:scalar(@"postLUTStrength",@"风格 1 强度",60,0,1,1)];
|
||||
for(int i=0;i<4;i++){[look addObject:row([NSString stringWithFormat:@"look%dEnabled",i+2],[NSString stringWithFormat:@"风格 %d 启用",i+2],160+i*4,0,1,1,@"bool")];[look addObject:scalar([NSString stringWithFormat:@"look%dStrength",i+2],[NSString stringWithFormat:@"风格 %d 强度",i+2],64+i*4,0,1,1)];}
|
||||
section(@"look",@"风格 LUT",144,look);
|
||||
NSMutableArray*curves=[NSMutableArray array];
|
||||
NSArray*cn=@[@"主曲线 阴影",@"主曲线 暗部",@"主曲线 亮部",@"主曲线 高光",@"红曲线 阴影",@"红曲线 高光",@"绿曲线 阴影",@"绿曲线 高光",@"蓝曲线 阴影",@"蓝曲线 高光"];
|
||||
for(int i=0;i<10;i++)[curves addObject:scalar([NSString stringWithFormat:@"curveY%d",i],cn[i],184+i*4)];
|
||||
for(int i=0;i<4;i++)[curves addObject:scalar([NSString stringWithFormat:@"masterX%d",i],[NSString stringWithFormat:@"主曲线 点%d X",i+1],224+i*4,-1,1,-1)];
|
||||
for(int c=0;c<3;c++)for(int i=0;i<2;i++)[curves addObject:scalar([NSString stringWithFormat:@"channel%dX%d",c,i],[NSString stringWithFormat:@"%@曲线 点%d X",@[@"红",@"绿",@"蓝"][c],i+1],240+c*8+i*4,-1,1,-1)];
|
||||
for(int c=0;c<4;c++)for(int i=0;i<4;i++){NSUInteger off=816+c*32;[curves addObject:scalar([NSString stringWithFormat:@"curve%dExtra%d",c,i],[NSString stringWithFormat:@"%@ 扩展点%d 偏移",@[@"主",@"红",@"绿",@"蓝"][c],i+1],off+i*4)];[curves addObject:scalar([NSString stringWithFormat:@"curve%dExtraX%d",c,i],[NSString stringWithFormat:@"%@ 扩展点%d X",@[@"主",@"红",@"绿",@"蓝"][c],i+1],off+16+i*4,-1,1,-1)];}
|
||||
section(@"curve",@"曲线",176,curves);
|
||||
NSMutableArray*hsl=[NSMutableArray array];NSArray*colors=@[@"红",@"橙",@"黄",@"绿",@"青",@"蓝",@"紫",@"洋红"];
|
||||
for(int a=0;a<3;a++)for(int c=0;c<8;c++)[hsl addObject:scalar([NSString stringWithFormat:@"hsl%d_%d",a,c],[NSString stringWithFormat:@"%@ %@",colors[c],@[@"色相",@"饱和度",@"明亮度"][a]],272+a*32+c*4)];
|
||||
for(int i=0;i<3;i++){[hsl addObject:scalar([NSString stringWithFormat:@"sample%d",i],[NSString stringWithFormat:@"自定义色 %@",@[@"R",@"G",@"B"][i]],368+i*4,0,1,i==0?1:i==1?.1:.58)];[hsl addObject:scalar([NSString stringWithFormat:@"custom%d",i],[NSString stringWithFormat:@"自定义 %@",@[@"色相",@"饱和度",@"明亮度"][i]],384+i*4)];[hsl addObject:scalar([NSString stringWithFormat:@"range%d",i],[NSString stringWithFormat:@"自定义 %@范围",@[@"色相",@"饱和度",@"明亮度"][i]],560+i*4,5,i==0?180:100,i==0?30:40)];}
|
||||
[hsl addObject:row(@"hslVisualize",@"显示自定义色选区",576,0,1,0,@"bool")];section(@"hsl",@"HSL 混色",180,hsl);
|
||||
NSMutableArray*grade=[NSMutableArray array];
|
||||
for(int c=0;c<4;c++){NSString*n=@[@"阴影",@"中间调",@"高光",@"全局"][c];int pair=c==0?424:c==1?416:c==2?432:592;int lum=c==0?452:c==1?448:c==2?456:600;
|
||||
for(int a=0;a<3;a++)[grade addObject:scalar([NSString stringWithFormat:@"grade%d_%d",c,a],[NSString stringWithFormat:@"%@ %@",n,@[@"色相",@"饱和度",@"明亮度"][a]],a==2?lum:pair+a*4,a==2?-100:0,a==0?360:100)];}
|
||||
[grade addObject:scalar(@"gradingBlending",@"混合",404,0,100,50)];[grade addObject:scalar(@"gradingBalance",@"平衡",408)];section(@"grading",@"颜色分级",400,grade);
|
||||
NSMutableArray*prim=[NSMutableArray array];for(int c=0;c<3;c++)for(int a=0;a<2;a++)[prim addObject:scalar([NSString stringWithFormat:@"primary%d_%d",c,a],[NSString stringWithFormat:@"%@原色 %@",@[@"红",@"绿",@"蓝"][c],a?@"饱和度":@"色相"],484+c*8+a*4)];section(@"primaries",@"三原色",480,prim);
|
||||
NSMutableArray*levels=[NSMutableArray array];for(int c=0;c<4;c++)for(int a=0;a<5;a++)[levels addObject:scalar([NSString stringWithFormat:@"level%d_%d",c,a],[NSString stringWithFormat:@"%@ %@",@[@"RGB",@"红",@"绿",@"蓝"][c],@[@"输入黑",@"伽马",@"输入白",@"输出黑",@"输出白"][a]],624+a*16+c*4,a==1?.1:0,a==1?10:255,a==1?1:(a==2||a==4)?255:0)];section(@"levels",@"色阶",608,levels);
|
||||
NSMutableArray*bw=[NSMutableArray array];for(int c=0;c<6;c++)[bw addObject:scalar([NSString stringWithFormat:@"bw%d",c],[NSString stringWithFormat:@"黑白 %@",@[@"红",@"黄",@"绿",@"青",@"蓝",@"洋红"][c]],c<4?720+c*4:736+(c-4)*4,0,200,100)];[bw addObject:scalar(@"bwHue",@"着色色相",744,0,360)];[bw addObject:scalar(@"bwSat",@"着色饱和度",748,0,100)];section(@"blackwhite",@"黑白混色",704,bw,0);
|
||||
NSMutableArray*balance=[NSMutableArray arrayWithObject:row(@"preserveLuma",@"保持明度",756,0,1,1,@"bool")];for(int c=0;c<3;c++)for(int a=0;a<3;a++)[balance addObject:scalar([NSString stringWithFormat:@"balance%d_%d",c,a],[NSString stringWithFormat:@"%@ %@",@[@"阴影",@"中间调",@"高光"][c],@[@"青 ↔ 红",@"洋红 ↔ 绿",@"黄 ↔ 蓝"][a]],768+c*16+a*4)];section(@"balance",@"色彩平衡",752,balance);
|
||||
});}
|
||||
NSArray *DYSections(){initialize();return sections;} NSArray *DYDescriptors(){initialize();return descriptors;}
|
||||
void DYDefaultUniforms(DYUniforms*u){memset(u,0,sizeof(*u));for(NSDictionary*r in DYDescriptors())*(float*)((uint8_t*)u+[r[@"offset"]unsignedIntegerValue])=[r[@"default"]floatValue];u->primariesM0=(DYFloat3){1,0,0};u->primariesM1=(DYFloat3){0,1,0};u->primariesM2=(DYFloat3){0,0,1};}
|
||||
void DYReadUniforms(id<PROAPIAccessing>m,CMTime t,DYUniforms*u){DYDefaultUniforms(u);id<FxParameterRetrievalAPI_v6>g=[m apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];for(NSDictionary*r in DYDescriptors()){double v=[r[@"default"]doubleValue];if([g getFloatValue:&v fromParameter:[r[@"pid"]unsignedIntValue] atTime:t]&&std::isfinite(v))*(float*)((uint8_t*)u+[r[@"offset"]unsignedIntegerValue])=fmin([r[@"max"]doubleValue],fmax([r[@"min"]doubleValue],v));}}
|
||||
BOOL DYCreateParameters(id<PROAPIAccessing>m,NSError**error){id<FxParameterCreationAPI_v5>a=[m apiForProtocol:@protocol(FxParameterCreationAPI_v5)];BOOL ok=a!=nil;
|
||||
ok=[a addCustomParameterWithName:@"大鱼调色" parameterID:DYInspectorParameterID defaultValue:[[[DYInspectorToken alloc]init]autorelease] parameterFlags:kFxParameterFlag_CUSTOM_UI|kFxParameterFlag_USE_FULL_VIEW_WIDTH|kFxParameterFlag_DONT_DISPLAY_IN_DASHBOARD|kFxParameterFlag_NOT_ANIMATABLE]&&ok;
|
||||
for(NSDictionary*r in DYDescriptors())ok=[a addFloatSliderWithName:r[@"title"] parameterID:[r[@"pid"]unsignedIntValue] defaultValue:[r[@"default"]doubleValue] parameterMin:[r[@"min"]doubleValue] parameterMax:[r[@"max"]doubleValue] sliderMin:[r[@"min"]doubleValue] sliderMax:[r[@"max"]doubleValue] delta:[r[@"step"]doubleValue] parameterFlags:kFxParameterFlag_HIDDEN]&&ok;
|
||||
ok=[a addCustomParameterWithName:@"LUT 文件" parameterID:DYAssetsParameterID defaultValue:[[[DYAssetState alloc]init]autorelease] parameterFlags:kFxParameterFlag_HIDDEN|kFxParameterFlag_NOT_ANIMATABLE]&&ok;
|
||||
if(!ok&&error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_InvalidParameter userInfo:@{NSLocalizedDescriptionKey:@"无法创建大鱼调色参数"}];return ok;}
|
||||
@implementation DYAssetState
|
||||
+ (BOOL)supportsSecureCoding{return YES;}
|
||||
- (instancetype)init{if((self=[super init]))_paths=[@{}copy];return self;}
|
||||
- (void)dealloc{[_paths release];[super dealloc];}
|
||||
- (void)encodeWithCoder:(NSCoder*)c{[c encodeObject:_paths forKey:@"paths"];}
|
||||
- (instancetype)initWithCoder:(NSCoder*)c{if((self=[self init])){NSSet*s=[NSSet setWithObjects:NSDictionary.class,NSString.class,nil];NSDictionary*d=[c decodeObjectOfClasses:s forKey:@"paths"];if(d)self.paths=d;}return self;}
|
||||
- (id)copyWithZone:(NSZone*)z{DYAssetState*v=[[[self class]allocWithZone:z]init];v.paths=_paths;return v;}
|
||||
- (id)interpolateBetween:(id)r withWeight:(float)w{return w<.5?[[self copy]autorelease]:[[r copy]autorelease];}
|
||||
- (BOOL)isEqual:(id)o{return [o isKindOfClass:self.class]&&[_paths isEqual:[o paths]];}
|
||||
- (NSUInteger)hash{return _paths.hash;}
|
||||
@end
|
||||
@implementation DYInspectorToken
|
||||
+ (BOOL)supportsSecureCoding{return YES;}
|
||||
- (void)encodeWithCoder:(NSCoder*)c{[c encodeInt:1 forKey:@"schema"];}
|
||||
- (instancetype)initWithCoder:(NSCoder*)c{return [self init];}
|
||||
- (id)copyWithZone:(NSZone*)z{return [[[self class]allocWithZone:z]init];}
|
||||
- (id)interpolateBetween:(id)r withWeight:(float)w{return [[self copy]autorelease];}
|
||||
- (BOOL)isEqual:(id)o{return [o isKindOfClass:self.class];}
|
||||
- (NSUInteger)hash{return 1;}
|
||||
@end
|
||||
DYAssetState*DYReadAssets(id<PROAPIAccessing>m,CMTime t){DYAssetState*v=nil;id<FxParameterRetrievalAPI_v6>g=[m apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];[g getCustomParameterValue:&v fromParameter:DYAssetsParameterID atTime:t];return [v isKindOfClass:DYAssetState.class]?v:[[[DYAssetState alloc]init]autorelease];}
|
||||
BOOL DYWriteAssets(id<PROAPIAccessing>m,DYAssetState*v,CMTime t){id<FxParameterSettingAPI_v6>s=[m apiForProtocol:@protocol(FxParameterSettingAPI_v6)];return [s setCustomParameterValue:v toParameter:DYAssetsParameterID atTime:t];}
|
||||
在新工单中引用
屏蔽一个用户