Commit Graph

1038 Commits

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
2021-04-29 11:01:32 -05:00
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.
2021-04-29 08:50:48 -07:00
sharmajs-amzn 45fd86c2bf {LYN-2848} Asset Processor: Modifying the Allowed or Rejected list merges previously existing Connections into one record (#363)
{LYN-2848} Asset Processor: Modifying the Allowed or Rejected list merges previously existing Connections into one record
https://jira.agscollab.com/browse/LYN-2848
launched ap gui and tested manually.
2021-04-29 08:27:34 -07:00
Hasareej 9e27929d10 Merge pull request #95 from aws-lumberyard-dev/hasareej_LYN-2475_viewportui_switcher
Initial pass of ViewportUiSwitcher.
2021-04-29 13:41:50 +01:00
Benjamin Jillich 0603fee04e [LYN-3072] TQO Animation: "Retarget Motion" on Simple Motion sends Asserts (#358)
* Added a check to only apply retargeting to animated joints. Joints that the motion does not animate won't have a valid motion data link and thus retargeting can't be applied.
* The check cannot be applied at a level above as we still need to adjust the translation for root nodes, even for the ones that the motion does not animate.
2021-04-29 12:20:20 +02:00
hasareej a173c341a3 Removing switcher icons. 2021-04-29 10:30:25 +01:00
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'
2021-04-28 21:38:43 -05:00
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.
2021-04-28 19:03:17 -05:00
Steve Pham ed74bb9166 SPEC-5380: Update windows/mac setup scripts to install latest cmake
* Adding choco install for cmake in 'install_utiltools.ps1'

* Adding brew installation command to install-xcode.sh
2021-04-28 16:10:34 -07:00
chiyenteng efc0cbacba Prevent AzToolsFramework benchmarks timeout for now (#398) (#403) 2021-04-28 15:32:35 -07:00
srikappa-amzn f6cd7aa5db Merge pull request #378 from aws-lumberyard-dev/Prefab/CreatePrefab
LYN-3159 - Fixed an assert during loading a level with prefabs that had patches on them
2021-04-28 15:22:05 -07:00
michabr 6e780808d2 UI Canvas Editor fixes (#340)
* Fix mouse input in UI Editor preview mode

* Add textured rect outline drawing for Draw2d
2021-04-28 15:04:20 -07:00
Esteban Papp ea61f9324c SPEC-6564 Cleanup _HEADERS now that CMake fixed the issue (#397) 2021-04-28 14:50:08 -07:00
AMZN-tpeng 4d7d870385 Merge pull request #217 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-14947
[ATOM][RHI][Vulkan][Android] Fix screen blur crash and constant buffer limits
2021-04-28 13:50:58 -07:00
Mike Balfour 18c2069b64 Merge pull request #359 from aws-lumberyard-dev/mbalfour/misc-viewport-fixes
ViewportContext - fix ebus connections
2021-04-28 15:43:30 -05:00
Esteban Papp 01f9d7bdc1 SPEC-6565 Cleanup paths to Tools/Python 2021-04-28 13:33:37 -07:00
cgalvan f1c5d4c801 Merge pull request #396 from aws-lumberyard-dev/cgalvan/RemoveNewViewportCryEngineChecks
[LYN-3374] Removed Cry3DEngine checks in EditorViewportWidget that was preventing selection, correct camera position, and other issues in the viewport.
2021-04-28 14:18:27 -05:00
srikappa 6947e8fe29 Added an IsObject check for nested instance DOM during link creation that happens during prefab loading 2021-04-28 12:14:55 -07:00
Shirang Jia e0f8066a97 Add AttachDate tag to EBS volume and add script to find/delete inactive EBS volumes (#380)
Add AttachDate tag to EBS volume and add script to find/delete inactive EBS volumes
2021-04-28 12:11:15 -07:00
Peng 7c42ff959e Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-28 11:50:51 -07:00
Vincent Liu 9f9b8f70b4 [LYN-3149] Update AWSCore Editor menu to invoke resource mapping tool through engine python environment (#318)
## Details
After migrating to engine python environment, there is no extra step required to launch resource mapping tool in editor.
1. This change is to migrate the editor tool launching process to engine python environment.
2. Add messagebox to show errors while using the tool
3. Note - as Qt binaries are not well organized in build directory, so separate out *AWSCore.ResourceMappintTool* target to group Qt binaries into independent build sub folder to solve the issue (temporarily, fix can be tracked by https://jira.agscollab.com/browse/LYN-2669, once fix is done, we can just remove this individual target)

## Testing
Runs AWSCore.Editor.Tests
```
[----------] Global test environment tear-down
[==========] 8 tests from 4 test cases ran. (161 ms total)
[  PASSED  ] 8 tests.
```
2021-04-28 11:28:23 -07:00
Luis Sempé ac78bb38e5 Merge pull request #377 from aws-lumberyard-dev/scripting/bug_fixes
Removing the ScriptCanvasDiagnosticsLibrary gem
2021-04-28 11:22:51 -07:00
Chris Galvan 67e64f8a95 [LYN-3374] Removed Cry3DEngine checks in EditorViewportWidget that was preventing selection, correct camera position, and other issues in the viewport. 2021-04-28 12:53:10 -05:00
Peng 0e092d6cb7 ATOM-14947 Took out jira links, just use the ticket number 2021-04-28 10:45:18 -07:00
AMZN-koppersr b4976ff9cb Merge pull request #327 from aws-lumberyard-dev/JsonSerializationTypeIdBug
Typeid bug fix in Json Serialization.
2021-04-28 10:44:42 -07:00
Guthrie Adams 3c8421036a Merge pull request #389 from aws-lumberyard-dev/Atom/guthadam/ATOM-15371
ATOM-15371 Adding missing RHI dependency to Atom tools
2021-04-28 12:35:21 -05:00
Guthrie Adams 518c6cb760 Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
ATOM-14003 adding image thumbnails to material inspector properties
2021-04-28 12:34:54 -05:00
cgalvan bbcc4ffeb1 Merge pull request #390 from aws-lumberyard-dev/cgalvan/RemoveUnusedDialogs
[LYN-3319] Removed some unused Editor dialogs.
2021-04-28 12:30:59 -05:00
Tommy Walton 2d58d6f544 Merge pull request #314 from aws-lumberyard-dev/Atom/amzn-tommy/ATOM-15281_WrinkleMaskSourceDependency
ATOM-15281 : Add a wildcard source dependecy to the scene builder for wrinklemasks

-Added a wildcard dependency that looks for a subfolder named _wrinklemask, and any files in that folder with the _wrinklemask suffix. This is so that references to _wrinklemask textures that match this naming convention can be found by the MorphTargetExporter, and so that the morph target assets produced by the ModelAssetBuilderComponent will be updated if masks are added or removed.
-Removed a source dependency on .mtl files, which are from the legacy renderer
-Updated a comment about static meshes, which I believe was referring to .cgf files since static meshes now also go through scene builder.
2021-04-28 10:29:01 -07:00
Nicholas Van Sickle 9d44d5710a Merge pull request #334 from aws-lumberyard-dev/nvsickle/RestoreViewportLayoutInContextMenu
Fix "Configure Layout..." being greyed out in the viewport menu
2021-04-28 10:17:43 -07:00
hershey5045 9ffca4df5d [SMC] UI Updates (#270)
* Update SMC prompt texts. Add progress dialog in shader variant generation script. Add "Generate Shader Variant List" command in context menu for shader files in Asset Browser.
2021-04-28 09:56:55 -07:00
Tom Hulton-Harrop 5d53590434 Merge pull request #310 from aws-lumberyard-dev/hultonha_PR-37_follow-up
Updates following review feedback to PR-37
2021-04-28 17:27:26 +01:00
Tom Hulton-Harrop d385189d32 Merge pull request #309 from aws-lumberyard-dev/hultonha_LYN-2772_whitebox-atom
Add Atom default material to White Box Gem
2021-04-28 17:27:07 +01:00
AMZN-koppersr 2dfe9942f2 Merge branch 'main' into JsonSerializationTypeIdBug 2021-04-28 09:23:41 -07:00
Chris Galvan 28b5a1427c [LYN-3319] Removed some unused Editor dialogs. 2021-04-28 11:23:40 -05:00
guthadam 33749519db ATOM-15371 Adding missing RHI dependency to Atom tools
This was causing error message spam and possibly other issues when launching the tools.

https://jira.agscollab.com/browse/ATOM-15371
2021-04-28 11:10:55 -05:00
Guthrie Adams 167b7f36a6 Merge pull request #373 from aws-lumberyard-dev/Atom/guthadam/ATOM-15370
ATOM-15370 Fix thumbnail scaling and sizing issues
2021-04-28 11:01:14 -05:00
Guthrie Adams 428feb6967 Merge pull request #376 from aws-lumberyard-dev/Atom/guthadam/ATOM-15372
ATOM-15372 Restoring material browser filter logic
2021-04-28 11:00:45 -05:00
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.
2021-04-28 10:26:49 -05:00
jjjoness cdce28115e Merge pull request #387 from aws-lumberyard-dev/LYN-1932
Lyn 1932
2021-04-28 16:21:43 +01:00
SergeyAMZN 52864bd92f Merge pull request #255 from aws-lumberyard-dev/MultiplayerPipeline
Added delayed activation for client networked entities. Added ability to specify additional .cfg file to use the same launcher for server & client
2021-04-28 16:19:34 +01:00
jjjoness 88dcaba8da Merge pull request #317 from aws-lumberyard-dev/LYN-1099
Lyn 1099
2021-04-28 16:16:04 +01:00
cgalvan 60d876a05e Merge pull request #375 from aws-lumberyard-dev/cgalvan/ReplaceGetSelectedEntitiesSize
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
2021-04-28 10:07:07 -05:00
Tom Hulton-Harrop b0b7d027a5 Merge pull request #388 from aws-lumberyard-dev/hultonha_LYN-3368_disable_ap_test
Disabling Asset Processor test causing intermittent failures
2021-04-28 15:53:47 +01:00
hasareej 11d39892d5 Fixing QString to QIcon conversion. 2021-04-28 15:18:54 +01:00
hasareej a30c952fa2 Deleting the EditorTransformComponentSelection switcher. 2021-04-28 15:03:47 +01:00
hultonha 6d624273a9 disabling test causing intermittent failures 2021-04-28 14:43:52 +01:00
jjjoness 2aafdab5af Added the new focus color. 2021-04-28 12:06:56 +01:00
jjjoness bf95c706d8 Merge branch 'main' into LYN-1932 2021-04-28 11:34:43 +01:00
hultonha d36a9470a3 Merge branch 'main' into hultonha_PR-37_follow-up 2021-04-28 09:27:00 +01:00