增加模块整体强度与中文工具栏,分组简化一级面板(验证中)
这个提交包含在:
1 父节点
0388b79bd8
当前提交
a1a0779e12
17 个文件已更改
+191
-74
没有与搜索条件相匹配的文件
+58
-2
@@ -7,6 +7,10 @@
|
||||
#import <CommonCrypto/CommonDigest.h>
|
||||
#import <os/log.h>
|
||||
|
||||
static char DYScreenInfoKey;
|
||||
NSDictionary *DYScreenToolCatalog(void){static NSDictionary *catalog;static dispatch_once_t once;dispatch_once(&once,^{catalog=[@{@"curve":@"点击曲线加点,拖动调整;通道、整体强度和精细参数在面板中设置。",@"lens":@"拖动画面网格调整畸变,拖动中心点定位光学中心;缩放与强度在详情中设置。",@"skin":@"切换画面肤色保护区域;保护程度、色相及人脸限定在详情中设置。",@"look":@"在控制面板选择 LUT;整体强度与各风格位置的强度分别调节。",@"whiteBalance":@"点击画面中的中性白色或灰色取样;Esc 取消,色温和色调可在详情中精调。",@"cloneStamp":@"先点击取样中心,再拖出覆盖区域;取样、羽化、参考区域和跟踪在蒙版详情中设置。",@"level":@"点击两点或拖出参考线;水平、垂直、仅测量和重置在详情中设置。",@"mosaic":@"选择人脸或已绘制蒙版,调整方块大小;蒙版跟踪保留在蒙版详情中。",@"rectangle":@"在画面拖出矩形,松开保存;位置、尺寸、羽化、强度及跟踪在蒙版详情中设置。",@"ellipse":@"在画面拖出椭圆,松开保存;位置、尺寸、羽化、强度及跟踪在蒙版详情中设置。",@"pen":@"点击放点,拖出曲柄,点首节点或回车闭合;Esc 取消,删除键撤回最后一点。"}copy];});return catalog;}
|
||||
NSDictionary *DYCurrentScreenToolInfo(id host){return objc_getAssociatedObject(host,&DYScreenInfoKey);}
|
||||
void DYPublishScreenToolInfo(id host,NSString *type,NSString *message){if(!host)return;dispatch_async(dispatch_get_main_queue(),^{NSDictionary *old=DYCurrentScreenToolInfo(host);NSString *kind=type?:old[@"type"]?:@"";NSDictionary *info=@{@"type":kind,@"message":message?:DYScreenToolCatalog()[kind]?:@""};if([old isEqual:info])return;objc_setAssociatedObject(host,&DYScreenInfoKey,info,OBJC_ASSOCIATION_COPY_NONATOMIC);[NSNotificationCenter.defaultCenter postNotificationName:@"DYScreenToolInfo" object:host userInfo:info];});}
|
||||
NSArray *DYToolTypes(void){return @[@"primary",@"spider",@"base",@"skin",@"look",@"hsl",@"curve",@"grading",@"primaries",@"levels",@"blackwhite",@"balance",@"mixer",@"film",@"lens"];}
|
||||
NSDictionary *DYToolSection(NSString *type){for(NSDictionary *s in DYSections())if([s[@"key"]isEqual:type])return s;return nil;}
|
||||
static NSArray *DYBaseToolParts(NSString *type){return [type isEqual:@"primary"]?@[@"input",@"primary",@"output"]:[type isEqual:@"base"]?@[@"base",@"color"]:@[type];}
|
||||
@@ -29,7 +33,7 @@ NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){return DYToolRemo
|
||||
BOOL DYBaseToolRemoved(NSDictionary *doc,NSString *type){return [doc[@"removedBase"]containsObject:type];}
|
||||
BOOL DYSetBaseToolRemoved(NSMutableDictionary *doc,NSString *type,BOOL removed){
|
||||
if(!DYValidToolDocument(doc)||![DYToolTypes()containsObject:type])return NO;
|
||||
NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];}
|
||||
NSMutableArray *types=[NSMutableArray arrayWithArray:doc[@"removedBase"]?:@[]];[types removeObject:type];if(removed){[types addObject:type];[doc[@"baseMasks"]removeObjectForKey:type];[doc[@"strengths"]removeObjectForKey:[@"base:" stringByAppendingString:type]];}
|
||||
if(types.count)doc[@"removedBase"]=types;else[doc removeObjectForKey:@"removedBase"];return YES;
|
||||
}
|
||||
void DYApplyRemovedBaseTools(DYUniforms *u,NSDictionary *doc){
|
||||
@@ -126,6 +130,7 @@ 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"];
|
||||
id mosaic=doc[@"mosaic"];
|
||||
if(mosaic){
|
||||
@@ -152,6 +157,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
for(NSString *key in node[@"values"]){NSDictionary *d=descriptors[key];id v=node[@"values"][key];if(!d||!finiteNumber(v)||[v doubleValue]<[d[@"min"]doubleValue]||[v doubleValue]>[d[@"max"]doubleValue]||(d[@"values"]&&![d[@"values"]containsObject:@((int)llround([v doubleValue]))]))return nil;}
|
||||
for(id key in node[@"paths"]){id p=node[@"paths"][key];if(![@[@"input",@"look0",@"look1",@"look2",@"look3",@"look4"]containsObject:key]||![p isKindOfClass:NSString.class]||[p length]>8192||![p isAbsolutePath]||![[p pathExtension].lowercaseString isEqual:@"cube"])return nil;}if(node[@"spider"]&&(![node[@"spider"]isKindOfClass:NSData.class]||!DYSpiderMeshIsValid(node[@"spider"])))return nil;
|
||||
}
|
||||
id strengths=doc[@"strengths"];if(strengths){if(![strengths isKindOfClass:NSDictionary.class]||[strengths count]>DYToolLimit+DYToolTypes().count+1)return nil;for(id ID in strengths){id value=strengths[ID];if(![ID isKindOfClass:NSString.class]||!finiteNumber(value)||[value doubleValue]<0||[value doubleValue]>1)return nil;BOOL base=[ID hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[ID substringFromIndex:5]];if(!base&&![ID isEqual:@"output"]&&!DYToolWithID(doc,ID))return nil;}}
|
||||
// Anchors are stable identities, never an array index or a translated title.
|
||||
// Reject unknown anchors/cycles so layout, rendering and undo share one order.
|
||||
for(NSDictionary *node in doc[@"layers"]){id after=node[@"after"];if(!after)continue;if([doc[@"schema"]isEqual:@1]||![after isKindOfClass:NSString.class])return nil;NSMutableSet *seen=[NSMutableSet setWithObject:node[@"id"]];while(after){if([after hasPrefix:@"base:"]){if(![DYToolTypes()containsObject:[after substringFromIndex:5]])return nil;break;}if([seen containsObject:after])return nil;[seen addObject:after];NSDictionary *parent=DYToolWithID(doc,after);if(!parent)return nil;after=parent[@"after"];}}
|
||||
@@ -175,12 +181,23 @@ BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil
|
||||
DYToolDocument *DYReadTools(id<PROAPIAccessing>m,CMTime t){DYToolDocument *d=nil;[[(id)m apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&d fromParameter:DYToolsParameterID atTime:t];return [d isKindOfClass:DYToolDocument.class]?d:[[[DYToolDocument alloc]init]autorelease];}
|
||||
BOOL DYWriteTools(id<PROAPIAccessing>m,NSDictionary *d,CMTime t){NSData *data=DYValidatedToolData(d);if(!data)return NO;DYToolDocument *v=[[[DYToolDocument alloc]init]autorelease];[v setImmutableDocument:[NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:NULL error:nil]];return [[m apiForProtocol:@protocol(FxParameterSettingAPI_v6)]setCustomParameterValue:v toParameter:DYToolsParameterID atTime:t];}
|
||||
NSDictionary *DYToolWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *n in doc[@"layers"])if([n[@"id"]isEqual:ID])return n;return nil;}
|
||||
double DYToolStrength(NSDictionary *doc,NSString *ID){NSNumber *value=doc[@"strengths"][ID?:@""];return value?value.doubleValue:1;}
|
||||
BOOL DYSetToolStrength(NSMutableDictionary *doc,NSString *ID,double strength){
|
||||
if(!DYValidToolDocument(doc)||!std::isfinite(strength)||strength<0||strength>1)return NO;
|
||||
BOOL base=[ID hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[ID substringFromIndex:5]];
|
||||
if(!base&&![ID isEqual:@"output"]&&!DYToolWithID(doc,ID))return NO;
|
||||
NSMutableDictionary *values=[NSMutableDictionary dictionaryWithDictionary:doc[@"strengths"]?:@{}];if(strength==1)[values removeObjectForKey:ID];else values[ID]=@(strength);if(values.count)doc[@"strengths"]=values;else[doc removeObjectForKey:@"strengths"];return YES;
|
||||
}
|
||||
NSArray *DYToolStrengthMasks(NSArray *masks,double strength){
|
||||
if(strength>=1)return masks?:@[];NSMutableArray *result=[NSMutableArray arrayWithArray:masks?:@[]];DYMaskParameters p=dyDefaultMaskParameters();p.kind=DYMaskRectangle;p.width=p.height=4000;p.feather=0;p.outputBlack=p.outputWhite=1;p.strength=strength;
|
||||
[result addObject:@{@"enabled":@YES,@"combine":@2,@"parameters":parameterData(p),@"nodes":[NSData data],@"keys":@[]}];return result;
|
||||
}
|
||||
static void DYAppendToolChildren(NSDictionary *doc,NSString *parent,NSMutableArray *order,NSMutableSet *seen){for(NSDictionary *node in doc[@"layers"])if([node[@"after"]isEqual:parent]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}}
|
||||
NSArray *DYToolDisplayOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray array];NSMutableSet *seen=[NSMutableSet set];for(NSString *type in DYToolTypes()){NSString *base=[@"base:" stringByAppendingString:type];[order addObject:base];DYAppendToolChildren(doc,base,order,seen);}for(NSDictionary *node in doc[@"layers"])if(!node[@"after"]&&![seen containsObject:node[@"id"]]){[seen addObject:node[@"id"]];[order addObject:node[@"id"]];DYAppendToolChildren(doc,node[@"id"],order,seen);}return order;}
|
||||
NSString *DYToolRootAnchor(NSDictionary *doc,NSString *ID){NSMutableSet *seen=[NSMutableSet set];NSDictionary *node=DYToolWithID(doc,ID);while(node[@"after"]){NSString *after=node[@"after"];if([after hasPrefix:@"base:"])return after;if([seen containsObject:after])return nil;[seen addObject:after];node=DYToolWithID(doc,after);}return @"tail";}
|
||||
NSArray *DYUnifiedRenderOrder(NSDictionary *doc){NSMutableArray *order=[NSMutableArray arrayWithArray:DYToolDisplayOrder(doc)];NSString *after=doc[@"outputAfter"]?:@"tail";NSUInteger index=[order indexOfObject:after];[order insertObject:@"output" atIndex:index==NSNotFound?order.count:index+1];return order;}
|
||||
NSDictionary *DYInsertTool(NSMutableDictionary *doc,NSString *type,NSString *after){if(!DYValidToolDocument(doc)||[doc[@"layers"]count]>=DYToolLimit)return nil;if(!([after hasPrefix:@"base:"]&&[DYToolTypes()containsObject:[after substringFromIndex:5]])&&!DYToolWithID(doc,after))return nil;NSDictionary *fresh=DYNewTool(type);if(!fresh)return nil;NSMutableDictionary *node=DYMutablePlist(fresh);node[@"after"]=after;NSMutableArray *layers=doc[@"layers"];for(NSMutableDictionary *old in layers)if([old[@"after"]isEqual:after])old[@"after"]=node[@"id"];NSUInteger index=0;NSDictionary *parent=DYToolWithID(doc,after);if(parent)index=[layers indexOfObjectIdenticalTo:parent]+1;[layers insertObject:node atIndex:MIN(index,layers.count)];if(![doc[@"schema"]isEqual:@3])doc[@"schema"]=@2;return node;}
|
||||
BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];return YES;}
|
||||
BOOL DYRemoveTool(NSMutableDictionary *doc,NSString *ID){NSMutableDictionary *node=(id)DYToolWithID(doc,ID);if(!node)return NO;NSString *after=node[@"after"];if([doc[@"outputAfter"]isEqual:ID])doc[@"outputAfter"]=after?:@"tail";for(NSMutableDictionary *child in doc[@"layers"])if([child[@"after"]isEqual:ID]){if(after)child[@"after"]=after;else[child removeObjectForKey:@"after"];}[doc[@"layers"]removeObject:node];[doc[@"strengths"]removeObjectForKey:ID];return YES;}
|
||||
NSArray *DYSharedMasks(NSDictionary *doc){return [doc[@"sharedMasks"]isKindOfClass:NSArray.class]?doc[@"sharedMasks"]:@[];}
|
||||
NSDictionary *DYSharedMaskWithID(NSDictionary *doc,NSString *ID){for(NSDictionary *mask in DYSharedMasks(doc))if([mask[@"id"]isEqual:ID])return mask;return nil;}
|
||||
static NSArray *DYRawMasksForTool(NSDictionary *doc,NSString *ID){return [ID hasPrefix:@"base:"]?doc[@"baseMasks"][[ID substringFromIndex:5]]?:@[]:DYToolWithID(doc,ID)[@"masks"]?:@[];}
|
||||
@@ -500,3 +517,42 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
|
||||
- (BOOL)getCustomParameterValue:(id*)out fromParameter:(UInt32)pid atTime:(CMTime)t{if(pid==DYAssetsParameterID){DYAssetState *a=[[[DYAssetState alloc]init]autorelease];NSDictionary *n=[self node];a.paths=n[@"paths"]?:@{};a.spiderMesh=n[@"spider"];a.spiderLinked=[n[@"spiderLinked"]boolValue];*out=a;return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *global=_token; if(!global)[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&global fromParameter:pid atTime:t];DYInspectorToken *local=[[[DYInspectorToken alloc]init]autorelease];NSMutableDictionary *folds=[NSMutableDictionary dictionary];for(NSString *key in global.folds)if([key hasPrefix:[_nodeID stringByAppendingString:@":"]])folds[[key substringFromIndex:_nodeID.length+1]]=global.folds[key];local.folds=folds;*out=local;return YES;}return NO;}
|
||||
- (BOOL)setCustomParameterValue:(id)v toParameter:(UInt32)pid atTime:(CMTime)t{if(!_depth)return NO;NSMutableDictionary *n=(id)[self node];if(!n)return NO;if(pid==DYAssetsParameterID&&[v isKindOfClass:DYAssetState.class]){n[@"paths"]=DYMutablePlist([v paths]);if([v spiderMesh])n[@"spider"]=[v spiderMesh];else[n removeObjectForKey:@"spider"];n[@"spiderLinked"]=@([v spiderLinked]);return YES;}if(pid==DYInspectorParameterID){DYInspectorToken *old=nil;[[_host apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&old fromParameter:pid atTime:t];[_token release];_token=old?[old copy]:[DYInspectorToken new];NSMutableDictionary *folds=[[_token.folds mutableCopy]autorelease];for(NSString *key in [v folds])folds[[_nodeID stringByAppendingFormat:@":%@",key]]=[v folds][key];_token.folds=folds;return YES;}return NO;}
|
||||
@end
|
||||
|
||||
#import "DYTheme.h"
|
||||
@interface DYModuleStrengthControl (Gesture)
|
||||
- (void)beginStrengthGesture;
|
||||
- (void)endStrengthGesture;
|
||||
@end
|
||||
@interface DYModuleStrengthSlider : NSSlider @end
|
||||
@implementation DYModuleStrengthSlider
|
||||
- (void)mouseDown:(NSEvent*)event{[self.target performSelector:@selector(beginStrengthGesture)];@try{[super mouseDown:event];}@finally{[self.target performSelector:@selector(endStrengthGesture)];}}
|
||||
@end
|
||||
@implementation DYModuleStrengthControl {
|
||||
id<PROAPIAccessing> _manager;NSString *_nodeID;NSTextField *_label,*_field;NSSlider *_slider;NSButton *_reset;BOOL _editing,_grouped;CMTime _editTime;
|
||||
}
|
||||
- (BOOL)isFlipped{return YES;}
|
||||
- (instancetype)initWithManager:(id<PROAPIAccessing>)manager nodeID:(NSString*)nodeID{
|
||||
if((self=[super initWithFrame:NSMakeRect(0,0,280,30)])){
|
||||
_manager=manager;_nodeID=[nodeID copy];self.accessibilityLabel=@"模块整体强度";
|
||||
_label=[NSTextField labelWithString:@"强度"];_label.font=[NSFont systemFontOfSize:11];[self addSubview:_label];
|
||||
_slider=[[[DYModuleStrengthSlider alloc]initWithFrame:NSZeroRect]autorelease];_slider.minValue=0;_slider.maxValue=100;_slider.continuous=YES;_slider.target=self;_slider.action=@selector(strengthChanged:);_slider.accessibilityLabel=@"模块整体强度百分比";[self addSubview:_slider];
|
||||
_field=[[[NSTextField alloc]initWithFrame:NSZeroRect]autorelease];_field.font=[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular];_field.alignment=NSTextAlignmentRight;_field.target=self;_field.action=@selector(strengthChanged:);_field.accessibilityLabel=@"模块整体强度百分比";[self addSubview:_field];
|
||||
_reset=[NSButton buttonWithTitle:@"↺" target:self action:@selector(resetStrength:)];_reset.bordered=NO;_reset.toolTip=@"还原整体强度为 100%";_reset.accessibilityLabel=_reset.toolTip;[self addSubview:_reset];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(strengthModelChanged:) name:DYModelChanged object:manager];
|
||||
[self strengthModelChanged:nil];[self resizeSubviewsWithOldSize:NSZeroSize];
|
||||
}return self;
|
||||
}
|
||||
- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[super dealloc];}
|
||||
- (void)resizeSubviewsWithOldSize:(NSSize)old{CGFloat w=self.bounds.size.width;_label.frame=NSMakeRect(0,7,32,18);_slider.frame=NSMakeRect(38,6,MAX(26,w-126),20);_field.frame=NSMakeRect(MAX(65,w-81),3,54,24);_reset.frame=NSMakeRect(w-24,3,24,24);}
|
||||
- (void)refreshWithDocument:(NSDictionary*)doc{if(_editing)return;double amount=DYToolStrength(doc,_nodeID)*100;_slider.doubleValue=amount;_field.stringValue=[NSString stringWithFormat:@"%.0f%%",amount];_label.textColor=DYThemeColor(@"text");_slider.toolTip=@"0% 旁路本模块,100% 完整应用;保留原参数与蒙版";}
|
||||
- (void)strengthModelChanged:(NSNotification*)note{if(_editing||!_manager)return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{[self refreshWithDocument:DYReadTools(_manager,a.currentTime).document];}@finally{[a endAction:self];}}
|
||||
- (void)beginStrengthGesture{if(_editing)return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{_editTime=a.currentTime;_grouped=[[_manager apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"调整模块整体强度"];_editing=YES;}@finally{[a endAction:self];}}
|
||||
- (void)endStrengthGesture{if(!_editing)return;id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];@try{if(_grouped)[[_manager apiForProtocol:@protocol(FxUndoAPI)]endUndoGroup];_grouped=NO;_editing=NO;}@finally{[a endAction:self];}[self strengthModelChanged:nil];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];}
|
||||
- (void)strengthChanged:(NSControl*)sender{
|
||||
double amount=sender.doubleValue;if(sender==_field){NSString *text=[_field.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];if([text hasSuffix:@"%"]||[text hasSuffix:@"%"])text=[text substringToIndex:text.length-1];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&amount]||!scanner.isAtEnd||!std::isfinite(amount)){NSBeep();[self strengthModelChanged:nil];return;}}
|
||||
if(!std::isfinite(amount))return;amount=MAX(0.,MIN(100.,amount));BOOL discrete=!_editing;if(discrete)[self beginStrengthGesture];
|
||||
id<FxCustomParameterActionAPI_v4>a=[_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL written=NO;[a startAction:self];@try{if(CMTimeCompare(a.currentTime,_editTime)==0){NSMutableDictionary *doc=DYMutablePlist(DYReadTools(_manager,a.currentTime).document);if(DYSetToolStrength(doc,_nodeID,amount/100))written=DYWriteTools(_manager,doc,a.currentTime);}}@finally{[a endAction:self];}
|
||||
if(written){_slider.doubleValue=amount;_field.stringValue=[NSString stringWithFormat:@"%.0f%%",amount];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:_manager];}else NSBeep();if(discrete)[self endStrengthGesture];
|
||||
}
|
||||
- (void)resetStrength:(id)sender{_field.stringValue=@"100%";[self strengthChanged:_field];}
|
||||
@end
|
||||
在新工单中引用
屏蔽一个用户