WIP: merge CST controls, port variable spider and restore primary balance wheel; regression pending

这个提交包含在:
mac 于 2026-11-01 20:15:26 +08:00 提交
1 父节点 cf5a97cac9
当前提交 ac164245aa
23 个文件已更改
+689 -53

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

+1 -1
查看文件
@@ -20,7 +20,7 @@ CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
def sha(data):return hashlib.sha256(data).hexdigest()
def model_identity():
files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','template/tools/dump_model.mm']
files=['大鱼调色/Plugin/DYModel.h','大鱼调色/Plugin/DYModel.mm','大鱼调色/Plugin/DYUniforms.h','大鱼调色/Plugin/DYColorManagement.h','大鱼调色/Plugin/DYCSTTypes.h','大鱼调色/Plugin/DYSpiderState.h','大鱼调色/Plugin/SpiderCore/DYColorMath.h','大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp','template/tools/dump_model.mm']
return {name:sha((ROOT/name).read_bytes()) for name in files}
def refresh_metadata():
+1 -1
查看文件
@@ -93,7 +93,7 @@ static Pixels render(id<MTLRenderPipelineState> pipeline, bool dayu, id<MTLTextu
[e setFragmentTexture:source atIndex:0];
for (NSUInteger i=0;i<textures.count;++i) [e setFragmentTexture:textures[i] atIndex:i+1];
[e setFragmentBytes:&u length:sizeof(u) atIndex:0]; float scene=.73f; [e setFragmentBytes:&scene length:4 atIndex:1];
if(dayu) { DYRenderOptions options={}; options.outputPremultiplied=premultiplied; [e setFragmentBytes:&options length:sizeof(options) atIndex:2];[e setFragmentBytes:&u length:sizeof(u) atIndex:3]; }
if(dayu) { DYRenderOptions options={}; options.outputPremultiplied=premultiplied; [e setFragmentBytes:&options length:sizeof(options) atIndex:2];[e setFragmentBytes:&u length:sizeof(u) atIndex:3];float empty[2]={0,0};simd_int2 size={0,0};[e setFragmentBytes:empty length:sizeof(empty) atIndex:4];[e setFragmentBytes:&size length:sizeof(size) atIndex:5]; }
else { float disabledWatermark[8]={}; [e setFragmentBytes:disabledWatermark length:sizeof(disabledWatermark) atIndex:2]; }
[e drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4]; [e endEncoding]; finish(commands);
Pixels output(width*height*4); [destination getBytes:output.data() bytesPerRow:width*8 fromRegion:MTLRegionMake2D(0,0,width,height) mipmapLevel:0]; return output;
+32
查看文件
@@ -0,0 +1,32 @@
// Reused sibling topology/math checks; source recorded in SpiderAndBalanceSources.json.
#import <Metal/Metal.h>
#import <Foundation/Foundation.h>
#include "../大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp"
#include <cstdio>
#include <cstdlib>
#include <random>
static int checks=0;
static void require(bool value,const char*why){checks++;if(!value){fprintf(stderr,"FAIL %s\n",why);exit(1);}}
int main(){@autoreleasepool{
static_assert(sizeof(dy::SpiderMesh)==4988,"archive ABI");
NSString*source=[NSString stringWithContentsOfFile:@"大鱼调色/Plugin/SpiderCore/DYColorMath.h" encoding:NSUTF8StringEncoding error:nil];
source=[source stringByAppendingString:@"\nkernel void meshProbe(device const float4*input[[buffer(0)]],device float4*out[[buffer(1)]],constant int2&size[[buffer(2)]],device const float*samples[[buffer(3)]],uint i[[thread_position_in_grid]]){out[i]=float4(dyVariableSpider(input[i].xyz,size.x,size.y,samples),1);}\n"];
NSError*error=nil;id<MTLDevice>device=MTLCreateSystemDefaultDevice();require(device,"Metal device");MTLCompileOptions*options=[MTLCompileOptions new];options.fastMathEnabled=NO;id<MTLLibrary>lib=[device newLibraryWithSource:source options:options error:&error];if(!lib)fprintf(stderr,"%s\n",error.localizedDescription.UTF8String);require(lib,"shared polar implementation compiles for Metal");id<MTLComputePipelineState>pipeline=[device newComputePipelineStateWithFunction:[lib newFunctionWithName:@"meshProbe"] error:&error];require(pipeline,"Metal pipeline");id<MTLCommandQueue>queue=[device newCommandQueue];
std::vector<simd_float4>corpus;std::mt19937 rng(571030);std::uniform_real_distribution<float>values(-.2,4);
for(int i=0;i<1000;i++){auto rgb=dyHSVRGB(float3{float(i)/1000,float(i%71)/70,1});corpus.push_back(simd_float4{rgb.x,rgb.y,rgb.z,1});corpus.push_back(simd_float4{values(rng),values(rng),values(rng),1});}
for(float gray:{0.f,.001f,.5f,1.f,4.f})corpus.push_back(simd_float4{gray,gray,gray,1});
id<MTLBuffer>input=[device newBufferWithBytes:corpus.data() length:corpus.size()*sizeof(simd_float4) options:MTLResourceStorageModeShared],output=[device newBufferWithLength:corpus.size()*sizeof(simd_float4) options:MTLResourceStorageModeShared];float maxError=0;int grids=0;
for(int hues:{6,8,12,16,24})for(int saturation:{6,8,12,16,24}){
auto neutral=dy::neutralMesh(hues,saturation);require(dy::validMesh(neutral),"all 25 supported topologies validate");auto samples=dy::meshSamples(neutral);
for(auto c:corpus){auto n=dyVariableSpider(float3{c.x,c.y,c.z},hues,saturation-1,samples.data());require(n.x==c.x&&n.y==c.y&&n.z==c.z,"every neutral grid is exact identity including HDR and gray");}
std::bitset<dy::SpiderMeshCapacity>selection;selection[2]=1;auto moved=dy::moveMesh(neutral,selection,-.035,.04);require(moved.pins[2]&&moved.x[0]<neutral.x[0]&&moved.x[saturation-1]==neutral.x[saturation-1],"one anchor moves free spoke points and leaves neighboring hue fixed");require(moved.x[saturation-2]==neutral.x[saturation-2],"outer boundary stays constrained");samples=dy::meshSamples(moved);
id<MTLBuffer>buffer=[device newBufferWithBytes:samples.data() length:samples.size()*sizeof(float) options:MTLResourceStorageModeShared];simd_int2 size={hues,saturation-1};id<MTLCommandBuffer>cmd=[queue commandBuffer];id<MTLComputeCommandEncoder>enc=[cmd computeCommandEncoder];[enc setComputePipelineState:pipeline];[enc setBuffer:input offset:0 atIndex:0];[enc setBuffer:output offset:0 atIndex:1];[enc setBytes:&size length:sizeof(size) atIndex:2];[enc setBuffer:buffer offset:0 atIndex:3];[enc dispatchThreads:MTLSizeMake(corpus.size(),1,1) threadsPerThreadgroup:MTLSizeMake(64,1,1)];[enc endEncoding];[cmd commit];[cmd waitUntilCompleted];require(cmd.status==MTLCommandBufferStatusCompleted,"Metal dispatch completed");const auto*gpu=(const simd_float4*)output.contents;int changed=0;
for(size_t i=0;i<corpus.size();i++){auto c=corpus[i];auto cpu=dyVariableSpider(float3{c.x,c.y,c.z},hues,saturation-1,samples.data());for(int k=0;k<3;k++){float relative=fabs(cpu[k]-gpu[i][k])/std::max(1.f,fabs(cpu[k]));maxError=std::max(maxError,relative);require(std::isfinite(gpu[i][k])&&relative<5e-5,"CPU Metal parity for each deformed grid");}changed+=fabs(cpu.x-c.x)+fabs(cpu.y-c.y)+fabs(cpu.z-c.z)>.001;}
require(changed>0,"grid edit changes visible colors");grids++;
// Uniform translation survives resampling between every pair of resolutions.
auto translated=neutral;for(int i=0;i<dy::meshCount(translated);i++){translated.x[i]+=.02;translated.y[i]-=.01;}
auto other=dy::resampleMesh(translated,saturation,hues);for(int i=0;i<dy::meshCount(other);i++){auto q=dy::meshNeutral(other,i);require(fabs(other.x[i]-q.x-.02)<2e-7&&fabs(other.y[i]-q.y+.01)<2e-7,"resampling preserves displacement including seam center and outer boundary");}
}
auto legacy=dyDefaultGrade();legacy.spiderX[7]+=.04;auto mesh=dy::legacyMesh(legacy);auto projected=dy::meshLegacyGrade(legacy,mesh);require(!memcmp(&legacy,&projected,sizeof(legacy)),"legacy grid no-op projection preserves every byte");auto invalid=mesh;invalid.hues=7;require(!dy::validMesh(invalid),"invalid resolution rejected");invalid=mesh;invalid.x[0]=NAN;require(!dy::validMesh(invalid),"nonfinite coordinate rejected");invalid=mesh;invalid.pins[4]=0;require(!dy::validMesh(invalid),"missing boundary constraint rejected");
printf("PASS spider_mesh: %d assertions, %d topologies, %lu colors/grid, CPU/Metal max relative error %.9g\n",checks,grids,(unsigned long)corpus.size(),maxError);
}}