diff --git a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp index 557fbc820c..91d85c2f99 100644 --- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp +++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp @@ -30,8 +30,6 @@ static constexpr const char TEST_EXPECTED_BUCKET_TYPE[] = "AWS::S3::Bucket"; static constexpr const char TEST_EXPECTED_BUCKET_NAMEID[] = "MyTestS3Bucket"; static constexpr const char TEST_EXPECTED_SERVICE_KEYNAME[] = "TestService"; -static constexpr const char TEST_EXPECTED_RESTAPI_ID_KEYNAME[] = "TestService.RESTApiId"; -static constexpr const char TEST_EXPECTED_RESTAPI_STAGE_KEYNAME[] = "TestService.RESTApiStage"; static constexpr const char TEST_VALID_RESOURCE_MAPPING_CONFIG_FILE[] = R"({ diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp index 30889e33f0..45f044be32 100644 --- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp +++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp @@ -31,7 +31,6 @@ namespace AudioControls namespace LoaderStrings { static constexpr const char* LevelsSubFolder = "levels"; - static constexpr const char* PathAttribute = "path"; } // namespace LoaderStrings diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp index b34a860b71..03a7552410 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp @@ -24,19 +24,6 @@ namespace { - // Dimensions of the 2D grid into which we place the triangles for quick lookup - const uint32_t kGridCellCountX = 10; - const uint32_t kGridCellCountY = 10; - - AZ_FORCE_INLINE void GetBoundsOfTriangle(const AZ::Vector2 triVerts[3], - float& minX, float& minY, float& maxX, float& maxY) - { - minX = AZStd::min(triVerts[0].GetX(), AZStd::min(triVerts[1].GetX(), triVerts[2].GetX())); - minY = AZStd::min(triVerts[0].GetY(), AZStd::min(triVerts[1].GetY(), triVerts[2].GetY())); - maxX = AZStd::max(triVerts[0].GetX(), AZStd::max(triVerts[1].GetX(), triVerts[2].GetX())); - maxY = AZStd::max(triVerts[0].GetY(), AZStd::max(triVerts[1].GetY(), triVerts[2].GetY())); - } - AZ_FORCE_INLINE bool IsDegenerateTriangle(const AZ::Vector2& p0, const AZ::Vector2& p1, const AZ::Vector2& p2) { const AZ::Vector2 v01(p1 - p0); diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp index afafa8350d..ce08f9b448 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp @@ -156,6 +156,4 @@ namespace GraphCanvas m_proxyWidget = nullptr; } } - -#include } diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h index 0067d75bac..5b35386547 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h @@ -7,13 +7,11 @@ */ #pragma once -#if !defined(Q_MOC_RUN) #include #include #include #include -#endif class QGraphicsProxyWidget; diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp index 9206d32d65..6d0590ed99 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp @@ -403,6 +403,4 @@ namespace GraphCanvas m_menuDisplayDirty = true; } } - -#include } diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h index 8f0bb05421..3044456046 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h @@ -9,7 +9,6 @@ class QEvent; -#if !defined(Q_MOC_RUN) #include #include @@ -18,7 +17,6 @@ class QEvent; #include #include #include -#endif namespace GraphCanvas { diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp index 01dab4c53b..21c5fffa86 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp @@ -208,6 +208,4 @@ namespace GraphCanvas m_proxyWidget = nullptr; } } - -#include } diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h index 322ceef941..63b6d3d301 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h @@ -9,7 +9,6 @@ class QEvent; -#if !defined(Q_MOC_RUN) #include #include @@ -17,7 +16,6 @@ class QEvent; #include #include #include -#endif namespace GraphCanvas { diff --git a/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp index f236b6b1e1..52e7892364 100644 --- a/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp @@ -1070,8 +1070,6 @@ namespace GraphCanvas // SceneComponent /////////////////// - static const char* k_copyPasteKey = "GraphCanvasScene"; - void SceneComponent::Reflect(AZ::ReflectContext* context) { GraphSerialization::Reflect(context); diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp index 9b8d67aa62..bac58c3ba1 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp @@ -11,8 +11,6 @@ namespace GraphCanvas { - constexpr const char* s_graphCanvasTranslationBuilderName = "GraphCanvasTranslationBuilder"; - AZ::Uuid TranslationAssetWorker::GetUUID() { return AZ::Uuid::CreateString("{459EF910-CAAF-465A-BA19-C91979DA5729}"); diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp index dd6ee187c0..3875f76d92 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp @@ -20,14 +20,6 @@ namespace GraphCanvas static constexpr char variant[] = "variant"; static constexpr char entries[] = "entries"; } - - static const AZStd::string_view RequiredFields[] = - { - Field::key, - Field::context, - Field::variant, - Field::entries - }; } AZ_CLASS_ALLOCATOR_IMPL(TranslationFormatSerializer, AZ::SystemAllocator, 0); diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp index 533625c762..b1412a2d7c 100644 --- a/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp +++ b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp @@ -63,7 +63,6 @@ namespace { eUiAnimParamType_User, "Muted", QColor(255, 224, 224) }, }; - const int kButtonsIdBase = 0x7fff; const int kMaxRows = 20; const int kColumnWidth = 300; const int kRowHeight = 24; diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp index b45cee6948..910307c71a 100644 --- a/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp +++ b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp @@ -18,12 +18,6 @@ // CUiAVEventsDialog dialog -namespace -{ - const int kCountSubItemIndex = 1; - const int kTimeSubItemIndex = 2; -} - class UiAVEventsModel : public QAbstractTableModel { diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp index 6a3afe2036..16d3b2b921 100644 --- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp +++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp @@ -70,24 +70,12 @@ ////////////////////////////////////////////////////////////////////////// namespace { - const char* s_kUiAnimViewLayoutSection = "UiAnimViewLayout"; - const char* s_kUiAnimViewSection = "DockingPaneLayouts\\UiAnimView"; - const char* s_kSplitterEntry = "Splitter"; - const char* s_kVersionEntry = "UiAnimViewLayoutVersion"; - const char* s_kUiAnimViewSettingsSection = "UiAnimView"; const char* s_kSnappingModeEntry = "SnappingMode"; const char* s_kFrameSnappingFPSEntry = "FrameSnappingFPS"; const char* s_kTickDisplayModeEntry = "TickDisplayMode"; - const char* s_kDefaultTracksEntry = "DefaultTracks"; - - const char* s_kRebarVersionEntry = "UiAnimViewReBarVersion"; - const char* s_kRebarBandEntryPrefix = "ReBarBand"; const char* s_kNoSequenceComboBoxEntry = "--- No Sequence ---"; - - const int TRACKVIEW_LAYOUT_VERSION = 0x0001; // Bump this up on every substantial pane layout change - const int TRACKVIEW_REBAR_VERSION = 0x0002; // Bump this up on every substantial rebar change } ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/LyShine/Code/Editor/EditorWindow.cpp b/Gems/LyShine/Code/Editor/EditorWindow.cpp index 8d7e20492d..5ae1eb44b9 100644 --- a/Gems/LyShine/Code/Editor/EditorWindow.cpp +++ b/Gems/LyShine/Code/Editor/EditorWindow.cpp @@ -2103,24 +2103,6 @@ void EditorWindow::RestoreModeSettings(UiEditorMode mode) settings.endGroup(); // UI canvas editor } -static const char* UIEDITOR_UNLOAD_SAVED_CANVAS_METRIC_EVENT_NAME = "UiEditorUnloadSavedCanvas"; -static const char* UIEDITOR_CANVAS_ID_ATTRIBUTE_NAME = "CanvasId"; -static const char* UIEDITOR_CANVAS_WIDTH_METRIC_NAME = "CanvasWidth"; -static const char* UIEDITOR_CANVAS_HEIGHT_METRIC_NAME = "CanvasHeight"; -static const char* UIEDITOR_CANVAS_MAX_HIERARCHY_DEPTH_METRIC_NAME = "MaxHierarchyDepth"; -static const char* UIEDITOR_CANVAS_NUM_ELEMENT_METRIC_NAME = "NumElement"; -static const char* UIEDITOR_CANVAS_NUM_ELEMENTS_WITH_COMPONENT_PREFIX_METRIC_NAME = "Num"; -static const char* UIEDITOR_CANVAS_NUM_ELEMENTS_WITH_CUSTOM_COMPONENT_METRIC_NAME = "NumCustomElement"; -static const char* UIEDITOR_CANVAS_NUM_UNIQUE_CUSTOM_COMPONENT_NAME = "NumUniqueCustomComponent"; -static const char* UIEDITOR_CANVAS_NUM_AVAILABLE_CUSTOM_COMPONENT_NAME = "NumAvailableCustomComponent"; -static const char* UIEDITOR_CANVAS_NUM_ANCHOR_PRESETS_ATTRIBUTE_NAME = "NumAnchorPreset"; -static const char* UIEDITOR_CANVAS_NUM_ANCHOR_CUSTOM_ATTRIBUTE_NAME = "NumAnchorCustom"; -static const char* UIEDITOR_CANVAS_NUM_PIVOT_PRESETS_ATTRIBUTE_NAME = "NumPivotPreset"; -static const char* UIEDITOR_CANVAS_NUM_PIVOT_CUSTOM_ATTRIBUTE_NAME = "NumPivotCustom"; -static const char* UIEDITOR_CANVAS_NUM_ROTATED_ELEMENT_METRIC_NAME = "NumRotatedElement"; -static const char* UIEDITOR_CANVAS_NUM_SCALED_ELEMENT_METRIC_NAME = "NumScaledElement"; -static const char* UIEDITOR_CANVAS_NUM_SCALE_TO_DEVICE_ELEMENT_METRIC_NAME = "NumScaleToDeviceElement"; - int EditorWindow::GetCanvasMaxHierarchyDepth(const LyShine::EntityArray& rootChildElements) { int depth = 0; diff --git a/Gems/LyShine/Code/Source/Animation/AnimNode.cpp b/Gems/LyShine/Code/Source/Animation/AnimNode.cpp index a87dae6fbd..be7ce78c9a 100644 --- a/Gems/LyShine/Code/Source/Animation/AnimNode.cpp +++ b/Gems/LyShine/Code/Source/Animation/AnimNode.cpp @@ -41,15 +41,6 @@ ////////////////////////////////////////////////////////////////////////// static const EUiAnimCurveType DEFAULT_TRACK_TYPE = eUiAnimCurveType_BezierFloat; -// Old serialization values that are no longer -// defined in IUiAnimationSystem.h, but needed for conversion: -static const int OLD_ACURVE_GOTO = 21; -static const int OLD_APARAM_PARTICLE_COUNT_SCALE = 95; -static const int OLD_APARAM_PARTICLE_PULSE_PERIOD = 96; -static const int OLD_APARAM_PARTICLE_SCALE = 97; -static const int OLD_APARAM_PARTICLE_SPEED_SCALE = 98; -static const int OLD_APARAM_PARTICLE_STRENGTH = 99; - ////////////////////////////////////////////////////////////////////////// // CUiAnimNode. ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp index 4d178e2f10..b93453129e 100644 --- a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp +++ b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp @@ -27,18 +27,6 @@ #define s_nodeParams s_nodeParamsEnt #define AddSupportedParam AddSupportedParamEnt -static const float TIMEJUMPED_TRANSITION_TIME = 1.0f; -static const float EPSILON = 0.01f; - -static const char* s_VariablePrefixes[] = -{ - "n", "i", "b", "f", "s", "ei", "es", - "shader", "clr", "color", "vector", - "snd", "sound", "dialog", "tex", "texture", - "obj", "object", "file", "text", "equip", "reverbpreset", "eaxpreset", - "aianchor", "customaction", "gametoken", "seq_", "mission_", "seqid_", "lightanimation_" -}; - ////////////////////////////////////////////////////////////////////////// namespace { diff --git a/Gems/LyShine/Code/Source/RenderGraph.cpp b/Gems/LyShine/Code/Source/RenderGraph.cpp index 51f62fc7ad..588413783d 100644 --- a/Gems/LyShine/Code/Source/RenderGraph.cpp +++ b/Gems/LyShine/Code/Source/RenderGraph.cpp @@ -21,9 +21,6 @@ namespace LyShine { - static const char* s_maskIncrProfileMarker = "UI_MASK_STENCIL_INCR"; - static const char* s_maskDecrProfileMarker = "UI_MASK_STENCIL_DECR"; - enum UiColorOp { ColorOp_Unused = 0, // reusing shader flag value, FixedPipelineEmu shader uses 0 to mean eCO_NOSET diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp index 8f55c4ebad..10014a8700 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp @@ -42,8 +42,6 @@ #define s_nodeParams s_nodeParamsSene #define AddSupportedParam AddSupportedParamScene -float const kDefaultCameraFOV = 60.0f; - namespace { bool s_nodeParamsInitialized = false; StaticInstance> s_nodeParams; diff --git a/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp b/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp index e995795198..09bbe640d4 100644 --- a/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp @@ -20,7 +20,6 @@ namespace AssetBlendTrackTest const AZ::Data::AssetId KEY1_ASSET_ID = AZ::Data::AssetId(AZ::Uuid("{86CE36B5-D996-4CEF-943E-3F12008694E1}"), 1); const AZ::Data::AssetId KEY2_ASSET_ID = AZ::Data::AssetId(AZ::Uuid("{94D54D20-BACC-4A60-8A03-0DC9B5033E03}"), 2); const AZ::Data::AssetId KEY3_ASSET_ID = AZ::Data::AssetId(AZ::Uuid("{94D54D20-BACC-4A60-8A03-0DC9B5033E03}"), 3); - const float KEY_TIME = 1.0f; ///////////////////////////////////////////////////////////////////////////////////// // Testing sub-class diff --git a/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp b/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp index 595a5aac3c..763fa67c78 100644 --- a/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp @@ -15,8 +15,6 @@ namespace EntityNodeTest { - // dummy entity id - const int ENTITY_ID = 0; // consants to set up test key frame, at 1.0 seconds, lasting for 1.0 seconds const int KEY_IDX = 0; const float KEY_TIME = 1.0f; diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp index 37f099ec1c..17468b5cc6 100644 --- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp +++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp @@ -40,9 +40,6 @@ namespace PhysX::Benchmarks //! used in BM_Joints_Snake static const float SnakeSegmentLength = 2.5f; - //! The size of the test terrain - static const float TerrainSize = 1000.0f; - //! Constant seed to use with random number generation static const long long RandGenSeed = 74111105110116; //(Number generated by concatenating 'Joint' ascii character codes (74 111 105 110 116) @@ -82,9 +79,6 @@ namespace PhysX::Benchmarks static const float SwingingJointUpperLimit = 90.0f; static const float SwingingJointLowerLimit = -180.0f; - //newtons cradle positioning - static const float ParentNewtonsCradleSpacing = 1.05f; - static const float NewtonsCradleArmLength = 10.0f; } // namespace JointSettings } // namespace JointConstants diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h index 38b1e56f56..cb6c4bf942 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h @@ -80,9 +80,7 @@ namespace ScriptCanvas using ResultType = FunctionTraits::result_type;\ static const size_t s_numArgs = FunctionTraits::arity;\ static const size_t s_numNames = SCRIPT_CANVAS_FUNCTION_VAR_ARGS(__VA_ARGS__);\ - static const size_t s_argsSlotIndicesStart = 2;\ - static const size_t s_resultsSlotIndicesStart = s_argsSlotIndicesStart + s_numArgs;\ - static const size_t s_numResults = ScriptCanvas::Internal::extended_tuple_size::value;\ + /*static const size_t s_numResults = ScriptCanvas::Internal::extended_tuple_size::value;*/\ \ static const char* GetArgName(size_t i)\ {\ diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp index d8cdbc7585..74a41eb2c6 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp @@ -13,7 +13,6 @@ namespace SubgraphInterfaceUtilityCpp { - const constexpr size_t k_uniqueOutIndex = 0; const constexpr size_t k_signatureIndex = 1; const constexpr AZ::u64 k_defaultOutIdSignature = 0x3ACF20E73ACF20E7ull; diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp index e01a3a0e7a..cc2058f249 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp @@ -34,8 +34,6 @@ namespace ExecutionInterpretedAPICpp constexpr size_t k_StringFastSize = 32; - constexpr size_t k_MaxNodeableOuts = 64; - constexpr size_t k_UuidSize = 16; constexpr unsigned char k_Bad = 77; diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp index 2033f92430..c889c6ca17 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp @@ -16,8 +16,6 @@ namespace ScriptCanvas { namespace Logic { - static const int NUMBER_OF_OUTPUTS = 8; - Sequencer::Sequencer() : Node() , m_selectedIndex(0) diff --git a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp index f6fce5ddb5..2f51f47230 100644 --- a/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp +++ b/Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp @@ -472,8 +472,6 @@ TEST_F(ScriptCanvasTestFixture, Contracts) delete graph->GetEntity(); } -const int k_executionCount = 998; - TEST_F(ScriptCanvasTestFixture, While) { RunUnitTestGraph("LY_SC_UnitTest_While", ScriptCanvas::ExecutionMode::Interpreted); diff --git a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp index ed0d889299..abcdce99b9 100644 --- a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp +++ b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp @@ -33,6 +33,30 @@ namespace TextureAtlasBuilder { + //! Used for sorting ImageDimensions + bool operator<(ImageDimension a, ImageDimension b); + + //! Used to expose the ImageDimension in a pair to AZStd::Sort + bool operator<(IndexImageDimension a, IndexImageDimension b); + + //! Returns true if two coordinate sets overlap + bool Collides(AtlasCoordinates a, AtlasCoordinates b); + + //! Returns true if item collides with any object in list + bool Collides(AtlasCoordinates item, AZStd::vector list); + + //! Returns the portion of the second item that overlaps with the first + AtlasCoordinates GetOverlap(AtlasCoordinates a, AtlasCoordinates b); + + //! Performs an operation that copies a pixel to the output + void SetPixels(AZ::u8* dest, const AZ::u8* source, int destBytes); + + //! Checks if we can insert an image into a slot + bool CanInsert(AtlasCoordinates slot, ImageDimension image, int padding, int farRight, int farBot); + + //! Adds the necessary padding to an Atlas Coordinate + void AddPadding(AtlasCoordinates& slot, int padding, int farRight, int farBot); + //! Counts leading zeros uint32_t CountLeadingZeros32(uint32_t x) { @@ -1411,7 +1435,7 @@ namespace TextureAtlasBuilder // Defines priority so that sorting can be meaningful. It may seem odd that larger items are "less than" smaller // ones, but as this is a deduction of priority, not value, it is correct. - static bool operator<(ImageDimension a, ImageDimension b) + bool operator<(ImageDimension a, ImageDimension b) { // Prioritize first by longest size if ((a.m_width > a.m_height ? a.m_width : a.m_height) != (b.m_width > b.m_height ? b.m_width : b.m_height)) @@ -1431,7 +1455,7 @@ namespace TextureAtlasBuilder } // Exposes priority logic to the sorting algorithm - static bool operator<(IndexImageDimension a, IndexImageDimension b) { return a.second < b.second; } + bool operator<(IndexImageDimension a, IndexImageDimension b) { return a.second < b.second; } // Tests if two coordinate sets intersect bool Collides(AtlasCoordinates a, AtlasCoordinates b) diff --git a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h index 7bff2be678..86faeac616 100644 --- a/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h +++ b/Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h @@ -200,28 +200,4 @@ namespace TextureAtlasBuilder //! Returns the height of the tallest area static int GetTallest(const ImageDimensionData& imageList); }; - - //! Used for sorting ImageDimensions - static bool operator<(ImageDimension a, ImageDimension b); - - //! Used to expose the ImageDimension in a pair to AZStd::Sort - static bool operator<(IndexImageDimension a, IndexImageDimension b); - - //! Returns true if two coordinate sets overlap - static bool Collides(AtlasCoordinates a, AtlasCoordinates b); - - //! Returns true if item collides with any object in list - static bool Collides(AtlasCoordinates item, AZStd::vector list); - - //! Returns the portion of the second item that overlaps with the first - static AtlasCoordinates GetOverlap(AtlasCoordinates a, AtlasCoordinates b); - - //! Performs an operation that copies a pixel to the output - static void SetPixels(AZ::u8* dest, const AZ::u8* source, int destBytes); - - //! Checks if we can insert an image into a slot - static bool CanInsert(AtlasCoordinates slot, ImageDimension image, int padding, int farRight, int farBot); - - //! Adds the necessary padding to an Atlas Coordinate - static void AddPadding(AtlasCoordinates& slot, int padding, int farRight, int farBot); }