From 0a1987572b1f1f79a8fc4035a09206bcb7586350 Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 6 Nov 2026 13:08:12 +0800 Subject: [PATCH] feat: complete ordered output domain and mosaic validation for 1.17 --- research/UnifiedPipeline1.17.0.md | 6 ++++++ 大鱼调色/Plugin/DYDiagnostics.mm | 2 +- 大鱼调色/Plugin/DYGrade.metal | 13 +++++++++++++ 大鱼调色/Plugin/DYInspector.mm | 11 ++++++----- 大鱼调色/Plugin/DYManagedColorPanel.mm | 2 +- 大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h | 1 + 大鱼调色/Plugin/DYUnifiedRender.inc.h | 17 ++++++++++------- 大鱼调色/Plugin/DYWorkspaceTools.inc.h | 12 +++++++----- 大鱼调色/Plugin/Info.plist | 6 +++--- 大鱼调色/Wrapper Application/Info.plist | 4 ++-- 10 files changed, 50 insertions(+), 24 deletions(-) diff --git a/research/UnifiedPipeline1.17.0.md b/research/UnifiedPipeline1.17.0.md index dfc582c..1c88a7b 100644 --- a/research/UnifiedPipeline1.17.0.md +++ b/research/UnifiedPipeline1.17.0.md @@ -12,3 +12,9 @@ - 检视器已移除内部纵向 ScrollView、取消高度上限;实际宿主自适应仍待正式版验收。 - 新 V4 状态/顺序、独立输出卡片与移动写回、局部马赛克逐帧人脸和共享蒙版实现。V4 使用工作域码值模块,Rec.709 创意 LUT/胶片使用明确局部参考域;有界兼容算法以边界增量延拓并保留 float32 超范围残差。此实现不等同所有旧算法均已改写成场景线性算法。 - Release 编译通过;新增生产渲染检查正在补齐。版本、公证、安装、宿主与 Release 尚未开始,正式安装仍 1.16.0。 + +## 原生验证与兼容决策 + +948 项 Release 原生检查中,新链路与马赛克检查全部通过;唯一失败是旧界面把输出卡片数量固定为零的断言,已按兼容隐藏/V4 独立卡片调整。新增场景曝光负值、超白翻倍检查纳入最终验证。输出层在控制面板使用同一渲染次序,一级旁路不再联动输入和输出,人脸肤色支持在 V4 当前节点参考图上重新生成。 + +原模板 custom dataValue 不能改成 V4 默认:FCP 会将其应用于已有 nil 状态效果,导致旧工程变化。继续保留旧载体,颜色设置中显式选择“全链路 · 输出转换层”;新流程输出默认为 tail。不得宣称所有旧效果自动迁移。版本准备为 1.17.0(98)。 diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 07abfea..245a751 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -290,7 +290,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { NSWindow *interactionWindow=[[[NSWindow alloc]initWithContentRect:NSMakeRect(0,0,400,780) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]autorelease];interactionWindow.contentView=inspector;[inspector layoutSubtreeIfNeeded]; NSArray *graphics=[inspector valueForKey:@"graphics"];NSView *wheel=nil;for(NSView *graphic in graphics)if([NSStringFromClass(graphic.class)isEqual:@"DYPrimaryBalanceWheel"])wheel=graphic; run.need(@"primary-balance-wheel-restored-and-palette-loaded",wheel&&[wheel valueForKey:@"wheel"]!=nil); - BOOL merged=cards.count==DYToolTypes().count&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)merged&=![@[@"input",@"output"]containsObject:card[@"section"][@"key"]]; + BOOL merged=cards.count==DYToolTypes().count+1&&[cards[0][@"section"][@"key"]isEqual:@"primary"]&&[cards[1][@"section"][@"key"]isEqual:@"spider"];for(NSDictionary *card in cards)if([card[@"section"][@"key"]isEqual:@"output"])merged&=[card[@"view"]isHidden]; NSDictionary *controls=[inspector valueForKey:@"controls"];for(NSDictionary *record in controls.allValues)merged&=![[record[@"descriptor"]objectForKey:@"key"]hasPrefix:@"cmbypass"]; run.record(@"single-primary-card-no-bypass-checkboxes",merged); auto mouseFor=[&](NSView *view,NSEventType type,NSPoint point,NSEventModifierFlags flags=0,NSInteger clicks=1){return [NSEvent mouseEventWithType:type location:[view convertPoint:point toView:nil] modifierFlags:flags timestamp:0 windowNumber:interactionWindow.windowNumber context:nil eventNumber:0 clickCount:clicks pressure:type==NSEventTypeLeftMouseUp?0:1];}; diff --git a/大鱼调色/Plugin/DYGrade.metal b/大鱼调色/Plugin/DYGrade.metal index 96ab1e0..29b4aa0 100644 --- a/大鱼调色/Plugin/DYGrade.metal +++ b/大鱼调色/Plugin/DYGrade.metal @@ -421,3 +421,16 @@ kernel void dyUnifiedBridgeIn(texture2d a [[texture(0)]],tex kernel void dyUnifiedBridgeOut(texture2d raw [[texture(0)]],texture2d changed [[texture(1)]],texture2d out [[texture(2)]],uint2 p [[thread_position_in_grid]]){ if(any(p>=uint2(out.get_width(),out.get_height())))return;float4 a=raw.read(p),b=changed.read(p);if(a.a>0&&b.a>0){float3 c=a.rgb/a.a;float3 delta=dyToolEncode(b.rgb/b.a)-clamp(c,0.f,1.f);a.rgb=(c+delta)*a.a;}out.write(a,p); } + +struct DYUnifiedMix {CSTParams toLinear,fromLinear,originalTo709;float amount;}; +kernel void dyUnifiedBlend(texture2d before [[texture(0)]],texture2d after [[texture(1)]],texture2d output [[texture(2)]],texture2d original [[texture(3)]],device const DYToolMaskEntry* masks [[buffer(0)]],constant DYToolMaskHeader& h [[buffer(1)]],constant DYUnifiedMix& p [[buffer(2)]],uint2 xy [[thread_position_in_grid]]){ + if(any(xy>=uint2(output.get_width(),output.get_height())))return;float4 a=before.read(xy),b=after.read(xy),o=original.read(xy);if(!(a.a>0)||!(b.a>0)){output.write(a,xy);return;} + float3 ac=cst_float_air(float4(a.rgb/a.a,1),p.toLinear).rgb,bc=cst_float_air(float4(b.rgb/b.a,1),p.toLinear).rgb; + float3 code=dyToolEncode(cst_float_air(float4(ac,1),dyPrimaryAP1To709).rgb),source=o.a>0?dyToolEncode(cst_float_air(float4(o.rgb/o.a,1),p.originalTo709).rgb):float3(0); + float2 uv=(float2(xy)+.5f)/float2(output.get_width(),output.get_height());float x=h.offsetX+uv.x*h.scaleX,y=h.offsetY+uv.y*h.scaleY;float coverage=1;bool found=false; + for(uint i=0;i=1){output.write(b,xy);return;}output.write(float4(cst_float_air(float4(mix(ac,bc,w),1),p.fromLinear).rgb*a.a,a.a),xy); +} +kernel void dyUnifiedExposure(texture2d a [[texture(0)]],texture2d b [[texture(1)]],constant float& gain [[buffer(0)]],uint2 p [[thread_position_in_grid]]){ + if(any(p>=uint2(b.get_width(),b.get_height())))return;float4 c=a.read(p);if(c.a>0)c.rgb*=gain;b.write(c,p); +} diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index b56919f..4cec0d6 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -501,7 +501,7 @@ NSView *DYCreateWorkspaceMaskEditor(id @implementation DYInspector #include "DYToolInspector.inc.h" -- (void)removeWorkspaceTool {if(!_workspaceEditor||!_cards.count)return;NSButton *source=[[[NSButton alloc]init]autorelease];source.tag=0;[self removeTool:source];} +- (void)removeWorkspaceTool {if(!_workspaceEditor||!_cards.count||[_cards[0][@"section"][@"key"]isEqual:@"output"])return;NSButton *source=[[[NSButton alloc]init]autorelease];source.tag=0;[self removeTool:source];} - (instancetype)initWithAPIManager:(id)manager { return [self initWithAPIManager:manager renderer:nil]; } @@ -516,7 +516,7 @@ NSView *DYCreateWorkspaceMaskEditor(id _preferredHeight=(_embedded||_workspaceEditor)?780:406; BOOL cstOnly=NO; if(!_embedded){idaction=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(action){[action startAction:self];@try{cstOnly=[DYReadTools(manager,action.currentTime).document[@"starterTool"]isEqual:@"cst"];}@finally{[action endAction:self];}}} - NSArray *presentation=DYPresentationSections(cstOnly,!_embedded&&!_workspaceEditor);if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;} + NSArray *presentation=DYPresentationSections(cstOnly,!_embedded&&(!_workspaceEditor||[workspaceType isEqual:@"output"]));if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;} _sections=[presentation copy];_stackViews=[NSMutableDictionary new];_stackOrder=[@[]copy]; _cards=[[NSMutableArray alloc] init]; _controls=[[NSMutableDictionary alloc] init]; _assetButtons=[[NSMutableDictionary alloc] init]; _graphics=[[NSMutableArray alloc] init]; @@ -813,7 +813,8 @@ NSView *DYCreateWorkspaceMaskEditor(id NSString *key=row.identifier?:@"";NSInteger tab=[_tabs[section]integerValue]; if(!_embedded&&[section isEqual:@"base"]&&[key isEqual:@"skinEnabled"])for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"skin"])return ![card[@"removed"]boolValue]; if([key isEqual:@"legacyInput"])return ![_tabs[@"primaryCMS"]boolValue]&&![_tabs[@"managedColor"]boolValue]&&[_tabs[@"legacyInput"]boolValue]; - if([section isEqual:@"primary"]&&[_tabs[@"managedColor"]boolValue]){if([@[@"heading:input",@"heading:output"]containsObject:key])return NO;if([key isEqual:@"cmmix"])return YES;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key]&&d[@"cmTab"]&&[d[@"cmTab"]integerValue]!=1)return NO;} + if([section isEqual:@"primary"]&&([_tabs[@"managedColor"]boolValue]||(_unified&&_embedded))){if([@[@"heading:input",@"heading:output"]containsObject:key])return NO;if([key isEqual:@"cmmix"])return YES;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key]&&d[@"cmTab"]&&[d[@"cmTab"]integerValue]!=1)return NO;} + if(_unified&&_workspaceEditor&&[section isEqual:@"primary"]){if([key isEqual:@"heading:output"])return NO;for(NSDictionary*d in DYToolSection(@"output")[@"rows"])if([d[@"key"]isEqual:key])return NO;} if([section isEqual:@"curve"] && ![key isEqual:@"curveGraph"])return NO; if([section isEqual:@"hsl"]) { int axis=0,color=0;if(sscanf(key.UTF8String,"hsl%d_%d",&axis,&color)==2)return color==tab; @@ -961,8 +962,8 @@ NSView *DYCreateWorkspaceMaskEditor(id @try { CMTime t=action.currentTime; id get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]; + _unified=DYUnifiedColorState(DYReadAssets(_embedded?[(DYToolManager*)_manager host]:_manager,t).colorManagement); if(!_embedded&&!_workspaceEditor){ - _unified=DYUnifiedColorState(DYReadAssets(_manager,t).colorManagement); [_renderOrder release];_renderOrder=[DYUnifiedRenderOrder(DYReadTools(_manager,t).document)copy]; NSMutableDictionary *primary=nil,*output=nil;for(NSMutableDictionary *card in _cards){if([card[@"section"][@"key"]isEqual:@"primary"])primary=card;if([card[@"section"][@"key"]isEqual:@"output"])output=card;} NSMutableArray *body=[NSMutableArray arrayWithArray:primary[@"body"]]; @@ -1011,7 +1012,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint]; } DYAssetState *assets=DYReadAssets(_manager,t);NSDictionary *cms=_embedded?DYReadAssets([(DYToolManager*)_manager host],t).colorManagement:assets.colorManagement;_tabs[@"managedColor"]=@(cms.count>0&&!DYPrimaryColorState(cms));_tabs[@"primaryCMS"]=@(DYPrimaryColorState(cms));[_managedPanel refreshWithState:assets.colorManagement context:[_renderer colorContext]];[_managedPanel setInputLUTPath:assets.paths[@"input"]];for(NSDictionary *r in _controls.allValues)if([r[@"descriptor"][@"key"]isEqual:@"cmmix"])[r[@"label"]setStringValue:([_tabs[@"managedColor"]boolValue]||[_tabs[@"primaryCMS"]boolValue])?@"调色混合":@"CST 混合"]; - for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:[_tabs[@"managedColor"]boolValue]?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];} + for(NSDictionary *c in _cards)if([c[@"section"][@"key"]isEqual:@"primary"]){[c[@"enabled"]setToolTip:([_tabs[@"managedColor"]boolValue]||_unified)?@"启停此层一级调色;全局色彩管理保持当前方式":@"启停此层输入、一级调色与输出转换"];[c[@"enabled"]setAccessibilityHelp:[c[@"enabled"]toolTip]];} [_spiderPanel setMesh:assets.spiderMesh linked:assets.spiderLinked]; double profile=0,configured=0;[get getFloatValue:&profile fromParameter:2013 atTime:t];[get getFloatValue:&configured fromParameter:2236 atTime:t]; DYInspectorToken *oldToken=nil;[get getCustomParameterValue:&oldToken fromParameter:DYInspectorParameterID atTime:t]; diff --git a/大鱼调色/Plugin/DYManagedColorPanel.mm b/大鱼调色/Plugin/DYManagedColorPanel.mm index aa480ab..c473659 100644 --- a/大鱼调色/Plugin/DYManagedColorPanel.mm +++ b/大鱼调色/Plugin/DYManagedColorPanel.mm @@ -33,7 +33,7 @@ static NSTextField *cmsLabel(NSString*s){NSTextField*l=[DYThemeLabel wrappingLab _refreshing=YES;NSDictionary *saved=[s copy];[_state release];_state=saved;NSInteger mode=s.count?[s[@"mode"]integerValue]:0;[_mode selectItemAtIndex:mode]; NSDictionary *values=s.count&&!DYPrimaryColorState(s)?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i]; _input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2||mode>=4;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标"; - _help.toolTip=mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。"; + _help.toolTip=mode==5?@"输入由一级 CST 解释,调色按层序执行。输出层之前使用工作空间,之后使用输出空间;创意 LUT、胶片和肤色使用其专用参考域。输出层只转换一次,宿主显示适配保持在最后。":mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。"; _help.stringValue=mode==5?@"按模块顺序调色,输出层默认最后,可上下移动。":mode==0?@"保留原有调色顺序。高级流程按需选择。":mode==4?@"使用一级 CST 设置,在一级与印片之后输出。":mode==1?@"保留 1.8 兼容流程,输入跟随 FCP。":mode==2?@"按所选相机编码解释输入;请核对上游转换。":@"按所选编码解释输入 LUT 的输出。"; _context.stringValue=mode==5?@"输入 → 工作域节点 → 输出转换层 → 宿主":mode==4?@"输入 CST → 工作域调色与印片 → 输出 CST":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_context.toolTip=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主。请核对上游相机 LUT 与颜色符合;已裁切信息无法恢复。":_context.stringValue;_refreshing=NO;[self setNeedsLayout:YES]; } diff --git a/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h b/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h index 955f8bc..ea8da28 100644 --- a/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYUnifiedDiagnostics.inc.h @@ -13,6 +13,7 @@ DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];DYUniforms u=defaults;u.skinProtection.x=0;u.cm.configured=1;u.cm.inputTransfer=u.cm.workingTransfer=u.cm.outputTransfer=20;u.cm.inputGamut=u.cm.workingGamut=u.cm.outputGamut=22;u.cm.toneMapping=0; auto frame=[&](DYUniforms values,NSDictionary *document,NSString *name){NSError *e=nil;BOOL ok=[renderer renderSource:src destination:dst uniforms:values paths:@{} spider:nil tools:document colorManagement:v4 hostPrimaries:kFxColorPrimaries_Rec709 error:&e];run.need(name,ok,@{@"error":reason(e)});return read(dst,gpu);}; Pixels plain=frame(u,doc,@"unified-neutral-wide-chain-renders");run.record(@"unified-neutral-preserves-negative-and-superwhite",fabs((float)plain[0]+.04)<.002&&fabs((float)plain[2]-4)<.01&&difference(plain,plain).nonfinite==0); + DYUniforms exposure=u;exposure.exposure=1;Pixels raised=frame(exposure,doc,@"unified-scene-exposure");run.record(@"unified-scene-exposure-doubles-negative-and-superwhite",fabs((float)raised[0]+.08)<.003&&fabs((float)raised[2]-8)<.03,@{@"red":@((float)raised[0]),@"blue":@((float)raised[2])}); DYUniforms changed=u;changed.hslHueA.x=20;changed.hslHueB.x=20;Pixels modified=frame(changed,doc,@"unified-HSL-before-output-accepts-linear-domain");run.record(@"unified-active-bounded-tool-carries-superwhite-residual",modified[2]>2.9&&difference(plain,modified).nonfinite==0); NSMutableDictionary *zero=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(zero,kCMTimeZero);p.strength=0;zero[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];doc[@"baseMasks"][@"hsl"]=@[zero]; Pixels masked=frame(changed,doc,@"unified-zero-mask");run.record(@"unified-zero-mask-is-exact-neutral",difference(masked,plain).maximum==0);[doc[@"baseMasks"]removeObjectForKey:@"hsl"]; diff --git a/大鱼调色/Plugin/DYUnifiedRender.inc.h b/大鱼调色/Plugin/DYUnifiedRender.inc.h index 62766c0..79757c0 100644 --- a/大鱼调色/Plugin/DYUnifiedRender.inc.h +++ b/大鱼调色/Plugin/DYUnifiedRender.inc.h @@ -3,13 +3,13 @@ if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools); NSMutableDictionary*entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;idd=entry[@"device"];idsource=[src metalTextureForDevice:d];if(!source)return fail(error,@"一级 CST 输入纹理不可用。"); uint64_t pixels=uint64_t(source.width)*source.height;if(!pixels||pixels>64ull*1024*1024||pixels*16*8>MAX(768ull*1024*1024,MIN(2ull*1024*1024*1024,d.recommendedMaxWorkingSetSize/2)))return fail(error,@"当前画面超过一级 CST 内存预算。"); - BOOL inputEnabled=u.inputSectionEnabled>.5;DYCMSettings global=u.cm;BOOL root=u.primarySectionEnabled>.5&&!DYBaseToolRemoved(tools,@"primary");DYApplyRemovedBaseTools(&u,tools);u.cm=global;int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut); - NSMutableArray*pool=[NSMutableArray array];NSCountedSet*pinned=[NSCountedSet set];idcurrent=nil; + BOOL inputEnabled=u.inputSectionEnabled>.5;DYCMSettings global=u.cm;DYApplyRemovedBaseTools(&u,tools);u.cm=global;int wt=lroundf(u.cm.workingTransfer),wg=lroundf(u.cm.workingGamut); + NSMutableArray*pool=[NSMutableArray array];NSCountedSet*pinned=[NSCountedSet set];idcurrent=nil,originalWorking=nil;int initialGamut=wg,initialTransfer=wt; auto next=[&]()->id{for(idt in pool)if(t!=current&&![pinned containsObject:t])return t;MTLTextureDescriptor*td=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:source.width height:source.height mipmapped:NO];td.storageMode=MTLStorageModePrivate;td.usage=MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite|MTLTextureUsageRenderTarget;idt=[d newTextureWithDescriptor:td];if(t){[pool addObject:t];[t release];}return t;}; auto dispatch=[&](NSString*name,const void*params,NSUInteger length,const void*extra=nullptr,NSUInteger extraLength=0){idout=next();if(!out)return fail(error,@"无法分配一级 CST 缓冲区。");BOOL ok=[self managedDispatch:name textures:@[current,out] data:params length:length extra:extra extraLength:extraLength entry:entry error:error];if(ok)current=out;return ok;}; auto transform=[&](CSTParams p){if(p.inputTransfer==p.outputTransfer&&p.inputGamut==p.outputGamut&&!p.toneMapping)return YES;return dispatch(@"dyPrimaryCST",&p,sizeof(p));}; auto tile=[&](idt){DYExportTile*v=[[[DYExportTile alloc]initWithTexture:t registry:d.registryID]autorelease];[v setBounds:src.tilePixelBounds origin:src.imageOrigin];[v setPixelAspect:src.pixelAspect];return v;}; - auto blend=[&](idbefore,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;idout=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};idmb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];DYCSTMixParams p={{wg,wt,2,20,0},{2,20,wg,wt,0},amount};idpipeline=[self managedKernel:@"dyPrimaryBlend" entry:entry error:error];if(!pipeline||!mb)return NO;idcb=[entry[@"queue"]commandBuffer];idce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;}; + auto blend=[&](idbefore,NSArray*masks,float amount,NSString*type){if(!masks.count&&amount>=1)return YES;idout=next();if(!out)return fail(error,@"无法分配一级混合缓冲区。");DYToolMaskHeader h{};idmb=[self maskBuffer:@{type:masks?:@[]} tile:src device:d header:&h];h.section=(int)[DYToolTypes()indexOfObject:type];struct {CSTParams toLinear,fromLinear,originalTo709;float amount;}p={{wg,wt,2,20,0},{2,20,wg,wt,0},{initialGamut,initialTransfer,22,20,0},amount};idpipeline=[self managedKernel:@"dyUnifiedBlend" entry:entry error:error];if(!pipeline||!mb)return NO;idcb=[entry[@"queue"]commandBuffer];idce=[cb computeCommandEncoder];[ce setComputePipelineState:pipeline];[ce setTexture:before atIndex:0];[ce setTexture:current atIndex:1];[ce setTexture:out atIndex:2];[ce setTexture:originalWorking?:before atIndex:3];[ce setBuffer:mb offset:0 atIndex:0];[ce setBytes:&h length:sizeof(h) atIndex:1];[ce setBytes:&p length:sizeof(p) atIndex:2];[ce dispatchThreads:MTLSizeMake(source.width,source.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];[cb commit];[cb waitUntilCompleted];if(cb.status!=MTLCommandBufferStatusCompleted)return fail(error,cb.error.localizedDescription);current=out;return YES;}; auto grade=[&](DYUniforms values,NSArray*masks,BOOL local){if(values.primarySectionEnabled<.5||values.cm.mix<=0)return YES;DYUniforms neutral=values;neutral.inputSectionEnabled=neutral.cm.outputEnabled=0;BOOL gradeNeutral=identityCM(neutral);if(!local&&gradeNeutral)return YES;if(local&&identityCM(values))return YES; DayuRenderParams p=DYCMRender(values.cm);p.input.toneMapping=0;if((int)lroundf(values.cm.workingTransfer)==20){p.reserved|=8;p.basis.colorspace=10;p.basisInput={(int)lroundf(values.cm.workingGamut),20,(int)lroundf(values.cm.workingGamut),10,0};p.basisOutput={(int)lroundf(values.cm.workingGamut),10,(int)lroundf(values.cm.workingGamut),20,0};}CSTParams back={wg,wt,wg,wt,0}; if(local){p.stages=(values.inputSectionEnabled>.5?1:0)|(gradeNeutral?0:2)|(values.cm.outputEnabled>.5?4:0);back={values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputGamut):(int)lroundf(values.cm.workingGamut),values.cm.outputEnabled>.5?(int)lroundf(values.cm.outputTransfer):(int)lroundf(values.cm.workingTransfer),wg,wt,0};} @@ -22,7 +22,7 @@ current=source;idcarrier=next();uint32_t noLUT=0;if(!carrier||![self managedDispatch:@"dyManagedCarrier" textures:@[current,carrier,entry[@"identity"]] data:&noLUT length:4 extra:nullptr extraLength:0 entry:entry error:error])return NO;current=carrier; if(inputEnabled&&!transform({(int)lroundf(u.cm.inputGamut),(int)lroundf(u.cm.inputTransfer),wg,wt,0}))return NO; // Preserve the original working image for source-referenced operations. - idoriginalWorking=current;[pinned addObject:originalWorking];int initialGamut=wg,initialTransfer=wt; + originalWorking=current;[pinned addObject:originalWorking]; auto isolated=[&](NSString *type,DYUniforms values,NSDictionary *nodePaths,NSData *mesh,NSArray *masks){ NSMutableDictionary *node=[NSMutableDictionary dictionaryWithDictionary:DYNewTool(type)];NSMutableDictionary *v=[NSMutableDictionary dictionary]; for(NSDictionary *descriptor in DYBaseToolDescriptors(type))if([descriptor[@"offset"]integerValue]>=0)v[descriptor[@"key"]]=@(*(float*)((uint8_t*)&values+[descriptor[@"offset"]unsignedIntegerValue])); @@ -30,12 +30,15 @@ node[@"filmFrameKey"]=@(values.filmFrameKey); if(DYToolIsNeutral(node))return YES; idbefore=current;[pinned addObject:before];BOOL ok=YES; - if([type isEqual:@"lens"]){idout=next();ok=out&&[self renderLens:tile(current) destination:tile(out) uniforms:values masks:@[] entry:entry error:error];if(ok)current=out;} + if([type isEqual:@"base"]&&values.baseSectionEnabled>.5&&values.exposureEnabled>.5&&values.exposure!=0){float gain=exp2f(values.exposure);ok=transform({wg,wt,wg,20,0})&&dispatch(@"dyUnifiedExposure",&gain,sizeof(gain))&&transform({wg,20,wg,wt,0});node[@"values"][@"exposure"]=@0;} + if(!ok){[pinned removeObject:before];return NO;} + if(DYToolIsNeutral(node)){} + else if([type isEqual:@"lens"]){idout=next();ok=out&&[self renderLens:tile(current) destination:tile(out) uniforms:values masks:@[] entry:entry error:error];if(ok)current=out;} else { // Creative Rec.709 LUT/film and skin models declare a local reference domain. // All other legacy controls operate on the current working RGB code values. BOOL reference=[@[@"look",@"film",@"skin"]containsObject:type]; - int domainGamut=reference?22:wg,domainTransfer=reference?1001:wt; + int domainGamut=reference?22:wg,domainTransfer=reference?1002:wt; if(reference)ok=transform({wg,wt,domainGamut,domainTransfer,0}); idraw=current;[pinned addObject:raw]; if(ok)ok=dispatch(@"dyUnifiedBridgeIn",nullptr,0); @@ -43,7 +46,7 @@ // A source-referenced skin node compares to the original image in this same // domain, never to a previous frame or an unrelated cached display image. idreferenceTexture=bounded; - if(ok&&[type isEqual:@"skin"]){current=originalWorking;ok=transform({initialGamut,initialTransfer,domainGamut,domainTransfer,0})&&dispatch(@"dyUnifiedBridgeIn",nullptr,0);referenceTexture=current;[pinned addObject:referenceTexture];current=bounded;} + if(ok&&[type isEqual:@"skin"]){if(!_exporting&&(values.skinFaceOnly>.5||values.skinVisualize>.5))[self prepareFaceSupport:tile(bounded)];else{[_faceEntries release];_faceEntries=nil;}current=originalWorking;ok=transform({initialGamut,initialTransfer,domainGamut,domainTransfer,0})&&dispatch(@"dyUnifiedBridgeIn",nullptr,0);referenceTexture=current;[pinned addObject:referenceTexture];current=bounded;} if(ok){idout=next();_managedFinishing=YES;@try{ok=out&&[self renderExtraTool:node source:tile(bounded) original:tile(referenceTexture) destination:tile(out) entry:entry error:error];}@finally{_managedFinishing=NO;}if(ok)current=out;} if(referenceTexture!=bounded)[pinned removeObject:referenceTexture];[pinned removeObject:bounded]; if(ok){idout=next();ok=out&&[self managedDispatch:@"dyUnifiedBridgeOut" textures:@[raw,current,out] data:nullptr length:0 extra:nullptr extraLength:0 entry:entry error:error];if(ok)current=out;} diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index a132678..5d4c7a2 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -58,7 +58,8 @@ NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array];NSMutableDictionary *numbers=[NSMutableDictionary dictionary],*titles=[NSMutableDictionary dictionary];for(NSString*ID in display){NSDictionary*node=DYToolWithID(document,ID);if(!node)continue;NSString*type=node[@"type"];NSInteger number=(numbers[type]?[numbers[type]integerValue]:(DYBaseToolRemoved(document,type)?0:1))+1;numbers[type]=@(number);titles[ID]=[NSString stringWithFormat:@"%@ %ld",DYToolSection(type)[@"title"],(long)number];} for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];} for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID]; - for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue; + if(DYUnifiedColorState(DYReadAssets(host,_toolTime).colorManagement))ordered=[NSMutableArray arrayWithArray:DYUnifiedRenderOrder(document)]; + for(NSString*ID in [ordered reverseObjectEnumerator]){if([ID isEqual:@"output"]){[rows addObject:@{@"node":ID,@"type":@"output",@"title":@"输出转换",@"enabled":@(rootUniforms.cm.outputEnabled>.5),@"kind":@"output"}];continue;}NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue; NSString*title=titles[ID]?:([ID isEqual:@"base:primary"]&&[document[@"starterTool"]isEqual:@"cst"]?@"CST 色彩空间转换":DYToolSection(type)[@"title"]?:type);[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool",@"maskCount":@(DYMasksForTool(document,ID).count)}]; for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];} } @@ -77,7 +78,7 @@ - (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row { NSDictionary *item=_layerRows[row];DYWorkspaceCell *cell=[[[DYWorkspaceCell alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField *label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:11];label.textColor=[NSColor colorWithWhite:.87 alpha:1];label.lineBreakMode=NSLineBreakByTruncatingTail;[cell addSubview:label];cell.textField=label; NSImageView *glyph=[[[NSImageView alloc]init]autorelease];glyph.image=[NSImage imageWithSystemSymbolName:item[@"mask"]?@"circle.lefthalf.filled":DYWorkspaceSymbol(item[@"type"]) accessibilityDescription:item[@"title"]];glyph.contentTintColor=[NSColor colorWithWhite:.65 alpha:1];[cell addSubview:glyph];cell.glyph=glyph; - if(!item[@"mask"]){NSButton *mask=DYWorkspaceButton(@"",self,@selector(editWorkspaceRowMask:));mask.bezelStyle=NSBezelStyleRegularSquare;mask.imagePosition=NSImageOnly;mask.image=[NSImage imageWithSystemSymbolName:[item[@"maskCount"]integerValue]?@"circle.lefthalf.filled":@"circle.dashed" accessibilityDescription:@"蒙版"];mask.tag=row;mask.toolTip=[item[@"maskCount"]integerValue]?@"编辑此图层蒙版":@"添加蒙版";mask.accessibilityLabel=[item[@"title"]stringByAppendingString:@"蒙版"];mask.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:mask];cell.maskButton=mask;} + if(!item[@"mask"]&&![item[@"kind"]isEqual:@"output"]){NSButton *mask=DYWorkspaceButton(@"",self,@selector(editWorkspaceRowMask:));mask.bezelStyle=NSBezelStyleRegularSquare;mask.imagePosition=NSImageOnly;mask.image=[NSImage imageWithSystemSymbolName:[item[@"maskCount"]integerValue]?@"circle.lefthalf.filled":@"circle.dashed" accessibilityDescription:@"蒙版"];mask.tag=row;mask.toolTip=[item[@"maskCount"]integerValue]?@"编辑此图层蒙版":@"添加蒙版";mask.accessibilityLabel=[item[@"title"]stringByAppendingString:@"蒙版"];mask.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:mask];cell.maskButton=mask;} NSButton *eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.bezelStyle=NSBezelStyleRegularSquare;eye.focusRingType=NSFocusRingTypeNone;eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.imagePosition=NSImageOnly;eye.tag=row;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];eye.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:eye];cell.bypass=eye;[cell resizeSubviewsWithOldSize:cell.bounds.size];return cell; } - (void)editWorkspaceRowMask:(NSButton*)sender{ @@ -89,7 +90,8 @@ if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_editorMode=_selectedMask?1:[item[@"type"]isEqual:@"look"]?2:0;[self rebuildWorkspaceEditor];[self pageChanged:nil]; } - (void)rebuildWorkspaceEditor { - NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil; + NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:[_selectedNode isEqual:@"output"]?@"output":nil; + _addMask.enabled=![_selectedNode isEqual:@"output"];_deleteLayer.enabled=![_selectedNode isEqual:@"output"]; if(_selectedMask)_editorMode=1;else if(![_editorNode isEqual:_selectedNode]||_editorMode==1)_editorMode=[type isEqual:@"look"]?2:0; BOOL stamp=DYSharedMaskWithID(_toolDocument,_selectedMask)[@"stampSource"]!=nil; _selectionTitle.stringValue=_selectedMask?(stamp?@"仿制图章 · 编辑与跟踪":@"蒙版 · 编辑与跟踪"):DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;} @@ -123,7 +125,7 @@ - (void)addWorkspaceMaskKind:(NSMenuItem*)sender {[self createWorkspaceMask:sender.tag];} - (void)createWorkspaceMask:(NSInteger)kind { idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*ID=nil; - [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(_hasUserSelection&&node.length&&![node isEqual:@"shared"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} + [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(_hasUserSelection&&node.length&&![node isEqual:@"shared"]&&![node isEqual:@"output"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} if(!ID)return;[_selectedMask release];_selectedMask=ID;if(!_hasUserSelection||!_selectedNode){[_selectedNode release];_selectedNode=[@"shared" copy];}_editorMode=1;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"document":_toolDocument?:@{},@"draw":@(kind==2),@"drawShape":@(kind==0||kind==1)}]; } @@ -156,7 +158,7 @@ if(sender.tag<0||sender.tag>=_layerRows.count)return;NSDictionary*row=_layerRows[sender.tag];NSString*ID=row[@"node"];idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO; [a startAction:self];idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"启用或旁路模块与蒙版"];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document); if(row[@"mask"]){NSMutableDictionary*mask=nil;for(NSMutableDictionary*m in DYMasksForTool(doc,ID))if([m[@"id"]isEqual:row[@"mask"]])mask=m;if(mask){mask[@"enabled"]=@(![mask[@"enabled"]boolValue]);changed=DYWriteTools(host,doc,a.currentTime);}} - else {NSDictionary*node=DYToolWithID(doc,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];NSDictionary*section=DYWorkspaceSection(type);idtarget=node?[[[DYToolManager alloc]initWithHost:host node:node]autorelease]:host;idaction=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:self];@try{double value=0;[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[section[@"enabled"]unsignedIntValue]atTime:a.currentTime];double extra=0;if(section[@"extraEnabled"])[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&extra fromParameter:[section[@"extraEnabled"]unsignedIntValue]atTime:a.currentTime];value=MAX(value,extra);idset=[target apiForProtocol:@protocol(FxParameterSettingAPI_v6)];NSMutableArray*flags=[NSMutableArray array];if(section[@"enabled"])[flags addObject:section[@"enabled"]];if(section[@"extraEnabled"])[flags addObject:section[@"extraEnabled"]];[flags addObjectsFromArray:section[@"enableParameters"]?:@[]];for(NSNumber*pid in flags)changed=[set setFloatValue:value>=.5?0:1 toParameter:pid.unsignedIntValue atTime:a.currentTime]||changed;}@finally{[action endAction:self];}} + else {NSDictionary*node=DYToolWithID(doc,ID);NSString*type=[ID isEqual:@"output"]?@"output":node?node[@"type"]:[ID substringFromIndex:5];NSDictionary*section=DYWorkspaceSection(type);idtarget=node?[[[DYToolManager alloc]initWithHost:host node:node]autorelease]:host;idaction=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[action startAction:self];@try{double value=0;[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[section[@"enabled"]unsignedIntValue]atTime:a.currentTime];double extra=0;if(section[@"extraEnabled"])[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&extra fromParameter:[section[@"extraEnabled"]unsignedIntValue]atTime:a.currentTime];value=MAX(value,extra);idset=[target apiForProtocol:@protocol(FxParameterSettingAPI_v6)];NSMutableArray*flags=[NSMutableArray array];if(section[@"enabled"])[flags addObject:section[@"enabled"]];if(section[@"extraEnabled"])[flags addObject:section[@"extraEnabled"]];if(!([type isEqual:@"primary"]&&DYUnifiedColorState(DYReadAssets(host,a.currentTime).colorManagement)))[flags addObjectsFromArray:section[@"enableParameters"]?:@[]];for(NSNumber*pid in flags)changed=[set setFloatValue:value>=.5?0:1 toParameter:pid.unsignedIntValue atTime:a.currentTime]||changed;}@finally{[action endAction:self];}} }@finally{if(grouped)[undo endUndoGroup];[a endAction:self];}if(changed)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; } - (void)deleteWorkspaceSelection:(id)sender { diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index ef3c61c..2d46eb8 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.16.0 + 1.17.0 CFBundleVersion - 97 + 98 NSHumanReadableCopyright PlugInKit @@ -71,7 +71,7 @@ uuid 1C17B73B-F229-4C09-A434-EAF6DFF5F22A version - 1.16.0 + 1.17.0 className diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 8836079..a4a17d3 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.16.0 + 1.17.0 CFBundleVersion - 97 + 98 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright