Commit Graph

2244 Commits

Author SHA1 Message Date
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
2021-07-16 13:21:55 -07:00
jiaweig 57f5e6b2fb Apply maybe_unused to tracing only variable (#2217)
Signed-off-by: jiaweig <jiaweig@amazon.com>
2021-07-16 13:08:29 -07:00
dmcdiarmid-ly bb5e9503dd Merge pull request #2221 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15994
DiffuseProbeGridRenderPass should always be enabled
2021-07-16 11:58:16 -07:00
Gene Walters 90763faeae Remove redundant scope from autocomponent functions (#2134)
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-07-16 11:05:20 -07:00
yuriy0 ccd4cc65a5 Use SampleLevel instead of Sample to sample shadow maps. (#1370)
* Use SampleLevel instead of Sample to sample shadow maps.

This allows shadow code to be used from computer shaders which don't allow Sample. Shadow maps don't have LODs anyways

* Fix some very silly typos
2021-07-16 12:26:09 -05:00
amzn-phist 4407891740 Update audio cvars from legacy to AZ_CVARs (#2182)
* Upgrade s_AudioLoggingOptions to AZ_CVAR

Removes this legacy CVar and reimplements it as an AZ_CVAR with similar
functionality of setting flags using alpha characters.

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

* Upgrade s_DrawAudioDebug to AZ_CVAR

Removes the legacy CVar and reimplements it as an AZ_CVAR with similar
functionality and options.

Additional updates to the logging options CVar to fix up flag enums.

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

* Upgrade s_FileCacheManagerDebugFilter to AZ_CVAR

Removes the legacy CVar and reimplements it as an AZ_CVAR with similar
functionality.

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

* Removal of legacy IConsole dependencies from Audio

Moves a g_languageAudio cvar from CrySystem to AudioSystem.
Convert all cvar commands to AZ_CONSOLEFREEFUNC's.
Remove IConsole.h includes from source files.
Removes the CSoundCVars class.

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

* Minor update to cvar comments etc.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-07-16 12:25:32 -05:00
lumberyard-employee-dm 6b747cf1e0 Added missing EMotionFX.Editor target as a runtime dependency of the EMotionFXAtom.Editor target to fix launching of the Editor when the EMotionFX gem isn't explictly enabled. (#2228)
Filled the dependencies of the AtomContent.Builders gem with the AtomConent_ReferenceMaterial and AtomContent_Sponza gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-16 11:20:43 -05:00
hultonha 23e22dbb4c Merge pull request #2131 from aws-lumberyard-dev/hultonha_LYN-2348_tube_render_crash
Ensure empty geometry buffers are not submitted for render
2021-07-16 17:13:54 +01:00
Benjamin Jillich c1ebbbc176 EMotion FX: Root bone not initialized without opening Scene Settings #2088 (#2231)
User provided model was exporting correctly with an .assetinfo while it was not when just placing the .fbx file in the project folder.
Turned out that the best matching root bone was set by opening the Scene Settings for the first time, so after saving it again it worked correctly.
We're now chosing the best matching root bone when initializing the actor group, which fixes the issue.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-16 17:53:04 +02:00
hultonha 21784fd27b Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2348_tube_render_crash 2021-07-16 15:16:10 +01:00
hultonha 6839ef1512 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-16 12:58:39 +01:00
hultonha 7bdc1bebaa Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2348_tube_render_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-16 12:57:16 +01:00
hultonha d55f1b748d Merge pull request #2136 from aws-lumberyard-dev/hultonha_LY-69118_lambda_crash
Update MSVC to use new lambda processing
2021-07-16 12:55:29 +01:00
Benjamin Jillich d16b810075 Transform node animations ignored (#2160)
* Fixing user asset issue having a transform node as root rather than a bone making the whole character not animate.
* Enabled the ability to export animations for transform nodes.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-16 13:47:47 +02:00
hultonha 5a0c1fab9f Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-16 10:30:37 +01:00
Benjamin Jillich 27407540c7 Cleaning motion asset infos (#2197)
* Removing a bunch of legacy files.
* Removing asset info files containing legacy data.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-16 10:19:38 +02:00
dmcdiar e2e6637f33 The DiffuseProbeGridRenderPass is now always enabled to allow Baked GI to render on non-raytracing hardware.
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-07-15 20:17:08 -07:00
moudgils 7ef383580e Metal sync interval support (#2187)
* Metal sync interval support
Add shader name to SRGPool for debugging purposes
Set default value of rpi_vsync_interval to 1

Signed-off-by: moudgils <moudgils@amazon.com>
2021-07-15 11:50:19 -07:00
hultonha 23d08d411f remove pragma once in cpp file
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-15 14:23:51 +01:00
hultonha a365ae1da1 Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-15 13:27:51 +01:00
hultonha 4b9c2cceb4 fix bug with wrong number of tube manipulators returned
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-15 13:25:00 +01:00
Benjamin Jillich 0863a24490 Revert "[MeshOptimizer] Determine the original vertex index based on the position (#2008)" (#2188)
This reverts commit a077a88d3f due to assets failing on Jenkins.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-15 12:18:10 +02:00
Benjamin Jillich e6ddc29cb4 Data integrity issue, keyframe times need to be ascending (#2130) (#2154)
* User provided animation resulted in a data integrity error.
* The first track had 0.66 as max time while another had a keyframe more resulting in 0.69.
* When updating the duration before fixing up the last keyframe for each of the tracks, the duration was returned early with 0.66 while there were other tracks having a keyframe more.
* We're now crawling through all tracks to determine the maximum duration.
* This results in a correct fixup of the last frame.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-15 11:55:47 +02:00
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01:00
Chris Burel a077a88d3f [MeshOptimizer] Determine the original vertex index based on the position (#2008)
* Determine the original vertex index based on the position

The Assimp library does not expose the FBX control point indices. This
change causes vertices that are close enough in their position to be
considered as coming from the same control point. This allows the mesh
optimizer to consider vertices with the same control point index (or
"original vertex index" as it is called in the code) for deduplication.

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a filter view instead of reimplementing a filter view

Signed-off-by: Chris Burel <burelc@amazon.com>

* Don't attempt to weld similar vertices if there's blendshapes

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add test for the mesh optimizer's ability to weld nearby vertices

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add logging call to show mesh optimizer effect on vertex count

Signed-off-by: Chris Burel <burelc@amazon.com>

* Use a bunch of temporaries in order to make `position` `const`

Signed-off-by: Chris Burel <burelc@amazon.com>

* Supply the vertex index remapping to the optimized skin weights

This ensures that the optimized skin weights use the vertex indexes from
the optimized mesh

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-15 08:44:40 +02:00
Nicholas Van Sickle 67ea31363d Fix gesture recognizer spamming errors when clicking the mouse (#2181)
The synthetic input devices created by the Qt -> AZ input system were being detected by the gesture recognizer, which confused it - this is a potential general issue for anything listening to the AZ input system out of game mode, but this is the only recorded issue so far. I've added a check in this case to ensure the event comes from the real, physical mouse device instead of one of our synthetic ones, stopping the spam.

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-14 17:22:08 -06:00
michabr a872111ca5 Fix LyShine bus attempt to connect twice (#2175)
Signed-off-by: abrmich <abrmich@amazon.com>
2021-07-14 15:57:16 -07:00
michabr 59e9f10853 Split LyShine .Editor target to .Tools and .Builders (#2161)
* Split LyShine .Editor target to .Tools and .Builders

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

* Fix compile error for Tests target

Signed-off-by: abrmich <abrmich@amazon.com>
2021-07-14 15:57:02 -07:00
Brian Herrera f655ce4ba6 Merge pull request #2114 from aws-lumberyard-dev/SPEC-7510
[SPEC-7510] Remove unnecessary static container for AWSCore scriptcanvas nodes
2021-07-14 15:20:04 -07:00
galibzon 32a2796620 [ATOM-15978] ShaderVariantAssetBuilder needs to fill up ShaderPlatformInterface::m_srgLayouts for Metal (#2156)
ShaderVariantAssetBuilder builds SRG Layout data only for Metal.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-07-14 15:38:08 -05:00
rgba16f e32b7a7c87 Mac m1 fixes (#2150)
* Update the Mac Editor plist application bundle identifier to be different than Lumberyard
Fix the editor to have runtime dependencies on the scene modules.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix Metal RHI calling unsupported timestamp query api on M1 Macs.
Add Query for Timestamps supported on device initialization.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Remove AZ::Scene* runtime dependencies from EmotionFX gem and add AZ::SceneUI as a runtime dependency of SceneProcessing::Editor module.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-07-14 13:14:42 -07:00
jackalbe ffcfa44b49 {LYN-4514} Engine updates to enable PAB for the Blast Gem (#2140)
* {LYN-4514} Engine updates to enable PAB for the Blast Gem

* Engine updates to enable Python Asset Building for the Blast Gem
* added API to detect IsPythonActive()
* ExportProductList behavior
* scene manifest usage of generated assetinfo
* updated ScriptProcessorRuleBehavior to handle OnPrepareForExport

Tests: new tests for scene behavior via ExportProduct

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* updated base on PR feedback
added more comments for IsPythonActive()
added a serializeContext for export product list

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
2021-07-14 14:54:22 -05:00
AMZN-tpeng d6d644501a [ATOM][RHI][Vulkan][Android] - Fix sample count validation error for android. (#2145)
ATOM-15755

Signed-off-by: Tony Peng <tonypeng@amazon.com>
Signed-off-by: Peng <tonypeng@amazon.com>
2021-07-14 12:22:49 -05:00
AMZN-tpeng cd819062f9 [ATOM][RHI][Vulkan][Android] - use bit conversion from enum to check for gpu query type support (#2141)
ATOM-15742

Signed-off-by: Tony Peng <tonypeng@amazon.com>
Signed-off-by: Peng <tonypeng@amazon.com>
2021-07-14 12:20:39 -05:00
hultonha f8a80468ab remove structured binding from lambda to workaround msvc bug
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-14 13:13:28 +01:00
hultonha ff7fc5136b Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2348_tube_render_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-14 09:21:54 +01:00
Benjamin Jillich 3ea3d7a436 Data integrity issue, keyframe times need to be ascending (#2130)
* User provided animation resulted in a data integrity error.
* The first track had 0.66 as max time while another had a keyframe more resulting in 0.69.
* When updating the duration before fixing up the last keyframe for each of the tracks, the duration was returned early with 0.66 while there were other tracks having a keyframe more.
* We're now crawling through all tracks to determine the maximum duration.
* This results in a correct fixup of the last frame.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-14 08:52:52 +02:00
Nicholas Van Sickle 867ae23664 Make Viewport input events fully Qt based (#2142)
* Make Viewport input events fully Qt based.

This should fix an issue with Qt touch event -> mouse event translation in the Editor, and may also fix issues with the Mac Editor and remote desktop (though, lacking the requisite hardware, I can test precisely none of these things personally).

See https://github.com/o3de/o3de/issues/1889

- Adapted LegacyViewportCameraController to use Movement::X & Y (mostly for testing purposes, it's on the slate for being removed soon)
- Moved cursor capture logic from RenderViewportWidget into QtEventToAzInputManager so that it can make sure it generates correct movement deltas
- Removed ViewportMouseCursorRequests::PreviousViewportCursorScreenPosition to have our viewport controllers use our dedicated Movement::X and Y channels instead, which will work in the launcher

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

* Address review feedback

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

* Fix Linux build

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-13 20:58:48 -07:00
Jeremy Ong 11327b59ea Expose vsync interval with new cvar rpi_vsync_interval and support Vulkan vsync (#2061)
* Expose vsync interval with new cvar rpi_vsync_interval

On change, the rpi_vsync_interval is broadcasted to a new event on
the WindowNotificationBus and all swapchains are recreated with the
new vsync value.

Signed-off-by: Jeremy Ong <jeremycong@gmail.com>

* Add vsync interval support to the Vulkan RHI

Vsync intervals are not intrinsically supported using the Vulkan
swapchain extension. Instead, extra presents are enqueued for each
extra vblank requested past 1. Swapchain recreation is triggered
when transitioning to and from the FIFO presentation mode (when
rpi_vsync_interval transitions from and to 0 respectively).

Signed-off-by: Jeremy Ong <jeremycong@gmail.com>

* Rollback vsync > 1 implementation on Vulkan and leverage *Internal pattern

Signed-off-by: Jeremy Ong <jeremycong@gmail.com>
2021-07-13 20:54:06 -07:00
Chris Galvan 454c85421c Merge pull request #2138 from aws-lumberyard-dev/cgalvan/AutoExpandNewInputEventGroups
Make new input event groups auto-expanded by default.
2021-07-13 16:37:38 -05:00
onecent1101 6b6bd1149d [SPEC-7510] Remove unnecessary static container for AWSCore scriptcanvas nodes
Signed-off-by: onecent1101 <liug@amazon.com>
2021-07-13 11:46:07 -07:00
Junbo Liang 177f532ffa [Android] SSL certificate error when run the AWS gem sample levels (#2060)
[Android] Add AWS CA Cert handling to fix SSL errors.
2021-07-13 11:25:57 -07:00
Chris Galvan 42bfefe6c0 Make new input event groups auto-expanded by default.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-13 13:02:11 -05:00
hultonha 402fd2ae4e small updates following review feedback
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-13 18:10:33 +01:00
SergeyAMZN 9b6d207163 Merge pull request #2105 from aws-lumberyard-dev/mp_phys_desync_merge
Fix positional desync of network objects plus related log spam
2021-07-13 17:58:39 +01:00
hultonha 0c0d307cae ensure empty geometry buffers are not submitted for render
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-13 15:01:23 +01:00
hultonha 1220ea6539 Merge pull request #2093 from aws-lumberyard-dev/Renaming_Urls_Names
Changed all amazon reverse urls to o3de reverse urls
2021-07-13 10:13:08 +01:00
Benjamin Jillich 91de09cff5 EMotion FX: Root bone not initialized without opening Scene Settings (#2088)
* User provided model was exporting correctly with an .assetinfo while it was not when just placing the .fbx file in the project folder.
* Turned out that the best matching root bone was set by opening the Scene Settings for the first time, so after saving it again it worked correctly.
* We're now chosing the best matching root bone when initializing the actor group, which fixes the issue.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-13 08:32:35 +02:00
lumberyard-employee-dm 158e25bd23 ly_create_alias() now adds the directory it was called from to the (#2120)
LY_ALL_TARGET_DIRECTORIES property if that directory has not already
been added

This addresses an issue where if a CMakeLists.txt contains a call to
ly_create_alias(), but NOT a call to ly_add_target, it would not be
added to the generated CMakeLists.txt for the install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-12 20:22:32 -05:00
AMZN-Phil 2e54e534ee Merge pull request #2104 from aws-lumberyard-dev/fix-redundant-gem-categories
Fix feature category spellings
2021-07-12 13:49:29 -07:00