birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,665 Commits 3 Branches 3 Tags
d347a9d2c034dea3878ce357060b7e040bee6885
Commit Graph

1104 Commits

Author SHA1 Message Date
Chris Galvan e09a4d20d3 Merge pull request #6240 from tjmgd/bug-keyword-prefab-23 
Fix for bug in entity outliner search box
 2021-12-27 13:12:08 -06:00
tjmgd a6240ff6bc Editor issue after clicking Find Layer in Asset Browser and (#6327) 
Find Slice in Asset Browser in Slice mode

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-22 11:51:33 -08:00
tjmgd 33495e4858 Slice save path incorrect, and error message incomplete (#6214) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-22 11:32:14 -08:00
tjmgd 3f766629bc Lua Editor log - text ghosted (#6329) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-22 09:36:34 -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 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
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
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
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
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
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
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
amzn-mike 8f134a82d1 Procedural Prefabs: Stable transform component ID (#6227) 
* Set Procedural Prefab Transform ComponentId to the hash of the file path.

Procedural prefabs needs to have a deterministic transform component ID in order for saved patches still work when the prefab is regenerated.

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

* Switch to Cityhash instead of XXHash since prefab system is using that elsewhere

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

* Added unit test

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>
 2021-12-10 11:20:31 -08:00
chiyenteng ca49eedc5f Convert prefab to temp spawnable assets (#6179) 
* Convert prefab to temp in-memory spawnable assets

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-12-10 10:55:01 -08:00
Artur K 53b88d4752 Preapre codebase for FileRequest compiletime improvements (#6192) 
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

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

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-12-10 13:08:24 +00:00
Scott Romero e9379c1746 [development] updated editor event handling with respect to imgui (#6114) 
Fixes #4366

- Added support for sending text events from the Qt event mapper
- Fixed several issues found while running the Profiler gem in debug
- Added ability to track AZ-consumed events in the Qt event mapper
- Minor clean up to input handling in ImGuiManager
- Select ImGui mouse events can now be properly consumed during AZ-input processing in the editor viewport
- Added tests for the Qt event mapper

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-12-09 13:58:27 -08:00
amzn-mike c63b4eb905 Removing unused variable and fix typo (#6265) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-09 12:53:25 -08:00
Chris Galvan e1d36bc445 Merge pull request #6302 from aws-lumberyard-dev/cgalvan/HideViewportManiuplatorsOnReadOnlyEntitiesEdgeCase 
Fixed logic for when to cull entities from having their viewport manipulators regenerated.
 2021-12-09 14:24:39 -06:00
Chris Galvan e636ea39e3 Fixed comment casing to match rest of file. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-09 13:15:20 -06:00
Steve Pham 8fd603cd50 Fix failed archive tests on linux and remove trait 
- Change the test Archive Folder name, Extract Folder Name, and File List file to be all lowercase to prevent the 'ResolvePath' function in LocalFileIO when executed to cause issues on case sensitive file systems (#6277)
- Fix memory corruption in profile builds on Linux when using AZ::IO::PathView by using AZ::IO::FixedMaxPath instead

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-09 10:18:11 -08:00
Chris Galvan 0bccecaa15 Fixed logic for when to cull entities from having their viewport manipulators regenerated. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-09 11:36:39 -06:00
Tom Hulton-Harrop c2341a7e3c Fix for change with axis gizmo labels not appearing (#6256) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-09 09:30:51 +00:00
Chris Galvan 1aed839271 Fixed typo. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-08 15:02:41 -06:00
Chris Galvan 9dc32a0381 Additional read-only prefab workflow changes. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-08 12:30:31 -06:00
Tom Hulton-Harrop b54215552c Prevent the camera from easily being set to an invalid orientation (#6203) 
* add temporary debug logging

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* improvement for box select sometimes getting stuck on

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add temporary debug logging

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* improvement for box select sometimes getting stuck on

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove temporary logging

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fixes for camera pitch issues

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* missed file with camera pitch fixes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove debug logs

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add some tests for new pitch constraint updates

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-08 09:42:40 +00:00
Tobias Alexander Franke 363007363a In the entity outliner search box, the matching results are not expanded and displayed 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-08 09:02:05 +00:00
Chris Galvan a8ef23e4ae Merge pull request #6232 from aws-lumberyard-dev/cgalvan/ReadOnlyPrefabWorkflowChanges 
Some read-only prefab workflow updates.
 2021-12-07 19:38:54 -06:00
Danilo Aimini 3a7d9f9b3a LYN-8633 | Read-Only Entities - Entity Outliner behavior changes (#6230) 
* Add invalid entityId check to IsReadOnly

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

* Ensure read-only entities editing is limited (no renaming, limited drag/drop, no asset drop on them)

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

* Removing redundant class definition in wrong namespace.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-07 16:58:29 -08:00
Chris Galvan 6532c50c27 Some read-only prefab workflow updates. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-07 17:22:10 -06:00
Esteban Papp cd5306febf Merging from development 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 12:35:41 -08:00
amzn-mike 7c96bc4f1f Fix loaded procprefabs not going through the asset hint fixup process… (#6077) 
* Fix loaded procprefabs not going through the asset hint fixup process for all versions of LoadInstanceFromPrefabDom.

Fixes procprefab asset references not working when pressing Ctrl+G in the editor

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

* Add unit test

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

* Add missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-07 13:00:47 -06:00
carlitosan 4b97f7bac2 Merge pull request #5296 from aws-lumberyard-dev/sc-editor-asset-redux 
Sc editor asset redux
 2021-12-07 09:15:52 -08:00
Danilo Aimini 6e0ac97f13 Merge pull request #6178 from aws-lumberyard-dev/daimini/gitflow_211206_o3de 
Merged `stabilization/2111RTE` to `development`
 2021-12-06 15:51:01 -08:00
Danilo Aimini efe63f3e95 Merge commit 'c5615f812ccc9d235747a1c5ba396ac2e9a23690' into daimini/gitflow_211206_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
#	Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
 2021-12-06 13:14:14 -08:00
Chris Galvan d04f4d238c Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ReadOnlyViewportChanges 2021-12-06 14:24:19 -06:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
Chris Galvan 10e95cd863 Updated logic to use AZStd::erase_if 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 14:21:00 -06:00
Danilo Aimini 476e66d902 LYN-8631 + LYN-8632 | Display appropriate read-only icons and procedural prefabs ui in the Outliner (#6160) 
* First step of procedural prefab styling and read-only registration.

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

* WIP - Introduce read-only handler for procedural prefabs (not hooked up)

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

* Introduce read-only entity interface, handler and unit tests.

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

* Introduce temp read-only icon, use new icon hierarchy in Outliner.

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

* Switch from a push paradigm to a pull paradigm - handlers get to implement logic to determine if an entity should be read-only. This allows multiple systems to weigh into whether an entity is read-only.

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

* Fixed to missing call in test

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

* Post-rebase fixes to class name changes

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

* Display a lock icon on top of the entity icon in the Entity Outliner. This icon is added programmatically, which prevents having to alter all Outliner icons and future-proofs this functionality.

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

* Minor style changes to procedural prefabs in the Outliner (use white icon)

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

* Ensure cache is refreshed when the handler is created, and also whenever the focus changes.

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

* Remove Procedural Prefab setreg that was added in the wrong place

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

* Remove redundant function

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

* Fix spacing issue caused by rebase

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

* Change tooltip so that it accurately says "inspect" instead of "edit" for procedural prefabs.

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

* Address minor styling issues mentioned in PR.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-06 12:16:16 -08:00
Chris Galvan e24323660b Fixed typo. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 12:44:52 -06:00
Chris Galvan 1f279ca713 Updated viewport to hide the transform maniuplators for entities marked as read only. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 12:19:02 -06:00
Chris Galvan d583256b17 Merge pull request #6144 from aws-lumberyard-dev/cgalvan/ReadOnlyEntityInspectorChanges 
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
 2021-12-06 12:01:39 -06:00
Guthrie Adams aa5563803f Merge pull request #6110 from aws-lumberyard-dev/Atom/guthadam/update_trace_logger_to_clear_log 
Changing trace logger to clear log file when opened
 2021-12-06 11:17:46 -06:00
Chris Galvan a7989df051 Fixed status combo box style in Entity Inspector. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 10:39:49 -06:00
Tom Hulton-Harrop 969dbf407a Add tests for planar manipulator draw when dealing with scaling (#6164) 
* add support to add a custom debug display request interface for manipulator test framework

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* wip changes to support tests for manipulator view drawing

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for planar manipulator draw when dealing with scaling

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* additional comments for added context

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small updates/fixes after PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for missing NullDebugDisplayRequests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-06 14:53:45 +00:00
Mikhail Naumov c5615f812c Fixing pivot offset when performing undo on Transform component (#6150) 
* Fixing undo offest on transform component

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

* Fixining possible issue with firing an unnecessary OnTransformChanged event when entity is manually disabled/enabled

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

* Adding better comments

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

* Unit tests

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

* Cherrupicking changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-12-06 14:46:47 +00:00
Danilo Aimini 87fb6be964 Fixes to Procedural Prefab instantiation - ensure the container of the procprefab has the correct editor components, and remove limitation to instantiating at the root. (#6147) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-12-03 15:38:29 -08:00
Chris Galvan b470f917ca Listen to read-only entity state changes so we can refresh if the read-only state changes on one of our selected entities. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-03 16:37:35 -06:00
Chris Galvan 273fb87eeb Renamed variable to be more descriptive. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-03 16:21:31 -06:00
Guthrie Adams af75b3a52a Made clearing the log file optional and renamed the function 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-03 15:44:04 -06:00