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

Gems/Atom

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 17:57:02 -07:00
parent 257557c692
commit c19c4af1e1
23 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
-1
View File
@@ -959,7 +959,6 @@ namespace AZ
size_t numInfluencesAdded = 0;
for (const auto& skinData : sourceMesh.m_skinData)
{
const size_t numJoints = skinData->GetBoneCount();
const AZ::u32 controlPointIndex = sourceMeshData->GetControlPointIndex(static_cast<int>(vertexIndex));
const size_t numSkinInfluences = skinData->GetLinkCount(controlPointIndex);
Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp
-2
View File
@@ -149,8 +149,6 @@ namespace AZ::RPI
const float tolerance = CalcPositionDeltaTolerance(sourceMesh);
AZ::Aabb deltaPositionAabb = AZ::Aabb::CreateNull();
const uint32_t numFaces = blendShapeData->GetFaceCount();
AZStd::vector<PackedCompressedMorphTargetDelta>& packedCompressedMorphTargetVertexData = productMesh.m_morphTargetVertexData;
MorphTargetMetaAsset::MorphTarget metaData;
Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp
-1
View File
@@ -616,7 +616,6 @@ namespace UnitTest
Data::Asset<RPI::BufferAsset> asset;
creator.End(asset);
bufferInfo.m_bufferDescriptor.m_byteCount;
Data::Instance<RPI::Buffer> bufferInst = RPI::Buffer::FindOrCreate(asset);
ASSERT_NE(bufferInst.get(), nullptr);
Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ namespace UnitTest
{
EXPECT_FALSE(m_disabled);
AZStd::for_each(m_expectedErrors.begin(), m_expectedErrors.end(), [this](ExpectedError& expectedError) { expectedError.m_gotCount = 0; });
AZStd::for_each(m_expectedErrors.begin(), m_expectedErrors.end(), [](ExpectedError& expectedError) { expectedError.m_gotCount = 0; });
m_checked = false;
}
Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp
-1
View File
@@ -490,7 +490,6 @@ namespace UnitTest
const uint16_t mipLevels = 1;
const uint16_t arraySize = 1;
const uint16_t pixelSize = 4;
Data::Asset<RPI::ImageMipChainAsset> mipChain;
Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp
+9 -9
View File
@@ -267,47 +267,47 @@ namespace UnitTest
creator.SetPropertyValue(Name{ "MyBool" }, m_testImageAsset);
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyInt" }, 0.0f);
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyUInt" }, -1);
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat" }, 10u);
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat2" }, 1.0f);
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat3" }, AZ::Vector4{});
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat4" }, AZ::Vector3{});
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyColor" }, MaterialPropertyValue(false));
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyImage" }, true);
});
expectCreatorError([this](MaterialAssetCreator& creator)
expectCreatorError([](MaterialAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyEnum" }, -1);
});
Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
+2 -2
View File
@@ -566,7 +566,7 @@ namespace UnitTest
// We use local functions to easily start a new MaterialAssetCreator for each test case because
// the AssetCreator would just skip subsequent operations after the first failure is detected.
auto expectError = [this](AZStd::function<void(MaterialSourceData& materialSourceData)> setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 2)
auto expectError = [](AZStd::function<void(MaterialSourceData& materialSourceData)> setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 2)
{
MaterialSourceData sourceData;
@@ -583,7 +583,7 @@ namespace UnitTest
EXPECT_FALSE(materialAssetOutcome.IsSuccess());
};
auto expectWarning = [this](AZStd::function<void(MaterialSourceData& materialSourceData)> setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 1)
auto expectWarning = [](AZStd::function<void(MaterialSourceData& materialSourceData)> setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 1)
{
MaterialSourceData sourceData;
Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp
+10 -10
View File
@@ -413,7 +413,7 @@ namespace UnitTest
EXPECT_EQ(1, creator.GetErrorCount());
};
auto expectCreatorWarning = [this](AZStd::function<void(MaterialTypeAssetCreator& creator)> passBadInput)
auto expectCreatorWarning = [](AZStd::function<void(MaterialTypeAssetCreator& creator)> passBadInput)
{
MaterialTypeAssetCreator creator;
creator.Begin(Uuid::CreateRandom());
@@ -442,47 +442,47 @@ namespace UnitTest
creator.SetPropertyValue(Name{ "MyBool" }, m_testImageAsset);
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyInt" }, 0.0f);
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyUInt" }, -1);
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat" }, 10u);
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat2" }, 1.0f);
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat3" }, AZ::Vector4{});
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyFloat4" }, AZ::Vector3{});
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyColor" }, MaterialPropertyValue(false));
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyImage" }, true);
});
expectCreatorError([this](MaterialTypeAssetCreator& creator)
expectCreatorError([](MaterialTypeAssetCreator& creator)
{
creator.SetPropertyValue(Name{ "MyEnum" }, -1);
});
Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
-1
View File
@@ -783,7 +783,6 @@ namespace UnitTest
const uint32_t vertexCount = 36;
const uint32_t vertexSize = sizeof(float) * 3;
const uint32_t vertexBufferSize = vertexCount * vertexSize;
RHI::BufferViewDescriptor validStreamBufferViewDescriptor =
RHI::BufferViewDescriptor::CreateStructured(0, vertexCount, vertexSize);