Commit Graph

284 Commits

Author SHA1 Message Date
jackalbe 143b8f1131 {SPEC-7465} Fix DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds (#1535)
* Fix for DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds
* added -ap_disableAssetTreeView=true to disable the Qt tree view for the asset tab to get the parts that want to be tested finish
* only shows up on Debug

Tests:
=== test session starts ===
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_AllPlatforms::test_AllSupportedPlatforms_FastScanWorks_FasterThanFullScan[windows-AutomatedTesting] PASSED [ 50%]
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_Windows::test_WindowsPlatforms_RunAPBatchAndConnectGui_RunsWithoutEditor[windows-AutomatedTesting] PASSED [100%]
--- generated xml file: F:\amazon\o3de\build\vs2019\Testing\Pytest\AssetPipelineTests.Batch_2_Sandbox.xml ---
=== 2 passed, 4 deselected in 18.32s ===
2021-06-24 06:47:59 -05:00
amzn-mike 63dd82aed3 Merge pull request #1498 from aws-lumberyard-dev/Helios_LYN-3723-FixPBRNormalMapImport
[LYN-3723] Fix Stingray PBR normal map import
2021-06-23 21:15:35 -05:00
amzn-mike 8e98f7bb28 Merge pull request #1505 from aws-lumberyard-dev/Helios_LYN-4742-AssImpRootTransformFix
[LYN 4742] AssImp Root Transform Fix
2021-06-23 21:15:03 -05:00
AMZN-nggieber 10dcae90a4 Replaced editor logo with new project manager logo for Project Manager (#1531) 2021-06-23 17:23:06 -07:00
amzn-mike 03a6d1e0f5 Merge branch 'stabilization/2106' into Helios_LYN-4742-AssImpRootTransformFix 2021-06-23 18:06:36 -05:00
amzn-mike 0e8a2ca110 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 2021-06-23 17:36:04 -05:00
amzn-mike 3d0093307f Merge pull request #1490 from aws-lumberyard-dev/Helios_AssImpAnimationOnAllBones
[AssImp] Add placeholder animations for all bones
2021-06-23 16:39:14 -05:00
amzn-mike 56f250baaf Merge pull request #1457 from aws-lumberyard-dev/Helios_FixCacheCopyFailure
[LYN-4508] Fix AP cache copy failure
2021-06-23 15:35:59 -05:00
amzn-mike 64e139aa97 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 2021-06-23 14:57:38 -05:00
amzn-mike 09b7d57dc4 Merge branch 'stabilization/2106' into Helios_AssImpAnimationOnAllBones 2021-06-23 14:51:24 -05:00
amzn-mike 9e2f1aed91 Add comment 2021-06-23 14:47:47 -05:00
Terry Michaels 1e457928f5 Update help URLs and remove unneeded links (#1520) 2021-06-23 14:42:33 -05:00
amzn-mike fd6f68ce91 Merge branch 'stabilization/2106' into Helios_FixCacheCopyFailure 2021-06-23 14:13:42 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Alex Peterson aa885e5d0b Fix project creation (#1445)
* Add ability to change project name

* Fixed several issues where path types were changed

* Added PythonBindings CreateProject unit test

* Fix python warning format

* Validate new project name in CLI

* Fix issue creating pathview on linux

* Use better testing macros

* Refactored the unit_test_engine_template.py test to actually test
against the current engine_template.py commands

The commands of create-template, create-from-template, create-project
and create-gem is now being validated.

Registered the unit_test_engine_template.py script with CTest in the smoke test
suite so that it runs in Automated Review

Fixed issues in the engine_template.py script where the template_restricted_path parameter was required in the create_project and create_gem functions

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-23 09:19:17 -07:00
amzn-mike c27e0fe6e5 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 2021-06-23 10:00:55 -05:00
amzn-mike bacb612dd1 Merge branch 'stabilization/2106' into Helios_AssImpAnimationOnAllBones 2021-06-23 09:59:43 -05:00
amzn-mike 74022447dd Merge branch 'stabilization/2106' into Helios_FixCacheCopyFailure 2021-06-23 09:55:33 -05:00
amzn-mike feb58fac5e Fix calculation for root transform 2021-06-22 23:59:40 -05:00
AMZN-nggieber bc3aa45ed9 Prism Show Gem Requirements and Prompt when Adding Gems with Requirements (#1478)
* Added requirements section to gem inspector

* Added Dialog when configuring for gems with extra requirements
2021-06-22 19:44:33 -07:00
AMZN-nggieber e21443b5d6 Added Project Preview to Project Settings and Fixed Issues with Moving Projects (#1380)
* Updated Project Settings Screen with preview and fixed moving projects

* Tests for some Project Utils

* Remove old defined consts

* Update UX to use display name when avaliable where appropriate

* Use newPreviewImagePath for temp changing preview.png otherwise use iconPath for preview in UX

* Removed use of newPreviewImagePath in ProjectButton
2021-06-22 17:24:48 -07:00
amzn-mike 1137c2d09d Fix importing normals on PBR materials
Some normals are flagged as "NORMAL_CAMERA" by AssImp, so if we can't find NORMALS we fallback to looking for NORMAL_CAMERA
2021-06-22 18:09:06 -05:00
amzn-mike e4e5178261 Add in placeholder animations for all bones as some models require this for correct animations
Matches with previous FBX SDK behavior
2021-06-22 13:04:08 -05:00
Terry Michaels 858dee2210 Need to keep full asset paths around in LuaIDE (#1470) 2021-06-22 07:05:42 -05:00
amzn-mike 514cfc3b4c Fix compile error 2021-06-21 12:27:13 -05:00
amzn-mike 4c7a46850d Update comments 2021-06-21 11:23:24 -05:00
amzn-mike d2d588901e Address PR feedback 2021-06-21 11:00:27 -05:00
amzn-mike bfe391b4bb Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 2021-06-21 08:16:21 -05:00
amzn-mike 582c936e3b Move begin/end cache file update calls into move/copy code 2021-06-19 18:37:48 -05:00
lumberyard-employee-dm 7dabe8b6e9 Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)
* Fixed organization of the AssetProcessor SourceAssetBrowser

Assets within the Engine Root were grouped under a '/' entry.
That has been fixed to use the relative path within the engine root for
those assets
Assets outside of the Engine Root, but on the same drive were using
absolute paths before. Now there are child entries that navigate up the
directory hierarchy to those asset locations

* Added ly_enable_gems call to Atom gems targets that are required

The DefaultLevel.prefab contains several Atom components, that require
the Atom RHI, RPI, Common_Feature, ShaderBuilder and AtomLyIntegration CommonFeatures
gems to be enabled in order to successfully process in the
AssetProcessor.

* Added ly_enable_gems call to make the Camera gem required in Tools,
Builders and Clients.

This is needed as the DefaultLevel.prefab contains an Editor Camera
Component

* Adding the ly_enable_gem call to make the Maestro gem required

CrySystem currently requires Maestro to be enabled in order to
initialize

* Added ly_enable_gems call to the SceneProcessing gem to make it required

The SceneCore and SceneData libraries that are part of the core engine
Code folder requires the SceneProcessing gem to be enabled in order to
invoke the InitializeDynamicModule hooks in DllMain.cpp in order to
initialize those libraries.

* Fixed bad argument in comment for Prefab CMakeLists.txt

* Fixed Assert in Asset Builders due to the Atom RPI Builder

The Atom RPI Builder was enabling the Asset Catalog for the ScriptAsset a second time

The Atom Feature Common EditorSystemCommonComponent.cpp which also loads
in the AssetBuilder is enabling the Asset Catalog for the ScriptAsset

Added BehaviorContext reflection to the OutputDeviceTransformType enum
to fix the BehaviorContext errors about reflecting a method that returns
such an enum

* Added TypeId output to the JsonDeserializer report message about missing
ClassData

Previously the report callback would indicate that the target type was
missing Serialization class data, but didn't indicate the TypeId of the
target type

* Added support to the ly_enable_gems function to be able to support
0 gems being enabled.

Updated the Install step for CMake to propagate any ly_enable_gems
within a CMakeLists.txt for a target into the generated CMakeLists.txt
that is made for each installed IMPORTED target

* Adding newline to the end of the Camera Gem CMakeLists.txt

* Fixing target TYPE parameter for actual Gem Modules to use the GEM_MODULE tag instead of MODULE

* Reverting change to the DESTINATION directory for the installed CMakeLists.txt to use the relative path to the installed directory

* Adding the Atom_Bootstrap gem as a required gem

The Client and GameLaunchers required the Atom_Bootstrap gem in order to create the NativeWindow
Added Atom_Feature_Common client module as a runtime dependency of the AtomLyIntegration CommonsFeature client module

* Fixed register.py --all-projects-path and --all-gems-path arguments to
NOT register projects or gems that are within a template folder
Fixed reading of old pre-1.0 o3de_manifest.json files where the
"engines" key was a json array

* Changed how the relative target source directory is calculated when that source directroy resides outside of the engine root.
The final dirname component is used with a unique SHA256 has to form a <dirname>-<8 char SHA256> folder for installing files into

* Adding newline to the end of Atom_Bootstrap CMakeLists.txt

* Moving ly_enable_gems variants for Tools and Builders inside of PAL_TRAIT_BUILD_HOST_TOOLS block

* Adding a comment to AWSCore.ResourceMappingTool target to indicate that it is not a GEM_MODULE.
Furthermore it cannot be loaded with the Gem system because the library is in a different directory the executable
2021-06-17 13:58:20 -05:00
amzn-mike ff81b0bfd6 Use contains method instead of find. Rename parentFillerAnimations -> fillerAnimations 2021-06-17 10:40:33 -05:00
Benjamin Jillich 7bd42e1f8d [LYN-4410] Back buttons should preserve selected gems (#1359) 2021-06-17 06:55:28 +02:00
amzn-mike 4c9b3b12cb Merge branch 'stabilization/2106' into V2Mainline 2021-06-16 12:05:28 -05:00
amzn-mike 57b19feca5 Cleanup code 2021-06-16 12:03:47 -05:00
AMZN-stankowi 1fd0886b70 Updated AssImp to v10 for Windows Invert PostRotation matrix in animation chains (#1340) 2021-06-16 08:32:47 -07:00
Eric Phister 74491c88b8 Fix AssetBuilders when project-path has a trailing slash (#1345)
* Fixes issues with project paths w/ trailing slash

When launching AP with a --project-path that has a trailing slash, the
AssetBuilders would get that slash instead of a normalized version.
This would mess up the params sent to AssetBuilders.

* Missed a variable name replacement

* Addresses feedback on code style guidelines

Removed 'auto' keyword in favor of explicit types.
2021-06-15 17:50:40 -05:00
yuriy0 e40a598648 Bug fix: check for valid extension in case insensitive manner (#1339) 2021-06-15 12:41:58 -07:00
Mike Balfour ab3aa904f0 Fixed misc slice conversion bugs
* Fixed crash caused by nesting the same slice twice
If the same slice is nested at multiple levels in the same slice hierarchy, the second conversion would reregister the prefab and crash.  Now that case is detected and the slice isn't reconverted.

* Fixed json array patches where multiple elements are removed.
The patches now generate removals from back to front, instead of front to back, so that the indices remain valid as each patch is applied.
2021-06-15 14:00:47 -05:00
amzn-mike 625e1326e3 Merge branch 'stabilization/2106' into V2Mainline 2021-06-14 19:55:01 -05:00
Alex Peterson ecded991b5 Display error when unable to start Python
Added AzFramework Application, logging, unit tests
2021-06-14 17:02:22 -07:00
amzn-mike 364187a87b Merge pull request #1047 from aws-lumberyard-dev/Helios_AssImp_TransformImporterFix
Fix AssImpTransformImporter logic for bone nodes
2021-06-14 18:41:09 -05:00
AMZN-nggieber 948075fa61 Gem Catalog Allows Filtering by Gem Selected Status Live (#1274) 2021-06-14 15:56:54 -07:00
sharmajs-amzn 86d0acf76c fixes for invalid drive letter casing for scanfolder (#1281) 2021-06-14 13:55:37 -07:00
Mike Balfour 6f61454be4 Added support for remapping entity refs across slice instances (#1284)
* Fixed memory assert on shutdown.
Cleaned up the entity pointers on serialization, so that they no longer leak themselves, their asset references, or anything else within them.

* Added support for remapping entity refs across slice instances.
Slice instances can have components with entity references that have been modified to reference entities in other slice instances, or even in the parent.  This change detects and remaps those references so that they work correctly.
2021-06-14 14:20:39 -05:00
amzn-mike a3ae330e6d Merge branch 'stabilization/2106' into Helios_AssImp_TransformImporterFix 2021-06-14 10:17:29 -05:00
amzn-mike 7dc4d8438b Fix non-bone transforms setting the wrong matrix variable
(cherry picked from commit 838a8b47da73e50fca4ea9ee5abc7c33250bf25d)
2021-06-14 08:08:51 -05:00
amzn-mike 9b039c1f9d Fix creating bone data for non-bones
(cherry picked from commit 8d1bdd1456e70e4efc47aa36dce660bc91e7dfcf)
2021-06-14 08:08:31 -05:00
amzn-mike 10999b6999 All bones have animations
(cherry picked from commit d17a8070010cdc5bc4e08d17b1549736d031414a)
2021-06-14 08:06:48 -05:00
amzn-mike 66a030b800 Fix transform data
Use first offsetMatrix for a bone (there may be multiple) and calculate using offsetOfParent * inverseRootOffset * rootOffset * inverseOffset

(cherry picked from commit a8eae976dda39ad28f9aa235e1e6ba34715ac48a)

# Conflicts:
#	Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
2021-06-14 08:06:25 -05:00
amzn-mike d841f0c0db Got transform result close for 3 bone chain, longer chains are still not correct
(cherry picked from commit 5ac65de6148dcc03b9f2953e97dd943493f23ed9)

# Conflicts:
#	Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
2021-06-14 08:03:39 -05:00