diff --git a/research/ControlsSync-20261117.md b/research/ControlsSync-20261117.md index 3389b99..e18bef3 100644 --- a/research/ControlsSync-20261117.md +++ b/research/ControlsSync-20261117.md @@ -16,3 +16,7 @@ 待实施:真实相位差、下一帧拒绝、曲线/畸变/白平衡参数写入、两界面模块和参数同步、LUT强度、马赛克选区保留、提示绘制与超时、相似变换形状约束回归;签名公证后在正式安装及FCP验证。 本轮不涉及NAS后端、站点文章或更新通道部署。 + +## 第一实施检查点 + +已替换OSC/宿主全等判断为同一帧半开区间,保留下一帧/旧帧拒绝;嵌入检查器改订阅根宿主模型事件,动态模块列表变更后通知远程布局;LUT浏览器加入五个风格位置与共享参数强度条;共享蒙版按实际可见别名保留列表和跟踪选择;取消常驻画布状态矩形,改为原生点击穿透、半透明、2秒自动收起的提示;Vision提出的变换先整体拟合为相似变换,再验证同一组实际像素,拒绝独立宽高拉伸。版本候选1.22.5(142)。尚待编译、自检和实机验收,不宣称已修复验证。 diff --git a/tools/tracking/verify_vision_regions.mm b/tools/tracking/verify_vision_regions.mm index 3c9f740..8e1c70d 100644 --- a/tools/tracking/verify_vision_regions.mm +++ b/tools/tracking/verify_vision_regions.mm @@ -15,7 +15,7 @@ int main(){@autoreleasepool{NSMutableArray *results=[NSMutableArray array];bool tracker.setMask(polygon);bool ok=tracker.reset(frame(0,paired,rotate),{cx,.5,paired?.32f:.65f,paired?.54f:.65f,0});dy::TrackResult r=tracker.result(); NSMutableArray *steps=[NSMutableArray array];for(int i=1;i<6&&ok;i++){r=tracker.track(frame(i,paired,rotate));ok&=r.valid;[steps addObject:@{@"i":@(i),@"cx":@(r.cx),@"cy":@(r.cy),@"sx":@(r.scaleX),@"sy":@(r.scaleY),@"angle":@(r.rotation),@"confidence":@(r.confidence),@"valid":@(r.valid),@"failure":@(int(r.failure))}];} float expectedX=cx+5*(paired?(mode==2?-1.5f:2.f):2.f)/320,expectedY=.5+5*(paired?(mode==2?1.f:-.75f):1.f)/192,expectedScale=1+5*(paired?(mode==2?-.025f:.035f):.01f); - bool precise=ok&&std::abs(r.cx-expectedX)<.006&&std::abs(r.cy-expectedY)<.008&&std::abs(r.scaleX-expectedScale)<.04&&std::abs(r.scaleY-expectedScale)<.04&&(!rotate||std::abs(r.rotation-.05)<.02); + bool precise=ok&&r.scaleX==r.scaleY&&std::abs(r.cx-expectedX)<.006&&std::abs(r.cy-expectedY)<.008&&std::abs(r.scaleX-expectedScale)<.04&&std::abs(r.scaleY-expectedScale)<.04&&(!rotate||std::abs(r.rotation-.05)<.02); bool loss=ok&&!tracker.track(frame(6,paired,rotate,true)).valid;all&=precise&&loss;[results addObject:@{@"mode":@(mode),@"geometryPass":@(precise),@"flatLossPass":@(loss),@"steps":steps}]; } auto report=@{@"pass":@(all),@"milliseconds":@(std::chrono::duration(std::chrono::steady_clock::now()-begin).count()),@"results":results};NSData *data=[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil];fwrite(data.bytes,1,data.length,stdout);return all?0:1;}} diff --git a/大鱼调色/Plugin/DYCanvasStatusToast.h b/大鱼调色/Plugin/DYCanvasStatusToast.h new file mode 100644 index 0000000..2eae499 --- /dev/null +++ b/大鱼调色/Plugin/DYCanvasStatusToast.h @@ -0,0 +1,34 @@ +#pragma once +#import + +// A native, click-through HUD has a real wall-clock lifetime even when FCP +// caches a paused OSC texture. It does not need parameter writes to erase it. +@interface DYCanvasStatusToast : NSObject +- (void)showMessage:(NSString*)message; +- (void)close; +@end +@implementation DYCanvasStatusToast { + NSPanel *_panel;NSTextField *_label;uint64_t _generation; +} +- (void)dealloc{[_panel orderOut:nil];[_panel release];[super dealloc];} +- (void)close{++_generation;[_panel orderOut:nil];} +- (void)showMessage:(NSString*)message { + NSCAssert(NSThread.isMainThread,@"Status HUD requires the main queue"); + if(!message.length||!NSApp.isRunning)return; + if(!_panel){ + _panel=[[NSPanel alloc]initWithContentRect:NSZeroRect styleMask:NSWindowStyleMaskBorderless|NSWindowStyleMaskNonactivatingPanel backing:NSBackingStoreBuffered defer:NO]; + _panel.releasedWhenClosed=NO;_panel.opaque=NO;_panel.backgroundColor=NSColor.clearColor;_panel.hasShadow=NO;_panel.ignoresMouseEvents=YES;_panel.hidesOnDeactivate=YES;_panel.level=NSFloatingWindowLevel; + _panel.collectionBehavior=NSWindowCollectionBehaviorTransient|NSWindowCollectionBehaviorFullScreenAuxiliary; + _panel.contentView.wantsLayer=YES;_panel.contentView.layer.cornerRadius=8;_panel.contentView.layer.backgroundColor=[NSColor colorWithWhite:.08 alpha:.62].CGColor; + _label=[NSTextField wrappingLabelWithString:@""];_label.font=[NSFont systemFontOfSize:12 weight:NSFontWeightMedium];_label.textColor=NSColor.whiteColor;_label.maximumNumberOfLines=2;_label.lineBreakMode=NSLineBreakByTruncatingTail;[_panel.contentView addSubview:_label]; + } + NSPoint mouse=NSEvent.mouseLocation;NSScreen *screen=NSScreen.mainScreen;for(NSScreen *candidate in NSScreen.screens)if(NSPointInRect(mouse,candidate.frame)){screen=candidate;break;} + NSRect bounds=screen.visibleFrame;CGFloat width=MIN(420.,MAX(180.,[message sizeWithAttributes:@{NSFontAttributeName:_label.font}].width+24));width=MIN(width,NSWidth(bounds)-24); + CGFloat height=[message boundingRectWithSize:NSMakeSize(width-24,40) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:_label.font}].size.height+18;height=MIN(54.,MAX(34.,height)); + // Place below the pointer, with a gap, and keep the entire compact HUD on screen. + CGFloat x=MAX(NSMinX(bounds)+12,MIN(NSMaxX(bounds)-width-12,mouse.x-width/2));CGFloat y=MAX(NSMinY(bounds)+12,MIN(NSMaxY(bounds)-height-12,mouse.y-height-24)); + [_panel setFrame:NSMakeRect(x,y,width,height) display:NO];_label.frame=NSMakeRect(12,8,width-24,height-16);_label.stringValue=message;[_panel orderFrontRegardless]; + uint64_t generation=++_generation; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW,2*NSEC_PER_SEC),dispatch_get_main_queue(),^{if(self->_generation==generation)[self close];}); +} +@end diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index fb372d4..77184c0 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -34,6 +34,15 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b - (void)drawSeparatorInRect:(NSRect)dirty{[[NSColor colorWithWhite:.23 alpha:1]setFill];NSRectFill(NSMakeRect(0,NSMaxY(self.bounds)-.5,self.bounds.size.width,.5));} @end +// Use the same authoring/undo path as the inspector throughout a slider drag. +@interface DYWorkspaceStrengthSlider : NSSlider @end +@implementation DYWorkspaceStrengthSlider +- (void)mouseDown:(NSEvent *)event { + id target=self.target;[target performSelector:@selector(beginLUTStrengthGesture)]; + @try{[super mouseDown:event];}@finally{[target performSelector:@selector(endLUTStrengthGesture)];} +} +@end + @class DYWorkspaceRoot; @interface DYColorWorkspace (Internal) - (void)layoutWorkspace; @@ -95,6 +104,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane; DYScopePlot *_plot;NSArray *_scopePlots;NSInteger _editorMode; DYTrackingPreview *_trackingPreview; + NSView *_lutStrengthBar;NSSlider *_lutStrength;NSTextField *_lutStrengthField;NSPopUpButton *_lutSlot;NSInteger _lutSlotIndex; NSTextField *_heading,*_description,*_status,*_lutExplanation; NSButton *_close,*_hostScopes,*_sizeMode; DYWorkspaceLifetime *_lifetime; @@ -139,7 +149,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b - (void)dealloc{ [self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil; [_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_trackingPreview release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release]; - [_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc]; + [_lutStrengthBar release];[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc]; } - (BOOL)visible{return _visible||_opening;} - (NSString *)lastError{return _lastError;} @@ -189,7 +199,10 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b _heading.hidden=YES;_toolbarScroll.frame=NSMakeRect(6,3,MAX(1,w-78),30);_sizeMode.frame=NSMakeRect(MAX(0,w-68),3,26,27);_close.frame=NSMakeRect(MAX(0,w-34),3,26,27); _sizeMode.image=[NSImage imageWithSystemSymbolName:_expanded?@"arrow.down.right.and.arrow.up.left":@"arrow.up.left.and.arrow.down.right" accessibilityDescription:_expanded?@"收为窄条":@"扩大工作区"];_sizeMode.accessibilityLabel=_expanded?@"收为窄条":@"扩大工作区";_sizeMode.toolTip=_sizeMode.accessibilityLabel;_sizeMode.contentTintColor=DYThemeColor(@"text"); _sizingSplit=YES;_split.frame=NSMakeRect(0,36,w,MAX(1,h-36));_sizingSplit=NO;[self layoutToolWorkspace]; - _lutPane.frame=_editorHost.bounds;_lutExplanation.hidden=YES; + CGFloat ew=_editorHost.bounds.size.width; + _lutStrengthBar.frame=NSMakeRect(0,0,ew,34);_lutSlot.frame=NSMakeRect(8,5,105,24); + _lutStrength.frame=NSMakeRect(121,7,MAX(32,ew-198),20);_lutStrengthField.frame=NSMakeRect(MAX(157,ew-69),5,60,24); + _lutPane.frame=NSMakeRect(0,34,ew,MAX(1,_editorHost.bounds.size.height-34));_lutExplanation.hidden=YES; CGFloat sw=_scopePane.bounds.size.width,sh=_scopePane.bounds.size.height;_description.frame=NSMakeRect(8,3,MAX(1,sw-50),19);_hostScopes.frame=NSMakeRect(sw-40,1,34,21);_status.hidden=YES; _trackingPreview.frame=_scopePane.bounds; CGFloat gap=4,pw=MAX(1,(sw-12-gap)/2),ph=MAX(1,(sh-30-gap)/2);for(NSUInteger i=0;i<_scopePlots.count;i++)[_scopePlots[i]setFrame:NSMakeRect(6+(i%2)*(pw+gap),26+(i/2)*(ph+gap),pw,ph)]; @@ -212,7 +225,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; + 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;_lutStrengthBar.hidden=_editorMode!=2;if(_editorMode==2)[self refreshLUTStrength]; CMTime currentTime=_toolTime,frameDuration=kCMTimeInvalid;BOOL exclusiveEnd=NO; idaction=[self actionAPI];if(_visible&&!_renderer.scopeEnabled&&action){[action startAction:self];@try{ currentTime=action.currentTime; @@ -241,7 +254,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b } - (void)ensureBrowser{ if(_browser.visible)return;[_browser release];_browser=nil;id action=[[self lutManager] apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action){[self reportError:@"宿主暂时无法读取风格1"];return;} - NSString *selected=nil;[action startAction:self];@try{selected=[DYReadAssets([self lutManager],action.currentTime).paths[@"look0"]copy];}@finally{[action endAction:self];} + NSString *selected=nil;[action startAction:self];@try{selected=[DYReadAssets([self lutManager],action.currentTime).paths[[self lutSlotKey]]copy];}@finally{[action endAction:self];} DYWorkspaceLifetime *token=_lifetime; _browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreviewFrames] selectedPath:selected palette:DYWorkspacePalette() selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closed)return [owner selectLUT:path completion:completion];if(completion)completion([NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]);return nil;}];[selected release]; [_browser embedInView:_lutPane close:^{DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closing&&!owner->_closed){owner->_editorMode=0;[owner pageChanged:nil];}}]; @@ -250,7 +263,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b id host=[[self lutManager] isKindOfClass:DYToolManager.class]?[(DYToolManager*)[self lutManager] host]:[self lutManager]; DYAssetState *local=DYReadAssets([self lutManager],time),*global=DYReadAssets(host,time);DYUniforms uniforms;DYReadUniforms(host,time,&uniforms); NSMutableDictionary *cm=[NSMutableDictionary dictionary];for(NSDictionary *descriptor in DYDescriptors()){NSString *key=descriptor[@"key"];NSInteger offset=[descriptor[@"offset"]integerValue];if(offset>=0&&([key hasPrefix:@"cm"]||[key isEqual:@"inputProfile"]||[key isEqual:@"inputSectionEnabled"]))cm[key]=@(*(float*)((uint8_t*)&uniforms+offset));} - NSDictionary *state=@{@"look":local.paths[@"look0"]?:NSNull.null,@"colorManagement":global.colorManagement?:NSNull.null,@"inputPath":global.paths[@"input"]?:NSNull.null,@"colorParameters":cm}; + NSDictionary *state=@{@"look":local.paths[[self lutSlotKey]]?:NSNull.null,@"slot":@(_lutSlotIndex),@"colorManagement":global.colorManagement?:NSNull.null,@"inputPath":global.paths[@"input"]?:NSNull.null,@"colorParameters":cm}; return @{@"time":[NSData dataWithBytes:&time length:sizeof(time)],@"state":state}; } - (NSDictionary *)selectionContext{ @@ -274,11 +287,11 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b if(outer)[outer startAction:self];[action startAction:self];id undo=nil;BOOL grouped=NO;NSDictionary *wantedPaths=nil;CMTime commitTime=kCMTimeInvalid;@try{ CMTime time=action.currentTime,original=kCMTimeInvalid;NSData *encodedTime=expected[@"time"];if(encodedTime.length==sizeof(original))memcpy(&original,encodedTime.bytes,sizeof(original)); if(!CMTIME_IS_NUMERIC(time)||!CMTIME_IS_NUMERIC(original)||CMTimeCompare(time,original)!=0)failure=@"播放头已改变,未将先前的 LUT 选择写到新画面;请重新选择"; - else if(![[self selectionContextAtTime:time][@"state"]isEqual:expected[@"state"]])failure=@"载入期间风格1或色彩管理已改变,已保留最新设置;请重新选择 LUT"; + else if(![[self selectionContextAtTime:time][@"state"]isEqual:expected[@"state"]])failure=@"载入期间风格位置或色彩管理已改变,已保留最新设置;请重新选择 LUT"; if(!failure&&[[self lutManager] isKindOfClass:DYToolManager.class]){DYToolManager *node=(DYToolManager*)[self lutManager];if(![node.type isEqual:@"look"]||!DYToolWithID(DYReadTools(node.host,time).document,node.nodeID)){failure=@"此风格图层已删除或不再可编辑,未修改其它图层";}} if(!failure&&![[self lutManager] isKindOfClass:DYToolManager.class]&&DYBaseToolRemoved(DYReadTools([self lutManager],time).document,@"look"))failure=@"基础风格工具已移除,请先恢复风格工具;未修改其它图层"; - if(!failure){DYAssetState *assets=[[DYReadAssets([self lutManager],time)copy]autorelease];if(!assets)assets=[[[DYAssetState alloc]init]autorelease];NSMutableDictionary *paths=[[assets.paths mutableCopy]autorelease]?:[NSMutableDictionary dictionary];if(path.length)paths[@"look0"]=path;else[paths removeObjectForKey:@"look0"];assets.paths=paths; - wantedPaths=assets.paths;commitTime=time;undo=[[self lutManager] apiForProtocol:@protocol(FxUndoAPI)];grouped=[undo startUndoGroup:@"选择风格1 LUT"];written=DYWriteAssets([self lutManager],assets,time);if(!written)failure=@"宿主未接受此 LUT,原来的选择已保留"; + if(!failure){DYAssetState *assets=[[DYReadAssets([self lutManager],time)copy]autorelease];if(!assets)assets=[[[DYAssetState alloc]init]autorelease];NSMutableDictionary *paths=[[assets.paths mutableCopy]autorelease]?:[NSMutableDictionary dictionary];if(path.length)paths[[self lutSlotKey]]=path;else[paths removeObjectForKey:[self lutSlotKey]];assets.paths=paths; + wantedPaths=assets.paths;commitTime=time;undo=[[self lutManager] apiForProtocol:@protocol(FxUndoAPI)];grouped=[undo startUndoGroup:@"选择风格 LUT"];written=DYWriteAssets([self lutManager],assets,time);if(!written)failure=@"宿主未接受此 LUT,原来的选择已保留"; } }@finally{if(outer){[action endAction:self]; // DYToolManager stages custom assets and commits its host document in diff --git a/大鱼调色/Plugin/DYInspector.h b/大鱼调色/Plugin/DYInspector.h index 3890688..409b74d 100644 --- a/大鱼调色/Plugin/DYInspector.h +++ b/大鱼调色/Plugin/DYInspector.h @@ -20,4 +20,6 @@ NSView *DYCreateWorkspaceMaskEditor(id - (instancetype)initWithAPIManager:(id)manager renderer:(DYRenderer *)renderer workspaceType:(NSString *)type; - (void)refresh; - (void)removeWorkspaceTool; +- (void)writeGraphicValues:(NSDictionary *)values; +- (void)graphicGesture:(BOOL)begin title:(NSString *)title; @end diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 403b4b7..dae55f0 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -583,7 +583,7 @@ NSView *DYCreateWorkspaceMaskEditor(id if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];} [self buildCards]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(hslPickerResult:) name:@"DYHSLPickerResult" object:_embedded?[(DYToolManager*)_manager host]:_manager]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_embedded?[(DYToolManager*)_manager host]:_manager]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil]; [NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil]; if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(revealViewerTool:) name:@"DYViewerToolRequested" object:_manager]; diff --git a/大鱼调色/Plugin/DYScopeDisplayTime.h b/大鱼调色/Plugin/DYScopeDisplayTime.h index 2020368..04b4f41 100644 --- a/大鱼调色/Plugin/DYScopeDisplayTime.h +++ b/大鱼调色/Plugin/DYScopeDisplayTime.h @@ -33,3 +33,12 @@ static inline CMTime DYHostDisplayedFrameTime(id host,CMTime cu if(frameDuration)*frameDuration=frame; return DYScopeDisplayTime(current,start,duration,frame); } + +// OSC reports the presented frame's start, while a custom view may report a +// subframe phase inside it (25p footage in a different project timebase, etc.). +// Accept only that frame's half-open interval; never borrow the next frame. +static inline bool DYHostDisplaysCanvasFrame(id host,CMTime current,CMTime canvas){ + CMTime frame=kCMTimeInvalid; + CMTime displayed=DYHostDisplayedFrameTime(host,current,&frame); + return DYScopeFrameContainsTime(canvas,displayed,frame,false); +} diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index 23bd6c9..a3821cc 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -3,7 +3,7 @@ - (void)postToolCanvasStatus:(NSString*)message { NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;} dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;if(message&&![message isEqual:@"已选中本层蒙版"]&&DYSharedMaskWithID(self->_toolCanvasDocument,maskID)[@"stampSource"])self->_toolTrackingMessages[maskID]=message; - drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release]; + drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message){if(!self->_canvasStatusToast)self->_canvasStatusToast=[DYCanvasStatusToast new];[self->_canvasStatusToast showMessage:message];}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"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=_toolDrawingShape=_toolDrawingStampReference=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil]; diff --git a/大鱼调色/Plugin/DYToolHostIvars.inc.h b/大鱼调色/Plugin/DYToolHostIvars.inc.h index c6e125f..50e36af 100644 --- a/大鱼调色/Plugin/DYToolHostIvars.inc.h +++ b/大鱼调色/Plugin/DYToolHostIvars.inc.h @@ -1,5 +1,6 @@ NSString *_toolSession,*_selectedToolNode,*_selectedToolMask; DYViewerParameterBridge *_viewerParameterBridge; + DYCanvasStatusToast *_canvasStatusToast; NSTimer *_toolAnalysisTimer; BOOL _toolCaptureEnabled,_toolCanvasHidden,_toolDrawingPen,_toolDrawingShape,_toolShowCoverage,_toolCanvasCommitPending; NSMutableDictionary *_toolCanvasDraft,*_toolCanvasOriginal;NSDictionary *_toolCanvasDocument; diff --git a/大鱼调色/Plugin/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index 416de02..ce23e34 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -4,6 +4,7 @@ NSNotificationCenter *n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(toolCanvasSelection:) name:@"DYToolCanvasSelection" object:_apiManager];[n addObserver:self selector:@selector(toolCanvasCommand:) name:@"DYToolCanvasCommand" object:_apiManager];[n addObserver:self selector:@selector(toolTrackRequested:) name:@"DYToolTrack" object:_apiManager]; } - (void)tearDownToolHost { + [_canvasStatusToast close];[_canvasStatusToast release];_canvasStatusToast=nil; [_viewerParameterBridge invalidate];[_viewerParameterBridge release];_viewerParameterBridge=nil; [_toolAnalysisTimer invalidate];[_toolAnalysisTimer release];@synchronized(DYToolCanvasSessions()){if(_toolSession)[DYToolCanvasSessions()removeObjectForKey:_toolSession];} [_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];[_toolTrackingMessages release]; diff --git a/大鱼调色/Plugin/DYToolInspector.inc.h b/大鱼调色/Plugin/DYToolInspector.inc.h index 3fc30b2..edf0f4a 100644 --- a/大鱼调色/Plugin/DYToolInspector.inc.h +++ b/大鱼调色/Plugin/DYToolInspector.inc.h @@ -6,7 +6,9 @@ if(existed)[view refresh]; } for(NSString *ID in [[_stackViews.allKeys copy]autorelease])if(![order containsObject:ID]){[_stackViews[ID]removeFromSuperview];[_stackViews removeObjectForKey:ID];} + BOOL changed=![_stackOrder isEqual:order]||![_stackRoots isEqual:roots]; [_stackOrder release];_stackOrder=[order copy];[_stackRoots release];_stackRoots=[roots copy];[self setNeedsLayout:YES]; + if(changed)dispatch_async(dispatch_get_main_queue(),^{if(!self->_tearingDown){[self layoutSubtreeIfNeeded];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);}}); } - (void)toolMask:(NSButton*)sender{if(sender.tag<0||sender.tag>=_cards.count)return;id host=_embedded?[(DYToolManager*)_manager host]:_manager;NSString *node=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:_cards[sender.tag][@"section"][@"key"]];[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:host userInfo:@{@"node":node,@"source":@"inspector"}];[(DYToolMaskPanel*)_cards[sender.tag][@"maskPanel"]addMenu:sender];} - (void)repeatTool:(NSButton*)sender{ diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index d4b4c52..f854196 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -193,12 +193,7 @@ [self drawStampReference]; [self drawStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])]; BOOL tracking=[_mask[@"tracking"]boolValue]; - NSString *status=_mask[@"status"]; - if(status.length){ - NSRect box=NSMakeRect(NSMinX(_imageRect)+8*_uiScale,NSMinY(_imageRect)+10*_uiScale,MAX(1,MIN(NSWidth(_imageRect)-16*_uiScale,680*_uiScale)),64*_uiScale); - DYDrawSoftControl(box,4,NO,NO,NO);NSMutableParagraphStyle *style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.lineBreakMode=NSLineBreakByWordWrapping; - [status drawInRect:NSInsetRect(box,7*_uiScale,5*_uiScale) withAttributes:@{NSForegroundColorAttributeName:[_mask[@"trackingStopped"]boolValue]?NSColor.systemOrangeColor:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:11*_uiScale],NSParagraphStyleAttributeName:style}]; - } + // Transient status is a native click-through HUD; paused OSC pixels never retain a banner. if(!tracking){NSArray *actions=@[[_mask[@"referenceDrawing"]boolValue]?@"取消参考选择":@"选择跟踪参考",@"手工关键帧",@"最后可信帧"];for(NSInteger i=0;i<3;i++){NSRect cell=[self stampActionRect:i];DYDrawSoftControl(cell,4,NO,NO,NO);[actions[i]drawInRect:NSInsetRect(cell,4,4) withAttributes:@{NSForegroundColorAttributeName:i==2&&![_mask[@"canReturn"]boolValue]?NSColor.grayColor:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.45)]}];}} NSArray *titles=tracking?@[@"停止跟踪"]:[_mask[@"referenceDrawing"]boolValue]?@[]:@[@"向后跟踪",@"双向跟踪",@"向前跟踪"]; for(NSUInteger i=0;iaction=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action)return NO; BOOL valid=NO;[action startAction:self];@try{ - valid=CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)==0&&[self writerValueMatches]; + valid=CMTIME_IS_NUMERIC(action.currentTime)&&DYHostDisplaysCanvasFrame(_writerHost,action.currentTime,_writerTime)&&[self writerValueMatches]; }@finally{[action endAction:self];}return valid; } - (void)beginParameter:(NSDictionary*)descriptor node:(NSString*)nodeID value:(double)value atTime:(CMTime)time { @@ -286,7 +286,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { if(!action){[host release];return;} idtarget=nil;NSString *type=nil; [action startAction:self];@try{ - if(CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(DYHostDisplayedFrameTime(host,action.currentTime),time)==0){ + if(CMTIME_IS_NUMERIC(action.currentTime)&&DYHostDisplaysCanvasFrame(host,action.currentTime,time)){ NSDictionary *doc=DYReadTools(host,time).document; if([node hasPrefix:@"base:"]){type=[node substringFromIndex:5];if([DYToolTypes()containsObject:type]&&!DYBaseToolRemoved(doc,type))target=[host retain];} else{NSDictionary *layer=DYToolWithID(doc,node);if(layer){type=layer[@"type"];target=[[DYToolManager alloc]initWithHost:host node:layer];}} @@ -321,7 +321,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { if(!a){[self closeWriter];return;} BOOL changed=NO,failed=NO; [a startAction:self];@try{ - if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,a.currentTime),_writerTime)!=0||![self writerValueMatches]){failed=YES;} + if(!CMTIME_IS_NUMERIC(a.currentTime)||!DYHostDisplaysCanvasFrame(_writerHost,a.currentTime,_writerTime)||![self writerValueMatches]){failed=YES;} else{ if(!_writerUndoOpen)_writerUndoOpen=[[_writerHost apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"画面调整 · 蜘蛛盘"]; if(_writerUndoOpen){ @@ -373,7 +373,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { idaction=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; if(!action){[self closeWriter];return;}BOOL conflict=NO,changed=NO,failed=NO; [action startAction:self];@try{ - conflict=!CMTIME_IS_NUMERIC(action.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0||![self writerValueMatches]; + conflict=!CMTIME_IS_NUMERIC(action.currentTime)||!DYHostDisplaysCanvasFrame(_writerHost,action.currentTime,_writerTime)||![self writerValueMatches]; if(!conflict&&anyChanged){ idundo=[_writerHost apiForProtocol:@protocol(FxUndoAPI)]; NSString *title=_writerDescriptors.count==1?_writerDescriptors[0][@"title"]:@"图形控件"; @@ -445,7 +445,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { NSMutableDictionary *values=[NSMutableDictionary dictionary]; NSDictionary *document=nil; [action startAction:self];@try{ - if(CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0)return; + if(!DYHostDisplaysCanvasFrame(_writerHost,action.currentTime,_writerTime))return; if(base)for(NSDictionary *d in _writerDescriptors){ double value=NAN; if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!std::isfinite(value))return; diff --git a/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h b/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h index 18b320f..b6dbed3 100644 --- a/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYViewerParameterDiagnostics.inc.h @@ -141,3 +141,19 @@ [bridge beginParameters:@[x,y]node:@"base:curve" values:@{@"masterX0":@(-1),@"curveY0":@0}atTime:last];[bridge changeValues:@{@"masterX0":@.4,@"curveY0":@25}];[bridge endGesture];drain();double actual=0;[base getFloatValue:&actual fromParameter:[y[@"pid"]unsignedIntValue]atTime:last];run.record(@"viewer-curve-saves-at-visible-last-frame-when-view-clock-is-exclusive-end",actual==25&&base->_undoStarts==1&&base->_undoEnds==1); [bridge beginParameters:@[x,y]node:@"base:curve" values:@{@"masterX0":@.4,@"curveY0":@25}atTime:last];drain();host->_time=CMTimeMake(98,25);[bridge changeValues:@{@"masterX0":@.5,@"curveY0":@35}];[bridge endGesture];drain();[base getFloatValue:&actual fromParameter:[y[@"pid"]unsignedIntValue]atTime:last];run.record(@"viewer-end-normalization-still-rejects-a-real-playhead-move",actual==25&&base->_undoStarts==1);[bridge invalidate];drain();[bridge release]; } + +{ + // Exact phase mismatch captured from the user's FCP run, with a 25p host. + DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,&error); + DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host.boundaryTiming=YES; + CMTime presented=CMTimeMake(779538,10);host->_time=CMTimeMake(2338614961LL,30000); + auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.04;while(NSProcessInfo.processInfo.systemUptimebridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host]; + auto descriptor=[](NSString*key)->NSDictionary*{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;}; + BOOL saved=YES;for(NSString*key in @[@"masterX0",@"curveY0",@"lensStrength",@"temperature",@"tint"]){NSDictionary*d=descriptor(key);double before=[d[@"default"]doubleValue];[bridge beginParameter:d node:[key hasPrefix:@"lens"]?@"base:lens":[@[@"temperature",@"tint"]containsObject:key]?@"base:base":@"base:curve" value:before atTime:presented];[bridge changeValue:.35];[bridge endGesture];drain();double value=0;[base getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:presented];saved&=fabs(value-.35)<1e-6;} + run.record(@"viewer-real-fcp-subframe-phase-saves-curve-lens-and-white-balance",saved&&base->_undoStarts==5&&base->_undoEnds==5); + int undo=base->_undoStarts;host->_time=CMTimeAdd(presented,CMTimeMake(1,25));NSDictionary*d=descriptor(@"lensStrength");[bridge beginParameter:d node:@"base:lens" value:.35 atTime:presented];[bridge changeValue:25];[bridge endGesture];drain(); + double value=0;[base getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:presented];run.record(@"viewer-subframe-tolerance-excludes-the-next-frame-boundary",fabs(value-.35)<1e-6&&base->_undoStarts==undo); + host->_time=CMTimeSubtract(presented,CMTimeMake(1,30000));run.record(@"viewer-subframe-tolerance-excludes-an-earlier-frame",!DYHostDisplaysCanvasFrame(host,host->_time,presented)); + [bridge invalidate];drain();[bridge release]; +} diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 58a02d5..6cffda2 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -222,10 +222,22 @@ chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);[stack showPage:@"lut" maskKind:nil];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document; run.record(@"workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",pending.cancelled&&completed&&cancelled&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]); [stack setValue:@0 forKey:@"editorMode"];[stack pageChanged:nil];[stack refreshToolWorkspace:nil];run.record(@"workspace-lut-return-to-adjustments-survives-model-refresh",[[stack valueForKey:@"editorMode"]integerValue]==0);chooseNode(lookB);run.record(@"workspace-reselect-lut-layer-reopens-browser",[[stack valueForKey:@"editorMode"]integerValue]==2); + + NSSlider *strength=[stack valueForKey:@"lutStrength"];strength.doubleValue=.37;[stack performSelector:@selector(lutStrengthChanged:)withObject:strength];workspaceDrain(); + DYInspector *mainLook=[[mainInspector valueForKey:@"stackViews"]objectForKey:lookB];NSDictionary *strengthControl=[[mainLook valueForKey:@"controls"]objectForKey:@2015]; + run.record(@"workspace-browser-strength-is-visible-and-updates-the-same-inspector-layer",![(NSView*)[stack valueForKey:@"lutStrengthBar"]isHidden]&&fabs([strengthControl[@"slider"]doubleValue]-.37)<1e-5&&fabs([DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookB)[@"values"][@"postLUTStrength"]doubleValue]-.37)<1e-5); + [mainLook writeGraphicValues:@{@"postLUTStrength":@.62}];workspaceDrain();run.record(@"inspector-strength-edit-refreshes-open-workspace-browser",fabs(strength.doubleValue-.62)<1e-5); + NSPopUpButton *slot=[stack valueForKey:@"lutSlot"];[slot selectItemAtIndex:2];[stack performSelector:@selector(lutSlotChanged:)withObject:slot];strength.doubleValue=.23;[stack performSelector:@selector(lutStrengthChanged:)withObject:strength];workspaceDrain();BOOL third=[stack commitLUT:late expected:[stack selectionContext]error:&failure];tools=DYReadTools(stackHost,kCMTimeZero).document; + run.record(@"workspace-five-lut-slots-share-paths-and-strengths-with-inspector",slot.numberOfItems==5&&third&&[DYToolWithID(tools,lookB)[@"paths"][@"look2"]isEqual:late]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]&&fabs([DYToolWithID(tools,lookB)[@"values"][@"look3Strength"]doubleValue]-.23)<1e-5&&fabs([DYToolWithID(tools,lookB)[@"values"][@"postLUTStrength"]doubleValue]-.62)<1e-5); + [slot selectItemAtIndex:0];[stack performSelector:@selector(lutSlotChanged:)withObject:slot]; BOOL choseHSL=chooseNode(@"base:hsl");undo=stackHost->_undoStarts;[stack createWorkspaceMask:1];workspaceDrain();NSString *sharedID=[[[stack valueForKey:@"selectedMask"]copy]autorelease]; NSButton *assign=[NSButton checkboxWithTitle:@"蜘蛛调色" target:nil action:nil];assign.identifier=@"base:spider";assign.state=NSControlStateValueOn;[stack maskAssignmentChanged:assign];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSArray *hslMasks=DYMasksForTool(tools,@"base:hsl"),*spiderMasks=DYMasksForTool(tools,@"base:spider"); BOOL mainHasShared=NO;for(NSDictionary *card in [mainInspector valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"hsl"]){NSDictionary *document=[card[@"maskPanel"]valueForKey:@"document"];mainHasShared=[DYMasksForTool(document,@"base:hsl").firstObject[@"id"]isEqual:sharedID];} run.record(@"workspace-shared-mask-links-hsl-and-spider-as-one-author-object",choseHSL&&sharedID&&DYSharedMasks(tools).count==1&&hslMasks.count==1&&spiderMasks.count==1&&hslMasks.firstObject==spiderMasks.firstObject&&[hslMasks.firstObject[@"id"]isEqual:sharedID]&&DYToolIDsForSharedMask(tools,sharedID).count==2&&mainHasShared&&stackHost->_undoStarts==undo+2&&stackHost->_undoEnds==stackHost->_undoStarts); + + [stackHost startAction:stack];NSMutableDictionary *mosaicDoc=DYMutablePlist(DYReadTools(stackHost,kCMTimeZero).document);mosaicDoc[@"mosaic"]=@{@"enabled":@YES,@"source":@"mask",@"maskIDs":@[sharedID],@"size":@32};DYWriteTools(stackHost,mosaicDoc,kCMTimeZero);[stackHost endAction:stack]; + [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:stackHost userInfo:@{@"node":@"shared",@"mask":sharedID,@"document":mosaicDoc}];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:stackHost];workspaceDrain(); + run.record(@"mosaic-mask-application-preserves-selection-and-tracking-editor",[[stack valueForKey:@"selectedMask"]isEqual:sharedID]&&[[stack valueForKey:@"editorMode"]integerValue]==1&&[stack valueForKey:@"maskEditor"]&&![(NSView*)[stack valueForKey:@"maskPane"]isHidden]); // The layer mask symbol is the navigation entry, preserving the shared object. chooseNode(@"base:hsl");NSArray *entryRows=[stack valueForKey:@"layerRows"];NSInteger entryRow=-1;for(NSUInteger i=0;ia=[target apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return; + double value=1;[a startAction:self];@try{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:[self lutStrengthKey]])[[target apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:a.currentTime];}@finally{[a endAction:self];} + _lutStrength.doubleValue=value;_lutStrengthField.stringValue=[NSString stringWithFormat:@"%.0f%%",value*100];[_lutSlot selectItemAtIndex:_lutSlotIndex]; +} +- (void)beginLUTStrengthGesture{[_toolEditor graphicGesture:YES title:@"风格 LUT 强度"];} +- (void)endLUTStrengthGesture{[_toolEditor graphicGesture:NO title:nil];[self refreshLUTStrength];} +- (void)lutStrengthChanged:(NSControl*)sender { + double value=sender==_lutStrength?sender.doubleValue:sender.doubleValue/100.;if(!std::isfinite(value))return;value=MAX(0.,MIN(1.,value)); + _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; + BOOL closing=_closing;_closing=YES;[_browser close];[_browser release];_browser=nil;_closing=closing;[self refreshLUTStrength];[self ensureBrowser]; +} - (void)addWorkspaceTool:(NSButton*)sender { NSString*type=sender.identifier;if([type isEqual:@"lens"]||![DYToolTypes()containsObject:type])return;idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*added=nil; [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSString*anchor=(DYToolWithID(doc,_selectedNode)||[_selectedNode hasPrefix:@"base:"])?_selectedNode:[@"base:" stringByAppendingString:type];NSMutableDictionary*node=(id)DYInsertTool(doc,type,anchor);if(!node){[self reportError:@"模块达到上限,未添加"];return;}if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms u;DYReadUniforms(host,a.currentTime,&u);DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);}idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"添加调色模块"];if(DYWriteTools(host,doc,a.currentTime))added=[node[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} @@ -152,7 +173,7 @@ if(!_trackingPreview.hidden&&!_trackingPreview.running&&![_trackingPreview.maskID isEqual:mask]){ [_trackingPreview reset];[self setTrackingPreviewVisible:NO]; } - if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_editorMode=1;[self rebuildWorkspaceEditor]; + if(![mask isEqual:_selectedMask]){[_selectedMask release];_selectedMask=[mask copy];}[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];_editorMode=1;[self refreshToolWorkspace:nil]; } - (void)externalWorkspaceToolSelection:(NSNotification*)note { if(![note.userInfo[@"source"]isEqual:@"inspector"]||![note.userInfo[@"node"]length])return;_hasUserSelection=YES;[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];[_selectedMask release];_selectedMask=nil;if(_visible){_editorMode=0;[self refreshToolWorkspace:nil];} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 96dd5c9..62c831b 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.22.4 + 1.22.5 CFBundleVersion - 141 + 142 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Plugin/MaskCore/DYSimilarityMotion.hpp b/大鱼调色/Plugin/MaskCore/DYSimilarityMotion.hpp new file mode 100644 index 0000000..a5aae03 --- /dev/null +++ b/大鱼调色/Plugin/MaskCore/DYSimilarityMotion.hpp @@ -0,0 +1,25 @@ +#pragma once +#include +#include + +namespace dy { +// Least-squares orientation-preserving similarity in pixel coordinates. +// All points share one rotation, scale and translation, so an authored shape +// cannot inherit shear or independent horizontal/vertical texture motion. +struct SimilarityMotion { + double a=1,b=0,tx=0,ty=0; + template Point map(Point p)const{return {float(a*p.x-b*p.y+tx),float(b*p.x+a*p.y+ty)};} +}; +template +bool fitSimilarityMotion(const std::vector& points,Mapping transform,SimilarityMotion& result){ + if(points.size()<3)return false; + double px=0,py=0,qx=0,qy=0; + for(auto p:points){auto q=transform(p);if(!std::isfinite(q.x)||!std::isfinite(q.y))return false;px+=p.x;py+=p.y;qx+=q.x;qy+=q.y;} + double n=points.size();px/=n;py/=n;qx/=n;qy/=n; + double denominator=0,real=0,imaginary=0; + for(auto p:points){auto q=transform(p);double x=p.x-px,y=p.y-py,u=q.x-qx,v=q.y-qy;denominator+=x*x+y*y;real+=x*u+y*v;imaginary+=x*v-y*u;} + if(!std::isfinite(denominator)||denominator<1e-8)return false; + result.a=real/denominator;result.b=imaginary/denominator;result.tx=qx-result.a*px+result.b*py;result.ty=qy-result.b*px-result.a*py; + return std::isfinite(result.a)&&std::isfinite(result.b)&&std::hypot(result.a,result.b)>1e-6; +} +} diff --git a/大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp b/大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp index bf3828f..df68cb0 100644 --- a/大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp +++ b/大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp @@ -2,6 +2,7 @@ #import #import #include "DYTracker.hpp" +#include "DYSimilarityMotion.hpp" namespace dy { inline TrackerROI visionMaskBounds(TrackerROI roi,const std::vector& polygon,float aspect){ @@ -13,8 +14,8 @@ inline TrackerROI visionMaskBounds(TrackerROI roi,const std::vector& } // Precision path for authored masks and independently moving clone regions. -// Vision estimates the local projective motion. We validate it against pixels -// inside the actual polygon, then expose the existing center/scale/angle format. +// Vision proposes local motion. Project it onto one similarity for the whole +// authored polygon, then validate those exact constrained pixels before saving. // No OpenCV code or fallback is used. class VisionRegionTracker { struct H { @@ -85,10 +86,13 @@ public: CVPixelBufferRelease(from);CVPixelBufferRelease(to);if(!found)return fail(TrackFailure::Backend); double sx=w/rw,sy=h/rh;H into{{sx,0,-ox*sx,0,-sy,h-1+oy*sy,0,0,1}},out{{1/sx,0,ox,0,-1/sy,oy+(h-1)/sy,0,0,1}}; H step=H::mul(out,H::mul(m,into)),next=H::mul(step,cumulative_); + SimilarityMotion rigid; + if(!fitSimilarityMotion(samples_,[&](FlowPoint p){return next.map(p);},rigid))return fail(TrackFailure::InvalidTransform); + next=H{{rigid.a,-rigid.b,rigid.tx,rigid.b,rigid.a,rigid.ty,0,0,1}}; FlowPoint seed{seed_.cx*width_,seed_.cy*height_};auto center=next.map(seed),before=cumulative_.map(seed); float c=std::cos(seed_.angle),s=std::sin(seed_.angle);auto xp=next.map({seed.x+20*c,seed.y+20*s}),yp=next.map({seed.x-20*s,seed.y+20*c}); float ax=(xp.x-center.x)/20,ay=(xp.y-center.y)/20,bx=(yp.x-center.x)/20,by=(yp.y-center.y)/20; - float scaleX=std::hypot(ax,ay),scaleY=std::hypot(bx,by),angle=std::atan2(ay,ax)-seed_.angle; + float scaleX=std::hypot(rigid.a,rigid.b),scaleY=scaleX,angle=std::atan2(ay,ax)-seed_.angle; if(!framePoint(center)||!std::isfinite(scaleX)||!std::isfinite(scaleY)||scaleX<.0625||scaleY<.0625||scaleX>16||scaleY>16||ax*by-ay*bx<=0|| scaleX/result_.scaleX<.8||scaleX/result_.scaleX>1.25||scaleY/result_.scaleY<.8||scaleY/result_.scaleY>1.25||std::abs(std::remainder(angle-result_.rotation,float(2*M_PI)))>.2||std::hypot(center.x-before.x,center.y-before.y)>std::max(rw,rh)*.3) return fail(TrackFailure::InvalidTransform); diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 9522308..8798e06 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.22.4 + 1.22.5 CFBundleVersion - 141 + 142 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 37490bc..9271b4a 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,7 +4,7 @@ ## 当前目标与进展 -修复用户实机反馈的屏幕控件、工作区/检查器联动、LUT强度、马赛克跟踪入口、提示遮挡与跟踪形变。正在定位和实施,尚未交付新版本。实机日志已证实OSC事件与宿主action相差0.032033秒,当前全等判断拒绝曲线/畸变写入;白平衡使用相同判断。[本轮记录](research/ControlsSync-20261117.md)。 +修复用户实机反馈的屏幕控件、工作区/检查器联动、LUT强度、马赛克跟踪入口、提示遮挡与跟踪形变。第一轮实现已完成,候选1.22.5(142)待编译和回归,尚未交付新版本。实机日志已证实OSC事件与宿主action相差0.032033秒,当前全等判断拒绝曲线/畸变写入;白平衡使用相同判断。[本轮记录](research/ControlsSync-20261117.md)。 ## 正式基线与工程入口