From e6fecdad7b1860c2aaa8161b1136e47af5d21b5c Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 16 Nov 2026 15:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=8E=9F=E7=94=9F=E7=94=BB?= =?UTF-8?q?=E5=B8=83HSL=E5=90=B8=E7=AE=A1=E4=B8=8E=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=B8=A7=E6=98=BE=E7=A4=BA=E5=8F=96=E6=A0=B7=EF=BC=8C=E5=87=86?= =?UTF-8?q?=E5=A4=87139=E5=AE=BF=E4=B8=BB=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Publishing/1.22.3/Release.md | 2 +- research/HSLPicker.md | 4 +++- 大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h | 8 +++++++ 大鱼调色/Plugin/DYInspector.mm | 23 +++++++++++++------ 大鱼调色/Plugin/DYRenderer.h | 3 +++ 大鱼调色/Plugin/DYScopeCapture.inc.h | 10 ++++++++ 大鱼调色/Plugin/DYToolHostDeclarations.inc.h | 3 +++ 大鱼调色/Plugin/DYToolOSC.inc.h | 24 ++++++++++++++------ 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 开发交接.md | 4 ++-- 11 files changed, 65 insertions(+), 20 deletions(-) diff --git a/Publishing/1.22.3/Release.md b/Publishing/1.22.3/Release.md index 38acf6d..8f2078c 100644 --- a/Publishing/1.22.3/Release.md +++ b/Publishing/1.22.3/Release.md @@ -1,4 +1,4 @@ -大鱼调色 1.22.3(138)新增 HSL 吸管:点击画面取色后,自动切换到颜色对应的 HSL 调整项,暖肤色优先进入橙色。中性色与 Esc 取消保留当前项,取色只选择颜色,不改动调色数值。主模块、独立 HSL 层及控制面板共用。 +大鱼调色 1.22.3(139)新增 HSL 吸管:直接点击 FCP 画面取色后,自动切换到颜色对应的 HSL 调整项,暖肤色优先进入橙色。中性色与 Esc 取消保留当前项,取色只选择颜色,不改动调色数值。主模块、独立 HSL 层及控制面板共用。 在一级调色与独立 CST 的曲线菜单中新增: diff --git a/research/HSLPicker.md b/research/HSLPicker.md index aea40f6..2583100 100644 --- a/research/HSLPicker.md +++ b/research/HSLPicker.md @@ -1,9 +1,11 @@ # HSL 点取色(1.22.3) -入口是各 HSL 面板的“HSL 吸管”:主模块、独立 HSL 层、控制面板均复用 `DYInspector`。调用与已有白平衡/自定义 HSL 一致的 `NSColorSampler`,将取到的显示颜色转换为 sRGB;点击后只改变当前编辑器的八色标签与选中状态,不写参数、不创建撤销记录、不改自定义色、不改变其他层。Esc 取消保持原样。 +入口是各 HSL 面板的“HSL 吸管”:主模块、独立 HSL 层、控制面板均复用 `DYInspector`。139使用原生 `DYToolOSC` 在 FCP 画面内点取色,由该实例当前帧的最终输出缓存经 ColorSync 转为显示 sRGB;不依赖系统取色浮层。取样复用既有320×180缓存,坐标随真实画布缩放,拒绝过时、分块及透明帧,不抓取屏幕。点击后只改变当前编辑器的八色标签与选中状态,不写参数、不创建撤销记录、不改自定义色、不改变其他层。Esc 取消保持原样。 `DYHSLPicker.h` 按圆周色相到红、橙、黄、绿、青、蓝、紫、洋红的中心距离归类。暖肤色的颜色启发式优先橙色,包含偏粉、桃色和棕色样本;这是基于颜色的选择,不做人物/人脸识别。高饱和正红仍归红色。低亮度、低色度和近灰色无可靠色相,保留当前项,并在按钮上显示中性色。 自定义 HSL 原有吸管仍仅在自定义标签下显示。新入口始终显示在 HSL 中,不再需要先切到自定义。普通面板、窄面板和横向工作区沿用动作行的自适应布局及现有色条/三轴布局。 自动验证覆盖八个颜色项、四类肤色和偏粉跨红色边界、黑白灰与无效输入,以及三个原生编辑器中的标签状态、色条互斥和参数不变。正式宿主实点与画面检查另记 `verification/HostDJIHSL1.22.3.json`,不能把自动检查替代为真人肤色识别或真实拍摄素材的色彩准确度承诺。 + +139以唯一请求令牌回送到发起的主模块/独立层/工作区;别的面板不改变选项。Esc 或再次按吸管取消,当前帧未就绪时保留取色状态供重试。138系统取色候选只完成加载与原生自检,实点未通过,不据此发布。 diff --git a/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h b/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h index 2be6b81..b4464f4 100644 --- a/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYHSLPickerDiagnostics.inc.h @@ -7,6 +7,7 @@ NSMutableDictionary *pickDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSDictionary *pickLayer=DYInsertTool(pickDoc,@"hsl",@"base:hsl");DYWriteTools(pickHost,pickDoc,kCMTimeZero); DYToolManager *pickProxy=[[[DYToolManager alloc]initWithHost:pickHost node:pickLayer]autorelease]; NSArray *pickEditors=@[[[[DYInspector alloc]initWithAPIManager:pickHost]autorelease],[[[DYInspector alloc]initWithAPIManager:pickProxy]autorelease],[[[DYInspector alloc]initWithAPIManager:pickHost renderer:nil workspaceType:@"hsl"]autorelease]]; + // Selection delivery is token-bound; a result for another editor is ignored. NSDictionary *pickBefore=[[pickHost->_values copy]autorelease];NSData *pickTools=[NSKeyedArchiver archivedDataWithRootObject:DYReadTools(pickHost,kCMTimeZero) requiringSecureCoding:YES error:nil]; for(NSUInteger editorIndex=0;editorIndex_values]&&[pickTools isEqual:pickAfter]&&pickHost->_undoStarts==0); } diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 3b5b436..d52f551 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -496,6 +496,7 @@ NSView *DYCreateWorkspaceMaskEditor(id NSMutableDictionary *_assetButtons; NSMutableArray *_graphics; NSColorSampler *_sampler; + NSString *_hslPickerToken; DYRenderer *_renderer; DYLUTLibrary *_library; DYLUTBrowser *_browser; @@ -581,6 +582,7 @@ NSView *DYCreateWorkspaceMaskEditor(id else [self addSubview:_document]; if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];} [self buildCards]; + [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(hslPickerResult:) name:@"DYHSLPickerResult" object:_embedded?[(DYToolManager*)_manager host]:_manager]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil]; [NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil]; @@ -611,7 +613,8 @@ NSView *DYCreateWorkspaceMaskEditor(id DYBetaSpanEnd(beta,nil);return self; } - (void)dealloc { - _tearingDown=YES;[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;[self spiderGesture:NO];[_workspace close];[_workspace release];[_workspaceButton release];[_workspaceSelectedNode release]; + _tearingDown=YES; + if(_hslPickerToken)[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:_embedded?[(DYToolManager*)_manager host]:_manager userInfo:@{@"token":_hslPickerToken,@"cancel":@YES}];[_hslPickerToken release];[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;[self spiderGesture:NO];[_workspace close];[_workspace release];[_workspaceButton release];[_workspaceSelectedNode release]; for(id graphic in _graphics)[graphic setDelegate:nil]; for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release]; [[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self]; @@ -749,7 +752,7 @@ NSView *DYCreateWorkspaceMaskEditor(id } if([key isEqual:@"hsl"]) { DYFlippedView *pickActions=[[[DYFlippedView alloc]initWithFrame:NSZeroRect]autorelease];pickActions.identifier=@"hslPickerControls"; - NSButton *autoPicker=DYButton(@"HSL 吸管",self,@selector(sampleHSLLane:));autoPicker.identifier=@"hslLanePicker";autoPicker.image=[NSImage imageWithSystemSymbolName:@"eyedropper" accessibilityDescription:nil];autoPicker.toolTip=@"点击画面取色,自动切换到对应颜色;肤色优先进入橙色。Esc 取消。";autoPicker.accessibilityLabel=@"HSL 吸管"; + NSButton *autoPicker=DYButton(@"HSL 吸管",self,@selector(sampleHSLLane:));autoPicker.identifier=@"hslLanePicker";autoPicker.toolTip=@"点击画面取色,自动切换到对应颜色;肤色优先进入橙色。Esc 取消。";autoPicker.accessibilityLabel=@"HSL 吸管"; [pickActions addSubview:autoPicker];[card addSubview:pickActions];[body addObject:pickActions]; DYFlippedView *tabs=[[[DYFlippedView alloc]initWithFrame:NSZeroRect]autorelease];tabs.identifier=@"hslTabs"; for(NSInteger i=0;i<9;i++){DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=i<8?[NSColor colorWithSRGBRed:((double[]){1,1,1,.15,0,0,.75,1})[i] green:((double[]){.2,.55,.84,.76,.76,.47,.15,.15})[i] blue:((double[]){.25,.12,0,.25,.8,1,.9,.65})[i] alpha:1]:DYAccent();b.title=@"";if(i==8)b.identifier=@"customColorSwatch";b.tag=i;b.target=self;b.action=@selector(tabChanged:);b.state=i==0?NSControlStateValueOn:NSControlStateValueOff;b.accessibilityLabel=[@[@"红",@"橙",@"黄",@"绿",@"青",@"蓝",@"紫",@"洋红",@"自定义"][i] stringByAppendingString:@" HSL"];[tabs addSubview:b];} @@ -1544,12 +1547,18 @@ NSView *DYCreateWorkspaceMaskEditor(id } [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification); } +- (void)hslPickerResult:(NSNotification *)note { + if(![_hslPickerToken isEqual:note.userInfo[@"token"]])return; + [_hslPickerToken release];_hslPickerToken=nil; + for(NSDictionary *card in _cards)for(NSView *row in card[@"body"])if([row.identifier isEqual:@"hslPickerControls"])[(NSButton*)row.subviews.firstObject setTitle:@"HSL 吸管"]; + [self selectHSLColor:note.userInfo[@"color"]]; +} - (void)sampleHSLLane:(id)sender { - if(_sampler)return; - _sampler=[[NSColorSampler alloc]init]; - [_sampler showSamplerWithSelectionHandler:^(NSColor *selectedColor){ - [self selectHSLColor:selectedColor];[_sampler release];_sampler=nil; - }]; + id host=_embedded?[(DYToolManager*)_manager host]:_manager; + if(_hslPickerToken){[NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:host userInfo:@{@"token":_hslPickerToken,@"cancel":@YES}];return;} + _hslPickerToken=[NSUUID.UUID.UUIDString copy]; + for(NSDictionary *card in _cards)for(NSView *row in card[@"body"])if([row.identifier isEqual:@"hslPickerControls"])[(NSButton*)row.subviews.firstObject setTitle:@"点击画面取色 · Esc 取消"]; + [NSNotificationCenter.defaultCenter postNotificationName:@"DYHSLPickerRequest" object:host userInfo:@{@"token":_hslPickerToken}]; } - (void)sampleColorForWhiteBalance:(BOOL)whiteBalance { if(_sampler)return; diff --git a/大鱼调色/Plugin/DYRenderer.h b/大鱼调色/Plugin/DYRenderer.h index 2fb12bf..b9f34e1 100644 --- a/大鱼调色/Plugin/DYRenderer.h +++ b/大鱼调色/Plugin/DYRenderer.h @@ -3,7 +3,10 @@ #import #import "DYUniforms.h" #import "DYToolState.h" +@class NSColor; @interface DYRenderer : NSObject +/// Current final-output sample in display sRGB; nil for stale/transparent frames. +- (NSColor *)canvasColorAtPoint:(NSPoint)point atTime:(CMTime)time; /// Decode and upload before committing a host parameter. The renderer retains /// the immutable selected contents independently of the thumbnail cache. - (NSProgress *)prepareLUTPath:(NSString *)path completion:(void (^)(NSError *error))completion; diff --git a/大鱼调色/Plugin/DYScopeCapture.inc.h b/大鱼调色/Plugin/DYScopeCapture.inc.h index 2887531..567b3aa 100644 --- a/大鱼调色/Plugin/DYScopeCapture.inc.h +++ b/大鱼调色/Plugin/DYScopeCapture.inc.h @@ -41,6 +41,16 @@ - (NSData *)canvasHistogramAtTime:(CMTime)time { return [self finalSampleAtTime:time].canvasHistogram; } +- (NSColor *)canvasColorAtPoint:(NSPoint)point atTime:(CMTime)time { + if(!std::isfinite(point.x)||!std::isfinite(point.y)||point.x<0||point.x>1||point.y<0||point.y>1)return nil; + DYScopeSample *sample=[self finalSampleAtTime:time];if(!sample||![sample.metadata[@"wholeImage"]boolValue])return nil; + auto reference=[sample displayReferenceWithProfile:[self scopeProfileForSpace:sample.space]]; + if(!reference->converted||reference->pixels.size()!=dyscope::Width*dyscope::Height)return nil; + size_t x=MIN(dyscope::Width-1,(size_t)(point.x*dyscope::Width)),y=MIN(dyscope::Height-1,(size_t)(point.y*dyscope::Height)); + const auto &p=reference->pixels[y*dyscope::Width+x]; + if(!std::isfinite(p.r)||!std::isfinite(p.g)||!std::isfinite(p.b)||p.a<=1e-6f)return nil; + return [NSColor colorWithSRGBRed:std::clamp(p.r,0.f,1.f) green:std::clamp(p.g,0.f,1.f) blue:std::clamp(p.b,0.f,1.f) alpha:1]; +} - (DYColorProfile *)scopeProfileForSpace:(CGColorSpaceRef)space { if(!space)return nil; @synchronized(_scopeProfileLock){ diff --git a/大鱼调色/Plugin/DYToolHostDeclarations.inc.h b/大鱼调色/Plugin/DYToolHostDeclarations.inc.h index a5fed27..cdcb060 100644 --- a/大鱼调色/Plugin/DYToolHostDeclarations.inc.h +++ b/大鱼调色/Plugin/DYToolHostDeclarations.inc.h @@ -3,6 +3,9 @@ static const NSInteger DYCloneReferencePart=8; @class DYPlugIn; static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static dispatch_once_t once;dispatch_once(&once,^{map=[[NSMapTable strongToWeakObjectsMapTable]retain];});return map;} @interface DYPlugIn (ToolCanvas) +- (BOOL)canvasHSLSampling; +- (void)selectCanvasHSLAtPoint:(NSPoint)point atTime:(CMTime)time; +- (void)finishCanvasHSLWithColor:(NSColor *)color; - (DYViewerParameterBridge*)viewerParameterBridge; - (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time; - (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time; diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index f0ed2d1..d4b4c52 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -5,6 +5,7 @@ @implementation DYToolOSC { id _device;id _queue;CIContext *_context; DYViewerControls *_viewerControls;CGFloat _height,_canvasWidth,_uiScale;BOOL _maskCapturing;DYPlugIn *_maskCaptureOwner;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics; + BOOL _hslSampling; BOOL _stampHasSource,_stampDragging,_stampSaving,_stampNeedsRedraw; NSPoint _stampSource,_stampStart,_stampEnd; NSString *_stampFailure,*_levelFailure; @@ -58,7 +59,7 @@ @synchronized(self){ self->_levelSaving=NO; if(self->_viewerControls.bridge!=bridge)return; - [self updateLevelFrom:plugin];[self restoreLevelReference]; + [self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];[self restoreLevelReference]; self->_levelFailure=[failure copy]; } }]; @@ -213,10 +214,11 @@ idapi=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.; DYPlugIn *plugin=[self pluginAtTime:time];NSDictionary *mask=[plugin toolCanvasMaskAtTime:time];NSInteger route=(plugin?1:0)+(mask?2:0);if(route!=_lastRoute||_drawCount++<2){_lastRoute=route;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_route plugin=%{public}d mask=%{public}d width=%{public}.2f height=%{public}.2f",plugin!=nil,mask!=nil,_imageRect.size.width,_imageRect.size.height);}[_mask release];_mask=[mask copy];[_handles removeAllObjects];[_outline release];_outline=nil; [_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time]; - [self updateLevelFrom:plugin]; + [self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling]; if(_levelMode)mask=nil; if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){ NSRect region=mask||_viewerControls.stampArmed||_levelMode?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]); + if(_hslSampling)region=NSIntegralRect(NSUnionRect(region,[self hslPickerRect])); if(NSIsEmptyRect(region)){[commands commit];[commands waitUntilCompleted];return;} NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:(NSInteger)NSWidth(region) pixelsHigh:(NSInteger)NSHeight(region) bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:(NSInteger)NSWidth(region)*4 bitsPerPixel:32]autorelease]; if(!bitmap){[commands commit];[commands waitUntilCompleted];return;} @@ -241,13 +243,16 @@ 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]}];} [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]; }}} +- (NSRect)hslPickerRect {return NSMakeRect(NSMinX(_imageRect)+12*_uiScale,MAX(NSMinY(_imageRect)+4*_uiScale,NSMaxY(_imageRect)-100*_uiScale),MIN(370*_uiScale,MAX(1.,NSWidth(_imageRect)-24*_uiScale)),28*_uiScale);} - (NSInteger)partAtPoint:(NSPoint)point { BOOL drawing=[_mask[@"drawing"]boolValue]; if(drawing&&!_levelMode)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i; NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit; + if(_hslSampling)return NSPointInRect(point,_imageRect)?10030:0; if(_levelMode){ if(_levelPlaced)for(NSInteger i=0;i<2;i++){NSPoint endpoint=[self canvasDisplayPoint:_level.toOutput(i?_levelLast:_levelFirst)];if(hypot(point.x-endpoint.x,point.y-endpoint.y)<=12*_uiScale)return 10016+i;} return NSPointInRect(point,_imageRect)?10015:0; @@ -269,11 +274,16 @@ for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];} if(p.kind==DYMaskBezier||p.kind==DYMaskLinearGradient||[_outline containsPoint:point])return 1;return 0; } -- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}} +- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}} - (BOOL)event:(NSEventType)type x:(double)x y:(double)y part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {@synchronized(self){ DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y); if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;} - [self updateLevelFrom:plugin]; + [self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling]; + if(_hslSampling){ + if(type==NSEventTypeKeyDown&&key==27){[plugin finishCanvasHSLWithColor:nil];_hslSampling=NO;return YES;} + if(type==NSEventTypeLeftMouseDown&&part==10030){[plugin selectCanvasHSLAtPoint:[self clampedDisplayUV:canvasPoint] atTime:time];_hslSampling=[plugin canvasHSLSampling];return YES;} + if(type==NSEventTypeLeftMouseUp&&part==10030)return YES; + } if(_stampSaving)return YES; if([self handleLevelEvent:type point:canvasPoint part:part key:key time:time plugin:plugin])return YES; if(!_viewerControls.stampArmed)[self clearStampCreation]; @@ -325,7 +335,7 @@ if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture]; BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010); if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time]){ - [self updateLevelFrom:plugin]; + [self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling]; if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevelState:@{} plugin:plugin];} else if(_viewerControls.levelMeasureRequested){_viewerControls.levelMeasureRequested=NO;NSMutableDictionary *state=[NSMutableDictionary dictionaryWithDictionary:_levelState?:@{}];state[@"levelMeasureOnly"]=@(![state[@"levelMeasureOnly"]boolValue]);[self commitLevelState:state plugin:plugin];} else if(_viewerControls.levelDirectionRequested){_viewerControls.levelDirectionRequested=NO;if(_levelPlaced)[self commitLevelReference:plugin];} @@ -342,10 +352,10 @@ - (void)mouseUpAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseUp x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (void)keyDownAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{BOOL result=(key==27||key==13||key==10||key==3||key==8||key==127)&&[self event:NSEventTypeKeyDown x:x y:y part:1 modifiers:m key:key time:t];if(update)*update=result;if(handled)*handled=result;} - (void)mouseMovedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){ - DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:(part==10014||part==10015)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){ + DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin];_hslSampling=[plugin canvasHSLSampling];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:(part==10014||part==10015||part==10030)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){ _levelLast=_level.toSource([self clampedDisplayUV:point]);redraw=YES; }else if(!_levelMode&&[mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t]; - if(update)*update=redraw||(!_levelMode&&[mask[@"drawing"]boolValue])||_stampNeedsRedraw;_stampNeedsRedraw=NO; + if(update)*update=_hslSampling||redraw||(!_levelMode&&[mask[@"drawing"]boolValue])||_stampNeedsRedraw;_stampNeedsRedraw=NO; }} - (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{[self mouseMovedAtPositionX:x positionY:y activePart:0 modifiers:m forceUpdate:update atTime:t];} - (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){BOOL changed=[_viewerControls mouseExited];if(update)*update=changed;}} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 8e460c6..afaf08e 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.3 CFBundleVersion - 138 + 139 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 7203a96..44f06fd 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.22.3 CFBundleVersion - 138 + 139 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 2eb811d..a718937 100644 --- a/开发交接.md +++ b/开发交接.md @@ -4,9 +4,9 @@ ## 本轮进行中:DJI 相机曲线预设与 HSL 吸管 -用户新增目标:HSL增加点取色吸管,按颜色切换八色调整项,暖肤色优先进入橙色;复用系统取色,覆盖偏粉/桃色/棕色的肤色点,主模块/独立层/工作区共用,灰色或取消保留选择,不写调色值。 +用户新增目标:HSL增加点取色吸管,按颜色切换八色调整项,暖肤色优先进入橙色;138的系统取色浮层未通过自动化实点,改为139原生OSC画面点取色,复用当前帧的显示sRGB缓存,拒绝过时/分块/透明帧,Esc或再次点击取消,令牌只回送发起面板;覆盖偏粉/桃色/棕色的肤色点,主模块/独立层/工作区共用,灰色或取消保留选择,不写调色值。 -相机预设目标仅为大鱼调色的一级调色与独立 CST。基线 `883f680ade8706b8b89580ddc77c062a9a14dd39` 已回读远端一致;既有 Xcode 引用排序差异保留,不纳入本轮。新增稳定曲线 ID 31–34:御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log/D-Log 2,分别复用既有 11/12 的 GPU 解码与编码。色域仍独立选择:D-Log 配 DJI D-Gamut,D-Log 2 配 DJI D-Gamut 2。未将 D-Log M 冒充为 D-Log;本轮不新增无公开数学依据的御 4 Pro 专用 D-Log M 标定。版本准备为 1.22.3(138)。已加入输入/工作/输出 GPU 对比检查;模板重建与静态检查通过。首次构建发现诊断引用了未导出的私有函数,已改为经正式参数描述表检查菜单;继承的失效 SDKROOT 已用当前 Xcode SDK 环境修正。首轮像素自检发现 ID31–33 在工作曲线位置需映射到原生 D-Log BASIS,已修复,输入与输出阶段此前通过;失败诊断保留在固定缓存 `dji-alias-working-first-failure.json`。修复后 Release 自检1099项全过,新增62项全过,相机12组像素对比误差为0。实际编译 `f5ae4ca5eadb65a54d01dd08e717afb97133de1f`;Apple公证原提交 `a49a614a-3128-4326-b4bf-9d80c979597f` 已 Accepted,138 正式安装版1099项自检全过;FCP12.4已加载138且三项目导入无警告,HSL按钮/色条可见,自动化无法操作系统取色浮层,正在请求实际鼠标核验。原提交,ZIP摘要见 `verification/NotarySubmission1.22.3.json`,不重复上传。待完成宿主菜单/实点验收、PKG 与 Release 附件校验。此前 1.22.2 仍为当前正式安装。 +相机预设目标仅为大鱼调色的一级调色与独立 CST。基线 `883f680ade8706b8b89580ddc77c062a9a14dd39` 已回读远端一致;既有 Xcode 引用排序差异保留,不纳入本轮。新增稳定曲线 ID 31–34:御 4 Pro D-Log、Pocket 4 D-Log、Pocket 4P D-Log/D-Log 2,分别复用既有 11/12 的 GPU 解码与编码。色域仍独立选择:D-Log 配 DJI D-Gamut,D-Log 2 配 DJI D-Gamut 2。未将 D-Log M 冒充为 D-Log;本轮不新增无公开数学依据的御 4 Pro 专用 D-Log M 标定。版本准备为 1.22.3(139),138只作已公证候选,不发布安装包。已加入输入/工作/输出 GPU 对比检查;模板重建与静态检查通过。首次构建发现诊断引用了未导出的私有函数,已改为经正式参数描述表检查菜单;继承的失效 SDKROOT 已用当前 Xcode SDK 环境修正。首轮像素自检发现 ID31–33 在工作曲线位置需映射到原生 D-Log BASIS,已修复,输入与输出阶段此前通过;失败诊断保留在固定缓存 `dji-alias-working-first-failure.json`。修复后 Release 自检1099项全过,新增62项全过,相机12组像素对比误差为0。实际编译 `f5ae4ca5eadb65a54d01dd08e717afb97133de1f`;Apple公证原提交 `a49a614a-3128-4326-b4bf-9d80c979597f` 已 Accepted,138 正式安装版1099项自检全过;FCP12.4已加载138且三项目导入无警告,HSL按钮/色条可见,自动化无法操作系统取色浮层,正在请求实际鼠标核验。原提交,ZIP摘要见 `verification/NotarySubmission1.22.3.json`,不重复上传。待完成宿主菜单/实点验收、PKG 与 Release 附件校验。此前 1.22.2 仍为当前正式安装。 ## 当前结果