Commit Graph

1713 Commits

Author SHA1 Message Date
Chris Santora b56667bb64 Added new blend source options that allow a blend mask to be used together with depth based blending. 2021-05-14 00:02:15 -07:00
Chris Santora 9dafc54fc0 Got things working again after merging my depth-based-blend changes together with the new layering model.
Updated the terminology (yet again) to hopefully be a bit more clear and consistent.
"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.

Added another debug render mode, so now we can show either the blend mask and the final blend weights.
2021-05-13 14:57:16 -07:00
Chris Santora 828ce72123 Merge branch 'Atom/santorac/MultilayerPbrImprovements' into Atom/santorac/DepthBasedLayerBlending 2021-05-13 12:12:51 -07:00
Chris Santora 70c8ef99ef Updates in response to code review, from gadams3.
Cleaned up code around MaterialFunctor's QueryMaterialPropertyMetadata and QueryMaterialPropertyGroupMetadata.
Removed unnecessary "groupHeader->setObjectName(...)"
Simplified code in MaterialInspector::OnDocumentPropertyGroupVisibilityChanged.
2021-05-13 09:39:01 -07:00
Chris Santora e429c8e06a Fixed issues after merging latest main, as well as some edge cases I didn't notice before.
The structure of InspectorWidget::m_groups changed, so I had to update my new code accordingly.
Updated the InspectorWidget::m_groups code a bit to be more readable.
Discovered the initial property group visiblity state wasn't being set correctly when a material was first opened, so groups weren't initially hidden when they should have been. This had to be fixed in different ways for MaterialEditor's inspector and MaterialComponent's inspector.

ATOM-14688 Disable Individual Layers
2021-05-12 23:28:05 -07:00
Chris Santora 37a1b77d50 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 2021-05-12 17:45:28 -07:00
Chris Santora 53188a12da Made StandardMultilayerPBR hide a layer's property groups when that layer is disabled.
ATOM-14688 Disable Individual Layers

- Added new SetMaterialPropertyGroupVisibility functions to the material functors.
- Updated the MaterialFunctor::EditorContext to include parameters for handling material property group metadata.
- Updated the material inspector(s) to apply the property group visiblity changes from the material functor, to hide or show the property groups.
- Moved some code from MaterialPropertyDescriptor.h/cpp to a new MaterialDynamicMetadata.h/cpp, since these aren't really related to the MaterialPropertyDescriptor code. It's more for material functors to use.
- Also fixed the casing for the "GetMaterialPropertyValue_Image" lua function, since I was already in this code (ATOM-14793 "Fix Inconsistent Casing For LuaMaterialFunctorRuntimeContext")

