Remove template author rows and adopt native 5.11 format for build36
这个提交包含在:
1 父节点
2b2d657de7
当前提交
b243751f86
15 个文件已更改
+222
-156
没有与搜索条件相匹配的文件
+18
-25
@@ -12,6 +12,8 @@ TEMPLATE=ROOT/'template'
|
||||
SOURCES=TEMPLATE/'sources'
|
||||
PROJECT_UUID='7d468273c013498e9806a0d7bc32fddf'
|
||||
PLUGIN_UUID='1C17B73B-F229-4C09-A434-EAF6DFF5F22A'
|
||||
OUTPUT_VERSION='5.11'
|
||||
OUTPUT_DISPLAY_VERSION='5.4.5'
|
||||
NATIVE_ALPHABET='*-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
|
||||
STANDARD_ALPHABET='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
|
||||
CONTENT_TAGS={'scenenode','layer','group','filter','behavior','mask'}
|
||||
@@ -60,10 +62,17 @@ def build(model):
|
||||
scene=root.find('scene');project=scene.find('scenenode[@factoryID="4"]')
|
||||
source=scene.find('.//scenenode[@name="效果源"]')
|
||||
if source is None or root.get('version')!='5.13' or root.findtext('displayversion')!='5.6.7':raise ValueError('Unexpected native EffectSource source')
|
||||
# Same EffectSource/FxPlug/custom-archive shape exists in the identity-
|
||||
# recorded native 5.11 / Motion 5.4.5 reference. Drop only later optional
|
||||
# 3D/HDR editor hints; keep factory/node versions and color settings intact.
|
||||
root.set('version',OUTPUT_VERSION);root.find('displayversion').text=OUTPUT_DISPLAY_VERSION
|
||||
for parent in root.iter():
|
||||
for child in list(parent):
|
||||
if child.tag in {'Object3DEnvironments','DRTSupport','onHDRDisplay','missingDynamicRangeType'}:parent.remove(child)
|
||||
if source.find('parameter[@id="2"]/parameter[@id="321"]').get('value')!='3':raise ValueError('Expected native EffectSource type 3')
|
||||
native_factories=E.parse(SOURCES/'NativeFactories.xml').getroot()
|
||||
lookup={f.get('uuid'):f for f in native_factories}
|
||||
factory_ids={'deca4859b16011d7a12d0003936f6f92':'5','402246385249454b90e08b2ee1b6bf06':'6','e35c74f01d5042f6b468eb530169bfb7':'7'}
|
||||
factory_ids={'deca4859b16011d7a12d0003936f6f92':'5'}
|
||||
insert_at=list(root).index(root.findall('factory')[-1])+1
|
||||
for uuid,fid in factory_ids.items():
|
||||
factory=copy.deepcopy(lookup[uuid]);factory.set('id',fid);root.insert(insert_at,factory);insert_at+=1
|
||||
@@ -87,17 +96,11 @@ def build(model):
|
||||
if node.get("id")=="10005":node.set("value","1");node.set("default","0");node.set("flags","8589934592")
|
||||
filt.append(node)
|
||||
source.append(filt)
|
||||
copyright=E.parse(SOURCES/'CopyrightRig.xml').getroot()
|
||||
entity_map={'3356608241':'10080','3356608243':'10081','3356608245':'10082'}
|
||||
for node in copyright.iter('scenenode'):
|
||||
node.set('id',entity_map[node.get('id')]);node.set('factoryID','6' if node.get('factoryID')=='1' else '7')
|
||||
# Native Rig stays directly below scene, after its native project.
|
||||
scene.insert(list(scene).index(project)+1,copyright)
|
||||
# User requested removal of the author's two display-only Rig widgets.
|
||||
# Do not regenerate their nodes, factories or published parameter rows.
|
||||
pub=scene.find('publishSettings')
|
||||
for node in list(pub):
|
||||
if node.tag!='version':pub.remove(node)
|
||||
for object_id,name in [('10081','FCP 版本作者→'),('10082','更多模板浏览器访问→')]:
|
||||
E.SubElement(pub,'target',object=object_id,channel='./2/100',name=name)
|
||||
E.SubElement(pub,'target',object='10060',channel='./9000',name='大鱼调色')
|
||||
E.SubElement(pub,'target',object='10060',channel='./10001',name='混合')
|
||||
current=scene.find('currentObject')
|
||||
@@ -116,6 +119,8 @@ def build(model):
|
||||
|
||||
def verify(data,model):
|
||||
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'])
|
||||
filters=root.findall('.//filter')
|
||||
assert len(filters)==1 and filters[0].get('pluginUUID')==PLUGIN_UUID
|
||||
f=filters[0];params={p.get('id'):p for p in f.findall('parameter')}
|
||||
@@ -134,24 +139,12 @@ 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]==[('10081','./2/100','FCP 版本作者→'),('10082','./2/100','更多模板浏览器访问→'),('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
# Compare every native Rig/widget field after reversing entity/factory IDs.
|
||||
rig=scene.find('scenenode[@id="10080"]');assert factories[rig.get('factoryID')]=='402246385249454b90e08b2ee1b6bf06'
|
||||
reverse=copy.deepcopy(rig)
|
||||
entity_map={'10080':'3356608241','10081':'3356608243','10082':'3356608245'}
|
||||
for node in reverse.iter('scenenode'):
|
||||
node.set('id',entity_map[node.get('id')]);node.set('factoryID','1' if node.get('factoryID')=='6' else '6')
|
||||
def structure(node):return (node.tag,dict(node.attrib),(node.text or '').strip(),[structure(child) for child in node])
|
||||
assert structure(reverse)==structure(E.parse(SOURCES/'CopyrightRig.xml').getroot())
|
||||
assert [(t.get('object'),t.get('channel'),t.get('name')) for t in pub]==[('10060','./9000','大鱼调色'),('10060','./10001','混合')]
|
||||
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'))
|
||||
for widget_id,title,flags in [('10081','大鱼先森Media','16842768'),('10082','dayu.media','16842769')]:
|
||||
widget=rig.find('scenenode[@id="'+widget_id+'"]');assert factories[widget.get('factoryID')]=='e35c74f01d5042f6b468eb530169bfb7'
|
||||
menu=widget.find('parameter[@id="2"]/parameter[@id="100"]')
|
||||
assert menu.attrib=={'name':'弹出式菜单','id':'100','flags':flags,'default':'2','value':'2'}
|
||||
assert [entry.attrib for entry in menu.findall('entry')]==[{'name':title,'tag':'2'}]
|
||||
assert widget.findtext('affecting')=='2' and widget.findtext('snapshot')=='3'
|
||||
assert len({n.get('id') for n in scene.iter() if n.tag in CONTENT_TAGS})==len([n for n in scene.iter() if n.tag in CONTENT_TAGS])
|
||||
return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'passed':True,'rig':'10080','author':'10081','site':'10082','unbound':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False}
|
||||
return {'passed':True,'sha256':sha(data),'version':root.get('version'),'displayversion':root.findtext('displayversion'),'filterCount':1,'nativeFloatParameters':len(model['parameters']),'customParameters':3,'publications':[dict(t.attrib) for t in pub],'effectSourceType':3,'externalMediaRequired':False,'placeholder':'native Drop Zone.tiff','animationObjects':0,'copyright':{'removedAtUserRequest':True,'publishedDisplayRows':0,'displayRigAbsent':True},'savedSelection':{'passed':True,'selectedContentCount':0,'currentObjectIsProject':True},'hostUIVerified':False,'hostRenderVerified':False}
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
在新工单中引用
屏蔽一个用户