Commit Graph

2458 Commits

Author SHA1 Message Date
scottr e1dfac34fc [ftue_auto_register] wrapped registration pybind calls with ExecuteWithLock 2021-05-27 15:24:39 -07:00
scottr 3137b961bf [ftue_auto_register] elevated error to assert if registration fails 2021-05-27 14:54:51 -07:00
scottr ecc18338fa [ftue_auto_register] move engine registration check into private helper function 2021-05-27 14:19:31 -07:00
scottr 78afc45709 [ftue_auto_register] add logic to auto register engine if it is not already 2021-05-27 12:39:14 -07:00
Mike Balfour 7ced53cf58 [SPEC-7039] Fix for mac build (#969)
Fix for the following error:
/workspace/o3de/Code/Tools/SerializeContextTools/SliceConverter.h:55:41: error: extra qualification on member 'ConvertSliceInstance'
2021-05-27 09:00:32 -05:00
greerdv 7353f262c5 Merge pull request #980 from aws-lumberyard-dev/remove-deprecated-transform-api
update rigid body to use non-deprecated function and remove many depr…
2021-05-27 12:44:17 +01:00
greerdv 34c59a81b8 update rigid body to use non-deprecated function and remove many deprecated transform bus functions 2021-05-27 10:51:36 +01:00
Tom Hulton-Harrop 4205a69106 Allow ComponentAdapter (and related types) to work with EntityComponentIdPairs as well as EntityIds (#920)
* provide the ability for component adapters to support multiple components per entity

* add missing explicit keywords

* updates following review feedback - update how template logic works

* small updats (fix typo, remove redundant includes)

* add missing this->

* naming change, common -> controller

* add [[maybe_unused]]
2021-05-27 09:34:52 +01:00
dmcdiarmid-ly 592114bd4f Merge pull request #887 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-5034
[ATOM-5034] Bake DiffuseProbeGrid textures
2021-05-27 00:03:54 -07:00
Terry Michaels 02e18be3fc Turned off mac asset building on pc platforms (#977) 2021-05-26 23:18:57 -05:00
michabr 8bd4c8d974 Add back text drawing using Draw2d (#928)
This is used by the UI Editor's viewport and also by LyShine to display debug text.
2021-05-26 20:51:05 -07:00
Terry Michaels b1115c091f Removed unused watersample level (#975) 2021-05-26 22:43:52 -05:00
Doug McDiarmid 74bdf2b069 Minor changes: Updated comments and removed an include file. 2021-05-26 20:25:48 -07:00
AMZN-mnaumov dd3907c8c4 Merge pull request #951 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15464
[ATOM-15464] Fixing Material Editor crash on shutdown
2021-05-26 20:23:04 -07:00
Alex Peterson 13de9de3c1 Project Manager Toolbar Update
- use flow control for projects page for automatic updates when resizing
- made the first time screen only display the first time
2021-05-26 19:47:17 -07:00
Doug McDiarmid 045def6ce1 Merge branch 'main' into Atom/dmcdiar/ATOM-5034 2021-05-26 19:23:06 -07:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
Nicholas Van Sickle d1863c6c5b Restore Editor viewport icon rendering (#879)
This introduces an EditorViewportIconDisplayInterface that will eventually be used to outright remove CIconManager, it provides a simple interface for loading 2D image assets and rendering them on-screen. It also introduces AtomBridge::PerViewportDynamicDraw for getting a dynamic draw instance on a per-viewport basis
2021-05-26 16:36:54 -07:00
Brian Herrera dc0f1ff0b1 Merge pull request #966 from aws-lumberyard-dev/pipelines/LYN-4027
[Inclusion] Rename parameter for retry config
2021-05-26 16:03:40 -07:00
Terry Michaels 5ed4454e8b Moved Create New Level logic out from SaveToStream (#967) 2021-05-26 17:52:34 -05:00
cgalvan f1a5160fe7 Merge pull request #963 from aws-lumberyard-dev/cgalvan/FixMacBuildSliceConverter
Fixed extra qualification causing compile error on Mac.
2021-05-26 16:20:02 -05:00
Brian Herrera d99fea7a98 [Inclusion] Rename parameter for retry config
Parameter was renamed to allowed_methods in urllib3 1.26.0. Both options are currently available in the version we are using now.
2021-05-26 13:54:39 -07:00
Mike Balfour 6c17c7bfb3 Add new API to convert absolute source paths to relative paths. (#930)
There are already APIs for getting a relative product path from an absolute source path, or getting a relative source path for an *existing* source file, but there were no APIs for getting a relative source path for a *new* source file.  Prefabs will need this ability to be able to correctly generate a relative source path inside the prefab file before the file has been saved.
The logic for relative source paths is a little bit tricky because the paths are relative to the watch folders, and the watch folders can be nested, with different priorities to explain which should take precedence.  The input paths can also include specifiers like "." and "..", which need to be reconciled before creating the final correct relative path.  The included unit tests test all of the tricky edge cases that I was able to identify.
2021-05-26 15:30:21 -05:00
galibzon 0678dec64e [ATOM-15618] Shader Build Pipeline: Add UnitTest To Validate Shader C… (#918)
* [ATOM-15618] Shader Build Pipeline: Add UnitTest To Validate Shader Compiler
Argument Processing Introduced With The New Supervariant System

- Added new test suite in
  Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp

- Refactored and improved the previously existing classes:
  GlobalBuildOptions, PreprocessorOptions and ShaderCompilerArguments
  to work well with the new ShaderSourceData::SupervariantInfo.

- Moved command line argument processing function out of
ShaderCompilerArguments and into its own utility namespace in
Atom/RHI.Edit/Utils.h

Signed-off-by: garrieta <garrieta@amazon.com>
2021-05-26 15:23:11 -05:00
Alex Peterson da24f4ccde Launch editor from Project Manager 2021-05-26 13:17:16 -07:00
srikappa-amzn ef6ac74aa7 Merge pull request #934 from aws-lumberyard-dev/Prefab/RemoveUndoCacheDependency
Remove prefab undo cache dependency on CreatePrefab use case
2021-05-26 13:00:02 -07:00
Chris Galvan b68b9000a3 Fixed extra qualification causing compile error on Mac. 2021-05-26 14:55:38 -05:00
Ken Pruiksma 60f7f971f3 Merge pull request #943 from aws-lumberyard-dev/pruiksma/halton_update
Make it easier to fill your own custom structures with Halton sequences.
2021-05-26 14:20:28 -05:00
jckand-amzn d2e6031f38 Merge pull request #953 from aws-lumberyard-dev/jckand/FoundationAuto
SPEC-6949: Moving failing Editor tests to Sandbox suite for investigation
2021-05-26 14:06:17 -05:00
moudgils 87e8eaef42 Merge pull request #936 from aws-lumberyard-dev/MacDxcUpdateFix
Update Dxc path for Mac based on the Dxc updated package
2021-05-26 11:50:09 -07:00
AMZN-koppersr 86afd5fc7f Merge pull request #917 from aws-lumberyard-dev/SpawnableIndexQuery
Additional list function added to Spawnables.
2021-05-26 11:44:07 -07:00
Chris Santora 88e1c84854 Merge pull request #863 from aws-lumberyard-dev/Atom/santorac/DepthBasedLayerBlending
ATOM-14676 Depth Based Layer Blending

- Added new blend source options that blends between layers based on which displaced height is higher. These options include Displacement, Displacement_With_BlendMaskTexture, and Displacement_With_BlendMaskVertexColors.
- Significantly refactored and updated the blend and displacement code in StandardMultilayerPBR_Common to support displacement-based blending.
- Added a new blend factor specifically for displacement-based blending that adjusts the transition between the layers independent of the displacement transition.
- Rearranged the per-layer parallax property groups because these are more general than just parallax. They can be used for displacement-based blending regardless of whether a parallax effect is being used.
  - Renamed "Parallax Mapping" to "Displacement" because these properties can be used for other things besides parallax, in particular the new displacement-based blend modes.
  - Removed the unnecessary per-layer "enable parallax" flags.
  - Made the "offset" property always available, so this can be used to adjust displacement for blending purposes even when there is no heightmap or parallax. (The "factor" property still only shows up with a heightmap because its only purpose is to scale the heightmap).
- Solidified a naming convention for how to talk about layer blending: 
  - "Blend mask" means the R and G channels that mask layers 2-3. These can come from multipls source, including a "blend mask texture" or "blend mask vertex colors".
  - "Blend weights" are the final RGB channels that are multiplied and added with layer properties to do the final blend.
  - "Blend source" is the combination of data that is used to produce the blend weights, which could be a combination of displacement maps, blend mask texture, vertex colors, or others in the future.
- Updated the list of available debug view modes, and moved them to the "blend" group because the only modes we have right now are related to layer blending. 
- Fixed a pre-existing bug where normals could be length 0.
- Added new cc0 textures from https://cc0textures.com/
- Added new materials for testing

New ASV test cases are here: https://github.com/aws-lumberyard/o3de-atom-sampleviewer/pull/67
2021-05-26 11:38:40 -07:00
rgba16f 6b2028c756 fix ly shine inverted font colors
Make AtomFont use the same vertex color format as LyShine.
2021-05-26 13:38:03 -05:00
srikappa 0ffaa5429b Fixed a linux build error where an implicit conversion to const ref is not supported 2021-05-26 11:31:16 -07:00
jiaweig 50085d0487 Merge pull request #823 from aws-lumberyard-dev/Atom/jiaweig/ATOM-15125_UV_Tangent
ATOM-15125 Support Reorder of Tangent Streams
2021-05-26 11:25:13 -07:00
pruiksma e903915867 Merge branch 'main' into pruiksma/halton_update 2021-05-26 13:05:50 -05:00
pruiksma 1924937150 Fixes from PR review 2021-05-26 13:05:07 -05:00
jckand-amzn 68cef57d3b Merge branch 'main' into jckand/FoundationAuto 2021-05-26 13:03:26 -05:00
jckand-amzn 1ebfa86f87 Added missing indent to test registry in CMakeLists.txt 2021-05-26 13:02:55 -05:00
srikappa 7d3dcf85f6 Merge branch 'main' into Prefab/RemoveUndoCacheDependency 2021-05-26 10:47:35 -07:00
srikappa 5a41746683 Fixed a comment and added a forward declaration 2021-05-26 10:46:00 -07:00
AMZN-koppersr a82f4440ea Fixed release compile error 2021-05-26 10:24:15 -07:00
amzn-sean 63ce0c1a62 character controller component now uses simulated body handles (#929) 2021-05-26 18:24:13 +01:00
lumberyard-employee-dm 9a0b93c9ff Fixed generation of Monolithic builds StaticModules.inl (#947)
* Fixed generation of Monolithic builds StaticModules.inl
A project's gem module RUNTIME_DEPENDENCIES were not visited to
determine any dependent gem modules that needed to load.
Therefore the CreateStaticModules function were missing
CreateModuleClass_* function calls required initialize the gem's AZ::Module
derived class in monolithic builds

* Removed the logic to strip the Gem:: and Project:: prefix from the Server Launcher gem dependencies

When associating gem dependencies with the server target there was CMake logic left over in it to strip the beginning of the target name if it began with "Gem::" or "Project::"
2021-05-26 12:18:26 -05:00
Steve Pham d4587d1f99 Add Label Exclusion filter for Sandbox tests from the main test suites (#955) 2021-05-26 10:14:18 -07:00
greerdv 53f31a2712 Merge pull request #950 from aws-lumberyard-dev/network-transform-scale
update network code to use uniform scale on Transform
2021-05-26 18:01:49 +01:00
AMZN-koppersr f3212902aa Merge branch 'main' into SpawnableIndexQuery 2021-05-26 09:48:20 -07:00
Chris Santora 4462b059a1 Merge branch 'main' into Atom/santorac/DepthBasedLayerBlending 2021-05-26 09:45:17 -07:00
SJ 8ca3b078a2 Remove bootstrap.cfg and some references to it.
Merge pull request #836 from aws-lumberyard-dev/LYN-2461
2021-05-26 09:32:57 -07:00
Hasareej ca5e629dac Hasareej lyn 2301 cluster space 2 (#843)
Initial Implementation of the ViewportUi Space Cluster
2021-05-26 17:12:30 +01:00