Keep clone stamp preview through host save and use the action clock
这个提交包含在:
1 父节点
df9b3c0253
当前提交
5032ce70ab
6 个文件已更改
+98
-40
没有与搜索条件相匹配的文件
@@ -90,7 +90,7 @@
|
||||
|
||||
|
||||
{
|
||||
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,&error);
|
||||
DYWorkspaceDiagnosticHost *base=[[[DYWorkspaceDiagnosticHost alloc]init]autorelease];DYCreateParameters(base,&error);
|
||||
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
|
||||
id<DYToolCanvasHostProbe> plugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];
|
||||
[plugin scheduleToolCanvasRegistration];NSData *state=nil;[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error];
|
||||
@@ -112,10 +112,22 @@
|
||||
click(180,291.25); // normalized source (0.25, 0.25)
|
||||
NSInteger part=down(348,244);
|
||||
[osc mouseDraggedAtPositionX:460 positionY:181 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];
|
||||
up(460,181,part);drain();
|
||||
CMTime actionTime=CMTimeMake(39,25);
|
||||
[osc drawOSCWithWidth:640 height:400 activePart:part destinationImage:overlay atTime:actionTime];
|
||||
host->_time=actionTime;
|
||||
up(460,181,part);
|
||||
[osc drawOSCWithWidth:640 height:400 activePart:part destinationImage:overlay atTime:actionTime];
|
||||
run.record(@"native-osc-stamp-preview-survives-async-save-and-different-render-time",
|
||||
[[(id)osc valueForKey:@"stampSaving"]boolValue]&&[[viewer valueForKey:@"stampArmed"]boolValue]&&
|
||||
[[(id)osc valueForKey:@"stampHasSource"]boolValue]&&!DYSharedMasks(DYReadTools(base,kCMTimeZero).document).count);
|
||||
drain();
|
||||
NSDictionary *stamp=[DYSharedMasks(DYReadTools(host,kCMTimeZero).document) firstObject];NSArray *source=stamp[@"stampSource"];
|
||||
DYMaskParameters target=DYMaskAtTime(stamp,kCMTimeZero);
|
||||
run.record(@"native-osc-creates-one-stamp-and-one-undo-from-source-click-and-drag",source.count==4&&fabs([source[0]doubleValue]-.25)<1e-6&&fabs([source[1]doubleValue]-.25)<1e-6&&fabs(target.centerX-.65)<1e-6&&fabs(target.centerY-.5)<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
run.record(@"native-osc-stamp-selects-saved-overlay-when-action-time-differs",
|
||||
stamp&&[[plugin toolCanvasMaskAtTime:actionTime][@"id"]isEqual:stamp[@"id"]]&&
|
||||
![[viewer valueForKey:@"stampArmed"]boolValue]&&![[(id)osc valueForKey:@"stampSaving"]boolValue]);
|
||||
host->_time=kCMTimeZero;
|
||||
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
|
||||
NSString *stampID=[[stamp[@"id"]copy]autorelease];
|
||||
NSMutableDictionary *tracked=DYMutablePlist(DYReadTools(host,kCMTimeZero).document);
|
||||
@@ -151,5 +163,21 @@
|
||||
run.record(@"native-osc-stamp-resizes-coverage-without-rotation-handle-or-track-changes",!rotationHandle&&part==2&&enlarged.width>target.width&&enlarged.height>target.height&&enlarged.centerX==target.centerX&&enlarged.centerY==target.centerY&&[resized[@"keys"]isEqual:keys]);
|
||||
click(251,104);drain(); // top-down viewport y=30...345, forward button is x=212...290.
|
||||
run.record(@"native-osc-stamp-forward-action-starts-the-existing-host-tracker",host->_forwardStarts==1&&host->_backwardStarts==0);
|
||||
[plugin cleanupAnalysis:nil];drain();[(id)osc release];[(id)plugin release];
|
||||
[plugin cleanupAnalysis:nil];drain();
|
||||
NSDictionary *beforeRejected=DYReadTools(base,kCMTimeZero).document;
|
||||
base->_rejectToolsWrites=YES;
|
||||
click(NSMidX(button),400-NSMidY(button));
|
||||
click(180,291.25);
|
||||
part=down(348,244);up(460,181,part);drain();
|
||||
run.record(@"native-osc-stamp-rejected-write-keeps-the-draft-and-existing-document",
|
||||
[beforeRejected isEqual:DYReadTools(base,kCMTimeZero).document]&&
|
||||
[[viewer valueForKey:@"stampArmed"]boolValue]&&[[(id)osc valueForKey:@"stampHasSource"]boolValue]&&
|
||||
[(id)osc valueForKey:@"stampFailure"]!=nil);
|
||||
base->_rejectToolsWrites=NO;
|
||||
part=down(348,244);up(460,181,part);drain();
|
||||
NSArray *afterRetry=DYSharedMasks(DYReadTools(base,kCMTimeZero).document);
|
||||
run.record(@"native-osc-stamp-retries-with-the-same-source-and-saves-once",
|
||||
afterRetry.count==DYSharedMasks(beforeRejected).count+1&&
|
||||
[afterRetry.lastObject[@"stampSource"]isEqual:source]&&![[viewer valueForKey:@"stampArmed"]boolValue]);
|
||||
[(id)osc release];[(id)plugin release];
|
||||
}
|
||||
@@ -6,6 +6,6 @@ static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static disp
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time;
|
||||
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time;
|
||||
- (BOOL)toolCanvasVisible;
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time;
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion;
|
||||
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction;
|
||||
@end
|
||||
@@ -23,32 +23,48 @@
|
||||
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected");
|
||||
@synchronized(self){if(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
|
||||
}
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time {
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion {
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
if(self->_trackingActive.load()||!CMTIME_IS_NUMERIC(time))return;
|
||||
if(self->_trackingActive.load()){completion(@"请先停止跟踪,再绘制图章。");return;}
|
||||
id<FxCustomParameterActionAPI_v4>action=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
|
||||
if(!action)return;
|
||||
if(!action){completion(@"宿主暂时无法保存图章,请重试。");return;}
|
||||
NSDictionary *selection=nil;
|
||||
NSString *failure=nil;
|
||||
[action startAction:self];@try{
|
||||
if(CMTimeCompare(DYHostDisplayedFrameTime(self->_apiManager,action.currentTime),time)!=0)return;
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,time).document);
|
||||
NSMutableDictionary *stamp=(id)DYAddSharedMask(doc,DYMaskEllipse);
|
||||
if(!stamp){NSBeep();return;}
|
||||
DYMaskParameters p=DYMaskAtTime(stamp,kCMTimeInvalid);
|
||||
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
|
||||
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
|
||||
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
|
||||
if(DYWriteTools(self->_apiManager,doc,time))selection=@{@"node":@"shared",@"mask":stamp[@"id"],@"document":doc};
|
||||
else NSBeep();
|
||||
if(grouped)[undo endUndoGroup];
|
||||
// A new stamp is clip-wide. The OSC supplies geometry, while the action
|
||||
// supplies the time for accessing this instance's non-animatable document.
|
||||
CMTime writeTime=DYHostDisplayedFrameTime(self->_apiManager,action.currentTime);
|
||||
id<FxParameterRetrievalAPI_v6>get=[self->_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
DYToolDocument *stored=nil;
|
||||
if(!CMTIME_IS_NUMERIC(writeTime)||![get getCustomParameterValue:&stored fromParameter:DYToolsParameterID atTime:writeTime]||![stored isKindOfClass:DYToolDocument.class]){
|
||||
failure=@"宿主暂时无法读取当前图章,请重试。";
|
||||
}else{
|
||||
NSMutableDictionary *doc=DYMutablePlist(stored.document);
|
||||
NSMutableDictionary *stamp=(id)DYAddSharedMask(doc,DYMaskEllipse);
|
||||
if(!stamp){
|
||||
failure=DYSharedMasks(doc).count>=DYSharedMaskLimit?@"已达到蒙版与图章数量上限。":@"无法在当前效果中创建图章。";
|
||||
}else{
|
||||
DYMaskParameters p=DYMaskAtTime(stamp,kCMTimeInvalid);
|
||||
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
|
||||
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
|
||||
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
|
||||
@try{
|
||||
if(DYWriteTools(self->_apiManager,doc,writeTime))selection=@{@"node":@"shared",@"mask":stamp[@"id"],@"document":doc};
|
||||
else failure=@"宿主未保存图章,请重新拖出覆盖区。";
|
||||
}@finally{if(grouped)[undo endUndoGroup];}
|
||||
}
|
||||
}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_clone_commit accepted=%{public}d osc=%{public}.9f action=%{public}.9f",
|
||||
selection!=nil,CMTimeGetSeconds(time),CMTimeGetSeconds(writeTime));
|
||||
}@finally{[action endAction:self];}
|
||||
if(selection){
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:self->_apiManager userInfo:selection];
|
||||
[self postToolCanvasStatus:@"仿制图章已保存 · 可跟踪目标区域"];
|
||||
}
|
||||
}else [self postToolCanvasStatus:failure];
|
||||
completion(failure);
|
||||
});
|
||||
}
|
||||
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction{
|
||||
|
||||
+28
-14
@@ -5,12 +5,12 @@
|
||||
@implementation DYToolOSC {
|
||||
id<MTLDevice> _device;id<MTLCommandQueue> _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 _stampHasSource,_stampDragging;
|
||||
BOOL _stampHasSource,_stampDragging,_stampSaving,_stampNeedsRedraw;
|
||||
NSPoint _stampSource,_stampStart,_stampEnd;
|
||||
CMTime _stampTime;
|
||||
NSString *_stampFailure;
|
||||
}
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{if((self=[super init])){_apiManager=manager;_viewerControls=[DYViewerControls new];_handles=[NSMutableArray new];_lastRoute=-1;_uiScale=1;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_init");}return self;}
|
||||
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[super dealloc];}
|
||||
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[_stampFailure release];[super dealloc];}
|
||||
- (FxDrawingCoordinates)drawingCoordinates{return kFxDrawingCoordinates_CANVAS;}
|
||||
- (DYPlugIn*)pluginAtTime:(CMTime)time{NSString *value=nil;id<FxParameterRetrievalAPI_v6>get=[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];[get getStringParameterValue:&value fromParameter:DYCanvasSessionParameterID];@synchronized(DYToolCanvasSessions()){return [DYToolCanvasSessions()objectForKey:value];}}
|
||||
- (NSPoint)canvasPoint:(float)x y:(float)y parameters:(DYMaskParameters)p{
|
||||
@@ -23,10 +23,9 @@
|
||||
NSRect v=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));CGFloat scale=MAX(.01,MIN(_uiScale,MIN(v.size.width/300.,v.size.height/100.)));
|
||||
return NSMakeRect(NSMinX(v)+(item==9?8:76)*scale,NSMaxY(v)-61*scale,64*scale,24*scale);
|
||||
}
|
||||
- (void)updateStampAtTime:(CMTime)time{
|
||||
if(!_viewerControls.stampArmed||!CMTIME_IS_NUMERIC(time)||!CMTIME_IS_NUMERIC(_stampTime)||CMTimeCompare(_stampTime,time)!=0){
|
||||
_stampHasSource=_stampDragging=NO;_stampTime=time;
|
||||
}
|
||||
- (void)clearStampCreation{
|
||||
_stampHasSource=_stampDragging=NO;
|
||||
[_stampFailure release];_stampFailure=nil;
|
||||
}
|
||||
- (NSRect)stampControlRect:(NSInteger)index{
|
||||
NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));
|
||||
@@ -53,10 +52,10 @@
|
||||
if(_viewerControls.stampArmed){
|
||||
NSRect cell=NSUnionRect([self stampControlRect:0],[self stampControlRect:3]);
|
||||
DYDrawSoftControl(cell,4,NO,NO,NO);
|
||||
NSString *prompt=_stampHasSource?@"拖出要覆盖的椭圆 · Esc 取消":@"点击画面选择取样中心 · Esc 取消";
|
||||
NSString *prompt=_stampSaving?@"正在保存仿制图章…":_stampFailure?:(_stampHasSource?@"拖出要覆盖的椭圆 · Esc 取消":@"点击画面选择取样中心 · Esc 取消");
|
||||
[prompt drawInRect:NSInsetRect(cell,6,4) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.48)]}];
|
||||
if(_stampHasSource)[self drawStampSource:_stampSource];
|
||||
if(_stampDragging){
|
||||
if(_stampDragging||_stampSaving||_stampFailure){
|
||||
NSRect target=[self stampTarget];
|
||||
NSRect oval=NSMakeRect(NSMinX(_imageRect)+target.origin.x*NSWidth(_imageRect),NSMinY(_imageRect)+target.origin.y*NSHeight(_imageRect),target.size.width*NSWidth(_imageRect),target.size.height*NSHeight(_imageRect));
|
||||
NSBezierPath *outline=[NSBezierPath bezierPathWithOvalInRect:oval];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
|
||||
@@ -79,7 +78,6 @@
|
||||
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];
|
||||
if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){
|
||||
[self updateStampAtTime:time];
|
||||
NSRect region=mask||_viewerControls.stampArmed?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
|
||||
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];
|
||||
@@ -131,9 +129,10 @@
|
||||
- (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 updateStampAtTime:time];
|
||||
if(_stampSaving)return YES;
|
||||
if(!_viewerControls.stampArmed)[self clearStampCreation];
|
||||
if(type==NSEventTypeKeyDown&&key==27&&_viewerControls.stampArmed){
|
||||
_viewerControls.stampArmed=NO;[self updateStampAtTime:time];return YES;
|
||||
_viewerControls.stampArmed=NO;[self clearStampCreation];return YES;
|
||||
}
|
||||
if(type==NSEventTypeLeftMouseDown&&part>=10011&&part<=10013){
|
||||
NSInteger direction=[_mask[@"tracking"]boolValue]?9:part-10012;
|
||||
@@ -142,6 +141,7 @@
|
||||
if(plugin&&_viewerControls.stampArmed&&NSWidth(_imageRect)>0&&NSHeight(_imageRect)>0){
|
||||
NSPoint uv=NSMakePoint(fmax(0,fmin(1,(x-NSMinX(_imageRect))/NSWidth(_imageRect))),fmax(0,fmin(1,(canvasPoint.y-NSMinY(_imageRect))/NSHeight(_imageRect))));
|
||||
if(type==NSEventTypeLeftMouseDown&&part==10014){
|
||||
[_stampFailure release];_stampFailure=nil;
|
||||
if(!_stampHasSource){_stampSource=uv;_stampHasSource=YES;}
|
||||
else {_stampStart=_stampEnd=uv;_stampDragging=YES;}
|
||||
return YES;
|
||||
@@ -151,7 +151,21 @@
|
||||
if(type==NSEventTypeLeftMouseUp){
|
||||
NSRect target=[self stampTarget];_stampDragging=NO;
|
||||
if(NSWidth(target)>=.001&&NSHeight(target)>=.001&&NSWidth(target)*NSWidth(_imageRect)>=3*_uiScale&&NSHeight(target)*NSHeight(_imageRect)>=3*_uiScale){
|
||||
[plugin addCloneStampFrom:_stampSource target:target atTime:time];_viewerControls.stampArmed=NO;[self updateStampAtTime:time];
|
||||
_stampSaving=YES;
|
||||
DYViewerParameterBridge *bridge=_viewerControls.bridge;
|
||||
[plugin addCloneStampFrom:_stampSource target:target atTime:time completion:^(NSString *failure){
|
||||
@synchronized(self){
|
||||
self->_stampSaving=NO;
|
||||
if(self->_viewerControls.bridge!=bridge||!self->_viewerControls.stampArmed){[self clearStampCreation];return;}
|
||||
self->_stampNeedsRedraw=YES;
|
||||
if(failure){
|
||||
[self->_stampFailure release];self->_stampFailure=[failure copy];
|
||||
}else{
|
||||
self->_viewerControls.stampArmed=NO;
|
||||
[self clearStampCreation];
|
||||
}
|
||||
}
|
||||
}];
|
||||
}
|
||||
}
|
||||
return YES;
|
||||
@@ -171,7 +185,7 @@
|
||||
- (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];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?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if([mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||[mask[@"drawing"]boolValue];
|
||||
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];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?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if([mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||[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;}}
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.13.2</string>
|
||||
<string>1.13.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>86</string>
|
||||
<string>87</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.13.2</string>
|
||||
<string>1.13.3</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.13.2</string>
|
||||
<string>1.13.3</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>86</string>
|
||||
<string>87</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户