Commit Graph

331 Commits

Author SHA1 Message Date
Esteban Papp 14e7754334 More fixes for warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:09 -07:00
Esteban Papp 1d4c53a777 More fixes for Gems
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:03 -07:00
pappeste 9b7dea6703 EMotionFX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:40:17 -07:00
Esteban Papp 3522f622f3 more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:06:20 -07:00
Esteban Papp 75c388b746 change conversions to static_cast
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:43 -07:00
Esteban Papp a6cdb1e58c Gems/EMotionFX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:33 -07:00
pappeste bed57208da EMotionFX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:03:44 -07:00
Chris Galvan 4ceff99ba1 Prevent EMFX notifications from being modal, which was blocking input while visible.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-12 12:10:13 -05:00
Benjamin Jillich 87922af706 Jack remains in A-pose while it's animation is playing (#3038)
* Removed a couple of legacy cgf/mtl and removed unused texture files.
* Replaced Jack with the correct version (the previous version had different joint names than the animations used).
* Increased the version in the actor group exporter to reprocess the actors due to PR #2957

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-08-12 09:07:04 +02:00
Benjamin Jillich 1f23297abb [EMotionFX] Avoid using invalid Aabbs #3048
Merge pull request #3048 from aws-lumberyard-dev/burelc/SPEC-7957
2021-08-12 00:06:42 -07:00
Chris Burel c28026a022 [EMotionFX] Avoid using invalid Aabbs
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-11 16:39:15 -07:00
Esteban Papp 9f7d280a1e Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ResourceSelectorHost.cpp
2021-08-11 07:55:26 -07:00
Benjamin Jillich 6a5a7740ad EMotion FX: Selecting Motion Properties crashes the Editor (#3005)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-08-11 09:45:27 +02:00
Luis Sempé 29c2ee9b0e Merge pull request #3014 from aws-lumberyard-dev/burelc/removeMCoreAlignedArray
Replace `MCore::AlignedArray` with `AZStd::vector`
2021-08-10 14:48:16 -07:00
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 2021-08-10 14:30:07 -07:00
Esteban Papp c484e685d1 SPEC-2513 Fixing w4018 2021-08-10 14:28:29 -07:00
Esteban Papp 4450eb4e22 fix new warning hit
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 13:24:57 -07:00
Luis Sempé 722066dcf7 Merge pull request #2985 from aws-lumberyard-dev/burelc/removeMCoreSmallArray
Replace MCore::SmallArray usage with AZStd::vector
2021-08-10 12:03:37 -07:00
Luis Sempé 0f067187f8 Merge pull request #2986 from aws-lumberyard-dev/emfx/open_editor
Open the EMFX editor even if no asset is specified
2021-08-10 11:57:53 -07:00
Chris Burel e6259882b8 Replace MCore::AlignedArray with AZStd::vector
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-10 11:39:51 -07:00
Esteban Papp ec1a08d487 Merge branch 'development' into cmake/SPEC-7484
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ConfigGroup.cpp
#	Code/Editor/ControlMRU.cpp
#	Code/Editor/CryEdit.cpp
#	Code/Editor/CryEdit.h
#	Code/Editor/IEditorImpl.cpp
#	Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
2021-08-10 09:23:34 -07:00
Chris Burel 0953a75a94 Replace MCore::SmallArray usage with AZStd::vector
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-10 08:44:23 -07:00
Chris Burel 1837d05169 Rename EMotionFX class members to follow the m_ naming convention
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 16:40:35 -07:00
lsemp3d cb52418a92 Open the EMFX editor even if no asset is specified
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-09 13:05:23 -07: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 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 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
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