4ad35f424e
Adds check to make sure that there are not too many samples created. ( #5789 )
...
* Adds check to make sure that there are not too many samples created.
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes made from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes made from PR 2
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-11-19 17:57:38 +00:00
ebb24d2285
Improvement for click detection when clicking quickly between mouse moves ( #5786 )
...
* improvement for click detection when clicking quickly between mouse moves
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove magic number and introduce constant
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add missing update from camera test
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-19 16:52:44 +00:00
e50735c127
Improved look for viewport ui border close button ( #5757 )
...
* improved look for viewport ui border close button
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove unused variable
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* removed commented 'fixme' calls
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-19 11:04:49 +00:00
9cbd323a3b
Merge pull request #5763 from aws-lumberyard-dev/Atom/antonmic/AuxGeomFeedback
...
Capsule light aux geom: addressed feedback from previous PR plus some cleanup
2021-11-18 15:19:08 -08:00
ac959bcc01
Dragging an entity from outside the focused Prefab into it may crash the Editor ( #5762 )
...
* Replace Instance References with EntityId of the Prefab Container (WIP)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Use the invalid entity id for the root instance and get the root instance every time to prevent weird Prefab EOS shenanigans.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Revert unnecessary changes, fix IsOwningPrefabBeingFocused to match previous behavior. Disable some tests that no longer apply correctly due to the testing environment not relying on the Prefab EOS.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix minor typo in test comment
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-18 15:06:58 -08:00
cf4ef5e73b
Addressed feedback from previous PR plus some cleanup
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-11-18 13:37:06 -08:00
bf4f52e146
Updates and fixes to viewport placement ( #5712 )
...
* updates to use more modern viewport intersection logic
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates to editor viewport ray intersection for object placement
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* make ed_defaultEntityPlacementDistance visible to Viewport.cpp
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix link error for AZ_CVAR variable
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-18 10:58:18 +00:00
734c2fb693
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-17 15:11:32 -08:00
555776fd7f
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context ( #5575 ) ( #5664 )
...
Also made the unlock conditional.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 63713ca284
2021-11-17 14:40:45 -08:00
be9db80f99
Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-17 12:15:57 -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
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
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
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
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
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
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
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
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
92c0e598d5
Starting to remove MTL asset references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:04 -06: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
2812ec2024
Fix brute force mesh intersection function ( #5447 )
...
* fix brute force mesh intersection function
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test for brute force ray intersection fix
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* refactor tests to remove as much duplication and provide API for future tests if required
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* small updates after review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update following review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for pointer offset
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-11 16:33:08 +00:00
de4e2d6308
Merge pull request #5544 from aws-lumberyard-dev/viewport/LYN-7989
...
Remove SurfaceManipulator.
2021-11-11 13:36:55 +00:00
039d2fc0c4
Remove SurfaceManipulator.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-11 12:13:55 +00:00
f24c3d3457
ASV Trace::Assert Environment.h(438) You are using an invalid variable, ( #5521 )
...
the owner has removed it!
This fixes the issue by forcing NameDictionary to not transfer
ownership. This means ComponentApplication()::Destroy will fully destroy
the NameDictionary before the OS::Allocator is destroyed.
In Windows the bug was not happening when running AssetProcessorBatch
because for Windows, _exit() is called before the application shutsdown
forcing all module to properly decrease the reference count of
EnvironmentVaqriableHolderBase::m_useCount for NameDictionary.
In MacOS, there's no _exit() so when the NameDictionary destructor was being called
before existing the application the reference count wouldn't be 0, and
would eventually try to destry the NameDictionary BUT the OS::Allocator
was already destroyed.
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com >
2021-11-11 05:24:33 -06:00
f564903f37
Merge pull request #5497 from aws-lumberyard-dev/viewport/select_rect_fix
...
Fix attempted rendering of invalid Entity selection boxes.
2021-11-11 09:15:27 +00:00
27f0aa7f13
LYN-7468 | Viewport manipulators for the container of the focused prefab should be hidden ( #5432 )
...
* Extend the level entity behavior to open prefab containers in focus mode. Disable manipulators for these entities too.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor adjustments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix enum casing in Entity Inspector.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Split views between for Level and FocusedContainer entities.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Slightly different fix to support components on focused containers.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor fixesto RefreshSelectedEntityIds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-10 14:43:32 -08:00
3ced915f8e
Fix attempted rendering of invalid Entity selection boxes.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 17:36:21 +00:00
adf3357176
Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239
...
Fix for Issue #5239 : Component Edit Mode does not disable Entity Inspector interaction
2021-11-10 14:50:36 +00:00
027b0f86ae
Activate AssetBrowserTableView feature ( #5367 )
...
Signed-off-by: igarri <igarri@amazon.com >
2021-11-10 13:41:59 +00:00
0e3df14ea2
Add missing bus connection/disconnection.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 11:59:28 +00:00
15586ee53e
Adding missing pragma once at XcbInputDeviceMouse.h ( #5448 )
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-11-09 15:42:01 -08:00
5fc4551ac0
[LYN-8041] Enable relocation of the Project Game Release Layout ( #5380 )
...
* Enable relocation of the Project Game Release Layout
Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected
Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.
Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called
Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Protect against an empty list of artifacts to remove when generating the
engine.pak
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-11-09 12:03:52 -06:00
ec74d363f3
Merge pull request #5297 from aws-lumberyard-dev/nvsickle/FixEntityOrdering
...
Fix Entity Outliner sort order with Prefabs enabled
2021-11-09 09:29:12 -08:00
c35f74e9ce
Physics/test axis aligned box shape configuration works #7378a ( #5366 )
...
* Safety commit before merging
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Moved from Physics to Terrain
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR + AR fix
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fixed another AR bug
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fixed another AR compilation bug
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* More PR changes
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Added virtual destructor
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Added TestSuite_main_Optimized.py
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Further fixes for PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fix to editor_test.py
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Testing prefab level
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Testing slice level
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Testing prefab level
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Disabled orefab loading for the time being.
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-11-09 14:11:33 +00:00
1998c53882
Non MSVC Release build fix ( #5428 )
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-11-09 10:19:04 +00:00
a5e11efda1
Add a safety check to Prefab/PrefabPublicHandler (potential AR fix)
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-11-08 16:21:35 -08:00
John Jones-Steele
Tom Hulton-Harrop
antonmic
Danilo Aimini
santorac
amzn-mike
jonawals
Mike Balfour
amzn-phist
AMZN-stankowi
bosnichd
AMZN-Igarri
Chris Galvan
amzn-sj
Mikhail Naumov
Guthrie Adams
galibzon
moraaar
lumberyard-employee-dm
Nicholas Van Sickle