feat: wire canvas HSL and spider editors, face support and lens repair (validation pending)

这个提交包含在:
mac 于 2026-11-05 01:28:18 +08:00 提交
1 父节点 e2aa0bd9a1
当前提交 a3bd2ceb26
19 个文件已更改
+245 -43

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

@@ -1,3 +1,6 @@
#include "DYSpiderState.h"
#import "DYHistogram.h"
// The OSC side publishes values and enqueues intent. Only the main queue enters
// host actions; no OSC/render callback waits for AppKit or a host model write.
@interface DYViewerParameterBridge : NSObject
@@ -14,6 +17,10 @@
// Call before the owning plug-in releases this object during teardown.
- (void)invalidate;
- (void)requestWorkspace;
- (void)requestTool:(NSString*)type;
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time;
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
- (void)changeSpider:(NSData*)mesh;
@end
static BOOL DYViewerSameValue(double a,double b) {
@@ -59,7 +66,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
NSString *_writerNode,*_writerType;
CMTime _writerTime;
uint64_t _writerGesture;
BOOL _writerUndoOpen;
BOOL _writerUndoOpen,_writerSpider; NSData *_writerLastMesh;
}
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager {
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;}return self;
@@ -71,6 +78,13 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
[_snapshot release];[_sourceDocument release];[_writerHost release];[_writerTarget release];
[_writerDescriptors release];[_writerLastValues release];[_writerCompanions release];[_writerNode release];[_writerType release];[super dealloc];
}
- (void)publishAssets:(DYAssetState*)assets histogram:(NSData*)histogram atTime:(CMTime)time {
@synchronized(self){if(_invalidated||!_snapshot||CMTimeCompare(time,_snapshotTime)!=0)return;NSMutableDictionary *next=[[_snapshot mutableCopy]autorelease];next[@"spider"]=assets.spiderMesh?:[NSData data];if(histogram)next[@"histogram"]=histogram;[_snapshot release];_snapshot=[next copy];}
}
- (void)requestTool:(NSString*)type {
if(![DYToolTypes()containsObject:type])return;
dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYViewerToolRequested" object:manager userInfo:@{@"type":type}];});
}
- (void)requestWorkspace{
dispatch_async(dispatch_get_main_queue(),^{id manager=nil;@synchronized(self){if(!_invalidated)manager=_apiManager;}if(manager)[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:manager];});
}
@@ -111,7 +125,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
id<FxCustomParameterActionAPI_v4>action=[_writerHost apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
[action startAction:self];@try{[[_writerHost apiForProtocol:@protocol(FxUndoAPI)]endUndoGroup];}@finally{[action endAction:self];}
}
_writerUndoOpen=NO;_writerGesture=0;_writerTime=kCMTimeInvalid;
_writerUndoOpen=NO;_writerSpider=NO;[_writerLastMesh release];_writerLastMesh=nil;_writerGesture=0;_writerTime=kCMTimeInvalid;
[_writerHost release];_writerHost=nil;[_writerTarget release];_writerTarget=nil;
[_writerDescriptors release];_writerDescriptors=nil;[_writerLastValues release];_writerLastValues=nil;
[_writerCompanions release];_writerCompanions=nil;
@@ -124,6 +138,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
}
- (BOOL)writerValueMatches {
if(![self writerNodeExists])return NO;
if(_writerSpider){NSData *current=DYReadAssets(_writerTarget,_writerTime).spiderMesh?:[NSData data];if(![current isEqual:_writerLastMesh])return NO;}
id<FxParameterRetrievalAPI_v6>get=[_writerTarget apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
for(NSDictionary *d in _writerDescriptors){double value=NAN;
if(![get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue] atTime:_writerTime]||!DYViewerSameValue(value,[_writerLastValues[d[@"key"]]doubleValue]))return NO;
@@ -180,6 +195,33 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
});
[node release];[selected release];[initial release];
}
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time {
if(mesh.length&&!DYSpiderMeshIsValid(mesh))return;NSDictionary *descriptor=nil;for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"spiderEnabled"])descriptor=d;
if(!descriptor)return;[self beginParameter:descriptor node:node value:enabled atTime:time];uint64_t gesture;@synchronized(self){gesture=_requestedGesture;}NSData *original=[mesh copy]?:[NSData new];
dispatch_async(dispatch_get_main_queue(),^{if(self->_writerGesture==gesture&&[self->_writerType isEqual:@"spider"]){self->_writerSpider=YES;self->_writerLastMesh=[original copy];if(![self writerStillValid])[self closeWriter];}});[original release];
}
- (void)changeSpider:(NSData*)mesh {
if(!DYSpiderMeshIsValid(mesh))return;NSData *frozen=[mesh copy];uint64_t gesture;@synchronized(self){gesture=_invalidated?0:_requestedGesture;}
if(gesture)dispatch_async(dispatch_get_main_queue(),^{
if(self->_writerGesture!=gesture||!self->_writerSpider)return;
if(![self writerStillValid]){[self closeWriter];return;}
if([frozen isEqual:self->_writerLastMesh])return;
id<FxCustomParameterActionAPI_v4>a=[self->_writerTarget apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL changed=NO,failed=NO;
[a startAction:self];@try{
if(!CMTIME_IS_NUMERIC(a.currentTime)||CMTimeCompare(a.currentTime,self->_writerTime)!=0||![self writerValueMatches]){failed=YES;}
else{
if(!self->_writerUndoOpen)self->_writerUndoOpen=[[self->_writerHost apiForProtocol:@protocol(FxUndoAPI)]startUndoGroup:@"画面调整 · 蜘蛛盘"];
if(self->_writerUndoOpen){DYAssetState *old=DYReadAssets(self->_writerTarget,self->_writerTime);DYAssetState *next=[[old copy]autorelease];next.spiderMesh=frozen;
failed=!DYWriteAssets(self->_writerTarget,next,self->_writerTime);
if(failed)DYWriteAssets(self->_writerTarget,old,self->_writerTime);else changed=YES;
}
}
}@finally{[a endAction:self];}
// Re-read after DYToolManager commits its document at the outer boundary.
if(changed){NSData *actual=DYReadAssets(self->_writerTarget,self->_writerTime).spiderMesh;if(![actual isEqual:frozen])failed=YES;else{[self->_writerLastMesh release];self->_writerLastMesh=[frozen copy];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];}}
if(failed)[self closeWriter];
});[frozen release];
}
- (void)writeValues:(NSDictionary<NSString*,NSNumber*>*)values gesture:(uint64_t)gesture {
NSCAssert(NSThread.isMainThread,@"Host writes require the main queue");
if(!_writerGesture||gesture!=_writerGesture||values.count!=_writerDescriptors.count)return;