Commit Graph

2233 Commits

Author SHA1 Message Date
SergeyAMZN 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
amzn-sean 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
rgba16f 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
Sergey Pereslavtsev 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
Nicholas Van Sickle 2c2c1d8137 Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
2021-11-11 15:04:18 -08:00
bosnichd 19acf94606 Remove the legacy ViewSystem and some other tangentially related legacy code. (#5558)
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-11-11 13:29:51 -07:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2021-11-11 10:15:52 -08:00
Tom Hulton-Harrop 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
AMZN-AlexOteiza edefb57cfd Fixed crash when typing asset name and clicking browse (#5495) 2021-11-11 13:58:00 +00:00
jonawals de4e2d6308 Merge pull request #5544 from aws-lumberyard-dev/viewport/LYN-7989
Remove SurfaceManipulator.
2021-11-11 13:36:55 +00:00
John 039d2fc0c4 Remove SurfaceManipulator.
Signed-off-by: John <jonawals@amazon.com>
2021-11-11 12:13:55 +00:00
galibzon 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
jonawals 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
Danilo Aimini 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
bosnichd 528a747876 Don't allocate memory when processing WM_INPUT messages. (#5491)
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-11-10 11:28:21 -07:00
John 3ced915f8e Fix attempted rendering of invalid Entity selection boxes.
Signed-off-by: John <jonawals@amazon.com>
2021-11-10 17:36:21 +00:00
Esteban Papp 21f9a789c1 Merged the Editor.Camera.Tests with the Editor.Tests (#5463)
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds dependency to Camera.Editor gem which is used by the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Inheirts from TraceBusHook instead of adding the default env to the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* makes order consistent between Setup/Teardown

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* adds missing header for non-unity builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes dependency to Camera gem

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-10 08:57:39 -08:00
bosnichd eb775a48dc Make InputDeviceId's constructor constexpr. (#5433)
* Make InputDeviceId's constructor constexpr.

See also https://github.com/o3de/o3de/pull/4220

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Updates based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-11-10 08:06:27 -07:00
jonawals 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
AMZN-Igarri 027b0f86ae Activate AssetBrowserTableView feature (#5367)
Signed-off-by: igarri <igarri@amazon.com>
2021-11-10 13:41:59 +00:00
John 0e3df14ea2 Add missing bus connection/disconnection.
Signed-off-by: John <jonawals@amazon.com>
2021-11-10 11:59:28 +00:00
moraaar 15586ee53e Adding missing pragma once at XcbInputDeviceMouse.h (#5448)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-11-09 15:42:01 -08:00
lsemp3d 934c0f2ec7 Made SerializeContext and BehaviorContext consistent with their class name
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-11-09 15:25:06 -08:00
lsemp3d d3b8b761fd Improved messaging on assert about argument types lacking reflection for scripting
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-11-09 14:51:10 -08:00
Mikhail Naumov e1d53395fe Propagation Optimization (#5355)
* Merge changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* removing leftover immediate flag

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-11-09 14:05:15 -08:00
Ronald Koppers e6a1f8ed0a Merge pull request #5108 from aws-lumberyard-dev/Prefabs/SpawnableEntityAlias
Ability to setup aliases for entities spawned from spawnables.
2021-11-09 13:17:59 -08:00
Chris Galvan 5bf0375598 Merge pull request #4776 from pollend/bugfix/resolve-dragging-problem-for-DockTabWidget
bugfix[Linux]: resolve dragging window with more than one tabbed  (#4658)
2021-11-09 12:30:33 -06:00
lumberyard-employee-dm 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
AMZN-koppersr cc2513f224 Linux build fix Spawnable Entity Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-09 09:55:39 -08:00
Nicholas Van Sickle 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
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-09 08:53:25 -08:00
John Jones-Steele 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
lumberyard-employee-dm 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
Tom Hulton-Harrop 5047ba7f7b merge stabilization/2110 to development - 2021/11/09
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-09 09:19:54 +00:00
nvsickle 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
Chris Burel 33d5109fe8 Merge stabilization/2110 as of 20edb35cdc into development (#5319) 2021-11-08 15:22:17 -08:00
AMZN-koppersr b3295ffeb3 Fixed several issues with compilation of Spawnable Entities Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-08 14:54:43 -08:00
AMZN-koppersr 976c6abb90 Build fix.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-08 13:48:20 -08:00
Alex Peterson 79f8edce14 Allow using gem repos page without losing changes #5317
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-08 12:17:16 -08:00
AMZN-koppersr c9f9a83c57 Further PR feedback on the Spawnble Entity Aliases.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-08 12:00:15 -08:00
AMZN-koppersr 8ccccdcaf1 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-08 10:10:06 -08:00
nvsickle 47c02f555a Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/FixEntityOrdering 2021-11-08 09:12:51 -08:00
AMZN-Igarri a1d9a2cc58 Asset Browser Tests (#4948)
* Added AssetBrowser Tests

Signed-off-by: igarri <igarri@amazon.com>

* Added Entries to test AssetBrowser

Signed-off-by: igarri <igarri@amazon.com>

* Added Print info.

Signed-off-by: igarri <igarri@amazon.com>

* Added more folders

Signed-off-by: igarri <igarri@amazon.com>

* Added Asset Browser Tests for the Search View

Signed-off-by: igarri <igarri@amazon.com>

* Fixed Entry creation

Signed-off-by: igarri <igarri@amazon.com>

* Removed optimize

Signed-off-by: igarri <igarri@amazon.com>

* Cleanup AssetBrowserModel

Signed-off-by: igarri <igarri@amazon.com>

* RowCount made public

Signed-off-by: igarri <igarri@amazon.com>

* Delegated entry creation to RootAssetBrowserEntry and added Code review feedback

Signed-off-by: igarri <igarri@amazon.com>

* removed unused helper class and fixed demo tests

Signed-off-by: igarri <igarri@amazon.com>

* Fixed bus connections

Signed-off-by: igarri <igarri@amazon.com>

* Refactored test environment and added basic tests

Signed-off-by: igarri <igarri@amazon.com>

* Applied some code review feedback and added basic tests

Signed-off-by: igarri <igarri@amazon.com>

* fixed naming

Signed-off-by: igarri <igarri@amazon.com>

* Refactored Tests

Signed-off-by: igarri <igarri@amazon.com>

* removed pointer reset, now handled by the AssetBrowserComponent

Signed-off-by: igarri <igarri@amazon.com>

* Fixed conversion unsigned-signed

Signed-off-by: igarri <igarri@amazon.com>

* Cleaned includes

Signed-off-by: igarri <igarri@amazon.com>

* fixed test setup

Signed-off-by: igarri <igarri@amazon.com>

* Fixed unused variables

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added printer function

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* cleaned up code

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added Test to check the correctness of the setup

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed basic tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2021-11-08 09:56:51 +00:00
Tom Hulton-Harrop 783186fa7e Update default camera orbit behavior (#5301)
* add new default orbit point behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add default orbit distance to settings registry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add new default orbit point behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add default orbit distance to settings registry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* expose default orbit distance to editor settings menu and update how we display default camera position

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add improve orbit changes for focus

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-08 09:19:40 +00:00
kberg-amzn c0e63988d8 merging latest dev, again, and hopefully dev is not still completely broken
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-05 19:23:01 -07:00
kberg-amzn 479ff188a0 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-05 15:05:23 -07:00
Jeremy Ong 6b6eb2c936 Remove markers that occupy <2us for 99% of events
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-11-05 16:01:51 -06:00
Michael Pollind eddb867ddf bugfix: change event to WindowBlocked for FancyDocking
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-11-04 19:36:09 -07:00
Michael Pollind b42f1b022e replace with ungrab mouse event instead of deactivate window
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-11-04 19:36:08 -07:00
Michael Pollind b3c7bf47f2 Update Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
Signed-off-by: Michael Pollind mpollind@gmail.com

Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-11-04 19:36:08 -07:00