补充偏粉肤色跨红色色相边界并保持橙色优先
这个提交包含在:
1 父节点
ca7221f073
当前提交
f5ae4ca5ea
3 个文件已更改
+4
-4
没有与搜索条件相匹配的文件
@@ -14,7 +14,7 @@ static inline int DYHSLPickedLane(float r,float g,float b) {
|
||||
float saturation=chroma/high;
|
||||
// Warm, less saturated pink/peach/brown points take precedence over red/yellow.
|
||||
// This is a colour heuristic, not face/person detection; saturated red stays red.
|
||||
if(hue<=52&&r>g&&g>=b-.025f&&saturation>=.08f&&saturation<=.72f)return 1;
|
||||
if((hue<=52||hue>=345)&&r>g&&r>b&&g>=b-.08f&&saturation>=.08f&&saturation<=.72f)return 1;
|
||||
const float centers[]={0,30,60,120,180,240,270,315};
|
||||
int best=0;float closest=360;
|
||||
for(int lane=0;lane<8;lane++){float distance=std::fabs(hue-centers[lane]);distance=std::min(distance,360-distance);if(distance<closest){closest=distance;best=lane;}}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Classifier boundaries and real native inspector selection, without opening a sampler.
|
||||
{
|
||||
const float points[][4]={{1,.04,.02,0},{1,.5,.02,1},{.95,.9,.02,2},{.03,.8,.05,3},{.02,.8,.8,4},{.02,.12,.9,5},{.55,.08,.95,6},{.95,.04,.6,7},
|
||||
{.95,.8,.79,1},{.74,.46,.44,1},{.65,.42,.28,1},{.27,.16,.12,1},{.5,.5,.5,-1},{1,1,1,-1},{0,0,0,-1},{.5,.49,.48,-1},{NAN,.3,.2,-1}};
|
||||
{.95,.8,.79,1},{.91,.7,.73,1},{.74,.46,.44,1},{.65,.42,.28,1},{.27,.16,.12,1},{.5,.5,.5,-1},{1,1,1,-1},{0,0,0,-1},{.5,.49,.48,-1},{NAN,.3,.2,-1}};
|
||||
for(unsigned i=0;i<sizeof(points)/sizeof(points[0]);i++)run.record([NSString stringWithFormat:@"hsl-picker-colour-%02u",i],DYHSLPickedLane(points[i][0],points[i][1],points[i][2])==(int)points[i][3]);
|
||||
DYDiagnosticManager *pickHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(pickHost,nil);
|
||||
NSMutableDictionary *pickDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSDictionary *pickLayer=DYInsertTool(pickDoc,@"hsl",@"base:hsl");DYWriteTools(pickHost,pickDoc,kCMTimeZero);
|
||||
@@ -18,7 +18,7 @@
|
||||
[(id)editor performSelector:@selector(selectHSLColor:) withObject:nil];
|
||||
BOOL retained=[[(NSDictionary*)[editor valueForKey:@"tabs"]objectForKey:@"hsl"]integerValue]==1,button=NO,swatch=NO;
|
||||
for(NSDictionary *card in [editor valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"hsl"]){
|
||||
for(NSView *row in card[@"body"]){if([row.identifier isEqual:@"hslPickerControls"])button=[row.subviews.firstObject action]==@selector(sampleHSLLane:);
|
||||
for(NSView *row in card[@"body"]){if([row.identifier isEqual:@"hslPickerControls"])button=[(NSButton*)row.subviews.firstObject action]==@selector(sampleHSLLane:);
|
||||
if([row.identifier isEqual:@"hslTabs"]){swatch=YES;for(NSButton *b in row.subviews)swatch&=(b.state==(b.tag==1?NSControlStateValueOn:NSControlStateValueOff));}}
|
||||
}
|
||||
run.record([NSString stringWithFormat:@"hsl-picker-native-editor-%lu",(unsigned long)editorIndex],blue&&skin&&retained&&button&&swatch);
|
||||
|
||||
在新工单中引用
屏蔽一个用户