From 641e76eca9f2c0b7f4d5bf1f83d6b8b884d9ecc5 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Fri, 14 Jan 2022 10:09:14 -0800 Subject: [PATCH 01/58] Convert the loops using the Get* functions in Terrain physics and debugger components to use the new ProcessRegion* functions. Signed-off-by: amzn-sj --- .../TerrainPhysicsColliderComponent.cpp | 80 ++++++++----------- .../TerrainWorldDebuggerComponent.cpp | 37 +++------ 2 files changed, 45 insertions(+), 72 deletions(-) diff --git a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp index c51728a5c3..4a8b4680b3 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp +++ b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp @@ -284,21 +284,14 @@ namespace Terrain heights.clear(); heights.reserve(gridWidth * gridHeight); - for (int32_t row = 0; row < gridHeight; row++) + auto perPositionHeightCallback = [&heights, worldCenterZ] + ([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { - const float y = row * gridResolution.GetY() + worldSize.GetMin().GetY(); - for (int32_t col = 0; col < gridWidth; col++) - { - const float x = col * gridResolution.GetX() + worldSize.GetMin().GetX(); - float height = 0.0f; + heights.emplace_back(surfacePoint.m_position.GetZ() - worldCenterZ); + }; - AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult( - height, &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats, x, y, - AzFramework::Terrain::TerrainDataRequests::Sampler::DEFAULT, nullptr); - - heights.emplace_back(height - worldCenterZ); - } - } + AzFramework::Terrain::TerrainDataRequestBus::Broadcast(&AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegion, + worldSize, gridResolution, perPositionHeightCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::DEFAULT); } uint8_t TerrainPhysicsColliderComponent::GetMaterialIdIndex(const Physics::MaterialId& materialId, const AZStd::vector& materialList) const @@ -350,42 +343,37 @@ namespace Terrain AZStd::vector materialList = GetMaterialList(); - for (int32_t row = 0; row < gridHeight; row++) + auto perPositionCallback = [&heightMaterials, &materialList, this, worldCenterZ, worldHeightBoundsMin, worldHeightBoundsMax] + (size_t xIndex, size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, bool terrainExists) { - const float y = row * gridResolution.GetY() + worldSize.GetMin().GetY(); - for (int32_t col = 0; col < gridWidth; col++) + float height = surfacePoint.m_position.GetZ(); + + // Any heights that fall outside the range of our bounding box will get turned into holes. + if ((height < worldHeightBoundsMin) || (height > worldHeightBoundsMax)) { - const float x = col * gridResolution.GetX() + worldSize.GetMin().GetX(); - float height = 0.0f; - - bool terrainExists = true; - AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult( - height, &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats, x, y, - AzFramework::Terrain::TerrainDataRequests::Sampler::DEFAULT, &terrainExists); - - // Any heights that fall outside the range of our bounding box will get turned into holes. - if ((height < worldHeightBoundsMin) || (height > worldHeightBoundsMax)) - { - height = worldHeightBoundsMin; - terrainExists = false; - } - - // Find the best surface tag at this point. - AzFramework::SurfaceData::SurfaceTagWeight surfaceWeight; - AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult( - surfaceWeight, &AzFramework::Terrain::TerrainDataRequests::GetMaxSurfaceWeightFromFloats, x, y, - AzFramework::Terrain::TerrainDataRequests::Sampler::DEFAULT, nullptr); - - Physics::HeightMaterialPoint point; - point.m_height = height - worldCenterZ; - point.m_quadMeshType = terrainExists ? Physics::QuadMeshType::SubdivideUpperLeftToBottomRight : Physics::QuadMeshType::Hole; - - Physics::MaterialId materialId = FindMaterialIdForSurfaceTag(surfaceWeight.m_surfaceType); - point.m_materialIndex = GetMaterialIdIndex(materialId, materialList); - - heightMaterials.emplace_back(point); + height = worldHeightBoundsMin; + terrainExists = false; } - } + + // Find the best surface tag at this point. + // We want the MaxSurfaceWeight. The ProcessSurfacePoints callback has surface weights sorted. + // So, we pick the value at the front of the list. + AzFramework::SurfaceData::SurfaceTagWeight surfaceWeight; + if (!surfacePoint.m_surfaceTags.empty()) + { + surfaceWeight = *surfacePoint.m_surfaceTags.begin(); + } + + Physics::HeightMaterialPoint point; + point.m_height = height - worldCenterZ; + point.m_quadMeshType = terrainExists ? Physics::QuadMeshType::SubdivideUpperLeftToBottomRight : Physics::QuadMeshType::Hole; + Physics::MaterialId materialId = FindMaterialIdForSurfaceTag(surfaceWeight.m_surfaceType); + point.m_materialIndex = GetMaterialIdIndex(materialId, materialList); + heightMaterials.emplace_back(point); + }; + + AzFramework::Terrain::TerrainDataRequestBus::Broadcast(&AzFramework::Terrain::TerrainDataRequests::ProcessSurfacePointsFromRegion, + worldSize, gridResolution, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::DEFAULT); } AZ::Vector2 TerrainPhysicsColliderComponent::GetHeightfieldGridSpacing() const diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp index f3e0d59537..46be621307 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp +++ b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp @@ -354,44 +354,29 @@ namespace Terrain // For each terrain height value in the region, create the _| grid lines for that point and cache off the height value // for use with subsequent grid line calculations. auto ProcessHeightValue = [gridResolution, &previousHeight, &rowHeights, §or] - (uint32_t xIndex, uint32_t yIndex, const AZ::Vector3& position, [[maybe_unused]] bool terrainExists) + (uint32_t xIndex, uint32_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { // Don't add any vertices for the first column or first row. These grid lines will be handled by an adjacent sector, if // there is one. if ((xIndex > 0) && (yIndex > 0)) { - float x = position.GetX() - gridResolution.GetX(); - float y = position.GetY() - gridResolution.GetY(); + float x = surfacePoint.m_position.GetX() - gridResolution.GetX(); + float y = surfacePoint.m_position.GetY() - gridResolution.GetY(); - sector.m_lineVertices.emplace_back(AZ::Vector3(x, position.GetY(), previousHeight)); - sector.m_lineVertices.emplace_back(position); + sector.m_lineVertices.emplace_back(AZ::Vector3(x, surfacePoint.m_position.GetY(), previousHeight)); + sector.m_lineVertices.emplace_back(surfacePoint.m_position); - sector.m_lineVertices.emplace_back(AZ::Vector3(position.GetX(), y, rowHeights[xIndex])); - sector.m_lineVertices.emplace_back(position); + sector.m_lineVertices.emplace_back(AZ::Vector3(surfacePoint.m_position.GetX(), y, rowHeights[xIndex])); + sector.m_lineVertices.emplace_back(surfacePoint.m_position); } // Save off the heights so that we can use them to draw subsequent columns and rows. - previousHeight = position.GetZ(); - rowHeights[xIndex] = position.GetZ(); + previousHeight = surfacePoint.m_position.GetZ(); + rowHeights[xIndex] = surfacePoint.m_position.GetZ(); }; - // This set of nested loops will get replaced with a call to ProcessHeightsFromRegion once the API exists. - for (size_t yIndex = 0; yIndex < numSamplesY; yIndex++) - { - float y = region.GetMin().GetY() + (gridResolution.GetY() * yIndex); - for (size_t xIndex = 0; xIndex < numSamplesX; xIndex++) - { - float x = region.GetMin().GetX() + (gridResolution.GetX() * xIndex); - - float height = worldMinZ; - bool terrainExists = false; - AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult( - height, &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats, x, y, - AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists); - ProcessHeightValue( - aznumeric_cast(xIndex), aznumeric_cast(yIndex), AZ::Vector3(x, y, height), terrainExists); - } - } + AzFramework::Terrain::TerrainDataRequestBus::Broadcast(&AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegion, + region, gridResolution, ProcessHeightValue, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); } void TerrainWorldDebuggerComponent::OnTerrainDataChanged(const AZ::Aabb& dirtyRegion, TerrainDataChangedMask dataChangedMask) From 6ac1211ae92889e0d8c8c72a2bdc18df1c2bfd24 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Fri, 14 Jan 2022 16:40:08 -0800 Subject: [PATCH 02/58] Add unit tests for ProcessSurfaceWeightsFromRegion and ProcessSurfacePointsFromRegion. Signed-off-by: amzn-sj --- Gems/Terrain/Code/Tests/TerrainSystemTest.cpp | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp index a5798a3dad..2eebc1b824 100644 --- a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp +++ b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp @@ -902,4 +902,168 @@ namespace UnitTest terrainSystem->ProcessNormalsFromRegion(testRegionBox, stepSize, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR); } + + TEST_F(TerrainSystemTest, TerrainProcessSurfaceWeightsFromRegion) + { + const AZ::Aabb spawnerBox = AZ::Aabb::CreateFromMinMaxValues(-10.0f, -10.0f, -5.0f, 10.0f, 10.0f, 15.0f); + auto entity = CreateAndActivateMockTerrainLayerSpawner( + spawnerBox, + [](AZ::Vector3& position, bool& terrainExists) + { + position.SetZ(1.0f); + terrainExists = true; + }); + + // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 1 meter intervals. + const AZ::Vector2 queryResolution(1.0f); + auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution); + + const AZ::Aabb testRegionBox = AZ::Aabb::CreateFromMinMaxValues(-3.0f, -3.0f, -1.0f, 3.0f, 3.0f, 1.0f); + const AZ::Vector2 stepSize(1.0f); + + const SurfaceData::SurfaceTag tag1 = SurfaceData::SurfaceTag("tag1"); + const SurfaceData::SurfaceTag tag2 = SurfaceData::SurfaceTag("tag2"); + const SurfaceData::SurfaceTag tag3 = SurfaceData::SurfaceTag("tag3"); + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight1; + tagWeight1.m_surfaceType = tag1; + tagWeight1.m_weight = 1.0f; + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight2; + tagWeight2.m_surfaceType = tag2; + tagWeight2.m_weight = 0.7f; + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight3; + tagWeight3.m_surfaceType = tag3; + tagWeight3.m_weight = 0.3f; + + NiceMock mockSurfaceRequests(entity->GetId()); + ON_CALL(mockSurfaceRequests, GetSurfaceWeights).WillByDefault( + [&tagWeight1, &tagWeight2, &tagWeight3](const AZ::Vector3& position, AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights) + { + surfaceWeights.clear(); + float absYPos = fabsf(position.GetY()); + if (absYPos < 1.0f) + { + surfaceWeights.push_back(tagWeight1); + } + else if(absYPos < 2.0f) + { + surfaceWeights.push_back(tagWeight2); + } + else + { + surfaceWeights.push_back(tagWeight3); + } + } + ); + + auto perPositionCallback = [&tagWeight1, &tagWeight2, &tagWeight3](size_t xIndex, size_t yIndex, + const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) + { + constexpr float epsilon = 0.0001f; + float absYPos = fabsf(surfacePoint.m_position.GetY()); + if (absYPos < 1.0f) + { + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight1.m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight1.m_weight, epsilon); + } + else if(absYPos < 2.0f) + { + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight2.m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight2.m_weight, epsilon); + } + else + { + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight3.m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight3.m_weight, epsilon); + } + }; + + terrainSystem->ProcessSurfaceWeightsFromRegion(testRegionBox, stepSize, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR); + } + + TEST_F(TerrainSystemTest, TerrainProcessSurfacePointsFromRegion) + { + const AZ::Aabb spawnerBox = AZ::Aabb::CreateFromMinMaxValues(-10.0f, -10.0f, -5.0f, 10.0f, 10.0f, 15.0f); + auto entity = CreateAndActivateMockTerrainLayerSpawner( + spawnerBox, + [](AZ::Vector3& position, bool& terrainExists) + { + position.SetZ(position.GetX() + position.GetY()); + terrainExists = true; + }); + + // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 1 meter intervals. + const AZ::Vector2 queryResolution(1.0f); + auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution); + + const AZ::Aabb testRegionBox = AZ::Aabb::CreateFromMinMaxValues(-3.0f, -3.0f, -1.0f, 3.0f, 3.0f, 1.0f); + const AZ::Vector2 stepSize(1.0f); + + const SurfaceData::SurfaceTag tag1 = SurfaceData::SurfaceTag("tag1"); + const SurfaceData::SurfaceTag tag2 = SurfaceData::SurfaceTag("tag2"); + const SurfaceData::SurfaceTag tag3 = SurfaceData::SurfaceTag("tag3"); + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight1; + tagWeight1.m_surfaceType = tag1; + tagWeight1.m_weight = 1.0f; + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight2; + tagWeight2.m_surfaceType = tag2; + tagWeight2.m_weight = 0.7f; + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight3; + tagWeight3.m_surfaceType = tag3; + tagWeight3.m_weight = 0.3f; + + NiceMock mockSurfaceRequests(entity->GetId()); + ON_CALL(mockSurfaceRequests, GetSurfaceWeights).WillByDefault( + [&tagWeight1, &tagWeight2, &tagWeight3](const AZ::Vector3& position, AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights) + { + surfaceWeights.clear(); + float absYPos = fabsf(position.GetY()); + if (absYPos < 1.0f) + { + surfaceWeights.push_back(tagWeight1); + } + else if(absYPos < 2.0f) + { + surfaceWeights.push_back(tagWeight2); + } + else + { + surfaceWeights.push_back(tagWeight3); + } + } + ); + + auto perPositionCallback = [&tagWeight1, &tagWeight2, &tagWeight3](size_t xIndex, size_t yIndex, + const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) + { + constexpr float epsilon = 0.0001f; + float expectedHeight = surfacePoint.m_position.GetX() + surfacePoint.m_position.GetY(); + + EXPECT_NEAR(surfacePoint.m_position.GetZ(), expectedHeight, epsilon); + + float absYPos = fabsf(surfacePoint.m_position.GetY()); + if (absYPos < 1.0f) + { + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight1.m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight1.m_weight, epsilon); + } + else if(absYPos < 2.0f) + { + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight2.m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight2.m_weight, epsilon); + } + else + { + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight3.m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight3.m_weight, epsilon); + } + }; + + terrainSystem->ProcessSurfacePointsFromRegion(testRegionBox, stepSize, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); + } } // namespace UnitTest From 8fa04400308138ae9af64c396380a3ee2718d60b Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Fri, 14 Jan 2022 16:59:26 -0800 Subject: [PATCH 03/58] Update TerrainPhysicsColliderTests to add mocks for the ProcessRegion functions since the TerrainPhysicsColliderComponent now uses the ProcessRegion functions Signed-off-by: amzn-sj --- .../Tests/TerrainPhysicsColliderTests.cpp | 96 ++++++++++++++++--- 1 file changed, 84 insertions(+), 12 deletions(-) diff --git a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp index 340acfbaac..859e618983 100644 --- a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp +++ b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp @@ -238,6 +238,33 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderGetHeightsRetu AZ::Vector2 mockHeightResolution = AZ::Vector2(1.0f); NiceMock terrainListener; ON_CALL(terrainListener, GetTerrainHeightQueryResolution).WillByDefault(Return(mockHeightResolution)); + ON_CALL(terrainListener, ProcessHeightsFromRegion).WillByDefault( + [](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, + AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) + { + if (!perPositionCallback) + { + return; + } + + const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); + const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); + + AzFramework::SurfaceData::SurfacePoint surfacePoint; + for (size_t y = 0; y < numSamplesY; y++) + { + float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); + for (size_t x = 0; x < numSamplesX; x++) + { + bool terrainExists = false; + float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); + surfacePoint.m_position.Set(fx, fy, 0.0f); + perPositionCallback(x, y, surfacePoint, terrainExists); + } + } + } + ); int32_t cols, rows; Physics::HeightfieldProviderRequestsBus::Event( @@ -271,8 +298,34 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderReturnsRelativ AZ::Vector2 mockHeightResolution = AZ::Vector2(1.0f); NiceMock terrainListener; - ON_CALL(terrainListener, GetHeightFromFloats).WillByDefault(Return(mockHeight)); ON_CALL(terrainListener, GetTerrainHeightQueryResolution).WillByDefault(Return(mockHeightResolution)); + ON_CALL(terrainListener, ProcessHeightsFromRegion).WillByDefault( + [mockHeight](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, + AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) + { + if (!perPositionCallback) + { + return; + } + + const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); + const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); + + AzFramework::SurfaceData::SurfacePoint surfacePoint; + for (size_t y = 0; y < numSamplesY; y++) + { + float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); + for (size_t x = 0; x < numSamplesX; x++) + { + bool terrainExists = false; + float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); + surfacePoint.m_position.Set(fx, fy, mockHeight); + perPositionCallback(x, y, surfacePoint, terrainExists); + } + } + } + ); // Just return the bounds as setup. This is equivalent to the box being at the origin. NiceMock boxShape(m_entity->GetId()); @@ -416,20 +469,39 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderGetHeightsAndM NiceMock terrainListener; ON_CALL(terrainListener, GetTerrainHeightQueryResolution).WillByDefault(Return(mockHeightResolution)); - ON_CALL(terrainListener, GetHeightFromFloats).WillByDefault(Return(mockHeight)); - ON_CALL(terrainListener, GetMaxSurfaceWeightFromFloats) - .WillByDefault( - [return1, return2]( - [[maybe_unused]] float x, [[maybe_unused]] float y, - [[maybe_unused]] AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter, [[maybe_unused]] bool* terrainExistsPtr) + ON_CALL(terrainListener, ProcessSurfacePointsFromRegion).WillByDefault( + [mockHeight, return1, return2](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, + AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) + { + if (!perPositionCallback) { - // return tag1 for the first half of the rows, tag2 for the rest. - if (y < 128.0) + return; + } + + const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); + const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); + + AzFramework::SurfaceData::SurfacePoint surfacePoint; + for (size_t y = 0; y < numSamplesY; y++) + { + float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); + for (size_t x = 0; x < numSamplesX; x++) { - return return1; + surfacePoint.m_surfaceTags.clear(); + bool terrainExists = false; + float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); + surfacePoint.m_position.Set(fx, fy, mockHeight); + if (fy < 128.0) + { + surfacePoint.m_surfaceTags.push_back(return1); + } + surfacePoint.m_surfaceTags.push_back(return2); + perPositionCallback(x, y, surfacePoint, terrainExists); } - return return2; - }); + } + } + ); AZStd::vector heightsAndMaterials; From 646443cfe56c2dde2d466aa8bc38743fa09c506b Mon Sep 17 00:00:00 2001 From: Roddie Kieley Date: Sat, 15 Jan 2022 14:15:27 -0330 Subject: [PATCH 04/58] issue5299: Resolved via change to not disable custom window decorations. Signed-off-by: Roddie Kieley --- .../Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp b/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp index 04f579cc66..5c2ac13d0e 100644 --- a/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp +++ b/Code/Tools/AssetBundler/Platform/Linux/source/utils/GUIApplicationManager_Linux.cpp @@ -12,6 +12,6 @@ namespace Platform { AzQtComponents::WindowDecorationWrapper::Option GetWindowDecorationWrapperOption() { - return AzQtComponents::WindowDecorationWrapper::OptionDisabled; + return AzQtComponents::WindowDecorationWrapper::OptionNone; } } \ No newline at end of file From f05ca0897e0a180123ebb172a5d7bf23ad8eeda1 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Sat, 15 Jan 2022 14:26:58 -0800 Subject: [PATCH 05/58] Fix some warnings and remove an unused function parameter Signed-off-by: amzn-sj --- .../Source/Components/TerrainPhysicsColliderComponent.cpp | 2 +- .../Source/Components/TerrainWorldDebuggerComponent.cpp | 6 +++--- .../Code/Source/Components/TerrainWorldDebuggerComponent.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp index 4a8b4680b3..c74a478dad 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp +++ b/Gems/Terrain/Code/Source/Components/TerrainPhysicsColliderComponent.cpp @@ -344,7 +344,7 @@ namespace Terrain AZStd::vector materialList = GetMaterialList(); auto perPositionCallback = [&heightMaterials, &materialList, this, worldCenterZ, worldHeightBoundsMin, worldHeightBoundsMax] - (size_t xIndex, size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, bool terrainExists) + ([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, bool terrainExists) { float height = surfacePoint.m_position.GetZ(); diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp index 46be621307..f684727d33 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp +++ b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.cpp @@ -297,7 +297,7 @@ namespace Terrain { if (sector.m_isDirty) { - RebuildSectorWireframe(sector, heightDataResolution, worldMinZ); + RebuildSectorWireframe(sector, heightDataResolution); } if (!sector.m_lineVertices.empty()) @@ -317,7 +317,7 @@ namespace Terrain } - void TerrainWorldDebuggerComponent::RebuildSectorWireframe(WireframeSector& sector, const AZ::Vector2& gridResolution, float worldMinZ) + void TerrainWorldDebuggerComponent::RebuildSectorWireframe(WireframeSector& sector, const AZ::Vector2& gridResolution) { if (!sector.m_isDirty) { @@ -354,7 +354,7 @@ namespace Terrain // For each terrain height value in the region, create the _| grid lines for that point and cache off the height value // for use with subsequent grid line calculations. auto ProcessHeightValue = [gridResolution, &previousHeight, &rowHeights, §or] - (uint32_t xIndex, uint32_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) + (size_t xIndex, size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { // Don't add any vertices for the first column or first row. These grid lines will be handled by an adjacent sector, if // there is one. diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h index f3bcead8c3..cb308effe6 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h +++ b/Gems/Terrain/Code/Source/Components/TerrainWorldDebuggerComponent.h @@ -93,7 +93,7 @@ namespace Terrain bool m_isDirty{ true }; }; - void RebuildSectorWireframe(WireframeSector& sector, const AZ::Vector2& gridResolution, float worldMinZ); + void RebuildSectorWireframe(WireframeSector& sector, const AZ::Vector2& gridResolution); void MarkDirtySectors(const AZ::Aabb& dirtyRegion); void DrawWorldBounds(AzFramework::DebugDisplayRequests& debugDisplay); void DrawWireframe(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay); From 392d08e2f0272c3bbe62207124e6664fb4c77a4e Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Mon, 17 Jan 2022 17:09:30 -0800 Subject: [PATCH 06/58] Update Terrain renderer code to use the ProcessRegion API functions instead of the Get* functions Signed-off-by: amzn-sj --- .../TerrainDetailMaterialManager.cpp | 76 ++++++++++--------- .../TerrainFeatureProcessor.cpp | 33 ++++---- 2 files changed, 58 insertions(+), 51 deletions(-) diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp index 2bc9e42bff..1f43b476a1 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp +++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainDetailMaterialManager.cpp @@ -751,50 +751,56 @@ namespace Terrain pixels.resize((quadrantWorldArea.m_max.m_x - quadrantWorldArea.m_min.m_x) * (quadrantWorldArea.m_max.m_y - quadrantWorldArea.m_min.m_y)); uint32_t index = 0; - for (int yPos = quadrantWorldArea.m_min.m_y; yPos < quadrantWorldArea.m_max.m_y; ++yPos) + auto perPositionCallback = [this, &pixels, &index]( + [[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, + const AzFramework::SurfaceData::SurfacePoint& surfacePoint, + [[maybe_unused]] bool terrainExists) { - for (int xPos = quadrantWorldArea.m_min.m_x; xPos < quadrantWorldArea.m_max.m_x; ++xPos) + // Store the top two surface weights in the texture with m_blend storing the relative weight. + bool isFirstMaterial = true; + float firstWeight = 0.0f; + AZ::Vector2 position(surfacePoint.m_position.GetX(), surfacePoint.m_position.GetY()); + for (const auto& surfaceTagWeight : surfacePoint.m_surfaceTags) { - AZ::Vector2 position = AZ::Vector2(xPos * DetailTextureScale, yPos * DetailTextureScale); - AzFramework::SurfaceData::SurfaceTagWeightList surfaceWeights; - AzFramework::Terrain::TerrainDataRequestBus::Broadcast(&AzFramework::Terrain::TerrainDataRequests::GetSurfaceWeightsFromVector2, position, surfaceWeights, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, nullptr); - - // Store the top two surface weights in the texture with m_blend storing the relative weight. - bool isFirstMaterial = true; - float firstWeight = 0.0f; - for (const auto& surfaceTagWeight : surfaceWeights) + if (surfaceTagWeight.m_weight > 0.0f) { - if (surfaceTagWeight.m_weight > 0.0f) + AZ::Crc32 surfaceType = surfaceTagWeight.m_surfaceType; + uint16_t materialId = GetDetailMaterialForSurfaceTypeAndPosition(surfaceType, position); + if (materialId != m_detailMaterials.NoFreeSlot && materialId < 255) { - AZ::Crc32 surfaceType = surfaceTagWeight.m_surfaceType; - uint16_t materialId = GetDetailMaterialForSurfaceTypeAndPosition(surfaceType, position); - if (materialId != m_detailMaterials.NoFreeSlot && materialId < 255) + if (isFirstMaterial) { - if (isFirstMaterial) - { - pixels.at(index).m_material1 = aznumeric_cast(materialId); - firstWeight = surfaceTagWeight.m_weight; - // m_blend only needs to be calculated is material 2 is found, otherwise the initial value of 0 is correct. - isFirstMaterial = false; - } - else - { - pixels.at(index).m_material2 = aznumeric_cast(materialId); - float totalWeight = firstWeight + surfaceTagWeight.m_weight; - float blendWeight = 1.0f - (firstWeight / totalWeight); - pixels.at(index).m_blend = aznumeric_cast(AZStd::round(blendWeight * 255.0f)); - break; - } + pixels.at(index).m_material1 = aznumeric_cast(materialId); + firstWeight = surfaceTagWeight.m_weight; + // m_blend only needs to be calculated is material 2 is found, otherwise the initial value of 0 is correct. + isFirstMaterial = false; + } + else + { + pixels.at(index).m_material2 = aznumeric_cast(materialId); + float totalWeight = firstWeight + surfaceTagWeight.m_weight; + float blendWeight = 1.0f - (firstWeight / totalWeight); + pixels.at(index).m_blend = aznumeric_cast(AZStd::round(blendWeight * 255.0f)); + break; } } - else - { - break; // since the list is ordered, no other materials are in the list with positive weights. - } } - ++index; + else + { + break; // since the list is ordered, no other materials are in the list with positive weights. + } } - } + ++index; + }; + + AZ::Vector3 worldMin(quadrantWorldArea.m_min.m_x * DetailTextureScale, quadrantWorldArea.m_min.m_y * DetailTextureScale, 0.0f); + AZ::Vector3 worldMax(quadrantWorldArea.m_max.m_x * DetailTextureScale, quadrantWorldArea.m_max.m_y * DetailTextureScale, 0.0f); + AZ::Vector2 stepSize(DetailTextureScale); + AZ::Aabb region; + region.Set(worldMin, worldMax); + + AzFramework::Terrain::TerrainDataRequestBus::Broadcast(&AzFramework::Terrain::TerrainDataRequests::ProcessSurfaceWeightsFromRegion, + region, stepSize, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); const int32_t left = quadrantTextureArea.m_min.m_x; const int32_t top = quadrantTextureArea.m_min.m_y; diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp index 351c34308a..ebc8a16fcb 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp +++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp @@ -226,25 +226,26 @@ namespace Terrain auto& surfaceDataContext = SurfaceData::SurfaceDataSystemRequestBus::GetOrCreateContext(false); typename SurfaceData::SurfaceDataSystemRequestBus::Context::DispatchLockGuard scopeLock(surfaceDataContext.m_contextMutex); - for (int32_t y = yStart; y < yEnd; y++) + auto perPositionCallback = [this, &pixels] + ([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, + const AzFramework::SurfaceData::SurfacePoint& surfacePoint, + [[maybe_unused]] bool terrainExists) { - for (int32_t x = xStart; x < xEnd; x++) - { - bool terrainExists = true; - float terrainHeight = 0.0f; - float xPos = x * m_sampleSpacing; - float yPos = y * m_sampleSpacing; - AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult( - terrainHeight, &AzFramework::Terrain::TerrainDataRequests::GetHeightFromFloats, - xPos, yPos, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists); + const float clampedHeight = AZ::GetClamp((surfacePoint.m_position.GetZ() - m_terrainBounds.GetMin().GetZ()) / m_terrainBounds.GetExtents().GetZ(), 0.0f, 1.0f); + const float expandedHeight = AZStd::roundf(clampedHeight * AZStd::numeric_limits::max()); + const uint16_t uint16Height = aznumeric_cast(expandedHeight); - const float clampedHeight = AZ::GetClamp((terrainHeight - m_terrainBounds.GetMin().GetZ()) / m_terrainBounds.GetExtents().GetZ(), 0.0f, 1.0f); - const float expandedHeight = AZStd::roundf(clampedHeight * AZStd::numeric_limits::max()); - const uint16_t uint16Height = aznumeric_cast(expandedHeight); + pixels.push_back(uint16Height); + }; - pixels.push_back(uint16Height); - } - } + AZ::Vector2 stepSize(m_sampleSpacing); + AZ::Vector3 maxBound( + m_dirtyRegion.GetMax().GetX() + m_sampleSpacing, m_dirtyRegion.GetMax().GetY() + m_sampleSpacing, 0.0f); + AZ::Aabb region; + region.Set(m_dirtyRegion.GetMin(), maxBound); + AzFramework::Terrain::TerrainDataRequestBus::Broadcast( + &AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegion, + region, stepSize, perPositionCallback,AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); } if (m_heightmapImage) From c262696056811660aa3e55cb6a83136232fb12fb Mon Sep 17 00:00:00 2001 From: abrmich Date: Tue, 18 Jan 2022 16:13:28 -0800 Subject: [PATCH 07/58] Move remaining two LyShine headers to the gem Signed-off-by: abrmich --- Code/Legacy/CryCommon/crycommon_files.cmake | 2 -- Code/Legacy/CrySystem/System.cpp | 3 --- Code/Legacy/CrySystem/XConsole.cpp | 5 ----- .../FontBuilderWorker/FontBuilderWorker.cpp | 4 ++-- .../Code/Tests/Builders/CopyDependencyBuilderTest.cpp | 2 -- .../LyShine/Code/Include}/LyShine/Bus/UiCursorBus.h | 0 .../LyShine/Code/Include}/LyShine/UiAssetTypes.h | 0 Gems/LyShine/Code/lyshine_static_files.cmake | 2 ++ 8 files changed, 4 insertions(+), 14 deletions(-) rename {Code/Legacy/CryCommon => Gems/LyShine/Code/Include}/LyShine/Bus/UiCursorBus.h (100%) rename {Code/Legacy/CryCommon => Gems/LyShine/Code/Include}/LyShine/UiAssetTypes.h (100%) diff --git a/Code/Legacy/CryCommon/crycommon_files.cmake b/Code/Legacy/CryCommon/crycommon_files.cmake index a4d87c207a..479f0ec879 100644 --- a/Code/Legacy/CryCommon/crycommon_files.cmake +++ b/Code/Legacy/CryCommon/crycommon_files.cmake @@ -100,8 +100,6 @@ set(FILES platform_impl.cpp Win32specific.h Win64specific.h - LyShine/UiAssetTypes.h - LyShine/Bus/UiCursorBus.h Maestro/Bus/EditorSequenceAgentComponentBus.h Maestro/Bus/EditorSequenceBus.h Maestro/Bus/EditorSequenceComponentBus.h diff --git a/Code/Legacy/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp index 7cf066f72e..0439b69efc 100644 --- a/Code/Legacy/CrySystem/System.cpp +++ b/Code/Legacy/CrySystem/System.cpp @@ -134,7 +134,6 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #include -#include #include #include @@ -1374,7 +1373,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam // Fall through intended case WM_ENTERMENULOOP: { - UiCursorBus::Broadcast(&UiCursorInterface::IncrementVisibleCounter); return true; } case WM_CAPTURECHANGED: @@ -1392,7 +1390,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam // Fall through intended case WM_EXITMENULOOP: { - UiCursorBus::Broadcast(&UiCursorInterface::DecrementVisibleCounter); return (uMsg != WM_CAPTURECHANGED); } case WM_SYSKEYUP: diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp index df82e34abe..e74b1e7c56 100644 --- a/Code/Legacy/CrySystem/XConsole.cpp +++ b/Code/Legacy/CrySystem/XConsole.cpp @@ -29,7 +29,6 @@ #include #include -#include //#define DEFENCE_CVAR_HASH_LOGGING // s should point to a buffer at least 65 chars long @@ -749,8 +748,6 @@ void CXConsole::ShowConsole(bool show, const int iRequestScrollMax) if (show && !m_bConsoleActive) { - UiCursorBus::Broadcast(&UiCursorBus::Events::IncrementVisibleCounter); - AzFramework::InputSystemCursorRequestBus::EventResult(m_previousSystemCursorState, AzFramework::InputDeviceMouse::Id, &AzFramework::InputSystemCursorRequests::GetSystemCursorState); @@ -760,8 +757,6 @@ void CXConsole::ShowConsole(bool show, const int iRequestScrollMax) } else if (!show && m_bConsoleActive) { - UiCursorBus::Broadcast(&UiCursorBus::Events::DecrementVisibleCounter); - AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id, &AzFramework::InputSystemCursorRequests::SetSystemCursorState, m_previousSystemCursorState); diff --git a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp index 3fe399d05d..ccaa1700f9 100644 --- a/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp +++ b/Gems/LmbrCentral/Code/Source/Builders/CopyDependencyBuilder/FontBuilderWorker/FontBuilderWorker.cpp @@ -9,7 +9,6 @@ #include "FontBuilderWorker.h" #include -#include #include #include @@ -52,7 +51,8 @@ namespace CopyDependencyBuilder if (fileExtension == "font" || fileExtension == "fontfamily") { - return azrtti_typeid(); + static AZ::Data::AssetType fontAssetType("{57767D37-0EBE-43BE-8F60-AB36D2056EF8}"); // form UiAssetTypes.h in the LyShine gem + return fontAssetType; } return AZ::Data::AssetType::CreateNull(); diff --git a/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp b/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp index 8b697f35f2..7767e4f239 100644 --- a/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp +++ b/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp @@ -19,8 +19,6 @@ #include #include -#include - #include #include #include diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h b/Gems/LyShine/Code/Include/LyShine/Bus/UiCursorBus.h similarity index 100% rename from Code/Legacy/CryCommon/LyShine/Bus/UiCursorBus.h rename to Gems/LyShine/Code/Include/LyShine/Bus/UiCursorBus.h diff --git a/Code/Legacy/CryCommon/LyShine/UiAssetTypes.h b/Gems/LyShine/Code/Include/LyShine/UiAssetTypes.h similarity index 100% rename from Code/Legacy/CryCommon/LyShine/UiAssetTypes.h rename to Gems/LyShine/Code/Include/LyShine/UiAssetTypes.h diff --git a/Gems/LyShine/Code/lyshine_static_files.cmake b/Gems/LyShine/Code/lyshine_static_files.cmake index 925658e756..c1515f5978 100644 --- a/Gems/LyShine/Code/lyshine_static_files.cmake +++ b/Gems/LyShine/Code/lyshine_static_files.cmake @@ -11,6 +11,7 @@ set(FILES Include/LyShine/IRenderGraph.h Include/LyShine/ISprite.h Include/LyShine/ILyShine.h + Include/LyShine/UiAssetTypes.h Include/LyShine/UiBase.h Include/LyShine/UiLayoutCellBase.h Include/LyShine/UiSerializeHelpers.h @@ -26,6 +27,7 @@ set(FILES Include/LyShine/Bus/UiCanvasManagerBus.h Include/LyShine/Bus/UiCanvasUpdateNotificationBus.h Include/LyShine/Bus/UiCheckboxBus.h + Include/LyShine/Bus/UiCursorBus.h Include/LyShine/Bus/UiDraggableBus.h Include/LyShine/Bus/UiDropdownBus.h Include/LyShine/Bus/UiDropdownOptionBus.h From a896ff11bc3aa8f13696e078e66fee1dbcf269ae Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:57:52 -0800 Subject: [PATCH 08/58] Changed .material serialization to avoid loading the .materialtype file, since the .material builder doesn't declare a source dependency on the .materialtype. Otherwise there can be ambiguous edge cases where changes to the .materialtype might or might not impact the baked MaterialAsset. Note that another option would have been to add a the appropriate source dependency, but that would hurt iteration time as any change to the .materialtype file would cause every .material file and .fbx to rebuild. These changes have the added benefit of simplifying some of the serialization code. MaterialSourceDataSerializer is no longer needed, as its main purpose was to pass the MaterialTypeSourceData down to the MaterialPropertyValueSerializer. Before, the JSON serialization system gave a lot of data flexibility because it did best-effort conversions, like allowing a float to be loaded as an int for example. But now the material serialization code doesn't know target data type, so it has to assume the data type based on what's in the .material file, and then the MaterialAsset will convert the data to the appropriate type later when Finalize() is called. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../MaterialPropertyValueSerializer.h | 7 - .../MaterialPropertyValueSourceData.h | 2 +- .../Material/MaterialSourceDataSerializer.h | 40 -- .../Material/MaterialTypeSourceData.h | 6 +- .../MaterialPropertyValueSerializer.cpp | 106 +++-- .../RPI.Edit/Material/MaterialSourceData.cpp | 21 +- .../Material/MaterialSourceDataSerializer.cpp | 162 ------- .../Material/MaterialTypeSourceData.cpp | 11 +- .../RPI.Reflect/Material/MaterialAsset.cpp | 132 +++++- .../Tests/Material/MaterialAssetTests.cpp | 32 +- .../Material/MaterialSourceDataTests.cpp | 410 ++++++++++-------- Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake | 2 - 12 files changed, 450 insertions(+), 481 deletions(-) delete mode 100644 Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h delete mode 100644 Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h index 29371618cf..befbb7c990 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSerializer.h @@ -24,13 +24,6 @@ namespace AZ AZ_RTTI(AZ::RPI::JsonMaterialPropertyValueSerializer, "{A52B1ED8-C849-4269-9AA7-9D0814D2EC59}", BaseJsonSerializer); AZ_CLASS_ALLOCATOR_DECL; - //! A LoadContext object must be passed down to the serializer via JsonDeserializerContext::GetMetadata().Add(...) - struct LoadContext - { - AZ_TYPE_INFO(JsonMaterialPropertyValueSerializer::LoadContext, "{5E0A891A-27F6-4AD7-88A5-B9EA50F88B45}"); - uint32_t m_materialTypeVersion; //!< The version number from the .materialtype file - }; - JsonSerializationResult::Result Load(void* outputValue, const Uuid& outputValueTypeId, const rapidjson::Value& inputValue, JsonDeserializerContext& context) override; diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h index 178cacba15..a0640a1522 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h @@ -54,7 +54,7 @@ namespace AZ //! The resolved value with a valid type of a property. It needs to be mutable to allow post-resolving when parent objects are declared as const. mutable MaterialPropertyValue m_resolvedValue; //! Candidate values from serialization. - AZStd::map m_possibleValues; + AZStd::map m_possibleValues; }; } // namespace RPI } // namespace AZ diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h deleted file mode 100644 index 301b80ed82..0000000000 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include - -namespace AZ -{ - class ReflectContext; - - namespace RPI - { - //! This custom serializer is needed to load the material type file and saves its data in the - //! JsonDeserializerSettings for JsonMaterialPropertyValueSerializer to use. - //! (Note we could have made a custom serializer specifically for the 'materialType' field but that - //! would require 'materialType' to appear before 'properties'. By having a custom serializer for the common - //! parent of 'materialType' and 'properties', we can avoid an order dependency within the JSON file). - class JsonMaterialSourceDataSerializer - : public BaseJsonSerializer - { - public: - AZ_RTTI(AZ::RPI::JsonMaterialSourceDataSerializer, "{008A7423-8DF6-4BA3-BF5E-B0C189CCBE58}", BaseJsonSerializer); - AZ_CLASS_ALLOCATOR_DECL; - - JsonSerializationResult::Result Load(void* outputValue, const Uuid& outputValueTypeId, const rapidjson::Value& inputValue, - JsonDeserializerContext& context) override; - - JsonSerializationResult::Result Store(rapidjson::Value& outputValue, const void* inputValue, - const void* defaultValue, const Uuid& valueTypeId, JsonSerializerContext& context) override; - }; - - } // namespace RPI -} // namespace AZ diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h index f5336807c7..9333880594 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h @@ -186,9 +186,8 @@ namespace AZ //! Searches for a specific property. //! Note this function can find properties using old versions of the property name; in that case, //! the name in the returned PropertyDefinition* will not match the @propertyName that was searched for. - //! @param materialTypeVersion indicates the version number of the property name being passed in. Only renames above this version number will be applied. //! @return the requested property, or null if it could not be found - const PropertyDefinition* FindProperty(AZStd::string_view groupName, AZStd::string_view propertyName, uint32_t materialTypeVersion = 0) const; + const PropertyDefinition* FindProperty(AZStd::string_view groupName, AZStd::string_view propertyName) const; //! Construct a complete list of group definitions, including implicit groups, arranged in the same order as the source data //! Groups with the same name will be consolidated into a single entry @@ -212,9 +211,8 @@ namespace AZ Outcome> CreateMaterialTypeAsset(Data::AssetId assetId, AZStd::string_view materialTypeSourceFilePath = "", bool elevateWarnings = true) const; //! Possibly renames @propertyId based on the material version update steps. - //! @param materialTypeVersion indicates the version number of the property name being passed in. Only renames above this version number will be applied. //! @return true if the property was renamed - bool ApplyPropertyRenames(MaterialPropertyId& propertyId, uint32_t materialTypeVersion = 0) const; + bool ApplyPropertyRenames(MaterialPropertyId& propertyId) const; }; //! The wrapper class for derived material functors. diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp index 5e04365ffb..10b45ca8df 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -55,15 +54,6 @@ namespace AZ MaterialSourceData::Property* property = reinterpret_cast(outputValue); AZ_Assert(property, "Output value for JsonMaterialPropertyValueSerializer can't be null."); - const MaterialTypeSourceData* materialType = context.GetMetadata().Find(); - if (!materialType) - { - AZ_Assert(false, "Material type reference not found"); - return context.Report(JsonSerializationResult::Tasks::ReadField, JsonSerializationResult::Outcomes::Catastrophic, "Material type reference not found."); - } - - const JsonMaterialPropertyValueSerializer::LoadContext* loadContext = context.GetMetadata().Find(); - // Construct the full property name (groupName.propertyName) by parsing it from the JSON path string. size_t startPropertyName = context.GetPath().Get().rfind('/'); size_t startGroupName = context.GetPath().Get().rfind('/', startPropertyName-1); @@ -72,47 +62,69 @@ namespace AZ JSR::ResultCode result(JSR::Tasks::ReadField); - auto propertyDefinition = materialType->FindProperty(groupName, propertyName, loadContext->m_materialTypeVersion); - if (!propertyDefinition) + if (inputValue.IsBool()) { - AZStd::string message = AZStd::string::format("Property '%.*s.%.*s' not found in material type.", AZ_STRING_ARG(groupName), AZ_STRING_ARG(propertyName)); - return context.Report(JsonSerializationResult::Tasks::ReadField, JsonSerializationResult::Outcomes::Unsupported, message); + result.Combine(LoadVariant(property->m_value, false, inputValue, context)); + } + else if (inputValue.IsInt() || inputValue.IsInt64()) + { + result.Combine(LoadVariant(property->m_value, 0, inputValue, context)); + } + else if (inputValue.IsUint() || inputValue.IsUint64()) + { + result.Combine(LoadVariant(property->m_value, 0u, inputValue, context)); + } + else if (inputValue.IsFloat() || inputValue.IsDouble()) + { + result.Combine(LoadVariant(property->m_value, 0.0f, inputValue, context)); + } + else if (inputValue.IsArray() && inputValue.Size() == 4) + { + result.Combine(LoadVariant(property->m_value, Vector4{0.0f, 0.0f, 0.0f, 0.0f}, inputValue, context)); + } + else if (inputValue.IsArray() && inputValue.Size() == 3) + { + result.Combine(LoadVariant(property->m_value, Vector3{0.0f, 0.0f, 0.0f}, inputValue, context)); + } + else if (inputValue.IsArray() && inputValue.Size() == 2) + { + result.Combine(LoadVariant(property->m_value, Vector2{0.0f, 0.0f}, inputValue, context)); + } + else if (inputValue.IsObject()) + { + JsonSerializationResult::ResultCode resultCode = LoadVariant(property->m_value, Color::CreateZero(), inputValue, context); + + if(resultCode.GetProcessing() != JsonSerializationResult::Processing::Completed) + { + resultCode = LoadVariant(property->m_value, Vector4::CreateZero(), inputValue, context); + } + + if(resultCode.GetProcessing() != JsonSerializationResult::Processing::Completed) + { + resultCode = LoadVariant(property->m_value, Vector3::CreateZero(), inputValue, context); + } + + if(resultCode.GetProcessing() != JsonSerializationResult::Processing::Completed) + { + resultCode = LoadVariant(property->m_value, Vector2::CreateZero(), inputValue, context); + } + + if(resultCode.GetProcessing() == JsonSerializationResult::Processing::Completed) + { + result.Combine(resultCode); + } + else + { + return context.Report(JsonSerializationResult::Tasks::ReadField, JsonSerializationResult::Outcomes::Unsupported, "Unknown data type"); + } + } + else if (inputValue.IsString()) + { + result.Combine(LoadVariant(property->m_value, AZStd::string{}, inputValue, context)); } else { - switch (propertyDefinition->m_dataType) - { - case MaterialPropertyDataType::Bool: - result.Combine(LoadVariant(property->m_value, false, inputValue, context)); - break; - case MaterialPropertyDataType::Int: - result.Combine(LoadVariant(property->m_value, 0, inputValue, context)); - break; - case MaterialPropertyDataType::UInt: - result.Combine(LoadVariant(property->m_value, 0u, inputValue, context)); - break; - case MaterialPropertyDataType::Float: - result.Combine(LoadVariant(property->m_value, 0.0f, inputValue, context)); - break; - case MaterialPropertyDataType::Vector2: - result.Combine(LoadVariant(property->m_value, Vector2{0.0f, 0.0f}, inputValue, context)); - break; - case MaterialPropertyDataType::Vector3: - result.Combine(LoadVariant(property->m_value, Vector3{0.0f, 0.0f, 0.0f}, inputValue, context)); - break; - case MaterialPropertyDataType::Vector4: - result.Combine(LoadVariant(property->m_value, Vector4{0.0f, 0.0f, 0.0f, 0.0f}, inputValue, context)); - break; - case MaterialPropertyDataType::Color: - result.Combine(LoadVariant(property->m_value, AZ::Colors::White, inputValue, context)); - break; - case MaterialPropertyDataType::Image: - case MaterialPropertyDataType::Enum: - result.Combine(LoadVariant(property->m_value, AZStd::string{}, inputValue, context)); - break; - default: - return context.Report(JsonSerializationResult::Tasks::ReadField, JsonSerializationResult::Outcomes::Unsupported, "Unknown data type"); - } + return context.Report(JsonSerializationResult::Tasks::ReadField, JsonSerializationResult::Outcomes::Unsupported, "Unknown data type"); } if (result.GetProcessing() == JsonSerializationResult::Processing::Completed) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index bc764ec7fb..b921b186c0 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -45,13 +44,17 @@ namespace AZ { if (JsonRegistrationContext* jsonContext = azrtti_cast(context)) { - jsonContext->Serializer()->HandlesType(); jsonContext->Serializer()->HandlesType(); } else if (auto* serializeContext = azrtti_cast(context)) { serializeContext->Class() - ->Version(1) + ->Version(2) + ->Field("description", &MaterialSourceData::m_description) + ->Field("materialType", &MaterialSourceData::m_materialType) + ->Field("materialTypeVersion", &MaterialSourceData::m_materialTypeVersion) + ->Field("parentMaterial", &MaterialSourceData::m_parentMaterial) + ->Field("properties", &MaterialSourceData::m_properties) ; serializeContext->RegisterGenericType(); @@ -80,6 +83,12 @@ namespace AZ MaterialAssetCreator materialAssetCreator; materialAssetCreator.SetElevateWarnings(elevateWarnings); + if (m_materialType.empty()) + { + AZ_Error("MaterialSourceData", false, "materialType was not specified"); + return Failure(); + } + Outcome materialTypeAssetId = AssetUtils::MakeAssetId(materialSourceFilePath, m_materialType, 0); if (!materialTypeAssetId) { @@ -194,6 +203,12 @@ namespace AZ bool elevateWarnings, AZStd::unordered_set* sourceDependencies) const { + if (m_materialType.empty()) + { + AZ_Error("MaterialSourceData", false, "materialType was not specified"); + return Failure(); + } + const auto materialTypeSourcePath = AssetUtils::ResolvePathReference(materialSourceFilePath, m_materialType); const auto materialTypeAssetId = AssetUtils::MakeAssetId(materialTypeSourcePath, 0); if (!materialTypeAssetId.IsSuccess()) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp deleted file mode 100644 index 2a504fc345..0000000000 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -namespace AZ -{ - namespace RPI - { - AZ_CLASS_ALLOCATOR_IMPL(JsonMaterialSourceDataSerializer, SystemAllocator, 0); - - JsonSerializationResult::Result JsonMaterialSourceDataSerializer::Load(void* outputValue, const Uuid& outputValueTypeId, - const rapidjson::Value& inputValue, JsonDeserializerContext& context) - { - namespace JSR = JsonSerializationResult; - - AZ_Assert(azrtti_typeid() == outputValueTypeId, - "Unable to deserialize material to json because the provided type is %s", - outputValueTypeId.ToString().c_str()); - AZ_UNUSED(outputValueTypeId); - - MaterialSourceData* materialSourceData = reinterpret_cast(outputValue); - AZ_Assert(materialSourceData, "Output value for JsonMaterialSourceDataSerializer can't be null."); - - JSR::ResultCode result(JSR::Tasks::ReadField); - - if (!inputValue.IsObject()) - { - return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Unsupported, "Material data must be a JSON object"); - } - - result.Combine(ContinueLoadingFromJsonObjectField(&materialSourceData->m_description, azrtti_typeid(), inputValue, "description", context)); - result.Combine(ContinueLoadingFromJsonObjectField(&materialSourceData->m_parentMaterial, azrtti_typeid(), inputValue, "parentMaterial", context)); - result.Combine(ContinueLoadingFromJsonObjectField(&materialSourceData->m_materialType, azrtti_typeid(), inputValue, "materialType", context)); - result.Combine(ContinueLoadingFromJsonObjectField(&materialSourceData->m_materialTypeVersion, azrtti_typeid(), inputValue, "materialTypeVersion", context)); - - if (materialSourceData->m_materialType.empty()) - { - return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Catastrophic, "Required field 'materialType' is missing or invalid"); - } - - JsonFileLoadContext* jsonFileLoadContext = context.GetMetadata().Find(); - - if (!jsonFileLoadContext) - { - // Go ahead and create a JsonFileLoadContext because we'll need to use it below when loading the material type - context.GetMetadata().Add(JsonFileLoadContext{}); - jsonFileLoadContext = context.GetMetadata().Find(); - } - - // Load the material type file because we need the property type information in order to know how to read the property values - MaterialTypeSourceData materialTypeData; - { - AZStd::string materialTypePath = AssetUtils::ResolvePathReference(jsonFileLoadContext->GetFilePath(), materialSourceData->m_materialType); - - auto materialTypeJson = JsonSerializationUtils::ReadJsonFile(materialTypePath, AZ::RPI::JsonUtils::DefaultMaxFileSize); - if (!materialTypeJson.IsSuccess()) - { - AZStd::string failureMessage; - failureMessage = AZStd::string::format("Failed to load material-type file '%s': %s", materialTypePath.c_str(), materialTypeJson.GetError().c_str()); - ScopedContextPath subPath{context, "materialType"}; - return context.Report(JSR::Tasks::ReadField, JSR::Outcomes::Catastrophic, failureMessage); - } - else - { - // Since we're about to load a different file the JsonFileLoadContext needs to be changed to reflect the file that's being loaded. - jsonFileLoadContext->PushFilePath(materialTypePath); - - // We also need a special reporting function for the material type, to note the fact that the issue is in the material type not this file. - auto reportingPrev = context.GetReporter(); - context.PushReporter([materialTypePath, reportingPrev](AZStd::string_view message, JSR::ResultCode result, AZStd::string_view path) -> JSR::ResultCode - { - AZStd::string materialTypeFilename; - if (!AzFramework::StringFunc::Path::GetFullFileName(materialTypePath.c_str(), materialTypeFilename)) - { - materialTypeFilename = materialTypePath; - } - - AZStd::string newPath = AZStd::string::format("[%.*s]%.*s", AZ_STRING_ARG(materialTypeFilename), AZ_STRING_ARG(path)); - return reportingPrev(message, result, newPath); - }); - - JsonDeserializerSettings settings; - settings.m_metadata = context.GetMetadata(); - settings.m_reporting = context.GetReporter(); - settings.m_registrationContext = context.GetRegistrationContext(); - settings.m_serializeContext = context.GetSerializeContext(); - settings.m_clearContainers = context.ShouldClearContainers(); - - JsonSerializationResult::ResultCode materialTypeLoadResult = JsonSerialization::Load(materialTypeData, materialTypeJson.GetValue(), settings); - materialTypeData.ResolveUvEnums(); - - // Restore prior configuration - context.PopReporter(); - jsonFileLoadContext->PopFilePath(); - - // Even though results from the material type file is a separate JSON serialization, we combine the results to make sure - // any issues are bubbled up. I'm not sure if this is the most desirable approach, but better to over-report issues than - // under-report them. - result.Combine(materialTypeLoadResult); - } - } - - context.GetMetadata().Add(AZStd::move(materialTypeData)); - - JsonMaterialPropertyValueSerializer::LoadContext materialPropertyValueLoadContext; - materialPropertyValueLoadContext.m_materialTypeVersion = materialSourceData->m_materialTypeVersion; - context.GetMetadata().Add(materialPropertyValueLoadContext); - - result.Combine(ContinueLoadingFromJsonObjectField(&materialSourceData->m_properties, azrtti_typeid(), inputValue, "properties", context)); - - if (result.GetProcessing() == JsonSerializationResult::Processing::Completed) - { - return context.Report(result, "Successfully loaded material."); - } - else - { - return context.Report(result, "Partially loaded material."); - } - } - - - JsonSerializationResult::Result JsonMaterialSourceDataSerializer::Store(rapidjson::Value& outputValue, const void* inputValue, - [[maybe_unused]] const void* defaultValue, const Uuid& valueTypeId, JsonSerializerContext& context) - { - namespace JSR = JsonSerializationResult; - - AZ_Assert(azrtti_typeid() == valueTypeId, - "Unable to serialize material to json because the provided type is %s", - valueTypeId.ToString().c_str()); - AZ_UNUSED(valueTypeId); - - const MaterialSourceData* materialSourceData = reinterpret_cast(inputValue); - AZ_Assert(materialSourceData, "Input value for JsonMaterialSourceDataSerializer can't be null."); - - JSR::ResultCode resultCode(JSR::Tasks::ReadField); - resultCode.Combine(ContinueStoringToJsonObjectField(outputValue, "description", &materialSourceData->m_description, nullptr, azrtti_typeid(), context)); - resultCode.Combine(ContinueStoringToJsonObjectField(outputValue, "parentMaterial", &materialSourceData->m_parentMaterial, nullptr, azrtti_typeid(), context)); - resultCode.Combine(ContinueStoringToJsonObjectField(outputValue, "materialType", &materialSourceData->m_materialType, nullptr, azrtti_typeid(), context)); - resultCode.Combine(ContinueStoringToJsonObjectField(outputValue, "materialTypeVersion", &materialSourceData->m_materialTypeVersion, nullptr, azrtti_typeid(), context)); - resultCode.Combine(ContinueStoringToJsonObjectField(outputValue, "properties", &materialSourceData->m_properties, nullptr, azrtti_typeid(), context)); - - return context.Report(resultCode, "Processed material."); - } - } // namespace RPI -} // namespace AZ diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp index d8e6c156be..87c064f571 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp @@ -130,17 +130,12 @@ namespace AZ return nullptr; } - bool MaterialTypeSourceData::ApplyPropertyRenames(MaterialPropertyId& propertyId, uint32_t materialTypeVersion) const + bool MaterialTypeSourceData::ApplyPropertyRenames(MaterialPropertyId& propertyId) const { bool renamed = false; for (const VersionUpdateDefinition& versionUpdate : m_versionUpdates) { - if (materialTypeVersion >= versionUpdate.m_toVersion) - { - continue; - } - for (const VersionUpdatesRenameOperationDefinition& action : versionUpdate.m_actions) { if (action.m_operation == "rename") @@ -161,7 +156,7 @@ namespace AZ return renamed; } - const MaterialTypeSourceData::PropertyDefinition* MaterialTypeSourceData::FindProperty(AZStd::string_view groupName, AZStd::string_view propertyName, uint32_t materialTypeVersion) const + const MaterialTypeSourceData::PropertyDefinition* MaterialTypeSourceData::FindProperty(AZStd::string_view groupName, AZStd::string_view propertyName) const { auto groupIter = m_propertyLayout.m_properties.find(groupName); if (groupIter != m_propertyLayout.m_properties.end()) @@ -178,7 +173,7 @@ namespace AZ // Property has not been found, try looking for renames in the version history MaterialPropertyId propertyId = MaterialPropertyId{groupName, propertyName}; - ApplyPropertyRenames(propertyId, materialTypeVersion); + ApplyPropertyRenames(propertyId); // Do the search again with the new names diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp index 309daf8b62..8bf975fd82 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp @@ -109,6 +109,77 @@ namespace AZ return m_wasPreFinalized; } + template + MaterialPropertyValue CastNumericMaterialPropertyValue(const MaterialPropertyValue& value) + { + TypeId typeId = value.GetTypeId(); + + if (typeId == azrtti_typeid()) + { + return aznumeric_cast(value.GetValue()); + } + else if (typeId == azrtti_typeid()) + { + return aznumeric_cast(value.GetValue()); + } + else if (typeId == azrtti_typeid()) + { + return aznumeric_cast(value.GetValue()); + } + else if (typeId == azrtti_typeid()) + { + return aznumeric_cast(value.GetValue()); + } + else + { + return value; + } + } + + + + template + MaterialPropertyValue CastVectorMaterialPropertyValue(const MaterialPropertyValue& value) + { + float values[4] = {}; + + TypeId typeId = value.GetTypeId(); + if (typeId == azrtti_typeid()) + { + value.GetValue().StoreToFloat2(values); + } + else if (typeId == azrtti_typeid()) + { + value.GetValue().StoreToFloat3(values); + } + else if (typeId == azrtti_typeid()) + { + value.GetValue().StoreToFloat4(values); + } + else + { + return value; + } + + typeId = azrtti_typeid(); + if (typeId == azrtti_typeid()) + { + return Vector2::CreateFromFloat2(values); + } + else if (typeId == azrtti_typeid()) + { + return Vector3::CreateFromFloat3(values); + } + else if (typeId == azrtti_typeid()) + { + return Vector4::CreateFromFloat4(values); + } + else + { + return value; + } + } + void MaterialAsset::Finalize(AZStd::function reportWarning, AZStd::function reportError) { if (m_wasPreFinalized) @@ -180,9 +251,66 @@ namespace AZ } else { - if (ValidateMaterialPropertyDataType(value.GetTypeId(), name, propertyDescriptor, reportError)) + // The material asset could be finalized sometime after the original JSON is loaded, and the material type might not have been available + // at that time, so the data type would not be known for each property. So each raw property's type could be based on what appeared in the JSON + // and this is the first opportunity we have to resolve that value with the actual type. For example, a float property could have been specified in + // the JSON as 7 instead of 7.0, which is valid. Similarly, a Color and a Vector3 can both be specified as "[0.0,0.0,0.0]" in the JSON file. + + MaterialPropertyValue finalValue = value; + + switch (propertyDescriptor->GetDataType()) { - finalizedPropertyValues[propertyIndex.GetIndex()] = value; + case MaterialPropertyDataType::Bool: + finalValue = CastNumericMaterialPropertyValue(value); + break; + case MaterialPropertyDataType::Int: + finalValue = CastNumericMaterialPropertyValue(value); + break; + case MaterialPropertyDataType::UInt: + finalValue = CastNumericMaterialPropertyValue(value); + break; + case MaterialPropertyDataType::Float: + finalValue = CastNumericMaterialPropertyValue(value); + break; + case MaterialPropertyDataType::Color: + if (value.GetTypeId() == azrtti_typeid()) + { + finalValue = Color::CreateFromVector3(value.GetValue()); + } + else if (value.GetTypeId() == azrtti_typeid()) + { + Vector4 vector4 = value.GetValue(); + finalValue = Color::CreateFromVector3AndFloat(vector4.GetAsVector3(), vector4.GetW()); + } + break; + case MaterialPropertyDataType::Vector2: + finalValue = CastVectorMaterialPropertyValue(value); + break; + case MaterialPropertyDataType::Vector3: + if (value.GetTypeId() == azrtti_typeid()) + { + finalValue = value.GetValue().GetAsVector3(); + } + else + { + finalValue = CastVectorMaterialPropertyValue(value); + } + break; + case MaterialPropertyDataType::Vector4: + if (value.GetTypeId() == azrtti_typeid()) + { + finalValue = value.GetValue().GetAsVector4(); + } + else + { + finalValue = CastVectorMaterialPropertyValue(value); + } + break; + } + + if (ValidateMaterialPropertyDataType(finalValue.GetTypeId(), name, propertyDescriptor, reportError)) + { + finalizedPropertyValues[propertyIndex.GetIndex()] = finalValue; } } } diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp index 61e1283f52..ea637fb17d 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp @@ -449,37 +449,7 @@ namespace UnitTest expectCreatorError("Type mismatch", [](MaterialAssetCreator& creator) { - creator.SetPropertyValue(Name{ "MyInt" }, 0.0f); - }); - - expectCreatorError("Type mismatch", - [](MaterialAssetCreator& creator) - { - creator.SetPropertyValue(Name{ "MyUInt" }, -1); - }); - - expectCreatorError("Type mismatch", - [](MaterialAssetCreator& creator) - { - creator.SetPropertyValue(Name{ "MyFloat" }, 10u); - }); - - expectCreatorError("Type mismatch", - [](MaterialAssetCreator& creator) - { - creator.SetPropertyValue(Name{ "MyFloat2" }, 1.0f); - }); - - expectCreatorError("Type mismatch", - [](MaterialAssetCreator& creator) - { - creator.SetPropertyValue(Name{ "MyFloat3" }, AZ::Vector4{}); - }); - - expectCreatorError("Type mismatch", - [](MaterialAssetCreator& creator) - { - creator.SetPropertyValue(Name{ "MyFloat4" }, AZ::Vector3{}); + creator.SetPropertyValue(Name{ "MyFloat" }, AZ::Vector4{}); }); expectCreatorError("Type mismatch", diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp index ef89e0138c..5e09fe6612 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp @@ -297,6 +297,63 @@ namespace UnitTest checkRawPropertyValues(); } + // Can return a Vector4 or a Color as a Vector4 + Vector4 GetAsVector4(const MaterialPropertyValue& value) + { + if (value.GetTypeId() == azrtti_typeid()) + { + return value.GetValue(); + } + else if (value.GetTypeId() == azrtti_typeid()) + { + return value.GetValue().GetAsVector4(); + } + else + { + return Vector4::CreateZero(); + } + } + + // Can return a Int or a UInt as a Int + int32_t GetAsInt(const MaterialPropertyValue& value) + { + if (value.GetTypeId() == azrtti_typeid()) + { + return value.GetValue(); + } + else if (value.GetTypeId() == azrtti_typeid()) + { + return aznumeric_cast(value.GetValue()); + } + else + { + return 0; + } + } + + template + bool AreTypesCompatible(const MaterialPropertyValue& a, const MaterialPropertyValue& b) + { + auto fixupType = [](TypeId t) + { + if (t == azrtti_typeid()) + { + return azrtti_typeid(); + } + + if (t == azrtti_typeid()) + { + return azrtti_typeid(); + } + + return t; + }; + + TypeId targetTypeId = azrtti_typeid(); + + return fixupType(a.GetTypeId()) == fixupType(targetTypeId) && fixupType(b.GetTypeId()) == fixupType(targetTypeId); + } + void CheckEqual(MaterialSourceData& a, MaterialSourceData& b) { EXPECT_STREQ(a.m_materialType.data(), b.m_materialType.data()); @@ -334,27 +391,41 @@ namespace UnitTest auto& propertyA = propertyIterA.second; auto& propertyB = propertyIterB->second; - bool typesMatch = propertyA.m_value.GetTypeId() == propertyB.m_value.GetTypeId(); - EXPECT_TRUE(typesMatch); - if (typesMatch) + AZStd::string propertyReference = AZStd::string::format(" for property '%s.%s'", groupName.c_str(), propertyName.c_str()); + + // We allow some types like Vector4 and Color or Int and UInt to be interchangeable since they serialize the same and can be converted when the MaterialAsset is finalized. + + if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) { - AZStd::string propertyReference = AZStd::string::format(" for property '%s.%s'", groupName.c_str(), propertyName.c_str()); - - auto typeId = propertyA.m_value.GetTypeId(); - - if (typeId == azrtti_typeid()) { EXPECT_EQ(propertyA.m_value.GetValue(), propertyB.m_value.GetValue()) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_EQ(propertyA.m_value.GetValue(), propertyB.m_value.GetValue()) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_EQ(propertyA.m_value.GetValue(), propertyB.m_value.GetValue()) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_NEAR(propertyA.m_value.GetValue(), propertyB.m_value.GetValue(), 0.01) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_TRUE(propertyA.m_value.GetValue().IsClose(propertyB.m_value.GetValue())) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_TRUE(propertyA.m_value.GetValue().IsClose(propertyB.m_value.GetValue())) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_TRUE(propertyA.m_value.GetValue().IsClose(propertyB.m_value.GetValue())) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_TRUE(propertyA.m_value.GetValue().IsClose(propertyB.m_value.GetValue())) << propertyReference.c_str(); } - else if (typeId == azrtti_typeid()) { EXPECT_STREQ(propertyA.m_value.GetValue().c_str(), propertyB.m_value.GetValue().c_str()) << propertyReference.c_str(); } - else - { - ADD_FAILURE(); - } + EXPECT_EQ(propertyA.m_value.GetValue(), propertyB.m_value.GetValue()) << propertyReference.c_str(); + } + else if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) + { + EXPECT_EQ(GetAsInt(propertyA.m_value), GetAsInt(propertyB.m_value)) << propertyReference.c_str(); + } + else if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) + { + EXPECT_NEAR(propertyA.m_value.GetValue(), propertyB.m_value.GetValue(), 0.01) << propertyReference.c_str(); + } + else if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) + { + EXPECT_TRUE(propertyA.m_value.GetValue().IsClose(propertyB.m_value.GetValue())) << propertyReference.c_str(); + } + else if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) + { + EXPECT_TRUE(propertyA.m_value.GetValue().IsClose(propertyB.m_value.GetValue())) << propertyReference.c_str(); + } + else if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) + { + EXPECT_TRUE(GetAsVector4(propertyA.m_value).IsClose(GetAsVector4(propertyB.m_value))) << propertyReference.c_str(); + } + else if (AreTypesCompatible(propertyA.m_value, propertyB.m_value)) + { + EXPECT_STREQ(propertyA.m_value.GetValue().c_str(), propertyB.m_value.GetValue().c_str()) << propertyReference.c_str(); + } + else + { + ADD_FAILURE(); } } } @@ -363,42 +434,8 @@ namespace UnitTest TEST_F(MaterialSourceDataTests, TestJsonRoundTrip) { - const char* materialTypeJson = - "{ \n" - " \"propertyLayout\": { \n" - " \"version\": 1, \n" - " \"groups\": [ \n" - " { \"name\": \"groupA\" }, \n" - " { \"name\": \"groupB\" }, \n" - " { \"name\": \"groupC\" } \n" - " ], \n" - " \"properties\": { \n" - " \"groupA\": [ \n" - " {\"name\": \"MyBool\", \"type\": \"bool\"}, \n" - " {\"name\": \"MyInt\", \"type\": \"int\"}, \n" - " {\"name\": \"MyUInt\", \"type\": \"uint\"} \n" - " ], \n" - " \"groupB\": [ \n" - " {\"name\": \"MyFloat\", \"type\": \"float\"}, \n" - " {\"name\": \"MyFloat2\", \"type\": \"vector2\"}, \n" - " {\"name\": \"MyFloat3\", \"type\": \"vector3\"} \n" - " ], \n" - " \"groupC\": [ \n" - " {\"name\": \"MyFloat4\", \"type\": \"vector4\"}, \n" - " {\"name\": \"MyColor\", \"type\": \"color\"}, \n" - " {\"name\": \"MyImage\", \"type\": \"image\"} \n" - " ] \n" - " } \n" - " } \n" - "} \n"; - const char* materialTypeFilePath = "@exefolder@/Temp/roundTripTest.materialtype"; - AZ::IO::FileIOStream file; - EXPECT_TRUE(file.Open(materialTypeFilePath, AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath)); - file.Write(strlen(materialTypeJson), materialTypeJson); - file.Close(); - MaterialSourceData sourceDataOriginal; sourceDataOriginal.m_materialType = materialTypeFilePath; sourceDataOriginal.m_parentMaterial = materialTypeFilePath; @@ -434,8 +471,8 @@ namespace UnitTest "properties": { "general": [ { - "name": "testColor", - "type": "color" + "name": "testValue", + "type": "Float" } ] } @@ -456,7 +493,7 @@ namespace UnitTest { "properties": { "general": { - "testColor": [0.1,0.2,0.3] + "testValue": 1.2 } }, "materialType": "@exefolder@/Temp/simpleMaterialType.materialtype" @@ -469,27 +506,11 @@ namespace UnitTest EXPECT_EQ(AZ::JsonSerializationResult::Tasks::ReadField, loadResult.m_jsonResultCode.GetTask()); EXPECT_EQ(AZ::JsonSerializationResult::Processing::Completed, loadResult.m_jsonResultCode.GetProcessing()); - AZ::Color testColor = material.m_properties["general"]["testColor"].m_value.GetValue(); - EXPECT_TRUE(AZ::Color(0.1f, 0.2f, 0.3f, 1.0f).IsClose(testColor, 0.01)); + float testValue = material.m_properties["general"]["testValue"].m_value.GetValue(); + EXPECT_FLOAT_EQ(1.2f, testValue); } - - TEST_F(MaterialSourceDataTests, Load_Error_NotAnObject) - { - const AZStd::string inputJson = R"( - [] - )"; - - MaterialSourceData material; - JsonTestResult loadResult = LoadTestDataFromJson(material, inputJson); - - EXPECT_EQ(AZ::JsonSerializationResult::Tasks::ReadField, loadResult.m_jsonResultCode.GetTask()); - EXPECT_EQ(AZ::JsonSerializationResult::Processing::Altered, loadResult.m_jsonResultCode.GetProcessing()); - EXPECT_EQ(AZ::JsonSerializationResult::Outcomes::Unsupported, loadResult.m_jsonResultCode.GetOutcome()); - - EXPECT_TRUE(loadResult.ContainsMessage("", "Material data must be a JSON object")); - } - - TEST_F(MaterialSourceDataTests, Load_Error_NoMaterialType) + + TEST_F(MaterialSourceDataTests, CreateMaterialAsset_NoMaterialType) { const AZStd::string inputJson = R"( { @@ -505,14 +526,29 @@ namespace UnitTest MaterialSourceData material; JsonTestResult loadResult = LoadTestDataFromJson(material, inputJson); - EXPECT_EQ(AZ::JsonSerializationResult::Tasks::ReadField, loadResult.m_jsonResultCode.GetTask()); - EXPECT_EQ(AZ::JsonSerializationResult::Processing::Halted, loadResult.m_jsonResultCode.GetProcessing()); - EXPECT_EQ(AZ::JsonSerializationResult::Outcomes::Catastrophic, loadResult.m_jsonResultCode.GetOutcome()); + const bool elevateWarnings = false; - EXPECT_TRUE(loadResult.ContainsMessage("", "Required field 'materialType' is missing")); + ErrorMessageFinder errorMessageFinder; + + errorMessageFinder.AddExpectedErrorMessage("materialType was not specified"); + auto result = material.CreateMaterialAsset(AZ::Uuid::CreateRandom(), "test.material", AZ::RPI::MaterialAssetProcessingMode::DeferredBake, elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); + + errorMessageFinder.Reset(); + errorMessageFinder.AddExpectedErrorMessage("materialType was not specified"); + result = material.CreateMaterialAsset(AZ::Uuid::CreateRandom(), "test.material", AZ::RPI::MaterialAssetProcessingMode::PreBake, elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); + + errorMessageFinder.Reset(); + errorMessageFinder.AddExpectedErrorMessage("materialType was not specified"); + result = material.CreateMaterialAssetFromSourceData(AZ::Uuid::CreateRandom(), "test.material", elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); } - - TEST_F(MaterialSourceDataTests, Load_Error_MaterialTypeDoesNotExist) + + TEST_F(MaterialSourceDataTests, CreateMaterialAsset_MaterialTypeDoesNotExist) { const AZStd::string inputJson = R"( { @@ -529,102 +565,43 @@ namespace UnitTest MaterialSourceData material; JsonTestResult loadResult = LoadTestDataFromJson(material, inputJson); - EXPECT_EQ(AZ::JsonSerializationResult::Tasks::ReadField, loadResult.m_jsonResultCode.GetTask()); - EXPECT_EQ(AZ::JsonSerializationResult::Processing::Halted, loadResult.m_jsonResultCode.GetProcessing()); - EXPECT_EQ(AZ::JsonSerializationResult::Outcomes::Catastrophic, loadResult.m_jsonResultCode.GetOutcome()); + const bool elevateWarnings = false; - EXPECT_TRUE(loadResult.ContainsMessage("/materialType", "Failed to load material-type file")); + ErrorMessageFinder errorMessageFinder; + + errorMessageFinder.AddExpectedErrorMessage("Could not find asset [DoesNotExist.materialtype]"); + auto result = material.CreateMaterialAsset(AZ::Uuid::CreateRandom(), "test.material", AZ::RPI::MaterialAssetProcessingMode::DeferredBake, elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); + + errorMessageFinder.Reset(); + errorMessageFinder.AddExpectedErrorMessage("Could not find asset [DoesNotExist.materialtype]"); + result = material.CreateMaterialAsset(AZ::Uuid::CreateRandom(), "test.material", AZ::RPI::MaterialAssetProcessingMode::PreBake, elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); + + errorMessageFinder.Reset(); + errorMessageFinder.AddExpectedErrorMessage("Could not find asset [DoesNotExist.materialtype]"); + errorMessageFinder.AddIgnoredErrorMessage("Failed to create material type asset ID", true); + result = material.CreateMaterialAssetFromSourceData(AZ::Uuid::CreateRandom(), "test.material", elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); } - - TEST_F(MaterialSourceDataTests, Load_MaterialTypeMessagesAreReported) + + TEST_F(MaterialSourceDataTests, CreateMaterialAsset_MaterialPropertyNotFound) { - const AZStd::string simpleMaterialTypeJson = R"( - { - "propertyLayout": { - "properties": { - "general": [ - { - "name": "testColor", - "type": "color" - } - ] - } - } - } - )"; - - const char* materialTypeFilePath = "@exefolder@/Temp/simpleMaterialType.materialtype"; - - AZ::IO::FileIOStream file; - EXPECT_TRUE(file.Open(materialTypeFilePath, AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath)); - file.Write(simpleMaterialTypeJson.size(), simpleMaterialTypeJson.data()); - file.Close(); - - const AZStd::string inputJson = R"( - { - "materialType": "@exefolder@/Temp/simpleMaterialType.materialtype", - "materialTypeVersion": 1, - "properties": { - "general": { - "testColor": [1.0,1.0,1.0] - } - } - } - )"; - MaterialSourceData material; - JsonTestResult loadResult = LoadTestDataFromJson(material, inputJson); + material.m_materialType = "@exefolder@/Temp/test.materialtype"; + AddPropertyGroup(material, "general"); + AddProperty(material, "general", "FieldDoesNotExist", 1.5f); + + const bool elevateWarnings = true; - EXPECT_EQ(AZ::JsonSerializationResult::Tasks::ReadField, loadResult.m_jsonResultCode.GetTask()); - EXPECT_EQ(AZ::JsonSerializationResult::Processing::Completed, loadResult.m_jsonResultCode.GetProcessing()); - - // propertyLayout is a field in the material type, not the material - EXPECT_TRUE(loadResult.ContainsMessage("[simpleMaterialType.materialtype]/propertyLayout/properties", "Successfully read")); - } - - TEST_F(MaterialSourceDataTests, Load_Error_PropertyNotFound) - { - const AZStd::string simpleMaterialTypeJson = R"( - { - "propertyLayout": { - "properties": { - "general": [ - { - "name": "testColor", - "type": "color" - } - ] - } - } - } - )"; - - const char* materialTypeFilePath = "@exefolder@/Temp/simpleMaterialType.materialtype"; - - AZ::IO::FileIOStream file; - EXPECT_TRUE(file.Open(materialTypeFilePath, AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath)); - file.Write(simpleMaterialTypeJson.size(), simpleMaterialTypeJson.data()); - file.Close(); - - const AZStd::string inputJson = R"( - { - "materialType": "@exefolder@/Temp/simpleMaterialType.materialtype", - "materialTypeVersion": 1, - "properties": { - "general": { - "doesNotExist": [1.0,1.0,1.0] - } - } - } - )"; - - MaterialSourceData material; - JsonTestResult loadResult = LoadTestDataFromJson(material, inputJson); - - EXPECT_EQ(AZ::JsonSerializationResult::Tasks::ReadField, loadResult.m_jsonResultCode.GetTask()); - EXPECT_EQ(AZ::JsonSerializationResult::Processing::PartialAlter, loadResult.m_jsonResultCode.GetProcessing()); - - EXPECT_TRUE(loadResult.ContainsMessage("/properties/general/doesNotExist", "Property 'general.doesNotExist' not found in material type.")); + ErrorMessageFinder errorMessageFinder("\"general.FieldDoesNotExist\" is not found"); + errorMessageFinder.AddIgnoredErrorMessage("Failed to build MaterialAsset", true); + auto result = material.CreateMaterialAsset(AZ::Uuid::CreateRandom(), "test.material", AZ::RPI::MaterialAssetProcessingMode::PreBake, elevateWarnings); + EXPECT_FALSE(result.IsSuccess()); + errorMessageFinder.CheckExpectedErrorsFound(); } TEST_F(MaterialSourceDataTests, CreateMaterialAsset_MultiLevelDataInheritance) @@ -896,7 +873,92 @@ namespace UnitTest AddProperty(materialSourceData, "general", "MyImage", AZStd::string("doesNotExist.streamingimage")); }, true); // In this case, the warning does happen even when the asset is not finalized, because the image path is checked earlier than that } + + template + void CheckSimilar(PropertyTypeT a, PropertyTypeT b); + + template<> void CheckSimilar(float a, float b) { EXPECT_FLOAT_EQ(a, b); } + template<> void CheckSimilar(Vector2 a, Vector2 b) { EXPECT_TRUE(a.IsClose(b)); } + template<> void CheckSimilar(Vector3 a, Vector3 b) { EXPECT_TRUE(a.IsClose(b)); } + template<> void CheckSimilar(Vector4 a, Vector4 b) { EXPECT_TRUE(a.IsClose(b)); } + template<> void CheckSimilar(Color a, Color b) { EXPECT_TRUE(a.IsClose(b)); } + template void CheckSimilar(PropertyTypeT a, PropertyTypeT b) { EXPECT_EQ(a, b); } + + template + void CheckEndToEndDataTypeResolution(const char* propertyName, const char* jsonValue, PropertyTypeT expectedFinalValue) + { + const char* groupName = "general"; + + const AZStd::string inputJson = AZStd::string::format(R"( + { + "materialType": "@exefolder@/Temp/test.materialtype", + "properties": { + "%s": { + "%s": %s + } + } + } + )", groupName, propertyName, jsonValue); + + MaterialSourceData material; + JsonTestResult loadResult = LoadTestDataFromJson(material, inputJson); + auto materialAssetResult = material.CreateMaterialAsset(Uuid::CreateRandom(), "test.material", AZ::RPI::MaterialAssetProcessingMode::PreBake); + EXPECT_TRUE(materialAssetResult); + MaterialPropertyIndex propertyIndex = materialAssetResult.GetValue()->GetMaterialPropertiesLayout()->FindPropertyIndex(MaterialPropertyId{groupName, propertyName}.GetFullName()); + CheckSimilar(expectedFinalValue, materialAssetResult.GetValue()->GetPropertyValues()[propertyIndex.GetIndex()].GetValue()); + } + + TEST_F(MaterialSourceDataTests, TestEndToEndDataTypeResolution) + { + // Data types in .material files don't have to exactly match the types in .materialtype files as specified in the properties layout. + // The exact location of the data type resolution has moved around over the life of the project, but the important thing is that + // the data type in the source .material file gets applied correctly by the time a finalized MaterialAsset comes out the other side. + + CheckEndToEndDataTypeResolution("MyBool", "true", true); + CheckEndToEndDataTypeResolution("MyBool", "false", false); + CheckEndToEndDataTypeResolution("MyBool", "1", true); + CheckEndToEndDataTypeResolution("MyBool", "0", false); + CheckEndToEndDataTypeResolution("MyBool", "1.0", true); + CheckEndToEndDataTypeResolution("MyBool", "0.0", false); + + CheckEndToEndDataTypeResolution("MyInt", "5", 5); + CheckEndToEndDataTypeResolution("MyInt", "-6", -6); + CheckEndToEndDataTypeResolution("MyInt", "-7.0", -7); + CheckEndToEndDataTypeResolution("MyInt", "false", 0); + CheckEndToEndDataTypeResolution("MyInt", "true", 1); + + CheckEndToEndDataTypeResolution("MyUInt", "8", 8u); + CheckEndToEndDataTypeResolution("MyUInt", "9.0", 9u); + CheckEndToEndDataTypeResolution("MyUInt", "false", 0u); + CheckEndToEndDataTypeResolution("MyUInt", "true", 1u); + + CheckEndToEndDataTypeResolution("MyFloat", "2", 2.0f); + CheckEndToEndDataTypeResolution("MyFloat", "-2", -2.0f); + CheckEndToEndDataTypeResolution("MyFloat", "2.1", 2.1f); + CheckEndToEndDataTypeResolution("MyFloat", "false", 0.0f); + CheckEndToEndDataTypeResolution("MyFloat", "true", 1.0f); + + CheckEndToEndDataTypeResolution("MyColor", "[0.1,0.2,0.3]", Color{0.1f, 0.2f, 0.3f, 1.0}); + CheckEndToEndDataTypeResolution("MyColor", "[0.1, 0.2, 0.3, 0.5]", Color{0.1f, 0.2f, 0.3f, 0.5f}); + CheckEndToEndDataTypeResolution("MyColor", "{\"RGB8\": [255, 0, 255, 0]}", Color{1.0f, 0.0f, 1.0f, 0.0f}); + + CheckEndToEndDataTypeResolution("MyFloat2", "[0.1,0.2]", Vector2{0.1f, 0.2f}); + CheckEndToEndDataTypeResolution("MyFloat2", "{\"y\":0.2, \"x\":0.1}", Vector2{0.1f, 0.2f}); + CheckEndToEndDataTypeResolution("MyFloat2", "{\"y\":0.2, \"x\":0.1, \"Z\":0.3}", Vector2{0.1f, 0.2f}); + CheckEndToEndDataTypeResolution("MyFloat2", "{\"y\":0.2, \"W\":0.4, \"x\":0.1, \"Z\":0.3}", Vector2{0.1f, 0.2f}); + + CheckEndToEndDataTypeResolution("MyFloat3", "[0.1,0.2,0.3]", Vector3{0.1f, 0.2f, 0.3f}); + CheckEndToEndDataTypeResolution("MyFloat3", "{\"y\":0.2, \"x\":0.1}", Vector3{0.1f, 0.2f, 0.0f}); + CheckEndToEndDataTypeResolution("MyFloat3", "{\"y\":0.2, \"x\":0.1, \"Z\":0.3}", Vector3{0.1f, 0.2f, 0.3f}); + CheckEndToEndDataTypeResolution("MyFloat3", "{\"y\":0.2, \"W\":0.4, \"x\":0.1, \"Z\":0.3}", Vector3{0.1f, 0.2f, 0.3f}); + + CheckEndToEndDataTypeResolution("MyFloat4", "[0.1,0.2,0.3,0.4]", Vector4{0.1f, 0.2f, 0.3f, 0.4f}); + CheckEndToEndDataTypeResolution("MyFloat4", "{\"y\":0.2, \"x\":0.1}", Vector4{0.1f, 0.2f, 0.0f, 0.0f}); + CheckEndToEndDataTypeResolution("MyFloat4", "{\"y\":0.2, \"x\":0.1, \"Z\":0.3}", Vector4{0.1f, 0.2f, 0.3f, 0.0f}); + CheckEndToEndDataTypeResolution("MyFloat4", "{\"y\":0.2, \"W\":0.4, \"x\":0.1, \"Z\":0.3}", Vector4{0.1f, 0.2f, 0.3f, 0.4f}); + } + } diff --git a/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake index e32d19ffd7..3c345cc00b 100644 --- a/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake +++ b/Gems/Atom/RPI/Code/atom_rpi_edit_files.cmake @@ -25,7 +25,6 @@ set(FILES Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h Include/Atom/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.h Include/Atom/RPI.Edit/Material/MaterialSourceData.h - Include/Atom/RPI.Edit/Material/MaterialSourceDataSerializer.h Include/Atom/RPI.Edit/Material/MaterialFunctorSourceData.h Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.h Include/Atom/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.h @@ -45,7 +44,6 @@ set(FILES Source/RPI.Edit/Material/MaterialPropertyValueSourceData.cpp Source/RPI.Edit/Material/MaterialPropertyValueSourceDataSerializer.cpp Source/RPI.Edit/Material/MaterialSourceData.cpp - Source/RPI.Edit/Material/MaterialSourceDataSerializer.cpp Source/RPI.Edit/Material/MaterialFunctorSourceData.cpp Source/RPI.Edit/Material/MaterialFunctorSourceDataSerializer.cpp Source/RPI.Edit/Material/MaterialFunctorSourceDataRegistration.cpp From 638fc027f5ea03c2a86a0e454022ccebd640eaa8 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Fri, 14 Jan 2022 13:05:59 -0800 Subject: [PATCH 09/58] Updated material builder version numbers in case my prior changes were impactful (it might not be necessary but I'm not sure, so just in case) Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp | 2 +- .../Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp index 768890a29b..cadb182d03 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp @@ -52,7 +52,7 @@ namespace AZ { AssetBuilderSDK::AssetBuilderDesc materialBuilderDescriptor; materialBuilderDescriptor.m_name = JobKey; - materialBuilderDescriptor.m_version = 115; // material dependency improvements updated + materialBuilderDescriptor.m_version = 116; // more material dependency improvements materialBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern("*.material", AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard)); materialBuilderDescriptor.m_patterns.push_back(AssetBuilderSDK::AssetBuilderPattern("*.materialtype", AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard)); materialBuilderDescriptor.m_busId = azrtti_typeid(); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp index 9a92e7b762..35a903dac0 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp @@ -128,7 +128,7 @@ namespace AZ if (auto* serialize = azrtti_cast(context)) { serialize->Class() - ->Version(21); // material dependency improvements updated + ->Version(22); // more material dependency improvements } } From f87d0f83869426b584d4ef9c0b83749e7c27850c Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Fri, 14 Jan 2022 16:18:26 -0800 Subject: [PATCH 10/58] Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../TestData/Test_Sponza_Material_Conversion_black.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_green.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_mat_arch.material | 2 +- .../Test_Sponza_Material_Conversion_mat_bricks.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_mat_floor.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_mat_roof.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_phong5.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_red.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_white.material | 2 +- .../Gem/Sponza/Assets/objects/lightBlocker_lambert1.material | 2 +- .../Levels/Graphics/PbrMaterialChart/materials/basic.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r00.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r01.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r02.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r03.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r04.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r05.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r06.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r07.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r08.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r09.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m00_r10.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r00.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r01.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r02.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r03.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r04.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r05.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r06.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r07.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r08.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r09.material | 2 +- .../Graphics/PbrMaterialChart/materials/basic_m10_r10.material | 2 +- AutomatedTesting/Materials/DefaultPBRTransparent.material | 2 +- AutomatedTesting/Materials/basic_grey.material | 2 +- .../Objects/MorphTargets/DisplayWrinkleMaskBlendValues.material | 2 +- .../OcclusionCullingPlaneTransparentVisualization.material | 2 +- .../OcclusionCullingPlaneVisualization.material | 2 +- .../Common/Assets/Materials/Presets/PBR/default_grid.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_aluminum.material | 2 +- .../Assets/Materials/Presets/PBR/metal_aluminum_matte.material | 2 +- .../Materials/Presets/PBR/metal_aluminum_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_brass.material | 2 +- .../Assets/Materials/Presets/PBR/metal_brass_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_brass_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_chrome.material | 2 +- .../Assets/Materials/Presets/PBR/metal_chrome_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_chrome_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_cobalt.material | 2 +- .../Assets/Materials/Presets/PBR/metal_cobalt_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_cobalt_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_copper.material | 2 +- .../Assets/Materials/Presets/PBR/metal_copper_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_copper_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_gold.material | 2 +- .../Assets/Materials/Presets/PBR/metal_gold_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_gold_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_iron.material | 2 +- .../Assets/Materials/Presets/PBR/metal_iron_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_iron_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_mercury.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_nickel.material | 2 +- .../Assets/Materials/Presets/PBR/metal_nickel_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_nickel_polished.material | 2 +- .../Assets/Materials/Presets/PBR/metal_palladium.material | 2 +- .../Assets/Materials/Presets/PBR/metal_palladium_matte.material | 2 +- .../Materials/Presets/PBR/metal_palladium_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_platinum.material | 2 +- .../Assets/Materials/Presets/PBR/metal_platinum_matte.material | 2 +- .../Materials/Presets/PBR/metal_platinum_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_silver.material | 2 +- .../Assets/Materials/Presets/PBR/metal_silver_matte.material | 2 +- .../Assets/Materials/Presets/PBR/metal_silver_polished.material | 2 +- .../Common/Assets/Materials/Presets/PBR/metal_titanium.material | 2 +- .../Assets/Materials/Presets/PBR/metal_titanium_matte.material | 2 +- .../Materials/Presets/PBR/metal_titanium_polished.material | 2 +- .../ReflectionProbe/ReflectionProbeVisualization.material | 2 +- Gems/Atom/Feature/Common/Assets/Materials/basic_grey.material | 2 +- Gems/Atom/TestData/TestData/Materials/AutoBrick/Brick.material | 2 +- Gems/Atom/TestData/TestData/Materials/AutoBrick/Tile.material | 2 +- Gems/Atom/TestData/TestData/Materials/ParallaxRock.material | 2 +- .../SkinTestCases/001_hermanubis_regression_test.material | 2 +- .../SkinTestCases/002_wrinkle_regression_test.material | 2 +- .../StandardMultilayerPbrTestCases/001_ManyFeatures.material | 2 +- .../001_ManyFeatures_Layer2Off.material | 2 +- .../001_ManyFeatures_Layer3Off.material | 2 +- .../StandardMultilayerPbrTestCases/002_ParallaxPdo.material | 2 +- .../StandardMultilayerPbrTestCases/003_Debug_BlendMask.material | 2 +- .../003_Debug_BlendWeights.material | 2 +- .../003_Debug_Displacement.material | 2 +- .../StandardMultilayerPbrTestCases/004_UseVertexColors.material | 2 +- .../StandardMultilayerPbrTestCases/005_UseDisplacement.material | 2 +- .../005_UseDisplacement_Layer2Off.material | 2 +- .../005_UseDisplacement_Layer3Off.material | 2 +- .../005_UseDisplacement_With_BlendMaskTexture.material | 2 +- ...UseDisplacement_With_BlendMaskTexture_AllSameHeight.material | 2 +- ..._UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material | 2 +- .../005_UseDisplacement_With_BlendMaskVertexColors.material | 2 +- .../Materials/StandardPbrTestCases/001_DefaultWhite.material | 2 +- .../Materials/StandardPbrTestCases/002_BaseColorLerp.material | 2 +- .../StandardPbrTestCases/002_BaseColorLinearLight.material | 2 +- .../StandardPbrTestCases/002_BaseColorMultiply.material | 2 +- .../Materials/StandardPbrTestCases/003_MetalMatte.material | 2 +- .../Materials/StandardPbrTestCases/003_MetalPolished.material | 2 +- .../Materials/StandardPbrTestCases/004_MetalMap.material | 2 +- .../Materials/StandardPbrTestCases/005_RoughnessMap.material | 2 +- .../Materials/StandardPbrTestCases/006_SpecularF0Map.material | 2 +- .../007_MultiscatteringCompensationOff.material | 2 +- .../007_MultiscatteringCompensationOn.material | 2 +- .../Materials/StandardPbrTestCases/008_NormalMap.material | 2 +- .../StandardPbrTestCases/008_NormalMap_Bevels.material | 2 +- .../Materials/StandardPbrTestCases/009_Opacity_Blended.material | 2 +- .../009_Opacity_Blended_Alpha_Affects_Specular.material | 2 +- .../009_Opacity_Cutout_PackedAlpha_DoubleSided.material | 2 +- .../009_Opacity_Cutout_SplitAlpha_DoubleSided.material | 2 +- .../009_Opacity_Cutout_SplitAlpha_SingleSided.material | 2 +- .../009_Opacity_Opaque_DoubleSided.material | 2 +- .../StandardPbrTestCases/009_Opacity_TintedTransparent.material | 2 +- .../StandardPbrTestCases/010_AmbientOcclusion.material | 2 +- .../Materials/StandardPbrTestCases/010_BothOcclusion.material | 2 +- .../Materials/StandardPbrTestCases/010_OcclusionBase.material | 2 +- .../StandardPbrTestCases/010_SpecularOcclusion.material | 2 +- .../Materials/StandardPbrTestCases/011_Emissive.material | 2 +- .../Materials/StandardPbrTestCases/012_Parallax_POM.material | 2 +- .../StandardPbrTestCases/012_Parallax_POM_Cutout.material | 2 +- .../Materials/StandardPbrTestCases/013_SpecularAA_Off.material | 2 +- .../Materials/StandardPbrTestCases/013_SpecularAA_On.material | 2 +- .../Materials/StandardPbrTestCases/014_ClearCoat.material | 2 +- .../StandardPbrTestCases/014_ClearCoat_NormalMap.material | 2 +- .../StandardPbrTestCases/014_ClearCoat_NormalMap_2ndUv.material | 2 +- .../StandardPbrTestCases/014_ClearCoat_RoughnessMap.material | 2 +- .../StandardPbrTestCases/015_SubsurfaceScattering.material | 2 +- .../015_SubsurfaceScattering_Transmission.material | 2 +- .../StandardPbrTestCases/100_UvTiling_AmbientOcclusion.material | 2 +- .../StandardPbrTestCases/100_UvTiling_BaseColor.material | 2 +- .../StandardPbrTestCases/100_UvTiling_Emissive.material | 2 +- .../StandardPbrTestCases/100_UvTiling_Metallic.material | 2 +- .../Materials/StandardPbrTestCases/100_UvTiling_Normal.material | 2 +- .../100_UvTiling_Normal_Dome_Rotate20.material | 2 +- .../100_UvTiling_Normal_Dome_Rotate90.material | 2 +- .../100_UvTiling_Normal_Dome_ScaleOnlyU.material | 2 +- .../100_UvTiling_Normal_Dome_ScaleOnlyV.material | 2 +- .../100_UvTiling_Normal_Dome_ScaleUniform.material | 2 +- .../100_UvTiling_Normal_Dome_TransformAll.material | 2 +- .../StandardPbrTestCases/100_UvTiling_Opacity.material | 2 +- .../StandardPbrTestCases/100_UvTiling_Parallax_A.material | 2 +- .../StandardPbrTestCases/100_UvTiling_Parallax_B.material | 2 +- .../StandardPbrTestCases/100_UvTiling_Roughness.material | 2 +- .../StandardPbrTestCases/100_UvTiling_SpecularF0.material | 2 +- .../101_DetailMaps_BaseNoDetailMaps.material | 2 +- .../Materials/StandardPbrTestCases/102_DetailMaps_All.material | 2 +- .../StandardPbrTestCases/103_DetailMaps_BaseColor.material | 2 +- .../103_DetailMaps_BaseColorWithMask.material | 2 +- .../StandardPbrTestCases/104_DetailMaps_Normal.material | 2 +- .../StandardPbrTestCases/104_DetailMaps_NormalWithMask.material | 2 +- .../105_DetailMaps_BlendMaskUsingDetailUVs.material | 2 +- .../Materials/StandardPbrTestCases/UvTilingBase.material | 2 +- .../TestData/Objects/ModelHotReload/DisplayVertexColor.material | 2 +- .../Assets/Materials/AnodizedMetal/anodized_metal.material | 2 +- .../Assets/Materials/Asphalt/asphalt.material | 2 +- .../Assets/Materials/BasicFabric/basic_fabric.material | 2 +- .../Assets/Materials/BrushedSteel/brushed_steel.material | 2 +- .../Assets/Materials/CarPaint/car_paint.material | 2 +- .../ReferenceMaterials/Assets/Materials/Coal/coal.material | 2 +- .../Assets/Materials/ConcreteStucco/concrete_stucco.material | 2 +- .../ReferenceMaterials/Assets/Materials/Copper/copper.material | 2 +- .../ReferenceMaterials/Assets/Materials/Fabric/fabric.material | 2 +- .../Assets/Materials/GalvanizedSteel/galvanized_steel.material | 2 +- .../Assets/Materials/GlazedClay/glazed_clay.material | 2 +- .../ReferenceMaterials/Assets/Materials/Gloss/gloss.material | 2 +- .../ReferenceMaterials/Assets/Materials/Gold/gold.material | 2 +- .../ReferenceMaterials/Assets/Materials/Ground/ground.material | 2 +- .../ReferenceMaterials/Assets/Materials/Iron/iron.material | 2 +- .../Assets/Materials/Leather/dark_leather.material | 2 +- .../Assets/Materials/Light_Leather/light_leather.material | 2 +- .../Materials/MicrofiberFabric/microfiber_fabric.material | 2 +- .../Assets/Materials/MixedStones/mixed_stones.material | 2 +- .../ReferenceMaterials/Assets/Materials/Nickle/nickle.material | 2 +- .../Assets/Materials/Plaster/plaster.material | 2 +- .../Assets/Materials/Plastic_01/plastic_01.material | 2 +- .../Assets/Materials/Plastic_02/plastic_02.material | 2 +- .../Assets/Materials/Plastic_03/plastic_03.material | 2 +- .../Assets/Materials/Platinum/platinum.material | 2 +- .../Assets/Materials/Porcelain/porcelain.material | 2 +- .../Materials/RotaryBrushedSteel/rotary_brushed_steel.material | 2 +- .../ReferenceMaterials/Assets/Materials/Rust/rust.material | 2 +- .../ReferenceMaterials/Assets/Materials/Suede/suede.material | 2 +- .../Assets/Materials/TireRubber/tire_rubber.material | 2 +- .../Assets/Materials/WoodPlanks/wood_planks.material | 2 +- .../Assets/Materials/WornMetal/warn_metal.material | 2 +- .../ReferenceMaterials/Assets/Materials/black.material | 2 +- .../ReferenceMaterials/Assets/Materials/blue.material | 2 +- .../ReferenceMaterials/Assets/Materials/green.material | 2 +- .../ReferenceMaterials/Assets/Materials/grey.material | 2 +- .../ReferenceMaterials/Assets/Materials/red.material | 2 +- .../ReferenceMaterials/Assets/Materials/white.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_black.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_green.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_mat_arch.material | 2 +- .../Test_Sponza_Material_Conversion_mat_bricks.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_mat_floor.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_mat_roof.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_phong5.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_red.material | 2 +- .../TestData/Test_Sponza_Material_Conversion_white.material | 2 +- .../Sponza/Assets/objects/lightBlocker_lambert1.material | 2 +- .../Atom/Scripts/Python/DCC_Materials/maya_materials_export.py | 2 +- .../SDK/Atom/Scripts/Python/DCC_Materials/pbr.material | 2 +- .../SDK/Maya/Scripts/Python/dcc_materials/main.py | 2 +- .../SDK/Maya/Scripts/Python/dcc_materials/materials_export.py | 2 +- .../SDK/Maya/Scripts/Python/dcc_materials/pbr.material | 2 +- .../Python/kitbash_converter/standardPBR.template.material | 2 +- .../Python/legacy_asset_converter/standardPBR.template.material | 2 +- .../Scripts/Python/maya_dcc_materials/maya_materials_export.py | 2 +- .../Python/maya_dcc_materials/standardpbr.template.material | 2 +- .../stingraypbs_converter/StandardPBR_AllProperties.material | 2 +- .../Substance/resources/atom/StandardPBR_AllProperties.material | 2 +- .../SDK/Substance/resources/atom/atom.material | 2 +- .../SDK/Substance/resources/atom/atom_variant00.material | 2 +- .../Tools/Resources/Atom/StandardPBR_AllProperties.material | 2 +- .../cloth/Chicken/Actor/chicken_chicken_body_mat.material | 2 +- .../cloth/Chicken/Actor/chicken_chicken_eye_mat.material | 2 +- .../Assets/Objects/cloth/Environment/cloth_blinds.material | 2 +- .../Objects/cloth/Environment/cloth_blinds_broken.material | 2 +- .../cloth/Environment/cloth_locked_corners_four.material | 2 +- .../Objects/cloth/Environment/cloth_locked_corners_two.material | 2 +- .../Assets/Objects/cloth/Environment/cloth_locked_edge.material | 2 +- .../Assets/Objects/_Primitives/_Box_1x1_MiddleGrey.material | 2 +- .../Objects/_Primitives/_Cylinder_1x1_MiddleGrey.material | 2 +- .../Assets/Objects/_Primitives/_Sphere_1x1_MiddleGrey.material | 2 +- .../Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material | 2 +- 231 files changed, 231 insertions(+), 231 deletions(-) diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material index cc2c9e785b..d15aa620c7 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material index a4bfb73d12..579359b085 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material index fe9c54bc02..88d5fc0fc6 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material index a19afa33e2..7244397ee9 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material index 0c1208d8fb..8a3f289c26 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material index 6aad4d644a..7bc193978f 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material index 302589dc85..a53cbef4e4 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material index 5217a4e4be..6ddb645319 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material index dba44f7b49..e3d310cd15 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material +++ b/AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "emissive": { "color": [ diff --git a/AutomatedTesting/Gem/Sponza/Assets/objects/lightBlocker_lambert1.material b/AutomatedTesting/Gem/Sponza/Assets/objects/lightBlocker_lambert1.material index c8e9f1f8f7..35677a81c6 100644 --- a/AutomatedTesting/Gem/Sponza/Assets/objects/lightBlocker_lambert1.material +++ b/AutomatedTesting/Gem/Sponza/Assets/objects/lightBlocker_lambert1.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "emissive": { "color": [ diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic.material index 32ac8dfd10..6af3ceb0c1 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic.material @@ -1,6 +1,6 @@ { "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "baseColor": { "color": [ 1.0, 1.0, 1.0 ], diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r00.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r00.material index 1c1096bf12..541bd83981 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r00.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r00.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r01.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r01.material index 33148f3f73..19691258e0 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r01.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r01.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r02.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r02.material index 38339454cb..46fda2aab1 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r02.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r02.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r03.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r03.material index e21ab5775a..79cf4bf401 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r03.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r03.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r04.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r04.material index 0272e66081..9aabf3e158 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r04.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r04.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r05.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r05.material index 67d51777a4..8b02f225fc 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r05.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r05.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r06.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r06.material index 3136f654e6..5b089da4bd 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r06.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r06.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r07.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r07.material index a79744ea11..25741cf689 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r07.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r07.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r08.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r08.material index 1372283500..04103273f2 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r08.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r08.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r09.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r09.material index d1c951e53c..74eb68da99 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r09.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r09.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r10.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r10.material index d34fc46530..3533ca6676 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r10.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r10.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 0.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r00.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r00.material index 92ddfec7c4..d2ce0fadc9 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r00.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r00.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r01.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r01.material index 874422384a..8d96ea6217 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r01.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r01.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r02.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r02.material index b017add10b..e8feb87283 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r02.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r02.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r03.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r03.material index 5353d651c8..c14591bd52 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r03.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r03.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r04.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r04.material index 6dd47e4e3b..60a3167f02 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r04.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r04.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r05.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r05.material index 04912cbfd4..d71ff06961 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r05.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r05.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r06.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r06.material index 27f7f6ff42..6fa8cfe1a6 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r06.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r06.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r07.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r07.material index e2b5df681c..773cc66f03 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r07.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r07.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r08.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r08.material index 5418f9c855..6971597d1d 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r08.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r08.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r09.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r09.material index dd1ec3489a..c2d8cc47bd 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r09.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r09.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r10.material b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r10.material index 5f9317d2cc..906879b0ea 100644 --- a/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r10.material +++ b/AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r10.material @@ -1,7 +1,7 @@ { "parentMaterial": "./basic.material", "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "metallic": { "factor": 1.0 diff --git a/AutomatedTesting/Materials/DefaultPBRTransparent.material b/AutomatedTesting/Materials/DefaultPBRTransparent.material index 7c8aa6cf94..a7000d5371 100644 --- a/AutomatedTesting/Materials/DefaultPBRTransparent.material +++ b/AutomatedTesting/Materials/DefaultPBRTransparent.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/Presets/PBR/default_grid.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "opacity": { "mode": "Blended" diff --git a/AutomatedTesting/Materials/basic_grey.material b/AutomatedTesting/Materials/basic_grey.material index 0b890db4c6..6ecc1e029a 100644 --- a/AutomatedTesting/Materials/basic_grey.material +++ b/AutomatedTesting/Materials/basic_grey.material @@ -1,6 +1,6 @@ { "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "baseColor": { "color": [ 0.18, 0.18, 0.18 ], diff --git a/AutomatedTesting/Objects/MorphTargets/DisplayWrinkleMaskBlendValues.material b/AutomatedTesting/Objects/MorphTargets/DisplayWrinkleMaskBlendValues.material index 878b3ac39f..52c323b454 100644 --- a/AutomatedTesting/Objects/MorphTargets/DisplayWrinkleMaskBlendValues.material +++ b/AutomatedTesting/Objects/MorphTargets/DisplayWrinkleMaskBlendValues.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/Skin.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "wrinkleLayers": { "count": 3, diff --git a/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneTransparentVisualization.material b/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneTransparentVisualization.material index 981e392eef..11d8d44e94 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneTransparentVisualization.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneTransparentVisualization.material @@ -1,6 +1,6 @@ { "materialType": "Materials\\Types\\StandardPBR.materialtype", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "enableShadows": false, diff --git a/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneVisualization.material b/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneVisualization.material index 4446cc2d9d..50440b714f 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneVisualization.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneVisualization.material @@ -1,6 +1,6 @@ { "materialType": "Materials\\Types\\StandardPBR.materialtype", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "enableShadows": false, diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/default_grid.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/default_grid.material index 387d022bd2..05345a1649 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/default_grid.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/default_grid.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Textures/Default/default_basecolor.tif" diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum.material index ece08a3492..38ebe17687 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_matte.material index afc2bb56f3..c3ec8a9266 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_polished.material index 27fa2bb11e..90c62b6d76 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass.material index 77f658aafa..e456d147e1 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_matte.material index d9c72471c8..11705a2bf8 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_polished.material index 57b5a15e54..5a2b2433d4 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome.material index 50e21d481c..cb8a8fad1e 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_matte.material index 55e1b0c3bc..1592c4c095 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_polished.material index ce6599837c..6c2e403fc9 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt.material index be4067570d..ea399542c0 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_matte.material index 09aed7ba63..c20f50c95e 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_polished.material index c1e6ca7798..7f00525f4d 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper.material index 3970606e7d..23b9fba63d 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_matte.material index d0385eebde..e16cf0bb4e 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_polished.material index 5e52702d21..53fac02767 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold.material index 2638e76a74..6ee7eed53f 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_matte.material index fd21141048..6fa842b6f7 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_polished.material index 5861c7b533..55a5412af1 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron.material index c35f8ca755..cac874c583 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_matte.material index 1ed1dd4dad..1373ff0108 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_polished.material index e60d31bd6d..59e1330993 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_mercury.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_mercury.material index e2d304ab32..82fbde8db3 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_mercury.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_mercury.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel.material index a158fa2777..0e3aacc785 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_matte.material index 4ae75d3a42..db72087d30 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_polished.material index 48effb1c94..d4467508ae 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium.material index 2b2a6f148a..0e91117519 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_matte.material index 1ab89f90ad..b7a5648fcf 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_polished.material index 5b7879c3fa..d8e398a7de 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum.material index 678c3321ce..f450fb66b0 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_matte.material index 7afa0809bb..a515ba5aaf 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_polished.material index df6a8fb595..5b3d184631 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver.material index a53c252144..14247e6421 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_matte.material index 588f90c3d1..e98fd5376d 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_polished.material index 96fbdee686..ae757460a5 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium.material index a34430bd7d..c3ce0014a1 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_matte.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_matte.material index 52ebc71d9c..0745b4894d 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_matte.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_matte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_polished.material b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_polished.material index b9dd832849..ff2d7734ad 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_polished.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_polished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/Feature/Common/Assets/Materials/ReflectionProbe/ReflectionProbeVisualization.material b/Gems/Atom/Feature/Common/Assets/Materials/ReflectionProbe/ReflectionProbeVisualization.material index e9bb191532..f4063ba923 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/ReflectionProbe/ReflectionProbeVisualization.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/ReflectionProbe/ReflectionProbeVisualization.material @@ -1,6 +1,6 @@ { "materialType": "ReflectionProbeVisualization.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "general": { "enableShadows": false, diff --git a/Gems/Atom/Feature/Common/Assets/Materials/basic_grey.material b/Gems/Atom/Feature/Common/Assets/Materials/basic_grey.material index 0b890db4c6..6ecc1e029a 100644 --- a/Gems/Atom/Feature/Common/Assets/Materials/basic_grey.material +++ b/Gems/Atom/Feature/Common/Assets/Materials/basic_grey.material @@ -1,6 +1,6 @@ { "materialType": "Materials/Types/StandardPBR.materialtype", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "baseColor": { "color": [ 0.18, 0.18, 0.18 ], diff --git a/Gems/Atom/TestData/TestData/Materials/AutoBrick/Brick.material b/Gems/Atom/TestData/TestData/Materials/AutoBrick/Brick.material index aaa2dc455f..061510d4c2 100644 --- a/Gems/Atom/TestData/TestData/Materials/AutoBrick/Brick.material +++ b/Gems/Atom/TestData/TestData/Materials/AutoBrick/Brick.material @@ -2,7 +2,7 @@ "description": "", "materialType": "TestData/Materials/Types/AutoBrick.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "appearance": { "ao": 0.5252525210380554, diff --git a/Gems/Atom/TestData/TestData/Materials/AutoBrick/Tile.material b/Gems/Atom/TestData/TestData/Materials/AutoBrick/Tile.material index 37c17e5616..b81ff4110b 100644 --- a/Gems/Atom/TestData/TestData/Materials/AutoBrick/Tile.material +++ b/Gems/Atom/TestData/TestData/Materials/AutoBrick/Tile.material @@ -2,7 +2,7 @@ "description": "", "materialType": "TestData/Materials/Types/AutoBrick.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "appearance": { "ao": 0.010100999847054482, diff --git a/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material b/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material index c9276216eb..1e140b9cf7 100644 --- a/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material +++ b/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/Presets/PBR/default_grid.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseTextureMap": "TestData/Textures/cc0/Rock030_2K_AmbientOcclusion.jpg" diff --git a/Gems/Atom/TestData/TestData/Materials/SkinTestCases/001_hermanubis_regression_test.material b/Gems/Atom/TestData/TestData/Materials/SkinTestCases/001_hermanubis_regression_test.material index e6c032b0f9..be607e7721 100644 --- a/Gems/Atom/TestData/TestData/Materials/SkinTestCases/001_hermanubis_regression_test.material +++ b/Gems/Atom/TestData/TestData/Materials/SkinTestCases/001_hermanubis_regression_test.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/Skin.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material b/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material index 9b955ddb1d..4222108b5e 100644 --- a/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material +++ b/Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/Skin.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material index 415bd36dcf..f683ad052d 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "enableLayer2": true, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer2Off.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer2Off.material index d91cfb34eb..042f31f3ec 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer2Off.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer2Off.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "enableLayer2": false diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer3Off.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer3Off.material index 3ee48df612..59fc168a6c 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer3Off.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer3Off.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "enableLayer3": false diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material index 64adf317a9..a1d3c288ea 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "enableLayer2": true, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material index ffcbf3ce7e..b7be8ab18f 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "debugDrawMode": "BlendMask" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material index 8d13ac781f..99a9c9f382 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "debugDrawMode": "FinalBlendWeights" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material index 7aff50cb56..6dbee69845 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "debugDrawMode": "Displacement" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material index ea3ea8b519..b53df9a505 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "blendSource": "BlendMaskVertexColors" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material index 9163fe0a0c..f313080cce 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "blendSource": "Displacement", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material index 9413e35128..6f64bcd49f 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "enableLayer2": false diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material index 93e0b21780..8b32223c82 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "enableLayer3": false diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material index 6b062f6d1e..023316c5f6 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "blendSource": "Displacement_With_BlendMaskTexture" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material index 0e6519afd4..d88802d4de 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "displacementBlendDistance": 0.0010000000474974514 diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material index b5b5656084..9ba4d20a9a 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "layer1_parallax": { "offset": -0.03200000151991844, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material index 8461ea429c..51219aa180 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "blendSource": "Displacement_With_BlendMaskVertexColors", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/001_DefaultWhite.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/001_DefaultWhite.material index 2e4eee7f8e..164b73c892 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/001_DefaultWhite.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/001_DefaultWhite.material @@ -2,5 +2,5 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3 + "materialTypeVersion": 3 } \ No newline at end of file diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLerp.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLerp.material index f8214e1b2e..29329a03a2 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLerp.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLerp.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLinearLight.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLinearLight.material index bf31a4a111..46a8fd70ef 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLinearLight.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLinearLight.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorMultiply.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorMultiply.material index b3b67448ea..7abf4ca40c 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorMultiply.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorMultiply.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalMatte.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalMatte.material index 12690076c3..73ad13e27b 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalMatte.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalMatte.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalPolished.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalPolished.material index 41496bd801..9dea40d6ec 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalPolished.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/003_MetalPolished.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/004_MetalMap.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/004_MetalMap.material index ebc65557ec..d20e354a53 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/004_MetalMap.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/004_MetalMap.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/005_RoughnessMap.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/005_RoughnessMap.material index e770537005..283c6ac60b 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/005_RoughnessMap.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/005_RoughnessMap.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/006_SpecularF0Map.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/006_SpecularF0Map.material index d0e0dccf1e..11228e2199 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/006_SpecularF0Map.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/006_SpecularF0Map.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOff.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOff.material index de9886ac46..3b9779aac1 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOff.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOff.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOn.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOn.material index 411646effc..dbbcdc631d 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOn.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/007_MultiscatteringCompensationOn.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap.material index c5561823ed..4b2842a594 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap_Bevels.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap_Bevels.material index b26cb927d0..aec3bbf478 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap_Bevels.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/008_NormalMap_Bevels.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.30000001192092898, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended.material index 98dd6baecd..1528403868 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended_Alpha_Affects_Specular.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended_Alpha_Affects_Specular.material index dbaec36136..20f5ccf098 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended_Alpha_Affects_Specular.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Blended_Alpha_Affects_Specular.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_PackedAlpha_DoubleSided.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_PackedAlpha_DoubleSided.material index 5545e5a482..d8683681c4 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_PackedAlpha_DoubleSided.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_PackedAlpha_DoubleSided.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "TestData/Textures/Foliage_Leaves_0_BaseColor.dds" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_DoubleSided.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_DoubleSided.material index 960a8b0700..8e8dad46d8 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_DoubleSided.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_DoubleSided.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "opacity": { "alphaSource": "Split", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_SingleSided.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_SingleSided.material index 2adc42141c..2d9b4c514b 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_SingleSided.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Cutout_SplitAlpha_SingleSided.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "opacity": { "alphaSource": "Split", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Opaque_DoubleSided.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Opaque_DoubleSided.material index a26bf6e045..f7ac93a7ac 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Opaque_DoubleSided.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_Opaque_DoubleSided.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Textures/Default/checker_uv_basecolor.png" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material index 1716792af1..9d36d0a7e6 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_AmbientOcclusion.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_AmbientOcclusion.material index 28f43a9a57..a7fe0d1d4d 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_AmbientOcclusion.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_AmbientOcclusion.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "010_OcclusionBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseFactor": 2.0, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_BothOcclusion.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_BothOcclusion.material index cee64dd107..1f9c94db47 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_BothOcclusion.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_BothOcclusion.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "010_OcclusionBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseFactor": 2.0, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_OcclusionBase.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_OcclusionBase.material index 9a41a7d191..534305b68a 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_OcclusionBase.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_OcclusionBase.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_SpecularOcclusion.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_SpecularOcclusion.material index 703088d6f8..6403bc5c14 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_SpecularOcclusion.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/010_SpecularOcclusion.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "010_OcclusionBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "specularFactor": 2.0, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/011_Emissive.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/011_Emissive.material index 97d657b82b..dc42c0d6b5 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/011_Emissive.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/011_Emissive.material @@ -1,7 +1,7 @@ { "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Textures/Default/default_basecolor.tif" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material index ed070d5de2..fee4a30f77 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material @@ -1,7 +1,7 @@ { "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "TestData/Textures/TextureHaven/4k_castle_brick_02_red/4k_castle_brick_02_red_bc.png" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material index f5ec0e8287..d69b75285e 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "TestData/Textures/TextureHaven/4k_castle_brick_02_red/4k_castle_brick_02_red_bc.png" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_Off.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_Off.material index 666bf45d57..a1da93acbb 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_Off.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_Off.material @@ -1,7 +1,7 @@ { "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "metallic": { "factor": 1.0 diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_On.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_On.material index 0581280d67..07018e9140 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_On.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/013_SpecularAA_On.material @@ -1,7 +1,7 @@ { "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "applySpecularAA": true diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat.material index c23f71e7df..e02a8b5fc2 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap.material index caa9f88818..56d8515305 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap_2ndUv.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap_2ndUv.material index 04d2051e8e..e7575d8bd6 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap_2ndUv.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_NormalMap_2ndUv.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_RoughnessMap.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_RoughnessMap.material index 51915a7bb0..3ccbfeacc1 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_RoughnessMap.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/014_ClearCoat_RoughnessMap.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material index 37a9b1144e..fb3621f056 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "subsurfaceScattering": { "enableSubsurfaceScattering": true, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material index 38adbc70cd..eff175be77 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "subsurfaceScattering": { "enableSubsurfaceScattering": true, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_AmbientOcclusion.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_AmbientOcclusion.material index e1260ab4f2..d88c1f151f 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_AmbientOcclusion.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_AmbientOcclusion.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseTextureMap": "TestData/Objects/cube/cube_diff.tif" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_BaseColor.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_BaseColor.material index 5dd3b88e1b..89bd1005a5 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_BaseColor.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_BaseColor.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "TestData/Objects/cube/cube_diff.tif" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Emissive.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Emissive.material index 21f2733d94..564de16cc2 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Emissive.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Emissive.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Metallic.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Metallic.material index 6c5f72faa1..0eff6198dd 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Metallic.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Metallic.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "metallic": { "factor": 1.0, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal.material index d53fbec47e..e50c669114 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "textureMap": "TestData/Objects/cube/cube_diff.tif" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate20.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate20.material index d693224e78..0b3d678bdd 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate20.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate20.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.15000000596046449, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate90.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate90.material index 19e3fce5e6..4a7ade8b30 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate90.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_Rotate90.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.15000000596046449, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyU.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyU.material index 44345f37c9..c0477ac5cf 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyU.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyU.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.15000000596046449, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyV.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyV.material index 2fadfa6e22..b088a0c090 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyV.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleOnlyV.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.15000000596046449, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleUniform.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleUniform.material index 476ba647be..c7c3fac87f 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleUniform.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_ScaleUniform.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.15000000596046449, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_TransformAll.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_TransformAll.material index d3db77e1eb..849e926031 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_TransformAll.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Normal_Dome_TransformAll.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "normal": { "factor": 0.15000000596046449, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Opacity.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Opacity.material index 5e8a0438dd..b203ec5318 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Opacity.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Opacity.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "opacity": { "alphaSource": "Split", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material index b3e69212db..ad2e27063b 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "TestData/Materials/StandardPbrTestCases/UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "TestData/Objects/cube/cube_diff.tif" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material index 3d52f3b9e6..75646e5191 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "TestData/Materials/StandardPbrTestCases/UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "TestData/Objects/cube/cube_diff.tif" diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Roughness.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Roughness.material index 4aa4b4a651..49ff9555f1 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Roughness.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Roughness.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "metallic": { "factor": 1.0 diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_SpecularF0.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_SpecularF0.material index bf53b57022..a750e30d80 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_SpecularF0.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_SpecularF0.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "TestData\\Materials\\StandardPbrTestCases\\UvTilingBase.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_BaseNoDetailMaps.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_BaseNoDetailMaps.material index 82192bac41..30959fc972 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_BaseNoDetailMaps.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_BaseNoDetailMaps.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Objects/Hermanubis/Hermanubis_bronze_BaseColor.png", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material index dd31d00db0..2cb14b490e 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Objects/Hermanubis/Hermanubis_bronze_BaseColor.png", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColor.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColor.material index eda8ef12de..826ae2d737 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColor.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColor.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "TestData/Materials/StandardPbrTestCases/101_DetailMaps_BaseNoDetailMaps.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "detailLayerGroup": { "baseColorDetailBlend": 0.800000011920929, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColorWithMask.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColorWithMask.material index 28c922a240..1c2214a031 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColorWithMask.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColorWithMask.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "TestData/Materials/StandardPbrTestCases/103_DetailMaps_BaseColor.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "detailLayerGroup": { "baseColorDetailBlend": 1.0, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_Normal.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_Normal.material index 291f0fc828..9a80cfaaa0 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_Normal.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_Normal.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "TestData/Materials/StandardPbrTestCases/101_DetailMaps_BaseNoDetailMaps.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "detailLayerGroup": { "enableDetailLayer": true, diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_NormalWithMask.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_NormalWithMask.material index 1c11d653c0..0ee81633ae 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_NormalWithMask.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/104_DetailMaps_NormalWithMask.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "TestData/Materials/StandardPbrTestCases/104_DetailMaps_Normal.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "detailLayerGroup": { "blendDetailMask": "TestData/Textures/checker8x8_gray_512.png", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material index 6964342447..b2747ead21 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/EnhancedPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Objects/Hermanubis/Hermanubis_bronze_BaseColor.png", diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/UvTilingBase.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/UvTilingBase.material index 48c287552f..be607db929 100644 --- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/UvTilingBase.material +++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/UvTilingBase.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\Types\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "uv": { "center": [ diff --git a/Gems/Atom/TestData/TestData/Objects/ModelHotReload/DisplayVertexColor.material b/Gems/Atom/TestData/TestData/Objects/ModelHotReload/DisplayVertexColor.material index 104d675387..8a2f45260a 100644 --- a/Gems/Atom/TestData/TestData/Objects/ModelHotReload/DisplayVertexColor.material +++ b/Gems/Atom/TestData/TestData/Objects/ModelHotReload/DisplayVertexColor.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardMultilayerPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "blend": { "blendSource": "BlendMaskVertexColors", diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/AnodizedMetal/anodized_metal.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/AnodizedMetal/anodized_metal.material index cb2c725678..9672075409 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/AnodizedMetal/anodized_metal.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/AnodizedMetal/anodized_metal.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Asphalt/asphalt.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Asphalt/asphalt.material index a004cefd18..76cabce752 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Asphalt/asphalt.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Asphalt/asphalt.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Asphalt/asphalt_basecolor.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BasicFabric/basic_fabric.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BasicFabric/basic_fabric.material index bf26749d3c..30a203a43a 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BasicFabric/basic_fabric.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BasicFabric/basic_fabric.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/BasicFabric/basic_fabric_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BrushedSteel/brushed_steel.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BrushedSteel/brushed_steel.material index 0a98da1143..8feed25399 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BrushedSteel/brushed_steel.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/BrushedSteel/brushed_steel.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "factor": 0.9292929172515869, diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/CarPaint/car_paint.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/CarPaint/car_paint.material index 3cd0e542fa..92544dd7be 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/CarPaint/car_paint.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/CarPaint/car_paint.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Coal/coal.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Coal/coal.material index 78ceb399ee..4c377178d3 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Coal/coal.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Coal/coal.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material index d4e2016022..c5c2e24a2a 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material index 80b7ea29f3..56d0fb1357 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Copper/copper.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Fabric/fabric.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Fabric/fabric.material index ff3a250b96..c2a71513ff 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Fabric/fabric.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Fabric/fabric.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Fabric/fabric_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GalvanizedSteel/galvanized_steel.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GalvanizedSteel/galvanized_steel.material index aca0648374..83dc076c23 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GalvanizedSteel/galvanized_steel.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GalvanizedSteel/galvanized_steel.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/GalvanizedSteel/galvanized_steel.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GlazedClay/glazed_clay.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GlazedClay/glazed_clay.material index 66f4dd7d00..ff82c9b03f 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GlazedClay/glazed_clay.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/GlazedClay/glazed_clay.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gloss/gloss.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gloss/gloss.material index ceaca4a274..3e2b1fb56e 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gloss/gloss.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gloss/gloss.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gold/gold.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gold/gold.material index b9ee3e5a12..a5e0fa4dba 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gold/gold.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Gold/gold.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Ground/ground.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Ground/ground.material index 86f84d4c84..63e9c49fba 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Ground/ground.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Ground/ground.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Ground/ground_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Iron/iron.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Iron/iron.material index d859a4a4cf..0ec8cc4819 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Iron/iron.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Iron/iron.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Leather/dark_leather.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Leather/dark_leather.material index 6c14a0c7fe..46d8511186 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Leather/dark_leather.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Leather/dark_leather.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Leather/leather_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Light_Leather/light_leather.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Light_Leather/light_leather.material index 1ae26a8e0d..a73e80b6cb 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Light_Leather/light_leather.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Light_Leather/light_leather.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Light_Leather/light_leather_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MicrofiberFabric/microfiber_fabric.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MicrofiberFabric/microfiber_fabric.material index d2f5964457..5d6b123c5d 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MicrofiberFabric/microfiber_fabric.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MicrofiberFabric/microfiber_fabric.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MixedStones/mixed_stones.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MixedStones/mixed_stones.material index b6dea22b24..c3a916b0bb 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MixedStones/mixed_stones.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/MixedStones/mixed_stones.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/MixedStones/mixed_stones_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Nickle/nickle.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Nickle/nickle.material index 82ff63aa20..9bec82bfd2 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Nickle/nickle.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Nickle/nickle.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material index cdf76f612d..73ff1024e3 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plaster/plaster.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material index 227017e1ab..bbac80a528 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_01/plastic_01.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_02/plastic_02.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_02/plastic_02.material index c30c3234c0..52c7ec11fb 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_02/plastic_02.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_02/plastic_02.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_03/plastic_03.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_03/plastic_03.material index 433c56251d..e7feda6620 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_03/plastic_03.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Plastic_03/plastic_03.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Platinum/platinum.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Platinum/platinum.material index 6613a21f2c..95b9f5767c 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Platinum/platinum.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Platinum/platinum.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Porcelain/porcelain.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Porcelain/porcelain.material index cef8ed194e..9b481628b5 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Porcelain/porcelain.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Porcelain/porcelain.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/RotaryBrushedSteel/rotary_brushed_steel.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/RotaryBrushedSteel/rotary_brushed_steel.material index 866c18d650..ae6753bffc 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/RotaryBrushedSteel/rotary_brushed_steel.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/RotaryBrushedSteel/rotary_brushed_steel.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Rust/rust.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Rust/rust.material index f6f2bdc52b..0ef4da333e 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Rust/rust.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Rust/rust.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Rust/rust_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Suede/suede.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Suede/suede.material index 782ed7451c..ae3288cbe9 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Suede/suede.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/Suede/suede.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/Suede/suede_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/TireRubber/tire_rubber.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/TireRubber/tire_rubber.material index 2fc5cec7a4..1cbd3a168a 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/TireRubber/tire_rubber.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/TireRubber/tire_rubber.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WoodPlanks/wood_planks.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WoodPlanks/wood_planks.material index 91f89a0a1b..0320a9a0f7 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WoodPlanks/wood_planks.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WoodPlanks/wood_planks.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/WoodPlanks/wood_planks_diffuse.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WornMetal/warn_metal.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WornMetal/warn_metal.material index cfdba2d2ef..876b404156 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WornMetal/warn_metal.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/WornMetal/warn_metal.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Materials/WornMetal/worn_metal_basecolor.jpg" diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/black.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/black.material index 56759107c9..f610fd7da0 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/black.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/black.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/white.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/blue.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/blue.material index 4691b674e0..1318552396 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/blue.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/blue.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/white.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/green.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/green.material index 6e118ddc7c..c378e48167 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/green.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/green.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/white.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/grey.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/grey.material index 82e8b17127..751561f5d1 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/grey.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/grey.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/white.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/red.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/red.material index 2527f82148..edb1cde854 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/red.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/red.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "Materials/white.material", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/white.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/white.material index bfb95933c4..b7383ff5e0 100644 --- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/white.material +++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/white.material @@ -2,5 +2,5 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3 + "materialTypeVersion": 3 } diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material index cc2c9e785b..d15aa620c7 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material index a4bfb73d12..579359b085 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material index fe9c54bc02..88d5fc0fc6 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material index a19afa33e2..7244397ee9 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material index 0c1208d8fb..8a3f289c26 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material index 6aad4d644a..7bc193978f 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material index 302589dc85..a53cbef4e4 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material index 5217a4e4be..6ddb645319 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material index dba44f7b49..e3d310cd15 100644 --- a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "emissive": { "color": [ diff --git a/Gems/AtomContent/Sponza/Assets/objects/lightBlocker_lambert1.material b/Gems/AtomContent/Sponza/Assets/objects/lightBlocker_lambert1.material index c8e9f1f8f7..35677a81c6 100644 --- a/Gems/AtomContent/Sponza/Assets/objects/lightBlocker_lambert1.material +++ b/Gems/AtomContent/Sponza/Assets/objects/lightBlocker_lambert1.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "emissive": { "color": [ diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py index d7280dc8cc..d5593002c9 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py @@ -382,7 +382,7 @@ class MayaToLumberyard(QtWidgets.QWidget): material = {'description': name, 'materialType': default_settings.get('materialType'), 'parentMaterial': default_settings.get('parentMaterial'), - 'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'), + 'materialTypeVersion': default_settings.get('materialTypeVersion'), 'properties': self.get_shader_properties(name, material_type, file_connections)} self.material_definitions[name if name not in self.material_definitions.keys() else self.get_increment(name)] = material diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/pbr.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/pbr.material index 94fc5a16bd..f156f60d33 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/pbr.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/pbr.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseFactor": 1.0, diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py index 860273d1eb..869f9bafc5 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py @@ -628,7 +628,7 @@ class MaterialsToLumberyard(QtWidgets.QWidget): 'description': name, 'materialType': default_settings.get('materialType'), 'parentMaterial': default_settings.get('parentMaterial'), - 'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'), + 'materialTypeVersion': default_settings.get('materialTypeVersion'), 'properties': self.get_lumberyard_material_properties(name, dcc_app, material_type, file_connections)} self.lumberyard_materials_dictionary[name if name not in self.lumberyard_materials_dictionary.keys() else self.get_filename_increment(name)] = material diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py index ea0182bb9b..5243a45ec9 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py @@ -546,7 +546,7 @@ class MaterialsToLumberyard(QtWidgets.QWidget): 'description': name, 'materialType': default_settings.get('materialType'), 'parentMaterial': default_settings.get('parentMaterial'), - 'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'), + 'materialTypeVersion': default_settings.get('materialTypeVersion'), 'properties': self.get_lumberyard_material_properties(name, material_type, file_connections)} self.material_definitions[name if name not in self.material_definitions.keys() else self.get_filename_increment(name)] = material diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/pbr.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/pbr.material index 94fc5a16bd..f156f60d33 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/pbr.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/pbr.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseFactor": 1.0, diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standardPBR.template.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standardPBR.template.material index cc2c548174..71d3df3471 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standardPBR.template.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standardPBR.template.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "texcoord": 0 diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/standardPBR.template.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/standardPBR.template.material index 78891d6c46..fe2a22a1fe 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/standardPBR.template.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/standardPBR.template.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "texcoord": 0 diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py index ad481ba5b1..e7ec878397 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py @@ -387,7 +387,7 @@ class MayaToLumberyard(QtWidgets.QWidget): material = {'description': name, 'materialType': default_settings.get('materialType'), 'parentMaterial': default_settings.get('parentMaterial'), - 'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'), + 'materialTypeVersion': default_settings.get('materialTypeVersion'), 'properties': self.get_shader_properties(name, material_type, file_connections)} self.material_definitions[name if name not in self.material_definitions.keys() else self.get_increment(name)] = material diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/standardpbr.template.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/standardpbr.template.material index 30d895f9ac..936b6a0eb1 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/standardpbr.template.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/standardpbr.template.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseFactor": 1.0, diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/StandardPBR_AllProperties.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/StandardPBR_AllProperties.material index 00ff63829f..c5f8395e5e 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/StandardPBR_AllProperties.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/StandardPBR_AllProperties.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "occlusion": { "diffuseFactor": 1.0, diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/StandardPBR_AllProperties.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/StandardPBR_AllProperties.material index 7d38d1a1a3..052c0a3dcb 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/StandardPBR_AllProperties.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/StandardPBR_AllProperties.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "texcoord": 0 diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom.material index 26f4dd7508..60b3f7021f 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom.material @@ -1,7 +1,7 @@ { "material": { "baseMaterial": "StaticMesh.basematerial", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "general": { "DiffuseColor": [ 1.0, 0.5, 0.5, 1.0 ], diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom_variant00.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom_variant00.material index 26d30908b8..dc4e2293b9 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom_variant00.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom_variant00.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials\\StandardPBR\\StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "texcoord": 0 diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Resources/Atom/StandardPBR_AllProperties.material b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Resources/Atom/StandardPBR_AllProperties.material index 7d38d1a1a3..052c0a3dcb 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Resources/Atom/StandardPBR_AllProperties.material +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Resources/Atom/StandardPBR_AllProperties.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "general": { "texcoord": 0 diff --git a/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_body_mat.material b/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_body_mat.material index 2ebfc261b7..8e7c325700 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_body_mat.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_body_mat.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_eye_mat.material b/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_eye_mat.material index 87c8b7dab5..61041448c5 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_eye_mat.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_chicken_eye_mat.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds.material b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds.material index 8d645287f6..1350910624 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds_broken.material b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds_broken.material index 9340723882..64db8c1444 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds_broken.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_blinds_broken.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_four.material b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_four.material index 682be41887..a55b9cc715 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_four.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_four.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_two.material b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_two.material index 6ff5a554d3..0294285d36 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_two.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_corners_two.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_edge.material b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_edge.material index c65a3afdbe..1f86911beb 100644 --- a/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_edge.material +++ b/Gems/NvCloth/Assets/Objects/cloth/Environment/cloth_locked_edge.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "color": [ diff --git a/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Box_1x1_MiddleGrey.material b/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Box_1x1_MiddleGrey.material index dee26ff898..586af47cbc 100644 --- a/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Box_1x1_MiddleGrey.material +++ b/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Box_1x1_MiddleGrey.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Textures/_Primitives/Middle_Gray_Checker.tif" diff --git a/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Cylinder_1x1_MiddleGrey.material b/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Cylinder_1x1_MiddleGrey.material index dee26ff898..586af47cbc 100644 --- a/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Cylinder_1x1_MiddleGrey.material +++ b/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Cylinder_1x1_MiddleGrey.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Textures/_Primitives/Middle_Gray_Checker.tif" diff --git a/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Sphere_1x1_MiddleGrey.material b/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Sphere_1x1_MiddleGrey.material index 718d951bb2..db9e3624be 100644 --- a/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Sphere_1x1_MiddleGrey.material +++ b/Gems/PrimitiveAssets/Assets/Objects/_Primitives/_Sphere_1x1_MiddleGrey.material @@ -2,7 +2,7 @@ "description": "", "materialType": "Materials/Types/StandardPBR.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 3, + "materialTypeVersion": 3, "properties": { "baseColor": { "textureMap": "Textures/_Primitives/Middle_Gray_Checker.tif" diff --git a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material index da2fc95293..fca5130653 100644 --- a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material +++ b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material @@ -2,7 +2,7 @@ "description": "", "materialType": "PbrTerrain.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 1, + "materialTypeVersion": 1, "properties": { "baseColor": { "color": [ 0.18, 0.18, 0.18 ] From b61238e50c0e7c9dc0c44e757be657a82881903a Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:30:51 -0800 Subject: [PATCH 11/58] Minor fixes to whitespace and comments. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp index 8bf975fd82..f2a9efd896 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp @@ -136,8 +136,6 @@ namespace AZ } } - - template MaterialPropertyValue CastVectorMaterialPropertyValue(const MaterialPropertyValue& value) { @@ -252,8 +250,8 @@ namespace AZ else { // The material asset could be finalized sometime after the original JSON is loaded, and the material type might not have been available - // at that time, so the data type would not be known for each property. So each raw property's type could be based on what appeared in the JSON - // and this is the first opportunity we have to resolve that value with the actual type. For example, a float property could have been specified in + // at that time, so the data type would not be known for each property. So each raw property's type was based on what appeared in the JSON + // and here we have the first opportunity to resolve that value with the actual type. For example, a float property could have been specified in // the JSON as 7 instead of 7.0, which is valid. Similarly, a Color and a Vector3 can both be specified as "[0.0,0.0,0.0]" in the JSON file. MaterialPropertyValue finalValue = value; From 3506a3975987fe1c9af8dd0ed57e89649aa49d80 Mon Sep 17 00:00:00 2001 From: Mikhail Naumov Date: Wed, 19 Jan 2022 15:01:21 -0600 Subject: [PATCH 12/58] Merge branch 'mnaumov/FixingEOOrdering' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/FixingEOOrdering_signofffix Signed-off-by: Mikhail Naumov --- .../Entity/EditorEntityContextBus.h | 7 ++----- .../Entity/EditorEntityHelpers.cpp | 4 ++-- .../Entity/EditorEntityModel.cpp | 9 ++------ .../Entity/EditorEntityModel.h | 4 +--- .../Prefab/PrefabPublicHandler.cpp | 21 +++++++++++++++++-- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h index 30ffb461fa..21c87da7b8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h @@ -201,11 +201,8 @@ namespace AzToolsFramework //! Fired after the EditorEntityContext fails to export the root level slice to the game stream virtual void OnSaveStreamForGameFailure(AZStd::string_view /*failureString*/) {} - //! Fired when the user triggers a clone of ComponentEntity object(s), before operation begins - virtual void OnEntitiesAboutToBeCloned() {} - - //! Fires when the user triggers a clone of ComponentEntity object(s)), after operation completes - virtual void OnEntitiesCloned() {} + //! Preserve entity order when re-parenting entities + virtual void ForceAddEntitiesToBack(bool /*forceAddToBack*/) {} }; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp index 3e256430a2..265924e996 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp @@ -1157,7 +1157,7 @@ namespace AzToolsFramework bool CloneInstantiatedEntities(const EntityIdSet& entitiesToClone, EntityIdSet& clonedEntities) { - EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnEntitiesAboutToBeCloned); + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, true); ScopedUndoBatch undoBatch("Clone Selection"); // Track the mapping of source to cloned entity. This both helps make sure that an entity is not accidentally @@ -1199,7 +1199,7 @@ namespace AzToolsFramework // Also replace the selection with the entities that have been cloned. Internal::UpdateUndoStackAndSelectClonedEntities(allEntityClonesContainer.m_entities, undoBatch); - EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnEntitiesCloned); + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, false); for (const AZ::Entity* entity : allEntityClonesContainer.m_entities) { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp index e4d4f40bce..88db0b049c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp @@ -643,14 +643,9 @@ namespace AzToolsFramework } } - void EditorEntityModel::OnEntitiesAboutToBeCloned() + void EditorEntityModel::ForceAddEntitiesToBack(bool forceAddToBack) { - m_forceAddToBack = true; - } - - void EditorEntityModel::OnEntitiesCloned() - { - m_forceAddToBack = false; + m_forceAddToBack = forceAddToBack; } void EditorEntityModel::ChildEntityOrderArrayUpdated() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h index 45d3d4ea59..de6b598dfc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h @@ -94,9 +94,7 @@ namespace AzToolsFramework void OnEntityStreamLoadBegin() override; void OnEntityStreamLoadSuccess() override; void OnEntityStreamLoadFailed() override; - void OnEntitiesAboutToBeCloned() override; - void OnEntitiesCloned() override; - + void ForceAddEntitiesToBack(bool forceAddToBack) override; //////////////////////////////////////////////// // AzFramework::EntityContextEventBus::Handler diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp index aaf6141e12..99806ca239 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -83,6 +84,20 @@ namespace AzToolsFramework return AZ::Failure(findCommonRootOutcome.TakeError()); } + // order entities by their respective position within Entity Outliner + EditorEntitySortRequestBus::Event( + commonRootEntityId, + [&topLevelEntities](EditorEntitySortRequestBus::Events* sortRequests) + { + AZStd::sort( + topLevelEntities.begin(), topLevelEntities.end(), + [&sortRequests](AZ::Entity* entity1, AZ::Entity* entity2) + { + return sortRequests->GetChildEntityIndex(entity1->GetId()) < + sortRequests->GetChildEntityIndex(entity2->GetId()); + }); + }); + AZ::EntityId containerEntityId; InstanceOptionalReference instanceToCreate; @@ -153,8 +168,6 @@ namespace AzToolsFramework } // Create the Prefab - AZ_Assert(filePath.IsAbsolute(), "CreatePrefabInMemory requires an absolute file path."); - instanceToCreate = prefabEditorEntityOwnershipInterface->CreatePrefab( entities, AZStd::move(instancePtrs), m_prefabLoaderInterface->GenerateRelativePath(filePath), commonRootEntityOwningInstance); @@ -172,6 +185,7 @@ namespace AzToolsFramework // Parent the non-container top level entities to the container entity. // Parenting the top level container entities will be done during the creation of links. + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, true); for (AZ::Entity* topLevelEntity : topLevelEntities) { if (!IsInstanceContainerEntity(topLevelEntity->GetId())) @@ -179,6 +193,7 @@ namespace AzToolsFramework AZ::TransformBus::Event(topLevelEntity->GetId(), &AZ::TransformBus::Events::SetParent, containerEntityId); } } + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, false); // Update the template of the instance since the entities are modified since the template creation. Prefab::PrefabDom serializedInstance; @@ -279,6 +294,8 @@ namespace AzToolsFramework CreatePrefabResult PrefabPublicHandler::CreatePrefabInDisk(const EntityIdList& entityIds, AZ::IO::PathView filePath) { + AZ_Assert(filePath.IsAbsolute(), "CreatePrefabInDisk requires an absolute file path."); + auto result = CreatePrefabInMemory(entityIds, filePath); if (result.IsSuccess()) { From f7c120b4b7571ab790ad34bffbaddafaf4d35717 Mon Sep 17 00:00:00 2001 From: Mikhail Naumov Date: Wed, 19 Jan 2022 15:15:15 -0600 Subject: [PATCH 13/58] PR feedback Signed-off-by: Mikhail Naumov --- .../AzToolsFramework/Entity/EditorEntityContextBus.h | 2 +- .../AzToolsFramework/Entity/EditorEntityHelpers.cpp | 4 ++-- .../AzToolsFramework/Entity/EditorEntityModel.cpp | 2 +- .../AzToolsFramework/Entity/EditorEntityModel.h | 2 +- .../AzToolsFramework/Prefab/PrefabPublicHandler.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h index 21c87da7b8..1a5ba60bdf 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextBus.h @@ -202,7 +202,7 @@ namespace AzToolsFramework virtual void OnSaveStreamForGameFailure(AZStd::string_view /*failureString*/) {} //! Preserve entity order when re-parenting entities - virtual void ForceAddEntitiesToBack(bool /*forceAddToBack*/) {} + virtual void SetForceAddEntitiesToBackFlag(bool /*forceAddToBack*/) {} }; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp index 265924e996..dc0f5e9654 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp @@ -1157,7 +1157,7 @@ namespace AzToolsFramework bool CloneInstantiatedEntities(const EntityIdSet& entitiesToClone, EntityIdSet& clonedEntities) { - EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, true); + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, true); ScopedUndoBatch undoBatch("Clone Selection"); // Track the mapping of source to cloned entity. This both helps make sure that an entity is not accidentally @@ -1199,7 +1199,7 @@ namespace AzToolsFramework // Also replace the selection with the entities that have been cloned. Internal::UpdateUndoStackAndSelectClonedEntities(allEntityClonesContainer.m_entities, undoBatch); - EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, false); + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, false); for (const AZ::Entity* entity : allEntityClonesContainer.m_entities) { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp index 88db0b049c..adf062875e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp @@ -643,7 +643,7 @@ namespace AzToolsFramework } } - void EditorEntityModel::ForceAddEntitiesToBack(bool forceAddToBack) + void EditorEntityModel::SetForceAddEntitiesToBackFlag(bool forceAddToBack) { m_forceAddToBack = forceAddToBack; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h index de6b598dfc..c2574a9940 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.h @@ -94,7 +94,7 @@ namespace AzToolsFramework void OnEntityStreamLoadBegin() override; void OnEntityStreamLoadSuccess() override; void OnEntityStreamLoadFailed() override; - void ForceAddEntitiesToBack(bool forceAddToBack) override; + void SetForceAddEntitiesToBackFlag(bool forceAddToBack) override; //////////////////////////////////////////////// // AzFramework::EntityContextEventBus::Handler diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp index 99806ca239..bde5de2f64 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp @@ -185,7 +185,7 @@ namespace AzToolsFramework // Parent the non-container top level entities to the container entity. // Parenting the top level container entities will be done during the creation of links. - EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, true); + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, true); for (AZ::Entity* topLevelEntity : topLevelEntities) { if (!IsInstanceContainerEntity(topLevelEntity->GetId())) @@ -193,7 +193,7 @@ namespace AzToolsFramework AZ::TransformBus::Event(topLevelEntity->GetId(), &AZ::TransformBus::Events::SetParent, containerEntityId); } } - EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::ForceAddEntitiesToBack, false); + EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::SetForceAddEntitiesToBackFlag, false); // Update the template of the instance since the entities are modified since the template creation. Prefab::PrefabDom serializedInstance; From 4b5f4042f201c35c94f1a60c82975342670972d9 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Wed, 19 Jan 2022 16:05:51 -0800 Subject: [PATCH 14/58] Move common code used by multiple tests into functions to reduce code duplication. Signed-off-by: amzn-sj --- .../Tests/TerrainPhysicsColliderTests.cpp | 117 ++++++-------- Gems/Terrain/Code/Tests/TerrainSystemTest.cpp | 149 ++++++++---------- 2 files changed, 111 insertions(+), 155 deletions(-) diff --git a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp index 859e618983..2d0933c367 100644 --- a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp +++ b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp @@ -69,6 +69,46 @@ protected: m_colliderComponent = m_entity->CreateComponent(Terrain::TerrainPhysicsColliderConfig()); m_app.RegisterComponentDescriptor(m_colliderComponent->CreateDescriptor()); } + + void ProcessRegionLoop(const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, + AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter, + AzFramework::SurfaceData::SurfaceTagWeightList* surfaceTags, + float mockHeight) + { + if (!perPositionCallback) + { + return; + } + + const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); + const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); + + AzFramework::SurfaceData::SurfacePoint surfacePoint; + for (size_t y = 0; y < numSamplesY; y++) + { + float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); + for (size_t x = 0; x < numSamplesX; x++) + { + bool terrainExists = false; + float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); + surfacePoint.m_position.Set(fx, fy, mockHeight); + if (surfaceTags) + { + surfacePoint.m_surfaceTags.clear(); + if (fy < 128.0) + { + surfacePoint.m_surfaceTags.push_back(surfaceTags->at(0)); + } + else + { + surfacePoint.m_surfaceTags.push_back(surfaceTags->at(1)); + } + } + perPositionCallback(x, y, surfacePoint, terrainExists); + } + } + } }; TEST_F(TerrainPhysicsColliderComponentTest, ActivateEntityActivateSuccess) @@ -239,30 +279,11 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderGetHeightsRetu NiceMock terrainListener; ON_CALL(terrainListener, GetTerrainHeightQueryResolution).WillByDefault(Return(mockHeightResolution)); ON_CALL(terrainListener, ProcessHeightsFromRegion).WillByDefault( - [](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + [this](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) { - if (!perPositionCallback) - { - return; - } - - const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); - const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); - - AzFramework::SurfaceData::SurfacePoint surfacePoint; - for (size_t y = 0; y < numSamplesY; y++) - { - float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); - for (size_t x = 0; x < numSamplesX; x++) - { - bool terrainExists = false; - float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); - surfacePoint.m_position.Set(fx, fy, 0.0f); - perPositionCallback(x, y, surfacePoint, terrainExists); - } - } + ProcessRegionLoop(inRegion, stepSize, perPositionCallback, sampleFilter, nullptr, 0.0f); } ); @@ -300,30 +321,11 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderReturnsRelativ NiceMock terrainListener; ON_CALL(terrainListener, GetTerrainHeightQueryResolution).WillByDefault(Return(mockHeightResolution)); ON_CALL(terrainListener, ProcessHeightsFromRegion).WillByDefault( - [mockHeight](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + [this, mockHeight](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) { - if (!perPositionCallback) - { - return; - } - - const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); - const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); - - AzFramework::SurfaceData::SurfacePoint surfacePoint; - for (size_t y = 0; y < numSamplesY; y++) - { - float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); - for (size_t x = 0; x < numSamplesX; x++) - { - bool terrainExists = false; - float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); - surfacePoint.m_position.Set(fx, fy, mockHeight); - perPositionCallback(x, y, surfacePoint, terrainExists); - } - } + ProcessRegionLoop(inRegion, stepSize, perPositionCallback, sampleFilter, nullptr, mockHeight); } ); @@ -467,39 +469,16 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderGetHeightsAndM return2.m_surfaceType = tag2; return2.m_weight = 1.0f; + AzFramework::SurfaceData::SurfaceTagWeightList surfaceTags = { return1, return2 }; + NiceMock terrainListener; ON_CALL(terrainListener, GetTerrainHeightQueryResolution).WillByDefault(Return(mockHeightResolution)); ON_CALL(terrainListener, ProcessSurfacePointsFromRegion).WillByDefault( - [mockHeight, return1, return2](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, + [this, mockHeight, &surfaceTags](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) { - if (!perPositionCallback) - { - return; - } - - const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); - const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); - - AzFramework::SurfaceData::SurfacePoint surfacePoint; - for (size_t y = 0; y < numSamplesY; y++) - { - float fy = aznumeric_cast(inRegion.GetMin().GetY() + (y * stepSize.GetY())); - for (size_t x = 0; x < numSamplesX; x++) - { - surfacePoint.m_surfaceTags.clear(); - bool terrainExists = false; - float fx = aznumeric_cast(inRegion.GetMin().GetX() + (x * stepSize.GetX())); - surfacePoint.m_position.Set(fx, fy, mockHeight); - if (fy < 128.0) - { - surfacePoint.m_surfaceTags.push_back(return1); - } - surfacePoint.m_surfaceTags.push_back(return2); - perPositionCallback(x, y, surfacePoint, terrainExists); - } - } + ProcessRegionLoop(inRegion, stepSize, perPositionCallback, sampleFilter, &surfaceTags, mockHeight); } ); diff --git a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp index 2eebc1b824..ab0847e634 100644 --- a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp +++ b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp @@ -68,6 +68,7 @@ namespace UnitTest AZStd::unique_ptr> m_boxShapeRequests; AZStd::unique_ptr> m_shapeRequests; AZStd::unique_ptr> m_terrainAreaHeightRequests; + AZStd::unique_ptr> m_terrainAreaSurfaceRequests; void SetUp() override { @@ -84,6 +85,7 @@ namespace UnitTest m_boxShapeRequests.reset(); m_shapeRequests.reset(); m_terrainAreaHeightRequests.reset(); + m_terrainAreaSurfaceRequests.reset(); m_app.Destroy(); } @@ -160,6 +162,49 @@ namespace UnitTest ActivateEntity(entity.get()); return entity; } + + void SetupSurfaceWeightMocks(AZ::Entity* entity, AzFramework::SurfaceData::SurfaceTagWeightList& expectedTags) + { + const SurfaceData::SurfaceTag tag1 = SurfaceData::SurfaceTag("tag1"); + const SurfaceData::SurfaceTag tag2 = SurfaceData::SurfaceTag("tag2"); + const SurfaceData::SurfaceTag tag3 = SurfaceData::SurfaceTag("tag3"); + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight1; + tagWeight1.m_surfaceType = tag1; + tagWeight1.m_weight = 1.0f; + expectedTags.push_back(tagWeight1); + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight2; + tagWeight2.m_surfaceType = tag2; + tagWeight2.m_weight = 0.7f; + expectedTags.push_back(tagWeight2); + + AzFramework::SurfaceData::SurfaceTagWeight tagWeight3; + tagWeight3.m_surfaceType = tag3; + tagWeight3.m_weight = 0.3f; + expectedTags.push_back(tagWeight3); + + m_terrainAreaSurfaceRequests = AZStd::make_unique>(entity->GetId()); + ON_CALL(*m_terrainAreaSurfaceRequests, GetSurfaceWeights).WillByDefault( + [tagWeight1, tagWeight2, tagWeight3](const AZ::Vector3& position, AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights) + { + surfaceWeights.clear(); + float absYPos = fabsf(position.GetY()); + if (absYPos < 1.0f) + { + surfaceWeights.push_back(tagWeight1); + } + else if(absYPos < 2.0f) + { + surfaceWeights.push_back(tagWeight2); + } + else + { + surfaceWeights.push_back(tagWeight3); + } + } + ); + } }; TEST_F(TerrainSystemTest, TrivialCreateDestroy) @@ -921,62 +966,28 @@ namespace UnitTest const AZ::Aabb testRegionBox = AZ::Aabb::CreateFromMinMaxValues(-3.0f, -3.0f, -1.0f, 3.0f, 3.0f, 1.0f); const AZ::Vector2 stepSize(1.0f); - const SurfaceData::SurfaceTag tag1 = SurfaceData::SurfaceTag("tag1"); - const SurfaceData::SurfaceTag tag2 = SurfaceData::SurfaceTag("tag2"); - const SurfaceData::SurfaceTag tag3 = SurfaceData::SurfaceTag("tag3"); + AzFramework::SurfaceData::SurfaceTagWeightList expectedTags; + SetupSurfaceWeightMocks(entity.get(), expectedTags); - AzFramework::SurfaceData::SurfaceTagWeight tagWeight1; - tagWeight1.m_surfaceType = tag1; - tagWeight1.m_weight = 1.0f; - - AzFramework::SurfaceData::SurfaceTagWeight tagWeight2; - tagWeight2.m_surfaceType = tag2; - tagWeight2.m_weight = 0.7f; - - AzFramework::SurfaceData::SurfaceTagWeight tagWeight3; - tagWeight3.m_surfaceType = tag3; - tagWeight3.m_weight = 0.3f; - - NiceMock mockSurfaceRequests(entity->GetId()); - ON_CALL(mockSurfaceRequests, GetSurfaceWeights).WillByDefault( - [&tagWeight1, &tagWeight2, &tagWeight3](const AZ::Vector3& position, AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights) - { - surfaceWeights.clear(); - float absYPos = fabsf(position.GetY()); - if (absYPos < 1.0f) - { - surfaceWeights.push_back(tagWeight1); - } - else if(absYPos < 2.0f) - { - surfaceWeights.push_back(tagWeight2); - } - else - { - surfaceWeights.push_back(tagWeight3); - } - } - ); - - auto perPositionCallback = [&tagWeight1, &tagWeight2, &tagWeight3](size_t xIndex, size_t yIndex, + auto perPositionCallback = [&expectedTags](size_t xIndex, size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { constexpr float epsilon = 0.0001f; float absYPos = fabsf(surfacePoint.m_position.GetY()); if (absYPos < 1.0f) { - EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight1.m_surfaceType); - EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight1.m_weight, epsilon); + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, expectedTags[0].m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, expectedTags[0].m_weight, epsilon); } else if(absYPos < 2.0f) { - EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight2.m_surfaceType); - EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight2.m_weight, epsilon); + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, expectedTags[1].m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, expectedTags[1].m_weight, epsilon); } else { - EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight3.m_surfaceType); - EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight3.m_weight, epsilon); + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, expectedTags[2].m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, expectedTags[2].m_weight, epsilon); } }; @@ -1001,44 +1012,10 @@ namespace UnitTest const AZ::Aabb testRegionBox = AZ::Aabb::CreateFromMinMaxValues(-3.0f, -3.0f, -1.0f, 3.0f, 3.0f, 1.0f); const AZ::Vector2 stepSize(1.0f); - const SurfaceData::SurfaceTag tag1 = SurfaceData::SurfaceTag("tag1"); - const SurfaceData::SurfaceTag tag2 = SurfaceData::SurfaceTag("tag2"); - const SurfaceData::SurfaceTag tag3 = SurfaceData::SurfaceTag("tag3"); + AzFramework::SurfaceData::SurfaceTagWeightList expectedTags; + SetupSurfaceWeightMocks(entity.get(), expectedTags); - AzFramework::SurfaceData::SurfaceTagWeight tagWeight1; - tagWeight1.m_surfaceType = tag1; - tagWeight1.m_weight = 1.0f; - - AzFramework::SurfaceData::SurfaceTagWeight tagWeight2; - tagWeight2.m_surfaceType = tag2; - tagWeight2.m_weight = 0.7f; - - AzFramework::SurfaceData::SurfaceTagWeight tagWeight3; - tagWeight3.m_surfaceType = tag3; - tagWeight3.m_weight = 0.3f; - - NiceMock mockSurfaceRequests(entity->GetId()); - ON_CALL(mockSurfaceRequests, GetSurfaceWeights).WillByDefault( - [&tagWeight1, &tagWeight2, &tagWeight3](const AZ::Vector3& position, AzFramework::SurfaceData::SurfaceTagWeightList& surfaceWeights) - { - surfaceWeights.clear(); - float absYPos = fabsf(position.GetY()); - if (absYPos < 1.0f) - { - surfaceWeights.push_back(tagWeight1); - } - else if(absYPos < 2.0f) - { - surfaceWeights.push_back(tagWeight2); - } - else - { - surfaceWeights.push_back(tagWeight3); - } - } - ); - - auto perPositionCallback = [&tagWeight1, &tagWeight2, &tagWeight3](size_t xIndex, size_t yIndex, + auto perPositionCallback = [&expectedTags](size_t xIndex, size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { constexpr float epsilon = 0.0001f; @@ -1049,18 +1026,18 @@ namespace UnitTest float absYPos = fabsf(surfacePoint.m_position.GetY()); if (absYPos < 1.0f) { - EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight1.m_surfaceType); - EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight1.m_weight, epsilon); + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, expectedTags[0].m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, expectedTags[0].m_weight, epsilon); } else if(absYPos < 2.0f) { - EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight2.m_surfaceType); - EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight2.m_weight, epsilon); + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, expectedTags[1].m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, expectedTags[1].m_weight, epsilon); } else { - EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, tagWeight3.m_surfaceType); - EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, tagWeight3.m_weight, epsilon); + EXPECT_EQ(surfacePoint.m_surfaceTags[0].m_surfaceType, expectedTags[2].m_surfaceType); + EXPECT_NEAR(surfacePoint.m_surfaceTags[0].m_weight, expectedTags[2].m_weight, epsilon); } }; From 7bba4172ece3aa4d44c9ac1970d7e8c667fc582a Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Wed, 19 Jan 2022 18:04:56 -0800 Subject: [PATCH 15/58] Add a GetNumSamplesFromRegion function which returns the number of samples given a region and step size. Update Terrain Feature Processor to use this function to get the number of samples instead of computing num samples independently. Signed-off-by: amzn-sj --- .../Terrain/TerrainDataRequestBus.h | 4 ++++ .../Mocks/Terrain/MockTerrainDataRequestBus.h | 2 ++ .../TerrainFeatureProcessor.cpp | 24 +++++++++++-------- .../Source/TerrainSystem/TerrainSystem.cpp | 10 ++++++++ .../Code/Source/TerrainSystem/TerrainSystem.h | 4 ++++ 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h index 0d16bf3460..9379485646 100644 --- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h +++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h @@ -161,6 +161,10 @@ namespace AzFramework SurfacePointListFillCallback perPositionCallback, Sampler sampleFilter = Sampler::DEFAULT) const = 0; + //! Returns the number of samples for a given region and step size. + virtual AZStd::pair GetNumSamplesFromRegion(const AZ::Aabb& inRegion, + const AZ::Vector2& stepSize) const = 0; + //! Given a region(aabb) and a step size, call the provided callback function with surface data corresponding to the //! coordinates in the region. virtual void ProcessHeightsFromRegion(const AZ::Aabb& inRegion, diff --git a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h index f3a6cc07b3..52ac28ef63 100644 --- a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h +++ b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h @@ -92,6 +92,8 @@ namespace UnitTest ProcessSurfaceWeightsFromListOfVector2, void(const AZStd::span&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler)); MOCK_CONST_METHOD3( ProcessSurfacePointsFromListOfVector2, void(const AZStd::span&, AzFramework::Terrain::SurfacePointListFillCallback, Sampler)); + MOCK_CONST_METHOD2( + GetNumSamplesFromRegion, AZStd::pair(const AZ::Aabb&, const AZ::Vector2&)); MOCK_CONST_METHOD4( ProcessHeightsFromRegion, void(const AZ::Aabb&, const AZ::Vector2&, AzFramework::Terrain::SurfacePointRegionFillCallback, Sampler)); MOCK_CONST_METHOD4( diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp index ebc8a16fcb..4232a37264 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp +++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp @@ -208,12 +208,21 @@ namespace Terrain } int32_t xStart = aznumeric_cast(AZStd::ceilf(m_dirtyRegion.GetMin().GetX() / m_sampleSpacing)); - int32_t xEnd = aznumeric_cast(AZStd::floorf(m_dirtyRegion.GetMax().GetX() / m_sampleSpacing)) + 1; int32_t yStart = aznumeric_cast(AZStd::ceilf(m_dirtyRegion.GetMin().GetY() / m_sampleSpacing)); - int32_t yEnd = aznumeric_cast(AZStd::floorf(m_dirtyRegion.GetMax().GetY() / m_sampleSpacing)) + 1; - uint32_t updateWidth = xEnd - xStart; - uint32_t updateHeight = yEnd - yStart; + AZ::Vector2 stepSize(m_sampleSpacing); + AZ::Vector3 maxBound( + m_dirtyRegion.GetMax().GetX() + m_sampleSpacing, m_dirtyRegion.GetMax().GetY() + m_sampleSpacing, 0.0f); + AZ::Aabb region; + region.Set(m_dirtyRegion.GetMin(), maxBound); + + AZStd::pair numSamples; + AzFramework::Terrain::TerrainDataRequestBus::BroadcastResult( + numSamples, &AzFramework::Terrain::TerrainDataRequests::GetNumSamplesFromRegion, + region, stepSize); + + uint32_t updateWidth = numSamples.first; + uint32_t updateHeight = numSamples.second; AZStd::vector pixels; pixels.reserve(updateWidth * updateHeight); { @@ -238,14 +247,9 @@ namespace Terrain pixels.push_back(uint16Height); }; - AZ::Vector2 stepSize(m_sampleSpacing); - AZ::Vector3 maxBound( - m_dirtyRegion.GetMax().GetX() + m_sampleSpacing, m_dirtyRegion.GetMax().GetY() + m_sampleSpacing, 0.0f); - AZ::Aabb region; - region.Set(m_dirtyRegion.GetMin(), maxBound); AzFramework::Terrain::TerrainDataRequestBus::Broadcast( &AzFramework::Terrain::TerrainDataRequests::ProcessHeightsFromRegion, - region, stepSize, perPositionCallback,AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); + region, stepSize, perPositionCallback, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); } if (m_heightmapImage) diff --git a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp index 2ecd13b5ad..4dfa03ed53 100644 --- a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp +++ b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.cpp @@ -690,6 +690,16 @@ void TerrainSystem::ProcessSurfacePointsFromListOfVector2( } } +AZStd::pair TerrainSystem::GetNumSamplesFromRegion( + const AZ::Aabb& inRegion, + const AZ::Vector2& stepSize) const +{ + const size_t numSamplesX = aznumeric_cast(ceil(inRegion.GetExtents().GetX() / stepSize.GetX())); + const size_t numSamplesY = aznumeric_cast(ceil(inRegion.GetExtents().GetY() / stepSize.GetY())); + + return AZStd::make_pair(numSamplesX, numSamplesY); +} + void TerrainSystem::ProcessHeightsFromRegion( const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, diff --git a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h index 7c6e0cd91e..2296d48843 100644 --- a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h +++ b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h @@ -163,6 +163,10 @@ namespace Terrain AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback, Sampler sampleFilter = Sampler::DEFAULT) const override; + //! Returns the number of samples for a given region and step size. + virtual AZStd::pair GetNumSamplesFromRegion(const AZ::Aabb& inRegion, + const AZ::Vector2& stepSize) const override; + //! Given a region(aabb) and a step size, call the provided callback function with surface data corresponding to the //! coordinates in the region. virtual void ProcessHeightsFromRegion(const AZ::Aabb& inRegion, From c27f73c66be8e8b86456f9601bab218c8be6ab31 Mon Sep 17 00:00:00 2001 From: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com> Date: Wed, 19 Jan 2022 20:17:15 -0700 Subject: [PATCH 16/58] Added a NumRaysPerProbe DiffuseProbeGrid setting Added supervariants to the precompiled DiffuseProbeGrid shaders for the NumRaysPerProbe values Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com> --- ...seProbeGridBlendDistance.precompiledshader | 126 ++++++++++++++++++ ...ProbeGridBlendIrradiance.precompiledshader | 126 ++++++++++++++++++ ...eProbeGridClassification.precompiledshader | 126 ++++++++++++++++++ ...numraysperprobe1008_dx12_0.azshadervariant | Bin 0 -> 8338 bytes ...numraysperprobe1008_null_0.azshadervariant | Bin 0 -> 486 bytes ...mraysperprobe1008_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes ...-numraysperprobe144_dx12_0.azshadervariant | Bin 0 -> 8306 bytes ...-numraysperprobe144_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe144_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes ...-numraysperprobe288_dx12_0.azshadervariant | Bin 0 -> 8338 bytes ...-numraysperprobe288_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe288_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes ...-numraysperprobe432_dx12_0.azshadervariant | Bin 0 -> 8338 bytes ...-numraysperprobe432_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe432_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes ...-numraysperprobe576_dx12_0.azshadervariant | Bin 0 -> 8338 bytes ...-numraysperprobe576_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe576_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes ...-numraysperprobe720_dx12_0.azshadervariant | Bin 0 -> 8338 bytes ...-numraysperprobe720_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe720_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes ...-numraysperprobe864_dx12_0.azshadervariant | Bin 0 -> 8338 bytes ...-numraysperprobe864_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe864_vulkan_0.azshadervariant | Bin 0 -> 12618 bytes .../diffuseprobegridblenddistance.azshader | Bin 79451 -> 626455 bytes ...begridblenddistance_dx12_0.azshadervariant | Bin 8338 -> 8338 bytes ...begridblenddistance_null_0.azshadervariant | Bin 486 -> 486 bytes ...gridblenddistance_vulkan_0.azshadervariant | Bin 12618 -> 12618 bytes ...numraysperprobe1008_dx12_0.azshadervariant | Bin 0 -> 9310 bytes ...numraysperprobe1008_null_0.azshadervariant | Bin 0 -> 486 bytes ...mraysperprobe1008_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes ...-numraysperprobe144_dx12_0.azshadervariant | Bin 0 -> 9314 bytes ...-numraysperprobe144_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe144_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes ...-numraysperprobe288_dx12_0.azshadervariant | Bin 0 -> 9314 bytes ...-numraysperprobe288_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe288_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes ...-numraysperprobe432_dx12_0.azshadervariant | Bin 0 -> 9310 bytes ...-numraysperprobe432_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe432_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes ...-numraysperprobe576_dx12_0.azshadervariant | Bin 0 -> 9314 bytes ...-numraysperprobe576_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe576_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes ...-numraysperprobe720_dx12_0.azshadervariant | Bin 0 -> 9310 bytes ...-numraysperprobe720_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe720_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes ...-numraysperprobe864_dx12_0.azshadervariant | Bin 0 -> 9310 bytes ...-numraysperprobe864_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe864_vulkan_0.azshadervariant | Bin 0 -> 15030 bytes .../diffuseprobegridblendirradiance.azshader | Bin 79495 -> 626793 bytes ...gridblendirradiance_dx12_0.azshadervariant | Bin 9314 -> 9314 bytes ...gridblendirradiance_null_0.azshadervariant | Bin 486 -> 486 bytes ...idblendirradiance_vulkan_0.azshadervariant | Bin 15030 -> 15030 bytes ...iffuseprobegridborderupdatecolumn.azshader | Bin 27583 -> 27583 bytes ...dborderupdatecolumn_dx12_0.azshadervariant | Bin 4522 -> 4522 bytes ...dborderupdatecolumn_null_0.azshadervariant | Bin 486 -> 486 bytes ...orderupdatecolumn_vulkan_0.azshadervariant | Bin 2701 -> 2701 bytes .../diffuseprobegridborderupdaterow.azshader | Bin 27580 -> 27580 bytes ...gridborderupdaterow_dx12_0.azshadervariant | Bin 4338 -> 4338 bytes ...gridborderupdaterow_null_0.azshadervariant | Bin 486 -> 486 bytes ...idborderupdaterow_vulkan_0.azshadervariant | Bin 2222 -> 2222 bytes ...numraysperprobe1008_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...numraysperprobe1008_null_0.azshadervariant | Bin 0 -> 486 bytes ...mraysperprobe1008_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes ...-numraysperprobe144_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...-numraysperprobe144_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe144_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes ...-numraysperprobe288_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...-numraysperprobe288_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe288_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes ...-numraysperprobe432_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...-numraysperprobe432_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe432_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes ...-numraysperprobe576_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...-numraysperprobe576_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe576_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes ...-numraysperprobe720_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...-numraysperprobe720_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe720_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes ...-numraysperprobe864_dx12_0.azshadervariant | Bin 0 -> 6994 bytes ...-numraysperprobe864_null_0.azshadervariant | Bin 0 -> 486 bytes ...umraysperprobe864_vulkan_0.azshadervariant | Bin 0 -> 10274 bytes .../diffuseprobegridclassification.azshader | Bin 76956 -> 606488 bytes ...egridclassification_dx12_0.azshadervariant | Bin 6994 -> 6994 bytes ...egridclassification_null_0.azshadervariant | Bin 486 -> 486 bytes ...ridclassification_vulkan_0.azshadervariant | Bin 10274 -> 10274 bytes .../diffuseprobegridraytracing.azshader | Bin 141617 -> 141617 bytes ...probegridraytracing_dx12_0.azshadervariant | Bin 31886 -> 31886 bytes ...probegridraytracing_null_0.azshadervariant | Bin 486 -> 486 bytes ...obegridraytracing_vulkan_0.azshadervariant | Bin 36188 -> 36188 bytes ...fuseprobegridraytracingclosesthit.azshader | Bin 141627 -> 141627 bytes ...aytracingclosesthit_dx12_0.azshadervariant | Bin 13174 -> 13174 bytes ...aytracingclosesthit_null_0.azshadervariant | Bin 486 -> 486 bytes ...tracingclosesthit_vulkan_0.azshadervariant | Bin 5364 -> 5364 bytes .../diffuseprobegridraytracingmiss.azshader | Bin 141621 -> 141621 bytes ...egridraytracingmiss_dx12_0.azshadervariant | Bin 13314 -> 13314 bytes ...egridraytracingmiss_null_0.azshadervariant | Bin 486 -> 486 bytes ...ridraytracingmiss_vulkan_0.azshadervariant | Bin 6396 -> 6396 bytes .../diffuseprobegridrelocation.azshader | Bin 79904 -> 79904 bytes ...probegridrelocation_dx12_0.azshadervariant | Bin 7994 -> 7994 bytes ...probegridrelocation_null_0.azshadervariant | Bin 486 -> 486 bytes ...obegridrelocation_vulkan_0.azshadervariant | Bin 11362 -> 11362 bytes .../diffuseprobegridrender.azshader | Bin 219075 -> 219075 bytes ...fuseprobegridrender_dx12_0.azshadervariant | Bin 30575 -> 30575 bytes ...fuseprobegridrender_null_0.azshadervariant | Bin 589 -> 589 bytes ...seprobegridrender_vulkan_0.azshadervariant | Bin 24081 -> 24081 bytes ...iffuseProbeGridFeatureProcessorInterface.h | 37 +++++ .../DiffuseProbeGrid.cpp | 10 +- .../DiffuseProbeGrid.h | 8 +- .../DiffuseProbeGridBlendDistancePass.cpp | 54 ++++---- .../DiffuseProbeGridBlendDistancePass.h | 16 ++- .../DiffuseProbeGridBlendIrradiancePass.cpp | 54 ++++---- .../DiffuseProbeGridBlendIrradiancePass.h | 16 ++- .../DiffuseProbeGridClassificationPass.cpp | 54 ++++---- .../DiffuseProbeGridClassificationPass.h | 14 +- .../DiffuseProbeGridFeatureProcessor.cpp | 6 + .../DiffuseProbeGridFeatureProcessor.h | 1 + .../DiffuseProbeGridRayTracingPass.cpp | 2 +- .../Code/Include/Atom/RPI.Public/RPIUtils.h | 6 +- .../RPI/Code/Source/RPI.Public/RPIUtils.cpp | 12 +- .../DiffuseProbeGridComponentConstants.h | 1 + .../DiffuseProbeGridComponentController.cpp | 15 ++- .../DiffuseProbeGridComponentController.h | 2 + .../EditorDiffuseProbeGridComponent.cpp | 23 ++++ .../EditorDiffuseProbeGridComponent.h | 3 + 125 files changed, 613 insertions(+), 99 deletions(-) create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe144_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe144_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe144_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe1008_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe1008_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe1008_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_vulkan_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_dx12_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_null_0.azshadervariant create mode 100644 Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_vulkan_0.azshadervariant diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.precompiledshader index 81d6bde5f0..98c327665e 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.precompiledshader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.precompiledshader @@ -29,6 +29,132 @@ "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance_null_0.azshadervariant" } ] + }, + { + "Name": "NumRaysPerProbe144", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe144_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe144_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe144_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe288", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe288_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe288_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe288_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe432", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe432_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe432_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe432_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe576", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe576_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe576_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe576_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe720", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe720_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe720_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe720_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe864", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe864_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe864_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe864_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe1008", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe1008_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe1008_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblenddistance-numraysperprobe1008_null_0.azshadervariant" + } + ] } ] } diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.precompiledshader index 9fa8e27461..c4d2dac642 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.precompiledshader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.precompiledshader @@ -29,6 +29,132 @@ "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance_null_0.azshadervariant" } ] + }, + { + "Name": "NumRaysPerProbe144", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe144_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe144_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe144_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe288", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe288_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe288_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe288_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe432", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe432_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe432_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe432_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe576", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe576_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe576_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe576_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe720", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe720_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe720_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe720_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe864", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe864_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe864_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe864_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe1008", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe1008_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe1008_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridblendirradiance-numraysperprobe1008_null_0.azshadervariant" + } + ] } ] } diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.precompiledshader index 66671fd7bc..5a34cc5b15 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.precompiledshader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.precompiledshader @@ -29,6 +29,132 @@ "RootShaderVariantAssetFileName": "diffuseprobegridclassification_null_0.azshadervariant" } ] + }, + { + "Name": "NumRaysPerProbe144", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe144_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe144_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe144_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe288", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe288_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe288_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe288_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe432", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe432_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe432_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe432_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe576", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe576_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe576_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe576_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe720", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe720_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe720_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe720_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe864", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe864_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe864_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe864_null_0.azshadervariant" + } + ] + }, + { + "Name": "NumRaysPerProbe1008", + "RootShaderVariantAssets": + [ + { + "APIName": "dx12", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe1008_dx12_0.azshadervariant" + }, + { + "APIName": "vulkan", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe1008_vulkan_0.azshadervariant" + }, + { + "APIName": "null", + "RootShaderVariantAssetFileName": "diffuseprobegridclassification-numraysperprobe1008_null_0.azshadervariant" + } + ] } ] } diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a66f166a0b39ae1bdf4bb4f050550388cd6394a4 GIT binary patch literal 8338 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 oAc9Yptbg|ZGdA|m|5S%c-aHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe1008_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..ad037d61ed839c55427acbad0d479203306a748f GIT binary patch literal 12618 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 E0i-*z!TaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe144_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe144_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..3ecbe8fb8d13972a298135f044859ff74bab86ec GIT binary patch literal 12618 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 PpCX-q*7BPUX59Y(c**qV literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c3925d31857fc8a0569df7cbefc7bac250293d8a GIT binary patch literal 8338 zcmeHMdsI``nmSwm^fgf>N6YZ=(cM zM6qoUwc4r;N~u_D^Pms`m8#XK)C(G^?L|ejE%w@W_6g{9-MMRKt(o~_X06#P=Vb41 z@9(jH-?txM0znW&sv@MHw>S$dB9>;<``DkGSDiIqt6w^U@Y(G5_|Ag(;OeK%UfwH~ zAAro~)kV_@w^rt4e4>!dtNME9&kFamSu6X>EV&7{G;hE6IQ8gWO}PlU`dkI%f+C(j z``6`DTK_PrYm#qhBi7JtIhXy!I}6{~Z(d zpAUnU{pDWxh_}F7_~ouJ+KRjFy)7TTNSjkC7770n z{mGS&@7C9@N^bgeAwUse*Hd@;@3!O3}gSGR8_Rd=F5bVTwX7Fszq^5)Zj0VWB| z$lYXS8NTOM7LH~J8@MIdw#{E8Z^2cc_|bsMb0)$15)}Gd>}LJvFrG zlj;%6-`e9xrhidK0O00%K@bAIqrf8uPbN+S&j{XTLC~V46pRY$knIIQDT|WBCaX45 z+CQ}=i9av3i|AnsEywd^idRkbs{sIg0T6~^@K7; z0GaCM1#i!mbLSA_>+Rw@*?gxcDt8{8pIs%^IH3tiRfi!re!Nx8(s2AbC8BhNdPsG@ z1`bO?(z!r3km;cw#HUOV5|1(~M)4{MC47fukKM!@aFEA|jc46p?}z$C~~DUC-{ zsTDK=0jfqJND63t-zplqx*T@&J5&Z<_sW_zP7bMRwOv_fD%)&e=rJOpFA=$?XANQY zPY01xGP^bjYg}mmGirYyr5w^zevz>53GE-F_N7wR$S7+_XrB)u8wV-UK}rx+ES3e-CMgdz>3(Abm_AOH6Q4((}tako7k_)ONvLCd}mU-?JbtTJn* zFgygNpE|g*ax<^Hh({^NRj?jLfhdL4XZgZz(JCJ~2?`1!$)E@q7>{U3-qTXi`;o3v zQ(D+kv!}7t+RiEBb*EQ7?PtZ;x`)1R^ok$r*b%%Wdu;pdBoISFpKA#*c^~*uYnnYR zMQv6V+{cmQ@#W~WUSGLUS}Dk@EXgB*I`gE2RnX7c0^X4Q7L2l9OWA-@3N);umz82I zrMMsYkxkjGr4&i=E-(Ne35Zh4MlEHtkWwIJfvzoJOg}RGN{EyNy0(BZ{m3J^t=A?K zr)ZxFsc!s*iLjOdHS!^84!OY<2`8Gg<$r7P{WH})6JCImLA?h?EuLBpu+cRqWid!6LX3s&mMha`W za}Tm9^h1oEW;y-16a554qBmnCdW2R&q6@S#5E1lR$O2FDv z0PNgJshT9BW8w^Mj@^bBQtPx`P4l*HAnhyaAc&gnVw$$r1!o7-_Xq#Bze7J)e+gsKiC$17W<<0 z6th>C*oCp@UyVJWH4YCSv0gfV>-?bgPG?V*@qtkg(#d!06h_Q{n$Jb6_oER9^^D;B z!osPW;UYKLzpN^faE!r zshUvU_lVzQ!{-Ba1SXKSAX?%mul+-?wC2E+AwAKzb-T$A?xf)fS?{{{#!&KKz1 zFy-fo4uL4@95abXS;dnp5{^8)c=Gs(z8yP*?N8<_Wu*X4hJbs4SGo~GHVKghkLDlG zr-$Z;Tzm+6%M6HLhsxewuOA}fLIuy3{E!qGDT?ZpDrIWW`K{_5d%fJ=tiSM8^`7YO zK2IsXe{nvW#kWZPw~hWz;Eoc)Y*>GMw%tFv13T3Q0Ox1N!TL z{zJ}jOCeGv(-uC9m*4zAvfMHN4@p!2FuPSDa)pVGL!u7C-CS_|IMx2qMSvdg^l>o# zedV<-0B{7yron%TYf^&?ZhLv)QbFY}T}c3V3ozeeeAiAo$X4yz>Nw4@eqKyM%Z6!9 zO)c@erZpvO&G7?KQJ^!3*AHDKV=}V=M>62Th4Q+?IUIob~(>Azz!15i8wD67Wx0F*TopsXuQTK`Vr#x+?v zxvxRP0?i9HOVGK*B@kFM0<7sbEwz_o`TaUUF)3Q7ihV$maLJ3rWeHBHfoyPpGTj!!DIh^v{Mlwih3k9VGe#_`6#1qkW_Dxj3$Vo6)9}`u3dJ$e?J)0 z^!DE!dRu^(QC_irO6r2pkjL8}<)3`GeMkOI5Ia_aeJd8-(Z-MV&0Y^8H7^%zYYFyw zjjdmme+w4S&RNpBVL>v!(#GY9`#rt~A^CvhyD_(TRsK6!t5YBJjGiBUaL3w{dF^lq z&cJ$$w851v0Nnm?+TKal7w5PT`v8*z#sd3LHuQqH*i z&B@e40B^xuVT6xqL#tiRX|N?ba5tGpR}S|Z%{|urcg#JOBXEivKi0M5RL2)HJ6cb5 zOjRtYW?U{0wLckRzW8uQDDI(x!WymppOQ+(<-=ej47LC1jf*?L{wQ&H6Ugei^V0xW zuER&*NCJKqq=PdmoGRya4)NAF5oT2-M3tG;@p4K@F=azz5n~v#f5>J%le5AZ@m@xQ z=cQ)e8jNfkrt;_`%`zv0g7<(BS7glc#4Gq!qzDBM_zuug z6y6cBAEn*@;hn$R?fv?j-0Vg#gt+#)cgmK-4Nsn(Js09fJTbfetJou7-`5Ay1SFzD zFC~wQ1}V(TKP-Cw{PrKl`|lL(Yy9x4=~0mz^}w?C{eRrEyzA=U#!jiJZGVV=8EgEb zfz;%0VNhYBiahww>efZ2?Wyd}MP+M#uRFB#Ew{AKdVBf4{lEF$?9KUY1uMT^8jiB5 zjO%)*@swko&klHPuI&{LGTif#Po+%aY`~t{+nclHw}-&!e(lf6r}lO~`+{fjH>?&) z`*Yv@#{6Tu8#hoM!FwBCMi)DHxXu1jdElzpu|L&gu~Xt|yNj~tm+n!7PCkjN8U41p zn3UMKYM@<|Z@M2-I~~qQXQ%%NC8TiW^5@?a+%^eTo_{(XFLWkz_OP(sWdv$t?Lhk+ zv2Ac7jB$MW8FpE$OSmZeOB?_GO@W7!%h>xkc3UfSH8G;I--|C8R1*s#22C zKvb|{usmdW!3hd9!5-9`n|j7qqR^3qJ@x$*jJRTkj?K_VFML`+1>jL}LhmwgvCi><={UOpH_^GxE(v&sk;2v%%e zO;Fa@mn^4MYn!zj@Qq z;7uVdGcfTMz>+7_#HY054U}((7Q$C{a!b6KkWB6D1sEsjm_P7^UbjJ zXA6iGG?dwWOJq9<3G6vkjvFxoKNSgAAkHv2Ga0w>Gt-U$4*86kdWi#qO1Bl=Zr3rv zQGA{)nIlR(OkxCNLBwIdFAA8p1J;g1NKM4gghr)JtSbC_z>F@#{d` zcQ!l0&z?{g3PCPJu-C#;HvT(|FQ8eSM6}%$pTiRI;f0}OcZvIbNyzA8mKWBi&O9B>FKhp;3_iJITffxn#H6T($< z9&GLH{wr6suV?kRZG`c!TmpXd(Q{xh90el)+ug5iY*p|30XzH<8l;p8kuADo2G0Qk zPtEm*s7iv{2;mE)L_;aUvNaG&MON!6o*ov3r`b>?BFa&&M&w;wD5JcKQTz}D2+(Nb zD_&L)DX)Vn8BleH;%8*baQ-_%y9wV?T4)4pKMK20eYx{d*pbNL4pDrA0veYKvqsp7 z5_OQ8Tulv`nkbnAIXk5j2qvb1kC>RmX<8A@aEV_kk~D+}mz{>L_Zyk&W91%BK0*#r z&E)}$72S5*`hPa$#Y2op_$-8+W)K}ST9!q-@0jRzWwoHl25dhY0zyOOhLD6XIN-eu z5!X^>Ab<%K56kImg>>A)0k&M_wp)S-z8BKhpu5?6nTZ1!Na?U2!UD6xE~tX_27iN+ zXI6kuXrF@<$+Ie-{Ylu-3T$G!AI9j79xo=Xd4O9}#hJ9z)&4X}`3x8W14Cvu8Yb00 zliF<>WVO&ll0@lMW-H1LfUyBBS&H?_P(zi11WZi*Q)c%bgshtW!r%=)2TUOZe!oK3 zE%HK2oSdU#CRBUP9*_6#H%o2(Xx?s9@EMWE@q}q@@!&J7&mn~5Nv#P&>*dsi3v?!?LX2bd zlhM~8WpOE+H?4W5Yq_i&~%%h7C7pNhXrec)mjWX6)n1VN$6CbT#+o^|y zY{n^_o@VItsk&UHz}>hyr`b_O6O~r@5jUdemmxpUQavli8Oi8RSm{;fNI%OUOEj`f zk>3xp9!lAt0O#!!B?5z}wj&li_WclLEW2fpSeP zv$k{%O{<`nE&0%54)(fpH*MF8zYKsk2Rmo=cjm=oARIRmfETVfsksqA zvgn!Xj8^;D^aG@{Q8;ZBAJXTLVPbZ!#PM4U@M8k}*wx5_aZ?)l)2QR@CyukjK)9TS zzY|jAVq&iERXXzBneDk2Ikk+y4U2-m8Y=xYg&l^Qp>j zVbM{cWvD_w9Y^<+a;PFDq<@g;fBZKZJ2f)XAf1~jm!2I8QD!#`x*ruf&CC5nL5Eu( zXhDOq{nJor1ks0#(w?iiT-^L69>ttYw#!)9!70`pLYlsN%Ux|PO;I{BMLC|yHg_9+ zU-{y^k2?rmn_Is2aeY}G%yO+ED@&6Y3_KDXYp+T}P;2;r!vJKbFDf3khcmjM(EczpdLpdhT7$%g09!E z9&*PUypxkwEiapeTP2+gQdgf^y)r&7&}po-S(Em&vQ&Ib486_WvU-j(i{y(TT77fe zp=^Ko42JZsuR%xPpd`sXx%a|w2fcemSaqEg_%- zLZ}u$!Hv0dD49r?r;}^Mbt#}Z?4OD^Y1_pg;LS&e@MhQqs2&H-QN=G*v;F5xdh5mk zjrcvVJ>pBBjmY?ZV?KUhF9VxBaGObLLcKkZ=Z$QAHx+;YkGh3nAZS(Uw7>Z4&^f?W zwlgA2Hzn?h_a;8rpC(tGqGw-}3w3OAcxuKq|4f5ExMVCHQgcWo;C=Jl@-!t!g;&ok zxIbUniGxfXYaIm3bRFdFcm;|(a)?kG!dyT`CLwCAX=gS>d4s?VXA zX1#K;ju0$a>B4X$FI?LwDo|Mx)N$6=Muf`E+xiIh?6~}H*poei-q2H zPR|>)=Cz%J5ZINB(xopBB};N6eAtsap0DdH+AfJt9f!6@0zPi@sq$}OA8e?qmX-|m zHfxU2$J^0myitd5Yy==8aI=r|jCCBBbY~ywEaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe288_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..ec0413a6b7a8199aaaa80b83afafbd16f994533a GIT binary patch literal 12618 zcmbuG36xdUm4+W6lORqEf(ocO;83CrPElqGl%b?b1w`;sJfNfotSYdIIDjJ%R6-1n zQPenr6Kb4d9HYT0#u+sxhR}A~ofx}qV>B`L_uY3lUQ5>MUaL>u_Wb+b`|PvNKIh!~ zs*2=txm=rNtxkM=Q@0_ThId)@NuN8uUNrO3jc=?zWpJx|hMseHw;>}AT>j~ez5ARx z?Yi8?$5)x$2_f?Oy-l z0^-ufP8j<6wEZ{y^XZi0T-Dud>x3()?apgzD z4!Ld7vXATEeeR255#QdFd-eFPh1<-XY`9`WUK&69dex%#cC%>zqcp0x3iohv`x zeDBpqclhvyx3;XBe^FCzdjBKd`E(n_Y{QCrJ+raPQ}6F~N$n>U!`AH9JmB0#50x%< z>bt(0I{(bGPU?B(GsYVvan=xuWyu;g-O`G$t_`nfY}W-h3&n^l;cZ?34%R~8aGiMOlaow=E$c*GLE4w z=Pj+TnoZpHx$Uuy8dW;(P3r3!^Nm$? zu*G@wwRW-U$=|XU=dsQ;b&Co$h1$jn>W50iqRsjzW6KxhE30bf7H!4(taoA?S+}sZ zv0>{N>z(iu7uHbdhT@p*lN_ye*v8e@=Vw=0=88g7p*r>JnD|-q@Qcj|ugJ~XCq84F z8yXAsg@!6~=#Y$e-HB~NzKI+n#MT@;g?(aOeNDc4L{Tomt>K(wkRTJsZbeC7N(obXJ<$d89rTAQlcG4*w|jrzrUutg1b4Zrfr z`nu}sNpt2j6ximi_O4;Kz+8wimNGft#az0D{hK<33o(j5-NR>cp}MXzIl7~3^Ruc8 zR4VfA5k4cUxy4m;s=nh_-1FVSubA)1>O#IAiW}20=YDVFP8M%#;?p+gzE7_BrVu_; z-0$T4)E6q_UbW?^lzmQ>qI-v&V-G~#d!xQ*s(UB)Mr_*E_e!*)?!Cy`)wO%4_4htx z?dsaiL%VZj?dsaiOS@;%IXz2bGtZEH&~3pvpIp|@Ipq2x;b&YqALPNgX1PHb&S!+& zuncD&a^o|c>y<0ZaIR6VBExy-<)&mf@0{H94CnggPS0@eubh`Ka&~{^=4Ci*C0Cu{ zysL5xGMqJ%IyTNWWDX&O0M_MTYZ^$X%7; zybp3~Q_kAib$MGoS;h+Q8U4();Ny5!vBu)D7Jc6@$V=&s3jFz*ii zU5{K=x)H%O^+h~uj#YO}w$NRVXD4*mlJ)P2Zr)+<1$N(zzdLZducq^ z)|*}*;~mVb>U|J>lo-<&>>S~<7g$aSpS{7^IM!ND>58Qv{ejfleqY4-_oKJAjx&z+ z*dOUjf}tOvj)dMH>^%zoKyY?%4noi6o*WwXgV8+e>dtitLK_i!3Chd`%LjyhXkyL{ zi}3@{JuCgw+z$hX@8Lz?q1MH<3`FFV;0A#`PfAZBxwq!Q5|ee)CCwVh^(D{2MJn;N zPD9Wg(*{vLg5FxGn~QsRWUB9h?p_7g8{~7s7@kc4l@u}`Q zq6Q~`JG3g=$AgWhUH=KG?)YQS2h)4rZK0d5Ep*=(Hg#+6JHVLg*0eKHtm}3;Yv_Fl zeHhsKkxt@2oL-xHob!p`TyDt|p-)2lulbwv2h0`qsu8J z%;p&^PqFK+K%zD$fxRQv;$(W);r@mF6tK_L(5HZXMut8W?DN<0)94-Vd|^Ko9M2Eq zPDi?D?5BZyAg##LJ)VIKA)^uW#S{)RS_-Wq#mPDk9A(DNG$9_0bJkvFZ=g8Vv4|`*I z&TA3v;admJ`nn(Cy8x{HLTc#PGZDwj$M|}1cD(Pn7~cTa9^)Iq#*jZdUE4yi{3LSs z9kvK@{ff=AJe*xGr9TUaxjbvm<32Z~wiDAln^TUCb6d=PampDl^7%ekUv2tX>$8!V zJN(W`eR?JK;+~ufmcKY1cV1%4<>XzP^;&`y`Qn(R=*EaK=YyS3KE_-CmXEnF1TR6% z@%(fx7lHND7I|L`HgDG#@h?g6x8pB^laKhz!N!(flEz;Fb`EXf_k+Zq%UQGVTM3re zKlbxdu>9S`>PLSWBIiDDNV&_w`gksHO}SNIeYJVce@JipGPhmwJ#sZz&a*E5f_{Fg z%bSzu=SN5%#B*dFcX!ANm-(2JCokp1G6huSDX^9SQc#c}}iMZR^tf zuTHr=>COKddYk!cyB3i%fAJ-Z^Nd`FSPS=HMaumorvj znCoX?*O#5^L3H`p*N4E4laG7sf+~)8Z`)$3RK+Ms#>u+AM<|o0PqwJcWLYH5c*7s?!oN=u0GxRp= ztL>MFoNE?WGR||l2I-2}%*`{RkG|@$|MpqCe&*hf{#oQO#JKw+`rg6ab6w9N+O4~L z|19&$|0>nB$2s1Z;jLv`^yiVdOLM`+yHva*FQ9iqj5`I{6LH+`^e-aXBlb%v7k8u* zy$SJ-%%Z;qv2HKZ+v1M=8f-o6wZEc~W?hZ>8$?bYaomwt!LB*>@HMdW$j3Q(9V{Pr zv66(>21!X?JeYO#JR)~XA{^sG1og_*O#5^U3B?4x9@=+Cm(m@w_thmcCVe^ zxtufRdLNvf>v!la=lVUIe9ZL$*m3d^=MP|g;*M+ve}Kqm=QfA9BYy;&qifgSykgB; zz@Crnn*Rk|KJLheU^(Mh-+!gISzm4chRC^Qv3JDtw+6}H5zmM|`kHI(zrA|c?c`_Eu`$6MpJ^dBSb5zqKM`kRn= zzx)N9y*qoOJI=fF38Fn>|7Xg@-N~ajA;vwO{uab~{ujM1?#`!R>twI}zctdVw=q9M zX4zj?))JED6&vUzL|Cm(mG6IjkT*0(dg&H8HF0g-df zV(*UUZw->YJDw4J^flMme|zMTr`@`D&+t3Jc_)I8yR$RA zHpj*J-UTf0c-OWo*yh@_bw%XNTWp^5v8&6gUz6(g@pDr*Y)$B`5x+Zkqwfy4m|k1# zaS!my)E0MOH#qtD{@HUIKE2@N%ZS~Z@wz(QQpv&oJb1gg4_eIy%23*Tn*RmJ7e4LTJ!E)BzI_?9uSx0UC5IO56⪙ra^4rb zh;dQJ{m|uXQM3Kg<$J-^5#JmSK$nkk{lSjovvu5oDDv5H2cgSb$Nlg<7;G&0r73p^ zSbiY(i&CxxU4Am$Whr+ky8NMV7o^+(bz~4+)blWOd0TLYr<`YLBFWWv0!VW{qc1Er^-e^>cNm=cXMKmG z%ZG35=?FOEXpj9H2{s39leh)eWfa&oX!ER_v-j7t8tb#SZm_CwT%Ju zNq$eJU+hz9%6G&z35okO7G9fkjia~5_VElq9^4&&=RW}%k8DWmHUX^N7=I<}iS*iS z?w$5Yh`e#d@vJEWJI-g6@Bb6QXVA-s&t$Oiedp*?4%SazAD;&mVEKE}oK6DE?T^i~ zbTZgxKH5$}Q<}`*mxF%!SXLB;Q&-g2b zckm3bxw}T=Ij{H5F@BF22c8e^Oz+8;f3>@jDeg zzW3C@Yl}Tzknx+I`nktv!fOk^`i$Rc8NUX2ZSg&z5$ss&9^687{bDZ`fo*YS&O*0# z_VN3;Ca|#_>;5&<+uT2GixD};iQ^7`A8hRoz&E~Eo}J<1JI^_A;j2A-&jni}$A|BE zsjr-N_c!LYkMCGZz<#%K9mY1Vc0hHdkJ_Kc>PVVdM0j!&_{`y-vl;>5_^3!SYCg>&)9pwJJ5UYea@@vZ>;h3o)i1{`Sb+v z@rXYc=rb<$nMnTuXT^7cazbjqH?`ZFk9)lV+?C!j_aXPEHotc~0QUK&?PsYi-X#yB z$2+G#KJhMj2wvL;*3=LFVX$%J{r>a_y>r;SFWS}RU7tAW@hI4OINtc~>CeIPaXuac zk3r0k?-?h?am$C3n?cb+>2m&{o*$DtfMyXfak`u;@QzB&ZB3<{Np^vd2?^$ zUG*~9vk=dLUxVciA!g+A3c7p=Ts)_KgYJAjCc4kgZU)2Gp^(Hi#q-etdA|Y-=~~( z?EMEQ`f7`JZmjDMaIUM8Rf=7Y{x+XO^Xa|I_Fs|Bk!CbyTmRmjpN}5sv+4a@v^n#(|IYxq=DNXO U9Ppigwoj4HJ!AO|2Qlt{09sP^)&Kwi literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..bfebe1ed5625c8bc5183744581d6c5d67a2acb55 GIT binary patch literal 8338 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..77ed6f870a18eb2b6af3df5fbc1e3822381271a1 GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe432_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..7ec21da8d223cb477db7bb1dc7145d6cb32d4b76 GIT binary patch literal 12618 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 TgTC|6_9@bN^H$z)2;=?<46yYe literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..f75dc925c1504bba412fca78afbc543edb84d267 GIT binary patch literal 8338 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 R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe576_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..b532faae4b4c3b6c491e91716b2f5b6d7654ea5f GIT binary patch literal 12618 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 Soqx7ZkuErU`Avr~?tcKQkM(Q- literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c2b5d1bfafb48d6a0382d089f91deb50a9ac4397 GIT binary patch literal 8338 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..77ed6f870a18eb2b6af3df5fbc1e3822381271a1 GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe720_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..12938b54606d6ed16483a0a6967fd947dd441876 GIT binary patch literal 12618 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 Q|7@QkoqNWL8~QWupFdLetpET3 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..5a33ba9798b3727f172ba4597371fb764ab8bde2 GIT binary patch literal 8338 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..77ed6f870a18eb2b6af3df5fbc1e3822381271a1 GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&o%6MU`T!nR#rXgL literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance-numraysperprobe864_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..14f9f51d851deb8ac06c573c8bc7b2694e944add GIT binary patch literal 12618 zcmbuG2bfjWwZ|_YO%N;;K?PJSSVoj$i_#fT%E*igh`?pIz{nJw84$36jS^IX25S^G zHn5?_7GsSDTZ|nwCWi2e?-}EJK4Ua7=Jz}IEIf{U-+SNpcJ6Zj*MF_O_S$Rjea@X3 zlFQ|CEtWSs>50vq2W}qHVfCjy@BC)Lw8u8Rx#rXX&F&p^?h%~_4n1haXE*iedD`Ub zbDN%6b>?Bs-kVZcv3_aUiOZk7?DM7FAInd9`J&B*VehS;d+wjd+;P?Fi-)v&r*!YiUR;?_3XI=kUZNF-JaQ{UsS8uqp&x>oib=^Ac)oc2H^782`+C92+ zaX{w3i_Wimw(tM$mYX#7kNrMg_u}&Q_ii2b(wgc?ca0jI-<7F9dVN^et^Hno{_wV^ zZF%UWTWf0bg?&!W{lD2whHZXZtJ0NMeKh#c z+ZQbVr2f6EQeAkKBygg}AztUI6Z+di>%Fnjk zcg-pCjM>Y&*ql!HT*+yQ#y|AMC!Y_S1^NYj5z(JTJS%|RAX$3kGOHs zyh6zlGfS#!^0N!*Epu(K{MI zi}UDf?PApvzGE-WW1Va278GgeR1o;%CjnFE%5*A~$QF_>5ZA z&{(K1G*p>Gn`FG}PHbcI3&|luY|F7-*vHk?*W{~*R^`9VzkS$FsVbb6Sgc1eubsjc z5l1YXS655n;H`@DdPbAEGYgzUdUNWkXJXps*D?HtvXOHdYYPnx72ox1m&Ef?)g<1C z+RD0_Y)5InrY2vESK5ToeRC443ns_QC~qdTHDKcl)p zr6S+1;WMn7TU<4(>U)00J>Nb2iun$!F68T>xG`;W?)P@?Wbw8pJ}qR#x_8Jq_C(aZH|l$(x_4q9#HL++??fx=-ixeVUAuQ$fA2%q zuCCoYv^!VUuCCp@w0kC<)3Y=x^9kl$z}bVL#`JRe#VvaK^~lImg}G4d`8F( z&T!@-HzvcmUb(Ui=NjcIGMsl_ZeoV>&dE*5aIRl&dWLg<<-CNEv->MIC&O7Qx#|q( zU6q@c;jEDyM}Av8@1NYl4Cj55J14_=x8#;&xK1gzD#Lk)^jn?byfboFW;pMN+|?P* z`yjV2<*c1e&Q{9lkaK^#fL&uR;ulmvDR`*CoH|`52Dug`ytN1KfSeeoN=tj z0m$?g-|7dV_d>$n2kbox{UC65Zw^M!<(?W8_CwG->*~&RC_)<=dI`$3c`N#cepq78 z4UX}B(LF1D(%cURhwl+Z-$B;Jwe&;el;HYT8__ z(mRH-B>Iu`)=J%6+{2?%eNS}vD!3jXpA*LLY%1E+BaX2Y=lH*f7RnicJ1z{b z7;ODWC-EObuT4G9`8aScx8%vt$D`fV@zTMem!U5{vPW{~%=;u{ztL-si#sqO<>X74 z%`;e@V%J@PL~Tw6d+x2pDfF(x{R{i4V4tg@PXzmn41E&V=da@@(>vbz!hRY!o*%}Y zf^^B)PX~8Jnvth_JQW#8Mnmb1W%K;}6>S>5HTKL*N8Fdt^G);_P4vnp`phPJp@}}L zi9WlD?t9$%k0T$?e-+}ss=LlJ5cl;9*tzt!zkz)}R3om(eh5)K(=~|a$l6#Bdt-Ud zYZ2|?TL;eix*y>?53KznYUtQA5y#8N_UV@n8 z1?gHY2J5FS^1cLY-mWj=FH7)u<1dGkkN7LV#+F}_#$O3`4sGH0!^ED;S+nq41(w%8 z_VZG({5{0#O@A38=RR*txy!-&crI^Cxz%8OwRz5eL~r{lw?pzhat&C{vo8LUer~GE zo0I3~3Zy6EIkFCNSEl;j^sYzl$0@%reT-cTcDy#v+$r=|A#vu80(<5>Cs(Jo^=bas zq}*Qg=6@}{&HS}phsc?~cp2k7BiAF=!aZ1-az9CV&*lX3@QmMp$WKLV;d>)E#)t1Z zIC;l-9%8PW!1}s};d?V!ejU;raeXc6Z$W$}9nV^Pe(4wY@TcIY$*JJDhqr>Y`E0Ou zw;|y-5$y9S>UVo;-@t6W!FM2X`Z#BS-g_;cNpEcHdMCXto`37X*3@4628}f9Zp^z7 zIeo-&PVWYHL548@aQb@?=aDx@_vT(i{_Zr#`%=zv&b5)==3LtDM;<_&OB`_?1RE#j z`We{uW#@VbT|V~pVX))m+aq^ z$Gq~tN_FjVjyGj^YuOV01tjj$Y;f@|74OK4=s_$x%g*&4x_q45_rZ>nk2~^Pu)KM@*Us-; z&KYxk0M5?!JM^Y={T@y}=K2uqIQfY42e3YIN49`JMC7w`n?u}@KZ4ECwd-$QvF5E{ z&qsF6|AHlW~|3+`KzS{mBk#o&r?}+DbEt0(>o)LZYHP_gGd-br}#~t|y zd^lp<{SbZQj{FB$yLIo9;r|otod`be&c|@t92e*NPhfe+TjQ4WpCGLf&-fhrn~`|G z{283RJNuwJ&b#v|qCH~&SIWiR$)hhsj60qFR>XS#H@z+H&SzljWUu{yG}5fMF+WG- z^byD1`3txk5_|gvcse2<=jX3r`M5h@g5_MlbA3f`b1rRvL;j99mpI~l4K_~9^$)P? z%g*%;x_q2xzZf`9KJHF4IC=NVGvNHr<(x5BbL`oQ&jz4#sqifgSykgC5(LEp8Ja&YWkGs;kXN zadEzP1hkK>rn-In+|(J{LiFZ{-<>uPyet zD|l6Ei#xD8oP2!$?6w`B?r`#D#O}fPJ;08WH_k}7J;Czo`s@Xk^DOy{=mBm+KZE!6 zF7!Ro<@B?;mX7qj(6zMy*D}_%?2RrTXJj9+oHe(O`+{xOQCn|B&bo=Sb(D{s_X96r zT-0%YbU9np>;QE6?r?R)H^&3f3lq*4(p8$7R${mI-e;C|_Dc4sW=?@q6JRDu#7TggjC*7X?a83PC)OSD}V@&z} z;GI)@_zuYU8Y_GUg7w#4M%;mnI}&U>{j@(q+}`jWB-PM%|Y9EZh>_f4t5RNJnQD{{q?NIy6t^7=|3X%_xw86nz(LlBf)%< z-;?PV`&63pZLy6<;y#Un*XCTK>8-JSJi|`_cfsHJPejHb8`HXt1#36PU&wkKy>^>> zr+qvkZ(MOaYs$cm^BLv)|0M7k^zz{|0c?EVIr@}?^^@1f=RpNn{@ygFlfiNaVDl`U z0=Aitwo?%~^AWr5$WK0=Q4_(f7#F!rLN{(a_a=koF2yH)_i!3|e7~6lZ!Ghk0vZL<+M$BEqDSvCS)e`?E-Xj)@EMX;(dG}SbOLffsN(!*E4l7 zSf4U*JR2`T=ac*`O?&t*1Mdp2J-FrI!{ChJd)k;Q!16x-m#5syRCoRu`$Mq4+TuOA z3hX#-;dd!mUJ1X;!1`%x&wImpF9-AC?=5^60C+d_iFK_`?LFc24gNf5*!DUJ0p9-*~_O7;Fq}=I%LMOK_4hlT>-s6!x@e1dx29Y+ z-feL5p3xY4JGwsFJhR5T18huf?bGiScY^sOzhBkg`6AEtU~|mI-GJ^GZ4vh_u(7qp z-rf!7lkBbb?B2S^@xA6Au;;*Y;TZSb=lltby%)R_z4zYdyt@9z8bj|nv5%imPXwQU z_;Z0iqf?)8^dE9od>1GuruO?%yS@3i*Bil|=pA!E@<3|yd&h%dpKscJmfGT7@(_Bw zbNb*D?~;e%wQXcgz2P4L8%N&nPmj_&ht2z$EdEd4X+ z5%Z8Vrg=OIuPyTWC74h0Gm<%KcdfqTp9A}jkF`4fdAK59{J#DxbUsv~Xp6X;Qr`EB zKIRztz5v$l+`+w=a`M5w1eVt?o&zs~9k0zgYV!_wZagcV9ev_FdPdAY&SRW6_cq>D zuYf%Z@f`RySng0_MlP?S%a_2#bLuzf&gU~O{9Z%%u4;=~ybk7*?7enl#rx_Fu37AEu1ZW z#(NLWdCH4)l0(?uhj&~>#uh(&{TALi72lWsO!xtqPf|PMI$po1CmI(gO&kH7WR*aymANdGl^5~r!nnYaIc2FNX{8}Q|U S-}`6#6zRM(R@`_nvX&3Fv; zF|`h7s?OB`8u~(z(P6r-8KWjHvyCh)C@{MLuh}NXMiiKR0I%7m=4RxY{aldIaq`40 zEnGojZe&2d(M*o`!`s4)?6`a`$mEC=;DyYhBEsk?#lV2<=mZ%L4s-3zd$Vj{NqF=B zY-0^*$^)|1)i=lQKElko_CV$HAJ5v$8Mc2=VYC*UoPI$YS8$@HUL5A_(mh%pYVo5H zY912<{!m0swK&ZD7Jurs{(_Afa5Iqt4@)jXO|8V52@WxwxeGOw5@#kOBk_roI1`x& zlmVz|l2|j5LX(K3NUW*g@YJ5XH_Ku2l?#86i#+*Xtm>2h|M-R~c2bLje`4EzImL}< zKuIx85Pvc(p4@xU8PxRrhPYCcY{QX)5@*6B+i+r1D0zlk3oeCCNSfwZL*ZGJh zb6kt#>D#hwK9+<(n;-6bAvk$rme%y|No-Ej+sv5%KoxHX8l$eh9cTm(%w&+zYb}nY zb>|nSeaq6{?)ZV(7OZ(YP_rFO71;jm32!-A)u%hW;rNDZIY{`V7ROB%ZrMXtUlg}b S3}mwwoIc?Mn>H&02mk=|-&5)U diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblenddistance_dx12_0.azshadervariant index ec72a557113911ff0807d16732437376516ba3b7..c3925d31857fc8a0569df7cbefc7bac250293d8a 100644 GIT binary patch delta 16 XcmbQ_ILUECmjXv!R_A#<2*C!8 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 Jf&Uxg-vB^}Tgw0d literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c2c98c19dc4be5541d870eac0dc4c879231d54af GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe1008_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..e870a155090cef47037921890149bf31cbfa7533 GIT binary patch literal 15030 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 NhT{)E{WV{V{{dt;;CcW6 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..f77e677928db09d4d2cdcc6b82ce773a8edb5bf7 GIT binary patch literal 9314 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 I#6Keb8Q3gf{{R30 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c2c98c19dc4be5541d870eac0dc4c879231d54af GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe144_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c12043e8fe681c7e05c7dee8165797600d07cafe GIT binary patch literal 15030 zcmbuG2b|T#wZ|_YO%O$?qJRYzL_|SQR9Kn|3bMjtMe(v+V0GEW-37r|z>35|&{(1< z#>4`4jV;C+6q-Z}Vp<@0&(^Lg|3WPay&&YYP!b7t<{<(bRn zaxIoNJLvvbI}dqvWQXM+^}7Ds1=H_c`{Ig2_GotVh?92jJY-bAvp>G7XRjj;zdX10 z{&SAowb|>_sw!76sW@Qi1Lu9RWXpT=)1E&4)xzl4mmho5hZC;5c=;J4TfOkbX~dgaL!*{&(n}^R?R{qMW!L!>l_iE^UAFy3tRqs5$J0apUuwGxfXAkM6o|(6f*2*7k_E z?|ka&E5DvJ_QY``%Z}P>_4C)hz2f}o<(I8#Tr+85->JF(H@nub&97-yzU<<6%XYbT z!O{=vUw`b2QW9TzHTT^9ohFR9cHM0=4;uRAV~ZwrJ@nF-4_h>-{FzB>@99|e@!Pjt zI;_o%mE9KH@J+KqZd%`=uYJ6MWVT>OTRyV3!$WU&JFE7i%Cd{PEgE?8g1gF3aOxZX zd)TqZ9Y3}E#gp$FdH%Y-ReO$U(R{nsxm+{S*&(-o^HNqj=9(9ocDYu?zI?)z2?H7$ zXAT&=$3Q(gFr~46epRFU zXj2@=(57>j*H_Oh&bcwRF=NWdA6!>6e{Nw+p`oh0Vk(?F)n==!uby39E7z*XnV0&y z#(ZOS9c*bHea&C&eDe3~t&8K#_1wAzg}H^=#!7OCO2m@QGboOoGB00MT|2vEE6r!l zi?-2q^J^O$){pU=iu{4|=aTG((wL2lbD8h3eV6FU!oosL@@rf4Gw0zqrrOL_6~Zgl zX6}nV;}$hE7U~NP)vlpUalHF3+9u`~vW5t;evR$Ieqdew+il=>Zy&aUs|&{$ zE#{-Nu1&%g5yvi^S655o;LVEjb_k!$2IsK6IdwHNF|GI8H2g+!kaHSq3k?mG-}h@* zjOTMz+{<_I#@1HV&Ez=B^K<9sOEF99^PUuaN9C)Iokf*rBF6f7uu^WSYxk?Kt8LUT z_Jb{QxJCF)sj9E5shKouRzrbfUT^Odb`#8n*w0iJ>$|j;&SC#<-Qhxvl24cLnOvx; zt16c6*xLMzngW@M^>z)P(KX!U>RHu4@GG5px9}^icXUl5Uk}BNX`A!BH*hCQx3%cg zGUvHZuAIF7^0#E9=RLXdyX5%Rc)rD&sxMTE4rV z5u0}PZHih+_pW5^>e{{M`g=#Rc6IHpL%VZj?dsZHmv-yVIjyg8nRjJ7bX#!FCzthe z4!Pb)_!(Eu2R=CWEH^mA`EJOSWjNO%HzC8hU%845=N{!MGo0^$+@TrHdnh+8!?}OC zqcfamF6YIJHGAfAb26M~E?1M`%%9x63}=qyxCZOvc_-x-W;pMl+=&^^`zE(I!*xpB zIT_A-rQh-l=RK0UFvEFoWZ^T-2th(#Bh3?v|ozT03v;JG6yY8^} z09#ka_YU?(Y}(bmhqlmrf{o|ideQ4+y#CCp-W$yPuuVmm|j2))#r^>8JNqH(&jb-bmPY2Gd4`-XCT9yt4;} zzDv=ZD~s_1&^`OmcLh67=mWvtgBZUXIF~CM5%%5Dyc1y`q&c^Ec;B?Q!5P~gCEGCf zIt1)IEs*|XQ++6+Pe{bv6OJ~*e4C@a5IH5dVPNZ2iFkX1vo&Wt&vzf>TP6;DUv%G& z(1(K^*PYB*d#gL$o0(iD9-Kvy(@|~ z^)kdbA+F>9B91dgR-CgZEAp(}tLq*`?>^%E^&gEaM_lI^deIWvhjNUmW(Q9)b z+A9(+OZq`ckMWbyU8DQbe@fEbN1Rn9xJ|Q?eJa@4+V{rav-a-WLU(<((A$*MqHd1; z3^ImxbJ!kn4eI91&z{h=d*4DgXXcOP6#dPaHg(tQx(-Hixy28Jen?3#3;j^^6NdII z-dX(*L)NVBH$3jn;fa%vF-L&g^jRV1@?2G8FQD>&rH}eD1|(u{d{Ub+>iZ8 zc3}-SBG!?4F_-qnGH>${?cuusob~lHGklK+Yd@VFI(8xAc=;H=2%H`7XKai=0jxd7 z{|Iah`4iLLP6W$OV(os0o`kr6#b)h}^e$0E7ijV=<@o<9xnvT-$blF^gl)9Jm*^zcM(`0>++h!T@2P&n{|E(z3oeKsqIok z&RQ3LLGN8qmv`;f&(DzFh;?KhmQipCfXvS9})ZtdXk`bFlgoY^btp$-T}7$Ml%0I`d=Z=BkvkLn>!Kt8`B!^N}S`I>u!3Rb7{K=xfgLR zam4vG*f=rQePH*Oo$EK~@^P;BgB>Ry_x=H}e0Rk9cYfz`&Y0^#aCWYT(3{TnFr0kM z^$7SuL_XsD7OYRa36FyHlh4lW8b0B?&DUdyYjp4WyRO*t<6!G3yXUp&@~cyRp8(4l z$NWA?Z!^Ezok`;XYKmA_CEAaBZCp+?ttifJ$KK2 zJ%eaB@1Fgm%q#!9q-&2lem29KOYhR}k+@5>;L=?x-I3?e+abn18u9&boNvtYi1vv6 zLgM0%9D^Qrq#Aq!V%}b)x5XWK32Z*>wZE*9W?qf?3L>YEIPS=+VD}tn_!`)G^rxew^zM^fu?x_9pU2#JR)~=TBhc#9VKI-CuUDKcmY>-M$TWoP6Aocfj(l z+p~6l=W@=NYaKW{*I&?^&h=L~`Izf(V8_WvoWFzhi97NxSU>sf+^!++$UnfY(Y@>M zx?<1&1X~~3J->%8A9v(^u$*zs?+5fY^Q-McM9w{ny(8A&N+f$ntPy?mb**v!_Ud7` zk2~@acrapI?})x}NB#xYZr(ln;QtNwP6Qu!=VLf+j*I&K4_Myu=GeRQ2@-dw4tzZl zpD&++vv+4ZbjNvjK0~xe?9UUoHNBrNbLivl%m&BZ`2uW^S+jJN_Ok?^#&`&hK2#8FRG-XXn}&z3E)-;N)Yj_F%`!N1RQ-`o!Jo z0M<`FJGX0yyR#|SHM)2GU03XRGqClM-E&7c`M5iqgXN6lS#CjZGr!t8A#(0n?A@{c zRwCKEV~yyeuWOC-w^t9lecYYS_)p{e?noCn?dCmuce=uPCxVZ=(+ysmLF`_P-xlmRdE-oi+YT(RuFv*hIcv!`q7S$Y{R}>@H>ckL zT~0rnd)bVBM|5p1z_pBZFFT>jM~(Ca%b9cY*bi(okJ@%d&NYeBA*?%JG#7i+!5bFU}MQIN!(zt{9f44 zNZcOi@`uBnm$)J5^1HyDmbjtl^26XFpL?Rq+k)FGankKM5BD?-MV(hH=NMzk?+xyl z?BTml#@ATkyDwOO?G?lw!nomJ zJv$a(XbjcH@7_ zjt)t7+>7U`{ZK^SImPh~9R_xs@0Z^V4hJ7cFCRWffQ|3xkv`MF`pN6#`i=z4-<;NT z6j*L2Y}VOyu+2Ktb~GaAdc@`=)+ZnDS03Doaj}*e=*EpVu?j4AAwKbUiJ9o}-Dfzw zv0QfnUYqNgMQ@AmGPBWLi+#LzbHI-2iJxPt!8Z4x?HJ@(#Bt(yV{5>!+qK!E_U58% zQ*3rod#=Yg#*6uD!Op)me$HP9wmHAHd5E0j#4-PI;OzYI{?x;3vqe4|(B&UbXWIyt z+XtU{%;Wu>k1p@MQeOa;I|A(AO1ullqsv>vwue)^h3LlH7cS;lgf5?*;{3B@@)>zLzYbouNYr=ZKn9E-tn**TV=%R5)ovoY7!sdZq^?bYM# z>_6dOfy{^Z*IZZ^#`JvD9TPsMf~|?H&)$sH$M0^F!KZ=S(_8a?H&=ID+>g`2-Vf{J z46rR~`b>1!X|MgPWRLn?ihg$T5l8(j0~{doH@o zIklaK$T?0NbDj_0(45QRwej=4IgQ~O+>^2Fvuko~=Gl7v3D~u}N8>rKpDB(p&r`rF zz?;xVp4A=ao05mW032^h{4VA9sSDw?>30zNPcweopnFcfj~Bsfi#O`xjNgpp=Noki zyteSWG~-v5@%tIPw)l>F8Q8JD6~SGOu3x+#E5Wv?k1Np4oqhbR`AV>{9Ba+2qPKZ| z+O9(694C&?pr3=yT|a!|cc!Z|TzsGZ1zh-Q58q#c&5`57_nPD@r`_|7x$Wckhik$9 z-rzor?Ygv?_v^sME$*?2?Rs?Atj%>fF1~B725S#}4cJ)mcH98g=TPQ|&;1+G`6>Rp zu=eo13A_co_TX*?`yJ94eh0NqZvo5u-DYXxZcV!L$JpDz`f7{sfVYDkr!D;M0Lv@k z_bae|+S>D-$a(Js^TWRz^7m1IcSE1p*Imi(?-%+8e|O?Lz`Mto_a3k|$A#~`V19~s zEbIGgNNxJYch~#C#?a>4t;65Y+pI&+`+h{uIutvP@9qO&ev048jAPBLq}NaX_$+=9 z?A=vtcE0zg5Z^ctLFf~2-@{;iefxrY1YJK{aKBBQba0O*&iED7rSHaLaE{ksyYXXf zkAt-JkM0<45%&eKv9-n7z6j>0c(&TJ zXX_cq_vn|v)`4~57|-2z-p|vQ!Pe`M^nRYI>u;={c?~QVxp^Hd*OxJKiS6gX8|d=R{Rev2XYXFE zqc_3+{l)eC5&2WHIrc5EZ@;!bXKY>I-bVLb)%H%Z-Aa!99dRAHcGu?b6Mso|OvU@B z{jZ3;>k&tO{{}X{j(6YI$lt;8QE%^pCnECJjBn6C!2A?{U-13WCu07y==c4Y@4?CI zwtpdV?nxZK@BABVF8w_q{_XZ-ba~Im zSpT878B5zIh@7#+o?qlkUfr|O?woPQJ_Wls^AYdIXJC0-aGxhmI=C+qmwjixgmb+9 z+Ksz}oLM_xfvq2Xvg?T&(#M+8$2IHkTCF|n%bGF=+RTr(xHs06XA$=%YS$b%-a7jl z?B}+&!Sv?IT>h8dW-j%q2g{i&`*`2J0efHk+=@H&ExLSvxX25`ihJq_zCqfe z2AhK!TC73s#){A37U+H^>J#tuMqqQJ*zBOzpJhuFeH`oCFcn)XaJ&rz(7hwpYHN6H z>MhaRfLqhY_v5zcax39%v4)M|v?;b&L)hEFyN+ok^Ll%%r#-e<&#w5ydNzUA7W?l2 zcK`D6IlU=ZJ|y1%&EQ;zf8%$4{U-5U+MIZlG;TV0w)-7Xm4t*nc-NBK&fsBpZZ3(aK zUe;@!_W&D5-um8(-e!Gk+ZvIxzQs}BJ;Bz+ZurJ}dZEW!eaH0i?#6g~@0T^z8|--R zjN>A*rSp?_PHH=>~nW)vCr+{wZ%UBfQ=#VK6jwExle67B699i z9BM<*1dcl$+~CAz=iDQ4 zbnD{|L5VpXqfg8^G-GoPedF_SPq1s!$Mf5Z-sbsf8-~bve&YCEwl~=MJQMThT%O@R ziFfZq5&dG!zL_!RJH`x8y!XcO`o)+L$>w|EJpNs^3|t1*=JzV+9SN56tydofHmPV^ZKHm0?szx#_?90Rr%^@+0>3zoM9w_oD2=Tn|IUE{m|I26b0uiYAqcYi#( z?|v0)7yI7pZ*%Q_7MlO!XChhO)65^bq5rm!ad-4udsfAgbFUh3RK>tsjwzh*{@X3T zJxbpetJjQ}R(|-bEAD&g%Zay7c_RIngT**aZO**m|L`)msBVuhcKX48B1tive9YOe H`(peLSAatwGSz)>=SI#a5dTUI>Vaw-y!Kpz%^m713Jk`1YNB0yuWsZ)Tovz8~K_&+O-1 z*4lfo%U*l!z4kf@1VIp43#Xjvn<(fLvGqenmibpC}~rwBPLfMd5KOeMOJDFEj4C{+)LpB{%HT7mJX~&sBgg zC`t3*`1P$RO~1G4b|ijhh*(4ajUF6PxI_Qx$5Xq@-Q8@fF6@tZ*t4?Kv6VAQ@XE9B zy$xpUKko)Dd;50yprKpK{M;6Iwmf^;(WE))6M*O+FU7gp!Y_1$(wEn(-4RrF&;9At#;e~=yS;q&s1d*G zgD%c>O@8AeTl4Ca$lp2&7r3SE|8`knc;dMQmR4uklUt4ZXV7%qDe(3UWh7|D)W~a3 z{=%4KFd`4Lg>AaYEy*296;^T!vF!z4CT=A}fA)`M@8oS>?7nZ|*P>mvsWP9a_%w0c za9Uy=e8$Ol%B9mkz5g&p00ZMj`9KgtyuqCW?lf>`fqM|#ayA4lN|=Mu01Vk55Hx2| zV(1uXuUhc$aLJ-2SP|&%N6`F5`6nn2uhdfjOiVTDl{x|>bb7Un*cEfQXQ@8q|y9jNf}RA!rF`b5x>sdKb_}Rru}}StxT5 zPFQp~tY-Q<(A+0e-p|0fvq|D|M{zqR%r%O}oyQ2v&?f0!(YOTdVaPp9Y)fM6oqgLS zq7;R0Ky_yaB{Ts^;R4=(Cr@W3hD;Tb8d#bk0wkmGRU~7C0Aam=+fD#Z5IG6h7SI5d zAQz=nj3(1GbQp$8Q3#TPx-cIt9bH{aaq+EJgU4-kt=@G)vQFoyZcpY|OiUw2f_vhT z+eY>P=JdphG|L@NNZ2Dnr(aN~J1Di@NPQ+@-xfMOLY<1F?7<=SfY2!$LN-~cQY$r( zmXsucr5puUR-(w7==>pByNeHV>YY;d^`SQvF7cb)@Qbbvu+= zNh4>E6)~d9a2>Q4I@G}I%Odlf}cWWkE|ahTp%D0DMU3eI+g?>jPif zj#|&Yyc0GyrNlh60=*{Gpyy1@0{t7vMHy#i(CPBB5gl?!CZ) zA{;}YxDQ!0`${4zG&4OpcGn{iW??KkzT6@1uo~vP?8hwZfM__;i71+xnb0c?Cr3ae zA*dz_?tQ@nf>8hw#i;LO;r8W6V5lQ7v@Za{CRg#@os;!CdO%_aC2of!2jeKNJ3}*e z9H#7$QViU=hd5M5J+r$OXB>59dyv&+Z~h<#HbGXt-4iF z7&>pGqio(a4#h=nu15LaA?auUjoKo@m<-uQ7q#yV45f#PxG!+G)V}`yz5Umg-f%n6 zUz4^!HEnXmioUdKlv-8;y{$Hf!(4052+^f8<1a@zg*P;|woYw5{&~yvsMg4)X20lG ztoa1?Wm7ZjY-4-}#+iS4<^e<7-MdF@=g(X}W3_$X-mPuB-zErY4|8u9M$CVb%|%PA z(TGDvW>9u+?%aoi@63IWb^lz>&S^bmZ#JCoIhvfSlxOoe=2J|W5od{76i^VW3Z>O! zqNpe&%SByRgYv&ed>_Y>nFr`%34=$8V+ts;MiFL_ntO{y?#Y}<5-Vk*ATrW_^RuhZ z9H#slu%y6mUqXu_sn;4Vprv^vbN0SrcpR{=pz>~uDXGsIZZvxP{F>mFu~Lh@#H05=hild|VNCg9=x zJoSn_+gyTcl#aZ48)JaF8I7i-hgLHglb@aAMN@0*lTm%oTdwTttaQG?i1$c zx*TAvDih*MFJ9nk#GSHC1pDZ#UpOB=cd@v&tRkgiprVP86y7KGs~@T$afe_pV&=l? zzm7f?*4o^9qLtpJKzKTvYiue+E^#4zVA&$>hrkU|uJcz`-2k32kOandi19-Zt}s*W ziu^eL*lW7^fv;r)`3*q+y5b8HjmC5`VY4+AOA4m!og|19MSUw(?KZZ#IZCaKO2Q<* zb8G4xH}Zmm+f>^&25%&$G8+tk%|M+4CfC}P_wVW|-hJ4vdu><6x!TiByMg)wpnl8H zO%gY%-R@Ir+okip_xro=-fif$b>Hp%zRwasE8%5h-I8M z&d!x>SiLTHZDM*(PP&WwHcP;zPcJ$RA?(-e)~Ic4di{7~Q&><$YjgC8NI^5b4W061n8t_wLlkfdI$@gZ^~n#*%6{(Z$v&pb1=g_u z>r5@Vzz4GvXdmF5;ycd87mM9bcYRTO5ezLF4DJ5VVKVm$9Q?;M6;>D7+Jc>;w~2r% zt36{2Ak_?m-JJs#cRUkJBHVR}ZBjtTk_6zK4}h&tntx?WF^P(>H7~=lreDV9bII>zQEuGz~HwA_E0e{&92Y~4AAE3&{Z;*$%{D3`d-K$ zM4f(vToX*L3l$UJ7EM|YyA_z++7$frBG2pao49&kfIa24tHdz0k9Q0%X%kd{`;OZVZWRr=EXNm)v#^=$#4G&WuPqP2c^ zMeD`+bY;-$Ez=4z^Ea;Bkh_R~!`-P4369RmNP zZv8;3rQ+P_t6gOk=jPK-%muWY3gwxi+}sVD(l-GX8y8XD9VwXs>N9gU@D8Wp{PqF<8drFhHZDqS)`@Xy;TGz~syyah z$mwSe`zg*2XNo7cnLN+e^4DMv_HHU(4|$d)ZkCQbt7nUDlbpJZMlDP#k;|!D<>Z1b zC33XHy~mk7s3%TpxtP=KA@-1j9nNX@{N9`2=k3{+K6wpR8uPU(rZ+D71bODys+nqX zOwW*Oft0!}iyE0#k`JDEiCkYImr@G?sRbhrfbC|yWEHI>k6V&oRZ>``2zfZferRR? zVq_0uyp)Zs% zSI9AqW@fuLwMb6h8dy?*m$+YyV~tK;%d!_7L{iQki+4OjhMNv`qhW6~%j)$5qU_Ju*Avpy=h zc{_{~r9x^9ZeQ*)K9ntY0JO+ft>j}asx2hYo zfu7PKAlKoYmo?HUQ+&X|oF%d=_M?_2*l*bq4H zy_$nHfco(q>>gbJ>Dw;`eMT}@0267t%Dg((>H;&T$XA3!R z<&GsBOT}-Mc1_RaO$0nGd{}&bmif+tzPP0AvV7? zg5nft>O_(d!jCCO59g942n1)vtUvjJzKzy(Pw+`vX;)${&l!*w-{;W0A2p0-QwMJ} zWcUYwX^#iuTuJe$x-D91;Bs!EmL!|-zn3>g(LEEmc)A+yf^FEk9f9e?U$I?Rt*zxA z^7Vt0SML4zUTH(H5(R>Z(&$4|Ho75~TvOU?AK`vYyB{A9wnUdjz~}s$KnCf;xPEq_ zu)NPQa&4mRKteUX<~nd{AJ>yl&pYF7u11uE{eP8*QS5n`lnvcwQ^7TP7=(@Sg4yQa zFLNlVTV!5aFt9C7#C9A6{RX*@&}D zUnrnJCOGDs5vjQ``-TR;fid4oteYBgE+=cfl0)s&c+b(W+DS+PH#_izlcgOmcE7Ql z>v`}?!Iu#yBTt1z&d`URz@iftt;>;TXQFY_ zhdr{nSA?uy1A|wyvSyygvi-c9d(j4PjK}~-2yj{y_@mX}IMP?#bgiOmK3zwgIW}gc zug=V$zhQM|_9A6H6P#sMTK~3W$~Ts?fr11G1U-$JD|+XA^rJH8!QTUqOR)sQqu0FNlTqIJ?Ar&C_8tHM zu`$bzXt&!DG*IVkKpBT_+8NRid*#S0tBeh6R^+gcCKz~AcbsRj| z=Fjj&96)X3Nik2ylj92PG}Rg=SIJuQIGMgf}i8_)}#6Xd^AmlicIzh*c0!B2&Px!KzDjoVqo7W4I*9%ch&jgh0 zsePCKF#Tj=isJZ~=weFLQ$^IM=td_Xy3uc3v|lLO0I}=n3LtvqrRdEQ?qUq@&}t5i z5Dl?MMX%-HrVv###TQ|N0byP7(MOfM6QYBk@l@C-a!8f!gxJ!Y`_6>QF0RXd6j`Z9ID`3W#VY#+IAx(pzTYahF)=%ONxFKH8cW*Ksip6sa^VJ4yvu%gSX!CtmW9^b|`N8Yru zA92z`EuF5S*yEH7LI+{gif{?cVSlINh5&1e65K+(DerSaMm@ao;_Ug9NgNIngw`!THqiy zNfrt&;Gb^ja?_jl9fZq_6NabyOlede>~+MOp#a+=?MkVGtkw<6gy&n-8HtxNg@u3fp3Q@grlY(1Xd0Fl za>p6uul3DDrvua+qLYC+zSK^e+@g28)zM90)Po3^_Ozu~MlUhy-Gzg*7vLT4^^`0e z$-+Cp@Ovh#HnY^Z#Goo)4yt4o{`af~c%H5!i?{+PrVx>!7e*`bkGsE6ieiiESU?FO z7k5^XArUro-W<{4GZXkpdb^dF^sk=^%bKBG7u6_tK1a<^d*;%*$;>tGg4ejY4XR5* zm7~5fri#T$j)2wboP2WV_mx)m?$1*f_5@opQBJEaqhLjjBuk=77HVQ5;tse(# zN~=mT6zD-`GNF2(BtDkwNPEtVO!g)LFIeF=x?A^k1~aZ$(?n@s8J#hdng%ukQ_4ttBzl>A9U znxc?2o2<>pi#O>xH_X_nhhsI&p->FB$=vVhkg%v_z;uwxw=vF*q2|$N}KO@k&58~GoC^oH$K%G?%U`j1p55IZ7Eu`CL zs&dplPj2^Lu*EOUq@VW1Fz7X)wI*seRC+Vp(T38c(v#l37HMTVvkwhqq}CVtvLo#Fxe2rWW3?FvUSf^_xUuT83b#N?K`Pf|=bu z>=(vufL?U%u}BRhXzBtVU`b*9%+hgMm;Lg`F53xON9ee4iB$%FX6a-u-hE+oVpaq% znx>F`GNHGVln@($4L2#qTh#E`#(AIIKbs{+$M(O}@CTQI9+9SO7@qbBTw!2OtD}pt zYHTcea*#0J>7VCM2QgCGGNE^TpRY-ATQj=l3l1zB2U`xLyLBMqSb^(slSw}w17^-_AG; zK)ZB@nDuet<}pubIxcuUe5}DgCR_Hh;kd6LE^IV9y8Wy>ryo~6W_7rq+4)Kj?FTt! zc6eJPUvyPB#7bNth$}KXe|L`agS@>synQn=VJ({X@{!)bA%$x=RiSDtV$6jG5#v!0 zo9rs;^(peaXTni1Ez$->Nd3QmD_CDaUc3T0Rxn5^N?`KAvXEALT~4prm*@VSyV{zw z1q4pk8v1pJoB_`9WN;M1& literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c2c98c19dc4be5541d870eac0dc4c879231d54af GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe288_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..70bbd8fbb0f4e82f23b0932016cfa56c71c6e7ab GIT binary patch literal 15030 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%0Aw=Z^7OdKeyrzeTOdJA1>;`uw)Is z-Qm{)&NoO~oWYi0h9+lFyRqVPxD~peiTcDly%E^jC^kE&roC*9qK{*J8>V1u1CF<0 z0J?X?v)UG3n|f>XcHp-3@%^|xy4-R&Tg+i&IBkk8<`DJ{@Xlj;(cEN@`Eae}8drV$NG& z)82f}?z`{Fme^dkezC`$!Sc4?x}=20o4+fIm_>lDYEw=>xJ48qs9$@%p~cW&C^?DPYBcC$5{nIuak#qmV@x5$s zu=(5*>t`3=zx#A$9b^M?P!%iO}cAz$qL RqyI#b!*I$mOV|2h{0~&j-ZKCI literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..7ed95335cac633ec61abb778c0f182a3e303437c GIT binary patch literal 9310 zcmeHtYgkiPm+(1BIJuC7a8UvYa=6M(JOmm*lqLZY6$>aTDy@Ntq5^{YqA0IDxe$U4 z8c`9!)*x!JwHDB#*lH8P3jtB_(iX3c8ZWg}BU-B+-*)y1;Mi%unR&kXeth#hv!8QW zYwx`-d+oLN+Uq0`1VLmCoPK&>jBr5A*4exd{a&*8r1^67{I}rG-~PK`j8GC%`Lto2 z_o9V+AoFQ$@kID)mMr5FdD=|P*IRy;d!EeB>QfEmCS296{QKjSrd_&nF>>jp67U5j zdDh#%EF9nRTZeY@wD0s$OXpndc+*|G8Ze4tSchsZ4cPky+Il}~RJWJnS zWy1dRZqS1F?nDmido|3@tqEtU^A{XWo}TRjME`Ix!QC2pzAJ*h=yuzg#=WmnrX0M=R*JOS~I~G<{h~!tm&Qc4La(bQohem4MJ znBkW4_Q%%NCF#+>c9o{OXYT%XL22Z)v#I8GXW7%+&ATVjiXB|WM;|IV1Z4$BUwQf$ z#w3Fgd78{@;|*>_p)EsH!!5-&l^mb8fe`)KKNqYlUN_fc*X*yvTdlz|->Ae)Ny3ck z+6$BJ#GOek;E#1ZI!J?oaie@82m$XHa3_O16Wn>=9t3wj8-nH}O~+^ehU^arnm%V* z#0Y4wO8s|u+MIb<8R+g$(ELUD9TbN*>L~ywrkeCd9RU(Ly;(+aLTBP0#R)p%Cisk& zIT_-N^(+X=fgGUsfSnREr>Bqr5g|tk>Lm$=n?6hknhV+-6{wxw6|_<1e%r)m%5;Py zh^>ZI%m4?P$2iIdIXHJJNmA`7>EsC9Vrbl%3_*@2S?7i(Bxw#n9s-FqnXPm7>r4}; z%eA+ZcQ;cal8|&R;0<{4v=(B>R1v9(rM3|u8HK+=a$XQ1tP^rO3BU;=Cj;988lV#7 zs*p<16q=e2!%!s(bOv<-Ukx2yQciL8+phwTJE{hqn@fsT>!|8X;h2p~14e@T5|KLw z_ASimsRd~*ay*vCej#%D8FjjgQuiCE&(qj|F0wHB(>LJguN zClA0ULW?n6sijXH<0~GV3?h z6qU6?6d6WgwC>BQDB*V(^Qi^7a`sO#z)K3fyL-7<9`>ByZeM-`hB^X6`vE{Ou9olNoTAgx1E+OS5;i+>Fpm7HGc;+& z0m^16MbDkFk3(hbXZAMWjKgk>&mc0R0V6Y_^l4;Oy|4YnPWs z%v|Frn|XypaaEb>Q2uvFHX2Bywuvz&L$=0M<#!E3=@DY?uef{0!1e1pu3wpd&3(`H z`pn%Knd5e54P;)SG_acJ9SsE><}y=Gm^Pc4cqz&$vZ=YfJ-Geo=WP>X+M`=q{bSp) z)??W5mR8o8=EN?HGwagiJ^GG&_YPXmoxXb7V!heftLb>qAq?vjcyx-QW+Sik|{IbEODD03Srfvv_?!E z6NBWrsv7H2{!PU1Nj#akhb|E@c$5UDkRodqV`izTzg+B*!l`-NLK!2Bjt*G&{F~t(KF{fEcBAf4)7c}3KkKX765@0uUr~e`DYs}!R+50~?S+fI zbn@*RT|?^?j=Y&`;()q2&Bo+M784mOI$`KJRk@RO>YMfpXJ>J?MAV}EC7|({g!qZya;xiy}g)89$3+8Y?0&b9gmH%$-HQ))ilEK*aF}@GM;rt?NRU>aZc_c6dJ=!9wVSEM|us`{y?FaLiMGl0vK8>7}^8d0W$Y89QwyKC1{LpZ^KT~JH$Yh zC0_9*kaCjV?#_X8yPgZj67D+BIySItUJ`K5hrre+Ouw+DSelZsH801pzJ6xpOrB#S z*d;<&JG#n3{eZzsfWdFy+D^r|G`l{ts(Mbfw6I!smiGW{;(#{KY~PT%OkUJs)=d$6 z5Ow+$a!WG0&6baOPds)7>|SDY?~wD)iM_7EiNk(| zvm=?3aUDjla}E5Zn1j8WlGjI`VosQ%B~R&FuU%V2-AJRBCRY>{Q8yHkOV(Eup%or| z&g?-QaY`%1obK4zwlsDmr_<}E4}ZYNt0Q~dQmiuWD`i}NLhLc};i zF*oq74g5a)^LjSF*N5LJ_v+0?zSSkfniFDc?avdYm>mf*8gkqY(?lTjl_KskIj-5n z?DV0Q6_GatRg~Zr9v2eWFD!@^W#6|T&pGTNaMsj0Jx+6ahAHJ{*!#MO5Y&yfChtwXdw(Y-yty#!mI9?p zh%8LcH@Md_Y0Q&@N4T*!+Q=q~PA#iK|KeP%ZSV;HzVsEO@l|OK!=83{IZk`}!L>F` z!HKf_Ps;HShHr?MG>A^-U|*joP!6citQ)tO*0c}ZcM(=sV-Wmw+chD5xxKRn3iPGa zW&89Q?QD&^3jxVYj`G&fhuss$O6xRg?o~fuT+Hu8wETxp0AcwGf^hupx+YDKm(&L2 zI;?zMBOO297aYo2V!L8LXlPOn)w{i5<9b4ey({c`4rgUVzGVOj6_J10z^ZyP|7rsD zqxsi;(Dpwe|H=kF{2%6D{YIv!gAFNZMjesYbYLK_(W5euNcG|Aq-?Ht=(NJ@2RTO;IzXfEEu8gZ^W{au^%rCBt zvF=H#!yv-W zs-$LDMD$uLX7wSXuREGaF!=02QyZ9Vw4zH<}2__p6skNxnMW%#tyVeqQ0LqKQJ1c6omn3o$glqKzYlRojtSY+DS{+hp)-Y zUXr_d)~Y4B`EwNenI0c~kagwyq7ScUUb(&l`ZQ5}U$Tojf2{T1^N|!NI^e-Wz+*@I zg`T_OQ})vnz0*Dq|9dX^e|IjK34Ge&&(WUoUyJti|7x^{?a`j~Mqm&7V_;YRWnh>6 zbzrCdF|en+8Q4Srqrk5GQ(!0mDX>?G{utO7{UNYtqY(5f_z>nwDdZ5}Z$g0mtZriZ z4yw9XDVC&vJi+^Y8D-^X-#(1C z_W%fpjd^xNv&oL2L0V@$%Gh_q&X9)KD_>01I)li2`+NJRYCnVyDWoFgeZ3L(w#mJ; zTz`nBfIaYzvD8f#>N+e(2ca}%35T(VKWH3hF>1sl9OdfdL2K6HpG^0vHN!p{J&7dEw$>7FO zoZXHxWMW^^OonrYv&dm;hR9Hq(5y8UDLIaLX_Drn%mNN2_XcT4xubMe_;myK-4kMG zlADh~V}yZ9>u*7f8{XPL3ZSw%O0hF2CVs1KXXAyD=6h+3oFYae9mcM6a5A?~;Fgef zaoQM_ylPm(IdcH#m-@bO}&oA%q-dQeCv%7+^$WqRa7qs?_$+4)0e+?^oiu zJ{OeirTIJmQTB;x>GGo^qRS~U&)^Z!%}zjcv;U}Q{|L6;21Lt&=oha=uXDMFF?=HG zI5a}EZAA1k4sHxnwo?2MHW(1rlNftg!8<07J0=MQ*PtoPDCn1)HT!%kH=}ncao0I} zD8NQo0cT`DRM*D_MhM_aX{0Npa#Zn9Y3OyLct+$w9Ewsi-r6vBP)q|p1+FAl#VwLb z%~RAt$^~j+p5l}8-OY|r=%Ob2mk`G5gX07Dkjqk%sV{5w?4bxb-y)O58kTh$AQ6Yz z*7|^M?DNr_*T@M!$Y1uvRY@0@sr^W6(bEf%`}7nq^$X@S^dVMui8a{IHWnpzuuai7 zEbPae%m{P0n>hX`<-Ev26q6O126NcoX}Mv*+TtYlFdxbXoUmaJZ@w^f7G*342-j_8 zZ7o|$*UK55^FQ+ZA!OWpk`$TAU5Hg-%|`YQ$74+-0KE2^MxF;&G%iU~=SGDW3-^O?$n4`-uW2WV=R z2J*leJD42dz@Ia5@Z?_}U7*_{?*(!Y8ps%nL{UQnUjSsWEZZDDeizBXV03E_xMt#StCg3X85B;r@CYvn;-!kA-HLj1@~ z|3odNjIC9dXBkd(KI>maws*tE|JY3)S77MY!SQOQEds->G7o=mSH+9W@jcyUef3tbJo>)0%Cd`kx>aa= zTT4Y5lWvu%QExxwB{#~@t%u_gmTh;y10)1eHkKFYNm$GRU^+a27CQ)=FD;GJ_FVZFY= ziedLWu_+*Ry?>@r7yiW%=ygkDnWkA)o9RK3+>ds%*iRYvwSbR$vtR#qP5ZR&@>ekH@w zV2gx{=KP=Ea2QhXpb)FK~kQNd@LXMXbFOr8WC+5a*kf4ms-m^6OXQ21kT3BaD#NS9!B z*huu`AOgRMpRb+>Vx+XqrGIpvub=L|ba=}b?nxg7+x9GQ??NQ;Lbst7qi!??Ot}+o z8VLvSPhW#?lP4;tB$N$$+?Ji^>>Zi9-g}Ex(&0@d{3z_<%Z-R392(=+Z-aMzWVe;Z zhXVphWQ@`v*eD+z@5(uX2QGasdyFCnv{vr5Lms=Ztnb2Y*_N^1Jmlp7X6`1z@kte_J%Emc{H%{%h2W>vk%opX z1DC}ZKZ4R3eMXP01fiNs(5fftFI5eLHIo`f!Gn|bje>2H8jp_j?V7ZI6#RD50RY;i zJH)L>h%}9OLd#L%TahCT0de`V*9}Kqg$aV;=;;2F=B#d1^*C9izsdP>AMN`h%GAh? zXukLxt&KG;OPEk*a{lft=li10^2pA0h|4mx`1K>Zi$jW3b7~`07Q|2p4I+lao>tj6 zsQ0JH%RZOGU|OV2^058?{w-&H33>BM;CSI6sVs@f2g^cQ=Y1)=epj)_cOEKB!Fmul zSxf0xA#x5l$CJUmNPUrZS$YN!k$VDcq-6fpe@Te8zy5;^RJ!V|mqCB}D+~C;#-aHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe432_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a545c832254f62e7e6d91e40b0b6790be9bee3a6 GIT binary patch literal 15030 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..4ed0fcb4f368749f630aa3a882c0ec624e2f7766 GIT binary patch literal 9314 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 J6Z=QRzX89FVa5Oe literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_null_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..c2c98c19dc4be5541d870eac0dc4c879231d54af GIT binary patch literal 486 zcmZQzU|?YGU<}-ML)7esBj1D%@+<$B#qTaHI<}jSt z*Hfs^cq=A3WL0B;cgOy|uZ>c>5@XJ^+(>o4H6gq9z0Zp26IvbFF8^!>nhOLTzV_dv z)HnV+)YIjDeSt|D=Pyoelgh3Mt5<5Cnj|UyB>wzNlXqugJGplXKr|qcmG$|D4G1e^ zh>Uw|{AR(a4xaT-oKH{6iCp91nJ5Ib`sF2O@h8UTj~Q}CKiYPB@%%sjt~DNx4sn*N zE-imFsXyL*_Ue+={uP>`3>1r=02#};E4Flc&VN_MEf)LMCilhvfCS?88w?k{M11U* zKiQNLX#VS1rN4N@%xjUA#_nhRPwW&-{`_deOe+qkzZn@~G|g{*#uAv!AQjjh%21ha R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe576_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..9c65b7c6825a9fe37d94e6d08e93535d00ca01eb GIT binary patch literal 15030 zcmbuG2b|T#wZ|_YO%NL$1?+%`2ndP_OLI{{7Fet(UY853EW5b7C>RS^(O8HYOB72? zEMV8zVyscI#n@3}VvrOQTVgC&;`@H@or8Z@KA-nKpEqw$=68PQ%$b=pXXf5rp1E8u z*J5e2$q%jWG<5Z-4$D67b}-!k9Og%{}R(2{&H4?2J*ZUS4+^acScx zj{N+vo$mPWW9Obz{`xgTX0`pY?ao6MowID^O?{uauv?e4GhVoS$cN7zadx}=H!BUu z{O_Vu>K-5Xzq{oQJ@Vbb?_cxG()PEl9rNskHHY3je!u({O#R+VW4f#z{KAvFwLN^z zJ`NJ1zJBW>*=u`Sq>J&$;xyvR!UC zZs~{hZ$7!Ml*HFp=U&{uq&_#pGpP#hq{>`gCS#$g4 z!`qbgS-8mwbDJ&8P47GGjZZd^%ogmZ`{S!RJo27pCMFRo3UL3fS8+b1v7!zF&QP zer9#P77t^zCdvKIMD%*2Qt=dS2aeg?WYA#!7OCO2m@QGboOoIzL}kT|2vEE6r!l zi?%U!3u+r1){pU=iu{2K=8^1%(wL2lbD8h3eV6FU!oosL@@rf4Gw0zqw%W{A6~Zgl zX6}nV;}il=>Zy&aUstd;# zE#{-Nu1&%g5yvf@Usp@w;LVEjb_k!$2IsK6IdwHNF|GI8H2g+$kaHSq3k?mG-}h@* zjOTMz+{<_I#?@BU&Ez=B^YiBAOEF99^PUuaN9U{N&Z5dQ5o3KkSSdHvwfolB)i&xE z`@t4D+%o*8R@K+l)J&Q+tD(R#ueWy$y9wq(>}x8E^<7#^r?7vw?rzuLF*V%e>RHu4@GG5p*YGQ?cT7zoUk}BNX`A!BH*hCQx3%cg zGUvHZshqO@^0#E9=RKwJyX5%Rc)rD&sxMTE4rV z5u0}PZHih+_pW5^>e{{M`g=#Rc6IHpL%VZj?dsZHmv-yVIjyhpnRjJ7bX#!FCzthe z4!Pb)_!(Eu2R=CWEH@;>`EJOSWjNO%HzC8hU%845=N{!MGo0^$+#wmxdnh+O!?}OC zqcWUlF6YIJHGAfAb26M~E?1M`%%9x+3}=qyxCZOvc_-x-W;pMl+=&^^`zE(I!*xvD zxf#xTrQfm)=RK0UIKz2wCo#@SNc0Ya4%OH%atuONYbIyXob9KH8mUi-fEt|#o} zVD0keVLZJt&4c6jqi=@DtM8w5eYRvJ2heYW_XK*eJ`?HvOfU!P2PVCY-Z>`GYjYpk zD-teC`sAd?_$lbF(S7MZHR3nLn0O^fzbP)LpOZIta<-7C#*N!6kiE=!c-6Fsx_s z&gy?CvT{Yg5pj18OPqX+IUL-k_u}CLnBAJ3o@}1g5s0 z;I4@Nd3ybg8TO;Wo=@miU_S?%F?SjL%!EC&0y31@tq(W4+HuJV$kNbS&aIehyntZ~F@D=TigXe(XoF z3v0L$v5w4(xwJQyd0T*J58va!SzkXh!}oZw_S4CsV;3Thmyhv_z}fMB#>V&)z}jQ{ zkHE%|KQZm?M6moM*6wHMNr?MbY}W25ZczpO$w_hvlMKM7;`q*G4e6y z9I$-M{bR6kT;r)}f9Hbr(-!MK5A3?#U&KEjET4^k0lIv|Uj{a|{Nfb{p}y1YJdmxA@xW}RO~Z~Ky5YP%ef zv)0Ay=)DW-@~++b`5Dq1v5w4x+!aaRmfroyU77gp>0|72u;aB^bG}zsAyIRqz}B2~ za&@w;NbA2QaXsl>|F!fs*MAND&k;G-D?W>H*2r~;xmbdnlek|belh(N)=@_POGJJq zVhi8v!7)C3Z-A3`Ofw|rx)H4JsYv+V1eSM9bHx3%q+fxwMnbrTd;c(4z8hlwJHK-|XUz2oI6K#)=uPK(3{F1g zdK~-+A|G*n3)UyzgeSoI$!F(w4WDw}=IcqsHM)2GU03Y+DX?{v-SaAR`4uU@PlM%* zV}75Zx0zpU&mwZ}SzN_9>vTEN39-30YeXM?)#Lo_vv&Pl`wsNaAwv-3?uh7n6L-&j zJ&$NN@1Fe=%q#!9q-&2lej&q~OYhR}k+@5>;L=?x-H{j3+abn13i17LoNvrai1vv6 za^m8S9D^Qrq#ArPV%}b%x5XWK6>L82wZEp3W?qf?IwGf!IPS=5uzQX(d;{z}@=+&m zg5~3myakqXKhE_BdYf};dmH&9;#}g0^Cz%zVy<_+ip1Ti1K)(i z=gVi{?A_T8-ErQX&k^kr`-{YFP4DN+9QwFBv%zt9)`4wtcfJIhCwue#l}4KRHs;re zoIc{XJKuo2BXPF>1v`&?)X%qI`M5iNSj)xTX@+idE^W<`7Kn3+BhE%(2J#P*tA9rU9u$*x`%Pr|`=2u%sM9w{ny*t+5 zawL0qtPy?mb**v!_Ud7`kGs&;oxi@V+5INT^cAfRu)#cT%O}c&jF0~al?@4pS@6Mg+w}x9nuPx5FC-|ad zi#yN@PCmYW_TGTcHgNJ4#O}rTZNZL{H_jxu?ZEQt`fLxDvzB}#b^y1bKbp_$E$DYd zm($PYUN)oO30+$Ya4loqOCNOksFA*4Idg6v`+;rdQQOXloOu&x^C%x{?hihRagoPe z(B*8AvjOPxJ>cqy?;3YSmydA+!H(l+{kYvw$ zJ$(1h_!=vG_W|p#y@I$y88-rKJpHuaN8BCYM<%@^*fT6cw|R!zMj>*Zq1eAYn6uGf zV=DXc@fQ4hQ?U67RzC=$_+G{^6*`t1!qMx07#8E%zfQ=jV8};*JIBmY0?%Vl{Z;YtfbHUk~JrCXH zoZ8MuA&lJa)=c(We z!JE)Wp4A=ao05mW2pn%p{4VA9sf*#Y={Fhury0L(&^;&L$4lU~#T#{L#_#Cl=Noky zyteSWJmXiD@%tIPw)l>F1=z8^6~SGJu3x+#%fYs&kE_tloqhbR`D(DS9Ba*7LvQo^ zv|WqHIZhm(K|cqZyMFk_?@ZTaxcEN*3%Kyr9=^W>ny4Q zy}^AL+jVI(?>B;tTijz4+fC@MS)1!}TzuDD0oES+O0cow?YJ4N&mqhapZm9<^HcnH zVeR32D|kzI?ZMp!_B*68{0?fJ-VT=cyUo(X-H~+XkFj@x_0<;N0q+7kPFwih4VG8J z?^j^`w6*6uk@MaI=7)bbEND7obfBDOW%zr;T*5OcH_s| zo&sxEY<7;lIMu`|2z`{u`O{!yC~?-$faUe~_ZRo|EZDqgi+Il^E*tN8IC*O{#{Ldn zA8ppG@m>HMQ(OD=o%#1*ev1G94f;D@tn)>%Ys|)d3EeT;BJRszV{41EeFe-<@ocqc z&(<@J@6oS0rZ*WXxE>8%s{_}j}ga3$jJy!uompM&Y& zp;r7XP%4r540s(|d{*>;kI#VB@Y>={c>^pLxp@;T*OxK#i0$XWTj=u6{Rev2XYXFE zqqo8S{l)eC5&2WHIrbf}Z@;!bXKbC})}Z^YYI`@??jT40j<^Fe$GdN9rwu%F*CuQ5M_laJqhKLX1c-#6uBu+29`+rJPw_au(rcm54Fm;N3Q|91Ncy1eIO ztpCv4jHT^UM9x@Z&oA;NukKlCch0zDpMl+*`H1)9bFjQExGxeX9o)LaW#5@E;T*5O zcH=G~XV%VFVCzSp?0TYx^s%P&an1U>R%_4tvZl;|HuIw`?u|9&S;W1G+BFA`x6Zx> z`?;-c2)%hSm*3Fa%%wi{U^#PTAMe|L!QK}?x8e?ci!R?EF7m>#;vRgv!><{fZ;-aA z!RBCw7Hd$uvEp;M1-hS!`oufE5!l=)Han>GXW0@(AIJJOOvBa+9B;z_bnl3@+8SP) zdQ0>+;MVl<{kSc<+;TWutYKp~ZHg_{5cYQPu48)1yxtz`X^$<|vnxKao=xDj#r`{h z-M@T%PHzg94~h4GGdS1b-}s$hze#)-x1Kf!n=gGfLU*tJ{^Hrhnzz8Fz3G}gci)pO zvAJ*k;*2|jzc7ShrW@!Zs5q>K*mPyy2ERG zfc0AEJ;271x4yTcw^`rXwnpTvZ*kOjPq1~d8@{ogUg)t_-!Xl>yD{G0`(;h_20Pw6 z{>)Yh|`l7owZBaY@z}AkornO@ZBDQ^eKJE;*=FE%Zoj3B^A8bvVr&!A_ zVArB8YGwe~IJV$+O`Q1(ZeZecjq}aW6X%edv6@CUyK=>cLmPoOsvNr_+BqSd7!u=FA)Z4=;0z>ULk(=Li3ZB*k#@F=xN& Gi}61+>)qG@ literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..bec463559262dd32eff6bca8a10125439cf6e84a GIT binary patch literal 9310 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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 R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe720_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..0e33c58e47e955762994355197edfd6e0ed0d2f6 GIT binary patch literal 15030 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 J`MNL0{{Zm1;EezP literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..0801a8caa896c3cf6345443a5e26cfb993d4eebd GIT binary patch literal 9310 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 R`cngok&Ja&owvAw`T!pO#uNYm literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance-numraysperprobe864_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a573e2511d6729f514dbdbb06c3d05b2c0ae52a8 GIT binary patch literal 15030 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 delta 196 zcmaF4K&|~P%LXMD*4jDU$8T&_X9;3tbIBA=@>IduKZ`= zGc(JXwqN|n_*`)Ef-LRnH@~ diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_dx12_0.azshadervariant index 816469ec2d30517153e6ed2b9838254c959f637d..74ce89a020c11e99ed1d19badbd86a070febb2b2 100644 GIT binary patch delta 16 XcmaFl@yKIClnO^(R_85l1_lNIKC}hl delta 16 XcmaFl@yKIClnO`fobKZ{7#J7;LhA<3 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_null_0.azshadervariant index f352a375d0032b1648ccbac3e12313e2527f8a71..c2c98c19dc4be5541d870eac0dc4c879231d54af 100644 GIT binary patch delta 16 XcmaFH{ET_SJw}eYtj=593=9kaJMIO* delta 16 YcmaFH{ET_SJw}e&Io-!^FfcFx06--MtpET3 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridblendirradiance_vulkan_0.azshadervariant index 8e4364d56b6791a5d27fb4429e0c97112a8a6a9c..70bbd8fbb0f4e82f23b0932016cfa56c71c6e7ab 100644 GIT binary patch delta 16 Xcmdm1x~+7>IxCL4tj=593=9kaLhuGn delta 16 Ycmdm1x~+7>IxCLaIo-!^FfcFx07oYWIsgCw diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn.azshader index f733a5613775353a67c84b00a4d43d806d9ab42e..c191496dd250e01dc5ba833b78e9bdeead9ba2b0 100644 GIT binary patch delta 176 zcmdmgopJwl#to`0taVwP8+tcuu>>))WjUvoyXH(T)K}g-m*+6+|>$00kCua7d`cdwpvzJG=RusEy#}Fwabw pG}x9ifk#;M8sVjDUXWZsd@) delta 16 YcmZ3byh?e)B0-MYIo)6GFfcFx06UrndH?_b diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_null_0.azshadervariant index a8cf6ac19e10dac397979abeec1a6d8306747ff4..e1a4be7db5aae2b3e71ba3f156454d6ef37615a2 100644 GIT binary patch delta 16 XcmaFH{ET_SJw}eYtj-O+3=9kaJtPJg delta 16 YcmaFH{ET_SJw}e&Io)6GFfcFx06`W8-T(jq diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdatecolumn_vulkan_0.azshadervariant index 6e7324191f5b2c28d9c13d4f7ea093aab6ad8607..fcd71ca437ea652b560f1810ae069ecdd2c9e4d5 100644 GIT binary patch delta 16 XcmeAb?G@e7%EeKa)w!XUfq?-4F*OA` delta 16 XcmeAb?G@e7%EeJTr~Att1_lNIH75oD diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow.azshader index 9e2e426ff43495e9c54687bbd4408d30484c7900..492150e17cfce8c8cbf42849378154219ecf4c1c 100644 GIT binary patch delta 170 zcmdmUopH}~#tlj=taVwPTdr?bX9;3t^9qmja`N3=&-#fC!G6ZNIaX*l6Gzi_xycta zo%U{45DgH9N>8q5Ro*;P<2+0`lz$kah116OO8;>eW)p_Zfl=0in}a&-PKEVJ0 delta 170 zcmdmUopH}~#tlj=thIBxU&n1$X9;3tE6EQGc5>NV&-#fC!G6ZNIaX*l6UV%zkINn0 z*1z4XAQ~VHm7ZMBs=Rro#(9`>DE}}-3upG`H^$pl6gM$!4vexE+#Kwg39|#N@MPdo d*2${^z9AcSGO&SzL&_@8c$HEd6Hr^WAOL*zKI;Gg diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridborderupdaterow_dx12_0.azshadervariant index 3c65d8d4c95fbc4067198366c4bbd2702157e4bb..cb64cf494543f75daffcaab7293231b4fb66443e 100644 GIT binary patch delta 16 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe1008_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe1008_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..cfd9468e32abe403d1de23d24eda737e4e772e0f GIT binary patch literal 6994 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe144_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..cfd9468e32abe403d1de23d24eda737e4e772e0f GIT binary patch literal 6994 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe288_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..cfd9468e32abe403d1de23d24eda737e4e772e0f GIT binary patch literal 6994 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe432_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 zcmbuF33Qaz6~`xpeF-2-*bD=RvM92JO(6*hBp^#j0|@ zNL`gO;mHH71{}yqTmMDJZQn1RxqIIm8!pXEc_3?f-&O;L_gH=O&Ww)Jrrs9V_vG4z z7p5GXURtt!Md2l@p1Seaigvq0(_gywKsfi{`uWR0A9K&f_1ERpef{_~imOpDHtVaY z=k5CUvuoGnzrDGCd4m%TdiJkgvwp|6?k{d=n|@^GE1UX%_R?jm8$I4E>EQdj`pWoo zz5lyeV9JaS`+c(c#Z`?TIFh@6Lv+f$1*1Y|DfP#%<)$C$_sZTr4W=D_WdD{sz8ybe zSwT+rjKSMq+j@Azx|#X6?x@-^eo6OoW{*>#F`n*t8NV+t6yO_E0SY=fxRyBN4d3iX| z%iHjpkaFMrgecyv)kI4@jTnqN3k7^^_X zh$kX*A~CSK9>$sz@v2Z&BrY_W2U~h$t19||zMkhtA1mUE!xiCJRf+nesUjwI^w;w( zUJxpc#O5S*$$a$F)8)n&#i}Z6eCVf#k6TosMph<$8hW|trRhc`5}~q4C{`LS2`>pp zom~UZj=q{*UWCq`w6fY*n`cu{U0D@QgexP|P~Y=!Xu7eXC91(f)YRC>^yA`*icoZT zBy_U=#-^JT319AM=tr`yCZ@B9BbF?P$J99Cbpy#YrkRazfpb;f+<3H1sv5hdW;a|L zIkzenuBm6&0am%w&Ds0nc`LsC0h0POvYc)u+cO zX)`tw8<~j5s<5;5NM}84VRpr(iFhR`TG*TWp%`Um;ZOkrNZ*DXkN(l094Cmnt zcQScfJ)7D;cw6%IvT!drCmlr0xeLtCc5}{oXAuKE^G@C@Ip?hV^~}+8PqC*azn(dI z?kjq75tIEd@ZI|^nllU|9+=;b7+^t>*|8ol9#_Ly6Ig#A#=Qp1_F>ckHpYjs9*gJ#=lrtsw z;!JT*srx)})&WM{-Nf;sZuH&7Q$*m*d$>6^E#%o#ypycY7e}_WULZLrVy(TzsX2+& z4qPai_XM1ry~SA{bujNEPJHI%>?@8vF_`xgPwJBM{%%eT^qFpM_5<9UeqJO!d&L{a zusQJ=%;^bl7CD&H1NxET=JbGb$-KKXoVkG_J3E6UFCCasbCw2ct}&F_hDabT>$6^6 zB$>Nq^NS_d5n(@69DB}$>4!S7b2KN0>4!^Z{Wi~)%w0{|G$>`0$ zNHQ_Nm#H4=FBXB{uN<6#5)o?xrw0?o87E|qZjuO$J|G_#r%%kmnP2MW@MG!;wNDn& z2W+N@rix5AO|t2xJKZi<&t;mUZzcLtHOz2&F|Q`{GezLkfXv#+IZMP^3Kgrjct}L7 zSt5GG`J64{9O2VPyi|l;j!@2dnaKLf8OM*lg`JKbl}l#WIhiAwTHxE=I_65ohxZcm4axV1b({m<-qe~I_a}t9&Ya$lhucx+SdabFuQbg^nk$B|gGZmj4^{TIUm1v}h zy&9&vnd3+AiLpoo_L%GKVuulDoBGyF{BjX^3lV4QD%pZ__Be~^sgZL?&2Y2f43ZmP zY&gf*aK`LxEs;E0#5w6FUM*@UA{TETwFbqPiqP?1kpD*xqlbnqa~SWG-PPriu|>DW z`CcKJyy)!yUMU%TrL(z8@~Ji}gn@Gp`iNgG!Vf&II_c>(BKmTjY?xo`u)*T2G1JqX zTw`0!Z9lGey4~{4ki1faKRD-Zl{kZQhiqg1+i(cD)tdq>XF|7CNC1Z<@I)dUq5rOB4 z7-qXcvc)vpp9%xVhrPFbzDY7M$!|6NOfvrH%>QP|;KbpauqOk=H;U}srAww4UBz#4 zI_!o@-Xt(MKYMJm2-2Kh<)cQQ^T)B^oz61{BDO)+ttE? z;#)=RaVL@a-Q#fc+om}_;5WKh+a-f{7G2}89g@j`&fea8CDSu{eUIwO5Wi0Z&Yiel zoWY#{e?SDr`9vPCZ?n|CQ^X!Yj1&?3f0J@I7T+bp2IBmJJt)GSyJ7eFA%~-*ZtNZw zffK{l_iM?l2c6}3#9`#Hc#ld3?;WH zkxY&LxO+6m2c5-zLNc+@aks5^aK2ZN=SdNT&QZ)?t8 zq2qkmp1|#V9B?+A8SI}IVf&6a`vj&+jpHql1Ga0=gs3@{z-I5WZ!QNJFJa3XYNCB2C>l{5rGjKnKh7~IXG|Z zQ1L&D8j4s)j);6|;(rmL!>+&hUqxm&Trzge#6NO6d$T|G+2uOB*5ZE?p|dyp?+!~B zr~XgG8TNhoQ_0i{zuWcnGs#;-_~P@qID<8#`$7bUA2RPcHU2|ndtu)N|0&G&2))@J zmCTyhH?#ehWNg9E(@V<(xASmJGQQM|4>g$XOUcxLj@;;o&sq6OME&IGD6;QgUrWZ% z=Eo(I!`{UclCc>iYOGkClW#=a1@;QP*?udzsR+Gc-%0KwA_ngp{{I$%HxaFJ*!ONu ze)A;>w&?7$BSjc~=*+H`WN^srQYB-DuCYGT$Xgp5@tz{|ZN#y$b=7ft`h%_Ebsf%` zWsR1%o^W*dnQeV%OI*Kg1L5efEmR-7O5ad2G0;&v=dF=AgY(9oHP#%A^M*_we49wt zkN0m1#NoVfzOlpJ-mo;u+%t%QPc6}vicg%T0d2C|-~OC|-y!^w$_Kj-D0LcgBgU(_OlVUmf7j=RQtktNycw|kW>44icumLr*c0ki%Om#iP}-#gL!`=6^h zaj>ymd6I2i7I%a&aMo|wNXg^^vt0R-_2cD2@6T1BIdQPDT%#o0dM)l~Vc_(|uuCM9 z3(Rtjk*pst7kYoLv6>SH8#`CyB(q-XK>x6M%V+d>hjZrmEGX2R!Dj)w2_i7wcw~M@ zXHSYGcMvBogZIMh;Pze=OU8yb1RrA9-7S%fUOzSUOwY0R6gL=?iDgvV(WUFVg zWa_ba)MIvVt7nR2Y^V_*Vpu&>C8OtFTYsi$4sP{Km&~9ZbeD<1s0Z2VnIV~aEFSfk z9o*`fDH$7T#D^GG&n(I48HR-%25i`Dhb7;m)?eA8hRGl=*bzz}DW9u;fGX z+2hVfx#nQ_a6aaUGgv>mxgs#uk4&68(nloM6Sv=Y=4lRgHO?CJiO=f!!ssn}KL5=> zsyY6piiV6IwhVgtfjBwI&HOz#huiOT{O)p4#Jh%#{jP&A{pb8w$e-_C=mv^d1M7^r zT&xqD0_niW3AZ}qlKtykpgGv7>s%;|?`P=!>r7~F>qN#6TLv|gmz?nLw4;OA)yZf2 ze_X2Z;g0)O7OuGA&R#PLd+(eVUi#_bI^WO0Hg)@stm*kv%WvQF=83Tn6~EyAmzEdj fR2`Ym{GZ$c)$z>Z-A?=OXgX+D%v*iv4*C5DY#YYx literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..cfd9468e32abe403d1de23d24eda737e4e772e0f GIT binary patch literal 6994 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe576_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..cfd9468e32abe403d1de23d24eda737e4e772e0f GIT binary patch literal 6994 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe720_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 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 literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_dx12_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..cfd9468e32abe403d1de23d24eda737e4e772e0f GIT binary patch literal 6994 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 S`cngok&Ja&oe$;%^#K4OY{sqt literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification-numraysperprobe864_vulkan_0.azshadervariant new file mode 100644 index 0000000000000000000000000000000000000000..a2d1bcd5e37b653bfe2dfda4c7f0f0f719d33c11 GIT binary patch literal 10274 zcmbuF33Qaz6~`xpeF-2-*bD=RvM92JO(6*hBp^#j0|@ zNL`gO;mHH71{}yqTmMDJZQn1RxqIIm8!pXEc_3?f-&O;L_gH=O&Ww)Jrrs9V_vG4z z7p5GXURtt!Md2l@p1Seaigvq0(_gywKsfi{`uWR0A9K&f_1ERpef{_~imOpDHtVaY z=k5CUvuoGnzrDGCd4m%TdiJkgvwp|6?k{d=n|@^GE1UX%_R?jm8$I4E>EQdj`pWoo zz5lyeV9JaS`+c(c#Z`?TIFh@6Lv+f$1*1Y|DfP#%<)$C$_sZTr4W=D_WdD{sz8ybe zSwT+rjKSMq+j@Azx|#X6?x@-^eo6OoW{*>#F`n*t8NV+t6yO_E0SY=fxRyBN4d3iX| z%iHjpkaFMrgecyv)kI4@jTnqN3k7^^_X zh$kX*A~CSK9>$sz@v2Z&BrY_W2U~h$t19||zMkhtA1mUE!xiCJRf+nesUjwI^w;w( zUJxpc#O5S*$$a$F)8)n&#i}Z6eCVf#k6TosMph<$8hW|trRhc`5}~q4C{`LS2`>pp zom~UZj=q{*UWCq`w6fY*n`cu{U0D@QgexP|P~Y=!Xu7eXC91(f)YRC>^yA`*icoZT zBy_U=#-^JT319AM=tr`yCZ@B9BbF?P$J99Cbpy#YrkRazfpb;f+<3H1sv5hdW;a|L zIkzenuBm6&0am%w&Ds0nc`LsC0h0POvYc)u+cO zX)`tw8<~j5s<5;5NM}84VRpr(iFhR`TG*TWp%`Um;ZOkrNZ*DXkN(l094Cmnt zcQScfJ)7D;cw6%IvT!drCmlr0xeLtCc5}{oXAuKE^G@C@Ip?hV^~}+8PqC*azn(dI z?kjq75tIEd@ZI|^nllU|9+=;b7+^t>*|8ol9#_Ly6Ig#A#=Qp1_F>ckHpYjs9*gJ#=lrtsw z;!JT*srx)})&WM{-Nf;sZuH&7Q$*m*d$>6^E#%o#ypycY7e}_WULZLrVy(TzsX2+& z4qPai_XM1ry~SA{bujNEPJHI%>?@8vF_`xgPwJBM{%%eT^qFpM_5<9UeqJO!d&L{a zusQJ=%;^bl7CD&H1NxET=JbGb$-KKXoVkG_J3E6UFCCasbCw2ct}&F_hDabT>$6^6 zB$>Nq^NS_d5n(@69DB}$>4!S7b2KN0>4!^Z{Wi~)%w0{|G$>`0$ zNHQ_Nm#H4=FBXB{uN<6#5)o?xrw0?o87E|qZjuO$J|G_#r%%kmnP2MW@MG!;wNDn& z2W+N@rix5AO|t2xJKZi<&t;mUZzcLtHOz2&F|Q`{GezLkfXv#+IZMP^3Kgrjct}L7 zSt5GG`J64{9O2VPyi|l;j!@2dnaKLf8OM*lg`JKbl}l#WIhiAwTHxE=I_65ohxZcm4axV1b({m<-qe~I_a}t9&Ya$lhucx+SdabFuQbg^nk$B|gGZmj4^{TIUm1v}h zy&9&vnd3+AiLpoo_L%GKVuulDoBGyF{BjX^3lV4QD%pZ__Be~^sgZL?&2Y2f43ZmP zY&gf*aK`LxEs;E0#5w6FUM*@UA{TETwFbqPiqP?1kpD*xqlbnqa~SWG-PPriu|>DW z`CcKJyy)!yUMU%TrL(z8@~Ji}gn@Gp`iNgG!Vf&II_c>(BKmTjY?xo`u)*T2G1JqX zTw`0!Z9lGey4~{4ki1faKRD-Zl{kZQhiqg1+i(cD)tdq>XF|7CNC1Z<@I)dUq5rOB4 z7-qXcvc)vpp9%xVhrPFbzDY7M$!|6NOfvrH%>QP|;KbpauqOk=H;U}srAww4UBz#4 zI_!o@-Xt(MKYMJm2-2Kh<)cQQ^T)B^oz61{BDO)+ttE? z;#)=RaVL@a-Q#fc+om}_;5WKh+a-f{7G2}89g@j`&fea8CDSu{eUIwO5Wi0Z&Yiel zoWY#{e?SDr`9vPCZ?n|CQ^X!Yj1&?3f0J@I7T+bp2IBmJJt)GSyJ7eFA%~-*ZtNZw zffK{l_iM?l2c6}3#9`#Hc#ld3?;WH zkxY&LxO+6m2c5-zLNc+@aks5^aK2ZN=SdNT&QZ)?t8 zq2qkmp1|#V9B?+A8SI}IVf&6a`vj&+jpHql1Ga0=gs3@{z-I5WZ!QNJFJa3XYNCB2C>l{5rGjKnKh7~IXG|Z zQ1L&D8j4s)j);6|;(rmL!>+&hUqxm&Trzge#6NO6d$T|G+2uOB*5ZE?p|dyp?+!~B zr~XgG8TNhoQ_0i{zuWcnGs#;-_~P@qID<8#`$7bUA2RPcHU2|ndtu)N|0&G&2))@J zmCTyhH?#ehWNg9E(@V<(xASmJGQQM|4>g$XOUcxLj@;;o&sq6OME&IGD6;QgUrWZ% z=Eo(I!`{UclCc>iYOGkClW#=a1@;QP*?udzsR+Gc-%0KwA_ngp{{I$%HxaFJ*!ONu ze)A;>w&?7$BSjc~=*+H`WN^srQYB-DuCYGT$Xgp5@tz{|ZN#y$b=7ft`h%_Ebsf%` zWsR1%o^W*dnQeV%OI*Kg1L5efEmR-7O5ad2G0;&v=dF=AgY(9oHP#%A^M*_we49wt zkN0m1#NoVfzOlpJ-mo;u+%t%QPc6}vicg%T0d2C|-~OC|-y!^w$_Kj-D0LcgBgU(_OlVUmf7j=RQtktNycw|kW>44icumLr*c0ki%Om#iP}-#gL!`=6^h zaj>ymd6I2i7I%a&aMo|wNXg^^vt0R-_2cD2@6T1BIdQPDT%#o0dM)l~Vc_(|uuCM9 z3(Rtjk*pst7kYoLv6>SH8#`CyB(q-XK>x6M%V+d>hjZrmEGX2R!Dj)w2_i7wcw~M@ zXHSYGcMvBogZIMh;Pze=OU8yb1RrA9-7S%fUOzSUOwY0R6gL=?iDgvV(WUFVg zWa_ba)MIvVt7nR2Y^V_*Vpu&>C8OtFTYsi$4sP{Km&~9ZbeD<1s0Z2VnIV~aEFSfk z9o*`fDH$7T#D^GG&n(I48HR-%25i`Dhb7;m)?eA8hRGl=*bzz}DW9u;fGX z+2hVfx#nQ_a6aaUGgv>mxgs#uk4&68(nloM6Sv=Y=4lRgHO?CJiO=f!!ssn}KL5=> zsyY6piiV6IwhVgtfjBwI&HOz#huiOT{O)p4#Jh%#{jP&A{pb8w$e-_C=mv^d1M7^r zT&xqD0_niW3AZ}qlKtykpgGv7>s%;|?`P=!>r7~F>qN#6TLv|gmz?nLw4;OA)yZf2 ze_X2Z;g0)O7OuGA&R#PLd+(eVUi#_bI^WO0Hg)@stm*kv%WvQF=83Tn6~EyAmzEdj fR2`Ym{GZ$c)$z>Z-A?=OXgX+D%v*iv4*C5DY#YYx literal 0 HcmV?d00001 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification.azshader index cd78a9526010f77721f32d19761b691e67687164..c12fd72c89af982806675d2b3fe47b4c22e454e4 100644 GIT binary patch delta 2125 zcmbPplVwJe>IOv?*1D|D2lF?pu>>))RRxD7W#>*lkfFM{UT3N5YnwU(UeX4kJd4@Bp z0mK>nLXgp6dY%rWCNA@hEG#HAzX7lLCdNh-ntuSV`KIP(l$ifqkkN5^t`4IXuJAE8 zGN8Yj2W9DRCHZyVVwa;@Hwi`+_S_@8oaZ(#s&|)TS9A=(1Rny#hPtgQwCKChx z5XDT=#F~o~kXW)JW>O~BTyW^&%z~Inm^gD88A(jJ#2L#(pv1sTu*8~+6ud;HQ({d9 z2e9_!x^#!hp{M>J7nC)p=fYCyWKfA*b9%Yz_SfQ!cFY{BHh-4dQmz>WN~vjr_*3aN zBF%g`*In}Uj)pfNGi`_~d&x8!DKK%SRWgkxCb^Phw6!2(BN0iKJfoQ!9q?8ZkYr1) Q*+`*{C+U)FIyk`f0BFiqs{jB1 delta 208 zcmbQyq&nv&%LYXj*4jDU_i8q)u>>))`Iq_!Ic838{KBfbxn5_f>Sl*N9(2*i8XV{R zDqr$Tzs%p96)Ge&{f8c#)AV*3=08yF+kx6oscv7elo_rUB*dY~!PMAbd_Cx>_4bLf zY&L?^H`Xz0ZwKnOL$PA}0XEL%s?$H*WB-Qi9+2=;4UX6iYwc#m%oW-$V8miAI6ZJ8 Kn>H&02mkeB diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_dx12_0.azshadervariant index 7ff0c32b5960274a3c2f9e080ddcb033ee856a23..cfd9468e32abe403d1de23d24eda737e4e772e0f 100644 GIT binary patch delta 16 Xcmca)cFAmmmo!IRR_BBH3=9kaJU|8> delta 16 Xcmca)cFAmmmo!K1obG!y3=9kaJq!jc diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridclassification_null_0.azshadervariant index 109a56fce3321885a4189e112adede955efc7857..6684ed1cf9359a2a2b8363db5c6d22dc41e80f79 100644 GIT binary patch delta 16 XcmaFH{ET_SJw}eYtj-7X85kGf*B|1U#k)5;6wSWfQ+jvudi1w+Nct=trQC)vvez aVF8@B2o$yI7f&5KB(`D!UJ#c7DFQGQf diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing_dx12_0.azshadervariant index 8b926d86c8cf3e85ac3e0d8622e83ec71be4cd05..ed96d10db3f182421b5f8f395c62292140eee1b9 100644 GIT binary patch delta 18 ZcmeDC$=LUkaYI`TM_pFut49nB3;CHyvQIe delta 73 zcmV-P0Ji_T(g?fK2(T*z1$~^0=W4Ss1U#k)!eA<{#WCgAvvjJBw+OQgqhS&7e@wGa ft6vbeXmSBPrU-4t;N?vf;99d#t6mV73n>CH;{_mc diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant index 5e8c9a32c15bf1e5414d8d4112842d1167ed4954..1b8c4ec22bea501f9f8480887e017573682aac2d 100644 GIT binary patch delta 16 XcmeyC_APBgo-s#VR_9qK1_lNIMqvh$ delta 16 XcmeyC_APBgo-s%5obKmY3=9kaNaY6y diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant index 32d658041832894d9e6cbad1eab0e3ccb5c25a5b..68527221c71d16ffba95b1cf55dc3bba4c976f29 100644 GIT binary patch delta 16 XcmaFH{ET_SJw}eYtj@De3=9kaJc$MB delta 16 XcmaFH{ET_SJw}e&Io;2*7#J7;KMe+7 diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant index 87de50f6207a230e57020fdc12f352cd2a3cb420..c2fd622048cdd9aad836a2e4e30d6bba5c629c03 100644 GIT binary patch delta 16 XcmeyO`9*WX8xfAWtj@De3=9kaL#+mL delta 16 XcmeyO`9*WX8xfA$Io;2*7#J7;MllBH diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader index 85c5e34a7dce0789452bb0b43f1cc29beae1712a..5739d6828cb5fa3a10f61296cc50921501d59428 100644 GIT binary patch delta 73 zcmV-P0Ji_N(g?NE2(Tpt1%7IY&PlT>1U#k)XyhigwczGGvu>)5w+JpmyzEJ<|FyG8 ft6vbeVsZgJrU;!k$L>6pft9mLt6mV71t|hB?bRU> delta 73 zcmV-P0Ji_N(g?NE2(Tpt1$~^0$-1*D1U#k)OCpd4)`N+Hvu>)5w+K5LlnY|{3&XQX ft6vbeVsZgJrU@RU zU2#mbZO6;ac98+XP$ipVrfyT8Y@jPWId#fMgxD7?4%Nx#8!pc~R=D|Pq>bR_DHk(Q pY`O7!y87hZzrG>cbmR9`Esp+hwn9!`hLp{(BCQ3de=uh>004!pN|XQq delta 177 zcmZ4Rfn~u5mJPBjthIBx&%N5L#1h2F<`EU?mRvPCW~$=m*{lmSQ2A5UH~$E=W9E?C zsC8IC@b0J0c98+XP$ipVrfyT8Y@jPWId#fMgxD7?j`JbkCMVvxle_t4q>bR_DHk(Q pY`O7!y87hZzrG>cbmR9`Ee=zT!_sYLt}i#ginJD-{=uBl003@VOU?iQ diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant index c1f11491d4945899420937490d984dd9035d9f4a..7cfce8e245c4b59a679c543b62c7c7a645698d98 100644 GIT binary patch delta 16 XcmdmGx65vWkvvCTR_B|$3=9kaI-~|P delta 16 XcmdmGx65vWkvvE3obGe47#J7;JER6y diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant index 01a6693151c388924df5ab7d43b77e055b724bd6..3fa87b4e79cf833cd9d576cd4f6ae62b1a69d6c8 100644 GIT binary patch delta 16 XcmaFH{ET_SJw}eYtj;%g85kGri#sB~S diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant index 1e56c4df52d4c196318c38b826b4034e33371636..9b831386eb42d39438926b3da6fc67f6460a1d3e 100644 GIT binary patch delta 16 XcmaD9@hD&N diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader index 1f045706254b0b0c859f4bc976030ea3b50a5844..4676c42e8da1743b54f491e17ccc3347aa0fb277 100644 GIT binary patch delta 342 zcmX@Sp7-#2-VItTELok8Pi@v?sdQsYDU66JtK7WSYZV8K9UCm)0AsK9;^5fab^8Pp zOdvK`QfK=gHKt?C9B=YvC$Guq{{g;C3Y&rU@`_OnW(*8W)9=)U?klaxQNkMrVVigCqvg%t>piHfehPi z+?c}!w=3B&O@Mi8@>(z1=>=lUD%f*^md^1Kke{*?UPcbks0033Z2lD^` delta 17 YcmaF=j`96F#tj+e?7CT9Ul1_l5tvIMsP diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_vulkan_0.azshadervariant index 4cbb76954dbaef688dfb2961b893a2156f11785a..5caf3084766a8bd2be7d63394f0257af6e304dd6 100644 GIT binary patch delta 17 ZcmbQZhjHQ_#tmF?>{*?UPcbks002NV23!CD delta 17 YcmbQZhjHQ_#tmF??7CT9Ul(DiffuseProbeGridNumRaysPerProbe::NumRaysPerProbe_##numRaysPerProbe) } + + static const DiffuseProbeGridNumRaysPerProbeEntry DiffuseProbeGridNumRaysPerProbeArray[aznumeric_cast(DiffuseProbeGridNumRaysPerProbe::Count)] = + { + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(144), + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(288), + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(432), + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(576), + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(720), + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(864), + DECLARE_DiffuseProbeGridNumRaysPerProbeEntry(1008) + }; + static const uint32_t DiffuseProbeGridNumRaysPerProbeArraySize = RHI::ArraySize(DiffuseProbeGridNumRaysPerProbeArray); + static const char* DiffuseProbeGridIrradianceFileName = "Irradiance_lutrgba16f.dds"; static const char* DiffuseProbeGridDistanceFileName = "Distance_lutrg32f.dds"; static const char* DiffuseProbeGridProbeDataFileName = "ProbeData_lutrgba16f.dds"; @@ -82,6 +118,7 @@ namespace AZ virtual void SetProbeSpacing(const DiffuseProbeGridHandle& probeGrid, const AZ::Vector3& probeSpacing) = 0; virtual void SetViewBias(const DiffuseProbeGridHandle& probeGrid, float viewBias) = 0; virtual void SetNormalBias(const DiffuseProbeGridHandle& probeGrid, float normalBias) = 0; + virtual void SetNumRaysPerProbe(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe) = 0; virtual void SetAmbientMultiplier(const DiffuseProbeGridHandle& probeGrid, float ambientMultiplier) = 0; virtual void Enable(const DiffuseProbeGridHandle& probeGrid, bool enable) = 0; virtual void SetGIShadows(const DiffuseProbeGridHandle& probeGrid, bool giShadows) = 0; diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp index a72d90fc94..798ebc502b 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.cpp @@ -134,6 +134,12 @@ namespace AZ m_updateRenderObjectSrg = true; } + void DiffuseProbeGrid::SetNumRaysPerProbe(const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe) + { + m_numRaysPerProbe = numRaysPerProbe; + m_updateTextures = true; + } + void DiffuseProbeGrid::SetTransform(const AZ::Transform& transform) { m_transform = transform; @@ -280,7 +286,7 @@ namespace AZ // probe raytrace { - uint32_t width = m_numRaysPerProbe; + uint32_t width = GetNumRaysPerProbe().m_rayCount; uint32_t height = GetTotalProbeCount(); m_rayTraceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage(); @@ -422,7 +428,7 @@ namespace AZ srg->SetConstantRaw(constantIndex, &probeGridCounts[0], sizeof(probeGridCounts)); constantIndex = srgLayout->FindShaderInputConstantIndex(AZ::Name("m_probeGrid.probeNumRays")); - srg->SetConstant(constantIndex, m_numRaysPerProbe); + srg->SetConstant(constantIndex, GetNumRaysPerProbe().m_rayCount); constantIndex = srgLayout->FindShaderInputConstantIndex(AZ::Name("m_probeGrid.probeNumIrradianceTexels")); srg->SetConstant(constantIndex, DefaultNumIrradianceTexels); diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h index a828fe4b96..8c8470cdad 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGrid.h @@ -81,6 +81,9 @@ namespace AZ float GetViewBias() const { return m_viewBias; } void SetViewBias(float viewBias); + const DiffuseProbeGridNumRaysPerProbeEntry& GetNumRaysPerProbe() const { return DiffuseProbeGridNumRaysPerProbeArray[aznumeric_cast(m_numRaysPerProbe)]; } + void SetNumRaysPerProbe(const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe); + float GetAmbientMultiplier() const { return m_ambientMultiplier; } void SetAmbientMultiplier(float ambientMultiplier); @@ -95,8 +98,6 @@ namespace AZ DiffuseProbeGridMode GetMode() const { return m_mode; } void SetMode(DiffuseProbeGridMode mode); - uint32_t GetNumRaysPerProbe() const { return m_numRaysPerProbe; } - uint32_t GetRemainingRelocationIterations() const { return aznumeric_cast(m_remainingRelocationIterations); } void DecrementRemainingRelocationIterations() { m_remainingRelocationIterations = AZStd::max(0, m_remainingRelocationIterations - 1); } void ResetRemainingRelocationIterations() { m_remainingRelocationIterations = DefaultNumRelocationIterations; } @@ -201,7 +202,6 @@ namespace AZ bool m_enabled = true; float m_normalBias = 0.6f; float m_viewBias = 0.01f; - uint32_t m_numRaysPerProbe = 288; float m_probeMaxRayDistance = 30.0f; float m_probeDistanceExponent = 50.0f; float m_probeHysteresis = 0.95f; @@ -214,6 +214,8 @@ namespace AZ bool m_giShadows = true; bool m_useDiffuseIbl = true; + DiffuseProbeGridNumRaysPerProbe m_numRaysPerProbe = DiffuseProbeGridNumRaysPerProbe::NumRaysPerProbe_288; + // rotation transform applied to probe rays AZ::Quaternion m_probeRayRotation; AZ::SimpleLcgRandom m_random; diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp index 702e784c86..a5da79a482 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -44,29 +43,35 @@ namespace AZ void DiffuseProbeGridBlendDistancePass::LoadShader() { - // load shader - // Note: the shader may not be available on all platforms - AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.azshader"; - m_shader = RPI::LoadCriticalShader(shaderFilePath); - if (m_shader == nullptr) + // load shaders, each supervariant handles a different number of rays per probe + // Note: the raytracing shaders may not be available on all platforms + m_shaders.reserve(DiffuseProbeGridNumRaysPerProbeArraySize); + for (uint32_t index = 0; index < DiffuseProbeGridNumRaysPerProbeArraySize; ++index) { - return; - } + AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.azshader"; + Data::Instance shader = RPI::LoadCriticalShader(shaderFilePath, DiffuseProbeGridNumRaysPerProbeArray[index].m_supervariant); + if (shader == nullptr) + { + return; + } - // load pipeline state - RHI::PipelineStateDescriptorForDispatch pipelineStateDescriptor; - const auto& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId); - shaderVariant.ConfigurePipelineState(pipelineStateDescriptor); - m_pipelineState = m_shader->AcquirePipelineState(pipelineStateDescriptor); + RHI::PipelineStateDescriptorForDispatch pipelineStateDescriptor; + const auto& shaderVariant = shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId); + shaderVariant.ConfigurePipelineState(pipelineStateDescriptor); + const RHI::PipelineState* pipelineState = shader->AcquirePipelineState(pipelineStateDescriptor); + AZ_Assert(pipelineState, "Failed to acquire pipeline state"); - // load Pass Srg asset - m_srgLayout = m_shader->FindShaderResourceGroupLayout(RPI::SrgBindingSlot::Pass); + RHI::Ptr srgLayout = shader->FindShaderResourceGroupLayout(RPI::SrgBindingSlot::Pass); + AZ_Assert(srgLayout.get(), "Failed to find Srg layout"); - // retrieve the number of threads per thread group from the shader - const auto outcome = RPI::GetComputeShaderNumThreads(m_shader->GetAsset(), m_dispatchArgs); - if (!outcome.IsSuccess()) - { - AZ_Error("PassSystem", false, "[DiffuseProbeGridBlendDistancePass '%s']: Shader '%s' contains invalid numthreads arguments:\n%s", GetPathName().GetCStr(), shaderFilePath.c_str(), outcome.GetError().c_str()); + RHI::DispatchDirect dispatchArgs; + const auto outcome = RPI::GetComputeShaderNumThreads(shader->GetAsset(), dispatchArgs); + if (!outcome.IsSuccess()) + { + AZ_Error("PassSystem", false, "[DiffuseProbeBlendIrradiancePass '%s']: Shader '%s' contains invalid numthreads arguments:\n%s", GetPathName().GetCStr(), shaderFilePath.c_str(), outcome.GetError().c_str()); + } + + m_shaders.push_back({ shader, pipelineState, srgLayout, dispatchArgs }); } } @@ -142,7 +147,8 @@ namespace AZ { // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs // (see ValidateSetImageView() in ShaderResourceGroupData.cpp) - diffuseProbeGrid->UpdateBlendDistanceSrg(m_shader, m_srgLayout); + DiffuseProbeGridShader& shader = m_shaders[diffuseProbeGrid->GetNumRaysPerProbe().m_index]; + diffuseProbeGrid->UpdateBlendDistanceSrg(shader.m_shader, shader.m_srgLayout); diffuseProbeGrid->GetBlendDistanceSrg()->Compile(); } @@ -157,6 +163,8 @@ namespace AZ // submit the DispatchItem for each DiffuseProbeGrid for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetVisibleRealTimeProbeGrids()) { + DiffuseProbeGridShader& shader = m_shaders[diffuseProbeGrid->GetNumRaysPerProbe().m_index]; + const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetBlendDistanceSrg()->GetRHIShaderResourceGroup(); commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup); @@ -165,8 +173,8 @@ namespace AZ diffuseProbeGrid->GetTexture2DProbeCount(probeCountX, probeCountY); RHI::DispatchItem dispatchItem; - dispatchItem.m_arguments = m_dispatchArgs; - dispatchItem.m_pipelineState = m_pipelineState; + dispatchItem.m_arguments = shader.m_dispatchArgs; + dispatchItem.m_pipelineState = shader.m_pipelineState; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsX = probeCountX * dispatchItem.m_arguments.m_direct.m_threadsPerGroupX; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsY = probeCountY * dispatchItem.m_arguments.m_direct.m_threadsPerGroupY; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsZ = 1; diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h index b85e54d25f..942f90eb10 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistancePass.h @@ -12,6 +12,7 @@ #include #include #include +#include namespace AZ { @@ -47,11 +48,16 @@ namespace AZ void CompileResources(const RHI::FrameGraphCompileContext& context) override; void BuildCommandListInternal(const RHI::FrameGraphExecuteContext& context) override; - // shader - Data::Instance m_shader; - const RHI::PipelineState* m_pipelineState = nullptr; - RHI::Ptr m_srgLayout; - RHI::DispatchDirect m_dispatchArgs; + // shaders + struct DiffuseProbeGridShader + { + Data::Instance m_shader; + const RHI::PipelineState* m_pipelineState = nullptr; + RHI::Ptr m_srgLayout; + RHI::DispatchDirect m_dispatchArgs; + }; + + AZStd::vector m_shaders; }; } // namespace Render } // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp index 7609e27b66..7a12fc5415 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -44,29 +43,35 @@ namespace AZ void DiffuseProbeGridBlendIrradiancePass::LoadShader() { - // load shader - // Note: the shader may not be available on all platforms - AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.azshader"; - m_shader = RPI::LoadCriticalShader(shaderFilePath); - if (m_shader == nullptr) + // load shaders, each supervariant handles a different number of rays per probe + // Note: the raytracing shaders may not be available on all platforms + m_shaders.reserve(DiffuseProbeGridNumRaysPerProbeArraySize); + for (uint32_t index = 0; index < DiffuseProbeGridNumRaysPerProbeArraySize; ++index) { - return; - } + AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.azshader"; + Data::Instance shader = RPI::LoadCriticalShader(shaderFilePath, DiffuseProbeGridNumRaysPerProbeArray[index].m_supervariant); + if (shader == nullptr) + { + return; + } - // load pipeline state - RHI::PipelineStateDescriptorForDispatch pipelineStateDescriptor; - const auto& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId); - shaderVariant.ConfigurePipelineState(pipelineStateDescriptor); - m_pipelineState = m_shader->AcquirePipelineState(pipelineStateDescriptor); + RHI::PipelineStateDescriptorForDispatch pipelineStateDescriptor; + const auto& shaderVariant = shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId); + shaderVariant.ConfigurePipelineState(pipelineStateDescriptor); + const RHI::PipelineState* pipelineState = shader->AcquirePipelineState(pipelineStateDescriptor); + AZ_Assert(pipelineState, "Failed to acquire pipeline state"); - // load Pass Srg asset - m_srgLayout = m_shader->FindShaderResourceGroupLayout(RPI::SrgBindingSlot::Pass); + RHI::Ptr srgLayout = shader->FindShaderResourceGroupLayout(RPI::SrgBindingSlot::Pass); + AZ_Assert(srgLayout.get(), "Failed to find Srg layout"); - // retrieve the number of threads per thread group from the shader - const auto outcome = RPI::GetComputeShaderNumThreads(m_shader->GetAsset(), m_dispatchArgs); - if (!outcome.IsSuccess()) - { - AZ_Error("PassSystem", false, "[DiffuseProbeBlendIrradiancePass '%s']: Shader '%s' contains invalid numthreads arguments:\n%s", GetPathName().GetCStr(), shaderFilePath.c_str(), outcome.GetError().c_str()); + RHI::DispatchDirect dispatchArgs; + const auto outcome = RPI::GetComputeShaderNumThreads(shader->GetAsset(), dispatchArgs); + if (!outcome.IsSuccess()) + { + AZ_Error("PassSystem", false, "[DiffuseProbeBlendIrradiancePass '%s']: Shader '%s' contains invalid numthreads arguments:\n%s", GetPathName().GetCStr(), shaderFilePath.c_str(), outcome.GetError().c_str()); + } + + m_shaders.push_back({ shader, pipelineState, srgLayout, dispatchArgs }); } } @@ -132,7 +137,8 @@ namespace AZ { // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs // (see ValidateSetImageView() in ShaderResourceGroupData.cpp) - diffuseProbeGrid->UpdateBlendIrradianceSrg(m_shader, m_srgLayout); + DiffuseProbeGridShader& shader = m_shaders[diffuseProbeGrid->GetNumRaysPerProbe().m_index]; + diffuseProbeGrid->UpdateBlendIrradianceSrg(shader.m_shader, shader.m_srgLayout); diffuseProbeGrid->GetBlendIrradianceSrg()->Compile(); } @@ -147,6 +153,8 @@ namespace AZ // submit the DispatchItem for each DiffuseProbeGrid for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetVisibleRealTimeProbeGrids()) { + DiffuseProbeGridShader& shader = m_shaders[diffuseProbeGrid->GetNumRaysPerProbe().m_index]; + const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetBlendIrradianceSrg()->GetRHIShaderResourceGroup(); commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup); @@ -155,8 +163,8 @@ namespace AZ diffuseProbeGrid->GetTexture2DProbeCount(probeCountX, probeCountY); RHI::DispatchItem dispatchItem; - dispatchItem.m_arguments = m_dispatchArgs; - dispatchItem.m_pipelineState = m_pipelineState; + dispatchItem.m_arguments = shader.m_dispatchArgs; + dispatchItem.m_pipelineState = shader.m_pipelineState; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsX = probeCountX * dispatchItem.m_arguments.m_direct.m_threadsPerGroupX; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsY = probeCountY * dispatchItem.m_arguments.m_direct.m_threadsPerGroupY; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsZ = 1; diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h index 3c5691a4b4..77dba9745c 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiancePass.h @@ -12,6 +12,7 @@ #include #include #include +#include namespace AZ { @@ -47,11 +48,16 @@ namespace AZ void CompileResources(const RHI::FrameGraphCompileContext& context) override; void BuildCommandListInternal(const RHI::FrameGraphExecuteContext& context) override; - // shader - Data::Instance m_shader; - const RHI::PipelineState* m_pipelineState = nullptr; - RHI::Ptr m_srgLayout; - RHI::DispatchDirect m_dispatchArgs; + // shaders + struct DiffuseProbeGridShader + { + Data::Instance m_shader; + const RHI::PipelineState* m_pipelineState = nullptr; + RHI::Ptr m_srgLayout; + RHI::DispatchDirect m_dispatchArgs; + }; + + AZStd::vector m_shaders; }; } // namespace Render } // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp index 7394b1ccfb..1d1e6f745f 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -48,29 +47,35 @@ namespace AZ void DiffuseProbeGridClassificationPass::LoadShader() { - // load shader - // Note: the shader may not be available on all platforms - AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.azshader"; - m_shader = RPI::LoadCriticalShader(shaderFilePath); - if (m_shader == nullptr) + // load shaders, each supervariant handles a different number of rays per probe + // Note: the raytracing shaders may not be available on all platforms + m_shaders.reserve(DiffuseProbeGridNumRaysPerProbeArraySize); + for (uint32_t index = 0; index < DiffuseProbeGridNumRaysPerProbeArraySize; ++index) { - return; - } + AZStd::string shaderFilePath = "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.azshader"; + Data::Instance shader = RPI::LoadCriticalShader(shaderFilePath, DiffuseProbeGridNumRaysPerProbeArray[index].m_supervariant); + if (shader == nullptr) + { + return; + } - // load pipeline state - RHI::PipelineStateDescriptorForDispatch pipelineStateDescriptor; - const auto& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId); - shaderVariant.ConfigurePipelineState(pipelineStateDescriptor); - m_pipelineState = m_shader->AcquirePipelineState(pipelineStateDescriptor); + RHI::PipelineStateDescriptorForDispatch pipelineStateDescriptor; + const auto& shaderVariant = shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId); + shaderVariant.ConfigurePipelineState(pipelineStateDescriptor); + const RHI::PipelineState* pipelineState = shader->AcquirePipelineState(pipelineStateDescriptor); + AZ_Assert(pipelineState, "Failed to acquire pipeline state"); - // load Pass Srg asset - m_srgLayout = m_shader->FindShaderResourceGroupLayout(RPI::SrgBindingSlot::Pass); + RHI::Ptr srgLayout = shader->FindShaderResourceGroupLayout(RPI::SrgBindingSlot::Pass); + AZ_Assert(srgLayout.get(), "Failed to find Srg layout"); - // retrieve the number of threads per thread group from the shader - const auto outcome = RPI::GetComputeShaderNumThreads(m_shader->GetAsset(), m_dispatchArgs); - if (!outcome.IsSuccess()) - { - AZ_Error("PassSystem", false, "[DiffuseProbeClassificationPass '%s']: Shader '%s' contains invalid numthreads arguments:\n%s", GetPathName().GetCStr(), shaderFilePath.c_str(), outcome.GetError().c_str()); + RHI::DispatchDirect dispatchArgs; + const auto outcome = RPI::GetComputeShaderNumThreads(shader->GetAsset(), dispatchArgs); + if (!outcome.IsSuccess()) + { + AZ_Error("PassSystem", false, "[DiffuseProbeBlendIrradiancePass '%s']: Shader '%s' contains invalid numthreads arguments:\n%s", GetPathName().GetCStr(), shaderFilePath.c_str(), outcome.GetError().c_str()); + } + + m_shaders.push_back({ shader, pipelineState, srgLayout, dispatchArgs }); } } @@ -135,7 +140,8 @@ namespace AZ { // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs // (see ValidateSetImageView() in ShaderResourceGroupData.cpp) - diffuseProbeGrid->UpdateClassificationSrg(m_shader, m_srgLayout); + DiffuseProbeGridShader& shader = m_shaders[diffuseProbeGrid->GetNumRaysPerProbe().m_index]; + diffuseProbeGrid->UpdateClassificationSrg(shader.m_shader, shader.m_srgLayout); diffuseProbeGrid->GetClassificationSrg()->Compile(); } } @@ -149,6 +155,8 @@ namespace AZ // submit the DispatchItems for each DiffuseProbeGrid for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetVisibleRealTimeProbeGrids()) { + DiffuseProbeGridShader& shader = m_shaders[diffuseProbeGrid->GetNumRaysPerProbe().m_index]; + const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetClassificationSrg()->GetRHIShaderResourceGroup(); commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup); @@ -157,8 +165,8 @@ namespace AZ diffuseProbeGrid->GetTexture2DProbeCount(probeCountX, probeCountY); RHI::DispatchItem dispatchItem; - dispatchItem.m_arguments = m_dispatchArgs; - dispatchItem.m_pipelineState = m_pipelineState; + dispatchItem.m_arguments = shader.m_dispatchArgs; + dispatchItem.m_pipelineState = shader.m_pipelineState; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsX = probeCountX; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsY = probeCountY; dispatchItem.m_arguments.m_direct.m_totalNumberOfThreadsZ = 1; diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h index 271cb3d146..3ec76fd0f0 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridClassificationPass.h @@ -18,6 +18,7 @@ #include #include #include +#include namespace AZ { @@ -49,10 +50,15 @@ namespace AZ void BuildCommandListInternal(const RHI::FrameGraphExecuteContext& context) override; // shader - Data::Instance m_shader; - const RHI::PipelineState* m_pipelineState = nullptr; - RHI::Ptr m_srgLayout; - RHI::DispatchDirect m_dispatchArgs; + struct DiffuseProbeGridShader + { + Data::Instance m_shader; + const RHI::PipelineState* m_pipelineState = nullptr; + RHI::Ptr m_srgLayout; + RHI::DispatchDirect m_dispatchArgs; + }; + + AZStd::vector m_shaders; }; } // namespace Render } // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp index 281255f1b4..ea02a8e0a2 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.cpp @@ -295,6 +295,12 @@ namespace AZ probeGrid->SetNormalBias(normalBias); } + void DiffuseProbeGridFeatureProcessor::SetNumRaysPerProbe(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe) + { + AZ_Assert(probeGrid.get(), "SetNumRaysPerProbe called with an invalid handle"); + probeGrid->SetNumRaysPerProbe(numRaysPerProbe); + } + void DiffuseProbeGridFeatureProcessor::SetAmbientMultiplier(const DiffuseProbeGridHandle& probeGrid, float ambientMultiplier) { AZ_Assert(probeGrid.get(), "SetAmbientMultiplier called with an invalid handle"); diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h index 16dfbd517a..d0df7dfbfe 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessor.h @@ -39,6 +39,7 @@ namespace AZ void SetProbeSpacing(const DiffuseProbeGridHandle& probeGrid, const AZ::Vector3& probeSpacing) override; void SetViewBias(const DiffuseProbeGridHandle& probeGrid, float viewBias) override; void SetNormalBias(const DiffuseProbeGridHandle& probeGrid, float normalBias) override; + void SetNumRaysPerProbe(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe) override; void SetAmbientMultiplier(const DiffuseProbeGridHandle& probeGrid, float ambientMultiplier) override; void Enable(const DiffuseProbeGridHandle& probeGrid, bool enable) override; void SetGIShadows(const DiffuseProbeGridHandle& probeGrid, bool giShadows) override; diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp index df551e7f42..7af6f4c8ec 100644 --- a/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingPass.cpp @@ -299,7 +299,7 @@ namespace AZ }; RHI::DispatchRaysItem dispatchRaysItem; - dispatchRaysItem.m_width = diffuseProbeGrid->GetNumRaysPerProbe(); + dispatchRaysItem.m_width = diffuseProbeGrid->GetNumRaysPerProbe().m_rayCount; dispatchRaysItem.m_height = diffuseProbeGrid->GetTotalProbeCount(); dispatchRaysItem.m_depth = 1; dispatchRaysItem.m_rayTracingPipelineState = m_rayTracingPipelineState.get(); diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h index 3e92542429..70754777c7 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/RPIUtils.h @@ -33,11 +33,11 @@ namespace AZ Data::Asset FindCriticalShaderAsset(const AZStd::string& shaderFilePath); //! Loads a shader for the given shader asset ID. Optional shaderFilePath param for debugging. - Data::Instance LoadShader(Data::AssetId shaderAssetId, const AZStd::string& shaderFilePath = ""); + Data::Instance LoadShader(Data::AssetId shaderAssetId, const AZStd::string& shaderFilePath = "", const AZStd::string& supervariantName = ""); //! Loads a shader for the given shader file path - Data::Instance LoadShader(const AZStd::string& shaderFilePath); - Data::Instance LoadCriticalShader(const AZStd::string& shaderFilePath); + Data::Instance LoadShader(const AZStd::string& shaderFilePath, const AZStd::string& supervariantName = ""); + Data::Instance LoadCriticalShader(const AZStd::string& shaderFilePath, const AZStd::string& supervariantName = ""); //! Loads a streaming image asset for the given file path Data::Instance LoadStreamingTexture(AZStd::string_view path); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp index fda8f967da..7285273c3e 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPIUtils.cpp @@ -74,7 +74,7 @@ namespace AZ return shaderAsset; } - Data::Instance LoadShader(Data::AssetId shaderAssetId, const AZStd::string& shaderFilePath) + Data::Instance LoadShader(Data::AssetId shaderAssetId, const AZStd::string& shaderFilePath, const AZStd::string& supervariantName) { auto shaderAsset = FindShaderAsset(shaderAssetId, shaderFilePath); if (!shaderAsset) @@ -82,7 +82,7 @@ namespace AZ return nullptr; } - Data::Instance shader = Shader::FindOrCreate(shaderAsset); + Data::Instance shader = Shader::FindOrCreate(shaderAsset, AZ::Name(supervariantName)); if (!shader) { AZ_Error("RPI Utils", false, "Failed to find or create a shader instance from shader asset [%s] with asset ID [%s]", shaderFilePath.c_str(), shaderAssetId.ToString().c_str()); @@ -103,15 +103,15 @@ namespace AZ return FindShaderAsset(GetShaderAssetId(shaderFilePath, isCritical), shaderFilePath); } - Data::Instance LoadShader(const AZStd::string& shaderFilePath) + Data::Instance LoadShader(const AZStd::string& shaderFilePath, const AZStd::string& supervariantName) { - return LoadShader(GetShaderAssetId(shaderFilePath), shaderFilePath); + return LoadShader(GetShaderAssetId(shaderFilePath), shaderFilePath, supervariantName); } - Data::Instance LoadCriticalShader(const AZStd::string& shaderFilePath) + Data::Instance LoadCriticalShader(const AZStd::string& shaderFilePath, const AZStd::string& supervariantName) { const bool isCritical = true; - return LoadShader(GetShaderAssetId(shaderFilePath, isCritical), shaderFilePath); + return LoadShader(GetShaderAssetId(shaderFilePath, isCritical), shaderFilePath, supervariantName); } AZ::Data::Instance LoadStreamingTexture(AZStd::string_view path) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h index 64669eceab..91c4e2bcf4 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentConstants.h @@ -19,5 +19,6 @@ namespace AZ static constexpr float DefaultDiffuseProbeGridAmbientMultiplier = 1.0f; static constexpr float DefaultDiffuseProbeGridViewBias = 0.2f; static constexpr float DefaultDiffuseProbeGridNormalBias = 0.1f; + static constexpr DiffuseProbeGridNumRaysPerProbe DefaultDiffuseProbeGridNumRaysPerProbe = DiffuseProbeGridNumRaysPerProbe::NumRaysPerProbe_288; } // namespace Render } // namespace AZ diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp index 397f22c4ff..b7dbbdbcf5 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp @@ -34,12 +34,13 @@ namespace AZ if (auto* serializeContext = azrtti_cast(context)) { serializeContext->Class() - ->Version(1) + ->Version(2) // ATOM-17127 ->Field("ProbeSpacing", &DiffuseProbeGridComponentConfig::m_probeSpacing) ->Field("Extents", &DiffuseProbeGridComponentConfig::m_extents) ->Field("AmbientMultiplier", &DiffuseProbeGridComponentConfig::m_ambientMultiplier) ->Field("ViewBias", &DiffuseProbeGridComponentConfig::m_viewBias) ->Field("NormalBias", &DiffuseProbeGridComponentConfig::m_normalBias) + ->Field("NumRaysPerProbe", &DiffuseProbeGridComponentConfig::m_numRaysPerProbe) ->Field("EditorMode", &DiffuseProbeGridComponentConfig::m_editorMode) ->Field("RuntimeMode", &DiffuseProbeGridComponentConfig::m_runtimeMode) ->Field("BakedIrradianceTextureRelativePath", &DiffuseProbeGridComponentConfig::m_bakedIrradianceTextureRelativePath) @@ -138,6 +139,7 @@ namespace AZ m_featureProcessor->SetAmbientMultiplier(m_handle, m_configuration.m_ambientMultiplier); m_featureProcessor->SetViewBias(m_handle, m_configuration.m_viewBias); m_featureProcessor->SetNormalBias(m_handle, m_configuration.m_normalBias); + m_featureProcessor->SetNumRaysPerProbe(m_handle, m_configuration.m_numRaysPerProbe); // load the baked texture assets, but only if they are all valid if (m_configuration.m_bakedIrradianceTextureAsset.GetId().IsValid() && @@ -320,6 +322,17 @@ namespace AZ m_featureProcessor->SetNormalBias(m_handle, m_configuration.m_normalBias); } + void DiffuseProbeGridComponentController::SetNumRaysPerProbe(const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe) + { + if (!m_featureProcessor) + { + return; + } + + m_configuration.m_numRaysPerProbe = numRaysPerProbe; + m_featureProcessor->SetNumRaysPerProbe(m_handle, m_configuration.m_numRaysPerProbe); + } + void DiffuseProbeGridComponentController::SetEditorMode(DiffuseProbeGridMode editorMode) { if (!m_featureProcessor) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h index d3dd0efc0c..8f84954b2c 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.h @@ -35,6 +35,7 @@ namespace AZ float m_ambientMultiplier = DefaultDiffuseProbeGridAmbientMultiplier; float m_viewBias = DefaultDiffuseProbeGridViewBias; float m_normalBias = DefaultDiffuseProbeGridNormalBias; + DiffuseProbeGridNumRaysPerProbe m_numRaysPerProbe = DefaultDiffuseProbeGridNumRaysPerProbe; DiffuseProbeGridMode m_editorMode = DiffuseProbeGridMode::RealTime; DiffuseProbeGridMode m_runtimeMode = DiffuseProbeGridMode::RealTime; @@ -98,6 +99,7 @@ namespace AZ void SetAmbientMultiplier(float ambientMultiplier); void SetViewBias(float viewBias); void SetNormalBias(float normalBias); + void SetNumRaysPerProbe(const DiffuseProbeGridNumRaysPerProbe& numRaysPerProbe); void SetEditorMode(DiffuseProbeGridMode editorMode); void SetRuntimeMode(DiffuseProbeGridMode runtimeMode); diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp index 19b3f4459c..6588b18636 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp @@ -40,6 +40,7 @@ namespace AZ ->Field("ambientMultiplier", &EditorDiffuseProbeGridComponent::m_ambientMultiplier) ->Field("viewBias", &EditorDiffuseProbeGridComponent::m_viewBias) ->Field("normalBias", &EditorDiffuseProbeGridComponent::m_normalBias) + ->Field("numRaysPerProbe", &EditorDiffuseProbeGridComponent::m_numRaysPerProbe) ->Field("editorMode", &EditorDiffuseProbeGridComponent::m_editorMode) ->Field("runtimeMode", &EditorDiffuseProbeGridComponent::m_runtimeMode) ; @@ -93,6 +94,9 @@ namespace AZ ->Attribute(Edit::Attributes::Step, 0.1f) ->Attribute(Edit::Attributes::Min, 0.0f) ->Attribute(Edit::Attributes::Max, 1.0f) + ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorDiffuseProbeGridComponent::m_numRaysPerProbe, "Number of Rays Per Probe", "Number of rays cast by each probe to detect lighting in its surroundings") + ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnNumRaysPerProbeChanged) + ->Attribute(AZ::Edit::Attributes::EnumValues, &EditorDiffuseProbeGridComponent::GetNumRaysPerProbeEnumList) ->ClassElement(AZ::Edit::ClassElements::EditorData, "Grid mode") ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ->DataElement(Edit::UIHandlers::ComboBox, &EditorDiffuseProbeGridComponent::m_editorMode, "Editor Mode", "Controls whether the editor uses RealTime or Baked diffuse GI. RealTime requires a ray-tracing capable GPU. Auto-Select will fallback to Baked if ray-tracing is not available") @@ -216,6 +220,19 @@ namespace AZ } } + AZStd::vector> EditorDiffuseProbeGridComponent::GetNumRaysPerProbeEnumList() const + { + AZStd::vector> enumList; + + for (uint32_t index = 0; index < DiffuseProbeGridNumRaysPerProbeArraySize; ++index) + { + const DiffuseProbeGridNumRaysPerProbeEntry& entry = DiffuseProbeGridNumRaysPerProbeArray[index]; + enumList.push_back(Edit::EnumConstant(entry.m_enum, AZStd::to_string(entry.m_rayCount).c_str())); + } + + return enumList; + } + AZ::Aabb EditorDiffuseProbeGridComponent::GetEditorSelectionBoundsViewport([[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo) { return m_controller.GetAabb(); @@ -313,6 +330,12 @@ namespace AZ return AZ::Edit::PropertyRefreshLevels::None; } + AZ::u32 EditorDiffuseProbeGridComponent::OnNumRaysPerProbeChanged() + { + m_controller.SetNumRaysPerProbe(m_numRaysPerProbe); + return AZ::Edit::PropertyRefreshLevels::None; + } + AZ::u32 EditorDiffuseProbeGridComponent::OnEditorModeChanged() { // this will update the configuration and also change the DiffuseProbeGrid mode diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h index ba5693b022..c7832902a8 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.h @@ -56,6 +56,7 @@ namespace AZ AZStd::string ValidateOrCreateNewTexturePath(const AZStd::string& relativePath, const char* fileSuffix); void CheckoutSourceTextureFile(const AZStd::string& fullPath); void CheckTextureAssetNotification(const AZStd::string& relativePath, Data::Asset& configurationAsset); + AZStd::vector> GetNumRaysPerProbeEnumList() const; // property change notifications AZ::Outcome OnProbeSpacingValidateX(void* newValue, const AZ::Uuid& valueType); @@ -65,6 +66,7 @@ namespace AZ AZ::u32 OnAmbientMultiplierChanged(); AZ::u32 OnViewBiasChanged(); AZ::u32 OnNormalBiasChanged(); + AZ::u32 OnNumRaysPerProbeChanged(); AZ::u32 OnEditorModeChanged(); AZ::u32 OnRuntimeModeChanged(); AZ::Outcome OnModeChangeValidate(void* newValue, const AZ::Uuid& valueType); @@ -80,6 +82,7 @@ namespace AZ float m_ambientMultiplier = DefaultDiffuseProbeGridAmbientMultiplier; float m_viewBias = DefaultDiffuseProbeGridViewBias; float m_normalBias = DefaultDiffuseProbeGridNormalBias; + DiffuseProbeGridNumRaysPerProbe m_numRaysPerProbe = DefaultDiffuseProbeGridNumRaysPerProbe; DiffuseProbeGridMode m_editorMode = DiffuseProbeGridMode::RealTime; DiffuseProbeGridMode m_runtimeMode = DiffuseProbeGridMode::RealTime; From c98d14ad924d2e0efe9eeff650b899cdeb204cda Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Thu, 20 Jan 2022 00:10:07 -0600 Subject: [PATCH 17/58] =?UTF-8?q?Atom=20Tools:=20Removing=20unnecessary=20?= =?UTF-8?q?modules,=20components,=20and=20dead=20code=20from=20ME=20?= =?UTF-8?q?=E2=80=A2=20Working=20toward=20creating=20a=20standalone=20appl?= =?UTF-8?q?ication=20template=20Removing=20application=20level=20modules?= =?UTF-8?q?=20and=20system=20components=20that=20make=20it=20difficult=20t?= =?UTF-8?q?o=20navigate=20the=20project=20and=20add=20a=20lot=20of=20boile?= =?UTF-8?q?rplate=20code=20=E2=80=A2=20Temporarily=20keeping=20viewport=20?= =?UTF-8?q?module=20and=20components=20because=20shutting=20down=20the=20a?= =?UTF-8?q?pplication=20deactivates=20module=20entities=20before=20system?= =?UTF-8?q?=20entities=20without=20respecting=20component=20service=20depe?= =?UTF-8?q?ndency=20order.=20This=20caused=20several=20RPI=20assets=20and?= =?UTF-8?q?=20names=20to=20leak=20because=20they=20were=20not=20being=20de?= =?UTF-8?q?stroyed=20in=20the=20correct=20order.=20=E2=80=A2=20Fixing=20in?= =?UTF-8?q?clude=20paths=20not=20referenced=20source=20folders=20=E2=80=A2?= =?UTF-8?q?=20Mostly=20cleanup=20and=20reorganization,=20no=20behavioral?= =?UTF-8?q?=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guthrie Adams --- .../Application/AtomToolsApplication.cpp | 4 + .../AtomToolsFrameworkSystemComponent.cpp | 6 +- .../DynamicProperty/DynamicProperty.cpp | 2 +- .../Code/Source/Inspector/InspectorWidget.cpp | 2 +- .../Tools/MaterialEditor/Code/CMakeLists.txt | 80 ++----------- .../Atom/Document/MaterialDocumentModule.h | 29 ----- .../Atom/Window/MaterialEditorWindowModule.h | 28 ----- .../Code/Source/Document/MaterialDocument.h | 7 +- .../Document/MaterialDocumentModule.cpp | 30 ----- .../Document/MaterialDocumentRequestBus.h | 0 .../Document/MaterialDocumentSettings.cpp | 2 +- .../Document/MaterialDocumentSettings.h | 0 .../MaterialDocumentSystemComponent.cpp | 85 -------------- .../MaterialDocumentSystemComponent.h | 41 ------- .../Code/Source/MaterialEditorApplication.cpp | 107 ++++++++++++++---- .../Code/Source/MaterialEditorApplication.h | 19 ++++ .../Viewport/InputController/Behavior.cpp | 5 +- .../InputController/DollyCameraBehavior.cpp | 4 +- .../InputController/DollyCameraBehavior.h | 2 +- .../Viewport/InputController/IdleBehavior.cpp | 2 +- .../Viewport/InputController/IdleBehavior.h | 2 +- .../MaterialEditorViewportInputController.cpp | 24 ++-- .../MaterialEditorViewportInputController.h | 4 +- ...MaterialEditorViewportInputControllerBus.h | 0 .../InputController/MoveCameraBehavior.cpp | 6 +- .../InputController/MoveCameraBehavior.h | 2 +- .../InputController/OrbitCameraBehavior.cpp | 2 +- .../InputController/OrbitCameraBehavior.h | 2 +- .../InputController/PanCameraBehavior.cpp | 8 +- .../InputController/PanCameraBehavior.h | 2 +- .../RotateEnvironmentBehavior.cpp | 2 +- .../RotateEnvironmentBehavior.h | 2 +- .../InputController/RotateModelBehavior.cpp | 2 +- .../InputController/RotateModelBehavior.h | 2 +- .../Viewport/MaterialViewportComponent.cpp | 17 +-- .../Viewport/MaterialViewportComponent.h | 4 +- .../Viewport/MaterialViewportModule.cpp | 2 +- .../Viewport/MaterialViewportModule.h | 0 .../MaterialViewportNotificationBus.h | 0 .../Viewport/MaterialViewportRenderer.cpp | 36 +++--- .../Viewport/MaterialViewportRenderer.h | 2 +- .../Viewport/MaterialViewportRequestBus.h | 0 .../Viewport/MaterialViewportSettings.cpp | 2 +- .../Viewport/MaterialViewportSettings.h | 0 .../Viewport/PerformanceMetrics.h | 0 .../Viewport/PerformanceMonitorComponent.cpp | 2 +- .../Viewport/PerformanceMonitorComponent.h | 5 +- .../Viewport/PerformanceMonitorRequestBus.h | 3 +- .../CreateMaterialDialog.cpp | 2 +- .../CreateMaterialDialog.h | 2 +- .../Source/Window/HelpDialog/HelpDialog.cpp | 4 +- .../Source/Window/HelpDialog/HelpDialog.h | 2 +- .../Source/Window/MaterialEditorWindow.cpp | 4 +- .../Window/MaterialEditorWindowComponent.cpp | 89 --------------- .../Window/MaterialEditorWindowComponent.h | 58 ---------- .../Window/MaterialEditorWindowModule.cpp | 38 ------- .../Window/MaterialEditorWindowSettings.cpp | 2 +- .../Window/MaterialEditorWindowSettings.h | 0 .../MaterialInspector/MaterialInspector.cpp | 2 +- .../MaterialInspector/MaterialInspector.h | 2 +- .../PerformanceMonitorWidget.cpp | 9 +- .../LightingPresetBrowserDialog.cpp | 2 +- .../LightingPresetBrowserDialog.h | 2 +- .../ModelPresetBrowserDialog.cpp | 2 +- .../ModelPresetBrowserDialog.h | 2 +- .../Window/SettingsDialog/SettingsWidget.h | 2 +- .../Window/ToolBar/LightingPresetComboBox.cpp | 6 +- .../Window/ToolBar/LightingPresetComboBox.h | 2 +- .../Window/ToolBar/MaterialEditorToolBar.cpp | 8 +- .../Window/ToolBar/MaterialEditorToolBar.h | 2 +- .../Window/ToolBar/ModelPresetComboBox.cpp | 6 +- .../Window/ToolBar/ModelPresetComboBox.h | 2 +- .../ViewportSettingsInspector.cpp | 4 +- .../ViewportSettingsInspector.h | 6 +- .../Code/materialeditor_files.cmake | 82 ++++++++++++++ .../Code/materialeditordocument_files.cmake | 19 ---- .../Code/materialeditorviewport_files.cmake | 46 -------- .../Code/materialeditorwindow_files.cmake | 52 --------- .../ShaderManagementConsoleWindowComponent.h | 12 +- .../ShaderManagementConsoleToolBar.cpp | 4 +- 80 files changed, 327 insertions(+), 736 deletions(-) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Document/MaterialDocumentRequestBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Document/MaterialDocumentSettings.h (100%) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/InputController/MaterialEditorViewportInputControllerBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportModule.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportNotificationBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportRequestBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportSettings.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/PerformanceMetrics.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/PerformanceMonitorRequestBus.h (95%) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Window/MaterialEditorWindowSettings.h (100%) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp index 51e8bc4dda..7b6be61050 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp @@ -158,6 +158,7 @@ namespace AtomToolsFramework components.end(), { azrtti_typeid(), + azrtti_typeid(), azrtti_typeid(), azrtti_typeid(), azrtti_typeid(), @@ -187,6 +188,9 @@ namespace AtomToolsFramework AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotificationBus::Broadcast( &AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotifications::OnDatabaseInitialized); + AzToolsFramework::SourceControlConnectionRequestBus::Broadcast( + &AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true); + if (!AZ::RPI::RPISystemInterface::Get()->IsInitialized()) { AZ::RPI::RPISystemInterface::Get()->InitializeSystemAssets(); diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp index a8481ef5bd..adba947092 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp @@ -30,7 +30,7 @@ namespace AtomToolsFramework { ec->Class("AtomToolsFrameworkSystemComponent", "") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b)) + ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System")) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ; } @@ -39,12 +39,12 @@ namespace AtomToolsFramework void AtomToolsFrameworkSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("AtomToolsFrameworkSystemService")); + provided.push_back(AZ_CRC_CE("AtomToolsFrameworkSystemService")); } void AtomToolsFrameworkSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.push_back(AZ_CRC("AtomToolsFrameworkSystemService")); + incompatible.push_back(AZ_CRC_CE("AtomToolsFrameworkSystemService")); } void AtomToolsFrameworkSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp index d4599b68b7..830f71933c 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp @@ -160,7 +160,7 @@ namespace AtomToolsFramework ApplyRangeEditDataAttributes(); break; case DynamicPropertyType::Color: - AddEditDataAttribute(AZ_CRC("ColorEditorConfiguration", 0xc8b9510e), AZ::RPI::ColorUtils::GetRgbEditorConfig()); + AddEditDataAttribute(AZ_CRC_CE("ColorEditorConfiguration"), AZ::RPI::ColorUtils::GetRgbEditorConfig()); break; case DynamicPropertyType::Enum: m_editData.m_elementId = AZ::Edit::UIHandlers::ComboBox; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp index fbe188364a..89f7e9d3bf 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace AtomToolsFramework { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt index 1d9295f9b3..5a0d153578 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt +++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt @@ -18,78 +18,12 @@ if(NOT PAL_TRAIT_ATOM_MATERIAL_EDITOR_APPLICATION_SUPPORTED) return() endif() - -ly_add_target( - NAME MaterialEditor.Document STATIC - NAMESPACE Gem - AUTOMOC - FILES_CMAKE - materialeditordocument_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - Source - PUBLIC - Include - BUILD_DEPENDENCIES - PUBLIC - Gem::AtomToolsFramework.Static - Gem::AtomToolsFramework.Editor - Gem::Atom_RPI.Edit - Gem::Atom_RPI.Public - Gem::Atom_RHI.Reflect -) - -ly_add_target( - NAME MaterialEditor.Window STATIC - NAMESPACE Gem - AUTOMOC - AUTOUIC - AUTORCC - FILES_CMAKE - materialeditorwindow_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - Source - PUBLIC - Include - BUILD_DEPENDENCIES - PUBLIC - Gem::AtomToolsFramework.Static - Gem::AtomToolsFramework.Editor - Gem::Atom_RPI.Public - Gem::Atom_Feature_Common.Public -) - -ly_add_target( - NAME MaterialEditor.Viewport STATIC - NAMESPACE Gem - AUTOMOC - AUTOUIC - FILES_CMAKE - materialeditorviewport_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - Source - Public - Include - BUILD_DEPENDENCIES - PUBLIC - Gem::AtomToolsFramework.Static - Gem::AtomToolsFramework.Editor - Gem::Atom_RHI.Public - Gem::Atom_RPI.Public - Gem::Atom_Feature_Common.Static - Gem::Atom_Component_DebugCamera.Static - Gem::AtomLyIntegration_CommonFeatures.Static -) - ly_add_target( NAME MaterialEditor EXECUTABLE NAMESPACE Gem AUTOMOC + AUTOUIC + AUTORCC FILES_CMAKE materialeditor_files.cmake ${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake @@ -106,9 +40,13 @@ ly_add_target( PRIVATE Gem::AtomToolsFramework.Static Gem::AtomToolsFramework.Editor - Gem::MaterialEditor.Window - Gem::MaterialEditor.Viewport - Gem::MaterialEditor.Document + Gem::Atom_RHI.Public + Gem::Atom_RHI.Reflect + Gem::Atom_RPI.Edit + Gem::Atom_RPI.Public + Gem::Atom_Feature_Common.Public + Gem::Atom_Component_DebugCamera.Static + Gem::AtomLyIntegration_CommonFeatures.Static RUNTIME_DEPENDENCIES Gem::AtomToolsFramework.Editor Gem::EditorPythonBindings.Editor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h deleted file mode 100644 index 0813f8cab8..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include - -namespace MaterialEditor -{ - //! Entry point for Material Editor Document library. This module is responsible for registering dependencies and logic needed - //! for the Material Document API - class MaterialDocumentModule - : public AZ::Module - { - public: - AZ_RTTI(MaterialDocumentModule, "{81D7A170-9284-4DE9-8D92-B6B94E8A2BDF}", AZ::Module); - AZ_CLASS_ALLOCATOR(MaterialDocumentModule, AZ::SystemAllocator, 0); - - MaterialDocumentModule(); - - //! Add required SystemComponents to the SystemEntity. - AZ::ComponentTypeList GetRequiredSystemComponents() const override; - }; -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h deleted file mode 100644 index 611a993084..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include - -namespace MaterialEditor -{ - //! Entry point for Material Editor Window library. - class MaterialEditorWindowModule - : public AZ::Module - { - public: - AZ_RTTI(MaterialEditorWindowModule, "{57D6239C-AE03-4ED8-9125-35C5B1625503}", AZ::Module); - AZ_CLASS_ALLOCATOR(MaterialEditorWindowModule, AZ::SystemAllocator, 0); - - MaterialEditorWindowModule(); - - //! Add required SystemComponents to the SystemEntity. - AZ::ComponentTypeList GetRequiredSystemComponents() const override; - }; -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h index ceb3190f26..c975824e22 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h @@ -7,18 +7,17 @@ */ #pragma once -#include #include #include -#include +#include #include -#include #include #include #include -#include +#include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp deleted file mode 100644 index c721798cfd..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include -#include -#include - -namespace MaterialEditor -{ - MaterialDocumentModule::MaterialDocumentModule() - { - // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here. - m_descriptors.insert(m_descriptors.end(), { - MaterialDocumentSystemComponent::CreateDescriptor(), - }); - } - - AZ::ComponentTypeList MaterialDocumentModule::GetRequiredSystemComponents() const - { - return AZ::ComponentTypeList{ - azrtti_typeid(), - azrtti_typeid(), - }; - } -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentRequestBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentRequestBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp index 4823b8c67c..256497de54 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp @@ -6,9 +6,9 @@ * */ -#include #include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp deleted file mode 100644 index 9302b5ac5c..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -namespace MaterialEditor -{ - void MaterialDocumentSystemComponent::Reflect(AZ::ReflectContext* context) - { - MaterialDocumentSettings::Reflect(context); - - if (AZ::SerializeContext* serialize = azrtti_cast(context)) - { - serialize->Class() - ->Version(0); - - if (AZ::EditContext* ec = serialize->GetEditContext()) - { - ec->Class("MaterialDocumentSystemComponent", "Tool for editing Atom material files") - ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System")) - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - ; - } - } - - if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) - { - behaviorContext->EBus("MaterialDocumentRequestBus") - ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common) - ->Attribute(AZ::Script::Attributes::Category, "Editor") - ->Attribute(AZ::Script::Attributes::Module, "materialeditor") - ; - } - } - - void MaterialDocumentSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) - { - required.push_back(AZ_CRC_CE("AtomToolsDocumentSystemService")); - required.push_back(AZ_CRC_CE("AssetProcessorToolsConnection")); - required.push_back(AZ_CRC_CE("AssetDatabaseService")); - required.push_back(AZ_CRC_CE("PropertyManagerService")); - required.push_back(AZ_CRC_CE("RPISystem")); - } - - void MaterialDocumentSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) - { - provided.push_back(AZ_CRC_CE("MaterialDocumentSystemService")); - } - - void MaterialDocumentSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) - { - incompatible.push_back(AZ_CRC_CE("MaterialDocumentSystemService")); - } - - void MaterialDocumentSystemComponent::Init() - { - } - - void MaterialDocumentSystemComponent::Activate() - { - AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast( - &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType, - []() - { - return aznew MaterialDocument(); - }); - } - - void MaterialDocumentSystemComponent::Deactivate() - { - } -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h deleted file mode 100644 index af19956088..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include - -namespace MaterialEditor -{ - //! MaterialDocumentSystemComponent - class MaterialDocumentSystemComponent - : public AZ::Component - { - public: - AZ_COMPONENT(MaterialDocumentSystemComponent, "{E011DA51-855D-45FA-87A3-1C1CD6379091}"); - - MaterialDocumentSystemComponent() = default; - ~MaterialDocumentSystemComponent() = default; - MaterialDocumentSystemComponent(const MaterialDocumentSystemComponent&) = delete; - MaterialDocumentSystemComponent& operator=(const MaterialDocumentSystemComponent&) = delete; - - static void Reflect(AZ::ReflectContext* context); - - static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); - static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided); - static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible); - - private: - //////////////////////////////////////////////////////////////////////// - // AZ::Component interface implementation - void Init() override; - void Activate() override; - void Deactivate() override; - //////////////////////////////////////////////////////////////////////// - }; -} // namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp index 15a5ff1715..2e64740057 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp @@ -6,22 +6,73 @@ * */ -#include -#include -#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include #include +#include +#include +#include + +void InitMaterialEditorResources() +{ + // Must register qt resources from other modules + Q_INIT_RESOURCE(MaterialEditor); + Q_INIT_RESOURCE(InspectorWidget); + Q_INIT_RESOURCE(AtomToolsAssetBrowser); +} namespace MaterialEditor { - //! This function returns the build system target name of "MaterialEditor" - AZStd::string MaterialEditorApplication::GetBuildTargetName() const + MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv) + : Base(argc, argv) { -#if !defined(LY_CMAKE_TARGET) -#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target" -#endif - return AZStd::string{ LY_CMAKE_TARGET }; + InitMaterialEditorResources(); + + QApplication::setApplicationName("O3DE Material Editor"); + + // The settings registry has been created at this point, so add the CMake target + AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization( + *AZ::SettingsRegistry::Get(), GetBuildTargetName()); + + AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect(); + AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusConnect(); + } + + MaterialEditorApplication::~MaterialEditorApplication() + { + AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusDisconnect(); + AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect(); + m_window.reset(); + } + + void MaterialEditorApplication::Reflect(AZ::ReflectContext* context) + { + Base::Reflect(context); + MaterialDocumentSettings::Reflect(context); + MaterialEditorWindowSettings::Reflect(context); + + if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) + { + behaviorContext->EBus("MaterialDocumentRequestBus") + ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common) + ->Attribute(AZ::Script::Attributes::Category, "Editor") + ->Attribute(AZ::Script::Attributes::Module, "materialeditor") + ; + } + } + + void MaterialEditorApplication::CreateStaticModules(AZStd::vector& outModules) + { + Base::CreateStaticModules(outModules); + outModules.push_back(aznew MaterialViewportModule); } const char* MaterialEditorApplication::GetCurrentConfigurationName() const @@ -35,26 +86,42 @@ namespace MaterialEditor #endif } - MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv) - : Base(argc, argv) + void MaterialEditorApplication::StartCommon(AZ::Entity* systemEntity) { - QApplication::setApplicationName("O3DE Material Editor"); + Base::StartCommon(systemEntity); - // The settings registry has been created at this point, so add the CMake target - AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization( - *AZ::SettingsRegistry::Get(), GetBuildTargetName()); + AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast( + &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType, + []() { return aznew MaterialDocument(); }); } - void MaterialEditorApplication::CreateStaticModules(AZStd::vector& outModules) + AZStd::string MaterialEditorApplication::GetBuildTargetName() const { - Base::CreateStaticModules(outModules); - outModules.push_back(aznew MaterialDocumentModule); - outModules.push_back(aznew MaterialViewportModule); - outModules.push_back(aznew MaterialEditorWindowModule); +#if !defined(LY_CMAKE_TARGET) +#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target" +#endif + //! Returns the build system target name of "MaterialEditor" + return AZStd::string{ LY_CMAKE_TARGET }; } AZStd::vector MaterialEditorApplication::GetCriticalAssetFilters() const { return AZStd::vector({ "passes/", "config/", "MaterialEditor/" }); } + + void MaterialEditorApplication::CreateMainWindow() + { + m_materialEditorBrowserInteractions.reset(aznew MaterialEditorBrowserInteractions); + m_window.reset(aznew MaterialEditorWindow); + } + + void MaterialEditorApplication::DestroyMainWindow() + { + m_window.reset(); + } + + QWidget* MaterialEditorApplication::GetAppMainWindow() + { + return m_window.get(); + } } // namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h index bf2e6f6ca1..060353e396 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h @@ -9,6 +9,10 @@ #pragma once #include +#include +#include +#include +#include namespace MaterialEditor { @@ -16,6 +20,8 @@ namespace MaterialEditor class MaterialEditorApplication : public AtomToolsFramework::AtomToolsDocumentApplication + , private AzToolsFramework::EditorWindowRequestBus::Handler + , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler { public: AZ_TYPE_INFO(MaterialEditor::MaterialEditorApplication, "{30F90CA5-1253-49B5-8143-19CEE37E22BB}"); @@ -23,13 +29,26 @@ namespace MaterialEditor using Base = AtomToolsFramework::AtomToolsDocumentApplication; MaterialEditorApplication(int* argc, char*** argv); + ~MaterialEditorApplication(); // AzFramework::Application overrides... + void Reflect(AZ::ReflectContext* context) override; void CreateStaticModules(AZStd::vector& outModules) override; const char* GetCurrentConfigurationName() const override; + void StartCommon(AZ::Entity* systemEntity) override; // AtomToolsFramework::AtomToolsApplication overrides... AZStd::string GetBuildTargetName() const override; AZStd::vector GetCriticalAssetFilters() const override; + + // AtomToolsMainWindowFactoryRequestBus::Handler overrides... + void CreateMainWindow() override; + void DestroyMainWindow() override; + + // AzToolsFramework::EditorWindowRequests::Bus::Handler + QWidget* GetAppMainWindow() override; + + AZStd::unique_ptr m_window; + AZStd::unique_ptr m_materialEditorBrowserInteractions; }; } // namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp index 321b79ba87..a843c4965c 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp @@ -6,10 +6,9 @@ * */ -#include #include - -#include +#include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp index c0326bce2a..c69884c5c0 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp @@ -6,11 +6,11 @@ * */ +#include #include #include -#include +#include #include -#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h index be226e5fde..5debfc4dd1 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp index 64e2fe1fdc..0cd062d86d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp @@ -6,7 +6,7 @@ * */ -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h index 3eec594da2..16543a890d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp index 1784405ffa..ced59f1bf5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp @@ -9,30 +9,30 @@ #include #include -#include #include #include +#include +#include #include #include -#include #include #include -#include +#include #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h index b488c3bf29..a68666f06d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp index a449d6f7ff..80b3409f57 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp @@ -6,10 +6,10 @@ * */ -#include #include -#include -#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h index b37350423f..ea0850ba16 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp index 4d8a5b9343..1d93e4eafe 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp @@ -7,8 +7,8 @@ */ #include -#include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h index 98240aef96..a312d22e73 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp index 62839be13c..2b036a1319 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp @@ -6,11 +6,11 @@ * */ -#include -#include #include -#include -#include +#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h index de8e2c3c43..93233511f0 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp index 17fb3f3e52..894841becd 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h index 80989df520..56c7a5190a 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace AZ { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp index 032b412d6e..ed09ae8fa3 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h index 7653e10014..e2c20ab5fd 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp index 9cf714b40e..b2f1cdc9c1 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp @@ -9,19 +9,19 @@ #include #include #include -#include -#include #include #include #include #include #include +#include #include #include -#include #include #include #include +#include +#include namespace MaterialEditor { @@ -42,7 +42,7 @@ namespace MaterialEditor { editContext->Class("MaterialViewport", "Manages configurations for lighting and models displayed in the viewport") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b)) + ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System")) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ; } @@ -103,18 +103,19 @@ namespace MaterialEditor void MaterialViewportComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required) { - required.push_back(AZ_CRC("PerformanceMonitorService", 0x6a44241a)); - required.push_back(AZ_CRC("AtomImageBuilderService", 0x76ded592)); + required.push_back(AZ_CRC_CE("RPISystem")); + required.push_back(AZ_CRC_CE("AssetDatabaseService")); + required.push_back(AZ_CRC_CE("PerformanceMonitorService")); } void MaterialViewportComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("MaterialViewportService", 0xed9b44d7)); + provided.push_back(AZ_CRC_CE("MaterialViewportService")); } void MaterialViewportComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.push_back(AZ_CRC("MaterialViewportService", 0xed9b44d7)); + incompatible.push_back(AZ_CRC_CE("MaterialViewportService")); } void MaterialViewportComponent::Init() diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h index 68668bd804..7209dfa489 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h @@ -12,11 +12,11 @@ #include #include #include -#include -#include #include #include #include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp index 7c3bc208ff..01a13519fb 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp @@ -6,8 +6,8 @@ * */ -#include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportNotificationBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportNotificationBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp index 409674f0bc..478fb92c55 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp @@ -8,51 +8,51 @@ #undef RC_INVOKED -#include #include +#include -#include #include +#include #include #include -#include +#include +#include #include #include #include #include -#include -#include +#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include -#include #include #include -#include -#include -#include -#include #include +#include #include #include -#include #include -#include +#include #include -#include +#include #include #include +#include -#include +#include +#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h index c6380ddc00..35b7965a2e 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRequestBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRequestBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp index c2c35119c2..0f08716407 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp @@ -6,9 +6,9 @@ * */ -#include #include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMetrics.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMetrics.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp index 563b2754df..c8f12480b5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp @@ -31,7 +31,7 @@ namespace MaterialEditor void PerformanceMonitorComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("PerformanceMonitorService", 0x6a44241a)); + provided.push_back(AZ_CRC_CE("PerformanceMonitorService")); } void PerformanceMonitorComponent::Init() diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h index 88a6827bd1..3045bf9533 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h @@ -8,11 +8,10 @@ #pragma once +#include #include #include - -#include -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorRequestBus.h similarity index 95% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorRequestBus.h index ae09064766..6001787d99 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorRequestBus.h @@ -8,8 +8,7 @@ #pragma once #include - -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp index 31ca873c48..0e6cf565e3 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include @@ -15,6 +14,7 @@ #include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h index 3453d8347c..ed3cb2773b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h @@ -10,7 +10,7 @@ #include -#include +#include #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp index 3ad41e4803..3e8cf19539 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp @@ -6,7 +6,7 @@ * */ -#include +#include namespace MaterialEditor { @@ -20,4 +20,4 @@ namespace MaterialEditor HelpDialog::~HelpDialog() = default; } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h index 5cca57ad2d..ec5b756df4 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h @@ -13,7 +13,7 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include -#include +#include AZ_POP_DISABLE_WARNING #endif diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp index 44adda432d..e1f8e713d4 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp @@ -6,19 +6,19 @@ * */ -#include #include #include #include -#include #include #include #include #include +#include #include #include #include #include +#include #include #include #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp deleted file mode 100644 index 5359ba8e53..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace MaterialEditor -{ - void MaterialEditorWindowComponent::Reflect(AZ::ReflectContext* context) - { - MaterialEditorWindowSettings::Reflect(context); - - if (AZ::SerializeContext* serialize = azrtti_cast(context)) - { - serialize->Class() - ->Version(0); - } - } - - void MaterialEditorWindowComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) - { - required.push_back(AZ_CRC_CE("AssetBrowserService")); - required.push_back(AZ_CRC_CE("PropertyManagerService")); - required.push_back(AZ_CRC_CE("SourceControlService")); - required.push_back(AZ_CRC_CE("AtomToolsMainWindowSystemService")); - } - - void MaterialEditorWindowComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) - { - provided.push_back(AZ_CRC_CE("MaterialEditorWindowService")); - } - - void MaterialEditorWindowComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) - { - incompatible.push_back(AZ_CRC_CE("MaterialEditorWindowService")); - } - - void MaterialEditorWindowComponent::Init() - { - } - - void MaterialEditorWindowComponent::Activate() - { - AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect(); - AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusConnect(); - AzToolsFramework::SourceControlConnectionRequestBus::Broadcast(&AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true); - } - - void MaterialEditorWindowComponent::Deactivate() - { - AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusDisconnect(); - AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect(); - - m_window.reset(); - } - - void MaterialEditorWindowComponent::CreateMainWindow() - { - m_materialEditorBrowserInteractions.reset(aznew MaterialEditorBrowserInteractions); - - m_window.reset(aznew MaterialEditorWindow); - } - - void MaterialEditorWindowComponent::DestroyMainWindow() - { - m_window.reset(); - } - - QWidget* MaterialEditorWindowComponent::GetAppMainWindow() - { - return m_window.get(); - } - -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h deleted file mode 100644 index 87f6160089..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include - -#include -#include -#include - -namespace MaterialEditor -{ - //! MaterialEditorWindowComponent is the entry point for the Material Editor gem user interface, and is mainly - //! used for initialization and registration of other classes, including MaterialEditorWindow. - class MaterialEditorWindowComponent - : public AZ::Component - , private AzToolsFramework::EditorWindowRequestBus::Handler - , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler - { - public: - AZ_COMPONENT(MaterialEditorWindowComponent, "{03976F19-3C74-49FE-A15F-7D3CADBA616C}"); - - static void Reflect(AZ::ReflectContext* context); - - static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); - static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided); - static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible); - - private: - //////////////////////////////////////////////////////////////////////// - // AtomToolsMainWindowFactoryRequestBus::Handler overrides... - void CreateMainWindow() override; - void DestroyMainWindow() override; - //////////////////////////////////////////////////////////////////////// - - ////////////////////////////////////////////////////////////////////////// - // AzToolsFramework::EditorWindowRequests::Bus::Handler - QWidget* GetAppMainWindow() override; - ////////////////////////////////////////////////////////////////////////// - - //////////////////////////////////////////////////////////////////////// - // AZ::Component interface implementation - void Init() override; - void Activate() override; - void Deactivate() override; - //////////////////////////////////////////////////////////////////////// - - AZStd::unique_ptr m_window; - AZStd::unique_ptr m_materialEditorBrowserInteractions; - }; -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp deleted file mode 100644 index 1562d11647..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include -#include - -void InitMaterialEditorResources() -{ - //Must register qt resources from other modules - Q_INIT_RESOURCE(MaterialEditor); - Q_INIT_RESOURCE(InspectorWidget); - Q_INIT_RESOURCE(AtomToolsAssetBrowser); -} - -namespace MaterialEditor -{ - MaterialEditorWindowModule::MaterialEditorWindowModule() - { - InitMaterialEditorResources(); - - // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here. - m_descriptors.insert(m_descriptors.end(), { - MaterialEditorWindowComponent::CreateDescriptor(), - }); - } - - AZ::ComponentTypeList MaterialEditorWindowModule::GetRequiredSystemComponents() const - { - return AZ::ComponentTypeList{ - azrtti_typeid(), - }; - } -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp index 71c71e8b75..5ab17d7b26 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp @@ -6,9 +6,9 @@ * */ -#include #include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp index e99f456653..7790b9bef5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include @@ -15,6 +14,7 @@ #include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h index a3b98e13d2..a4cd2b7616 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h @@ -9,12 +9,12 @@ #pragma once #if !defined(Q_MOC_RUN) -#include #include #include #include #include #include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp index 940790eb0a..8492ce5f1f 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp @@ -6,10 +6,9 @@ * */ -#include - -#include -#include +#include +#include +#include #include @@ -55,4 +54,4 @@ namespace MaterialEditor } } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp index f8ad038a85..cc7a851429 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp @@ -8,9 +8,9 @@ #include #include -#include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h index f9d455d915..68b52b3a98 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h @@ -10,8 +10,8 @@ #if !defined(Q_MOC_RUN) #include -#include #include +#include #endif #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp index f5a1677462..e16b61d214 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp @@ -7,9 +7,9 @@ */ #include -#include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h index 67da7db262..a169d3053b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h @@ -10,8 +10,8 @@ #if !defined(Q_MOC_RUN) #include -#include #include +#include #endif #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h index fea98eeda1..e7c655ee21 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h @@ -9,10 +9,10 @@ #pragma once #if !defined(Q_MOC_RUN) -#include #include #include #include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp index e0bb59cb82..20229cad37 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp @@ -6,9 +6,9 @@ * */ -#include -#include #include +#include +#include namespace MaterialEditor { @@ -102,4 +102,4 @@ namespace MaterialEditor } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h index 4c452dfb5b..f39b856085 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h @@ -10,7 +10,7 @@ #if !defined(Q_MOC_RUN) #include -#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp index 10442e0c27..25877f910d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp @@ -6,21 +6,21 @@ * */ -#include -#include -#include #include +#include +#include +#include #include #include #include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include +#include #include #include #include #include -#include AZ_POP_DISABLE_WARNING namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h index c25b90eb80..056fb3ba80 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h @@ -11,7 +11,7 @@ #if !defined(Q_MOC_RUN) #include #include -#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp index 1e8bfec485..1c9bd36be4 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp @@ -6,9 +6,9 @@ * */ -#include -#include #include +#include +#include namespace MaterialEditor { @@ -102,4 +102,4 @@ namespace MaterialEditor } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h index e315854d75..bb71cec25b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h @@ -10,7 +10,7 @@ #if !defined(Q_MOC_RUN) #include -#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp index 613762c10a..512059f1f6 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp @@ -7,10 +7,10 @@ */ #include -#include #include #include #include +#include #include #include #include @@ -376,4 +376,4 @@ namespace MaterialEditor } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h index 6299ddb1f2..464a55aa7f 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h @@ -12,11 +12,11 @@ #include #include #include -#include -#include -#include #include #include +#include +#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake index d4c4364ba7..9d1e2b22f8 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake +++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake @@ -10,4 +10,86 @@ set(FILES Source/main.cpp Source/MaterialEditorApplication.cpp Source/MaterialEditorApplication.h + + Source/Document/MaterialDocumentRequestBus.h + Source/Document/MaterialDocumentSettings.h + Source/Document/MaterialDocument.cpp + Source/Document/MaterialDocument.h + Source/Document/MaterialDocumentSettings.cpp + + Source/Viewport/MaterialViewportModule.h + Source/Viewport/MaterialViewportModule.cpp + Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h + Source/Viewport/MaterialViewportSettings.h + Source/Viewport/MaterialViewportRequestBus.h + Source/Viewport/MaterialViewportNotificationBus.h + Source/Viewport/PerformanceMetrics.h + Source/Viewport/PerformanceMonitorRequestBus.h + Source/Viewport/InputController/MaterialEditorViewportInputController.cpp + Source/Viewport/InputController/MaterialEditorViewportInputController.h + Source/Viewport/InputController/Behavior.cpp + Source/Viewport/InputController/Behavior.h + Source/Viewport/InputController/DollyCameraBehavior.cpp + Source/Viewport/InputController/DollyCameraBehavior.h + Source/Viewport/InputController/IdleBehavior.cpp + Source/Viewport/InputController/IdleBehavior.h + Source/Viewport/InputController/MoveCameraBehavior.cpp + Source/Viewport/InputController/MoveCameraBehavior.h + Source/Viewport/InputController/PanCameraBehavior.cpp + Source/Viewport/InputController/PanCameraBehavior.h + Source/Viewport/InputController/OrbitCameraBehavior.cpp + Source/Viewport/InputController/OrbitCameraBehavior.h + Source/Viewport/InputController/RotateEnvironmentBehavior.cpp + Source/Viewport/InputController/RotateEnvironmentBehavior.h + Source/Viewport/InputController/RotateModelBehavior.cpp + Source/Viewport/InputController/RotateModelBehavior.h + Source/Viewport/MaterialViewportSettings.cpp + Source/Viewport/MaterialViewportComponent.cpp + Source/Viewport/MaterialViewportComponent.h + Source/Viewport/MaterialViewportWidget.cpp + Source/Viewport/MaterialViewportWidget.h + Source/Viewport/MaterialViewportWidget.ui + Source/Viewport/MaterialViewportRenderer.cpp + Source/Viewport/MaterialViewportRenderer.h + Source/Viewport/PerformanceMonitorComponent.cpp + Source/Viewport/PerformanceMonitorComponent.h + + Source/Window/MaterialEditorWindowSettings.h + Source/Window/MaterialEditorBrowserInteractions.h + Source/Window/MaterialEditorBrowserInteractions.cpp + Source/Window/MaterialEditorWindow.h + Source/Window/MaterialEditorWindow.cpp + Source/Window/MaterialEditorWindowSettings.cpp + Source/Window/MaterialEditor.qrc + Source/Window/MaterialEditor.qss + Source/Window/SettingsDialog/SettingsDialog.cpp + Source/Window/SettingsDialog/SettingsDialog.h + Source/Window/SettingsDialog/SettingsWidget.cpp + Source/Window/SettingsDialog/SettingsWidget.h + Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp + Source/Window/CreateMaterialDialog/CreateMaterialDialog.h + Source/Window/CreateMaterialDialog/CreateMaterialDialog.ui + Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp + Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h + Source/Window/PresetBrowserDialogs/PresetBrowserDialog.ui + Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp + Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h + Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp + Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h + Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp + Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h + Source/Window/PerformanceMonitor/PerformanceMonitorWidget.ui + Source/Window/ToolBar/MaterialEditorToolBar.h + Source/Window/ToolBar/MaterialEditorToolBar.cpp + Source/Window/ToolBar/ModelPresetComboBox.h + Source/Window/ToolBar/ModelPresetComboBox.cpp + Source/Window/ToolBar/LightingPresetComboBox.h + Source/Window/ToolBar/LightingPresetComboBox.cpp + Source/Window/MaterialInspector/MaterialInspector.h + Source/Window/MaterialInspector/MaterialInspector.cpp + Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h + Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp + Source/Window/HelpDialog/HelpDialog.h + Source/Window/HelpDialog/HelpDialog.cpp + Source/Window/HelpDialog/HelpDialog.ui ) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake deleted file mode 100644 index d86dd03749..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. -# For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Include/Atom/Document/MaterialDocumentModule.h - Include/Atom/Document/MaterialDocumentRequestBus.h - Include/Atom/Document/MaterialDocumentSettings.h - Source/Document/MaterialDocumentModule.cpp - Source/Document/MaterialDocumentSystemComponent.cpp - Source/Document/MaterialDocumentSystemComponent.h - Source/Document/MaterialDocument.cpp - Source/Document/MaterialDocument.h - Source/Document/MaterialDocumentSettings.cpp -) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake deleted file mode 100644 index ba34cabd90..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. -# For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h - Include/Atom/Viewport/MaterialViewportModule.h - Include/Atom/Viewport/MaterialViewportSettings.h - Include/Atom/Viewport/MaterialViewportRequestBus.h - Include/Atom/Viewport/MaterialViewportNotificationBus.h - Include/Atom/Viewport/PerformanceMetrics.h - Include/Atom/Viewport/PerformanceMonitorRequestBus.h - Source/Viewport/InputController/MaterialEditorViewportInputController.cpp - Source/Viewport/InputController/MaterialEditorViewportInputController.h - Source/Viewport/InputController/Behavior.cpp - Source/Viewport/InputController/Behavior.h - Source/Viewport/InputController/DollyCameraBehavior.cpp - Source/Viewport/InputController/DollyCameraBehavior.h - Source/Viewport/InputController/IdleBehavior.cpp - Source/Viewport/InputController/IdleBehavior.h - Source/Viewport/InputController/MoveCameraBehavior.cpp - Source/Viewport/InputController/MoveCameraBehavior.h - Source/Viewport/InputController/PanCameraBehavior.cpp - Source/Viewport/InputController/PanCameraBehavior.h - Source/Viewport/InputController/OrbitCameraBehavior.cpp - Source/Viewport/InputController/OrbitCameraBehavior.h - Source/Viewport/InputController/RotateEnvironmentBehavior.cpp - Source/Viewport/InputController/RotateEnvironmentBehavior.h - Source/Viewport/InputController/RotateModelBehavior.cpp - Source/Viewport/InputController/RotateModelBehavior.h - Source/Viewport/MaterialViewportModule.cpp - Source/Viewport/MaterialViewportSettings.cpp - Source/Viewport/MaterialViewportComponent.cpp - Source/Viewport/MaterialViewportComponent.h - Source/Viewport/MaterialViewportWidget.cpp - Source/Viewport/MaterialViewportWidget.h - Source/Viewport/MaterialViewportWidget.ui - Source/Viewport/MaterialViewportRenderer.cpp - Source/Viewport/MaterialViewportRenderer.h - Source/Viewport/PerformanceMonitorComponent.cpp - Source/Viewport/PerformanceMonitorComponent.h -) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake deleted file mode 100644 index 3d21e71294..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. -# For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Include/Atom/Window/MaterialEditorWindowModule.h - Include/Atom/Window/MaterialEditorWindowSettings.h - Source/Window/MaterialEditorBrowserInteractions.h - Source/Window/MaterialEditorBrowserInteractions.cpp - Source/Window/MaterialEditorWindow.h - Source/Window/MaterialEditorWindow.cpp - Source/Window/MaterialEditorWindowModule.cpp - Source/Window/MaterialEditorWindowSettings.cpp - Source/Window/MaterialEditor.qrc - Source/Window/MaterialEditor.qss - Source/Window/MaterialEditorWindowComponent.h - Source/Window/MaterialEditorWindowComponent.cpp - Source/Window/SettingsDialog/SettingsDialog.cpp - Source/Window/SettingsDialog/SettingsDialog.h - Source/Window/SettingsDialog/SettingsWidget.cpp - Source/Window/SettingsDialog/SettingsWidget.h - Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp - Source/Window/CreateMaterialDialog/CreateMaterialDialog.h - Source/Window/CreateMaterialDialog/CreateMaterialDialog.ui - Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp - Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h - Source/Window/PresetBrowserDialogs/PresetBrowserDialog.ui - Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp - Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h - Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp - Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h - Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp - Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h - Source/Window/PerformanceMonitor/PerformanceMonitorWidget.ui - Source/Window/ToolBar/MaterialEditorToolBar.h - Source/Window/ToolBar/MaterialEditorToolBar.cpp - Source/Window/ToolBar/ModelPresetComboBox.h - Source/Window/ToolBar/ModelPresetComboBox.cpp - Source/Window/ToolBar/LightingPresetComboBox.h - Source/Window/ToolBar/LightingPresetComboBox.cpp - Source/Window/MaterialInspector/MaterialInspector.h - Source/Window/MaterialInspector/MaterialInspector.cpp - Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h - Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp - Source/Window/HelpDialog/HelpDialog.h - Source/Window/HelpDialog/HelpDialog.cpp - Source/Window/HelpDialog/HelpDialog.ui -) diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h index 9b43babd9a..aab0f7ce37 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h @@ -8,15 +8,15 @@ #pragma once +#include +#include +#include + #include #include -#include - -#include -#include -#include -#include +#include +#include namespace ShaderManagementConsole { diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp index d65ac7048d..5699713240 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include @@ -29,4 +29,4 @@ namespace ShaderManagementConsole } } // namespace ShaderManagementConsole -#include +#include From 3df7e239ac5e345b4b6815dee0eb56149b96d281 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Thu, 20 Jan 2022 09:32:42 -0800 Subject: [PATCH 18/58] Fix build error on PC Signed-off-by: amzn-sj --- .../Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp index 4232a37264..d9bdcb97bc 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp +++ b/Gems/Terrain/Code/Source/TerrainRenderer/TerrainFeatureProcessor.cpp @@ -221,8 +221,8 @@ namespace Terrain numSamples, &AzFramework::Terrain::TerrainDataRequests::GetNumSamplesFromRegion, region, stepSize); - uint32_t updateWidth = numSamples.first; - uint32_t updateHeight = numSamples.second; + uint32_t updateWidth = static_cast(numSamples.first); + uint32_t updateHeight = static_cast(numSamples.second); AZStd::vector pixels; pixels.reserve(updateWidth * updateHeight); { From 730daae1e65426d26cba0d01e0070dac03e6e8c0 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Thu, 20 Jan 2022 09:33:21 -0800 Subject: [PATCH 19/58] Added code comments. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Code/Source/RPI.Reflect/Material/MaterialAsset.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp index f2a9efd896..92fded1d5d 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp @@ -109,6 +109,9 @@ namespace AZ return m_wasPreFinalized; } + //! Attempts to convert a numeric MaterialPropertyValue to another numeric type @T, + //! since MaterialPropertyValue itself does not support any kind of casting. + //! If the original MaterialPropertyValue is not a numeric type, the original value is returned. template MaterialPropertyValue CastNumericMaterialPropertyValue(const MaterialPropertyValue& value) { @@ -135,7 +138,10 @@ namespace AZ return value; } } - + + //! Attempts to convert an AZ::Vector[2-4] MaterialPropertyValue to another AZ::Vector[2-4] type @T. + //! Any extra elements will be dropped or set to 0.0 as needed. + //! If the original MaterialPropertyValue is not a Vector type, the original value is returned. template MaterialPropertyValue CastVectorMaterialPropertyValue(const MaterialPropertyValue& value) { From 0a722b5a0616f6bf919f8644880333e522dd3f36 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Thu, 20 Jan 2022 09:48:15 -0800 Subject: [PATCH 20/58] Update comment for clarity Signed-off-by: amzn-sj --- Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h index 2296d48843..3e489730d0 100644 --- a/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h +++ b/Gems/Terrain/Code/Source/TerrainSystem/TerrainSystem.h @@ -163,7 +163,8 @@ namespace Terrain AzFramework::Terrain::SurfacePointListFillCallback perPositionCallback, Sampler sampleFilter = Sampler::DEFAULT) const override; - //! Returns the number of samples for a given region and step size. + //! Returns the number of samples for a given region and step size. The first and second + //! elements of the pair correspond to the X and Y sample counts respectively. virtual AZStd::pair GetNumSamplesFromRegion(const AZ::Aabb& inRegion, const AZ::Vector2& stepSize) const override; From d6cdd1d053bc5abbea00dec0e4396b2fb0efb0b1 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Thu, 20 Jan 2022 09:51:38 -0800 Subject: [PATCH 21/58] Update another comment Signed-off-by: amzn-sj --- .../AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h index 9379485646..8b29f2a554 100644 --- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h +++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h @@ -161,7 +161,8 @@ namespace AzFramework SurfacePointListFillCallback perPositionCallback, Sampler sampleFilter = Sampler::DEFAULT) const = 0; - //! Returns the number of samples for a given region and step size. + //! Returns the number of samples for a given region and step size. The first and second + //! elements of the pair correspond to the X and Y sample counts respectively. virtual AZStd::pair GetNumSamplesFromRegion(const AZ::Aabb& inRegion, const AZ::Vector2& stepSize) const = 0; From 8e08e42c86bf9ae30263065c1b5bff93ee832ae6 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Thu, 20 Jan 2022 11:01:00 -0800 Subject: [PATCH 22/58] Fix some warnings about unused parameters Signed-off-by: amzn-sj --- .../Code/Tests/TerrainPhysicsColliderTests.cpp | 13 ++++++------- Gems/Terrain/Code/Tests/TerrainSystemTest.cpp | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp index 2d0933c367..dc43544f05 100644 --- a/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp +++ b/Gems/Terrain/Code/Tests/TerrainPhysicsColliderTests.cpp @@ -72,7 +72,6 @@ protected: void ProcessRegionLoop(const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, - AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter, AzFramework::SurfaceData::SurfaceTagWeightList* surfaceTags, float mockHeight) { @@ -281,9 +280,9 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderGetHeightsRetu ON_CALL(terrainListener, ProcessHeightsFromRegion).WillByDefault( [this](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, - AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) + [[maybe_unused]] AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) { - ProcessRegionLoop(inRegion, stepSize, perPositionCallback, sampleFilter, nullptr, 0.0f); + ProcessRegionLoop(inRegion, stepSize, perPositionCallback, nullptr, 0.0f); } ); @@ -323,9 +322,9 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderReturnsRelativ ON_CALL(terrainListener, ProcessHeightsFromRegion).WillByDefault( [this, mockHeight](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, - AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) + [[maybe_unused]] AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) { - ProcessRegionLoop(inRegion, stepSize, perPositionCallback, sampleFilter, nullptr, mockHeight); + ProcessRegionLoop(inRegion, stepSize, perPositionCallback, nullptr, mockHeight); } ); @@ -476,9 +475,9 @@ TEST_F(TerrainPhysicsColliderComponentTest, TerrainPhysicsColliderGetHeightsAndM ON_CALL(terrainListener, ProcessSurfacePointsFromRegion).WillByDefault( [this, mockHeight, &surfaceTags](const AZ::Aabb& inRegion, const AZ::Vector2& stepSize, AzFramework::Terrain::SurfacePointRegionFillCallback perPositionCallback, - AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) + [[maybe_unused]] AzFramework::Terrain::TerrainDataRequests::Sampler sampleFilter) { - ProcessRegionLoop(inRegion, stepSize, perPositionCallback, sampleFilter, &surfaceTags, mockHeight); + ProcessRegionLoop(inRegion, stepSize, perPositionCallback, &surfaceTags, mockHeight); } ); diff --git a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp index ab0847e634..ddccdbc49c 100644 --- a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp +++ b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp @@ -969,7 +969,7 @@ namespace UnitTest AzFramework::SurfaceData::SurfaceTagWeightList expectedTags; SetupSurfaceWeightMocks(entity.get(), expectedTags); - auto perPositionCallback = [&expectedTags](size_t xIndex, size_t yIndex, + auto perPositionCallback = [&expectedTags]([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { constexpr float epsilon = 0.0001f; @@ -1015,7 +1015,7 @@ namespace UnitTest AzFramework::SurfaceData::SurfaceTagWeightList expectedTags; SetupSurfaceWeightMocks(entity.get(), expectedTags); - auto perPositionCallback = [&expectedTags](size_t xIndex, size_t yIndex, + auto perPositionCallback = [&expectedTags]([[maybe_unused]] size_t xIndex, [[maybe_unused]] size_t yIndex, const AzFramework::SurfaceData::SurfacePoint& surfacePoint, [[maybe_unused]] bool terrainExists) { constexpr float epsilon = 0.0001f; From c31e3c020898816b1a2eee355af202e7c952c56c Mon Sep 17 00:00:00 2001 From: Sergey Pereslavtsev Date: Thu, 20 Jan 2022 19:36:33 +0000 Subject: [PATCH 23/58] LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX Signed-off-by: Sergey Pereslavtsev --- .../EditorHeightfieldColliderComponent.cpp | 3 + .../Source/HeightfieldColliderComponent.cpp | 4 + Gems/PhysX/Code/Source/Utils.cpp | 132 ++++++----- Gems/PhysX/Code/Source/Utils.h | 7 + ...ditorHeightfieldColliderComponentTests.cpp | 208 ++++++++++++++++-- Gems/PhysX/Code/Tests/EditorTestUtilities.cpp | 18 ++ Gems/PhysX/Code/Tests/EditorTestUtilities.h | 3 + 7 files changed, 302 insertions(+), 73 deletions(-) diff --git a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp index fb0a38fa18..c6def5f0ab 100644 --- a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp +++ b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp @@ -189,6 +189,9 @@ namespace PhysX configuration.m_entityId = GetEntityId(); configuration.m_debugName = GetEntity()->GetName(); + // Update material selection from the mapping + Utils::SetMaterialsFromHeightfieldProvider(GetEntityId(), m_colliderConfig.m_materialSelection); + AzPhysics::ShapeColliderPairList colliderShapePairs; colliderShapePairs.emplace_back(AZStd::make_shared(m_colliderConfig), m_shapeConfig); configuration.m_colliderAndShapeData = colliderShapePairs; diff --git a/Gems/PhysX/Code/Source/HeightfieldColliderComponent.cpp b/Gems/PhysX/Code/Source/HeightfieldColliderComponent.cpp index c1fa09f21f..b219253b6f 100644 --- a/Gems/PhysX/Code/Source/HeightfieldColliderComponent.cpp +++ b/Gems/PhysX/Code/Source/HeightfieldColliderComponent.cpp @@ -140,6 +140,10 @@ namespace PhysX Physics::HeightfieldShapeConfiguration& configuration = static_cast(*m_shapeConfig.second); configuration = Utils::CreateHeightfieldShapeConfiguration(GetEntityId()); + + // Update material selection from the mapping + Physics::ColliderConfiguration* colliderConfig = m_shapeConfig.first.get(); + Utils::SetMaterialsFromHeightfieldProvider(GetEntityId(), colliderConfig->m_materialSelection); } void HeightfieldColliderComponent::RefreshHeightfield() diff --git a/Gems/PhysX/Code/Source/Utils.cpp b/Gems/PhysX/Code/Source/Utils.cpp index fecea57d9c..a988f6791c 100644 --- a/Gems/PhysX/Code/Source/Utils.cpp +++ b/Gems/PhysX/Code/Source/Utils.cpp @@ -66,6 +66,67 @@ namespace PhysX } } + AZStd::pair GetPhysXMaterialIndicesFromHeightfieldSamples( + const AZStd::vector& samples, + const int32_t row, const int32_t col, + const int32_t numRows, const int32_t numCols) + { + + uint8_t materialIndex0 = 0; + uint8_t materialIndex1 = 0; + + const bool lastRowIndex = (row == (numRows - 1)); + const bool lastColumnIndex = (col == (numCols - 1)); + + // In PhysX, the material indices refer to the quad down and to the right of the sample. + // If we're in the last row or last column, there aren't any quads down or to the right, + // so just clear these out. + + if (!lastRowIndex && !lastColumnIndex) + { + auto GetIndex = [numCols](int32_t row, int32_t col) + { + return (row * numCols) + col; + }; + + // Our source data is providing one material index per vertex, but PhysX wants one material index + // per triangle. The heuristic that we'll go with for selecting the material index is to choose + // the material for the vertex that's not on the diagonal of each triangle. + // Ex: A *---* B + // | / | For this, we'll use A for index0 and D for index1. + // C *---* D + // + // Ex: A *---* B + // | \ | For this, we'll use C for index0 and B for index1. + // C *---* D + // + // This is a pretty arbitrary choice, so the heuristic might need to be revisited over time if this + // causes incorrect or unpredictable physics material mappings. + + const Physics::HeightMaterialPoint& currentSample = samples[GetIndex(row, col)]; + + switch (currentSample.m_quadMeshType) + { + case Physics::QuadMeshType::SubdivideUpperLeftToBottomRight: + materialIndex0 = samples[GetIndex(row + 1, col)].m_materialIndex; + materialIndex1 = samples[GetIndex(row, col + 1)].m_materialIndex; + break; + case Physics::QuadMeshType::SubdivideBottomLeftToUpperRight: + materialIndex0 = currentSample.m_materialIndex; + materialIndex1 = samples[GetIndex(row + 1, col + 1)].m_materialIndex; + break; + case Physics::QuadMeshType::Hole: + materialIndex0 = physx::PxHeightFieldMaterial::eHOLE; + materialIndex1 = physx::PxHeightFieldMaterial::eHOLE; + break; + default: + AZ_Assert(false, "Unhandled case in GetPhysXMaterialIndicesFromHeightfieldSamples"); + break; + } + } + return { materialIndex0, materialIndex1 }; + } + void CreatePxGeometryFromHeightfield( Physics::HeightfieldShapeConfiguration& heightfieldConfig, physx::PxGeometryHolder& pxGeometry) { @@ -116,12 +177,8 @@ namespace PhysX for (int32_t row = 0; row < numRows; row++) { - const bool lastRowIndex = (row == (numRows - 1)); - for (int32_t col = 0; col < numCols; col++) { - const bool lastColumnIndex = (col == (numCols - 1)); - auto GetIndex = [numCols](int32_t row, int32_t col) { return (row * numCols) + col; @@ -134,52 +191,15 @@ namespace PhysX AZ_Assert(currentSample.m_materialIndex < physxMaximumMaterialIndex, "MaterialIndex must be less than 128"); currentPhysxSample.height = azlossy_cast( AZ::GetClamp(currentSample.m_height, minHeightBounds, maxHeightBounds) * scaleFactor); - if (lastRowIndex || lastColumnIndex) - { - // In PhysX, the material indices refer to the quad down and to the right of the sample. - // If we're in the last row or last column, there aren't any quads down or to the right, - // so just clear these out. - currentPhysxSample.materialIndex0 = 0; - currentPhysxSample.materialIndex1 = 0; - } - else - { - // Our source data is providing one material index per vertex, but PhysX wants one material index - // per triangle. The heuristic that we'll go with for selecting the material index is to choose - // the material for the vertex that's not on the diagonal of each triangle. - // Ex: A *---* B - // | / | For this, we'll use A for index0 and D for index1. - // C *---* D - // - // Ex: A *---* B - // | \ | For this, we'll use C for index0 and B for index1. - // C *---* D - // - // This is a pretty arbitrary choice, so the heuristic might need to be revisited over time if this - // causes incorrect or unpredictable physics material mappings. - switch (currentSample.m_quadMeshType) - { - case Physics::QuadMeshType::SubdivideUpperLeftToBottomRight: - currentPhysxSample.materialIndex0 = samples[GetIndex(row + 1, col)].m_materialIndex; - currentPhysxSample.materialIndex1 = samples[GetIndex(row, col + 1)].m_materialIndex; - // Set the tesselation flag to say that we need to go from UL to BR - currentPhysxSample.materialIndex0.setBit(); - break; - case Physics::QuadMeshType::SubdivideBottomLeftToUpperRight: - currentPhysxSample.materialIndex0 = currentSample.m_materialIndex; - currentPhysxSample.materialIndex1 = samples[GetIndex(row + 1, col + 1)].m_materialIndex; - break; - case Physics::QuadMeshType::Hole: - currentPhysxSample.materialIndex0 = physx::PxHeightFieldMaterial::eHOLE; - currentPhysxSample.materialIndex1 = physx::PxHeightFieldMaterial::eHOLE; - break; - default: - AZ_Warning("PhysX Heightfield", false, "Unhandled case in CreatePxGeometryFromConfig"); - currentPhysxSample.materialIndex0 = 0; - currentPhysxSample.materialIndex1 = 0; - break; - } + auto [materialIndex0, materialIndex1] = GetPhysXMaterialIndicesFromHeightfieldSamples(samples, row, col, numRows, numCols); + currentPhysxSample.materialIndex0 = materialIndex0; + currentPhysxSample.materialIndex1 = materialIndex1; + + if (currentSample.m_quadMeshType == Physics::QuadMeshType::SubdivideUpperLeftToBottomRight) + { + // Set the tesselation flag to say that we need to go from UL to BR + currentPhysxSample.setTessFlag(); } } } @@ -1562,6 +1582,20 @@ namespace PhysX return configuration; } + + void SetMaterialsFromHeightfieldProvider(const AZ::EntityId& heightfieldProviderId, Physics::MaterialSelection& materialSelection) + { + AZStd::vector materialList; + Physics::HeightfieldProviderRequestsBus::EventResult( + materialList, heightfieldProviderId, &Physics::HeightfieldProviderRequestsBus::Events::GetMaterialList); + + materialSelection.SetMaterialSlots(Physics::MaterialSelection::SlotsArray(materialList.size(), "")); + + for (int i = 0; i < materialList.size(); ++i) + { + materialSelection.SetMaterialId(materialList[i], i); + } + } } // namespace Utils namespace ReflectionUtils diff --git a/Gems/PhysX/Code/Source/Utils.h b/Gems/PhysX/Code/Source/Utils.h index 525db03315..5244926aa2 100644 --- a/Gems/PhysX/Code/Source/Utils.h +++ b/Gems/PhysX/Code/Source/Utils.h @@ -188,8 +188,15 @@ namespace PhysX //! Returns defaultValue if the input is infinite or NaN, otherwise returns the input unchanged. const AZ::Vector3& Sanitize(const AZ::Vector3& input, const AZ::Vector3& defaultValue = AZ::Vector3::CreateZero()); + AZStd::pair GetPhysXMaterialIndicesFromHeightfieldSamples( + const AZStd::vector& samples, + const int32_t row, const int32_t col, + const int32_t numRows, const int32_t numCols); + Physics::HeightfieldShapeConfiguration CreateHeightfieldShapeConfiguration(AZ::EntityId entityId); + void SetMaterialsFromHeightfieldProvider(const AZ::EntityId& heightfieldProviderId, Physics::MaterialSelection& materialSelection); + namespace Geometry { using PointList = AZStd::vector; diff --git a/Gems/PhysX/Code/Tests/EditorHeightfieldColliderComponentTests.cpp b/Gems/PhysX/Code/Tests/EditorHeightfieldColliderComponentTests.cpp index ef112d8623..9bdc63e60d 100644 --- a/Gems/PhysX/Code/Tests/EditorHeightfieldColliderComponentTests.cpp +++ b/Gems/PhysX/Code/Tests/EditorHeightfieldColliderComponentTests.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using ::testing::NiceMock; using ::testing::Return; @@ -27,18 +28,28 @@ namespace PhysXEditorTests { AZStd::vector GetSamples() { - AZStd::vector samples{ { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 2.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 1.5f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 1.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 1.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 0.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight }, - { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight } }; + AZStd::vector samples{ { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 0 }, + { 2.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 1 }, + { 1.5f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 2 }, + { 1.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 0 }, + { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 1 }, + { 1.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 2 }, + { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 0 }, + { 0.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 1 }, + { 3.0f, Physics::QuadMeshType::SubdivideUpperLeftToBottomRight, 2 } }; return samples; } + AZStd::vector GetMaterialList() + { + AZStd::vector materials{ + {Physics::MaterialId::FromUUID("{EC976D51-2C26-4C1E-BBF2-75BAAAFA162C}")}, + {Physics::MaterialId::FromUUID("{B9836F51-A235-4781-95E3-A6302BEE9EFF}")}, + {Physics::MaterialId::FromUUID("{7E060707-BB03-47EB-B046-4503C7145B6E}")} + }; + return materials; + } + EntityPtr SetupHeightfieldComponent() { // create an editor entity with a shape collider component and a box shape component @@ -78,6 +89,7 @@ namespace PhysXEditorTests x = -3.0f; y = 3.0f; }); + ON_CALL(mockShapeRequests, GetMaterialList).WillByDefault(Return(GetMaterialList())); } EntityPtr TestCreateActiveGameEntityFromEditorEntity(AZ::Entity* editorEntity) @@ -89,6 +101,89 @@ namespace PhysXEditorTests return gameEntity; } + class PhysXEditorHeightfieldFixture : public PhysXEditorFixture + { + public: + void SetUp() override + { + PhysXEditorFixture::SetUp(); + PopulateDefaultMaterialLibrary(); + + m_editorEntity = SetupHeightfieldComponent(); + m_editorMockShapeRequests = AZStd::make_unique>(m_editorEntity->GetId()); + SetupMockMethods(*m_editorMockShapeRequests.get()); + m_editorEntity->Activate(); + + m_gameEntity = TestCreateActiveGameEntityFromEditorEntity(m_editorEntity.get()); + m_gameMockShapeRequests = AZStd::make_unique>(m_gameEntity->GetId()); + SetupMockMethods(*m_gameMockShapeRequests.get()); + m_gameEntity->Activate(); + } + + void TearDown() override + { + CleanupHeightfieldComponent(); + + m_editorEntity = nullptr; + m_gameEntity = nullptr; + m_editorMockShapeRequests = nullptr; + m_gameMockShapeRequests = nullptr; + + PhysXEditorFixture::TearDown(); + } + + void PopulateDefaultMaterialLibrary() + { + AZ::Data::AssetId assetId = AZ::Data::AssetId(AZ::Uuid::Create()); + + // Create an asset out of our Script Event + Physics::MaterialLibraryAsset* matLibAsset = aznew Physics::MaterialLibraryAsset; + { + AZStd::vector matIds = GetMaterialList(); + + for (Physics::MaterialId matId : matIds) + { + Physics::MaterialFromAssetConfiguration matConfig; + matConfig.m_id = matId; + matConfig.m_configuration.m_surfaceType = matId.GetUuid().ToString(); + matLibAsset->AddMaterialData(matConfig); + } + } + + // Note: There is no interface to simply update material library asset. It has to go via updating the entire configuration which causes assets reloading. + // It makes sense as a safety mechanism in the Editor but makes it harder to write tests. + // Hence have to work around it via const_cast here to be able to simply set the generated asset into configuration. + AzPhysics::SystemConfiguration* sysConfig = const_cast(AZ::Interface::Get()->GetConfiguration()); + + AZ::Data::Asset assetData(assetId, matLibAsset, AZ::Data::AssetLoadBehavior::Default); + sysConfig->m_materialLibraryAsset = assetData; + } + + Physics::Material* GetMaterialFromRaycast(float x, float y) + { + AzPhysics::RayCastRequest request; + request.m_start = AZ::Vector3(x, y, 5.0f); + request.m_direction = AZ::Vector3(0.0f, 0.0f, -1.0f); + request.m_distance = 10.0f; + + //query the scene + auto* sceneInterface = AZ::Interface::Get(); + AzPhysics::SceneQueryHits result = sceneInterface->QueryScene(m_defaultSceneHandle, &request); + EXPECT_EQ(result.m_hits.size(), 1); + + if (result) + { + return result.m_hits[0].m_material; + } + + return nullptr; + }; + + EntityPtr m_editorEntity; + EntityPtr m_gameEntity; + AZStd::unique_ptr> m_editorMockShapeRequests; + AZStd::unique_ptr> m_gameMockShapeRequests; + }; TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentDependenciesSatisfiedEntityIsValid) { @@ -149,21 +244,13 @@ namespace PhysXEditorTests CleanupHeightfieldComponent(); } - TEST_F(PhysXEditorFixture, EditorHeightfieldColliderComponentHeightfieldColliderWithAABoxCorrectRuntimeGeometry) + TEST_F(PhysXEditorHeightfieldFixture, EditorHeightfieldColliderComponentHeightfieldColliderWithAABoxCorrectRuntimeGeometry) { - EntityPtr editorEntity = SetupHeightfieldComponent(); - NiceMock mockShapeRequests(editorEntity->GetId()); - SetupMockMethods(mockShapeRequests); - editorEntity->Activate(); - - EntityPtr gameEntity = TestCreateActiveGameEntityFromEditorEntity(editorEntity.get()); - NiceMock mockShapeRequests2(gameEntity->GetId()); - SetupMockMethods(mockShapeRequests2); - gameEntity->Activate(); + AZ::EntityId gameEntityId = m_gameEntity->GetId(); AzPhysics::SimulatedBody* staticBody = nullptr; AzPhysics::SimulatedBodyComponentRequestsBus::EventResult( - staticBody, gameEntity->GetId(), &AzPhysics::SimulatedBodyComponentRequests::GetSimulatedBody); + staticBody, gameEntityId, &AzPhysics::SimulatedBodyComponentRequests::GetSimulatedBody); const auto* pxRigidStatic = static_cast(staticBody->GetNativePointer()); PHYSX_SCENE_READ_LOCK(pxRigidStatic->getScene()); @@ -183,7 +270,7 @@ namespace PhysXEditorTests int32_t numRows{ 0 }; int32_t numColumns{ 0 }; Physics::HeightfieldProviderRequestsBus::Event( - gameEntity->GetId(), &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridSize, numColumns, numRows); + gameEntityId, &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridSize, numColumns, numRows); EXPECT_EQ(numColumns, heightfield->getNbColumns()); EXPECT_EQ(numRows, heightfield->getNbRows()); @@ -194,12 +281,12 @@ namespace PhysXEditorTests float minHeightBounds{ 0.0f }; float maxHeightBounds{ 0.0f }; Physics::HeightfieldProviderRequestsBus::Event( - gameEntity->GetId(), &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldHeightBounds, minHeightBounds, + gameEntityId, &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldHeightBounds, minHeightBounds, maxHeightBounds); AZStd::vector samples; Physics::HeightfieldProviderRequestsBus::EventResult( - samples, gameEntity->GetId(), &Physics::HeightfieldProviderRequestsBus::Events::GetHeightsAndMaterials); + samples, gameEntityId, &Physics::HeightfieldProviderRequestsBus::Events::GetHeightsAndMaterials); const float halfBounds{ (maxHeightBounds - minHeightBounds) / 2.0f }; const float scaleFactor = (maxHeightBounds <= minHeightBounds) ? 1.0f : AZStd::numeric_limits::max() / halfBounds; @@ -208,7 +295,80 @@ namespace PhysXEditorTests EXPECT_EQ(samplePhysX.height, azlossy_cast(samplePhysics.m_height * scaleFactor)); } } - CleanupHeightfieldComponent(); + } + + TEST_F(PhysXEditorHeightfieldFixture, EditorHeightfieldColliderComponentHeightfieldColliderCorrectMaterials) + { + AZ::EntityId gameEntityId = m_gameEntity->GetId(); + + int32_t numRows{ 0 }; + int32_t numColumns{ 0 }; + Physics::HeightfieldProviderRequestsBus::Event( + gameEntityId, &Physics::HeightfieldProviderRequestsBus::Events::GetHeightfieldGridSize, numColumns, numRows); + + EXPECT_EQ(numRows, 3); + EXPECT_EQ(numColumns, 3); + + AZStd::vector samples; + Physics::HeightfieldProviderRequestsBus::EventResult( + samples, gameEntityId, &Physics::HeightfieldProviderRequestsBus::Events::GetHeightsAndMaterials); + + AzPhysics::SimulatedBody* staticBody = nullptr; + AzPhysics::SimulatedBodyComponentRequestsBus::EventResult( + staticBody, gameEntityId, &AzPhysics::SimulatedBodyComponentRequests::GetSimulatedBody); + + const auto* pxRigidStatic = static_cast(staticBody->GetNativePointer()); + PHYSX_SCENE_READ_LOCK(pxRigidStatic->getScene()); + + physx::PxShape* shape = nullptr; + pxRigidStatic->getShapes(&shape, 1, 0); + + physx::PxHeightFieldGeometry heightfieldGeometry; + shape->getHeightFieldGeometry(heightfieldGeometry); + + physx::PxHeightField* heightfield = heightfieldGeometry.heightField; + + AZStd::vector physicsSurfaceTypes; + for (Physics::MaterialId materialId : GetMaterialList()) + { + physicsSurfaceTypes.emplace_back(materialId.GetUuid().ToString()); + } + + // PhysX Heightfield cooking doesn't map 1-1 sample material indices to triangle material indices + // Hence hardcoding the expected material indices in the test + const int physicsMaterialsValidationDataIndex[] = {0, 2, 1, 1}; + + for (int sampleRow = 0; sampleRow < numRows; ++sampleRow) + { + for (int sampleColumn = 0; sampleColumn < numColumns; ++sampleColumn) + { + physx::PxHeightFieldSample samplePhysX = heightfield->getSample(sampleRow, sampleColumn); + Physics::HeightMaterialPoint samplePhysics = samples[sampleRow * numColumns + sampleColumn]; + + auto [materialIndex0, materialIndex1] = PhysX::Utils::GetPhysXMaterialIndicesFromHeightfieldSamples(samples, sampleRow, sampleColumn, numRows, numColumns); + EXPECT_EQ(samplePhysX.materialIndex0, materialIndex0); + EXPECT_EQ(samplePhysX.materialIndex1, materialIndex1); + + if (sampleRow != numRows - 1 && sampleColumn != numColumns - 1) + { + const float x_offset = -0.25f; + const float y_offset = 0.75f; + const float secondRayOffset = 0.5f; + + float rayX = x_offset + sampleColumn; + float rayY = y_offset + sampleRow; + + Physics::Material* mat1 = GetMaterialFromRaycast(rayX, rayY); + EXPECT_NE(mat1, nullptr); + + Physics::Material* mat2 = GetMaterialFromRaycast(rayX + secondRayOffset, rayY + secondRayOffset); + EXPECT_NE(mat2, nullptr); + + AZStd::string expectedMaterialName = physicsSurfaceTypes[physicsMaterialsValidationDataIndex[sampleRow * 2 + sampleColumn]]; + EXPECT_EQ(mat1->GetSurfaceTypeName(), expectedMaterialName); + } + } + } } } // namespace PhysXEditorTests diff --git a/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp b/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp index fa794c58a5..272d9157b2 100644 --- a/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp +++ b/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp @@ -70,6 +70,24 @@ namespace PhysXEditorTests } } + void PhysXEditorFixture::ConnectToPVD() + { + auto* debug = AZ::Interface::Get(); + if (debug) + { + debug->ConnectToPvd(); + } + } + + void PhysXEditorFixture::DisconnectFromPVD() + { + auto* debug = AZ::Interface::Get(); + if (debug) + { + debug->DisconnectFromPvd(); + } + } + // DefaultWorldBus AzPhysics::SceneHandle PhysXEditorFixture::GetDefaultSceneHandle() const { diff --git a/Gems/PhysX/Code/Tests/EditorTestUtilities.h b/Gems/PhysX/Code/Tests/EditorTestUtilities.h index 9dfe40f366..26566f724a 100644 --- a/Gems/PhysX/Code/Tests/EditorTestUtilities.h +++ b/Gems/PhysX/Code/Tests/EditorTestUtilities.h @@ -48,6 +48,9 @@ namespace PhysXEditorTests void SetUp() override; void TearDown() override; + void ConnectToPVD(); + void DisconnectFromPVD(); + // DefaultWorldBus AzPhysics::SceneHandle GetDefaultSceneHandle() const override; From f4befb22426d84eba7172ebf17ac2cf97e8dd8be Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Thu, 20 Jan 2022 11:39:28 -0800 Subject: [PATCH 24/58] Removed some dead code. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI.Edit/Material/MaterialPropertyValueSerializer.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp index 10b45ca8df..9980d8f2ff 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSerializer.cpp @@ -54,12 +54,6 @@ namespace AZ MaterialSourceData::Property* property = reinterpret_cast(outputValue); AZ_Assert(property, "Output value for JsonMaterialPropertyValueSerializer can't be null."); - // Construct the full property name (groupName.propertyName) by parsing it from the JSON path string. - size_t startPropertyName = context.GetPath().Get().rfind('/'); - size_t startGroupName = context.GetPath().Get().rfind('/', startPropertyName-1); - AZStd::string_view groupName = context.GetPath().Get().substr(startGroupName + 1, startPropertyName - startGroupName - 1); - AZStd::string_view propertyName = context.GetPath().Get().substr(startPropertyName + 1); - JSR::ResultCode result(JSR::Tasks::ReadField); if (inputValue.IsBool()) From 61dc7623d21108c3798c3fe3a6dd52fec851f955 Mon Sep 17 00:00:00 2001 From: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com> Date: Thu, 20 Jan 2022 12:41:25 -0700 Subject: [PATCH 25/58] Minor change to a comment Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com> --- .../DiffuseProbeGridComponentController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp index b7dbbdbcf5..8c8b29a053 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp @@ -34,7 +34,7 @@ namespace AZ if (auto* serializeContext = azrtti_cast(context)) { serializeContext->Class() - ->Version(2) // ATOM-17127 + ->Version(2) // Added NumRaysPerProbe setting ->Field("ProbeSpacing", &DiffuseProbeGridComponentConfig::m_probeSpacing) ->Field("Extents", &DiffuseProbeGridComponentConfig::m_extents) ->Field("AmbientMultiplier", &DiffuseProbeGridComponentConfig::m_ambientMultiplier) From 59e43813f0b091f4456a0a90892bf08f7e7b5141 Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Thu, 20 Jan 2022 13:00:02 -0800 Subject: [PATCH 26/58] GCC Support for Linux Updates and fixes to support GCC for Linux Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- Code/Editor/Include/SandboxAPI.h | 2 +- .../Platform/Common/GCC/editor_lib_gcc.cmake | 9 ++ Code/Editor/TopRendererWnd.h | 2 - Code/Framework/AzCore/AzCore/EBus/EBus.h | 9 +- .../AzCore/EBus/Internal/BusContainer.h | 10 +- .../AzCore/EBus/Internal/CallstackEntry.h | 2 +- Code/Framework/AzCore/AzCore/IO/Path/Path.inl | 94 ++++++------ .../AzCore/AzCore/Math/MathIntrinsics.h | 4 +- .../AzCore/AzCore/Memory/AllocatorManager.h | 4 +- .../AzCore/AzCore/Name/NameDictionary.h | 4 +- Code/Framework/AzCore/AzCore/PlatformDef.h | 92 +++++++++++- .../AzCore/AzCore/RTTI/BehaviorContext.h | 7 +- Code/Framework/AzCore/AzCore/RTTI/RTTI.h | 29 ++-- Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h | 36 +++-- .../AzCore/AzCore/Script/ScriptContext.h | 2 +- .../Serialization/Json/RegistrationContext.h | 6 + .../AzCore/AzCore/UnitTest/TestTypes.h | 11 +- .../AzCore/AzCore/azcore_files.cmake | 1 + Code/Framework/AzCore/AzCore/base.h | 61 +------- .../AzCore/std/containers/compressed_pair.h | 1 + .../AzCore/std/containers/fixed_vector.h | 2 +- .../AzCore/AzCore/std/containers/map.h | 2 +- .../AzCore/std/containers/node_handle.h | 7 +- .../AzCore/AzCore/std/containers/set.h | 2 +- .../AzCore/std/containers/unordered_map.h | 2 +- .../AzCore/std/containers/unordered_set.h | 2 +- .../AzCore/std/function/function_base.h | 4 +- .../AzCore/std/function/function_template.h | 2 +- .../AzCore/AzCore/std/function/invoke.h | 1 + .../AzCore/AzCore/std/string/fixed_string.inl | 20 ++- .../AzCore/AzCore/std/string/string.h | 8 +- .../AzCore/AzCore/std/string/string_view.h | 110 +++++++++++--- .../AzCore/std/typetraits/conjunction.h | 1 + .../AzCore/AzCore/std/typetraits/intrinsics.h | 7 +- Code/Framework/AzCore/AzCore/variadic.h | 64 +++++++++ .../OverrunDetectionAllocator_Unimplemented.h | 2 +- .../Platform/Linux/platform_linux.cmake | 3 +- Code/Framework/AzCore/Tests/AZStd/String.cpp | 54 +++---- Code/Framework/AzCore/Tests/EBus.cpp | 30 ++-- Code/Framework/AzCore/Tests/Serialization.cpp | 17 ++- .../TcpTransport/TcpConnection.cpp | 2 +- .../TcpTransport/TcpConnectionSet.cpp | 2 +- .../UdpTransport/UdpNetworkInterface.cpp | 2 +- .../Platform/Linux/AzTest_Traits_Linux.h | 2 - .../AssetBrowser/Entries/AssetBrowserEntry.h | 1 - .../Entity/EditorEntityHelpers.h | 2 +- .../AzToolsFramework/Slice/SliceUtilities.cpp | 2 +- .../AzToolsFramework/Thumbnails/Thumbnail.h | 2 +- .../Common/GCC/aztoolsframework_gcc.cmake} | 1 - Code/Framework/GridMate/CMakeLists.txt | 1 - .../GridMate/GridMate/Carrier/Carrier.cpp | 4 +- .../GridMate/Carrier/SecureSocketDriver.cpp | 2 + .../Carrier/StreamSecureSocketDriver.cpp | 5 + Code/Legacy/CrySystem/IDebugCallStack.cpp | 2 +- .../Common/GCC/projectmanager_gcc.cmake | 12 ++ .../GCC/pythonbindingsexample_gcc.cmake | 12 ++ .../Code/Include/Framework/AWSApiRequestJob.h | 93 ++++++------ .../Include/Framework/ServiceRequestJob.h | 135 +++++++++--------- ...mageprocessingatom_editor_static_gcc.cmake | 12 ++ .../GCC/atom_asset_shader_static_gcc.cmake | 12 ++ .../Feature/ParamMacros/MapParamCommon.inl | 1 + .../Common/atom_feature_common_gcc.cmake | 12 ++ .../Common/GCC/atom_feature_common_gcc.cmake | 13 ++ .../Include/Atom/RPI.Public/GpuQuery/Query.h | 4 +- .../Include/Atom/RPI.Public/Pass/ParentPass.h | 8 +- .../Common/GCC/atom_rpi_public_gcc.cmake | 12 +- .../GCC/editorpythonbindings_static_gcc.cmake | 12 ++ .../GCC/editorpythonbindings_tests_gcc.cmake | 12 ++ .../Code/Tests/ExpressionEngineTestFixture.h | 2 +- .../Code/Tests/MathExpressionTests.cpp | 44 +++--- .../GradientSignal/Code/Source/ImageAsset.cpp | 1 + .../Code/Source/Animation/AnimSplineTrack.h | 2 +- .../Code/Source/Cinematics/AnimSplineTrack.h | 2 +- .../Platform/Common/GCC/metastream_gcc.cmake | 10 ++ Gems/PhysX/Code/CMakeLists.txt | 2 + .../Clang/physx_editor_static_clang.cmake | 7 + .../Common/GCC/physx_editor_static_gcc.cmake | 12 ++ .../MSVC/physx_editor_static_msvc.cmake | 7 + .../GCC/pythonassetbuilder_static_gcc.cmake | 12 ++ .../GCC/pythonassetbuilder_tests_gcc.cmake | 12 ++ .../Platform/Common/GCC/qtforpython_gcc.cmake | 12 ++ .../Code/Editor/Components/EditorGraph.cpp | 2 +- .../Code/Editor/Components/GraphUpgrade.cpp | 2 +- .../Libraries/Core/ScriptEventBase.h | 2 +- ...scriptcanvastesting_editor_tests_gcc.cmake | 7 + .../Include/ScriptEvents/ScriptEventsAsset.h | 9 +- .../ScriptEventsSystemEditorComponent.cpp | 2 +- Gems/WhiteBox/Code/CMakeLists.txt | 1 + .../Common/Clang/whitebox_editor_clang.cmake | 7 + .../Common/GCC/whitebox_editor_gcc.cmake | 12 ++ .../Common/MSVC/whitebox_editor_msvc.cmake | 7 + .../Linux/BuiltInPackages_linux.cmake | 4 +- cmake/Configurations.cmake | 17 ++- .../Common/GCC/Configurations_gcc.cmake | 87 +++++++++++ .../Platform/Linux/Configurations_linux.cmake | 27 ++++ cmake/Platform/Linux/PAL_linux.cmake | 3 + .../build/Platform/Linux/build_config.json | 32 +++++ scripts/build/Platform/Linux/build_linux.sh | 27 +++- 98 files changed, 1050 insertions(+), 429 deletions(-) create mode 100644 Code/Editor/Platform/Common/GCC/editor_lib_gcc.cmake create mode 100644 Code/Framework/AzCore/AzCore/variadic.h rename Code/Framework/{GridMate/Platform/Common/gridmate_msvc.cmake => AzToolsFramework/Platform/Common/GCC/aztoolsframework_gcc.cmake} (99%) create mode 100644 Code/Tools/ProjectManager/Platform/Common/GCC/projectmanager_gcc.cmake create mode 100644 Code/Tools/PythonBindingsExample/source/Platform/Common/GCC/pythonbindingsexample_gcc.cmake create mode 100644 Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Common/GCC/imageprocessingatom_editor_static_gcc.cmake create mode 100644 Gems/Atom/Asset/Shader/Code/Source/Platform/Common/GCC/atom_asset_shader_static_gcc.cmake create mode 100644 Gems/Atom/Feature/Common/Code/Platform/Common/atom_feature_common_gcc.cmake create mode 100644 Gems/Atom/Feature/Common/Code/Source/Platform/Common/GCC/atom_feature_common_gcc.cmake rename Code/Framework/GridMate/Platform/Common/gridmate_clang.cmake => Gems/Atom/RPI/Code/Source/Platform/Common/GCC/atom_rpi_public_gcc.cmake (52%) create mode 100644 Gems/EditorPythonBindings/Code/Source/Platform/Common/GCC/editorpythonbindings_static_gcc.cmake create mode 100644 Gems/EditorPythonBindings/Code/Source/Platform/Common/GCC/editorpythonbindings_tests_gcc.cmake create mode 100644 Gems/Metastream/Code/Source/Platform/Common/GCC/metastream_gcc.cmake create mode 100644 Gems/PhysX/Code/Source/Platform/Common/Clang/physx_editor_static_clang.cmake create mode 100644 Gems/PhysX/Code/Source/Platform/Common/GCC/physx_editor_static_gcc.cmake create mode 100644 Gems/PhysX/Code/Source/Platform/Common/MSVC/physx_editor_static_msvc.cmake create mode 100644 Gems/PythonAssetBuilder/Code/Source/Platform/Common/GCC/pythonassetbuilder_static_gcc.cmake create mode 100644 Gems/PythonAssetBuilder/Code/Source/Platform/Common/GCC/pythonassetbuilder_tests_gcc.cmake create mode 100644 Gems/QtForPython/Code/Source/Platform/Common/GCC/qtforpython_gcc.cmake create mode 100644 Gems/ScriptCanvasTesting/Code/Platform/Common/GCC/scriptcanvastesting_editor_tests_gcc.cmake create mode 100644 Gems/WhiteBox/Code/Source/Platform/Common/Clang/whitebox_editor_clang.cmake create mode 100644 Gems/WhiteBox/Code/Source/Platform/Common/GCC/whitebox_editor_gcc.cmake create mode 100644 Gems/WhiteBox/Code/Source/Platform/Common/MSVC/whitebox_editor_msvc.cmake create mode 100644 cmake/Platform/Common/GCC/Configurations_gcc.cmake diff --git a/Code/Editor/Include/SandboxAPI.h b/Code/Editor/Include/SandboxAPI.h index 4e0cafea4a..757b799837 100644 --- a/Code/Editor/Include/SandboxAPI.h +++ b/Code/Editor/Include/SandboxAPI.h @@ -21,7 +21,7 @@ #endif #if defined(SANDBOX_IMPORTS) && defined(SANDBOX_EXPORTS) -#error SANDBOX_EXPORTS and SANDBOX_IMPORTS can't be defined at the same time +#error SANDBOX_EXPORTS and SANDBOX_IMPORTS cannot be defined at the same time #endif #if defined(SANDBOX_EXPORTS) diff --git a/Code/Editor/Platform/Common/GCC/editor_lib_gcc.cmake b/Code/Editor/Platform/Common/GCC/editor_lib_gcc.cmake new file mode 100644 index 0000000000..bc945f55c9 --- /dev/null +++ b/Code/Editor/Platform/Common/GCC/editor_lib_gcc.cmake @@ -0,0 +1,9 @@ +# +# Copyright (c) Contributors to the Open 3D Engine Project. +# For complete copyright and license terms please see the LICENSE at the root of this distribution. +# +# SPDX-License-Identifier: Apache-2.0 OR MIT +# +# + +set(LY_COMPILE_OPTIONS PRIVATE -fexceptions) diff --git a/Code/Editor/TopRendererWnd.h b/Code/Editor/TopRendererWnd.h index c5bc7a31f2..7bdf2eaff2 100644 --- a/Code/Editor/TopRendererWnd.h +++ b/Code/Editor/TopRendererWnd.h @@ -81,8 +81,6 @@ public: bool m_bShowStatObjects; bool m_bShowWater; bool m_bAutoScaleGreyRange; - - friend class QTopRendererWnd; }; #endif // CRYINCLUDE_EDITOR_TOPRENDERERWND_H diff --git a/Code/Framework/AzCore/AzCore/EBus/EBus.h b/Code/Framework/AzCore/AzCore/EBus/EBus.h index 67cffb4e41..4ab4f9a76c 100644 --- a/Code/Framework/AzCore/AzCore/EBus/EBus.h +++ b/Code/Framework/AzCore/AzCore/EBus/EBus.h @@ -23,6 +23,11 @@ #include #include + // Included for backwards compatibility purposes +#include +#include +#include + #include #include @@ -515,7 +520,7 @@ namespace AZ * This is not EBus Context Mutex when LocklessDispatch is set */ template - using DispatchLockGuard = typename ImplTraits::template DispatchLockGuard; + using DispatchLockGuardTemplate = typename ImplTraits::template DispatchLockGuard; ////////////////////////////////////////////////////////////////////////// // Check to help identify common mistakes @@ -645,7 +650,7 @@ namespace AZ * during broadcast/event dispatch. * @see EBusTraits::LocklessDispatch */ - using DispatchLockGuard = DispatchLockGuard; + using DispatchLockGuard = DispatchLockGuardTemplate; /** * The scoped lock guard to use during connection. Some specialized policies execute handler methods which diff --git a/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h b/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h index 2c57359c67..ce79b93805 100644 --- a/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h +++ b/Code/Framework/AzCore/AzCore/EBus/Internal/BusContainer.h @@ -93,14 +93,14 @@ namespace AZ // This struct will hold the handlers per address struct HandlerHolder; // This struct will hold each handler - using HandlerNode = HandlerNode; + using HandlerNode = AZ::Internal::HandlerNode; // Defines how handler holders are stored (will be some sort of map-like structure from id -> handler holder) using AddressStorage = AddressStoragePolicy; // Defines how handlers are stored per address (will be some sort of list) using HandlerStorage = HandlerStoragePolicy; using Handler = IdHandler; - using MultiHandler = MultiHandler; + using MultiHandler = AZ::Internal::MultiHandler; using BusPtr = AZStd::intrusive_ptr; EBusContainer() = default; @@ -774,13 +774,13 @@ namespace AZ // This struct will hold the handler per address struct HandlerHolder; // This struct will hold each handler - using HandlerNode = HandlerNode; + using HandlerNode = AZ::Internal::HandlerNode; // Defines how handler holders are stored (will be some sort of map-like structure from id -> handler holder) using AddressStorage = AddressStoragePolicy; // No need for HandlerStorage, there's only 1 so it will always just be a HandlerNode* using Handler = IdHandler; - using MultiHandler = MultiHandler; + using MultiHandler = AZ::Internal::MultiHandler; using BusPtr = AZStd::intrusive_ptr; EBusContainer() = default; @@ -1316,7 +1316,7 @@ namespace AZ // This struct will hold the handlers per address struct HandlerHolder; // This struct will hold each handler - using HandlerNode = HandlerNode; + using HandlerNode = AZ::Internal::HandlerNode; // Defines how handlers are stored per address (will be some sort of list) using HandlerStorage = HandlerStoragePolicy; // No need for AddressStorage, there's only 1 diff --git a/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h b/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h index bcda78aef8..391a0ea18e 100644 --- a/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h +++ b/Code/Framework/AzCore/AzCore/EBus/Internal/CallstackEntry.h @@ -161,7 +161,7 @@ namespace AZ template struct EBusCallstackStorage { - AZ_THREAD_LOCAL static C* s_entry; + static AZ_THREAD_LOCAL C* s_entry; EBusCallstackStorage() = default; ~EBusCallstackStorage() = default; diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl index 0dc1799528..ab991e1750 100644 --- a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl +++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl @@ -13,50 +13,6 @@ #include -// extern instantiations of Path templates to prevent implicit instantiations -namespace AZ::IO -{ - // Class templates explicit declarations - extern template class BasicPath; - extern template class BasicPath; - extern template class PathIterator; - extern template class PathIterator; - extern template class PathIterator; - - // Swap function explicit declarations - extern template void swap(Path& lhs, Path& rhs) noexcept; - extern template void swap(FixedMaxPath& lhs, FixedMaxPath& rhs) noexcept; - - // Hash function explicit declarations - extern template size_t hash_value(const Path& pathToHash); - extern template size_t hash_value(const FixedMaxPath& pathToHash); - - // Append operator explicit declarations - extern template BasicPath operator/(const BasicPath& lhs, const PathView& rhs); - extern template BasicPath operator/(const BasicPath& lhs, const PathView& rhs); - extern template BasicPath operator/(const BasicPath& lhs, AZStd::string_view rhs); - extern template BasicPath operator/(const BasicPath& lhs, AZStd::string_view rhs); - extern template BasicPath operator/(const BasicPath& lhs, - const typename BasicPath::value_type* rhs); - extern template BasicPath operator/(const BasicPath& lhs, - const typename BasicPath::value_type* rhs); - - // Iterator compare explicit declarations - extern template bool operator==(const PathIterator& lhs, - const PathIterator& rhs); - extern template bool operator==(const PathIterator& lhs, - const PathIterator& rhs); - extern template bool operator==(const PathIterator& lhs, - const PathIterator& rhs); - extern template bool operator!=(const PathIterator& lhs, - const PathIterator& rhs); - extern template bool operator!=(const PathIterator& lhs, - const PathIterator& rhs); - extern template bool operator!=(const PathIterator& lhs, - const PathIterator& rhs); -} - - //! PathView implementation namespace AZ::IO { @@ -939,13 +895,13 @@ namespace AZ::IO // then it has no root directory nor filename if (rootNameView.end() == m_path.end()) { - // has_root_directory || has_filename = false - // If the root name is of the form - // # C: - then it isn't absolute unless it has a root directory C:\ - // # \\?\ = is a UNC path that can't exist without a root directory - // # \\server - Is absolute, but has no root directory - // Therefore if the rootName is larger than three characters - // then append the path separator + /* has_root_directory || has_filename = false + If the root name is of the form + C: - then it isn't absolute unless it has a root directory C:\. + \\?\ = is a UNC path that can't exist without a root directory. + \\server - Is absolute, but has no root directory. + Therefore if the rootName is larger than three characters + then append the path separator. */ if (rootNameView.size() >= 3) { m_path.push_back(m_preferred_separator); @@ -1550,3 +1506,39 @@ namespace AZ::IO return AZStd::hash{}(pathToHash); } } + +// extern instantiations of Path templates to prevent implicit instantiations +namespace AZ::IO +{ + // Swap function explicit declarations + extern template void swap(Path& lhs, Path& rhs) noexcept; + extern template void swap(FixedMaxPath& lhs, FixedMaxPath& rhs) noexcept; + + // Hash function explicit declarations + extern template size_t hash_value(const Path& pathToHash); + extern template size_t hash_value(const FixedMaxPath& pathToHash); + + // Append operator explicit declarations + extern template BasicPath operator/(const BasicPath& lhs, const PathView& rhs); + extern template BasicPath operator/(const BasicPath& lhs, const PathView& rhs); + extern template BasicPath operator/(const BasicPath& lhs, AZStd::string_view rhs); + extern template BasicPath operator/(const BasicPath& lhs, AZStd::string_view rhs); + extern template BasicPath operator/(const BasicPath& lhs, + const typename BasicPath::value_type* rhs); + extern template BasicPath operator/(const BasicPath& lhs, + const typename BasicPath::value_type* rhs); + + // Iterator compare explicit declarations + extern template bool operator==(const PathIterator& lhs, + const PathIterator& rhs); + extern template bool operator==(const PathIterator& lhs, + const PathIterator& rhs); + extern template bool operator==(const PathIterator& lhs, + const PathIterator& rhs); + extern template bool operator!=(const PathIterator& lhs, + const PathIterator& rhs); + extern template bool operator!=(const PathIterator& lhs, + const PathIterator& rhs); + extern template bool operator!=(const PathIterator& lhs, + const PathIterator& rhs); +} diff --git a/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h b/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h index 7b731a12b2..32441aaa32 100644 --- a/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h +++ b/Code/Framework/AzCore/AzCore/Math/MathIntrinsics.h @@ -14,7 +14,7 @@ #define az_clz_u64(x) _lzcnt_u64(x) #define az_popcnt_u32(x) __popcnt(x) #define az_popcnt_u64(x) __popcnt64(x) -#elif defined(AZ_COMPILER_CLANG) +#elif defined(AZ_COMPILER_CLANG) || defined(AZ_COMPILER_GCC) #define az_ctz_u32(x) __builtin_ctz(x) #define az_ctz_u64(x) __builtin_ctzll(x) #define az_clz_u32(x) __builtin_clz(x) @@ -22,5 +22,5 @@ #define az_popcnt_u32(x) __builtin_popcount(x) #define az_popcnt_u64(x) __builtin_popcountll(x) #else - #error Count Leading Zeros, Count Trailing Zeros and Pop Count intrinsics isn't supported for this compiler + #error Count Leading Zeros, Count Trailing Zeros and Pop Count intrinsics isnt supported for this compiler #endif diff --git a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h index 14dec68ad1..50afce929a 100644 --- a/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h +++ b/Code/Framework/AzCore/AzCore/Memory/AllocatorManager.h @@ -39,6 +39,9 @@ namespace AZ template constexpr friend void AZStd::destroy_at(T*); public: + + AllocatorManager(); + typedef AZStd::function OutOfMemoryCBType; static void PreRegisterAllocator(IAllocator* allocator); // Only call if the environment is not yet attached @@ -185,7 +188,6 @@ namespace AZ AZ::Debug::AllocationRecords::Mode m_defaultTrackingRecordMode; AZStd::unique_ptr m_mallocSchema; - AllocatorManager(); ~AllocatorManager(); static AllocatorManager g_allocMgr; ///< The single instance of the allocator manager diff --git a/Code/Framework/AzCore/AzCore/Name/NameDictionary.h b/Code/Framework/AzCore/AzCore/Name/NameDictionary.h index 8f9af4be3a..3df05f04b5 100644 --- a/Code/Framework/AzCore/AzCore/Name/NameDictionary.h +++ b/Code/Framework/AzCore/AzCore/Name/NameDictionary.h @@ -45,7 +45,9 @@ namespace AZ //! that already exist. class NameDictionary final { + public: AZ_CLASS_ALLOCATOR(NameDictionary, AZ::OSAllocator, 0); + private: friend Module; friend Name; @@ -75,8 +77,8 @@ namespace AZ //! @return A Name instance. If the hash was not found, the Name will be empty. Name FindName(Name::Hash hash) const; - private: NameDictionary(); + private: ~NameDictionary(); void ReportStats() const; diff --git a/Code/Framework/AzCore/AzCore/PlatformDef.h b/Code/Framework/AzCore/AzCore/PlatformDef.h index 7f00f7e90e..8609ad5756 100644 --- a/Code/Framework/AzCore/AzCore/PlatformDef.h +++ b/Code/Framework/AzCore/AzCore/PlatformDef.h @@ -10,10 +10,17 @@ ////////////////////////////////////////////////////////////////////////// // Platforms +#include + #include "PlatformRestrictedFileDef.h" #if defined(__clang__) #define AZ_COMPILER_CLANG __clang_major__ +#elif defined(__GNUC__) + // Assign AZ_COMPILER_GCC to a number that represents the major+minor (2 digits) + path level (2 digits) i.e. 3.2.0 == 30200 + #define AZ_COMPILER_GCC (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) #elif defined(_MSC_VER) #define AZ_COMPILER_MSVC _MSC_VER #else @@ -29,7 +36,7 @@ #define AZ_DYNAMIC_LIBRARY_PREFIX AZ_TRAIT_OS_DYNAMIC_LIBRARY_PREFIX #define AZ_DYNAMIC_LIBRARY_EXTENSION AZ_TRAIT_OS_DYNAMIC_LIBRARY_EXTENSION -#if defined(AZ_COMPILER_CLANG) +#if defined(AZ_COMPILER_CLANG) || defined(AZ_COMPILER_GCC) #define AZ_DLL_EXPORT AZ_TRAIT_OS_DLL_EXPORT_CLANG #define AZ_DLL_IMPORT AZ_TRAIT_OS_DLL_IMPORT_CLANG #elif defined(AZ_COMPILER_MSVC) @@ -67,12 +74,36 @@ #if defined(AZ_COMPILER_MSVC) /// Disables a warning using push style. For use matched with an AZ_POP_WARNING -#define AZ_PUSH_DISABLE_WARNING(_msvcOption, __) \ - __pragma(warning(push)) \ + +// Compiler specific AZ_PUSH_DISABLE_WARNING +#define AZ_PUSH_DISABLE_WARNING_MSVC(_msvcOption) \ + __pragma(warning(push)) \ + __pragma(warning(disable : _msvcOption)) +#define AZ_PUSH_DISABLE_WARNING_CLANG(_clangOption) +#define AZ_PUSH_DISABLE_WARNING_GCC(_gccOption) + +/// Compiler specific AZ_POP_DISABLE_WARNING. This needs to be matched with the compiler specific AZ_PUSH_DISABLE_WARNINGs +#define AZ_POP_DISABLE_WARNING_CLANG +#define AZ_POP_DISABLE_WARNING_MSVC \ + __pragma(warning(pop)) +#define AZ_POP_DISABLE_WARNING_GCC + + +// Variadic definitions for AZ_PUSH_DISABLE_WARNING for the current compiler +#define AZ_PUSH_DISABLE_WARNING_1(_msvcOption) \ + __pragma(warning(push)) \ + __pragma(warning(disable : _msvcOption)) + +#define AZ_PUSH_DISABLE_WARNING_2(_msvcOption, _2) \ + __pragma(warning(push)) \ + __pragma(warning(disable : _msvcOption)) + +#define AZ_PUSH_DISABLE_WARNING_3(_msvcOption, _2, _3) \ + __pragma(warning(push)) \ __pragma(warning(disable : _msvcOption)) /// Pops the warning stack. For use matched with an AZ_PUSH_DISABLE_WARNING -#define AZ_POP_DISABLE_WARNING \ +#define AZ_POP_DISABLE_WARNING \ __pragma(warning(pop)) @@ -94,17 +125,62 @@ # define AZ_FUNCTION_SIGNATURE __FUNCSIG__ ////////////////////////////////////////////////////////////////////////// -#elif defined(AZ_COMPILER_CLANG) +#elif defined(AZ_COMPILER_CLANG) || defined(AZ_COMPILER_GCC) + +#if defined(AZ_COMPILER_CLANG) /// Disables a single warning using push style. For use matched with an AZ_POP_WARNING -#define AZ_PUSH_DISABLE_WARNING(__, _clangOption) \ - _Pragma("clang diagnostic push") \ + +// Compiler specific AZ_PUSH_DISABLE_WARNING +#define AZ_PUSH_DISABLE_WARNING_CLANG(_clangOption) \ + _Pragma("clang diagnostic push") \ _Pragma(AZ_STRINGIZE(clang diagnostic ignored _clangOption)) +#define AZ_PUSH_DISABLE_WARNING_MSVC(_msvcOption) +#define AZ_PUSH_DISABLE_WARNING_GCC(_gccOption) + +/// Compiler specific AZ_POP_DISABLE_WARNING. This needs to be matched with the compiler specific AZ_PUSH_DISABLE_WARNINGs +#define AZ_POP_DISABLE_WARNING_CLANG \ + _Pragma("clang diagnostic pop") +#define AZ_POP_DISABLE_WARNING_MSVC +#define AZ_POP_DISABLE_WARNING_GCC + +// Variadic definitions for AZ_PUSH_DISABLE_WARNING for the current compiler +#define AZ_PUSH_DISABLE_WARNING_1(_1) +#define AZ_PUSH_DISABLE_WARNING_2(_1, _clangOption) AZ_PUSH_DISABLE_WARNING_CLANG(_clangOption) +#define AZ_PUSH_DISABLE_WARNING_3(_1, _clangOption, _2) AZ_PUSH_DISABLE_WARNING_CLANG(_clangOption) /// Pops the warning stack. For use matched with an AZ_PUSH_DISABLE_WARNING #define AZ_POP_DISABLE_WARNING \ _Pragma("clang diagnostic pop") +#else + +/// Disables a single warning using push style. For use matched with an AZ_POP_WARNING + +// Compiler specific AZ_PUSH_DISABLE_WARNING +#define AZ_PUSH_DISABLE_WARNING_GCC(_gccOption) \ + _Pragma("GCC diagnostic push") \ + _Pragma(AZ_STRINGIZE(GCC diagnostic ignored _gccOption)) +#define AZ_PUSH_DISABLE_WARNING_CLANG(_clangOption) +#define AZ_PUSH_DISABLE_WARNING_MSVC(_msvcOption) + +/// Compiler specific AZ_POP_DISABLE_WARNING. This needs to be matched with the compiler specific AZ_PUSH_DISABLE_WARNINGs +#define AZ_POP_DISABLE_WARNING_CLANG +#define AZ_POP_DISABLE_WARNING_MSVC +#define AZ_POP_DISABLE_WARNING_GCC \ + _Pragma("GCC diagnostic pop") + +// Variadic definitions for AZ_PUSH_DISABLE_WARNING for the current compiler +#define AZ_PUSH_DISABLE_WARNING_1(_1) +#define AZ_PUSH_DISABLE_WARNING_2(_1, _2) +#define AZ_PUSH_DISABLE_WARNING_3(_1, _2, _gccOption) AZ_PUSH_DISABLE_WARNING_GCC(_gccOption) + +/// Pops the warning stack. For use matched with an AZ_PUSH_DISABLE_WARNING +#define AZ_POP_DISABLE_WARNING + _Pragma("GCC diagnostic pop") + +#endif // defined(AZ_COMPILER_CLANG) + #define AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING #define AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING #define AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING @@ -121,6 +197,8 @@ #error Compiler not supported #endif +#define AZ_PUSH_DISABLE_WARNING(...) AZ_MACRO_SPECIALIZE(AZ_PUSH_DISABLE_WARNING_, AZ_VA_NUM_ARGS(__VA_ARGS__), (__VA_ARGS__)) + // We need to define AZ_DEBUG_BUILD in debug mode. We can also define it in debug optimized mode (left up to the user). // note that _DEBUG is not in fact always defined on all platforms, and only AZ_DEBUG_BUILD should be relied on. #if !defined(AZ_DEBUG_BUILD) && defined(_DEBUG) diff --git a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h index 7f48f301aa..0f7470eb39 100644 --- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h +++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h @@ -1541,7 +1541,7 @@ namespace AZ } template - static bool SetClassEqualityComparer(BehaviorClass* behaviorClass, const T*) + static void SetClassEqualityComparer(BehaviorClass* behaviorClass, const T*) { behaviorClass->m_equalityComparer = &DefaultEqualityComparer; } @@ -2341,8 +2341,6 @@ namespace AZ // For some reason the Script.cpp test validates that an incomplete type can be used with the SetResult struct template static constexpr bool IsCopyAssignable = false; - template - static constexpr bool IsCopyAssignable() = AZStd::declval())>> = true; template static bool Set(BehaviorValueParameter& param, T&& result, bool IsValueCopy) @@ -2402,6 +2400,9 @@ namespace AZ } }; + template + constexpr bool SetResult::IsCopyAssignable() = AZStd::declval())>> = true; + AZ_FORCE_INLINE BehaviorValueParameter& BehaviorValueParameter::operator=(BehaviorValueParameter&& other) { *static_cast(this) = AZStd::move(static_cast(other)); diff --git a/Code/Framework/AzCore/AzCore/RTTI/RTTI.h b/Code/Framework/AzCore/AzCore/RTTI/RTTI.h index acf6f64f77..e8ccaa79cf 100644 --- a/Code/Framework/AzCore/AzCore/RTTI/RTTI.h +++ b/Code/Framework/AzCore/AzCore/RTTI/RTTI.h @@ -977,26 +977,32 @@ namespace AZ { return AzGenericTypeInfo::Uuid(); } - + + #if defined(AZ_COMPILER_MSVC) + // There is a bug with the MSVC compiler when using the 'auto' keyword here. It appears that MSVC is unable to distinguish between a template + // template argument with a type variadic pack vs a template template argument with a non-type auto variadic pack. template class U, typename = void> + #else + template class U, typename = void> + #endif // defined(AZ_COMPILER_MSVC) inline const AZ::TypeId& RttiTypeId() { return AzGenericTypeInfo::Uuid(); } - template class U, typename = void> + template class U, typename = void> inline const AZ::TypeId& RttiTypeId() { return AzGenericTypeInfo::Uuid(); } - template class U, typename = void> + template class U, typename = void> inline const AZ::TypeId& RttiTypeId() { return AzGenericTypeInfo::Uuid(); } - template class U, typename = void> + template class U, typename = void> inline const AZ::TypeId& RttiTypeId() { return AzGenericTypeInfo::Uuid(); @@ -1027,15 +1033,22 @@ namespace AZ } // Returns true if the type is contained, otherwise false. Safe to call for type not supporting AZRtti (returns false unless type fully match). + +#if defined(AZ_COMPILER_MSVC) + // There is a bug with the MSVC compiler when using the 'auto' keyword here. It appears that MSVC is unable to distinguish between a template + // template argument with a type variadic pack vs a template template argument with a non-type auto variadic pack. template class T, class U> - inline bool RttiIsTypeOf(const U&) +#else + template class T, class U> +#endif // defined(AZ_COMPILER_MSVC) + inline bool RttiIsTypeOf(const U&) { using CheckType = typename AZ::Internal::RttiRemoveQualifiers::type; return AzGenericTypeInfo::Uuid() == RttiTypeId(); } // Returns true if the type is contained, otherwise false. Safe to call for type not supporting AZRtti (returns false unless type fully match). - template class T, class U> + template class T, class U> inline bool RttiIsTypeOf(const U&) { using CheckType = typename AZ::Internal::RttiRemoveQualifiers::type; @@ -1043,7 +1056,7 @@ namespace AZ } // Returns true if the type is contained, otherwise false.Safe to call for type not supporting AZRtti(returns false unless type fully match). - template class T, class U> + template class T, class U> inline bool RttiIsTypeOf(const U&) { using CheckType = typename AZ::Internal::RttiRemoveQualifiers::type; @@ -1051,7 +1064,7 @@ namespace AZ } // Returns true if the type is contained, otherwise false.Safe to call for type not supporting AZRtti(returns false unless type fully match). - template class T, class U> + template class T, class U> inline bool RttiIsTypeOf(const U&) { using CheckType = typename AZ::Internal::RttiRemoveQualifiers::type; diff --git a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h index 022025a3df..2cff17a638 100644 --- a/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h +++ b/Code/Framework/AzCore/AzCore/RTTI/TypeInfo.h @@ -148,11 +148,18 @@ namespace AZ { /// Needs to match declared parameter type. template