Commit Graph

216 Commits

Author SHA1 Message Date
Tommy Walton 343fc1999f ATOM-15346 : Morph target buffer only found on first Atom mesh (merge from 1.0->main)
Instead of assuming the first submesh will always have a reference to the morph target buffer, search the submeshes to find the first one that does.
2021-05-18 10:52:41 -07:00
mrieggeramzn aab4b4a126 Merge pull request #737 from aws-lumberyard-dev/Atom/mriegger/ATOM-15529
Making shadow res of 1024 and bicubic pcf the default
2021-05-18 09:13:49 -07:00
Jonny Galloway 275fbc714d Merge branch 'aws-lumberyard:main' into cherry-pick_fix_ATOM14976_to_main 2021-05-17 10:32:06 -05:00
rgba16f 749ffcfff2 Merge pull request #708 from aws-lumberyard-dev/Atom/breja/FixDefaultDebugDrawId
Fix AzFramework::g_defaultSceneEntityDebugDisplayId not working for the AtomDebugDisplayViewportInstance
2021-05-17 10:26:40 -05:00
Nicholas Van Sickle 46c0c35c26 Merge pull request #734 from aws-lumberyard-dev/nvsickle/DebugInfoDisplay
Restore debug rendering to the viewport
2021-05-14 15:20:05 -07:00
nvsickle 1426052a5f Address a bit more review feedback
-Use aznumeric_cast for enum <-> int casts
-Short circuit logic a bit more nicely
2021-05-14 13:01:46 -07:00
nvsickle a8b29bf603 Remove memory info from the overlay for now (depended on the now-dead CryMemoryManager) 2021-05-14 12:38:46 -07:00
nvsickle 810c63b80e Streamline AtomLyIntegration/AtomViewportDisplayInfo/gem.json 2021-05-14 12:38:01 -07:00
nvsickle f7a9b28000 Make AtomFont's API use copy semantics for string_view 2021-05-14 12:37:35 -07:00
amzn-sj 05fec17ebd Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files 2021-05-14 10:35:50 -07:00
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-14 10:27:33 -07:00
AMZN-mnaumov d0daab4fe0 Merge pull request #710 from aws-lumberyard-dev/Atom/mnaumov/LYN-3529
[LYN-3529] Hiding "Open Material Editor" when material asset is assigned
2021-05-13 17:15:03 -07:00
Guthrie Adams ab81bd0e7e Merge pull request #726 from aws-lumberyard-dev/Atom/guthadam/ATOM-15223
ATOM-15223 updating material assignment ID to be portable to other models
2021-05-13 17:21:07 -05:00
gallowj 183790bf79 materials need properties updated to match changes with standardpbr materialType 2021-05-13 16:41:32 -05:00
gallowj 49084d250f updating material files 2021-05-13 16:40:51 -05:00
gallowj 42d47ca5fc New geometry and texture replacement for the Standford Lucy assets. 2021-05-13 16:28:48 -05:00
guthadam 488e3b5da5 Merge branch 'main' into Atom/guthadam/ATOM-15223 2021-05-13 00:33:28 -05:00
mriegger 124ca1618a Making shadow res of 1024 and bicubic pcf the default 2021-05-12 20:51:56 -07:00
nvsickle 8fd5c30e13 Address some build/review feedback 2021-05-12 17:47:10 -07:00
mnaumov ef8f9c82a0 Merge from main 2021-05-12 16:37:32 -07:00
nvsickle 84216f0479 Add API for ViewportInfoDisplayState, add some minor RHI integration 2021-05-12 15:58:28 -07:00
greerdv ce3842ac84 Merge branch 'main' into non-uniform-scale-compatibility 2021-05-12 22:19:33 +01:00
greerdv 655d71e0dd update compatibility of atom components with NonUniformScaleService 2021-05-12 22:16:14 +01:00
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
guthadam 931a127b7b ATOM-15223 updating material assignment ID to be portable to other models
The bug was reported that copy and paste did not work with the material component.
Copy and paste to take the worked fine.
All of the material assignments/overrides get mapped using the LOD and asset ID of materials provided with the model.
The asset IDs of materials exported by atom builders, using the scene API, are the combination of the same UUID as the model asset ID and the unique sub ID that is now hashed from the material name provided by the DCC tool.
If we map material assignments using the entire asset ID that was generated in the model builder then the mapping will only work with that specific model.
This change updates the material assignment ID equality operators and hash function to only use the sub ID portion of the asset ID.
As long as the sub IDs are generated consistently the material assignment mappings will be portable to models with the same material names.

