e4563c0058
Update RPISystem::GetCurrentTime() to use TimeSystem ( #5613 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-18 14:31:02 +00: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
dc98a56d45
Clang/Clazy pass over AzCore ( #5045 )
...
* Multiple cleanups ( tidy etc. )
Coalesce nested namespaces.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Multiple cleanups ( tidy etc. ) cntd.
Converted Uuid into POD ( defaulted the constructor )
Add `&/const &` to `for` loops that benefit from their use
Some Qt optimizations ( string ref, prevent container detaches, etc. )
Replace `::bind` in a few places.
Replaced the use of AZ_CRC with AZ_CRC_CE in a few places.
Replace a few `typedef`s with `using`s
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Linux compilation fix.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply review suggestions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix vs2019 build
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Small clang re-format in StringFunc.cpp
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply reviewer's suggestions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-11-18 10:09:22 +00:00
734c2fb693
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-17 15:11:32 -08:00
4b37e742d3
Add interface to allow disabling global AZ Core test environment trace bus suppression ( #5594 )
...
* Add interface to allow disabling global AZ Core test environment trace bus suppression
Update BaseAssetManagerTest class to disable the suppression by default
Update specific asset manager tests that rely on the trace bus suppression to ReEnable it
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Remove nodiscard
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Remove unique_ptr for disable token
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Fix move operator
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Switch to having individual flags for suppression of each type of output
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add cvar to force stacktrace output.
Clean up whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-17 14:40:48 -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
1e42261d76
Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-17 09:04:04 -08: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
e07cb1f2ed
Re-enabled linux tests physics ( #5701 )
...
* Re-enabled linux tests physics
* 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 >
Signed-off-by: aljanru <aljanru@amazon.co.uk >
Co-authored-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com >
2021-11-17 14:30:41 +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
c2cf9471ba
Merge commit 'c3dacb1e5228c05ae146b711c007ee38e4b7ef1c' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:55:22 -08:00
214b47a0d5
Merge commit 'b20a9b5f39b025475d74f166a2634f74b835fdca' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:55:14 -08:00
c4810c0ee0
Merge commit 'a5adf33427e3b2163c2f21c75148598b3364d8d4' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:55:06 -08:00
7875600fb0
Merge commit '7031147e324602fb20fcfe2070a942bf9eb4594a' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:55:02 -08:00
564bf0c819
Merge commit 'fc547d902c2e110b671a095b9731aff18154e68d' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:46 -08:00
fa7d7e2ec3
Merge commit 'b3e2c3f075db1f28277c0a35987318449b4eeeb9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:34 -08:00
14e4fd40d4
Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:22 -08:00
e44fa2a52a
Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:19 -08:00
4ab3bd487f
Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:39 -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
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
e1ace4a8f6
WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this...
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-15 12:37:52 -08:00
4d161f42df
WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this...
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-15 12:37:21 -08:00
63713ca284
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context ( #5575 )
...
Also made the unlock conditional.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 12:23:56 -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
0cea59d669
[LYN-7463] Fix insert streaming request failure ( #5604 )
...
* 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 >
2021-11-15 11:28:06 -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
f9824fc4ee
Merge pull request #5586 from aws-lumberyard-dev/IMGUI_EntityOutlinerFix
...
Fixed IMGUI Entity Outliner to show net entities
2021-11-15 14:23:10 +00:00
38a03817bb
Removal and Replacement of the CryTimer (gEnv->pTimer) ( #5409 )
...
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.
* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
- updated parts to use the time conversion functions.
- in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-15 12:11:58 +00: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
57adfd795e
Add a name to JobManager ( #5576 )
...
* Add a name to JobManager, all worker threads use that name to label their threads
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
* update with PR feedback, changed to use AZStd::fixed_string::format
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
* Fix copy paste errors using local variable names
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-11-12 13:15:41 -06:00
435f839666
Fixed IMGUI Entity Outliner to show net entities
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com >
2021-11-12 13:36:14 +00:00
92c0e598d5
Starting to remove MTL asset references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:04 -06:00
facfdf4e7a
Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-11-11 16:07:18 -08:00
amzn-sean
Tom Hulton-Harrop
Artur K
santorac
amzn-mike
jonawals
Tommy Walton
AMZN-AlexOteiza
Mike Balfour
amzn-phist
AMZN-stankowi
bosnichd
AMZN-Igarri
Chris Galvan
Gene Walters
amzn-sj
Mikhail Naumov
SergeyAMZN
Danilo Aimini
rgba16f
Sergey Pereslavtsev
Guthrie Adams
chcurran