From dbf25fe6719f17075362538dad0404951102524d Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 22:19:05 +0800 Subject: [PATCH] diagnostic: add bounded real-host OSC hit and pointer entry metadata for build24 --- verification/Delivery.json | 8 +++--- verification/InstalledSelfTest.json | 37 +++++++++++++++++++++---- 大鱼调色/Plugin/DYToolOSC.inc.h | 6 ++-- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/verification/Delivery.json b/verification/Delivery.json index 527bf60..7dd49e2 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -3,14 +3,14 @@ "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", "version": "1.4.0", - "build": "22", + "build": "23", "team": "B3W25FX5H5", - "notaryID": "998d1b1e-12a8-41aa-a954-15da4f660aec", + "notaryID": "94a7e19a-e173-4630-8a04-3b03a87069da", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "34162025b6241ddc7ea3464d58186a95948e5928", + "sourceCommit": "375761619f1427e3bc858de5565344c3d54ec68c", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "9b8f6e407545429b77c1de88d4cceb738760771c5a7f1dbd9732bdcc95c23738", "shaderSHA256": "df82ed0310281e854085063276ab161db7c623511751a1c1c63607b4072c8097", - "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-eb52cb62e5b64c3dbcbe51b4a4f07173.app" + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-7d4cb59101b145c9831f00eb51f1e512.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 389868a..d007975 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -1,6 +1,6 @@ { "bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", - "checks": 216, + "checks": 222, "gpu": "Apple M4", "limitations": [ "Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.", @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C1EB458E-641B-4158-8315-21C451A665C1" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/072E0B29-B427-4AA5-9B85-1EAD1179ED65" }, { "descriptors": 234, @@ -816,7 +816,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C1EB458E-641B-4158-8315-21C451A665C1/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/072E0B29-B427-4AA5-9B85-1EAD1179ED65/diagnostic-export.cube" }, { "bytes": 1186074, @@ -836,7 +836,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 86.23637491837144, + "maximumGapMS": 97.95183315873146, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -1144,8 +1144,35 @@ { "name": "backward-single-step-includes-reference-and-one-neighbor", "pass": true + }, + { + "name": "canvas-cold-load-selects-saved-mask-from-immutable-snapshot", + "pass": true + }, + { + "coveredPixels": 13508, + "name": "native-osc-real-metal-overlay-transparent-around-controls", + "pass": true + }, + { + "name": "native-osc-object-to-canvas-center-hit", + "pass": true + }, + { + "name": "native-osc-drag-writes-independent-normalized-geometry", + "pass": true, + "x": 0.550000011920929, + "y": 0.550000011920929 + }, + { + "name": "native-osc-drag-commits-one-undo-after-callback", + "pass": true + }, + { + "name": "native-osc-escape-discards-draft-without-host-edit", + "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/C1EB458E-641B-4158-8315-21C451A665C1", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/072E0B29-B427-4AA5-9B85-1EAD1179ED65", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index e2fe4a9..b273a96 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -4,7 +4,7 @@ @end @implementation DYToolOSC { id _device;id _queue;CIContext *_context; - CGFloat _height;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount; + CGFloat _height;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics; } - (instancetype)initWithAPIManager:(id)manager{if((self=[super init])){_apiManager=manager;_handles=[NSMutableArray new];_lastRoute=-1;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_init");}return self;} - (void)dealloc{[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[super dealloc];} @@ -41,9 +41,9 @@ for(NSDictionary *h in _handles){NSPoint p=[h[@"point"]pointValue];if(hypot(p.x-point.x,p.y-point.y)<=9)return [h[@"part"]integerValue];} DYMaskParameters p;[_mask[@"parameters"]getBytes:&p length:sizeof(p)];if([_mask[@"drawing"]boolValue]||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{if(part)*part=[self partAtPoint:NSMakePoint(x,_height-y)];} +- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{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 { - DYPlugIn *plugin=[self pluginAtTime:time];if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0)return NO;NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];return YES; + 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);if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0)return NO;NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];return YES; } - (void)mouseDownAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{if(update)*update=[self event:NSEventTypeLeftMouseDown x:x y:y part:part modifiers:m key:0 time:t];} - (void)mouseDraggedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{if(update)*update=[self event:NSEventTypeLeftMouseDragged x:x y:y part:part modifiers:m key:0 time:t];} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 7e6ee91..3916657 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.4.0 CFBundleVersion - 23 + 24 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 5810e73..7050c06 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.4.0 CFBundleVersion - 23 + 24 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright