Commit Graph

4375 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 6d896beb4b added version to material component exporter
deleted unnecessary checks

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-03 17:30:18 -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 f0ba0ff7eb Merge pull request #5033 from aws-lumberyard-dev/Atom/jromnoa/assert-for-screenshot-comparisons
Fixes the test_BasicLevelSetup_SetsUpLevel() test and adds proper asserts for screenshot comparisons.
2021-11-03 12:26:56 -07:00
Steve Pham 0e8edfa702 Update OpenMesh for Windows and prepare for Linux and Mac (#5248)
- Update to OpenMesh-8.1-rev3 for Windows
- Add OpenMesh-8.1-rev3 for Linux but not enabled
- Add OpenMesh-8.1-rev3 for Mac but not enabled

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-03 11:37:28 -07:00
Luis Sempé 8966380acf Merge pull request #5197 from aws-lumberyard-dev/animation/rhhong/render_settings_merge
[Merge] load render option in atom render plugin and use render actor setting in atom debug draw
2021-11-03 10:56:45 -07:00
rhhong 246debd50a fix android compile error
Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-03 09:27:42 -07:00
jromnoa 1085aed137 Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 2021-11-03 09:23:26 -07:00
santorac a6db2c6f8f Merge pull request #5098 from aws-lumberyard-dev/Atom/santorac/ShaderReloadDebugImprovements
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.
2021-11-03 08:59:59 -07:00
Sergey Pereslavtsev 2ac75d1231 Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchies2 2021-11-03 13:58:50 +00:00
rhhong 0c86198fd9 CR feedback; add ability to update the render in the preference window.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-02 23:09:42 -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
Adi Bar-Lev cf1d13fa43 AutomatedTesting - adding Hair to MainPipeline (#5200)
* AutomatedTesting - adding Hair to MainPipeline

Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>

* Hair - securing default value of render technique to be ShortCut

Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
2021-11-02 15:38:38 -04: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
SergeyAMZN 536cba18d7 Merge pull request #4778 from aws-lumberyard-dev/LYN-6770_AutomatedTestNetInputs
LYN-6770 Automated Test Network Input
2021-11-02 16:49:13 +00: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
Scott Romero 797b8248e5 [development] Consolidated programmatic profiler capture API (#4969)
Merged overlapping profiler EBuses/Interfaces into AzCore
Fixed ambiguous LogLevel type in some unity file scenarios
Added cvar/console access for profiler capture
Added utilities for reflecting AZ::Interfaces through the BehaviorContext
Included profiler system sample python script

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-11-02 09:00:15 -07:00
Mike Balfour a9d65b25ec Merge commit 'd52ce49dcb827c04150a6f11b7cceead9f61a43c' into mbalfour/gitflow_211102_o3de 2021-11-02 09:45:07 -05:00
Mike Balfour 1d22eddf71 Merge commit 'ecd11a441ce08e6767ab2ce732513e963b9acbbe' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:20 -05: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
Mike Balfour 5867ab6bde Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:12 -05:00
Ken Pruiksma d52ce49dcb Terrain macro material fixes (#5182)
* Minor fixes for macro materials
- When macro image views are no longer used, they will explicitely be set to nullptr
- limiting for loop in shader to the number of macro materials total so it doesn't read unitialized memory

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

* Removing parts of the terrain shader no longer used.

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

* Fixing normalization in shaders, adding default valus for all structs used in SRGs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-11-02 09:27:10 -05:00
rhhong f089187f3a Merge branch 'development' into animation/rhhong/render_settings_merge
Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-01 23:06:09 -07:00
jromnoa 2329e4302f Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 2021-11-01 21:10:16 -07:00
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 2021-11-01 20:23:27 -07:00
Vincent Liu 96159c1e3a Add missing exclamation mark for documentation (#5144)
* Add missing exclamation mark for documentation

Signed-off-by: onecent1101 <liug@amazon.com>

* Add more

Signed-off-by: onecent1101 <liug@amazon.com>
2021-11-01 14:52:40 -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
Gene Walters fa32940205 Adding logs to dedicated-server start up (unable to use for automated testing just yet since remote console cant be connected that early). Adding pytest check to make sure AutomatedTesting.ServerLauncher is running. Moved sveditor_port to MultiplayerEditorConnection since it was never actually getting used when it was in EditorSystemComponent (dedicated servers dont know about editor)
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-01 13:01:59 -07:00
Guthrie Adams ecd11a441c Merge pull request #5152 from aws-lumberyard-dev/Atom/guthadam/material_component_json_serializer
Created custom JSON serializer for editor material component
2021-11-01 13:56:35 -05:00
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-11-01 11:43:19 -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
Esteban Papp 8e420dad3d Removes some usage of DEDICATED_SERVER (#5119)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-01 08:46:26 -07:00
Esteban Papp 43563060bc Making trait variable consistent and fixing warning (#5118)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-01 08:44:22 -07: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
Guthrie Adams 68cb8792f7 fix header comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-31 15:12:27 -05:00
rhhong c79bf7a0c1 load render option in atom render plugin and use render actor settings in atom debug draw
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-30 22:37:05 -07:00
Guthrie Adams 799290aefc Created custom JSON serializer for editor material component
The editor component contains an editor specific, dynamically generated version of the material slots to display all the possible options, organize properties for the user interface, and add custom actions.
The critical data is already stored inside of the component controller configuration, which only stores a map of modified or overridden values.
This change disables serialization of the redundant data for prefabs.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-30 17:36:07 -05:00
AMZN-ScottR 2d7c6af97c Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-29 17:21:29 -07:00
AMZN-ScottR 4721f44b92 [profiler_capture_api] more changes based on PR feedback
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-29 17:19:38 -07:00
Gene Walters 2f38873e03 Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-29 13:55:32 -07: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
ffarahmand-DPS 971e24285f Fixes debug console's "quit" issues (#4975)
* Fixes a crash caused when attempting to ‘quit’ the launcher from the debug console. The change simply ensures that the underlying font data the OnRenderTick() function relies on has not yet been released from memory.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Fixes a crash caused when attempting to ‘quit’ the launcher from the debug console. An object created on the heap was never deleted, causing a chain reaction.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Some quick clean-up for safety.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Changes !defined(DEDICATED_SERVER) to a runtime check since macro is no longer defined.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
2021-10-29 11:28:42 -07:00