Add dark defaults, modular effect templates and canvas leveling
这个提交包含在:
1 父节点
ffabdca5b1
当前提交
5ca307414c
25 个文件已更改
+1702
-88
没有与搜索条件相匹配的文件
+17
-14
@@ -11,8 +11,11 @@ import shutil
|
||||
import stat
|
||||
import subprocess
|
||||
import tempfile
|
||||
import sys
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
sys.path.insert(0, str(ROOT / "tools"))
|
||||
from template_payload import template_files
|
||||
APP = Path("/Library/Plug-Ins/FxPlug/大鱼调色.app")
|
||||
CACHE = Path.home() / "Library/Caches/CodexBuilds/com.dayu.color"
|
||||
LOCK = Path.home() / ".codex/app-delivery-locks/com.dayu.color.lock"
|
||||
@@ -79,31 +82,29 @@ def main():
|
||||
LOCK.mkdir()
|
||||
(LOCK / "owner.json").write_text(json.dumps(dict(PID=os.getpid(), cwd=str(ROOT),
|
||||
product="大鱼调色", phase="PKG packaging", started=datetime.datetime.now(datetime.timezone.utc).isoformat())))
|
||||
stage = None
|
||||
try:
|
||||
check_bundle_access((path, path.lstat().st_mode) for path in [APP, *APP.rglob("*")])
|
||||
source = APP / "Contents/Resources/FCP Templates"
|
||||
staged = CACHE / "pkg-inputs/大鱼调色/大鱼调色"
|
||||
staged.mkdir(parents=True, exist_ok=True)
|
||||
# Use a fresh staging directory, so historical files cannot leak into
|
||||
# the new payload or override the intended effect list.
|
||||
stage = Path(tempfile.mkdtemp(prefix="pkg-inputs-", dir=CACHE))
|
||||
staged = stage / "大鱼调色"
|
||||
hashes = {}
|
||||
for name in ["大鱼调色.moef", "large.png", "small.png"]:
|
||||
data = (source / name).read_bytes()
|
||||
assert data == (ROOT / "template" / name).read_bytes(), name
|
||||
target = staged / name
|
||||
if target.exists():
|
||||
os.chflags(target, 0)
|
||||
for reference, bundled, installed in template_files():
|
||||
data = (source / bundled).read_bytes()
|
||||
assert data == (ROOT / "template" / reference).read_bytes(), installed
|
||||
target = staged / installed
|
||||
target.parent.mkdir(parents=True, exist_ok=True)
|
||||
target.write_bytes(data)
|
||||
target.chmod(0o644)
|
||||
if name.endswith(".png"):
|
||||
os.chflags(target, 2)
|
||||
hashes[name] = hashlib.sha256(data).hexdigest()
|
||||
for folder in [staged, staged.parent]:
|
||||
folder.chmod(0o755)
|
||||
hashes[str(installed)] = hashlib.sha256(data).hexdigest()
|
||||
keychain = str(Path.home() / "Library/Keychains/login.keychain-db")
|
||||
profile = "codex-dayu-notary-B3W25FX5H5"
|
||||
version = info["CFBundleShortVersionString"]
|
||||
manifest = dict(name="大鱼调色", output=str(args.output_dir / "大鱼调色.pkg"),
|
||||
identifierPrefix="com.dayu.color.installer", resources=[dict(source=str(APP)),
|
||||
dict(source=str(staged.parent), destination="~/Movies/Motion Templates.localized/Effects.localized")],
|
||||
dict(source=str(staged), destination="~/Movies/Motion Templates.localized/Effects.localized")],
|
||||
signing=dict(identity="Developer ID Installer: zhong luo (B3W25FX5H5)", profile=profile,
|
||||
keychain=keychain, notaryKeychain=keychain),
|
||||
appearance=dict(title="大鱼调色", subtitle="适用于 Final Cut Pro 与 Motion 的原生调色效果",
|
||||
@@ -142,6 +143,8 @@ def main():
|
||||
report_path.write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n")
|
||||
print("正式安装包:" + str(package))
|
||||
finally:
|
||||
if stage and not args.prepare_only:
|
||||
shutil.rmtree(stage)
|
||||
(LOCK / "owner.json").unlink()
|
||||
LOCK.rmdir()
|
||||
|
||||
|
||||
@@ -0,0 +1,597 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE ozxmlscene>
|
||||
<ozml version="5.11">
|
||||
<displayversion>5.4.5</displayversion>
|
||||
<factory id="1" uuid="46c844a813d311d8a438000a95af9f7e">
|
||||
<description>Channel</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="2" uuid="65cb4dc9d4504fa281921f5f751fba06">
|
||||
<description>小组件</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="3" uuid="66fc0d6af6a911d6a7a7000393670732">
|
||||
<description>图像</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="4" uuid="7d468273c013498e9806a0d7bc32fddf">
|
||||
<description>项目</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="5" uuid="deca4859b16011d7a12d0003936f6f92">
|
||||
<description>ProPlugin 滤镜</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<build />
|
||||
<description />
|
||||
<canvas>
|
||||
<layout>1</layout>
|
||||
<activeView>0</activeView>
|
||||
</canvas>
|
||||
<viewer subview="0">
|
||||
<resolutionMode>0</resolutionMode>
|
||||
<dynamicResolution>0</dynamicResolution>
|
||||
<viewmode>0</viewmode>
|
||||
<overlayOptions>92956</overlayOptions>
|
||||
<oscOptions>30</oscOptions>
|
||||
<compensateAspectRatio>1</compensateAspectRatio>
|
||||
<renderFields>0</renderFields>
|
||||
<showMotionBlur>0</showMotionBlur>
|
||||
<showFrameBlending>1</showFrameBlending>
|
||||
<showLighting>1</showLighting>
|
||||
<showShadows>1</showShadows>
|
||||
<showReflection>1</showReflection>
|
||||
<showDepthOfField>0</showDepthOfField>
|
||||
<renderFullView>0</renderFullView>
|
||||
<renderQuality>2</renderQuality>
|
||||
<textRenderQuality>2</textRenderQuality>
|
||||
<showHighQualityResampling>0</showHighQualityResampling>
|
||||
<showShapeAntialiasing>1</showShapeAntialiasing>
|
||||
<show3DIntersectionAntialiasing>0</show3DIntersectionAntialiasing>
|
||||
<cameraType>0</cameraType>
|
||||
<cameraName>活跃的摄像机</cameraName>
|
||||
<mirrorHMD>0</mirrorHMD>
|
||||
<panZoom camera="0" zoom="0.43564814329147339" panX="726" panY="3" mode="2" centered="1" />
|
||||
<panZoom camera="1" zoom="0.15078124403953552" panX="19" panY="129" mode="2" centered="1" />
|
||||
</viewer>
|
||||
<projectPanel>
|
||||
<layersPreviewColumn>1</layersPreviewColumn>
|
||||
<layersOpacityColumn>0</layersOpacityColumn>
|
||||
<layersBlendColumn>0</layersBlendColumn>
|
||||
<displayMasks>1</displayMasks>
|
||||
<displayBehaviors>1</displayBehaviors>
|
||||
<displayEffects>1</displayEffects>
|
||||
<layersVerticalZoom>1.7999999523162842</layersVerticalZoom>
|
||||
<mediaPreviewColumn>1</mediaPreviewColumn>
|
||||
<mediaTypeColumn>1</mediaTypeColumn>
|
||||
<mediaDurationColumn>1</mediaDurationColumn>
|
||||
<mediaInUseColumn>1</mediaInUseColumn>
|
||||
<mediaFrameSizeColumn>1</mediaFrameSizeColumn>
|
||||
<mediaCompressorColumn>1</mediaCompressorColumn>
|
||||
<mediaDepthColumn>1</mediaDepthColumn>
|
||||
<mediaFrameRateColumn>1</mediaFrameRateColumn>
|
||||
<mediaDataRateColumn>1</mediaDataRateColumn>
|
||||
<mediaAudioRateColumn>1</mediaAudioRateColumn>
|
||||
<mediaAudioFormatColumn>1</mediaAudioFormatColumn>
|
||||
<mediaFileSizeColumn>1</mediaFileSizeColumn>
|
||||
<mediaFileCreatedColumn>1</mediaFileCreatedColumn>
|
||||
<mediaDileModifiedColumn>1</mediaDileModifiedColumn>
|
||||
<mediaVerticalZoom>1.7999999523162842</mediaVerticalZoom>
|
||||
</projectPanel>
|
||||
<timeline>
|
||||
<displayVideo>1</displayVideo>
|
||||
<displayAudio>0</displayAudio>
|
||||
<displayKeyframes>1</displayKeyframes>
|
||||
<displayMasks>1</displayMasks>
|
||||
<displayBehaviors>1</displayBehaviors>
|
||||
<displayEffects>1</displayEffects>
|
||||
<videoVerticalZoom>2.2222222222222223</videoVerticalZoom>
|
||||
<audioVerticalZoom>1.5555555820465088</audioVerticalZoom>
|
||||
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
|
||||
</timeline>
|
||||
<curveeditor>
|
||||
<autozoom>0</autozoom>
|
||||
<snapping>0</snapping>
|
||||
<displayAudioWaveform>0</displayAudioWaveform>
|
||||
<lockKeyframesInTime>0</lockKeyframesInTime>
|
||||
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
|
||||
<currentviewvolume originx="-0.25544805540078452" originy="-62.5" width="10.520896110000001" height="125" />
|
||||
<snapshotChannels>0</snapshotChannels>
|
||||
</curveeditor>
|
||||
<inspector>
|
||||
<collapseState id="./1/100" state="1" />
|
||||
<collapseState id="./1/200" state="1" />
|
||||
<collapseState id="./1/344" state="1" />
|
||||
</inspector>
|
||||
<scene>
|
||||
<sceneSettings>
|
||||
<width>3840</width>
|
||||
<height>2160</height>
|
||||
<duration>600</duration>
|
||||
<shouldOverrideFCDuration>0</shouldOverrideFCDuration>
|
||||
<frameRate>60</frameRate>
|
||||
<NTSC>1</NTSC>
|
||||
<pixelAspectRatio>1</pixelAspectRatio>
|
||||
<workingGamut>0</workingGamut>
|
||||
<viewGamut>-1</viewGamut>
|
||||
<optimizeForDisplay>0</optimizeForDisplay>
|
||||
<backgroundColor red="0" green="0" blue="0" alpha="0" />
|
||||
<audioChannels>2</audioChannels>
|
||||
<audioBitsPerSample>32</audioBitsPerSample>
|
||||
<fieldRenderingMode>0</fieldRenderingMode>
|
||||
<motionBlurSamples>8</motionBlurSamples>
|
||||
<motionBlurDuration>1</motionBlurDuration>
|
||||
<sharpScaling>0</sharpScaling>
|
||||
<startTimecode>0</startTimecode>
|
||||
<presetPath>/Applications/Motion.app/Contents/Resources/zh_CN.lproj/Presets/Project/4K - Ultra HD.preset</presetPath>
|
||||
<backgroundMode>0</backgroundMode>
|
||||
<reflectionRecursionLimit>2</reflectionRecursionLimit>
|
||||
<glyphOSCMode>0</glyphOSCMode>
|
||||
<animateFlag>0</animateFlag>
|
||||
<parameterColorSpaceID>3</parameterColorSpaceID>
|
||||
<savePreviewMovie>0</savePreviewMovie>
|
||||
</sceneSettings>
|
||||
<publishSettings>
|
||||
<version>2</version>
|
||||
<target object="10060" channel="./9000" name="大鱼调色" />
|
||||
</publishSettings>
|
||||
<currentFrame>0 1 1 0</currentFrame>
|
||||
<currentObject>10000</currentObject>
|
||||
<timeRange offset="0 1 1 0" duration="1201200 120000 1 0" />
|
||||
<playRange offset="0 1 1 0" duration="1201200 120000 1 0" />
|
||||
<flags>129</flags>
|
||||
<audioTracks>0</audioTracks>
|
||||
<timemarkerset />
|
||||
<guideset />
|
||||
<curvesets selected="1" />
|
||||
<scenenode name="项目" id="10000" factoryID="4" version="5">
|
||||
<scenenode name="小组件" id="10002" factoryID="2" version="5">
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="选项" id="103" flags="8589938688" />
|
||||
<parameter name="Hidden" id="102" flags="8589934608" default="0" value="1" />
|
||||
<parameter name="快照" id="101" flags="8589938706" />
|
||||
<parameter name="小组件" id="100" flags="8589934608" default="1.7777777777777777" value="1.7777777777777777" />
|
||||
</parameter>
|
||||
</scenenode>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>268435473</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</scenenode>
|
||||
<layer name="群组 1" id="10047">
|
||||
<scenenode name="效果源" id="10050" factoryID="3" version="5">
|
||||
<validTracks>1</validTracks>
|
||||
<aspectRatio>0</aspectRatio>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>16384</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704">
|
||||
<parameter name="电影效果" id="344" flags="8589938706">
|
||||
<foldFlags>131076</foldFlags>
|
||||
<parameter name="景深" id="346" flags="8589934608" default="1.3999999999999999" value="2" />
|
||||
<parameter name="焦点" id="348" flags="8589938706">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="颜色" id="243" flags="8589938688">
|
||||
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
|
||||
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
|
||||
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
|
||||
</parameter>
|
||||
<parameter name="媒体" id="324" flags="8589938704">
|
||||
<parameter name="源媒体" id="300" flags="81604444176" default="10048" value="10048" />
|
||||
<parameter name="源媒体" id="325" flags="8590000146" />
|
||||
</parameter>
|
||||
<parameter name="页码" id="301" flags="8589934610" default="1" value="1" />
|
||||
<parameter name="重新定时值" id="304" flags="8590066066" default="1" value="1" />
|
||||
<parameter name="重新定时值缓存" id="319" flags="8590065810" default="1" value="1" />
|
||||
</parameter>
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="拖放区" id="311" flags="8589934738" default="0" value="1" />
|
||||
<parameter name="类型" id="321" flags="8590000146" default="0" value="3" />
|
||||
<parameter name="移动" id="326" flags="77309415442">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="缩放" id="327" flags="77309415442">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="填充不透明" id="328" flags="8589934608" default="0" value="0" />
|
||||
<parameter name="填充颜色" id="329" flags="8589938704">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="清除" id="315" flags="8590000144" default="0" value="0" />
|
||||
<parameter name="宽度" id="313" flags="8589934610" default="1" value="3840" />
|
||||
<parameter name="高度" id="314" flags="8589934610" default="1" value="2160" />
|
||||
</parameter>
|
||||
<filter name="大鱼调色" id="10060" factoryID="5" pluginUUID="1C17B73B-F229-4C09-A434-EAF6DFF5F22A" pluginVersion="0" pluginName="大鱼调色" pluginDynamicParams="0">
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<baseFlags>8589934608</baseFlags>
|
||||
<parameter name="大鱼调色" id="9000" flags="12884901888">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********Y*eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-U47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3IqVnP*XG5VwU6JcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6U6ZVCIoxWOaJXRB6S5mEZLl*EF3Z7PbBkNKBoPr7IPqhZPe6a6ZwE22FNGKtnQ4JXR4xmJ4xfNKs*0**F*-c*7**d*16*Bk-7*2k*K*-O*46*O*-j*5I*T*01*6I*Vk07*7**a*0X*8I*dk0d*8g*fE0l*96*hk10*Ag*q*1P*CE*uE1w*Dw********0*E*********b*******************-2UU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-zk********6-*********-********************6***</defaultVal>
|
||||
<dataValue>*********Y*eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-U47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3IqVnP*XG5VwU6JcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6U6ZVCIoxWOaJXRB6S5mEZLl*EF3Z7PbBkNKBoPr7IPqhZPe6a6ZwE22FNGKtnQ4JXR4xmJ4xfNKs*0**F*-c*7**d*16*Bk-7*2k*K*-O*46*O*-j*5I*T*01*6I*Vk07*7**a*0X*8I*dk0d*8g*fE0l*96*hk10*Ag*q*1P*CE*uE1w*Dw********0*E*********b*******************-2UU*0**F*-c*7**d*16*Bk-7*2s*Kk-h*4w*QE-p*5g-zk********6-*********-********************6***</dataValue>
|
||||
</parameter>
|
||||
<parameter name="LUT 文件" id="9001" flags="12889161776">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</defaultVal>
|
||||
<dataValue>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</dataValue>
|
||||
</parameter>
|
||||
<parameter name="工具与蒙版" id="9002" flags="12889161776">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBHO5Bgol6H1WUd680UU*fG90oi9pcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6iA3VCIoxWOaJXRB6H1X7-fXAoBHMrC1YuCnkxDXx*U*m*1M*CU*y*26*FU-8*2s*IU-K*3c*LU-W*4M*OJr-mOKpVQbZKQr-dN4JmJ47VQqJIQqhdPZFgPqxfJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U28*F2-2U2H*FI-4U2Z*Gs-Ck2y*IQ-H*3P*Jo-Lk3V*KA-NE3b*KY-Ok3h*Kw-QE3n*LI-Rk3t*M2-W*4B*N6-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</defaultVal>
|
||||
<dataValue>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBHO5Bgol6H1WUd680UU*fG90oi9pcYMqlVQrBiMKpZK0FXP43nQqJnL2tHF4ZXR4ZjPa3mSO6iA3VCIoxWOaJXRB6H1X7-fXAoBHMrC1YuCnkxDXx*U*m*1M*CU*y*26*FU-8*2s*IU-K*3c*LU-W*4M*OJr-mOKpVQbZKQr-dN4JmJ47VQqJIQqhdPZFgPqxfJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U28*F2-2U2H*FI-4U2Z*Gs-Ck2y*IQ-H*3P*Jo-Lk3V*KA-NE3b*KY-Ok3h*Kw-QE3n*LI-Rk3t*M2-W*4B*N6-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</dataValue>
|
||||
</parameter>
|
||||
<parameter name="相机输入" id="2013" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旧版输入强度" id="2014" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="CST 配置版本" id="2236" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入转换启用" id="2241" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输入曲线" id="2237" flags="12889161776" default="28" value="28" />
|
||||
<parameter name="输入色域" id="2238" flags="12889161776" default="27" value="27" />
|
||||
<parameter name="工作曲线" id="2239" flags="12889161776" default="10" value="10" />
|
||||
<parameter name="工作色域" id="2240" flags="12889161776" default="16" value="16" />
|
||||
<parameter name="CST 混合" id="2269" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级调色启用" id="2242" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级曝光" id="2247" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡方向" id="2248" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡强度" id="2249" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级饱和度" id="2250" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级对比度" id="2251" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="对比度轴心" id="2252" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光对比度" id="2253" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光轴心" id="2254" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影对比度" id="2255" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影轴心" id="2256" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="白点" id="2257" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肩部压缩" id="2258" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="一级高光" id="2259" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级中间调" id="2260" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级阴影" id="2261" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑点" id="2262" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="趾部压缩" id="2263" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="色度混合" id="2264" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="旁路一级曝光" id="2265" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级色彩" id="2266" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级对比" id="2267" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级影调" id="2268" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
|
||||
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
|
||||
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="1" />
|
||||
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="对比度" id="2001" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="对比度 启用" id="2021" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="高光" id="2002" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 启用" id="2022" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影" id="2003" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 启用" id="2023" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="白色色阶" id="2004" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="白色色阶 启用" id="2024" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黑色色阶" id="2005" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑色色阶 启用" id="2025" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="色温" id="2006" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色温 启用" id="2026" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="色调" id="2007" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色调 启用" id="2027" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="饱和度" id="2008" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="饱和度 启用" id="2028" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="鲜艳度" id="2009" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="鲜艳度 启用" id="2029" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="纹理" id="2010" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="纹理 启用" id="2030" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="清晰度" id="2011" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="清晰度 启用" id="2031" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="去朦胧" id="2012" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="去朦胧 启用" id="2032" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="复制时自动调色" id="8800" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="一级调色总开关" id="2271" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蜘蛛盘混合" id="2273" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蜘蛛盘校色仪" id="2272" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="基础调色" id="2034" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="白平衡与颜色" id="2035" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保护程度" id="2117" flags="12889161760" default="60" value="60" />
|
||||
<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="风格 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" />
|
||||
<parameter name="风格 3 启用" id="2041" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 3 强度" id="2017" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 4 启用" id="2042" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 4 强度" id="2018" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 5 启用" id="2043" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 5 强度" id="2019" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 LUT" id="2036" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="主曲线 阴影" id="2046" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 暗部" id="2047" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 亮部" id="2048" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 高光" id="2049" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红曲线 阴影" id="2050" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红曲线 高光" id="2051" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿曲线 阴影" id="2052" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿曲线 高光" id="2053" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝曲线 阴影" id="2054" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝曲线 高光" id="2055" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 点1 X" id="2056" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主曲线 点2 X" id="2057" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主曲线 点3 X" id="2058" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主曲线 点4 X" id="2059" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红曲线 点1 X" id="2060" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红曲线 点2 X" id="2061" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿曲线 点1 X" id="2062" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿曲线 点2 X" id="2063" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝曲线 点1 X" id="2064" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝曲线 点2 X" id="2065" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点1 偏移" id="2204" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点1 X" id="2208" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点2 偏移" id="2205" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点2 X" id="2209" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点3 偏移" id="2206" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点3 X" id="2210" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点4 偏移" id="2207" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点4 X" id="2211" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点1 偏移" id="2212" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点1 X" id="2216" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点2 偏移" id="2213" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点2 X" id="2217" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点3 偏移" id="2214" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点3 X" id="2218" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点4 偏移" id="2215" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点4 X" id="2219" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点1 偏移" id="2220" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点1 X" id="2224" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点2 偏移" id="2221" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点2 X" id="2225" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点3 偏移" id="2222" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点3 X" id="2226" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点4 偏移" id="2223" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点4 X" id="2227" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点1 偏移" id="2228" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点1 X" id="2232" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点2 偏移" id="2229" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点2 X" id="2233" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点3 偏移" id="2230" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点3 X" id="2234" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点4 偏移" id="2231" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点4 X" id="2235" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="曲线" id="2044" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红 色相" id="2068" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 色相" id="2069" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 色相" id="2070" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 色相" id="2071" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="青 色相" id="2072" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 色相" id="2073" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="紫 色相" id="2074" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="洋红 色相" id="2075" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 饱和度" id="2076" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 饱和度" id="2077" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 饱和度" id="2078" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 饱和度" id="2079" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="青 饱和度" id="2080" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 饱和度" id="2081" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="紫 饱和度" id="2082" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="洋红 饱和度" id="2083" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 明亮度" id="2084" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 明亮度" id="2085" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 明亮度" id="2086" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 明亮度" id="2087" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="青 明亮度" id="2088" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 明亮度" id="2089" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="紫 明亮度" id="2090" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="洋红 明亮度" id="2091" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义色 R" id="2092" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="自定义 色相" id="2096" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 色相范围" id="2140" flags="12889161760" default="30" value="30" />
|
||||
<parameter name="自定义色 G" id="2093" flags="12889161760" default="0.10000000000000001" value="0.10000000000000001" />
|
||||
<parameter name="自定义 饱和度" id="2097" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 饱和度范围" id="2141" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="自定义色 B" id="2094" flags="12889161760" default="0.57999999999999996" value="0.57999999999999996" />
|
||||
<parameter name="自定义 明亮度" id="2098" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 明亮度范围" id="2142" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="显示自定义色选区" id="2144" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="HSL 混色" id="2045" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影 色相" id="2106" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 饱和度" id="2107" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 明亮度" id="2113" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 色相" id="2104" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 饱和度" id="2105" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 明亮度" id="2112" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 色相" id="2108" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 饱和度" id="2109" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 明亮度" id="2114" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="全局 色相" id="2148" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="全局 饱和度" id="2149" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="全局 明亮度" id="2150" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="混合" id="2101" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="平衡" id="2102" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色分级" id="2100" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红原色 色相" id="2121" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红原色 饱和度" id="2122" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿原色 色相" id="2123" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿原色 饱和度" id="2124" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝原色 色相" id="2125" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝原色 饱和度" id="2126" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="三原色" id="2120" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="RGB 输入黑" id="2156" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="RGB 伽马" id="2160" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="RGB 输入白" id="2164" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="RGB 输出黑" id="2168" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="RGB 输出白" id="2172" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="红 输入黑" id="2157" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 伽马" id="2161" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红 输入白" id="2165" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="红 输出黑" id="2169" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 输出白" id="2173" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="绿 输入黑" id="2158" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 伽马" id="2162" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="绿 输入白" id="2166" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="绿 输出黑" id="2170" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 输出白" id="2174" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="蓝 输入黑" id="2159" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 伽马" id="2163" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蓝 输入白" id="2167" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="蓝 输出黑" id="2171" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 输出白" id="2175" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="色阶" id="2152" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黑白 红" id="2180" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="黑白 黄" id="2181" flags="12889161760" default="60" value="60" />
|
||||
<parameter name="黑白 绿" id="2182" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="黑白 青" id="2183" flags="12889161760" default="60" value="60" />
|
||||
<parameter name="黑白 蓝" id="2184" flags="12889161760" default="20" value="20" />
|
||||
<parameter name="黑白 洋红" id="2185" flags="12889161760" default="80" value="80" />
|
||||
<parameter name="着色色相" id="2186" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="着色饱和度" id="2187" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混合" id="2270" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混色" id="2176" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持明度" id="2189" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影 青 ↔ 红" id="2192" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 洋红 ↔ 绿" id="2193" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 黄 ↔ 蓝" id="2194" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 青 ↔ 红" id="2196" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 洋红 ↔ 绿" id="2197" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 黄 ↔ 蓝" id="2198" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 青 ↔ 红" id="2200" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 洋红 ↔ 绿" id="2201" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 黄 ↔ 蓝" id="2202" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡" id="2188" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 红输入" id="2276" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 绿输入" id="2277" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红输出 ← 蓝输入" id="2278" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 红输入" id="2280" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 绿输入" id="2281" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="绿输出 ← 蓝输入" id="2282" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 红输入" id="2284" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 绿输入" id="2285" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 蓝输入" id="2286" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持亮度" id="2289" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="保持饱和度" id="2290" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="通道混合强度" id="2291" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="通道混合器" id="2288" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片混合强度" id="2293" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用减色" id="2294" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="整体减色" id="2295" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="青色减色" id="2296" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="洋红减色" id="2297" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黄色减色" id="2298" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="密度" id="2299" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="密度模式" id="2300" flags="12889161760" default="2" value="2" />
|
||||
<parameter name="胶片亮度模型" id="2301" flags="12889161760" default="6" value="6" />
|
||||
<parameter name="启用晕光" id="2302" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="散射半径" id="2303" flags="12889161760" default="5" value="5" />
|
||||
<parameter name="染料透射" id="2304" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="晕光增强" id="2305" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用辉光" id="2306" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="辉光灵敏度" id="2307" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="辉光扩散" id="2308" flags="12889161760" default="30" value="30" />
|
||||
<parameter name="辉光强度" id="2309" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="启用颗粒" id="2310" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒数量" id="2311" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒大小" id="2312" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片响应" id="2313" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色变化" id="2314" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒帧保持" id="2315" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="颗粒种子" id="2316" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="启用暗角" id="2317" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="暗角强度" id="2318" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="暗角半径" id="2319" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="暗角过渡" id="2320" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="畸变校正" id="2329" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="画面缩放" id="2330" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="光学中心 X" id="2331" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="光学中心 Y" id="2332" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="镜头畸变修复" id="2328" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
|
||||
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="发布 OSC" id="10005" flags="8589934592" default="0" value="1" />
|
||||
</filter>
|
||||
</scenenode>
|
||||
<aspectRatio>1</aspectRatio>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704">
|
||||
<parameter name="阴影" id="234" flags="8589938706">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="颜色" id="243" flags="8589938688">
|
||||
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
|
||||
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
|
||||
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
|
||||
</parameter>
|
||||
<parameter name="投影" id="208" flags="8589973522">
|
||||
<foldFlags>131087</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="四角" id="207" flags="8589973506">
|
||||
<foldFlags>131087</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="裁剪" id="216" flags="8589973522">
|
||||
<foldFlags>131087</foldFlags>
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="类型" id="307" flags="12884901904" default="1" value="1" />
|
||||
<parameter name="固定分辨率" id="301" flags="8589936658" default="0" value="0" />
|
||||
<parameter name="固定宽度" id="302" flags="12884901910" default="3840" value="3840" />
|
||||
<parameter name="固定高度" id="303" flags="12884901910" default="2160" value="2160" />
|
||||
<parameter name="光圈宽度" id="312" flags="12884901906" default="3840" value="3840" />
|
||||
<parameter name="光圈高度" id="313" flags="12884901906" default="2160" value="2160" />
|
||||
</parameter>
|
||||
</layer>
|
||||
<footage name="媒体层" id="10049">
|
||||
<clip name="效果源" id="10048">
|
||||
<pathURL>Drop Zone.tiff</pathURL>
|
||||
<missingWidth>1200</missingWidth>
|
||||
<missingHeight>1200</missingHeight>
|
||||
<missingDuration>0.033333333333333333</missingDuration>
|
||||
<creationDuration>1</creationDuration>
|
||||
<mediaID />
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="像素宽高比" id="104" flags="12884901888" default="1" value="1" />
|
||||
<parameter name="帧速率" id="107" flags="8589934592" default="0" value="30" />
|
||||
<parameter name="固定宽度" id="114" flags="12884901888" default="1200" value="1200" />
|
||||
<parameter name="固定高度" id="115" flags="12884901888" default="1200" value="1200" />
|
||||
<parameter name="使用背景颜色" id="116" flags="8589934594" default="0" value="0" />
|
||||
<parameter name="背景颜色" id="117" flags="8589971458">
|
||||
<foldFlags>15</foldFlags>
|
||||
<parameter name="红色" id="1" flags="8589967376" default="1" value="1" />
|
||||
<parameter name="绿色" id="2" flags="8589967376" default="1" value="1" />
|
||||
<parameter name="蓝色" id="3" flags="8589967376" default="1" value="1" />
|
||||
</parameter>
|
||||
<parameter name="Missing Is Still" id="128" flags="8589934610" default="0" value="1" />
|
||||
</parameter>
|
||||
</clip>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</footage>
|
||||
</scene>
|
||||
</ozml>
|
||||
@@ -3710,7 +3710,7 @@
|
||||
}
|
||||
],
|
||||
"sourceSHA256": {
|
||||
"template/tools/dump_model.mm": "04e04446aa351d774913bc25b06512fefe7969bdf4c6e471a91f1e9d6c4fc3b5",
|
||||
"template/tools/dump_model.mm": "4e93d3790803cc5d91ae4de1a6f3e0c72626d7930ec013d70753b9c45b26be21",
|
||||
"大鱼调色/Plugin/DYCSTTypes.h": "ed5ba7e7ae35d1bba10e80a81184fa26b1f7eb582e47b2e45c3edd294889c76a",
|
||||
"大鱼调色/Plugin/DYColorManagement.h": "b0a4cd1b8c45dbce90a7b4f30f72ebf95ecd382895e74e3bfeda0f7cdb185157",
|
||||
"大鱼调色/Plugin/DYFilmMath.h": "945b7036c6aa6d27941a3bf96c4d70dec65a14b1747fba618e650738fa7108f0",
|
||||
@@ -3720,12 +3720,22 @@
|
||||
"大鱼调色/Plugin/DYModel.h": "a28652bd53aa9e1d085af1108c344b5d673c5e1b3731531e1bb2982efeb8708c",
|
||||
"大鱼调色/Plugin/DYModel.mm": "e5bdf3177e164c0b97e535be7e6d14ea56d49f3f74c3622078374e7a9597d2c1",
|
||||
"大鱼调色/Plugin/DYSpiderState.h": "0c80747e41e8fc97762e301b011bd08c18865a825eaafde086ed79ace37b22f9",
|
||||
"大鱼调色/Plugin/DYToolState.h": "bf22a9c1b29afaa6d411fae48ffd7de919947af1c626cc5d491218dd8065b293",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "ed99f24cceef8bbad66c562f027acd7a22b7d20f4386e04370fde2bb01f43f8c",
|
||||
"大鱼调色/Plugin/DYToolState.h": "83e54959fe6161dee7a3a9c3afec7ca0872b52ad9c0fa286e7497a4a759f8e2f",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "fd752f21967e4761af91c1e3673dd1419f26c288509d2cf1f078733072e15a29",
|
||||
"大鱼调色/Plugin/DYUniforms.h": "4901446fa6b2a6987a6a137baa458df70f5e25a1e64fdb5c502f765b20edc0c0",
|
||||
"大鱼调色/Plugin/MaskCore/DYMask.h": "5b9aa44390d4a1fca1baf5e34cb9eefc8483c939a65cc2a0412b7b41fc85bc16",
|
||||
"大鱼调色/Plugin/MaskCore/DYMaskOperator.h": "43fa701ad574f38ce0ab4f4d3900bb034edaaa1adc09821d2f4443ee2b687ba2",
|
||||
"大鱼调色/Plugin/SpiderCore/DYColorMath.h": "bdd6278e17ff4208ad94a8b0e834c817c0a3475f205dd79898e8fd88e84a19c9",
|
||||
"大鱼调色/Plugin/SpiderCore/DYSpiderMesh.hpp": "81ecf1f0bae4030615144c7cd7ca492f93f2d718ff9e45da8242f97848e3d754"
|
||||
},
|
||||
"starterArchives": {
|
||||
"hsl": {
|
||||
"9000": "AAAAAAAAAkAqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBgGJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAacLDBMbHB0jVSRudWxs0w0ODxARElVmb2xkc1ZzY2hlbWFWJGNsYXNzgAIQAoAG0xQVDxYYGldOUy5rZXlzWk5TLm9iamVjdHOhF4ADoRmABIAFU2hzbAjSHh8gIVokY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaIgIlhOU09iamVjdNIeHyQlXxAQRFlJbnNwZWN0b3JUb2tlbqImIl8QEERZSW5zcGVjdG9yVG9rZW4ACAARABoAJAApADIANwBJAEwAWABaAGIAaABvAHUAfACDAIUAhwCJAJAAmACjAKUApwCpAKsArQCxALIAtwDCAMsA2ADbAOQA6QD8AP8AAAAAAAACAQAAAAAAAAAnAAAAAAAAAAAAAAAAAAABEggACAARABoAJAApADIANwBJAE4AWwBtAG8AcQB1AHsB/wAAAAAAAAIBAAAAAAAAABAAAAAAAAAAAAAAAAAAAAIAAA==",
|
||||
"9002": "AAAAAAAAA68qYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEC72JwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAa8QHgsMESEiIyQlJicrMUJDREVGR0hJSktMTU5PUFNUV1UkbnVsbNINDg8QWGRvY3VtZW50ViRjbGFzc4ACgB3TEhMOFBogV05TLmtleXNaTlMub2JqZWN0c6UVFhcYGYADgASABYAGgAelGxwdHh+ACIAJgAuAG4AcgApbc3RhcnRlclRvb2xZYmFzZU1hc2tzW3JlbW92ZWRCYXNlVnNjaGVtYVZsYXllcnNTaHNs0xITDigpIKCggArSLC0uL1okY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaIuMFhOU09iamVjdNITDjJBrjM0NTY3ODk6Ozw9Pj9AgAyADYAOgA+AEIARgBKAE4AUgBWAFoAXgBiAGYAaV3ByaW1hcnlWc3BpZGVyVGJhc2VUc2tpblRsb29rVWN1cnZlV2dyYWRpbmdZcHJpbWFyaWVzVmxldmVsc1pibGFja3doaXRlV2JhbGFuY2VVbWl4ZXJUZmlsbVRsZW5z0iwtUVJXTlNBcnJheaJRMBAB0hMOVUGggBrSLC1YWV5EWVRvb2xEb2N1bWVudKJaMF5EWVRvb2xEb2N1bWVudAAIABEAGgAkACkAMgA3AEkATABYAFoAewCBAIYAjwCWAJgAmgChAKkAtAC6ALwAvgDAAMIAxADKAMwAzgDQANIA1ADWAOIA7AD4AP8BBgEKAREBEgETARUBGgElAS4BOwE+AUcBTAFbAV0BXwFhAWMBZQFnAWkBawFtAW8BcQFzAXUBdwF5AYEBiAGNAZIBlwGdAaUBrwG2AcEByQHPAdQB2QHeAeYB6QHrAfAB8QHzAfgCBwIKAAAAAAAAAgEAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAhkIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7A24AAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAADbwA="
|
||||
},
|
||||
"primary": {
|
||||
"9000": "AAAAAAAAAkQqYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEBhGJwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAacLDBMbHB0jVSRudWxs0w0ODxARElVmb2xkc1ZzY2hlbWFWJGNsYXNzgAIQAoAG0xQVDxYYGldOUy5rZXlzWk5TLm9iamVjdHOhF4ADoRmABIAFV3ByaW1hcnkI0h4fICFaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiICJYTlNPYmplY3TSHh8kJV8QEERZSW5zcGVjdG9yVG9rZW6iJiJfEBBEWUluc3BlY3RvclRva2VuAAgAEQAaACQAKQAyADcASQBMAFgAWgBiAGgAbwB1AHwAgwCFAIcAiQCQAJgAowClAKcAqQCrAK0AtQC2ALsAxgDPANwA3wDoAO0BAAEDAAAAAAAAAgEAAAAAAAAAJwAAAAAAAAAAAAAAAAAAARYIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7AgMAAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAACBAA=",
|
||||
"9002": "AAAAAAAAA68qYnBsaXN0MDDUAQIDBAUGBwxYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05TS2V5ZWRBcmNoaXZlctIICQoLXERhdGFJc0xlZ2FjeV8QD0JsaW5kRGF0YU9iamVjdIACgAGjDQ4PVSRudWxsTxEC72JwbGlzdDAw1AECAwQFBgcKWCR2ZXJzaW9uWSRhcmNoaXZlclQkdG9wWCRvYmplY3RzEgABhqBfEA9OU0tleWVkQXJjaGl2ZXLRCAlbQ3VzdG9tIERhdGGAAa8QHgsMESEiIyQlJicrMUJDREVGR0hJSktMTU5PUFNUV1UkbnVsbNINDg8QWGRvY3VtZW50ViRjbGFzc4ACgB3TEhMOFBogV05TLmtleXNaTlMub2JqZWN0c6UVFhcYGYADgASABYAGgAelGxwdHh+ACIAJgAuAG4AcgApbc3RhcnRlclRvb2xZYmFzZU1hc2tzW3JlbW92ZWRCYXNlVnNjaGVtYVZsYXllcnNXcHJpbWFyedMSEw4oKSCgoIAK0iwtLi9aJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiLjBYTlNPYmplY3TSEw4yQa4zNDU2Nzg5Ojs8PT4/QIAMgA2ADoAPgBCAEYASgBOAFIAVgBaAF4AYgBmAGlZzcGlkZXJUYmFzZVRza2luVGxvb2tTaHNsVWN1cnZlV2dyYWRpbmdZcHJpbWFyaWVzVmxldmVsc1pibGFja3doaXRlV2JhbGFuY2VVbWl4ZXJUZmlsbVRsZW5z0iwtUVJXTlNBcnJheaJRMBAB0hMOVUGggBrSLC1YWV5EWVRvb2xEb2N1bWVudKJaMF5EWVRvb2xEb2N1bWVudAAIABEAGgAkACkAMgA3AEkATABYAFoAewCBAIYAjwCWAJgAmgChAKkAtAC6ALwAvgDAAMIAxADKAMwAzgDQANIA1ADWAOIA7AD4AP8BBgEOARUBFgEXARkBHgEpATIBPwFCAUsBUAFfAWEBYwFlAWcBaQFrAW0BbwFxAXMBdQF3AXkBewF9AYQBiQGOAZMBlwGdAaUBrwG2AcEByQHPAdQB2QHeAeYB6QHrAfAB8QHzAfgCBwIKAAAAAAAAAgEAAAAAAAAAWwAAAAAAAAAAAAAAAAAAAhkIAAgAEQAaACQAKQAyADcASQBOAFsAbQBvAHEAdQB7A24AAAAAAAACAQAAAAAAAAAQAAAAAAAAAAAAAAAAAAADbwA="
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
-1
@@ -18,7 +18,16 @@ static NSString *archive(id object) {
|
||||
return [carrier base64EncodedStringWithOptions:0];
|
||||
}
|
||||
int main(void){@autoreleasepool{
|
||||
NSDictionary *out=@{@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
|
||||
NSMutableDictionary *starterArchives=[NSMutableDictionary dictionary];
|
||||
for(NSString *type in @[@"primary",@"hsl"]){
|
||||
DYInspectorToken *inspector=[[[DYInspectorToken alloc]init]autorelease];
|
||||
inspector.folds=@{type:@NO};
|
||||
DYToolDocument *tools=[[[DYToolDocument alloc]init]autorelease];
|
||||
tools.document=DYInitialToolDocument(type);
|
||||
if(![tools.document[@"starterTool"] isEqual:type]||tools.document[@"removedBase"]==nil)return 2;
|
||||
starterArchives[type]=@{@"9000":archive(inspector),@"9002":archive(tools)};
|
||||
}
|
||||
NSDictionary *out=@{@"starterArchives":starterArchives,@"parameters":DYDescriptors(),@"archivesBase64":@{@"9000":archive([[[DYInspectorToken alloc]init]autorelease]),@"9001":archive([[[DYAssetState alloc]init]autorelease]),@"9002":archive([[[DYToolDocument alloc]init]autorelease])}};
|
||||
NSError *error=nil;NSData *json=[NSJSONSerialization dataWithJSONObject:out options:NSJSONWritingPrettyPrinted|NSJSONWritingSortedKeys error:&error];
|
||||
if(!json){fprintf(stderr,"Could not export our model metadata\n");return 2;}fwrite(json.bytes,1,json.length,stdout);return 0;
|
||||
}}
|
||||
@@ -0,0 +1,597 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE ozxmlscene>
|
||||
<ozml version="5.11">
|
||||
<displayversion>5.4.5</displayversion>
|
||||
<factory id="1" uuid="46c844a813d311d8a438000a95af9f7e">
|
||||
<description>Channel</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="2" uuid="65cb4dc9d4504fa281921f5f751fba06">
|
||||
<description>小组件</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="3" uuid="66fc0d6af6a911d6a7a7000393670732">
|
||||
<description>图像</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="4" uuid="7d468273c013498e9806a0d7bc32fddf">
|
||||
<description>项目</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<factory id="5" uuid="deca4859b16011d7a12d0003936f6f92">
|
||||
<description>ProPlugin 滤镜</description>
|
||||
<manufacturer>Apple</manufacturer>
|
||||
<version>1</version>
|
||||
</factory>
|
||||
<build />
|
||||
<description />
|
||||
<canvas>
|
||||
<layout>1</layout>
|
||||
<activeView>0</activeView>
|
||||
</canvas>
|
||||
<viewer subview="0">
|
||||
<resolutionMode>0</resolutionMode>
|
||||
<dynamicResolution>0</dynamicResolution>
|
||||
<viewmode>0</viewmode>
|
||||
<overlayOptions>92956</overlayOptions>
|
||||
<oscOptions>30</oscOptions>
|
||||
<compensateAspectRatio>1</compensateAspectRatio>
|
||||
<renderFields>0</renderFields>
|
||||
<showMotionBlur>0</showMotionBlur>
|
||||
<showFrameBlending>1</showFrameBlending>
|
||||
<showLighting>1</showLighting>
|
||||
<showShadows>1</showShadows>
|
||||
<showReflection>1</showReflection>
|
||||
<showDepthOfField>0</showDepthOfField>
|
||||
<renderFullView>0</renderFullView>
|
||||
<renderQuality>2</renderQuality>
|
||||
<textRenderQuality>2</textRenderQuality>
|
||||
<showHighQualityResampling>0</showHighQualityResampling>
|
||||
<showShapeAntialiasing>1</showShapeAntialiasing>
|
||||
<show3DIntersectionAntialiasing>0</show3DIntersectionAntialiasing>
|
||||
<cameraType>0</cameraType>
|
||||
<cameraName>活跃的摄像机</cameraName>
|
||||
<mirrorHMD>0</mirrorHMD>
|
||||
<panZoom camera="0" zoom="0.43564814329147339" panX="726" panY="3" mode="2" centered="1" />
|
||||
<panZoom camera="1" zoom="0.15078124403953552" panX="19" panY="129" mode="2" centered="1" />
|
||||
</viewer>
|
||||
<projectPanel>
|
||||
<layersPreviewColumn>1</layersPreviewColumn>
|
||||
<layersOpacityColumn>0</layersOpacityColumn>
|
||||
<layersBlendColumn>0</layersBlendColumn>
|
||||
<displayMasks>1</displayMasks>
|
||||
<displayBehaviors>1</displayBehaviors>
|
||||
<displayEffects>1</displayEffects>
|
||||
<layersVerticalZoom>1.7999999523162842</layersVerticalZoom>
|
||||
<mediaPreviewColumn>1</mediaPreviewColumn>
|
||||
<mediaTypeColumn>1</mediaTypeColumn>
|
||||
<mediaDurationColumn>1</mediaDurationColumn>
|
||||
<mediaInUseColumn>1</mediaInUseColumn>
|
||||
<mediaFrameSizeColumn>1</mediaFrameSizeColumn>
|
||||
<mediaCompressorColumn>1</mediaCompressorColumn>
|
||||
<mediaDepthColumn>1</mediaDepthColumn>
|
||||
<mediaFrameRateColumn>1</mediaFrameRateColumn>
|
||||
<mediaDataRateColumn>1</mediaDataRateColumn>
|
||||
<mediaAudioRateColumn>1</mediaAudioRateColumn>
|
||||
<mediaAudioFormatColumn>1</mediaAudioFormatColumn>
|
||||
<mediaFileSizeColumn>1</mediaFileSizeColumn>
|
||||
<mediaFileCreatedColumn>1</mediaFileCreatedColumn>
|
||||
<mediaDileModifiedColumn>1</mediaDileModifiedColumn>
|
||||
<mediaVerticalZoom>1.7999999523162842</mediaVerticalZoom>
|
||||
</projectPanel>
|
||||
<timeline>
|
||||
<displayVideo>1</displayVideo>
|
||||
<displayAudio>0</displayAudio>
|
||||
<displayKeyframes>1</displayKeyframes>
|
||||
<displayMasks>1</displayMasks>
|
||||
<displayBehaviors>1</displayBehaviors>
|
||||
<displayEffects>1</displayEffects>
|
||||
<videoVerticalZoom>2.2222222222222223</videoVerticalZoom>
|
||||
<audioVerticalZoom>1.5555555820465088</audioVerticalZoom>
|
||||
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
|
||||
</timeline>
|
||||
<curveeditor>
|
||||
<autozoom>0</autozoom>
|
||||
<snapping>0</snapping>
|
||||
<displayAudioWaveform>0</displayAudioWaveform>
|
||||
<lockKeyframesInTime>0</lockKeyframesInTime>
|
||||
<displayRange in="-441795416 1729492187 3 0" out="10265448055 1000000000 3 0" />
|
||||
<currentviewvolume originx="-0.25544805540078452" originy="-62.5" width="10.520896110000001" height="125" />
|
||||
<snapshotChannels>0</snapshotChannels>
|
||||
</curveeditor>
|
||||
<inspector>
|
||||
<collapseState id="./1/100" state="1" />
|
||||
<collapseState id="./1/200" state="1" />
|
||||
<collapseState id="./1/344" state="1" />
|
||||
</inspector>
|
||||
<scene>
|
||||
<sceneSettings>
|
||||
<width>3840</width>
|
||||
<height>2160</height>
|
||||
<duration>600</duration>
|
||||
<shouldOverrideFCDuration>0</shouldOverrideFCDuration>
|
||||
<frameRate>60</frameRate>
|
||||
<NTSC>1</NTSC>
|
||||
<pixelAspectRatio>1</pixelAspectRatio>
|
||||
<workingGamut>0</workingGamut>
|
||||
<viewGamut>-1</viewGamut>
|
||||
<optimizeForDisplay>0</optimizeForDisplay>
|
||||
<backgroundColor red="0" green="0" blue="0" alpha="0" />
|
||||
<audioChannels>2</audioChannels>
|
||||
<audioBitsPerSample>32</audioBitsPerSample>
|
||||
<fieldRenderingMode>0</fieldRenderingMode>
|
||||
<motionBlurSamples>8</motionBlurSamples>
|
||||
<motionBlurDuration>1</motionBlurDuration>
|
||||
<sharpScaling>0</sharpScaling>
|
||||
<startTimecode>0</startTimecode>
|
||||
<presetPath>/Applications/Motion.app/Contents/Resources/zh_CN.lproj/Presets/Project/4K - Ultra HD.preset</presetPath>
|
||||
<backgroundMode>0</backgroundMode>
|
||||
<reflectionRecursionLimit>2</reflectionRecursionLimit>
|
||||
<glyphOSCMode>0</glyphOSCMode>
|
||||
<animateFlag>0</animateFlag>
|
||||
<parameterColorSpaceID>3</parameterColorSpaceID>
|
||||
<savePreviewMovie>0</savePreviewMovie>
|
||||
</sceneSettings>
|
||||
<publishSettings>
|
||||
<version>2</version>
|
||||
<target object="10060" channel="./9000" name="大鱼调色" />
|
||||
</publishSettings>
|
||||
<currentFrame>0 1 1 0</currentFrame>
|
||||
<currentObject>10000</currentObject>
|
||||
<timeRange offset="0 1 1 0" duration="1201200 120000 1 0" />
|
||||
<playRange offset="0 1 1 0" duration="1201200 120000 1 0" />
|
||||
<flags>129</flags>
|
||||
<audioTracks>0</audioTracks>
|
||||
<timemarkerset />
|
||||
<guideset />
|
||||
<curvesets selected="1" />
|
||||
<scenenode name="项目" id="10000" factoryID="4" version="5">
|
||||
<scenenode name="小组件" id="10002" factoryID="2" version="5">
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>16</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="选项" id="103" flags="8589938688" />
|
||||
<parameter name="Hidden" id="102" flags="8589934608" default="0" value="1" />
|
||||
<parameter name="快照" id="101" flags="8589938706" />
|
||||
<parameter name="小组件" id="100" flags="8589934608" default="1.7777777777777777" value="1.7777777777777777" />
|
||||
</parameter>
|
||||
</scenenode>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="-2002 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>268435473</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</scenenode>
|
||||
<layer name="群组 1" id="10047">
|
||||
<scenenode name="效果源" id="10050" factoryID="3" version="5">
|
||||
<validTracks>1</validTracks>
|
||||
<aspectRatio>0</aspectRatio>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>16384</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704">
|
||||
<parameter name="电影效果" id="344" flags="8589938706">
|
||||
<foldFlags>131076</foldFlags>
|
||||
<parameter name="景深" id="346" flags="8589934608" default="1.3999999999999999" value="2" />
|
||||
<parameter name="焦点" id="348" flags="8589938706">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="颜色" id="243" flags="8589938688">
|
||||
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
|
||||
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
|
||||
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
|
||||
</parameter>
|
||||
<parameter name="媒体" id="324" flags="8589938704">
|
||||
<parameter name="源媒体" id="300" flags="81604444176" default="10048" value="10048" />
|
||||
<parameter name="源媒体" id="325" flags="8590000146" />
|
||||
</parameter>
|
||||
<parameter name="页码" id="301" flags="8589934610" default="1" value="1" />
|
||||
<parameter name="重新定时值" id="304" flags="8590066066" default="1" value="1" />
|
||||
<parameter name="重新定时值缓存" id="319" flags="8590065810" default="1" value="1" />
|
||||
</parameter>
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="拖放区" id="311" flags="8589934738" default="0" value="1" />
|
||||
<parameter name="类型" id="321" flags="8590000146" default="0" value="3" />
|
||||
<parameter name="移动" id="326" flags="77309415442">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="缩放" id="327" flags="77309415442">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="填充不透明" id="328" flags="8589934608" default="0" value="0" />
|
||||
<parameter name="填充颜色" id="329" flags="8589938704">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="清除" id="315" flags="8590000144" default="0" value="0" />
|
||||
<parameter name="宽度" id="313" flags="8589934610" default="1" value="3840" />
|
||||
<parameter name="高度" id="314" flags="8589934610" default="1" value="2160" />
|
||||
</parameter>
|
||||
<filter name="大鱼调色" id="10060" factoryID="5" pluginUUID="1C17B73B-F229-4C09-A434-EAF6DFF5F22A" pluginVersion="0" pluginName="大鱼调色" pluginDynamicParams="0">
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<baseFlags>8589934608</baseFlags>
|
||||
<parameter name="大鱼调色" id="9000" flags="12884901888">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********YEeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-V47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3Jr-mOKpVQbY6oVsT603O74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW607MHZBDMadZMrHG5VwY7JwE22FNGKtnQ4JXR4xmJ4xfNKuW7W7T2--2KIZiQr-ZMrFjQZFjOqJi**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-W*4U*Pk-p*5k*Uk03*6Q*WE0E*7U*ck0Z*8Q*eE0f*8o*hE0q*9g*lU1D*Bk*rk1c*Co-**21*********U2*********7k*******************FM6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*UA********0*E*********E*******************0-**</defaultVal>
|
||||
<dataValue>*********YEeMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-V47kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OQ91-AP5-oXJGFiRKlgokoC1l*F2ZJaPqlYQpNnMqVZPK3K74BgMLBnU*6E*c*4olEJ1lMM4ZRCImtfNLZnKYtH9axWOaJXR5CV3s*1cFa*-6*3Jr-mOKpVQbY6oVsT603O74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW607MHZBDMadZMrHG5VwY7JwE22FNGKtnQ4JXR4xmJ4xfNKuW7W7T2--2KIZiQr-ZMrFjQZFjOqJi**U*2E*O*0E*8E*m*1Q*GE-A*3U*KU-W*4U*Pk-p*5k*Uk03*6Q*WE0E*7U*ck0Z*8Q*eE0f*8o*hE0q*9g*lU1D*Bk*rk1c*Co-**21*********U2*********7k*******************FM6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*UA********0*E*********E*******************0-**</dataValue>
|
||||
</parameter>
|
||||
<parameter name="LUT 文件" id="9001" flags="12889161776">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</defaultVal>
|
||||
<dataValue>*********Z2eMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl2-YK7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OI91-QR6pIYPbJgPBIB1UwE2F6H3-IJJL-VR4VnJWFXP43nQplnQ4ZYNL7AOKtfNKFT2*xXPqljQYpVPa3bNKpZPbFOQr-dN4JmHKJnO6*0U*E7U*0**BAM4EsO4llLHZAiOqJtQpdCImtjMadZMrFnc80**x6S5m*VKWFXP43nQqtVPKJM74BgMLBnNLBQHZB2OKBoOKxiML7tcW*WK2tHHq7eNKBooVsT70JQF3Z-QrBZR3BoMLFZcWMWL2FNELBnNLFHR43oNE*6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*M*-a*52*Rk-y*6g*bE0c*8c*f*0h*8w*gE0s*A**mk1A*Ao*nk1I*Bw*u*1p*DU-*E24*FA-3U********6-*********0Q*******************2X0**6*-2*4U*Y*0Y*AU*r*2Y*HU-P*4o*Pk-l*5I*Sk6E*********U2*********2********************V2*</dataValue>
|
||||
</parameter>
|
||||
<parameter name="工具与蒙版" id="9002" flags="12889161776">
|
||||
<numberOfKeypoints>0</numberOfKeypoints>
|
||||
<defaultVal>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBLQ57dPK3mSRAG2ksc8G0Uc6*8oWkh9WxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW9X-MHZBDMadZMrHG2ksmEOsnB1IqBnUtCXgwDHszE6*AU*q*1c*DU-0*2M*GU-C*36*JU-O*3s*MU-a*4ZNnQ4ZYNL7IMa3nNJFnOqZiJ4ljPqhHO5BgJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U2C*FI-3U2L*FY-5U2d*H6-Dk30*Ig-I*3T*K2-Mk3Z*KQ-OE3f*Ko-Pk3l*LA-RE3r*LY-Sk3x*ME-WE4C*NA-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</defaultVal>
|
||||
<dataValue>*********uweMb-gOLBoA11I*E61-*I4-klM75NZQbBdPqtN743mMqVdRaJmJ0FoPr-M74xWOaJXR5AG**44c3wE1otHGqJtNKF-QaBcOLNZQh660Ec9L2FVR437QolZNq3XSJwE1o7gOKtYF43oMIxWOaJXR6*0U*4X1EsDJGFiRKlgHl20vq7kP4ZnR1*kp*20*kE3-UQ8K0FqNL7nOKxiKGFVQaBcOLNZQZEYR4xkK0FjMadZMrFn2U*-Ve-T2*xCIohZSKJYEL7XO4ZqNL9F0*ZPErJnR4xh62FVR44**OwE5UgA2G2W6mEZ7WQfAI71F2J4FoV7GYhAHItDI3BIJpIYPbJgPB6B1UwEK4FjMrJhNKtoJWFXP43nQs*0U-rH2VAC3-cUJotH9ahZSLBOHZAiPq7eNKBoQuIJ3VQM4M*1U*G*-M*4U*SZ4lkR5Vy*06*7U*i*4s*QU*dPQrFVQbFZQZFjPqlNMa3nNIpVQqhnKr7ZPKxqNKF0MLBZJbBXO4JhMJNgMLZZQbBLQ57dPK3mSRAG2ksc8G0Uc6*8oWkh9WxO74BgMLBnPa3hNJUYMqlVQrBZQplCIoFdMrFdPqtVQbaW9X-MHZBDMadZMrHG2ksmEOsnB1IqBnUtCXgwDHszE6*AU*q*1c*DU-0*2M*GU-C*36*JU-O*3s*MU-a*4ZNnQ4ZYNL7IMa3nNJFnOqZiJ4ljPqhHO5BgJKBpQbNZJqRmMKFdPaRNQ57dPK3mOKJnJalZRaJgQpdWP43XOrRcOLFZJq7VP43iMqJJPKZsNL7INaZgPJFgNKtnoWkhIJ7LHZB-Qb7VSO7FA-*-oVACJI4UU-fG90pMKJt2KJFjPql2PqBpPKJiR87OA3t2KJFjPql2PqBpPKJiR**6*-2*4U*Y*0Y*AU*r*2Y*H*-M*3c*Sk0-*6M*Xk0K*7U*aU0V*8Y*h*0u*9k*jU1**A6*l*18*Ak*nU1E*B6*p*1K*C6*v*1s*Dw--U2C*FI-3U2L*FY-5U2d*H6-Dk30*Ig-I*3T*K2-Mk3Z*KQ-OE3f*Ko-Pk3l*LA-RE3r*LY-Sk3x*ME-WE4C*NA-Zk4R*OI-fk4q*Q2-mE5D*RE-qE5S*SM-uE5f*T*-wE5n*TU0-k68*********U2*********Kk*******************VY6**U*2E*O*0E*8E*m*1Q*GE-C*3g*PE-j*52*RE-v*qs********0*E*********E*******************1Pk*</dataValue>
|
||||
</parameter>
|
||||
<parameter name="相机输入" id="2013" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旧版输入强度" id="2014" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="CST 配置版本" id="2236" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入转换启用" id="2241" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输入曲线" id="2237" flags="12889161776" default="28" value="28" />
|
||||
<parameter name="输入色域" id="2238" flags="12889161776" default="27" value="27" />
|
||||
<parameter name="工作曲线" id="2239" flags="12889161776" default="10" value="10" />
|
||||
<parameter name="工作色域" id="2240" flags="12889161776" default="16" value="16" />
|
||||
<parameter name="CST 混合" id="2269" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级调色启用" id="2242" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级曝光" id="2247" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡方向" id="2248" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡强度" id="2249" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级饱和度" id="2250" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="一级对比度" id="2251" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="对比度轴心" id="2252" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光对比度" id="2253" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光轴心" id="2254" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影对比度" id="2255" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影轴心" id="2256" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="白点" id="2257" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="肩部压缩" id="2258" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="一级高光" id="2259" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级中间调" id="2260" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="一级阴影" id="2261" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑点" id="2262" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="趾部压缩" id="2263" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="色度混合" id="2264" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="旁路一级曝光" id="2265" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级色彩" id="2266" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级对比" id="2267" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="旁路一级影调" id="2268" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输出转换启用" id="2243" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="输出曲线" id="2244" flags="12889161776" default="1002" value="1002" />
|
||||
<parameter name="输出色域" id="2245" flags="12889161776" default="22" value="22" />
|
||||
<parameter name="自动色调映射" id="2246" flags="12889161776" default="0" value="1" />
|
||||
<parameter name="输入转换 / CST" id="2033" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="曝光" id="2000" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="曝光 启用" id="2020" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="对比度" id="2001" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="对比度 启用" id="2021" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="高光" id="2002" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 启用" id="2022" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影" id="2003" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 启用" id="2023" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="白色色阶" id="2004" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="白色色阶 启用" id="2024" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黑色色阶" id="2005" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑色色阶 启用" id="2025" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="色温" id="2006" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色温 启用" id="2026" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="色调" id="2007" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色调 启用" id="2027" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="饱和度" id="2008" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="饱和度 启用" id="2028" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="鲜艳度" id="2009" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="鲜艳度 启用" id="2029" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="纹理" id="2010" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="纹理 启用" id="2030" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="清晰度" id="2011" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="清晰度 启用" id="2031" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="去朦胧" id="2012" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="去朦胧 启用" id="2032" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="复制时自动调色" id="8800" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="一级调色总开关" id="2271" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蜘蛛盘混合" id="2273" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蜘蛛盘校色仪" id="2272" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="基础调色" id="2034" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="白平衡与颜色" id="2035" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保护程度" id="2117" flags="12889161760" default="60" value="60" />
|
||||
<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="风格 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" />
|
||||
<parameter name="风格 3 启用" id="2041" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 3 强度" id="2017" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 4 启用" id="2042" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 4 强度" id="2018" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 5 启用" id="2043" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 5 强度" id="2019" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="风格 LUT" id="2036" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="主曲线 阴影" id="2046" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 暗部" id="2047" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 亮部" id="2048" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 高光" id="2049" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红曲线 阴影" id="2050" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红曲线 高光" id="2051" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿曲线 阴影" id="2052" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿曲线 高光" id="2053" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝曲线 阴影" id="2054" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝曲线 高光" id="2055" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主曲线 点1 X" id="2056" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主曲线 点2 X" id="2057" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主曲线 点3 X" id="2058" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主曲线 点4 X" id="2059" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红曲线 点1 X" id="2060" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红曲线 点2 X" id="2061" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿曲线 点1 X" id="2062" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿曲线 点2 X" id="2063" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝曲线 点1 X" id="2064" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝曲线 点2 X" id="2065" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点1 偏移" id="2204" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点1 X" id="2208" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点2 偏移" id="2205" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点2 X" id="2209" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点3 偏移" id="2206" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点3 X" id="2210" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="主 扩展点4 偏移" id="2207" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="主 扩展点4 X" id="2211" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点1 偏移" id="2212" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点1 X" id="2216" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点2 偏移" id="2213" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点2 X" id="2217" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点3 偏移" id="2214" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点3 X" id="2218" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="红 扩展点4 偏移" id="2215" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 扩展点4 X" id="2219" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点1 偏移" id="2220" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点1 X" id="2224" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点2 偏移" id="2221" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点2 X" id="2225" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点3 偏移" id="2222" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点3 X" id="2226" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="绿 扩展点4 偏移" id="2223" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 扩展点4 X" id="2227" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点1 偏移" id="2228" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点1 X" id="2232" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点2 偏移" id="2229" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点2 X" id="2233" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点3 偏移" id="2230" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点3 X" id="2234" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="蓝 扩展点4 偏移" id="2231" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 扩展点4 X" id="2235" flags="12889161760" default="-1" value="-1" />
|
||||
<parameter name="曲线" id="2044" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红 色相" id="2068" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 色相" id="2069" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 色相" id="2070" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 色相" id="2071" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="青 色相" id="2072" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 色相" id="2073" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="紫 色相" id="2074" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="洋红 色相" id="2075" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 饱和度" id="2076" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 饱和度" id="2077" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 饱和度" id="2078" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 饱和度" id="2079" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="青 饱和度" id="2080" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 饱和度" id="2081" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="紫 饱和度" id="2082" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="洋红 饱和度" id="2083" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 明亮度" id="2084" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="橙 明亮度" id="2085" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黄 明亮度" id="2086" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 明亮度" id="2087" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="青 明亮度" id="2088" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 明亮度" id="2089" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="紫 明亮度" id="2090" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="洋红 明亮度" id="2091" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义色 R" id="2092" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="自定义 色相" id="2096" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 色相范围" id="2140" flags="12889161760" default="30" value="30" />
|
||||
<parameter name="自定义色 G" id="2093" flags="12889161760" default="0.10000000000000001" value="0.10000000000000001" />
|
||||
<parameter name="自定义 饱和度" id="2097" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 饱和度范围" id="2141" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="自定义色 B" id="2094" flags="12889161760" default="0.57999999999999996" value="0.57999999999999996" />
|
||||
<parameter name="自定义 明亮度" id="2098" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="自定义 明亮度范围" id="2142" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="显示自定义色选区" id="2144" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="HSL 混色" id="2045" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影 色相" id="2106" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 饱和度" id="2107" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 明亮度" id="2113" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 色相" id="2104" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 饱和度" id="2105" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 明亮度" id="2112" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 色相" id="2108" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 饱和度" id="2109" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 明亮度" id="2114" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="全局 色相" id="2148" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="全局 饱和度" id="2149" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="全局 明亮度" id="2150" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="混合" id="2101" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="平衡" id="2102" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色分级" id="2100" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红原色 色相" id="2121" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红原色 饱和度" id="2122" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿原色 色相" id="2123" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿原色 饱和度" id="2124" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝原色 色相" id="2125" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝原色 饱和度" id="2126" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="三原色" id="2120" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="RGB 输入黑" id="2156" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="RGB 伽马" id="2160" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="RGB 输入白" id="2164" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="RGB 输出黑" id="2168" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="RGB 输出白" id="2172" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="红 输入黑" id="2157" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 伽马" id="2161" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红 输入白" id="2165" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="红 输出黑" id="2169" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红 输出白" id="2173" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="绿 输入黑" id="2158" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 伽马" id="2162" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="绿 输入白" id="2166" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="绿 输出黑" id="2170" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿 输出白" id="2174" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="蓝 输入黑" id="2159" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 伽马" id="2163" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="蓝 输入白" id="2167" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="蓝 输出黑" id="2171" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝 输出白" id="2175" flags="12889161760" default="255" value="255" />
|
||||
<parameter name="色阶" id="2152" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黑白 红" id="2180" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="黑白 黄" id="2181" flags="12889161760" default="60" value="60" />
|
||||
<parameter name="黑白 绿" id="2182" flags="12889161760" default="40" value="40" />
|
||||
<parameter name="黑白 青" id="2183" flags="12889161760" default="60" value="60" />
|
||||
<parameter name="黑白 蓝" id="2184" flags="12889161760" default="20" value="20" />
|
||||
<parameter name="黑白 洋红" id="2185" flags="12889161760" default="80" value="80" />
|
||||
<parameter name="着色色相" id="2186" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="着色饱和度" id="2187" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混合" id="2270" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="黑白混色" id="2176" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持明度" id="2189" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="阴影 青 ↔ 红" id="2192" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 洋红 ↔ 绿" id="2193" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="阴影 黄 ↔ 蓝" id="2194" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 青 ↔ 红" id="2196" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 洋红 ↔ 绿" id="2197" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="中间调 黄 ↔ 蓝" id="2198" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 青 ↔ 红" id="2200" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 洋红 ↔ 绿" id="2201" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="高光 黄 ↔ 蓝" id="2202" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="色彩平衡" id="2188" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 红输入" id="2276" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="红输出 ← 绿输入" id="2277" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="红输出 ← 蓝输入" id="2278" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 红输入" id="2280" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="绿输出 ← 绿输入" id="2281" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="绿输出 ← 蓝输入" id="2282" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 红输入" id="2284" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 绿输入" id="2285" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="蓝输出 ← 蓝输入" id="2286" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="保持亮度" id="2289" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="保持饱和度" id="2290" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="通道混合强度" id="2291" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="通道混合器" id="2288" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片混合强度" id="2293" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用减色" id="2294" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="整体减色" id="2295" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="青色减色" id="2296" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="洋红减色" id="2297" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="黄色减色" id="2298" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="密度" id="2299" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="密度模式" id="2300" flags="12889161760" default="2" value="2" />
|
||||
<parameter name="胶片亮度模型" id="2301" flags="12889161760" default="6" value="6" />
|
||||
<parameter name="启用晕光" id="2302" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="散射半径" id="2303" flags="12889161760" default="5" value="5" />
|
||||
<parameter name="染料透射" id="2304" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="晕光增强" id="2305" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="启用辉光" id="2306" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="辉光灵敏度" id="2307" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="辉光扩散" id="2308" flags="12889161760" default="30" value="30" />
|
||||
<parameter name="辉光强度" id="2309" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="启用颗粒" id="2310" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒数量" id="2311" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒大小" id="2312" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片响应" id="2313" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颜色变化" id="2314" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="颗粒帧保持" id="2315" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="颗粒种子" id="2316" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="启用暗角" id="2317" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="暗角强度" id="2318" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="暗角半径" id="2319" flags="12889161760" default="50" value="50" />
|
||||
<parameter name="暗角过渡" id="2320" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="印片外观" id="2324" flags="12889161776" default="0" value="0" />
|
||||
<parameter name="印片强度" id="2325" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="胶片模拟" id="2292" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="畸变校正" id="2329" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="画面缩放" id="2330" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="光学中心 X" id="2331" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="光学中心 Y" id="2332" flags="12889161760" default="0.5" value="0.5" />
|
||||
<parameter name="镜头畸变修复" id="2328" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="混合" id="10001" flags="12884901888" default="1" value="1" />
|
||||
<parameter name="翻转" id="10002" flags="12889161760" default="0" value="0" />
|
||||
<parameter name="输入点" id="10003" flags="12889161760" default="1" value="1" />
|
||||
<parameter name="发布 OSC" id="10005" flags="8589934592" default="0" value="1" />
|
||||
</filter>
|
||||
</scenenode>
|
||||
<aspectRatio>1</aspectRatio>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="1199198 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704">
|
||||
<parameter name="阴影" id="234" flags="8589938706">
|
||||
<foldFlags>15</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="颜色" id="243" flags="8589938688">
|
||||
<parameter name="Hidden Channel" id="245" flags="8589934610" default="1" value="3" />
|
||||
<parameter name="转换类型" id="247" flags="8590032912" default="3" value="3" />
|
||||
<parameter name="PQ 峰值(尼特)" id="248" flags="8589967376" default="1000" value="1000" />
|
||||
</parameter>
|
||||
<parameter name="投影" id="208" flags="8589973522">
|
||||
<foldFlags>131087</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="四角" id="207" flags="8589973506">
|
||||
<foldFlags>131087</foldFlags>
|
||||
</parameter>
|
||||
<parameter name="裁剪" id="216" flags="8589973522">
|
||||
<foldFlags>131087</foldFlags>
|
||||
</parameter>
|
||||
</parameter>
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="类型" id="307" flags="12884901904" default="1" value="1" />
|
||||
<parameter name="固定分辨率" id="301" flags="8589936658" default="0" value="0" />
|
||||
<parameter name="固定宽度" id="302" flags="12884901910" default="3840" value="3840" />
|
||||
<parameter name="固定高度" id="303" flags="12884901910" default="2160" value="2160" />
|
||||
<parameter name="光圈宽度" id="312" flags="12884901906" default="3840" value="3840" />
|
||||
<parameter name="光圈高度" id="313" flags="12884901906" default="2160" value="2160" />
|
||||
</parameter>
|
||||
</layer>
|
||||
<footage name="媒体层" id="10049">
|
||||
<clip name="效果源" id="10048">
|
||||
<pathURL>Drop Zone.tiff</pathURL>
|
||||
<missingWidth>1200</missingWidth>
|
||||
<missingHeight>1200</missingHeight>
|
||||
<missingDuration>0.033333333333333333</missingDuration>
|
||||
<creationDuration>1</creationDuration>
|
||||
<mediaID />
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704">
|
||||
<parameter name="像素宽高比" id="104" flags="12884901888" default="1" value="1" />
|
||||
<parameter name="帧速率" id="107" flags="8589934592" default="0" value="30" />
|
||||
<parameter name="固定宽度" id="114" flags="12884901888" default="1200" value="1200" />
|
||||
<parameter name="固定高度" id="115" flags="12884901888" default="1200" value="1200" />
|
||||
<parameter name="使用背景颜色" id="116" flags="8589934594" default="0" value="0" />
|
||||
<parameter name="背景颜色" id="117" flags="8589971458">
|
||||
<foldFlags>15</foldFlags>
|
||||
<parameter name="红色" id="1" flags="8589967376" default="1" value="1" />
|
||||
<parameter name="绿色" id="2" flags="8589967376" default="1" value="1" />
|
||||
<parameter name="蓝色" id="3" flags="8589967376" default="1" value="1" />
|
||||
</parameter>
|
||||
<parameter name="Missing Is Still" id="128" flags="8589934610" default="0" value="1" />
|
||||
</parameter>
|
||||
</clip>
|
||||
<flags>0</flags>
|
||||
<timing in="0 1 1 0" out="0 120000 1 0" offset="0 1 1 0" />
|
||||
<foldFlags>0</foldFlags>
|
||||
<baseFlags>524304</baseFlags>
|
||||
<parameter name="属性" id="1" flags="8589938704" />
|
||||
<parameter name="对象" id="2" flags="8589938704" />
|
||||
</footage>
|
||||
</scene>
|
||||
</ozml>
|
||||
+31
-12
@@ -16,6 +16,7 @@ OUTPUT_VERSION='5.11'
|
||||
OUTPUT_DISPLAY_VERSION='5.4.5'
|
||||
NATIVE_ALPHABET='*-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
|
||||
STANDARD_ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
|
||||
STARTERS={'primary':'一级调色','hsl':'HSL'}
|
||||
CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
|
||||
|
||||
|
||||
@@ -58,7 +59,11 @@ def custom_archive(encoded):
|
||||
return text,name
|
||||
|
||||
|
||||
def build(model):
|
||||
def archives(model, starter):
|
||||
return model['archivesBase64'] | (model['starterArchives'][starter] if starter else {})
|
||||
|
||||
|
||||
def build(model, starter=None):
|
||||
root=E.parse(SOURCES/'NativeEffectSource.moef').getroot()
|
||||
scene=root.find('scene');project=scene.find('scenenode[@factoryID="4"]')
|
||||
source=scene.find('.//scenenode[@name="效果源"]')
|
||||
@@ -83,7 +88,7 @@ def build(model):
|
||||
host=list(filt.findall('parameter'))
|
||||
for node in host:filt.remove(node)
|
||||
for pid,name in [('9000','大鱼调色'),('9001','LUT 文件'),('9002','工具与蒙版')]:
|
||||
text,class_name=custom_archive(model['archivesBase64'][pid])
|
||||
text,class_name=custom_archive(archives(model, starter)[pid])
|
||||
expected={'9000':'DYInspectorToken','9001':'DYAssetState','9002':'DYToolDocument'}[pid]
|
||||
if class_name!=expected:raise ValueError('Wrong custom parameter class')
|
||||
flags='12884901888' if pid=='9000' else '12889161776'
|
||||
@@ -104,7 +109,8 @@ def build(model):
|
||||
for node in list(pub):
|
||||
if node.tag!='version':pub.remove(node)
|
||||
E.SubElement(pub,'target',object='10060',channel='./9000',name='大鱼调色')
|
||||
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
|
||||
if not starter:
|
||||
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
|
||||
current=scene.find('currentObject')
|
||||
if current is None:
|
||||
current=E.Element('currentObject');scene.insert(list(scene).index(scene.find('currentFrame'))+1,current)
|
||||
@@ -119,7 +125,7 @@ def build(model):
|
||||
return data
|
||||
|
||||
|
||||
def verify(data,model):
|
||||
def verify(data,model,starter=None):
|
||||
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
|
||||
assert root.get('version')==OUTPUT_VERSION and root.findtext('displayversion')==OUTPUT_DISPLAY_VERSION
|
||||
assert all(not list(root.iter(tag)) for tag in ['Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'])
|
||||
@@ -133,7 +139,7 @@ def verify(data,model):
|
||||
# FCP also applies a changed dataValue to existing nil-state instances.
|
||||
# Keep both carriers at the original registered value; V3 is explicit opt-in.
|
||||
for pid in ['9000','9001','9002']:
|
||||
assert params[pid].findtext('defaultVal')==params[pid].findtext('dataValue')==custom_archive(model['archivesBase64'][pid])[0]
|
||||
assert params[pid].findtext('defaultVal')==params[pid].findtext('dataValue')==custom_archive(archives(model, starter)[pid])[0]
|
||||
assert all(not v in data for v in (b'CameraRawTables',b'1.png',b'relativeURL'))
|
||||
assert len(root.findall('.//behavior'))==0 and len(root.findall('.//keypoint'))==0
|
||||
assert scene.find('.//scenenode[@name="效果源"]/parameter[@id="2"]/parameter[@id="321"]').get('value')=='3'
|
||||
@@ -145,7 +151,9 @@ def verify(data,model):
|
||||
if node.tag in CONTENT_TAGS and node is not project and node.find('baseFlags') is not None and int(node.findtext('baseFlags'))&0x10000001:selected.append(node.get('id'))
|
||||
assert not selected and scene.findtext('currentObject')==project.get('id')
|
||||
pub=scene.find('publishSettings').findall('target')
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
expected=[('10060','./9000','大鱼调色')]
|
||||
if not starter:expected.append(('10060','./10001','混合'))
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==expected
|
||||
assert all(scene.find('.//scenenode[@id="'+identity+'"]') is None for identity in ['10080','10081','10082'])
|
||||
assert all(text.encode() not in data for text in ['FCP 版本作者','更多模板浏览器访问','大鱼先森Media','dayu.media'])
|
||||
assert not any(f.get('uuid')=='dd0036f96c9e4bfdadb82f71fbf5c9d8' for f in root.findall('factory'))
|
||||
@@ -154,11 +162,22 @@ def verify(data,model):
|
||||
|
||||
|
||||
def main():
|
||||
p=argparse.ArgumentParser(description=__doc__);p.add_argument('--output',type=Path,default=TEMPLATE/'大鱼调色.moef');p.add_argument('--overwrite',action='store_true');p.add_argument('--refresh-model',action='store_true');args=p.parse_args()
|
||||
if args.output.exists() and not args.overwrite:raise FileExistsError('Output exists; choose another file or explicitly --overwrite')
|
||||
p=argparse.ArgumentParser(description=__doc__)
|
||||
p.add_argument('--output',type=Path,default=TEMPLATE/'大鱼调色.moef')
|
||||
p.add_argument('--overwrite',action='store_true')
|
||||
p.add_argument('--refresh-model',action='store_true')
|
||||
p.add_argument('--starters',action='store_true',help='Build the two starter MOEFs alongside the full effect')
|
||||
args=p.parse_args()
|
||||
outputs={None:args.output}
|
||||
if args.starters:
|
||||
outputs.update({starter:args.output.parent/name/(name+'.moef') for starter,name in STARTERS.items()})
|
||||
for output in outputs.values():
|
||||
if output.exists() and not args.overwrite:raise FileExistsError('Output exists: '+str(output))
|
||||
model=refresh_metadata() if args.refresh_model else metadata()
|
||||
data=build(model);report=verify(data,model)
|
||||
args.output.parent.mkdir(parents=True,exist_ok=True);args.output.write_bytes(data)
|
||||
(TEMPLATE/'verification/StaticContract.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
|
||||
print(json.dumps(report,ensure_ascii=False,indent=2))
|
||||
for starter,output in outputs.items():
|
||||
data=build(model,starter);report=verify(data,model,starter)
|
||||
output.parent.mkdir(parents=True,exist_ok=True);output.write_bytes(data)
|
||||
if not starter:
|
||||
(TEMPLATE/'verification/StaticContract.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
|
||||
print(json.dumps(dict(report,path=str(output),starter=starter),ensure_ascii=False))
|
||||
if __name__=='__main__':main()
|
||||
+49
-17
@@ -2,6 +2,7 @@
|
||||
"""Single-install Release delivery; keeps a product lock through host acceptance."""
|
||||
from pathlib import Path
|
||||
import subprocess,os,json,shutil,plistlib,uuid,sys,datetime,hashlib,time
|
||||
from template_payload import template_files
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
CACHE=Path('/Users/mac/Library/Caches/CodexBuilds/com.dayu.color')
|
||||
LOCK=Path('/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock')
|
||||
@@ -9,7 +10,9 @@ DEST=Path('/Library/Plug-Ins/FxPlug/大鱼调色.app')
|
||||
APP=CACHE/'DerivedData/Build/Products/Release/大鱼调色.app'
|
||||
LOOSE=CACHE/'DerivedData/Build/Products/Release/大鱼调色 XPC Service.pluginkit'
|
||||
PLUGIN='Contents/PlugIns/大鱼调色 XPC Service.pluginkit'
|
||||
TEMPLATE=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef'
|
||||
TEMPLATE_ROOT=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色'
|
||||
TEMPLATE=TEMPLATE_ROOT/'大鱼调色/大鱼调色.moef'
|
||||
BUNDLED_TEMPLATES=Path('Contents/Resources/FCP Templates')
|
||||
IDENTITY='Developer ID Application: zhong luo (B3W25FX5H5)'
|
||||
PROFILE='codex-dayu-notary-B3W25FX5H5'
|
||||
KEYCHAIN='/Users/mac/Library/Keychains/login.keychain-db'
|
||||
@@ -44,6 +47,43 @@ def self_test(executable,report):
|
||||
failed=[x.get('name') for x in parsed.get('results',[]) if not x.get('pass',True)]
|
||||
raise RuntimeError('原生自检未通过,正式旧版未替换。诊断:'+str(report)+';失败项:'+str(failed))
|
||||
return parsed
|
||||
def install_templates():
|
||||
# Keep the previous Motion Templates files available until the new set is
|
||||
# verified. Stage each replacement on the same volume as the destination.
|
||||
changed=[]
|
||||
hashes={}
|
||||
try:
|
||||
for _,bundled,installed in template_files():
|
||||
source=DEST/BUNDLED_TEMPLATES/bundled
|
||||
target=TEMPLATE_ROOT/installed
|
||||
target.parent.mkdir(parents=True,exist_ok=True)
|
||||
previous=(target.read_bytes(),target.stat().st_mode & 0o777,target.stat().st_flags) if target.exists() else None
|
||||
data=source.read_bytes()
|
||||
changed.append((target,previous))
|
||||
write_template_file(target,data,0o644,2 if target.suffix=='.png' else 0)
|
||||
assert target.read_bytes()==data
|
||||
hashes[str(installed)]=hashlib.sha256(data).hexdigest()
|
||||
except Exception:
|
||||
for target,previous in reversed(changed):
|
||||
if previous is not None:
|
||||
write_template_file(target,*previous)
|
||||
elif target.exists():
|
||||
os.chflags(target,0)
|
||||
target.unlink()
|
||||
raise
|
||||
return hashes
|
||||
|
||||
def write_template_file(target,data,mode,flags):
|
||||
temp=target.with_name('.dayu-color-stage-'+uuid.uuid4().hex)
|
||||
try:
|
||||
temp.write_bytes(data)
|
||||
temp.chmod(mode)
|
||||
if target.exists() and target.stat().st_flags:os.chflags(target,0)
|
||||
os.replace(temp,target)
|
||||
if flags:os.chflags(target,flags)
|
||||
finally:
|
||||
temp.unlink(missing_ok=True)
|
||||
|
||||
def main():
|
||||
hosts_closed();CACHE.mkdir(parents=True,exist_ok=True);LOCK.parent.mkdir(parents=True,exist_ok=True);LOCK.mkdir()
|
||||
(LOCK/'owner.json').write_text(json.dumps(dict(PID=os.getpid(),cwd=str(ROOT),product='大鱼调色',started=datetime.datetime.now(datetime.timezone.utc).isoformat())))
|
||||
@@ -54,11 +94,11 @@ def main():
|
||||
if any(l.endswith('/Contents/MacOS/大鱼调色') for l in run('ps','-axo','comm=').splitlines()):raise RuntimeError('请先正常退出当前大鱼调色窗口')
|
||||
print('Building final Release',flush=True)
|
||||
run('xcodebuild','-project','大鱼调色.xcodeproj','-scheme','Wrapper Application','-configuration','Release','-enableAddressSanitizer','NO','-derivedDataPath',str(CACHE/'DerivedData'),'clean','build',log=CACHE/'release-build.log')
|
||||
b=APP/'Contents/Resources/FCP Templates/大鱼调色.moef';b.parent.mkdir(parents=True,exist_ok=True);shutil.copy2(ROOT/'template/大鱼调色.moef',b)
|
||||
b.chmod(0o644)
|
||||
for name in ['large.png','small.png']:
|
||||
if (ROOT/'template'/name).exists():
|
||||
target=b.parent/name;shutil.copy2(ROOT/'template'/name,target);target.chmod(0o644)
|
||||
for source,bundled,_ in template_files():
|
||||
target=APP/BUNDLED_TEMPLATES/bundled
|
||||
target.parent.mkdir(parents=True,exist_ok=True)
|
||||
shutil.copyfile(ROOT/'template'/source,target)
|
||||
target.chmod(0o644)
|
||||
# Sources on exFAT can be exposed as owner-only. Installer changes ownership to root.
|
||||
(APP/'Contents/Resources/Basis_balanceWheel.png').chmod(0o644)
|
||||
identity(APP,'com.dayu.color');plugin=APP/PLUGIN;identity(plugin,'com.dayu.color.XPC')
|
||||
@@ -96,24 +136,16 @@ def main():
|
||||
if str(DEST/'Contents/MacOS/大鱼调色') in run('ps','-axo','comm=').splitlines():break
|
||||
time.sleep(.25)
|
||||
else:raise RuntimeError('未从正式安装路径启动')
|
||||
template_hashes=install_templates()
|
||||
except Exception:
|
||||
failed=DEST.parent/('.dayu-color-failed-'+uuid.uuid4().hex+'.app');os.replace(DEST,failed)
|
||||
if old:os.replace(old,DEST);old=None
|
||||
raise
|
||||
TEMPLATE.parent.mkdir(parents=True,exist_ok=True)
|
||||
if TEMPLATE.exists():shutil.copy2(TEMPLATE,CACHE/'previous-template.moef')
|
||||
tmp=TEMPLATE.with_name('.dayu-color-template-stage.moef');shutil.copy2(DEST/'Contents/Resources/FCP Templates/大鱼调色.moef',tmp);os.replace(tmp,TEMPLATE)
|
||||
for name in ['large.png','small.png']:
|
||||
source=DEST/'Contents/Resources/FCP Templates'/name;target=TEMPLATE.parent/name
|
||||
if source.exists():
|
||||
if target.exists():os.chflags(target,0)
|
||||
shutil.copy2(source,target);os.chflags(target,2)
|
||||
# All generated copies are removed before final registry/host verification.
|
||||
for copy,expected in [(APP,'com.dayu.color'),(LOOSE,'com.dayu.color.XPC')]:
|
||||
if copy.exists():identity(copy,expected);unregister(copy/PLUGIN if copy.suffix=='.app' else copy);shutil.rmtree(copy)
|
||||
if old:unregister(old/PLUGIN)
|
||||
archive.unlink();backup=CACHE/'previous-template.moef'
|
||||
if backup.exists():backup.unlink()
|
||||
archive.unlink()
|
||||
# Unregistering an old copy can race the host's launch registration. Re-add
|
||||
# only the verified installed path; never repeat signing/notarization/install.
|
||||
for attempt in range(3):
|
||||
@@ -122,7 +154,7 @@ def main():
|
||||
if entries:break
|
||||
time.sleep(.5)
|
||||
if len(entries)!=1 or not entries[0].rstrip().endswith('\t'+str(DEST/PLUGIN)):raise RuntimeError('PluginKit发现多份/错误版本: '+registry)
|
||||
record=dict(status='installed-awaiting-host-verification',path=str(DEST),bundleID='com.dayu.color',version=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleShortVersionString'],build=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleVersion'],team='B3W25FX5H5',notaryID=result['id'],notaryStatus=result['status'],gatekeeper=gate,sourceCommit=run('git','rev-parse','HEAD'),templatePath=str(TEMPLATE),templateSHA256=hashlib.sha256(TEMPLATE.read_bytes()).hexdigest(),shaderSHA256=hashlib.sha256((DEST/PLUGIN/'Contents/Resources/default.metallib').read_bytes()).hexdigest())
|
||||
record=dict(status='installed-awaiting-host-verification',path=str(DEST),bundleID='com.dayu.color',version=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleShortVersionString'],build=plistlib.loads((DEST/'Contents/Info.plist').read_bytes())['CFBundleVersion'],team='B3W25FX5H5',notaryID=result['id'],notaryStatus=result['status'],gatekeeper=gate,sourceCommit=run('git','rev-parse','HEAD'),templatePath=str(TEMPLATE),templateSHA256=template_hashes[str(TEMPLATE.relative_to(TEMPLATE_ROOT))],installedTemplateSHA256=template_hashes,shaderSHA256=hashlib.sha256((DEST/PLUGIN/'Contents/Resources/default.metallib').read_bytes()).hexdigest())
|
||||
if old:record['previousInstallBackup']=str(old)
|
||||
output=ROOT/'verification/Delivery.json';output.write_text(json.dumps(record,ensure_ascii=False,indent=2)+'\n')
|
||||
run('open',str(DEST));print('FORMAL_INSTALLED. Run installed self-test and host verification; type complete only after success. Type leave to preserve pending state.',flush=True)
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
"""Shared source, bundle and Motion Templates paths for the shipped effects."""
|
||||
from pathlib import Path
|
||||
|
||||
EFFECTS = ("大鱼调色", "一级调色", "HSL")
|
||||
PREVIEWS = ("large.png", "small.png")
|
||||
|
||||
|
||||
def template_files():
|
||||
for effect in EFFECTS:
|
||||
for name in (effect + ".moef", *PREVIEWS):
|
||||
installed = Path(effect) / name
|
||||
# Preserve the full effect's original flat bundle layout and artwork.
|
||||
bundled = Path(name) if effect == EFFECTS[0] else installed
|
||||
source = Path(name) if name in PREVIEWS else bundled
|
||||
yield source, bundled, installed
|
||||
+6
-1
@@ -13,7 +13,12 @@ import xml.etree.ElementTree as E
|
||||
ROOT=Path(__file__).resolve().parent.parent
|
||||
module=runpy.run_path(str(ROOT/'tools/build_template.py'),run_name='template_contract')
|
||||
file=ROOT/'template'/'\u5927\u9c7c\u8c03\u8272.moef'
|
||||
data=file.read_bytes();contract=module['verify'](data,module['metadata']())
|
||||
model=module['metadata']()
|
||||
data=file.read_bytes();contract=module['verify'](data,model)
|
||||
for starter,name in module['STARTERS'].items():
|
||||
path=file.parent/name/(name+'.moef')
|
||||
module['verify'](path.read_bytes(),model,starter)
|
||||
print('Verified starter:',name)
|
||||
root=E.fromstring(data);scene=root.find('scene');factories={f.get('id'):f.get('uuid') for f in root.findall('factory')}
|
||||
project=[node for node in scene.findall('scenenode') if factories.get(node.get('factoryID'))==module['PROJECT_UUID']][0]
|
||||
assert root.get('version')=='5.11' and root.findtext('displayversion')=='5.4.5'
|
||||
|
||||
@@ -190,3 +190,75 @@ if(faceFixture.length){
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-clone.cube"]];
|
||||
run.record(@"clone-stamp-spatial-state-refuses-static-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc error:&failure]&&failure);
|
||||
}
|
||||
|
||||
{
|
||||
// Sample the real final GPU pass using linear X/Y ramps and opaque alpha.
|
||||
const NSUInteger w=64,h=36;
|
||||
DYDiagnosticTile *source=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
|
||||
DYDiagnosticTile *destination=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:w height:h]autorelease];
|
||||
Pixels grid(w*h*4);
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){
|
||||
NSUInteger i=(y*w+x)*4;grid[i]=(x+.5)/w;grid[i+1]=(y+.5)/h;grid[i+2]=.1;grid[i+3]=1;
|
||||
}
|
||||
[[source metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,w,h)mipmapLevel:0 withBytes:grid.data() bytesPerRow:w*8];
|
||||
DYRenderer *renderer=[[[DYRenderer alloc]init]autorelease];DYUniforms u=DYToolUniforms(@{@"type":@"lens"});
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYInitialToolDocument(nil));
|
||||
const double angle=-M_PI/6,aspect=w/double(h),c=cos(angle),s=sin(angle),zoom=c-s*aspect;
|
||||
doc[@"levelRotation"]=@(angle);
|
||||
NSError *failure=nil;
|
||||
BOOL ok=[renderer renderSource:source destination:destination uniforms:u paths:@{} spider:nil tools:DYToolRenderSnapshot(doc,kCMTimeZero) colorManagement:nil hostPrimaries:kFxColorPrimaries_Rec709 error:&failure];
|
||||
Pixels corrected=read(destination,gpu);
|
||||
double worst=0,alpha=1;
|
||||
for(NSUInteger y=0;y<h;y++)for(NSUInteger x=0;x<w;x++){
|
||||
NSUInteger i=(y*w+x)*4;
|
||||
double dx=((x+.5)/w-.5)/zoom,dy=((y+.5)/h-.5)/zoom;
|
||||
double sx=std::clamp(.5+c*dx+s*dy/aspect,.5/w,1-.5/w);
|
||||
double sy=std::clamp(.5+c*dy-s*dx*aspect,.5/h,1-.5/h);
|
||||
worst=std::max({worst,fabs(corrected[i]-sx),fabs(corrected[i+1]-sy)});
|
||||
alpha=MIN(alpha,corrected[i+3]);
|
||||
}
|
||||
run.record(@"level-metal-inverse-rotation-and-full-corner-coverage",ok&&worst<.002&&alpha==1,@{@"error":reason(failure),@"maximumError":@(worst),@"minimumAlpha":@(alpha)});
|
||||
NSURL *cube=[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"unsupported-level.cube"]];
|
||||
run.record(@"level-spatial-transform-is-refused-by-cube-export",![renderer exportLUT:cube uniforms:u paths:@{} spider:nil tools:doc error:&failure]&&failure);
|
||||
}
|
||||
|
||||
{
|
||||
DYDiagnosticManager *base=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(base,nil);
|
||||
DYToolCanvasProbe *host=[[[DYToolCanvasProbe alloc]init]autorelease];host->_base=base;host->_time=kCMTimeZero;
|
||||
id<DYToolCanvasHostProbe> plugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];
|
||||
[plugin scheduleToolCanvasRegistration];
|
||||
NSData *state=nil;[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error];
|
||||
auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.07;while(NSProcessInfo.processInfo.systemUptime<end)[[NSRunLoop mainRunLoop]runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:.002]];};drain();
|
||||
id<FxOnScreenControl_v4> osc=(id)[[NSClassFromString(@"DYToolOSC")alloc]initWithAPIManager:host];
|
||||
DYDiagnosticTile *overlay=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:640 height:400]autorelease];
|
||||
[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];
|
||||
id viewer=[(id)osc valueForKey:@"viewerControls"];
|
||||
BOOL update=NO;
|
||||
auto down=[&](double x,double y){
|
||||
NSInteger part=0;
|
||||
[osc hitTestOSCAtMousePositionX:x mousePositionY:y activePart:&part atTime:kCMTimeZero];
|
||||
[osc mouseDownAtPositionX:x positionY:y activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];return part;
|
||||
};
|
||||
auto up=[&](double x,double y,NSInteger part){[osc mouseUpAtPositionX:x positionY:y activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];};
|
||||
auto click=[&](double x,double y){NSInteger part=down(x,y);up(x,y,part);};
|
||||
auto control=[&](NSInteger part){
|
||||
for(NSDictionary *a in [viewer valueForKey:@"areas"])if([a[@"part"]integerValue]==part){
|
||||
NSRect r=[a[@"rect"]rectValue];click(NSMidX(r),400-NSMidY(r));break;
|
||||
}
|
||||
};
|
||||
auto angle=[&](){return [DYReadTools(host,kCMTimeZero).document[@"levelRotation"] doubleValue];};
|
||||
int undo=base->_undoStarts;
|
||||
control(20026);
|
||||
click(150,280);click(390,200);drain();
|
||||
run.record(@"level-osc-two-points-horizontal-one-undo",fabs(angle()+atan2(80.,240.))<1e-6&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1);
|
||||
control(20033);drain();
|
||||
control(20032);
|
||||
NSInteger part=down(200,270);up(230,150,part);drain();
|
||||
run.record(@"level-osc-reset-and-vertical-drag-each-create-one-undo",fabs(angle()-(M_PI_2-atan2(120.,30.)))<1e-6&&base->_undoStarts==undo+3&&base->_undoEnds==undo+3);
|
||||
double previous=angle();
|
||||
click(180,200);
|
||||
BOOL handled=NO;
|
||||
[osc keyDownAtPositionX:250 positionY:225 keyPressed:27 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];drain();
|
||||
run.record(@"level-osc-escape-discards-uncommitted-point",handled&&angle()==previous&&base->_undoStarts==undo+3);
|
||||
[osc release];[plugin release];drain();
|
||||
}
|
||||
@@ -1135,8 +1135,11 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
@try {
|
||||
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
NSError *failure=nil;if(!DYResetToolParameters(_manager,DYDescriptors(),t,&failure)){dispatch_async(dispatch_get_main_queue(),^{[self showError:failure.localizedDescription?:@"未能完整还原参数。"];});return;}
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,[[[DYToolDocument alloc]init]autorelease].document,t);
|
||||
[set setCustomParameterValue:[[[DYInspectorToken alloc]init]autorelease] toParameter:DYInspectorParameterID atTime:t];
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=@{};DYWriteAssets(_manager,assets,t);NSString *starter=DYReadTools(_manager,t).document[@"starterTool"];
|
||||
DYWriteTools(_manager,DYInitialToolDocument(starter),t);
|
||||
DYInspectorToken *token=[[[DYInspectorToken alloc]init]autorelease];
|
||||
if(starter)token.folds=@{starter:@NO};
|
||||
[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:t];
|
||||
for(NSMutableDictionary *card in _cards)card[@"collapsed"]=@YES;
|
||||
} @finally {if(grouped)[undo endUndoGroup];[action endAction:self];}
|
||||
[self postChanged];
|
||||
@@ -1303,7 +1306,9 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
|
||||
CMTime t=action.currentTime;id<FxParameterSettingAPI_v6> set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];
|
||||
for(NSDictionary *d in DYDescriptors()){id value=values[d[@"key"]];if(!value&&[d[@"offset"]integerValue]>=1104)value=d[@"default"];if(value)[set setFloatValue:[value doubleValue] toParameter:[d[@"pid"]unsignedIntValue] atTime:t];}
|
||||
if([json[@"version"]isEqual:@1]&&!values[@"cmConfigured"]){[set setFloatValue:-1 toParameter:2236 atTime:t];[set setFloatValue:1 toParameter:2270 atTime:t];}
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.colorManagement=newCMS.count?newCMS:nil;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);DYWriteTools(_manager,tools,t);
|
||||
DYAssetState *assets=[[[DYAssetState alloc] init] autorelease];assets.paths=validPaths;assets.colorManagement=newCMS.count?newCMS:nil;assets.spiderMesh=mesh;assets.spiderLinked=mesh?[json[@"spider"][@"linked"]boolValue]:YES;DYWriteAssets(_manager,assets,t);
|
||||
restoredTools[@"starterTool"]=DYReadTools(_manager,t).document[@"starterTool"];
|
||||
DYWriteTools(_manager,restoredTools,t);
|
||||
} @finally {[action endAction:self];}
|
||||
[self postChanged];
|
||||
if(missing.count)[self showError:[@"调色参数已恢复,以下 LUT 文件需要重新选择:\n" stringByAppendingString:[missing componentsJoinedByString:@"\n"]]];
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
#pragma once
|
||||
#include <CoreGraphics/CoreGraphics.h>
|
||||
#include <cmath>
|
||||
#include <algorithm>
|
||||
|
||||
inline double DYLevelDelta(CGPoint first, CGPoint second, double aspect, bool vertical) {
|
||||
const double angle = std::atan2(second.y - first.y, (second.x - first.x) * aspect);
|
||||
return std::remainder((vertical ? M_PI_2 : 0.) - angle, M_PI);
|
||||
}
|
||||
|
||||
// Coordinates are normalized to a top-down image. Rotation is measured in
|
||||
// display pixels so the same line aligns in landscape, portrait and anamorphic footage.
|
||||
struct DYLevelTransform {
|
||||
double aspect, cosine, sine, zoom;
|
||||
|
||||
DYLevelTransform(double angle, double displayAspect)
|
||||
: aspect(displayAspect), cosine(std::cos(angle)), sine(std::sin(angle)),
|
||||
zoom(std::max(1., std::abs(cosine) + std::abs(sine) * std::max(aspect, 1. / aspect))) {}
|
||||
|
||||
CGPoint toSource(CGPoint output) const {
|
||||
const double x = (output.x - .5) * aspect / zoom, y = (output.y - .5) / zoom;
|
||||
return CGPointMake(.5 + (cosine * x + sine * y) / aspect, .5 + cosine * y - sine * x);
|
||||
}
|
||||
|
||||
CGPoint toOutput(CGPoint source) const {
|
||||
const double x = (source.x - .5) * aspect * zoom, y = (source.y - .5) * zoom;
|
||||
return CGPointMake(.5 + (cosine * x - sine * y) / aspect, .5 + cosine * y + sine * x);
|
||||
}
|
||||
};
|
||||
@@ -66,13 +66,38 @@
|
||||
[tile setBounds:bounds origin:source.imageOrigin];[tile setPixelAspect:source.pixelAspect];[tile inheritColorSpace:source.colorSpace];
|
||||
return tile;
|
||||
}
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
- (BOOL)renderSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {
|
||||
double angle=[tools[@"levelRotation"] doubleValue];
|
||||
if(!angle)return [self renderColorSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error];
|
||||
@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(!DYValidToolDocument(tools))return fail(error,@"水平校正数据无效");
|
||||
NSMutableDictionary *entry=[self device:dst.deviceRegistryID error:error];
|
||||
if(!entry)return NO;
|
||||
id<MTLDevice>device=entry[@"device"];
|
||||
FxRect bounds=src.imagePixelBounds;
|
||||
NSInteger width=bounds.right-bounds.left,height=bounds.top-bounds.bottom;
|
||||
if(width<=0||height<=0)return fail(error,@"画面尺寸无效");
|
||||
MTLTextureDescriptor *desc=[MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA32Float width:width height:height mipmapped:NO];
|
||||
desc.storageMode=MTLStorageModePrivate;
|
||||
desc.usage=MTLTextureUsageRenderTarget|MTLTextureUsageShaderRead|MTLTextureUsageShaderWrite;
|
||||
id<MTLTexture>texture=[device newTextureWithDescriptor:desc];
|
||||
if(!texture)return fail(error,@"无法分配水平校正缓冲区");
|
||||
DYExportTile *frame=[[[DYExportTile alloc]initWithTexture:texture registry:device.registryID]autorelease];
|
||||
[texture release];
|
||||
[frame setBounds:bounds origin:dst.imageOrigin];
|
||||
[frame setPixelAspect:src.pixelAspect];
|
||||
[frame inheritColorSpace:dst.colorSpace];
|
||||
if(![self renderColorSource:src destination:frame uniforms:u paths:paths spider:spider tools:tools colorManagement:state hostPrimaries:primaries error:error])return NO;
|
||||
return [self copyTile:frame to:dst rotation:angle entry:entry error:error];
|
||||
});}
|
||||
}
|
||||
- (BOOL)renderColorSource:(FxImageTile*)src destination:(FxImageTile*)dst uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools colorManagement:(NSDictionary*)state hostPrimaries:(NSInteger)primaries error:(NSError**)error {@synchronized(self){return DYRenderWithPool(error,[&]()->BOOL{
|
||||
if(state&&![state isKindOfClass:NSDictionary.class])return fail(error,@"色彩管理状态无效。");
|
||||
NSDictionary*context=DYHostColorContext(src,dst,primaries);@synchronized(_previewLock){[_colorContext release];_colorContext=[context copy];}
|
||||
if(tools[@"sharedMasks"]){
|
||||
if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
FxImageTile *stamped=[self sourceByApplyingStamps:DYSharedMasks(tools) source:src registry:dst.deviceRegistryID error:error];if(!stamped)return NO;
|
||||
return [self renderSource:stamped destination:dst uniforms:u paths:paths spider:spider tools:DYResolvedToolDocument(tools) colorManagement:state hostPrimaries:primaries error:error];
|
||||
return [self renderColorSource:stamped destination:dst uniforms:u paths:paths spider:spider tools:DYResolvedToolDocument(tools) colorManagement:state hostPrimaries:primaries error:error];
|
||||
}
|
||||
if(!state.count)return [self renderSource:src destination:dst uniforms:u paths:paths spider:spider tools:tools error:error];
|
||||
if(!DYManagedColorValid(state,error))return NO;if(!tools)tools=@{@"schema":@2,@"layers":@[],@"baseMasks":@{}};if(!DYValidToolDocument(tools))return fail(error,@"调色层或蒙版数据无效。");
|
||||
|
||||
+7
-1
@@ -8,6 +8,7 @@
|
||||
#import "DYAutoGrade.h"
|
||||
#import "DYToolState.h"
|
||||
#include "DYFilmTime.h"
|
||||
#include "DYLevelGeometry.h"
|
||||
#import <CoreImage/CoreImage.h>
|
||||
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
|
||||
#import <os/log.h>
|
||||
@@ -41,7 +42,12 @@
|
||||
- (BOOL)destinationImageRect:(FxRect*)rect sourceImages:(NSArray<FxImageTile*>*)src destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(!src.count)return NO;*rect=src[0].imagePixelBounds;return YES;}
|
||||
- (BOOL)sourceTileRect:(FxRect*)rect sourceImageIndex:(NSUInteger)i sourceImages:(NSArray<FxImageTile*>*)src destinationTileRect:(FxRect)dstRect destinationImage:(FxImageTile*)dst pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{if(i>=src.count)return NO;*rect=src[i].imagePixelBounds;return YES;}
|
||||
- (BOOL)renderDestinationImage:(FxImageTile*)dst sourceImages:(NSArray<FxImageTile*>*)src pluginState:(NSData*)s atTime:(CMTime)t error:(NSError**)e{
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];if(_toolCaptureEnabled&&!_trackingActive.load()){@synchronized(self){FxRect image=[src[0]imagePixelBounds];double aspect=[src[0]pixelAspect],height=image.top-image.bottom;_toolSourceAspect=height>0&&std::isfinite(aspect)&&aspect>0?(image.right-image.left)*aspect/height:1;_toolSourceFrame={};_toolSourceTime=t;}}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
|
||||
if(!src.count||!src[0].ioSurface||!dst.ioSurface||!s.length)return NO;NSDictionary*p=[NSPropertyListSerialization propertyListWithData:s options:NSPropertyListImmutable format:NULL error:e];if(![p isKindOfClass:NSDictionary.class])return NO;NSData*b=p[@"uniforms"];if(![@[@1,@2]containsObject:p[@"schema"]]||![b isKindOfClass:NSData.class]||b.length!=sizeof(DYUniforms)||![p[@"paths"]isKindOfClass:NSDictionary.class])return NO;DYUniforms u;[b getBytes:&u length:sizeof(u)];uint64_t beta=!_betaFirstRenderStarted.exchange(true)?DYBetaSpanBegin(@"first_render",nil):0;BOOL ok=[_renderer renderSource:src[0] destination:dst uniforms:u paths:p[@"paths"] spider:p[@"spider"] tools:p[@"tools"] colorManagement:p[@"colorManagement"] hostPrimaries:p[@"hostPrimaries"]?[p[@"hostPrimaries"]integerValue]:-1 error:e];DYBetaSpanEnd(beta,@{@"status":ok?@"passed":@"failed"});if(!ok)DYBetaEvent(@"render_error",@{@"error_domain":(e&&*e)?(*e).domain:@"unknown",@"error_code":@((e&&*e)?(*e).code:0)});if(ok){[_renderer captureScopeTile:dst atTime:t];@synchronized(self){
|
||||
FxRect image=src[0].imagePixelBounds;
|
||||
double aspect=src[0].pixelAspect,height=image.top-image.bottom,width=image.right-image.left;
|
||||
_toolSourceAspect=width>0&&height>0&&std::isfinite(aspect)&&aspect>0?width*aspect/height:0;
|
||||
if(_toolCaptureEnabled&&!_trackingActive.load()){_toolSourceFrame={};_toolSourceTime=t;}
|
||||
}BOOL analyze=NO;@synchronized(self){if(![p[@"copyAuto"]boolValue])_copyAnalyzed=NO;else if(!_copyAnalyzed){_copyAnalyzed=YES;analyze=YES;}}if(analyze){NSDictionary*values=DYAutoGrade([_renderer preview]);if(values)dispatch_async(dispatch_get_main_queue(),^{[self applyValues:values];});}}return ok;
|
||||
}
|
||||
- (void)alert:(NSString*)message{dispatch_async(dispatch_get_main_queue(),^{NSAlert*a=[NSAlert new];a.messageText=@"大鱼调色";a.informativeText=message?:@"操作未完成";[a runModal];[a release];});}
|
||||
- (void)exportRequested:(NSNotification*)n{
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <cmath>
|
||||
#include "DYScopeMath.hpp"
|
||||
#import "DYScopeSample.h"
|
||||
#include "DYLevelGeometry.h"
|
||||
static BOOL fail(NSError**e,NSString*m){if(e)*e=[NSError errorWithDomain:@"com.dayu.color" code:1 userInfo:@{NSLocalizedDescriptionKey:m?:@"Metal 调色失败"}];return NO;}
|
||||
// MRC NSError out-parameters must outlive every nested render pool. Preserve
|
||||
// the same pointer across nested closures, then autorelease in the caller pool.
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
|
||||
- (instancetype)init {
|
||||
if((self=[super init])) {
|
||||
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@7}];
|
||||
[_defaults registerDefaults:@{@"themeIndex":@8}];
|
||||
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
|
||||
}
|
||||
return self;
|
||||
|
||||
@@ -6,6 +6,8 @@ static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static disp
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time;
|
||||
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time;
|
||||
- (BOOL)toolCanvasVisible;
|
||||
- (DYLevelTransform)toolCanvasLevelForAspect:(double)fallback rotation:(double *)rotation;
|
||||
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion;
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion;
|
||||
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction;
|
||||
@end
|
||||
@@ -104,6 +104,44 @@
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:self->_apiManager userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@(direction)}];
|
||||
});
|
||||
}
|
||||
- (DYLevelTransform)toolCanvasLevelForAspect:(double)fallback rotation:(double *)rotation {
|
||||
@synchronized(self){
|
||||
double angle=[_toolCanvasDocument[@"levelRotation"] doubleValue];
|
||||
if(rotation)*rotation=angle;
|
||||
return DYLevelTransform(angle,_toolSourceAspect>0?_toolSourceAspect:fallback);
|
||||
}
|
||||
}
|
||||
- (void)saveCanvasLevel:(double)rotation replacing:(double)previous completion:(void (^)(NSString *failure))completion {
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
NSString *failure=nil;
|
||||
id<FxCustomParameterActionAPI_v4> action=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
|
||||
if(!action){completion(@"宿主暂时无法保存水平校正。");return;}
|
||||
[action startAction:self];
|
||||
@try {
|
||||
// The correction is clip-wide. Use the action clock for the document write.
|
||||
CMTime time=DYHostDisplayedFrameTime(self->_apiManager,action.currentTime);
|
||||
DYToolDocument *stored=nil;
|
||||
id<FxParameterRetrievalAPI_v6> get=[self->_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];
|
||||
if(!CMTIME_IS_NUMERIC(time)||![get getCustomParameterValue:&stored fromParameter:DYToolsParameterID atTime:time]||
|
||||
![stored isKindOfClass:DYToolDocument.class]||[stored.document[@"levelRotation"] doubleValue]!=previous){
|
||||
failure=@"水平校正状态已变化,请重新画线。";
|
||||
}else if(rotation!=previous){
|
||||
NSMutableDictionary *doc=DYMutablePlist(stored.document);
|
||||
doc[@"levelRotation"]=rotation?@(rotation):nil;
|
||||
id<FxUndoAPI> undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
BOOL grouped=[undo startUndoGroup:rotation?@"水平校正":@"重置水平校正"];
|
||||
@try {
|
||||
if(DYWriteTools(self->_apiManager,doc,time)){
|
||||
DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;
|
||||
[self adoptToolCanvasDocument:saved.document];
|
||||
}else failure=@"宿主未保存水平校正,请重试。";
|
||||
}@finally{if(grouped)[undo endUndoGroup];}
|
||||
}
|
||||
}@finally{[action endAction:self];}
|
||||
if(!failure)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
completion(failure);
|
||||
});
|
||||
}
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
|
||||
|
||||
+124
-15
@@ -7,14 +7,103 @@
|
||||
DYViewerControls *_viewerControls;CGFloat _height,_canvasWidth,_uiScale;BOOL _maskCapturing;DYPlugIn *_maskCaptureOwner;NSRect _imageRect;NSDictionary *_mask;NSMutableArray *_handles;NSBezierPath *_outline;NSInteger _lastRoute;NSUInteger _drawCount,_hitDiagnostics,_eventDiagnostics;
|
||||
BOOL _stampHasSource,_stampDragging,_stampSaving,_stampNeedsRedraw;
|
||||
NSPoint _stampSource,_stampStart,_stampEnd;
|
||||
NSString *_stampFailure;
|
||||
NSString *_stampFailure,*_levelFailure;
|
||||
DYLevelTransform _level{0,1};
|
||||
double _levelAngle;
|
||||
NSInteger _levelMode;
|
||||
CMTime _levelTime;
|
||||
BOOL _levelHasFirst,_levelDown,_levelSecondPress,_levelSaving;
|
||||
NSPoint _levelFirst,_levelLast;
|
||||
}
|
||||
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager{if((self=[super init])){_apiManager=manager;_viewerControls=[DYViewerControls new];_handles=[NSMutableArray new];_lastRoute=-1;_uiScale=1;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_init");}return self;}
|
||||
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[_stampFailure release];[super dealloc];}
|
||||
- (void)dealloc{[_viewerControls release];[_device release];[_queue release];[_context release];[_mask release];[_handles release];[_outline release];[_stampFailure release];[_levelFailure release];[super dealloc];}
|
||||
- (FxDrawingCoordinates)drawingCoordinates{return kFxDrawingCoordinates_CANVAS;}
|
||||
- (DYPlugIn*)pluginAtTime:(CMTime)time{NSString *value=nil;id<FxParameterRetrievalAPI_v6>get=[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];[get getStringParameterValue:&value fromParameter:DYCanvasSessionParameterID];@synchronized(DYToolCanvasSessions()){return [DYToolCanvasSessions()objectForKey:value];}}
|
||||
- (void)clearLevelLine {
|
||||
_levelHasFirst=_levelDown=_levelSecondPress=NO;
|
||||
[_levelFailure release];_levelFailure=nil;
|
||||
}
|
||||
- (void)updateLevelFrom:(DYPlugIn *)plugin time:(CMTime)time {
|
||||
double angle=0;
|
||||
double fallback=NSWidth(_imageRect)>0&&NSHeight(_imageRect)>0?NSWidth(_imageRect)/NSHeight(_imageRect):1;
|
||||
_level=plugin?[plugin toolCanvasLevelForAspect:fallback rotation:&angle]:DYLevelTransform(0,fallback);
|
||||
if(_levelMode!=_viewerControls.levelMode||_levelAngle!=angle||
|
||||
(_levelHasFirst&&CMTIME_IS_NUMERIC(time)&&CMTimeCompare(time,_levelTime)!=0))[self clearLevelLine];
|
||||
_levelMode=_viewerControls.levelMode;_levelAngle=angle;
|
||||
}
|
||||
- (NSPoint)displayUV:(NSPoint)point {
|
||||
return NSMakePoint((point.x-NSMinX(_imageRect))/NSWidth(_imageRect),(point.y-NSMinY(_imageRect))/NSHeight(_imageRect));
|
||||
}
|
||||
- (NSPoint)clampedDisplayUV:(NSPoint)point {
|
||||
NSPoint uv=[self displayUV:point];
|
||||
return NSMakePoint(std::clamp(uv.x,0.,1.),std::clamp(uv.y,0.,1.));
|
||||
}
|
||||
- (NSPoint)canvasDisplayPoint:(NSPoint)uv {
|
||||
return NSMakePoint(NSMinX(_imageRect)+uv.x*NSWidth(_imageRect),NSMinY(_imageRect)+uv.y*NSHeight(_imageRect));
|
||||
}
|
||||
- (void)commitLevel:(double)angle plugin:(DYPlugIn *)plugin {
|
||||
if(_levelSaving)return;
|
||||
_levelSaving=YES;
|
||||
DYViewerParameterBridge *bridge=_viewerControls.bridge;
|
||||
[plugin saveCanvasLevel:angle replacing:_levelAngle completion:^(NSString *failure){
|
||||
@synchronized(self){
|
||||
self->_levelSaving=NO;
|
||||
if(self->_viewerControls.bridge!=bridge||!self->_viewerControls.levelMode)return;
|
||||
[self clearLevelLine];
|
||||
self->_levelFailure=[failure copy];
|
||||
}
|
||||
}];
|
||||
}
|
||||
- (BOOL)handleLevelEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part key:(unichar)key time:(CMTime)time plugin:(DYPlugIn *)plugin {
|
||||
if(!_levelMode||!plugin)return NO;
|
||||
if(type==NSEventTypeKeyDown&&key==27){
|
||||
_viewerControls.levelMode=0;[self clearLevelLine];return YES;
|
||||
}
|
||||
if(type==NSEventTypeLeftMouseDown&&part==10015){
|
||||
if(_levelSaving)return YES;
|
||||
[_levelFailure release];_levelFailure=nil;
|
||||
_levelDown=YES;_levelSecondPress=_levelHasFirst;
|
||||
_levelLast=[self clampedDisplayUV:point];
|
||||
if(!_levelHasFirst){_levelFirst=_levelLast;_levelTime=time;_levelHasFirst=YES;}
|
||||
return YES;
|
||||
}
|
||||
if(!_levelDown||(type!=NSEventTypeLeftMouseDragged&&type!=NSEventTypeLeftMouseUp))return NO;
|
||||
_levelLast=[self clampedDisplayUV:point];
|
||||
if(type==NSEventTypeLeftMouseUp){
|
||||
_levelDown=NO;
|
||||
double distance=hypot((_levelLast.x-_levelFirst.x)*NSWidth(_imageRect),(_levelLast.y-_levelFirst.y)*NSHeight(_imageRect));
|
||||
if(distance>=5*_uiScale){
|
||||
double delta=DYLevelDelta(_levelFirst,_levelLast,_level.aspect,_levelMode==2);
|
||||
double corrected=std::remainder(_levelAngle+delta,2*M_PI);
|
||||
[self commitLevel:fabs(corrected)<1e-7?0:corrected plugin:plugin];
|
||||
}else if(_levelSecondPress){
|
||||
_levelFailure=[@"两点太近,请重新选择第二点。" copy];
|
||||
}
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
- (void)drawLevelControls {
|
||||
if(!_levelMode)return;
|
||||
NSRect viewport=NSIntersectionRect(_imageRect,NSMakeRect(0,0,_canvasWidth,_height));
|
||||
CGFloat scale=MIN(_uiScale,NSWidth(viewport)/325.);
|
||||
NSRect prompt=NSMakeRect(NSMinX(viewport)+8*scale,NSMinY(viewport)+8*scale,290*scale,26*scale);
|
||||
DYDrawSoftControl(prompt,4*scale,NO,NO,NO);
|
||||
NSString *title=_levelFailure?:(_levelSaving?@"正在保存水平校正…":_levelHasFirst?@"选择参考线终点 · Esc 退出":@"点击两点或拖出参考线 · Esc 退出");
|
||||
[title drawInRect:NSInsetRect(prompt,6*scale,5*scale) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:12*scale]}];
|
||||
if(!_levelHasFirst)return;
|
||||
NSPoint first=[self canvasDisplayPoint:_levelFirst],last=[self canvasDisplayPoint:_levelLast];
|
||||
[NSGraphicsContext saveGraphicsState];NSRectClip(viewport);
|
||||
NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:first];[line lineToPoint:last];
|
||||
for(NSValue *value in @[[NSValue valueWithPoint:first],[NSValue valueWithPoint:last]]){
|
||||
NSPoint point=value.pointValue;CGFloat r=3*_uiScale;
|
||||
[line appendBezierPathWithOvalInRect:NSMakeRect(point.x-r,point.y-r,2*r,2*r)];
|
||||
}
|
||||
[NSColor.blackColor setStroke];line.lineWidth=3.5*_uiScale;[line stroke];
|
||||
[NSColor.systemCyanColor setStroke];line.lineWidth=1.5*_uiScale;[line stroke];
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
- (NSPoint)canvasPoint:(float)x y:(float)y parameters:(DYMaskParameters)p{
|
||||
float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return NSMakePoint(_imageRect.origin.x+u*_imageRect.size.width,_imageRect.origin.y+v*_imageRect.size.height);
|
||||
float ca=cos(p.angle),sa=sin(p.angle),aspect=p.imageAspect;float px=x*p.width*aspect,py=y*p.height;float u=p.centerX+(px*ca-py*sa)/aspect,v=p.centerY+px*sa+py*ca;return [self canvasStampSource:NSMakePoint(u,v)];
|
||||
}
|
||||
- (void)addHandle:(NSPoint)p part:(NSInteger)part{[_handles addObject:@{@"point":[NSValue valueWithPoint:p],@"part":@(part)}];}
|
||||
- (NSRect)toolbarRectForItem:(NSInteger)item{
|
||||
@@ -36,7 +125,7 @@
|
||||
return NSMakeRect(MIN(_stampStart.x,_stampEnd.x),MIN(_stampStart.y,_stampEnd.y),fabs(_stampStart.x-_stampEnd.x),fabs(_stampStart.y-_stampEnd.y));
|
||||
}
|
||||
- (NSPoint)canvasStampSource:(NSPoint)source{
|
||||
return NSMakePoint(NSMinX(_imageRect)+source.x*NSWidth(_imageRect),NSMinY(_imageRect)+source.y*NSHeight(_imageRect));
|
||||
return [self canvasDisplayPoint:_level.toOutput(source)];
|
||||
}
|
||||
- (void)drawStampSource:(NSPoint)source{
|
||||
NSPoint p=[self canvasStampSource:source];
|
||||
@@ -57,8 +146,14 @@
|
||||
if(_stampHasSource)[self drawStampSource:_stampSource];
|
||||
if(_stampDragging||_stampSaving||_stampFailure){
|
||||
NSRect target=[self stampTarget];
|
||||
NSRect oval=NSMakeRect(NSMinX(_imageRect)+target.origin.x*NSWidth(_imageRect),NSMinY(_imageRect)+target.origin.y*NSHeight(_imageRect),target.size.width*NSWidth(_imageRect),target.size.height*NSHeight(_imageRect));
|
||||
NSBezierPath *outline=[NSBezierPath bezierPathWithOvalInRect:oval];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
|
||||
NSBezierPath *outline=[NSBezierPath bezierPath];
|
||||
for(int i=0;i<64;i++){
|
||||
double angle=i*(2*M_PI/64);
|
||||
NSPoint uv=NSMakePoint(NSMidX(target)+cos(angle)*NSWidth(target)/2,NSMidY(target)+sin(angle)*NSHeight(target)/2);
|
||||
NSPoint p=[self canvasStampSource:uv];
|
||||
if(i==0)[outline moveToPoint:p];else [outline lineToPoint:p];
|
||||
}
|
||||
[outline closePath];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
|
||||
}
|
||||
}else if(source.count==4){
|
||||
[self drawStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
|
||||
@@ -77,8 +172,10 @@
|
||||
id<FxOnScreenControlAPI_v4>api=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.;
|
||||
DYPlugIn *plugin=[self pluginAtTime:time];NSDictionary *mask=[plugin toolCanvasMaskAtTime:time];NSInteger route=(plugin?1:0)+(mask?2:0);if(route!=_lastRoute||_drawCount++<2){_lastRoute=route;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_route plugin=%{public}d mask=%{public}d width=%{public}.2f height=%{public}.2f",plugin!=nil,mask!=nil,_imageRect.size.width,_imageRect.size.height);}[_mask release];_mask=[mask copy];[_handles removeAllObjects];[_outline release];_outline=nil;
|
||||
[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time];
|
||||
[self updateLevelFrom:plugin time:time];
|
||||
if(_levelMode)mask=nil;
|
||||
if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){
|
||||
NSRect region=mask||_viewerControls.stampArmed?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
|
||||
NSRect region=mask||_viewerControls.stampArmed||_levelMode?NSMakeRect(0,0,canvasWidth,_height):NSIntegralRect([_viewerControls drawingBounds]);
|
||||
if(NSIsEmptyRect(region)){[commands commit];[commands waitUntilCompleted];return;}
|
||||
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:(NSInteger)NSWidth(region) pixelsHigh:(NSInteger)NSHeight(region) bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:(NSInteger)NSWidth(region)*4 bitsPerPixel:32]autorelease];
|
||||
if(!bitmap){[commands commit];[commands waitUntilCompleted];return;}
|
||||
@@ -89,7 +186,7 @@
|
||||
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:NSGraphicsContext.currentContext.CGContext flipped:YES]];
|
||||
if(mask){BOOL blankShape=[mask[@"drawShape"]boolValue]&&![mask[@"shapeStarted"]boolValue];DYMaskParameters p;[mask[@"parameters"]getBytes:&p length:sizeof(p)];p.imageAspect=_imageRect.size.width/_imageRect.size.height;_outline=[[NSBezierPath bezierPath]retain];
|
||||
if(p.kind==DYMaskBezier){NSData *data=mask[@"nodes"];auto *nodes=(const DYBezierNode*)data.bytes;NSUInteger count=data.length/sizeof(DYBezierNode);for(NSUInteger i=0;i<count;i++){NSPoint anchor=[self canvasPoint:nodes[i].x y:nodes[i].y parameters:p];if(i==0)[_outline moveToPoint:anchor];else{auto a=nodes[i-1],b=nodes[i];[_outline curveToPoint:anchor controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];}[self addHandle:anchor part:1000+i*3];for(int j=0;j<2;j++){NSPoint handle=[self canvasPoint:j?nodes[i].outX:nodes[i].inX y:j?nodes[i].outY:nodes[i].inY parameters:p];if(hypot(handle.x-anchor.x,handle.y-anchor.y)>3){NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:anchor];[line lineToPoint:handle];[[NSColor colorWithWhite:1 alpha:.55]setStroke];[line stroke];[self addHandle:handle part:1000+i*3+j+1];}}}
|
||||
NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=NSMakePoint(_imageRect.origin.x+[hover[0]doubleValue]*_imageRect.size.width,_imageRect.origin.y+[hover[1]doubleValue]*_imageRect.size.height);[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];}
|
||||
NSArray *hover=mask[@"hover"];if(count&&[mask[@"drawing"]boolValue]&&hover.count==2){NSPoint target=[self canvasStampSource:NSMakePoint([hover[0]doubleValue],[hover[1]doubleValue])];[_outline curveToPoint:target controlPoint1:[self canvasPoint:nodes[count-1].outX y:nodes[count-1].outY parameters:p] controlPoint2:target];}
|
||||
if(count>=3&&![mask[@"drawing"]boolValue]){auto a=nodes[count-1],b=nodes[0];[_outline curveToPoint:[self canvasPoint:b.x y:b.y parameters:p] controlPoint1:[self canvasPoint:a.outX y:a.outY parameters:p] controlPoint2:[self canvasPoint:b.inX y:b.inY parameters:p]];[_outline closePath];}
|
||||
}else if(p.kind<2&&!blankShape){int count=p.kind==DYMaskEllipse?96:4;for(int i=0;i<count;i++){float angle=i*(2.f*M_PI/count),x=p.kind==DYMaskEllipse?.5f*cosf(angle):((float[]){-.5,.5,.5,-.5})[i],y=p.kind==DYMaskEllipse?.5f*sinf(angle):((float[]){-.5,-.5,.5,.5})[i];NSPoint point=[self canvasPoint:x y:y parameters:p];if(i==0)[_outline moveToPoint:point];else[_outline lineToPoint:point];}[_outline closePath];}
|
||||
else if(p.kind==DYMaskLinearGradient){[_outline moveToPoint:[self canvasPoint:0 y:-2 parameters:p]];[_outline lineToPoint:[self canvasPoint:0 y:2 parameters:p]];}
|
||||
@@ -102,14 +199,15 @@
|
||||
NSMutableParagraphStyle *style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter;
|
||||
for(NSInteger item=9;item<=10;item++){NSString *title=item==9?@"✓ 完成":@"取消";NSRect cell=[self toolbarRectForItem:item];CGFloat size=cell.size.height*.48;[title drawInRect:NSInsetRect(cell,0,MAX(0.,(cell.size.height-size-3)/2))withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:size weight:NSFontWeightMedium],NSForegroundColorAttributeName:NSColor.whiteColor,NSShadowAttributeName:shadow,NSParagraphStyleAttributeName:style}];}
|
||||
}
|
||||
}[self drawStampControls];[_viewerControls draw];
|
||||
}if(_levelMode)[self drawLevelControls];else [self drawStampControls];[_viewerControls draw];
|
||||
[NSGraphicsContext restoreGraphicsState];CIImage *overlay=[CIImage imageWithCGImage:bitmap.CGImage options:@{kCIImageColorSpace:NSNull.null}];overlay=[overlay imageByApplyingTransform:CGAffineTransformMakeTranslation(NSMinX(region),texture.height-NSMaxY(region))];[_context render:overlay toMTLTexture:texture commandBuffer:commands bounds:CGRectMake(0,0,texture.width,texture.height) colorSpace:nil];
|
||||
}[commands commit];[commands waitUntilCompleted];
|
||||
}}}
|
||||
- (NSInteger)partAtPoint:(NSPoint)point {
|
||||
BOOL drawing=[_mask[@"drawing"]boolValue];
|
||||
if(drawing)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
|
||||
if(drawing&&!_levelMode)for(NSInteger i=9;i<=10;i++)if(NSPointInRect(point,[self toolbarRectForItem:i]))return 10000+i;
|
||||
NSInteger viewerHit=[_viewerControls partAtPoint:point];if(viewerHit)return viewerHit;
|
||||
if(_levelMode)return NSPointInRect(point,_imageRect)?10015:0;
|
||||
if(_viewerControls.stampArmed)return NSPointInRect(point,_imageRect)?10014:0;
|
||||
NSArray *source=_mask[@"stampSource"];
|
||||
if(source.count==4){
|
||||
@@ -125,11 +223,13 @@
|
||||
for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];}
|
||||
if(p.kind==DYMaskBezier||p.kind==DYMaskLinearGradient||[_outline containsPoint:point])return 1;return 0;
|
||||
}
|
||||
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}}
|
||||
- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];[self updateLevelFrom:plugin time:time];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}}
|
||||
- (BOOL)event:(NSEventType)type x:(double)x y:(double)y part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {@synchronized(self){
|
||||
DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y);
|
||||
if(_maskCapturing&&plugin!=_maskCaptureOwner){_maskCapturing=NO;_maskCaptureOwner=nil;return NO;}
|
||||
[self updateLevelFrom:plugin time:time];
|
||||
if(_stampSaving)return YES;
|
||||
if([self handleLevelEvent:type point:canvasPoint part:part key:key time:time plugin:plugin])return YES;
|
||||
if(!_viewerControls.stampArmed)[self clearStampCreation];
|
||||
if(type==NSEventTypeKeyDown&&key==27&&_viewerControls.stampArmed){
|
||||
_viewerControls.stampArmed=NO;[self clearStampCreation];return YES;
|
||||
@@ -139,7 +239,8 @@
|
||||
[plugin trackCloneStamp:_mask[@"id"] direction:direction];return YES;
|
||||
}
|
||||
if(plugin&&_viewerControls.stampArmed&&NSWidth(_imageRect)>0&&NSHeight(_imageRect)>0){
|
||||
NSPoint uv=NSMakePoint(fmax(0,fmin(1,(x-NSMinX(_imageRect))/NSWidth(_imageRect))),fmax(0,fmin(1,(canvasPoint.y-NSMinY(_imageRect))/NSHeight(_imageRect))));
|
||||
NSPoint uv=_level.toSource([self clampedDisplayUV:canvasPoint]);
|
||||
uv=NSMakePoint(std::clamp(uv.x,0.,1.),std::clamp(uv.y,0.,1.));
|
||||
if(type==NSEventTypeLeftMouseDown&&part==10014){
|
||||
[_stampFailure release];_stampFailure=nil;
|
||||
if(!_stampHasSource){_stampSource=uv;_stampHasSource=YES;}
|
||||
@@ -174,9 +275,14 @@
|
||||
BOOL ownedMask=_maskCapturing&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp);
|
||||
if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];
|
||||
BOOL penAction=type==NSEventTypeLeftMouseDown&&(part==10009||part==10010);
|
||||
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;
|
||||
if(!ownedMask&&!penAction&&type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time]){
|
||||
[self updateLevelFrom:plugin time:time];
|
||||
if(_viewerControls.levelResetRequested){_viewerControls.levelResetRequested=NO;[self commitLevel:0 plugin:plugin];}
|
||||
return YES;
|
||||
}
|
||||
if(_levelMode)return NO;
|
||||
if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0){_maskCapturing=NO;return NO;}
|
||||
NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);
|
||||
NSPoint point=_level.toSource([self displayUV:canvasPoint]);
|
||||
if(type==NSEventTypeLeftMouseDown){_maskCapturing=part>0&&part<10000;_maskCaptureOwner=_maskCapturing?plugin:nil;}
|
||||
[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];if(type==NSEventTypeLeftMouseUp||(type==NSEventTypeKeyDown&&key==27)){_maskCapturing=NO;_maskCaptureOwner=nil;}return YES;
|
||||
}}
|
||||
@@ -185,7 +291,10 @@
|
||||
- (void)mouseUpAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseUp x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;}
|
||||
- (void)keyDownAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{BOOL result=(key==27||key==13||key==10||key==3||key==8||key==127)&&[self event:NSEventTypeKeyDown x:x y:y part:1 modifiers:m key:key time:t];if(update)*update=result;if(handled)*handled=result;}
|
||||
- (void)mouseMovedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){
|
||||
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:part==10014?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if([mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||[mask[@"drawing"]boolValue]||_stampNeedsRedraw;_stampNeedsRedraw=NO;
|
||||
DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];[self updateLevelFrom:plugin time:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue]||[mask[@"drawShape"]boolValue];NSCursor *cursor=[_viewerControls headerAtPoint:point]?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:(part==10014||part==10015)?NSCursor.crosshairCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(_levelMode&&_levelHasFirst&&!_levelDown&&!_levelSaving&&!viewerHit&&part==10015){
|
||||
_levelLast=[self clampedDisplayUV:point];redraw=YES;
|
||||
}else if(!_levelMode&&[mask[@"drawing"]boolValue]&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];
|
||||
if(update)*update=redraw||(!_levelMode&&[mask[@"drawing"]boolValue])||_stampNeedsRedraw;_stampNeedsRedraw=NO;
|
||||
}}
|
||||
- (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{[self mouseMovedAtPositionX:x positionY:y activePart:0 modifiers:m forceUpdate:update atTime:t];}
|
||||
- (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){BOOL changed=[_viewerControls mouseExited];if(update)*update=changed;}}
|
||||
|
||||
@@ -13,12 +13,27 @@
|
||||
id<MTLComputeCommandEncoder>encoder=[commands computeCommandEncoder];[encoder setComputePipelineState:entry[@"dyToolBlend"]];[encoder setTexture:before atIndex:0];[encoder setTexture:after atIndex:1];[encoder setTexture:output atIndex:2];[encoder setBuffer:masks offset:0 atIndex:0];[encoder setBytes:&h length:sizeof(h) atIndex:1];[encoder dispatchThreads:MTLSizeMake(output.width,output.height,1) threadsPerThreadgroup:MTLSizeMake(16,16,1)];[encoder endEncoding];
|
||||
}
|
||||
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest entry:(NSMutableDictionary*)e error:(NSError**)error {
|
||||
return [self copyTile:source to:dest rotation:0 entry:e error:error];
|
||||
}
|
||||
- (BOOL)copyTile:(FxImageTile*)source to:(FxImageTile*)dest rotation:(double)angle entry:(NSMutableDictionary*)e error:(NSError**)error {
|
||||
id<MTLDevice>device=e[@"device"];id<MTLTexture>a=[source metalTextureForDevice:device],b=[dest metalTextureForDevice:device];
|
||||
NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",_managedFinishing,(unsigned long)b.pixelFormat];id<MTLRenderPipelineState>pipeline=pipelines[key];
|
||||
if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:_managedFinishing?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
|
||||
if(!a||!b)return fail(error,@"宿主图像纹理不可用");
|
||||
BOOL useFloat=_managedFinishing||angle!=0;
|
||||
NSMutableDictionary *pipelines=e[@"pipelines"];NSString *key=[NSString stringWithFormat:@"copy-%d-%lu",useFloat,(unsigned long)b.pixelFormat];id<MTLRenderPipelineState>pipeline=pipelines[key];
|
||||
if(!pipeline){MTLRenderPipelineDescriptor *desc=[MTLRenderPipelineDescriptor new];desc.vertexFunction=[e[@"library"]newFunctionWithName:@"dyVertex"];desc.fragmentFunction=[e[@"library"]newFunctionWithName:useFloat?@"dyManagedCopyFragment":@"dyToolCopyFragment"];desc.colorAttachments[0].pixelFormat=b.pixelFormat;pipeline=[device newRenderPipelineStateWithDescriptor:desc error:error];[desc.vertexFunction release];[desc.fragmentFunction release];[desc release];if(!pipeline)return NO;pipelines[key]=pipeline;[pipeline release];}
|
||||
FxRect s=source.tilePixelBounds,t=dest.tilePixelBounds;float width=s.right-s.left,height=s.top-s.bottom,l=(t.left-s.left)/width,r=(t.right-s.left)/width,top=(s.top-t.top)/height,bottom=(s.top-t.bottom)/height;
|
||||
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT){top=1-top;bottom=1-bottom;}
|
||||
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)for(auto &vertex:v)vertex.position.y=-vertex.position.y;
|
||||
float w=b.width,h=b.height;DYVertex2D v[]={{{w/2,-h/2},{r,bottom}},{{-w/2,-h/2},{l,bottom}},{{w/2,h/2},{r,top}},{{-w/2,h/2},{l,top}}};
|
||||
double pixelAspect=source.pixelAspect;
|
||||
if(!std::isfinite(pixelAspect)||pixelAspect<=0)pixelAspect=1;
|
||||
DYLevelTransform level(angle,width*pixelAspect/height);
|
||||
for(auto &vertex:v){
|
||||
if(angle){
|
||||
CGPoint uv=level.toSource(CGPointMake(vertex.textureCoordinate.x,vertex.textureCoordinate.y));
|
||||
vertex.textureCoordinate={(float)uv.x,(float)uv.y};
|
||||
}
|
||||
if(source.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.textureCoordinate.y=1-vertex.textureCoordinate.y;
|
||||
if(dest.imageOrigin==kFxImageOrigin_BOTTOM_LEFT)vertex.position.y=-vertex.position.y;
|
||||
}
|
||||
vector_uint2 size={(unsigned)b.width,(unsigned)b.height};id<MTLCommandBuffer>cb=[e[@"queue"]commandBuffer];MTLRenderPassDescriptor *pass=[MTLRenderPassDescriptor renderPassDescriptor];pass.colorAttachments[0].texture=b;pass.colorAttachments[0].loadAction=MTLLoadActionDontCare;pass.colorAttachments[0].storeAction=MTLStoreActionStore;id<MTLRenderCommandEncoder>encoder=[cb renderCommandEncoderWithDescriptor:pass];[encoder setRenderPipelineState:pipeline];[encoder setVertexBytes:v length:sizeof(v) atIndex:0];[encoder setVertexBytes:&size length:sizeof(size) atIndex:1];[encoder setFragmentTexture:a atIndex:0];[encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4];[encoder endEncoding];[cb commit];[cb waitUntilCompleted];return cb.status==MTLCommandBufferStatusCompleted?YES:fail(error,cb.error.localizedDescription);
|
||||
}
|
||||
// Extra skin keeps the source reference used by the prior release. All other
|
||||
@@ -101,6 +116,7 @@
|
||||
});}}
|
||||
- (BOOL)exportLUT:(NSURL*)url uniforms:(DYUniforms)u paths:(NSDictionary*)paths spider:(NSData*)spider tools:(NSDictionary*)tools error:(NSError**)error {@synchronized(self){
|
||||
if(tools&&!DYValidToolDocument(tools))return fail(error,@"工具或蒙版数据损坏,未更改原工程");DYApplyRemovedBaseTools(&u,tools);paths=DYVisibleBaseToolPaths(paths,tools);if(DYBaseToolRemoved(tools,@"spider"))spider=nil;
|
||||
if([tools[@"levelRotation"]doubleValue]!=0)return fail(error,@"水平校正属于空间处理,请保存完整预设。");
|
||||
for(NSDictionary *mask in DYSharedMasks(tools))if(mask[@"stampSource"]&&[mask[@"enabled"]boolValue])return fail(error,@"仿制图章属于空间处理,请保存完整预设。");
|
||||
if((u.lensSectionEnabled>.5&&(u.lensStrength!=0||u.lensScale!=1))||(u.skinProtection.x>.5&&u.skinVisualize>.5))return fail(error,@"镜头修复与肤色区域显示无法保存到 Cube,请保存完整预设。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"lens"]&&!DYToolIsNeutral(node))return fail(error,@"镜头畸变属于空间处理,请保存完整预设。");}
|
||||
DYUniforms effective=u;if(![paths[@"input"]length]&&effective.inputProfile==0)effective.preLUTStrength=0;if(![paths[@"look0"]length])effective.postLUTStrength=0;for(int i=0;i<4;i++)if(![paths[[NSString stringWithFormat:@"look%d",i+1]]length])effective.extraPostLUTStrengths[i]=0;bypassNeutralTools(&effective);bypassIdleSkin(&effective);if(effective.skinFaceOnly>.5&&effective.skinProtection.x>.5&&effective.skinProtection.y>0)return fail(error,@"人脸限定肤色保护属于空间选区,Cube 无法保存。请保存完整预设,或关闭人脸限定后导出。");for(NSDictionary *node in tools[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"skin"]&&layer.skinProtection.x>.5&&layer.skinProtection.y>0&&(layer.skinFaceOnly>.5||layer.skinVisualize>.5))return fail(error,@"新增肤色层含人脸空间选区,请保存完整预设。");}
|
||||
|
||||
@@ -26,6 +26,7 @@ NSDictionary *DYNewMask(NSInteger kind);
|
||||
BOOL DYValidToolDocument(NSDictionary *document);
|
||||
BOOL DYValidToolMask(NSDictionary *mask);
|
||||
NSMutableDictionary *DYMutablePlist(NSDictionary *value);
|
||||
NSDictionary *DYInitialToolDocument(NSString *starter);
|
||||
DYToolDocument *DYReadTools(id<PROAPIAccessing> manager,CMTime time);
|
||||
BOOL DYWriteTools(id<PROAPIAccessing> manager,NSDictionary *document,CMTime time);
|
||||
NSArray *DYMasksForTool(NSDictionary *document,NSString *nodeID);
|
||||
|
||||
+14
-2
@@ -61,7 +61,16 @@ NSMutableDictionary *DYMutablePlist(NSDictionary *value){
|
||||
if(!value)return [NSMutableDictionary dictionary];
|
||||
return [(NSMutableDictionary*)CFPropertyListCreateDeepCopy(kCFAllocatorDefault,(CFPropertyListRef)value,kCFPropertyListMutableContainersAndLeaves) autorelease];
|
||||
}
|
||||
static NSDictionary *DYEmptyTools(){return @{@"schema":@1,@"layers":@[],@"baseMasks":@{}};}
|
||||
NSDictionary *DYInitialToolDocument(NSString *starter) {
|
||||
NSMutableDictionary *doc=[NSMutableDictionary dictionaryWithDictionary:@{@"schema":@1,@"layers":@[],@"baseMasks":@{}}];
|
||||
if([starter isEqual:@"primary"]||[starter isEqual:@"hsl"]){
|
||||
NSMutableArray *removed=[NSMutableArray arrayWithArray:DYToolTypes()];
|
||||
[removed removeObject:starter];
|
||||
doc[@"removedBase"]=removed;
|
||||
doc[@"starterTool"]=starter;
|
||||
}
|
||||
return doc;
|
||||
}
|
||||
static BOOL finiteNumber(id v){return [v isKindOfClass:NSNumber.class]&&std::isfinite([v doubleValue]);}
|
||||
static BOOL validStampValues(id values,NSUInteger count,NSUInteger offsets,double minScale,double maxScale){
|
||||
if(![values isKindOfClass:NSArray.class]||[values count]!=count)return NO;
|
||||
@@ -102,6 +111,9 @@ static BOOL validMasks(id masks,NSMutableSet *ids,NSSet *sharedIDs,BOOL referenc
|
||||
static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
if(![NSPropertyListSerialization propertyList:doc isValidForFormat:NSPropertyListBinaryFormat_v1_0])return nil;
|
||||
if(![doc isKindOfClass:NSDictionary.class]||(![doc[@"schema"]isEqual:@1]&&![doc[@"schema"]isEqual:@2]&&![doc[@"schema"]isEqual:@3])||![doc[@"layers"]isKindOfClass:NSArray.class]||[doc[@"layers"]count]>DYToolLimit||![doc[@"baseMasks"]isKindOfClass:NSDictionary.class]||[doc[@"baseMasks"]count]>DYToolTypes().count)return nil;
|
||||
id starter=doc[@"starterTool"],level=doc[@"levelRotation"];
|
||||
if(starter&&![starter isEqual:@"primary"]&&![starter isEqual:@"hsl"])return nil;
|
||||
if(level&&(!finiteNumber(level)||fabs([level doubleValue])>M_PI))return nil;
|
||||
BOOL references=[doc[@"schema"]isEqual:@3];id shared=doc[@"sharedMasks"];NSMutableSet *sharedIDs=[NSMutableSet set],*ids=[NSMutableSet set];if(shared){if(!references||![shared isKindOfClass:NSArray.class]||[shared count]>DYSharedMaskLimit)return nil;for(NSDictionary *mask in shared){if(!DYValidToolMask(mask)||[ids containsObject:mask[@"id"]]||mask[@"sharedID"])return nil;[ids addObject:mask[@"id"]];if(!mask[@"stampSource"])[sharedIDs addObject:mask[@"id"]];}}
|
||||
id removed=doc[@"removedBase"];if(removed){if(![removed isKindOfClass:NSArray.class]||[removed count]>DYToolTypes().count)return nil;NSMutableSet *unique=[NSMutableSet set];for(id type in removed){if(![type isKindOfClass:NSString.class]||![DYToolTypes()containsObject:type]||[unique containsObject:type]||[doc[@"baseMasks"][type]count])return nil;[unique addObject:type];}}
|
||||
for(NSString *key in doc[@"baseMasks"]){if(![DYToolTypes()containsObject:key]||!validMasks(doc[@"baseMasks"][key],ids,sharedIDs,references))return nil;}
|
||||
@@ -119,7 +131,7 @@ static NSData *DYValidatedToolData(NSDictionary *doc){
|
||||
BOOL DYValidToolDocument(NSDictionary *doc){return DYValidatedToolData(doc)!=nil;}
|
||||
@implementation DYToolDocument
|
||||
+ (BOOL)supportsSecureCoding{return YES;}
|
||||
- (instancetype)init{if((self=[super init]))_document=[DYEmptyTools()copy];return self;}
|
||||
- (instancetype)init{if((self=[super init]))_document=[DYInitialToolDocument(nil)copy];return self;}
|
||||
- (void)dealloc{[_document release];[super dealloc];}
|
||||
- (void)setDocument:(NSDictionary *)d{NSData *b=DYValidatedToolData(d);if(!b)return;NSDictionary *immutable=[NSPropertyListSerialization propertyListWithData:b options:NSPropertyListImmutable format:NULL error:nil];[self setImmutableDocument:immutable];}
|
||||
- (void)setImmutableDocument:(NSDictionary*)document{if(document==_document)return;[document retain];[_document release];_document=document;}
|
||||
|
||||
@@ -43,6 +43,8 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
|
||||
- (void)draw;
|
||||
- (NSRect)drawingBounds;
|
||||
@property(nonatomic) BOOL stampArmed;
|
||||
@property(nonatomic) NSInteger levelMode; // 0 closed, 1 horizontal, 2 vertical
|
||||
@property(nonatomic) BOOL levelResetRequested;
|
||||
- (NSInteger)partAtPoint:(NSPoint)point;
|
||||
- (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time;
|
||||
- (BOOL)mouseMoved:(NSPoint)point;
|
||||
@@ -58,7 +60,7 @@ static void DYDrawCloneStamp(NSRect rect,NSColor *color){
|
||||
@synthesize bridge=_bridge;
|
||||
- (instancetype)init{if((self=[super init])){_panels=[NSMutableArray new];_areas=[NSMutableArray new];_scale=1;_time=kCMTimeInvalid;}return self;}
|
||||
- (void)dealloc{[self finishCapture];[_bridge release];[_panels release];[_areas release];[super dealloc];}
|
||||
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;}
|
||||
- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[self finishCapture];for(DYViewerParameterPanel*p in _panels)p.bridge=nil;[_panels removeAllObjects];[_bridge release];_bridge=[bridge retain];_pendingSkinPreview=NO;_stampArmed=NO;_levelMode=0;_levelResetRequested=NO;}
|
||||
- (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;}
|
||||
- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{
|
||||
_size=size;_time=time;_backingScale=scale;
|
||||
@@ -69,10 +71,17 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
if(_capture&&![_capture capturing])_capture=nil;
|
||||
[_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return;
|
||||
// Only tools that benefit from direct image interaction belong on the canvas.
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp"];
|
||||
CGFloat railScale=MIN(s,v.size.width/480.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-476*railScale;
|
||||
_rail=NSMakeRect(x,y,356*railScale,25*railScale);
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance",@"cloneStamp",@"level"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管",@"仿制图章",@"水平校正"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper",@"clone-stamp",@"level"];
|
||||
CGFloat railScale=MIN(s,v.size.width/520.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-516*railScale;
|
||||
_rail=NSMakeRect(x,y,396*railScale,25*railScale);
|
||||
if(_levelMode){
|
||||
NSArray *labels=@[@"水平",@"垂直",@"重置"];
|
||||
for(NSInteger i=0;i<3;i++){
|
||||
NSRect r=NSMakeRect(NSMaxX(v)-(276-56*i)*railScale,y-34*railScale,52*railScale,26*railScale);
|
||||
[_areas addObject:@{@"part":@(20031+i),@"kind":@"levelOption",@"index":@(i+1),@"title":labels[i],@"rect":[NSValue valueWithRect:r]}];
|
||||
}
|
||||
}
|
||||
for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x+i*40*railScale,y,w,25*railScale)]}];
|
||||
for(NSInteger i=0;i<types.count;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
|
||||
CGFloat buttonWidth=100*railScale,buttonHeight=27*railScale;
|
||||
@@ -112,7 +121,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
}
|
||||
- (void)draw{
|
||||
if(!_areas.count)return;[NSGraphicsContext saveGraphicsState];NSRectClip(_viewport);CGFloat s=_scale;for(DYViewerParameterPanel*p in _panels)[p draw];
|
||||
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=([a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled])||([a[@"toolType"]isEqual:@"cloneStamp"]&&_stampArmed);for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
|
||||
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=([a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled])||([a[@"toolType"]isEqual:@"cloneStamp"]&&_stampArmed)||([a[@"toolType"]isEqual:@"level"]&&_levelMode)||([a[@"kind"]isEqual:@"levelOption"]&&[a[@"index"]integerValue]==_levelMode);for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
|
||||
BOOL hover=_hover==[a[@"part"]integerValue];
|
||||
BOOL pressed=_pressed==[a[@"part"]integerValue];DYDrawSoftControl(r,4*s,NO,selected||hover,pressed);
|
||||
if(a[@"symbol"]){
|
||||
@@ -139,6 +148,8 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
- (void)activateTool:(NSString*)type{
|
||||
if([type isEqual:@"level"]){_stampArmed=NO;_levelMode=_levelMode?0:1;return;}
|
||||
_levelMode=0;
|
||||
if([type isEqual:@"cloneStamp"]){_stampArmed=!_stampArmed;return;}
|
||||
_stampArmed=NO;
|
||||
if([type isEqual:@"look"]){[_bridge requestWorkspacePage:@"lut"];return;}
|
||||
@@ -157,7 +168,7 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
if(!hit)return NO;_pressed=hit;return YES;
|
||||
}
|
||||
if(!_pressed)return NO;
|
||||
if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"mask"]){_stampArmed=NO;[_bridge requestMask:[a[@"index"]integerValue]];}else if([kind isEqual:@"workspace"])[_bridge requestWorkspace];else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_backingScale atTime:time];}
|
||||
if(type==NSEventTypeLeftMouseUp){NSInteger pressed=_pressed;_pressed=0;if(hit==pressed){for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==hit){NSString*kind=a[@"kind"];if([kind isEqual:@"tool"])[self activateTool:a[@"toolType"]];else if([kind isEqual:@"levelOption"]){NSInteger choice=[a[@"index"]integerValue];if(choice==3)_levelResetRequested=YES;else _levelMode=choice;}else if([kind isEqual:@"mask"]){_stampArmed=NO;_levelMode=0;[_bridge requestMask:[a[@"index"]integerValue]];}else if([kind isEqual:@"workspace"]){_levelMode=0;[_bridge requestWorkspace];}else if([kind isEqual:@"hidePanels"]){for(DYViewerParameterPanel*panel in _panels){[panel finishCapture];panel.bridge=nil;}[_panels removeAllObjects];}else if([kind isEqual:@"railPage"])_railPage++;break;}}[self prepareWithSize:_size scale:_backingScale atTime:time];}
|
||||
return YES;
|
||||
}
|
||||
- (BOOL)capturing{return _pressed||[_capture capturing];}
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.14.4</string>
|
||||
<string>1.15.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>95</string>
|
||||
<string>96</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
@@ -71,7 +71,7 @@
|
||||
<key>uuid</key>
|
||||
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
|
||||
<key>version</key>
|
||||
<string>1.14.4</string>
|
||||
<string>1.15.0</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>className</key>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.14.4</string>
|
||||
<string>1.15.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>95</string>
|
||||
<string>96</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户