birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cloth editor component logic to keep the last known mesh node and restore it later.

Browse Source 
- Fix cloth editor component logic to keep the last known mesh node and restore it later.
- Fix cloth assets slices, materials were missing.
This commit is contained in:
Aaron Ruiz Mora
2021-04-26 15:49:44 +01:00
committed by GitHub
parent 3f32cc929c
commit fbfc2e4968
8 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Assets/slices/Cloth/Chicken_Actor.slice
+22 -22
View File
@@ -154,7 +154,7 @@
</Class>
<Class name="EditorTransform" field="Transform Data" version="2" type="{B02B7063-D238-4F40-A724-405F7A6D68CB}">
<Class name="Vector3" field="Translate" value="0.0000000 0.0000000 0.0000000" type="{8379EB7D-01FA-4538-B64B-A6543B4BE73D}"/>
<Class name="Vector3" field="Rotate" value="0.0000000 0.0000000 359.9999695" type="{8379EB7D-01FA-4538-B64B-A6543B4BE73D}"/>
<Class name="Vector3" field="Rotate" value="0.0000000 0.0000000 -0.0000546" type="{8379EB7D-01FA-4538-B64B-A6543B4BE73D}"/>
<Class name="Vector3" field="Scale" value="1.0000000 1.0000000 1.0000000" type="{8379EB7D-01FA-4538-B64B-A6543B4BE73D}"/>
<Class name="bool" field="Locked" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
</Class>
@@ -379,20 +379,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="4115391834" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
<Class name="Asset" field="MaterialAsset" value="id={80F92051-203E-52CE-B4D6-E3AED21795C9}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/chicken/actor/chicken_mohawkmat.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZStd::unordered_map" field="PropertyOverrides" type="{6E6962E1-04C9-56F9-89C4-361031CC1384}"/>
</Class>
</Class>
<Class name="AZStd::pair" field="element" type="{F652A87A-0FDF-527C-B0ED-340C074A4874}">
<Class name="AZ::Render::MaterialAssignmentId" field="value1" version="1" type="{EB603581-4654-4C17-B6DE-AE61E79EDA97}">
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3988576522" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="1541321207" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -405,7 +392,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="2328463833" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="668669130" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -413,6 +400,19 @@
<Class name="AZStd::unordered_map" field="PropertyOverrides" type="{6E6962E1-04C9-56F9-89C4-361031CC1384}"/>
</Class>
</Class>
<Class name="AZStd::pair" field="element" type="{F652A87A-0FDF-527C-B0ED-340C074A4874}">
<Class name="AZ::Render::MaterialAssignmentId" field="value1" version="1" type="{EB603581-4654-4C17-B6DE-AE61E79EDA97}">
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="2608524672" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
<Class name="Asset" field="MaterialAsset" value="id={80F92051-203E-52CE-B4D6-E3AED21795C9}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/chicken/actor/chicken_mohawkmat.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZStd::unordered_map" field="PropertyOverrides" type="{6E6962E1-04C9-56F9-89C4-361031CC1384}"/>
</Class>
</Class>
</Class>
</Class>
</Class>
@@ -437,7 +437,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="2328463833" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="668669130" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={FB34D8F7-E8CA-542D-92A3-F0E04F3A3EC3}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/chicken/actor/chicken_chicken_body_mat.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -449,7 +449,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3988576522" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="1541321207" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={6114C408-26EE-51DC-8733-A07800BF4991}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/chicken/actor/chicken_chicken_eye_mat.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -461,7 +461,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="4115391834" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="2608524672" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={80F92051-203E-52CE-B4D6-E3AED21795C9}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/chicken/actor/chicken_mohawkmat.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -477,7 +477,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="2328463833" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="668669130" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -489,7 +489,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3988576522" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="1541321207" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -501,7 +501,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{3E4C6A29-92A4-523E-8739-F3E64957569E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="4115391834" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="2608524672" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
Gems/NvCloth/Assets/slices/Cloth/cloth_blinds.slice
+4 -4
View File
@@ -200,7 +200,7 @@
</Class>
<Class name="AZ::Render::MeshComponentController" field="Controller" type="{D0F35FAC-4194-4C89-9487-D000DDB8B272}">
<Class name="AZ::Render::MeshComponentConfig" field="Configuration" version="1" type="{63737345-51B1-472B-9355-98F99993909B}">
<Class name="Asset" field="ModelAsset" value="id={C3078003-51DA-5D8E-B311-38C426480DD2}:10e37787,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_blinds.azmodel},loadBehavior=0" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="Asset" field="ModelAsset" value="id={C3078003-51DA-5D8E-B311-38C426480DD2}:10e37787,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_blinds.azmodel},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZ::s64" field="SortKey" value="0" type="{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}"/>
<Class name="unsigned char" field="LodOverride" value="255" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
<Class name="bool" field="ExcludeFromReflectionCubeMaps" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
@@ -228,7 +228,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{C3078003-51DA-5D8E-B311-38C426480DD2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -260,7 +260,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{C3078003-51DA-5D8E-B311-38C426480DD2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={6BFA7C7C-AF9F-5B12-8B30-6B6ECE9BAB9E}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/environment/cloth_blinds.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -276,7 +276,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{C3078003-51DA-5D8E-B311-38C426480DD2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
Gems/NvCloth/Assets/slices/Cloth/cloth_blinds_broken.slice
+4 -4
View File
@@ -200,7 +200,7 @@
</Class>
<Class name="AZ::Render::MeshComponentController" field="Controller" type="{D0F35FAC-4194-4C89-9487-D000DDB8B272}">
<Class name="AZ::Render::MeshComponentConfig" field="Configuration" version="1" type="{63737345-51B1-472B-9355-98F99993909B}">
<Class name="Asset" field="ModelAsset" value="id={A64AD477-5E35-5834-A9A3-580B9D708E0C}:101c095a,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_blinds_broken.azmodel},loadBehavior=0" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="Asset" field="ModelAsset" value="id={A64AD477-5E35-5834-A9A3-580B9D708E0C}:101c095a,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_blinds_broken.azmodel},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZ::s64" field="SortKey" value="0" type="{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}"/>
<Class name="unsigned char" field="LodOverride" value="255" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
<Class name="bool" field="ExcludeFromReflectionCubeMaps" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
@@ -228,7 +228,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{A64AD477-5E35-5834-A9A3-580B9D708E0C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -260,7 +260,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{A64AD477-5E35-5834-A9A3-580B9D708E0C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={EB6CB909-E4BB-54CB-8CAE-6A4B4F203B1B}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/environment/cloth_blinds_broken.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -276,7 +276,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{A64AD477-5E35-5834-A9A3-580B9D708E0C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
Gems/NvCloth/Assets/slices/Cloth/cloth_locked_corners_four.slice
+4 -4
View File
@@ -200,7 +200,7 @@
</Class>
<Class name="AZ::Render::MeshComponentController" field="Controller" type="{D0F35FAC-4194-4C89-9487-D000DDB8B272}">
<Class name="AZ::Render::MeshComponentConfig" field="Configuration" version="1" type="{63737345-51B1-472B-9355-98F99993909B}">
<Class name="Asset" field="ModelAsset" value="id={89C91D92-7B4E-5EB5-945D-0053111859EE}:10a5006e,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_locked_corners_four.azmodel},loadBehavior=0" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="Asset" field="ModelAsset" value="id={89C91D92-7B4E-5EB5-945D-0053111859EE}:10a5006e,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_locked_corners_four.azmodel},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZ::s64" field="SortKey" value="0" type="{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}"/>
<Class name="unsigned char" field="LodOverride" value="255" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
<Class name="bool" field="ExcludeFromReflectionCubeMaps" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
@@ -228,7 +228,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{89C91D92-7B4E-5EB5-945D-0053111859EE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -260,7 +260,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{89C91D92-7B4E-5EB5-945D-0053111859EE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={838EA487-0F74-5448-AABE-947B138CD6C2}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/environment/cloth_locked_corners_four.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -276,7 +276,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{89C91D92-7B4E-5EB5-945D-0053111859EE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
Gems/NvCloth/Assets/slices/Cloth/cloth_locked_corners_two.slice
+4 -4
View File
@@ -200,7 +200,7 @@
</Class>
<Class name="AZ::Render::MeshComponentController" field="Controller" type="{D0F35FAC-4194-4C89-9487-D000DDB8B272}">
<Class name="AZ::Render::MeshComponentConfig" field="Configuration" version="1" type="{63737345-51B1-472B-9355-98F99993909B}">
<Class name="Asset" field="ModelAsset" value="id={23C6817F-0B79-5CAD-B861-9E6F5E55927D}:10ba54b2,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_locked_corners_two.azmodel},loadBehavior=0" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="Asset" field="ModelAsset" value="id={23C6817F-0B79-5CAD-B861-9E6F5E55927D}:10ba54b2,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_locked_corners_two.azmodel},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZ::s64" field="SortKey" value="0" type="{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}"/>
<Class name="unsigned char" field="LodOverride" value="255" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
<Class name="bool" field="ExcludeFromReflectionCubeMaps" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
@@ -228,7 +228,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{23C6817F-0B79-5CAD-B861-9E6F5E55927D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -260,7 +260,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{23C6817F-0B79-5CAD-B861-9E6F5E55927D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={A56F28DD-6082-50B6-9B44-9EF3E03E95BB}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/environment/cloth_locked_corners_two.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -276,7 +276,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{23C6817F-0B79-5CAD-B861-9E6F5E55927D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
Gems/NvCloth/Assets/slices/Cloth/cloth_locked_edge.slice
+4 -4
View File
@@ -200,7 +200,7 @@
</Class>
<Class name="AZ::Render::MeshComponentController" field="Controller" type="{D0F35FAC-4194-4C89-9487-D000DDB8B272}">
<Class name="AZ::Render::MeshComponentConfig" field="Configuration" version="1" type="{63737345-51B1-472B-9355-98F99993909B}">
<Class name="Asset" field="ModelAsset" value="id={9DCAD62C-7A35-5D7D-8276-870D646CD5E2}:103ef5f6,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_locked_edge.azmodel},loadBehavior=0" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="Asset" field="ModelAsset" value="id={9DCAD62C-7A35-5D7D-8276-870D646CD5E2}:103ef5f6,type={2C7477B6-69C5-45BE-8163-BCD6A275B6D8},hint={objects/cloth/environment/cloth_locked_edge.azmodel},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
<Class name="AZ::s64" field="SortKey" value="0" type="{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}"/>
<Class name="unsigned char" field="LodOverride" value="255" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
<Class name="bool" field="ExcludeFromReflectionCubeMaps" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
@@ -228,7 +228,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="AZ::Render::MaterialAssignment" field="value2" version="1" type="{C66E5214-A24B-4722-B7F0-5991E6F8F163}">
@@ -260,7 +260,7 @@
<Class name="AZ::u64" field="lodIndex" value="18446744073709551615" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={FF25E0FE-B695-5084-AE1E-65F095AA5C3F}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={objects/cloth/environment/cloth_locked_edge.azmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
@@ -276,7 +276,7 @@
<Class name="AZ::u64" field="lodIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
<Class name="AssetId" field="materialAssetId" version="1" type="{652ED536-3402-439B-AEBE-4A5DBC554085}">
<Class name="AZ::Uuid" field="guid" value="{9DCAD62C-7A35-5D7D-8276-870D646CD5E2}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="subId" value="3644789410" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="unsigned int" field="subId" value="902256226" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
</Class>
</Class>
<Class name="Asset" field="materialAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={522C7BE0-501D-463E-92C6-15184A2B7AD8},hint={},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+10 -5
View File
@@ -482,14 +482,14 @@ namespace NvCloth
{
bool foundNode = AZStd::find(m_meshNodeList.cbegin(), m_meshNodeList.cend(), m_config.m_meshNode) != m_meshNodeList.cend();
if (!foundNode && !m_previousMeshNode.empty())
if (!foundNode && !m_lastKnownMeshNode.empty())
{
// Check the if the mesh node previously selected is still part of the mesh list
// to keep using it and avoid the user to select it again in the combo box.
foundNode = AZStd::find(m_meshNodeList.cbegin(), m_meshNodeList.cend(), m_previousMeshNode) != m_meshNodeList.cend();
foundNode = AZStd::find(m_meshNodeList.cbegin(), m_meshNodeList.cend(), m_lastKnownMeshNode) != m_meshNodeList.cend();
if (foundNode)
{
m_config.m_meshNode = m_previousMeshNode;
m_config.m_meshNode = m_lastKnownMeshNode;
}
}
@@ -502,7 +502,7 @@ namespace NvCloth
}
}
m_previousMeshNode = "";
m_lastKnownMeshNode = "";
if (m_simulateInEditor)
{
@@ -517,7 +517,12 @@ namespace NvCloth
void EditorClothComponent::OnModelPreDestroy()
{
m_previousMeshNode = m_config.m_meshNode;
if (m_config.m_meshNode != Internal::StatusMessageSelectNode &&
m_config.m_meshNode != Internal::StatusMessageNoAsset &&
m_config.m_meshNode != Internal::StatusMessageNoClothNodes)
{
m_lastKnownMeshNode = m_config.m_meshNode;
}
m_meshNodeList = { {Internal::StatusMessageNoAsset} };
m_config.m_meshNode = Internal::StatusMessageNoAsset;
Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
+1 -1
View File
@@ -70,7 +70,7 @@ namespace NvCloth
// This list is not serialized, it's compiled when the asset has been received via MeshComponentNotificationBus.
MeshNodeList m_meshNodeList;
AZStd::string m_previousMeshNode;
AZStd::string m_lastKnownMeshNode;
AZStd::unordered_set<AZStd::string> m_meshNodesWithBackstopData;