增加模块整体强度与中文工具栏,分组简化一级面板(验证中)
这个提交包含在:
1 父节点
0388b79bd8
当前提交
a1a0779e12
17 个文件已更改
+191
-74
没有与搜索条件相匹配的文件
@@ -83,9 +83,10 @@
|
||||
- (BOOL)renderToolsSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
|
||||
if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools);
|
||||
NSMutableDictionary *weighted=[[tools mutableCopy]autorelease],*baseWeights=[NSMutableDictionary dictionaryWithDictionary:tools[@"baseMasks"]?:@{}];for(NSString *type in DYToolTypes()){double amount=DYToolStrength(tools,[@"base:" stringByAppendingString:type]);if(amount<1)baseWeights[type]=DYToolStrengthMasks(baseWeights[type],amount);}weighted[@"baseMasks"]=baseWeights;NSMutableArray *weightedLayers=[NSMutableArray array];for(NSDictionary *node in tools[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];double amount=DYToolStrength(tools,node[@"id"]);copy[@"masks"]=DYToolStrengthMasks(node[@"masks"],amount);copy[@"renderStrength"]=@(amount);[weightedLayers addObject:copy];}weighted[@"layers"]=weightedLayers;tools=weighted;
|
||||
DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
|
||||
NSMutableSet *activeIDs=nil;BOOL anchored=NO;
|
||||
for(NSDictionary *node in tools[@"layers"])if(!DYToolIsNeutral(node)){
|
||||
for(NSDictionary *node in tools[@"layers"])if([node[@"renderStrength"]doubleValue]>0&&!DYToolIsNeutral(node)){
|
||||
if(!activeIDs)activeIDs=[NSMutableSet set];
|
||||
[activeIDs addObject:node[@"id"]];
|
||||
anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"];
|
||||
|
||||
在新工单中引用
屏蔽一个用户