Guthrie Adams
3bca63bb71
The bug reported that overridden texture properties would be lost whenever an entity was created, destroyed, or a prefab was created. Initially, it seemed like there was a problem with the custom JSON serializer for material properties. Debugging proved this to be incorrect because all of the data was converted to JSON values in the serializer on multiple passes. At some point during prefab patching, the data for the asset properties is lost while other values like colors and floats serialize correctly. Converting the asset data values into asset IDs resolves the immediate problem for the material component but the underlying issue is still under investigation by the prefab team. This change is being posted for review in case the underlying issue cannot be resolved in time for the next release. Signed-off-by: Guthrie Adams <guthadam@amazon.com> Fixing unittests and moving texture conversion into material component controller Signed-off-by: Guthrie Adams <guthadam@amazon.com>
57 lines
1.9 KiB
C++
57 lines
1.9 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/Memory/Memory.h>
|
|
#include <AzCore/Name/Name.h>
|
|
#include <AzCore/Serialization/Json/BaseJsonSerializer.h>
|
|
|
|
namespace AZ
|
|
{
|
|
namespace Render
|
|
{
|
|
// Custom JSON serializer for material assignment objects containing AZStd::any property overrides,
|
|
// which aren't supported by the system
|
|
class JsonMaterialAssignmentSerializer : public BaseJsonSerializer
|
|
{
|
|
public:
|
|
AZ_RTTI(JsonMaterialAssignmentSerializer, "{3D33653E-4582-483F-91F5-BBCC347C3DF0}", 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;
|
|
|
|
private:
|
|
template<typename T>
|
|
bool LoadAny(
|
|
AZStd::any& propertyValue,
|
|
const rapidjson::Value& inputPropertyValue,
|
|
AZ::JsonDeserializerContext& context,
|
|
AZ::JsonSerializationResult::ResultCode& result);
|
|
|
|
template<typename T>
|
|
bool StoreAny(
|
|
const AZStd::any& propertyValue,
|
|
rapidjson::Value& outputPropertyValue,
|
|
AZ::JsonSerializerContext& context,
|
|
AZ::JsonSerializationResult::ResultCode& result);
|
|
};
|
|
} // namespace Render
|
|
} // namespace AZ
|