Browse Source

fix warnigns after merge

Signed-off-by: Esteban Papp <[email protected]>
Esteban Papp 4 years ago
parent
commit
0c6a838c6f

+ 2 - 2
Code/Editor/ViewportManipulatorController.cpp

@@ -113,8 +113,8 @@ namespace SandboxEditor
                     windowSize, event.m_windowHandle, &AzFramework::WindowRequestBus::Events::GetClientAreaSize);
 
                 auto screenPoint = AzFramework::ScreenPoint(
-                    position->m_normalizedPosition.GetX() * windowSize.m_width,
-                    position->m_normalizedPosition.GetY() * windowSize.m_height);
+                    static_cast<int>(position->m_normalizedPosition.GetX() * windowSize.m_width),
+                    static_cast<int>(position->m_normalizedPosition.GetY() * windowSize.m_height));
 
                 m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPoint;
                 AZStd::optional<ProjectedViewportRay> ray;

+ 4 - 4
Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp

@@ -300,11 +300,11 @@ namespace AzToolsFramework
         // Generate movement events based on the pixel delta divided by the DPI scaling factor, to calculate a rough approximation
         // of cursor movement velocity.
         movementXChannel->ProcessRawInputEvent(
-            m_mouseDevice->m_cursorPositionData2D->m_normalizedPositionDelta.GetX() * aznumeric_cast<float>(m_sourceWidget->width()) /
-            m_sourceWidget->devicePixelRatioF());
+            static_cast<float>(m_mouseDevice->m_cursorPositionData2D->m_normalizedPositionDelta.GetX() * aznumeric_cast<float>(m_sourceWidget->width()) /
+            m_sourceWidget->devicePixelRatioF()));
         movementYChannel->ProcessRawInputEvent(
-            m_mouseDevice->m_cursorPositionData2D->m_normalizedPositionDelta.GetY() * aznumeric_cast<float>(m_sourceWidget->height()) /
-            m_sourceWidget->devicePixelRatioF());
+            static_cast<float>(m_mouseDevice->m_cursorPositionData2D->m_normalizedPositionDelta.GetY() * aznumeric_cast<float>(m_sourceWidget->height()) /
+            m_sourceWidget->devicePixelRatioF()));
         mouseWheelChannel->ProcessRawInputEvent(0.0f);
 
         NotifyUpdateChannelIfNotIdle(systemCursorChannel, nullptr);

BIN
Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/temp/128x128_RGBA8.tga.streamingimage


+ 1 - 1
Gems/Atom/Asset/Shader/Code/Tests/McppBinderTests.cpp

@@ -32,7 +32,7 @@ namespace UnitTest
         {
             for (int bufferPos = 0, rollback = 0; bufferPos < (bufferSize - 1); ++bufferPos)
             {
-                const char value = 'a' + rollback++;
+                const char value = 'a' + static_cast<char>(rollback++);
                 buffer[bufferPos] = value;
                 if (value == 'z')
                 {

+ 7 - 7
Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocument.cpp

@@ -38,30 +38,30 @@ namespace AtomToolsFramework
         return m_relativePath;
     }
 
-    const AZStd::any& AtomToolsDocument::GetPropertyValue(const AZ::Name& propertyFullName) const
+    const AZStd::any& AtomToolsDocument::GetPropertyValue([[maybe_unused]] const AZ::Name& propertyFullName) const
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
         return m_invalidValue;
     }
 
-    const AtomToolsFramework::DynamicProperty& AtomToolsDocument::GetProperty(const AZ::Name& propertyFullName) const
+    const AtomToolsFramework::DynamicProperty& AtomToolsDocument::GetProperty([[maybe_unused]] const AZ::Name& propertyFullName) const
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
         return m_invalidProperty;
     }
     
-    bool AtomToolsDocument::IsPropertyGroupVisible(const AZ::Name& propertyGroupFullName) const
+    bool AtomToolsDocument::IsPropertyGroupVisible([[maybe_unused]] const AZ::Name& propertyGroupFullName) const
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
         return false;
     }
 
-    void AtomToolsDocument::SetPropertyValue(const AZ::Name& propertyFullName, const AZStd::any& value)
+    void AtomToolsDocument::SetPropertyValue([[maybe_unused]] const AZ::Name& propertyFullName, [[maybe_unused]] const AZStd::any& value)
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
     }
 
-    bool AtomToolsDocument::Open(AZStd::string_view loadPath)
+    bool AtomToolsDocument::Open([[maybe_unused]] AZStd::string_view loadPath)
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
         return false;
@@ -79,14 +79,14 @@ namespace AtomToolsFramework
         return false;
     }
 
-    bool AtomToolsDocument::SaveAsCopy(AZStd::string_view savePath)
+    bool AtomToolsDocument::SaveAsCopy([[maybe_unused]] AZStd::string_view savePath)
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
         return false;
     }
 
 
-    bool AtomToolsDocument::SaveAsChild(AZStd::string_view savePath)
+    bool AtomToolsDocument::SaveAsChild([[maybe_unused]] AZStd::string_view savePath)
     {
         AZ_Error("AtomToolsDocument", false, "%s not implemented.", __FUNCTION__);
         return false;