Commit Graph

252 Commits (bb76bccc06249d2bb9db6863335d0ffdc81f1f73)

Author SHA1 Message Date
jjjoness bf95c706d8 Merge branch 'main' into LYN-1932 5 years ago
hultonha d36a9470a3 Merge branch 'main' into hultonha_PR-37_follow-up 5 years ago
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
5 years ago
mnaumov 793d60f150 Merge main 5 years ago
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 5 years ago
srikappa 26604fd66c Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 06803040ac Fixed an assert during loading a level with prefabs 5 years ago
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
5 years ago
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 5 years ago
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. 5 years ago
hultonha 64e06c3010 more updates to camera code 5 years ago
mnaumov 03e681ca5f Merge from main 5 years ago
mnaumov 5f33337fec Merge main 5 years ago
AMZN-mnaumov a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
[ATOM-14585] Enlarged thumbnails on hover
5 years ago
AMZN-koppersr 0f8e6cbda1 Fixed a Linux build error. 5 years ago
hultonha 1b946818a2 more tidy-up to CameraInput.cpp 5 years ago
hultonha 80108fd848 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 5 years ago
hultonha 0acaac14d8 Merge branch 'main' into hultonha_PR-37_follow-up 5 years ago
hultonha 0952b7bd87 update Cluster file name to ButtonGroup 5 years ago
amzn-sean fbb8727407 Merge branch 'main' into physx_ragdoll_create 5 years ago
hultonha 0da9a05d87 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hultonha 56477b7cc7 merge from main and resolve conflicts 5 years ago
hultonha c898318377 updated camera changes 5 years ago
mnaumov fdcb19f45a Reverting some unused code 5 years ago
mnaumov 91f027a05c PR feedback 5 years ago
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.
5 years ago
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
5 years ago
mnaumov c4e3c39ee2 PR feedback 5 years ago
hultonha 15afcc341d fixes and updates to CameraInput 5 years ago
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 5 years ago
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 5 years ago
hasareej c85fbe86ba Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hasareej 9cf8070c9e Styling and Review Feedback Changes 5 years ago
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::
5 years ago
jjjoness 051cc0bce2 Merge branch 'main' into LYN-1932 5 years ago
hultonha fbaa59f28f updates following review feedback 5 years ago
hultonha fc591e292e tidy-up to some naming for types 5 years ago
hultonha a4b8db2f94 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hultonha b27daeead5 updates to viewport ui switcher id and usage 5 years ago
mnaumov 0bcc85e4d8 scope pointer 5 years ago
mnaumov 30458bc1be PR feedback 5 years ago
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 5 years ago
Guthrie Adams fb26308a26
Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
5 years ago
mnaumov 9f4606c17a Removing test code 5 years ago
mnaumov b215d1c098 Enlarged thumbnails on hover 5 years ago
Chris Burel 61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
5 years ago
amzn-mike 16ca036ea8
Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
Disable Asset Load Cancellation
5 years ago
guthadam 923f234d71 ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.

This is a prerequisite for displaying image previews inside of the material inspector.

https://jira.agscollab.com/browse/ATOM-15326

https://jira.agscollab.com/browse/ATOM-14003
5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
AMZN-daimini e772afa06e
Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
5 years ago
amzn-mike d25179303d Add jira ticket for disabled tests 5 years ago
amzn-mike c61b244416 Use a const to toggle asset cancellation on and off 5 years ago
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 5 years ago
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 5 years ago
mnaumov 09a0676b9c Adding custom title to PropertyAssetCtrl 5 years ago
daimini 8f79379bc8 Fixes as per Ram's review 5 years ago
daimini 76739de282 Fix spacing 5 years ago
daimini ea43eb3ac9 Set position of instantiated prefab 5 years ago
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
daimini c9a4b6f50b Better handle the default case for Instantiate 5 years ago
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 5 years ago
amzn-mike 9e2836613f Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel 5 years ago
amzn-mike 58e8233c2c Remove debug message 5 years ago
amzn-mike 0428189bed Increase test difficulty 5 years ago
amzn-mike 39789c30d8 Remove container OnAssetCanceled event 5 years ago
amzn-mike 35a47932eb Disable weak references and unit tests for them. 5 years ago
Eric Phister 38f0203546
Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
5 years ago
Terry Michaels d680995074
Renamed several non-inclusive terms (#236) 5 years ago
greerdv 1fa5728655
Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
5 years ago
amzn-mike 3907ffc173 Add unit test 5 years ago
mbalfour bd23944531 Fix issues with rapid asset cancellation / reload:
* Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference.  This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it.  The method now detects this case and calls GetAsset(), which triggers a new load.
* AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset.  Now it returns false, to help ensure the container doesn't try to get reused.
* AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load.  They are no longer added, since they shouldn't be waiting for any dependent assets to load.  (This could cause incorrect warnings to print in some situations)
* AssetContainer was erroneously warning about removing assets from a missing waiting list.  The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without.
* AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it.
* AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it.  This prevents asset containers that are in the middle of cancellation from getting reused.
5 years ago
hultonha cc4d69f279 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 5 years ago
AMZN-AlexOteiza dbcb2f9916
Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
5 years ago
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 5 years ago
amzn-sean 0e803713bf Ragdoll now uses Add/Remove SimulatedBody
Addressed Minor Character PR feedback
5 years ago
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 5 years ago
mnaumov 5f0e7f2cbc merge from main 5 years ago
daimini 67fa4a332b Change CreateLink to return the LinkId 5 years ago
daimini ca8d6f8818 Instantiate Prefab 5 years ago
Luis Sempé 8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
5 years ago
luissemp 49322b040b Fixed Lua IDE startup 5 years ago
cgalvan 7a6b0c16b7
Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 5f8ffdfdc1 [LYN-3137] Fixed EMFX floating dock widgets not responding to docking events. 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
phistere 70b4938cff LYN-2524: Launch AP from SDK when not found in the executable directory 5 years ago
amzn-sean 743d6a511a
Merge pull request #192 from aws-lumberyard-dev/physx_character_create
Character controller now uses Add/Remove Simulated Body API
5 years ago
SergeyAMZN 0a09ab7c8e
Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
Merging current state of multiplayer pipeline to main
5 years ago
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 5 years ago
amzn-sean b0cb5a381b
Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
5 years ago
greerdv 62a3b7635b Merge branch 'main' into non-uniform-scale-mesh 5 years ago
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
5 years ago
Nicholas Van Sickle e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
5 years ago
AMZN-daimini 62bc7a66bb
Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
5 years ago
srikappa-amzn f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
5 years ago
nvsickle 4f9d7e3782 Simplify ResetInputChannels 5 years ago
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
5 years ago
srikappa 78892c8d7e Improved a couple of comments 5 years ago
pereslav 465546a6e4 Merge branch 'main' into MultiplayerPipeline 5 years ago