Commit Graph

236 Commits (33cbc2db219cb77d088cb15c1774c86d9b1be9aa)

Author SHA1 Message Date
Esteban Papp 3522f622f3 more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 75c388b746 change conversions to static_cast
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a6cdb1e58c Gems/EMotionFX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste bed57208da EMotionFX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan 4ceff99ba1 Prevent EMFX notifications from being modal, which was blocking input while visible.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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>
4 years ago
Benjamin Jillich 1f23297abb
[EMotionFX] Avoid using invalid Aabbs #3048
Merge pull request #3048 from aws-lumberyard-dev/burelc/SPEC-7957
4 years ago
Chris Burel c28026a022 [EMotionFX] Avoid using invalid Aabbs
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 094d06f1e3
Update EMotionFX layouts to deal with changed QObject names (#3045)
Commit 1837d05169 changed some of the EMotionFX editor's QObject names
to match their new class member names. Unfortunately this broke the
EMotionFX layouts. This recreates the good layouts to contain the new
QObject names.

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
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
4 years ago
Benjamin Jillich 6a5a7740ad
EMotion FX: Selecting Motion Properties crashes the Editor (#3005)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Luis Sempé 29c2ee9b0e
Merge pull request #3014 from aws-lumberyard-dev/burelc/removeMCoreAlignedArray
Replace `MCore::AlignedArray` with `AZStd::vector`
4 years ago
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 4 years ago
Esteban Papp c484e685d1
SPEC-2513 Fixing w4018 4 years ago
Esteban Papp 4450eb4e22 fix new warning hit
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Luis Sempé 722066dcf7
Merge pull request #2985 from aws-lumberyard-dev/burelc/removeMCoreSmallArray
Replace MCore::SmallArray usage with AZStd::vector
4 years ago
Luis Sempé 0f067187f8
Merge pull request #2986 from aws-lumberyard-dev/emfx/open_editor
Open the EMFX editor even if no asset is specified
4 years ago
Chris Burel e6259882b8 Replace `MCore::AlignedArray` with `AZStd::vector`
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
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
4 years ago
Chris Burel 0953a75a94 Replace MCore::SmallArray usage with AZStd::vector
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 1837d05169 Rename EMotionFX class members to follow the `m_` naming convention
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
lsemp3d cb52418a92 Open the EMFX editor even if no asset is specified
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Chris Burel 04babd3cff Fix misnamed range-for loop variables
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel c34147d861 Fix violation of -Wrange-loop-analysis
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel d57d263b5d Fix format strings in EMotionFX to use the correct token for size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 5602507024 Fix EMotionFX Editor tests to compile with `-Wshorten-64-to-32`
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
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>
4 years ago
Chris Burel 120ee64144 Convert EMotionFX editor uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
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>
4 years ago
Chris Burel 8314f8caf3 Update ActorInstance uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 7a8f968738 Convert Pose uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 225798480c Fix Actor lod levels and material indexes uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 382ca192c8 Fix Node/Skeleton uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 85c96c7596 Remove `static_cast<uint32>` from MemoryFile
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 404ab51439 uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 88a9a4fb5d Correct signature of MCore::MemSet to match memset
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 916b3a94d6 Convert MCoreCommandManager uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 387a1faf23 Convert IDGenerator uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel ce139d6ae9 Remove unused HashFunctions functions
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
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>
4 years ago
Chris Burel 24fa61f59e Convert DiskFile to not need uint32
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 38217651c5 Convert CommandSyntax uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel f4442425ed Convert CommandManagerCallback uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel a86e2ddf24 Convert MCore::CommandLine uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 889cdd8c0a Convert MCore::Command uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel d712c54e20 Convert BoundingSphere to use `int32_t` to match `AZ::Vector3::GetElement`'s signature
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel b8695742d9 Convert MCore Attribute classes uint32 -> size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel a04a0965cc Convert AlignedArray uint32->size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel db622de75f Convert MCore Algorithms to use size_t
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel c3ff3f342d Update StringIdPool to use AZ::u32 instead of uint32
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago