Commit Graph

5667 Commits

Author SHA1 Message Date
Junbo Liang c7397fe4a2 Fix AWSTests.periodic failing on Linux due to a File Not Found error
Signed-off-by: junbo <junbo@amazon.com>
2021-08-09 13:00:43 -07:00
carlitosan aca59c6b88 Merge pull request #2946 from aws-lumberyard-dev/carlitosan/development
Fix for failing periodic test due to editor properties name change
2021-08-09 11:58:24 -07:00
michabr bb88f1f9df Fix input not working in Ctrl-G mode after UI Editor is opened (#2948)
* Fix input not working in Ctrl-G mode after UI Editor is opened

Signed-off-by: abrmich <abrmich@amazon.com>

* Delete environment variable

Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-09 11:24:25 -07:00
Artur K 6bf6ae9485 Editor code: tidy up BOOLs,NULLs and overrides pt5. (#2876)
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 5 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
2021-08-09 13:06:29 -05:00
Benjamin Jillich c237ee352e Translate EMotionFX code to use AZStd::vector instead of MCore::Array #1611
Merge pull request #1611 from aws-lumberyard-dev/burelc/removeMCoreArray
2021-08-09 11:01:30 -07:00
Cynthia Lin b21b0e12e4 fix: Switch local environment detection to depend on BUILD_NUMBER instead of CI (#2962)
CI is only available on Jenkins v2.289.1, nightly builds are still run on Jenkins 2.277.4

Signed-off-by: Cynthia Lin <cyntlin@amazon.com>
2021-08-09 10:32:31 -07:00
Artur K fb3195d996 Reduce size of AllocationInfo struct to 64 bytes ( was 72 ) (#2771)
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-09 10:05:55 -07:00
Nicholas Lawson 12579e5d2e Fixes incorrect build dependencies for tests (#2959)
The serialize context tools were not being auto built by CI because of
this.
Added missing dependency on AzTestRunner.

Also moved the AssetBundlerBatch dependency directly in there
No reason to add it to additional_dependnecies, since its only
used for conditional inclusions.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-08-09 10:05:25 -07:00
amzn-phist f03df3e546 Fix issues with audio localization bank switching (#2945)
* Fix issues with locating and loading loc banks

The code that initially checked the g_languageAudio cvar wasn't properly
detecting when the cvar wasn't set.  Fixed an issue discovering
localized banks wasn't properly recursing into subdirectories.
Simplified handling of audio language switching for Wwise.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address feedback on PR

Change .size() == 0 to .empty()

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-09 11:51:06 -05:00
Chris Burel 04babd3cff Fix misnamed range-for loop variables
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:45 -07:00
Chris Burel bf92c283a0 Fix NvCloth tests to work with new EMotionFX API
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:43 -07:00
Chris Burel c34147d861 Fix violation of -Wrange-loop-analysis
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:42 -07:00
Chris Burel d57d263b5d Fix format strings in EMotionFX to use the correct token for size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:40 -07:00
Chris Burel 2cfee517a0 Adjust EMotionFXAtom to work with the new EMotionFX size_t API
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:38 -07:00
Chris Burel 5602507024 Fix EMotionFX Editor tests to compile with -Wshorten-64-to-32
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:36 -07:00
Chris Burel 0547a1085a Add version converter for the game controller settings, since one of its field types has changed
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:35 -07:00
Chris Burel 120ee64144 Convert EMotionFX editor uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:33 -07:00
Chris Burel 4034195bdc Convert EMotionFX runtime uint32 -> size_t
This allows the EMotionFX runtime to compile with `/we4267` enabled, which
emits a warning when converting from `size_t` to a smaller type. All tests
for the runtime have been updated accordingly, and they pass.

In instances where a range-for loop could be used, or a std algorithm, that
was used instead of using `size_t numItems = vec.size()` and a for loop.

Casts to `uint32` were removed where possible. Some places remain, like in
the file formats.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:31 -07:00
Chris Burel 8314f8caf3 Update ActorInstance uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:29 -07:00
Chris Burel 7a8f968738 Convert Pose uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:27 -07:00
Chris Burel 225798480c Fix Actor lod levels and material indexes uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:23 -07:00
Chris Burel 382ca192c8 Fix Node/Skeleton uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:17:27 -07:00
Scott Romero 0999a7f6e4 [development] s3 upload script now replicates directory structure relative to search root (#2947)
Previously the script was using the full local path as the artifact key when uploading to s3. This was causing the installer artifacts to be uploaded incorrectly and non-functional for normal use.

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-08-09 08:48:51 -07:00
Chris Burel 85c96c7596 Remove static_cast<uint32> from MemoryFile
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:38 -07:00
Chris Burel 404ab51439 uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:36 -07:00
Chris Burel 88a9a4fb5d Correct signature of MCore::MemSet to match memset
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:19 -07:00
Chris Burel 916b3a94d6 Convert MCoreCommandManager uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:18 -07:00
Chris Burel 387a1faf23 Convert IDGenerator uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:16 -07:00
Chris Burel ce139d6ae9 Remove unused HashFunctions functions
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:14 -07:00
Chris Burel 5a4b0f5770 Convert Math::Align to a template, so it doesn't depend on the uint32 type
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:12 -07:00
Chris Burel 24fa61f59e Convert DiskFile to not need uint32
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:10 -07:00
Chris Burel 38217651c5 Convert CommandSyntax uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:08 -07:00
Chris Burel f4442425ed Convert CommandManagerCallback uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:07 -07:00
Chris Burel a86e2ddf24 Convert MCore::CommandLine uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:05 -07:00
Chris Burel 889cdd8c0a Convert MCore::Command uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:03 -07:00
Chris Burel d712c54e20 Convert BoundingSphere to use int32_t to match AZ::Vector3::GetElement's signature
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:37:01 -07:00
Chris Burel b8695742d9 Convert MCore Attribute classes uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:36:59 -07:00
Chris Burel a04a0965cc Convert AlignedArray uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:36:57 -07:00
Chris Burel db622de75f Convert MCore Algorithms to use size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:36:56 -07:00
Chris Burel c3ff3f342d Update StringIdPool to use AZ::u32 instead of uint32
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:36:54 -07:00
Chris Burel 0a56c17519 Remove unused MCore::AbstractData class
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:36:52 -07:00
Chris Burel 8884227fe6 Remove MCore::Array
This translates all usages of MCore::Array to AZStd::vector. It is
designed to be as minimal of a change as possible (no changing to
range-for loops or other C++11 stuff).

We can decide to submit this wholesale, or submit it to a separate
branch that we can then integrate individual files from once we're ready
to do a specific class's transition.

It does not completely solve the `uint32`->`size_t` transition.

One important finding from doing this: `MCore::Array` uses a `memcpy`
when it reallocates. `AZStd::vector` will use the contained type's copy
or move constructor, per element. This is a significant change in
behavior. If you have type, `SomeStruct` that defines a destructor, that
type is copyable and not movable. So if you have a
`MCore::Array<SomeStruct>`, and you call `Add(); Add(); Add()`, that
reallocates 3 times, copying the contents using `memcpy`, and never
invokes `SomeStruct`'s copy constructor or destructor. Translating that
to `AZStd::vector<SomeStruct>` and calling `push_back(); push_back();
push_back();` will still reallocate 3 times, but it sees that
`SomeStruct` is non-movable, and uses the copy constructor to make the
copies, and then the destructor on the previous values. This call to the
destructor wasn't there before, and can cause things to be deleted that
weren't before. The solution to this is to make that struct be a
move-only type. Where possible, this was done by changing that type to
use `AZStd::unique_ptr` instead of a raw pointer, to get the proper move
behavior. Where that is not possible (types that inherit from
`MCore::MemoryObject`), a hand-written move constructor was created.

In general:
GetLength() becomes size()
GetMaxLength() becomes capacity()
GetIsEmpty() becomes empty()
Reserve() becomes reserve()
ReserveExact() becomes reserve()
Resize() becomes resize()
ResizeFast() becomes resize_no_construct()
Add() becomes emplace_back()
AddExact() becomes emplace_back()
AddEmpty() becomes emplace_back()
AddEmptyExact() becomes emplace_back()
GetPtr() becomes data()
GetItem() becomes at()
Shrink() becomes shrink_to_fit()
GetFirst() becomes front()
GetLast() becomes back()
Remove() becomes erase()
RemoveFirst() becomes erase()
RemoveLast() becomes pop_back()
RemoveByValue() becomes if (const auto it = AZStd::find(...); it != end(container)) container.erase(it);
Insert() becomes emplace()
Swap() becomes swap()
Clear(true) becomes clear(); shrink_to_fit()
Clear() becomes clear(); shrink_to_fit()
Clear(false) becomes clear()
Swap() becomes swap()
Find() becomes AZStd::find
MoveElements() becomes AZStd::move
SetMemoryCategory() is removed

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 08:36:43 -07:00
Guthrie Adams 211432fe5f Merge pull request #2689 from aws-lumberyard-dev/lawalfua/atomToolsMainWindow
AtomToolsMainWindow, making a base class for atom tools windows ATOM-415
2021-08-09 10:08:54 -05:00
hultonha 30c277bc56 Editor code: tidy up BOOLs,NULLs and overrides pt2.
Merge pull request #2873 from nemerle/tidy_up_editor_code_a_bit_split2
2021-08-09 15:29:54 +01:00
hultonha 3d15382fb6 Camera Component, Editor Viewport Widget refactoring.
Merge pull request #2840 from yuriy0/camera_and_editor_viewport_widget_improvements
2021-08-09 14:01:41 +01:00
hultonha 1f9e976fe4 Adding Setting to allow the user to choose the max number of items to show in the Search View
Merge pull request #1679 from aws-lumberyard-dev/LYN-4700
2021-08-09 12:52:29 +01:00
hultonha 659e486cd7 Add an integration test to validate pick mode crash (#2935)
* add an integration test to validate pick mode crash

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update to test after review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-09 11:56:19 +01:00
greerdv 5baa74ea40 Merge pull request #2944 from aws-lumberyard-dev/jonawals_SPEC-4851_staging_approved
Add previously approved changes.
2021-08-09 10:52:32 +01:00
igarri 7b5ecfb7d9 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
2021-08-09 09:32:42 +01:00
Benjamin Jillich 868d718a18 Added automatic bounding box expansion, fixed several bugs in the aabb calculations and removed node OBBs (#2871)
Merge pull request #2871 from aws-lumberyard-dev/jillich/EmfxAabbImprovements
2021-08-09 01:19:42 -07:00