1f9b284de2
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h # Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h # Code/Editor/Plugins/EditorCommon/stdafx.cpp # Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h # Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h # Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h # Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h # Code/Tools/AssetProcessor/native/precompiled.h # Code/Tools/Standalone/StandaloneTools_precompiled.h # Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h # Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h # Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h # Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h # Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake # Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h # Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h # Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp # Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake # Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h # Gems/Blast/Code/Source/StdAfx.cpp # Gems/Camera/Code/Source/Camera_precompiled.h # Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h # Gems/FastNoise/Code/Source/FastNoise_precompiled.h # Gems/Gestures/Code/Source/Gestures_precompiled.h # Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h # Gems/GraphCanvas/Code/precompiled.h # Gems/ImGui/Code/Source/ImGui_precompiled.h # Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h # Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h # Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp # Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h # Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h # Gems/LyShine/Code/Source/LyShine_precompiled.h # Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h # Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h # Gems/Maestro/Code/Source/Maestro_precompiled.h # Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h # Gems/Metastream/Code/Source/Metastream_precompiled.h # Gems/Microphone/Code/Source/Microphone_precompiled.h # Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h # Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h # Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h # Gems/PhysX/Code/Source/PhysX_precompiled.h # Gems/PhysX/Code/physx_unsupported_files.cmake # Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h # Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h # Gems/ScriptCanvas/Code/Editor/precompiled.h # Gems/ScriptCanvas/Code/Source/precompiled.h # Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h # Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h # Gems/ScriptEvents/Code/Source/precompiled.h # Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp # Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h # Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h # Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h # Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h # Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h # Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h # Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h # Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h # Gems/Twitch/Code/Source/Twitch_precompiled.h # Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
345 lines
13 KiB
C++
345 lines
13 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 "EditorShapeComponentConverters.h"
|
|
|
|
#include "EditorCapsuleShapeComponent.h"
|
|
#include "EditorCylinderShapeComponent.h"
|
|
#include "EditorPolygonPrismShapeComponent.h"
|
|
#include "EditorSphereShapeComponent.h"
|
|
#include "EditorBoxShapeComponent.h"
|
|
#include "ShapeComponentConverters.h"
|
|
#include <LmbrCentral/Shape/BoxShapeComponentBus.h>
|
|
#include <LmbrCentral/Shape/SphereShapeComponentBus.h>
|
|
|
|
namespace LmbrCentral
|
|
{
|
|
namespace ClassConverters
|
|
{
|
|
bool DeprecateEditorSphereColliderComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
// Cache the Configuration
|
|
SphereShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData<SphereShapeConfig>(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorSphereShapeComponent
|
|
const bool result = classElement.Convert<EditorSphereShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<SphereShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<SphereShapeConfig>(context, configuration);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool UpgradeEditorSphereShapeComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
const AZ::u32 version = classElement.GetVersion();
|
|
if (version <= 1)
|
|
{
|
|
SphereShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorSphereShapeComponent
|
|
const bool result = classElement.Convert<EditorSphereShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<SphereShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<SphereShapeConfig>(context, configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return UpgradeShapeComponentConfigToShape<SphereShape, SphereShapeConfig>(version, "SphereShape", context, classElement);;
|
|
}
|
|
|
|
bool DeprecateEditorBoxColliderComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
// Cache the Configuration
|
|
BoxShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData<BoxShapeConfig>(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorBoxShapeComponent
|
|
if (classElement.Convert(context, EditorBoxShapeComponentTypeId))
|
|
{
|
|
configIndex = classElement.AddElement<BoxShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<BoxShapeConfig>(context, configuration);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool UpgradeEditorBoxShapeComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
const AZ::u32 version = classElement.GetVersion();
|
|
|
|
if (version <= 1)
|
|
{
|
|
// Cache the Configuration
|
|
BoxShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorBoxShapeComponent
|
|
if (classElement.Convert(context, EditorBoxShapeComponentTypeId))
|
|
{
|
|
configIndex = classElement.AddElement<BoxShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<BoxShapeConfig>(context, configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// upgrade for editor and runtime components at this stage are the same
|
|
return UpgradeShapeComponentConfigToShape<BoxShape, BoxShapeConfig>(version, "BoxShape", context, classElement);
|
|
}
|
|
|
|
bool DeprecateEditorCylinderColliderComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
// Cache the Configuration
|
|
CylinderShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData<CylinderShapeConfig>(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorCylinderShapeComponent
|
|
const bool result = classElement.Convert<EditorCylinderShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<CylinderShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<CylinderShapeConfig>(context, configuration);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool UpgradeEditorCylinderShapeComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
const AZ::u32 version = classElement.GetVersion();
|
|
if (version <= 1)
|
|
{
|
|
// Cache the Configuration
|
|
CylinderShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorCylinderShapeComponent
|
|
const bool result = classElement.Convert<EditorCylinderShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<CylinderShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<CylinderShapeConfig>(context, configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// upgrade for editor and runtime components at this stage are the same
|
|
return UpgradeShapeComponentConfigToShape<CylinderShape, CylinderShapeConfig>(version, "CylinderShape", context, classElement);;
|
|
}
|
|
|
|
bool DeprecateEditorCapsuleColliderComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
// Cache the Configuration
|
|
CapsuleShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData<CapsuleShapeConfig>(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorCapsuleShapeComponent
|
|
const bool result = classElement.Convert<EditorCapsuleShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<CapsuleShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<CapsuleShapeConfig>(context, configuration);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool UpgradeEditorCapsuleShapeComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
const AZ::u32 version = classElement.GetVersion();
|
|
if (version <= 1)
|
|
{
|
|
// Cache the Configuration
|
|
CapsuleShapeConfig configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorCapsuleShapeComponent
|
|
const bool result = classElement.Convert<EditorCapsuleShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<CapsuleShapeConfig>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<CapsuleShapeConfig>(context, configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return UpgradeShapeComponentConfigToShape<CapsuleShape, CapsuleShapeConfig>(version, "CapsuleShape", context, classElement);
|
|
}
|
|
|
|
bool UpgradeEditorPolygonPrismShapeComponent(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
|
|
{
|
|
if (classElement.GetVersion() <= 1)
|
|
{
|
|
// Cache the Configuration
|
|
PolygonPrismShape configuration;
|
|
int configIndex = classElement.FindElement(AZ_CRC("Configuration", 0xa5e2a5d7));
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).GetData(configuration);
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Convert to EditorPolygonPrismComponent
|
|
const bool result = classElement.Convert<EditorPolygonPrismShapeComponent>(context);
|
|
if (result)
|
|
{
|
|
configIndex = classElement.AddElement<PolygonPrismShape>(context, "Configuration");
|
|
if (configIndex != -1)
|
|
{
|
|
classElement.GetSubElement(configIndex).SetData<PolygonPrismShape>(context, configuration);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|
|
}
|