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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Code/Tests/Utils/ActorAssetHelperTest.cpp
+12 -12
View File
@@ -106,7 +106,7 @@ namespace UnitTest
auto actor = AZStd::make_unique<ActorHelper>("actor_test");
actor->FinishSetup();
m_actorComponent->OnAssetReady(CreateAssetFromActor(AZStd::move(actor)));
m_actorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
AZStd::unique_ptr<NvCloth::AssetHelper> assetHelper = NvCloth::AssetHelper::CreateAssetHelper(m_actorComponent->GetEntityId());
@@ -121,7 +121,7 @@ namespace UnitTest
auto actor = AZStd::make_unique<ActorHelper>("actor_test");
actor->FinishSetup();
m_actorComponent->OnAssetReady(CreateAssetFromActor(AZStd::move(actor)));
m_actorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
AZStd::unique_ptr<NvCloth::AssetHelper> assetHelper = NvCloth::AssetHelper::CreateAssetHelper(m_actorComponent->GetEntityId());
@@ -135,7 +135,7 @@ namespace UnitTest
auto actor = AZStd::make_unique<ActorHelper>("actor_test");
actor->FinishSetup();
m_actorComponent->OnAssetReady(CreateAssetFromActor(AZStd::move(actor)));
m_actorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
AZStd::unique_ptr<NvCloth::AssetHelper> assetHelper = NvCloth::AssetHelper::CreateAssetHelper(m_actorComponent->GetEntityId());
@@ -152,7 +152,7 @@ namespace UnitTest
auto actor = AZStd::make_unique<ActorHelper>("actor_test");
actor->FinishSetup();
m_actorComponent->OnAssetReady(CreateAssetFromActor(AZStd::move(actor)));
m_actorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
AZStd::unique_ptr<NvCloth::AssetHelper> assetHelper = NvCloth::AssetHelper::CreateAssetHelper(m_actorComponent->GetEntityId());
@@ -172,12 +172,12 @@ namespace UnitTest
auto meshNode1Index = actor->AddJoint(MeshNode1Name, AZ::Transform::CreateTranslation(AZ::Vector3(3.0f, -2.0f, 0.0f)), RootNodeName);
auto otherNodeIndex = actor->AddJoint(OtherNodeName, AZ::Transform::CreateTranslation(AZ::Vector3(0.5f, 0.0f, 0.0f)), RootNodeName);
auto meshNode2Index = actor->AddJoint(MeshNode2Name, AZ::Transform::CreateTranslation(AZ::Vector3(0.2f, 0.6f, 1.0f)), OtherNodeName);
actor->SetMesh(LodLevel, meshNode1Index, CreateEMotionFXMesh(meshNode1Index, MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->SetMesh(LodLevel, otherNodeIndex, CreateEMotionFXMesh(otherNodeIndex, MeshVertices, MeshIndices));
actor->SetMesh(LodLevel, meshNode2Index, CreateEMotionFXMesh(meshNode2Index, MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->SetMesh(LodLevel, meshNode1Index, CreateEMotionFXMesh(MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->SetMesh(LodLevel, otherNodeIndex, CreateEMotionFXMesh(MeshVertices, MeshIndices));
actor->SetMesh(LodLevel, meshNode2Index, CreateEMotionFXMesh(MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->FinishSetup();
m_actorComponent->OnAssetReady(CreateAssetFromActor(AZStd::move(actor)));
m_actorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
AZStd::unique_ptr<NvCloth::AssetHelper> assetHelper = NvCloth::AssetHelper::CreateAssetHelper(m_actorComponent->GetEntityId());
@@ -198,12 +198,12 @@ namespace UnitTest
auto meshNode1Index = actor->AddJoint(MeshNode1Name, AZ::Transform::CreateTranslation(AZ::Vector3(3.0f, -2.0f, 0.0f)), RootNodeName);
auto otherNodeIndex = actor->AddJoint(OtherNodeName, AZ::Transform::CreateTranslation(AZ::Vector3(0.5f, 0.0f, 0.0f)), RootNodeName);
auto meshNode2Index = actor->AddJoint(MeshNode2Name, AZ::Transform::CreateTranslation(AZ::Vector3(0.2f, 0.6f, 1.0f)), OtherNodeName);
actor->SetMesh(LodLevel, meshNode1Index, CreateEMotionFXMesh(meshNode1Index, MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->SetMesh(LodLevel, otherNodeIndex, CreateEMotionFXMesh(otherNodeIndex, MeshVertices, MeshIndices));
actor->SetMesh(LodLevel, meshNode2Index, CreateEMotionFXMesh(meshNode2Index, MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->SetMesh(LodLevel, meshNode1Index, CreateEMotionFXMesh(MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->SetMesh(LodLevel, otherNodeIndex, CreateEMotionFXMesh(MeshVertices, MeshIndices));
actor->SetMesh(LodLevel, meshNode2Index, CreateEMotionFXMesh(MeshVertices, MeshIndices, MeshSkinningInfo, MeshUVs, MeshClothData));
actor->FinishSetup();
m_actorComponent->OnAssetReady(CreateAssetFromActor(AZStd::move(actor)));
m_actorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
AZStd::unique_ptr<NvCloth::AssetHelper> assetHelper = NvCloth::AssetHelper::CreateAssetHelper(m_actorComponent->GetEntityId());