Add dark defaults, modular effect templates and canvas leveling
这个提交包含在:
1 父节点
ffabdca5b1
当前提交
5ca307414c
25 个文件已更改
+1702
-88
没有与搜索条件相匹配的文件
@@ -190,3 +190,75 @@ if(faceFixture.length){
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-clone.cube"]];
|
||||
run.record(@"clone-stamp-spatial-state-refuses-static-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc error:&failure]&&failure);
|
||||
}
|
||||
|
||||
{
|
||||
// Sample the real final GPU pass using linear X/Y ramps and opaque alpha.
|
||||
const NSUInteger w=64,h=36;
|
||||
DYDiagnosticTile *source=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
|
||||
DYDiagnosticTile *destination=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
|
||||
Pixels grid(w*h*4);
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){
|
||||
NSUInteger i=(y*w+x)*4;grid[i]=(x+.5)/w;grid[i+1]=(y+.5)/h;grid[i+2]=.1;grid[i+3]=1;
|
||||
}
|
||||
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:grid.data() bytesPerRow:w*8];
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];DYUniforms u=DYToolUniforms(@{@"type":@"lens"});
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYInitialToolDocument(nil));
|
||||
const double angle=-M_PI/6,aspect=w/double(h),c=cos(angle),s=sin(angle),zoom=c-s*aspect;
|
||||
doc[@"levelRotation"]=@(angle);
|
||||
NSError *failure=nil;
|
||||
BOOL ok=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:DYToolRenderSnapshot(doc,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&failure];
|
||||
Pixels corrected=read(destination,gpu);
|
||||
double worst=0,alpha=1;
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){
|
||||
NSUInteger i=(y*w+x)*4;
|
||||
double dx=((x+.5)/w-.5)/zoom,dy=((y+.5)/h-.5)/zoom;
|
||||
double sx=std::clamp(.5+c*dx+s*dy/aspect,.5/w,1-.5/w);
|
||||
double sy=std::clamp(.5+c*dy-s*dx*aspect,.5/h,1-.5/h);
|
||||
worst=std::max({worst,fabs(corrected[i]-sx),fabs(corrected[i+1]-sy)});
|
||||
alpha=MIN(alpha,corrected[i+3]);
|
||||
}
|
||||
run.record(@"level-metal-inverse-rotation-and-full-corner-coverage",ok&&worst<.002&&alpha==1,@{@"error":reason(failure),@"maximumError":@(worst),@"minimumAlpha":@(alpha)});
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-level.cube"]];
|
||||
run.record(@"level-spatial-transform-is-refused-by-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc error:&failure]&&failure);
|
||||
}
|
||||
|
||||
{
|
||||
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);
|
||||
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];
|
||||
auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.07;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};drain();
|
||||
id<FxOnScreenControl_v4> osc=(id)[[NSClassFromString(@"DYToolOSC")alloc]initWithAPIManager:host];
|
||||
DYDiagnosticTile *overlay=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:640 height:400]autorelease];
|
||||
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
|
||||
id viewer=[(id)osc valueForKey:@"viewerControls"];
|
||||
BOOL update=NO;
|
||||
auto down=[&](double x,double y){
|
||||
NSInteger part=0;
|
||||
[osc hitTestOSCAtMousePositionX:x mousePositionY:y activePart:&part atTime:kCMTimeZero];
|
||||
[osc mouseDownAtPositionX:x positionY:y activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];return part;
|
||||
};
|
||||
auto up=[&](double x,double y,NSInteger part){[osc mouseUpAtPositionX:x positionY:y activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];};
|
||||
auto click=[&](double x,double y){NSInteger part=down(x,y);up(x,y,part);};
|
||||
auto control=[&](NSInteger part){
|
||||
for(NSDictionary *a in [viewer valueForKey:@"areas"])if([a[@"part"]integerValue]==part){
|
||||
NSRect r=[a[@"rect"]rectValue];click(NSMidX(r),400-NSMidY(r));break;
|
||||
}
|
||||
};
|
||||
auto angle=[&](){return [DYReadTools(host,kCMTimeZero).document[@"levelRotation"] doubleValue];};
|
||||
int undo=base->_undoStarts;
|
||||
control(20026);
|
||||
click(150,280);click(390,200);drain();
|
||||
run.record(@"level-osc-two-points-horizontal-one-undo",fabs(angle()+atan2(80.,240.))<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
control(20033);drain();
|
||||
control(20032);
|
||||
NSInteger part=down(200,270);up(230,150,part);drain();
|
||||
run.record(@"level-osc-reset-and-vertical-drag-each-create-one-undo",fabs(angle()-(M_PI_2-atan2(120.,30.)))<1e-6&&base->_undoStarts==undo+3&&base->_undoEnds==undo+3);
|
||||
double previous=angle();
|
||||
click(180,200);
|
||||
BOOL handled=NO;
|
||||
[osc keyDownAtPositionX:250 positionY:225 keyPressed:27 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];drain();
|
||||
run.record(@"level-osc-escape-discards-uncommitted-point",handled&&angle()==previous&&base->_undoStarts==undo+3);
|
||||
[osc release];[plugin release];drain();
|
||||
}
|
||||
@@ -1135,8 +1135,11 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
@try {
|
||||
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
NSError *failure=nil;if(!DYResetToolParameters(_manager,DYDescriptors(),t,&failure)){dispatch_async(dispatch_get_main_queue(),^{[self showError:failure.localizedDescription?:@"未能完整还原参数。"];});return;}
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,[[[DYToolDocument alloc]init]autorelease].document,t);
|
||||
[set setCustomParameterValue:[[[DYInspectorToken alloc]init]autorelease] toParameter:DYInspectorParameterID atTime:t];
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);NSString *starter=DYReadTools(_manager,t).document[@"starterTool"];
|
||||
DYWriteTools(_manager,DYInitialToolDocument(starter),t);
|
||||
DYInspectorToken *token=[[[DYInspectorToken alloc]init]autorelease];
|
||||
if(starter)token.folds=@{starter:@NO};
|
||||
[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:t];
|
||||
for(NSMutableDictionary *card in _cards)card[@"collapsed"]=@YES;
|
||||
} @finally {if(grouped)[undo endUndoGroup];[action endAction:self];}
|
||||
[self postChanged];
|
||||
@@ -1303,7 +1306,9 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
for(NSDictionary *d in DYDescriptors()){id value=values[d[@"key"]];if(!value&&[d[@"offset"]integerValue]>=1104)value=d[@"default"];if(value)[set setFloatValue:[value doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];}
|
||||
if([json[@"version"]isEqual:@1]&&!values[@"cmConfigured"]){[set setFloatValue:-1 toParameter:2236 atTime:t];[set setFloatValue:1 toParameter:2270 atTime:t];}
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.colorManagement=newCMS.count?newCMS:nil;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,tools,t);
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.colorManagement=newCMS.count?newCMS:nil;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);
|
||||
restoredTools[@"starterTool"]=DYReadTools(_manager,t).document[@"starterTool"];
|
||||
DYWriteTools(_manager,restoredTools,t);
|
||||
} @finally {[action endAction:self];}
|
||||
[self postChanged];
|
||||
if(missing.count)[self showError:[@"调色参数已恢复,以下 LUT 文件需要重新选择:\n" stringByAppendingString:[missing componentsJoinedByString:@"\n"]]];
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
#pragma once
|
||||
#include <CoreGraphics/CoreGraphics.h>
|
||||
#include <cmath>
|
||||
#include <algorithm>
|
||||
|
||||
inline double DYLevelDelta(CGPoint first, CGPoint second, double aspect, bool vertical) {
|
||||
const double angle = std::atan2(second.y - first.y, (second.x - first.x) * aspect);
|
||||
return std::remainder((vertical ? M_PI_2 : 0.) - angle, M_PI);
|
||||
}
|
||||
|
||||
// Coordinates are normalized to a top-down image. Rotation is measured in
|
||||
// display pixels so the same line aligns in landscape, portrait and anamorphic footage.
|
||||
struct DYLevelTransform {
|
||||
double aspect, cosine, sine, zoom;
|
||||
|
||||
DYLevelTransform(double angle, double displayAspect)
|
||||
: aspect(displayAspect), cosine(std::cos(angle)), sine(std::sin(angle)),
|
||||
zoom(std::max(1., std::abs(cosine) + std::abs(sine) * std::max(aspect, 1. / aspect))) {}
|
||||
|
||||
CGPoint toSource(CGPoint output) const {
|
||||
const double x = (output.x - .5) * aspect / zoom, y = (output.y - .5) / zoom;
|
||||
return CGPointMake(.5 + (cosine * x + sine * y) / aspect, .5 + cosine * y - sine * x);
|
||||
}
|
||||
|
||||
CGPoint toOutput(CGPoint source) const {
|
||||
const double x = (source.x - .5) * aspect * zoom, y = (source.y - .5) * zoom;
|
||||
return CGPointMake(.5 + (cosine * x - sine * y) / aspect, .5 + cosine * y + sine * x);
|
||||
}
|
||||
};
|
||||
@@ -66,13 +66,38 @@
|
||||
[tile setBounds:bounds origin:source.imageOrigin];[tile setPixelAspect:source.pixelAspect];[tile inheritColorSpace:source.colorSpace];
|
||||
return tile;
|
||||
}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {
|
||||
double angle=[tools[@"levelRotation"] doubleValue];
|
||||
if(!angle)return [self renderColorSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error];
|
||||
@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(!DYValidToolDocument(tools))return fail(error,@"水平校正数据无效");
|
||||
NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];
|
||||
if(!entry)return NO;
|
||||
id<MTLDevice>device=entry[@"device"];
|
||||
FxRect bounds=src.imagePixelBounds;
|
||||
NSInteger width=bounds.right-bounds.left,height=bounds.top-bounds.bottom;
|
||||
if(width<=0||height<=0)return fail(error,@"画面尺寸无效");
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:width height:height mipmapped:NO];
|
||||
desc.storageMode=MTLStorageModePrivate;
|
||||
desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
id<MTLTexture>texture=[device newTextureWithDescriptor:desc];
|
||||
if(!texture)return fail(error,@"无法分配水平校正缓冲区");
|
||||
DYExportTile *frame=[[[DYExportTile alloc]initWithTexture:texture registry:device.registryID]autorelease];
|
||||
[texture release];
|
||||
[frame setBounds:bounds origin:dst.imageOrigin];
|
||||
[frame setPixelAspect:src.pixelAspect];
|
||||
[frame inheritColorSpace:dst.colorSpace];
|
||||
if(![self renderColorSource:src destination:frame uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error])return NO;
|
||||
return [self copyTile:frame to:dst rotation:angle entry:entry error:error];
|
||||
});}
|
||||
}
|
||||
- (BOOL)renderColorSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(state&&![state isKindOfClass:NSDictionary.class])return fail(error,@"色彩管理状态无效。");
|
||||
NSDictionary*context=DYHostColorContext(src,dst,primaries);@synchronized(_previewLock){[_colorContext release];_colorContext=[context copy];}
|
||||
if(tools[@"sharedMasks"]){
|
||||
if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
FxImageTile *stamped=[self sourceByApplyingStamps:DYSharedMasks(tools) source:src registry:dst.deviceRegistryID error:error];if(!stamped)return NO;
|
||||
return [self renderSource:stamped destination:dst uniforms:u paths:paths spider:spider tools:DYResolvedToolDocument(tools) colorManagement:state hostPrimaries:primaries error:error];
|
||||
return [self renderColorSource:stamped destination:dst uniforms:u paths:paths spider:spider tools:DYResolvedToolDocument(tools) colorManagement:state hostPrimaries:primaries error:error];
|
||||
}
|
||||
if(!state.count)return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
|
||||
if(!DYManagedColorValid(state,error))return NO;if(!tools)tools=@{@"schema":@2,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
|
||||
+7
-1
@@ -8,6 +8,7 @@
|
||||
#import "DYAutoGrade.h"
|
||||
#import "DYToolState.h"
|
||||
#include "DYFilmTime.h"
|
||||
#include "DYLevelGeometry.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#import <os/log.h>
|
||||
@@ -41,7 +42,12 @@
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
|
||||
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
|
||||
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_toolSourceTime=t;}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){
|
||||
FxRect image=src[0].imagePixelBounds;
|
||||
double aspect=src[0].pixelAspect,height=image.top-image.bottom,width=image.right-image.left;
|
||||
_toolSourceAspect=width>0&&height>0&&std::isfinite(aspect)&&aspect>0?width*aspect/height:0;
|
||||
if(_toolCaptureEnabled&&!_trackingActive.load()){_toolSourceFrame={};_toolSourceTime=t;}
|
||||
}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
|
||||
}
|
||||
- (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});}
|
||||
- (void)exportRequested:(NSNotification*)n{
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <cmath>
|
||||
#include "DYScopeMath.hpp"
|
||||
#import "DYScopeSample.h"
|
||||
#include "DYLevelGeometry.h"
|
||||
static BOOL fail(NSError**e,NSString*m){if(e)*e=[NSError errorWithDomain:@"com.dayu.color" code:1 userInfo:@{NSLocalizedDescriptionKey:m?:@"Metal 调色失败"}];return NO;}
|
||||
// MRC NSError out-parameters must outlive every nested render pool. Preserve
|
||||
// the same pointer across nested closures, then autorelease in the caller pool.
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
|
||||
- (instancetype)init {
|
||||
if((self=[super init])) {
|
||||
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@7}];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@8}];
|
||||
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
|
||||
}
|
||||
return self;
|
||||
|
||||
@@ -6,6 +6,8 @@ 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;
|
||||
- (DYLevelTransform)toolCanvasLevelForAspect:(double)fallback rotation:(double *)rotation;
|
||||
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion;
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion;
|
||||
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction;
|
||||
@end
|
||||
@@ -104,6 +104,44 @@
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:self->_apiManager userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@(direction)}];
|
||||
});
|
||||
}
|
||||
- (DYLevelTransform)toolCanvasLevelForAspect:(double)fallback rotation:(double *)rotation {
|
||||
@synchronized(self){
|
||||
double angle=[_toolCanvasDocument[@"levelRotation"] doubleValue];
|
||||
if(rotation)*rotation=angle;
|
||||
return DYLevelTransform(angle,_toolSourceAspect>0?_toolSourceAspect:fallback);
|
||||
}
|
||||
}
|
||||
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion {
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
NSString *failure=nil;
|
||||
id<FxCustomParameterActionAPI_v4> action=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
|
||||
if(!action){completion(@"宿主暂时无法保存水平校正。");return;}
|
||||
[action startAction:self];
|
||||
@try {
|
||||
// The correction is clip-wide. Use the action clock for the document write.
|
||||
CMTime time=DYHostDisplayedFrameTime(self->_apiManager,action.currentTime);
|
||||
DYToolDocument *stored=nil;
|
||||
id<FxParameterRetrievalAPI_v6> get=[self->_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
if(!CMTIME_IS_NUMERIC(time)||![get getCustomParameterValue:&stored fromParameter:DYToolsParameterID atTime:time]||
|
||||
![stored isKindOfClass:DYToolDocument.class]||[stored.document[@"levelRotation"] doubleValue]!=previous){
|
||||
failure=@"水平校正状态已变化,请重新画线。";
|
||||
}else if(rotation!=previous){
|
||||
NSMutableDictionary *doc=DYMutablePlist(stored.document);
|
||||
doc[@"levelRotation"]=rotation?@(rotation):nil;
|
||||
id<FxUndoAPI> undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
BOOL grouped=[undo startUndoGroup:rotation?@"水平校正":@"重置水平校正"];
|
||||
@try {
|
||||
if(DYWriteTools(self->_apiManager,doc,time)){
|
||||
DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;
|
||||
[self adoptToolCanvasDocument:saved.document];
|
||||
}else failure=@"宿主未保存水平校正,请重试。";
|
||||
}@finally{if(grouped)[undo endUndoGroup];}
|
||||
}
|
||||
}@finally{[action endAction:self];}
|
||||
if(!failure)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
completion(failure);
|
||||
});
|
||||
}
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
|
||||
|
||||
+124
-15
@@ -7,14 +7,103 @@
|
||||
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,_stampSaving,_stampNeedsRedraw;
|
||||
NSPoint _stampSource,_stampStart,_stampEnd;
|
||||
NSString *_stampFailure;
|
||||
NSString *_stampFailure,*_levelFailure;
|
||||
DYLevelTransform _level{0,1};
|
||||
double _levelAngle;
|
||||
NSInteger _levelMode;
|
||||
CMTime _levelTime;
|
||||
BOOL _levelHasFirst,_levelDown,_levelSecondPress,_levelSaving;
|
||||
NSPoint _levelFirst,_levelLast;
|
||||
}
|
||||
- (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];[_stampFailure release];[super dealloc];}
|
||||
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[_stampFailure release];[_levelFailure 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];}}
|
||||
- (void)clearLevelLine {
|
||||
_levelHasFirst=_levelDown=_levelSecondPress=NO;
|
||||
[_levelFailure release];_levelFailure=nil;
|
||||
}
|
||||
- (void)updateLevelFrom:(DYPlugIn *)plugin time:(CMTime)time {
|
||||
double angle=0;
|
||||
double fallback=NSWidth(_imageRect)>0&&NSHeight(_imageRect)>0?NSWidth(_imageRect)/NSHeight(_imageRect):1;
|
||||
_level=plugin?[plugin toolCanvasLevelForAspect:fallback rotation:&angle]:DYLevelTransform(0,fallback);
|
||||
if(_levelMode!=_viewerControls.levelMode||_levelAngle!=angle||
|
||||
(_levelHasFirst&&CMTIME_IS_NUMERIC(time)&&CMTimeCompare(time,_levelTime)!=0))[self clearLevelLine];
|
||||
_levelMode=_viewerControls.levelMode;_levelAngle=angle;
|
||||
}
|
||||
- (NSPoint)displayUV:(NSPoint)point {
|
||||
return NSMakePoint((point.x-NSMinX(_imageRect))/NSWidth(_imageRect),(point.y-NSMinY(_imageRect))/NSHeight(_imageRect));
|
||||
}
|
||||
- (NSPoint)clampedDisplayUV:(NSPoint)point {
|
||||
NSPoint uv=[self displayUV:point];
|
||||
return NSMakePoint(std::clamp(uv.x,0.,1.),std::clamp(uv.y,0.,1.));
|
||||
}
|
||||
- (NSPoint)canvasDisplayPoint:(NSPoint)uv {
|
||||
return NSMakePoint(NSMinX(_imageRect)+uv.x*NSWidth(_imageRect),NSMinY(_imageRect)+uv.y*NSHeight(_imageRect));
|
||||
}
|
||||
- (void)commitLevel:(double)angle plugin:(DYPlugIn *)plugin {
|
||||
if(_levelSaving)return;
|
||||
_levelSaving=YES;
|
||||
DYViewerParameterBridge *bridge=_viewerControls.bridge;
|
||||
[plugin saveCanvasLevel:angle replacing:_levelAngle completion:^(NSString *failure){
|
||||
@synchronized(self){
|
||||
self->_levelSaving=NO;
|
||||
if(self->_viewerControls.bridge!=bridge||!self->_viewerControls.levelMode)return;
|
||||
[self clearLevelLine];
|
||||
self->_levelFailure=[failure copy];
|
||||
}
|
||||
}];
|
||||
}
|
||||
- (BOOL)handleLevelEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part key:(unichar)key time:(CMTime)time plugin:(DYPlugIn *)plugin {
|
||||
if(!_levelMode||!plugin)return NO;
|
||||
if(type==NSEventTypeKeyDown&&key==27){
|
||||
_viewerControls.levelMode=0;[self clearLevelLine];return YES;
|
||||
}
|
||||
if(type==NSEventTypeLeftMouseDown&&part==10015){
|
||||
if(_levelSaving)return YES;
|
||||
[_levelFailure release];_levelFailure=nil;
|
||||
_levelDown=YES;_levelSecondPress=_levelHasFirst;
|
||||
_levelLast=[self clampedDisplayUV:point];
|
||||
if(!_levelHasFirst){_levelFirst=_levelLast;_levelTime=time;_levelHasFirst=YES;}
|
||||
return YES;
|
||||
}
|
||||
if(!_levelDown||(type!=NSEventTypeLeftMouseDragged&&type!=NSEventTypeLeftMouseUp))return NO;
|
||||
_levelLast=[self clampedDisplayUV:point];
|
||||
if(type==NSEventTypeLeftMouseUp){
|
||||
_levelDown=NO;
|
||||
double distance=hypot((_levelLast.x-_levelFirst.x)*NSWidth(_imageRect),(_levelLast.y-_levelFirst.y)*NSHeight(_imageRect));
|
||||
if(distance>=5*_uiScale){
|
||||
double delta=DYLevelDelta(_levelFirst,_levelLast,_level.aspect,_levelMode==2);
|
||||
double corrected=std::remainder(_levelAngle+delta,2*M_PI);
|
||||
[self commitLevel:fabs(corrected)<1e-7?0:corrected plugin:plugin];
|
||||
}else if(_levelSecondPress){
|
||||
_levelFailure=[@"两点太近,请重新选择第二点。" copy];
|
||||
}
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
- (void)drawLevelControls {
|
||||
if(!_levelMode)return;
|
||||
NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));
|
||||
CGFloat scale=MIN(_uiScale,NSWidth(viewport)/325.);
|
||||
NSRect prompt=NSMakeRect(NSMinX(viewport)+8*scale,NSMinY(viewport)+8*scale,290*scale,26*scale);
|
||||
DYDrawSoftControl(prompt,4*scale,NO,NO,NO);
|
||||
NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelHasFirst?@"选择参考线终点 · Esc 退出":@"点击两点或拖出参考线 · Esc 退出");
|
||||
[title drawInRect:NSInsetRect(prompt,6*scale,5*scale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:12*scale]}];
|
||||
if(!_levelHasFirst)return;
|
||||
NSPoint first=[self canvasDisplayPoint:_levelFirst],last=[self canvasDisplayPoint:_levelLast];
|
||||
[NSGraphicsContext saveGraphicsState];NSRectClip(viewport);
|
||||
NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:first];[line lineToPoint:last];
|
||||
for(NSValue *value in @[[NSValue valueWithPoint:first],[NSValue valueWithPoint:last]]){
|
||||
NSPoint point=value.pointValue;CGFloat r=3*_uiScale;
|
||||
[line appendBezierPathWithOvalInRect:NSMakeRect(point.x-r,point.y-r,2*r,2*r)];
|
||||
}
|
||||
[NSColor.blackColor setStroke];line.lineWidth=3.5*_uiScale;[line stroke];
|
||||
[NSColor.systemCyanColor setStroke];line.lineWidth=1.5*_uiScale;[line stroke];
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
- (NSPoint)canvasPoint:(float)x y:(float)y parameters:(DYMaskParameters)p{
|
||||
float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return NSMakePoint(_imageRect.origin.x+u*_imageRect.size.width,_imageRect.origin.y+v*_imageRect.size.height);
|
||||
float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return [self canvasStampSource:NSMakePoint(u,v)];
|
||||
}
|
||||
- (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];}
|
||||
- (NSRect)toolbarRectForItem:(NSInteger)item{
|
||||
@@ -36,7 +125,7 @@
|
||||
return NSMakeRect(MIN(_stampStart.x,_stampEnd.x),MIN(_stampStart.y,_stampEnd.y),fabs(_stampStart.x-_stampEnd.x),fabs(_stampStart.y-_stampEnd.y));
|
||||
}
|
||||
- (NSPoint)canvasStampSource:(NSPoint)source{
|
||||
return NSMakePoint(NSMinX(_imageRect)+source.x*NSWidth(_imageRect),NSMinY(_imageRect)+source.y*NSHeight(_imageRect));
|
||||
return [self canvasDisplayPoint:_level.toOutput(source)];
|
||||
}
|
||||
- (void)drawStampSource:(NSPoint)source{
|
||||
NSPoint p=[self canvasStampSource:source];
|
||||
@@ -57,8 +146,14 @@
|
||||
if(_stampHasSource)[self drawStampSource:_stampSource];
|
||||
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];
|
||||
NSBezierPath *outline=[NSBezierPath bezierPath];
|
||||
for(int i=0;i<64;i++){
|
||||
double angle=i*(2*M_PI/64);
|
||||
NSPoint uv=NSMakePoint(NSMidX(target)+cos(angle)*NSWidth(target)/2,NSMidY(target)+sin(angle)*NSHeight(target)/2);
|
||||
NSPoint p=[self canvasStampSource:uv];
|
||||
if(i==0)[outline moveToPoint:p];else [outline lineToPoint:p];
|
||||
}
|
||||
[outline closePath];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
|
||||
}
|
||||
}else if(source.count==4){
|
||||
[self drawStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
|
||||
@@ -77,8 +172,10 @@
|
||||
id<FxOnScreenControlAPI_v4>api=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.;
|
||||
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];
|
||||
[self updateLevelFrom:plugin time:time];
|
||||
if(_levelMode)mask=nil;
|
||||
if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){
|
||||
NSRect region=mask||_viewerControls.stampArmed?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
|
||||
NSRect region=mask||_viewerControls.stampArmed||_levelMode?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];
|
||||
if(!bitmap){[commands commit];[commands waitUntilCompleted];return;}
|
||||
@@ -89,7 +186,7 @@
|
||||
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:NSGraphicsContext.currentContext.CGContext flipped:YES]];
|
||||
if(mask){BOOL blankShape=[mask[@"drawShape"]boolValue]&&![mask[@"shapeStarted"]boolValue];DYMaskParameters p;[mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/_imageRect.size.height;_outline=[[NSBezierPath bezierPath]retain];
|
||||
if(p.kind==DYMaskBezier){NSData *data=mask[@"nodes"];auto *nodes=(const DYBezierNode*)data.bytes;NSUInteger count=data.length/sizeof(DYBezierNode);for(NSUInteger i=0;i<count;i++){NSPoint anchor=[self canvasPoint:nodes[i].x y:nodes[i].y parameters:p];if(i==0)[_outline moveToPoint:anchor];else{auto a=nodes[i-1],b=nodes[i];[_outline curveToPoint:anchor controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];}[self addHandle:anchor part:1000+i*3];for(int j=0;j<2;j++){NSPoint handle=[self canvasPoint:j?nodes[i].outX:nodes[i].inX y:j?nodes[i].outY:nodes[i].inY parameters:p];if(hypot(handle.x-anchor.x,handle.y-anchor.y)>3){NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:anchor];[line lineToPoint:handle];[[NSColor colorWithWhite:1 alpha:.55]setStroke];[line stroke];[self addHandle:handle part:1000+i*3+j+1];}}}
|
||||
NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=NSMakePoint(_imageRect.origin.x+[hover[0]doubleValue]*_imageRect.size.width,_imageRect.origin.y+[hover[1]doubleValue]*_imageRect.size.height);[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];}
|
||||
NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=[self canvasStampSource:NSMakePoint([hover[0]doubleValue],[hover[1]doubleValue])];[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];}
|
||||
if(count>=3&&![mask[@"drawing"]boolValue]){auto a=nodes[count-1],b=nodes[0];[_outline curveToPoint:[self canvasPoint:b.x y:b.y parameters:p] controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];[_outline closePath];}
|
||||
}else if(p.kind<2&&!blankShape){int count=p.kind==DYMaskEllipse?96:4;for(int i=0;i<count;i++){float angle=i*(2.f*M_PI/count),x=p.kind==DYMaskEllipse?.5f*cosf(angle):((float[]){-.5,.5,.5,-.5})[i],y=p.kind==DYMaskEllipse?.5f*sinf(angle):((float[]){-.5,-.5,.5,.5})[i];NSPoint point=[self canvasPoint:x y:y parameters:p];if(i==0)[_outline moveToPoint:point];else[_outline lineToPoint:point];}[_outline closePath];}
|
||||
else if(p.kind==DYMaskLinearGradient){[_outline moveToPoint:[self canvasPoint:0 y:-2 parameters:p]];[_outline lineToPoint:[self canvasPoint:0 y:2 parameters:p]];}
|
||||
@@ -102,14 +199,15 @@
|
||||
NSMutableParagraphStyle *style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter;
|
||||
for(NSInteger item=9;item<=10;item++){NSString *title=item==9?@"✓ 完成":@"取消";NSRect cell=[self toolbarRectForItem:item];CGFloat size=cell.size.height*.48;[title drawInRect:NSInsetRect(cell,0,MAX(0.,(cell.size.height-size-3)/2))withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size weight:NSFontWeightMedium],NSForegroundColorAttributeName:NSColor.whiteColor,NSShadowAttributeName:shadow,NSParagraphStyleAttributeName:style}];}
|
||||
}
|
||||
}[self drawStampControls];[_viewerControls draw];
|
||||
}if(_levelMode)[self drawLevelControls];else [self drawStampControls];[_viewerControls draw];
|
||||
[NSGraphicsContext restoreGraphicsState];CIImage *overlay=[CIImage imageWithCGImage:bitmap.CGImage options:@{kCIImageColorSpace:NSNull.null}];overlay=[overlay imageByApplyingTransform:CGAffineTransformMakeTranslation(NSMinX(region),texture.height-NSMaxY(region))];[_context render:overlay toMTLTexture:texture commandBuffer:commands bounds:CGRectMake(0,0,texture.width,texture.height) colorSpace:nil];
|
||||
}[commands commit];[commands waitUntilCompleted];
|
||||
}}}
|
||||
- (NSInteger)partAtPoint:(NSPoint)point {
|
||||
BOOL drawing=[_mask[@"drawing"]boolValue];
|
||||
if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
|
||||
if(drawing&&!_levelMode)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
|
||||
NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit;
|
||||
if(_levelMode)return NSPointInRect(point,_imageRect)?10015:0;
|
||||
if(_viewerControls.stampArmed)return NSPointInRect(point,_imageRect)?10014:0;
|
||||
NSArray *source=_mask[@"stampSource"];
|
||||
if(source.count==4){
|
||||
@@ -125,11 +223,13 @@
|
||||
for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];}
|
||||
if(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{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];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);}}
|
||||
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin time: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 {@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 updateLevelFrom:plugin time:time];
|
||||
if(_stampSaving)return YES;
|
||||
if([self handleLevelEvent:type point:canvasPoint part:part key:key time:time plugin:plugin])return YES;
|
||||
if(!_viewerControls.stampArmed)[self clearStampCreation];
|
||||
if(type==NSEventTypeKeyDown&&key==27&&_viewerControls.stampArmed){
|
||||
_viewerControls.stampArmed=NO;[self clearStampCreation];return YES;
|
||||
@@ -139,7 +239,8 @@
|
||||
[plugin trackCloneStamp:_mask[@"id"] direction:direction];return YES;
|
||||
}
|
||||
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))));
|
||||
NSPoint uv=_level.toSource([self clampedDisplayUV:canvasPoint]);
|
||||
uv=NSMakePoint(std::clamp(uv.x,0.,1.),std::clamp(uv.y,0.,1.));
|
||||
if(type==NSEventTypeLeftMouseDown&&part==10014){
|
||||
[_stampFailure release];_stampFailure=nil;
|
||||
if(!_stampHasSource){_stampSource=uv;_stampHasSource=YES;}
|
||||
@@ -174,9 +275,14 @@
|
||||
BOOL ownedMask=_maskCapturing&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp);
|
||||
if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];
|
||||
BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010);
|
||||
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;
|
||||
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time]){
|
||||
[self updateLevelFrom:plugin time:time];
|
||||
if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevel:0 plugin:plugin];}
|
||||
return YES;
|
||||
}
|
||||
if(_levelMode)return NO;
|
||||
if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0){_maskCapturing=NO;return NO;}
|
||||
NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);
|
||||
NSPoint point=_level.toSource([self displayUV:canvasPoint]);
|
||||
if(type==NSEventTypeLeftMouseDown){_maskCapturing=part>0&&part<10000;_maskCaptureOwner=_maskCapturing?plugin:nil;}
|
||||
[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];if(type==NSEventTypeLeftMouseUp||(type==NSEventTypeKeyDown&&key==27)){_maskCapturing=NO;_maskCaptureOwner=nil;}return YES;
|
||||
}}
|
||||
@@ -185,7 +291,10 @@
|
||||
- (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]||_stampNeedsRedraw;_stampNeedsRedraw=NO;
|
||||
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin time: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||part==10015)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){
|
||||
_levelLast=[self clampedDisplayUV:point];redraw=YES;
|
||||
}else if(!_levelMode&&[mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];
|
||||
if(update)*update=redraw||(!_levelMode&&[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;}}
|
||||
|
||||
@@ -13,12 +13,27 @@
|
||||
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"dyToolBlend"]];[encoder setTexture:before atIndex:0];[encoder setTexture:after atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBuffer:masks offset:0 atIndex:0];[encoder setBytes:&h length:sizeof(h) atIndex:1];[encoder dispatchThreads:MTLSizeMake(output.width,output.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
}
|
||||
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest entry:(NSMutableDictionary*)e error:(NSError**)error {
|
||||
return [self copyTile:source to:dest rotation:0 entry:e error:error];
|
||||
}
|
||||
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest rotation:(double)angle entry:(NSMutableDictionary*)e error:(NSError**)error {
|
||||
id<MTLDevice>device=e[@"device"];id<MTLTexture>a=[source metalTextureForDevice:device],b=[dest metalTextureForDevice:device];
|
||||
NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",_managedFinishing,(unsigned long)b.pixelFormat];id<MTLRenderPipelineState>pipeline=pipelines[key];
|
||||
if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:_managedFinishing?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
|
||||
if(!a||!b)return fail(error,@"宿主图像纹理不可用");
|
||||
BOOL useFloat=_managedFinishing||angle!=0;
|
||||
NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",useFloat,(unsigned long)b.pixelFormat];id<MTLRenderPipelineState>pipeline=pipelines[key];
|
||||
if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:useFloat?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
|
||||
FxRect s=source.tilePixelBounds,t=dest.tilePixelBounds;float width=s.right-s.left,height=s.top-s.bottom,l=(t.left-s.left)/width,r=(t.right-s.left)/width,top=(s.top-t.top)/height,bottom=(s.top-t.bottom)/height;
|
||||
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){top=1-top;bottom=1-bottom;}
|
||||
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(auto &vertex:v)vertex.position.y=-vertex.position.y;
|
||||
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};
|
||||
double pixelAspect=source.pixelAspect;
|
||||
if(!std::isfinite(pixelAspect)||pixelAspect<=0)pixelAspect=1;
|
||||
DYLevelTransform level(angle,width*pixelAspect/height);
|
||||
for(auto &vertex:v){
|
||||
if(angle){
|
||||
CGPoint uv=level.toSource(CGPointMake(vertex.textureCoordinate.x,vertex.textureCoordinate.y));
|
||||
vertex.textureCoordinate={(float)uv.x,(float)uv.y};
|
||||
}
|
||||
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.textureCoordinate.y=1-vertex.textureCoordinate.y;
|
||||
if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.position.y=-vertex.position.y;
|
||||
}
|
||||
vector_uint2 size={(unsigned)b.width,(unsigned)b.height};id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];MTLRenderPassDescriptor *pass=[MTLRenderPassDescriptor renderPassDescriptor];pass.colorAttachments[0].texture=b;pass.colorAttachments[0].loadAction=MTLLoadActionDontCare;pass.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>encoder=[cb renderCommandEncoderWithDescriptor:pass];[encoder setRenderPipelineState:pipeline];[encoder setVertexBytes:v length:sizeof(v) atIndex:0];[encoder setVertexBytes:&size length:sizeof(size) atIndex:1];[encoder setFragmentTexture:a atIndex:0];[encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[encoder endEncoding];[cb commit];[cb waitUntilCompleted];return cb.status==MTLCommandBufferStatusCompleted?YES:fail(error,cb.error.localizedDescription);
|
||||
}
|
||||
// Extra skin keeps the source reference used by the prior release. All other
|
||||
@@ -101,6 +116,7 @@
|
||||
});}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
|
||||
if(tools&&!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
|
||||
if([tools[@"levelRotation"]doubleValue]!=0)return fail(error,@"水平校正属于空间处理,请保存完整预设。");
|
||||
for(NSDictionary *mask in DYSharedMasks(tools))if(mask[@"stampSource"]&&[mask[@"enabled"]boolValue])return fail(error,@"仿制图章属于空间处理,请保存完整预设。");
|
||||
if((u.lensSectionEnabled>.5&&(u.lensStrength!=0||u.lensScale!=1))||(u.skinProtection.x>.5&&u.skinVisualize>.5))return fail(error,@"镜头修复与肤色区域显示无法保存到 Cube,请保存完整预设。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"lens"]&&!DYToolIsNeutral(node))return fail(error,@"镜头畸变属于空间处理,请保存完整预设。");}
|
||||
DYUniforms effective=u;if(![paths[@"input"]length]&&effective.inputProfile==0)effective.preLUTStrength=0;if(![paths[@"look0"]length])effective.postLUTStrength=0;for(int i=0;i<4;i++)if(![paths[[NSString stringWithFormat:@"look%d",i+1]]length])effective.extraPostLUTStrengths[i]=0;bypassNeutralTools(&effective);bypassIdleSkin(&effective);if(effective.skinFaceOnly>.5&&effective.skinProtection.x>.5&&effective.skinProtection.y>0)return fail(error,@"人脸限定肤色保护属于空间选区,Cube 无法保存。请保存完整预设,或关闭人脸限定后导出。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"skin"]&&layer.skinProtection.x>.5&&layer.skinProtection.y>0&&(layer.skinFaceOnly>.5||layer.skinVisualize>.5))return fail(error,@"新增肤色层含人脸空间选区,请保存完整预设。");}
|
||||
|
||||
@@ -26,6 +26,7 @@ NSDictionary *DYNewMask(NSInteger kind);
|
||||
BOOL DYValidToolDocument(NSDictionary *document);
|
||||
BOOL DYValidToolMask(NSDictionary *mask);
|
||||
NSMutableDictionary *DYMutablePlist(NSDictionary *value);
|
||||
NSDictionary *DYInitialToolDocument(NSString *starter);
|
||||
DYToolDocument *DYReadTools(id<PROAPIAccessing> manager,CMTime time);
|
||||
BOOL DYWriteTools(id<PROAPIAccessing> manager,NSDictionary *document,CMTime time);
|
||||
NSArray *DYMasksForTool(NSDictionary *document,NSString *nodeID);
|
||||
|
||||
+14
-2
@@ -61,7 +61,16 @@ NSMutableDictionary *DYMutablePlist(NSDictionary *value){
|
||||
if(!value)return [NSMutableDictionary dictionary];
|
||||
return [(NSMutableDictionary*)CFPropertyListCreateDeepCopy(kCFAllocatorDefault,(CFPropertyListRef)value,kCFPropertyListMutableContainersAndLeaves) autorelease];
|
||||
}
|
||||
static NSDictionary *DYEmptyTools(){return @{@"schema":@1,@"layers":@[],@"baseMasks":@{}};}
|
||||
NSDictionary *DYInitialToolDocument(NSString *starter) {
|
||||
NSMutableDictionary *doc=[NSMutableDictionary dictionaryWithDictionary:@{@"schema":@1,@"layers":@[],@"baseMasks":@{}}];
|
||||
if([starter isEqual:@"primary"]||[starter isEqual:@"hsl"]){
|
||||
NSMutableArray *removed=[NSMutableArray arrayWithArray:DYToolTypes()];
|
||||
[removed removeObject:starter];
|
||||
doc[@"removedBase"]=removed;
|
||||
doc[@"starterTool"]=starter;
|
||||
}
|
||||
return doc;
|
||||
}
|
||||
static BOOL finiteNumber(id v){return [v isKindOfClass:NSNumber.class]&&std::isfinite([v doubleValue]);}
|
||||
static BOOL validStampValues(id values,NSUInteger count,NSUInteger offsets,double minScale,double maxScale){
|
||||
if(![values isKindOfClass:NSArray.class]||[values count]!=count)return NO;
|
||||
@@ -102,6 +111,9 @@ static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL referenc
|
||||
static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return nil;
|
||||
if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2]&&![doc[@"schema"]isEqual:@3])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return nil;
|
||||
id starter=doc[@"starterTool"],level=doc[@"levelRotation"];
|
||||
if(starter&&![starter isEqual:@"primary"]&&![starter isEqual:@"hsl"])return nil;
|
||||
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
|
||||
BOOL references=[doc[@"schema"]isEqual:@3];id shared=doc[@"sharedMasks"];NSMutableSet *sharedIDs=[NSMutableSet set],*ids=[NSMutableSet set];if(shared){if(!references||![shared isKindOfClass:NSArray.class]||[shared count]>DYSharedMaskLimit)return nil;for(NSDictionary *mask in shared){if(!DYValidToolMask(mask)||[ids containsObject:mask[@"id"]]||mask[@"sharedID"])return nil;[ids addObject:mask[@"id"]];if(!mask[@"stampSource"])[sharedIDs addObject:mask[@"id"]];}}
|
||||
id removed=doc[@"removedBase"];if(removed){if(![removed isKindOfClass:NSArray.class]||[removed count]>DYToolTypes().count)return nil;NSMutableSet *unique=[NSMutableSet set];for(id type in removed){if(![type isKindOfClass:NSString.class]||![DYToolTypes()containsObject:type]||[unique containsObject:type]||[doc[@"baseMasks"][type]count])return nil;[unique addObject:type];}}
|
||||
for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids,sharedIDs,references))return nil;}
|
||||
@@ -119,7 +131,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil;}
|
||||
@implementation DYToolDocument
|
||||
+ (BOOL)supportsSecureCoding{return YES;}
|
||||
- (instancetype)init{if((self=[super init]))_document=[DYEmptyTools()copy];return self;}
|
||||
- (instancetype)init{if((self=[super init]))_document=[DYInitialToolDocument(nil)copy];return self;}
|
||||
- (void)dealloc{[_document release];[super dealloc];}
|
||||
- (void)setDocument:(NSDictionary *)d{NSData *b=DYValidatedToolData(d);if(!b)return;NSDictionary *immutable=[NSPropertyListSerialization propertyListWithData:b options:NSPropertyListImmutable format:NULL error:nil];[self setImmutableDocument:immutable];}
|
||||
- (void)setImmutableDocument:(NSDictionary*)document{if(document==_document)return;[document retain];[_document release];_document=document;}
|
||||
|
||||
@@ -43,6 +43,8 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
|
||||
- (void)draw;
|
||||
- (NSRect)drawingBounds;
|
||||
@property(nonatomic) BOOL stampArmed;
|
||||
@property(nonatomic) NSInteger levelMode; // 0 closed, 1 horizontal, 2 vertical
|
||||
@property(nonatomic) BOOL levelResetRequested;
|
||||
- (NSInteger)partAtPoint:(NSPoint)point;
|
||||
- (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time;
|
||||
- (BOOL)mouseMoved:(NSPoint)point;
|
||||
@@ -58,7 +60,7 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
|
||||
@synthesize bridge=_bridge;
|
||||
- (instancetype)init{if((self=[super init])){_panels=[NSMutableArray new];_areas=[NSMutableArray new];_scale=1;_time=kCMTimeInvalid;}return self;}
|
||||
- (void)dealloc{[self finishCapture];[_bridge release];[_panels release];[_areas release];[super dealloc];}
|
||||
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;}
|
||||
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;_levelMode=0;_levelResetRequested=NO;}
|
||||
- (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;}
|
||||
- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{
|
||||
_size=size;_time=time;_backingScale=scale;
|
||||
@@ -69,10 +71,17 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
if(_capture&&![_capture capturing])_capture=nil;
|
||||
[_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return;
|
||||
// Only tools that benefit from direct image interaction belong on the canvas.
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp"];
|
||||
CGFloat railScale=MIN(s,v.size.width/480.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-476*railScale;
|
||||
_rail=NSMakeRect(x,y,356*railScale,25*railScale);
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp",@"level"];
|
||||
CGFloat railScale=MIN(s,v.size.width/520.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-516*railScale;
|
||||
_rail=NSMakeRect(x,y,396*railScale,25*railScale);
|
||||
if(_levelMode){
|
||||
NSArray *labels=@[@"水平",@"垂直",@"重置"];
|
||||
for(NSInteger i=0;i<3;i++){
|
||||
NSRect r=NSMakeRect(NSMaxX(v)-(276-56*i)*railScale,y-34*railScale,52*railScale,26*railScale);
|
||||
[_areas addObject:@{@"part":@(20031+i),@"kind":@"levelOption",@"index":@(i+1),@"title":labels[i],@"rect":[NSValue valueWithRect:r]}];
|
||||
}
|
||||
}
|
||||
for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x+i*40*railScale,y,w,25*railScale)]}];
|
||||
for(NSInteger i=0;i<types.count;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
|
||||
CGFloat buttonWidth=100*railScale,buttonHeight=27*railScale;
|
||||
@@ -112,7 +121,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
}
|
||||
- (void)draw{
|
||||
if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(_viewport);CGFloat s=_scale;for(DYViewerParameterPanel*p in _panels)[p draw];
|
||||
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=([a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled])||([a[@"toolType"]isEqual:@"cloneStamp"]&&_stampArmed);for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
|
||||
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=([a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled])||([a[@"toolType"]isEqual:@"cloneStamp"]&&_stampArmed)||([a[@"toolType"]isEqual:@"level"]&&_levelMode)||([a[@"kind"]isEqual:@"levelOption"]&&[a[@"index"]integerValue]==_levelMode);for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
|
||||
BOOL hover=_hover==[a[@"part"]integerValue];
|
||||
BOOL pressed=_pressed==[a[@"part"]integerValue];DYDrawSoftControl(r,4*s,NO,selected||hover,pressed);
|
||||
if(a[@"symbol"]){
|
||||
@@ -139,6 +148,8 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
- (void)activateTool:(NSString*)type{
|
||||
if([type isEqual:@"level"]){_stampArmed=NO;_levelMode=_levelMode?0:1;return;}
|
||||
_levelMode=0;
|
||||
if([type isEqual:@"cloneStamp"]){_stampArmed=!_stampArmed;return;}
|
||||
_stampArmed=NO;
|
||||
if([type isEqual:@"look"]){[_bridge requestWorkspacePage:@"lut"];return;}
|
||||
@@ -157,7 +168,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
if(!hit)return NO;_pressed=hit;return YES;
|
||||
}
|
||||
if(!_pressed)return NO;
|
||||
if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"mask"]){_stampArmed=NO;[_bridge requestMask:[a[@"index"]integerValue]];}else if([kind isEqual:@"workspace"])[_bridge requestWorkspace];else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_backingScale atTime:time];}
|
||||
if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"levelOption"]){NSInteger choice=[a[@"index"]integerValue];if(choice==3)_levelResetRequested=YES;else _levelMode=choice;}else if([kind isEqual:@"mask"]){_stampArmed=NO;_levelMode=0;[_bridge requestMask:[a[@"index"]integerValue]];}else if([kind isEqual:@"workspace"]){_levelMode=0;[_bridge requestWorkspace];}else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_backingScale atTime:time];}
|
||||
return YES;
|
||||
}
|
||||
- (BOOL)capturing{return _pressed||[_capture capturing];}
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.14.4</string>
|
||||
<string>1.15.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>95</string>
|
||||
<string>96</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.14.4</string>
|
||||
<string>1.15.0</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户