Commit Graph

91 Commits (fbdd26bbbcd4bf8dac35d07dffd5e26dfa337d19)

Author SHA1 Message Date
Eric Phister fbdd26bbbc
Merge pull request #410 from aws-lumberyard-dev/ly-sdk/phistere/LYN-2723-Merge
LYN-2723: Fixes issues with bad project or engine paths

Cherry-pick: 6ce7a6d30c57c941459b43c157861df5d9143ae1
5 years ago
AMZN-koppersr 5e4094b258
Revamped AzFramework::Scene (#332)
Updated AzFramework::Scene to allow it to serve as the one-stop location for localized singletons. Localized singletons in this case are instance that can only occur once in an environment but multiple times within an application. As an example, this allows settings up a single camera per viewport for instance.

Highlights of changes:

Replaced the original ebuses with interfaces and events for easy of use and performance.
Removed the Entity Context specific code and moved that to new locations within the Entity Context itself.
Allowed basic inheritance. If a subsystem isn't found in a scene the parent can optionally be searched.
Scenes can enter a zombie state and avoid immediately being deleted. This is needed for situations where subsystems can't be destroyed until async calls have been completed.
5 years ago
lumberyard-employee-dm 3dec5d3b71
LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
5 years ago
Eric Phister 7dd7e82d86 LYN-2723: Fixes issues with bad project or engine paths (#369)
* Setup NativeUIRequests as an AZ::Interface.  Adds a NativeUISystemComponent to AzFramework Application.

* Renames NativeUISystemComponent (class) to NativeUISystem, since it's no longer a Component.

* Minor update to SettingsRegistryInterface::Remove doc-comments for accuracy.

* Fixes to make an early fatal shutdown of Editor occur without crash.

* LYN-2723: Updates startup to handle errors: engine root is empty, no valid project.json found (mismatched engine name), or bad project path (launch project picker dialog).

* LYN-2723: Minor formatting/spelling edits.

* LYN-2723: Moves ParseCommandLine from ComponentApplication to SettingsRegistryMergeUtils so it can be used in more places.

* Misc fixes. 'wait_for_connect' setting wasn't being properly applied to AP connection settings. Fix infinite loop in CCmdLine::Next.

* LYN-2723: Addresses review feedback.

* LYN-2723: Reverts some changes that caused a unit test to fail.

* LYN-2723: Reverts one more change that was unnecessary.
5 years ago
Chris Galvan 67e64f8a95 [LYN-3374] Removed Cry3DEngine checks in EditorViewportWidget that was preventing selection, correct camera position, and other issues in the viewport. 5 years ago
cgalvan bbcc4ffeb1
Merge pull request #390 from aws-lumberyard-dev/cgalvan/RemoveUnusedDialogs
[LYN-3319] Removed some unused Editor dialogs.
5 years ago
Nicholas Van Sickle 9d44d5710a
Merge pull request #334 from aws-lumberyard-dev/nvsickle/RestoreViewportLayoutInContextMenu
Fix "Configure Layout..." being greyed out in the viewport menu
5 years ago
Chris Galvan 28b5a1427c [LYN-3319] Removed some unused Editor dialogs. 5 years ago
cgalvan 65565daf5a
Merge pull request #370 from aws-lumberyard-dev/cgalvan/CherryPickDragAndDropHitTest
[LYN-3122] Cherry-pick: Fixed the viewport Entity hit test logic. This allows the BuildDragDropContext to detect hit position correctly so that assets dragged into the viewport are placed in the correct position.
5 years ago
jjjoness 88dcaba8da
Merge pull request #317 from aws-lumberyard-dev/LYN-1099
Lyn 1099
5 years ago
cgalvan 60d876a05e
Merge pull request #375 from aws-lumberyard-dev/cgalvan/ReplaceGetSelectedEntitiesSize
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
5 years ago
jjjoness 1fd6938519 Replaced missing & 5 years ago
Chris Galvan 8e88d746a3 [LYN-3356] Replaced GetSelectedEntities + size() with new API. 5 years ago
Chris Galvan 84e0f6f58d [LYN-3122] Moved invariant logic outside of for loop and removed TODO comment. 5 years ago
Chris Galvan f269d92f90 [LYN-3122] Fixed the viewport Entity hit test logic. This allows the BuildDragDropContext to detect hit position correctly so that assets dragged into the viewport are placed in the correct position. 5 years ago
Chris Galvan 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. 5 years ago
jjjoness 0607f6efa6 Changed Play Console from comments in PR. 5 years ago
Aaron Ruiz Mora 00fca9489c
Fix editor crashing by protecting gEnv->g3DEngine 5 years ago
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 5 years ago
jjjoness 275d99359d Merge branch 'main' into LYN-1099 5 years ago
mbalfour f76b69d480 Added a handful of null checks to let new level creation succeed. 5 years ago
nvsickle 33d210b793 Fix "Configure Layout..." being greyed out in the viewport menu 5 years ago
bosnichd e5b5067748
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false (#315)
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false, and added some null checks to protect against gEnv->pRenderer and gEnv->p3DEngine now being null in the editor as well as the launcher.
5 years ago
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 5 years ago
jjjoness 734cd63494 Merge branch 'main' into LYN-1099 5 years ago
AMZN-AlexOteiza 3f32cc929c
Fixed All Physics automated tests (#129)
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
5 years ago
jjjoness 73df05529c Completed new Play Console button. 5 years ago
hultonha 662934afbe Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 5 years ago
jjjoness fd87ffc971 Merge branch 'main' into LYN-1099 5 years ago
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
Chris Burel 61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
jjjoness 2b63ecab87 Merge branch 'main' into LYN-1099 5 years ago
nvsickle 795ce4dfca Revert accidental change 5 years ago
nvsickle fb2ca8e02c Fix Editor crash in test teardown calling set_view_pane_layout
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
5 years ago
cgalvan 5d3774521f
Merge pull request #251 from aws-lumberyard-dev/cgalvan/RemoveSetEditMode
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
5 years ago
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 5 years ago
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 5 years ago
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 5 years ago
Terry Michaels d680995074
Renamed several non-inclusive terms (#236) 5 years ago
jjjoness 012ab89a23 Changed Play Console to right of toolbar. 5 years ago
hultonha bfc4a3bb21 fix bug for setting SimpleMotion asset 5 years ago
rgba16f f750a491c8 remove mistakenly added .orig file 5 years ago
rgba16f 40a35b4e45 Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
rgba16f 96bbfb3ff0 Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim 5 years ago
Chris Galvan ee90a73744 [LYN-3105] Fixed missing include. 5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
Nicholas Van Sickle e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
5 years ago
rgba16f c01174d57f Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago