1845eba6ee
Fixed compile error.
...
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-12-20 16:33:36 -06:00
f23798a10a
Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:30 -06:00
f6faad4adb
Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:24 -06:00
a07534ea51
Merge commit '7e5115114ca9500abf67095acb71fbb6087d06c8' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:13 -06:00
748f2a5c05
Merge remote-tracking branch 'upstream/development' into nvsickle/GenericDomDocument
2021-12-20 11:51:15 -08:00
22df3a843e
Merge commit '6613030fe691d87c3a870f17c448746616c44787' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:19 -06:00
bb14675db7
Fix tests Debug ( #6405 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-12-20 16:53:41 +00:00
d5b9cf10cf
Collection of miscellaneous PAL changes required for restricted platforms. ( #6482 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-12-20 08:15:10 -07:00
fea4d0e6b1
adding TimeSystem unit tests ( #6446 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-12-20 14:32:25 +00:00
e58d8815f1
chore: add assertions to plane to ensure normalization
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-18 17:40:44 -08:00
2ddf55474e
chore: remove "using namespace " from AZCore Memory ( #6373 )
...
* chore: remove "using namespace " from AZCore Memory
REF: https://github.com/o3de/o3de/issues/6281
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix formatting
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix indentation for AllocatorBase.cpp
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix formatting
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: address minor checkstyle problems
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-17 13:26:31 +00:00
d20aa935ba
Quaternion to scaled-axis angle representation (and back) helpers ( #6421 )
...
Direct conversion helpers for quaternion to the scaled axis-angle representation and back without the need to convert them first to the axis-angle format and manually scale (or normalize on the way back). This also avoids having to deal with the special case of an identity representation which is 0,0,0 in the scaled axis-angle format while our convention for axis-angle is 0,1,0 for the axis and 0 for the angle.
Added unit tests that check the conversion round-trips from quaternion -> (scaled) axis-angle -> quaternion as well as comparing the scaled axis-angle representations from the direct helper functions as well as the axis-angle while manually scaling/normalizing.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-12-17 09:43:35 +01:00
34edd4d0c0
Fixed post rebase Spawnable issues.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 18:06:25 -08:00
e8366040df
Added unit test to cover the updates to the Spawnable Entities Aliases.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:22 -08:00
1efbb7216f
Addressed issues found in/by the Spawnables benchmarks and unit tests.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:17 -08:00
02137e2219
Fixed existing tests for Prefab processing.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:13 -08:00
43c42f63c6
Cleaned up some unused code in the Prefab processor.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:04 -08:00
7b5868d198
Added additional functions to edit prefabs during processing to PrefabDocument.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:00:54 -08:00
b8e3b27ea9
Added a PrefabDocument for Prefab to simplify working with Prefabs during conversion to spawnables.
...
The new PrefabDocument handles the Prefab and the Instance. This reduces the number of times the Instance has to be reloaded from the Prefab and keeps the entity ids stable between steps. The intention is for all the PrefabDocument to conceptually manipulate the Prefab DOM, although behind the scenes it will manipulate the Instance for now. The Instance should only be directly used in case the PrefabDocument doesn't provide the functionality yet.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:00:00 -08:00
9def902e1c
Fixes up parents for entities that are moved to another Prefab.
...
This fixes issues with entities that are moved to another Prefab and have a parent that was also moved to the same Prefab. Entities that have their parent moved to another Prefab continue to work as is because a placeholder entity is always left behind. Entities that are moved to another Prefab but have a parent that's still in the original Prefab will currently not work correctly. This will be a addressed in a future commit.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:51 -08:00
76a913882c
Resolving links in the Prefab Processing Stack now also makes sure that entity ids of aliased entities are appropriately unique or match.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:47 -08:00
cbea11c452
Minor performance optimization to Prefab Instance.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:43 -08:00
7e38a5f35c
Fixed entity registration issue when setting up Spawnable Entity Aliases.
...
In some cases entities created for use as a Spawnable Entity Alias would share an entity id with their original. This is no longer working due to a reverse lookup from an entity id to its PrefabDOM. Upon further investigation this turned out to not matter as instances that are created by the PrefabCatchmentProcessor would create new entity ids any way. This cause unexpected behavior at runtime as entity relations may be broken. This will be addressed in a future fix.
Testing the above also highlighted a possible double delete in the builder when aliases were registered. This has also been fixed.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:38 -08:00
016eda6cf1
Fixed infinite recursion when adding prefabs
...
While processing prefabs into spawnables new prefabs can be added for later processing. Because the new prefabs were immediately added to the list of prefabs it could happen that the new prefabs would be added to the active processor for processing, which could lead to infinite recursion. Adding prefabs while iterating prefabs now delays the addition until the iteration has completed.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:33 -08:00
18cfcd659b
Fix missing parent class reflection for ProceduralPrefabSystemComponent ( #6413 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-12-16 07:49:32 -08:00
f4ae3a5b7d
Fix: Find function reports code with a line offset of 1 ( #6331 )
...
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-16 15:39:03 +00:00
01770a1574
Fixes for CameraInput handling ( #6425 )
...
* add temporary optimize off calls
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix + tests for camera input issue
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* simplify boolean expression (PR feedback)
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-16 09:35:39 +00:00
d065eb9498
Initial improvements to fix viewport icon selection and draw order ( #6284 )
...
* wip fixes for entity viewport icons displaying in the correct order and handling selection correctly
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add additional comment about z value
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* move manual sorting and some small tidy-up
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update comment
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following initial round of PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* additional changes to support tests for entity icon intersection
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add support to enable/disable icons separately from helpers
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* final tests added and small tidy-up to display EntityId correctly
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update some manipulator test framework calls after utility functions were moved
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for implicit cast
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* move icon scale values to AZ_CVARS
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix failing tests caught in AR and update some naming conventions for tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update naming convention for members of ProjectedViewportRay
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update other references to ProjectedViewportRay
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update more references to ProjectedViewportRay change
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update menus for python tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-16 09:35:23 +00:00
10cb618ba6
Merge remote-tracking branch 'upstream/development' into nvsickle/GenericDomDocument
2021-12-15 10:24:39 -08:00
352b4ab690
Make DomValue final
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-12-15 10:23:58 -08:00
105524b7c0
Add a missing comma to fix generator
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-12-15 09:29:40 -08:00
33bfdc0bd3
corrected implementation of GetRealElapseTime ( #6422 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-12-15 16:44:38 +00:00
e2679aad57
Merge pull request #6195 from tjmgd/bug-keyword-22
...
keyword bug fixed
2021-12-15 10:00:58 -06:00
50e06ea8c5
Merge pull request #6328 from tjmgd/bug-lua-debugging-62
...
Fix: Lua script debugging loading problem
2021-12-15 09:58:11 -06:00
0a31483faa
Merge pull request #6333 from tjmgd/bug-lua-breakpoint-67
...
Fix: Lua breakpoint error
2021-12-15 09:57:54 -06:00
dc9d1a2f31
Introduced a Json Serializer for the AzCore mutable path classes
...
Added UnitTest for Json Serialization of AzCore Path types
resolves #2477
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-14 23:34:00 -06:00
2fa10d7e6a
Merge pull request #6397 from aws-lumberyard-dev/Prism/PMVS2022Check
...
Force Project Manager to generate VS2019 projects on Windows
2021-12-14 12:46:35 -08:00
7e5115114c
Merge pull request #6403 from aws-lumberyard-dev/nvsickle/FixAmbiguousTypeSerialization
...
Ensure StoreTypeName stores the correct type for generic types
2021-12-14 10:41:19 -08:00
f3d426e638
Merge pull request #4965 from aws-lumberyard-dev/APTetherLifetimeOnByDefault
...
Enable lifetime tethering of the AP by default
2021-12-14 09:31:24 -07:00
8b7cdd45a3
Merge pull request #6344 from aws-lumberyard-dev/daimini/ReadOnly/TransformResetFix
...
Disable invalid operations related to procedural prefabs in the Inspector
2021-12-14 09:33:43 -06:00
197e7b95e1
Fix for change with axis gizmo labels not appearing ( #6256 ) ( #6387 )
...
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-14 09:24:10 +00:00
f71b134a84
Ensure JsonSerializer::StoreTypeName stores the correct type for generic types
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-12-13 23:40:35 -08:00
98fa18558e
Force Project Manager to use VS2019
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-12-13 17:40:09 -08:00
aa9799a63b
Use the high perf allocator for DomValueWriter
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-12-13 15:05:17 -08:00
d951e1f652
LyShine cleanup of TODOs ( #6138 )
...
* LyShine cleanup pass for Atom conversion
Signed-off-by: abrmich <abrmich@amazon.com >
* Add GHI numbers to comments
Signed-off-by: abrmich <abrmich@amazon.com >
2021-12-14 00:00:26 +01:00
04669544cc
Remove unused trait AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS ( #6389 )
...
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-12-13 14:54:57 -08:00
7188529652
Fix for GHI-4644: mesh optimization breaking skin influences (DCO fix) ( #6336 )
...
* Average incoming skin influences when multiple vertices have been welded. This is one option which will average out the weights even if two welded vertices have differing boneIds, but we probably also need to add the influences earlier in the process and enforce a process where the vertices do not get welded if they have influences with differing boneIds
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Move skin influences from MeshBuilderSkinningInfo to the vertex attribute layers so they are considered when choosing which vertices can be welded and so they are not duplicated when compatible vertices have been welded
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Updating unit tests
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Remove unused functions
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Update based on feedback from burelc
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-12-13 13:07:04 -08:00
71bb200e0a
[LYN-7064] Hot Loading of Procedural Prefabs ( #4923 )
...
* Prefab hotloading - load and maintain asset references
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Working hotloading
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Clean up code, add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add missing includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add event for template removal.
Clear ProceduralPrefabSystemComponent lookup when templates are removed.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add unit test.
Fix missing include, make sure source name is set
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix missing include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix missing include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Update comments to make ebus event behavior more clear
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix missing include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix missing includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix missing include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix temp directory usage which doesn't work on linux
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix temp directory usage which doesn't work on linux
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Use AZ::IO::Path for comparison. Print paths on failure
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix unit test - register asset with catalog so it can be looked up later
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-12-13 12:44:41 -08:00
946a77e914
Document ValueWriter, add basic OpaqueValue handling
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-12-13 12:06:24 -08:00
af91cea8ef
Add copy-on-write note
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-12-13 11:56:53 -08:00
Mike Balfour
Nicholas Van Sickle
AMZN-Igarri
bosnichd
amzn-sean
Michael Pollind
Benjamin Jillich
AMZN-koppersr
amzn-mike
tjmgd
Tom Hulton-Harrop
AMZN-Phil
Chris Galvan
lumberyard-employee-dm
AMZN-Phil
Jeremy Ong
michabr
Steve Pham
Tommy Walton