be9db80f99
Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-17 12:15:57 -08:00
95c8398c79
Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton
...
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
2021-11-17 12:14:24 -08:00
a1cf76ec65
Merge pull request #5652 from aws-lumberyard-dev/viewport/EditorModeUIBackButton
...
Viewport/editor mode UI back button
2021-11-17 18:32:46 +00:00
d0ebe4ee10
Follow up fix for ATOM-13512 ( #5689 )
...
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
2021-11-17 10:00:31 -08:00
e34ea3bcaa
Fixes for viewport selection issues ( #5494 )
...
* improvements to editor selection in the viewport
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix issue with being able to select icons that are not showing for entities inside entity containers
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update comment after review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates to viewport picking code to simplify the api
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test to replicate near clip intersection issue
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* small tidy-up changes
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates to how we perform world to screen and screen to world calculations, added test coverage and some tidy-up
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add some more tests for ViewportInteractionImpl
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* minor tweaks before PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix typo in fix
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for manipulator test framework tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates to RPI::View and RenderPipeline after review feedback from VickyAtAZ
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add constexpr to ScreenPoint, ScreenVector and ScreenSize initializing constructors
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add PrintTo functions for Screen* types
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* downgrade error to warning temporarily
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* check incoming view is null
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove pragma optimize off
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-17 17:12:21 +00:00
593f03efb4
Camera fixes follow-up ( #5703 )
...
* allow unconstrained camera when tracking transform and fix some camera interpolation issues
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* tests for interpolation fixes
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test for camera constraints change
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following review feeedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-17 16:23:01 +00:00
9f9aa8f2a6
[Linux] Avoid duplicating inotify watches in forked AssetBuilder processes ( #5683 )
...
The AssetProcessor on Linux uses `inotify` to monitor for file updates.
The AssetProcessor also uses a `ProcessWatcher` to launch child
AssetBuilder processes. `ProcessWatcher` accomplishes this by calling
`fork()`, which duplicates the current process, then calling `exec()`.
The `fork()` call also appears to duplicate any inotify fds. This
results in the subprocess consuming duplicate inotify watches, which is
a limited system resource (Ubunut 20 defaults
`/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor
still has issues with this max, but this should free up at least half of
the uses.
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-17 07:34:56 -08:00
a6164ca2cd
Fix for camera roll behavior when in 'Be this camera' mode ( #5658 )
...
* fix for camera roll behavior when in 'Be this camera' mode
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates for camera tests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for failing unit test - require default function
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-17 12:27:23 +00:00
8ee6f1a7f4
Fix back icon scaling.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-17 11:08:22 +00:00
551e6010dd
Add support for getting the level entity when prefabs are enabled. ( #5680 )
...
* Add support for getting the level entity when prefabs are enabled.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Made a little prettier.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
* Addressed PR feedback plus fixed the crash when the level component failed to add.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
2021-11-16 19:23:53 -06:00
c2308de8ee
Added in missed suggestions from previous PR
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 16:29:12 -08:00
a3d3423ff7
Merge branch 'stabilization/2110' into Prism/AddEditGemsButton
2021-11-16 16:04:06 -08:00
de67bb70c9
Added comment why GemRepos isn't included in ContainsScreen
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 16:01:25 -08:00
95da89d0cc
Merge branch 'stabilization/2110' into Prism/AddEditGemsButton
2021-11-16 15:58:14 -08:00
0d17e575a7
Fix: Display Repo Gems on Repo Screen Correctly ( #5638 )
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 15:53:51 -08:00
2ae8477683
ATOM-13512 Altering IBL ImageProcessor .preset Does Not Force Assets to Rebuild ( #5639 )
...
Changes include:
- Move config files from ImageProcessingAtom/Config/ folder to ImageProcessingAtom/Assets/Config/ folder so it can be watched as source depencies.
- Change GetSuggestedPreset function so it can return certain preset for certain file name.
- Move file mask mappings from preset to ImageBuilder.settings. But the file masks in preset can still be used.
- Changed from using project config folder's imageBuilder.Settings for override to using it as json merge patch.
- Expose GetFileHash function in AssetBuilderSDK api.
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
2021-11-16 15:25:13 -08:00
fc805594d0
Fixes for misc gem download issues ( #5665 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-16 14:51:28 -08:00
6651ae3d78
Fix for python load errors on Linux ( #5627 )
...
* Explicitly load libpython on Linux
Downstream loads of python modules that weren't linked to libpython would
fail to load because libraries were loaded using the RTLD_LOCAL flag. This
adds a function that will explicitly load libpython on Linux using the
RTLD_GLOBAL flag.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Fix misspelled function name
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Addressing PR feedback
- Updates naming and location of things.
- Adds load code to a Gem template.
- Updates error checking.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
* Address further feedback
Removes the api function in favor of just having modules inherit off a
PythonLoader class, that way we get RAAI behavior and lifetime management
for free.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-11-16 15:32:24 -06:00
df36067ef3
Configure gems option added to projects button to go directly to gem catalog
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 13:22:52 -08:00
1aae84537d
Makes project settings screen scrollable
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 12:37:20 -08:00
4854023eb1
Merge pull request #5592 from aws-lumberyard-dev/Prism/ShowProjectBuildReq
...
Store whether O3DE Project Manager built the project successfully
2021-11-16 12:22:20 -08:00
cb5c4256c7
Fix license text eliding
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 10:18:37 -08:00
db3d41ad9d
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-16 10:06:28 -08:00
4d6e7f7ef9
Address PR comments.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 17:59:18 +00:00
921612594a
Add placeholder icon for back button.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 17:54:19 +00:00
c3dacb1e52
Unlocked a mutex after modifying the associated variable ( #5625 )
...
* Unlocked a mutex after modifying the variable the mutex was meant for.
This fixes an issue where mounting bundles in the Editor was causing the Editor to freeze up, because the following line, m_levelOpenEvent.Signal, resulted in another attempt to lock that same mutex.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Added a comment describing why the unlock is necessary.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-16 08:07:20 -08:00
1546247922
Trivial refactor of comments.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 16:02:22 +00:00
f369fcb3d1
Merge remote-tracking branch 'origin/stabilization/2110' into viewport/EditorModeUIBackButton
2021-11-16 15:56:53 +00:00
6b201bf97c
Add back button to editor mode UI.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 15:55:22 +00:00
5e04ddcc02
Merge pull request #5647 from aws-lumberyard-dev/cgalvan/UpdateSplashScreenName
...
Updated splash screen and about dialog with Stable 21.11 name
2021-11-16 09:34:22 -06:00
b20a9b5f39
Some modifications required for restricted platforms: ( #5624 )
...
- Replace AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS with AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS that allows the number of threads created by the job manager to be set directly.
- Add AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS that allows the number of threads created by the task graph to be set directly.
- Add a define that forces the AsyncUploadQueue to use the primary copy queue instead of creating a secondary copy queue.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-16 08:27:32 -07:00
ce10906671
Updated splash screen and about dialog with Stable 21.11 name
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-16 08:08:53 -06:00
a5adf33427
Deactivate new Asset Picker View by default in the Editor ( #5614 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-16 10:47:02 +00:00
7d849cc0d2
Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
...
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 16:51:22 -08:00
7031147e32
Added event to signal when the Editor is fully initialized so test scripts can listen for that instead of needed arbitrary wait commands. ( #5623 )
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-15 17:01:47 -06:00
8b7e538dd3
Cherry Pick: [LYN-7463] Fix insert streaming request failure ( #5604 ) ( #5622 )
...
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Re-enable disabled test which was failing for the same reason.
Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Instead of using a mutex, re-order the statements to remove the streamer request first
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 0cea59d66980125227+amzn-mike@users.noreply.github.com >
2021-11-15 14:14:43 -08:00
fc547d902c
Add message to indicate Json serialization of bitset is not supported ( #5590 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-15 14:09:43 -06:00
18cf128854
Remove some code duplication
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 11:50:28 -08:00
b3e2c3f075
SetComponentProperty is now supported by undo operation ( #5599 )
...
* Adding undo support to SetComponentProperty to make it function with prefab system
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Renaming a variable
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-11-15 11:01:42 -08:00
07c142b975
Remove temporary changes and remove key before building
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 08:51:00 -08:00
76b7e73f6f
Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting ( #5593 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 16:23:04 -08:00
5ec5824849
Hide the "up one level" button temporarily. ( #5595 )
...
Signed-off-by: Danilo Aimini <daimini@amazon.com >
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-12 14:16:44 -08:00
520c2b52d4
Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references
...
Removing references and builders for legacy MTL assets
2021-11-12 13:47:50 -06:00
c0df1846f4
Create desktop shortcut functionality ( #5536 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 11:03:43 -08:00
a544800536
LYN-4946 | Merge Game Mode buttons in the Play Controls toolbar ( #5557 )
...
* LYN-4946 Double play buttons - Tranformer style into one.
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* compile fix
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Changes as per review.
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Address minor confusion points.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix rename operation missing some matches...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove extra newline.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
Co-authored-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-11-11 17:36:12 -08:00
320ae45989
Removing material type asset info
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:09 -06:00
92c0e598d5
Starting to remove MTL asset references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:04 -06:00
bc20208f13
Create file in project directory on successful build for Project Manager
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-11 14:39:10 -08:00
e0d736dd84
Fixed the other call to CreateVariable ( #5561 )
...
in favor of CreateVariableEx
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com >
2021-11-11 16:04:22 -06:00
0b211d3743
Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI
...
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
2021-11-11 14:01:42 -08:00
santorac
AMZN-Phil
jonawals
Qing Tao
Tom Hulton-Harrop
Chris Burel
Mike Balfour
nggieber
AMZN-nggieber
Alex Peterson
amzn-phist
AMZN-stankowi
Chris Galvan
bosnichd
AMZN-Igarri
amzn-mike
amzn-sj
AMZN-Phil
Mikhail Naumov
Danilo Aimini
Guthrie Adams
Guthrie Adams
galibzon