Implement persistent leveling and all standalone module templates; validation pending

这个提交包含在:
mac 于 2026-11-06 12:24:19 +08:00 提交
1 父节点 81b50538b4
当前提交 dc5769492d
33 个文件已更改
+8585 -88

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

@@ -218,6 +218,15 @@ if(faceFixture.length){
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)});
u.lensStrength=80;
BOOL positiveOK=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:doc colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&failure];Pixels warped=read(destination,gpu);
u.lensStrength=-80;
BOOL negativeOK=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:doc colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&failure];Pixels opposite=read(destination,gpu);
run.record(@"level-then-lens-keeps-both-spatial-operations-active",positiveOK&&negativeOK&&difference(warped,corrected).maximum>.01&&difference(warped,opposite).maximum>.01);
u.lensStrength=0;doc[@"levelMeasureOnly"]=@YES;
BOOL measured=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:doc colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&failure];
run.record(@"level-measure-only-preserves-source-pixels",measured&&difference(read(destination,gpu),grid).maximum<.002);
[doc removeObjectForKey:@"levelMeasureOnly"];
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);
}
@@ -251,6 +260,18 @@ if(faceFixture.length){
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);
NSDictionary *savedLevel=[[DYReadTools(host,kCMTimeZero).document copy]autorelease];
run.record(@"level-placed-line-is-persisted-with-reference-points",[savedLevel[@"levelReference"][@"points"]count]==4&&[[(id)osc valueForKey:@"levelPlaced"]boolValue]);
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
NSPoint lineFirst=[[(id)osc valueForKey:@"levelFirst"]pointValue];
DYLevelTransform transform(angle(),640./400.);NSPoint display=transform.toOutput(lineFirst);
NSInteger endpoint=down(display.x*640,400-display.y*400);up(display.x*640+6,400-display.y*400+10,endpoint);drain();
run.record(@"level-retained-endpoint-edits-with-one-undo",endpoint==10016&&base->_undoStarts==undo+2&&base->_undoEnds==undo+2&&![DYReadTools(host,kCMTimeZero).document[@"levelReference"]isEqual:savedLevel[@"levelReference"]]);
control(20034);drain();
run.record(@"level-measure-toggle-preserves-line-and-angle",[DYReadTools(host,kCMTimeZero).document[@"levelMeasureOnly"]boolValue]&&[DYReadTools(host,kCMTimeZero).document[@"levelReference"][@"points"]count]==4);
control(20026);control(20026);drain();
run.record(@"level-reopening-restores-saved-line",[[(id)osc valueForKey:@"levelPlaced"]boolValue]);
undo=base->_undoStarts-1;
control(20033);drain();
control(20032);
NSInteger part=down(200,270);up(230,150,part);drain();
@@ -262,3 +283,16 @@ if(faceFixture.length){
run.record(@"level-osc-escape-discards-uncommitted-point",handled&&angle()==previous&&base->_undoStarts==undo+3);
[osc release];[plugin release];drain();
}
{
for(NSString *starter in [DYToolTypes()arrayByAddingObject:@"cst"]){
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);
NSDictionary *doc=DYInitialToolDocument(starter);BOOL valid=DYValidToolDocument(doc)&&DYWriteTools(host,doc,kCMTimeZero);
DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[inspector refresh];
NSString *expected=[starter isEqual:@"cst"]?@"primary":starter;
NSUInteger visible=0;BOOL match=NO,cstFields=YES;
for(NSDictionary *card in [inspector valueForKey:@"cards"])if(![card[@"removed"]boolValue]){visible++;match=[card[@"section"][@"key"]isEqual:expected];if([starter isEqual:@"cst"]){cstFields=[card[@"section"][@"title"]isEqual:@"CST 色彩空间转换"];for(NSDictionary *row in card[@"section"][@"rows"])cstFields&=![row[@"key"]isEqual:@"cmexposure"]&&![row[@"key"]isEqual:@"primaryBalance"];}}
NSMutableDictionary *expanded=DYMutablePlist(doc);BOOL add=DYInsertTool(expanded,@"curve",[@"base:" stringByAppendingString:expected])!=nil;
run.record([@"standalone-initial-module-and-add-layer-" stringByAppendingString:starter],valid&&visible==1&&match&&cstFields&&add&&DYValidToolDocument(expanded));
}
}
+1
查看文件
@@ -3,6 +3,7 @@
#import "DYHistogram.h"
#include "DYFilmMath.h"
#include "DYFilmTime.h"
#include "DYLevelGeometry.h"
#import "DYDiagnostics.h"
#import "DYModel.h"
#import "DYRenderer.h"
+9 -6
查看文件
@@ -211,16 +211,17 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
}
@end
static NSArray *DYPresentationSections(void) {
static NSArray *DYPresentationSections(BOOL cstOnly) {
NSMutableDictionary *bySection=[NSMutableDictionary dictionary],*byKey=[NSMutableDictionary dictionary];
for(NSDictionary *s in DYSections())bySection[s[@"key"]]=s;
for(NSDictionary *d in DYDescriptors())byKey[d[@"key"]]=d;
NSMutableDictionary *primary=[[bySection[@"primary"]mutableCopy]autorelease];NSMutableArray *cmRows=[NSMutableArray array];
for(NSString *part in @[@"input",@"primary",@"output"]){
for(NSString *part in (cstOnly?@[@"input",@"output"]:@[@"input",@"primary",@"output"])){
[cmRows addObject:@{@"key":[@"heading:" stringByAppendingString:part],@"title":[part isEqual:@"input"]?@"输入与工作空间":[part isEqual:@"output"]?@"输出转换":@"一级调色"}];
for(NSDictionary *d in bySection[part][@"rows"]){NSString *key=d[@"key"];if([key hasPrefix:@"cmbypass"]||[key isEqual:@"cmbalanceStrength"])continue;
if([key isEqual:@"cmbalanceAngle"])[cmRows addObject:@{@"key":@"primaryBalance",@"kind":@"balanceWheel",@"title":@"一级白平衡色轮"}];else[cmRows addObject:d];}
}
if(cstOnly)primary[@"title"]=@"CST 色彩空间转换";
primary[@"rows"]=cmRows;primary[@"enabled"]=byKey[@"primaryMasterEnabled"][@"pid"];primary[@"enableParameters"]=@[bySection[@"input"][@"enabled"],bySection[@"primary"][@"enabled"],bySection[@"output"][@"enabled"]];
NSMutableDictionary *base=[[bySection[@"base"] mutableCopy]autorelease];NSMutableArray *rows=[NSMutableArray array];
for(NSString *key in @[@"temperature",@"tint",@"exposure",@"contrast",@"highlights",@"shadows",@"whites",@"blacks",@"texture",@"clarity",@"dehaze",@"vibrance",@"saturation",@"skinEnabled",@"copyAutoGrade"]){NSDictionary*d=byKey[key];if(d)[rows addObject:d];}
@@ -513,7 +514,9 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
_assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=1;
_workspaceEditor=workspaceType.length>0;_embedded=[manager isKindOfClass:DYToolManager.class];if(_embedded)[(id)_manager retain];
_preferredHeight=(_embedded||_workspaceEditor)?780:406;
NSArray *presentation=DYPresentationSections();if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;}
BOOL cstOnly=NO;
if(!_embedded){id<FxCustomParameterActionAPI_v4>action=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(action){[action startAction:self];@try{cstOnly=[DYReadTools(manager,action.currentTime).document[@"starterTool"]isEqual:@"cst"];}@finally{[action endAction:self];}}}
NSArray *presentation=DYPresentationSections(cstOnly);if(_embedded||_workspaceEditor){NSMutableArray *filtered=[NSMutableArray array];for(NSDictionary *s in presentation)if([s[@"key"]isEqual:_workspaceEditor?workspaceType:[(DYToolManager*)manager type]])[filtered addObject:s];presentation=filtered;}
_sections=[presentation copy];_stackViews=[NSMutableDictionary new];_stackOrder=[@[]copy];
_cards=[[NSMutableArray alloc] init]; _controls=[[NSMutableDictionary alloc] init];
_assetButtons=[[NSMutableDictionary alloc] init]; _graphics=[[NSMutableArray alloc] init];
@@ -535,7 +538,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
_save.identifier=@"primaryAction";
_workspaceButton=[DYButton(@"控制面板",self,@selector(openWorkspace:))retain];_workspaceButton.accessibilityLabel=@"打开调色控制面板";
_addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
for(NSDictionary *section in DYPresentationSections(NO)){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule,_workspaceButton]){[self addSubview:v];v.hidden=_embedded||_workspaceEditor;}
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<DYThemeNames().count;i++){
NSButton *b=DYButton(DYThemeNames()[i],self,@selector(selectTheme:));[b setButtonType:NSButtonTypePushOnPushOff];b.tag=i+7;b.identifier=@"appearanceToggle";
@@ -962,7 +965,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
}
id<PROAPIAccessing> maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;NSDictionary *tools=DYReadTools(maskHost,t).document;for(NSDictionary *card in _cards){
NSString *type=card[@"section"][@"key"];BOOL visible=YES;
if(!_embedded){DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];visible=[@[@"primary",@"base",@"spider",@"hsl"]containsObject:type]||[token.folds[[@"visible:" stringByAppendingString:type]]boolValue];
if(!_embedded){DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];visible=[tools[@"starterTool"]isEqual:type]||[@[@"primary",@"base",@"spider",@"hsl"]containsObject:type]||[token.folds[[@"visible:" stringByAppendingString:type]]boolValue];
if(!visible){for(NSDictionary*d in DYBaseToolDescriptors(type)){double value=[d[@"default"]doubleValue];[get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:t];if(std::isfinite(value)&&fabs(value-[d[@"default"]doubleValue])>1e-6){visible=YES;break;}}if([tools[@"baseMasks"][type]count])visible=YES;if([type isEqual:@"look"])for(NSString *assetKey in DYReadAssets(_manager,t).paths)if([assetKey hasPrefix:@"look"])visible=YES;}
}
BOOL removed=!_embedded&&(DYBaseToolRemoved(tools,type)||(!_workspaceEditor&&!visible));groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed);
@@ -1138,7 +1141,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
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};
if(starter){NSString *type=[starter isEqual:@"cst"]?@"primary":starter;token.folds=@{type:@NO,[@"visible:" stringByAppendingString:type]:@YES};}
[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:t];
for(NSMutableDictionary *card in _cards)card[@"collapsed"]=@YES;
} @finally {if(grouped)[undo endUndoGroup];[action endAction:self];}
+2 -1
查看文件
@@ -67,7 +67,8 @@
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 {
double angle=[tools[@"levelRotation"] doubleValue];
if([tools[@"starterTool"]isEqual:@"cst"])u.cm.basisEnabled=0;
double angle=[tools[@"levelMeasureOnly"]boolValue]?0:[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,@"水平校正数据无效");
@@ -7,7 +7,8 @@ static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static disp
- (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;
- (NSDictionary *)toolCanvasLevelState;
- (void)saveCanvasLevel:(NSDictionary *)state replacing:(NSDictionary *)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
+12 -9
查看文件
@@ -108,28 +108,31 @@
@synchronized(self){
double angle=[_toolCanvasDocument[@"levelRotation"] doubleValue];
if(rotation)*rotation=angle;
return DYLevelTransform(angle,_toolSourceAspect>0?_toolSourceAspect:fallback);
return DYLevelTransform([_toolCanvasDocument[@"levelMeasureOnly"]boolValue]?0:angle,_toolSourceAspect>0?_toolSourceAspect:fallback);
}
}
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion {
- (NSDictionary *)toolCanvasLevelState {
@synchronized(self){NSMutableDictionary *state=[NSMutableDictionary dictionary];for(NSString *key in @[@"levelRotation",@"levelReference",@"levelMeasureOnly"])if(_toolCanvasDocument[key])state[key]=_toolCanvasDocument[key];return [[state copy]autorelease];}
}
- (void)saveCanvasLevel:(NSDictionary *)state replacing:(NSDictionary *)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){
BOOL read=CMTIME_IS_NUMERIC(time)&&[get getCustomParameterValue:&stored fromParameter:DYToolsParameterID atTime:time]&&[stored isKindOfClass:DYToolDocument.class];
NSMutableDictionary *actual=[NSMutableDictionary dictionary];
for(NSString *key in @[@"levelRotation",@"levelReference",@"levelMeasureOnly"])if(stored.document[key])actual[key]=stored.document[key];
if(!read||![actual isEqual:previous])failure=@"水平校正状态已变化,请重试。";
else if(![state isEqual:actual]){
NSMutableDictionary *doc=DYMutablePlist(stored.document);
doc[@"levelRotation"]=rotation?@(rotation):nil;
for(NSString *key in @[@"levelRotation",@"levelReference",@"levelMeasureOnly"])doc[key]=state[key];
id<FxUndoAPI> undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
BOOL grouped=[undo startUndoGroup:rotation?@"水平校正":@"重置水平校正"];
BOOL grouped=[undo startUndoGroup:state[@"levelReference"]?@"水平校正":@"重置水平校正"];
@try {
if(DYWriteTools(self->_apiManager,doc,time)){
DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;
+63 -36
查看文件
@@ -12,23 +12,34 @@
double _levelAngle;
NSInteger _levelMode;
CMTime _levelTime;
BOOL _levelHasFirst,_levelDown,_levelSecondPress,_levelSaving;
BOOL _levelHasFirst,_levelDown,_levelSecondPress,_levelSaving,_levelPlaced;
NSInteger _levelEditingEnd; NSDictionary *_levelState;
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];[_levelFailure release];[super dealloc];}
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[_stampFailure release];[_levelFailure release];[_levelState 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;
_levelHasFirst=_levelDown=_levelSecondPress=_levelPlaced=NO;_levelEditingEnd=0;
[_levelFailure release];_levelFailure=nil;
}
- (void)restoreLevelReference {
[self clearLevelLine];
NSArray *points=_levelState[@"levelReference"][@"points"];
if(points.count==4){_levelFirst=NSMakePoint([points[0]doubleValue],[points[1]doubleValue]);_levelLast=NSMakePoint([points[2]doubleValue],[points[3]doubleValue]);_levelPlaced=YES;}
}
- (void)updateLevelFrom:(DYPlugIn *)plugin {
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)[self clearLevelLine];
NSDictionary *state=plugin?[plugin toolCanvasLevelState]:@{};
BOOL changed=![_levelState isEqual:state];
if(changed){[_levelState release];_levelState=[state copy];[self restoreLevelReference];}
if(!_levelMode&&_viewerControls.levelMode){[self restoreLevelReference];NSInteger mode=[state[@"levelReference"][@"mode"]integerValue];if(mode)_viewerControls.levelMode=mode;}
if(_levelMode&&!_viewerControls.levelMode)[self restoreLevelReference];
_levelMode=_viewerControls.levelMode;_levelAngle=angle;
_viewerControls.levelMeasureOnly=[state[@"levelMeasureOnly"]boolValue];
}
- (NSPoint)displayUV:(NSPoint)point {
return NSMakePoint((point.x-NSMinX(_imageRect))/NSWidth(_imageRect),(point.y-NSMinY(_imageRect))/NSHeight(_imageRect));
@@ -40,65 +51,76 @@
- (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;
- (void)commitLevelState:(NSDictionary *)state plugin:(DYPlugIn *)plugin {
if(_levelSaving)return;_levelSaving=YES;
DYViewerParameterBridge *bridge=_viewerControls.bridge;
[plugin saveCanvasLevel:angle replacing:_levelAngle completion:^(NSString *failure){
[plugin saveCanvasLevel:state replacing:_levelState?:@{} completion:^(NSString *failure){
@synchronized(self){
self->_levelSaving=NO;
if(self->_viewerControls.bridge!=bridge||!self->_viewerControls.levelMode)return;
[self clearLevelLine];
if(self->_viewerControls.bridge!=bridge)return;
[self updateLevelFrom:plugin];[self restoreLevelReference];
self->_levelFailure=[failure copy];
}
}];
}
- (void)commitLevelReference:(DYPlugIn *)plugin {
double corrected=DYLevelDelta(_levelFirst,_levelLast,_level.aspect,_levelMode==2);
NSMutableDictionary *state=[NSMutableDictionary dictionaryWithDictionary:_levelState?:@{}];
state[@"levelRotation"]=@(fabs(corrected)<1e-7?0:corrected);
state[@"levelReference"]=@{@"points":@[@(_levelFirst.x),@(_levelFirst.y),@(_levelLast.x),@(_levelLast.y)],@"aspect":@(_level.aspect),@"mode":@(_levelMode)};
[self commitLevelState:state plugin:plugin];
}
- (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;
[self restoreLevelReference];_viewerControls.levelMode=0;return YES;
}
// FCP's drawing and event callbacks may report different sample times.
// Compare events only and leave room for the host's sub-frame drift.
if(_levelHasFirst&&(type==NSEventTypeLeftMouseDown||type==NSEventTypeLeftMouseUp)&&
(time.epoch!=_levelTime.epoch||fabs(CMTimeGetSeconds(CMTimeSubtract(time,_levelTime)))>.05))[self clearLevelLine];
if(type==NSEventTypeLeftMouseDown&&part==10015){
(time.epoch!=_levelTime.epoch||fabs(CMTimeGetSeconds(CMTimeSubtract(time,_levelTime)))>.05))[self restoreLevelReference];
if(type==NSEventTypeLeftMouseDown&&(part==10015||part==10016||part==10017)){
if(_levelSaving)return YES;
[_levelFailure release];_levelFailure=nil;
_levelDown=YES;_levelSecondPress=_levelHasFirst;
_levelLast=[self clampedDisplayUV:point];
if(!_levelHasFirst){_levelFirst=_levelLast;_levelTime=time;_levelHasFirst=YES;}
NSPoint source=_level.toSource([self clampedDisplayUV:point]);
_levelEditingEnd=part==10016?1:part==10017?2:0;
if(_levelEditingEnd){_levelTime=time;return YES;}
_levelPlaced=NO;
_levelLast=source;
if(!_levelHasFirst){_levelFirst=source;_levelTime=time;_levelHasFirst=YES;}
return YES;
}
if(!_levelDown||(type!=NSEventTypeLeftMouseDragged&&type!=NSEventTypeLeftMouseUp))return NO;
_levelLast=[self clampedDisplayUV:point];
NSPoint source=_level.toSource([self clampedDisplayUV:point]);
if(_levelEditingEnd==1)_levelFirst=source;else _levelLast=source;
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];
}
NSPoint first=[self canvasDisplayPoint:_level.toOutput(_levelFirst)],last=[self canvasDisplayPoint:_level.toOutput(_levelLast)];
double distance=hypot(last.x-first.x,last.y-first.y);
if(distance>=5*_uiScale)[self commitLevelReference:plugin];
else if(_levelSecondPress||_levelEditingEnd){[self restoreLevelReference];_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);
CGFloat scale=MIN(_uiScale,NSWidth(viewport)/420.);
NSRect prompt=NSMakeRect(NSMinX(viewport)+8*scale,NSMinY(viewport)+8*scale,400*scale,72*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];
NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelPlaced?@"拖动端点修正 · 空白处重画 · Esc 收起":_levelHasFirst?@"选择参考线终点 · Esc 取消":@"点击两点或拖出参考线 · Esc 收起");
NSDictionary *attrs=@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:12*scale]};
[title drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+5*scale,388*scale,18*scale) withAttributes:attrs];
DYLevelTransform result(_levelAngle,_level.aspect);
NSString *numbers=[NSString stringWithFormat:@"FCP 旋转 %+.2f° 缩放 %.2f%%(增加 %.2f%%)",-_levelAngle*180/M_PI,result.zoom*100,(result.zoom-1)*100];
[numbers drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+27*scale,388*scale,18*scale) withAttributes:attrs];
NSString *hint=_viewerControls.levelMeasureOnly?@"仅测量:数值用于原始变换;已有缩放请乘以上述比例。":@"插件已应用;改用原始变换前,请切换「仅测量」。";
[hint drawInRect:NSMakeRect(NSMinX(prompt)+6*scale,NSMinY(prompt)+49*scale,388*scale,18*scale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:10*scale]}];
if(!_levelHasFirst&&!_levelPlaced)return;
NSPoint first=[self canvasDisplayPoint:_level.toOutput(_levelFirst)],last=[self canvasDisplayPoint:_level.toOutput(_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;
NSPoint point=value.pointValue;CGFloat r=5*_uiScale;
[line appendBezierPathWithOvalInRect:NSMakeRect(point.x-r,point.y-r,2*r,2*r)];
}
[NSColor.blackColor setStroke];line.lineWidth=3.5*_uiScale;[line stroke];
@@ -210,7 +232,10 @@
BOOL drawing=[_mask[@"drawing"]boolValue];
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(_levelMode){
if(_levelPlaced)for(NSInteger i=0;i<2;i++){NSPoint endpoint=[self canvasDisplayPoint:_level.toOutput(i?_levelLast:_levelFirst)];if(hypot(point.x-endpoint.x,point.y-endpoint.y)<=12*_uiScale)return 10016+i;}
return NSPointInRect(point,_imageRect)?10015:0;
}
if(_viewerControls.stampArmed)return NSPointInRect(point,_imageRect)?10014:0;
NSArray *source=_mask[@"stampSource"];
if(source.count==4){
@@ -280,7 +305,9 @@
BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010);
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time]){
[self updateLevelFrom:plugin];
if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevel:0 plugin:plugin];}
if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevelState:@{} plugin:plugin];}
else if(_viewerControls.levelMeasureRequested){_viewerControls.levelMeasureRequested=NO;NSMutableDictionary *state=[NSMutableDictionary dictionaryWithDictionary:_levelState?:@{}];state[@"levelMeasureOnly"]=@(![state[@"levelMeasureOnly"]boolValue]);[self commitLevelState:state plugin:plugin];}
else if(_viewerControls.levelDirectionRequested){_viewerControls.levelDirectionRequested=NO;if(_levelPlaced)[self commitLevelReference:plugin];}
return YES;
}
if(_levelMode)return NO;
@@ -295,7 +322,7 @@
- (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];[self updateLevelFrom:plugin];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;
_levelLast=_level.toSource([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;
}}
+1 -1
查看文件
@@ -116,7 +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,@"水平校正属于空间处理,请保存完整预设。");
if(![tools[@"levelMeasureOnly"]boolValue]&&[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,@"新增肤色层含人脸空间选区,请保存完整预设。");}
+9 -3
查看文件
@@ -63,9 +63,9 @@ NSMutableDictionary *DYMutablePlist(NSDictionary *value){
}
NSDictionary *DYInitialToolDocument(NSString *starter) {
NSMutableDictionary *doc=[NSMutableDictionary dictionaryWithDictionary:@{@"schema":@1,@"layers":@[],@"baseMasks":@{}}];
if([starter isEqual:@"primary"]||[starter isEqual:@"hsl"]){
if([DYToolTypes() containsObject:starter]||[starter isEqual:@"cst"]){
NSMutableArray *removed=[NSMutableArray arrayWithArray:DYToolTypes()];
[removed removeObject:starter];
[removed removeObject:[starter isEqual:@"cst"]?@"primary":starter];
doc[@"removedBase"]=removed;
doc[@"starterTool"]=starter;
}
@@ -112,8 +112,14 @@ 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(starter&&![DYToolTypes() containsObject:starter]&&![starter isEqual:@"cst"])return nil;
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
id measured=doc[@"levelMeasureOnly"],reference=doc[@"levelReference"];
if(measured&&(!finiteNumber(measured)||([measured doubleValue]!=0&&[measured doubleValue]!=1)))return nil;
if(reference){
if(![reference isKindOfClass:NSDictionary.class]||![reference[@"points"]isKindOfClass:NSArray.class]||[reference[@"points"]count]!=4||!finiteNumber(reference[@"aspect"])||[reference[@"aspect"]doubleValue]<=0||[reference[@"aspect"]doubleValue]>100||(![reference[@"mode"]isEqual:@1]&&![reference[@"mode"]isEqual:@2]))return nil;
for(id value in reference[@"points"])if(!finiteNumber(value)||fabs([value doubleValue])>4)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;}
+14 -14
查看文件
@@ -52,7 +52,7 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
- (NSRect)drawingBounds;
@property(nonatomic) BOOL stampArmed;
@property(nonatomic) NSInteger levelMode; // 0 closed, 1 horizontal, 2 vertical
@property(nonatomic) BOOL levelResetRequested;
@property(nonatomic) BOOL levelResetRequested,levelMeasureOnly,levelMeasureRequested,levelDirectionRequested;
- (NSInteger)partAtPoint:(NSPoint)point;
- (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time;
- (BOOL)mouseMoved:(NSPoint)point;
@@ -68,7 +68,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;_levelMode=0;_levelResetRequested=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=_levelMeasureRequested=_levelDirectionRequested=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;
@@ -84,9 +84,9 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
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);
NSArray *labels=@[@"水平",@"垂直",@"重置",@"仅测量"];
for(NSInteger i=0;i<4;i++){
NSRect r=NSMakeRect(NSMaxX(v)-(354-66*i)*railScale,y-34*railScale,62*railScale,26*railScale);
[_areas addObject:@{@"part":@(20031+i),@"kind":@"levelOption",@"index":@(i+1),@"title":labels[i],@"rect":[NSValue valueWithRect:r]}];
}
}
@@ -98,10 +98,10 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
- (NSInteger)partAtPoint:(NSPoint)p{
if(!_bridge||!std::isfinite(p.x)||!std::isfinite(p.y)||!NSPointInRect(p,_viewport))return 0;
for(NSDictionary*a in _areas)if(NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];if(NSPointInRect(p,_rail))return 20000;
for(NSInteger i=_panels.count-1;i>=0;i--){NSInteger part=[_panels[i]partAtPoint:p];if(part)return 100000+(i+1)*10000+(part-20000);}
if(!_levelMode)for(NSInteger i=_panels.count-1;i>=0;i--){NSInteger part=[_panels[i]partAtPoint:p];if(part)return 100000+(i+1)*10000+(part-20000);}
return 0;
}
- (BOOL)headerAtPoint:(NSPoint)p{if(NSPointInRect(p,_rail))return NO;for(DYViewerParameterPanel*panel in [_panels reverseObjectEnumerator]){NSInteger part=[panel partAtPoint:p];if(part)return part==20000;}return NO;}
- (BOOL)headerAtPoint:(NSPoint)p{if(_levelMode||NSPointInRect(p,_rail))return NO;for(DYViewerParameterPanel*panel in [_panels reverseObjectEnumerator]){NSInteger part=[panel partAtPoint:p];if(part)return part==20000;}return NO;}
- (NSString*)skinNodeInSnapshot:(NSDictionary*)snapshot{
NSDictionary *doc=snapshot[@"document"];if(!doc)return nil;NSString *node=snapshot[@"selectedNode"];
if([node isEqual:@"base:skin"]&&!DYBaseToolRemoved(doc,@"skin"))return node;
@@ -123,13 +123,13 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
if(!_areas.count)return NSZeroRect;
NSRect rect=_rail;
for(NSDictionary *area in _areas)rect=NSUnionRect(rect,[area[@"rect"] rectValue]);
for(DYViewerParameterPanel *panel in _panels){NSRect bounds=[panel drawingBounds];if(!NSIsEmptyRect(bounds))rect=NSUnionRect(rect,bounds);}
if(!_levelMode)for(DYViewerParameterPanel *panel in _panels){NSRect bounds=[panel drawingBounds];if(!NSIsEmptyRect(bounds))rect=NSUnionRect(rect,bounds);}
// Tooltips and control shadows extend beyond the buttons.
return NSIntersectionRect(_viewport,NSInsetRect(rect,-24*_scale,-32*_scale));
}
- (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)||([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;
if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(_viewport);CGFloat s=_scale;if(!_levelMode)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)||([a[@"toolType"]isEqual:@"level"]&&_levelMode)||([a[@"kind"]isEqual:@"levelOption"]&&([a[@"index"]integerValue]==_levelMode||([a[@"index"]integerValue]==4&&_levelMeasureOnly)));if(!_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"]){
@@ -157,14 +157,14 @@ 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:@"level"]){[self finishCapture];_stampArmed=NO;_levelMode=_levelMode?0:1;return;}
BOOL returningFromLevel=_levelMode!=0;_levelMode=0;
if([type isEqual:@"cloneStamp"]){_stampArmed=!_stampArmed;return;}
_stampArmed=NO;
if([type isEqual:@"look"]){[_bridge requestWorkspacePage:@"lut"];return;}
if([type isEqual:@"skin"]){[self toggleSkinPreview];return;}
if([type isEqual:@"whiteBalance"]){[_bridge requestWhiteBalanceAtTime:_time];return;}
for(DYViewerParameterPanel*p in [[_panels copy]autorelease])if([p.toolType isEqual:type]){[p finishCapture];p.bridge=nil;[_panels removeObjectIdenticalTo:p];return;}
for(DYViewerParameterPanel*p in [[_panels copy]autorelease])if([p.toolType isEqual:type]){if(returningFromLevel){[_bridge requestTool:type];return;}[p finishCapture];p.bridge=nil;[_panels removeObjectIdenticalTo:p];return;}
[_bridge requestTool:type];DYViewerParameterPanel*p=[[[DYViewerParameterPanel alloc]init]autorelease];p.toolType=type;p.bridge=_bridge;
[_panels addObject:p];
}
@@ -177,7 +177,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:@"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];}
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 if(choice==4)_levelMeasureRequested=YES;else{_levelMode=choice;_levelDirectionRequested=YES;}}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];}
@@ -72,6 +72,10 @@
NSRect strength=[areaFor(lens,@"lensStrength",nil)[@"rect"]rectValue];start=NSMakePoint(NSMidX(strength),NSMidY(strength));end=NSMakePoint(start.x+size.width*.125,start.y);undo=base->_undoStarts;
[controls event:NSEventTypeLeftMouseDown point:start atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:end atTime:host->_time];drain();[controls event:NSEventTypeLeftMouseUp point:end atTime:host->_time];drain();publish();
run.record(@"viewer-lens-strength-handle-writes-existing-radial-parameter",fabs(value(@"lensStrength")-50)<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
click(areaFor(controls,@"tool",@"level"));
run.record(@"viewer-level-temporarily-hides-lens-hit-targets",[controls partAtPoint:start]==0);
click(areaFor(controls,@"tool",@"lens"));
run.record(@"viewer-return-from-level-resumes-existing-lens-overlay",panelFor(@"lens")==lens&&[controls partAtPoint:start]>100000);
click(areaFor(controls,@"tool",@"lens"));run.record(@"viewer-repeated-image-tool-entry-closes-only-that-overlay",!panelFor(@"lens")&&panelFor(@"curve"));
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,host->_time).document);NSString *layerID=[[DYInsertTool(doc,@"curve",@"base:curve")[@"id"]copy]autorelease];DYWriteTools(host,doc,host->_time);
[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:host userInfo:@{@"node":layerID}];drain();publish();
@@ -117,7 +117,7 @@
auto toolbarButton=[&](NSString *type)->NSButton *{for(NSButton *button in toolbar.subviews)if([button.identifier isEqual:type])return button;return nil;};
auto chooseNode=[&](NSString *node)->BOOL{NSArray *rows=[stack valueForKey:@"layerRows"];for(NSUInteger i=0;i<rows.count;i++)if([rows[i][@"node"]isEqual:node]&&[rows[i][@"kind"]isEqual:@"tool"]){[table selectRowIndexes:[NSIndexSet indexSetWithIndex:i]byExtendingSelection:NO];[stack tableViewSelectionDidChange:nil];return YES;}return NO;};
BOOL horizontal=YES;CGFloat previous=-1;for(NSView *button in toolbar.subviews){horizontal&=button.frame.origin.x>previous&&button.frame.origin.y==0;previous=button.frame.origin.x;}
run.record(@"workspace-toolbar-lists-grading-tools-and-leaves-distortion-on-canvas",toolbar.subviews.count==DYToolTypes().count-1&&horizontal&&!toolbarButton(@"lens"));
run.record(@"workspace-toolbar-lists-every-inspector-tool-including-distortion",toolbar.subviews.count==DYToolTypes().count&&horizontal&&toolbarButton(@"lens"));
NSUInteger originalLayers=[DYReadTools(stackHost,kCMTimeZero).document[@"layers"]count];int undo=stackHost->_undoStarts;
[stack addWorkspaceTool:toolbarButton(@"curve")];workspaceDrain();NSString *curveID=[[[stack valueForKey:@"selectedNode"]copy]autorelease];NSDictionary *tools=DYReadTools(stackHost,kCMTimeZero).document;
run.record(@"workspace-toolbar-adds-real-uuid-and-synchronizes-regular-inspector",[tools[@"layers"]count]==originalLayers+1&&[DYToolWithID(tools,curveID)[@"type"]isEqual:@"curve"]&&[[mainInspector valueForKey:@"stackViews"]objectForKey:curveID]&&stackHost->_undoStarts==undo+1&&stackHost->_undoEnds==stackHost->_undoStarts);
+5 -4
查看文件
@@ -5,7 +5,7 @@
_splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v3"];if(_splitFraction<.12||_splitFraction>.4)_splitFraction=.18;_scopeFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.scopeFraction.v1"];if(_scopeFraction<.15||_scopeFraction>.45)_scopeFraction=.27;_toolTime=kCMTimeInvalid;_sizingSplit=YES;
_toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO;
_toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll];
CGFloat x=0;for(NSString *type in DYToolTypes()) {if([type isEqual:@"lens"])continue;NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=28;button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30);
CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=28;button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30);
_split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split];
_toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost];
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=NO;_layerScroll.autohidesScrollers=YES;_layerScroll.scrollerStyle=NSScrollerStyleOverlay;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
@@ -37,7 +37,8 @@
- (void)splitView:(NSSplitView*)split resizeSubviewsWithOldSize:(NSSize)old{[self layoutToolWorkspace];}
- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;if(NSApp.currentEvent.type!=NSEventTypeLeftMouseDragged&&NSApp.currentEvent.type!=NSEventTypeLeftMouseUp)return;_splitFraction=MAX(.12,MIN(.4,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));_scopeFraction=MAX(.15,MIN(.45,_scopePane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction.v3"];[NSUserDefaults.standardUserDefaults setDouble:_scopeFraction forKey:@"com.dayu.color.workspace.scopeFraction.v1"];[self layoutWorkspace];}
- (BOOL)workspaceBaseVisible:(NSString*)type document:(NSDictionary*)document time:(CMTime)time {
if([type isEqual:@"lens"]||DYBaseToolRemoved(document,type))return NO;
if(DYBaseToolRemoved(document,type))return NO;
if([document[@"starterTool"]isEqual:type])return YES;
if([@[@"primary",@"spider",@"base",@"hsl"]containsObject:type])return YES;
id<PROAPIAccessing>host=[self rootHost];id<FxParameterRetrievalAPI_v6>get=[host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:time];if([token.folds[[@"visible:" stringByAppendingString:type]]boolValue]||DYMasksForTool(document,[@"base:" stringByAppendingString:type]).count)return YES;
for(NSDictionary*d in DYBaseToolDescriptors(type)){double value=[d[@"default"]doubleValue];[get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:time];if(std::isfinite(value)&&fabs(value-[d[@"default"]doubleValue])>1e-6)return YES;}
@@ -57,8 +58,8 @@
NSArray *display=DYToolDisplayOrder(document);NSMutableArray *ordered=[NSMutableArray array];NSMutableDictionary *numbers=[NSMutableDictionary dictionary],*titles=[NSMutableDictionary dictionary];for(NSString*ID in display){NSDictionary*node=DYToolWithID(document,ID);if(!node)continue;NSString*type=node[@"type"];NSInteger number=(numbers[type]?[numbers[type]integerValue]:(DYBaseToolRemoved(document,type)?0:1))+1;numbers[type]=@(number);titles[ID]=[NSString stringWithFormat:@"%@ %ld",DYToolSection(type)[@"title"],(long)number];}
for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];}
for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID];
for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if([type isEqual:@"lens"])continue;if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue;
NSString*title=titles[ID]?:DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool",@"maskCount":@(DYMasksForTool(document,ID).count)}];
for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue;
NSString*title=titles[ID]?:([ID isEqual:@"base:primary"]&&[document[@"starterTool"]isEqual:@"cst"]?@"CST 色彩空间转换":DYToolSection(type)[@"title"]?:type);[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool",@"maskCount":@(DYMasksForTool(document,ID).count)}];
for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];}
}
for(NSDictionary*mask in DYSharedMasks(document))if(!DYToolIDsForSharedMask(document,mask[@"id"]).count){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":mask[@"stampSource"]?@"◩ 仿制图章":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];}
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.15.0</string>
<string>1.16.0</string>
<key>CFBundleVersion</key>
<string>96</string>
<string>97</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.15.0</string>
<string>1.16.0</string>
</dict>
<dict>
<key>className</key>