From df6bf52f32283b18f595f371a76851705c42b35d Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Nov 2026 11:16:49 +0800 Subject: [PATCH] test: resolve authored pen masks by identity and prepare boundary-fix build 78 --- research/WorkspaceFeedback-20261105.md | 2 ++ 大鱼调色/Plugin/DYColorWorkspace.mm | 2 +- 大鱼调色/Plugin/DYRenderer.h | 1 + 大鱼调色/Plugin/DYScopeCapture.inc.h | 1 + 大鱼调色/Plugin/DYToolPenDiagnostics.inc.h | 2 +- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/research/WorkspaceFeedback-20261105.md b/research/WorkspaceFeedback-20261105.md index cb08bc5..306a467 100644 --- a/research/WorkspaceFeedback-20261105.md +++ b/research/WorkspaceFeedback-20261105.md @@ -34,3 +34,5 @@ LUT 属于有数量的浏览内容,恢复按视口宽度换行的多行网格 同一 raw currentTime 精确比较也出现在 ViewerParameterBridge(开始、每次写、有效性和蜘蛛盘批次)与蒙版提交、界面完成命令。复用同一个宿主显示帧时间归一化,仅对合法输入范围的排他末端生效;OSC 提供的事件时刻仍为写入时刻,真实播放头变化、改层和外部值冲突保护保留。 增加 fake host 的明确 4.00 秒界面 / 3.96 秒 OSC 复现:成对曲线参数持久化、实际播放头移到3.92后拒写、钢笔三节点闭合一次保存。真实用户77诊断仍待回报,这属于有代码和片尾宿主时差证据支持的修复候选,不把 native 用例当作真实宿主绘制完成。 + +回归首轮的钢笔断言读取了 baseMasks.hsl 的最后一个原始条目,实际上它是已存在的共享引用(没有 nodes),因此得到假阴性;宿主模拟日志记录提交成功。已改为按实际 maskID 解析作者对象,继续检查节点、单次撤销和绘制结束状态,不放宽保存断言。 diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index 9eb65a1..7f978d3 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -187,7 +187,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b } - (void)pageChanged:(id)sender{ if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2; - CMTime displayTime=_toolTime;idaction=[self actionAPI];if(_visible&&action){[action startAction:self];@try{ + CMTime displayTime=_toolTime;idaction=[self actionAPI];if(_visible&&!_renderer.scopeEnabled&&action){[action startAction:self];@try{ displayTime=DYHostDisplayedFrameTime([self rootHost],_toolTime);if(CMTimeCompare(displayTime,_toolTime)!=0)os_log(OS_LOG_DEFAULT,"dayu_scope_end_boundary requested=%{public}.9f display=%{public}.9f",CMTimeGetSeconds(_toolTime),CMTimeGetSeconds(displayTime)); }@finally{[action endAction:self];}} [_renderer setScopeEnabled:_visible atTime:displayTime];if(_editorMode==2)[self ensureBrowser];[self scopeChanged:nil];[self layoutWorkspace]; diff --git a/大鱼调色/Plugin/DYRenderer.h b/大鱼调色/Plugin/DYRenderer.h index 4afd6e6..ba3e8bf 100644 --- a/大鱼调色/Plugin/DYRenderer.h +++ b/大鱼调色/Plugin/DYRenderer.h @@ -22,6 +22,7 @@ - (void)invalidatePreview; /// Conversion/statistics run while visible; retain one small final-output /// sample per instance so opening a paused workspace needs no parameter edit. +- (BOOL)scopeEnabled; - (void)setScopeEnabled:(BOOL)enabled; - (void)setScopeEnabled:(BOOL)enabled atTime:(CMTime)time; /// Call after the final destination render succeeds, while the tile is valid. diff --git a/大鱼调色/Plugin/DYScopeCapture.inc.h b/大鱼调色/Plugin/DYScopeCapture.inc.h index d46b349..9149993 100644 --- a/大鱼调色/Plugin/DYScopeCapture.inc.h +++ b/大鱼调色/Plugin/DYScopeCapture.inc.h @@ -1,5 +1,6 @@ // Included in DYRenderer's implementation; final destination sampling is kept // separate from the earlier input-analysis thumbnail used by auto-grade/LUTs. +- (BOOL)scopeEnabled{@synchronized(_previewLock){return _scopeEnabled;}} - (void)setScopeEnabled:(BOOL)enabled{[self setScopeEnabled:enabled atTime:kCMTimeInvalid];} - (void)setScopeEnabled:(BOOL)enabled atTime:(CMTime)time{ BOOL start=NO;@synchronized(_previewLock){if(_scopeEnabled==enabled)return;_scopeEnabled=enabled;_scopeGeneration++;[_scopePending release];_scopePending=nil; diff --git a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h index 6ce1ae9..9942d7b 100644 --- a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h @@ -39,6 +39,6 @@ // the displayed last-frame time. Keep the provided event time for authoring. host.boundaryTiming=YES;host->_time=CMTimeMake(4,1);CMTime last=CMTimeMake(99,25);redraw(); auto endClick=[&](double x,double y){[osc mouseDownAtPositionX:x positionY:y activePart:1 modifiers:0 forceUpdate:&update atTime:last];[osc mouseUpAtPositionX:x positionY:y activePart:1 modifiers:0 forceUpdate:&update atTime:last];}; - endClick(170,275);endClick(445,275);endClick(300,140);int endUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:last];drain();NSDictionary *endMask=[DYReadTools(base,last).document[@"baseMasks"][@"hsl"]lastObject];run.record(@"pen-last-frame-close-saves-three-authored-nodes-at-exclusive-host-end",[endMask[@"nodes"]length]==3*sizeof(DYBezierNode)&&base->_undoStarts==endUndo+1&&![[plugin toolCanvasMaskAtTime:last][@"drawing"]boolValue]); + endClick(170,275);endClick(445,275);endClick(300,140);int endUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:last];drain();NSDictionary *endMask=nil;for(NSDictionary *candidate in DYMasksForTool(DYReadTools(base,last).document,@"base:hsl"))if([candidate[@"id"]isEqual:maskID])endMask=candidate;run.record(@"pen-last-frame-close-saves-three-authored-nodes-at-exclusive-host-end",[endMask[@"nodes"]length]==3*sizeof(DYBezierNode)&&base->_undoStarts==endUndo+1&&![[plugin toolCanvasMaskAtTime:last][@"drawing"]boolValue],@{@"nodes":@([endMask[@"nodes"]length]/sizeof(DYBezierNode)),@"undoBefore":@(endUndo),@"undoAfter":@(base->_undoStarts),@"snapshotNodes":@([[plugin toolCanvasMaskAtTime:last][@"nodes"]length]/sizeof(DYBezierNode)),@"drawing":[plugin toolCanvasMaskAtTime:last][@"drawing"]?:@NO}); [osc release];[plugin release]; } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 7e31e8b..1553597 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.12.0 CFBundleVersion - 77 + 78 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 47d817e..a8cc6a1 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.12.0 CFBundleVersion - 77 + 78 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright