birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,013 Commits 3 Branches 3 Tags
51ecbbca818eebbdbbdb94c66dee46eb3c2a45c9
Commit Graph

2658 Commits

Author SHA1 Message Date
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
AMZN-koppersr 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
amzn-mike 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
Tom Hulton-Harrop 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
Tom Hulton-Harrop 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
Nicholas Van Sickle 10cb618ba6 Merge remote-tracking branch 'upstream/development' into nvsickle/GenericDomDocument 2021-12-15 10:24:39 -08:00
Nicholas Van Sickle 352b4ab690 Make DomValue final 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-15 10:23:58 -08:00
amzn-sean 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
Chris Galvan 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
Chris Galvan 0a31483faa Merge pull request #6333 from tjmgd/bug-lua-breakpoint-67 
Fix: Lua breakpoint error
 2021-12-15 09:57:54 -06:00
lumberyard-employee-dm 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
Nicholas Van Sickle 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
Jeremy Ong 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
Chris Galvan 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
Tom Hulton-Harrop 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
Nicholas Van Sickle 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
Nicholas Van Sickle 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
Steve Pham 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
amzn-mike 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
Nicholas Van Sickle 946a77e914 Document ValueWriter, add basic OpaqueValue handling 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 12:06:24 -08:00
Nicholas Van Sickle af91cea8ef Add copy-on-write note 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:56:53 -08:00
amzn-mike 45abb9f88e Proc Prefabs: Remove feature toggle (#6348) 
* Disable feature flag - redirect proc prefab check to IsPrefabSystemEnabled.

Procedural Prefabs are now on by default when the prefab system is enabled.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Bump scene builder version to cause all procedural prefabs to rebuild

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to lambda for ebus call

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unused const

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-13 11:52:03 -08:00
Nicholas Van Sickle 202226c2cb Document short string usage 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:31:23 -08:00
Nicholas Van Sickle d044f51a89 Remove DomDocument for now 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:21:38 -08:00
Nicholas Van Sickle 8da04f15d3 Add some Value documentation 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 11:15:02 -08:00
Danilo Aimini 0dfb8d42c4 Disable the ability to instantiate into closed prefabs, and to move the root prefab in focus mode. (#6320) 
* Disable "Move Up" and "Move Down" for focused prefab containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable the ability to instantiate prefabs inside closed prefab instances.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor comment fix.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-13 19:10:04 +01:00
John Jones-Steele 586f146a84 Fixed nullptr error (#6386) 
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-12-13 17:56:46 +00:00
Nicholas Van Sickle 0216d0ae9f Clarify shared string semantics 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-13 09:11:06 -08:00
moraaar f941d03f9e Fix namespace Az for AZ in ProcessWatcher for iOS (#6382) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-12-13 14:03:00 +00:00
Nicholas Van Sickle e080ade885 Switch high perf allocator back on for containers, modest perf boost 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-12 14:20:16 -08:00
Nicholas Van Sickle d9ac3c2120 Tidy up Type enum 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-12 13:56:10 -08:00
Nicholas Van Sickle cc120c772c Add RapidjsonCopyAndMutate to compare w/ shallow copy 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-12 12:58:52 -08:00
Nicholas Van Sickle c53c97cf5f Add another round of benchmarks 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-11 15:54:57 -08:00
Nicholas Van Sickle 1f2635d24b Switch to the high pref heap allocator, roll back pool interface changes 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-10 16:35:26 -08:00
Nicholas Van Sickle 809ee2dce9 Fix "force string copy" logic 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-10 16:18:38 -08:00
Nicholas Van Sickle 1af39a5c5c Add benchmarks, some light optimizations like SSO 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-10 15:57:52 -08:00
Danilo Aimini c06b697c6b Revert part of the fix as it would break unit tests. Verified the remaining code still achieves the same purpose on the UI side without impacting the backend. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-10 15:06:55 -08:00
Steve Pham 4670003aaf Fix failed Atom rpi tests linux (#6319) 
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS
- Add template specialization for ConstantsData::SetConstant<Color> and ConstantsData::GetConstant<Color>
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS from source code
- Fix ConstantsData::SetConstantArray<bool> to pass unit test SetConstant_GetConstant_FalsePackedInGarbage_Bool on Linux, cause by an unwanted optimization (comments describe the situation). This will make this behavior consistent across platforms

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-10 14:54:08 -08:00
Danilo Aimini d1533914ab Disable the additional transform context menu items in the inspector. Prevent the user from reparenting entities under procprefabs using the entity picker. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-10 13:16:02 -08:00
chcurran 8357fa34e9 fixed unit testing code 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:42 -08:00
chcurran 23267fd862 SC Editor serialization update in JSON 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-12-10 11:56:41 -08:00
Chris Galvan ca5424dd7b Fixed asset completer model for source handle picker. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-10 11:56:39 -08:00