Commit Graph

1721 Commits

Author SHA1 Message Date
Guthrie Adams bb4fdc8fe8 Added basic unit test for relative path function
Moved asset system stub to RPI utils

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:23 -05:00
Guthrie Adams b14e0958ce updated comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:20 -05:00
Guthrie Adams ebcefb2fe7 updated image paths to use new function
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:15 -05:00
Guthrie Adams b643a8c80f updated comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:12 -05:00
Guthrie Adams 84ca17e7cb Created function to get relative paths to referenced files that will fall back to asset folder relative paths under certain conditions
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:10 -05:00
Guthrie Adams 620e522f86 material editor and exporter save source materials with relative paths
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:07 -05:00
jromnoa 1085aed137 Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 2021-11-03 09:23:26 -07:00
santorac 01e1bbea67 Merge branch 'development' into Atom/santorac/ShaderReloadDebugImprovements 2021-11-02 13:48:30 -07:00
rgba16f [Amazon] 5c072a5d51 Part 2 of enabling Atom to use TaskGraph
Enable Atom CullingScene to use TaskGraph
Enable Atom PNG save to use TaskGraph for red/blue color channel swap on save out.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-11-02 15:02:08 -05:00
Mike Balfour 6d7be70133 Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de
Merging stabilization/2110 to development
2021-11-02 13:33:14 -05:00
AMZN-stankowi 6d592d78cd Fixes for release builds with DCO fix (#5164)
* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-11-02 09:03:38 -07:00
Mike Balfour 122a28c4b4 Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:09 -05:00
Mike Balfour 5b4e840c5c Merge commit '5fe2207892a29b62e9f3d97412f2688dd568a928' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:27 -05:00
Mike Balfour 6c4a67651e Merge commit '9dac7270928d67e1afdba0fe842df0358fb27563' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:17 -05:00
jromnoa 2329e4302f Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 2021-11-01 21:10:16 -07:00
Qing Tao 8da6bea073 ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene crea… (#5153)
* ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene created by PreviewRenderer but not the Main Scene
Deprecate GetDefaultScene() function.
Update all the places which use GetDefaultScene to use Scene::GetFeatureProcessorFromEntityId or GetMainScene.
Tested with Editor, UI Editor, Material Editor, game launcher.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-01 14:26:55 -07:00
Tommy Walton c87670bbfb Fix innocuous release build error in RPIUtils LoadStreamingTexture (#5021)
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-01 11:38:45 -07:00
Guthrie Adams 7ba7928559 Removing redundant registration of script assets
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-01 11:19:08 -05:00
Santi Paprika db01d8ddda Fix bug timestamp view 'Once per Second' option (#5080)
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
2021-11-01 14:47:45 +00:00
galibzon 0807cb7f3e Added "RemovePassTemplate" method. (#5039)
* Added "RemovePassTemplate" method.

Signed-off-by: garrieta <garrieta@amazon.com>

* RemovePassTemplate only allows to remove PassTemplates
created with the Runtime API. It now asserts if there are Passes
referencing the PassTemplate that should be removed.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-29 15:41:17 -05:00
Tommy Walton 4ccbb964f3 Add missing dependencies to pass builder (#4884) (#5099)
* Adding shaders and attimage files as runtime depenencies for pass files, so that they are included in asset bundles. Also using the correct job key for attimage files.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Use a reference to avoid a copy

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Bumping the AnyAsset builder version

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Revert "Bumping the AnyAsset builder version"

This reverts commit 778798ae9cdd93ebe93248b3113e4cfb7609020d.

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-10-29 10:53:31 -07:00
Esteban Papp 72d6f2972e Adding support for multi-config/multi-permutation installer 2021-10-29 10:46:28 -07:00
Adi Bar-Lev 5fe2207892 Merge pull request #5095 from aws-lumberyard-dev/Atom/barlev/Stabilization_MaterialMetalicBugFix
Material - enbale/disable metallic scale according to texture selection
2021-10-29 11:12:14 -04:00
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-28 18:29:52 -07:00
Adi Bar-Lev cd3891fe23 Merge commit '689f5b2a4ac376634439708637346e5a3157f085' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:31 -04:00
Adi Bar-Lev 8184c526f7 Merge commit '9e0756f3c11ae5218246fec732e1ceb4da14caeb' into barlev/gitflow_211028_O3DE 2021-10-28 19:16:57 -04:00
hershey5045 9dac727092 Add component activation in LUT activation script. (#5101)
Signed-off-by: rbarrand <rbarrand@amazon.com>

Co-authored-by: rbarrand <rbarrand@amazon.com>
2021-10-28 15:21:47 -07:00
santorac ecae08fa95 Made some improvements for debugging shader hot reload issues.
Made ShaderReloadDebugTracker store its static data in Environment system variables, so they are shared across dlls. This fixes issues with inconsistent indenting when debug operations are performed in different libraries.
New ShaderReloadDebugTracker operations in FullscreenTrianglePass.
Added a ShaderReloadDebugTracker message to Shader::GetVariant that includes asset built timestamp infromation, which I think will be really helpful in sorting out reload issues.
Renamed some functions and variables to remove a redundant "ShaderAsset" term.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-28 12:05:56 -07:00
Guthrie Adams 5de24437ab fixed comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:53:26 -05:00
Guthrie Adams 1f4967b168 extending conversions from script to other numeric types
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:53:23 -05:00
Guthrie Adams b71e307de5 Fix issue setting enum values on material component from script
Replaced get and set functions with explicit types with templates
Added special case handling for setting enum values as strings or numbers from script

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:53:21 -05:00
Adi Bar-Lev bd6153f471 Material - enbale/disable metallic scale according to texture selection
Remark: resolves GitHub issue https://github.com/o3de/o3de/issues/2647 - ATOM-15614

Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
2021-10-28 13:24:49 -04:00
Tommy Walton 67f90a9b37 Add missing dependencies to pass builder (#4884)
* Adding shaders and attimage files as runtime depenencies for pass files, so that they are included in asset bundles. Also using the correct job key for attimage files.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Use a reference to avoid a copy

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Bumping the AnyAsset builder version

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Revert "Bumping the AnyAsset builder version"

This reverts commit 778798ae9cdd93ebe93248b3113e4cfb7609020d.

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-10-28 10:22:20 -07:00
Danilo Aimini e4df621f88 Merge pull request #5052 from aws-lumberyard-dev/daimini/gitflow_211027_o3de
GitFlow 10/27/21 (stabilization2110 to development) - O3DE
2021-10-27 17:45:45 -07:00
Jeremy Ong 13a136fa05 Merge pull request #5038 from aws-lumberyard-dev/Atom/jiaweig/ATOM-16414_vulkan_stencil
ATOM-16414 Vulkan stencil reference bits are used incorrectly
2021-10-27 15:49:56 -06:00
Esteban Papp 46fc1a720c Fixes monolithic and non-monolithic installed builds (test project builds against debug/profile non-monolithic and release monolithic)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-27 13:04:10 -07:00
Qing Tao 9e0756f3c1 ATOM-16656 PassTree tool: ParentPass image attachment preview doesn't work (#5032)
Move imageAttachmentCopy instance from RenderPass to Pass so it can support preview image for all passes but not only for RenderPass.
Fixed an issue with image attachment preview when switching render pipeline with attachment preview on.

Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-27 11:28:21 -07:00
Danilo Aimini ef81af0712 Merge commit 'cf90d7a59466295ada9223751d4f0020a1d6336d' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:23:02 -07:00
Danilo Aimini 4c1082f54e Merge commit '049112d8fa8f74400dcb612f91fb3e329be83d54' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:22:49 -07:00
Danilo Aimini 64b58e21a3 Merge commit '42a14079f2dd41f01048e9169daac282802b98c1' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:22:39 -07:00
Danilo Aimini b5f0375f1b Merge commit 'e22235ec5b850541d6a186a80b44050ebfd24d89' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:22:25 -07:00
Danilo Aimini 20939d6285 Merge commit '3913d9125172ad6a195dcc7d299701be3cd4624a' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:22:15 -07:00
Danilo Aimini 4430c1c3d3 Merge commit 'a945fd9f1bc885af48bd7c3172f1e46d24588eb5' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:22:10 -07:00
Danilo Aimini 8507e26de8 Merge commit 'b541d69efc1b1476eaa929a7cb81e09a3cf4185a' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:22:05 -07:00
Danilo Aimini 1a65250b96 Merge commit '22a287d046c606ccb79ff19c1c15075d8cd71dbc' into daimini/gitflow_211027_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:21:56 -07:00
Esteban Papp b7b79efd69 fixes monolithic vs non-monolithic installation (generates, monolithic doesnt build)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-10-27 10:17:27 -07:00
Ken Pruiksma 97920feaf1 Detail material Id texture created from surface weights. (#4984)
* Added some structs for detail materials

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added some template functions for looking up materials. Added lookups for all the relevant detail material fields in StandardPBR.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added some structs for detail materials

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added some template functions for looking up materials. Added lookups for all the relevant detail material fields in StandardPBR.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added support for generating a detail material texture with IDs populated from surface weights.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updated TerrainAreaMaterailRequestBus to have separate calls for region vs materials instead of the awkward out parameter
Update MaterialPropertyDescriptor so that you can retrieve enum names by ID
Several bug fixes / updates to the terrain feature processor dealing with detail materials.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating detail material texture based on offsets. Not quite working yet but close. Added visualization for detail material in shader (currently on, will be turned off before final commit)

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Small bugfixes
* Fix compile error in non-unity builds
* Fixed backwards x/y loops causing the wrong pixels to update
* Fixed selection of surface type with multiple surface weights

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Adding seam to detail texture debug display. Offseting edges by a half-pixel to avoid bleed. Disabling debugging detail textures by default.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Missing file from last commit for detail material change.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Cleanups

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* bug fix

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Bug fix in the terrain fp for TerrainAreaMaterialRequestBus returning incomplete materials on GetSurfaceMaterialMappings

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Some PR updates. Exposing detail material id debugging through a cvar.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Various updates from review.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* PR updates dealing with debug texture boundary line.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Hiding some fields from the terrain material

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing type in generic lambda for linux / android

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

Co-authored-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-10-27 10:12:13 -05:00
galibzon cf90d7a594 ShaderVariantAssetBuilder: Provide registry property to disable (#5029)
The registry property name is:
"/O3DE/Atom/Shaders/BuildVariants"
Default value is <true>.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-27 10:05:26 -05:00
jiaweig b9d51e53eb Combine stencil face bits
Signed-off-by: jiaweig <jiaweig@amazon.com>
2021-10-27 03:59:04 -07:00
santorac 049112d8fa Merge pull request #5027 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided
Removed reference to opacity.doubleSided property that no longer exists.
2021-10-26 18:54:12 -07:00