From 7bac613f4a0b5f3b4a8e9eb2dc8b8bf5ca74c3fb Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 23:23:52 +0800 Subject: [PATCH] fix: preserve native reference and partial black-white branches for anchored layers; pass 281 native integration checks --- research/MaskWorkflow1.4.1.md | 33 +++++++++++++++++ template/sources/RegisteredParameters.json | 4 +-- tools/build_masked_kernel.py | 7 +++- tools/create_mask_host_fixture.py | 6 ++-- 大鱼调色/Plugin/DYGrade.metal | 15 ++++---- 大鱼调色/Plugin/DYRenderer.mm | 18 ++++++---- 大鱼调色/Plugin/DYToolCanvasEditing.inc.h | 6 ++-- 大鱼调色/Plugin/DYToolGPU.h | 2 +- 大鱼调色/Plugin/DYToolHostIvars.inc.h | 1 + 大鱼调色/Plugin/DYToolHostMethods.inc.h | 4 +-- .../Plugin/DYToolInsertionDiagnostics.inc.h | 24 +++++++++++-- 大鱼调色/Plugin/DYToolOSC.inc.h | 3 +- 大鱼调色/Plugin/DYToolPenDiagnostics.inc.h | 1 + 大鱼调色/Plugin/DYToolRender.inc.h | 35 ++++++++++++++++--- 大鱼调色/Plugin/DYToolTrackingProbe.inc.h | 2 ++ 15 files changed, 129 insertions(+), 32 deletions(-) create mode 100644 research/MaskWorkflow1.4.1.md diff --git a/research/MaskWorkflow1.4.1.md b/research/MaskWorkflow1.4.1.md new file mode 100644 index 0000000..9fd8157 --- /dev/null +++ b/research/MaskWorkflow1.4.1.md @@ -0,0 +1,33 @@ +# 1.4.1:就地插层、蒙版可读性和钢笔修复 + +基线为1.4.0(24)后的主分支 `745aa1626e1df368290fbbd47a716ff3ce9ca630`。本轮原生Release构建281项检查通过,独立跟踪18项检查通过。正式签名、公证、宿主和安装包状态分别以 `verification/Delivery.json`、宿主记录、`Package.json`、`Release.json` 为准;此说明不代替实机验收。 + +## 插入位置与运算 + +新建工具文档schema2的节点保存 `after` 锚点,可引用原工具或另一个工具UUID。点击原HSL或新增HSL的“再加一层”,新层立即排在该层之后。再次点击原层时插在原层与此前第二层之间;删除层重接后续节点。参数仍从初始化值开始,独立保存身份、折叠、启停、蒙版和资源。 + +schema1及没有after的既有1.4.0尾部层保留原位置和原数学,不在打开旧工程时偷偷改变调色;新层和旧尾部层的子层可并存。序号按当前显示位置生成,作者身份始终为UUID。 + +原固定融合链的操作顺序早于当前界面分组,不重新排列旧模块。活跃插入通过独立分段内核执行在原工具的实际阶段之后;基础调整在第二阶段后、CST在前段、蜘蛛盘在原末端。原始内核保留,没有活跃新增层时使用原融合路径,初始化新层像素精确直通。 + +分段保留首次CST后的原图,供原邻域、白点统计、亮度权重和蒙版取样;保留原uniform及旧输入LUT,只禁止后段再次CST。肤色参考保留在原HSL之前。部分黑白混合若被黑白/LUT锚点切开,在共同前缀后保留黑白与彩色两支,原肤色之后混合,再执行新增肤色与一次蜘蛛盘。可证明全零覆盖的额外工具直接复制输入,避免空蒙版额外裁切HDR/负值。 + +HSL与后续颜色分级、红通道曲线与HSL的独立非交换参照,以及Cube同序检查通过。CST、原三原色+白点统计/纹理、旧输入LUT、亮度选区、肤色、基础第二阶段、部分黑白混合和蜘蛛盘的零覆盖插层参照通过,分段半浮点最大差异约0.001465。此差异不适用于所有素材和参数组合的精度保证。 + +## 蒙版控件与钢笔 + +面板参数与数字为13pt,状态12pt;数值框88×32pt,滑条单独占一行,操作按钮32–36pt高,跟踪按钮两列三行。六种类型在220/300/420pt宽度的边界、不重叠、字号和目标尺寸检查通过。画面工具栏依据宿主backingScaleFactor绘制,短画面换列。 + +修复检视器添加钢笔未携带绘制态的问题,提供“重画钢笔”“完成绘制”“取消绘制”。点击放点、按住拖出共线双柄,鼠标移动显示下一段预览;至少三个点时点首节点、Return或完成按钮闭合。Delete回退未提交点,选中已闭合路径节点可删除(至少保留三点)。Esc/取消恢复原作者路径。绘制中禁用跟踪,完成或取消后恢复。 + +OSC回调只在锁内更新内存草稿,立即供下一次绘制读取;宿主参数提交留到回调结束后的主队列,形成一次撤销。连续手势排队保留,跨帧草稿、过期目标和迟到模式通知拒绝覆盖。绘制、命中和坐标缓存也有自身互斥。原生检查覆盖检视器入口、默认形状外放点、即时预览、曲柄、首节点/Return闭合、完成/取消按钮、归档、连续手势和跨帧拒绝。 + +## Color Finale 对照与跟踪 + +本机Color Finale 2.16.2(625)只读静态证据、精确产物摘要和迁移边界见 `ColorFinaleMasksFollowup.md/.json`。没有复制原版反编译源码、二进制、图标或运行库作为产品依赖。 + +修复原跟踪器将钢笔区域预先裁到创建框±0.5的问题。特征搜索边界由实际变换后的路径推导,保留真实多边形判断;300特征、相对质量0.03、10像素间隔、亚像素精炼、21×21 LK、最多4级、30次迭代、每两帧重检测。继续保留现有严格仿射拟合、置信度、丢失停止和手工键优先。宿主实际分析采样上限3840×2160,兼顾像素长宽比。 + +默认框外钢笔纹理在旧版检出0点、无法启动,新版117点;12帧亚像素运动末帧误差约X0.0073/Y0.0323像素。独立CPU与真实Metal18项覆盖300点容量、旋转、独立缩放、静止、换景/低纹理拒绝及4K;本产品281项原生集成同时覆盖实际插件FxAnalyzer回调的精确帧序、撤销、取消和过期写入。 + +这些是有证据的独立重建与适配,不代表Color Finale全部蒙版系统已经完整迁移。B样条、多选/编组、图像/人物/外部蒙版、来源和轨迹区段编辑等差异见专项清单;未进行同一真实视频的完整原版轨迹等价对照。旧系统、Intel、Motion和非方像素/变速工程仍需实机覆盖。 diff --git a/template/sources/RegisteredParameters.json b/template/sources/RegisteredParameters.json index 1615cd9..ec85bda 100644 --- a/template/sources/RegisteredParameters.json +++ b/template/sources/RegisteredParameters.json @@ -3071,8 +3071,8 @@ "大鱼调色/Plugin/DYModel.h": "80e88add97deeac7a9dc47d12f68b0245905786297de2e6553b3da15c729da6e", "大鱼调色/Plugin/DYModel.mm": "beadabb0773e911581dedc263f55a49e03dde6e6d1fc2329df18cb384710d234", "大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9", - "大鱼调色/Plugin/DYToolState.h": "a1b0e328faae5dce7bb8497186f028a45d2da4f1a87e1980cd30c7a59a098a9f", - "大鱼调色/Plugin/DYToolState.mm": "2d8aefba3ddd1ab06fe63025c29efc5e6a4e586ce33486c8aceb7352e8ed6099", + "大鱼调色/Plugin/DYToolState.h": "28088ec819307a60f2e52334fd807a514c3ff8a550bc0efbe7069b68a6242320", + "大鱼调色/Plugin/DYToolState.mm": "9ddc4b7509ad63fc24d1724359b4a218609f90b971eee57f6cdeda0c1b309129", "大鱼调色/Plugin/DYUniforms.h": "8ef480025c739b29f55884ba0c7218e9d6fd8d80c46cfc72d6ee3da90215abe4", "大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16", "大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2", diff --git a/tools/build_masked_kernel.py b/tools/build_masked_kernel.py index b5f2d21..92391b7 100644 --- a/tools/build_masked_kernel.py +++ b/tools/build_masked_kernel.py @@ -31,7 +31,7 @@ def masked_kernel(source): # A second, explicitly ranged entry lets anchored extra tools interrupt the # existing native instruction order. The historical entry above is unchanged. segment = body.replace('@dy_gradeMasked(', '@dy_gradeSegment(', 1) - segment = segment.replace(') local_unnamed_addr #0 {', ', i32 %dyStageFirst, i32 %dyStageLast, <3 x float> %dyExternalSkinReference) local_unnamed_addr #0 {', 1) + segment = segment.replace(') local_unnamed_addr #0 {', ', i32 %dyStageFirst, i32 %dyStageLast, <3 x float> %dyExternalSkinReference, <3 x float> %dyOriginalReference) local_unnamed_addr #0 {', 1) for stage, (value, before, section) in enumerate(stages): target = f' %dyScalar{value} = insertelement <3 x float> undef, float %dyWeight{section}, i64 0' replacement = '\n'.join([ @@ -46,6 +46,11 @@ def masked_kernel(source): assert skin_call in segment segment = segment.replace(skin_call, ' %dyHasLocalSkinReference = icmp ule i32 %dyStageFirst, 5\n %dySkinReference = select i1 %dyHasLocalSkinReference, <3 x float> %v411, <3 x float> %dyExternalSkinReference\n'+skin_call, 1) segment = segment.replace('(<3 x float> %v668, <3 x float> %v411,', '(<3 x float> %v668, <3 x float> %dySkinReference,', 1) + # Highlight/shadow spatial weighting uses the same original post-CST + # reference as the historical fused function, not a later segment's input. + original_luma = next(line for line in segment.splitlines() if line.startswith(' %v213 = ')) + assert '@air.dot.v3f32(<3 x float> %v53,' in original_luma + segment = segment.replace(original_luma, original_luma.replace('<3 x float> %v53,', '<3 x float> %dyOriginalReference,'), 1) clamp = next(line for line in segment.splitlines() if line.startswith(' %v672 = ')) segment = segment.replace(clamp, '\n'.join([ clamp.replace('%v672 = ', '%dyClamped672 = ', 1), diff --git a/tools/create_mask_host_fixture.py b/tools/create_mask_host_fixture.py index a66fed0..6e17d5d 100644 --- a/tools/create_mask_host_fixture.py +++ b/tools/create_mask_host_fixture.py @@ -6,7 +6,7 @@ out=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa');out.mkdi media=out/'大鱼调色_蒙版合成运动.mov' if not media.exists(): subprocess.run(['/opt/homebrew/bin/ffmpeg','-v','error','-f','lavfi','-i',"nullsrc=s=1080x640:r=25:d=4,geq=lum='128+70*sin(X/11)*cos(Y/9)+35*sin((X+Y)/4)':cb='128+35*sin(X/17)':cr='128+35*cos(Y/21)',crop=960:540:'40+10*t':'40+5*t'",'-c:v','prores_ks','-profile:v','2','-pix_fmt','yuv422p10le','-color_primaries','bt709','-color_trc','bt709','-colorspace','bt709',str(media)],check=True) -root=E.Element('fcpxml',version='1.12');res=E.SubElement(root,'resources');E.SubElement(res,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)');a=E.SubElement(res,'asset',id='a1',name='合成运动纹理',start='0s',duration='4s',format='f1',hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=media.as_uri());template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef');E.SubElement(res,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri());lib=E.SubElement(root,'library');event=E.SubElement(lib,'event',name='大鱼调色_1.4_23_蒙版与工具层验收') -for name in ['大鱼调色_1.4_23_独立工具与蒙版','大鱼调色_1.4_23_逐帧跟踪']: +root=E.Element('fcpxml',version='1.12');res=E.SubElement(root,'resources');E.SubElement(res,'format',id='f1',width='960',height='540',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)');a=E.SubElement(res,'asset',id='a1',name='合成运动纹理',start='0s',duration='4s',format='f1',hasVideo='1',videoSources='1');E.SubElement(a,'media-rep',kind='original-media',src=media.as_uri());template=Path('/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef');E.SubElement(res,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri());lib=E.SubElement(root,'library');event=E.SubElement(lib,'event',name='大鱼调色_1.4.1_25_蒙版与工具层验收') +for name in ['大鱼调色_1.4.1_25_独立工具与蒙版','大鱼调色_1.4.1_25_逐帧跟踪']: project=E.SubElement(event,'project',name=name);seq=E.SubElement(project,'sequence',format='f1',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k',duration='4s');spine=E.SubElement(seq,'spine');clip=E.SubElement(spine,'asset-clip',ref='a1',name=name,offset='0s',start='0s',duration='4s');E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1') -E.indent(root);xml=out/'大鱼调色_1.4_23_蒙版与工具层.fcpxml';xml.write_text('\n\n'+E.tostring(root,encoding='unicode')+'\n');print(xml) +E.indent(root);xml=out/'大鱼调色_1.4.1_25_蒙版与工具层.fcpxml';xml.write_text('\n\n'+E.tostring(root,encoding='unicode')+'\n');print(xml) diff --git a/大鱼调色/Plugin/DYGrade.metal b/大鱼调色/Plugin/DYGrade.metal index 85cafbc..97f36ee 100644 --- a/大鱼调色/Plugin/DYGrade.metal +++ b/大鱼调色/Plugin/DYGrade.metal @@ -23,7 +23,7 @@ extern "C" half4 dy_gradeSegment(half4 sample, float2 uv, texture2d source texture3d look3, texture3d look4, texture3d look5, texture3d hslMixer, texture3d whiteBalance, texture3d colorGrading, constant DYUniforms& uniforms, - constant float& sceneLevel,float w0,float w1,float w2,float w3,float w4,float w5,float w6,float w7,float w8,float w9,float w10,float w11,uint stageFirst,uint stageLast,float3 skinReference); + constant float& sceneLevel,float w0,float w1,float w2,float w3,float w4,float w5,float w6,float w7,float w8,float w9,float w10,float w11,uint stageFirst,uint stageLast,float3 skinReference,float3 originalReference); struct DYRaster { float4 position [[position]]; @@ -207,18 +207,21 @@ fragment half4 dySegmentFragment(DYRaster in [[stage_in]], device const DYToolMaskEntry* masks [[buffer(6)]], constant DYToolMaskHeader& maskHeader [[buffer(7)]], constant DYToolStageRange& stages [[buffer(8)]], - texture2d skinReference [[texture(10)]]) { + texture2d skinReference [[texture(10)]], + texture2d nativeSource [[texture(11)]]) { constexpr sampler sampleFilter(coord::normalized, address::clamp_to_edge, filter::linear); half4 sample = source.sample(sampleFilter, in.uv); if (!(sample.a > half(0.0))) return half4(0.0h); - float weights[12];float3 encoded=dyToolEncode(float3(sample.rgb)); + half4 originalSample=nativeSource.sample(sampleFilter,in.uv); + float weights[12];float3 encoded=dyToolEncode(float3(originalSample.rgb)); for(int i=0;i<12;i++)weights[i]=dyToolCoverage(in.uv,encoded,masks,maskHeader,i); + if(stages.suppressBlackWhite)weights[10]=0; half4 reference=skinReference.sample(sampleFilter,in.uv); float3 skinEncoded=dyToolEncode(reference.a>half(0)?float3(reference.rgb/reference.a):float3(0)); - half4 result = dy_gradeSegment(sample, in.uv, source, preLUT, look1, look2, look3, - look4, look5, hslMixer, whiteBalance, colorGrading, uniforms, sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],uint(stages.first),uint(stages.last),skinEncoded); + half4 result = dy_gradeSegment(sample, in.uv, nativeSource, preLUT, look1, look2, look3, + look4, look5, hslMixer, whiteBalance, colorGrading, uniforms, sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],uint(stages.first),uint(stages.last),skinEncoded,encoded); if(stages.first<=9 && stages.last>=9 && options.blackWhiteMix>0.0f && options.blackWhiteMix<1.0f) { - half4 color=dy_gradeSegment(sample,in.uv,source,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],uint(stages.first),uint(stages.last),skinEncoded); + half4 color=dy_gradeSegment(sample,in.uv,nativeSource,preLUT,look1,look2,look3,look4,look5,hslMixer,whiteBalance,colorGrading,colorUniforms,sceneLevel,weights[0],weights[1],weights[2],weights[3],weights[4],weights[5],weights[6],weights[7],weights[8],weights[9],weights[10],weights[11],uint(stages.first),uint(stages.last),skinEncoded,encoded); result.rgb=mix(color.rgb,result.rgb,half(options.blackWhiteMix)); } result.a = sample.a; diff --git a/大鱼调色/Plugin/DYRenderer.mm b/大鱼调色/Plugin/DYRenderer.mm index 6648afb..7a4f548 100644 --- a/大鱼调色/Plugin/DYRenderer.mm +++ b/大鱼调色/Plugin/DYRenderer.mm @@ -130,15 +130,15 @@ static void bypassIdleSkin(DYUniforms *u){ } - (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths error:(NSError**)err{return [self renderSource:src destination:dst uniforms:u paths:paths spider:nil error:err];} - (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider error:(NSError**)err{return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:@{} error:err];} -- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks error:(NSError**)err{return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:masks stageFirst:-1 stageLast:-1 skinReference:nil error:err];} -- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks stageFirst:(NSInteger)stageFirst stageLast:(NSInteger)stageLast skinReference:(FxImageTile*)skinReference error:(NSError**)err{@synchronized(self){@autoreleasepool{ +- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks error:(NSError**)err{return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:masks stageFirst:-1 stageLast:-1 skinReference:nil originalReference:nil captureOriginal:nullptr suppressBlackWhite:NO error:err];} +- (BOOL)renderLegacy:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData *)spider masks:(NSDictionary*)masks stageFirst:(NSInteger)stageFirst stageLast:(NSInteger)stageLast skinReference:(FxImageTile*)skinReference originalReference:(FxImageTile*)originalReference captureOriginal:(DYExportTile**)captureOriginal suppressBlackWhite:(BOOL)suppressBlackWhite error:(NSError**)err{@synchronized(self){@autoreleasepool{ BOOL segmented=stageFirst>=0;if(segmented&&(stageFirst>stageLast||stageLast>11))return fail(err,@"原生工具分段范围无效"); if(spider.length&&!DYSpiderMeshIsValid(spider))return fail(err,@"蜘蛛盘数据无效"); if(u.primarySectionEnabled<.5){u.inputSectionEnabled=0;u.cm.basisEnabled=0;u.cm.outputEnabled=0;} [_activeLUTPaths release];_activeLUTPaths=[[NSSet alloc]initWithArray:paths.allValues?:@[]]; NSMutableDictionary*e=[self device:dst.deviceRegistryID error:err];if(!e)return NO;idd=e[@"device"];idinput=[src metalTextureForDevice:d],output=[dst metalTextureForDevice:d];if(!input||!output)return fail(err,@"宿主图像纹理不可用"); - BOOL useCM=managed(u,paths);bypassNeutralTools(&u);float bwMix=fmaxf(0,fminf(1,u.cm.blackWhiteMix));if(bwMix<=0)u.blackWhiteSectionEnabled=0; + BOOL useCM=managed(u,paths)&&(!segmented||stageFirst==0);bypassNeutralTools(&u);float bwMix=fmaxf(0,fminf(1,u.cm.blackWhiteMix));if(bwMix<=0)u.blackWhiteSectionEnabled=0; NSArray*ts=[self textures:paths uniforms:&u entry:e error:err];if(!ts)return NO;bypassIdleSkin(&u); // Only a deformed active mesh allocates samples; device entries retain the // current buffer across frames. Neutral grids are exact identity at all densities. @@ -159,15 +159,21 @@ static void bypassIdleSkin(DYUniforms *u){ ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyColorManagement"]];[ce setTexture:straight atIndex:0];[ce setTexture:converted atIndex:1];[ce setBytes:&cm length:sizeof(cm) atIndex:0];[ce setBytes:&u.cm.mix length:4 atIndex:1];[ce dispatchThreads:MTLSizeMake(input.width,input.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[ce endEncoding];if(hasMasks){idblended=[d newTextureWithDescriptor:td];if(!blended){[converted release];[straight release];return fail(err,@"无法分配一级蒙版缓冲区");}maskHeader.section=0;maskHeader.premultiplied=0;[self encodeBlend:straight after:converted output:blended masks:maskBuffer header:maskHeader entry:e commands:cb];[converted release];converted=blended;}[straight release];straight=converted; } } + // Keep the actual post-CST straight source alive across all native segments. + // Both native spatial helpers and whites statistics historically read this + // source; the current segment's center color is a different input. + idnativeSource=segmented&&originalReference?[originalReference metalTextureForDevice:d]:straight; + if(!nativeSource){[straight release];return fail(err,@"原生工具参考纹理不可用");} + if(segmented&&captureOriginal&&!*captureOriginal){DYExportTile *reference=[[DYExportTile alloc]initWithTexture:nativeSource registry:d.registryID];[reference setBounds:src.tilePixelBounds origin:src.imageOrigin];[reference setPixelAspect:src.pixelAspect];*captureOriginal=reference;} float level=.5;idscene=[d newBufferWithBytes:&level length:4 options:MTLResourceStorageModeShared]; - if(!_exporting&&(!segmented||(stageFirst<=2&&stageLast>=2))&&u.whites>0&&u.whitesEnabled>.5&&u.baseSectionEnabled>.5){ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyWhitesSceneStatistics"]];[ce setTexture:straight atIndex:0];[ce setTexture:ts[7] atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];[ce setBuffer:scene offset:0 atIndex:1];[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];} - BOOL preview=NO;@synchronized(_previewLock){preview=!_exporting&&CACurrentMediaTime()-_lastPreview>.5;}idpb=nil;if(preview){pb=[d newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyInputAnalysis"]];[ce setTexture:straight atIndex:0];[ce setTexture:ts[0] atIndex:1];float inputStrength=u.inputSectionEnabled>.5?u.preLUTStrength:0;[ce setBytes:&inputStrength length:4 atIndex:1];[ce setBuffer:pb offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];} + if(!_exporting&&(!segmented||(stageFirst<=2&&stageLast>=2))&&u.whites>0&&u.whitesEnabled>.5&&u.baseSectionEnabled>.5){ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyWhitesSceneStatistics"]];[ce setTexture:nativeSource atIndex:0];[ce setTexture:ts[7] atIndex:1];[ce setBytes:&u length:sizeof(u) atIndex:0];[ce setBuffer:scene offset:0 atIndex:1];[ce dispatchThreadgroups:MTLSizeMake(1,1,1) threadsPerThreadgroup:MTLSizeMake(256,1,1)];[ce endEncoding];} + BOOL preview=NO;@synchronized(_previewLock){preview=(!segmented||stageFirst==0)&&!_exporting&&CACurrentMediaTime()-_lastPreview>.5;}idpb=nil;if(preview){pb=[d newBufferWithLength:320*180*16 options:MTLResourceStorageModeShared];ce=[cb computeCommandEncoder];[ce setComputePipelineState:e[@"dyInputAnalysis"]];[ce setTexture:straight atIndex:0];[ce setTexture:ts[0] atIndex:1];float inputStrength=u.inputSectionEnabled>.5?u.preLUTStrength:0;[ce setBytes:&inputStrength length:4 atIndex:1];[ce setBuffer:pb offset:0 atIndex:0];[ce dispatchThreads:MTLSizeMake(320,180,1) threadsPerThreadgroup:MTLSizeMake(8,8,1)];[ce endEncoding];} MTLRenderPassDescriptor*rp=[MTLRenderPassDescriptor renderPassDescriptor];rp.colorAttachments[0].texture=output;rp.colorAttachments[0].loadAction=MTLLoadActionDontCare;rp.colorAttachments[0].storeAction=MTLStoreActionStore;idre=[cb renderCommandEncoderWithDescriptor:rp];[re setRenderPipelineState:pipeline]; float w=output.width,h=output.height;FxRect s=src.tilePixelBounds,t=dst.tilePixelBounds;float sw=s.right-s.left,sh=s.top-s.bottom;float l=(t.left-s.left)/sw,r=(t.right-s.left)/sw,top=(s.top-t.top)/sh,bottom=(s.top-t.bottom)/sh; if(src.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){top=1-top;bottom=1-bottom;} DYVertex2D vs[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}}; if(dst.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(int i=0;i<4;i++)vs[i].position.y=-vs[i].position.y; - vector_uint2 vp={(unsigned)output.width,(unsigned)output.height};[re setVertexBytes:vs length:sizeof(vs) atIndex:0];[re setVertexBytes:&vp length:sizeof(vp) atIndex:1];[re setViewport:(MTLViewport){0,0,w,h,0,1}];[re setFragmentTexture:straight atIndex:0];for(NSUInteger i=0;i_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release]; } - (void)discardToolCanvasDraft { - @synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; + @synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; } - (void)commitToolCanvasDraftAtTime:(CMTime)eventTime { NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision; @@ -58,7 +58,9 @@ if(count<=3){[self postToolCanvasStatus:@"闭合路径至少保留三个点;可使用重画钢笔重新绘制。"];return;} [self toolCanvasEvent:NSEventTypeLeftMouseDown point:point part:_toolDragPart modifiers:modifiers key:0 time:time];NSMutableData *nodes=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];[nodes replaceBytesInRange:NSMakeRange(index*sizeof(DYBezierNode),sizeof(DYBezierNode)) withBytes:NULL length:0];_toolCanvasDraft[@"nodes"]=nodes;[self commitToolCanvasDraftAtTime:time];return; } + if(type==NSEventTypeMouseMoved){if(_toolDrawingPen){if(_toolCanvasDraft&&CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;}_toolCanvasHoverPoint=point;_toolCanvasHasHover=[_toolCanvasDraft[@"nodes"]length]>0;}return;} if(type==NSEventTypeLeftMouseDown){ + _toolCanvasHasHover=NO; if(_toolDrawingPen&&part==1000&&[_toolCanvasDraft[@"nodes"]length]>=3*sizeof(DYBezierNode)){[self commitToolCanvasDraftAtTime:time];return;} if(!_toolCanvasDraft){NSDictionary *mask=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!mask)return;++_toolCanvasRevision;_toolCanvasOriginal=[DYMutablePlist(mask)retain];_toolCanvasDraft=[DYMutablePlist(mask)retain];_toolCanvasEditTime=time;_toolDragParameters=DYMaskAtTime(mask,time);_toolDragParameters.imageAspect=_toolSourceFrame.valid()?float(_toolSourceFrame.width)/_toolSourceFrame.height:1;_toolCanvasDraft[@"parameters"]=[NSData dataWithBytes:&_toolDragParameters length:sizeof(DYMaskParameters)];_toolCanvasDraft[@"keys"]=@[];if(_toolDrawingPen)_toolCanvasDraft[@"nodes"]=[NSData data];} if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;} @@ -67,7 +69,7 @@ } if(!_toolCanvasDraft)return; if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];return;} - if(type==NSEventTypeLeftMouseDragged){DYMaskParameters p=_toolDragParameters;float dx=point.x-_toolDragStart.x,dy=point.y-_toolDragStart.y; + if(type==NSEventTypeLeftMouseDragged){_toolCanvasHasHover=NO;DYMaskParameters p=_toolDragParameters;float dx=point.x-_toolDragStart.x,dy=point.y-_toolDragStart.y; if(_toolDrawingPen||_toolDragPart>=1000){NSMutableData *data=[[_toolCanvasDraft[@"nodes"]mutableCopy]autorelease];NSUInteger count=data.length/sizeof(DYBezierNode);if(count){auto *nodes=(DYBezierNode*)data.mutableBytes;NSUInteger index=_toolDrawingPen?count-1:(_toolDragPart-1000)/3,handle=_toolDrawingPen?2:(_toolDragPart-1000)%3;float a=p.imageAspect,c=cos(p.angle),s=sin(p.angle),x=((point.x-p.centerX)*a*c+(point.y-p.centerY)*s)/(p.width*a),y=(-(point.x-p.centerX)*a*s+(point.y-p.centerY)*c)/p.height;if(index=2&&_toolDragPart<=5){float a=p.imageAspect,c=cos(p.angle),s=sin(p.angle),x=(point.x-p.centerX)*a,y=point.y-p.centerY;p.width=MAX(.001f,2*fabs(x*c+y*s)/a);p.height=MAX(.001f,2*fabs(-x*s+y*c));} diff --git a/大鱼调色/Plugin/DYToolGPU.h b/大鱼调色/Plugin/DYToolGPU.h index 676327b..eaf013c 100644 --- a/大鱼调色/Plugin/DYToolGPU.h +++ b/大鱼调色/Plugin/DYToolGPU.h @@ -2,4 +2,4 @@ #include "MaskCore/DYMaskOperator.h" struct DYToolMaskEntry {DYResolvedMask mask;int section,combine;}; struct DYToolMaskHeader {unsigned count;float offsetX,offsetY,scaleX,scaleY;int section,premultiplied;}; -struct DYToolStageRange {int first,last;}; +struct DYToolStageRange {int first,last,suppressBlackWhite;}; diff --git a/大鱼调色/Plugin/DYToolHostIvars.inc.h b/大鱼调色/Plugin/DYToolHostIvars.inc.h index d4aa0f9..26cd00c 100644 --- a/大鱼调色/Plugin/DYToolHostIvars.inc.h +++ b/大鱼调色/Plugin/DYToolHostIvars.inc.h @@ -2,6 +2,7 @@ NSTimer *_toolAnalysisTimer; BOOL _toolCaptureEnabled,_toolCanvasHidden,_toolDrawingPen,_toolShowCoverage,_toolCanvasCommitPending; NSMutableDictionary *_toolCanvasDraft,*_toolCanvasOriginal;NSDictionary *_toolCanvasDocument; + NSPoint _toolCanvasHoverPoint;BOOL _toolCanvasHasHover; NSPoint _toolDragStart;DYMaskParameters _toolDragParameters;NSInteger _toolDragPart; CMTime _toolCanvasEditTime;uint64_t _toolCanvasRevision; dy::GrayFrame _toolSourceFrame,_trackingReferenceFrame; diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index 8011da9..9db9b38 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -25,11 +25,11 @@ } - (void)toolCanvasSelection:(NSNotification*)notification { NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected"); - @synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":@"已选中本层蒙版"]; + @synchronized(self){if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":@"已选中本层蒙版"]; } - (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}} - (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time { - @synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;NSDictionary *m=_toolCanvasDraft?:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"coverage":@(_toolShowCoverage)};} + @synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;NSDictionary *m=_toolCanvasDraft?:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage)};} } - (void)toolTrackRequested:(NSNotification*)notification { NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消钢笔绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;} diff --git a/大鱼调色/Plugin/DYToolInsertionDiagnostics.inc.h b/大鱼调色/Plugin/DYToolInsertionDiagnostics.inc.h index 4b3f35a..8a89ac5 100644 --- a/大鱼调色/Plugin/DYToolInsertionDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolInsertionDiagnostics.inc.h @@ -17,9 +17,27 @@ NSMutableDictionary *extra=(id)doc[@"layers"][0];extra[@"values"][@"hsl1_2"]=@55;DYUniforms baseHSLOnly=base;baseHSLOnly.colorGradingSectionEnabled=0;Pixels first=render(run,renderer,source,destination,gpu,baseHSLOnly,@{},@"insertion-base-hsl-reference");DYDiagnosticTile *intermediate=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:width height:height]autorelease];upload(intermediate,first);Pixels second=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(extra),@{},@"insertion-extra-hsl-reference");upload(intermediate,second);DYUniforms grading=DYToolUniforms(@{@"type":@"grading"});grading.colorGradingHueSatA.x=210;grading.colorGradingHueSatA.y=42;grading.colorGradingLuma.x=18;Pixels expected=render(run,renderer,intermediate,destination,gpu,grading,@{},@"insertion-later-native-grading-reference");Pixels actual=renderInserted(doc,base,@"anchored-hsl-before-grading-render");run.record(@"anchored-hsl-executes-before-later-native-grading",difference(expected,actual).maximum<.004,measure(difference(expected,actual))); NSMutableDictionary *tail=DYMutablePlist(doc);[tail[@"layers"][0]removeObjectForKey:@"after"];tail[@"schema"]=@1;Pixels oldTail=renderInserted(tail,base,@"historical-tail-hsl-render");run.record(@"anchored-hsl-is-not-only-a-visual-move-from-tail",difference(actual,oldTail).different>20,measure(difference(actual,oldTail))); // Two anchors must follow the legacy native operation order, not insertion time. - doc=DYMutablePlist(empty.document);NSMutableDictionary *hsl=(id)DYInsertTool(doc,@"hsl",@"base:hsl");hsl[@"values"][@"hsl0_0"]=@35;NSMutableDictionary *curve=(id)DYInsertTool(doc,@"curve",@"base:curve");curve[@"values"][@"curveY0"]=@.25; - DYUniforms neutralBase=DYToolUniforms(@{@"type":@"hsl"});first=render(run,renderer,source,destination,gpu,DYToolUniforms(curve),@{},@"anchored-curve-first-reference");upload(intermediate,first);expected=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(hsl),@{},@"anchored-hsl-second-reference");actual=renderInserted(doc,neutralBase,@"two-native-anchor-render");run.record(@"two-anchors-preserve-native-curve-before-hsl-operation-order",difference(expected,actual).maximum<.004,measure(difference(expected,actual))); - first=render(run,renderer,source,destination,gpu,DYToolUniforms(hsl),@{},@"wrong-hsl-before-curve-reference");upload(intermediate,first);Pixels wrong=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(curve),@{},@"wrong-curve-after-hsl-reference");run.record(@"anchor-reference-operations-are-noncommuting",difference(expected,wrong).different>20,measure(difference(expected,wrong))); + doc=DYMutablePlist(empty.document);NSMutableDictionary *hsl=(id)DYInsertTool(doc,@"hsl",@"base:hsl");hsl[@"values"][@"hsl0_0"]=@35;NSMutableDictionary *curve=(id)DYInsertTool(doc,@"curve",@"base:curve");curve[@"values"][@"curveY4"]=@32;curve[@"values"][@"curveY5"]=@(-24);curve[@"values"][@"channel0X0"]=@.25;curve[@"values"][@"channel0X1"]=@.75; + DYUniforms neutralBase=DYToolUniforms(@{@"type":@"hsl"});first=render(run,renderer,source,destination,gpu,DYToolUniforms(curve),@{},@"anchored-curve-first-reference");run.record(@"curve-anchor-reference-materially-adjusts-red-channel",difference(first,input).different>20&&difference(first,input).maximum>.01,measure(difference(first,input)));upload(intermediate,first);expected=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(hsl),@{},@"anchored-hsl-second-reference");actual=renderInserted(doc,neutralBase,@"two-native-anchor-render");run.record(@"two-anchors-preserve-native-curve-before-hsl-operation-order",difference(expected,actual).maximum<.004,measure(difference(expected,actual))); + first=render(run,renderer,source,destination,gpu,DYToolUniforms(hsl),@{},@"wrong-hsl-before-curve-reference");upload(intermediate,first);Pixels wrong=render(run,renderer,intermediate,destination,gpu,DYToolUniforms(curve),@{},@"wrong-curve-after-hsl-reference");run.record(@"anchor-reference-operations-are-noncommuting",difference(expected,wrong).different>20&&difference(expected,wrong).maximum>.005,measure(difference(expected,wrong))); + + // A changed tool with a zero-strength mask forces the anchored scheduler but + // contributes no correction. Compare against the untouched fused operation to + // catch replayed CST, lost global-white statistics, a displaced spatial source, + // lost pre-HSL skin reference, or moving the original Spider before color work. + auto boundary=[&](NSString *name,DYUniforms u,NSString *anchor,NSData *mesh,NSDictionary *baseMasks=nil){ + NSMutableDictionary *control=DYMutablePlist(empty.document),*baselineDocument=DYMutablePlist(empty.document);if(baseMasks){control[@"baseMasks"]=DYMutablePlist(baseMasks);baselineDocument[@"baseMasks"]=DYMutablePlist(baseMasks);}NSMutableDictionary *node=(id)DYInsertTool(control,@"hsl",anchor);node[@"values"][@"hsl0_0"]=@32;NSMutableDictionary *mask=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters p=DYMaskAtTime(mask,kCMTimeZero);p.strength=0;mask[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];[node[@"masks"]addObject:mask];NSError *failure=nil; + BOOL baselineOK=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:mesh tools:baselineDocument error:&failure];Pixels before=read(destination,gpu);BOOL insertedOK=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:mesh tools:control error:&failure];Pixels after=read(destination,gpu);Difference delta=difference(before,after);BOOL alpha=YES;for(NSUInteger i=0;ivalues;for(NSString *line in [text componentsSeparatedByCharactersInSet:NSCharacterSet.newlineCharacterSet]){float r,g,b;if(sscanf(line.UTF8String,"%f %f %f",&r,&g,&b)==3){values.push_back(r);values.push_back(g);values.push_back(b);}} float codes[3]={.5f,.25f,.75f};Pixels solid(input.size());for(NSUInteger i=0;i3){NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:anchor];[line lineToPoint:handle];[[NSColor colorWithWhite:1 alpha:.55]setStroke];[line stroke];[self addHandle:handle part:1000+i*3+j+1];}}} + NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=NSMakePoint(_imageRect.origin.x+[hover[0]doubleValue]*_imageRect.size.width,_imageRect.origin.y+[hover[1]doubleValue]*_imageRect.size.height);[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];} if(count>=3&&![mask[@"drawing"]boolValue]){auto a=nodes[count-1],b=nodes[0];[_outline curveToPoint:[self canvasPoint:b.x y:b.y parameters:p] controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];[_outline closePath];} }else if(p.kind<2){int count=p.kind==DYMaskEllipse?96:4;for(int i=0;i=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(drawing)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=drawing;} - (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{if(update)*update=NO;} - (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{if(update)*update=NO;} - (void)keyUpAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{if(update)*update=NO;if(handled)*handled=NO;} diff --git a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h index 0a665a7..58cef0d 100644 --- a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h @@ -12,6 +12,7 @@ int undo=base->_undoStarts;BOOL update=NO; auto click=[&](double x,double y){[osc mouseDownAtPositionX:x positionY:y activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:x positionY:y activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];}; click(152,307);snapshot=[plugin toolCanvasMaskAtTime:kCMTimeZero];run.record(@"pen-point-snapshot-updates-before-main-queue-without-author-write",[snapshot[@"nodes"]length]==sizeof(DYBezierNode)&&base->_undoStarts==undo&&[DYReadTools(base,kCMTimeZero).document isEqual:author]); + [osc mouseMovedAtPositionX:240 positionY:280 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];snapshot=[plugin toolCanvasMaskAtTime:kCMTimeZero];run.record(@"pen-cursor-previews-next-segment-without-parameter-or-undo-writes",update&&[snapshot[@"hover"]count]==2&&base->_undoStarts==undo&&[DYReadTools(base,kCMTimeZero).document isEqual:author]); [osc mouseDownAtPositionX:488 positionY:307 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:509 positionY:290 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:509 positionY:290 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];click(320,118); snapshot=[plugin toolCanvasMaskAtTime:kCMTimeZero];NSData *nodes=snapshot[@"nodes"];const DYBezierNode *v=(const DYBezierNode*)nodes.bytes;BOOL handles=nodes.length==3*sizeof(DYBezierNode)&&fabs(v[1].inX+v[1].outX-2*v[1].x)<1e-5&&fabs(v[1].inY+v[1].outY-2*v[1].y)<1e-5&&fabs(v[1].outX-v[1].x)>.01;run.record(@"pen-drag-creates-mirrored-cubic-handles",handles); [osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];[osc hitTestOSCAtMousePositionX:152 mousePositionY:307 activePart:&part atTime:kCMTimeZero];run.record(@"pen-first-anchor-hit-closes-path-after-three-points",part==1000);[osc mouseDownAtPositionX:152 positionY:307 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain(); diff --git a/大鱼调色/Plugin/DYToolRender.inc.h b/大鱼调色/Plugin/DYToolRender.inc.h index 05a6a94..a6f9005 100644 --- a/大鱼调色/Plugin/DYToolRender.inc.h +++ b/大鱼调色/Plugin/DYToolRender.inc.h @@ -24,6 +24,12 @@ // Extra skin keeps the source reference used by the prior release. All other // extra tools reuse the same isolated native tool path and their own mask group. - (BOOL)renderExtraTool:(NSDictionary*)node source:(FxImageTile*)source original:(FxImageTile*)original destination:(FxImageTile*)destination entry:(NSMutableDictionary*)entry error:(NSError**)error { + // Prove a constant-zero aggregate conservatively. In particular a first + // subtract mask of strength zero is full coverage, not an empty selection. + // Skipping only this isolated operation preserves HDR/negative pixels that + // the legacy grading entry would otherwise clip even at zero stage coverage. + BOOL found=NO;float low=1,high=1;for(NSDictionary *mask in node[@"masks"]){if(![mask[@"enabled"]boolValue])continue;DYMaskParameters p=DYMaskAtTime(mask,kCMTimeInvalid);float a=0,b=p.strength==0?0:1;NSInteger combine=[mask[@"combine"]integerValue];if(!found){low=combine==1?1-b:a;high=combine==1?1-a:b;found=YES;}else if(combine==1){low*=1-b;high*=1-a;}else if(combine==2){low*=a;high*=b;}else{low=1-(1-low)*(1-a);high=1-(1-high)*(1-b);}} + if(found&&high==0)return [self copyTile:source to:destination entry:entry error:error]; DYUniforms layer=DYToolUniforms(node);NSString *type=node[@"type"]; if(![type isEqual:@"skin"])return [self renderLegacy:source destination:destination uniforms:layer paths:node[@"paths"] spider:node[@"spider"] masks:@{type:node[@"masks"]} error:error]; idd=entry[@"device"];idbefore=[source metalTextureForDevice:d],input=[original metalTextureForDevice:d],after=[destination metalTextureForDevice:d]; @@ -40,7 +46,7 @@ if(!active)return [self renderLegacy:src destination:dst uniforms:u paths:paths spider:spider masks:tools[@"baseMasks"] error:error]; NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];if(!entry)return NO;idd=entry[@"device"];idinput=[src metalTextureForDevice:d];if(!input)return fail(error,@"宿主图像纹理不可用"); MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA16Float width:input.width height:input.height mipmapped:NO];desc.storageMode=MTLStorageModePrivate;desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite; - DYExportTile *tile=nil,*skinReference=nil;NSArray *order=DYToolDisplayOrder(tools);NSMutableDictionary *groups=[NSMutableDictionary dictionary];for(NSString *ID in order){NSDictionary *node=DYToolWithID(tools,ID);if(!node||DYToolIsNeutral(node))continue;NSString *root=DYToolRootAnchor(tools,ID);if(!groups[root])groups[root]=[NSMutableArray array];[groups[root]addObject:node];} + DYExportTile *tile=nil,*skinReference=nil,*originalReference=nil;NSArray *order=DYToolDisplayOrder(tools);NSMutableDictionary *groups=[NSMutableDictionary dictionary];for(NSString *ID in order){NSDictionary *node=DYToolWithID(tools,ID);if(!node||DYToolIsNeutral(node))continue;NSString *root=DYToolRootAnchor(tools,ID);if(!groups[root])groups[root]=[NSMutableArray array];[groups[root]addObject:node];} auto makeTile=[&](){idtexture=[d newTextureWithDescriptor:desc];if(!texture)return (DYExportTile*)nil;DYExportTile *result=[[DYExportTile alloc]initWithTexture:texture registry:d.registryID];[result setBounds:src.tilePixelBounds origin:src.imageOrigin];[result setPixelAspect:src.pixelAspect];[texture release];return result;}; auto replace=[&](DYExportTile *next){[tile release];tile=next;}; auto apply=[&](NSString *anchor){for(NSDictionary *node in groups[anchor]){@autoreleasepool{DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配新增工具缓冲区");BOOL ok=[self renderExtraTool:node source:tile original:src destination:next entry:entry error:error];if(!ok){[next release];return NO;}replace(next);}}return YES;}; @@ -51,22 +57,41 @@ // Basic adjustment spans stages 2/8, so its insertion point is after stage 8. // CST precedes stage 0; Spider stays after all twelve fused color stages. NSArray *anchors=@[@"base:primary",@"base:primaries",@"",@"base:curve",@"base:levels",@"base:balance",@"base:hsl",@"base:grading",@"base:base",@"base:blackwhite",@"base:look",@"base:skin"]; + float bwMix=fmaxf(0,fminf(1,u.cm.blackWhiteMix));BOOL splitBW=u.blackWhiteSectionEnabled>.5&&bwMix>0&&bwMix<1&&([groups[@"base:blackwhite"]count]||[groups[@"base:look"]count]); NSInteger first=0; - for(NSInteger last=0;last<12;last++)if(last==5||last==11||[groups[anchors[last]]count]){@autoreleasepool{ + for(NSInteger last=0;last<(splitBW?9:12);last++)if(last==5||last==(splitBW?8:11)||[groups[anchors[last]]count]){@autoreleasepool{ DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配原生工具分段缓冲区");DYUniforms segment=u; - if(first>0){segment.primarySectionEnabled=0;segment.inputSectionEnabled=0;segment.cm.basisEnabled=0;segment.cm.outputEnabled=0;} - BOOL ok=[self renderLegacy:tile?:src destination:next uniforms:segment paths:paths spider:nil masks:tools[@"baseMasks"] stageFirst:first stageLast:last skinReference:skinReference error:error];if(!ok){[next release];return NO;}replace(next); + BOOL ok=[self renderLegacy:tile?:src destination:next uniforms:segment paths:paths spider:nil masks:tools[@"baseMasks"] stageFirst:first stageLast:last skinReference:skinReference originalReference:originalReference captureOriginal:first==0?&originalReference:nullptr suppressBlackWhite:NO error:error];if(!ok){[next release];return NO;}replace(next); if(!apply(anchors[last]))return NO; // Skin protects the native pre-HSL result, including tools inserted before it. if(last==5){[skinReference release];skinReference=[tile retain];}first=last+1; }} + if(splitBW){ + // Native partial B&W mixes two complete color branches after native skin, + // before Spider. Keep that fork if a B&W/Look insertion splits stages 9-11. + // Only the suffix is duplicated; CST, statistics and the prefix stay shared. + DYExportTile *prefix=[tile retain],*bwTile=nil; + @try{ + for(int branch=0;branch<2;branch++){ + if(branch==1)replace([prefix retain]);DYUniforms branchUniforms=u;branchUniforms.cm.blackWhiteMix=1;NSInteger begin=9; + for(NSInteger end=9;end<12;end++)if(end==11||[groups[anchors[end]]count]){@autoreleasepool{ + DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配黑白混合分支缓冲区");BOOL ok=[self renderLegacy:tile destination:next uniforms:branchUniforms paths:paths spider:nil masks:tools[@"baseMasks"] stageFirst:begin stageLast:end skinReference:skinReference originalReference:originalReference captureOriginal:nullptr suppressBlackWhite:branch==1 error:error];if(!ok){[next release];return NO;}replace(next);if(end<11&&!apply(anchors[end]))return NO;begin=end+1; + }} + if(branch==0)bwTile=[tile retain]; + } + DYExportTile *mixed=makeTile();if(!mixed)return fail(error,@"无法分配黑白混合缓冲区");DYToolMaskEntry constant{};constant.section=0;constant.combine=0;constant.mask.parameters=dyDefaultMaskParameters();constant.mask.parameters.kind=DYMaskRectangle;constant.mask.parameters.width=constant.mask.parameters.height=4000;constant.mask.parameters.feather=0;constant.mask.parameters.outputBlack=constant.mask.parameters.outputWhite=1;constant.mask.parameters.strength=bwMix; + idweight=[[d newBufferWithBytes:&constant length:sizeof(constant) options:MTLResourceStorageModeShared]autorelease];if(!weight){[mixed release];return fail(error,@"无法分配黑白混合权重");}DYToolMaskHeader h{};h.count=1;h.section=0;h.premultiplied=1;h.scaleX=h.scaleY=1;idcommands=[entry[@"queue"]commandBuffer];[self encodeBlend:[tile metalTextureForDevice:d] after:[bwTile metalTextureForDevice:d] output:[mixed metalTextureForDevice:d] masks:weight header:h entry:entry commands:commands];[commands commit];[commands waitUntilCompleted];if(commands.status!=MTLCommandBufferStatusCompleted){[mixed release];return fail(error,commands.error.localizedDescription);}replace(mixed); + }@finally{[prefix release];[bwTile release];} + // An extra skin tool follows the original skin and B&W mixture once. + if(!apply(@"base:skin"))return NO; + } if(u.spiderSectionEnabled>.5&&u.spiderMix>0&&spider.length){DYUniforms sp=DYToolUniforms(@{@"type":@"spider"});sp.spiderSectionEnabled=u.spiderSectionEnabled;sp.spiderMix=u.spiderMix;DYExportTile *next=makeTile();if(!next)return fail(error,@"无法分配蜘蛛盘缓冲区");BOOL ok=[self renderLegacy:tile destination:next uniforms:sp paths:@{} spider:spider masks:@{@"spider":tools[@"baseMasks"][@"spider"]?:@[]} error:error];if(!ok){[next release];return NO;}replace(next);} if(!apply(@"base:spider"))return NO; } // Schema 1 extra layers (and children inserted after those layers) retain // their old end-of-chain order. Saving does not silently migrate old looks. if(!apply(@"tail"))return NO;return [self copyTile:tile to:dst entry:entry error:error]; - }@finally{[skinReference release];[tile release];} + }@finally{[originalReference release];[skinReference release];[tile release];} }}} - (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){ for(NSArray *masks in [tools[@"baseMasks"]allValues])if(masks.count)return fail(error,@"当前调色含空间蒙版或跟踪,Cube 无法保存这些信息。请先保存完整预设,或移除蒙版后导出。");for(NSDictionary *node in tools[@"layers"])if([node[@"masks"]count])return fail(error,@"新增工具含蒙版,无法完整导出为 Cube。请保存完整预设。"); diff --git a/大鱼调色/Plugin/DYToolTrackingProbe.inc.h b/大鱼调色/Plugin/DYToolTrackingProbe.inc.h index abf8e07..980a756 100644 --- a/大鱼调色/Plugin/DYToolTrackingProbe.inc.h +++ b/大鱼调色/Plugin/DYToolTrackingProbe.inc.h @@ -27,6 +27,8 @@ @interface DYToolCanvasProbe : DYToolTrackingProbe @end @implementation DYToolCanvasProbe +- (double)backingScaleFactor{return 1;} +- (void)setCursor:(NSCursor*)cursor{} - (id)apiForProtocol:(Protocol*)p{if([NSStringFromProtocol(p)isEqual:@"FxOnScreenControlAPI_v4"])return self;return [super apiForProtocol:p];} - (BOOL)convertPointFromSpace:(FxDrawingCoordinates)from fromX:(double)x fromY:(double)y toSpace:(FxDrawingCoordinates)to toX:(double*)outX toY:(double*)outY{if(outX)*outX=40+x*560;if(outY)*outY=55+y*315;return YES;} @end