Tested in MaterialEditor and in in the main Editor's MaterialComponent property override inspector.
2021-05-12 17:06:57 -07:00
Amzn-Catdo 8101b60f5d Merge pull request #689 from aws-lumberyard-dev/Prefab/Automation/Tests
Prefab/automation/tests
2021-05-12 17:05:10 -07:00
catdo 7633ec9a83 removed spacings in CMakeList and removed the tags.txt file in the prefab level 2021-05-12 16:27:51 -07:00
SSpalding 67c3801d73 Log monitor encoding fix (#729)
Fixed log monitor encoding bug.
2021-05-12 16:15:18 -07:00
catdo a19599d96b Merge branch 'main' into Prefab/Automation/Tests 2021-05-12 14:39:03 -07:00
Steve Pham 50abafbab1 Add orchestrating script to install ubuntu packages for O3DE on Linux (#721)
SPEC-3510: Linux environment setup scripts

* Add orchestrating script to install ubuntu packages for O3DE on Linux
* Fix issue parsing package content file for build-tools
2021-05-12 14:31:39 -07:00
SJ 3a63941d56 Fix Jenkins failure during engine registration for iOS
iOS is built on Mac where environment variables are accessed using the '$' symbol.
2021-05-12 14:24:40 -07:00
zsolleci 50ba6bba56 Merge pull request #702 from aws-lumberyard-dev/LY-123750
T92563569 completed and suite updated
2021-05-12 16:24:33 -05:00
Mike Balfour 2679826421 Change SerializeContextTools into a ToolsApplication so that it can correctly read in slice data 2021-05-12 16:03:52 -05:00
srikappa-amzn 1895c2d18d Merge pull request #675 from aws-lumberyard-dev/Prefab/CreatePrefab
Get instantiation to work after creation of a prefab is undone
2021-05-12 13:54:26 -07:00
catdo 2787e5053d addressed some nits and added comments 2021-05-12 13:18:32 -07:00
Olex Lozitskiy 5f3a6c0934 Merge pull request #724 from aws-lumberyard-dev/Atom/olexl/LYN-3734_atom_ap_issue
LYN-3734 Bringing back RHI modules to tool deps
2021-05-12 16:01:38 -04:00
srikappa 98a579abef Added a comment 2021-05-12 12:17:36 -07:00
zsolleci b5d7ae829a addressed internal review feedback 2021-05-12 14:10:54 -05:00
Aristo7 3569ac9b87 Bringing back RHI modules to tools deps 2021-05-12 13:13:28 -05:00
amzn-sj 3383cfc95a Fix Jenkins failure during engine registration for iOS 2021-05-12 10:20:03 -07:00
Shirang Jia 33f7da764e Remove unneeded scripts that have internal service references (#683) 2021-05-12 10:05:42 -07:00
bosnichd 7cec2d8b07 Remove more unused things from CryCommon and CrySystem. (#709)
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
2021-05-12 08:30:15 -06:00
mbalfour ae9b36c135 PR feedback - now allows for multiple specializations on the command-line, and changed the switch name to "specializations" to reflect that. 2021-05-12 08:56:49 -05:00
Tom Hulton-Harrop f9fb61cc5d Fix issue with viewport interaction ordering and viewport matrix changed handler (#695)
* fix for ctrl+mouse-wheel to cycle transform modes in the viewport

* ensure correct callback function is invoked

* remove redundant check in CameraInput
2021-05-12 09:40:37 +01:00
Steve Pham bf62687b37 Update android installation script to install gradle 7.0 2021-05-11 18:58:26 -07:00
kberg-amzn deae9db5c2 Merge pull request #704 from aws-lumberyard-dev/MultiplayerComponents
Removing unused GridMate touchpoints from AzFramework, and non-inclusive code removal
2021-05-11 17:51:03 -07:00
Chris Santora 275bb1bfec ATOM-14688 Disable Individual Layers
Added flags for enabling StandardMultilayerPBR layers 2 and 3. This makes it easy to create a two-layer material, or to flip layers off and on for debugging.
2021-05-11 17:25:53 -07:00
Chris Santora 9faf35b529 Refactor in prepration for ATOM-14688 "Disable Individual Layers"
Refactored StandardMultilayerPBR to collate all the code for each layer into a couple structs and utility functions. This makes the code easier to maintain, and in particular will make it easy for me to add Enable flags for the layers in a subsequent commit.
Also removed subsurface scattering and translucency from StandardMultilayerPBR, according to ATOM-4120 "Stabilize Standard PBR Regarding Subsurface and Translucency".

Squashed commit of the following:

commit a6052d6ad4f70183d0ce72e84c7dc5512dc24d5e
Author: Chris Santora <santorac@amazon.com>
Date:   Tue May 11 16:32:15 2021 -0700

    Got the refactor finally working. I had change it to blend the baseColor, spec factor, and metalness before converting to albedo and spec, in order to get exactly the same results as before.

commit 42d6da7f405097dea07b6ed0426d6a662b61440d
Author: Chris Santora <santorac@amazon.com>
Date:   Tue May 11 15:58:38 2021 -0700

    Fixed clear coat issue due to LightingData initialized too late.

commit 358194a5caf6f9eb99b0e5345ad5f7768b244a93
Author: Chris Santora <santorac@amazon.com>
Date:   Tue May 11 15:18:30 2021 -0700

    Fixed a couple issues.

commit adb431f8113b945057959db288a7ee2dd825dd69
Author: Chris Santora <santorac@amazon.com>
Date:   Tue May 11 12:42:12 2021 -0700

    WIP refactor of StandardMultilayerPBR to collate the code for each layer. Also removed subsurface scattering from multilayer.
2021-05-11 17:09:41 -07:00
karlberg 35500981eb More removal fixes 2021-05-11 16:36:44 -07:00
catdo a2a315a6cd Fixed all nits and took out the general module and its usage 2021-05-11 16:29:26 -07:00
Olex Lozitskiy 6b2a750f3d Merge pull request #589 from aws-lumberyard-dev/Atom/olexl/ATOM-15376
Gem::AtomBridge now contains all the runtime/tool deps for projects that wish to use Atom renderer
2021-05-11 19:28:56 -04:00
karlberg b2a92b1950 Removing test that required netbinding on the AzFramework TransformComponent 2021-05-11 16:00:15 -07:00
Aristo7 93ef3acb50 Removing non-tool modules from tools runtime deps 2021-05-11 18:43:09 -04:00
sharmajs-amzn 7f5962d1ba disable AssetJobsFloodTest.ContainerCoreTest_BasicDependencyManagement_Success test (#703) 2021-05-11 15:23:43 -07:00
sconel 4e54df49db Merge pull request #438 from aws-lumberyard-dev/Spawnable/ProductDependency
AddProductDependency to handle inter-product dependencies in PrefabProcessors
2021-05-11 15:19:01 -07:00
karlberg 3169b3477d Adding missing files to azframework_files.cmake and fixing include errors due to network removal 2021-05-11 15:15:35 -07:00
Aristo7 b92a1884a8 Addex dx12/metal builders to linux 2021-05-11 18:08:59 -04:00
AMZN-mnaumov d469572422 Merge pull request #681 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14320
[ATOM-14320] Fixing parallax artifacts
2021-05-11 14:31:50 -07:00
karlberg 318f97a717 build fix for removed gridmate headers 2021-05-11 14:28:10 -07:00
Mike Balfour 12ce70030c Merge pull request #701 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
Move ThumbnailerNullComponent into AzToolsFramework so that it can be used by other tools
2021-05-11 16:26:56 -05:00
mbalfour b5e87d3601 Change SerializeContextTools into a ToolsApplication so that it can correctly read in slice data:
- Uses ToolsApplication instead of ComponentApplication so that built-in Editor components are recognized and read in correctly
- Starts up all the DynamicModules immediately so that the System Components are activated, which registers asset handlers and allows asset references to serialize in correctly
- Adds a -specialization command-line flag to specify which project specialization to use (editor, game, etc)
- Removes the filter to ignore unknown classes since they should all now be "known"
- Adds a few gem autoload flags and a null thumbnail service so that Qt and Python systems can be skipped, as they aren't needed for the data conversions and would bring additional overhead and complications
2021-05-11 16:13:04 -05:00
karlberg 74385a575f Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-11 13:43:17 -07:00
karlberg 5440d0926d Fixing some dependencies in script canvas and emfx 2021-05-11 13:42:44 -07:00
srikappa 33af6c1014 Merge branch 'main' into Prefab/CreatePrefab 2021-05-11 13:41:48 -07:00
Aristo7 fe24f37a70 Fixing up null.builder loading issue 2021-05-11 15:34:31 -05:00
mbalfour 21dfcfed74 Fix bug where setting autoLoad to false for one gem will prevent every gem after it from loading as well. 2021-05-11 15:26:07 -05:00
Aristo7 b6740dd972 Merge remote-tracking branch 'upstream/main' into Atom/olexl/ATOM-15376 2021-05-11 15:19:17 -05:00
Eric Phister ab8738b7c3 Updating to support Wwise SDK 2021.1.1.X (#686)
* Code updates for Wwise 2021.1.X support.

* [WIP] CMake updates for Wwise 2021.1.X support.

* Updates FindWwise.cmake to search for a Wwise install or let user set it as cache variable.

* Makes Wwise SDK optional, and the AudioEngineWwise Gem will revert to a 'stub' build if no SDK found.

* Adding a .gitignore for Wwise project files.

* Updates a .wcmdline file for integration into Wwise projects.

* Updates the cmake messaging regarding Wwise SDK and smooths out some of configuration scenarios.

* Updates the Wwise project for AutomatedTesting to ver 2021.1.1.7601 and rebuilds banks.
2021-05-11 15:16:32 -05:00