8884227fe6
This translates all usages of MCore::Array to AZStd::vector. It is designed to be as minimal of a change as possible (no changing to range-for loops or other C++11 stuff). We can decide to submit this wholesale, or submit it to a separate branch that we can then integrate individual files from once we're ready to do a specific class's transition. It does not completely solve the `uint32`->`size_t` transition. One important finding from doing this: `MCore::Array` uses a `memcpy` when it reallocates. `AZStd::vector` will use the contained type's copy or move constructor, per element. This is a significant change in behavior. If you have type, `SomeStruct` that defines a destructor, that type is copyable and not movable. So if you have a `MCore::Array<SomeStruct>`, and you call `Add(); Add(); Add()`, that reallocates 3 times, copying the contents using `memcpy`, and never invokes `SomeStruct`'s copy constructor or destructor. Translating that to `AZStd::vector<SomeStruct>` and calling `push_back(); push_back(); push_back();` will still reallocate 3 times, but it sees that `SomeStruct` is non-movable, and uses the copy constructor to make the copies, and then the destructor on the previous values. This call to the destructor wasn't there before, and can cause things to be deleted that weren't before. The solution to this is to make that struct be a move-only type. Where possible, this was done by changing that type to use `AZStd::unique_ptr` instead of a raw pointer, to get the proper move behavior. Where that is not possible (types that inherit from `MCore::MemoryObject`), a hand-written move constructor was created. In general: GetLength() becomes size() GetMaxLength() becomes capacity() GetIsEmpty() becomes empty() Reserve() becomes reserve() ReserveExact() becomes reserve() Resize() becomes resize() ResizeFast() becomes resize_no_construct() Add() becomes emplace_back() AddExact() becomes emplace_back() AddEmpty() becomes emplace_back() AddEmptyExact() becomes emplace_back() GetPtr() becomes data() GetItem() becomes at() Shrink() becomes shrink_to_fit() GetFirst() becomes front() GetLast() becomes back() Remove() becomes erase() RemoveFirst() becomes erase() RemoveLast() becomes pop_back() RemoveByValue() becomes if (const auto it = AZStd::find(...); it != end(container)) container.erase(it); Insert() becomes emplace() Swap() becomes swap() Clear(true) becomes clear(); shrink_to_fit() Clear() becomes clear(); shrink_to_fit() Clear(false) becomes clear() Swap() becomes swap() Find() becomes AZStd::find MoveElements() becomes AZStd::move SetMemoryCategory() is removed Signed-off-by: Chris Burel <burelc@amazon.com>
67 lines
2.3 KiB
C++
67 lines
2.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/Memory/Memory.h>
|
|
#include <AzCore/std/containers/vector.h>
|
|
#include <AzQtComponents/Components/Widgets/BrowseEdit.h>
|
|
#include <EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/NodeHierarchyWidget.h>
|
|
|
|
namespace EMotionFX
|
|
{
|
|
class ActorInstance;
|
|
}
|
|
|
|
namespace EMStudio
|
|
{
|
|
class NodeSelectionWindow;
|
|
|
|
class ActorJointBrowseEdit
|
|
: public AzQtComponents::BrowseEdit
|
|
{
|
|
Q_OBJECT // AUTOMOC
|
|
|
|
public:
|
|
AZ_CLASS_ALLOCATOR_DECL
|
|
|
|
explicit ActorJointBrowseEdit(QWidget* parent = nullptr);
|
|
|
|
void SetSingleJointSelection(bool singleSelectionEnabled);
|
|
void SetSelectedJoints(const AZStd::vector<SelectionItem>& selectedJoints);
|
|
|
|
EMotionFX::ActorInstance* GetActorInstance() const;
|
|
const AZStd::vector<SelectionItem>& GetPreviouslySelectedJoints() const { return m_previouslySelectedJoints; }
|
|
|
|
signals:
|
|
// Emitted when the new joint selection got accepted from the joint selection window.
|
|
void SelectionDone(const AZStd::vector<SelectionItem>& selectedJoints);
|
|
|
|
// Selection got rejected. In case reaction happened on the SelectionChanged() signal, handle going back to the original state.
|
|
void SelectionRejected(const AZStd::vector<SelectionItem>& previouslySelectedJoints);
|
|
|
|
// Emitted while the selection window is open and selection changes (final selection via SelectionDone() signal).
|
|
void SelectionChanged(const AZStd::vector<SelectionItem>& selectedJoints);
|
|
|
|
private slots:
|
|
void OnBrowseButtonClicked();
|
|
void OnSelectionDone(const AZStd::vector<SelectionItem>& selectedJoints);
|
|
void OnSelectionChanged();
|
|
void OnSelectionRejected();
|
|
void OnTextEdited(const QString& text);
|
|
|
|
private:
|
|
void UpdatePlaceholderText();
|
|
|
|
AZStd::vector<SelectionItem> m_previouslySelectedJoints; /// Selected joints before selection window opened.
|
|
AZStd::vector<SelectionItem> m_selectedJoints;
|
|
NodeSelectionWindow* m_jointSelectionWindow = nullptr;
|
|
bool m_singleJointSelection = true;
|
|
};
|
|
} // namespace EMStudio
|