Commit Graph

57 Commits

Author SHA1 Message Date
AMZN-koppersr 976c6abb90 Build fix.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-08 13:48:20 -08:00
AMZN-koppersr c9f9a83c57 Further PR feedback on the Spawnble Entity Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-08 12:00:15 -08:00
AMZN-koppersr 567702931f Updates for the spawnable entity aliases based on provided feedback.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-04 19:10:20 -07:00
AMZN-koppersr 045a826c68 Updates to the Spawnable entity aliases based on provided feedback on PR.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-01 14:18:04 -07:00
AMZN-koppersr 6587e149b7 Added unit tests for spawnable entity aliases.
This also fixes several issues discovered through the unit tests and renames a few functions to be clearer.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-10-28 13:53:53 -07:00
AMZN-koppersr 66df146554 Fixed existing spawnable unit tests to work with entity alias changes.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-10-28 10:15:21 -07:00
AMZN-koppersr 15ea380d39 Post integration fixes and additional changes for entity aliases in spawnables.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-10-28 10:15:16 -07:00
AMZN-koppersr a05d5f5d6d Extended the Spawnable Entities Interface to allow entity aliases to be updated.
Entity aliases can now be updated as a reaction to the spawnable being loaded or at any other time afterwards through the Spawnable Entities Interface. Currently these changes are applied to the spawnable that owns the entity aliases, but once the Spawnable Entities Interface makes use of AzFramework::Scene a copy of the entity aliases should be stored in the scene and be updated instead of the spawnable.

This change also adds support for a load barrier, which acts the same as a regular barrier but also accounts for the spawnable being loaded and won't trigger the callback until has completed.
The return values in from the processing functions in the Spawnable Entities Manager now have a clearer return value to indicate whether a request has completed or is being re-queued.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-10-28 10:15:07 -07:00
AMZN-koppersr a0d7048fd4 Added support for entity aliases to Spawnable.
Entity aliases can be used to have a request to spawn an entity:
- spawn the original entity as normal
- be disabled
- redirected to another entity in another spawnable
- also spawn an entity from another spawnable
- add the components from an entity in another spawnable

