精简跟踪预览并完善主题及零强度旁路,准备143正式交付
这个提交包含在:
1 父节点
afff5cb5f3
当前提交
e6e5407b7a
6 个文件已更改
+8
-7
没有与搜索条件相匹配的文件
@@ -253,7 +253,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
- (void)previewChanged:(NSNotification *)notification{if(_visible&&_editorMode==2)[_browser updatePreview:[_renderer lookLUTPreviewFrames]];}
|
||||
- (void)themeChanged:(NSNotification *)notification{[self updatePalette];}
|
||||
- (void)updatePalette{
|
||||
[_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()];
|
||||
_root.appearance=[NSAppearance appearanceNamed:DYThemeIsLight()?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];[_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation,_screenHint,_screenStatus,_levelNumbers])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()];
|
||||
}
|
||||
- (void)ensureBrowser{
|
||||
if(_browser.visible)return;[_browser release];_browser=nil;id<FxCustomParameterActionAPI_v4> action=[[self lutManager] apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action){[self reportError:@"宿主暂时无法读取风格1"];return;}
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
- (BOOL)renderToolsSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(!tools)tools=@{@"schema":@1,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");
|
||||
if(tools[@"sharedMasks"])tools=DYResolvedToolDocument(tools);
|
||||
NSMutableDictionary *weighted=[[tools mutableCopy]autorelease],*baseWeights=[NSMutableDictionary dictionaryWithDictionary:tools[@"baseMasks"]?:@{}];for(NSString *type in DYToolTypes()){double amount=DYToolStrength(tools,[@"base:" stringByAppendingString:type]);if(amount<1)baseWeights[type]=DYToolStrengthMasks(baseWeights[type],amount);}weighted[@"baseMasks"]=baseWeights;NSMutableArray *weightedLayers=[NSMutableArray array];for(NSDictionary *node in tools[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];double amount=DYToolStrength(tools,node[@"id"]);copy[@"masks"]=DYToolStrengthMasks(node[@"masks"],amount);copy[@"renderStrength"]=@(amount);[weightedLayers addObject:copy];}weighted[@"layers"]=weightedLayers;tools=weighted;
|
||||
NSMutableDictionary *weighted=[[tools mutableCopy]autorelease],*baseWeights=[NSMutableDictionary dictionaryWithDictionary:tools[@"baseMasks"]?:@{}];for(NSString *type in DYToolTypes()){double amount=DYToolStrength(tools,[@"base:" stringByAppendingString:type]);if(amount<1)baseWeights[type]=DYToolStrengthMasks(baseWeights[type],amount);}weighted[@"baseMasks"]=baseWeights;NSMutableArray *weightedLayers=[NSMutableArray array];for(NSDictionary *node in tools[@"layers"]){NSMutableDictionary *copy=[[node mutableCopy]autorelease];double amount=DYToolStrength(tools,node[@"id"]);copy[@"masks"]=DYToolStrengthMasks(node[@"masks"],amount);copy[@"renderStrength"]=@(amount);[weightedLayers addObject:copy];}weighted[@"layers"]=weightedLayers;NSMutableArray *bypassed=[NSMutableArray arrayWithArray:tools[@"removedBase"]?:@[]];for(NSString *type in DYToolTypes())if(DYToolStrength(tools,[@"base:" stringByAppendingString:type])==0&&![bypassed containsObject:type])[bypassed addObject:type];if(bypassed.count)weighted[@"removedBase"]=bypassed;tools=weighted;
|
||||
DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
|
||||
NSMutableSet *activeIDs=nil;BOOL anchored=NO;
|
||||
for(NSDictionary *node in tools[@"layers"])if([node[@"renderStrength"]doubleValue]>0&&!DYToolIsNeutral(node)){
|
||||
|
||||
@@ -525,7 +525,7 @@ BOOL DYToolIsNeutral(NSDictionary *node){NSString *type=node[@"type"];DYUniforms
|
||||
@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)];}}
|
||||
- (void)mouseDown:(NSEvent*)event{id target=[self.target retain];[target performSelector:@selector(beginStrengthGesture)];@try{[super mouseDown:event];}@finally{[target performSelector:@selector(endStrengthGesture)];[target release];}}
|
||||
@end
|
||||
@implementation DYModuleStrengthControl {
|
||||
id<PROAPIAccessing> _manager;NSString *_nodeID;NSTextField *_label,*_field;NSSlider *_slider;NSButton *_reset;BOOL _editing,_grouped;CMTime _editTime;
|
||||
|
||||
@@ -156,9 +156,9 @@
|
||||
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
|
||||
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
|
||||
_progress.frame=NSMakeRect(8,28,body,10);
|
||||
_status.frame=NSMakeRect(8,43,body,64);
|
||||
_preview.frame=NSMakeRect(8,112,body,MAX(1,h-138));
|
||||
_detail.frame=NSMakeRect(8,MAX(112,h-22),body,18);
|
||||
BOOL compact=h<280;_status.maximumNumberOfLines=compact?1:3;_status.frame=NSMakeRect(8,compact?38:43,body,compact?18:52);
|
||||
CGFloat previewTop=compact?60:102;_preview.frame=NSMakeRect(8,previewTop,body,MAX(1,h-previewTop-24));
|
||||
_detail.frame=NSMakeRect(8,MAX(previewTop,h-20),body,18);
|
||||
}
|
||||
- (void)applyUpdate:(NSDictionary *)info {
|
||||
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
|
||||
|
||||
@@ -204,6 +204,7 @@
|
||||
nativeField.stringValue=@"62%";[nativeField sendAction:nativeField.action to:nativeField.target];workspaceDrain();run.record(@"module-strength-inspector-to-workspace-and-host",fabs(DYToolStrength(DYReadTools(stackHost,kCMTimeZero).document,curveID)-.62)<1e-8&&[field.stringValue isEqual:@"62%"]);
|
||||
nativeField.stringValue=@"100%";[nativeField sendAction:nativeField.action to:nativeField.target];workspaceDrain();
|
||||
}
|
||||
undo=stackHost->_undoStarts;
|
||||
NSDictionary *beforeCurve=DYReadTools(stackHost,kCMTimeZero).document;
|
||||
[curveEditor graphicGesture:YES title:@"测试曲线手势"];
|
||||
[curveEditor writeGraphicValues:@{@"masterX0":@.3,@"curveY0":@12}];
|
||||
|
||||
在新工单中引用
屏蔽一个用户