Parcourir la source

Gems/ScriptCanvas

Signed-off-by: Esteban Papp <[email protected]>
Esteban Papp il y a 4 ans
Parent
commit
f22d2d736b

+ 0 - 2
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Utils/NodeUtils.cpp

@@ -77,8 +77,6 @@ namespace ScriptCanvas
         {
         {
             return ConstructCustomNodeIdentifier(scriptCanvasNode->RTTI_GetType());
             return ConstructCustomNodeIdentifier(scriptCanvasNode->RTTI_GetType());
         }
         }
-
-        return NodeTypeIdentifier(0);
     }
     }
 
 
     NodeTypeIdentifier NodeUtils::ConstructEBusIdentifier(ScriptCanvas::EBusBusId ebusIdentifier)
     NodeTypeIdentifier NodeUtils::ConstructEBusIdentifier(ScriptCanvas::EBusBusId ebusIdentifier)

+ 1 - 1
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp

@@ -30,7 +30,7 @@ namespace ScriptCanvasDeveloper
 #if defined(AZ_COMPILER_MSVC)
 #if defined(AZ_COMPILER_MSVC)
         INPUT osInput = { 0 };
         INPUT osInput = { 0 };
         osInput.type = INPUT_KEYBOARD;
         osInput.type = INPUT_KEYBOARD;
