Commit Graph

653 Commits

Author SHA1 Message Date
Benjamin Jillich 0fa00a117c [ATOM-14477] Add clone function to model and/or model asset (#135)
* Added clone methods for the buffer, model lod and model assets.
* Cloning works via the creators.
* Mesh handle/instance now knows about the model asset it originated from as well as the cloned model asset that we need for instancing until instancing works without the dependencies to the asset ids.
* MeshComponentRequestBus returns the original asset id and the model asset. If you need access to the clone, go by the model.
* Cloth component mesh now gettings its model asset from the model as it needs to work on the clone.
* Moved the requires cloning function from the mesh loader in the mesh feature processor to the mesh component controller.
* As we need the model asset to be loaded before we can check if it requires cloning or not, we couldn't pass in a bool from the controller but had to use a callback.
* Using asset hint instead of asset id for the model lod asset creator error.
* Storing a map of source buffer asset ids and the actual cloned buffer assets rather than just their ids.
* Using the buffer assets from the new map directly and removed the search process in the mesh loop where the asset views are created.
* Fixed the vegetation mocks.
* Using the actor's mesh asset when emitting the on model ready event for the mesh component notification bus.
* Mesh components notifications connection policy changed to adapt to cloned model asset.
* Handling empty meshes in model lod asset creator.
* Removed the requires cloning callback from the mesh feature processor and made it a parameter to the acquire mesh function
* Fixing mocks and unit tests
2021-04-23 18:33:00 +02:00
AMZN-daimini e772afa06e Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00
evanchia-ly-sdets 1dd1f85d2b Merge pull request #274 from aws-lumberyard-dev/egg_file_removal
removing egg files
2021-04-23 09:17:11 -07:00
dmcdiarmid-ly 104262e048 Merge pull request #191 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14951
[ATOM-14951] Move clearcoat into the forward pass and remove render target
2021-04-22 23:49:10 -07:00
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 2021-04-22 23:36:29 -07:00
dmcdiar 10a8780e6f Merge branch 'main' into Atom/dmcdiar/ATOM-14951
# Conflicts:
#	Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
#	Gems/Atom/Feature/Common/Assets/Passes/ReflectionGlobalFullscreen.pass
#	Gems/Atom/Feature/Common/Assets/Passes/Reflections.pass
#	Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/PBR/ForwardPassOutput.azsli
#	Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionGlobalFullscreen.azsl
2021-04-22 21:49:21 -07:00
rgba16f ca1a684c95 Merge pull request #266 from aws-lumberyard-dev/FixGameLauncherConsole
Fix GameLauncher Imgui DebugConsole so that it renders
2021-04-22 23:40:13 -05:00
evanchia 5849575318 removing egg files 2021-04-22 20:08:01 -07:00
evanchia-ly-sdets f3c0aad914 Merge pull request #258 from aws-lumberyard-dev/metrics_string_security_fix
Fixing string interpolation security risk in test metrics
2021-04-22 19:50:51 -07:00
carlitosan 5a150b150b Merge pull request #264 from aws-lumberyard-dev/carlitosan-parser-fixes
Carlitosan parser fixes
2021-04-22 19:41:23 -07:00
srikappa-amzn 11f811eb7e Merge pull request #260 from aws-lumberyard-dev/Prefab/CreatePrefab
Added undo and redo support for nested prefab creation
2021-04-22 17:51:01 -07:00
chiyenteng bac334a244 Fix serialization issues related to sequence node/track (#214) (#247)
* Fix serialization issues related to sequence node/track
2021-04-22 17:42:06 -07:00
rgba16f 0bf7c29506 Fix GameLauncher Imgui DebugConsole so that it renders 2021-04-22 19:11:27 -05:00
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 2021-04-22 17:01:29 -07:00
daimini 8f79379bc8 Fixes as per Ram's review 2021-04-22 16:45:20 -07:00
evanchia ad7e7d829e changed variable formatting method 2021-04-22 16:42:52 -07:00
chcurran 5409f85f96 Merge branch 'main' into carlitosan-parser-fixes 2021-04-22 16:15:54 -07:00
chcurran cb7a26ce5e Editor for stability and overloaded nodes. LYN-2904, LYN-3059, LYN-3234, LYN-2888 2021-04-22 16:13:24 -07:00
Esteban Papp 9ca7408929 SPEC-6499 Timeout in pipes expire due to logs being in a sub-step 2021-04-22 15:56:24 -07:00
daimini 76739de282 Fix spacing 2021-04-22 15:52:39 -07:00
daimini ea43eb3ac9 Set position of instantiated prefab 2021-04-22 15:49:13 -07:00
evanchia-ly-sdets 6164e2aa99 Merge pull request #146 from aws-lumberyard-dev/hydra_util_package
Moving hydra util files package
2021-04-22 15:11:33 -07:00
bosnichd ea965dc78a Fix for "GameLauncher crashes silently after any interaction within it"
Fix for "GameLauncher crashes silently after any interaction within it"
2021-04-22 16:07:20 -06:00
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-22 14:54:01 -07:00
daimini c9a4b6f50b Better handle the default case for Instantiate 2021-04-22 14:53:07 -07:00
cgalvan 5d3774521f Merge pull request #251 from aws-lumberyard-dev/cgalvan/RemoveSetEditMode
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
2021-04-22 16:36:57 -05:00
evanchia 8f76dd0f26 Fixing string interpolation security risk in test metrics 2021-04-22 14:30:15 -07:00
AMZN-stankowi f44f06c9f0 AssImp set to be the default FBX processor (#78) (#136)
* AssImp set to be the default FBX processor (#78)

If you encounter issues, reach out to the Helios team with details, and then switch back to FBX SDK locally by changing FBXImporter.h

* Merge pull request #219 from aws-lumberyard-dev/sceneapi_scripting

LYN-3030: Fix to export_chunks_builder.py to match the AssImp node paths

* Hide some automated test folders from the asset processor for automatedtesting. This is necessary because these assets should only be processed when running the test, and not any time AP is launched for this project.

* Putting these test assets back to visible to Asset Processor. These tests need to be updated at some point to handle that, but they won't work with this change for now. Note that until this is addressed, these tests may randomly time out if they're the first tests run on a clean asset processor, and these tests launch AP without using a unique port, so the test can also fail if an Asset Processor executable is hanging open.

Grabbed the change I missed from the 1.0 branch merge, no idea how this got lost.

* Moved from main to periodic. Allen and Fuzzy were already on board, and I think with the potential flakiness in this test, we don't want this in main.

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-04-22 14:09:44 -07:00
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 2021-04-22 13:57:08 -07:00
evanchia 8c29ebe728 chaging name from Lumberyard to od3e 2021-04-22 13:30:11 -07:00
evanchia e7db0a64d6 Merge branch 'main' into hydra_util_package 2021-04-22 13:26:34 -07:00
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 2021-04-22 15:22:44 -05:00
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 2021-04-22 15:00:50 -05:00
sharmajs-amzn 957d1360da Custom UV Stream Names in assimp (#210) (#243)
* Custom UV Stream Names in assimp
https://jira.agscollab.com/browse/LYN-2506
2021-04-22 12:54:36 -07:00
Eric Phister 38f0203546 Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
2021-04-22 14:32:14 -05:00
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 2021-04-22 14:28:42 -05:00
jckand-amzn f6d1c46915 Merge pull request #250 from aws-lumberyard-dev/jckand/FoundationAuto
Several Dynamic Vegetation automated test updates
2021-04-22 14:27:00 -05:00
Chris Santora 43b7a42a0b Merge pull request #188 from aws-lumberyard-dev/Atom/santorac/CavityMaps-ATOM-14040
ATOM-14040 Add Support for Cavity Maps

Replace the "Ambient Occlusion" property groups with "Occlusion" property groups that contain settings for "Diffuse AO" and "Specular Cavity" maps.
Pre-multiplied diffuseAmbientOcclusion into the m_albedo.rgb gbuffer, making room for specularOcclusion to be stored in m_albedo.a
Added new render pipeline connections to connect the albedo gbuffer to the fullscreen reflection passes.
Also fixed ATOM-15297 "StandardPBR_ForwardPass.shadervariantlist Job Fails With Obscure Error"
2021-04-22 12:15:22 -07:00
SJ 9a6bd4a629 Fix crash in AssetProcessor on Mac 2021-04-22 11:57:10 -07:00
Terry Michaels d680995074 Renamed several non-inclusive terms (#236) 2021-04-22 13:31:26 -05:00
jckand e5a990b05c LYN-3120: Temporarily disabling reset of view pane layout in editor_test_helper.py teardown. Updating view of planting area for several DynVeg tests that was changed with the addition of the default level entity. 2021-04-22 13:20:44 -05:00
mrieggeramzn b8861cd575 Merge pull request #216 from aws-lumberyard-dev/Atom/mriegger/DirFix
Fix for directional light not having shadows in editor
2021-04-22 11:11:52 -07:00
greerdv 1fa5728655 Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
2021-04-22 18:49:36 +01:00
evanchia-ly-sdets 8238b76dba Merge pull request #200 from aws-lumberyard-dev/test_metrics_endpoint_fix
Test metrics uses both Jenkins endpoints fix
2021-04-22 10:28:53 -07:00
amzn-sj 4b88d3683d Merge branch 'main' into LYN-3077 2021-04-22 10:11:13 -07:00
amzn-sj 3aa0544076 Fix AssetProcessor crash on Mac 2021-04-22 10:06:28 -07:00
Benjamin Jillich ba324b8806 [LYN-3013] Github TQO Animation: MorphTarget has data integrity issue (#237)
* Added error reporting for data integrity issues for non-uniform motion data.
* The actual issue was a mismatch between the end times of the morph and the skeletal animations. They need to match in EMotionFX.
* The morph target animation exported a keyframe too much.
2021-04-22 18:53:27 +02:00
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 2021-04-22 09:47:18 -07:00
AMZN-AlexOteiza dbcb2f9916 Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
2021-04-22 17:46:37 +01:00
moudgils 4b2e4b8b02 Merge pull request #238 from aws-lumberyard-dev/Atom/moudgils/BumpShaderBuilder
Bump shader  builder
2021-04-22 09:43:51 -07:00