From a1a0779e126f1b23d8513a93e5623caab9edd923 Mon Sep 17 00:00:00 2001 From: mac Date: Tue, 17 Nov 2026 01:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9D=97=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E5=BC=BA=E5=BA=A6=E4=B8=8E=E4=B8=AD=E6=96=87=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=EF=BC=8C=E5=88=86=E7=BB=84=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E9=9D=A2=E6=9D=BF=EF=BC=88=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E4=B8=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...History-20261117-before-module-strength.md | 29 +++++++++ 大鱼调色/Plugin/DYColorWorkspace.mm | 19 +++--- 大鱼调色/Plugin/DYInspector.mm | 23 ++++--- 大鱼调色/Plugin/DYToolCanvasEditing.inc.h | 2 +- 大鱼调色/Plugin/DYToolInspector.inc.h | 2 +- 大鱼调色/Plugin/DYToolOSC.inc.h | 19 +----- 大鱼调色/Plugin/DYToolRender.inc.h | 3 +- 大鱼调色/Plugin/DYToolState.h | 11 ++++ 大鱼调色/Plugin/DYToolState.mm | 60 ++++++++++++++++++- 大鱼调色/Plugin/DYUnifiedRender.inc.h | 7 ++- 大鱼调色/Plugin/DYViewerControls.inc.h | 5 +- 大鱼调色/Plugin/DYViewerParameterBridge.inc.h | 11 +++- 大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h | 4 +- 大鱼调色/Plugin/DYWorkspaceTools.inc.h | 36 +++++++++-- 大鱼调色/Plugin/Info.plist | 4 +- 大鱼调色/Wrapper Application/Info.plist | 4 +- 开发交接.md | 26 +++----- 17 files changed, 191 insertions(+), 74 deletions(-) create mode 100644 research/HandoffHistory-20261117-before-module-strength.md diff --git a/research/HandoffHistory-20261117-before-module-strength.md b/research/HandoffHistory-20261117-before-module-strength.md new file mode 100644 index 0000000..d8c984c --- /dev/null +++ b/research/HandoffHistory-20261117-before-module-strength.md @@ -0,0 +1,29 @@ +# 大鱼调色开发交接 + +更新于2026-11-17(Asia/Shanghai)。 + +## 当前版本与目标 + +正式安装已更新为 **1.22.5(142)**,路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队B3W25FX5H5。Release构建、Developer ID签名、Apple公证Accepted、票据、Gatekeeper、正式安装及启动完成;构建/正式安装各1113项自检通过。[安装](verification/Delivery1.22.5.json) · [身份](verification/InstalledIdentity1.22.5.json) · [本轮详细记录](research/ControlsSync-20261117.md)。 + +本轮修复:同帧源时钟相位导致曲线/畸变/白平衡画布写入被拒;面板模型事件及动态模块布局刷新;LUT浏览器五位置强度;马赛克共享蒙版与跟踪入口;巨大常驻状态框改紧凑半透明、点击穿透、2秒收起提示;Vision运动整体约束为平移/旋转/等比缩放,保持用户绘制的蒙版形状。 + +## 已验证范围与缺口 + +FCP12.4正式142实测:控制面板新增风格LUT模块后检查器出现同一模块,控制面板37%→检查器37%,检查器62%→控制面板62%。100帧合成运动正方形蒙版跟踪完成,最大相对宽高比漂移7.8537e-8;应用马赛克后100键和关联保留,选中蒙版可继续编辑跟踪。FCP及XPC退出后冷重开,保存预设的整个工具文档一致。[宿主范围](verification/HostControlsSync1.22.5.json) · [轨迹数据](verification/HostShapeTracking1.22.5.json) · [Vision回归](verification/SimilarityTracking1.22.5.json)。 + +**物理OSC拖动/画面吸管、提示2秒消失未完成直接GUI验收**:自动化坐标输入未触发OSC回调,不能据此判定产品通过或失败。同帧写入及下一帧拒绝有原生桥接回归。复杂真实素材、遮挡、透视、Motion/HDR/变速及真实DJI色彩未测;合成100帧不代表任意素材。关闭重开面板会默认选首工具,重新选中蒙版可见跟踪编辑器。既有图章“最后可信帧”在FCP12.4自动跳转仍需手动定位。 + +## 源码、发行与恢复 + +工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支main,远程 `https://dayu.media/git/dayu/dayu-color.git`。实际编译源 `a1eb334840e1af285e878e7c094b06aaf01cba49`;发行标签 `v1.22.5-controls-sync-20261117` → `a20e734f6691313771df67d91402c200fec0b401` 已推送回读,标签不随后续证据提交移动。接手遗留Xcode工程引用排序改动保留、未提交。 + +[Release450](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117),附件79;正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg`,44,585,448字节,SHA-256 `194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a`。PKG公证 `9ee8e167-6d03-4c1a-93bc-efab671754af` Accepted,20项展开验包通过;发布前及发布后完整下载均匹配。本轮未再次运行系统安装器。[验包](verification/Package1.22.5.json) · [发布后下载](verification/Release1.22.5.json) · [恢复步骤](RECOVERY.md)。 + +独立HTTPS克隆检出1050个编译节点文件和发行标签全部文件、Git完整性、409个构建输入(工程字典仅排序等价)核对通过,无LFS/子模块,未在恢复目录重编。旧141回滚APP、构建APP、公证ZIP、临时验包和恢复目录已清理;保留正式/历史PKG、源码、QA媒体与库,未宣称全盘仅一个副本。[恢复核验](verification/Recovery1.22.5.json) · [清理](verification/Cleanup1.22.5.json)。 + +## 继续工作 + +优先用用户原始素材手动复测曲线松手、畸变拖动和白平衡吸管,以及2秒提示,再扩大复杂跟踪素材范围。FCP QA库包含用户真实媒体,勿上传或清理整库。缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`;Xcode27.2、FxPlug4.3.5、当前MacOSX.sdk;复用tools/deliver.py、Packaging/build_pkg.py与publish_release.py及产品/仓库锁。 + +本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126)。[上一轮完整交接](research/HandoffHistory-20261117-before-controls-sync.md)。 diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index 77184c0..c86f435 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -8,6 +8,7 @@ #import "DYManagedColor.h" #include "DYSpiderScopeDrawing.h" #include "DYScopeDisplayTime.h" +#include "DYLevelGeometry.h" #include static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;} @@ -115,7 +116,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b NSUInteger _session,_selectionID; NSView *_toolPane,*_editorHost,*_toolbar,*_maskPane;NSScrollView *_toolbarScroll,*_layerScroll,*_maskScroll,*_assignmentScroll; NSSplitView *_split;NSTableView *_layerTable;DYInspector *_toolEditor;NSView *_maskEditor; - NSTextField *_selectionTitle;NSButton *_addMask,*_deleteLayer; + NSTextField *_selectionTitle;NSButton *_addMask,*_deleteLayer;DYModuleStrengthControl *_moduleStrength;NSTextField *_screenHint,*_screenStatus;NSPopUpButton *_screenTools;NSButton *_screenDetails;NSString *_screenType;CGFloat _toolbarHeight;NSView *_screenSettings;NSTextField *_levelNumbers; NSArray *_layerRows;NSDictionary *_toolDocument;NSString *_selectedNode,*_selectedMask,*_maskNode,*_editorNode; id _lutTarget;CMTime _toolTime;BOOL _refreshingStack,_sizingSplit,_hasUserSelection;CGFloat _splitFraction,_scopeFraction; } @@ -149,7 +150,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]; - [_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]; + [_screenSettings release];[_moduleStrength release];[_screenHint release];[_screenStatus release];[_screenTools release];[_screenDetails release];[_screenType release];[_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;} @@ -196,13 +197,15 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b } - (void)layoutWorkspace{ CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height; - _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); + CGFloat toolbarWidth=MAX(1,w-86),tx=0,ty=0;for(NSView *button in _toolbar.subviews){CGFloat width=button.frame.size.width;if(tx>0&&tx+width>toolbarWidth){tx=0;ty+=29;}button.frame=NSMakeRect(tx,ty,width,27);tx+=width+3;}_toolbarHeight=ty+30;_toolbar.frame=NSMakeRect(0,0,toolbarWidth,_toolbarHeight);_toolbarScroll.hasHorizontalScroller=NO; + _heading.hidden=YES;_toolbarScroll.frame=NSMakeRect(6,3,toolbarWidth,_toolbarHeight);_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]; - CGFloat ew=_editorHost.bounds.size.width; - _lutStrengthBar.frame=NSMakeRect(0,0,ew,34);_lutSlot.frame=NSMakeRect(8,5,105,24); + CGFloat infoTop=_toolbarHeight+5;_screenTools.frame=NSMakeRect(8,infoTop,134,25);_screenDetails.frame=NSMakeRect(145,infoTop,68,25);_screenHint.frame=NSMakeRect(224,infoTop+2,MAX(1,w-238),32);_screenStatus.frame=NSMakeRect(10,infoTop+29,MAX(1,w-24),16); + _sizingSplit=YES;_split.frame=NSMakeRect(0,infoTop+50,w,MAX(1,h-infoTop-50));_sizingSplit=NO;[self layoutToolWorkspace]; + CGFloat ew=_editorHost.bounds.size.width;_screenSettings.frame=NSMakeRect(8,34,MAX(1,ew-16),MAX(1,_editorHost.bounds.size.height-34));_levelNumbers.frame=NSMakeRect(6,48,MAX(1,ew-30),70); + _lutStrengthBar.frame=NSMakeRect(0,30,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; + _lutPane.frame=NSMakeRect(0,64,ew,MAX(1,_editorHost.bounds.size.height-64));_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)]; @@ -225,7 +228,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;_lutStrengthBar.hidden=_editorMode!=2;if(_editorMode==2)[self refreshLUTStrength]; + if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_screenSettings.hidden=_editorMode!=3;_moduleStrength.hidden=_editorMode==3;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=NO;_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; diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index dae55f0..28145b7 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -570,8 +570,8 @@ NSView *DYCreateWorkspaceMaskEditor(id b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded||_workspaceEditor;[themes addObject:b]; }_themeButtons=[themes copy]; if(!_embedded||_workspaceEditor)_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect]; - _scroll.hasVerticalScroller=NO; _scroll.hasHorizontalScroller=_workspaceEditor;_scroll.scrollerStyle=NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO; - _scroll.autohidesScrollers=YES; _scroll.borderType=NSNoBorder; + _scroll.hasVerticalScroller=_workspaceEditor&&[workspaceType isEqual:@"primary"]; _scroll.hasHorizontalScroller=_workspaceEditor&&![workspaceType isEqual:@"primary"];_scroll.scrollerStyle=_workspaceEditor?NSScrollerStyleLegacy:NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO; + _scroll.autohidesScrollers=!_workspaceEditor; _scroll.borderType=NSNoBorder; _scroll.clipsToBounds=YES;_scroll.wantsLayer=YES;_scroll.layer.masksToBounds=YES; _scroll.contentView.clipsToBounds=YES; _scroll.contentView.wantsLayer=YES;_scroll.contentView.layer.masksToBounds=YES; @@ -734,6 +734,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [card addSubview:reset]; NSMutableArray *body=[NSMutableArray array]; NSString *key=section[@"key"]?:@""; + if(_workspaceEditor&&[key isEqual:@"primary"]){NSSegmentedControl *pages=[NSSegmentedControl segmentedControlWithLabels:@[@"常用",@"影调",@"更多设置"] trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(tabChanged:)];pages.identifier=@"primaryWorkspace";pages.selectedSegment=0;pages.accessibilityLabel=@"一级调色设置分组";[card addSubview:pages];[body addObject:pages];} if([key isEqual:@"primary"]) { NSButton *migrate=DYButton(@"旧版输入 → 改用 CST",self,@selector(useCST:));migrate.identifier=@"legacyInput";migrate.toolTip=@"保留旧工程输入效果;点击后改用上方 CST 设置,可撤销";[card addSubview:migrate];[body addObject:migrate]; } @@ -842,12 +843,13 @@ NSView *DYCreateWorkspaceMaskEditor(id NSMutableDictionary *record=[NSMutableDictionary dictionaryWithDictionary:@{@"section":section,@"view":card,@"header":header,@"enabled":enabled,@"reset":reset,@"body":body,@"collapsed":@YES}]; if([key isEqual:@"look"]){NSButton *add=DYButton(@"+",self,@selector(addLook:));add.bordered=NO;add.font=[NSFont boldSystemFontOfSize:20];add.accessibilityLabel=@"添加风格 LUT";[card addSubview:add];record[@"add"]=add;} id host=_embedded?[(DYToolManager*)_manager host]:_manager; - NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:key]; + NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[key isEqual:@"output"]?@"output":[@"base:" stringByAppendingString:key]; DYToolMaskPanel *maskPanel=[[[DYToolMaskPanel alloc]initWithManager:host nodeID:nodeID]autorelease];[card addSubview:maskPanel];[body insertObject:maskPanel atIndex:0];record[@"maskPanel"]=maskPanel; NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.identifier=@"layerAction";mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask; DYMaskCountBadge *maskBadge=[[[DYMaskCountBadge alloc]initWithFrame:NSZeroRect]autorelease];maskBadge.hidden=YES;maskBadge.accessibilityLabel=[section[@"title"] stringByAppendingString:@"蒙版数量"];[card addSubview:maskBadge];record[@"maskBadge"]=maskBadge; NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.identifier=@"layerAction";repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat; NSButton *remove=DYButton(@"",self,@selector(removeTool:));remove.tag=index;remove.bordered=NO;remove.identifier=@"layerAction";remove.image=[NSImage imageWithSystemSymbolName:@"minus.square" accessibilityDescription:@"删除此层"];remove.toolTip=@"删除此层并还原参数、LUT 与蒙版";remove.accessibilityLabel=[section[@"title"]stringByAppendingString:_embedded?@"删除此层":@"删除模块"];[card addSubview:remove];record[@"removeButton"]=remove; + if(!_workspaceEditor&&([DYToolTypes()containsObject:key]||[key isEqual:@"output"])){DYModuleStrengthControl *strength=[[[DYModuleStrengthControl alloc]initWithManager:host nodeID:nodeID]autorelease];strength.identifier=@"moduleStrength";[card addSubview:strength];record[@"strength"]=strength;} [_cards addObject:record]; index++; } @@ -868,6 +870,7 @@ NSView *DYCreateWorkspaceMaskEditor(id } - (BOOL)showRow:(NSView *)row section:(NSString *)section { if(_workspaceEditor&&[row.identifier isEqual:@"toolMasks"])return NO; + if(_workspaceEditor&&[section isEqual:@"primary"]){NSString *key=row.identifier?:@"";if([key isEqual:@"primaryWorkspace"])return YES;NSInteger page=[_tabs[@"primaryWorkspace"]integerValue];NSArray *common=@[@"primaryBalance",@"cmexposure",@"cmsaturation",@"cmcontrast",@"cmpivot"],*tone=@[@"cmhiContrast",@"cmhiPivot",@"cmshadowContrast",@"cmshadowPivot",@"cmwhite",@"cmshoulder",@"cmhighlights",@"cmmidtones",@"cmshadows",@"cmblack",@"cmtoe"];NSInteger group=[common containsObject:key]?0:[tone containsObject:key]?1:2;if(group!=page)return NO;} if([row.identifier isEqual:@"toolMasks"])return [(DYToolMaskPanel*)row contentHeight]>0; NSString *key=row.identifier?:@"";NSInteger tab=[_tabs[section]integerValue]; if(!_embedded&&[section isEqual:@"base"]&&[key isEqual:@"skinEnabled"])for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"skin"])return ![card[@"removed"]boolValue]; @@ -909,7 +912,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [c[@"enabled"]setFrame:NSMakeRect(12,12,20,20)]; BOOL narrow=cw<300;CGFloat titleWidth=MIN(cw-(narrow?60:171),MAX(94,[[(NSButton *)c[@"header"]title]sizeWithAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:12]}].width+36)); [c[@"header"]setFrame:NSMakeRect(42,8,titleWidth,28)]; - CGFloat headerHeight=_workspaceEditor?0:narrow?69:43,buttonY=narrow?38:10; + CGFloat headerHeight=_workspaceEditor?0:narrow?69:43,buttonY=narrow?38:10;CGFloat strengthTop=headerHeight;if(c[@"strength"]){[c[@"strength"]setFrame:NSMakeRect(12,strengthTop,cw-24,30)];headerHeight+=34;} if(_workspaceEditor)for(NSString *name in @[@"header",@"enabled",@"reset",@"repeatButton",@"removeButton",@"maskButton",@"maskBadge"])[c[name]setHidden:YES]; card.frame=NSMakeRect(16,y,cw,headerHeight+(contentHeight>0?contentHeight+8:0));y+=card.frame.size.height+12; [c[@"reset"]setFrame:NSMakeRect(cw-34,buttonY,24,24)]; @@ -931,11 +934,16 @@ NSView *DYCreateWorkspaceMaskEditor(id if(_workspaceEditor){ // Keep module controls together, then distribute ordinary parameter // columns across the actual viewport instead of a fixed 250pt strip. - CGFloat height=MAX(160,_scroll.contentSize.height-12),available=MAX(280,_scroll.contentSize.width-24),x=12; + CGFloat strengthHeight=c[@"strength"]?34:0;CGFloat height=MAX(126,_scroll.contentSize.height-12-strengthHeight),available=MAX(280,_scroll.contentSize.width-24),x=12; NSMutableArray *rows=[NSMutableArray array],*graphics=[NSMutableArray array];NSView *tabs=nil; for(NSView *row in body)if(!row.hidden){NSString *identifier=row.identifier?:@"";if([identifier isEqual:@"hslTabs"])tabs=row; else if([identifier hasSuffix:@"Graph"]||[identifier isEqual:@"gradingWheels"]||[identifier isEqual:@"primaryBalance"])[graphics addObject:row];else [rows addObject:row];} - if([key isEqual:@"spider"]){ + if([key isEqual:@"primary"]){ + CGFloat top=42;NSInteger columns=available>=620?2:1;CGFloat rw=(available-16*(columns-1))/columns;NSInteger index=0; + for(NSView *row in rows){if([row.identifier isEqual:@"primaryWorkspace"]){row.frame=NSMakeRect(12,2,MIN(available,360),30);continue;}row.frame=NSMakeRect(12+(index%columns)*(rw+16),top+(index/columns)*36,rw,34);index++;} + CGFloat bottom=top+ceil(double(index)/columns)*36;for(NSView *graphic in graphics){graphic.frame=NSMakeRect(12,bottom,MIN(available,260),218);for(NSView *view in graphic.subviews)view.frame=graphic.bounds;bottom+=228;} + card.frame=NSMakeRect(0,6,_scroll.contentSize.width,MAX(_scroll.contentSize.height-6,bottom+8));y=NSMaxY(card.frame)+6;continue; + }else if([key isEqual:@"spider"]){ CGFloat groupWidth=MAX(490,available);_spiderPanel.frame=NSMakeRect(x,0,groupWidth,height); for(NSView *row in rows)if([row.identifier isEqual:@"spiderMix"]){[_spiderPanel addSubview:row];_spiderPanel.accessoryRow=row;} [_spiderPanel setNeedsLayout:YES];[_spiderPanel layoutSubtreeIfNeeded];x+=groupWidth; @@ -1080,7 +1088,7 @@ NSView *DYCreateWorkspaceMaskEditor(id for(NSDictionary *card in _cards){ NSString *type=card[@"section"][@"key"]; BOOL removed=[type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(tools,type);groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed); - [card[@"maskPanel"]refreshWithDocument:tools time:t]; + [card[@"maskPanel"]refreshWithDocument:tools time:t];[(DYModuleStrengthControl*)card[@"strength"]refreshWithDocument:tools]; NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:card[@"section"][@"key"]];NSUInteger count=[DYMasksForTool(tools,nodeID) count]; [(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版"; [card[@"maskButton"]setToolTip:hint];[card[@"maskButton"]setAccessibilityHelp:hint]; @@ -1339,6 +1347,7 @@ NSView *DYCreateWorkspaceMaskEditor(id NSNumber *extra=section[@"extraEnabled"];if(extra)[set setFloatValue:defaultEnabled toParameter:extra.unsignedIntValue atTime:t]; NSString *key=section[@"key"]?:@""; + NSMutableDictionary *strengthDoc=DYMutablePlist(DYReadTools(_manager,t).document);if(DYSetToolStrength(strengthDoc,[@"base:" stringByAppendingString:key],1))DYWriteTools(_manager,strengthDoc,t); if([key isEqual:@"primary"]){for(NSDictionary *d in DYDescriptors())if([d[@"key"]hasPrefix:@"cm"])[set setFloatValue:[d[@"default"]doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];[set setFloatValue:1 toParameter:2236 atTime:t];for(NSNumber *linked in section[@"enableParameters"])[set setFloatValue:1 toParameter:linked.unsignedIntValue atTime:t];[set setFloatValue:0 toParameter:2013 atTime:t];DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];NSMutableDictionary *paths=[[state.paths mutableCopy]autorelease];[paths removeObjectForKey:@"input"];state.paths=paths;DYWriteAssets(_manager,state,t);} if([key isEqual:@"primary"])DYPrimaryControlChanged(_manager,t,@"cmworkingTransfer"); if([key isEqual:@"spider"]){DYAssetState *state=[[DYReadAssets(_manager,t)copy]autorelease];auto m=DYSpiderMesh(state.spiderMesh);m=dy::neutralMesh(m.hues,m.rings+1);state.spiderMesh=[NSData dataWithBytes:&m length:sizeof(m)];DYWriteAssets(_manager,state,t);} diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index a3821cc..06b9740 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){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]; + drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message)DYPublishScreenToolInfo(self->_apiManager,nil,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/DYToolInspector.inc.h b/大鱼调色/Plugin/DYToolInspector.inc.h index edf0f4a..e518d15 100644 --- a/大鱼调色/Plugin/DYToolInspector.inc.h +++ b/大鱼调色/Plugin/DYToolInspector.inc.h @@ -58,4 +58,4 @@ - (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor||_measuringDefaultHeight)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child setNeedsLayout:YES];[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;} -- (void)resetRepeatedTool{if(!_embedded)return;idhost=[(DYToolManager*)_manager host];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;idundo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];} +- (void)resetRepeatedTool{if(!_embedded)return;idhost=[(DYToolManager*)_manager host];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}DYSetToolStrength(doc,node[@"id"],1);node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;idundo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];} diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index f854196..71eddf1 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -105,17 +105,7 @@ - (void)drawLevelControls { if(!_levelMode)return; NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height)); - CGFloat scale=MIN(_uiScale,NSWidth(viewport)/420.); - NSRect prompt=NSMakeRect(NSMinX(viewport)+8*scale,NSMinY(viewport)+8*scale,400*scale,72*scale); - DYDrawSoftControl(prompt,4*scale,NO,NO,NO); - NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelPlaced?@"拖动端点修正 · 空白处重画 · Esc 收起":_levelHasFirst?@"选择参考线终点 · Esc 取消":@"点击两点或拖出参考线 · Esc 收起"); - NSDictionary *attrs=@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:12*scale]}; - [title drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+5*scale,388*scale,18*scale) withAttributes:attrs]; - DYLevelTransform result(_levelAngle,_level.aspect); - NSString *numbers=[NSString stringWithFormat:@"FCP 旋转 %+.2f° 缩放 %.2f%%(增加 %.2f%%)",-_levelAngle*180/M_PI,result.zoom*100,(result.zoom-1)*100]; - [numbers drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+27*scale,388*scale,18*scale) withAttributes:attrs]; - NSString *hint=_viewerControls.levelMeasureOnly?@"仅测量:数值用于原始变换;已有缩放请乘以上述比例。":@"插件已应用;改用原始变换前,请切换「仅测量」。"; - [hint drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+49*scale,388*scale,18*scale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:10*scale]}]; + NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelPlaced?@"拖动端点修正;空白处重画;Esc 收起":_levelHasFirst?@"选择参考线终点;Esc 取消":@"点击两点或拖出参考线;Esc 收起");DYLevelTransform result(_levelAngle,_level.aspect);NSString *numbers=[NSString stringWithFormat:@"%@ · FCP旋转 %+.2f° · 缩放 %.2f%%%@",title,-_levelAngle*180/M_PI,result.zoom*100,_viewerControls.levelMeasureOnly?@" · 仅测量":@""];[_viewerControls.bridge publishScreenTool:@"level" message:numbers]; if(!_levelHasFirst&&!_levelPlaced)return; NSPoint first=[self canvasDisplayPoint:_level.toOutput(_levelFirst)],last=[self canvasDisplayPoint:_level.toOutput(_levelLast)]; [NSGraphicsContext saveGraphicsState];NSRectClip(viewport); @@ -173,10 +163,7 @@ - (void)drawStampControls{ NSArray *source=_mask[@"stampSource"]; if(_viewerControls.stampArmed){ - NSRect cell=NSUnionRect([self stampControlRect:0],[self stampControlRect:3]); - DYDrawSoftControl(cell,4,NO,NO,NO); - NSString *prompt=_stampSaving?@"正在保存仿制图章…":_stampFailure?:(_stampHasSource?@"拖出要覆盖的椭圆 · Esc 取消":@"点击画面选择取样中心 · Esc 取消"); - [prompt drawInRect:NSInsetRect(cell,6,4) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.48)]}]; + NSString *prompt=_stampSaving?@"正在保存仿制图章…":_stampFailure?:(_stampHasSource?@"拖出要覆盖的椭圆;Esc 取消":@"点击画面选择取样中心;Esc 取消");[_viewerControls.bridge publishScreenTool:@"cloneStamp" message:prompt]; if(_stampHasSource)[self drawStampSource:_stampSource]; if(_stampDragging||_stampSaving||_stampFailure){ NSRect target=[self stampTarget]; @@ -238,7 +225,7 @@ for(NSInteger item=9;item<=10;item++){NSString *title=item==9?@"✓ 完成":@"取消";NSRect cell=[self toolbarRectForItem:item];CGFloat size=cell.size.height*.48;[title drawInRect:NSInsetRect(cell,0,MAX(0.,(cell.size.height-size-3)/2))withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size weight:NSFontWeightMedium],NSForegroundColorAttributeName:NSColor.whiteColor,NSShadowAttributeName:shadow,NSParagraphStyleAttributeName:style}];} } }if(_levelMode)[self drawLevelControls];else [self drawStampControls];[_viewerControls draw]; - if(_hslSampling){NSRect prompt=[self hslPickerRect];DYDrawSoftControl(prompt,4,NO,NO,NO);[@"HSL 吸管:点击画面取色 · Esc 取消" drawInRect:NSInsetRect(prompt,7*_uiScale,5*_uiScale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:11*_uiScale]}];} + if(_hslSampling)[_viewerControls.bridge publishScreenTool:@"hsl" message:@"HSL 吸管:点击画面取色;Esc 取消"]; [NSGraphicsContext restoreGraphicsState];CIImage *overlay=[CIImage imageWithCGImage:bitmap.CGImage options:@{kCIImageColorSpace:NSNull.null}];overlay=[overlay imageByApplyingTransform:CGAffineTransformMakeTranslation(NSMinX(region),texture.height-NSMaxY(region))];[_context render:overlay toMTLTexture:texture commandBuffer:commands bounds:CGRectMake(0,0,texture.width,texture.height) colorSpace:nil]; }[commands commit];[commands waitUntilCompleted]; }}} diff --git a/大鱼调色/Plugin/DYToolRender.inc.h b/大鱼调色/Plugin/DYToolRender.inc.h index 095da0d..b6e12b8 100644 --- a/大鱼调色/Plugin/DYToolRender.inc.h +++ b/大鱼调色/Plugin/DYToolRender.inc.h @@ -83,9 +83,10 @@ - (BOOL)renderToolsSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{ if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程"); if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools); + NSMutableDictionary *weighted=[[tools mutableCopy]autorelease],*baseWeights=[NSMutableDictionary dictionaryWithDictionary:tools[@"baseMasks"]?:@{}];for(NSString *type in DYToolTypes()){double amount=DYToolStrength(tools,[@"base:" stringByAppendingString:type]);if(amount<1)baseWeights[type]=DYToolStrengthMasks(baseWeights[type],amount);}weighted[@"baseMasks"]=baseWeights;NSMutableArray *weightedLayers=[NSMutableArray array];for(NSDictionary *node in tools[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];double amount=DYToolStrength(tools,node[@"id"]);copy[@"masks"]=DYToolStrengthMasks(node[@"masks"],amount);copy[@"renderStrength"]=@(amount);[weightedLayers addObject:copy];}weighted[@"layers"]=weightedLayers;tools=weighted; DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil; NSMutableSet *activeIDs=nil;BOOL anchored=NO; - for(NSDictionary *node in tools[@"layers"])if(!DYToolIsNeutral(node)){ + for(NSDictionary *node in tools[@"layers"])if([node[@"renderStrength"]doubleValue]>0&&!DYToolIsNeutral(node)){ if(!activeIDs)activeIDs=[NSMutableSet set]; [activeIDs addObject:node[@"id"]]; anchored|=![DYToolRootAnchor(tools,node[@"id"])isEqual:@"tail"]; diff --git a/大鱼调色/Plugin/DYToolState.h b/大鱼调色/Plugin/DYToolState.h index dfed3e2..a2b13b5 100644 --- a/大鱼调色/Plugin/DYToolState.h +++ b/大鱼调色/Plugin/DYToolState.h @@ -20,6 +20,17 @@ NSDictionary *DYNewTool(NSString *type); // layers without an anchor retain their historical end-of-chain semantics. NSDictionary *DYInsertTool(NSMutableDictionary *document,NSString *type,NSString *afterID); BOOL DYRemoveTool(NSMutableDictionary *document,NSString *nodeID); +NSDictionary *DYScreenToolCatalog(void); +void DYPublishScreenToolInfo(id host,NSString *type,NSString *message); +NSDictionary *DYCurrentScreenToolInfo(id host); +double DYToolStrength(NSDictionary *document,NSString *nodeID); +BOOL DYSetToolStrength(NSMutableDictionary *document,NSString *nodeID,double strength); +// Runtime-only constant intersection; never consumes an authored mask slot. +NSArray *DYToolStrengthMasks(NSArray *masks,double strength); +@interface DYModuleStrengthControl : NSView +- (instancetype)initWithManager:(id)manager nodeID:(NSString*)nodeID; +- (void)refreshWithDocument:(NSDictionary*)document; +@end NSArray *DYToolDisplayOrder(NSDictionary *document); NSArray *DYUnifiedRenderOrder(NSDictionary *document); NSString *DYToolRootAnchor(NSDictionary *document,NSString *nodeID); diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm index 66bf571..a1034dd 100644 --- a/大鱼调色/Plugin/DYToolState.mm +++ b/大鱼调色/Plugin/DYToolState.mm @@ -7,6 +7,10 @@ #import #import +static char DYScreenInfoKey; +NSDictionary *DYScreenToolCatalog(void){static NSDictionary *catalog;static dispatch_once_t once;dispatch_once(&once,^{catalog=[@{@"curve":@"点击曲线加点,拖动调整;通道、整体强度和精细参数在面板中设置。",@"lens":@"拖动画面网格调整畸变,拖动中心点定位光学中心;缩放与强度在详情中设置。",@"skin":@"切换画面肤色保护区域;保护程度、色相及人脸限定在详情中设置。",@"look":@"在控制面板选择 LUT;整体强度与各风格位置的强度分别调节。",@"whiteBalance":@"点击画面中的中性白色或灰色取样;Esc 取消,色温和色调可在详情中精调。",@"cloneStamp":@"先点击取样中心,再拖出覆盖区域;取样、羽化、参考区域和跟踪在蒙版详情中设置。",@"level":@"点击两点或拖出参考线;水平、垂直、仅测量和重置在详情中设置。",@"mosaic":@"选择人脸或已绘制蒙版,调整方块大小;蒙版跟踪保留在蒙版详情中。",@"rectangle":@"在画面拖出矩形,松开保存;位置、尺寸、羽化、强度及跟踪在蒙版详情中设置。",@"ellipse":@"在画面拖出椭圆,松开保存;位置、尺寸、羽化、强度及跟踪在蒙版详情中设置。",@"pen":@"点击放点,拖出曲柄,点首节点或回车闭合;Esc 取消,删除键撤回最后一点。"}copy];});return catalog;} +NSDictionary *DYCurrentScreenToolInfo(id host){return objc_getAssociatedObject(host,&DYScreenInfoKey);} +void DYPublishScreenToolInfo(id host,NSString *type,NSString *message){if(!host)return;dispatch_async(dispatch_get_main_queue(),^{NSDictionary *old=DYCurrentScreenToolInfo(host);NSString *kind=type?:old[@"type"]?:@"";NSDictionary *info=@{@"type":kind,@"message":message?:DYScreenToolCatalog()[kind]?:@""};if([old isEqual:info])return;objc_setAssociatedObject(host,&DYScreenInfoKey,info,OBJC_ASSOCIATION_COPY_NONATOMIC);[NSNotificationCenter.defaultCenter postNotificationName:@"DYScreenToolInfo" object:host userInfo:info];});} NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film",@"lens"];} NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;} static NSArray *DYBaseToolParts(NSString *type){return [type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];} @@ -29,7 +33,7 @@ NSArray *DYBaseToolDescriptors(NSString *type){return DYToolRemo BOOL DYBaseToolRemoved(NSDictionary *doc,NSString *type){return [doc[@"removedBase"]containsObject:type];} BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){ if(!DYValidToolDocument(doc)||![DYToolTypes()containsObject:type])return NO; - NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];} + NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];[doc[@"strengths"]removeObjectForKey:[@"base:" stringByAppendingString:type]];} if(types.count)doc[@"removedBase"]=types;else[doc removeObjectForKey:@"removedBase"];return YES; } void DYApplyRemovedBaseTools(DYUniforms *u,NSDictionary *doc){ @@ -126,6 +130,7 @@ static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL referenc static NSData *DYValidatedToolData(NSDictionary *doc){ if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return nil; if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2]&&![doc[@"schema"]isEqual:@3])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return nil; + id starter=doc[@"starterTool"],level=doc[@"levelRotation"]; id mosaic=doc[@"mosaic"]; if(mosaic){ @@ -152,6 +157,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){ for(NSString *key in node[@"values"]){NSDictionary *d=descriptors[key];id v=node[@"values"][key];if(!d||!finiteNumber(v)||[v doubleValue]<[d[@"min"]doubleValue]||[v doubleValue]>[d[@"max"]doubleValue]||(d[@"values"]&&![d[@"values"]containsObject:@((int)llround([v doubleValue]))]))return nil;} for(id key in node[@"paths"]){id p=node[@"paths"][key];if(![@[@"input",@"look0",@"look1",@"look2",@"look3",@"look4"]containsObject:key]||![p isKindOfClass:NSString.class]||[p length]>8192||![p isAbsolutePath]||![[p pathExtension].lowercaseString isEqual:@"cube"])return nil;}if(node[@"spider"]&&(![node[@"spider"]isKindOfClass:NSData.class]||!DYSpiderMeshIsValid(node[@"spider"])))return nil; } + id strengths=doc[@"strengths"];if(strengths){if(![strengths isKindOfClass:NSDictionary.class]||[strengths count]>DYToolLimit+DYToolTypes().count+1)return nil;for(id ID in strengths){id value=strengths[ID];if(![ID isKindOfClass:NSString.class]||!finiteNumber(value)||[value doubleValue]<0||[value doubleValue]>1)return nil;BOOL base=[ID hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[ID substringFromIndex:5]];if(!base&&![ID isEqual:@"output"]&&!DYToolWithID(doc,ID))return nil;}} // Anchors are stable identities, never an array index or a translated title. // Reject unknown anchors/cycles so layout, rendering and undo share one order. for(NSDictionary *node in doc[@"layers"]){id after=node[@"after"];if(!after)continue;if([doc[@"schema"]isEqual:@1]||![after isKindOfClass:NSString.class])return nil;NSMutableSet *seen=[NSMutableSet setWithObject:node[@"id"]];while(after){if([after hasPrefix:@"base:"]){if(![DYToolTypes()containsObject:[after substringFromIndex:5]])return nil;break;}if([seen containsObject:after])return nil;[seen addObject:after];NSDictionary *parent=DYToolWithID(doc,after);if(!parent)return nil;after=parent[@"after"];}} @@ -175,12 +181,23 @@ BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil DYToolDocument *DYReadTools(idm,CMTime t){DYToolDocument *d=nil;[[(id)m apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&d fromParameter:DYToolsParameterID atTime:t];return [d isKindOfClass:DYToolDocument.class]?d:[[[DYToolDocument alloc]init]autorelease];} BOOL DYWriteTools(idm,NSDictionary *d,CMTime t){NSData *data=DYValidatedToolData(d);if(!data)return NO;DYToolDocument *v=[[[DYToolDocument alloc]init]autorelease];[v setImmutableDocument:[NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:NULL error:nil]];return [[m apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:v toParameter:DYToolsParameterID atTime:t];} NSDictionary *DYToolWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *n in doc[@"layers"])if([n[@"id"]isEqual:ID])return n;return nil;} +double DYToolStrength(NSDictionary *doc,NSString *ID){NSNumber *value=doc[@"strengths"][ID?:@""];return value?value.doubleValue:1;} +BOOL DYSetToolStrength(NSMutableDictionary *doc,NSString *ID,double strength){ + if(!DYValidToolDocument(doc)||!std::isfinite(strength)||strength<0||strength>1)return NO; + BOOL base=[ID hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[ID substringFromIndex:5]]; + if(!base&&![ID isEqual:@"output"]&&!DYToolWithID(doc,ID))return NO; + NSMutableDictionary *values=[NSMutableDictionary dictionaryWithDictionary:doc[@"strengths"]?:@{}];if(strength==1)[values removeObjectForKey:ID];else values[ID]=@(strength);if(values.count)doc[@"strengths"]=values;else[doc removeObjectForKey:@"strengths"];return YES; +} +NSArray *DYToolStrengthMasks(NSArray *masks,double strength){ + if(strength>=1)return masks?:@[];NSMutableArray *result=[NSMutableArray arrayWithArray:masks?:@[]];DYMaskParameters p=dyDefaultMaskParameters();p.kind=DYMaskRectangle;p.width=p.height=4000;p.feather=0;p.outputBlack=p.outputWhite=1;p.strength=strength; + [result addObject:@{@"enabled":@YES,@"combine":@2,@"parameters":parameterData(p),@"nodes":[NSData data],@"keys":@[]}];return result; +} static void DYAppendToolChildren(NSDictionary *doc,NSString *parent,NSMutableArray *order,NSMutableSet *seen){for(NSDictionary *node in doc[@"layers"])if([node[@"after"]isEqual:parent]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}} NSArray *DYToolDisplayOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray array];NSMutableSet *seen=[NSMutableSet set];for(NSString *type in DYToolTypes()){NSString *base=[@"base:" stringByAppendingString:type];[order addObject:base];DYAppendToolChildren(doc,base,order,seen);}for(NSDictionary *node in doc[@"layers"])if(!node[@"after"]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}return order;} NSString *DYToolRootAnchor(NSDictionary *doc,NSString *ID){NSMutableSet *seen=[NSMutableSet set];NSDictionary *node=DYToolWithID(doc,ID);while(node[@"after"]){NSString *after=node[@"after"];if([after hasPrefix:@"base:"])return after;if([seen containsObject:after])return nil;[seen addObject:after];node=DYToolWithID(doc,after);}return @"tail";} NSArray *DYUnifiedRenderOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray arrayWithArray:DYToolDisplayOrder(doc)];NSString *after=doc[@"outputAfter"]?:@"tail";NSUInteger index=[order indexOfObject:after];[order insertObject:@"output" atIndex:index==NSNotFound?order.count:index+1];return order;} NSDictionary *DYInsertTool(NSMutableDictionary *doc,NSString *type,NSString *after){if(!DYValidToolDocument(doc)||[doc[@"layers"]count]>=DYToolLimit)return nil;if(!([after hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[after substringFromIndex:5]])&&!DYToolWithID(doc,after))return nil;NSDictionary *fresh=DYNewTool(type);if(!fresh)return nil;NSMutableDictionary *node=DYMutablePlist(fresh);node[@"after"]=after;NSMutableArray *layers=doc[@"layers"];for(NSMutableDictionary *old in layers)if([old[@"after"]isEqual:after])old[@"after"]=node[@"id"];NSUInteger index=0;NSDictionary *parent=DYToolWithID(doc,after);if(parent)index=[layers indexOfObjectIdenticalTo:parent]+1;[layers insertObject:node atIndex:MIN(index,layers.count)];if(![doc[@"schema"]isEqual:@3])doc[@"schema"]=@2;return node;} -BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];return YES;} +BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];[doc[@"strengths"]removeObjectForKey:ID];return YES;} NSArray *DYSharedMasks(NSDictionary *doc){return [doc[@"sharedMasks"]isKindOfClass:NSArray.class]?doc[@"sharedMasks"]:@[];} NSDictionary *DYSharedMaskWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *mask in DYSharedMasks(doc))if([mask[@"id"]isEqual:ID])return mask;return nil;} static NSArray *DYRawMasksForTool(NSDictionary *doc,NSString *ID){return [ID hasPrefix:@"base:"]?doc[@"baseMasks"][[ID substringFromIndex:5]]?:@[]:DYToolWithID(doc,ID)[@"masks"]?:@[];} @@ -500,3 +517,42 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms - (BOOL)getCustomParameterValue:(id*)out fromParameter:(UInt32)pid atTime:(CMTime)t{if(pid==DYAssetsParameterID){DYAssetState *a=[[[DYAssetState alloc]init]autorelease];NSDictionary *n=[self node];a.paths=n[@"paths"]?:@{};a.spiderMesh=n[@"spider"];a.spiderLinked=[n[@"spiderLinked"]boolValue];*out=a;return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *global=_token; if(!global)[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&global fromParameter:pid atTime:t];DYInspectorToken *local=[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[NSMutableDictionary dictionary];for(NSString *key in global.folds)if([key hasPrefix:[_nodeID stringByAppendingString:@":"]])folds[[key substringFromIndex:_nodeID.length+1]]=global.folds[key];local.folds=folds;*out=local;return YES;}return NO;} - (BOOL)setCustomParameterValue:(id)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth)return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;if(pid==DYAssetsParameterID&&[v isKindOfClass:DYAssetState.class]){n[@"paths"]=DYMutablePlist([v paths]);if([v spiderMesh])n[@"spider"]=[v spiderMesh];else[n removeObjectForKey:@"spider"];n[@"spiderLinked"]=@([v spiderLinked]);return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *old=nil;[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:pid atTime:t];[_token release];_token=old?[old copy]:[DYInspectorToken new];NSMutableDictionary *folds=[[_token.folds mutableCopy]autorelease];for(NSString *key in [v folds])folds[[_nodeID stringByAppendingFormat:@":%@",key]]=[v folds][key];_token.folds=folds;return YES;}return NO;} @end + +#import "DYTheme.h" +@interface DYModuleStrengthControl (Gesture) +- (void)beginStrengthGesture; +- (void)endStrengthGesture; +@end +@interface DYModuleStrengthSlider : NSSlider @end +@implementation DYModuleStrengthSlider +- (void)mouseDown:(NSEvent*)event{[self.target performSelector:@selector(beginStrengthGesture)];@try{[super mouseDown:event];}@finally{[self.target performSelector:@selector(endStrengthGesture)];}} +@end +@implementation DYModuleStrengthControl { + id _manager;NSString *_nodeID;NSTextField *_label,*_field;NSSlider *_slider;NSButton *_reset;BOOL _editing,_grouped;CMTime _editTime; +} +- (BOOL)isFlipped{return YES;} +- (instancetype)initWithManager:(id)manager nodeID:(NSString*)nodeID{ + if((self=[super initWithFrame:NSMakeRect(0,0,280,30)])){ + _manager=manager;_nodeID=[nodeID copy];self.accessibilityLabel=@"模块整体强度"; + _label=[NSTextField labelWithString:@"强度"];_label.font=[NSFont systemFontOfSize:11];[self addSubview:_label]; + _slider=[[[DYModuleStrengthSlider alloc]initWithFrame:NSZeroRect]autorelease];_slider.minValue=0;_slider.maxValue=100;_slider.continuous=YES;_slider.target=self;_slider.action=@selector(strengthChanged:);_slider.accessibilityLabel=@"模块整体强度百分比";[self addSubview:_slider]; + _field=[[[NSTextField alloc]initWithFrame:NSZeroRect]autorelease];_field.font=[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular];_field.alignment=NSTextAlignmentRight;_field.target=self;_field.action=@selector(strengthChanged:);_field.accessibilityLabel=@"模块整体强度百分比";[self addSubview:_field]; + _reset=[NSButton buttonWithTitle:@"↺" target:self action:@selector(resetStrength:)];_reset.bordered=NO;_reset.toolTip=@"还原整体强度为 100%";_reset.accessibilityLabel=_reset.toolTip;[self addSubview:_reset]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(strengthModelChanged:) name:DYModelChanged object:manager]; + [self strengthModelChanged:nil];[self resizeSubviewsWithOldSize:NSZeroSize]; + }return self; +} +- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[super dealloc];} +- (void)resizeSubviewsWithOldSize:(NSSize)old{CGFloat w=self.bounds.size.width;_label.frame=NSMakeRect(0,7,32,18);_slider.frame=NSMakeRect(38,6,MAX(26,w-126),20);_field.frame=NSMakeRect(MAX(65,w-81),3,54,24);_reset.frame=NSMakeRect(w-24,3,24,24);} +- (void)refreshWithDocument:(NSDictionary*)doc{if(_editing)return;double amount=DYToolStrength(doc,_nodeID)*100;_slider.doubleValue=amount;_field.stringValue=[NSString stringWithFormat:@"%.0f%%",amount];_label.textColor=DYThemeColor(@"text");_slider.toolTip=@"0% 旁路本模块,100% 完整应用;保留原参数与蒙版";} +- (void)strengthModelChanged:(NSNotification*)note{if(_editing||!_manager)return;ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{[self refreshWithDocument:DYReadTools(_manager,a.currentTime).document];}@finally{[a endAction:self];}} +- (void)beginStrengthGesture{if(_editing)return;ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{_editTime=a.currentTime;_grouped=[[_manager apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"调整模块整体强度"];_editing=YES;}@finally{[a endAction:self];}} +- (void)endStrengthGesture{if(!_editing)return;ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];@try{if(_grouped)[[_manager apiForProtocol:@protocol(FxUndoAPI)]endUndoGroup];_grouped=NO;_editing=NO;}@finally{[a endAction:self];}[self strengthModelChanged:nil];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];} +- (void)strengthChanged:(NSControl*)sender{ + double amount=sender.doubleValue;if(sender==_field){NSString *text=[_field.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];if([text hasSuffix:@"%"]||[text hasSuffix:@"%"])text=[text substringToIndex:text.length-1];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&amount]||!scanner.isAtEnd||!std::isfinite(amount)){NSBeep();[self strengthModelChanged:nil];return;}} + if(!std::isfinite(amount))return;amount=MAX(0.,MIN(100.,amount));BOOL discrete=!_editing;if(discrete)[self beginStrengthGesture]; + ida=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL written=NO;[a startAction:self];@try{if(CMTimeCompare(a.currentTime,_editTime)==0){NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);if(DYSetToolStrength(doc,_nodeID,amount/100))written=DYWriteTools(_manager,doc,a.currentTime);}}@finally{[a endAction:self];} + if(written){_slider.doubleValue=amount;_field.stringValue=[NSString stringWithFormat:@"%.0f%%",amount];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];}else NSBeep();if(discrete)[self endStrengthGesture]; +} +- (void)resetStrength:(id)sender{_field.stringValue=@"100%";[self strengthChanged:_field];} +@end diff --git a/大鱼调色/Plugin/DYUnifiedRender.inc.h b/大鱼调色/Plugin/DYUnifiedRender.inc.h index 8934bc8..ede7832 100644 --- a/大鱼调色/Plugin/DYUnifiedRender.inc.h +++ b/大鱼调色/Plugin/DYUnifiedRender.inc.h @@ -61,17 +61,20 @@ }; for(NSString *ID in DYUnifiedRenderOrder(tools)){ if([ID isEqual:@"output"]){ - if(u.cm.outputEnabled>.5){CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0}; + double amount=DYToolStrength(tools,@"output");if(u.cm.outputEnabled>.5&&amount>0){idbefore=current;[pinned addObject:before];int priorGamut=wg,priorTransfer=wt;CSTParams output={wg,wt,(int)lroundf(u.cm.outputGamut),(int)lroundf(u.cm.outputTransfer),0}; if(u.cm.toneMapping>.5)output.toneMapping=(wt>1000?2:0)+(output.outputTransfer>1000?1:0); if(!transform(output))return NO;wg=output.outputGamut;wt=output.outputTransfer; + if(amount<1){idconverted=current;[pinned addObject:converted];current=before;BOOL ok=transform({priorGamut,priorTransfer,wg,wt,0});idadapted=current;[pinned addObject:adapted];current=converted;if(ok)ok=blend(adapted,@[],amount,@"primary");[pinned removeObject:adapted];[pinned removeObject:converted];if(!ok)return NO;}[pinned removeObject:before]; }continue; } BOOL base=[ID hasPrefix:@"base:"];NSDictionary *node=base?nil:DYToolWithID(tools,ID);NSString *type=base?[ID substringFromIndex:5]:node[@"type"]; if(base&&DYBaseToolRemoved(tools,type))continue; + double strength=DYToolStrength(tools,ID);if(strength<=0)continue;idmoduleBefore=current;if(strength<1)[pinned addObject:moduleBefore]; DYUniforms values=base?u:DYToolUniforms(node);NSArray *masks=base?tools[@"baseMasks"][type]:node[@"masks"]; - if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;continue;} + if([type isEqual:@"primary"]){values.inputSectionEnabled=values.cm.outputEnabled=0;values.cm.workingTransfer=wt;values.cm.workingGamut=wg;if(!grade(values,masks,NO))return NO;if(strength<1){BOOL ok=blend(moduleBefore,@[],strength,type);[pinned removeObject:moduleBefore];if(!ok)return NO;}continue;} if([type isEqual:@"film"]){if(!print(values,masks))return NO;values.filmPrint.x=0;} if(!isolated(type,values,base?DYVisibleBaseToolPaths(paths,tools):node[@"paths"],base?spider:node[@"spider"],masks))return NO; + if(strength<1){BOOL ok=blend(moduleBefore,@[],strength,type);[pinned removeObject:moduleBefore];if(!ok)return NO;} } [pinned removeObject:originalWorking]; // Final host adaptation is separate from the movable output node. Cube uses diff --git a/大鱼调色/Plugin/DYViewerControls.inc.h b/大鱼调色/Plugin/DYViewerControls.inc.h index f205edd..304f3ac 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -71,7 +71,7 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){ - (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;_levelMode=0;_levelResetRequested=_levelMeasureRequested=_levelDirectionRequested=NO;} - (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;} - (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{ - _size=size;_time=time;_backingScale=scale; + _size=size;_time=time;_backingScale=scale;NSDictionary *command=[_bridge takeScreenCommand];if([command[@"type"]isEqual:@"level"]){_levelMode=[command[@"mode"]integerValue];if(_levelMode<0||_levelMode>2)_levelMode=0;_stampArmed=NO;} if(_pendingSkinPreview){NSDictionary *snapshot=[_bridge snapshotAtTime:time];if(snapshot&&[self skinNodeInSnapshot:snapshot]){_pendingSkinPreview=NO;[self toggleSkinPreview];}} NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersectionRect(_viewport,bounds):bounds;_viewport=v; _scale=MAX(.6,MIN(MAX(1.,scale),MIN(v.size.width/420.,v.size.height/350.)));CGFloat s=_scale; @@ -153,10 +153,11 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti [a[@"title"]drawInRect:NSInsetRect(r,1,MAX(1.,(r.size.height-fontSize-3)/2)) withAttributes:attributes]; if(selected){NSBezierPath *mark=[NSBezierPath bezierPath];[mark moveToPoint:NSMakePoint(NSMinX(r),NSMidY(r)-3*s)];[mark lineToPoint:NSMakePoint(NSMinX(r),NSMidY(r)+3*s)];[NSColor.systemCyanColor setStroke];mark.lineWidth=2*s;[mark stroke];} } - for(NSDictionary *a in _areas)if(a[@"symbol"]&&_hover==[a[@"part"]integerValue]){NSRect r=[a[@"rect"]rectValue],tip=NSMakeRect(NSMidX(r)-36*s,NSMinY(r)-28*s,72*s,25*s);DYDrawSoftControl(tip,4*s,NO,NO,NO);[a[@"title"]drawInRect:NSInsetRect(tip,5*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:NSColor.whiteColor}];break;} + [NSGraphicsContext restoreGraphicsState]; } - (void)activateTool:(NSString*)type{ + [_bridge publishScreenTool:type message:nil]; if([type isEqual:@"mosaic"]){[self finishCapture];_stampArmed=NO;_levelMode=0;[_bridge requestMosaicMenu];return;} if([type isEqual:@"level"]){[self finishCapture];_stampArmed=NO;_levelMode=_levelMode?0:1;return;} BOOL returningFromLevel=_levelMode!=0;_levelMode=0; diff --git a/大鱼调色/Plugin/DYViewerParameterBridge.inc.h b/大鱼调色/Plugin/DYViewerParameterBridge.inc.h index afc322a..4bcc09c 100644 --- a/大鱼调色/Plugin/DYViewerParameterBridge.inc.h +++ b/大鱼调色/Plugin/DYViewerParameterBridge.inc.h @@ -25,6 +25,8 @@ - (void)requestWorkspacePage:(NSString *)page; - (void)requestMask:(NSInteger)kind; - (void)requestTool:(NSString*)type; +- (void)publishScreenTool:(NSString*)type message:(NSString*)message; +- (NSDictionary*)takeScreenCommand; - (void)requestWhiteBalanceAtTime:(CMTime)time; @property(nonatomic,retain) DYRenderer *renderer; - (NSData*)canvasHistogramAtTime:(CMTime)time; @@ -65,7 +67,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { @implementation DYViewerParameterBridge { id _apiManager; - NSDictionary *_snapshot,*_sourceDocument;NSString *_selectedNode; + NSDictionary *_screenCommand;NSDictionary *_snapshot,*_sourceDocument;NSString *_selectedNode; CMTime _snapshotTime; BOOL _invalidated,_validationScheduled; uint64_t _requestSequence,_requestedGesture,_completedGesture; @@ -82,13 +84,13 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { } @synthesize renderer=_renderer; - (instancetype)initWithAPIManager:(id)manager { - if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(mosaicMenuRequested:) name:@"DYMosaicMenuRequested" object:manager];}return self; + if((self=[super init])){_apiManager=manager;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(screenCommand:) name:@"DYScreenToolCommand" object:manager];_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(mosaicMenuRequested:) name:@"DYMosaicMenuRequested" object:manager];}return self; } - (void)dealloc { // invalidate enqueues closure before the owner releases its final reference; // the queued block keeps the bridge alive until its host group is closed. NSCAssert(!_writerUndoOpen,@"Viewer parameter group must be closed before teardown"); - [NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release]; + [NSNotificationCenter.defaultCenter removeObserver:self];[_screenCommand release];[_renderer release];[_selectedNode release];[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release]; [_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[_pendingSpiderMeshes release];[super dealloc]; } - (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time { @@ -107,6 +109,9 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) { if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerWhiteBalanceRequested" object:manager userInfo:@{@"time":[(NSDictionary*)CMTimeCopyAsDictionary(time,kCFAllocatorDefault) autorelease]}]; }); } +- (void)screenCommand:(NSNotification*)note{@synchronized(self){[_screenCommand release];_screenCommand=[note.userInfo copy];}} +- (NSDictionary*)takeScreenCommand{@synchronized(self){NSDictionary *value=[_screenCommand autorelease];_screenCommand=nil;return value;}} +- (void)publishScreenTool:(NSString*)type message:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)DYPublishScreenToolInfo(manager,type,message);});} - (void)requestTool:(NSString*)type { if(![DYToolTypes()containsObject:type])return; dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerToolRequested" object:manager userInfo:@{@"type":type}];}); diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 6cffda2..c921ab5 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -191,8 +191,8 @@ NSView *toolbar=[stack valueForKey:@"toolbar"];NSTableView *table=[stack valueForKey:@"layerTable"]; auto toolbarButton=[&](NSString *type)->NSButton *{for(NSButton *button in toolbar.subviews)if([button.identifier isEqual:type])return button;return nil;}; auto chooseNode=[&](NSString *node)->BOOL{NSArray *rows=[stack valueForKey:@"layerRows"];for(NSUInteger i=0;iprevious&&button.frame.origin.y==0;previous=button.frame.origin.x;} - run.record(@"workspace-toolbar-lists-every-inspector-tool-including-distortion",toolbar.subviews.count==DYToolTypes().count&&horizontal&&toolbarButton(@"lens")); + BOOL horizontal=YES;for(NSButton *button in toolbar.subviews){horizontal&=NSContainsRect(toolbar.bounds,button.frame)&&button.imagePosition==NSImageLeft&&button.title.length>0;} + run.record(@"workspace-toolbar-wraps-labelled-tools-without-hidden-buttons",toolbar.subviews.count==DYToolTypes().count&&horizontal&&toolbarButton(@"lens")); NSUInteger originalLayers=[DYReadTools(stackHost,kCMTimeZero).document[@"layers"]count];int undo=stackHost->_undoStarts; [stack addWorkspaceTool:toolbarButton(@"curve")];workspaceDrain();NSString *curveID=[[[stack valueForKey:@"selectedNode"]copy]autorelease];NSDictionary *tools=DYReadTools(stackHost,kCMTimeZero).document; run.record(@"workspace-toolbar-adds-real-uuid-and-synchronizes-regular-inspector",[tools[@"layers"]count]==originalLayers+1&&[DYToolWithID(tools,curveID)[@"type"]isEqual:@"curve"]&&[[mainInspector valueForKey:@"stackViews"]objectForKey:curveID]&&stackHost->_undoStarts==undo+1&&stackHost->_undoEnds==stackHost->_undoStarts); diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index 24786bf..bdfd792 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -5,10 +5,10 @@ _splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v3"];if(_splitFraction<.12||_splitFraction>.4)_splitFraction=.18;_scopeFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.scopeFraction.v1"];if(_scopeFraction<.15||_scopeFraction>.45)_scopeFraction=.27;_toolTime=kCMTimeInvalid;_sizingSplit=YES; _toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO; _toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll]; - CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=28;button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30); + CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageLeft;button.imageHugsTitle=YES;button.contentTintColor=DYThemeColor(@"text");CGFloat width=MAX(66,ceil([title sizeWithAttributes:@{NSFontAttributeName:button.font}].width)+32);button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30); _split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split]; _toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost]; - _layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=NO;_layerScroll.autohidesScrollers=YES;_layerScroll.scrollerStyle=NSScrollerStyleOverlay;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll]; + _layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=NO;_layerScroll.scrollerStyle=NSScrollerStyleLegacy;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll]; _layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=28;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.target=self;_layerTable.action=@selector(workspaceRowClicked:);_layerTable.backgroundColor=DYWorkspacePalette()[@"background"];_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable; _addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask]; _deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer]; @@ -24,6 +24,12 @@ [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshToolWorkspace:) name:DYModelChanged object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceCanvasSelection:) name:@"DYToolCanvasSelection" object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(externalWorkspaceToolSelection:) name:@"DYWorkspaceToolSelection" object:[self rootHost]]; + _screenTools=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_screenTools addItemsWithTitles:@[@"屏幕工具",@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正",@"局部马赛克",@"矩形蒙版",@"椭圆蒙版",@"钢笔蒙版"]];_screenTools.target=self;_screenTools.action=@selector(screenToolPicked:);_screenTools.font=[NSFont systemFontOfSize:11];_screenTools.accessibilityLabel=@"屏幕工具说明与设置";[_root addSubview:_screenTools]; + _screenDetails=[DYWorkspaceButton(@"详情设置",self,@selector(screenToolDetails:))retain];[_root addSubview:_screenDetails]; + _screenHint=[[NSTextField wrappingLabelWithString:@"从屏幕工具菜单查看操作说明与详细设置"]retain];_screenHint.font=[NSFont systemFontOfSize:11];_screenHint.maximumNumberOfLines=2;[_root addSubview:_screenHint]; + _screenStatus=[[NSTextField labelWithString:@"操作提示会保留在这里"]retain];_screenStatus.font=[NSFont systemFontOfSize:10];_screenStatus.lineBreakMode=NSLineBreakByTruncatingTail;[_root addSubview:_screenStatus]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(screenToolInfo:) name:@"DYScreenToolInfo" object:[self rootHost]];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(screenCanvasStatus:) name:@"DYToolTrackingStatus" object:[self rootHost]]; + _screenSettings=[[DYWorkspaceList alloc]init];_screenSettings.hidden=YES;[_editorHost addSubview:_screenSettings];NSArray *levelLabels=@[@"画水平线",@"画垂直线",@"仅测量",@"重置"];for(NSInteger i=0;i<4;i++){NSButton *b=DYWorkspaceButton(levelLabels[i],self,@selector(levelSetting:));b.tag=i+1;b.frame=NSMakeRect(6+i*76,5,72,28);[_screenSettings addSubview:b];}_levelNumbers=[NSTextField wrappingLabelWithString:@"在画面选择两点,校正角度与缩放会在这里显示。"];_levelNumbers.font=[NSFont systemFontOfSize:12];[_screenSettings addSubview:_levelNumbers];[self screenToolInfo:[NSNotification notificationWithName:@"DYScreenToolInfo" object:[self rootHost]userInfo:DYCurrentScreenToolInfo([self rootHost])?:@{}]]; _sizingSplit=NO; } - (void)layoutToolWorkspace { @@ -31,7 +37,7 @@ CGFloat w=_split.bounds.size.width,h=_split.bounds.size.height,scope=MAX(240,MIN(420,w*_scopeFraction)),left=MAX(174,MIN(MIN(300,w-scope-322),w*_splitFraction)),divider=_split.dividerThickness,editor=MAX(1,w-left-scope-2*divider); _toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+divider,0,editor,h);_scopePane.frame=NSMakeRect(left+divider+editor+divider,0,scope,h); _layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));[_layerScroll layoutSubtreeIfNeeded];NSSize layerViewport=_layerScroll.contentView.bounds.size;_layerTable.frame=NSMakeRect(0,0,layerViewport.width,MAX(layerViewport.height,_layerRows.count*_layerTable.rowHeight));[_layerTable.tableColumns.firstObject setWidth:layerViewport.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28); - CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29)); + CGFloat ew=_editorHost.bounds.size.width;CGFloat strengthWidth=MIN(260,MAX(200,ew*.48));_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-strengthWidth-30),22);_moduleStrength.frame=NSMakeRect(ew-strengthWidth-8,0,strengthWidth,30);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29)); _maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(188,MAX(152,ew*.23));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height); if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(536,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];} [self layoutMaskAssignments]; @@ -102,8 +108,8 @@ if(_selectedMask)_editorMode=1;else if(![_editorNode isEqual:_selectedNode]||_editorMode==1)_editorMode=[type isEqual:@"look"]?2:0; BOOL stamp=DYSharedMaskWithID(_toolDocument,_selectedMask)[@"stampSource"]!=nil; _selectionTitle.stringValue=_selectedMask?(stamp?@"仿制图章 · 编辑与跟踪":@"蒙版 · 编辑与跟踪"):DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;} - if(![_editorNode isEqual:_selectedNode]){[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){idtarget=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}} - [_toolEditor refresh]; + if(![_editorNode isEqual:_selectedNode]){[_moduleStrength removeFromSuperview];[_moduleStrength release];_moduleStrength=nil;if([DYToolTypes()containsObject:type]||[type isEqual:@"output"]){_moduleStrength=[[DYModuleStrengthControl alloc]initWithManager:[self rootHost]nodeID:_selectedNode];[_editorHost addSubview:_moduleStrength];}[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){idtarget=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}} + [_toolEditor refresh];[_moduleStrength refreshWithDocument:_toolDocument];double angle=[_toolDocument[@"levelRotation"]doubleValue];double aspect=[_toolDocument[@"levelReference"][@"aspect"]doubleValue];if(!(aspect>0))aspect=16./9;DYLevelTransform level(angle,aspect);_levelNumbers.stringValue=[NSString stringWithFormat:@"FCP 旋转 %+.2f°\n缩放 %.2f%% · %@",-angle*180/M_PI,level.zoom*100,[_toolDocument[@"levelMeasureOnly"]boolValue]?@"仅测量,数值供原始变换使用":@"插件应用校正"]; if(_selectedNode.length&&![_selectedNode isEqual:@"shared"])[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:[self rootHost]userInfo:@{@"node":_selectedNode}]; if(_selectedMask){BOOL shared=DYSharedMaskWithID(_toolDocument,_selectedMask)!=nil;NSString*maskNode=shared?@"shared":_selectedNode;if(![_maskNode isEqual:maskNode]){[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=[maskNode copy];_maskEditor=[DYCreateWorkspaceMaskEditor([self rootHost],maskNode)retain];_maskScroll.documentView=_maskEditor;}[_maskEditor refreshWithDocument:_toolDocument time:_toolTime];[_maskEditor selectMaskID:_selectedMask];} else {_maskScroll.documentView=nil;[_maskEditor release];_maskEditor=nil;[_maskNode release];_maskNode=nil;} @@ -141,7 +147,7 @@ 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; + NSString*type=sender.identifier;if(![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];} if(added){_editorMode=0;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":added}];[added release];} } @@ -190,3 +196,21 @@ idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO; [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if(DYSharedMaskWithID(doc,_selectedMask))changed=DYRemoveSharedMask(doc,_selectedMask);else{NSMutableArray*masks=[[DYMasksForTool(doc,_selectedNode)mutableCopy]autorelease];[masks filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary*m,NSDictionary*b){return ![m[@"id"]isEqual:self->_selectedMask];}]];changed=DYSetToolMasks(doc,_selectedNode,masks);}if(changed){idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"删除蒙版对象"];changed=DYWriteTools(host,doc,a.currentTime);if(grouped)[undo endUndoGroup];}}@finally{[a endAction:self];}if(changed){[_selectedMask release];_selectedMask=nil;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];} } +- (NSArray*)screenToolTypes{return @[@"",@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level",@"mosaic",@"rectangle",@"ellipse",@"pen"];} +- (void)screenToolPicked:(NSPopUpButton*)sender{NSInteger index=sender.indexOfSelectedItem;if(index<0||index>=[self screenToolTypes].count)return;NSString *type=[self screenToolTypes][index];[self screenToolInfo:[NSNotification notificationWithName:@"DYScreenToolInfo" object:[self rootHost]userInfo:@{@"type":type,@"message":DYScreenToolCatalog()[type]?:@"从画面选择工具,或使用详情设置。"}]];} +- (void)screenToolInfo:(NSNotification*)note{NSString *type=note.userInfo[@"type"];if(type.length){[_screenType release];_screenType=[type copy];NSUInteger index=[[self screenToolTypes]indexOfObject:type];if(index!=NSNotFound)[_screenTools selectItemAtIndex:index];_screenHint.stringValue=DYScreenToolCatalog()[type]?:@"在控制面板调整当前工具";_screenHint.toolTip=_screenHint.stringValue;}NSString *message=note.userInfo[@"message"];if(message.length){_screenStatus.stringValue=message;_screenStatus.toolTip=message;}_screenDetails.enabled=_screenType.length>0;} +- (void)screenCanvasStatus:(NSNotification*)note{NSString *message=note.userInfo[@"message"];if(message.length){_screenStatus.stringValue=message;_screenStatus.toolTip=message;}} +- (void)screenToolDetails:(id)sender{ + NSString *type=_screenType;if(!type.length)return; + if([type isEqual:@"level"]){_editorMode=3;[self pageChanged:nil];return;} + if([type isEqual:@"mosaic"]){[NSNotificationCenter.defaultCenter postNotificationName:@"DYMosaicMenuRequested" object:[self rootHost]userInfo:@{@"anchor":_screenDetails}];return;} + if([@[@"cloneStamp",@"rectangle",@"ellipse",@"pen"]containsObject:type]){NSInteger kind=[@[@"ellipse",@"rectangle",@"pen"]indexOfObject:type];for(NSDictionary *row in _layerRows)if(row[@"mask"]){NSDictionary *mask=DYSharedMaskWithID(_toolDocument,row[@"mask"]);if(!mask)for(NSDictionary *m in DYMasksForTool(_toolDocument,row[@"node"]))if([m[@"id"]isEqual:row[@"mask"]])mask=m;BOOL match=[type isEqual:@"cloneStamp"]?mask[@"stampSource"]!=nil:!mask[@"stampSource"]&&DYMaskAtTime(mask,_toolTime).kind==kind;if(match){[_selectedNode release];_selectedNode=[row[@"node"]copy];[_selectedMask release];_selectedMask=[row[@"mask"]copy];_editorMode=1;[self rebuildWorkspaceEditor];return;}}_screenStatus.stringValue=@"先在画面绘制区域,再打开详情;已有蒙版可直接在左侧选择。";return;} + if([type isEqual:@"whiteBalance"])type=@"base"; + NSString *ID=nil;NSDictionary *selected=DYToolWithID(_toolDocument,_selectedNode);if([selected[@"type"]isEqual:type]||[_selectedNode isEqual:[@"base:" stringByAppendingString:type]])ID=_selectedNode;else for(NSDictionary *row in _layerRows)if([row[@"type"]isEqual:type]&&!row[@"mask"]){ID=row[@"node"];break;} + if(!ID){NSButton *button=DYWorkspaceButton(@"",nil,nil);button.identifier=type;[self addWorkspaceTool:button];return;} + [ID retain];[_selectedNode release];_selectedNode=ID;[_selectedMask release];_selectedMask=nil;_editorMode=[type isEqual:@"look"]?2:0;[self rebuildWorkspaceEditor]; +} +- (void)levelSetting:(NSButton*)sender{ + if(sender.tag==1||sender.tag==2){[NSNotificationCenter.defaultCenter postNotificationName:@"DYScreenToolCommand" object:[self rootHost]userInfo:@{@"type":@"level",@"mode":@(sender.tag)}];_screenStatus.stringValue=sender.tag==1?@"回到画面绘制水平参考线":@"回到画面绘制垂直参考线";return;} + idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL written=NO;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);if(sender.tag==3)doc[@"levelMeasureOnly"]=@(![doc[@"levelMeasureOnly"]boolValue]);else{[doc removeObjectForKey:@"levelRotation"];[doc removeObjectForKey:@"levelReference"];[doc removeObjectForKey:@"levelMeasureOnly"];}idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL group=[undo startUndoGroup:sender.tag==3?@"切换水平校正测量方式":@"重置水平校正"];written=DYWriteTools(host,doc,a.currentTime);if(group)[undo endUndoGroup];}@finally{[a endAction:self];}if(written)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; +} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 62c831b..3a3ff75 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.22.5 + 1.22.6 CFBundleVersion - 142 + 143 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 8798e06..19f256a 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.22.5 + 1.22.6 CFBundleVersion - 142 + 143 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index d8c984c..ff4b5dc 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,28 +2,16 @@ 更新于2026-11-17(Asia/Shanghai)。 -## 当前版本与目标 +## 当前目标与进展 -正式安装已更新为 **1.22.5(142)**,路径 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID `com.dayu.color`、服务 `com.dayu.color.XPC`、团队B3W25FX5H5。Release构建、Developer ID签名、Apple公证Accepted、票据、Gatekeeper、正式安装及启动完成;构建/正式安装各1113项自检通过。[安装](verification/Delivery1.22.5.json) · [身份](verification/InstalledIdentity1.22.5.json) · [本轮详细记录](research/ControlsSync-20261117.md)。 +本轮增加控制面板各图层、检查器模块整体强度;屏幕工具说明、实时提示与详情入口集中到控制面板;顶部图标加中文;简化一级调色拥挤横向布局,改常用/影调/更多设置分组、纵向滚动,并常显其他参数区滚动条。候选1.22.6(143),尚未交付;正式安装仍1.22.5(142)。 -本轮修复:同帧源时钟相位导致曲线/畸变/白平衡画布写入被拒;面板模型事件及动态模块布局刷新;LUT浏览器五位置强度;马赛克共享蒙版与跟踪入口;巨大常驻状态框改紧凑半透明、点击穿透、2秒收起提示;Vision运动整体约束为平移/旋转/等比缩放,保持用户绘制的蒙版形状。 +工程 `/Volumes/备份/大鱼调色/大鱼调色`,main,远程 `https://dayu.media/git/dayu/dayu-color.git`。基线0388b79bd82100f493dd691a3126f00fc398fe40已远端核验;接手遗留project.pbxproj引用排序改动保留,不混入提交。首轮编译发现reset代码插入位置不当,已修正,待回归。 -## 已验证范围与缺口 +强度存入宿主tools文档,默认100%,保留原参数/蒙版;统一色彩路径按完整模块结果混合,旧版路径复用逐模块蒙版混合。控制面板共用固定强度入口,检查器每模块独立控件。主要路径:DYToolState、DYToolRender、DYUnifiedRender、DYInspector、DYColorWorkspace、DYWorkspaceTools、DYViewerParameterBridge、DYToolOSC。 -FCP12.4正式142实测:控制面板新增风格LUT模块后检查器出现同一模块,控制面板37%→检查器37%,检查器62%→控制面板62%。100帧合成运动正方形蒙版跟踪完成,最大相对宽高比漂移7.8537e-8;应用马赛克后100键和关联保留,选中蒙版可继续编辑跟踪。FCP及XPC退出后冷重开,保存预设的整个工具文档一致。[宿主范围](verification/HostControlsSync1.22.5.json) · [轨迹数据](verification/HostShapeTracking1.22.5.json) · [Vision回归](verification/SimilarityTracking1.22.5.json)。 +## 待完成 -**物理OSC拖动/画面吸管、提示2秒消失未完成直接GUI验收**:自动化坐标输入未触发OSC回调,不能据此判定产品通过或失败。同帧写入及下一帧拒绝有原生桥接回归。复杂真实素材、遮挡、透视、Motion/HDR/变速及真实DJI色彩未测;合成100帧不代表任意素材。关闭重开面板会默认选首工具,重新选中蒙版可见跟踪编辑器。既有图章“最后可信帧”在FCP12.4自动跳转仍需手动定位。 +编译与模型/渲染/布局回归、Developer ID签名与公证、固定路径替换、FCP正式宿主验收、PKG签名公证验包、Release上传和完整下载、独立远端恢复核验、生成副本清理。正式APP固定 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,主ID com.dayu.color。复用tools/deliver.py及Packaging脚本、产品与仓库锁。 -## 源码、发行与恢复 - -工程 `/Volumes/备份/大鱼调色/大鱼调色`,分支main,远程 `https://dayu.media/git/dayu/dayu-color.git`。实际编译源 `a1eb334840e1af285e878e7c094b06aaf01cba49`;发行标签 `v1.22.5-controls-sync-20261117` → `a20e734f6691313771df67d91402c200fec0b401` 已推送回读,标签不随后续证据提交移动。接手遗留Xcode工程引用排序改动保留、未提交。 - -[Release450](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.22.5-controls-sync-20261117),附件79;正式包 `/Volumes/备份/大鱼调色/发行包/大鱼调色-1.22.5.pkg`,44,585,448字节,SHA-256 `194c636978289dda73860a9409401f3063d153c6e3fdafdfc98bc52c760a2a2a`。PKG公证 `9ee8e167-6d03-4c1a-93bc-efab671754af` Accepted,20项展开验包通过;发布前及发布后完整下载均匹配。本轮未再次运行系统安装器。[验包](verification/Package1.22.5.json) · [发布后下载](verification/Release1.22.5.json) · [恢复步骤](RECOVERY.md)。 - -独立HTTPS克隆检出1050个编译节点文件和发行标签全部文件、Git完整性、409个构建输入(工程字典仅排序等价)核对通过,无LFS/子模块,未在恢复目录重编。旧141回滚APP、构建APP、公证ZIP、临时验包和恢复目录已清理;保留正式/历史PKG、源码、QA媒体与库,未宣称全盘仅一个副本。[恢复核验](verification/Recovery1.22.5.json) · [清理](verification/Cleanup1.22.5.json)。 - -## 继续工作 - -优先用用户原始素材手动复测曲线松手、畸变拖动和白平衡吸管,以及2秒提示,再扩大复杂跟踪素材范围。FCP QA库包含用户真实媒体,勿上传或清理整库。缓存 `/Users/mac/Library/Caches/CodexBuilds/com.dayu.color`;Xcode27.2、FxPlug4.3.5、当前MacOSX.sdk;复用tools/deliver.py、Packaging/build_pkg.py与publish_release.py及产品/仓库锁。 - -本轮无NAS生产改动,文章15792仍1.22.2(137),主APP更新通道仍1.21.8(126)。[上一轮完整交接](research/HandoffHistory-20261117-before-controls-sync.md)。 +本轮不涉及NAS后端、站点文章或更新通道。前序142及验收限制见[上一轮交接](research/HandoffHistory-20261117-before-module-strength.md)及[恢复记录](RECOVERY.md)。