Commit Graph

40 Commits

Author SHA1 Message Date
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
srikappa 4d90b7cfb6 Fix bug with detachPrefab incorrectly replacing old entity aliases in patches 2021-06-18 11:19:59 -07:00
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 2021-06-11 17:45:46 -07:00
sconel 38b1a89631 Merge pull request #1233 from aws-lumberyard-dev/Prefabs/NestedContainerExport
Fix issue involving missing parent container entities in spawnables
2021-06-10 16:28:56 -07:00
Mike Balfour ffe913a2d6 Added ability to convert multiply-nested slices (#1239) (#1245)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.

(cherry picked from commit 86136ddfa6)
2021-06-10 16:16:03 -05:00
sconel 856daf1485 Addressed PR feedback 2021-06-10 10:46:36 -07:00
sconel 2dee4d3ac9 Add support to export nested container entities. Resolves missing parents in spawnables 2021-06-09 17:37:41 -07:00
Danilo Aimini 80f62d0523 LYN-3708 | Optimize Prefab instance propagation to stabilize UX (#700)
* Add instanceToIgnore to calls leading to instances being added to the queue for propagation.

* Change PrefabUndoEntityUpdate to make it so that the instance triggering the prefab template change is not reloaded on propagation, since it will already be up to date due to the way we generated the patch to begin with.

* Add FindPrefabDomValue utility function for paths

* Expose the level root prefab template id in the Prefab EOS Interface

* Fix Instance Alias Path generation to work with the new FindValueInPrefabDom function

* Stop reloading ancestors on propagation, and fix instance reloading so that the level dom is used (and overrides are preserved)

* Remove commented out code, refactor FindPrefabDomValue for paths (was handling an edge case incorrectly, and it's not even triggered)

* Fix issue with PathView reference - with PathView already being a reference, this resulted in a copy and triggered a warning during automated review builds.

* Additional fix to the build warning, remove redundant error message

* Revert changes to Instance::GetAbsoluteInstanceAliasPath(), as they were impacting serialization.

* Remove the dependency to the level root prefab template in the propagation code, climb up the hierarchy instead. This allows tests to work despite not using the EOS properly.
Also use PrefabDomPaths to retrieve the instance dom from the root dom instead of iterating.

* Remove now unused PrefabDomUtils function, extend optimization to link updates.

* Trigger a full instance propagation to correctly refresh alias references.
This is an issue in the test because some operations are called from the backend API and will not trigger propagation properly. Tests will soon be rewritten to more properly represent frontend workflows.

* Fixes lingering issues with propagation:
- Restores code that fixes the selection if entityIds have changed;
- Fixes Do() function on link update. Prefab containers will propagate correctly while still being stable during editing.

* Remove GetRootPrefabInstanceTemplateId (no longer necessary after the code has been rewritten)

* Fix optimization code to account for instances being removed and propagation being run out of order in Create Prefab undo.

* Renamed variable, added comments for clarity.

* Restore asserts on instance not being found; Rename Do to Redo for clarity; Add comments.

* Fixed incomplete comment.
2021-06-08 10:44:20 -07:00
cgalvan deb3c5e74a [LYN-2446] Implemented support for duplicating instances. (#1097)
* [LYN-2446] Implemented support for duplicating instances.

* [LYN-2446] Addressed PR feedback.

* [LYN-2446] Addressed additional PR feedback.
2021-06-03 16:20:59 -07:00
Mike Balfour d90a3d46a7 Support for nested slice conversions (#1121)
This set of changes enables conversions for singly-nested slices. Multiple nesting hierarchies are only partially supported at this point. Conversion is also significantly more deterministic, which makes it easier to convert single slices without needing to reconvert every slice or level that relies on it as well.
Changes:

- Added version of Instance::AddInstance() that takes in an alias to allow for deterministic aliases
- Added a "SliceConverterEditorEntityContextComponent" that's used to specifically disable entity activation on creation. The disabling is done this way vs adding a new public API, because the disable shouldn't be required in any normal case outside of this tool.
- Disabled more AWS gems for the SliceConverter, as they're unneeded and cause issues if they're around in the tool.
- Added a small null check to the Camera Controller.
- Added the actual support for slice instance conversion. This instantiates the entities, applies the data patches, turns them into a prefab instance, and generates a JSON patch out of the changes.
2021-06-03 15:59:45 -05:00
srikappa a9d030b454 Merge branch 'main' into DetachPrefab 2021-06-01 11:12:52 -07:00
Mike Balfour 96905a26d7 Add support for AP-compliant relative paths (#998)
The method "PrefabLoader::GetRelativePathToProject" has been changed to "PrefabLoader::GenerateRelativePath", and reworked to get a correct relative path.  GetFullPath has also been modified to get correct relative paths too.  This requires an Asset Processor connection - if one isn't available (like during unit tests), the methods have fallback logic to produce project-relative paths.

With this change, SliceConverter can't use SaveTemplate() to save the file any more, because GetFullPath now expects to find an existing path, which doesn't work for not-yet-created files.  Instead, it now has to use the same technique as the Editor and call SaveTemplateToString then save the string out as a file.
2021-05-28 09:57:17 -05:00
srikappa 55e1da64bb Renamed a function and improved comments 2021-05-28 02:29:09 -07:00
srikappa dc4a15628f Remove unused GetNestedInstance method in Prefab Instance class 2021-05-28 00:43:31 -07:00
chiyteng c21a59af50 Remove print dom for debug previously 2021-05-27 17:19:32 -07:00
chiyteng 4b610058b5 implement function DetachPrefabFromParent in PrefabPublicHandler 2021-05-26 15:47:41 -07:00
srikappa be9c9d9fa3 Remove prefab undo cache dependency on CreatePrefab use case 2021-05-25 12:57:16 -07:00
srikappa eb873f246a Merge branch 'main' into Prefab/CreatePrefab 2021-05-17 17:13:02 -07:00
srikappa 45074c651a Fix bugs with creating prefabs with nested entities 2021-05-17 17:10:50 -07:00
Mike Balfour d084027b6e Bugfixes to enable slice-to-prefab conversion to run with less warnings/errors/crashes (#768)
While trying to process all slices and levels in Automated Testing, a few bugs came up that needed to be addressed:
- [LYN-3832] TransformComponent had a field removed without updating the version number and converter, which caused a lot of excessive warnings
- SliceComponent would crash in debug builds on instantiation failures due to a null dereference that was guarded against in most but not all places
- SliceConverter now detects when nested slices exist and gracefully warns about it.
- InstanceUpdateExecutor / TemplateInstanceMapper will now immediately remove instances that are unregistered, so that any in the queue don't get processed on a subsequent tick.  This was causing crashes when the instance was destroyed before the processing occurred.  It also has a side benefit of preventing the same instance from executing multiple times.
- Minor logic bugfix to the pack close warning, the boolean check was flipped.

Also added an early-out on SetTemplateId, since this was causing some unnecessary instance queue entries.
2021-05-17 14:58:18 -05:00
srikappa b11234097d Fixed a capitalization issue 2021-05-11 11:30:16 -07:00
srikappa 0da6e450a6 Improved comments 2021-05-10 11:43:32 -07:00
srikappa 1c04160966 Added a missing header 2021-05-07 16:23:14 -07:00
srikappa eb8084d3f6 Initial draft for getting instantiation to work immediately after creation is undone 2021-05-07 16:21:23 -07:00
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 2021-04-27 14:12:46 -07:00
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 2021-04-23 20:14:17 -07:00
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-22 14:54:01 -07:00
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 2021-04-22 13:57:08 -07:00
AMZN-daimini 62bc7a66bb Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
2021-04-20 16:22:34 -07:00
srikappa 967d182ccc Fixed a couple of typos 2021-04-19 17:29:03 -07:00
srikappa 707f7cb6ce Added some comments 2021-04-19 15:06:41 -07:00
srikappa 889158e3a9 A couple of minor fixes 2021-04-19 09:53:45 -07:00
srikappa 778d60bd0c Replaced unique instance queue with checks in template to instance mapper 2021-04-15 18:45:48 -07:00
srikappa a371edd07f Initial commit of CreatePrefab work 2021-04-14 17:26:14 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00