birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more gems changes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-23 13:03:37 -07:00
parent 804d833bb9
commit 23f99aeb94
30 changed files with 27 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp
-2
View File
@@ -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"({
Gems/AudioSystem/Code/Source/Editor/AudioControlsLoader.cpp
-1
View File
@@ -31,7 +31,6 @@ namespace AudioControls
namespace LoaderStrings
{
static constexpr const char* LevelsSubFolder = "levels";
static constexpr const char* PathAttribute = "path";
} // namespace LoaderStrings
Gems/EMotionFX/Code/EMotionFX/Source/BlendSpace2DNode.cpp
-13
View File
@@ -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);
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp
-2
View File
@@ -156,6 +156,4 @@ namespace GraphCanvas
m_proxyWidget = nullptr;
}
}
#include <Source/Components/NodePropertyDisplays/moc_AssetIdNodePropertyDisplay.cpp>
}
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.h
-2
View File
@@ -7,13 +7,11 @@
*/
#pragma once
#if !defined(Q_MOC_RUN)
#include <AzFramework/Asset/AssetCatalogBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx>
#include <GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h>
#include <GraphCanvas/Components/NodePropertyDisplay/AssetIdDataInterface.h>
#endif
class QGraphicsProxyWidget;
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp
-2
View File
@@ -403,6 +403,4 @@ namespace GraphCanvas
m_menuDisplayDirty = true;
}
}
#include <Source/Components/NodePropertyDisplays/moc_ComboBoxNodePropertyDisplay.cpp>
}
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.h
-2
View File
@@ -9,7 +9,6 @@
class QEvent;
#if !defined(Q_MOC_RUN)
#include <AzCore/Component/EntityBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx>
@@ -18,7 +17,6 @@ class QEvent;
#include <GraphCanvas/Components/NodePropertyDisplay/ComboBoxDataInterface.h>
#include <GraphCanvas/Components/MimeDataHandlerBus.h>
#include <Widgets/GraphCanvasComboBox.h>
#endif
namespace GraphCanvas
{
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp
-2
View File
@@ -208,6 +208,4 @@ namespace GraphCanvas
m_proxyWidget = nullptr;
}
}
#include <Source/Components/NodePropertyDisplays/moc_EntityIdNodePropertyDisplay.cpp>
}
Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.h
-2
View File
@@ -9,7 +9,6 @@
class QEvent;
#if !defined(Q_MOC_RUN)
#include <AzCore/Component/EntityBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.hxx>
@@ -17,7 +16,6 @@ class QEvent;
#include <GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.h>
#include <GraphCanvas/Components/NodePropertyDisplay/EntityIdDataInterface.h>
#include <GraphCanvas/Components/MimeDataHandlerBus.h>
#endif
namespace GraphCanvas
{
Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
-2
View File
@@ -1070,8 +1070,6 @@ namespace GraphCanvas
// SceneComponent
///////////////////
static const char* k_copyPasteKey = "GraphCanvasScene";
void SceneComponent::Reflect(AZ::ReflectContext* context)
{
GraphSerialization::Reflect(context);
Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
-2
View File
@@ -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}");
Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
-8
View File
@@ -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);
Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
-1
View File
@@ -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;
Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
-6
View File
@@ -18,12 +18,6 @@
// CUiAVEventsDialog dialog
namespace
{
const int kCountSubItemIndex = 1;
const int kTimeSubItemIndex = 2;
}
class UiAVEventsModel
: public QAbstractTableModel
{
Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
-12
View File
@@ -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
}
//////////////////////////////////////////////////////////////////////////
Gems/LyShine/Code/Editor/EditorWindow.cpp
-18
View File
@@ -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;
Gems/LyShine/Code/Source/Animation/AnimNode.cpp
-9
View File
@@ -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.
//////////////////////////////////////////////////////////////////////////
Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
-12
View File
@@ -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
{
Gems/LyShine/Code/Source/RenderGraph.cpp
-3
View File
@@ -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
Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
-2
View File
@@ -42,8 +42,6 @@
#define s_nodeParams s_nodeParamsSene
#define AddSupportedParam AddSupportedParamScene
float const kDefaultCameraFOV = 60.0f;
namespace {
bool s_nodeParamsInitialized = false;
StaticInstance<std::vector<CAnimNode::SParamInfo>> s_nodeParams;
Gems/Maestro/Code/Source/Cinematics/Tests/AssetBlendTrackTest.cpp
-1
View File
@@ -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
Gems/Maestro/Code/Source/Cinematics/Tests/EntityNodeTest.cpp
-2
View File
@@ -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;
Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
-6
View File
@@ -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
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+1 -3
View File
@@ -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<ResultType>::value;\
/*static const size_t s_numResults = ScriptCanvas::Internal::extended_tuple_size<ResultType>::value;*/\
\
static const char* GetArgName(size_t i)\
{\
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp
-1
View File
@@ -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;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
-2
View File
@@ -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;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
-2
View File
@@ -16,8 +16,6 @@ namespace ScriptCanvas
{
namespace Logic
{
static const int NUMBER_OF_OUTPUTS = 8;
Sequencer::Sequencer()
: Node()
, m_selectedIndex(0)
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
-2
View File
@@ -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);
Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.cpp
+26 -2
View File
@@ -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<AtlasCoordinates> 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)
Gems/TextureAtlas/Code/Source/Editor/AtlasBuilderWorker.h
-24
View File
@@ -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<AtlasCoordinates> 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);
}