实现同帧OSC写入、双面板刷新、LUT强度与蒙版形状保持,待验证
这个提交包含在:
1 父节点
4e0ccec6a9
当前提交
c0cddd2b65
21 个文件已更改
+171
-32
没有与搜索条件相匹配的文件
@@ -261,7 +261,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(!active)return NO;
|
||||
id<FxCustomParameterActionAPI_v4>action=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action)return NO;
|
||||
BOOL valid=NO;[action startAction:self];@try{
|
||||
valid=CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)==0&&[self writerValueMatches];
|
||||
valid=CMTIME_IS_NUMERIC(action.currentTime)&&DYHostDisplaysCanvasFrame(_writerHost,action.currentTime,_writerTime)&&[self writerValueMatches];
|
||||
}@finally{[action endAction:self];}return valid;
|
||||
}
|
||||
- (void)beginParameter:(NSDictionary*)descriptor node:(NSString*)nodeID value:(double)value atTime:(CMTime)time {
|
||||
@@ -286,7 +286,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(!action){[host release];return;}
|
||||
id<PROAPIAccessing>target=nil;NSString *type=nil;
|
||||
[action startAction:self];@try{
|
||||
if(CMTIME_IS_NUMERIC(action.currentTime)&&CMTimeCompare(DYHostDisplayedFrameTime(host,action.currentTime),time)==0){
|
||||
if(CMTIME_IS_NUMERIC(action.currentTime)&&DYHostDisplaysCanvasFrame(host,action.currentTime,time)){
|
||||
NSDictionary *doc=DYReadTools(host,time).document;
|
||||
if([node hasPrefix:@"base:"]){type=[node substringFromIndex:5];if([DYToolTypes()containsObject:type]&&!DYBaseToolRemoved(doc,type))target=[host retain];}
|
||||
else{NSDictionary *layer=DYToolWithID(doc,node);if(layer){type=layer[@"type"];target=[[DYToolManager alloc]initWithHost:host node:layer];}}
|
||||
@@ -321,7 +321,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
if(!a){[self closeWriter];return;}
|
||||
BOOL changed=NO,failed=NO;
|
||||
[a startAction:self];@try{
|
||||
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,a.currentTime),_writerTime)!=0||![self writerValueMatches]){failed=YES;}
|
||||
if(!CMTIME_IS_NUMERIC(a.currentTime)||!DYHostDisplaysCanvasFrame(_writerHost,a.currentTime,_writerTime)||![self writerValueMatches]){failed=YES;}
|
||||
else{
|
||||
if(!_writerUndoOpen)_writerUndoOpen=[[_writerHost apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"画面调整 · 蜘蛛盘"];
|
||||
if(_writerUndoOpen){
|
||||
@@ -373,7 +373,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
id<FxCustomParameterActionAPI_v4>action=[_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
|
||||
if(!action){[self closeWriter];return;}BOOL conflict=NO,changed=NO,failed=NO;
|
||||
[action startAction:self];@try{
|
||||
conflict=!CMTIME_IS_NUMERIC(action.currentTime)||CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0||![self writerValueMatches];
|
||||
conflict=!CMTIME_IS_NUMERIC(action.currentTime)||!DYHostDisplaysCanvasFrame(_writerHost,action.currentTime,_writerTime)||![self writerValueMatches];
|
||||
if(!conflict&&anyChanged){
|
||||
id<FxUndoAPI>undo=[_writerHost apiForProtocol:@protocol(FxUndoAPI)];
|
||||
NSString *title=_writerDescriptors.count==1?_writerDescriptors[0][@"title"]:@"图形控件";
|
||||
@@ -445,7 +445,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
NSMutableDictionary *values=[NSMutableDictionary dictionary];
|
||||
NSDictionary *document=nil;
|
||||
[action startAction:self];@try{
|
||||
if(CMTimeCompare(DYHostDisplayedFrameTime(_writerHost,action.currentTime),_writerTime)!=0)return;
|
||||
if(!DYHostDisplaysCanvasFrame(_writerHost,action.currentTime,_writerTime))return;
|
||||
if(base)for(NSDictionary *d in _writerDescriptors){
|
||||
double value=NAN;
|
||||
if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!std::isfinite(value))return;
|
||||
|
||||
在新工单中引用
屏蔽一个用户