From 3fd015224037df944b428684c43ec8ec7accea85 Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 4 Nov 2026 12:20:20 +0800 Subject: [PATCH] fix: use saturated multicolor module gradients without gray surfaces --- Packaging/Release-1.8.3.md | 4 ++-- README.md | 10 ++++++++-- 大鱼调色/Plugin/DYInspector.mm | 20 ++++++++++++++------ 大鱼调色/Plugin/DYTheme.mm | 7 ++++--- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/Packaging/Release-1.8.3.md b/Packaging/Release-1.8.3.md index 5abe7b3..4819ff0 100644 --- a/Packaging/Release-1.8.3.md +++ b/Packaging/Release-1.8.3.md @@ -1,6 +1,6 @@ -大鱼调色 1.8.3(61)公测 +大鱼调色 1.8.3(62)公测 -新增“霓虹炫彩”主题:中性深蓝灰面板,青、蓝、洋红、绿等模块细边与标记,洋红到青色渐变滑杆和重点按钮,明亮白色文字。未设置主题时默认使用炫彩;原六种主题和编号保留,可随时切换。 +新增“霓虹炫彩”主题:分模块的多色渐变:一级紫红、蜘蛛盘青蓝、基础珊瑚玫红、HSL绿青、曲线青蓝等;大面积卡片、标题及图标均跟随各模块配色。洋红到青色渐变重点按钮与滑杆,白色文字。未设置主题时默认使用炫彩;原六种主题和编号保留,可随时切换。 曲线编辑器新增真实分析画面的直方图叠层,显示亮度与 RGB 分布;RGB 页叠加四通道,红、绿、蓝页只显示对应通道。支持“直方图”开关,曲线控制点仍可直接添加、拖动、删除。主题、通道和叠层显示不改变调色参数或预设。 diff --git a/README.md b/README.md index 1b6e7bb..8fcf8a2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,14 @@ # 大鱼调色 -原生 FxPlug 4 调色器,当前公测版本 **1.8.2(59)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 +原生 FxPlug 4 调色器,当前公测版本 **1.8.3(62)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。 -1.8.2 将高级色彩管理收进顶部“颜色设置”按钮,默认收起且不占调色区域;展开和收起只改变显示,不写调色参数、不产生撤销项。新增“黑金渐变”主题:黑色与深炭色背景、亮金文字和小范围静态光晕;未设置主题时默认黑金,已明确保存的五种旧主题继续保留,可随时切换。增加对比度或减少透明度时不绘制文字光晕。窄栏使用两排操作按钮。 +1.8.3 新增默认“霓虹炫彩”:按模块分布紫红、青蓝、玫红、绿青等双色渐变,卡片、标题与图标都使用模块配色,取消统一紫底与深蓝灰底;重点按钮与滑杆用洋红到青色渐变,正文白色。原六种主题与编号保留。本机已从黑金切换到炫彩。曲线新增亮度/RGB直方图叠层、单通道查看与显隐开关,使用真实320×180分析缓存、256档,最多每秒更新2次。 + +直方图沿用已有分析画面:原流程为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前;不是最终输出示波器或每层曲线的即时输入。透明/非有限像素不计,范围外归端点,共同峰值平方根缩放。主题与叠层不写入调色预设,曲线数学、CMS及模板保持。 + +[1.8.3安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.3-neon-histogram-20261104)。605项原生检查及正式FCP验收见 verification/HostNeon1.8.3.json。 + +历史1.8.2 将高级色彩管理收进顶部“颜色设置”按钮,默认收起且不占调色区域;展开和收起只改变显示,不写调色参数、不产生撤销项。新增“黑金渐变”主题:黑色与深炭色背景、亮金文字和小范围静态光晕;未设置主题时默认黑金,已明确保存的五种旧主题继续保留,可随时切换。增加对比度或减少透明度时不绘制文字光晕。窄栏使用两排操作按钮。 默认色彩流程仍为“原有流程”,已保存的 v2/v3 工程继续使用原设置。下文的高级色彩流程均从“颜色设置”展开选择。色轮与通道曲线保留实际色相,界面主题不改变图像颜色。 diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 6cd8d43..b9fb6ef 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -158,17 +158,24 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { - (void)scrollWheel:(NSEvent*)event{if(!self.hasVerticalScroller){[self.nextResponder scrollWheel:event];return;}[super scrollWheel:event];} @end -static NSColor *DYModuleAccent(NSString *key) { +static NSColor *DYModuleColor(NSString *key,BOOL end,CGFloat scale=1) { NSArray *keys=@[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film"]; NSUInteger i=[keys indexOfObject:key?:@""];if(i==NSNotFound)i=0; - static const CGFloat colors[][3]={{.05,.81,.96},{.26,.55,1},{1,.27,.59},{1,.64,.32},{.67,.41,1},{.22,.85,.57},{.12,.79,1},{1,.30,.77},{.38,.57,1},{.18,.85,.73},{.78,.84,.93},{.99,.56,.37},{.31,.73,1},{.93,.69,.32}}; - return [NSColor colorWithSRGBRed:colors[i][0] green:colors[i][1] blue:colors[i][2] alpha:1]; + static const CGFloat colors[][2][3]={ + {{.96,.18,.68},{.49,.17,1}},{{.03,.84,1},{.12,.32,1}},{{1,.35,.30},{1,.13,.67}},{{1,.70,.15},{1,.30,.39}}, + {{.66,.32,1},{1,.20,.69}},{{.12,.94,.48},{.01,.72,.77}},{{.04,.82,1},{.25,.35,1}},{{1,.22,.76},{.65,.20,1}}, + {{.30,.51,1},{.66,.26,1}},{{.23,.94,.56},{.01,.71,.68}},{{.70,.45,1},{.31,.31,1}},{{1,.37,.40},{1,.69,.20}}, + {{.08,.73,1},{.16,.95,.74}},{{1,.64,.16},{1,.22,.56}} + }; + const CGFloat *c=colors[i][end?1:0]; + return [NSColor colorWithSRGBRed:c[0]*scale+(scale<1?.012:0) green:c[1]*scale+(scale<1?.006:0) blue:c[2]*scale+(scale<1?.025:0) alpha:1]; } +static NSColor *DYModuleAccent(NSString *key){return DYModuleColor(key,NO);} @interface DYCard : DYFlippedView @end @implementation DYCard - (void)drawRect:(NSRect)rect { NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,.5,.5) xRadius:11 yRadius:11]; - DYDrawThemeSurface(path,YES); [DYThemeColor(@"border") setStroke]; + if(DYThemeIndex()==6){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYModuleColor(self.identifier,NO,.23) endingColor:DYModuleColor(self.identifier,YES,.18)]autorelease];[g drawInBezierPath:path angle:20];[[DYModuleAccent(self.identifier)colorWithAlphaComponent:.55]setStroke];}else{DYDrawThemeSurface(path,YES);[DYThemeColor(@"border")setStroke];} path.lineWidth=1; [path stroke]; if(DYThemeIndex()==6){[NSGraphicsContext saveGraphicsState];[path addClip];NSColor *accent=DYModuleAccent(self.identifier);NSGradient *edge=[[[NSGradient alloc]initWithStartingColor:[accent colorWithAlphaComponent:.85] endingColor:[DYThemeColor(@"accent")colorWithAlphaComponent:.12]]autorelease];[edge drawInRect:NSMakeRect(10,0,self.bounds.size.width-20,2) angle:0];[NSGraphicsContext restoreGraphicsState];} [[NSColor colorWithWhite:.52 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill]; @@ -181,7 +188,7 @@ static NSColor *DYModuleAccent(NSString *key) { @implementation DYHeader - (void)drawRect:(NSRect)dirtyRect { NSRect r=NSInsetRect(self.bounds,.5,2); - NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease]; + NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemeIndex()==6?DYModuleColor(self.identifier,NO,.34):DYThemePalette()[@"headerTop"] endingColor:DYThemeIndex()==6?DYModuleColor(self.identifier,YES,.27):DYThemePalette()[@"headerBottom"]]autorelease]; [g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:r xRadius:8 yRadius:8] angle:90]; NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk()); [(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes]; @@ -297,7 +304,7 @@ static NSArray *DYPresentationSections(void) { } - (void)drawRect:(NSRect)dirtyRect { NSRect r=[self plotRect]; - [(DYThemeIndex()>=5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill]; + [(DYThemeIndex()==6?[NSColor colorWithSRGBRed:.025 green:.02 blue:.06 alpha:1]:DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill]; if(_histogramToggle.state==NSControlStateValueOn){ const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr; if(h&&h->samples){ @@ -577,6 +584,7 @@ static NSImage *DYWheelImage(void) { - (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];} - (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; } - (void)themeChanged:(NSNotification *)notification { + for(NSDictionary *card in _cards){NSColor *accent=DYThemeIndex()==6?DYModuleAccent(card[@"section"][@"key"]):DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];} self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor]; for(NSButton *b in _themeButtons)b.state=b.tag==DYThemeIndex()?NSControlStateValueOn:NSControlStateValueOff; _websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:DYThemeTextAttributes(_websiteLink.font,DYAccent())]autorelease]; diff --git a/大鱼调色/Plugin/DYTheme.mm b/大鱼调色/Plugin/DYTheme.mm index aedb52d..a43ffe5 100644 --- a/大鱼调色/Plugin/DYTheme.mm +++ b/大鱼调色/Plugin/DYTheme.mm @@ -32,7 +32,7 @@ static const double paletteRGB[7][17][3]={ {{0.08,0.17,0.1},{0.05,0.12,0.07},{0.12,0.27,0.15},{0.09,0.2,0.11},{0.16,0.35,0.2},{0.12,0.27,0.15},{0.21,0.57,0.31},{0.14,0.4,0.21},{0.14,0.27,0.16},{0.1,0.2,0.11},{0.54,0.96,0.64},{0.22,0.75,0.35},{0.91,1.0,0.93},{0.28,0.8,0.42},{0.95,1.0,0.96},{0.86,0.96,0.88},{0.66,0.8,0.68}}, {{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}}, {{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}}, - {{.085,.10,.14},{.035,.045,.065},{.12,.14,.19},{.065,.08,.115},{.105,.125,.17},{.15,.18,.23},{.17,.20,.26},{.09,.115,.16},{.25,.29,.36},{.13,.16,.21},{.90,.20,.83},{.02,.79,.94},{.93,.97,1},{.55,.80,.90},{.95,.97,1},{.86,.91,.96},{.72,.78,.85}} + {{.15,.04,.24},{.075,.018,.14},{.20,.055,.29},{.13,.025,.23},{.14,.045,.25},{.18,.07,.30},{.23,.07,.34},{.09,.065,.25},{.27,.17,.39},{.13,.07,.23},{.90,.20,.83},{.02,.79,.94},{.93,.97,1},{.55,.80,.90},{.95,.97,1},{.86,.91,.96},{.72,.78,.85}} }; NSColor *DYThemeSwatch(NSInteger index){static const double values[7][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36},{.65,.38,1}};index=MAX(0,MIN(6,index));return rgb(values[index][0],values[index][1],values[index][2]);} void DYSetThemeIndex(NSInteger index){if(index<0||index>6)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];} @@ -43,7 +43,7 @@ NSDictionary *DYThemePalette(void){ const double (*p)[3]=paletteRGB[index];NSMutableDictionary *d=[NSMutableDictionary dictionary]; for(int i=0;i<17;i++)d[[NSString stringWithFormat:@"slot%d",i]]=rgb(p[i][0],p[i][1],p[i][2]); NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):index==6?rgb(.08,.79,.94):DYThemeSwatch(index); - [d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];if(index==6){d[@"backgroundEnd"]=rgb(.065,.085,.115);d[@"cardEnd"]=rgb(.085,.11,.15);d[@"border"]=[rgb(.30,.42,.53)colorWithAlphaComponent:.55];} [all addObject:[[d copy]autorelease]]; + [d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];if(index==6){d[@"backgroundEnd"]=rgb(.01,.16,.20);d[@"cardEnd"]=rgb(.035,.12,.25);d[@"border"]=[rgb(.47,.37,.88)colorWithAlphaComponent:.55];} [all addObject:[[d copy]autorelease]]; }palettes=[all copy]; });return palettes[DYThemeIndex()]; } @@ -64,7 +64,8 @@ NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) { } void DYDrawThemeSurface(NSBezierPath *path,BOOL card) { NSDictionary *palette=DYThemePalette();NSString *role=card?@"card":@"background"; - if(DYThemeIndex()>=5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];} + if(DYThemeIndex()==6&&!card){NSGradient *g=[[[NSGradient alloc]initWithColors:@[palette[role],rgb(.035,.035,.21),palette[@"backgroundEnd"]]]autorelease];[g drawInBezierPath:path angle:25];} + else if(DYThemeIndex()>=5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];} else {[palette[role]setFill];[path fill];} } @implementation DYThemeLabel diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index c675ee1..a64533b 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.8.3 CFBundleVersion - 61 + 62 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 151afb9..28a6f9e 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.8.3 CFBundleVersion - 61 + 62 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright