fix: replay paused scopes and bound per-pixel face masks

这个提交包含在:
mac 于 2026-11-08 16:41:55 +08:00 提交
1 父节点 cdf6ddc1d7
当前提交 8a434b8e40
14 个文件已更改
+105 -52

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

+16 -7
查看文件
@@ -105,7 +105,7 @@ inline float dyToolMaskHSLWeight(float3 source,thread const DYMaskParameters& p)
if(p.flags&DYMaskLightnessEnabled)weight*=dyToolMaskRangeWeight(hsl.z,p.lightnessRange);
return weight;
}
inline float dyToolMaskShapeWeight(float x,float y,thread const DYMaskParameters& p,thread const DYMaskPath& path){
inline float dyToolMaskShapeWeight(float x,float y,thread const DYMaskParameters& p,device const DYMaskPath& path){
float dx=(x-p.centerX)*p.imageAspect,dy=y-p.centerY,ca=cos(p.angle),sa=sin(p.angle);
float px=dx*ca+dy*sa,py=-dx*sa+dy*ca;
if(p.kind==DYMaskLinearGradient){
@@ -125,14 +125,14 @@ inline float dyToolMaskShapeWeight(float x,float y,thread const DYMaskParameters
}
if(!inside)return 0;if(p.feather==0)return 1;return dyToolMaskSoftStep(0,p.feather*.5f,sqrt(distance2));
}
inline float dyToolMaskRawCoverage(float x,float y,float3 source,thread const DYMaskParameters& p,thread const DYMaskPath& path){return p.kind==DYMaskHSLKey?dyToolMaskHSLWeight(source,p):(p.kind==DYMaskLumaKey?dyLuma(dyLimit(source)):dyToolMaskShapeWeight(x,y,p,path));}
inline float dyToolMaskOperator(float x,float y,float3 source,thread const DYMaskParameters& p,thread const DYMaskPath& path){
inline float dyToolMaskRawCoverage(float x,float y,float3 source,thread const DYMaskParameters& p,device const DYMaskPath& path){return p.kind==DYMaskHSLKey?dyToolMaskHSLWeight(source,p):(p.kind==DYMaskLumaKey?dyLuma(dyLimit(source)):dyToolMaskShapeWeight(x,y,p,path));}
inline float dyToolMaskOperator(float x,float y,float3 source,thread const DYMaskParameters& p,device const DYMaskPath& path){
if((p.version!=1&&p.version!=2)||p.kind>DYMaskLumaKey)return 0;
float raw=dyToolMaskRawCoverage(x,y,source,p,path);
return dyToolMaskLevels(raw,p);
}
inline float dyToolMask(float x,float y,float3 source,device const DYResolvedMask& value){DYResolvedMask local=value;return dyToolMaskOperator(x,y,source,local.parameters,local.path);}
inline float dyToolMask(float x,float y,float3 source,device const DYResolvedMask& value){DYMaskParameters parameters=value.parameters;return dyToolMaskOperator(x,y,source,parameters,value.path);}
inline float3 dyToolEncode(float3 linear){return select(1.055f*pow(max(linear,float3(0)),float3(1.f/2.4f))-.055f,linear*12.92f,linear<=.0031308f);}
@@ -140,12 +140,21 @@ inline float3 dyToolDecode(float3 encoded){return select(pow(max((encoded+.055f)
inline float dyToolCoverage(float2 uv,float3 source,device const DYToolMaskEntry* masks,constant DYToolMaskHeader& h,int section){
float x=h.offsetX+uv.x*h.scaleX,y=h.offsetY+uv.y*h.scaleY;float coverage=1;bool found=false;
for(uint i=0;i<h.count;i++){if(masks[i].section!=section)continue;
// Copy device data to thread storage; shared mask math accepts constant
// descriptors, so evaluate through the address-space-neutral copy below.
float a=dyToolMask(x,y,source,masks[i].mask);
if(!found){coverage=masks[i].combine==1?1-a:a;found=true;}
else if(masks[i].combine==1)coverage*=1-a;else if(masks[i].combine==2)coverage*=a;else coverage=1-(1-coverage)*(1-a);
}if(section==3&&h.faceOnly){float face=0;for(uint i=0;i<h.count;i++)if(masks[i].section==-100)face=1-(1-face)*(1-dyToolMask(x,y,source,masks[i].mask));for(uint i=0;i<h.count;i++)if(masks[i].section==-101)face*=1-dyToolMask(x,y,source,masks[i].mask);coverage*=face;}return clamp(coverage,0.f,1.f);
}
if(section==3&&h.faceOnly){
float face=0;
for(uint i=0;i<h.count;i++){
device const DYToolMaskEntry &entry=masks[i];
if(entry.section==-100&&x>=entry.minX&&x<=entry.maxX&&y>=entry.minY&&y<=entry.maxY)
face=1-(1-face)*(1-dyToolMask(x,y,source,entry.mask));
}
if(face>0)for(uint i=0;i<h.count;i++)if(masks[i].section==-101)face*=1-dyToolMask(x,y,source,masks[i].mask);
coverage*=face;
}
return clamp(coverage,0.f,1.f);
}
fragment half4 dyMaskedFragment(DYRaster in [[stage_in]],