8b82041361
* Add comparison operators to SurfaceTagWeight. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Changed AddSurfaceTagWeight to always combine weights. This simplifies the API a bit and defines the behavior if someone ever tries to add a duplicate tag. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added benchmarks for measuring the performance-critical APIs. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Changed SurfaceTagWeights to a fixed_vector. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Add inPosition to AddSurfacePoint. This will be used to detect which input the surface point is associated with. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Add inPositionIndex to the appropriate APIs. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched Gradient Surface benchmarks to use actual surface components. The gradient unit tests and benchmarks were previously using a mock surface data system, which led to misleading benchmark results. Now, the actual SurfaceData system gets constructed, and the tests use a mock provider, but the benchmarks use actual shape providers for more realistic benchmarking. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed unit tests to have better query ranges. Half of each previous range was querying outside the surface provider's data. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * First attempt at removing SurfacePointLists. This currently runs significantly slower than the previous code but passes the unit tests. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Another attempt at optimization. This one runs faster than the previous, but still slow. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fix the cmake dependency so that the gradient tests rebuild SurfaceData.dll when run. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switch SurfaceAltitudeGradient over to the new bulk API. Also, optimized the non-bulk API by having it reuse the SurfacePointList to avoid the repeated allocation / deallocation cost. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched to using an indirect index so that all allocations are consecutive in our reserved buffer. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched back to SurfaceTagWeight again. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added runtime dependency to LmbrCentral for unit tests. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched code over to use the full EnumeratePoints in most cases. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added knowledge of max surface point creation into the system. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Add generic GetSurfacePointsFromList API implementation for surface providers. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed implementation to use the correct maximum number of input points based on the surface providers being queried. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fix out-of-bounds references on empty lists. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fix memory allocation that caused benchmark runs to crash. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Starting to clean up the API. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Move SurfacePointList into separate files for easier maintainability. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed bug where too many points were filtered out due to using the position Z as a part of the AABB check. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Made FilterPoints an internal part of SurfacePointList so we can choose when and how to perform the filtering. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Final cleanup / comments. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added includes for non-unity builds. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Changed how unit tests initialize the mock lists to try and fix the linux errors. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed compile error. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
136 lines
6.7 KiB
C++
136 lines
6.7 KiB
C++
/*
|
|
* 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 "EditorGradientSurfaceDataComponent.h"
|
|
#include <AzCore/Serialization/Utils.h>
|
|
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
|
|
#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
|
|
#include <LmbrCentral/Dependency/DependencyNotificationBus.h>
|
|
#include <GradientSignal/Ebuses/GradientPreviewRequestBus.h>
|
|
#include <SurfaceData/SurfacePointList.h>
|
|
|
|
namespace GradientSignal
|
|
{
|
|
void EditorGradientSurfaceDataComponent::Reflect(AZ::ReflectContext* context)
|
|
{
|
|
BaseClassType::Reflect(context);
|
|
|
|
AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context);
|
|
if (serialize)
|
|
{
|
|
serialize->Class<EditorGradientSurfaceDataComponent, BaseClassType>()
|
|
->Version(1, &LmbrCentral::EditorWrappedComponentBaseVersionConverter<typename BaseClassType::WrappedComponentType, typename BaseClassType::WrappedConfigType,1>)
|
|
;
|
|
|
|
AZ::EditContext* edit = serialize->GetEditContext();
|
|
if (edit)
|
|
{
|
|
edit->Class<EditorGradientSurfaceDataComponent>(
|
|
s_componentName, s_componentDescription)
|
|
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
|
|
->Attribute(AZ::Edit::Attributes::Icon, s_icon)
|
|
->Attribute(AZ::Edit::Attributes::ViewportIcon, s_viewportIcon)
|
|
->Attribute(AZ::Edit::Attributes::HelpPageURL, s_helpUrl)
|
|
->Attribute(AZ::Edit::Attributes::Category, s_categoryName)
|
|
->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
|
|
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
|
|
->ClassElement(AZ::Edit::ClassElements::Group, "Preview")
|
|
->Attribute(AZ::Edit::Attributes::AutoExpand, false)
|
|
->UIElement("GradientPreviewer", "Previewer")
|
|
->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Show)
|
|
->Attribute(AZ::Edit::Attributes::NameLabelOverride, "")
|
|
->Attribute(AZ_CRC("GradientEntity", 0xe8531817), &EditorGradientSurfaceDataComponent::GetGradientEntityId)
|
|
->Attribute(AZ_CRC("GradientFilter", 0x99bf0362), &EditorGradientSurfaceDataComponent::GetFilterFunc)
|
|
->ClassElement(AZ::Edit::ClassElements::Group, "")
|
|
;
|
|
}
|
|
}
|
|
}
|
|
|
|
void EditorGradientSurfaceDataComponent::Activate()
|
|
{
|
|
m_gradientEntityId = GetEntityId();
|
|
|
|
BaseClassType::Activate();
|
|
|
|
AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(GetEntityId());
|
|
}
|
|
|
|
void EditorGradientSurfaceDataComponent::Deactivate()
|
|
{
|
|
// Make sure any previews for this entity aren't currently trying to refresh. Otherwise, the preview job could call
|
|
// back into our FilterFunc lambda below after the entity has already been destroyed.
|
|
AZ::EntityId canceledEntity;
|
|
GradientSignal::GradientPreviewRequestBus::EventResult(
|
|
canceledEntity, GetEntityId(), &GradientSignal::GradientPreviewRequestBus::Events::CancelRefresh);
|
|
|
|
// If the preview shouldn't be active, use an invalid entityId
|
|
m_gradientEntityId = AZ::EntityId();
|
|
AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
|
|
|
|
BaseClassType::Deactivate();
|
|
}
|
|
|
|
AZ::u32 EditorGradientSurfaceDataComponent::ConfigurationChanged()
|
|
{
|
|
auto result = BaseClassType::ConfigurationChanged();
|
|
|
|
LmbrCentral::DependencyNotificationBus::Event(GetEntityId(), &LmbrCentral::DependencyNotificationBus::Events::OnCompositionChanged);
|
|
|
|
return result;
|
|
}
|
|
|
|
AZ::EntityId EditorGradientSurfaceDataComponent::GetGradientEntityId() const
|
|
{
|
|
return m_gradientEntityId;
|
|
}
|
|
|
|
AZStd::function<float(float, const GradientSampleParams & params)> EditorGradientSurfaceDataComponent::GetFilterFunc()
|
|
{
|
|
// By default, our preview will show the gradient value that was queried from the gradient on this entity.
|
|
// To show what this GradientSurfaceData component will produce, we use a custom FilterFunc to modify what
|
|
// the preview will display. We create a SurfacePoint, call ModifySurfacePoints() on that point, and return
|
|
// the max value from any tags returned, or 0 if no tags were added to the point.
|
|
|
|
// This allows us to view the results of the GradientSurfaceData modifications, including threshold clamping and
|
|
// constraining to shape bounds. Note that the primary gradient controls the "Pin Preview to Entity" preview setting
|
|
// that affects *where* this preview is rendered. If the primary gradient is pinned to a different entity that doesn't
|
|
// overlap this component's shape constraint entity, this preview can end up all black. To see a preview that lines up
|
|
// with this shape constraint, the input gradient will need to "Pin Preview to Entity" to the same shape entity.
|
|
|
|
return [this]([[maybe_unused]] float sampleValue, const GradientSampleParams& params)
|
|
{
|
|
// Create a fake surface point with the position we're sampling.
|
|
AzFramework::SurfaceData::SurfacePoint point;
|
|
point.m_position = params.m_position;
|
|
SurfaceData::SurfacePointList pointList = AZStd::span<const AzFramework::SurfaceData::SurfacePoint>(&point, 1);
|
|
|
|
// Send it into the component, see what emerges
|
|
m_component.ModifySurfacePoints(pointList);
|
|
|
|
// If the point was successfully modified, we should have one or more masks with a non-zero value.
|
|
// Technically, they should all have the same value, but we'll grab the max from all of them in case
|
|
// the underlying logic ever changes to allow separate ranges per tag.
|
|
float result = 0.0f;
|
|
pointList.EnumeratePoints([&result](
|
|
[[maybe_unused]] size_t inPositionIndex, [[maybe_unused]] const AZ::Vector3& position,
|
|
[[maybe_unused]] const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
|
|
{
|
|
masks.EnumerateWeights(
|
|
[&result]([[maybe_unused]] AZ::Crc32 surfaceType, float weight) -> bool
|
|
{
|
|
result = AZ::GetMax(result, weight);
|
|
return true;
|
|
});
|
|
return true;
|
|
});
|
|
return result;
|
|
};
|
|
}
|
|
}
|