保存仿制图章修复与前轮发布诊断,待正式验收

这个提交包含在:
mac 于 2026-11-14 22:54:31 +08:00 提交
1 父节点 5a10408557
当前提交 ca9936ee3c
25 个文件已更改
+1354 -58

没有与搜索条件相匹配的文件

+65 -8
查看文件
@@ -2,10 +2,11 @@
// deferred until the gesture has finished and the callback has returned.
- (void)postToolCanvasStatus:(NSString*)message {
NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;}
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;if(message&&![message isEqual:@"已选中本层蒙版"]&&DYSharedMaskWithID(self->_toolCanvasDocument,maskID)[@"stampSource"])self->_toolTrackingMessages[maskID]=message;
drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
}
- (void)discardToolCanvasDraft {
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
}
// OSC and custom actions can use different origins. Capture the action clock
// after the first event, then compare that clock only with itself at commit.
@@ -21,12 +22,12 @@
});[original release];
}
- (void)commitToolCanvasDraftAtTime:(CMTime)eventTime {
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp;
@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;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp,referenceEdit;
@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;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;referenceEdit=_toolDragPart==DYCloneReferencePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
// 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;}
_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=_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;}
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
@@ -40,17 +41,28 @@
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,writeTime).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=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft);
if(resizeStamp){
if(referenceEdit){
result=DYMutablePlist(current);result[@"stampReference"]=draft[@"stampReference"];
}else if(sourceEdit&&[current[@"keys"]count]){
NSArray *baseSource=current[@"stampSource"],*changedSource=draft[@"stampSource"];
DYStampMotion motion=DYStampMotionAtTime(current,time);motion.active=true;
motion.sourceOffsetX+=[changedSource[0]floatValue]-[baseSource[0]floatValue];
motion.sourceOffsetY+=[changedSource[1]floatValue]-[baseSource[1]floatValue];
result=DYMutablePlist(current);NSMutableArray *keys=result[@"keys"];
[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)!=0;}]];
if(!DYMergeTracking(result,@[DYStampKey(time,DYMaskAtTime(current,time),YES,1,motion)]))return;
}else if(resizeStamp){
DYMaskParameters p=DYMaskAtTime(result,kCMTimeInvalid),authored=DYMaskAtTime(current,kCMTimeInvalid);
DYStampMotion motion=DYStampMotionAtTime(current,time);
authored.width=p.width/motion.targetScaleX;authored.height=p.height/motion.targetScaleY;
result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)];
result[@"keys"]=current[@"keys"];
}else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;}
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
[result removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:referenceEdit?@"设置图章跟踪参考":sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
}@finally{[a endAction:self];}
os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft));
if(changed)[self postToolCanvasStatus:sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
if(changed)[self postToolCanvasStatus:referenceEdit?@"跟踪参考已保存 · 绿色区域只用于跟踪,黄色修复范围保持不变":sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
}@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];
}
@@ -58,6 +70,7 @@
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=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}@synchronized(self){if(_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime))time=_toolCanvasEditTime;}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
if([@[@"reference",@"clearReference",@"manual",@"return"]containsObject:command]){[self cloneStampCommand:command mask:info[@"mask"] atTime:time];return;}
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 {
@@ -68,6 +81,21 @@
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {
if(!CMTIME_IS_NUMERIC(time)||!std::isfinite(point.x)||!std::isfinite(point.y))return;
@synchronized(self){if(_trackingActive.load()||!_selectedToolNode||!_selectedToolMask)return;if(_toolCanvasCommitPending){NSString *node=[_selectedToolNode copy],*maskID=[_selectedToolMask copy];dispatch_async(dispatch_get_main_queue(),^{@synchronized(self){if(![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}[self toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];});[node release];[maskID release];return;}
if(_toolDrawingStampReference){
if(type==NSEventTypeKeyDown&&key==27){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"已取消跟踪参考选择,保留原图章。"];return;}
if(type==NSEventTypeLeftMouseDown&&part==DYCloneReferencePart){
NSDictionary *stamp=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!stamp[@"stampSource"])return;
_toolCanvasOriginal=[DYMutablePlist(stamp)retain];_toolCanvasDraft=[DYMutablePlist(stamp)retain];_toolCanvasEditTime=time;_toolDragStart=point;_toolDragPart=DYCloneReferencePart;
}
if(_toolCanvasDraft&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp)){
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新选择跟踪参考。"];return;}
double x0=std::clamp(MIN(point.x,_toolDragStart.x),0.,1.),y0=std::clamp(MIN(point.y,_toolDragStart.y),0.,1.);
double x1=std::clamp(MAX(point.x,_toolDragStart.x),0.,1.),y1=std::clamp(MAX(point.y,_toolDragStart.y),0.,1.);
BOOL valid=DYSetStampReference(_toolCanvasDraft,NSMakeRect(x0,y0,x1-x0,y1-y0),time);
if(type==NSEventTypeLeftMouseUp){if(valid)[self commitToolCanvasDraftAtTime:time];else{[self discardToolCanvasDraft];[self postToolCanvasStatus:@"参考区域太小或离修复区过远,请重新框选。"];}}
}
return;
}
if(part>=10000&&type==NSEventTypeLeftMouseDown){
NSInteger item=part-10000;
if(item==7){_toolShowCoverage=!_toolShowCoverage;return;}
@@ -131,3 +159,32 @@
if(type==NSEventTypeLeftMouseUp&&!_toolDrawingPen)[self commitToolCanvasDraftAtTime:time];
}
}
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)eventTime {
if(!maskID.length)return;
dispatch_async(dispatch_get_main_queue(),^{
@synchronized(self){if(self->_trackingActive.load()||![maskID isEqual:self->_selectedToolMask]||self->_toolCanvasCommitPending)return;}
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a){[self toolStatus:@"宿主暂时无法编辑图章,请重试。"];return;}
[a startAction:self];@try{
CMTime time=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime);if(!CMTIME_IS_NUMERIC(time))return;
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document),*stamp=(id)DYSharedMaskWithID(doc,maskID);if(!stamp[@"stampSource"])return;
if([command isEqual:@"return"]){
CMTime last=DYTrackingRecordedTime(stamp,@"trackingLastTime"),timeline=kCMTimeInvalid;
if(CMTIME_IS_NUMERIC(last))[[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)]timelineTime:&timeline fromInputTime:last];
NSError *error=nil;
if(!CMTIME_IS_NUMERIC(timeline)||![[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)]movePlayheadToTime:timeline error:&error])[self toolStatus:@"暂时无法定位最后可信帧,请按提示中的片段时间定位。"];return;
}
BOOL cancelReference=[command isEqual:@"reference"]&&self->_toolDrawingStampReference;
[self discardToolCanvasDraft];
if(cancelReference){[self postToolCanvasStatus:@"已取消参考选择,保留原图章。"];return;}
if([command isEqual:@"reference"]){@synchronized(self){self->_toolDrawingStampReference=YES;self->_toolCanvasHidden=NO;}[self postToolCanvasStatus:@"拖框选择同一表面上有纹理的跟踪参考;Esc 取消。"];return;}
if([command isEqual:@"clearReference"]){[stamp removeObjectForKey:@"stampReference"];[stamp removeObjectForKey:@"status"];}
else if([command isEqual:@"manual"]){if(!DYAddStampManualKey(stamp,time)){[self toolStatus:@"无法建立手工关键帧,请检查轨迹数量或重新定位。"];return;}}
else return;
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:[command isEqual:@"manual"]?@"设置图章手工关键帧":@"重置图章跟踪参考"];
BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];
if(written){[self adoptToolCanvasDocument:doc];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];[self postToolCanvasStatus:[command isEqual:@"manual"]?@"手工关键帧已保存 · 移到另一帧拖动黄色修复区或青色取样点,帧间自动过渡。":@"已使用修复区域作为跟踪参考。"];}
else [self toolStatus:@"宿主未保存图章修改,请重试。"];
}@finally{[a endAction:self];}
});
}