Ken Pruiksma
b455b915a8
* Making terrain query resolution a single float instead of a Vector2 Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * Keeping the concept of different x/y step sizes in region queries since that may be useful and is separate from query resolution. Also keeping the concept of different x/y step sizes in physics since that's independent of the terrain gem. Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * Formatting cleanups Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * A few more minor cleanups Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * Added support to convert serialized Vector2 query resolution to a single float. Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * Switch ray intersection check back to using separate values for x and y resolution Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * Fixing new unit tests added to use float query resolution. Signed-off-by: Ken Pruiksma <pruiksma@amazon.com> * Updating automated test Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
87 lines
3.3 KiB
C++
87 lines
3.3 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
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AzCore/Asset/AssetCommon.h>
|
|
#include <AzCore/Component/Component.h>
|
|
#include <AzCore/Math/Vector3.h>
|
|
#include <AzCore/Serialization/Json/BaseJsonSerializer.h>
|
|
#include <AzCore/Serialization/Json/RegistrationContext.h>
|
|
#include <TerrainSystem/TerrainSystem.h>
|
|
|
|
namespace LmbrCentral
|
|
{
|
|
template<typename, typename>
|
|
class EditorWrappedComponentBase;
|
|
}
|
|
|
|
namespace Terrain
|
|
{
|
|
// Custom JSON serializer for TerrainWorldConfig to handle version conversion
|
|
class JsonTerrainWorldConfigSerializer : public AZ::BaseJsonSerializer
|
|
{
|
|
public:
|
|
AZ_RTTI(Terrain::JsonTerrainWorldConfigSerializer, "{910BC31F-CD49-488E-8004-227D9FEB5A16}", AZ::BaseJsonSerializer);
|
|
AZ_CLASS_ALLOCATOR_DECL;
|
|
|
|
AZ::JsonSerializationResult::Result Load(
|
|
void* outputValue, const AZ::Uuid& outputValueTypeId, const rapidjson::Value& inputValue,
|
|
AZ::JsonDeserializerContext& context) override;
|
|
};
|
|
|
|
class TerrainWorldConfig
|
|
: public AZ::ComponentConfig
|
|
{
|
|
public:
|
|
AZ_CLASS_ALLOCATOR(TerrainWorldConfig, AZ::SystemAllocator, 0);
|
|
AZ_RTTI(TerrainWorldConfig, "{295844DB-20DD-45B2-94DB-4245D5AE9AFF}", AZ::ComponentConfig);
|
|
static void Reflect(AZ::ReflectContext* context);
|
|
|
|
AZ::Vector3 m_worldMin{ 0.0f, 0.0f, 0.0f };
|
|
AZ::Vector3 m_worldMax{ 1024.0f, 1024.0f, 1024.0f };
|
|
float m_heightQueryResolution{ 1.0f };
|
|
|
|
private:
|
|
AZ::Outcome<void, AZStd::string> ValidateWorldMin(void* newValue, const AZ::Uuid& valueType);
|
|
AZ::Outcome<void, AZStd::string> ValidateWorldMax(void* newValue, const AZ::Uuid& valueType);
|
|
AZ::Outcome<void, AZStd::string> ValidateWorldHeight(void* newValue, const AZ::Uuid& valueType);
|
|
float NumberOfSamples(const AZ::Vector3& min, const AZ::Vector3& max, float heightQuery);
|
|
AZ::Outcome<void, AZStd::string> DetermineMessage(float numSamples);
|
|
|
|
};
|
|
|
|
|
|
class TerrainWorldComponent
|
|
: public AZ::Component
|
|
{
|
|
public:
|
|
template<typename, typename>
|
|
friend class LmbrCentral::EditorWrappedComponentBase;
|
|
AZ_COMPONENT(TerrainWorldComponent, "{4734EFDC-135D-4BF5-BE57-4F9AD03ADF78}");
|
|
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
|
|
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services);
|
|
static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services);
|
|
static void Reflect(AZ::ReflectContext* context);
|
|
|
|
TerrainWorldComponent(const TerrainWorldConfig& configuration);
|
|
TerrainWorldComponent() = default;
|
|
~TerrainWorldComponent() override;
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
// AZ::Component interface implementation
|
|
void Activate() override;
|
|
void Deactivate() override;
|
|
bool ReadInConfig(const AZ::ComponentConfig* baseConfig) override;
|
|
bool WriteOutConfig(AZ::ComponentConfig* outBaseConfig) const override;
|
|
|
|
private:
|
|
TerrainWorldConfig m_configuration;
|
|
};
|
|
}
|