Commit Graph

3957 Commits

Author SHA1 Message Date
AMZN-Phil 5a3c289fac Merge pull request #2882 from aws-lumberyard-dev/Prism/RemoveTabFocus
Change Focus From Tabs in o3de.exe, Refactor Project Page Create, Sort Projects Alphabetically
2021-08-23 15:49:12 -07:00
santorac 60d137c5b6 Merge pull request #2746 from aws-lumberyard-dev/Atom/santorac/OptionalSceneApiMaterialConversion3
Made Model Material Conversion Optional

Added a new registry setting that disables automatic conversion of materials from model files like FBX.

By default, processing of model files (like FBX) automatically convert the included materials to Atom materials, using StandardPBR. This adds a job dependency on StandardPBR.materialtype, which propagates to any related azsl files as well. Thus any change to azsl code will cause all model files in the project to rebuild.

Some game teams have no interest in using the auto-converted materials; they always use a Material Component to apply material overrides for every mesh. This new setting allows teams to disable material auto-conversion for the entire project, thus removing the job dependency on StandardPBR.materialtype. Instead, every mesh will be assigned the same default material. Any change to azsl code will cause that one default material to rebuild, but this will not trigger any models to rebuild.

Details:
- Added /O3DE/SceneAPI/MaterialConverter registry settings for configuring the scene material converter. It includes an enable flag, and a default material to use when conversion is disabled.
- Added SceneBuilderDependencyRequests::AddFingerprintInfo which allows SceneAPI components to modify the scene builder analysis fingerprint. We use this to reprocess scene files when the material converter settings change.
- Updated SceneAPI's material asset builder to skip the StandardPBR dependency when material conversion is disabled.
- Added some code to MaterialComponentController to handle an edge case that may when disabling material conversion on an existing project, and assigned materials disappear.

Testing:
- Changing the registry setting does trigger a rebuild of the fbx files.
- When material conversion is disabled, changing an azsl file does not cause fbx files to rebuild, but the shader still reloads as expected.
- Made a test level using multiple models with multiple meshes, made various adjustments to the material slots for each mesh, and tried switching the material conversion registry setting from true to false. (Details below)
- Merged this change to a customer's fork and tested on their existing content.

Details about my test level:
- Made a new test level AtomTest project
- Added two entities, both using multi-mat_mesh-groups_1m_cubes.fbx
- Added a material component to both entities
  - Entity 1 material assignments
    - Blue_Zaxis: left as-is
    - Green_Yaxis: exported the material
    - Red_Xaxis: exported the material, and changed the material instance color to pink
    - StingrayPBS1: exported the material, scaled the UVs in the exported material source, and changed the material instance color to green.
    - With_Texture: selected an existing brick material, changed the material instance color to red.
  - Entity 2 material assignments
    - Default Material: set to an existing brick material
    - Blue_Zaxis: manually assigned built-in material that was converted from fbx
    - Green_Yaxis: manually assigned built-in material that was converted from fbx, and changed the material instance color to orange