Also moved material assignment structures to atom common features static library so this was to be moved to cpp files
2021-05-12 13:47:47 -05:00
Aristo7 3569ac9b87 Bringing back RHI modules to tools deps 2021-05-12 13:13:28 -05:00
mnaumov 7342e62680 Hiding "Open Material" when material asset is assigned 2021-05-11 19:33:46 -07:00
nvsickle 6fcd5c7817 Restore Viewport debug text
Adds the AtomViewportDisplayInfo Gem which renders debug text to the default viewport context depending on the value of r_DisplayInfo.
The gem is flagged as a dependency of AtomBridge, so all Atom projects will consume it by default.
2021-05-11 18:27:47 -07:00
nvsickle cdca18ca25 Use a smart viewport context pointer in AtomFont to avoid a crash 2021-05-11 18:26:05 -07:00
Aristo7 93ef3acb50 Removing non-tool modules from tools runtime deps 2021-05-11 18:43:09 -04:00
Aristo7 b92a1884a8 Addex dx12/metal builders to linux 2021-05-11 18:08:59 -04:00
rgba16f d9ae94ee77 Merge remote-tracking branch 'upstream/main' into Atom/breja/FixDefaultDebugDrawId 2021-05-11 16:24:49 -05:00
rgba16f 85e4f0d65f Fix AzFramework::g_defaultSceneEntityDebugDisplayId not working for the AtomDebugDisplayViewportInstance 2021-05-11 16:24:28 -05:00
Aristo7 fe24f37a70 Fixing up null.builder loading issue 2021-05-11 15:34:31 -05:00
Aristo7 b6740dd972 Merge remote-tracking branch 'upstream/main' into Atom/olexl/ATOM-15376 2021-05-11 15:19:17 -05:00
nvsickle 7ff5c0e105 Add multiline spacing and GetTextSize to Atom Font 2021-05-11 12:18:04 -07:00
Guthrie Adams ff9d8f7a87 Merge pull request #660 from aws-lumberyard-dev/Atom/guthadam/ATOM-15486
ATOM-15486 Material Editor: Implement layout and user settings
2021-05-11 13:09:39 -05:00
Aristo7 703f9deee0 Testing jenkins break 2021-05-11 12:43:30 -05:00
Ken Pruiksma 02d88bc8da Merge pull request #676 from aws-lumberyard-dev/pruiksma/ATOM-15515
ATOM-15515 Fixing nullptr reference in OnShapeChanged() in light delegates.
2021-05-11 11:02:52 -05:00
greerdv 27d6e5b848 formatting tidy up 2021-05-11 11:41:33 +01:00
greerdv 619f71cc19 fixing some bugs with debug draw not taking entity scale into account 2021-05-11 11:39:14 +01:00
greerdv 793af49457 Merge branch 'main' into debug_draw_transform 2021-05-11 09:50:51 +01:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05:00
pruiksma 7957d3f8b6 Merge branch 'main' into pruiksma/ATOM-15515 2021-05-10 19:45:09 -05:00
mrieggeramzn d7c72a249c Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
Atom/mriegger/pls
2021-05-10 17:13:39 -07:00
greerdv fb6c6e2468 Merge branch 'main' into debug_draw_transform 2021-05-10 22:02:27 +01:00
greerdv 45055ab3cc applying debug draw transform stack to DrawLines and DrawTriangles 2021-05-10 22:01:41 +01:00
pruiksma e37b3989be ATOM-15515 Fixing nullptr reference in OnShapeChanged() when visibility is turned back on for shapeless punctual light types. 2021-05-10 15:31:33 -05:00
Aristo7 1e232294d5 Added Null RHI to all targets 2021-05-10 14:36:32 -05:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00