An entity alias can indicate whether or not to load the spawnable dependency. If the spawnable dependency is loaded it will be loaded asynchronously because starting blocking loads in an asset handler can lead to deadlocks once there are no more jobs available to deserialize assets.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-10-28 10:15:03 -07:00
AMZN-koppersr 48f2487d3c Updates in preparation for adding entity aliases to spawnables.
The following has been changed:
- AssetDataStream can now return the stored streaming deadline and priority.
- RootSpawnable now has an event that's called just before root spawnable spawns entities. This is an immediate event unlike the other events that are queued.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-10-28 10:14:58 -07:00
Mikhail Naumov 7af448c9b7 PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-10-11 20:15:56 -05:00
Mikhail Naumov f43b3b9fbe Fixing crash creating new level when simulate mode is on
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-10-07 20:35:23 -05:00
Artur K f44169f7fa Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-29 11:31:01 -05:00
srikappa-amzn 27e93e3af7 Merge branch 'development' into Prefab/DestroyGameEntitySupport
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-28 06:57:38 -07:00
srikappa-amzn 28c056e4fd Added comments and changed some function names
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-23 18:26:39 -07:00
srikappa-amzn 3c882230ed Store the spawn ticket id inside entity instead of maintaining a map of entity to ticket
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-23 15:25:15 -07:00
AMZN-koppersr b40e049429 Added array index operators to Spawnable(Const)EntityContainerView. (#4153)
* Added array index operators to Spawnable(Const)EntityContainerView.

This commit also includes some tweaks to the begin/end functions and unit tests.

Ticket: https://github.com/o3de/o3de/issues/4110

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>

* Fixed string formatter for assert in Spawnable(Const)EntityContainerView.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>

* Added empty() to Spawnable(Const)EntityContainerView and made move functions use [[nodiscard]]

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-09-16 12:13:28 -07:00
srikappa-amzn a4af34423a Use iter_swap instead of erase
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-16 00:03:00 -07:00
srikappa-amzn 2cbd72e801 Improved comments and minor changes to accessing interfaces
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-15 14:57:54 -07:00
srikappa-amzn 619f31572e Enable destroying game entities spawned with a spawnable
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-15 13:28:15 -07:00
Mikhail Naumov bb90c4ddfe Disabling RootSpawnable warning (#3427)
* Disabling RootSpawnable warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Revert "Disabling RootSpawnable warning"

This reverts commit c14e8d93945043498ab494bf608312cf5e1ad50d.

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* commenting out warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-24 15:43:26 -07:00
moraaar dbb6c1ae46 Fixed EntitySpawnTicket move constructor (#2832)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-08-04 17:57:48 +01:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Mike Balfour db92dffb14 Fix Vegetation Modifier behavior when in-game (#1441)
* Removed a bit of dead legacy code

* Fixed entity references during spawning
Entities that had references to other entities that hadn't been spawned yet weren't getting their IDs remapped correctly, since the new ID wasn't available yet.  By pre-generating the full set of IDs, the references now remap correctly.

* Fixed up Entity References to work across multiple SpawnEntities calls
With SpawnEntities, entity references need to forward-reference to the *first* entity spawned, then from that point on backwards-reference to the *last* entity spawned.  Added that logic, along with some initial unit tests for SpawnAllEntities.

* Added more unit tests for SpawnEntities / SpawnAllEntities
2021-06-22 15:20:28 -05:00
AMZN-koppersr 4ad0560d06 Removed AddOn(De)SpawnedHandler from Spawnable Entities Interface
The calls AddOnSpawnedHandler and AddOnDespawnedHandler were removed from the SpawnableEntitiesInterface. These functions will eventually be called from multiple threads and AZ::Event currently doesn't have a thread-safe version to support this. There's also a performance concern as these callbacks are called for each individual (de)spawn requests which can lead to multiple handlers being called without information that's relevant to the callback. It would be better to batch up all (de)spawn requests per ProcessQueue call and only have a single event do a single signal. Since both events are currently not being used they have been removed for now, but can be introduced -with the previously mentioned concerns in mind- when needed.
2021-06-09 14:22:40 -07:00
AMZN-koppersr febf53671e Addressed PR feedback. 2021-06-04 11:09:44 -07:00
AMZN-koppersr 1e7ac60949 Reintroduced spawning multiple instances of the same entity
The following was changed:
- The remapper in AZ::IdUtils now has an additional argument to tell it what to do when it encounters the same source entity id. The original behavior of ignoring the new entity id and returning the first occurrence is the default. The alternative behavior is to store the last known entity id and return that instead.
- Split the optional arguments for SpawnAllEntities and SpawnEntities.
- SpawnEntities now has an option to continue with the entity mapping from a previous spawn call or to start with a fresh mapping. The latter is the default as the former will come at a performance cost since the mapping table has to be reconstructed.
- Entities spawned using SpawnEntities and ReloadEntities now also get the correct entity mapping applied.
- Added several new unit tests to cover most of the new functionality.
- Fixed some places where the older API version was still called.
2021-06-03 10:56:34 -07:00
AMZN-koppersr 8c541b5205 Moved default values to object in the Spawnable Entities Interface 2021-06-03 10:56:30 -07:00
AMZN-koppersr 1bf8c599e3 External Serialize Context for spawning
This change makes it possible to provide a Serialize Context for spawning entities from spawnables. This also removes the need for the Serialize Context to be retrieved multiple times per frame.
2021-06-03 10:56:26 -07:00
AMZN-koppersr c0dade8883 Merge branch 'main' into SpawnablePriorityQueue 2021-06-01 09:57:27 -07:00
AMZN-koppersr 2550c3e1ff Spawnable Entity Manager threshold default to "m_highPriorityThreshold" 2021-05-27 16:13:32 -07:00
AMZN-koppersr c946d57928 Addressed PR feedback. 2021-05-27 11:14:21 -07:00
sconel 07ecb938e7 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/ScriptCanvas/Integration 2021-05-26 16:45:23 -07:00
sconel b5599ca739 Add asset picker support to spawn SC node and thread safety measures 2021-05-26 16:45:04 -07:00
AMZN-koppersr 1248dc5fb4 Spawning priority threshold through SetReg
The priority threshold to consider a task high priority can now be configured through the Settings Registry under key "/O3DE/AzFramework/Spawnables/HighPriorityThreshold".
2021-05-26 16:39:24 -07:00
AMZN-koppersr e0948a26bc Fixed early ticket delete crash
This commit fixes a crash that could happen when a spawnable ticket was deleted before all requests in the queue had completed. Because of this crash the requests now only hold on to the payload of the ticket but not the ticket itself. As a side effect, callbacks can no longer provide the ticket itself so instead a unique id for the ticket is returned.
2021-05-26 14:29:39 -07:00
AMZN-koppersr 76827ff95e Added support for a priority lane for entity spawning
It's now possible to have high and normal priority calls on the spawnable entities manager. This allows for events like (de)spawning and retrieving information to be executed before already queued requests, though requests cannot be reordered on the same ticket. High priority calls are executed twice per frame, while normal priority calls are called only once.
2021-05-26 14:29:35 -07:00
AMZN-koppersr 37b53c0680 Spawnables can no longer be moved.
Spawnables had support for moving, but as the base class AZ::Data::AssetData doesn't support moving this was causing subtle issues. Moving spawnables wasn't used so it was removed.
2021-05-26 14:29:31 -07:00
AMZN-koppersr a82f4440ea Fixed release compile error 2021-05-26 10:24:15 -07:00
AMZN-koppersr e4efc467f2 Updated comment for ListEntities in SpawnableEntitiesInterface.
Updated the comment for ListEntities to be more descriptive. This hopefully clears up the confusion about what the index in a spawnable ticket exactly refers to.
2021-05-25 17:38:20 -07:00
AMZN-koppersr a807c0b4d8 Additional list function added to Spawnables.
A new list function was added to the SpawnableEntitiesInterface that list entities together with the id of the entity in the spawnable that was used to create it.
This change also include the setup for testing the SpawnableEntitiesManager plus a few tests to cover the newly added functionality.
2021-05-24 19:47:15 -07:00
sconel 31e5a312b4 Updated loadAll check to set to false if previous entities already spawned on ticket 2021-05-19 08:58:12 -07:00
sconel 4769664e9e Updating the loadAll flag after a SpawnAllCommand 2021-05-19 08:50:14 -07:00
sconel d8126d59c7 Moved to iterative clone instead of bulk, addressed PR feedback 2021-05-19 08:39:00 -07:00
sconel 8733f0e492 Remove extra newline 2021-05-18 17:16:44 -07:00
sconel 66a7db44f7 Reduced scope of change to focus on SpawnAllEntities 2021-05-18 17:13:24 -07:00
sconel fb290a27af Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix 2021-05-18 16:24:23 -07:00
sconel 8792cac88a Updating SpawnableEntitiesManager to handle entity references during spawn 2021-05-17 18:50:21 -07:00