增加模块整体强度与中文工具栏,分组简化一级面板(验证中)
这个提交包含在:
1 父节点
0388b79bd8
当前提交
a1a0779e12
17 个文件已更改
+191
-74
没有与搜索条件相匹配的文件
@@ -61,17 +61,20 @@
|
||||
};
|
||||
for(NSString *ID in DYUnifiedRenderOrder(tools)){
|
||||
if([ID isEqual:@"output"]){
|
||||
if(u.cm.outputEnabled>.5){CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0};
|
||||
double amount=DYToolStrength(tools,@"output");if(u.cm.outputEnabled>.5&&amount>0){id<MTLTexture>before=current;[pinned addObject:before];int priorGamut=wg,priorTransfer=wt;CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0};
|
||||
if(u.cm.toneMapping>.5)output.toneMapping=(wt>1000?2:0)+(output.outputTransfer>1000?1:0);
|
||||
if(!transform(output))return NO;wg=output.outputGamut;wt=output.outputTransfer;
|
||||
if(amount<1){id<MTLTexture>converted=current;[pinned addObject:converted];current=before;BOOL ok=transform({priorGamut,priorTransfer,wg,wt,0});id<MTLTexture>adapted=current;[pinned addObject:adapted];current=converted;if(ok)ok=blend(adapted,@[],amount,@"primary");[pinned removeObject:adapted];[pinned removeObject:converted];if(!ok)return NO;}[pinned removeObject:before];
|
||||
}continue;
|
||||
}
|
||||
BOOL base=[ID hasPrefix:@"base:"];NSDictionary *node=base?nil:DYToolWithID(tools,ID);NSString *type=base?[ID substringFromIndex:5]:node[@"type"];
|
||||
if(base&&DYBaseToolRemoved(tools,type))continue;
|
||||
double strength=DYToolStrength(tools,ID);if(strength<=0)continue;id<MTLTexture>moduleBefore=current;if(strength<1)[pinned addObject:moduleBefore];
|
||||
DYUniforms values=base?u:DYToolUniforms(node);NSArray *masks=base?tools[@"baseMasks"][type]:node[@"masks"];
|
||||
if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;continue;}
|
||||
if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;if(strength<1){BOOL ok=blend(moduleBefore,@[],strength,type);[pinned removeObject:moduleBefore];if(!ok)return NO;}continue;}
|
||||
if([type isEqual:@"film"]){if(!print(values,masks))return NO;values.filmPrint.x=0;}
|
||||
if(!isolated(type,values,base?DYVisibleBaseToolPaths(paths,tools):node[@"paths"],base?spider:node[@"spider"],masks))return NO;
|
||||
if(strength<1){BOOL ok=blend(moduleBefore,@[],strength,type);[pinned removeObject:moduleBefore];if(!ok)return NO;}
|
||||
}
|
||||
[pinned removeObject:originalWorking];
|
||||
// Final host adaptation is separate from the movable output node. Cube uses
|
||||
|
||||
在新工单中引用
屏蔽一个用户