fix: stabilize inspector refresh and finalize compact workspace candidate 75
这个提交包含在:
1 父节点
1396d5b7bf
当前提交
ded1f22be8
17 个文件已更改
+70
-24
没有与搜索条件相匹配的文件
@@ -1,11 +1,13 @@
|
||||
# 大鱼调色 1.12.0(74)
|
||||
# 大鱼调色 1.12.0(75)
|
||||
|
||||
统一调色工作区加入横排工具、左侧图层和右侧选中模块编辑。普通检查器和工作区同步新增、删除、启停、参数与蒙版。调整、蒙版、LUT和示波器位于同一面板,默认窄条,可扩大、收回及调整左右分栏。
|
||||
统一调色工作区加入横排工具、左侧图层和右侧选中模块编辑。普通检查器和工作区同步新增、删除、启停、参数与蒙版。工作区采用平面深灰和紧凑图标工具条,默认横向窄条;中央直接显示当前模块,右侧常驻亮度波形、RGB分列、直方图和矢量图。分栏与窗口大小可调。
|
||||
|
||||
画布左侧保留常驻矩形/椭圆/钢笔、曲线与直方图、畸变、肤色范围和LUT入口,底部增加“控制面板”。曲线和畸变去除半透明卡片背景,HSL与蜘蛛盘等模块在统一工作区调整。LUT继续使用现有文件夹、缩略图、真实帧预览和异步载入逻辑。
|
||||
画布左侧恢复有按压反馈的图标按钮,保留常驻矩形/椭圆/钢笔、曲线与直方图、畸变、肤色范围和LUT入口,底部增加“控制面板”。曲线和畸变去除半透明卡片背景,HSL与蜘蛛盘等模块在统一工作区调整。LUT继续使用现有文件夹、缩略图、真实帧预览和异步载入逻辑。
|
||||
|
||||
一张蒙版可以同时关联HSL、蜘蛛盘及其它模块,形状、关键帧和跟踪共同更新。支持先画后指定模块,或选模块后画、继续添加关联。解除某一关联不会删除共享对象;旧独立蒙版及完整预设v7继续兼容。
|
||||
|
||||
跟踪按本机ColorFinale2.16.2证据重建,使用从官方锁定源码静态编译的OpenCV4.5.1及对应角点、光流、仿射和预处理流程,许可证随APP提供。生成运动参考已通过;尚无原版相同视频完整轨迹对照,不声称最终轨迹完全等价。失配时停止并保留可信轨迹前缀。
|
||||
|
||||
需要macOS14.6或更高、Apple Silicon Mac、Final Cut Pro或Motion。工作区是宿主托管的可调整远程窗口;公开FxPlug接口未提供原生停靠到FCP检视器。空间蒙版/畸变可用完整预设保存,静态Cube无法保存这些空间处理。
|
||||
|
||||
蜘蛛盘采用左盘面、右参数布局;调整与蒙版参数按窄条高度横向分列。选择风格LUT图层直接显示原有浏览器,点击图层的蒙版符号进入编辑、跟踪与共享关联,取消独立LUT/蒙版标签。修复钢笔闭合写回前露出默认矩形的问题,并合并同一批参数变化触发的检视器刷新。切换片段/重开检视器的现场空白对应宿主PluginNotFound,构建流程避免在用户验收时重新登记临时APP;正式宿主稳定性结论以该候选实际复验记录为准。
|
||||
@@ -60,3 +60,5 @@ OpenCV4.5.1由官方锁定源码静态构建并随包保留全部许可,宿主
|
||||
用户实测截图显示 FCP 自定义视图空白。系统日志在 09:43:55 记录 `Unable to create custom view`,FxPlugErrorDomain=16;本机 SDK FxTypes.h 将 16 定义为 `kFxError_PluginNotFound`。现场未发现本次 1.12.0 正式服务的对应崩溃报告,不能把既有 1.10.0 的诊断崩溃当成本次证据。后台完整 APP 编译会执行 `RegisterWithLaunchServices`,临时构建副本进入 PluginKit,可能干扰宿主插件重连;已移除构建副本登记。用户测试期间只编译 XPC 目标并核验不会执行 LaunchServices 登记,最终完整构建必须宿主正常退出后进行。参数回调改为每个待处理主队列批次只发一次模型更新,避免一个事务数百次视图刷新;需要正式版重复切换与重开验证,暂不宣称空白故障根因已完全解决。
|
||||
|
||||
四宫格第四项采用显示参考 RGB 的 BT.709 色差坐标,计算来源为 [ITU-R BT.709-6 第 3.3 节](https://www.itu.int/dms_pubrec/itu-r/rec/bt/r-rec-bt.709-6-201506-i%21%21pdf-e.pdf)。保持现有显示参考采样边界,不把它标为精密 HDR/IRE 测量。
|
||||
|
||||
用户已确认空白出现在切换片段或重新打开检视器后,已正常退出FCP。XPC单目标构建和812项原生离屏检查已通过,PluginKit维持唯一正式路径。正式75候选将包含后台远程回调与会话过期检查,再执行签名后完整原生自检与宿主重复切换;保留SDK reply返回前同步接入子视图的已验证尺寸合同,不以无现场证据的异步替换破坏旧几何修复。
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"nativeReference": {
|
||||
@@ -18,11 +18,11 @@
|
||||
},
|
||||
"staticContract": {
|
||||
"passed": true,
|
||||
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
"nativeFloatParameters": 278,
|
||||
"nativeFloatParameters": 285,
|
||||
"customParameters": 3,
|
||||
"publications": [
|
||||
{
|
||||
@@ -55,7 +55,7 @@
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"status": "pending-user-manual-acceptance",
|
||||
"status": "superseded-after-user-feedback",
|
||||
"date": "2026-11-04T20:14:41.392289+00:00",
|
||||
"version": "1.12.0",
|
||||
"build": "74",
|
||||
@@ -62,5 +62,13 @@
|
||||
],
|
||||
"automationLimitation": "Some CUA actions reported external user changes. User confirmed manual testing; attempted clicks are not treated as proof of size-toggle or drawing success.",
|
||||
"currentFormalServicePID": 859,
|
||||
"currentFCPPID": 824
|
||||
"currentFCPPID": 824,
|
||||
"userReportedIssues": [
|
||||
"Canvas rail needs icon button affordance.",
|
||||
"Closed pen path displayed as rectangle.",
|
||||
"Narrow workspace needs horizontal layout and persistent right four-up scopes.",
|
||||
"LUT and mask must open from the layer, without separate tabs.",
|
||||
"Main custom inspector intermittently blank; host log showed FxPlugErrorDomain 16 PluginNotFound."
|
||||
],
|
||||
"newCandidate": "1.12.0(75), source changes under verification; not installed yet"
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"date": "2026-11-05T01:56:52.024898+00:00",
|
||||
"status": "native-preflight-passed-formal-delivery-pending",
|
||||
"version": "1.12.0",
|
||||
"build": "75",
|
||||
"checks": 812,
|
||||
"passed": true,
|
||||
"reportSHA256": "bb8b81679e037d86784a459f374c9ba40d25ae8350d1ac6ec345cb06d7b50d98",
|
||||
"scope": [
|
||||
"Offscreen AppKit fixtures, no test window presented.",
|
||||
"Horizontal module and six mask layouts at minimum strip height.",
|
||||
"Permanent four plots and real scope worker rasters.",
|
||||
"Layer-driven LUT/mask navigation, UUID isolation and shared assignments.",
|
||||
"Shared three-node pen path before and after authoritative write.",
|
||||
"Deferred coalesced model refresh and repeated inspector/remote recreation."
|
||||
],
|
||||
"remaining": [
|
||||
"Final signed candidate must repeat preflight after the added background-reply session check.",
|
||||
"Formal FCP switching/reopening and drawing acceptance.",
|
||||
"Original same-video full tracking trajectory comparison."
|
||||
],
|
||||
"buildIsolation": "XPC-only scheme does not execute RegisterWithLaunchServices; PluginKit retains one formal installed path.",
|
||||
"uiAudit": "SwiftUI audit not applicable: existing native interface is AppKit, no Swift source."
|
||||
}
|
||||
@@ -146,7 +146,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
id<FxRemoteWindowAPI_v3> v3=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v3)];id<FxRemoteWindowAPI_v2> sizable=v3?:[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v2)];id<FxRemoteWindowAPI> remote=sizable?:[_manager apiForProtocol:@protocol(FxRemoteWindowAPI)];
|
||||
void(^reply)(FxXPView *,NSError *)=^(FxXPView *parent,NSError *error){void(^attach)(void)=^{DYColorWorkspace *owner=token.owner;if(!owner||owner->_closed||owner->_session!=session)return;owner->_opening=NO;
|
||||
if(!parent){[owner reportError:error.localizedDescription?:@"宿主未能创建辅助窗口"];return;}[owner attachToParent:parent];
|
||||
};if(NSThread.isMainThread)attach();else dispatch_sync(dispatch_get_main_queue(),attach);};
|
||||
};/* FxPlug reads the first child size immediately after reply returns; retain the verified synchronous attach contract (BrowserMoreSpace1.7.3). */if(NSThread.isMainThread)attach();else dispatch_sync(dispatch_get_main_queue(),attach);};
|
||||
// FCP initially uses the requested maximum. Keep the default a narrow strip;
|
||||
// larger LUT/mask layouts are an explicit choice, without moving host windows.
|
||||
if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(840,300) maximumSize:_expanded?NSMakeSize(2400,1200):NSMakeSize(1440,360) reply:reply];
|
||||
|
||||
@@ -268,7 +268,7 @@ static NSArray *DYPresentationSections(void) {
|
||||
- (void)setHistogram:(NSData *)histogram {if(_histogram==histogram)return;[_histogram release];_histogram=[histogram copy];const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;_histogramToggle.accessibilityValueDescription=h&&h->samples?[NSString stringWithFormat:@"分析画面,%u 个有效采样",h->samples]:@"等待画面;请移动播放头";[self setNeedsDisplay:YES];}
|
||||
- (void)histogramToggled:(id)sender {[self setNeedsDisplay:YES];}
|
||||
- (void)channelChanged:(NSSegmentedControl *)sender { _channel=sender.selectedSegment;[self setNeedsDisplay:YES]; }
|
||||
- (NSRect)plotRect { return _fixedWorkspaceChannel?NSMakeRect(8,8,MAX(50,self.bounds.size.width-16),MAX(50,self.bounds.size.height-42)):NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-76)); }
|
||||
- (NSRect)plotRect {if(_fixedWorkspaceChannel){CGFloat side=MAX(50,MIN(self.bounds.size.width-16,self.bounds.size.height-42));return NSMakeRect((self.bounds.size.width-side)/2,MAX(8,(self.bounds.size.height-side-34)/2),side,side);}return NSMakeRect(16,37,MAX(50,self.bounds.size.width-32),MAX(50,self.bounds.size.height-76));}
|
||||
- (NSArray *)slots {
|
||||
NSMutableArray *result=[NSMutableArray array];
|
||||
NSInteger n=_channel==0?4:2;
|
||||
@@ -301,7 +301,7 @@ static NSArray *DYPresentationSections(void) {
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=[self plotRect];
|
||||
DYDrawSoftControl(r,5,YES,NO,NO);
|
||||
if(_fixedWorkspaceChannel){[[NSColor colorWithWhite:DYThemeIsLight()?.81:.17 alpha:1]setFill];NSRectFill(r);[[NSColor colorWithWhite:DYThemeIsLight()?.54:.36 alpha:1]setStroke];NSFrameRectWithWidth(r,.5);}else DYDrawSoftControl(r,5,YES,NO,NO);
|
||||
if(_histogramToggle.state==NSControlStateValueOn){
|
||||
const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;
|
||||
if(h&&h->samples){
|
||||
@@ -338,11 +338,11 @@ static NSArray *DYPresentationSections(void) {
|
||||
NSPoint q=NSMakePoint(r.origin.x+x*r.size.width,r.origin.y+(1-fmax(0,fmin(1,y)))*r.size.height);
|
||||
if(sample==0)[curve moveToPoint:q];else[curve lineToPoint:q];
|
||||
}
|
||||
NSColor *color=_channel==0?(DYThemeIsLight()?DYInk():DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
|
||||
NSColor *color=_channel==0?(DYThemeIsLight()?DYInk():_fixedWorkspaceChannel?[NSColor colorWithWhite:.9 alpha:1]:DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
|
||||
for(NSDictionary *point in points) {NSPoint q=[self positionOfPoint:point];[color setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] fill];[DYInk() setStroke];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] stroke];}
|
||||
NSDictionary *axis=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:8 weight:NSFontWeightRegular],NSForegroundColorAttributeName:DYThemeColor(@"secondary")};
|
||||
[@"0" drawAtPoint:NSMakePoint(NSMinX(r),NSMaxY(r)+2) withAttributes:axis];[@"128" drawAtPoint:NSMakePoint(NSMidX(r)-7,NSMaxY(r)+2) withAttributes:axis];[@"255" drawAtPoint:NSMakePoint(NSMaxX(r)-14,NSMaxY(r)+2) withAttributes:axis];
|
||||
[(_fixedWorkspaceChannel?@[@"主控",@"红色",@"绿色",@"蓝色"][_channel]:@"点击添加 · 拖动调整 · 双击删除") drawAtPoint:NSMakePoint(16,self.bounds.size.height-16) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}];
|
||||
[(_fixedWorkspaceChannel?@[@"主控",@"红色",@"绿色",@"蓝色"][_channel]:@"点击添加 · 拖动调整 · 双击删除") drawAtPoint:NSMakePoint(_fixedWorkspaceChannel?NSMidX(r)-12:16,_fixedWorkspaceChannel?NSMaxY(r)+18:self.bounds.size.height-16) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}];
|
||||
}
|
||||
- (void)sendValues:(NSDictionary *)values {
|
||||
NSMutableDictionary *merged=[[_values mutableCopy] autorelease];[merged addEntriesFromDictionary:values];[self setValues:merged];
|
||||
|
||||
@@ -381,7 +381,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
[self updateVisibleFolders];
|
||||
CGFloat available=MAX(80,_gridScroll.contentSize.width),tileWidth=_sizeSlider.doubleValue,gap=10;
|
||||
BOOL list=_layoutMenu.indexOfSelectedItem==1;NSInteger columns=list?1:MAX(1,(NSInteger)floor((available+gap)/(tileWidth+gap)));tileWidth=list?MAX(110,available-14):MIN(tileWidth,(available-gap*(columns-1)-14)/columns);tileWidth=MAX(70,tileWidth);
|
||||
_columns=columns;_tileWidth=tileWidth;_tileHeight=list?70:ceil(tileWidth*9/16)+24;
|
||||
if(_embedded&&!list)tileWidth=MIN(tileWidth,MAX(70,(_gridScroll.contentSize.height-36)*16/9));_columns=columns;_tileWidth=tileWidth;_tileHeight=list?70:ceil(tileWidth*9/16)+24;
|
||||
NSInteger rows=(_visibleEntries.count+columns-1)/columns;CGFloat contentHeight=MAX(_gridScroll.contentSize.height,rows*(_tileHeight+gap)+12);
|
||||
if(_embedded){_horizontalRows=MAX(1,NSInteger((_gridScroll.contentSize.height-12)/(_tileHeight+gap)));NSInteger horizontalColumns=(_visibleEntries.count+_horizontalRows-1)/_horizontalRows;_gridDocument.frame=NSMakeRect(0,0,MAX(available,horizontalColumns*(_tileWidth+gap)+14),_gridScroll.contentSize.height);}else{_horizontalRows=0;_gridDocument.frame=NSMakeRect(0,0,available,contentHeight);}_emptyLabel.frame=NSMakeRect(20,MAX(36,_gridScroll.contentSize.height/2-45),MAX(50,available-40),90);
|
||||
_layingOut=NO;[self updateVisibleTiles];
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
if(_workspaceMode){
|
||||
CGFloat h=self.bounds.size.height;_eye.frame=NSMakeRect(8,4,26,28);_list.frame=NSMakeRect(38,4,132,28);_add.frame=NSMakeRect(174,4,26,28);_remove.frame=NSMakeRect(204,4,26,28);_combine.frame=NSMakeRect(242,4,92,28);_invert.frame=NSMakeRect(344,6,68,24);_canvas.frame=NSMakeRect(422,4,100,28);
|
||||
NSInteger perColumn=MAX(1,NSInteger((h-48)/44));NSUInteger index=0;
|
||||
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*214,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,126,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+132,y,66,24)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,198,18)];index++;}
|
||||
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*214,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,126,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+132,y,66,22)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,198,18)];index++;}
|
||||
CGFloat x=16+ceil(double(index)/perColumn)*214,y=42,aw=200;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;
|
||||
if(pen){_penRedraw.frame=NSMakeRect(x,y,aw,25);y+=29;_penFinish.frame=NSMakeRect(x,y,97,25);_penCancel.frame=NSMakeRect(x+103,y,97,25);y+=33;}
|
||||
if(shape){if(y+135>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*28,97,25)];y+=87;_clear.frame=NSMakeRect(x,y,aw,25);y+=28;}
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@
|
||||
- (BOOL)parameterChanged:(UInt32)pid atTime:(CMTime)t error:(NSError**)e{if(pid==DYToolsParameterID)[self adoptToolCanvasDocument:DYReadTools(_apiManager,t).document];if(pid==DYToolsParameterID||pid==2013||pid==2014||(pid>=2236&&pid<2400)||pid==DYAssetsParameterID)[_renderer invalidatePreview];// Many parameter callbacks arrive in one host transaction. Refresh the native
|
||||
// inspector once after the transaction unwinds, rather than queueing a full
|
||||
// remote parameter read and view rebuild for every scalar in the burst.
|
||||
if(!_modelRefreshPending.exchange(true))dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self.apiManager];});return YES;}
|
||||
if(!_modelRefreshPending.exchange(true)){id host=_apiManager;dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];});}return YES;}
|
||||
- (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{
|
||||
DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;id<FxTimingAPI_v4>timing=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a histogram:nil atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;id<FxColorGamutAPI_v2>gamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil;
|
||||
}
|
||||
|
||||
@@ -34,5 +34,6 @@
|
||||
click(170,275);click(445,275);click(300,140);int sharedUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];NSDictionary *closed=[plugin toolCanvasMaskAtTime:kCMTimeZero];DYMaskParameters closedParameters;[closed[@"parameters"]getBytes:&closedParameters length:sizeof(closedParameters)];
|
||||
run.record(@"shared-pen-close-keeps-three-point-bezier-before-author-write",closedParameters.kind==DYMaskBezier&&[closed[@"nodes"]length]==3*sizeof(DYBezierNode)&&![closed[@"drawing"]boolValue]&&base->_undoStarts==sharedUndo);
|
||||
drain();NSDictionary *sharedAuthor=DYReadTools(base,kCMTimeZero).document,*savedShared=DYSharedMaskWithID(sharedAuthor,sharedID);run.record(@"shared-pen-close-persists-same-path-and-both-module-references-once",[savedShared[@"nodes"]isEqual:closed[@"nodes"]]&&DYToolIDsForSharedMask(sharedAuthor,sharedID).count==2&&base->_undoStarts==sharedUndo+1&&[[plugin toolCanvasMaskAtTime:kCMTimeZero][@"nodes"]isEqual:closed[@"nodes"]]);
|
||||
__block NSInteger refreshCount=0;id refreshObserver=[NSNotificationCenter.defaultCenter addObserverForName:DYModelChanged object:host queue:nil usingBlock:^(NSNotification *note){refreshCount++;}];for(int i=0;i<100;i++)[(id<FxTileableEffect>)plugin parameterChanged:2003 atTime:kCMTimeZero error:NULL];BOOL deferred=refreshCount==0;drain();run.record(@"inspector-parameter-burst-coalesces-to-one-deferred-refresh",deferred&&refreshCount==1);[NSNotificationCenter.defaultCenter removeObserver:refreshObserver];
|
||||
[osc release];[plugin release];
|
||||
}
|
||||
@@ -8,12 +8,15 @@
|
||||
- (void)createWorkspaceMask:(NSInteger)kind;
|
||||
- (void)maskAssignmentChanged:(NSButton *)sender;
|
||||
- (void)deleteWorkspaceSelection:(id)sender;
|
||||
- (void)refreshToolWorkspace:(NSNotification *)notification;
|
||||
- (void)editWorkspaceRowMask:(NSButton *)sender;
|
||||
- (void)toggleWorkspaceSize:(id)sender;
|
||||
- (void)tableViewSelectionDidChange:(NSNotification *)note;
|
||||
- (BOOL)commitLUT:(NSString *)path expected:(NSDictionary *)expected error:(NSError **)error;
|
||||
- (NSProgress *)selectLUT:(NSString *)path completion:(void(^)(NSError *))completion;
|
||||
@end
|
||||
@interface DYWorkspaceDiagnosticHost : DYDiagnosticManager {
|
||||
@public NSView *_parent;CMTime _workspaceTime;NSUInteger _requests,_closes;NSInteger _actionDepth;BOOL _permissionFailure,_nodeCommitHadUndo,_rejectToolsWrites,_verifyWritesInAction,_writesInAction;NSSize _minimumRequested,_maximumRequested;
|
||||
@public NSView *_parent;CMTime _workspaceTime;NSUInteger _requests,_closes;NSInteger _actionDepth;BOOL _permissionFailure,_nodeCommitHadUndo,_rejectToolsWrites,_verifyWritesInAction,_writesInAction,_asyncRemote;NSSize _minimumRequested,_maximumRequested;
|
||||
}
|
||||
@end
|
||||
@implementation DYWorkspaceDiagnosticHost
|
||||
@@ -22,7 +25,7 @@
|
||||
- (void)startAction:(id)sender{_actionDepth++;}
|
||||
- (void)endAction:(id)sender{_actionDepth--;if(_actionDepth<0)_permissionFailure=YES;}
|
||||
- (CMTime)currentTime{return _workspaceTime;}
|
||||
- (void)remoteWindowWithMinimumSize:(CGSize)minimum maximumSize:(CGSize)maximum reply:(void(^)(FxXPView*,NSError*))reply{if(!_actionDepth)_permissionFailure=YES;_requests++;_minimumRequested=minimum;_maximumRequested=maximum;reply((FxXPView*)_parent,nil);}
|
||||
- (void)remoteWindowWithMinimumSize:(CGSize)minimum maximumSize:(CGSize)maximum reply:(void(^)(FxXPView*,NSError*))reply{if(!_actionDepth)_permissionFailure=YES;_requests++;_minimumRequested=minimum;_maximumRequested=maximum;if(_asyncRemote){NSView *parent=_parent;dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0),^{reply((FxXPView*)parent,nil);});}else reply((FxXPView*)_parent,nil);}
|
||||
- (void)closeRemoteWindow{if(!_actionDepth)_permissionFailure=YES;_closes++;}
|
||||
- (BOOL)setFloatValue:(double)value toParameter:(UInt32)pid atTime:(CMTime)time{if(_verifyWritesInAction)_writesInAction&=_actionDepth>0&&NSThread.isMainThread;return [super setFloatValue:value toParameter:pid atTime:time];}
|
||||
- (BOOL)setCustomParameterValue:(NSObject<NSSecureCoding,NSCopying> *)value toParameter:(UInt32)pid atTime:(CMTime)time{if(_verifyWritesInAction)_writesInAction&=_actionDepth>0&&NSThread.isMainThread;if(pid==DYToolsParameterID){_nodeCommitHadUndo=_undoActive;if(_rejectToolsWrites)return NO;}return [super setCustomParameterValue:value toParameter:pid atTime:time];}
|
||||
|
||||
@@ -99,6 +99,7 @@
|
||||
run.record(@"workspace-switching-lut-target-directly-shows-browser",[[stack valueForKey:@"editorMode"]integerValue]==2&&[[stack valueForKey:@"browser"]visible]);
|
||||
chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);[stack showPage:@"lut" maskKind:nil];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document;
|
||||
run.record(@"workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",pending.cancelled&&completed&&cancelled&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]);
|
||||
[stack setValue:@0 forKey:@"editorMode"];[stack pageChanged:nil];[stack refreshToolWorkspace:nil];run.record(@"workspace-lut-return-to-adjustments-survives-model-refresh",[[stack valueForKey:@"editorMode"]integerValue]==0);chooseNode(lookB);run.record(@"workspace-reselect-lut-layer-reopens-browser",[[stack valueForKey:@"editorMode"]integerValue]==2);
|
||||
BOOL choseHSL=chooseNode(@"base:hsl");undo=stackHost->_undoStarts;[stack createWorkspaceMask:1];workspaceDrain();NSString *sharedID=[[[stack valueForKey:@"selectedMask"]copy]autorelease];
|
||||
NSButton *assign=[NSButton checkboxWithTitle:@"蜘蛛调色" target:nil action:nil];assign.identifier=@"base:spider";assign.state=NSControlStateValueOn;[stack maskAssignmentChanged:assign];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSArray *hslMasks=DYMasksForTool(tools,@"base:hsl"),*spiderMasks=DYMasksForTool(tools,@"base:spider");
|
||||
BOOL mainHasShared=NO;for(NSDictionary *card in [mainInspector valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"hsl"]){NSDictionary *document=[card[@"maskPanel"]valueForKey:@"document"];mainHasShared=[DYMasksForTool(document,@"base:hsl").firstObject[@"id"]isEqual:sharedID];}
|
||||
@@ -123,5 +124,9 @@
|
||||
run.record([@"workspace-horizontal-minimum-height-" stringByAppendingString:type],fits,@{@"document":NSStringFromRect(document.bounds),@"viewport":NSStringFromSize(strip.contentSize),@"outside":bad});
|
||||
if([type isEqual:@"spider"]){NSView *panel=[editor valueForKey:@"spiderPanel"];[panel layoutSubtreeIfNeeded];NSView *disc=[panel valueForKey:@"disc"],*hues=[panel valueForKey:@"hues"];run.record(@"workspace-spider-places-disc-left-and-parameters-right",NSMaxX(disc.frame)<=NSMinX(hues.frame)&&NSContainsRect(panel.bounds,hues.frame));}
|
||||
}
|
||||
[stack close];stackHost->_asyncRemote=YES;[stack showRelativeToView:nil];[stack close];[stack showRelativeToView:nil];workspaceDrain();run.record(@"workspace-background-remote-reply-attaches-only-current-session",stack.visible&&[(NSView*)[stack valueForKey:@"root"]superview]==stackHost->_parent&&!stackHost->_permissionFailure);[stack close];stackHost->_asyncRemote=NO;
|
||||
// Repeated inspector/window recreation must not keep stale subviews or
|
||||
// close a newer workspace session when delayed callbacks finish.
|
||||
BOOL recreated=YES;for(int cycle=0;cycle<8;cycle++){@autoreleasepool{DYInspector *fresh=[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer];fresh.frame=NSMakeRect(0,0,360,780);[fixture.contentView addSubview:fresh];[fresh layoutSubtreeIfNeeded];recreated&=fresh.subviews.count>0&&[(NSArray*)[fresh valueForKey:@"cards"]count]>0;[fresh removeFromSuperview];[fresh release];workspaceDrain();[stack showRelativeToView:nil];workspaceDrain();recreated&=stack.visible&&[(NSView*)[stack valueForKey:@"root"]superview]==stackHost->_parent;[stack close];} }run.record(@"workspace-repeated-inspector-and-remote-recreation-keeps-current-session",recreated&&!stackHost->_permissionFailure&&stackHost->_actionDepth==0);
|
||||
[stack showRelativeToView:nil];workspaceDrain();NSString *selectedBefore=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack toggleWorkspaceSize:nil];workspaceDrain();BOOL expanded=stack.visible&&stackHost->_maximumRequested.height==1200&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore];[stack toggleWorkspaceSize:nil];workspaceDrain();run.record(@"workspace-size-mode-keeps-selection-and-recreates-only-host-window",expanded&&stack.visible&&stackHost->_maximumRequested.height==360&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore]&&!stackHost->_permissionFailure);[stack close];
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
_split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split];
|
||||
_toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost];
|
||||
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=NO;_layerScroll.autohidesScrollers=YES;_layerScroll.scrollerStyle=NSScrollerStyleOverlay;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
|
||||
_layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=28;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYWorkspacePalette()[@"background"];_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
|
||||
_layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=28;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.target=self;_layerTable.action=@selector(workspaceRowClicked:);_layerTable.backgroundColor=DYWorkspacePalette()[@"background"];_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
|
||||
_addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask];
|
||||
_deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer];
|
||||
_selectionTitle=[[DYThemeLabel labelWithString:@""]retain];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle];
|
||||
@@ -83,12 +83,13 @@
|
||||
if(sender.tag<0||sender.tag>=_layerRows.count)return;NSDictionary *row=_layerRows[sender.tag];_hasUserSelection=YES;[_selectedNode release];_selectedNode=[row[@"node"]copy];[_selectedMask release];_selectedMask=nil;
|
||||
NSArray *masks=DYMasksForTool(_toolDocument,_selectedNode);if(masks.count){_selectedMask=[masks[0][@"id"]copy];_editorMode=1;[self refreshToolWorkspace:nil];}else [self addWorkspaceMask:sender];
|
||||
}
|
||||
- (void)workspaceRowClicked:(id)sender {if(_layerTable.clickedRow>=0)[self tableViewSelectionDidChange:nil];}
|
||||
- (void)tableViewSelectionDidChange:(NSNotification*)note {
|
||||
if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_editorMode=_selectedMask?1:[item[@"type"]isEqual:@"look"]?2:0;[self rebuildWorkspaceEditor];[self pageChanged:nil];
|
||||
}
|
||||
- (void)rebuildWorkspaceEditor {
|
||||
NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil;
|
||||
_editorMode=_selectedMask?1:[type isEqual:@"look"]?2:0;
|
||||
if(_selectedMask)_editorMode=1;else if(![_editorNode isEqual:_selectedNode]||_editorMode==1)_editorMode=[type isEqual:@"look"]?2:0;
|
||||
_selectionTitle.stringValue=_selectedMask?@"蒙版 · 编辑与跟踪":DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;}
|
||||
if(![_editorNode isEqual:_selectedNode]){[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){id<PROAPIAccessing>target=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}}
|
||||
[_toolEditor refresh];
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.12.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>74</string>
|
||||
<string>75</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.12.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>74</string>
|
||||
<string>75</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户