Commit Graph

313 Commits

Author SHA1 Message Date
AMZN-koppersr b4976ff9cb Merge pull request #327 from aws-lumberyard-dev/JsonSerializationTypeIdBug
Typeid bug fix in Json Serialization.
2021-04-28 10:44:42 -07:00
Guthrie Adams 518c6cb760 Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
ATOM-14003 adding image thumbnails to material inspector properties
2021-04-28 12:34:54 -05:00
hultonha f24e3b2891 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-28 17:29:24 +01:00
Tom Hulton-Harrop 5d53590434 Merge pull request #310 from aws-lumberyard-dev/hultonha_PR-37_follow-up
Updates following review feedback to PR-37
2021-04-28 17:27:26 +01:00
AMZN-koppersr 2dfe9942f2 Merge branch 'main' into JsonSerializationTypeIdBug 2021-04-28 09:23:41 -07:00
Guthrie Adams 167b7f36a6 Merge pull request #373 from aws-lumberyard-dev/Atom/guthadam/ATOM-15370
ATOM-15370 Fix thumbnail scaling and sizing issues
2021-04-28 11:01:14 -05:00
jjjoness cdce28115e Merge pull request #387 from aws-lumberyard-dev/LYN-1932
Lyn 1932
2021-04-28 16:21:43 +01:00
hasareej 11d39892d5 Fixing QString to QIcon conversion. 2021-04-28 15:18:54 +01:00
hasareej a30c952fa2 Deleting the EditorTransformComponentSelection switcher. 2021-04-28 15:03:47 +01:00
hultonha e05ab8bfb7 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-28 15:03:05 +01:00
jjjoness 2aafdab5af Added the new focus color. 2021-04-28 12:06:56 +01:00
jjjoness bf95c706d8 Merge branch 'main' into LYN-1932 2021-04-28 11:34:43 +01:00
hultonha d36a9470a3 Merge branch 'main' into hultonha_PR-37_follow-up 2021-04-28 09:27:00 +01:00
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
2021-04-28 00:17:58 -05:00
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 2021-04-27 18:46:26 -05:00
srikappa 26604fd66c Merge branch 'main' into Prefab/CreatePrefab 2021-04-27 15:41:04 -07:00
srikappa 06803040ac Fixed an assert during loading a level with prefabs 2021-04-27 15:36:44 -07:00
guthadam eeafb5eaa3 ATOM-15370 Fix thumbnail scaling and sizing issues
TLDR
Thumbnails size will be removed from the system.
Each thumbnail class is responsible for determining its stored size.
Images and other thumbnail types can be scaled up or down within reason without blurring.

The thumbnail system uses the concept of context and size organize thumbnails by size based on their intended use.  However, most of the thumbnail classes do not respect or use the specified size, which is 16 by 16 pixels and really only usable for small icons.

The thumbnails are currently being used in the asset browser tree control, the larger asset browser previews, the material component property asset controls, the material component inspector for the large preview, and other places.  Each of these places use completely different sizes, some of which are large and change dynamically. Whenever the thumbnails are painted they are scaled to the desired size.

Material and mesh thumbnails were always being captured at 512x512 regardless of what the rest of the thumbnail system said.  Source, product, and folder thumbnails would be stored at the original asset size.  The loading movie thumbnail was always drawn at 16 by 16 and scale up so it was always blurry.  Image thumbnails were always scaled down to 16 by 16 and scale up for larger previews.

Rather than worrying about the size of each context, each thumbnail class will store the image at whenever it deems to be a large enough size that can be scaled down when used.

This may eliminate the need for multiple thumbnail contexts which are not being used anyway.

https://jira.agscollab.com/browse/ATOM-15370
2021-04-27 16:43:06 -05:00
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 2021-04-27 14:12:56 -07:00
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 2021-04-27 14:12:46 -07:00
hultonha 64e06c3010 more updates to camera code 2021-04-27 19:40:45 +01:00
mnaumov 03e681ca5f Merge from main 2021-04-27 11:26:02 -07:00
mnaumov 5f33337fec Merge main 2021-04-27 11:05:22 -07:00
AMZN-mnaumov a00d47365e Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
[ATOM-14585] Enlarged thumbnails on hover
2021-04-27 10:53:18 -07:00
AMZN-koppersr 0f8e6cbda1 Fixed a Linux build error. 2021-04-27 10:36:43 -07:00
hultonha 1b946818a2 more tidy-up to CameraInput.cpp 2021-04-27 13:58:17 +01:00
hultonha 80108fd848 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-27 13:13:53 +01:00
hultonha 0acaac14d8 Merge branch 'main' into hultonha_PR-37_follow-up 2021-04-27 11:39:28 +01:00
hultonha 0952b7bd87 update Cluster file name to ButtonGroup 2021-04-27 11:32:53 +01:00
amzn-sean fbb8727407 Merge branch 'main' into physx_ragdoll_create 2021-04-27 11:04:04 +01:00
hultonha 0da9a05d87 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-27 11:02:20 +01:00
hultonha 56477b7cc7 merge from main and resolve conflicts 2021-04-27 10:58:35 +01:00
hultonha c898318377 updated camera changes 2021-04-27 10:30:07 +01:00
mnaumov fdcb19f45a Reverting some unused code 2021-04-26 17:48:49 -07:00
mnaumov 91f027a05c PR feedback 2021-04-26 17:42:49 -07:00
AMZN-koppersr 6dfa33816b Fixed a bug with type ids for inherited classes with a custom serializer.
The code that adds a $type field for pointers where needed was still assuming that custom serializer were always for primitives, which isn't the case anymore. This changes updates the behavior to allow $type to be added to those as well as long as they use an object. This does now however rely more heavily on earlier checks that the data needs a $type because it otherwise can't tell the difference between a primitive getting a default value (an empty object). In the original code this situation would have resulted in failed serialization though, so it's unlikely to be a problem.
2021-04-26 15:26:18 -07:00
AMZN-daimini 44f1a627e7 Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
2021-04-26 13:20:35 -07:00
mnaumov c4e3c39ee2 PR feedback 2021-04-26 12:44:51 -07:00
hultonha 15afcc341d fixes and updates to CameraInput 2021-04-26 19:46:57 +01:00
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 2021-04-26 13:25:55 -05:00
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 2021-04-26 11:49:48 -05:00
hasareej c85fbe86ba Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-26 17:30:51 +01:00
hasareej 9cf8070c9e Styling and Review Feedback Changes 2021-04-26 16:25:44 +01:00
AMZN-AlexOteiza 3f32cc929c Fixed All Physics automated tests (#129)
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
2021-04-26 15:25:34 +01:00
jjjoness 051cc0bce2 Merge branch 'main' into LYN-1932 2021-04-26 15:17:15 +01:00
hultonha fbaa59f28f updates following review feedback 2021-04-26 15:03:29 +01:00
hultonha fc591e292e tidy-up to some naming for types 2021-04-26 11:44:13 +01:00
hultonha a4b8db2f94 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-26 11:01:48 +01:00
hultonha b27daeead5 updates to viewport ui switcher id and usage 2021-04-24 18:35:24 +01:00