5cee9b43b7
Squashed commit of Procedural Prefab work ( #4481 )
...
* Squashed commit of the following:
commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585bhttps://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs
commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 18:03:38 2021 -0500
fixing non-unity build
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 15:43:50 2021 -0500
adding header for validation
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf#244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates
{lyn5880} adding Instantiate Procedural Prefab to the Editor
commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 14:21:09 2021 -0500
updated based on feeback
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 11:35:30 2021 -0500
small include tweak
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 10:08:53 2021 -0500
moved the seg reg key to the CPP file
removed the Queue Load
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 08:24:57 2021 -0500
Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample
Add example prefab script and FBX with 2 meshes to test it
commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 16:07:47 2021 -0500
make sure the AZ::IO::SystemFile::Exists() before returning fullPath
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 28 14:03:11 2021 -0500
Move sceneJobHandler reset out of exception block. Add more info to error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 13:04:37 2021 -0500
{lyn5880} adding Instantiate Procedural Prefab to the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 09:23:54 2021 -0500
Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{ly5395} adding asset loading logic for procedural prefabs
commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Mon Sep 27 13:52:21 2021 -0500
added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
optimized headers
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:12:40 2021 -0500
Remove some whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:04:58 2021 -0500
Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript
Fixes to support writing a python script to generate a prefab
commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:51:17 2021 -0500
Use raise_error instead of print
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:47:20 2021 -0500
Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:47 2021 -0500
Test entity cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:28 2021 -0500
Make CastWithTypeName only return true if the object can be successfully cast
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:49:28 2021 -0500
Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 13:19:51 2021 -0500
Store watch folder in scene so source relative path can be calculated
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 23 14:10:31 2021 -0500
Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule
{ly5384} script processing rule behavior more stateless
commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 22 15:19:30 2021 -0500
{ly5384} script processing rule beahvior more stateless
Made the script processing rule beahvior more stateless so that the
script name needs to be discovered each time.
Disconnet from the bus after each scene script builder usage.
Before it would be possible that the same script can be run more than
once for each asset.
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:27:12 2021 -0500
Update scene_data.py to latest PrefabGroup format
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:26:27 2021 -0500
Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:48:15 2021 -0500
AZ::JsonSerializationUtils update
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:21:52 2021 -0500
revert odd README.md merge issue
added alias for PrefabBuilder.Tools
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:52:58 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
# Conflicts:
# Gems/Prefab/PrefabBuilder/CMakeLists.txt
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:43:19 2021 -0500
added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:59 2021 -0500
Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile
{ly5384} Fixing Linux build issues.
commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:48 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile
commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:52:07 2021 -0500
Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix
fixing an API merge compile error
commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:50:58 2021 -0500
fixing an API merge compile error
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:10:46 2021 -0500
Make sure EntityUtilityComponent is loaded in AssetBuilderApplication
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:09:03 2021 -0500
Clean up entities and templates after python script is done
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 20 14:05:12 2021 -0500
ScriptProcessorRuleBehavior resets entity context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:40:37 2021 -0500
Add add_prefab_group
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 11:53:25 2021 -0500
Fix merge compile issue
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 11:18:44 2021 -0500
{ly5395} adding asset loading logic for procedural prefabs
* enabling the Prefab gem for tool work
* enabling prefab gem for AutomatedTesting
* AssetTypeInfoHandler for procedural prefab
* EnableCatalogForAsset for procedural prefab
* RegisterHandler for AssetManager
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:32:37 2021 -0500
Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671fc8697edd5#229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework
commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 10:04:06 2021 -0500
{ly5384} Fixing Linux build issues.
* symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
* wrapped the AZ::ComponentId return for both cases
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 09:44:30 2021 -0500
Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc
Reflect Prefab/Entity constants and add failure unit tests
commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:37:29 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:27:57 2021 -0500
Updated PrefabBuilder to point to new asset type for the procedural prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:56:13 2021 -0500
{lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:53:22 2021 -0500
Add failure tests and some test cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:34:03 2021 -0500
Reflect InvalidTemplateId, fix reflection for InvalidComponentId
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:55:16 2021 -0500
Fix merge issues
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:28:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:24:44 2021 -0500
Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab
API Update: Wrap PrefabSystemComponentInterface behavior
commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:33 2021 -0500
Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
API Update: AzToolsFramework::Prefab::PrefabLoaderInterface
commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:06 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp
commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:36 2021 -0500
Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement
API Update: Editor Entity Component Functions
commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:09 2021 -0500
Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore
API Update: Editor Component JSON Helper Functions
commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:48:41 2021 -0500
m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
adding error messages for the prefab processing
fixed typo
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:32:42 2021 -0500
reduced the JSON for the testing framework to tree types only
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:25:00 2021 -0500
enable ProceduralPrefabAsset JsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:31:59 2021 -0500
Remove unneeded include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:20:04 2021 -0500
Cleanup whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 13:49:20 2021 -0500
FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)
Fixed a memory leak
Moved const to header
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 10:49:32 2021 -0500
updated the DOM logic for the asset loading sake
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 13:23:13 2021 -0500
Update CreateStringPermissive to stop when enough data has been collected.
Update unit tests.
Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
Updated AssetTreeFilterModel to cap the string length
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:55:38 2021 -0500
Rename GetComponentJson to GetComponentDefaultJson.
Clean up GetComponentTypeIdFromName
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:29:04 2021 -0500
Move scripting ebus and handler into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 20:27:41 2021 -0400
Renamed SearchComponents to FindMatchingComponents
Added missing printf formatting
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:31:08 2021 -0400
Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
API Update: Editor Entity Management - Add some comments and error handling
commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:13:43 2021 -0400
Move bus and handler code into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:25:35 2021 -0400
Add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:16:33 2021 -0400
Add error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 16:54:20 2021 -0400
Cleanup code
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 10:48:40 2021 -0500
Add and update unit tests
Reflect APIs to behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 2 13:00:02 2021 -0500
Add Search and Component json output APIs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 13:37:44 2021 -0400
Make bus handler private
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 12:30:13 2021 -0400
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 10:12:49 2021 -0500
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 16:06:10 2021 -0500
Update unit test to verify components on saved prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 12:52:46 2021 -0500
Expand test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 17:32:14 2021 -0500
Add error handling
Add component creation
Add error testing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:31:28 2021 -0500
enabling ProductDependencies test again
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:23:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:14:07 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:09:10 2021 -0500
Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group
{lyn5392} Adding PrefabGroup scene manifest rule
commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:33:24 2021 -0500
removing unneeded AZStd::move() calls
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:17:52 2021 -0500
cleaned up the code
finalized the unit tests
fixed the code based on the tests... FTW!
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 13:06:20 2021 -0500
Add FindComponentByTypeName and UpdateComponentForEntity APIs
Add unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 14:02:17 2021 -0500
Fix bus connect that should have been a bus disconnect
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 12:57:04 2021 -0500
Fix up includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 08:43:23 2021 -0500
WIP
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:44:37 2021 -0500
Rename files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:14:34 2021 -0500
Remove 'editor' from bus/component name
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Aug 31 09:18:37 2021 -0500
{lyn5392} Adding PrefabGroup scene manifest rule
* Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
* has reflections for serialization & behavior
* testing the behavior using Lua
* testing the serialization using JSON
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 17:52:18 2021 -0500
Reflect SaveTemplateToString
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 12:46:17 2021 -0500
Add warning/error messages, update module
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 11:17:25 2021 -0500
Add some comments and error handling
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 17:16:45 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:28:00 2021 -0500
Add CreatePrefabTemplate
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac#199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
Add editor entity creation and unit test
commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 16:44:57 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:03:35 2021 -0500
Setup CreateEditorReadyEntity to use a custom entity context
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 09:29:20 2021 -0500
Add EditorEntityUtilityComponent for managing entities from the behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f8d39e267143603cad5e575faa4443#3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
commit 575faa444343603cad5e4b817a648343603cad5ed9cce28a53bb52475ce8#2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
commit bb52475ce8697dfad486650e1ab44dd9cce28a53e7f787572e486ba58628#2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
commit 486ba58628e7f787572e7cfde884d9e7f787572e#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
commit 837e1c7370d30de01752efcbe2c4a1#1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
commit efcbe2c4a1d30de017520c43493e29d30de01752#1624 )
Signed-off-by: AMZN-alexpete
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Material Editor: Added alternate skybox toggle to the toolbar
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Squashed commit of the following:
commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585bhttps://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs
commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 18:03:38 2021 -0500
fixing non-unity build
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 15:43:50 2021 -0500
adding header for validation
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf#244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates
{lyn5880} adding Instantiate Procedural Prefab to the Editor
commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 14:21:09 2021 -0500
updated based on feeback
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 11:35:30 2021 -0500
small include tweak
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 10:08:53 2021 -0500
moved the seg reg key to the CPP file
removed the Queue Load
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 08:24:57 2021 -0500
Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample
Add example prefab script and FBX with 2 meshes to test it
commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 16:07:47 2021 -0500
make sure the AZ::IO::SystemFile::Exists() before returning fullPath
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 28 14:03:11 2021 -0500
Move sceneJobHandler reset out of exception block. Add more info to error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 13:04:37 2021 -0500
{lyn5880} adding Instantiate Procedural Prefab to the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 09:23:54 2021 -0500
Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{ly5395} adding asset loading logic for procedural prefabs
commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Mon Sep 27 13:52:21 2021 -0500
added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
optimized headers
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:12:40 2021 -0500
Remove some whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:04:58 2021 -0500
Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript
Fixes to support writing a python script to generate a prefab
commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:51:17 2021 -0500
Use raise_error instead of print
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:47:20 2021 -0500
Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:47 2021 -0500
Test entity cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:28 2021 -0500
Make CastWithTypeName only return true if the object can be successfully cast
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:49:28 2021 -0500
Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 13:19:51 2021 -0500
Store watch folder in scene so source relative path can be calculated
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 23 14:10:31 2021 -0500
Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule
{ly5384} script processing rule behavior more stateless
commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 22 15:19:30 2021 -0500
{ly5384} script processing rule beahvior more stateless
Made the script processing rule beahvior more stateless so that the
script name needs to be discovered each time.
Disconnet from the bus after each scene script builder usage.
Before it would be possible that the same script can be run more than
once for each asset.
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:27:12 2021 -0500
Update scene_data.py to latest PrefabGroup format
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:26:27 2021 -0500
Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:48:15 2021 -0500
AZ::JsonSerializationUtils update
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:21:52 2021 -0500
revert odd README.md merge issue
added alias for PrefabBuilder.Tools
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:52:58 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
# Conflicts:
# Gems/Prefab/PrefabBuilder/CMakeLists.txt
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:43:19 2021 -0500
added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:59 2021 -0500
Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile
{ly5384} Fixing Linux build issues.
commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:48 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile
commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:52:07 2021 -0500
Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix
fixing an API merge compile error
commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:50:58 2021 -0500
fixing an API merge compile error
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:10:46 2021 -0500
Make sure EntityUtilityComponent is loaded in AssetBuilderApplication
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:09:03 2021 -0500
Clean up entities and templates after python script is done
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 20 14:05:12 2021 -0500
ScriptProcessorRuleBehavior resets entity context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:40:37 2021 -0500
Add add_prefab_group
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 11:53:25 2021 -0500
Fix merge compile issue
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 11:18:44 2021 -0500
{ly5395} adding asset loading logic for procedural prefabs
* enabling the Prefab gem for tool work
* enabling prefab gem for AutomatedTesting
* AssetTypeInfoHandler for procedural prefab
* EnableCatalogForAsset for procedural prefab
* RegisterHandler for AssetManager
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:32:37 2021 -0500
Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671fc8697edd5#229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework
commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 10:04:06 2021 -0500
{ly5384} Fixing Linux build issues.
* symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
* wrapped the AZ::ComponentId return for both cases
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 09:44:30 2021 -0500
Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc
Reflect Prefab/Entity constants and add failure unit tests
commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:37:29 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:27:57 2021 -0500
Updated PrefabBuilder to point to new asset type for the procedural prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:56:13 2021 -0500
{lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:53:22 2021 -0500
Add failure tests and some test cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:34:03 2021 -0500
Reflect InvalidTemplateId, fix reflection for InvalidComponentId
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:55:16 2021 -0500
Fix merge issues
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:28:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:24:44 2021 -0500
Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab
API Update: Wrap PrefabSystemComponentInterface behavior
commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:33 2021 -0500
Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
API Update: AzToolsFramework::Prefab::PrefabLoaderInterface
commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:06 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp
commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:36 2021 -0500
Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement
API Update: Editor Entity Component Functions
commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:09 2021 -0500
Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore
API Update: Editor Component JSON Helper Functions
commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:48:41 2021 -0500
m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
adding error messages for the prefab processing
fixed typo
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:32:42 2021 -0500
reduced the JSON for the testing framework to tree types only
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:25:00 2021 -0500
enable ProceduralPrefabAsset JsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:31:59 2021 -0500
Remove unneeded include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:20:04 2021 -0500
Cleanup whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 13:49:20 2021 -0500
FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)
Fixed a memory leak
Moved const to header
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 10:49:32 2021 -0500
updated the DOM logic for the asset loading sake
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 13:23:13 2021 -0500
Update CreateStringPermissive to stop when enough data has been collected.
Update unit tests.
Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
Updated AssetTreeFilterModel to cap the string length
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:55:38 2021 -0500
Rename GetComponentJson to GetComponentDefaultJson.
Clean up GetComponentTypeIdFromName
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:29:04 2021 -0500
Move scripting ebus and handler into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 20:27:41 2021 -0400
Renamed SearchComponents to FindMatchingComponents
Added missing printf formatting
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:31:08 2021 -0400
Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
API Update: Editor Entity Management - Add some comments and error handling
commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:13:43 2021 -0400
Move bus and handler code into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:25:35 2021 -0400
Add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:16:33 2021 -0400
Add error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 16:54:20 2021 -0400
Cleanup code
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 10:48:40 2021 -0500
Add and update unit tests
Reflect APIs to behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 2 13:00:02 2021 -0500
Add Search and Component json output APIs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 13:37:44 2021 -0400
Make bus handler private
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 12:30:13 2021 -0400
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 10:12:49 2021 -0500
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 16:06:10 2021 -0500
Update unit test to verify components on saved prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 12:52:46 2021 -0500
Expand test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 17:32:14 2021 -0500
Add error handling
Add component creation
Add error testing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:31:28 2021 -0500
enabling ProductDependencies test again
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:23:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:14:07 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:09:10 2021 -0500
Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group
{lyn5392} Adding PrefabGroup scene manifest rule
commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:33:24 2021 -0500
removing unneeded AZStd::move() calls
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:17:52 2021 -0500
cleaned up the code
finalized the unit tests
fixed the code based on the tests... FTW!
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 13:06:20 2021 -0500
Add FindComponentByTypeName and UpdateComponentForEntity APIs
Add unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 14:02:17 2021 -0500
Fix bus connect that should have been a bus disconnect
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 12:57:04 2021 -0500
Fix up includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 08:43:23 2021 -0500
WIP
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:44:37 2021 -0500
Rename files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:14:34 2021 -0500
Remove 'editor' from bus/component name
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Aug 31 09:18:37 2021 -0500
{lyn5392} Adding PrefabGroup scene manifest rule
* Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
* has reflections for serialization & behavior
* testing the behavior using Lua
* testing the serialization using JSON
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 17:52:18 2021 -0500
Reflect SaveTemplateToString
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 12:46:17 2021 -0500
Add warning/error messages, update module
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 11:17:25 2021 -0500
Add some comments and error handling
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 17:16:45 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:28:00 2021 -0500
Add CreatePrefabTemplate
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac#199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
Add editor entity creation and unit test
commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 16:44:57 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:03:35 2021 -0500
Setup CreateEditorReadyEntity to use a custom entity context
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 09:29:20 2021 -0500
Add EditorEntityUtilityComponent for managing entities from the behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f8d39e267143603cad5e575faa4443#3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
commit 575faa444343603cad5e4b817a648343603cad5ed9cce28a53bb52475ce8#2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
commit bb52475ce8697dfad486650e1ab44dd9cce28a53e7f787572e486ba58628#2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
commit 486ba58628e7f787572e7cfde884d9e7f787572e#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
commit 837e1c7370d30de01752efcbe2c4a1#1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
commit efcbe2c4a1d30de017520c43493e29d30de01752#1624 )
Signed-off-by: AMZN-alexpete
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Squashed commit of the following:
commit dbd3526517bcb6553402cbc0af1f02e1f68e0707
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Oct 4 14:30:56 2021 -0500
Increased scene manifest max size to size_t::max to match default json size limit
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea4a9ffd23feb3beeadc9bf6ca765c96980e9e6d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Oct 1 19:15:25 2021 -0500
Switch to querying cache location from Settings Registry
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 1c197996132625b8e26856fc92a30f9862d9dfdb
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Oct 1 14:42:32 2021 -0500
Update to look in cache for generated manifest instead of source folder
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit cf3c32791fd71dc48066f9783c8859d386370b95
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 30 11:09:40 2021 -0500
Added generated manifest to dependency tracking. Updated unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 56cb0d27982e61c2cf123b765def8b5c9e21b021
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:51:52 2021 -0500
Moved manifest size const to header and used that in scene builder
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 7c8016a0ba6000090b29371f253b7906c9f3d141
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:21:06 2021 -0500
Add doc comment
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 45fd5473f5ed6fe4fe93f8d629857852bcbe5e03
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:11:36 2021 -0500
Clean up code and add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit d0e610cad380e2278bc18552a4d1c71c64a5d339
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 13:21:58 2021 -0500
Source dependency reporting WIP
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
(cherry picked from commit d6464dcee20ea4e6f2d40f0d3301f24be5f4dee6)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Add comment on unit test globals, fix indentation
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Cleaned up scene_mesh_to_prefab.py
Added comments
Removed raise_error function
Made mesh_group_name cleanup more comprehensive
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* fix for "warning C4100: 'message': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
f44169f7fa
Cleanup SerializeContext.h pt.1 ( #4264 )
...
* Remove AssetSerializer inclusion from SerializeContext header
Moved a few Reflect methods to new cpp files.
In addition, some preparations for further header dependency reductions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix smoke test lua failures.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Windows build fixes.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Missing license headers
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix white-space issues.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix inheritance list wrapping broken by older clang-format
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
1d53200eda
Gems/SceneProcessing
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
194205c453
Replaced AzFramework::FileFunc JSON utils API calls with AzCore::JsonUtils APIs that appear to have been duplicated. Also fixed up improper Project Configurator -> Project Manager comment replacements.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
dbf12ae697
Updated remaining Project Configurator references to Project Manager.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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
4 years ago
68b04fa6c1
Merge branch 'development' into cmake/AddressSanitizer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Legacy/CryCommon/LegacyAllocator.h
4 years ago
079e018e8e
Merge remote-tracking branch 'upstream/development' into Atom/santorac/OptionalSceneApiMaterialConversion3
4 years ago
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
7164b64bb5
Move BuildDebugSceneGraph function out of SceneProcessing gem ( #3290 )
...
Moved BuildDebugSceneGraph out of SceneProcessing gem and into DebugOutput class to allow the function to be shared, which ensures the same dbgsg format is outputted among any calls to the function.
* Move BuildDebugSceneGraph function, update all calls to this function
Signed-off-by: Victor Huang <huavicto@amazon.com>
* Remove unused includes
Signed-off-by: Victor Huang <huavicto@amazon.com>
* Remove z
Signed-off-by: Victor Huang <huavicto@amazon.com>
4 years ago
1d7f690e06
missing header includes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
eb1593a19c
Changes to SDK wrappers and functions to allow more flexible scene file processing ( #3112 )
...
These changes allow for usage of different asset import SDKs to process scene files.
Move AssImp specific code out of node, scene & material wrapper parent classes and into child wrapper classes (AssImpNodeWrapper, etc.), allowing child classes to expose import SDK code. Allows for more convenient implementation of other import SDK's elsewhere (such as in a gem).
Add a loadingComponentUuid parameter to LoadSceneFromVerifiedPath to allow for usage of different loading components. Changed tests and all calls to this function accordingly.
* Move AssImp specific code out of wrapper parent classes and into child classes for gem usage
Signed-off-by: Victor Huang <huavicto@amazon.com>
* Add loadingComponentUuid parameter to LoadSceneFromVerifiedPath function
Signed-off-by: Victor Huang <huavicto@amazon.com>
* Make wrapper members protected, change pointer cast
Signed-off-by: Victor Huang <huavicto@amazon.com>
* Adding spaces to fix style
Signed-off-by: Victor Huang <huavicto@amazon.com>
* Fix for pointer cast causing test failures
Signed-off-by: Victor Huang <huavicto@amazon.com>
4 years ago
5c90bc0d58
Skip blend shapes that influence multiple meshes ( #3009 )
...
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
36abde95a9
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 ScenePI 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 registery 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 switcihng the material conversion registry setting from true to false. (Details below)
- TODO: Will merge this change to a customer's fork and test 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
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
41a1cb58cf
SceneProcessing
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
a3712b5564
TSpace setting for MikkT tangent generation ( #2386 )
...
* Added TSpace method setting which is only visible for MikkT generation.
* Fixed a bug with generating tangents for blend shapes.
* Renamed tangent space into generation method.
* Some code cleaning
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
1e10ee61ba
[MeshOptimizer] Return the correct size from the position map when there are blendshapes ( #2391 )
...
The previous version returned the incorrect size from the position map when
blendshapes are present in the model. When there are blendshapes, the
vertex welding is disabled, and nothing is inserted into the position map.
However, the position map's size was being used to dictate how many
elements to create in the skinning info. The skinning info tries to
compensate for an incorrect max vertex index by resizing its underlying
vector when adding an influence, but that was using the index as the new
size of the vector, so it was off by one. This fixes both errors.
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
dbe6bb673e
Merge pull request #2277 from aws-lumberyard-dev/burelc/LYN-4490
...
[MeshOptimizer] Weld nearby vertices when optimizing meshes
4 years ago
001aa96fae
Merge pull request #2299 from aws-lumberyard-dev/jillich/TangentsGeneration
...
MikkT tangent generation support
4 years ago
d987c45072
MikkT tangent generation support
...
* Default setting when no tangents rule: MikkT tangents.
* Calculates tangents/bitangents for all available uv sets.
* Creates tangent/bitangent data in in case they are not existing yet (as in: the source scene contains tangents/bitangents)
* Overwrites the tangent/bitangent data from the source scene in case MikkT is wished.
* Added helper functions to create tangent/bitangent scene nodes, finding tangent/bitangent data for a given uv layer and calculating the number of uv layers provided by the mesh scene node.
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
69b5c04b7f
Cleared m_scriptFilename between scene files. ( #2278 )
...
This fixes a bug where a Python script file would be run on a scene file
that didn't have a script file set.
Added a general case version to SceneBuilderWorker.cpp, to make it easy
to mark all scene files as dirty.
Automated tests for this will come in a separate pull request.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
2355581d79
Replace Array2D with vector<vector<>>
...
The thought behind Array2D was that it would be more efficient from a
memory allocation perspective to have one fixed buffer that grows than
it would be to have a vector of vectors. In reality, the runtime of
inserting into the middle of one large buffer, and shifting all the
resulting elements, ends up far outweighing any memory allocation
overhead.
In the mesh optimizer, things are added to the end of each sub-vector
one by one. It isn't known up front how many elements each sub-vector
will have. With vertex welding enabled, it is far more likely that a
given vertex will be influenced by a large number of joints. When using
the Array2D to store the influences, and a vertex with a low index has
more than 4 influences, those influences have to be inserted into close
to the front of the big vector, and all the other elements shifted.
Array2D was doing this with a linear shift, shifting the elements by 1
at a time, and not providing any exponential growth on the amount of
elements reserved by each sub-vector. The result is a linear insertion
time.
By contrast, using vector<vector<Influence>> instead gives us back the
amortized constant insertion time. Since the skin influences are just
added to the end of each sub-vector, no shifting of the elements is
necessary. And since the amount of original vertex indices is known up
front, the number of sub-vectors can still be pre-created, so the
sub-vectors themselves never need to shift.
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
2b89d9d563
MikkT generator fills given tangent data rather than creating a new scene node
...
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
9ea46bad83
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>
4 years ago
7bcd4baec4
Use a bunch of temporaries in order to make `position` `const`
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
70a8214c2d
Add logging call to show mesh optimizer effect on vertex count
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
38046bd0c9
Don't attempt to weld similar vertices if there's blendshapes
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
cbb4778ef5
Use a filter view instead of reimplementing a filter view
...
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
e4e1946018
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>
4 years ago
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
5a0c1fab9f
Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
0863a24490
Revert "[MeshOptimizer] Determine the original vertex index based on the position ( #2008 )" ( #2188 )
...
This reverts commit a077a88d3f
4 years ago
2c9922d4b5
Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash
4 years ago
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>
4 years ago
f8a80468ab
remove structured binding from lambda to workaround msvc bug
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
2ab2503337
Revert "[MeshOptimizer] Determine the original vertex index based on the position ( #1562 )" ( #1902 )
...
This reverts commit ef1f95f1d0
5 years ago
ef1f95f1d0
[MeshOptimizer] Determine the original vertex index based on the position ( #1562 )
...
* 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>
5 years ago
0c43493e29
FBX to Scene part 3, tangent generation rule FBX -> SourceScene ( #1747 )
...
* Tangent space FromFBX -> FromSourceScene
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
5 years ago
73522e90c9
FBX -> Scene, part 2. Code changes, file renames ( #1704 )
...
* First pass FBX -> Scene File conversion.
This is the simple pass, minimizing code changes and focused on comments.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
* Step 1 of part 2 of the FBX -> Scene rename
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
* Renaming FbxSceneBuilder folder to SceneBuilder
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
* Renamed files
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
* More FBX -> Scene
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
5 years ago
4c4be73bd5
First pass FBX -> Scene File conversion. ( #1699 )
...
This is the simple pass, minimizing code changes and focused on comments.
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
5 years ago
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com>
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com>
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
9d94977b2c
FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support ( #933 )
...
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878 )"
This reverts commit 58adcf168f#753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"
This reverts commit 798d96f1a2eb31d90ad9#753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""
This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.
* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878 )""
This reverts commit 978477097892a22e83519646527ff52ba6532f35.
* Fixed how FbxImportRequestHandler is loaded
* Bumped version to force FBX to rebuild + removed unused variable
* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878 )""
This reverts commit 978477097892a22e83519646527ff52ba6532f35.
* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""
This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.
* Fixed a bad revert
* Better error reporting at AP launch
* AZ_CRC -> AZ_CRC_CE and removed delayed reload of settings registry file now that it's available at startup
* fixed typo in comment
5 years ago
1da8c50e8e
Temporarily backing out STL changes to unblock mainline ( #921 )
...
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878 )"
This reverts commit 58adcf168f#753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"
This reverts commit 798d96f1a2eb31d90ad9
5 years ago
798d96f1a2
Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter
...
[LYN-3689] AssImp: Data driven supported filetypes
5 years ago
f779821ac0
Helios - LYN-3250 - Fixed morph targets for meshes that had multiple … ( #696 )
...
* Helios - LYN-3250 - Fixed morph targets for meshes that had multiple materials (#374 )
Fixed morph targets for meshes that had multiple materials and were split by AssImp: Recombined them into one mesh in the O3DE scene graph, so the behavior would match FBX SDK.
5 years ago
2b538c9921
Switch to using settings registry
...
# Conflicts:
# Assets/Engine/Registry/assetimporter.setreg
5 years ago
7f81602fe7
Use the material id from the base mesh when optimizing blend shapes ( #517 )
...
This is cherry-picked from #311
When processing meshes with blend shapes, the mesh optimizer disables the
optimize duplicates setting, to prevent potential vertex reodering that
could cause the base mesh vertices to become out of sync with the blend
shape. However, it will still reorder vertices based on their material.
It places all triangles that use the same material in the same submesh,
grouping them together in the resulting mesh. The SceneAPI does not track
material ids for blend shapes. To ensure that the blend shape triangles are
reordered in the same way as the base shape, this change makes the blend
shape optimization use the material id from the base shape.
5 years ago
1d4c483e73
Red code legacy renderer ( #383 )
...
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:
Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
5 years ago
991fb071a5
Add a wildcard source dependecy to the scene builder for wrinklemasks
5 years ago
amzn-mike
Artur K
Esteban Papp
Chris Galvan
santorac
Jeremy Ong
amzn-victor
Benjamin Jillich
Chris Santora
pappeste
Chris Burel
Benjamin Jillich
AMZN-stankowi
Steve Pham
hultonha
AMZN-stankowi
bosnichd
Tommy Walton