Commit Graph

510 Commits

Author SHA1 Message Date
Vicky 1681e97a0c ATOM-15369 LYN-3352 Expose sorting paramers to DynamicDrawContext's draw functions (#451) (#463)
* ATOM-15369 Expose sorting paramers to DynamicDrawContext's draw functions
 LYN-3352 LyShine: First element in Hierarchy does not properly draw in UI Editor

Add function to DynamicDrawContext to support set sort key for followed draw calls.
Use different sort key for background draw and top layer draw in UI canvas.
2021-04-30 11:19:13 -07:00
Luis Sempé 759e784e81 Merge pull request #480 from aws-lumberyard-dev/scripting/palette_fix
Removed BC Setters from showing up in the node palette
2021-04-30 11:10:19 -07:00
AMZN-puvvadar 24fb48ea8c Merge pull request #271 from aws-lumberyard-dev/mpgem_editor
Adding Multiplayer.Editor which allows specifying a server process for use with Editor on Ctrl+G
2021-04-30 09:54:30 -07:00
luissemp ab5ffc7604 Removed BC Setters from showing up in the node palette 2021-04-30 09:35:41 -07:00
Mike Balfour 3f607a1072 Merge pull request #477 from aws-lumberyard-dev/mbalfour/main-spec-6600
[SPEC-6600] Disabling unit tests that intermittently fail AR runs.
2021-04-30 11:30:41 -05:00
mbalfour c69a00fd80 [SPEC-6600] Disabling unit tests that intermittently fail AR runs. 2021-04-30 10:25:48 -05:00
greerdv 6eaf27e802 merging from main 2021-04-30 14:40:30 +01:00
bosnichd 1d4c483e73 Red code legacy renderer (#383)
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:

Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
2021-04-30 07:31:42 -06:00
greerdv d4d47cf492 fixing gEnv dereference crash in polygon prism debug draw 2021-04-30 14:31:07 +01:00
Benjamin Jillich aa5ddbf532 [LYN-3344] EMotionFX: Data integrity error, missing keyframe at the end of the animation (#418)
Animation tracks in the DCC tool formats are often stored individually, each having its own duration. For EMotion FX motion data, it is required to have tracks with the same duration and e.g. a position track has to match the duration of a morph track. This will be automatically fixed by adding missing keyframes at the end of the tracks to match the animation's global duration. The value of these are the same as the last one of the given track so that they freeze at that value.

* Added function that adds missing keyframes to match the individual tracks' duration for the non-uniform motion data in emfx.
* Added data integrity checks for various stages of the motion data builder / motion exporter.
* Checking for data integrity issues with an assert in the emfx importer. This is just a safety check and we don't need that for release builds as they should be captured at asset processing time already.
2021-04-30 07:21:52 +02:00
chcurran 6d45e9e408 Merge branch 'main' into carlitosan-beta-fixes 2021-04-29 18:21:09 -07:00
chcurran 1d7fc92930 Fixes errors in function scope variables that require static initialization 2021-04-29 18:19:14 -07:00
Sean Sweeney dcb253e08c Merge pull request #321 from aws-lumberyard-dev/modify_test_timeout
Modify test timeouts
2021-04-29 18:03:45 -07:00
Ken Pruiksma 07780e137b Merge pull request #440 from aws-lumberyard-dev/pruiksma/ATOM-15427
Cherry pick [ATOM-15427] from 1.0 to main.
2021-04-29 18:44:31 -05:00
moudgils 4fd9ad5341 Merge pull request #414 from aws-lumberyard-dev/Atom/moudgils/DisableMetalShaders
Disable metal shaders that dont cross compile correctly
2021-04-29 16:37:07 -07:00
puvvadar 8fc0b84d99 Merge branch 'main' into mpgem_editor 2021-04-29 15:14:28 -07:00
SergeyAMZN ef658b0cc7 Merge pull request #423 from aws-lumberyard-dev/MultiplayerPipeline
Added NetworkPrefabProcessor into Ctrl+G pipeline + minor fixes
2021-04-29 23:10:48 +01:00
pruiksma 109605a733 Cherry pick 06044522763512b78ae504f658a3e7cb5f99996c from 1.0 to main.
[ATOM-15427] Fixing crash in DirectionalLightFeatureProcessor caused by incorrect use of a container.
2021-04-29 16:44:24 -05:00
carlitosan 79886a7db3 Merge pull request #430 from aws-lumberyard-dev/carlitosan-beta-fixes
Carlitosan beta fixes - use long brackets for Lua implementation of ScriptCanvas strings
2021-04-29 13:56:13 -07:00
pereslav dfb262c572 Merge branch 'main' into MultiplayerPipeline 2021-04-29 20:53:53 +01:00
hershey5045 a746223c65 Change AtomSampleViewer screenshots to use png (#336)
Add functionality to capture png screenshots.
2021-04-29 12:01:32 -07:00
Nicholas Van Sickle 3c5c692148 Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
Fix viewport box selection
2021-04-29 11:19:28 -07:00
chcurran b70103ae98 Merge branch 'main' into carlitosan-beta-fixes 2021-04-29 11:02:23 -07:00
Ken Pruiksma 7f423f16a1 Merge pull request #412 from aws-lumberyard-dev/pruiksma/ATOM-15380
[ATOM-15380] Cherry picking changes from 1.0 - cfdb70978868aa5d0040d3b79994a26e9f82ca39
2021-04-29 12:58:47 -05:00
dmcdiarmid-ly b1807cc337 Merge pull request #415 from aws-lumberyard-dev/Atom/dmcdiar/SPEC-6486
[SPEC-6486] DiffuseProbeGrid Resultcode initialized but not referenced in release builds
2021-04-29 10:57:41 -07:00
Aaron Ruiz Mora 771a7a25aa Adding OUTPUT_NAME to physics gems shared libraries to avoid conflicting with their 3rdParty libraries 2021-04-29 18:00:06 +01:00
pereslav 85e46a5f10 Merge branch 'main' into MultiplayerPipeline 2021-04-29 16:53:36 +01: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
pereslav 7e633d907e Enabled NetworkPrefabProcessor for Ctrl+G 2021-04-29 16:26:13 +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
dmcdiar f65ef56654 Added maybe_unsed to result codes that are only used in Asserts. 2021-04-29 01:02:47 -07:00
chcurran f52975be83 use long brackets to implement SC strings in Lua 2021-04-28 22:40:41 -07:00
moudgils 389846c45c Disable metal shaders that dont cross compile correctly 2021-04-28 21:24:10 -07: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
pruiksma 186066edc1 [ATOM-15380] Cherry picking changes from 1.0 - cfdb70978868aa5d0040d3b79994a26e9f82ca39
---
[ATOM-15380] Fix cases where light delegates will attempt to set properties on the feature processor without having a valid handle.
2021-04-28 20:36:35 -05:00
nvsickle 9311dc4cb9 Fix RenderViewportWidget::ViewportWorldToScreen, which fixes box selection 2021-04-28 17:42:43 -07:00
puvvadar 0dfd635b27 Merge branch 'main' into mpgem_editor 2021-04-28 15:51:53 -07:00
puvvadar bd435e2abb Build MP Editor RequiredSystem Components off standard version 2021-04-28 15:11:35 -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
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
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
Peng 0e092d6cb7 ATOM-14947 Took out jira links, just use the ticket number 2021-04-28 10:45:18 -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
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
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