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

Updated the gradient signal unit tests for the image gradient now using a StreamingImageAsset

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2022-02-07 12:06:11 -06:00
parent 640093fe63
commit e66d55189e
8 changed files with 257 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp
+3 -2
View File
@@ -8,6 +8,7 @@
#include <Tests/GradientSignalTestFixtures.h>
#include <Tests/GradientSignalTestHelpers.h>
#include <AzTest/AzTest.h>
#include <AzCore/Asset/AssetManager.h>
@@ -88,7 +89,7 @@ namespace UnitTest
// Create the Image Gradient Component.
GradientSignal::ImageGradientConfig config;
config.m_imageAsset = ImageAssetMockAssetHandler::CreateSpecificPixelImageAsset(
config.m_imageAsset = UnitTest::CreateSpecificPixelImageAsset(
test.m_imageSize, test.m_imageSize, static_cast<AZ::u32>(test.m_pixel.GetX()), static_cast<AZ::u32>(test.m_pixel.GetY()));
config.m_tilingX = test.m_tiling;
config.m_tilingY = test.m_tiling;
@@ -379,7 +380,7 @@ namespace UnitTest
// Create an ImageGradient with a 3x3 asset with the center pixel set.
GradientSignal::ImageGradientConfig gradientConfig;
gradientConfig.m_imageAsset = ImageAssetMockAssetHandler::CreateSpecificPixelImageAsset(3, 3, 1, 1);
gradientConfig.m_imageAsset = UnitTest::CreateSpecificPixelImageAsset(3, 3, 1, 1);
entity->CreateComponent<GradientSignal::ImageGradientComponent>(gradientConfig);
// Create the test GradientTransform
Gems/GradientSignal/Code/Tests/GradientSignalTestFixtures.cpp
+10 -5
View File
@@ -8,7 +8,10 @@
#include <Tests/GradientSignalTestFixtures.h>
#include <Tests/GradientSignalTestHelpers.h>
#include <Atom/RPI.Reflect/Image/ImageMipChainAsset.h>
#include <Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h>
#include <AzFramework/Components/TransformComponent.h>
#include <GradientSignal/Components/GradientSurfaceDataComponent.h>
#include <GradientSignal/Components/GradientTransformComponent.h>
@@ -70,14 +73,16 @@ namespace UnitTest
void GradientSignalBaseFixture::SetupCoreSystems()
{
m_mockHandler = new UnitTest::ImageAssetMockAssetHandler();
AZ::Data::AssetManager::Instance().RegisterHandler(m_mockHandler, azrtti_typeid<GradientSignal::ImageAsset>());
// Using the AZ::RPI::MakeAssetHandler will both create the asset handlers,
// and register them with the AssetManager
m_assetHandlers.emplace_back(AZ::RPI::MakeAssetHandler<AZ::RPI::ImageMipChainAssetHandler>());
m_assetHandlers.emplace_back(AZ::RPI::MakeAssetHandler<AZ::RPI::StreamingImageAssetHandler>());
}
void GradientSignalBaseFixture::TearDownCoreSystems()
{
AZ::Data::AssetManager::Instance().UnregisterHandler(m_mockHandler);
delete m_mockHandler; // delete after removing from the asset manager
// This will delete the asset handlers, which will unregister themselves on deletion
m_assetHandlers.clear();
AzFramework::LegacyAssetEventBus::ClearQueuedEvents();
}
@@ -147,7 +152,7 @@ namespace UnitTest
GradientSignal::ImageGradientConfig config;
const uint32_t imageSize = 4096;
const int32_t imageSeed = 12345;
config.m_imageAsset = ImageAssetMockAssetHandler::CreateImageAsset(imageSize, imageSize, imageSeed);
config.m_imageAsset = UnitTest::CreateImageAsset(imageSize, imageSize, imageSeed);
config.m_tilingX = 1.0f;
config.m_tilingY = 1.0f;
entity->CreateComponent<GradientSignal::ImageGradientComponent>(config);
Gems/GradientSignal/Code/Tests/GradientSignalTestFixtures.h
+2 -1
View File
@@ -9,6 +9,7 @@
#include <Tests/GradientSignalTestMocks.h>
#include <LmbrCentral/Shape/MockShapes.h>
#include <Atom/RPI.Reflect/Asset/AssetHandler.h>
#include <AzTest/GemTestEnvironment.h>
namespace UnitTest
@@ -89,7 +90,7 @@ namespace UnitTest
AZStd::unique_ptr<AZ::Entity> BuildTestSurfaceMaskGradient(float shapeHalfBounds);
AZStd::unique_ptr<AZ::Entity> BuildTestSurfaceSlopeGradient(float shapeHalfBounds);
UnitTest::ImageAssetMockAssetHandler* m_mockHandler = nullptr;
AZ::RPI::AssetHandlerPtrList m_assetHandlers;
};
struct GradientSignalTest
Gems/GradientSignal/Code/Tests/GradientSignalTestHelpers.cpp
+178
View File
@@ -8,11 +8,189 @@
#include <Tests/GradientSignalTestHelpers.h>
#include <Atom/RPI.Reflect/Image/ImageMipChainAssetCreator.h>
#include <Atom/RPI.Reflect/Image/StreamingImageAssetCreator.h>
#include <AzCore/Math/Aabb.h>
#include <GradientSignal/GradientSampler.h>
namespace UnitTest
{
AZ::RHI::ImageSubresourceLayout BuildSubImageLayout(AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize)
{
AZ::RHI::ImageSubresourceLayout layout;
layout.m_size = AZ::RHI::Size{ width, height, 1 };
layout.m_rowCount = width;
layout.m_bytesPerRow = width * pixelSize;
layout.m_bytesPerImage = width * height * pixelSize;
return layout;
}
AZStd::vector<uint8_t> BuildBasicImageData(AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::s32 seed)
{
const size_t imageSize = width * height * pixelSize;
AZStd::vector<uint8_t> image;
image.reserve(imageSize);
size_t value = 0;
AZStd::hash_combine(value, seed);
for (AZ::u32 x = 0; x < width; ++x)
{
for (AZ::u32 y = 0; y < height; ++y)
{
AZStd::hash_combine(value, x);
AZStd::hash_combine(value, y);
image.push_back(static_cast<AZ::u8>(value));
}
}
EXPECT_EQ(image.size(), imageSize);
return image;
}
AZ::Data::Asset<AZ::RPI::ImageMipChainAsset> BuildBasicMipChainAsset(AZ::u16 mipLevels, AZ::u16 arraySize, AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::s32 seed)
{
using namespace AZ;
RPI::ImageMipChainAssetCreator assetCreator;
assetCreator.Begin(Data::AssetId(AZ::Uuid::CreateRandom()), mipLevels, arraySize);
RHI::ImageSubresourceLayout layout = BuildSubImageLayout(width, height, pixelSize);
assetCreator.BeginMip(layout);
for (AZ::u32 arrayIndex = 0; arrayIndex < arraySize; ++arrayIndex)
{
AZStd::vector<uint8_t> data = BuildBasicImageData(width, height, pixelSize, seed);
assetCreator.AddSubImage(data.data(), data.size());
}
assetCreator.EndMip();
Data::Asset<RPI::ImageMipChainAsset> asset;
EXPECT_TRUE(assetCreator.End(asset));
EXPECT_TRUE(asset.IsReady());
EXPECT_NE(asset.Get(), nullptr);
return asset;
}
AZStd::vector<uint8_t> BuildSpecificPixelImageData(AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::u32 pixelX, AZ::u32 pixelY)
{
const size_t imageSize = width * height * pixelSize;
AZStd::vector<uint8_t> image;
image.reserve(imageSize);
const AZ::u8 pixelValue = 255;
// Image data should be stored inverted on the y axis relative to our engine, so loop backwards through y.
for (int y = static_cast<int>(height) - 1; y >= 0; --y)
{
for (AZ::u32 x = 0; x < width; ++x)
{
if ((x == static_cast<int>(pixelX)) && (y == static_cast<int>(pixelY)))
{
image.push_back(pixelValue);
}
else
{
image.push_back(0);
}
}
}
EXPECT_EQ(image.size(), imageSize);
return image;
}
AZ::Data::Asset<AZ::RPI::ImageMipChainAsset> BuildSpecificPixelMipChainAsset(AZ::u16 mipLevels, AZ::u16 arraySize, AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::u32 pixelX, AZ::u32 pixelY)
{
using namespace AZ;
RPI::ImageMipChainAssetCreator assetCreator;
assetCreator.Begin(Data::AssetId(AZ::Uuid::CreateRandom()), mipLevels, arraySize);
RHI::ImageSubresourceLayout layout = BuildSubImageLayout(width, height, pixelSize);
assetCreator.BeginMip(layout);
for (AZ::u32 arrayIndex = 0; arrayIndex < arraySize; ++arrayIndex)
{
AZStd::vector<uint8_t> data = BuildSpecificPixelImageData(width, height, pixelSize, pixelX, pixelY);
assetCreator.AddSubImage(data.data(), data.size());
}
assetCreator.EndMip();
Data::Asset<RPI::ImageMipChainAsset> asset;
EXPECT_TRUE(assetCreator.End(asset));
EXPECT_TRUE(asset.IsReady());
EXPECT_NE(asset.Get(), nullptr);
return asset;
}
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> CreateImageAsset(AZ::u32 width, AZ::u32 height, AZ::s32 seed)
{
auto randomAssetId = AZ::Data::AssetId(AZ::Uuid::CreateRandom());
auto imageAsset = AZ::Data::AssetManager::Instance().CreateAsset<AZ::RPI::StreamingImageAsset>(
randomAssetId, AZ::Data::AssetLoadBehavior::Default);
const AZ::u32 arraySize = 1;
const AZ::u32 mipCountTotal = 1;
const auto format = AZ::RHI::Format::R8_UNORM;
const AZ::u32 pixelSize = AZ::RHI::GetFormatComponentCount(format);
AZ::Data::Asset<AZ::RPI::ImageMipChainAsset> mipChain = BuildBasicMipChainAsset(mipCountTotal, arraySize, width, height, pixelSize, seed);
AZ::RPI::StreamingImageAssetCreator assetCreator;
assetCreator.Begin(randomAssetId);
AZ::RHI::ImageDescriptor imageDesc = AZ::RHI::ImageDescriptor::Create2DArray(AZ::RHI::ImageBindFlags::ShaderRead, width, height, arraySize, format);
imageDesc.m_mipLevels = static_cast<AZ::u16>(mipCountTotal);
assetCreator.SetImageDescriptor(imageDesc);
assetCreator.AddMipChainAsset(*mipChain.Get());
EXPECT_TRUE(assetCreator.End(imageAsset));
EXPECT_TRUE(imageAsset.IsReady());
EXPECT_NE(imageAsset.Get(), nullptr);
return imageAsset;
}
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> CreateSpecificPixelImageAsset(AZ::u32 width, AZ::u32 height, AZ::u32 pixelX, AZ::u32 pixelY)
{
auto randomAssetId = AZ::Data::AssetId(AZ::Uuid::CreateRandom());
auto imageAsset = AZ::Data::AssetManager::Instance().CreateAsset<AZ::RPI::StreamingImageAsset>(
randomAssetId, AZ::Data::AssetLoadBehavior::Default);
const AZ::u32 arraySize = 1;
const AZ::u32 mipCountTotal = 1;
const auto format = AZ::RHI::Format::R8_UNORM;
const AZ::u32 pixelSize = AZ::RHI::GetFormatComponentCount(format);
AZ::Data::Asset<AZ::RPI::ImageMipChainAsset> mipChain = BuildSpecificPixelMipChainAsset(mipCountTotal, arraySize, width, height, pixelSize, pixelX, pixelY);
AZ::RPI::StreamingImageAssetCreator assetCreator;
assetCreator.Begin(randomAssetId);
AZ::RHI::ImageDescriptor imageDesc = AZ::RHI::ImageDescriptor::Create2DArray(AZ::RHI::ImageBindFlags::ShaderRead, width, height, arraySize, format);
imageDesc.m_mipLevels = static_cast<AZ::u16>(mipCountTotal);
assetCreator.SetImageDescriptor(imageDesc);
assetCreator.AddMipChainAsset(*mipChain.Get());
EXPECT_TRUE(assetCreator.End(imageAsset));
EXPECT_TRUE(imageAsset.IsReady());
EXPECT_NE(imageAsset.Get(), nullptr);
return imageAsset;
}
void GradientSignalTestHelpers::CompareGetValueAndGetValues(AZ::EntityId gradientEntityId, float shapeHalfBounds)
{
// Create a gradient sampler and run through a series of points to see if they match expectations.
Gems/GradientSignal/Code/Tests/GradientSignalTestHelpers.h
+64
View File
@@ -12,8 +12,72 @@
#include <AzCore/std/containers/vector.h>
#include <AzTest/AzTest.h>
#include <Atom/RHI.Reflect/ImageSubresource.h>
#include <Atom/RPI.Reflect/Image/ImageMipChainAsset.h>
#include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
namespace UnitTest
{
//! Helper method to build a AZ::RHI::ImageSubresourceLayout
//! @param width The width of the image
//! @param height The height of the image
//! @param pixelSize Number of bytes per pixel
//! @return The AZ::RHI::ImageSubresourceLayout that has been filled out appropriately
AZ::RHI::ImageSubresourceLayout BuildSubImageLayout(AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize);
//! Build a deterministic random set of image pixel data
//! @param width Width of the image
//! @param height Height of the image
//! @param pixelSize Number of bytes per pixel
//! @param seed The random seed for generating the data
//! @return A vector of bytes for the image data
AZStd::vector<uint8_t> BuildBasicImageData(AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::s32 seed);
//! Build a mip chain asset that contains the basic image data from BuildBasicImageData
//! @param mipLevels Number of mip levels in the chain
//! @param arraySize Number of sub images within a mip level
//! @param width The width of the image
//! @param height The height of the image
//! @param pixelSize The number of bytes per pixel
//! @param seed The random seed for generating the data
//! @return A mip chain asset with the specified basic image data
AZ::Data::Asset<AZ::RPI::ImageMipChainAsset> BuildBasicMipChainAsset(AZ::u16 mipLevels, AZ::u16 arraySize, AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::s32 seed);
//! Construct an array of image data where all the pixels are 0 except for one at the given coordinate
//! @param width Width of the image
//! @param height Height of the image
//! @param pixelSize Number of bytes per pixel
//! @param pixelX The X coordinate of the pixel to set to 1
//! @param pixelY The Y coordinate of the pixel to set to 1
//! @return A vector of bytes for the image data
AZStd::vector<uint8_t> BuildSpecificPixelImageData(AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::u32 pixelX, AZ::u32 pixelY);
//! Build a mip chain asset that contains the specific image data from BuildSpecificPixelImageData
//! @param mipLevels Number of mip levels in the chain
//! @param arraySize Number of sub images within a mip level
//! @param width The width of the image
//! @param height The height of the image
//! @param pixelSize The number of bytes per pixel
//! @param pixelX The X coordinate of the pixel to set to 1
//! @param pixelY The Y coordinate of the pixel to set to 1
//! @return A mip chain asset with the specific pixel image data
AZ::Data::Asset<AZ::RPI::ImageMipChainAsset> BuildSpecificPixelMipChainAsset(AZ::u16 mipLevels, AZ::u16 arraySize, AZ::u32 width, AZ::u32 height, AZ::u32 pixelSize, AZ::u32 pixelX, AZ::u32 pixelY);
//! Creates a deterministically random set of pixel data as an AZ::RPI::StreamingImageAsset.
//! \param width The width of the AZ::RPI::StreamingImageAsset
//! \param height The height of the AZ::RPI::StreamingImageAsset
//! \param seed The random seed to use for generating the random data
//! \return The AZ::RPI::StreamingImageAsset in a loaded ready state
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> CreateImageAsset(AZ::u32 width, AZ::u32 height, AZ::s32 seed);
//! Creates an AZ::RPI::StreamingImageAsset where all the pixels are 0 except for the one pixel at the given coordinates, which is set to 1.
//! \param width The width of the AZ::RPI::StreamingImageAsset
//! \param height The height of the AZ::RPI::StreamingImageAsset
//! \param pixelX The X coordinate of the pixel to set to 1
//! \param pixelY The Y coordinate of the pixel to set to 1
//! \return The AZ::RPI::StreamingImageAsset in a loaded ready state
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> CreateSpecificPixelImageAsset(AZ::u32 width, AZ::u32 height, AZ::u32 pixelX, AZ::u32 pixelY);
class GradientSignalTestHelpers
{
public:
Gems/GradientSignal/Code/Tests/GradientSignalTestMocks.cpp
-74
View File
@@ -1,74 +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 <Tests/GradientSignalTestMocks.h>
namespace UnitTest
{
AZ::Data::Asset<GradientSignal::ImageAsset> ImageAssetMockAssetHandler::CreateImageAsset(AZ::u32 width, AZ::u32 height, AZ::s32 seed)
{
auto imageAsset = AZ::Data::AssetManager::Instance().CreateAsset<GradientSignal::ImageAsset>(
AZ::Data::AssetId(AZ::Uuid::CreateRandom()), AZ::Data::AssetLoadBehavior::Default);
imageAsset->m_imageWidth = width;
imageAsset->m_imageHeight = height;
imageAsset->m_bytesPerPixel = 1;
imageAsset->m_imageFormat = ImageProcessingAtom::EPixelFormat::ePixelFormat_R8;
imageAsset->m_imageData.reserve(width * height);
size_t value = 0;
AZStd::hash_combine(value, seed);
for (AZ::u32 x = 0; x < width; ++x)
{
for (AZ::u32 y = 0; y < height; ++y)
{
AZStd::hash_combine(value, x);
AZStd::hash_combine(value, y);
imageAsset->m_imageData.push_back(static_cast<AZ::u8>(value));
}
}
return imageAsset;
}
AZ::Data::Asset<GradientSignal::ImageAsset> ImageAssetMockAssetHandler::CreateSpecificPixelImageAsset(
AZ::u32 width, AZ::u32 height, AZ::u32 pixelX, AZ::u32 pixelY)
{
auto imageAsset = AZ::Data::AssetManager::Instance().CreateAsset<GradientSignal::ImageAsset>(
AZ::Data::AssetId(AZ::Uuid::CreateRandom()), AZ::Data::AssetLoadBehavior::Default);
imageAsset->m_imageWidth = width;
imageAsset->m_imageHeight = height;
imageAsset->m_bytesPerPixel = 1;
imageAsset->m_imageFormat = ImageProcessingAtom::EPixelFormat::ePixelFormat_R8;
imageAsset->m_imageData.reserve(width * height);
const AZ::u8 pixelValue = 255;
// Image data should be stored inverted on the y axis relative to our engine, so loop backwards through y.
for (int y = static_cast<int>(height) - 1; y >= 0; --y)
{
for (AZ::u32 x = 0; x < width; ++x)
{
if ((x == static_cast<int>(pixelX)) && (y == static_cast<int>(pixelY)))
{
imageAsset->m_imageData.push_back(pixelValue);
}
else
{
imageAsset->m_imageData.push_back(0);
}
}
}
return imageAsset;
}
}
Gems/GradientSignal/Code/Tests/GradientSignalTestMocks.h
-47
View File
@@ -27,53 +27,6 @@
namespace UnitTest
{
// Mock asset handler for GradientSignal::ImageAsset that we can use in unit tests to pretend to load an image asset with.
// Also includes utility functions for creating image assets with specific testable patterns.
struct ImageAssetMockAssetHandler : public AZ::Data::AssetHandler
{
//! Creates a deterministically random set of pixel data as an ImageAsset.
//! \param width The width of the ImageAsset
//! \param height The height of the ImageAsset
//! \param seed The random seed to use for generating the random data
//! \return The ImageAsset in a loaded ready state
static AZ::Data::Asset<GradientSignal::ImageAsset> CreateImageAsset(AZ::u32 width, AZ::u32 height, AZ::s32 seed);
//! Creates an ImageAsset where all the pixels are 0 except for the one pixel at the given coordinates, which is set to 1.
//! \param width The width of the ImageAsset
//! \param height The height of the ImageAsset
//! \param pixelX The X coordinate of the pixel to set to 1
//! \param pixelY The Y coordinate of the pixel to set to 1
//! \return The ImageAsset in a loaded ready state
static AZ::Data::Asset<GradientSignal::ImageAsset> CreateSpecificPixelImageAsset(
AZ::u32 width, AZ::u32 height, AZ::u32 pixelX, AZ::u32 pixelY);
AZ::Data::AssetPtr CreateAsset(const AZ::Data::AssetId& id, [[maybe_unused]] const AZ::Data::AssetType& type) override
{
// For our mock handler, always mark our assets as immediately ready.
return aznew GradientSignal::ImageAsset(id, AZ::Data::AssetData::AssetStatus::Ready);
}
void DestroyAsset(AZ::Data::AssetPtr ptr) override
{
if (ptr)
{
delete ptr;
}
}
void GetHandledAssetTypes([[maybe_unused]] AZStd::vector<AZ::Data::AssetType>& assetTypes) override
{
}
AZ::Data::AssetHandler::LoadResult LoadAssetData(
[[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset,
[[maybe_unused]] AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
[[maybe_unused]] const AZ::Data::AssetFilterCB& assetLoadFilterCB) override
{
return AZ::Data::AssetHandler::LoadResult::LoadComplete;
}
};
struct MockGradientRequestsBus
: public GradientSignal::GradientRequestBus::Handler
{
Gems/GradientSignal/Code/gradientsignal_shared_tests_files.cmake
-1
View File
@@ -11,6 +11,5 @@ set(FILES
Tests/GradientSignalTestHelpers.h
Tests/GradientSignalTestFixtures.cpp
Tests/GradientSignalTestFixtures.h
Tests/GradientSignalTestMocks.cpp
Tests/GradientSignalTestMocks.h
)