Commit Graph

6316 Commits

Author SHA1 Message Date
chcurran 6bd5cd7bde Fix release build warning error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-25 10:53:34 -07:00
chcurran be9ad98b24 remove commented out debugging artifacts
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-24 17:46:25 -07:00
chcurran 214700a73e Finish repair for scanning for upgrade tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-24 17:38:34 -07:00
chcurran 26f6a714c8 initial fix for version scan
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-24 15:14:20 -07:00
chcurran 794c22c02e merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 16:02:58 -07:00
chcurran 13188f8958 Simplify codegen of baseclass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 15:56:45 -07:00
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
Luis Sempé 6ab776a3a6 Merge pull request #3354 from aws-lumberyard-dev/scripting/autogenfixes
Fixed categories not being properly applied for Nodeables & removed old code generator tags

> LG, I guess old NodeableCodegen definitions have all been migrated to new xml format file?

correct
2021-08-23 15:09:57 -07:00
chcurran 95a812b238 fixup codegen, remove android errors
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 15:07:42 -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
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
William Hayward d45ec58cd7 Merge pull request #3323 from aws-lumberyard-dev/readme-updates
Readme updates
2021-08-23 16:25:42 -04:00
Jacob Hilliard 246621fda5 Visualizer: finish deserialization of captures (#3293)
* Visualizer: Initial capture loading support

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Deserialize thread id

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Quality of life improvements throughout

- Decrease row size for more information onscreen
- Remove fudge factors in drawing logic
- Add comments to deserialization logic
- Fix Editor text scaling bug
- Early out for data culling to avoid erase_if call

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-23 13:14:00 -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
santorac b6dfb86007 Removed unnecessary #include
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-23 12:53:33 -07:00
santorac de932c62b3 Reverted changes in MaterialComponentController for an obsucre edge case. We'll handle the case of missing material assets more generally as a separate task.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-23 12:50:11 -07:00
chcurran aafe735833 Add JSON serialization to required ExpressionEvaluation class
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 12:11:55 -07:00
amzn-phist c66dcc7413 Fix rpaths during o3de sdk install on Linux (#3370)
* Fix rpaths during o3de sdk install on Linux

Adds install code that modifies ly_copy commands to fix rpaths for things like qt plugins.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Add newline at end of file

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update to use bracket argument

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Minor edit

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Move the string configure call to inside override

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-23 13:28:54 -05:00
santorac b23a70ff42 Merge pull request #3338 from aws-lumberyard-dev/santorac/RapidJSON_3rdParty
Moved RapidJSON to 3p-package-source
2021-08-23 09:48:55 -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
sharmajs-amzn 16ea6355a7 {LYN-5375} asset bundler tests timing out (#3356)
* Enabling AssetBundler Tests

Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>

* enabling fast scan

Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
2021-08-23 10:28:24 -05: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
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
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
santorac 6b23e07af4 Changed MaterialConverterBus GetMaterialTypePath() to return a string instead of char*
Minor code cleanup.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-20 17:22:11 -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
moudgils b2b6886338 Fixes asserts related to buffer allocation using null rhi (#3367)
Fixes GPU crashes when releasing Indirect draw and query related dx12 objects
Fixes imgui profiler related to viewing buffer allocations

Signed-off-by: moudgils <moudgils@amazon.com>
2021-08-20 13:31:35 -07:00
Esteban Papp b406129fd2 Another warning fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 11:41:46 -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
moudgils aa68122002 Atom starter game ios fixes (#3297)
* Various fixes for AtomStarterGame on ios
 - Use low end pipeline on ioos by default for BoootStrapComponent
 - Track the need to bind null heap within Argument buffers
 - Only bind the null heap if its needed
 - Track its usage for Vertex/Fragment stages
 - Increase null dummy buffer to 1K to address GPU crash oon thee first frame

Signed-off-by: moudgils <moudgils@amazon.com>
2021-08-20 10:58:40 -07:00
amzn-phist b0fe07158c Fixes AZ_PROFILE markers that failed release build (#3364)
Removes a ToString function that wasn't really needed, it was only
defined for release builds, but AZ_PROFILE macros are still defined to
something in release.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-20 10:43:56 -07:00
Sean Sweeney 99b7c5f8ec Merge pull request #3362 from aws-lumberyard-dev/lytesttools_unittest_fix
fixes a flaky lytesttools unit test
2021-08-20 10:24:13 -07:00
puvvadar 80584a7130 Merge pull request #3310 from aws-lumberyard-dev/mp_serverrpc_bugfix
Fix type error with Server to Authority RPC generation
2021-08-20 09:52:51 -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
Artur K 992f87b03d Remove std::bind usages from Code/Editor (#3358)
A few small modernizations as well ( override )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-20 11:49:19 -05:00
Chris Galvan 30e46cc377 Merge pull request #3361 from aws-lumberyard-dev/cgalvan/FixConsoleVarsCrash
Fixed console variables crash.
2021-08-20 11:43:29 -05:00
Esteban Papp 6005fdda28 fixing wwise warns/compilation errors (#3353)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 09:40:22 -07:00
Guthrie Adams 5c727c4198 Merge pull request #3355 from aws-lumberyard-dev/Atom/guthadam/atomtools_moving_app_init_to_base_class
AtomTools: moved more startup code from main cpp files into the base application class
2021-08-20 11:37:11 -05:00
Chris Galvan e59778485f Merge pull request #3351 from aws-lumberyard-dev/jckand/PhysXVegTestFix
Updating test with PhysX Mesh asset assignment workaround
2021-08-20 11:35:57 -05:00
Mike Balfour bf42e3f02a Non-terrain-gem changes in support of upcoming terrain work. (#3345)
In preparation for a prototype Terrain Gem to get submitted, there are a few changes that are needed outside of the Terrain Gem as well:

The TerrainDataNotificationBus lives in AzFramework/Terrain, and needed to be extended to contain an optional OnTerrainDataChanged event to notify other systems when a terrain region has changed.
The HeightmapUpdateNotificationBus was removed, as this was a legacy file from the old already-removed terrain system.
The EditorWrappedComponentBase<> wrapper received a small optimization to ensure that ConfigurationChanged() is only called when the value of visibility actually changes. With prefabs, it appears that sometimes OnEntityVisibilityChanged could be called multiple times in a row with the same visibility value.
The TerrainSurfaceDataSystemComponent was updated to use the correct busses, and is ready to be moved to the Terrain Gem in a subsequent PR.

Signed-off-by: Mike Balfour 82224783+mbalfour-amzn@users.noreply.github.com
2021-08-20 11:31:19 -05:00
evanchia 8d6df19592 fixes a flaky lytesttools unit test
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-20 09:15:14 -07:00
bosnichd cef82f0313 Fix the GameStateSamples Gem and remove an unused variable from DebugConsole.h (#3347)
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-08-20 09:58:33 -06:00
Chris Galvan 69c6e63249 Fixed console variables crash.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-20 10:41:03 -05:00
jckand-amzn 860e6b0a5f Merge branch 'development' of https://github.com/o3de/o3de into jckand/PhysXVegTestFix 2021-08-20 10:16:48 -05:00
SergeyAMZN 5bc46fc676 Merge pull request #2639 from aws-lumberyard-dev/nvsickle/NetworkingActivationOrder
Ensure network autonomy gets set before entity activation
2021-08-20 14:09:30 +01:00
SergeyAMZN 2f48973921 Merge pull request #3327 from aws-lumberyard-dev/MPWeaponsSQ
Added the ability to look up a Net Entity ID for a given AZ Entity ID
2021-08-20 13:24:08 +01:00