Commit Graph

4835 Commits

Author SHA1 Message Date
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
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
SJ 7eeaf7dad5 Generate install layout for Mac (#2144)
* 1. Move call to install(TARGETS...) to its own function to create a platform specific implementation for Mac.
2. Add linker-signed flag to work around cmake install issue.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add newline

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Rename function to ly_install_target_override and only call it if it has been implemented.
2. Pass in runtime, archive, and library directory paths as params to clean it up a bit.

Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-07-14 17:32:07 -07:00
Sean Sweeney 9e81cedf80 Merge pull request #1979 from aws-lumberyard-dev/system_test_example_update
System test example update
2021-07-14 16:59:01 -07:00
bosnichd 72ea2ca1b4 Change the InputDeviceImplementationRequest to be addressable by an InputDevcieId to account for the situation where someone may want to swap out the implementation for a single instance of a devcie type rather than all instances of that device type (the latter can still be achieved using Broadcast instead of Event when calling the EBus method). (#2180)
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-07-14 17:44:44 -06: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-sean 8f706c09d6 update sc that is used in physics tests to use the 'PhysicsSystemInterface' instead of 'System Interface' (#2162)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-07-14 20:16:56 +01:00
Chris Galvan a5b0f1f710 Merge pull request #2163 from aws-lumberyard-dev/cgalvan/SaveCameraChangesWhenBeThisCamera
Use the proper undo sequence so that viewport camera changes are saved properly.
2021-07-14 14:08:44 -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
Chris Galvan 8f4ded8c64 Use the proper undo sequence so that viewport camera changes are saved properly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-14 12:10:49 -05:00
Scott Romero acd5546503 [development] update mobile settings editor tool to support new project path structure (#2147)
Fixes #2087

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-14 09:41:46 -07:00
Chris Galvan 1a74bcc836 Merge pull request #1912 from aws-lumberyard-dev/jckand/DynVegXfailFixes
Updating/re-enabling skipped/xfailed Dynamic Vegetation automated tests
2021-07-14 11:36:31 -05:00
jckand-amzn 9fcc9f7b41 Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegXfailFixes 2021-07-14 09:56:07 -05:00
hultonha 5c177ef48a Merge remote-tracking branch 'upstream/development' into hultonha_LYN-2349_tube_delete_crash
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-14 09:23:26 +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
AMZN-ScottR 201a387c7e [mobile-settings-crash-fix] removed dep on FileUtil in ProjectSettingsToolWindow.cpp and optimize return in GetPlatformResource
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-13 17:46:35 -07:00
AMZN-koppersr abb70bcfa4 Merge pull request #2110 from aws-lumberyard-dev/Prefab/BestEffortPatching
Make prefab patch application use a best effort mechanism
2021-07-13 16:14:34 -07:00
AMZN-ScottR 7937ece773 [mobile-settings-crash-fix] update mobile settings editor tool to support new project path structure
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-13 15:07:16 -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
srikappa da11424119 Merge branch 'development' into Prefab/BestEffortPatching
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-13 11:52:07 -07: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
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 b0707d3295 ensure the final vertex in a spline cannot be deleted using a manipulator
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-13 17:51:06 +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
hultonha 5bdb73b064 Merge pull request #2024 from aws-lumberyard-dev/lyn5017_LockSelection/UnlockAll_bug
Fixed small bug with edit menu
2021-07-13 10:11:52 +01:00
jromnoa 900f37644e fix Atom GPU test by enabling autotest_mode (#2117)
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-07-12 18:19:41 -07:00
evanchia 12a8cc7cd7 Removing deleted test from CMakeLists and updated in line comments for sample test
Signed-off-by: evanchia <evanchia@amazon.com>
2021-07-12 15:31:09 -07:00
srikappa 86a6d75b40 Remove an additional check during patch application to report errors
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 15:01:11 -07:00
Chris Galvan df9358c492 Merge pull request #2109 from aws-lumberyard-dev/cgalvan/RemoveDeprecatedGraphicsMenuItems
Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.
2021-07-12 16:57:34 -05:00
srikappa c494adba88 Use a utility function to compare json document and expected string
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 14:21:04 -07:00
Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
Merged stabilization/2106 to development
2021-07-12 14:05:19 -05:00
srikappa b7e3db9d82 Make prefab patch application use a best effort mechanism
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-12 11:58:14 -07:00
SergeyAMZN c4a50b961e Merge pull request #2102 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp
Added an option to character component not use auto-apply velocities on a physics tick
2021-07-12 19:49:50 +01:00
Chris Galvan 2fc1062802 Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 13:42:08 -05:00
puvvadar a48a0d1f8a Fix positional desync of network objects plus related log spam
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-07-12 11:15:38 -07:00
Gene Walters e7b44b7d6b Git Issue 1948: LoadLevel Console Command Requires Full Asset Path Instead of Level Name (#1952)
* Update LoadLevel to also search inside the Level folder for a spawnable if LevelName isnt a fullpath to a spawnable

Signed-off-by: Gene Walters <genewalt@amazon.com>

* A better check to see if users provided a file extension

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-07-12 11:03:19 -07:00
Brian Herrera 79459cfeb9 Merge pull request #2097 from aws-lumberyard-dev/pipelines/fix-lfs-output
Remove git lfs steps
2021-07-12 11:00:28 -07:00