From a1eb334840e1af285e878e7c094b06aaf01cba49 Mon Sep 17 00:00:00 2001 From: mac Date: Tue, 17 Nov 2026 00:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3LUT=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=B9=B6=E4=BF=9D=E5=AD=98=E5=90=8C=E5=B8=A7?= =?UTF-8?q?=E5=86=99=E5=85=A5=E4=B8=8E=E5=8F=8C=E5=90=91=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E8=BF=9B=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- research/ControlsSync-20261117.md | 2 ++ tools/tracking/verify_vision_regions.mm | 8 ++++++++ verification/SimilarityTracking1.22.5.json | 8 +++++++- 大鱼调色/Plugin/DYWorkspaceTools.inc.h | 2 +- 开发交接.md | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/research/ControlsSync-20261117.md b/research/ControlsSync-20261117.md index 2d64de8..d833859 100644 --- a/research/ControlsSync-20261117.md +++ b/research/ControlsSync-20261117.md @@ -24,3 +24,5 @@ ## 第一轮验证与修正 Release编译通过。独立Vision区域回归四种模式全部通过,末帧两轴缩放严格相等,平移/旋转/缩放精度及纯色丢失停止通过(verification/SimilarityTracking1.22.5.json)。首次集成自检捕获工作区选中同一蒙版重复刷新触发通知递归;保留已选蒙版且当前已在跟踪编辑模式的短路,只有模式不同或对象变化时才重建。未上传Apple、未替换141,不将旧自检报告当成本轮结果。待重新构建验证。 + +第二轮集成自检完成,唯一失败是LUT位置切换:结束强度手势时刷新旧位置,覆盖弹出菜单刚选的新位置。修复为先捕获新位置再结束手势。双向强度同步、真实OSC相位写入、下一帧拒绝和马赛克跟踪编辑器保留已通过;待全部重跑。新增整体相似拟合的各向异性纹理/旋转等比平移/非有限拒绝数学回归全部通过。 diff --git a/tools/tracking/verify_vision_regions.mm b/tools/tracking/verify_vision_regions.mm index 8e1c70d..bf82085 100644 --- a/tools/tracking/verify_vision_regions.mm +++ b/tools/tracking/verify_vision_regions.mm @@ -8,6 +8,14 @@ dy::GrayFrame frame(int step,bool paired,bool rotate,bool flat=false){dy::GrayFr bool left=paired&&x<160;float cx=paired?(left?80:240):160,cy=96,scale=1+step*(paired?(left?-.025f:.035f):.01f),angle=rotate?.01f*step:0,tx=step*(paired?(left?-1.5f:2.f):2.f),ty=step*(paired?(left?1.f:-.75f):1.f); float a=(x-cx-tx)/scale,b=(y-cy-ty)/scale,u=(cx+a*std::cos(angle)+b*std::sin(angle))/4,v=(cy-a*std::sin(angle)+b*std::cos(angle))/4;f.pixels[y*320+x]=flat?.4f:texture(u,v);}return f;} int main(){@autoreleasepool{NSMutableArray *results=[NSMutableArray array];bool all=true;auto begin=std::chrono::steady_clock::now(); + { + std::vector points={{-20,-20},{20,-20},{20,20},{-20,20}}; + dy::SimilarityMotion fit; + bool anisotropic=dy::fitSimilarityMotion(points,[](dy::FlowPoint p){return dy::FlowPoint{p.x*1.3f+8,p.y*.7f-3};},fit)&&std::abs(fit.a-1)<1e-6&&std::abs(fit.b)<1e-6&&std::abs(fit.tx-8)<1e-6&&std::abs(fit.ty+3)<1e-6; + bool similarity=dy::fitSimilarityMotion(points,[](dy::FlowPoint p){return dy::FlowPoint{1.1f*p.x-.2f*p.y+5,.2f*p.x+1.1f*p.y-7};},fit)&&std::abs(fit.a-1.1)<1e-6&&std::abs(fit.b-.2)<1e-6&&std::abs(fit.tx-5)<1e-6&&std::abs(fit.ty+7)<1e-6; + bool bad=!dy::fitSimilarityMotion(points,[](dy::FlowPoint p){return dy::FlowPoint{NAN,p.y};},fit); + all&=anisotropic&&similarity&&bad;[results addObject:@{@"test":@"whole-shape-similarity-fit",@"anisotropicTextureKeepsShape":@(anisotropic),@"rotationScaleTranslationExact":@(similarity),@"nonfiniteRejected":@(bad)}]; + } for(int mode=0;mode<4;mode++){ bool paired=mode>=2,rotate=mode==1;float cx=paired?(mode==2?.25:.75):.5;dy::VisionRegionTracker tracker; std::vector polygon={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}}; diff --git a/verification/SimilarityTracking1.22.5.json b/verification/SimilarityTracking1.22.5.json index 5dc107d..38bbb6b 100644 --- a/verification/SimilarityTracking1.22.5.json +++ b/verification/SimilarityTracking1.22.5.json @@ -1,7 +1,13 @@ { "pass": true, - "milliseconds": 282.551708, + "milliseconds": 245.011459, "results": [ + { + "test": "whole-shape-similarity-fit", + "anisotropicTextureKeepsShape": true, + "rotationScaleTranslationExact": true, + "nonfiniteRejected": true + }, { "steps": [ { diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index 1126641..24786bf 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -137,7 +137,7 @@ _lutStrength.doubleValue=value;_lutStrengthField.stringValue=[NSString stringWithFormat:@"%.0f%%",value*100];[_toolEditor writeGraphicValues:@{[self lutStrengthKey]:@(value)}]; } - (void)lutSlotChanged:(NSPopUpButton*)sender { - [self endLUTStrengthGesture];_lutSlotIndex=MAX(0,MIN(4,sender.indexOfSelectedItem));_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil; + NSInteger index=MAX(0,MIN(4,sender.indexOfSelectedItem));[self endLUTStrengthGesture];_lutSlotIndex=index;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil; BOOL closing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;_closing=closing;[self refreshLUTStrength];[self ensureBrowser]; } - (void)addWorkspaceTool:(NSButton*)sender { diff --git a/开发交接.md b/开发交接.md index 9271b4a..ef584e4 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,7 +4,7 @@ ## 当前目标与进展 -修复用户实机反馈的屏幕控件、工作区/检查器联动、LUT强度、马赛克跟踪入口、提示遮挡与跟踪形变。第一轮实现已完成,候选1.22.5(142)待编译和回归,尚未交付新版本。实机日志已证实OSC事件与宿主action相差0.032033秒,当前全等判断拒绝曲线/畸变写入;白平衡使用相同判断。[本轮记录](research/ControlsSync-20261117.md)。 +修复用户实机反馈的屏幕控件、工作区/检查器联动、LUT强度、马赛克跟踪入口、提示遮挡与跟踪形变。第一轮实现已完成,候选1.22.5(142)已编译,修正两项集成自检问题后待全量重跑,尚未交付新版本。实机日志已证实OSC事件与宿主action相差0.032033秒,当前全等判断拒绝曲线/畸变写入;白平衡使用相同判断。[本轮记录](research/ControlsSync-20261117.md)。 ## 正式基线与工程入口