diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index 773102c..0942def 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -253,7 +253,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b - (void)previewChanged:(NSNotification *)notification{if(_visible&&_editorMode==2)[_browser updatePreview:[_renderer lookLUTPreviewFrames]];} - (void)themeChanged:(NSNotification *)notification{[self updatePalette];} - (void)updatePalette{ - [_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()]; + _root.appearance=[NSAppearance appearanceNamed:DYThemeIsLight()?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];[_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation,_screenHint,_screenStatus,_levelNumbers])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()]; } - (void)ensureBrowser{ if(_browser.visible)return;[_browser release];_browser=nil;id action=[[self lutManager] apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action){[self reportError:@"宿主暂时无法读取风格1"];return;} diff --git a/大鱼调色/Plugin/DYToolRender.inc.h b/大鱼调色/Plugin/DYToolRender.inc.h index b6e12b8..3830bcd 100644 --- a/大鱼调色/Plugin/DYToolRender.inc.h +++ b/大鱼调色/Plugin/DYToolRender.inc.h @@ -83,7 +83,7 @@ - (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; + 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;NSMutableArray *bypassed=[NSMutableArray arrayWithArray:tools[@"removedBase"]?:@[]];for(NSString *type in DYToolTypes())if(DYToolStrength(tools,[@"base:" stringByAppendingString:type])==0&&![bypassed containsObject:type])[bypassed addObject:type];if(bypassed.count)weighted[@"removedBase"]=bypassed;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([node[@"renderStrength"]doubleValue]>0&&!DYToolIsNeutral(node)){ diff --git a/大鱼调色/Plugin/DYToolState.mm b/大鱼调色/Plugin/DYToolState.mm index a1034dd..4077d20 100644 --- a/大鱼调色/Plugin/DYToolState.mm +++ b/大鱼调色/Plugin/DYToolState.mm @@ -525,7 +525,7 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms @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)];}} +- (void)mouseDown:(NSEvent*)event{id target=[self.target retain];[target performSelector:@selector(beginStrengthGesture)];@try{[super mouseDown:event];}@finally{[target performSelector:@selector(endStrengthGesture)];[target release];}} @end @implementation DYModuleStrengthControl { id _manager;NSString *_nodeID;NSTextField *_label,*_field;NSSlider *_slider;NSButton *_reset;BOOL _editing,_grouped;CMTime _editTime; diff --git a/大鱼调色/Plugin/DYTrackingPreview.inc.h b/大鱼调色/Plugin/DYTrackingPreview.inc.h index 8a76ff9..76fdc70 100644 --- a/大鱼调色/Plugin/DYTrackingPreview.inc.h +++ b/大鱼调色/Plugin/DYTrackingPreview.inc.h @@ -156,9 +156,9 @@ _title.frame=NSMakeRect(8,6,MAX(1,w-108),18); _action.frame=NSMakeRect(MAX(0,w-98),2,92,24); _progress.frame=NSMakeRect(8,28,body,10); - _status.frame=NSMakeRect(8,43,body,64); - _preview.frame=NSMakeRect(8,112,body,MAX(1,h-138)); - _detail.frame=NSMakeRect(8,MAX(112,h-22),body,18); + BOOL compact=h<280;_status.maximumNumberOfLines=compact?1:3;_status.frame=NSMakeRect(8,compact?38:43,body,compact?18:52); + CGFloat previewTop=compact?60:102;_preview.frame=NSMakeRect(8,previewTop,body,MAX(1,h-previewTop-24)); + _detail.frame=NSMakeRect(8,MAX(previewTop,h-20),body,18); } - (void)applyUpdate:(NSDictionary *)info { if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];} diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 5c78487..dc6bc75 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -204,6 +204,7 @@ nativeField.stringValue=@"62%";[nativeField sendAction:nativeField.action to:nativeField.target];workspaceDrain();run.record(@"module-strength-inspector-to-workspace-and-host",fabs(DYToolStrength(DYReadTools(stackHost,kCMTimeZero).document,curveID)-.62)<1e-8&&[field.stringValue isEqual:@"62%"]); nativeField.stringValue=@"100%";[nativeField sendAction:nativeField.action to:nativeField.target];workspaceDrain(); } + undo=stackHost->_undoStarts; NSDictionary *beforeCurve=DYReadTools(stackHost,kCMTimeZero).document; [curveEditor graphicGesture:YES title:@"测试曲线手势"]; [curveEditor writeGraphicValues:@{@"masterX0":@.3,@"curveY0":@12}]; diff --git a/开发交接.md b/开发交接.md index b0bc674..bf940bd 100644 --- a/开发交接.md +++ b/开发交接.md @@ -6,7 +6,7 @@ 本轮增加控制面板各图层、检查器模块整体强度;屏幕工具说明、实时提示与详情入口集中到控制面板;顶部图标加中文;简化一级调色拥挤横向布局,改常用/影调/更多设置分组、纵向滚动,并常显其他参数区滚动条。候选1.22.6(143),尚未交付;正式安装仍1.22.5(142)。 -工程 `/Volumes/备份/大鱼调色/大鱼调色`,main,远程 `https://dayu.media/git/dayu/dayu-color.git`。基线0388b79bd82100f493dd691a3126f00fc398fe40已远端核验;接手遗留project.pbxproj引用排序改动保留,不混入提交。Release编译通过;首轮1128项原生回归中仅紧凑高度下跟踪预览和最后一行旁路按钮可见性两项失败,已压缩提示行修正。整体强度像素、序列化和三组设置可达性通过;已补控制面板/检查器37%与62%双向回归,第二轮待完成。 +工程 `/Volumes/备份/大鱼调色/大鱼调色`,main,远程 `https://dayu.media/git/dayu/dayu-color.git`。基线0388b79bd82100f493dd691a3126f00fc398fe40已远端核验;接手遗留project.pbxproj引用排序改动保留,不混入提交。Release编译通过;首轮1128项原生回归中仅紧凑高度下跟踪预览和最后一行旁路按钮可见性两项失败,已压缩提示行修正。整体强度像素、序列化和三组设置可达性通过;已补控制面板/检查器37%与62%双向回归,第二轮1130项中强度双向回归通过;跟踪预览固定138点标题开销仍使小窗画面偏小,已改为自适应紧凑布局。另修正新增测试前后撤销计数基准;正式交付工具将重新完整回归。 强度存入宿主tools文档,默认100%,保留原参数/蒙版;统一色彩路径按完整模块结果混合,旧版路径复用逐模块蒙版混合。控制面板共用固定强度入口,检查器每模块独立控件。主要路径:DYToolState、DYToolRender、DYUnifiedRender、DYInspector、DYColorWorkspace、DYWorkspaceTools、DYViewerParameterBridge、DYToolOSC。