diff --git a/Packaging/Release-1.8.3.md b/Packaging/Release-1.8.3.md new file mode 100644 index 0000000..5abe7b3 --- /dev/null +++ b/Packaging/Release-1.8.3.md @@ -0,0 +1,11 @@ +大鱼调色 1.8.3(61)公测 + +新增“霓虹炫彩”主题:中性深蓝灰面板,青、蓝、洋红、绿等模块细边与标记,洋红到青色渐变滑杆和重点按钮,明亮白色文字。未设置主题时默认使用炫彩;原六种主题和编号保留,可随时切换。 + +曲线编辑器新增真实分析画面的直方图叠层,显示亮度与 RGB 分布;RGB 页叠加四通道,红、绿、蓝页只显示对应通道。支持“直方图”开关,曲线控制点仍可直接添加、拖动、删除。主题、通道和叠层显示不改变调色参数或预设。 + +直方图复用 320×180 分析缓存、256 档,最多每秒2次更新,播放或移动播放头时刷新。透明与非有限像素不计,范围外值归到端点,共同峰值平方根缩放。原流程取一级 CST/输入 LUT 后,新 CMS 取显示输出转换后、SDR修饰前;它不是最终输出示波器,也不是每个独立曲线层的即时输入。工具提示可查看来源与范围。 + +色彩管理、调色数学和模板默认保持不变。系统要求 Apple Silicon、macOS14.6 或更新。唯一正式位置 /Library/Plug-Ins/FxPlug/大鱼调色.app。 + +验证结果与发行摘要在本版正式验收后补齐。 diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 083835e..6cd8d43 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -158,12 +158,19 @@ 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) { + 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]; +} @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]; 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]; } @end @@ -179,6 +186,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk()); [(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes]; [self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes]; + if(DYThemeIndex()==6){[DYModuleAccent(self.identifier)setFill];[[NSBezierPath bezierPathWithRoundedRect:NSMakeRect(2,8,2,14) xRadius:1 yRadius:1]fill];} } - (void)mouseDown:(NSEvent *)event { if(event.clickCount==2) [NSApp sendAction:self.doubleClickAction to:self.target from:self]; @@ -586,13 +594,13 @@ static NSImage *DYWheelImage(void) { NSInteger index=0; for(NSDictionary *section in _sections) { DYCard *card=[[[DYCard alloc] initWithFrame:NSZeroRect] autorelease]; - card.accessibilityLabel=section[@"title"]; + card.accessibilityLabel=section[@"title"];card.identifier=section[@"key"]; [_document addSubview:card]; DYHeader *header=[[[DYHeader alloc] initWithFrame:NSZeroRect] autorelease]; header.title=[section[@"key"] isEqual:@"skin"]?@"肤色保护设置":section[@"title"]; [header setButtonType:NSButtonTypePushOnPushOff]; header.bordered=NO; header.alignment=NSTextAlignmentLeft; header.font=[NSFont boldSystemFontOfSize:12]; - header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index; + header.identifier=section[@"key"];header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index; header.doubleClickAction=@selector(resetSection:); header.toolTip=@"展开或折叠界面;双击还原本组"; [card addSubview:header]; NSButton *enabled=DYButton(@"",self,@selector(groupEnabled:));enabled.bordered=NO;[enabled setButtonType:NSButtonTypePushOnPushOff];enabled.image=[NSImage imageWithSystemSymbolName:@"eye" accessibilityDescription:@"启用本组"]; diff --git a/大鱼调色/Plugin/DYTheme.mm b/大鱼调色/Plugin/DYTheme.mm index d1f7404..aedb52d 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}}, - {{.12,.10,.22},{.055,.045,.105},{.18,.15,.29},{.10,.085,.18},{.16,.14,.25},{.21,.17,.34},{.24,.19,.37},{.13,.12,.24},{.29,.27,.39},{.15,.14,.23},{.80,.18,1},{.04,.78,.97},{.94,.95,1},{.73,.71,.86},{.96,.95,1},{.88,.87,.96},{.75,.74,.85}} + {{.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}} }; 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];} @@ -42,8 +42,8 @@ NSDictionary *DYThemePalette(void){ for(NSInteger index=0;index<7;index++){ 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):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(.105,.075,.18);d[@"cardEnd"]=rgb(.14,.11,.23);d[@"border"]=[rgb(.58,.43,.80)colorWithAlphaComponent:.55];} [all addObject:[[d copy]autorelease]]; + 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]]; }palettes=[all copy]; });return palettes[DYThemeIndex()]; } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index bef7d0f..c675ee1 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.8.3 CFBundleVersion - 60 + 61 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 3fd35f7..151afb9 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.8.3 CFBundleVersion - 60 + 61 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright