fix: preserve last-frame canvas curve and pen edits across the host out-point boundary
这个提交包含在:
1 父节点
dad77aff77
当前提交
8ac7ca43da
9 个文件已更改
+43
-10
没有与搜索条件相匹配的文件
@@ -28,3 +28,9 @@ LUT 属于有数量的浏览内容,恢复按视口宽度换行的多行网格
|
||||
- 11:00–11:02 FCP PID 对应服务7411,独立验收库的76切换与蒙版项目。HSL 2 色板上排、三轴同宽排列,矢量图细虚线及肤色标签实际可见,四路采样57600;畸变不在工具条/层表。
|
||||
- 11:04 播放第二片段到片尾,重新开工作区仍等待。日志明确 `requested=4.000000000 cached=3.960000000`,对应25fps排他末端与末帧。78候选只在宿主给出的精确输入末端减一个合法帧长,内点、越界、无帧长不偏移。暂不引入多帧缓存。
|
||||
- 自动坐标点击未见OSC hit/event,不能算已实际绘制。已请用户在77重试钢笔及曲线,以本地实际保存日志定位;此前 native mock 验证不代替此项。
|
||||
|
||||
## 78 片尾编辑保护
|
||||
|
||||
同一 raw currentTime 精确比较也出现在 ViewerParameterBridge(开始、每次写、有效性和蜘蛛盘批次)与蒙版提交、界面完成命令。复用同一个宿主显示帧时间归一化,仅对合法输入范围的排他末端生效;OSC 提供的事件时刻仍为写入时刻,真实播放头变化、改层和外部值冲突保护保留。
|
||||
|
||||
增加 fake host 的明确 4.00 秒界面 / 3.96 秒 OSC 复现:成对曲线参数持久化、实际播放头移到3.92后拒写、钢笔三节点闭合一次保存。真实用户77诊断仍待回报,这属于有代码和片尾宿主时差证据支持的修复候选,不把 native 用例当作真实宿主绘制完成。
|
||||
@@ -188,8 +188,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
- (void)pageChanged:(id)sender{
|
||||
if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2;
|
||||
CMTime displayTime=_toolTime;id<FxCustomParameterActionAPI_v4>action=[self actionAPI];if(_visible&&action){[action startAction:self];@try{
|
||||
id<FxTimingAPI_v4>timing=[[self rootHost]apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime start=kCMTimeInvalid,duration=kCMTimeInvalid,frame=kCMTimeInvalid;
|
||||
if([timing respondsToSelector:@selector(startTimeOfInputToFilter:)]&&[timing respondsToSelector:@selector(durationTimeOfInputToFilter:)]&&[timing respondsToSelector:@selector(frameDuration:)]){[timing startTimeOfInputToFilter:&start];[timing durationTimeOfInputToFilter:&duration];[timing frameDuration:&frame];displayTime=DYScopeDisplayTime(_toolTime,start,duration,frame);if(CMTimeCompare(displayTime,_toolTime)!=0)os_log(OS_LOG_DEFAULT,"dayu_scope_end_boundary requested=%{public}.9f display=%{public}.9f",CMTimeGetSeconds(_toolTime),CMTimeGetSeconds(displayTime));}
|
||||
displayTime=DYHostDisplayedFrameTime([self rootHost],_toolTime);if(CMTimeCompare(displayTime,_toolTime)!=0)os_log(OS_LOG_DEFAULT,"dayu_scope_end_boundary requested=%{public}.9f display=%{public}.9f",CMTimeGetSeconds(_toolTime),CMTimeGetSeconds(displayTime));
|
||||
}@finally{[action endAction:self];}}
|
||||
[_renderer setScopeEnabled:_visible atTime:displayTime];if(_editorMode==2)[self ensureBrowser];[self scopeChanged:nil];[self layoutWorkspace];
|
||||
}
|
||||
|
||||
@@ -838,7 +838,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if([key isEqual:@"spider"]){
|
||||
CGFloat groupWidth=MAX(490,available);_spiderPanel.frame=NSMakeRect(x,0,groupWidth,height);
|
||||
for(NSView *row in rows)if([row.identifier isEqual:@"spiderMix"]){[_spiderPanel addSubview:row];_spiderPanel.accessoryRow=row;}
|
||||
[_spiderPanel layoutSubtreeIfNeeded];x+=groupWidth;
|
||||
[_spiderPanel setNeedsLayout:YES];[_spiderPanel layoutSubtreeIfNeeded];x+=groupWidth;
|
||||
}else{
|
||||
CGFloat top=0;
|
||||
if(tabs){tabs.frame=NSMakeRect(x,4,available,30);NSInteger index=0;CGFloat sw=available/9;for(NSView *button in tabs.subviews)button.frame=NSMakeRect(index++*sw,1,sw-5,27);top=46;}
|
||||
|
||||
@@ -7,3 +7,12 @@ static inline CMTime DYScopeDisplayTime(CMTime requested,CMTime start,CMTime dur
|
||||
CMTime end=CMTimeAdd(start,duration);if(!CMTIME_IS_NUMERIC(end)||CMTimeCompare(requested,end)!=0)return requested;
|
||||
CMTime last=CMTimeSubtract(end,frame);return CMTimeCompare(last,start)<0?start:last;
|
||||
}
|
||||
|
||||
#import <FxPlug/FxPlugSDK.h>
|
||||
// Caller must already hold a custom parameter action. OSC events keep their
|
||||
// provided time; this only normalizes the custom-view clock used to guard them.
|
||||
static inline CMTime DYHostDisplayedFrameTime(id<PROAPIAccessing> host,CMTime current){
|
||||
id<FxTimingAPI_v4>timing=[host apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime start=kCMTimeInvalid,duration=kCMTimeInvalid,frame=kCMTimeInvalid;
|
||||
if([timing respondsToSelector:@selector(startTimeOfInputToFilter:)]&&[timing respondsToSelector:@selector(durationTimeOfInputToFilter:)]&&[timing respondsToSelector:@selector(frameDuration:)]){[timing startTimeOfInputToFilter:&start];[timing durationTimeOfInputToFilter:&duration];[timing frameDuration:&frame];}
|
||||
return DYScopeDisplayTime(current,start,duration,frame);
|
||||
}
|
||||
@@ -19,7 +19,7 @@
|
||||
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
|
||||
[a startAction:self];@try{
|
||||
os_log(OS_LOG_DEFAULT,"dayu_pen_commit event=%{public}.9f action=%{public}.9f nodes=%{public}lu",CMTimeGetSeconds(time),CMTimeGetSeconds(a.currentTime),(unsigned long)([draft[@"nodes"]length]/sizeof(DYBezierNode)));
|
||||
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(a.currentTime,time)!=0){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;}
|
||||
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(self->_apiManager,a.currentTime),time)!=0){[self postToolCanvasStatus:@"播放头已移动,本次蒙版草稿未写入其它帧。"];return;}
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document),*current=[self toolMask:maskID node:node document:doc];
|
||||
if(!current||![current isEqual:original]){os_log(OS_LOG_DEFAULT,"dayu_pen_commit conflict current=%{public}d",current!=nil);[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;}
|
||||
NSMutableDictionary *result=DYMutablePlist(draft);
|
||||
@@ -34,7 +34,7 @@
|
||||
- (void)toolCanvasCommand:(NSNotification*)notification {
|
||||
NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;}
|
||||
CMTime time=CMTimeMakeWithEpoch([info[@"timeValue"]longLongValue],[info[@"timeScale"]intValue],[info[@"timeEpoch"]longLongValue]);
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=a.currentTime;}@finally{[a endAction:self];}}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
|
||||
if([command isEqual:@"finish"]||[command isEqual:@"cancel"])[self toolCanvasEvent:NSEventTypeKeyDown point:NSZeroPoint part:1 modifiers:0 key:[command isEqual:@"finish"]?13:27 time:time];
|
||||
}
|
||||
- (void)updateToolShapeDraftAtPoint:(NSPoint)point {
|
||||
|
||||
@@ -35,5 +35,10 @@
|
||||
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];
|
||||
// A custom-view clock may report the exclusive out point while OSC supplies
|
||||
// the displayed last-frame time. Keep the provided event time for authoring.
|
||||
host.boundaryTiming=YES;host->_time=CMTimeMake(4,1);CMTime last=CMTimeMake(99,25);redraw();
|
||||
auto endClick=[&](double x,double y){[osc mouseDownAtPositionX:x positionY:y activePart:1 modifiers:0 forceUpdate:&update atTime:last];[osc mouseUpAtPositionX:x positionY:y activePart:1 modifiers:0 forceUpdate:&update atTime:last];};
|
||||
endClick(170,275);endClick(445,275);endClick(300,140);int endUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:last];drain();NSDictionary *endMask=[DYReadTools(base,last).document[@"baseMasks"][@"hsl"]lastObject];run.record(@"pen-last-frame-close-saves-three-authored-nodes-at-exclusive-host-end",[endMask[@"nodes"]length]==3*sizeof(DYBezierNode)&&base->_undoStarts==endUndo+1&&![[plugin toolCanvasMaskAtTime:last][@"drawing"]boolValue]);
|
||||
[osc release];[plugin release];
|
||||
}
|
||||
@@ -29,8 +29,13 @@
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error;
|
||||
@end
|
||||
|
||||
@interface DYToolCanvasProbe : DYToolTrackingProbe @end
|
||||
@interface DYToolCanvasProbe : DYToolTrackingProbe
|
||||
@property(nonatomic) BOOL boundaryTiming;
|
||||
@end
|
||||
@implementation DYToolCanvasProbe
|
||||
- (void)startTimeOfInputToFilter:(CMTime*)time{*time=_boundaryTiming?kCMTimeZero:kCMTimeInvalid;}
|
||||
- (void)durationTimeOfInputToFilter:(CMTime*)time{*time=_boundaryTiming?CMTimeMake(4,1):kCMTimeInvalid;}
|
||||
- (void)frameDuration:(CMTime*)time{*time=_boundaryTiming?CMTimeMake(1,25):kCMTimeInvalid;}
|
||||
- (double)backingScaleFactor{return 1;}
|
||||
- (void)setCursor:(NSCursor*)cursor{}
|
||||
- (id)apiForProtocol:(Protocol*)p{if([NSStringFromProtocol(p)isEqual:@"FxOnScreenControlAPI_v4"])return self;return [super apiForProtocol:p];}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "DYScopeDisplayTime.h"
|
||||
#include "DYSpiderState.h"
|
||||
#import "DYHistogram.h"
|
||||
|
||||
@@ -175,7 +176,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(!active)return NO;
|
||||
id<FxCustomParameterActionAPI_v4>action=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action)return NO;
|
||||
BOOL valid=NO;[action startAction:self];@try{
|
||||
valid=CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(action.currentTime,_writerTime)==0&&[self writerValueMatches];
|
||||
valid=CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)==0&&[self writerValueMatches];
|
||||
}@finally{[action endAction:self];}return valid;
|
||||
}
|
||||
- (void)beginParameter:(NSDictionary*)descriptor node:(NSString*)nodeID value:(double)value atTime:(CMTime)time {
|
||||
@@ -200,7 +201,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(!action){[host release];return;}
|
||||
id<PROAPIAccessing>target=nil;NSString *type=nil;
|
||||
[action startAction:self];@try{
|
||||
if(CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(action.currentTime,time)==0){
|
||||
if(CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(DYHostDisplayedFrameTime(host,action.currentTime),time)==0){
|
||||
NSDictionary *doc=DYReadTools(host,time).document;
|
||||
if([node hasPrefix:@"base:"]){type=[node substringFromIndex:5];if([DYToolTypes()containsObject:type]&&!DYBaseToolRemoved(doc,type))target=[host retain];}
|
||||
else{NSDictionary *layer=DYToolWithID(doc,node);if(layer){type=layer[@"type"];target=[[DYToolManager alloc]initWithHost:host node:layer];}}
|
||||
@@ -230,7 +231,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if([frozen isEqual:self->_writerLastMesh])return;
|
||||
id<FxCustomParameterActionAPI_v4>a=[self->_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL changed=NO,failed=NO;
|
||||
[a startAction:self];@try{
|
||||
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(a.currentTime,self->_writerTime)!=0||![self writerValueMatches]){failed=YES;}
|
||||
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(self->_writerHost,a.currentTime),self->_writerTime)!=0||![self writerValueMatches]){failed=YES;}
|
||||
else{
|
||||
if(!self->_writerUndoOpen)self->_writerUndoOpen=[[self->_writerHost apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"画面调整 · 蜘蛛盘"];
|
||||
if(self->_writerUndoOpen){DYAssetState *old=DYReadAssets(self->_writerTarget,self->_writerTime);DYAssetState *next=[[old copy]autorelease];next.spiderMesh=frozen;
|
||||
@@ -264,7 +265,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
id<FxCustomParameterActionAPI_v4>action=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
|
||||
if(!action){[self closeWriter];return;}BOOL conflict=NO,changed=NO,failed=NO;
|
||||
[action startAction:self];@try{
|
||||
conflict=!CMTIME_IS_NUMERIC(action.currentTime)||CMTimeCompare(action.currentTime,_writerTime)!=0||![self writerValueMatches];
|
||||
conflict=!CMTIME_IS_NUMERIC(action.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0||![self writerValueMatches];
|
||||
if(!conflict&&anyChanged){
|
||||
id<FxUndoAPI>undo=[_writerHost apiForProtocol:@protocol(FxUndoAPI)];
|
||||
NSString *title=_writerDescriptors.count==1?_writerDescriptors[0][@"title"]:@"图形控件";
|
||||
|
||||
@@ -129,3 +129,11 @@
|
||||
run.record(@"viewer-bridge-external-cst-configuration-conflict-stops-the-whole-color-wheel",value(h)==30&&fabs(value(s)-.4)<1e-6&&[base->_values[@2236]doubleValue]==0&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
[bridge invalidate];drain();[bridge release];
|
||||
}
|
||||
|
||||
{
|
||||
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,&error);DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=CMTimeMake(4,1);host.boundaryTiming=YES;
|
||||
id<DYViewerParameterProbe>bridge=(id)[[NSClassFromString(@"DYViewerParameterBridge")alloc]initWithAPIManager:host];NSDictionary *x=nil,*y=nil;for(NSDictionary *d in DYDescriptors()){if([d[@"key"]isEqual:@"masterX0"])x=d;if([d[@"key"]isEqual:@"curveY0"])y=d;}
|
||||
auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.04;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};CMTime last=CMTimeMake(99,25);
|
||||
[bridge beginParameters:@[x,y]node:@"base:curve" values:@{@"masterX0":@(-1),@"curveY0":@0}atTime:last];[bridge changeValues:@{@"masterX0":@.4,@"curveY0":@25}];[bridge endGesture];drain();double actual=0;[base getFloatValue:&actual fromParameter:[y[@"pid"]unsignedIntValue]atTime:last];run.record(@"viewer-curve-saves-at-visible-last-frame-when-view-clock-is-exclusive-end",actual==25&&base->_undoStarts==1&&base->_undoEnds==1);
|
||||
[bridge beginParameters:@[x,y]node:@"base:curve" values:@{@"masterX0":@.4,@"curveY0":@25}atTime:last];drain();host->_time=CMTimeMake(98,25);[bridge changeValues:@{@"masterX0":@.5,@"curveY0":@35}];[bridge endGesture];drain();[base getFloatValue:&actual fromParameter:[y[@"pid"]unsignedIntValue]atTime:last];run.record(@"viewer-end-normalization-still-rejects-a-real-playhead-move",actual==25&&base->_undoStarts==1);[bridge invalidate];drain();[bridge release];
|
||||
}
|
||||
在新工单中引用
屏蔽一个用户