2021-08-23 15:24:21 -07:00
Esteban Papp a75994e0b9 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 15:11:09 -07:00
Esteban Papp 7308578e55 reverting a change that will be cleaned by another PR
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 14:58:47 -07:00
Esteban Papp 31addc43dc Windows and Linux compiling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 14:02:45 -07:00
Mike Balfour 97a053a540 Initial stub terrain gem (#3368)
This is the initial Terrain Gem. In this PR, it doesn't do anything, but it contains all of the initial code, icons, and build scripts for the gem to compile and build successfully. The follow-up PR will contain the first round of functioning code.

Also, with the creation of the gem, the TerrainSurfaceDataSystemComponent is getting relocated from the SurfaceData Gem to the Terrain Gem. This should have no impact, as that component has provided no active functionality in o3de. (It will start working again with the initial terrain system code in the next PR)

This also adds a couple of null guards to prefab code to prevent AP crashes, and fixed an incorrect service dependency in the VegetationSystemComponent that was exposed by moving the TerrainSurfaceDataSystemComponent.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-08-23 15:41:57 -05:00
Mikhail Naumov f7eaa4490f fixing syntax errors
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 13:40:01 -07:00
AMZN-Phil ea5bfe0269 Merge pull request #3389 from aws-lumberyard-dev/Prism/UseGemDisplayNames
Improves Gem Catalog Search, Gem Display Names now used in Gem Catalog
2021-08-23 13:37:34 -07:00
michabr 89cc27fdef Fix input priority conflict with LyShine and ImGuiPass (#3329)
* Fix input priority conflict with LyShine and ImGuiPass

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

* Add GetPriorityDebugUI() input listener priority

Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-23 13:05:19 -07:00
Mikhail Naumov f224d657be Ronald's feedback
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 13:02:12 -07:00
Esteban Papp 1f44b7a328 Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 13:01:17 -07:00
Esteban Papp cb7b084e6b Code/Legacy
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 13:01:03 -07:00
Esteban Papp 6bdef50444 Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 13:00:45 -07:00
Esteban Papp 7d71e3dc07 Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 13:00:27 -07:00
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 12:59:13 -07:00
Esteban Papp 8c526eeeb6 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 11:13:56 -07:00
nggieber 6eb9273763 Improves Gem Catalog Search (searches, Name, DisplayName, Creator, Summary, and Features), Gem Display Names now used in Gem Catalog
Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-23 08:28:49 -07:00
nggieber b38fc80418 Tabs are shown gray background when tab focused, Reworked ProjectsScreen to reuse Widgets instead of recreating it on each update, Sorting projects alphabetically
Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-23 07:15:44 -07:00
amzn-sean b4279ab3d8 Remove touchbending references in PhysX Gem (#3320)
* minor comments update

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-08-23 14:54:56 +01:00
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 20:36:11 -07:00
Esteban Papp 7558a3d233 fixes for Android
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 19:40:13 -07:00
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-20 19:35:38 -07:00
Esteban Papp c07b9d31bf PR comments/improvements
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 19:21:50 -07:00
Esteban Papp 72ff6080ad format fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 18:59:12 -07:00
Esteban Papp 3eb795a305 alignment mismatches
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 18:40:20 -07:00
Esteban Papp 2e228d94f0 push/pop mismatch
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 18:39:40 -07:00
Esteban Papp e98bab8a75 fixing format strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 18:39:00 -07:00
Esteban Papp 257557c692 Code/Framework/AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:56:42 -07:00
Esteban Papp fbbcdfd3ca Code/Framework/AzQtComponents
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:56:25 -07:00
Esteban Papp 657853c093 Code/Framework/AzNetworking
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:56:09 -07:00
Esteban Papp ece541b79f Code/Framework/AzManipulatorTestFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:55:54 -07:00
Esteban Papp 4efaafeb96 Code/Framework/AzFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:55:28 -07:00
Esteban Papp 847fe108b7 Code/Framework/AtomCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:55:10 -07:00
Esteban Papp d4ee5423a9 Code/Framework/AzCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:54:53 -07:00
Esteban Papp a2ab05a262 Code/Tools
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:54:20 -07:00
Esteban Papp ca03f65a5d Code/Legacy/CryCommon
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:54:03 -07:00
Esteban Papp 9d5e7abfb1 Code/Framework/GridMate
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:53:48 -07:00
Esteban Papp 588d702e43 Code/Framework/AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:53:31 -07:00
Esteban Papp eaefc580d6 Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:53:14 -07:00
lumberyard-employee-dm c86d650c1a Updated the CrySystem module to execute deferred console commands (#3371)
* Updated the CrySystem module to execute deferred console commands

This allows the CVars declared in CrySystem module to execute commands
invoked before it was loaded.

This is particularly useful for the load level command

resolves #2062

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the invocation of deferred console commands after the LevelSystem
instance has been created

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-20 19:46:36 -05:00
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 14:51:35 -07:00
Esteban Papp 9245a31196 more fixes for Code
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 14:48:42 -07:00
srikappa-amzn c20ec14af7 Added comments and did some code clean up
Changes in this commit:
- Added comments to dialog code in CryEdit.cpp and CryEditDoc.cpp
- Moved Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/Cards/warning.svg to Code/Framework/AzQtComponents/AzQtComponents/Images/Notifications/warning.svg
- Improved the hover message over prefab settings in EditorPreferencesPageGeneral.cpp
- Fixed a syntax error in Editor.qss

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-08-20 13:42:56 -07:00
Esteban Papp c8c29b1aff Enable warning MSVC 4296: 'operator': expression is always false 2021-08-20 13:42:19 -07:00
Esteban Papp 57a8e4fb4e build fixes (#3369)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 13:40:46 -07:00
Esteban Papp 8bc9ed3d01 removing some rad leftovers (#3366)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 13:39:51 -07:00
srikappa-amzn 7a83950f59 Initial draft for save all prefabs workflow
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-08-20 11:35:57 -07:00
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 11:18:43 -07:00
Esteban Papp a35464ca08 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 10:09:44 -07:00
puvvadar 4e618db62d Merge pull request #3082 from aws-lumberyard-dev/MultiplayerForwardDeclControllerErrorFix
Fix Multiplayer AutoComponent Delete Incomplete Type Compile Error
2021-08-20 09:52:11 -07:00