From c19c4af1e1b381b4945fed312e1a518acad8c8d0 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 20 Aug 2021 17:57:02 -0700 Subject: [PATCH] Gems/Atom Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/Compressors/ETC2.cpp | 2 -- .../Code/Source/Converters/ColorChart.cpp | 1 - .../Code/Source/Converters/FIR-Filter.cpp | 14 ++++++------- .../Code/Source/Converters/HighPass.cpp | 3 --- .../Code/Source/ImageLoader/DdsLoader.cpp | 4 ++-- .../Code/Source/Processing/ImageConvert.cpp | 2 -- .../Source/Processing/ImageObjectImpl.cpp | 2 -- .../ImageThumbnailSystemComponent.cpp | 2 +- .../Editor/CommonFiles/Preprocessor.cpp | 3 ++- .../Source/Editor/ShaderBuilderUtility.cpp | 2 +- .../Model/ModelAssetBuilderComponent.cpp | 1 - .../Model/MorphTargetExporter.cpp | 2 -- .../RPI/Code/Tests/Buffer/BufferTests.cpp | 1 - .../Code/Tests/Common/ErrorMessageFinder.cpp | 2 +- .../Code/Tests/Image/StreamingImageTests.cpp | 1 - .../Tests/Material/MaterialAssetTests.cpp | 18 ++++++++--------- .../Material/MaterialSourceDataTests.cpp | 4 ++-- .../Tests/Material/MaterialTypeAssetTests.cpp | 20 +++++++++---------- Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp | 1 - .../Viewport/RenderViewportWidget.h | 2 -- .../MaterialEditorBrowserInteractions.cpp | 6 +++--- .../Source/Window/MaterialEditorWindow.cpp | 8 ++++---- .../EditorMaterialComponentInspector.cpp | 4 ++-- 23 files changed, 44 insertions(+), 61 deletions(-) diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp index 9c002952be..0c3d6dca3d 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp @@ -115,8 +115,6 @@ namespace ImageProcessingAtom IImageObjectPtr ETC2Compressor::CompressImage(IImageObjectPtr srcImage, EPixelFormat fmtDst, const CompressOption* compressOption) const { - const size_t srcPixelSize = 4; - //validate input EPixelFormat fmtSrc = srcImage->GetPixelFormat(); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp index 0b06e00a9f..b6e9cf4c8c 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp @@ -133,7 +133,6 @@ namespace ImageProcessingAtom IImageObjectPtr C3dLutColorChart::GenerateChartImage() { - const AZ::u32 mipCount = 1; IImageObjectPtr image(IImageObject::CreateImage(ePS_Red* ePS_Blue, ePS_Green, 1, ePixelFormat_R8G8B8A8)); { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp index 0bfdf6d672..0387ec5c7b 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp @@ -209,18 +209,18 @@ namespace ImageProcessingAtom /* addition of c-pointers already takes care of datatype-sizes */ \ const signed long int dy = /*parm->mirror ? -1 :*/ 1; \ const unsigned int stridei = parm->incols * 1 * 1; \ - const unsigned int stridet = parm->subcols * 1 * 1; \ - const unsigned int strideo = parm->outcols * 1 * 1; \ + [[maybe_unused]] const unsigned int stridet = parm->subcols * 1 * 1; \ + [[maybe_unused]] const unsigned int strideo = parm->outcols * 1 * 1; \ /* offset and shift calculations still require the unmodified values */ \ const unsigned int strideiraw = parm->incols; \ - const unsigned int stridetraw = parm->subcols; \ + [[maybe_unused]] const unsigned int stridetraw = parm->subcols; \ const unsigned int strideoraw = parm->outcols; \ \ class Plane2D tmp(tmpcols, tmprows, 4); \ dtyp*** t = (dtyp***)tmp; \ int srcPos, dstPos; \ - bool plusminush = false; const bool of = true; \ - bool plusminusv = false; const bool nc = false; \ + bool plusminush = false; [[maybe_unused]] const bool of = true; \ + bool plusminusv = false; [[maybe_unused]] const bool nc = false; \ FilterWeights* fwh = calculateFilterWeights(parm->resample.colrem, parm->caged ? 0 : 0 - parm->region.subtop, parm->caged ? srccols : parm->subrows - parm->region.subtop, \ parm->resample.colquo, 0, dstcols, reps, parm->resample.colblur, parm->resample.wf, parm->resample.operation != eWindowEvaluation_Sum, plusminush); \ FilterWeights* fwv = calculateFilterWeights(parm->resample.rowrem, parm->caged ? 0 : 0 - parm->region.intop, parm->caged ? srcrows : parm->inrows - parm->region.intop, \ @@ -833,7 +833,7 @@ namespace ImageProcessingAtom #define filterRowFetch(srcOffs, srcSize, srcSkip, dstOffs, dstSize, dstSkip) \ /* vertical stride, horizontal fetch */ \ - getCxNFromStreamSwapped(srcSkip, i); \ + /* getCxNFromStreamSwapped(srcSkip, i); Expands to nothing */ \ getCxNFromStream(srcSkip, i); \ getCxNFromPlane(1); \ \ @@ -935,7 +935,7 @@ namespace ImageProcessingAtom comcpyCHistogram(); \ \ /* horizontal stride, vertical store */ \ - putCxNToStreamSwapped(dstSkip, o); \ + /* putCxNToStreamSwapped(dstSkip, o); Expands to nothing */ \ putCxNToStream(dstSkip, o); \ putCxNToPlane(1); \ \ diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp index eefd5332be..e2071fb586 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp @@ -58,9 +58,6 @@ namespace ImageProcessingAtom // linear interpolation FilterImage(MipGenType::triangle, MipGenEvalType::sum, 0.0f, 0.0f, m_img, dwMipDown, newImage, dstMip, NULL, NULL); - const AZ::u32 pixelCountIn = m_img->GetWidth(dstMip) * m_img->GetHeight(dstMip); - const AZ::u32 pixelCountOut = newImage->GetWidth(dstMip) * newImage->GetHeight(dstMip); - //substraction AZ::u8* srcPixelBuf; AZ::u32 srcPitch; diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp index b9054a9911..20367227bd 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp @@ -87,7 +87,7 @@ namespace ImageProcessingAtom if (dxgiFormat != DXGI_FORMAT_UNKNOWN) { int i = 0; - for (i; i < ePixelFormat_Count; i++) + for (; i < ePixelFormat_Count; i++) { const PixelFormatInfo* info = CPixelFormats::GetInstance().GetPixelFormatInfo((EPixelFormat)i); if (static_cast(info->d3d10Format) == dxgiFormat) @@ -506,7 +506,7 @@ namespace ImageProcessingAtom if (dxgiFormat != DXGI_FORMAT_UNKNOWN) { uint32_t i = 0; - for (i; i < ePixelFormat_Count; i++) + for (; i < ePixelFormat_Count; i++) { const PixelFormatInfo* info = CPixelFormats::GetInstance().GetPixelFormatInfo((EPixelFormat)i); if (static_cast(info->d3d10Format) == dxgiFormat) diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp index 9abb6de300..3f28e89334 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp @@ -603,8 +603,6 @@ namespace ImageProcessingAtom const bool isCompressing = isSourceFormatUncompressed ? true : false; const EPixelFormat outputFormat = isCompressing ? destinationFormat : sourceFormat; - const uint32_t imageWidth = m_image->Get()->GetWidth(0); - const uint32_t imageHeight = m_image->Get()->GetHeight(0); ICompressorPtr compressor = ICompressor::FindCompressor(outputFormat, m_input->m_presetSetting.m_destColorSpace, isCompressing); // find out if the compressor has a preference to any specific colorspace diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp index fd3923d7bf..8504f5e074 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp @@ -241,8 +241,6 @@ namespace ImageProcessingAtom // clone this image-object's contents IImageObject* CImageObject::Clone(uint32_t maxMipCount) const { - const EPixelFormat srcPixelformat = GetPixelFormat(); - IImageObject* outImage = AllocateImage(maxMipCount); AZ::u32 mips = outImage->GetMipCount(); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp index 7e4d29e23c..5a41411d86 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp @@ -180,7 +180,7 @@ namespace ImageProcessingAtom // Dispatch event on main thread AZ::SystemTickBus::QueueFunction( [ - thumbnailKey, thumbnailSize, + thumbnailKey, pixmap = QPixmap::fromImage(image.scaled(QSize(thumbnailSize, thumbnailSize), Qt::KeepAspectRatio, Qt::SmoothTransformation)) ]() mutable { diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp index 9c77ae6b35..9c1b3a78ca 100644 --- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp +++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp @@ -154,7 +154,8 @@ namespace AZ // Remark: for MacOS & Linux it is important to call va_start again before // each call to azvsnprintf. Not required for Windows. va_start(args, format); - count = azvscprintf(format, args) + 1; // vscprintf returns a size that doesn't include the null character. + count = azvscprintf(format, args); + count += 1; // vscprintf returns a size that doesn't include the null character. va_end(args); biggerData.reset(new char[count]); diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp index 0018f2ead8..450631eaae 100644 --- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp +++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp @@ -517,7 +517,7 @@ namespace AZ { // Search the function name into the list of valid entry points into the shader. auto findId = - AZStd::find_if(shaderEntryPoints.begin(), shaderEntryPoints.end(), [&functionName, &mask](const auto& item) { + AZStd::find_if(shaderEntryPoints.begin(), shaderEntryPoints.end(), [&functionName](const auto& item) { return item.first == functionName; }); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp index 13e5714b52..5fcbcd7180 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp @@ -959,7 +959,6 @@ namespace AZ size_t numInfluencesAdded = 0; for (const auto& skinData : sourceMesh.m_skinData) { - const size_t numJoints = skinData->GetBoneCount(); const AZ::u32 controlPointIndex = sourceMeshData->GetControlPointIndex(static_cast(vertexIndex)); const size_t numSkinInfluences = skinData->GetLinkCount(controlPointIndex); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp index fa437c002f..44141f3ae3 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MorphTargetExporter.cpp @@ -149,8 +149,6 @@ namespace AZ::RPI const float tolerance = CalcPositionDeltaTolerance(sourceMesh); AZ::Aabb deltaPositionAabb = AZ::Aabb::CreateNull(); - const uint32_t numFaces = blendShapeData->GetFaceCount(); - AZStd::vector& packedCompressedMorphTargetVertexData = productMesh.m_morphTargetVertexData; MorphTargetMetaAsset::MorphTarget metaData; diff --git a/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp b/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp index f648de6997..a2f478901c 100644 --- a/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Buffer/BufferTests.cpp @@ -616,7 +616,6 @@ namespace UnitTest Data::Asset asset; creator.End(asset); - bufferInfo.m_bufferDescriptor.m_byteCount; Data::Instance bufferInst = RPI::Buffer::FindOrCreate(asset); ASSERT_NE(bufferInst.get(), nullptr); diff --git a/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp index 7ffdffbb14..fa88f145a6 100644 --- a/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp +++ b/Gems/Atom/RPI/Code/Tests/Common/ErrorMessageFinder.cpp @@ -105,7 +105,7 @@ namespace UnitTest { EXPECT_FALSE(m_disabled); - AZStd::for_each(m_expectedErrors.begin(), m_expectedErrors.end(), [this](ExpectedError& expectedError) { expectedError.m_gotCount = 0; }); + AZStd::for_each(m_expectedErrors.begin(), m_expectedErrors.end(), [](ExpectedError& expectedError) { expectedError.m_gotCount = 0; }); m_checked = false; } diff --git a/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp b/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp index 3836f5c8f5..345637bfe5 100644 --- a/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Image/StreamingImageTests.cpp @@ -490,7 +490,6 @@ namespace UnitTest const uint16_t mipLevels = 1; const uint16_t arraySize = 1; - const uint16_t pixelSize = 4; Data::Asset mipChain; diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp index 0b30b723d6..ce223ceb35 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp @@ -267,47 +267,47 @@ namespace UnitTest creator.SetPropertyValue(Name{ "MyBool" }, m_testImageAsset); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyInt" }, 0.0f); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyUInt" }, -1); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat" }, 10u); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat2" }, 1.0f); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat3" }, AZ::Vector4{}); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat4" }, AZ::Vector3{}); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyColor" }, MaterialPropertyValue(false)); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyImage" }, true); }); - expectCreatorError([this](MaterialAssetCreator& creator) + expectCreatorError([](MaterialAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyEnum" }, -1); }); diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp index a20d16b0d6..553c3243e1 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp @@ -566,7 +566,7 @@ namespace UnitTest // We use local functions to easily start a new MaterialAssetCreator for each test case because // the AssetCreator would just skip subsequent operations after the first failure is detected. - auto expectError = [this](AZStd::function setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 2) + auto expectError = [](AZStd::function setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 2) { MaterialSourceData sourceData; @@ -583,7 +583,7 @@ namespace UnitTest EXPECT_FALSE(materialAssetOutcome.IsSuccess()); }; - auto expectWarning = [this](AZStd::function setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 1) + auto expectWarning = [](AZStd::function setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 1) { MaterialSourceData sourceData; diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp index 6b788addc7..e11a049af2 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp @@ -413,7 +413,7 @@ namespace UnitTest EXPECT_EQ(1, creator.GetErrorCount()); }; - auto expectCreatorWarning = [this](AZStd::function passBadInput) + auto expectCreatorWarning = [](AZStd::function passBadInput) { MaterialTypeAssetCreator creator; creator.Begin(Uuid::CreateRandom()); @@ -442,47 +442,47 @@ namespace UnitTest creator.SetPropertyValue(Name{ "MyBool" }, m_testImageAsset); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyInt" }, 0.0f); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyUInt" }, -1); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat" }, 10u); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat2" }, 1.0f); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat3" }, AZ::Vector4{}); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyFloat4" }, AZ::Vector3{}); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyColor" }, MaterialPropertyValue(false)); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyImage" }, true); }); - expectCreatorError([this](MaterialTypeAssetCreator& creator) + expectCreatorError([](MaterialTypeAssetCreator& creator) { creator.SetPropertyValue(Name{ "MyEnum" }, -1); }); diff --git a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp index ff998ad4d3..7b07e14de0 100644 --- a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp @@ -783,7 +783,6 @@ namespace UnitTest const uint32_t vertexCount = 36; const uint32_t vertexSize = sizeof(float) * 3; - const uint32_t vertexBufferSize = vertexCount * vertexSize; RHI::BufferViewDescriptor validStreamBufferViewDescriptor = RHI::BufferViewDescriptor::CreateStructured(0, vertexCount, vertexSize); diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h index bb26e116af..1dad34cdb5 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h @@ -160,8 +160,6 @@ namespace AtomToolsFramework QElapsedTimer m_renderTimer; // The time of the last recorded tick event from the system tick bus. AZ::ScriptTimePoint m_time; - // Whether the Viewport is currently hiding and capturing the cursor position. - bool m_capturingCursor = false; // The viewport settings (e.g. grid snapping, grid size) for this viewport. const AzToolsFramework::ViewportInteraction::ViewportSettings* m_viewportSettings = nullptr; // Maps our internal Qt events into AzFramework InputChannels for our ViewportControllerList. diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp index 3440d9c316..e6ffd2842f 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp @@ -125,7 +125,7 @@ namespace MaterialEditor QDesktopServices::openUrl(QUrl::fromLocalFile(entry->GetFullPath().c_str())); }); - menu->addAction("Duplicate...", [entry, caller]() + menu->addAction("Duplicate...", [entry]() { const QFileInfo duplicateFileInfo(AtomToolsFramework::GetDuplicationFileInfo(entry->GetFullPath().c_str())); if (!duplicateFileInfo.absoluteFilePath().isEmpty()) @@ -156,7 +156,7 @@ namespace MaterialEditor AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument, entry->GetFullPath()); }); - menu->addAction("Duplicate...", [entry, caller]() + menu->addAction("Duplicate...", [entry]() { const QFileInfo duplicateFileInfo(AtomToolsFramework::GetDuplicationFileInfo(entry->GetFullPath().c_str())); if (!duplicateFileInfo.absoluteFilePath().isEmpty()) @@ -285,7 +285,7 @@ namespace MaterialEditor }); // add get latest action - m_getLatestAction = sourceControlMenu->addAction("Get Latest", [path, this]() + m_getLatestAction = sourceControlMenu->addAction("Get Latest", [path]() { SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestLatest, path.c_str(), [](bool, const SourceControlFileInfo&) {}); diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp index 8922591580..4c742d4ee1 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp @@ -304,7 +304,7 @@ namespace MaterialEditor } }, QKeySequence::New); - m_actionOpen = m_menuFile->addAction("&Open...", [this]() { + m_actionOpen = m_menuFile->addAction("&Open...", []() { const AZStd::vector assetTypes = { azrtti_typeid() }; const AZStd::string filePath = AtomToolsFramework::GetOpenFileInfo(assetTypes).absoluteFilePath().toUtf8().constData(); if (!filePath.empty()) @@ -369,7 +369,7 @@ namespace MaterialEditor AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId); }, QKeySequence::Close); - m_actionCloseAll = m_menuFile->addAction("Close All", [this]() { + m_actionCloseAll = m_menuFile->addAction("Close All", []() { AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments); }); @@ -436,7 +436,7 @@ namespace MaterialEditor SetDockWidgetVisible(label, !IsDockWidgetVisible(label)); }); - m_actionConsole = m_menuView->addAction("&Console", [this]() { + m_actionConsole = m_menuView->addAction("&Console", []() { }); m_actionPythonTerminal = m_menuView->addAction("Python &Terminal", [this]() { @@ -471,7 +471,7 @@ namespace MaterialEditor dialog.exec(); }); - m_actionAbout = m_menuHelp->addAction("&About...", [this]() { + m_actionAbout = m_menuHelp->addAction("&About...", []() { }); } diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp index f4c255d774..b9a4adc068 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp @@ -214,7 +214,7 @@ namespace AZ groupNameId.c_str())); auto propertyGroupWidget = new AtomToolsFramework::InspectorPropertyGroupWidget( &group, &group, group.TYPEINFO_Uuid(), this, this, saveStateKey, - [this](const AzToolsFramework::InstanceDataNode* source, const AzToolsFramework::InstanceDataNode* target) { + [](const AzToolsFramework::InstanceDataNode* source, const AzToolsFramework::InstanceDataNode* target) { AZ_UNUSED(source); const AtomToolsFramework::DynamicProperty* property = AtomToolsFramework::FindDynamicPropertyForInstanceDataNode(target); return property && AtomToolsFramework::ArePropertyValuesEqual(property->GetValue(), property->GetConfig().m_parentValue); @@ -267,7 +267,7 @@ namespace AZ groupNameId.c_str())); auto propertyGroupWidget = new AtomToolsFramework::InspectorPropertyGroupWidget( &group, &group, group.TYPEINFO_Uuid(), this, this, saveStateKey, - [this](const AzToolsFramework::InstanceDataNode* source, const AzToolsFramework::InstanceDataNode* target) { + [](const AzToolsFramework::InstanceDataNode* source, const AzToolsFramework::InstanceDataNode* target) { AZ_UNUSED(source); const AtomToolsFramework::DynamicProperty* property = AtomToolsFramework::FindDynamicPropertyForInstanceDataNode(target); return property && AtomToolsFramework::ArePropertyValuesEqual(property->GetValue(), property->GetConfig().m_parentValue);