-        osInput.ki.wVk = m_keyValue;
+        osInput.ki.wVk = static_cast<WORD>(m_keyValue);
 
 
         switch (m_keyAction)
         switch (m_keyAction)
         {
         {

+ 2 - 2
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp

@@ -174,8 +174,8 @@ namespace ScriptCanvasDeveloper
         osInput.type = INPUT_MOUSE;
         osInput.type = INPUT_MOUSE;
         osInput.mi.mouseData = 0;
         osInput.mi.mouseData = 0;
         osInput.mi.time = 0;
         osInput.mi.time = 0;
-        osInput.mi.dx = targetPoint.x() - currentPosition.x();
-        osInput.mi.dy = targetPoint.y() - currentPosition.y();
+        osInput.mi.dx = static_cast<LONG>(targetPoint.x() - currentPosition.x());
+        osInput.mi.dy = static_cast<LONG>(targetPoint.y() - currentPosition.y());
         osInput.mi.dwFlags = MOUSEEVENTF_MOVE;
         osInput.mi.dwFlags = MOUSEEVENTF_MOVE;
 
 
         ::SendInput(1, &osInput, sizeof(osInput));
         ::SendInput(1, &osInput, sizeof(osInput));

+ 4 - 4
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp

@@ -78,8 +78,8 @@ namespace ScriptCanvasDeveloper
     {
     {
         CompoundAction* compoundAction = aznew CompoundAction();
         CompoundAction* compoundAction = aznew CompoundAction();
 
 
-        QPoint startPoint(m_scenePoint.x() - 5, m_scenePoint.y() - 5);
-        QPoint endPoint(m_scenePoint.x() + 5, m_scenePoint.y() + 5);
+        QPoint startPoint(static_cast<int>(m_scenePoint.x() - 5.0), static_cast<int>(m_scenePoint.y() - 5.0));
+        QPoint endPoint(static_cast<int>(m_scenePoint.x() + 5.0), static_cast<int>(m_scenePoint.y() + 5.0));
 
 
         QRect sceneRect = QRect(startPoint, endPoint);
         QRect sceneRect = QRect(startPoint, endPoint);
 
 
@@ -150,8 +150,8 @@ namespace ScriptCanvasDeveloper
     {
     {
         CompoundAction* compoundAction = aznew CompoundAction();
         CompoundAction* compoundAction = aznew CompoundAction();
 
 
-        QPoint startPoint(m_scenePoint.x() - 5, m_scenePoint.y() - 5);
-        QPoint endPoint(m_scenePoint.x() + 5, m_scenePoint.y() + 5);
+        QPoint startPoint(static_cast<int>(m_scenePoint.x() - 5.0), static_cast<int>(m_scenePoint.y() - 5.0));
+        QPoint endPoint(static_cast<int>(m_scenePoint.x() + 5.0), static_cast<int>(m_scenePoint.y() + 5.0));
 
 
         QRect sceneRect = QRect(startPoint, endPoint);
         QRect sceneRect = QRect(startPoint, endPoint);
 
 

+ 1 - 1
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp

@@ -40,7 +40,7 @@ namespace ScriptCanvasDeveloper
     {
     {
         ClearActionQueue();
         ClearActionQueue();
 
 
-        QPoint targetPoint = m_targetEdit->mapToGlobal(QPoint(5, m_targetEdit->height() * 0.5f));
+        QPoint targetPoint = m_targetEdit->mapToGlobal(QPoint(5, static_cast<int>(m_targetEdit->height() * 0.5f)));
 
 
         // Cheaty clear for right now.
         // Cheaty clear for right now.
         m_targetEdit->clear();
         m_targetEdit->clear();

+ 2 - 2
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp

@@ -70,7 +70,7 @@ namespace ScriptCanvasDeveloper
 
 
                 if (dropPoint)
                 if (dropPoint)
                 {
                 {
-                    QPointF qPoint = QPoint(dropPoint->GetX(), dropPoint->GetY());
+                    QPointF qPoint = QPoint(static_cast<int>(dropPoint->GetX()), static_cast<int>(dropPoint->GetY()));
                     m_createNodeAction = aznew CreateNodeFromPaletteAction(m_nodePaletteWidget, (*graphId), m_nodeName, qPoint);
                     m_createNodeAction = aznew CreateNodeFromPaletteAction(m_nodePaletteWidget, (*graphId), m_nodeName, qPoint);
                 }
                 }
                 break;
                 break;
@@ -218,7 +218,7 @@ namespace ScriptCanvasDeveloper
 
 
                 if (dropPoint)
                 if (dropPoint)
                 {
                 {
-                    QPointF qPoint = QPoint(dropPoint->GetX(), dropPoint->GetY());
+                    QPointF qPoint = QPoint(static_cast<int>(dropPoint->GetX()), static_cast<int>(dropPoint->GetY()));
                     m_createNodeAction = aznew CreateNodeFromContextMenuAction((*graphId), m_nodeName, qPoint);
                     m_createNodeAction = aznew CreateNodeFromContextMenuAction((*graphId), m_nodeName, qPoint);
                 }
                 }
                 break;
                 break;

+ 2 - 2
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp

@@ -54,7 +54,7 @@ namespace ScriptCanvasDeveloper
                 qreal verticalPoint = boundingRect.top() + boundingRect.height() * m_offsets.m_verticalPosition;
                 qreal verticalPoint = boundingRect.top() + boundingRect.height() * m_offsets.m_verticalPosition;
                 verticalPoint += m_offsets.m_verticalOffset;
                 verticalPoint += m_offsets.m_verticalOffset;
 
 
-                AZ::Vector2 scenePoint(horizontalPoint, verticalPoint);
+                AZ::Vector2 scenePoint(static_cast<float>(horizontalPoint), static_cast<float>(verticalPoint));
                 GetStateModel()->SetStateData(m_outputId, scenePoint);
                 GetStateModel()->SetStateData(m_outputId, scenePoint);
             }
             }
         }
         }
@@ -92,7 +92,7 @@ namespace ScriptCanvasDeveloper
             qreal verticalPoint = groupBoundingBox.top() + groupBoundingBox.height() * m_offsets.m_verticalPosition;
             qreal verticalPoint = groupBoundingBox.top() + groupBoundingBox.height() * m_offsets.m_verticalPosition;
             verticalPoint += m_offsets.m_verticalPosition;
             verticalPoint += m_offsets.m_verticalPosition;
 
 
-            AZ::Vector2 scenePoint(horizontalPoint, verticalPoint);
+            AZ::Vector2 scenePoint(static_cast<float>(horizontalPoint), static_cast<float>(verticalPoint));
             GetStateModel()->SetStateData(m_outputId, scenePoint);
             GetStateModel()->SetStateData(m_outputId, scenePoint);
         }
         }
         else
         else

+ 2 - 2
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp

@@ -70,8 +70,8 @@ namespace ScriptCanvasDeveloper
                 AZ::Vector2 modifiedValue = (*position);
                 AZ::Vector2 modifiedValue = (*position);
 
 
                 QRectF sceneBoundingBox = nodeItem->sceneBoundingRect();
                 QRectF sceneBoundingBox = nodeItem->sceneBoundingRect();
-                modifiedValue.SetX(position->GetX() + sceneBoundingBox.width() * m_horizontalDimension);
-                modifiedValue.SetY(position->GetY() + sceneBoundingBox.height() * m_verticalDimension);
+                modifiedValue.SetX(position->GetX() + static_cast<float>(sceneBoundingBox.width()) * m_horizontalDimension);
+                modifiedValue.SetY(position->GetY() + static_cast<float>(sceneBoundingBox.height()) * m_verticalDimension);
 
 
                 GetStateModel()->SetStateData(m_positionId, modifiedValue);
                 GetStateModel()->SetStateData(m_positionId, modifiedValue);
             }
             }