feat: overlay live vectorscope on spider disc and default skin protection off
这个提交包含在:
1 父节点
b34ef54ad8
当前提交
01efcc8a29
43 个文件已更改
+281
-67
没有与搜索条件相匹配的文件
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -1294,7 +1294,8 @@
|
||||
"title": "显示肤色保护区域"
|
||||
},
|
||||
{
|
||||
"default": 1,
|
||||
"default": 0,
|
||||
"hostDefault": 1,
|
||||
"key": "skinEnabled",
|
||||
"kind": "bool",
|
||||
"max": 1,
|
||||
@@ -3718,10 +3719,10 @@
|
||||
"大鱼调色/Plugin/DYManagedColor.h": "1f435e32ee8b6f74fbc6c588f3564cc794ce100d1aae821075c115b33bb24412",
|
||||
"大鱼调色/Plugin/DYManagedColor.mm": "0d2527b18589f63d63d16fd64c47a70c5973994fb3841a3246631c7e836ea8e8",
|
||||
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
|
||||
"大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1",
|
||||
"大鱼调色/Plugin/DYModel.mm": "327eb427759eaac8d04de39c09c416c0c68e7cac636978c864bdd103d297aec7",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "96eff1bd54be127e527595da7cbf38e58f4dfd4a16c9491d8630f7b1d1045c84",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "a0bf1a613e280a56ade97303e87f376878e459debd68f72adc0895d6bf67ad61",
|
||||
"大鱼调色/Plugin/DYToolState.h": "da71b283a5a0cc05ad8b1e554a105d0196f3283c4e31f0c5521204d74100b882",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "c36d2e91353f2b179be5a9df8c248ce34dbfb7e73cba913754f9d1675f2a3375",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"nativeReference": {
|
||||
@@ -18,7 +18,7 @@
|
||||
},
|
||||
"staticContract": {
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
@@ -55,7 +55,7 @@
|
||||
},
|
||||
"savedSelection": {
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"selectionMask": "0x10000001",
|
||||
"projectID": "10000",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"passed": true,
|
||||
"sha256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
|
||||
"sha256": "48d9ff4883cf189ae0a54b5cf412a898beb97b38d29d6cbc745d6cfa613dce60",
|
||||
"version": "5.11",
|
||||
"displayversion": "5.4.5",
|
||||
"filterCount": 1,
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -308,7 +308,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@
|
||||
<parameter name="肤色色相" id="2118" flags="12889161760" default="28" value="28" />
|
||||
<parameter name="仅保护人脸肤色" id="2333" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="显示肤色保护区域" id="2334" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肤色保护" id="2116" flags="12889161760" default="1" value="0" />
|
||||
<parameter name="风格 1 强度" id="2015" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 启用" id="2040" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 2 强度" id="2016" flags="12889161760" default="1" value="1" />
|
||||
|
||||
@@ -54,7 +54,7 @@ if(faceFixture.length){
|
||||
// Both FxPlug row conventions must resolve the same visual face.
|
||||
Pixels flipped(portrait.size());for(NSUInteger y=0;y<h;y++)memcpy(flipped.data()+y*w*4,portrait.data()+(h-1-y)*w*4,w*8);upload(flipped);[src setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];[dst setDiagnosticImageOrigin:kFxImageOrigin_BOTTOM_LEFT];u.skinVisualize=0;Pixels bottom=render(run,face,src,dst,gpu,u,@{},@"face-bottom-origin-production-render");double flipError=0;for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w*4;x++)flipError=MAX(flipError,fabs((float)bottom[(h-1-y)*w*4+x]-(float)protectedFrame[y*w*4+x]));run.record(@"face-top-and-bottom-origins-protect-identical-visual-region",flipError<.003,@{@"maximumError":@(flipError)});[src setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];[dst setDiagnosticImageOrigin:kFxImageOrigin_TOP_LEFT];upload(portrait);
|
||||
NSMutableDictionary *masked=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *zero=DYMutablePlist(DYNewMask(DYMaskRectangle));DYMaskParameters zeroP=DYMaskAtTime(zero,kCMTimeZero);zeroP.strength=0;zero[@"parameters"]=[NSData dataWithBytes:&zeroP length:sizeof(zeroP)];masked[@"baseMasks"][@"skin"]=[NSMutableArray arrayWithObject:zero];u.skinVisualize=1;NSError *maskError=nil;BOOL maskOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:masked error:&maskError];Pixels empty=read(dst,gpu);double emptyMax=0;for(NSUInteger i=0;i<w*h;i++)emptyMax=MAX(emptyMax,(float)empty[i*4]);run.record(@"face-preview-respects-authored-zero-strength-mask",maskOK&&emptyMax<.001);
|
||||
u.skinVisualize=0;u.skinProtection.x=0;NSMutableDictionary *layers=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *skin=(id)DYInsertTool(layers,@"skin",@"base:skin");skin[@"values"][@"skinStrength"]=@100;skin[@"values"][@"skinVisualize"]=@1;BOOL layerOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:layers error:&maskError];Pixels layerMask=read(dst,gpu);double layerFace=0,layerBackground=0;for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)layerFace=MAX(layerFace,(float)layerMask[(y*w+x)*4]);for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)layerBackground=MAX(layerBackground,(float)layerMask[(y*w+x)*4]);run.record(@"face-independent-layer-uses-own-preview-and-face-mask",layerOK&&layerFace>.01&&layerBackground<.001);
|
||||
u.skinVisualize=0;u.skinProtection.x=0;NSMutableDictionary *layers=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSMutableDictionary *skin=(id)DYInsertTool(layers,@"skin",@"base:skin");skin[@"values"][@"skinEnabled"]=@1;skin[@"values"][@"skinStrength"]=@100;skin[@"values"][@"skinVisualize"]=@1;BOOL layerOK=[face renderSource:src destination:dst uniforms:u paths:@{}spider:nil tools:layers error:&maskError];Pixels layerMask=read(dst,gpu);double layerFace=0,layerBackground=0;for(NSUInteger y=65;y<185;y++)for(NSUInteger x=175;x<275;x++)layerFace=MAX(layerFace,(float)layerMask[(y*w+x)*4]);for(NSUInteger y=410;y<470;y++)for(NSUInteger x=410;x<470;x++)layerBackground=MAX(layerBackground,(float)layerMask[(y*w+x)*4]);run.record(@"face-independent-layer-uses-own-preview-and-face-mask",layerOK&&layerFace>.01&&layerBackground<.001);
|
||||
DYDiagnosticTile *twoSource=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:1024 height:512]autorelease],*twoDest=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:1024 height:512]autorelease];Pixels two(1024*512*4);for(NSUInteger y=0;y<512;y++)for(NSUInteger x=0;x<1024;x++)memcpy(two.data()+(y*1024+x)*4,portrait.data()+(y*512+x%512)*4,8);[[twoSource metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,1024,512)mipmapLevel:0 withBytes:two.data()bytesPerRow:1024*8];u.skinProtection.x=1;BOOL twoOK=[face renderSource:twoSource destination:twoDest uniforms:u paths:@{}error:&maskError];NSData *twoEntries=[face valueForKey:@"faceEntries"];const DYToolMaskEntry *twoMasks=(const DYToolMaskEntry*)twoEntries.bytes;NSInteger faceCount=0;for(NSUInteger i=0;i<twoEntries.length/sizeof(*twoMasks);i++)faceCount+=twoMasks[i].section==-100;run.record(@"face-multiple-people-build-independent-support-regions",twoOK&&faceCount==2,@{@"faces":@(faceCount)});
|
||||
NSMutableDictionary *privacy=DYMutablePlist(DYInitialToolDocument(nil));privacy[@"mosaic"]=@{@"enabled":@YES,@"source":@"face",@"size":@64};DYUniforms privacyU=defaults;privacyU.primarySectionEnabled=0;privacyU.skinProtection.x=0;
|
||||
BOOL privacyOK=[face renderSource:src destination:dst uniforms:privacyU paths:@{} spider:nil tools:privacy colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&maskError];Pixels privateFrame=read(dst,gpu);
|
||||
|
||||
+12
-2
@@ -1,4 +1,5 @@
|
||||
#import "DYScopeSample.h"
|
||||
#include "DYScopeMath.hpp"
|
||||
#include "DYScopeDisplayTime.h"
|
||||
#import "DYHistogram.h"
|
||||
#include "DYFilmMath.h"
|
||||
@@ -214,8 +215,8 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
run.need(@"finite-real-model-defaults",finite&&matches);
|
||||
run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22&&defaults.cm.toneMapping==1);
|
||||
bool initialGroups=true;
|
||||
for(NSDictionary *section in sections){BOOL base=YES;for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;}
|
||||
run.record(@"all-module-eyes-enabled-by-default",initialGroups);
|
||||
for(NSDictionary *section in sections){BOOL base=![section[@"key"]isEqual:@"skin"];for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;}
|
||||
run.record(@"module-eyes-enabled-by-default-except-skin",initialGroups);
|
||||
DYDiagnosticManager *manager=[[[DYDiagnosticManager alloc]init]autorelease];error=nil;
|
||||
run.need(@"native-parameter-creation",DYCreateParameters(manager,&error)&&!manager->_duplicate&&manager->_values.count==descriptors.count&&manager->_custom.count==4,@{@"error":reason(error)});
|
||||
id<FxParameterSettingAPI_v6> setter=[manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];id<FxParameterRetrievalAPI_v6> getter=[manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
@@ -224,6 +225,15 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
|
||||
[setter setFloatValue:1 toParameter:mappingPID atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&mappingRead);storedMapping&=mappingRead.cm.toneMapping==1;
|
||||
[setter setFloatValue:0 toParameter:mappingPID atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&mappingRead);storedMapping&=mappingRead.cm.toneMapping==0;
|
||||
run.record(@"historical-host-mapping-default-and-explicit-on-off-preserved",mappingPID&&storedMapping);
|
||||
UInt32 skinPID=[DYToolSection(@"skin")[@"enabled"]unsignedIntValue];
|
||||
DYUniforms legacySkin;DYReadUniforms(manager,kCMTimeZero,&legacySkin);
|
||||
[setter setFloatValue:0 toParameter:skinPID atTime:kCMTimeZero];DYUniforms newSkin;DYReadUniforms(manager,kCMTimeZero,&newSkin);
|
||||
auto insertedSkin=DYToolUniforms(DYNewTool(@"skin"));
|
||||
auto existingSkin=DYToolUniforms(@{@"type":@"skin",@"values":@{@"skinStrength":@60}});
|
||||
run.record(@"skin-default-off-preserves-legacy-host-and-layer-values",
|
||||
skinPID&&defaults.skinProtection.x==0&&legacySkin.skinProtection.x==1&&newSkin.skinProtection.x==0&&
|
||||
insertedSkin.skinProtection.x==0&&insertedSkin.skinProtection.y==60&&existingSkin.skinProtection.x==1);
|
||||
[setter setFloatValue:1 toParameter:skinPID atTime:kCMTimeZero];
|
||||
[setter setFloatValue:.75 toParameter:2000 atTime:kCMTimeZero];double value=0;[getter getFloatValue:&value fromParameter:2000 atTime:kCMTimeZero];DYUniforms restored;DYReadUniforms(manager,kCMTimeZero,&restored);
|
||||
run.record(@"native-get-set-model-roundtrip",value==.75&&restored.exposure==.75f);
|
||||
[setter setFloatValue:999 toParameter:2000 atTime:kCMTimeZero];DYReadUniforms(manager,kCMTimeZero,&restored);run.record(@"model-clamps-host-out-of-range",restored.exposure==5);
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
run.record(@"idle-preview-default-no-polygon-mask-pipeline",!masked);
|
||||
fresh.skinFaceOnly=0;Pixels reference=render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-reference-render");
|
||||
run.record(@"idle-preview-matches-neutral-with-face-option-off",difference(actual,reference).maximum<.002);
|
||||
run.record(@"idle-preview-preserves-saved-default-controls",saved.skinFaceOnly==1&&saved.skinProtection.x==1&&saved.preLUTStrength==1&&saved.cm.blackWhiteMix==0);
|
||||
run.record(@"idle-preview-preserves-saved-default-controls",saved.skinFaceOnly==1&&saved.skinProtection.x==0&&saved.preLUTStrength==1&&saved.cm.blackWhiteMix==0);
|
||||
saved.skinProtection.x=1; // Explicitly exercise the enabled path below.
|
||||
fresh=saved;fresh.saturation=25;render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-active-color-render");
|
||||
run.record(@"idle-preview-active-color-still-detects-faces",probe->faceCalls==1);
|
||||
fresh=saved;fresh.skinVisualize=1;render(run,probe,source,destination,gpu,fresh,@{},@"idle-preview-skin-selection-render");
|
||||
|
||||
@@ -565,7 +565,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if(!_embedded&&!_workspaceEditor)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(rememberWorkspaceSelection:) name:@"DYWorkspaceToolSelection" object:_manager];
|
||||
if(_renderer){
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(curveOutputChanged:) name:@"DYOutputHistogramDidChange" object:_renderer];
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(curveOutputChanged:) name:@"DYFinalOutputDidChange" object:_renderer];
|
||||
}
|
||||
[self themeChanged:nil];
|
||||
[self setAccessibilityLabel:@"大鱼调色检查器"];
|
||||
@@ -736,7 +736,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
if([key isEqual:@"grading"]) {
|
||||
DYWheelPanel *wheels=[[[DYWheelPanel alloc]initWithFrame:NSZeroRect]autorelease];wheels.delegate=self;wheels.identifier=@"gradingWheels";[card addSubview:wheels];[body addObject:wheels];[_graphics addObject:wheels];
|
||||
}
|
||||
if([key isEqual:@"spider"]){_spiderPanel=[[[DYSpiderPanel alloc]initWithFrame:NSZeroRect]autorelease];_spiderPanel.delegate=self;_spiderPanel.horizontalLayout=_workspaceEditor;_spiderPanel.identifier=@"spiderGraph";[card addSubview:_spiderPanel];[body addObject:_spiderPanel];}
|
||||
if([key isEqual:@"spider"]){_spiderPanel=[[[DYSpiderPanel alloc]initWithFrame:NSZeroRect]autorelease];_spiderPanel.delegate=self;[_spiderPanel setScopeRenderer:_renderer];_spiderPanel.horizontalLayout=_workspaceEditor;_spiderPanel.identifier=@"spiderGraph";[card addSubview:_spiderPanel];[body addObject:_spiderPanel];}
|
||||
for(NSDictionary *d in section[@"rows"]) {
|
||||
DYFlippedView *row=[[[DYFlippedView alloc] initWithFrame:NSZeroRect] autorelease];
|
||||
row.identifier=d[@"key"];
|
||||
|
||||
+6
-4
@@ -6,12 +6,13 @@
|
||||
NSString *const DYModelChanged=@"DYModelChanged";
|
||||
static NSMutableArray *sections,*descriptors;
|
||||
static UInt32 PID(NSUInteger offset){return 2000+(UInt32)offset/4;}
|
||||
static NSDictionary *row(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double d,NSString*kind){
|
||||
static NSMutableDictionary *row(NSString*k,NSString*t,NSUInteger o,double lo,double hi,double d,NSString*kind){
|
||||
NSMutableDictionary*r=[@{@"key":k,@"title":t,@"pid":@(PID(o)),@"offset":@(o),@"min":@(lo),@"max":@(hi),@"default":@(d),@"step":@(hi-lo>10?1:.01),@"kind":kind?:@"float"}mutableCopy];
|
||||
[descriptors addObject:r];return [r autorelease];
|
||||
}
|
||||
static void section(NSString*k,NSString*t,NSUInteger offset,NSArray*rows,double def=1){
|
||||
NSDictionary*e=row([k stringByAppendingString:@"Enabled"],t,offset,0,1,def,@"bool");
|
||||
static void section(NSString*k,NSString*t,NSUInteger offset,NSArray*rows,double def=1,NSNumber *hostDefault=nil){
|
||||
NSMutableDictionary *e=row([k stringByAppendingString:@"Enabled"],t,offset,0,1,def,@"bool");
|
||||
if(hostDefault)e[@"hostDefault"]=hostDefault;
|
||||
[sections addObject:@{@"key":k,@"title":t,@"enabled":e[@"pid"],@"defaultEnabled":@(def),@"rows":rows}];
|
||||
}
|
||||
static NSDictionary *scalar(NSString*k,NSString*t,NSUInteger o,double lo=-100,double hi=100,double def=0){return row(k,t,o,lo,hi,def,@"float");}
|
||||
@@ -136,7 +137,8 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{
|
||||
section(@"spider",@"蜘蛛盘校色仪",offsetof(DYUniforms,spiderSectionEnabled),@[scalar(@"spiderMix",@"蜘蛛盘混合",offsetof(DYUniforms,spiderMix),0,1,1)]);
|
||||
section(@"base",@"基础调色",136,[[[base subarrayWithRange:NSMakeRange(0,6)]arrayByAddingObjectsFromArray:[base subarrayWithRange:NSMakeRange(10,3)]]arrayByAddingObject:copyAuto],1);
|
||||
section(@"color",@"白平衡与颜色",140,@[base[6],base[7],base[9],base[8]],1);
|
||||
section(@"skin",@"肤色保护",464,@[scalar(@"skinStrength",@"保护程度",468,0,100,60),scalar(@"skinHue",@"肤色色相",472,0,60,28),row(@"skinFaceOnly",@"仅保护人脸肤色",offsetof(DYUniforms,skinFaceOnly),0,1,1,@"bool"),row(@"skinVisualize",@"显示肤色保护区域",offsetof(DYUniforms,skinVisualize),0,1,0,@"bool")],1);
|
||||
// Existing FCP effects can omit the historical on value. New templates seed off.
|
||||
section(@"skin",@"肤色保护",464,@[scalar(@"skinStrength",@"保护程度",468,0,100,60),scalar(@"skinHue",@"肤色色相",472,0,60,28),row(@"skinFaceOnly",@"仅保护人脸肤色",offsetof(DYUniforms,skinFaceOnly),0,1,1,@"bool"),row(@"skinVisualize",@"显示肤色保护区域",offsetof(DYUniforms,skinVisualize),0,1,0,@"bool")],0,@1);
|
||||
NSMutableArray*look=[NSMutableArray arrayWithObject:scalar(@"postLUTStrength",@"风格 1 强度",60,0,1,1)];
|
||||
for(int i=0;i<4;i++){[look addObject:row([NSString stringWithFormat:@"look%dEnabled",i+2],[NSString stringWithFormat:@"风格 %d 启用",i+2],160+i*4,0,1,1,@"bool")];[look addObject:scalar([NSString stringWithFormat:@"look%dStrength",i+2],[NSString stringWithFormat:@"风格 %d 强度",i+2],64+i*4,0,1,1)];}
|
||||
section(@"look",@"风格 LUT",144,look);
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
@property(nonatomic,assign) NSView *accessoryRow;
|
||||
@property(nonatomic,assign) id<DYGraphicDelegate> delegate;
|
||||
- (void)setMesh:(NSData *)mesh linked:(BOOL)linked;
|
||||
- (void)setScopeRenderer:(DYRenderer *)renderer;
|
||||
@end
|
||||
@implementation DYSpiderPanel {
|
||||
DYSpiderDisc *_disc; NSPopUpButton *_hues,*_saturation; NSButton *_link;
|
||||
@@ -31,6 +32,7 @@
|
||||
}return self;
|
||||
}
|
||||
- (void)dealloc{_disc.changed=nil;_disc.gesture=nil;_disc.selectionChanged=nil;[_disc release];[_hues release];[_saturation release];[_link release];[_status release];[super dealloc];}
|
||||
- (void)setScopeRenderer:(DYRenderer *)renderer{_disc.scopeRenderer=renderer;}
|
||||
- (void)setMesh:(NSData *)data linked:(BOOL)linked{auto m=DYSpiderMesh(data);_disc.meshData=[NSData dataWithBytes:&m length:sizeof(m)];_linked=linked;[_hues selectItemWithTag:m.hues];[_saturation selectItemWithTag:m.rings+1];_link.state=linked?NSControlStateValueOn:NSControlStateValueOff;}
|
||||
- (void)layout{[super layout];CGFloat w=self.bounds.size.width;
|
||||
if(_horizontalLayout){CGFloat d=MIN(self.bounds.size.height,MAX(170,w*.48)),x=d+20,cw=MAX(200,w-x-10);_disc.frame=NSMakeRect(0,0,d,d);[[self viewWithTag:101]setFrame:NSMakeRect(x,7,48,18)];_hues.frame=NSMakeRect(x+58,2,cw-58,26);[[self viewWithTag:102]setFrame:NSMakeRect(x,37,48,18)];_saturation.frame=NSMakeRect(x+58,32,cw-58,26);_link.frame=NSMakeRect(x,64,cw,22);_accessoryRow.frame=NSMakeRect(x,89,cw,33);CGFloat bw=(cw-6)/2;for(int i=0;i<5;i++)[[self viewWithTag:201+i]setFrame:NSMakeRect(x+(i%2)*(bw+6),126+(i/2)*30,bw,26)];_status.frame=NSMakeRect(x,218,cw,MAX(18,self.bounds.size.height-218));_status.hidden=self.bounds.size.height<238;return;}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#import "DYAutoGrade.h"
|
||||
#import "DYToolState.h"
|
||||
#include "DYFilmTime.h"
|
||||
#include "DYSpiderScopeDrawing.h"
|
||||
#include "DYLevelGeometry.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
- (NSData*)outputHistogram;
|
||||
/// Bins from this instance's most recent final output at the requested time.
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time;
|
||||
/// Latest completed spider density raster. Requests a coalesced background refresh.
|
||||
- (NSData*)outputSpiderScope;
|
||||
/// Exact-time final output for the OSC, cached per sample.
|
||||
- (NSData*)canvasSpiderScopeAtTime:(CMTime)time;
|
||||
/// Display-encoded float RGBA, 320×180, with the visually top row first.
|
||||
/// Analysis preview retains the host texture's original row order separately.
|
||||
- (NSData*)lookLUTPreview;
|
||||
|
||||
@@ -136,7 +136,9 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
NSDictionary *_toolDocument,*_colorContext,*_exportManagedState;
|
||||
BOOL _managedFinishing;NSData *_faceEntries,*_faceInput,*_faceCachedEntries;CIContext *_faceContext;NSData *_mosaicRaster,*_mosaicEntries;NSDictionary *_mosaicFaceSnapshot;
|
||||
dispatch_queue_t _scopeQueue;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning,_outputHistogramObserved,_outputHistogramNotificationPending;
|
||||
BOOL _scopeEnabled,_scopeWorkerRunning,_outputObserved,_outputNotificationPending,_spiderScopeWorkerRunning;
|
||||
NSData *_spiderScopeRaster;
|
||||
uint64_t _spiderScopeSerial;
|
||||
NSUInteger _scopeGeneration;
|
||||
DYScopeSample *_scopePending,*_scopeLatest;
|
||||
uint64_t _scopeCaptureSerial,_scopeLatestSerial;CMTime _scopeRequestedTime;
|
||||
@@ -155,7 +157,7 @@ static NSArray *DYPrimaryActiveFinishing(DYUniforms u,NSDictionary *paths,NSData
|
||||
#include "DYFaceRender.inc.h"
|
||||
#include "DYToolRender.inc.h"
|
||||
- (instancetype)init{if((self=[super init])){_previewLock=[NSObject new];_scopeQueue=dispatch_queue_create("com.dayu.color.final-output-scopes",DISPATCH_QUEUE_SERIAL);_devices=[NSMutableDictionary new];_luts=[NSMutableDictionary new];_preparedLUTs=[NSMutableDictionary new];_activeLUTPaths=[NSSet new];_lutPreparationQueue=dispatch_queue_create("com.dayu.color.lut-upload",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_lutPreparationQueue,dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0));_tables=[DYColorTables new];}return self;}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)dealloc{[_mosaicRaster release];[_mosaicEntries release];[_mosaicFaceSnapshot release];[_faceEntries release];[_faceInput release];[_faceCachedEntries release];[_faceContext release];[_scopePending release];[_scopeLatest release];[_spiderScopeRaster release];[_scopePreview release];[_scopeMetadata release];[_scopeProfile release];dispatch_release(_scopeQueue);[_devices release];[_luts release];[_preparedLUTs release];[_activeLUTPaths release];dispatch_release(_lutPreparationQueue);[_tables release];[_preview release];[_lookLUTPreview release];[_colorContext release];[_previewLock release];[super dealloc];}
|
||||
- (void)trimPreparedLUTsKeeping:(NSString *)path {
|
||||
if(_preparedLUTs.count<=12)return;
|
||||
for(NSString *key in _preparedLUTs.allKeys)if(![_activeLUTPaths containsObject:key]&&![key isEqualToString:path])[_preparedLUTs removeObjectForKey:key];
|
||||
|
||||
+39
-10
@@ -18,24 +18,53 @@
|
||||
- (NSDictionary *)scopeMetadata{@synchronized(_previewLock){return [[_scopeMetadata retain]autorelease];}}
|
||||
- (NSData*)outputHistogram{
|
||||
DYScopeSample *sample=nil;
|
||||
@synchronized(_previewLock){_outputHistogramObserved=YES;sample=[[_scopeLatest retain]autorelease];}
|
||||
@synchronized(_previewLock){_outputObserved=YES;sample=[[_scopeLatest retain]autorelease];}
|
||||
return sample.canvasHistogram;
|
||||
}
|
||||
- (void)queueOutputHistogramNotification{
|
||||
- (void)queueOutputNotification{
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,NSEC_PER_SEC/30),dispatch_get_main_queue(),^{
|
||||
@synchronized(_previewLock){_outputHistogramNotificationPending=NO;}
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYOutputHistogramDidChange" object:self];
|
||||
@synchronized(_previewLock){_outputNotificationPending=NO;}
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYFinalOutputDidChange" object:self];
|
||||
});
|
||||
}
|
||||
- (NSData *)canvasHistogramAtTime:(CMTime)time{
|
||||
- (DYScopeSample *)finalSampleAtTime:(CMTime)time{
|
||||
if(!CMTIME_IS_NUMERIC(time))return nil;
|
||||
DYScopeSample *sample=nil;
|
||||
@synchronized(_previewLock){sample=[_scopeLatest retain];}
|
||||
NSDictionary *metadata=sample.metadata;
|
||||
CMTime captured=CMTimeMakeWithEpoch([metadata[@"timeValue"]longLongValue],[metadata[@"timeScale"]intValue],[metadata[@"timeEpoch"]longLongValue]);
|
||||
NSData *histogram=metadata&&CMTimeCompare(time,captured)==0?sample.canvasHistogram:nil;
|
||||
if(metadata&&CMTimeCompare(time,captured)==0)return [sample autorelease];
|
||||
[sample release];
|
||||
return histogram;
|
||||
return nil;
|
||||
}
|
||||
- (NSData *)canvasHistogramAtTime:(CMTime)time {
|
||||
return [self finalSampleAtTime:time].canvasHistogram;
|
||||
}
|
||||
- (NSData *)canvasSpiderScopeAtTime:(CMTime)time {
|
||||
return [self finalSampleAtTime:time].spiderScope;
|
||||
}
|
||||
- (NSData *)outputSpiderScope {
|
||||
NSData *raster=nil;
|
||||
@synchronized(_previewLock){
|
||||
_outputObserved=YES;
|
||||
raster=[[_spiderScopeRaster retain]autorelease];
|
||||
if(!_scopeLatest||_spiderScopeWorkerRunning||_spiderScopeSerial==_scopeLatestSerial)return raster;
|
||||
_spiderScopeWorkerRunning=YES;
|
||||
}
|
||||
dispatch_async(_scopeQueue,^{@autoreleasepool{
|
||||
DYScopeSample *sample=nil;uint64_t serial;
|
||||
@synchronized(_previewLock){sample=[_scopeLatest retain];serial=_scopeLatestSerial;}
|
||||
NSData *measured=sample.spiderScope;
|
||||
@synchronized(_previewLock){
|
||||
[_spiderScopeRaster release];_spiderScopeRaster=[measured retain];_spiderScopeSerial=serial;
|
||||
_spiderScopeWorkerRunning=NO;
|
||||
}
|
||||
[sample release];
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYSpiderScopeDidChange" object:self];
|
||||
});
|
||||
}});
|
||||
return raster;
|
||||
}
|
||||
- (void)captureScopeTile:(FxImageTile *)tile atTime:(CMTime)time{
|
||||
NSUInteger generation;uint64_t serial;@synchronized(_previewLock){if(_exporting||!tile)return;generation=_scopeGeneration;serial=++_scopeCaptureSerial;}
|
||||
@@ -58,14 +87,14 @@
|
||||
FxRect bounds=tile.tilePixelBounds,image=tile.imagePixelBounds;BOOL whole=bounds.left==image.left&&bounds.right==image.right&&bounds.top==image.top&&bounds.bottom==image.bottom;
|
||||
sample.metadata=@{@"time":@(CMTimeGetSeconds(time)),@"timeValue":@(time.value),@"timeScale":@(time.timescale),@"timeEpoch":@(time.epoch),@"source":context[@"destination"]?:@"宿主 RGB",@"wholeImage":@(whole),@"region":whole?@"整帧取样":@"仅当前宿主输出分块",@"width":@(dyscope::Width),@"height":@(dyscope::Height)};
|
||||
[buffer release];[entry release];[context release];
|
||||
BOOL start=NO,notifyHistogram=NO;@synchronized(_previewLock){
|
||||
BOOL start=NO,notifyOutput=NO;@synchronized(_previewLock){
|
||||
if(serial>=_scopeLatestSerial){
|
||||
[_scopeLatest release];_scopeLatest=[sample retain];_scopeLatestSerial=serial;
|
||||
if(_outputHistogramObserved&&!_outputHistogramNotificationPending){_outputHistogramNotificationPending=YES;notifyHistogram=YES;}
|
||||
if(_outputObserved&&!_outputNotificationPending){_outputNotificationPending=YES;notifyOutput=YES;}
|
||||
}
|
||||
if(_scopeEnabled&&serial==_scopeLatestSerial&&(generation==_scopeGeneration||!CMTIME_IS_NUMERIC(_scopeRequestedTime)||CMTimeCompare(time,_scopeRequestedTime)==0)){sample.generation=_scopeGeneration;[_scopePending release];_scopePending=[sample retain];if(!_scopeWorkerRunning){_scopeWorkerRunning=YES;start=YES;}}
|
||||
}[sample release];
|
||||
if(notifyHistogram)[self queueOutputHistogramNotification];
|
||||
if(notifyOutput)[self queueOutputNotification];
|
||||
if(start)dispatch_async(_scopeQueue,^{[self processPendingScopeSamples];});
|
||||
}@catch(NSException *exception){/* Scope diagnostics must never fail rendering. */}}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <cstdint>
|
||||
#include <span>
|
||||
#include <vector>
|
||||
#include "SpiderCore/DYColorMath.h"
|
||||
|
||||
// Display-reference measurements only. Values remain unclipped; the plot
|
||||
// covers -10%...110% and explicitly counts samples beyond that range.
|
||||
@@ -57,4 +58,32 @@ inline std::vector<uint8_t> vectorImage(std::span<const uint32_t> counts){
|
||||
if(counts.size()!=Bins*Bins)return {};std::vector<uint8_t> out(counts.size()*4);uint32_t maximum=0;for(uint32_t n:counts)maximum=std::max(maximum,n);float divisor=std::log1p(float(maximum));
|
||||
for(size_t i=0;i<counts.size();i++){float cb=float(i%Bins)/(Bins-1)*1.2f-.6f,cr=.6f-float(i/Bins)/(Bins-1)*1.2f;float intensity=counts[i]&&divisor>0?std::pow(std::log1p(float(counts[i]))/divisor,.65f):0;float colors[]={.5f+1.5748f*cr,.5f-.187324f*cb-.468124f*cr,.5f+1.8556f*cb};float peak=std::max({colors[0],colors[1],colors[2],.001f});for(int c=0;c<3;c++)out[i*4+c]=uint8_t(std::lround(std::clamp(colors[c]/peak,0.f,1.f)*intensity*255));out[i*4+3]=255;}return out;
|
||||
}
|
||||
inline constexpr unsigned SpiderBins=192;
|
||||
inline constexpr float SpiderSkinAngle=28.f*3.14159265358979323846f/180.f;
|
||||
inline std::vector<uint8_t> spiderVectorImage(std::span<const RGBA> pixels) {
|
||||
std::vector<uint32_t> density(SpiderBins*SpiderBins);
|
||||
constexpr float radius=(SpiderBins-1)*.5f;
|
||||
constexpr float tau=6.28318530718f;
|
||||
uint32_t peak=0;
|
||||
for(const auto &pixel:pixels){
|
||||
if(!std::isfinite(pixel.a)||pixel.a<=1e-6f||
|
||||
!std::isfinite(pixel.r)||!std::isfinite(pixel.g)||!std::isfinite(pixel.b))continue;
|
||||
auto hsv=dyRGBHSV(float3{pixel.r/pixel.a,pixel.g/pixel.a,pixel.b/pixel.a});
|
||||
if(!std::isfinite(hsv.x)||!std::isfinite(hsv.y))continue;
|
||||
float distance=radius*std::clamp(hsv.y,0.f,1.f),angle=hsv.x*tau;
|
||||
unsigned x=std::lround(radius+std::cos(angle)*distance);
|
||||
unsigned y=std::lround(radius+std::sin(angle)*distance);
|
||||
peak=std::max(peak,++density[y*SpiderBins+x]);
|
||||
}
|
||||
std::vector<uint8_t> raster(density.size()*4);
|
||||
if(!peak)return raster;
|
||||
float maximum=std::log1p(float(peak));
|
||||
for(size_t i=0;i<density.size();i++){
|
||||
if(!density[i])continue;
|
||||
float intensity=std::sqrt(std::log1p(float(density[i]))/maximum);
|
||||
uint8_t alpha=std::lround(255.f*(.24f+.76f*intensity));
|
||||
std::fill_n(raster.data()+4*i,4,alpha); // premultiplied white
|
||||
}
|
||||
return raster;
|
||||
}
|
||||
}
|
||||
@@ -8,4 +8,6 @@
|
||||
@property(nonatomic) CGColorSpaceRef space;
|
||||
/// Final-output bins in the host RGB domain, calculated only if requested.
|
||||
@property(nonatomic,readonly) NSData *canvasHistogram;
|
||||
/// Transparent density raster in the spider's hue/saturation coordinates.
|
||||
@property(nonatomic,readonly) NSData *spiderScope;
|
||||
@end
|
||||
+13
-2
@@ -1,7 +1,8 @@
|
||||
#import "DYScopeSample.h"
|
||||
#import "DYHistogram.h"
|
||||
#include "DYScopeMath.hpp"
|
||||
@implementation DYScopeSample {
|
||||
NSData *_canvasHistogram;
|
||||
NSData *_canvasHistogram,*_spiderScope;
|
||||
}
|
||||
- (NSData *)canvasHistogram{
|
||||
@synchronized(self){
|
||||
@@ -9,6 +10,16 @@
|
||||
return [[_canvasHistogram retain]autorelease];
|
||||
}
|
||||
}
|
||||
- (NSData *)spiderScope {
|
||||
@synchronized(self){if(_spiderScope)return [[_spiderScope retain]autorelease];}
|
||||
const auto *pixels=(const dyscope::RGBA *)_pixels.bytes;
|
||||
auto raster=dyscope::spiderVectorImage({pixels,_pixels.length/sizeof(*pixels)});
|
||||
NSData *data=[NSData dataWithBytes:raster.data() length:raster.size()];
|
||||
@synchronized(self){
|
||||
if(!_spiderScope)_spiderScope=[data retain];
|
||||
return [[_spiderScope retain]autorelease];
|
||||
}
|
||||
}
|
||||
- (void)setSpace:(CGColorSpaceRef)space{if(_space==space)return;if(_space)CGColorSpaceRelease(_space);_space=space?CGColorSpaceRetain(space):nil;}
|
||||
- (void)dealloc{[_pixels release];[_metadata release];[_canvasHistogram release];if(_space)CGColorSpaceRelease(_space);[super dealloc];}
|
||||
- (void)dealloc{[_pixels release];[_metadata release];[_canvasHistogram release];[_spiderScope release];if(_space)CGColorSpaceRelease(_space);[super dealloc];}
|
||||
@end
|
||||
@@ -1,6 +1,8 @@
|
||||
// Ported from dayu-colorplate; provenance in research/SpiderAndBalanceSources.json.
|
||||
#include "DYSpiderScopeDrawing.h"
|
||||
@interface DYSpiderDisc : NSView
|
||||
@property(nonatomic) DYGrade grade;
|
||||
@property(nonatomic,retain) DYRenderer *scopeRenderer;
|
||||
@property(nonatomic,copy) NSData *meshData;
|
||||
@property(nonatomic,readonly) NSInteger hueCount,saturationCount;
|
||||
- (void)changeHueCount:(int)hues saturationCount:(int)saturation;
|
||||
@@ -18,7 +20,30 @@
|
||||
- (void)toggleLock;
|
||||
@end
|
||||
@implementation DYSpiderDisc {BOOL _dragging,_marquee,_gestureActive;NSPoint _dragOrigin,_marqueeEnd;DYGrade _dragGrade;dy::SpiderMesh _mesh,_dragMesh;BOOL _variableMesh;NSMutableIndexSet*_selectionStart,*_pinsStart;}
|
||||
- (void)dealloc{[self finishGesture];[_pinned release];[_selection release];[_selectionStart release];[_pinsStart release];[_changed release];[_selectionChanged release];[_gesture release];[super dealloc];}
|
||||
- (void)dealloc{[self finishGesture];self.scopeRenderer=nil;[_pinned release];[_selection release];[_selectionStart release];[_pinsStart release];[_changed release];[_selectionChanged release];[_gesture release];[super dealloc];}
|
||||
- (void)setScopeRenderer:(DYRenderer *)renderer {
|
||||
if(renderer==_scopeRenderer)return;
|
||||
NSNotificationCenter *center=NSNotificationCenter.defaultCenter;
|
||||
if(_scopeRenderer){
|
||||
[center removeObserver:self name:@"DYFinalOutputDidChange" object:_scopeRenderer];
|
||||
[center removeObserver:self name:@"DYSpiderScopeDidChange" object:_scopeRenderer];
|
||||
}
|
||||
[_scopeRenderer release];_scopeRenderer=[renderer retain];
|
||||
if(renderer){
|
||||
[center addObserver:self selector:@selector(finalOutputChanged:) name:@"DYFinalOutputDidChange" object:renderer];
|
||||
[center addObserver:self selector:@selector(spiderScopeChanged:) name:@"DYSpiderScopeDidChange" object:renderer];
|
||||
}
|
||||
self.needsDisplay=YES;
|
||||
}
|
||||
- (BOOL)canDisplayScope {
|
||||
return self.window&&!self.hiddenOrHasHiddenAncestor&&!NSIsEmptyRect(self.visibleRect);
|
||||
}
|
||||
- (void)finalOutputChanged:(NSNotification *)note {
|
||||
if([self canDisplayScope])[_scopeRenderer outputSpiderScope];
|
||||
}
|
||||
- (void)spiderScopeChanged:(NSNotification *)note {
|
||||
if([self canDisplayScope])self.needsDisplay=YES;
|
||||
}
|
||||
- (BOOL)isFlipped{return YES;}
|
||||
- (BOOL)acceptsFirstResponder{return YES;}
|
||||
- (BOOL)acceptsFirstMouse:(NSEvent*)event{return YES;}
|
||||
@@ -53,16 +78,17 @@
|
||||
float step=e.modifierFlags&NSEventModifierFlagShift?.02f:.005f;
|
||||
if(c==NSLeftArrowFunctionKey)[self moveFrom:_grade x:-step y:0];else if(c==NSRightArrowFunctionKey)[self moveFrom:_grade x:step y:0];else if(c==NSUpArrowFunctionKey)[self moveFrom:_grade x:0 y:-step];else if(c==NSDownArrowFunctionKey)[self moveFrom:_grade x:0 y:step];else[super keyDown:e];
|
||||
}
|
||||
- (instancetype)initWithFrame:(NSRect)r{if((self=[super initWithFrame:r])){_grade=dyDefaultGrade();_mesh=dy::legacyMesh(_grade);_selected=-1;self.pinData=nil;self.selection=[NSMutableIndexSet indexSet];_interactionEnabled=YES;self.accessibilityLabel=@"蜘蛛盘,拖动一点联动同列自由点";}return self;}
|
||||
- (NSRect)discRect{CGFloat s=MIN(self.bounds.size.width,self.bounds.size.height)-32;return NSMakeRect((self.bounds.size.width-s)/2,(self.bounds.size.height-s)/2,s,s);}
|
||||
- (instancetype)initWithFrame:(NSRect)r{if((self=[super initWithFrame:r])){_grade=dyDefaultGrade();_mesh=dy::legacyMesh(_grade);_selected=-1;self.pinData=nil;self.selection=[NSMutableIndexSet indexSet];_interactionEnabled=YES;self.accessibilityLabel=@"蜘蛛盘,含矢量示波器和肤色指示线";}return self;}
|
||||
- (NSRect)discRect{CGFloat s=MAX(0,MIN(self.bounds.size.width,self.bounds.size.height)-32);return NSMakeRect((self.bounds.size.width-s)/2,(self.bounds.size.height-s)/2,s,s);}
|
||||
- (NSPoint)point:(NSInteger)i{NSRect r=self.discRect;return NSMakePoint(r.origin.x+_mesh.x[i]*r.size.width,r.origin.y+_mesh.y[i]*r.size.height);}
|
||||
- (void)setGrade:(DYGrade)g{if(memcmp(g.spiderX,_grade.spiderX,sizeof(g.spiderX))||memcmp(g.spiderY,_grade.spiderY,sizeof(g.spiderY))){_grade=g;self.meshData=nil;}else _grade=g;self.needsDisplay=YES;}
|
||||
- (void)drawRect:(NSRect)dirty{
|
||||
NSRect r=self.discRect;NSPoint c=NSMakePoint(NSMidX(r),NSMidY(r));CGFloat rad=r.size.width/2;
|
||||
for(int s=0;s<64;s++)for(int ring=1;ring<=5;ring++){double a=s*M_PI/32,b=(s+1)*M_PI/32;NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:NSMakePoint(c.x+cos(a)*(ring-1)*rad/5,c.y+sin(a)*(ring-1)*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(a)*ring*rad/5,c.y+sin(a)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*ring*rad/5,c.y+sin(b)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*(ring-1)*rad/5,c.y+sin(b)*(ring-1)*rad/5)];[p closePath];[[NSColor colorWithCalibratedHue:s/64. saturation:ring/5. brightness:.47 alpha:1]setFill];[p fill];}
|
||||
[[NSColor colorWithWhite:1 alpha:.30]setStroke];for(int ring=1;ring<=_mesh.rings;ring++){NSBezierPath *p=[NSBezierPath bezierPath];for(int s=0;s<=_mesh.hues;s++){NSPoint q=[self point:dy::meshIndex(_mesh,s%_mesh.hues,ring)];if(s==0)[p moveToPoint:q];else[p lineToPoint:q];}[p stroke];}
|
||||
NSRect r=self.discRect;if(NSIsEmptyRect(r))return;NSPoint c=NSMakePoint(NSMidX(r),NSMidY(r));CGFloat rad=r.size.width/2;
|
||||
for(int s=0;s<64;s++)for(int ring=1;ring<=5;ring++){double a=s*M_PI/32,b=(s+1)*M_PI/32;NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:NSMakePoint(c.x+cos(a)*(ring-1)*rad/5,c.y+sin(a)*(ring-1)*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(a)*ring*rad/5,c.y+sin(a)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*ring*rad/5,c.y+sin(b)*ring*rad/5)];[p lineToPoint:NSMakePoint(c.x+cos(b)*(ring-1)*rad/5,c.y+sin(b)*(ring-1)*rad/5)];[p closePath];[[NSColor colorWithCalibratedHue:s/64. saturation:ring/5. brightness:.22 alpha:1]setFill];[p fill];}
|
||||
DYDrawSpiderScope(r,[self canDisplayScope]?[_scopeRenderer outputSpiderScope]:nil,1);
|
||||
[[NSColor colorWithWhite:1 alpha:.26]setStroke];for(int ring=1;ring<=_mesh.rings;ring++){NSBezierPath *p=[NSBezierPath bezierPath];for(int s=0;s<=_mesh.hues;s++){NSPoint q=[self point:dy::meshIndex(_mesh,s%_mesh.hues,ring)];if(s==0)[p moveToPoint:q];else[p lineToPoint:q];}[p stroke];}
|
||||
for(int s=0;s<_mesh.hues;s++){NSBezierPath*p=[NSBezierPath bezierPath];[p moveToPoint:[self point:[self nodeCount]-1]];for(int ring=1;ring<=_mesh.rings;ring++)[p lineToPoint:[self point:dy::meshIndex(_mesh,s,ring)]];[p stroke];}
|
||||
for(int i=0;i<[self nodeCount];i++){NSPoint p=[self point:i];CGFloat z=[_selection containsIndex:i]?4.5:2.6;NSBezierPath *d=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-z,p.y-z,z*2,z*2)];[([_selection containsIndex:i]?DYAccent():[NSColor colorWithWhite:1 alpha:.85])setFill];[d fill];if([_selection containsIndex:i]){[NSColor.whiteColor setStroke];[d stroke];}if([_pinned containsIndex:i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(p.x-1,p.y-1,2,2));}}
|
||||
for(int i=0;i<[self nodeCount];i++){NSPoint p=[self point:i];CGFloat z=[_selection containsIndex:i]?4.5:2.6;NSBezierPath *d=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(p.x-z,p.y-z,z*2,z*2)];[([_selection containsIndex:i]?DYAccent():[NSColor colorWithWhite:1 alpha:.85])setFill];[d fill];[[NSColor colorWithWhite:0 alpha:.8]setStroke];d.lineWidth=.85;[d stroke];if([_selection containsIndex:i]){[NSColor.whiteColor setStroke];[d stroke];}if([_pinned containsIndex:i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(p.x-1,p.y-1,2,2));}}
|
||||
if(_marquee){
|
||||
NSRect box=NSMakeRect(MIN(_dragOrigin.x,_marqueeEnd.x),MIN(_dragOrigin.y,_marqueeEnd.y),fabs(_dragOrigin.x-_marqueeEnd.x),fabs(_dragOrigin.y-_marqueeEnd.y));
|
||||
NSBezierPath*outline=[NSBezierPath bezierPathWithRect:box];outline.lineWidth=1.25;
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
#pragma once
|
||||
#import <AppKit/AppKit.h>
|
||||
#include "DYScopeMath.hpp"
|
||||
|
||||
// The spider and the OSC both draw in top-down coordinates. Keep the
|
||||
// scopes below the editable mesh and clip the raster to the wheel.
|
||||
static inline void DYDrawSpiderScope(NSRect rect, NSData *raster, CGFloat scale) {
|
||||
if(NSIsEmptyRect(rect))return;
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
[[NSBezierPath bezierPathWithOvalInRect:rect]addClip];
|
||||
constexpr size_t side=dyscope::SpiderBins;
|
||||
if(raster.length==side*side*4){
|
||||
CGDataProviderRef provider=CGDataProviderCreateWithCFData((CFDataRef)raster);
|
||||
CGColorSpaceRef space=CGColorSpaceCreateDeviceRGB();
|
||||
CGImageRef image=CGImageCreate(side,side,8,32,side*4,space,kCGImageAlphaPremultipliedLast,
|
||||
provider,nullptr,false,kCGRenderingIntentDefault);
|
||||
if(image){
|
||||
NSImage *trace=[[[NSImage alloc]initWithCGImage:image size:NSZeroSize]autorelease];
|
||||
[trace drawInRect:rect fromRect:NSZeroRect operation:NSCompositingOperationSourceOver
|
||||
fraction:1 respectFlipped:YES hints:@{NSImageHintInterpolation:@(NSImageInterpolationLow)}];
|
||||
CGImageRelease(image);
|
||||
}
|
||||
CGColorSpaceRelease(space);CGDataProviderRelease(provider);
|
||||
}
|
||||
|
||||
NSPoint center=NSMakePoint(NSMidX(rect),NSMidY(rect));
|
||||
CGFloat radius=NSWidth(rect)*.5;
|
||||
CGFloat dx=cos(dyscope::SpiderSkinAngle),dy=sin(dyscope::SpiderSkinAngle);
|
||||
NSBezierPath *line=[NSBezierPath bezierPath];
|
||||
[line moveToPoint:NSMakePoint(center.x+dx*radius*.08,center.y+dy*radius*.08)];
|
||||
[line lineToPoint:NSMakePoint(center.x+dx*radius*.91,center.y+dy*radius*.91)];
|
||||
CGFloat dashes[]={4*scale,3*scale};
|
||||
[line setLineDash:dashes count:2 phase:0];
|
||||
line.lineWidth=2.6*scale;
|
||||
[[NSColor colorWithWhite:0 alpha:.85]setStroke];[line stroke];
|
||||
line.lineWidth=1.2*scale;
|
||||
[[NSColor colorWithSRGBRed:1 green:.79 blue:.57 alpha:1]setStroke];[line stroke];
|
||||
if(radius>=36*scale){
|
||||
NSDictionary *attrs=@{NSFontAttributeName:[NSFont systemFontOfSize:9*scale weight:NSFontWeightMedium],
|
||||
NSForegroundColorAttributeName:[NSColor colorWithSRGBRed:1 green:.88 blue:.74 alpha:1]};
|
||||
NSString *label=@"肤色";NSSize size=[label sizeWithAttributes:attrs];
|
||||
NSPoint anchor=NSMakePoint(center.x+dx*radius*.73-size.width/2,center.y+dy*radius*.73+4*scale);
|
||||
NSRect tag=NSInsetRect(NSMakeRect(anchor.x,anchor.y,size.width,size.height),-3*scale,-1*scale);
|
||||
[[NSColor colorWithWhite:.08 alpha:.92]setFill];
|
||||
[[NSBezierPath bezierPathWithRoundedRect:tag xRadius:3*scale yRadius:3*scale]fill];
|
||||
[label drawAtPoint:anchor withAttributes:attrs];
|
||||
}
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@@ -86,7 +86,7 @@ static NSData *parameterData(DYMaskParameters p){return [NSData dataWithBytes:&p
|
||||
static BOOL readParameters(id data,DYMaskParameters *p){if(![data isKindOfClass:NSData.class]||[data length]!=sizeof(*p))return NO;[data getBytes:p length:sizeof(*p)];return dyValidMaskParameters(*p);}
|
||||
static CMTime keyTime(NSDictionary *key){return CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);}
|
||||
NSDictionary *DYNewMask(NSInteger kind){if(kind<0||kind>5)return nil;DYMaskParameters p=dyDefaultMaskParameters();p.kind=(DYMaskKind)kind;p.width=.5;p.height=.5;p.sourceStage=DYMaskSourceOriginal;if(kind==DYMaskHSLKey)p.flags=DYMaskHueEnabled;NSData *nodes=[NSData data];if(kind==DYMaskBezier){DYBezierNode n[4]={};float x[4]={-.5,.5,.5,-.5},y[4]={-.5,-.5,.5,.5};for(int i=0;i<4;i++)n[i]={x[i],y[i],x[i],y[i],x[i],y[i]};nodes=[NSData dataWithBytes:n length:sizeof(n)];}return @{@"id":NSUUID.UUID.UUIDString,@"enabled":@YES,@"combine":@0,@"parameters":parameterData(p),@"nodes":nodes,@"keys":@[]};}
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinStrength":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
NSDictionary *DYNewTool(NSString *type){if(![DYToolTypes()containsObject:type])return nil;return @{@"id":NSUUID.UUID.UUIDString,@"type":type,@"values":[type isEqual:@"skin"]?@{@"skinEnabled":@0}:[type isEqual:@"primary"]?@{@"cmtoneMapping":@0}:@{},@"paths":@{},@"spiderLinked":@YES,@"masks":@[]};}
|
||||
BOOL DYValidToolMask(NSDictionary *mask){
|
||||
if(![mask isKindOfClass:NSDictionary.class]||!validID(mask[@"id"])||!finiteNumber(mask[@"enabled"])||!finiteNumber(mask[@"combine"])||[mask[@"combine"]integerValue]<0||[mask[@"combine"]integerValue]>2)return NO;
|
||||
if(mask[@"label"]&&(![mask[@"label"]isKindOfClass:NSString.class]||[mask[@"label"]length]>100))return NO;
|
||||
|
||||
@@ -62,12 +62,14 @@
|
||||
}
|
||||
if([area[@"kind"]isEqual:@"spiderPlot"]){
|
||||
auto mesh=DYSpiderMesh([self spiderData]);CGFloat rad=r.size.width/2;NSPoint center=NSMakePoint(NSMidX(r),NSMidY(r));
|
||||
for(int i=0;i<64;i++){double a=i*2*M_PI/64,b=(i+1)*2*M_PI/64;NSBezierPath *wedge=[NSBezierPath bezierPath];[wedge moveToPoint:center];[wedge lineToPoint:NSMakePoint(center.x+cos(a)*rad,center.y+sin(a)*rad)];[wedge lineToPoint:NSMakePoint(center.x+cos(b)*rad,center.y+sin(b)*rad)];[wedge closePath];[[NSColor colorWithHue:i/64. saturation:.8 brightness:.8 alpha:.24]setFill];[wedge fill];}
|
||||
for(int i=0;i<64;i++){double a=i*2*M_PI/64,b=(i+1)*2*M_PI/64;NSBezierPath *wedge=[NSBezierPath bezierPath];[wedge moveToPoint:center];[wedge lineToPoint:NSMakePoint(center.x+cos(a)*rad,center.y+sin(a)*rad)];[wedge lineToPoint:NSMakePoint(center.x+cos(b)*rad,center.y+sin(b)*rad)];[wedge closePath];[[NSColor colorWithHue:i/64. saturation:.8 brightness:.19 alpha:1]setFill];[wedge fill];}
|
||||
DYDrawSpiderScope(r,[_bridge canvasSpiderScopeAtTime:_time],s);
|
||||
ink=[NSColor colorWithWhite:.94 alpha:1];
|
||||
auto point=[&](int i){return NSMakePoint(r.origin.x+mesh.x[i]*r.size.width,r.origin.y+mesh.y[i]*r.size.height);};NSBezierPath *net=[NSBezierPath bezierPath];net.lineWidth=.6*s;
|
||||
for(int ring=1;ring<=mesh.rings;ring++)for(int hue=0;hue<=mesh.hues;hue++){NSPoint q=point(dy::meshIndex(mesh,hue%mesh.hues,ring));if(hue==0)[net moveToPoint:q];else[net lineToPoint:q];}
|
||||
for(int hue=0;hue<mesh.hues;hue++){[net moveToPoint:point(dy::meshCount(mesh)-1)];for(int ring=1;ring<=mesh.rings;ring++)[net lineToPoint:point(dy::meshIndex(mesh,hue,ring))];}
|
||||
[[ink colorWithAlphaComponent:.5]setStroke];[net stroke];
|
||||
for(int i=0;i<dy::meshCount(mesh);i++){NSPoint q=point(i);CGFloat rr=(i==_selectedSpider?4:2)*s;[(i==_selectedSpider?accent:ink)setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-rr,q.y-rr,2*rr,2*rr)]fill];if(mesh.pins[i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(q.x-s,q.y-s,2*s,2*s));}}return;
|
||||
[[ink colorWithAlphaComponent:.26]setStroke];[net stroke];
|
||||
for(int i=0;i<dy::meshCount(mesh);i++){NSPoint q=point(i);CGFloat rr=(i==_selectedSpider?4:2)*s;[(i==_selectedSpider?accent:ink)setFill];NSBezierPath *dot=[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-rr,q.y-rr,2*rr,2*rr)];[dot fill];dot.lineWidth=.85*s;[[NSColor colorWithWhite:0 alpha:.8]setStroke];[dot stroke];if(mesh.pins[i]){[NSColor.blackColor setFill];NSRectFill(NSMakeRect(q.x-s,q.y-s,2*s,2*s));}}return;
|
||||
}
|
||||
if([area[@"kind"]isEqual:@"wheel"]){
|
||||
NSInteger index=[area[@"index"]integerValue];[self text:area[@"title"]rect:NSMakeRect(r.origin.x,r.origin.y-19*s,r.size.width,17*s)size:10 color:ink alignment:NSTextAlignmentCenter];
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
- (void)requestWhiteBalanceAtTime:(CMTime)time;
|
||||
@property(nonatomic,retain) DYRenderer *renderer;
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time;
|
||||
- (NSData*)canvasSpiderScopeAtTime:(CMTime)time;
|
||||
- (void)publishAssets:(DYAssetState*)assets atTime:(CMTime)time;
|
||||
- (void)beginSpider:(NSData*)mesh node:(NSString*)node enabled:(double)enabled atTime:(CMTime)time;
|
||||
- (void)changeSpider:(NSData*)mesh;
|
||||
@@ -95,6 +96,9 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
|
||||
- (NSData*)canvasHistogramAtTime:(CMTime)time {
|
||||
return [_renderer canvasHistogramAtTime:time];
|
||||
}
|
||||
- (NSData*)canvasSpiderScopeAtTime:(CMTime)time {
|
||||
return [_renderer canvasSpiderScopeAtTime:time];
|
||||
}
|
||||
- (void)requestWhiteBalanceAtTime:(CMTime)time {
|
||||
if(!CMTIME_IS_NUMERIC(time))return;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
|
||||
@@ -118,6 +118,37 @@
|
||||
DYWorkspaceDiagnosticRenderer *otherScope=[[[DYWorkspaceDiagnosticRenderer alloc]init]autorelease];[otherScope setScopeEnabled:YES atTime:CMTimeMake(9,24)];workspaceDrain();run.record(@"workspace-scope-cache-never-crosses-plugin-instances",!otherScope.scopeMetadata&&!otherScope.scopePreview);
|
||||
[otherScope setScopeEnabled:NO];[scopeRenderer setScopeEnabled:NO];
|
||||
|
||||
// The spider reuses the same frame, including when the full scopes are closed.
|
||||
constexpr size_t spiderBytes=dyscope::SpiderBins*dyscope::SpiderBins*4;
|
||||
NSData *osc=[scopeRenderer canvasSpiderScopeAtTime:CMTimeMake(9,24)];
|
||||
run.record(@"spider-osc-uses-exact-instance-output-time",osc.length==spiderBytes&&
|
||||
![scopeRenderer canvasSpiderScopeAtTime:CMTimeMake(8,24)]&&![otherScope canvasSpiderScopeAtTime:CMTimeMake(9,24)]);
|
||||
[scopeRenderer outputSpiderScope];
|
||||
scopeDeadline=NSProcessInfo.processInfo.systemUptime+5;
|
||||
NSData *overlay=nil;
|
||||
while(!(overlay=[scopeRenderer outputSpiderScope])&&NSProcessInfo.processInfo.systemUptime<scopeDeadline)
|
||||
[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
|
||||
run.record(@"spider-inspector-replays-paused-output-without-enabling-full-scopes",
|
||||
[overlay isEqual:osc]&&!scopeRenderer.scopeEnabled);
|
||||
for(unsigned i=0;i<16;i++){finalPixels[i*4]=.5f;finalPixels[i*4+1]=.12f;finalPixels[i*4+2]=.05f;}
|
||||
[[finalTile metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,4,4) mipmapLevel:0 withBytes:finalPixels.data() bytesPerRow:4*8];
|
||||
[scopeRenderer captureScopeTile:finalTile atTime:CMTimeMake(9,24)];
|
||||
scopeDeadline=NSProcessInfo.processInfo.systemUptime+5;
|
||||
NSData *updated=nil;
|
||||
while([(updated=[scopeRenderer outputSpiderScope])isEqual:overlay]&&NSProcessInfo.processInfo.systemUptime<scopeDeadline)
|
||||
[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.005]];
|
||||
run.record(@"spider-plot-refreshes-on-edits-at-the-same-time",
|
||||
updated.length==spiderBytes&&![updated isEqual:overlay]&&[updated isEqual:[scopeRenderer canvasSpiderScopeAtTime:CMTimeMake(9,24)]]);
|
||||
|
||||
const dyscope::RGBA vectors[]={{.5f,0,0,.5f},{0,.5f,0,.5f},{0,0,.5f,.5f},{.1f,.1f,.1f,1},
|
||||
{1,0,1,0},{NAN,1,0,1},{1,.2f,0,NAN}};
|
||||
auto density=dyscope::spiderVectorImage(vectors);
|
||||
auto alpha=[&](unsigned x,unsigned y){return density[(y*dyscope::SpiderBins+x)*4+3];};
|
||||
unsigned nonempty=0;
|
||||
for(size_t i=3;i<density.size();i+=4)nonempty+=density[i]>0;
|
||||
run.record(@"spider-raster-hue-orientation-neutral-center-and-invalid-filtering",
|
||||
nonempty==4&&alpha(191,96)&&alpha(48,178)&&alpha(48,13)&&alpha(96,96));
|
||||
|
||||
}
|
||||
// Exercise the new stack workspace against the same authoritative host document
|
||||
// as the regular inspector. Every view stays in an unpresented native fixture.
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.19.1</string>
|
||||
<string>1.20.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>110</string>
|
||||
<string>111</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.19.1</string>
|
||||
<string>1.20.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>110</string>
|
||||
<string>111</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
@@ -1,8 +1,16 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
更新于 2026-11-06(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
|
||||
更新于 2026-11-08(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。
|
||||
|
||||
## 当前基线
|
||||
## 1.20.0(111)蜘蛛盘示波器
|
||||
|
||||
蜘蛛盘校色仪在检查器、浮动工作区和画布控件叠加当前效果最终输出的浅色轨迹,色相和饱和度与蜘蛛网格共用坐标。压暗色盘,保留前景可拖动节点,并用带「肤色」标签的 28° 虚线标示固定参考方向。取样沿用 320×180 的最终输出缓存。检查器后台生成密度栅格,画布仅取与当前时间匹配的样本;工作区原有的 Cb/Cr 矢量示波器维持原坐标。
|
||||
|
||||
新 FCP 整合效果、独立模板和新插入的肤色工具默认关闭保护。FCP 模板显式写入关闭值,注册默认保留历史开启值,兼容省略该参数的旧片段。Motion 直接添加原生滤镜沿用注册默认。显式开启时保护程度默认 60,仅保护人脸默认开启。
|
||||
|
||||
已通过 17 套 FCP 效果模板结构校验;Release 构建、签名、公证、宿主验收及发行包待完成。源码入口为 `大鱼调色/Plugin/DYScopeCapture.inc.h`、`DYSpiderDisc.inc.h`、`DYViewerGraphics.inc.h` 和 `DYModel.mm`。继续从正式安装路径验证播放、色盘拖动及新加效果的肤色开关。已有工程文件的 Security 引用排序差异留在工作区。
|
||||
|
||||
## 1.19.1 交付基线(历史)
|
||||
|
||||
**1.19.1(110)已正式公证安装,完成本轮默认预览宿主验证,PKG 与 Git Release 已交付。** 实际编译提交 `3642a1dba6cbbc4423bd6928944e0e95d76d9cfa`,APP 公证 `c965f687-ab0b-442b-99e1-4b5013065f50` Accepted。固定路径仍为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;994 项正式安装原生检查、票据、Gatekeeper、唯一 PluginKit 路径通过。
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户