Mike Balfour
d90a3d46a7
This set of changes enables conversions for singly-nested slices. Multiple nesting hierarchies are only partially supported at this point. Conversion is also significantly more deterministic, which makes it easier to convert single slices without needing to reconvert every slice or level that relies on it as well. Changes: - Added version of Instance::AddInstance() that takes in an alias to allow for deterministic aliases - Added a "SliceConverterEditorEntityContextComponent" that's used to specifically disable entity activation on creation. The disabling is done this way vs adding a new public API, because the disable shouldn't be required in any normal case outside of this tool. - Disabled more AWS gems for the SliceConverter, as they're unneeded and cause issues if they're around in the tool. - Added a small null check to the Camera Controller. - Added the actual support for slice instance conversion. This instantiates the entities, applies the data patches, turns them into a prefab instance, and generates a JSON patch out of the changes.
66 lines
2.8 KiB
C++
66 lines
2.8 KiB
C++
/*
|
|
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
|
* its licensors.
|
|
*
|
|
* For complete copyright and license terms please see the LICENSE at the root of this
|
|
* distribution (the "License"). All use of this software is governed by the License,
|
|
* or, if provided, by the license below or the license accompanying this file. Do not
|
|
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
*
|
|
*/
|
|
#pragma once
|
|
|
|
#include <AzToolsFramework/Entity/EditorEntityContextComponent.h>
|
|
|
|
namespace AzToolsFramework
|
|
{
|
|
// This class is an inelegant workaround for use by the Slice Converter to selectively disable entity add/remove logic
|
|
// during slice conversion in the EditorEntityContextComponent. Specifically, the standard versions of these methods will
|
|
// attempt to activate the entities as they're added. This is both unnecessary and undesirable during slice conversion, since
|
|
// entity activation requires a lot of subsystems to be active and valid.
|
|
// Instead, by selectively disabling this logic, the entities can remain in an initialized state, which is sufficient for conversion,
|
|
// without requiring those extra subsystems.
|
|
|
|
// This problem also could have been solved by adding APIs to the EditorEntityContextComponent or the EntityContext, but there aren't
|
|
// any other known valid use cases for disabling this logic, so the extra APIs would simply encourage "bad behavior" by using them
|
|
// when they likely aren't necessary or desired.
|
|
|
|
class SliceConverterEditorEntityContextComponent
|
|
: public EditorEntityContextComponent
|
|
{
|
|
public:
|
|
|
|
AZ_COMPONENT(SliceConverterEditorEntityContextComponent, "{1CB0C38F-8E85-4422-91C6-E1F3B9B4B853}");
|
|
|
|
SliceConverterEditorEntityContextComponent() : EditorEntityContextComponent() {}
|
|
|
|
// Simple API to selectively disable this logic *only* when performing slice to prefab conversion.
|
|
static void DisableOnContextEntityLogic()
|
|
{
|
|
m_enableOnContextEntityLogic = false;
|
|
}
|
|
|
|
protected:
|
|
|
|
void OnContextEntitiesAdded([[maybe_unused]] const EntityList& entities) override
|
|
{
|
|
if (m_enableOnContextEntityLogic)
|
|
{
|
|
EditorEntityContextComponent::OnContextEntitiesAdded(entities);
|
|
}
|
|
}
|
|
|
|
void OnContextEntityRemoved([[maybe_unused]] const AZ::EntityId& id) override
|
|
{
|
|
if (m_enableOnContextEntityLogic)
|
|
{
|
|
EditorEntityContextComponent::OnContextEntityRemoved(id);
|
|
}
|
|
}
|
|
|
|
// By default, act just like the EditorEntityContextComponent
|
|
static inline bool m_enableOnContextEntityLogic = true;
|
|
};
|
|
} // namespace AzToolsFramework
|