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
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
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
d04f4d238c
Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ReadOnlyViewportChanges
2021-12-06 14:24:19 -06:00
15e26b7515
merge development
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-06 12:21:45 -08:00
10e95cd863
Updated logic to use AZStd::erase_if
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 14:21:00 -06:00
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
e24323660b
Fixed typo.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 12:44:52 -06:00
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
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
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
be252d797d
Remove disabled failed asset load tests trait from linux ( #6100 )
...
* Remove trait AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS for Linux
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-12-06 09:11:56 -08:00
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
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
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
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
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
273fb87eeb
Renamed variable to be more descriptive.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 16:21:31 -06:00
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
d56cfa40dd
Changing trace logger to clear log file when opened
...
Also switched the log message sink from a vector to a list so the entire container does not have to be rebuilt every time and entry is added.
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-12-03 15:00:53 -06:00
954642c1ce
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 13:40:07 -06:00
d0511cf444
Fix warnings on Mac builds. ( #6112 )
...
* Fix warnings on Mac builds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Save one map query
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-03 10:31:40 -08:00
c3fdbfb926
Updated the ComponentApplication Settings Registry initialization to no ( #6108 )
...
longer read form the users `~/.o3de/Registry` directory in non
debug/profile configurations.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-03 11:55:23 -06:00
75c015b67e
chore: add #prama once to XcbInputDeviceKeyboard ( #6091 )
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-03 09:09:02 -08:00
1962083c72
Merge pull request #4955 from aws-lumberyard-dev/terrain/sphrose_test_terrain_gradient_list_LYN-7376
...
Python tests for TerrainHeightGradientList LYN-7376
2021-12-03 15:42:02 +00:00
8344539ab6
Manipulator Bounds updates ( #5959 )
...
* first pass updates to improve manipulators
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add setting to enable/disable manipulator axis flipping
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update manipulator cvar to use ed_ naming convention
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* wip updates to add AzToolsFramework values to the SettingsRegistry
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* expose a number of manipulator settings for configuration
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add setting for manipulator base scale to change size of all manipulators together
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* minor updates before posting PR
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add manipulator section for settings registry paths
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for failing unit test after manipulator changes
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix total scale
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for polygon prism component shape tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-03 14:46:15 +00:00
d24f01a413
compile fix
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-03 14:10:23 +00:00
1ed0b4f8ff
Replace } lost in merge
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-03 12:15:56 +00:00
4e5b62ee25
conflict fix
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-03 11:36:58 +00:00
6bd0308339
Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-02 14:17:35 -08:00
bd1a4a3062
Removed trait AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
...
* Removed trait AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS (#6078 )
* Added check for gamepad support
* Skip tests that rely on gamepad support on platforms that dont support it
* Use GTEST_SKIP(() if available, otherwise just use SUCCEED()
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-12-02 10:20:55 -08:00
d89dcff7df
Fix failing zero color conversion test on Linux
...
* Removed AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST (#6074 )
* Protect against 'NaN' (divide by zero) for saturation calculations by setting value to zero instead
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-12-02 08:50:03 -08:00
625fca71ab
Prefab/unit tests for deletion ( #6034 )
...
* Added tests for deleting entity under level and other prefabs
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Added class comments and improved variable names
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Called the reflect function of PrefabFocusHandler from PrefabSystemComponent
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Added couple of unit tests around entity and prefab deletion
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Used engine root path from settings registry as fake path for prefab creation
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Added 2 unit tests around deleting prefabs
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
2021-12-02 08:09:28 -08:00
bd1c8ec961
chore: remove duplicate instance of FancyDockingDropZoneConstants ( #5827 )
...
* chore: remove duplicate instance of FancyDockingDropZoneConstants
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: move to namespace
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-02 09:28:29 +00:00
e16781e6b6
LYN-8629 | Read-Only Entities - Setup ( #6059 )
...
* Introduce read-only entity interface, handler and unit tests.
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 >
* Renaming ReadOnlyEntityQueryNotificationBus to ReadOnlyEntityQueryRequestBus for consistency with engine patterns.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-01 12:24:49 -08:00
e8750f8096
Rename sr_regset-file CVar to sr_regset_file ( #6067 )
...
The Legacy Cry XConsole code validates that CVars only contain
underscore and alphanumeric characters via an Assert in `debug`
configurations.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-01 13:16:19 -06:00
7c445d9c7d
Merge pull request #5820 from aws-lumberyard-dev/LYN-8025_PipeEditorServerLogsToEditor
...
Pipe Editor-Server Logs Back to the Editor
2021-12-01 07:36:02 -08:00
828431f185
Update AssetManager unit tests to not interact with the disk ( #5815 )
...
* Changed AssetManager tests to use memory streams for asset reading/writing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix compilation on non-unity builds
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fixed handling of path lookups when test folder path is non-empty
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add more detailed error message for "asset is not loaded"
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Make numThreads a constexpr
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add FindFile function
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Remove unused lambda capture
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Remove trailing whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add size to assert
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-12-01 09:05:35 -06:00
786a72cf63
LYN-7376 test_TerrainHeightGradientList_AddRemoveGradients
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-01 10:41:45 +00:00
fb6e6e339f
Add CRC validator ( #5857 )
...
* Adds crc validation checks
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Fixes invalid CRCs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Changes test to smoke suite
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* excludes some test data from the validator
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* uses pathlib instead of os.path
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* fixes wrong path to test scripts
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Escape not needed
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-30 15:07:57 -08:00
530bcb9428
//! for code comments autogen
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-30 14:17:02 -08:00
879012b1ae
Added the --regset-file option for setreg file loading ( #5768 )
...
The SettingsRegistryMergeUtils.cpp now supports specifying a path to a JSON Merge Patch formated settings registry file via the --regset-file option.
The option supports specify an anchor key to merge the settings underneath that is separated from the filepath via "::"
Ex. `--regset-file="Registry/custom.setreg::/Custom/Anchor"`
An AZ::Console command of "sr_regset-file" has also been added to allow merging of a setting registry file as well.
closes #5767
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-11-30 13:03:46 -06:00
dc3c126662
GetSurfacePoint - expose to BehaviorContext ( #6017 )
...
* Fix GetSurfacePoint exposure to BehaviorContext.
The previous way of exposing it made it unusable from ScriptCanvas, since the public API uses an "out" parameter. This introduces a private variation of the API that returns the value instead, so that it functions correctly in Script Canvas.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Added descriptive comment.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Addressed PR feedback.
Fixed comment spacing and renamed private methods to remove the need for the typecast.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-11-30 11:30:00 -06:00
3a1e6744fb
Save Data linux support ( #6014 )
...
Implementation of SaveData for Linux
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-11-30 08:47:21 -08:00
12efc84632
[development] minor Profiler gem fixes ( #5473 )
...
Fixed incorrect frame boundary guess when loading a profile capture
Added some missing default initializers
Removed implicit dependency on Atom timing marker constants
Fixed issue with small visualizer viewport bounds when loading a saved capture
Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-11-30 08:27:27 -08:00
4dd9e94bc3
Add tests for deleting an entity from the level and from another prefab ( #5839 )
...
* Added tests for deleting entity under level and other prefabs
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Added class comments and improved variable names
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Called the reflect function of PrefabFocusHandler from PrefabSystemComponent
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Added function comments and made an if statement to be one line
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
2021-11-30 08:20:25 -08:00
768a196b63
Add a way to set the vsync_interval CVar from code ( #5813 )
...
* Add a way to set the render vsync from code
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
* Update change with PR feedback. Missing whitespace plus a comment on why the assignment is outside the value changed check
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-11-30 10:11:26 -06:00
6908a3e945
Update intersect behavior for positioning entities in the viewport ( #5906 )
...
* update intersect behavior for positioning entities in the viewport and restore SurfaceManipulator
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* tests for surface manipulator from EditorTransformComponentSelection
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update comments in tests and remove #pragma optimize('', off)@
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add new file for FindClosestPickIntersection tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add remaining tests for surface manipulator and snap fixes
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* some small updates and polish before PR
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* small updates following PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-30 15:07:40 +00:00
75d6cb2527
Connected filterChanged signal to Update the table Model ( #5901 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-30 14:54:01 +00:00
4424b4d51e
Fix Integer Spin Controller not sending PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished ( #5942 )
...
* IntWidgetHandler::CreateUI now registers and sends editingFinished event
* add tests for int spin control valueChanged and editingFinished signals
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-30 10:49:53 +00:00
carlitosan
Danilo Aimini
Chris Galvan
Guthrie Adams
Steve Pham
Tom Hulton-Harrop
Mikhail Naumov
Guthrie Adams
lumberyard-employee-dm
Michael Pollind
sphrose
srikappa-amzn
Gene Walters
amzn-mike
Esteban Papp
Gene Walters
Mike Balfour
Scott Romero
rgba16f
AMZN-Igarri
amzn-sean