From 57059390d18dda85a6abe5b7a0572d54c3af4fe5 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Nov 2026 09:30:31 +0800 Subject: [PATCH] wip: restore canvas icon buttons, retain closing pen path and add vector sampling --- 大鱼调色/Plugin/DYScopeCapture.inc.h | 4 ++-- 大鱼调色/Plugin/DYScopeMath.hpp | 10 +++++++++- 大鱼调色/Plugin/DYToolCanvasEditing.inc.h | 8 ++++++-- 大鱼调色/Plugin/DYViewerControls.inc.h | 11 +++++++---- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/大鱼调色/Plugin/DYScopeCapture.inc.h b/大鱼调色/Plugin/DYScopeCapture.inc.h index 3c81be5..08de5a5 100644 --- a/大鱼调色/Plugin/DYScopeCapture.inc.h +++ b/大鱼调色/Plugin/DYScopeCapture.inc.h @@ -48,12 +48,12 @@ }if(target)CGColorSpaceRelease(target); std::vector reference;reference.reserve(pixels.size());for(const auto&p:pixels)reference.push_back({p.r,p.g,p.b,p.a}); auto measurements=dyscope::measure(reference);measurements.nonfinite+=invalid; - auto wave=dyscope::densityImage(measurements.wave,false),parade=dyscope::densityImage(measurements.parade,true); + auto wave=dyscope::densityImage(measurements.wave,false),parade=dyscope::densityImage(measurements.parade,true),vectors=dyscope::vectorImage(measurements.vectors); NSMutableDictionary *metadata=[[sample.metadata mutableCopy]autorelease]; metadata[@"domain"]=converted?@"sRGB 显示参考":@"宿主 RGB(未换算)"; metadata[@"note"]=converted?@"最终输出 · ICC 转扩展 sRGB · R′G′B′ 百分比;非 HDR / IRE 精密测量":(error?[NSString stringWithFormat:@"RGB 原值参考 · %@;波形按 709 权重参考,非 IRE",error.localizedDescription]:@"最终输出 · 空间未知;RGB 原值 / 709 权重波形参考,非显示 / HDR / IRE 测量"); metadata[@"converted"]=@(converted);metadata[@"minimum"]=@(measurements.minimum);metadata[@"maximum"]=@(measurements.maximum);metadata[@"valid"]=@(measurements.valid);metadata[@"transparent"]=@(measurements.transparent>=invalid?measurements.transparent-invalid:0);metadata[@"nonfinite"]=@(measurements.nonfinite);metadata[@"below"]=@(measurements.below);metadata[@"above"]=@(measurements.above); - metadata[@"waveform"]=[NSData dataWithBytes:wave.data() length:wave.size()];metadata[@"parade"]=[NSData dataWithBytes:parade.data() length:parade.size()];metadata[@"histogram"]=[NSData dataWithBytes:measurements.histogram.data() length:sizeof(measurements.histogram)]; + metadata[@"waveform"]=[NSData dataWithBytes:wave.data() length:wave.size()];metadata[@"parade"]=[NSData dataWithBytes:parade.data() length:parade.size()];metadata[@"histogram"]=[NSData dataWithBytes:measurements.histogram.data() length:sizeof(measurements.histogram)];metadata[@"vectorscope"]=[NSData dataWithBytes:vectors.data() length:vectors.size()]; BOOL publish=NO;@synchronized(_previewLock){if(_scopeEnabled&&sample.generation==_scopeGeneration){[_scopePreview release];_scopePreview=[[NSData alloc]initWithBytes:pixels.data() length:pixels.size()*sizeof(DYCompositeRGBA)];[_scopeMetadata release];_scopeMetadata=[metadata copy];publish=YES;}} NSUInteger generation=sample.generation;[sample release]; if(publish)dispatch_async(dispatch_get_main_queue(),^{BOOL active=NO;@synchronized(_previewLock){active=_scopeEnabled&&generation==_scopeGeneration;}if(active)[NSNotificationCenter.defaultCenter postNotificationName:@"DYScopeDidChange" object:self];}); diff --git a/大鱼调色/Plugin/DYScopeMath.hpp b/大鱼调色/Plugin/DYScopeMath.hpp index 7f1becb..394c76d 100644 --- a/大鱼调色/Plugin/DYScopeMath.hpp +++ b/大鱼调色/Plugin/DYScopeMath.hpp @@ -13,12 +13,15 @@ inline constexpr unsigned Width=320,Height=180,Bins=256; inline constexpr float Low=-.1f,High=1.1f; struct RGBA { float r,g,b,a; }; struct Result { - std::vector wave=std::vector(Width*Bins),parade=std::vector(3*Width*Bins); + std::vector wave=std::vector(Width*Bins),parade=std::vector(3*Width*Bins),vectors=std::vector(Bins*Bins); std::array histogram{}; uint64_t valid=0,transparent=0,nonfinite=0,below=0,above=0; float minimum=0,maximum=0; }; inline unsigned bin(float v){if(!(v>Low))return 0;if(v>=High)return Bins-1;return unsigned(std::clamp(std::lround((v-Low)/(High-Low)*(Bins-1)),0l,long(Bins-1)));} +// BT.709 colour-difference coordinates on the same encoded display-reference +// RGB used by the existing scopes (ITU-R BT.709-6 section 3.3). Not an IRE meter. +inline unsigned chromaBin(float v){return unsigned(std::clamp(std::lround((v+.6f)/1.2f*(Bins-1)),0l,long(Bins-1)));} inline Result measure(std::span pixels,unsigned width=Width,unsigned height=Height){ Result r;if(!width||!height||pixels.size()!=size_t(width)*height)return r;bool first=true; for(unsigned y=0;y pixels,unsigned width=Width,unsigned if(!(std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a))){r.nonfinite++;continue;} if(p.a<=1e-6f){r.transparent++;continue;} float values[4]={.2126f*p.r+.7152f*p.g+.0722f*p.b,p.r,p.g,p.b};unsigned column=std::min(Width-1,unsigned(uint64_t(x)*Width/width)); + float cb=(p.b-values[0])/1.8556f,cr=(p.r-values[0])/1.5748f;r.vectors[(Bins-1-chromaBin(cr))*Bins+chromaBin(cb)]++; for(unsigned c=0;c<4;c++){ float v=values[c];unsigned b=bin(v);r.histogram[c*Bins+b]++; if(!c)r.wave[(Bins-1-b)*Width+column]++; @@ -46,4 +50,8 @@ inline std::vector densityImage(std::span counts,bool p } return out; } +inline std::vector vectorImage(std::span counts){ + if(counts.size()!=Bins*Bins)return {};std::vector out(counts.size()*4);uint32_t maximum=0;for(uint32_t n:counts)maximum=std::max(maximum,n);float divisor=std::log1p(float(maximum)); + for(size_t i=0;i0?std::pow(std::log1p(float(counts[i]))/divisor,.65f):0;float colors[]={.5f+1.5748f*cr,.5f-.187324f*cb-.468124f*cr,.5f+1.8556f*cb};float peak=std::max({colors[0],colors[1],colors[2],.001f});for(int c=0;c<3;c++)out[i*4+c]=uint8_t(std::lround(std::clamp(colors[c]/peak,0.f,1.f)*intensity*255));out[i*4+3]=255;}return out; +} } diff --git a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h index 9ec5e22..3cfbf09 100644 --- a/大鱼调色/Plugin/DYToolCanvasEditing.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasEditing.inc.h @@ -9,7 +9,11 @@ } - (void)commitToolCanvasDraftAtTime:(CMTime)eventTime { NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision; - @synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;[self discardToolCanvasDraft];revision=_toolCanvasRevision;_toolCanvasCommitPending=YES;} + @synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime; + // Keep the completed path visible until the authoritative write returns. + // Discarding it here exposed the new pen mask's default rectangular nodes + // during the OSC redraw that immediately follows the closing click. + _toolDrawingPen=_toolDrawingShape=_toolCanvasHasHover=NO;revision=++_toolCanvasRevision;_toolCanvasCommitPending=YES;} dispatch_async(dispatch_get_main_queue(),^{@try{ @synchronized(self){if(self->_trackingActive.load()||revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;} ida=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO; @@ -23,7 +27,7 @@ }@finally{[a endAction:self];} if(changed)[self postToolCanvasStatus:@"蒙版已保存 · 可一次撤销"]; [NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager]; - }@finally{@synchronized(self){self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release]; + }@finally{@synchronized(self){if(revision==self->_toolCanvasRevision){[self->_toolCanvasDraft release];self->_toolCanvasDraft=nil;[self->_toolCanvasOriginal release];self->_toolCanvasOriginal=nil;self->_toolCanvasEditTime=kCMTimeInvalid;}self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release]; } - (void)toolCanvasCommand:(NSNotification*)notification { NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;} diff --git a/大鱼调色/Plugin/DYViewerControls.inc.h b/大鱼调色/Plugin/DYViewerControls.inc.h index 000500a..2e5374b 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -34,11 +34,11 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti if(_capture&&![_capture capturing])_capture=nil; [_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return; // Only tools that benefit from direct image interaction belong on the canvas. - NSArray *types=@[@"curve",@"lens",@"skin",@"look"],*titles=@[@"曲线",@"畸变",@"肤色",@"LUT"]; + NSArray *types=@[@"curve",@"lens",@"skin",@"look"],*titles=@[@"曲线",@"畸变",@"肤色",@"LUT"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"camera.aperture",@"person.crop.circle",@"square.stack.3d.up"]; CGFloat railScale=MIN(s,MAX(.3,v.size.height/280.));CGFloat x=NSMinX(v)+8*railScale,y=NSMinY(v)+8*railScale,w=36*railScale; _rail=NSMakeRect(x,y,w,196*railScale); - for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x,y+i*28*railScale,w,25*railScale)]}]; - for(NSInteger i=0;i<4;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"rect":[NSValue valueWithRect:NSMakeRect(x,y+(i+3)*28*railScale,w,25*railScale)]}]; + for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x,y+i*28*railScale,w,25*railScale)]}]; + for(NSInteger i=0;i<4;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x,y+(i+3)*28*railScale,w,25*railScale)]}]; CGFloat buttonWidth=MIN(100*s,v.size.width-16*s),buttonHeight=MIN(27*s,MAX(16.,v.size.height*.16)); [_areas addObject:@{@"part":@20001,@"kind":@"workspace",@"title":@"控制面板",@"rect":[NSValue valueWithRect:NSMakeRect(NSMidX(v)-buttonWidth/2,NSMaxY(v)-buttonHeight-8*railScale,buttonWidth,buttonHeight)]}]; } @@ -70,13 +70,16 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(_viewport);CGFloat s=_scale;for(DYViewerParameterPanel*p in _panels)[p draw]; for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=[a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled];for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES; BOOL hover=_hover==[a[@"part"]integerValue]; - // Text and its narrow shadow stay readable without tinting the review image. + BOOL pressed=_pressed==[a[@"part"]integerValue];DYDrawSoftControl(r,4*s,NO,selected||hover,pressed); + if(a[@"symbol"]){NSImage *icon=[NSImage imageWithSystemSymbolName:a[@"symbol"] accessibilityDescription:a[@"title"]];NSImageSymbolConfiguration *configuration=[[NSImageSymbolConfiguration configurationWithPointSize:14*s weight:NSFontWeightRegular]configurationByApplyingConfiguration:[NSImageSymbolConfiguration configurationWithPaletteColors:@[selected?NSColor.systemCyanColor:NSColor.whiteColor]]];icon=[icon imageWithSymbolConfiguration:configuration];CGFloat side=MIN(17*s,r.size.height-6*s);[icon drawInRect:NSMakeRect(NSMidX(r)-side/2,NSMidY(r)-side/2,side,side) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];continue;} + // The bottom workspace entry keeps its explicit text label. NSMutableParagraphStyle*style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter; NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[NSColor colorWithWhite:0 alpha:.95];shadow.shadowBlurRadius=2;shadow.shadowOffset=NSMakeSize(0,-1); CGFloat fontSize=MIN(11*s,r.size.height*.44);NSDictionary *attributes=@{NSFontAttributeName:[NSFont systemFontOfSize:fontSize weight:selected||hover?NSFontWeightBold:NSFontWeightMedium],NSForegroundColorAttributeName:selected||hover?NSColor.systemCyanColor:NSColor.whiteColor,NSParagraphStyleAttributeName:style,NSShadowAttributeName:shadow}; [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(NSMaxX(r)+6*s,NSMinY(r),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{