From f0fa62bde3f962adc2a6ff5f797fb16048e66c3b Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:46:48 -0700 Subject: [PATCH] PR comments/observations Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../AzFramework/Physics/Common/PhysicsTypes.h | 2 +- .../Code/Editor/Animation/UiAnimViewNodes.cpp | 72 ------------------- 2 files changed, 1 insertion(+), 73 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h index 30f3fb6297..26dfcd3b77 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h +++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsTypes.h @@ -56,7 +56,7 @@ namespace AzPhysics //! A handle to a Scene within the physics simulation. //! A SceneHandle is a tuple of a Crc of the scenes name and the index in the Scene list. using SceneHandle = AZStd::tuple; - static constexpr SceneHandle InvalidSceneHandle = { AZ::Crc32(), AZ::s8(-1) }; + static constexpr SceneHandle InvalidSceneHandle = { AZ::Crc32(), SceneIndex(-1) }; //! Ease of use type for referencing a List of SceneHandle objects. using SceneHandleList = AZStd::vector; diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp index 3df400ddf2..74d2c7d4fb 100644 --- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp +++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp @@ -99,84 +99,12 @@ protected: { // For now we do not support any drag and drop in the Nodes pane return; - - //CUiAnimViewNodesCtrl::CRecord* pRecord = (CUiAnimViewNodesCtrl::CRecord*) itemAt(event->pos()); - //if (!pRecord) - //{ - // return; - //} - //CUiAnimViewNode* pTargetNode = pRecord->GetNode(); - // - //QTreeWidget::dragMoveEvent(event); - //if (!event->isAccepted()) - //{ - // return; - //} - // - //if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/) - //{ - // CUiAnimViewAnimNode* pDragTarget = static_cast(pTargetNode); - // bool bAllValidReparenting = true; - // QList nodes = draggedNodes(event); - // Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes) - // { - // if (!pDraggedNode->IsValidReparentingTo(pDragTarget)) - // { - // bAllValidReparenting = false; - // break; - // } - // } - // - // if (!bAllValidReparenting) - // { - // event->ignore(); - // } - // - // return; - //} } void dropEvent([[maybe_unused]] QDropEvent* event) { // For now we do not support any drag and drop in the Nodes pane return; - - //CUiAnimViewNodesCtrl::CRecord* pRecord = (CUiAnimViewNodesCtrl::CRecord*) itemAt(event->pos()); - //if (!pRecord) - //{ - // return; - //} - //CUiAnimViewNode* pTargetNode = pRecord->GetNode(); - // - //QTreeWidget::dropEvent(event); - //if (!event->isAccepted()) - //{ - // return; - //} - // - //if (pTargetNode && pTargetNode->IsGroupNode() /*&& !m_draggedNodes.DoesContain(pTargetNode)*/) - //{ - // CUiAnimViewAnimNode* pDragTarget = static_cast(pTargetNode); - // bool bAllValidReparenting = true; - // QList nodes = draggedNodes(event); - // Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes) - // { - // if (!pDraggedNode->IsValidReparentingTo(pDragTarget)) - // { - // bAllValidReparenting = false; - // break; - // } - // } - // - // if (bAllValidReparenting) - // { - // UiAnimUndo undo("Drag and Drop UiAnimView Nodes"); - // Q_FOREACH(CUiAnimViewAnimNode * pDraggedNode, nodes) - // { - // pDraggedNode->SetNewParent(pDragTarget); - // } - // } - //} } void keyPressEvent(QKeyEvent* event)