birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,901 Commits 3 Branches 3 Tags
c2b8542bbd0e4e71fa9d77877607ff9c76e152b4
Commit Graph

93 Commits

Author SHA1 Message Date
moudgils c2b8542bbd Support for refresh rate and sync interval (#2989) 
* Add support for querying the refresh rate and sync interval
 2021-08-12 12:07:46 -07:00
Guthrie Adams 2afd3b0959 Merge pull request #3052 from aws-lumberyard-dev/Atom/guthadam/atomtools_refactor_move_mainwindow_bus 
AtomTools: move main window bus reflection to atom tools
 2021-08-12 09:33:58 -05:00
Guthrie Adams e0410385d5 AtomTools: fixing status bar messages 
fixed problems with status bar messages not appearing
added status bar messages to shader management console
got rid of central widget variable and moved layout to atom tools window base class

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-11 16:38:13 -05:00
Guthrie Adams 3142367fa8 move main window bus reflection to atom tools 
update python scripts

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-11 15:21:54 -05:00
Guthrie Adams 1c181af94e fixing problems with document tab management 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-05 22:36:43 -05:00
Dayo Lawal e507236257 Addressing requests 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 17:59:00 -05:00
Dayo Lawal e8d685211b CreateMenu/CreateTabBar 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 16:24:49 -05:00
Dayo Lawal 602da53ebe Merging upstream 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 14:20:25 -05:00
Dayo Lawal bf7512ebf4 Merge fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-05 14:07:48 -05:00
hultonha 1169c82b98 Make camera controller priority customizable (#2826) 
* make 'should handle' logic customizable

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to get priority function

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor comment tweak

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-08-05 09:45:03 +01:00
Dayo Lawal 259bc3f85e ATWindowNotificationBus and ATFactoryRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-03 19:24:46 -05:00
Guthrie Adams f269d222b7 Fixing issues with shader management console startup 
Updating test scripts

Synchronizing SMC and ME application classes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-08-03 17:07:03 -05:00
Dayo Lawal 4eacd076da Fixing ME and ATWindowNotificationBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-03 15:53:20 -05:00
hultonha 7393c86416 some formatting and naming changes after PR feedback 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-08-03 15:24:54 +01:00
hultonha 71a299d739 minor comment grammar fix 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-08-03 13:53:34 +01:00
hultonha 86758fda35 documentation pass for modular viewport camera controller 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-08-03 13:44:21 +01:00
Dayo Lawal 2ed07c2a6a delete MEWindowsRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 23:09:28 -05:00
Dayo Lawal 63ed78d267 status_bar 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 17:27:26 -05:00
Dayo Lawal 58ff2d8cab AtomToolsMainWindowRequestBus 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 14:59:45 -05:00
Dayo Lawal 8eb9205711 AtomToolsMainWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-08-02 00:34:43 -05:00
Guthrie Adams 4465b52de5 AtomToolsApplication minor comments/formatting 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-07-29 09:13:49 -05:00
Dayo Lawal 3cd40b151e Merge remote-tracking branch 'upstream/development' into atomToolsApplication 2021-07-28 11:47:47 -05:00
Dayo Lawal 4b0527c07f Moving comments 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 13:42:48 -05:00
Dayo Lawal 5cb001dffd More fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 12:51:38 -05:00
Dayo Lawal 06b3f7d964 Undoing adding reflect and adding target names to functions 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 12:18:12 -05:00
Dayo Lawal 485f6338ac CreateReflectionManager() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 02:19:26 -05:00
Dayo Lawal 61038ccd03 Reflect() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 02:09:45 -05:00
Dayo Lawal 4b97a416a3 GetCriticalAssetFilters() 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-27 02:06:33 -05:00
Dayo Lawal 4baea40a75 Reflect() fix 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 17:48:22 -05:00
Dayo Lawal 7122f1b761 More refractoring 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 17:41:10 -05:00
Dayo Lawal 50f6ea8385 Using GetBuildTargetName() and other fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 16:22:34 -05:00
Dayo Lawal 4306b57230 More replacement with target name 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 13:08:59 -05:00
Dayo Lawal 78b07a0869 Fixing errors and streamlining more to base class 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-26 12:51:37 -05:00
hultonha 4268376587 Ensure camera system correctly consumes events when it is active (#2346) 
* add typename for struct initializer

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for ensuring while the camera is 'active', events are consumed and not propagated

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* refactor how we decide which priority to repsond to events to

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* also -> only

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-07-23 08:52:44 +02:00
Dayo Lawal ecc26a24a5 //! Comment added 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:59 -05:00
Dayo Lawal c1998d8d3c AtomToolsApplication working with SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:57 -05:00
Dayo Lawal 002a4a4a21 AtomToolsApplication working with MatEditor 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:55 -05:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-07-16 15:25:48 -07:00
Nicholas Van Sickle 867ae23664 Make Viewport input events fully Qt based (#2142) 
* Make Viewport input events fully Qt based.

This should fix an issue with Qt touch event -> mouse event translation in the Editor, and may also fix issues with the Mac Editor and remote desktop (though, lacking the requisite hardware, I can test precisely none of these things personally).

See https://github.com/o3de/o3de/issues/1889

- Adapted LegacyViewportCameraController to use Movement::X & Y (mostly for testing purposes, it's on the slate for being removed soon)
- Moved cursor capture logic from RenderViewportWidget into QtEventToAzInputManager so that it can make sure it generates correct movement deltas
- Removed ViewportMouseCursorRequests::PreviousViewportCursorScreenPosition to have our viewport controllers use our dedicated Movement::X and Y channels instead, which will work in the launcher

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

* Address review feedback

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

* Fix Linux build

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-13 20:58:48 -07:00
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-08 13:56:47 -05:00
nvsickle 4babf69361 Address a few more review things 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:09 -07:00
nvsickle 52ae7433b3 Use synthetic keyboard and mouse devices instead of synthetic input channels 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:06 -07:00
nvsickle f4c96fc9df -Rework input handling to filter through a global event filter 
-Attempt to support remote desktop for viewport cursor capture

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:50:00 -07:00
nvsickle a4a038cb28 Switch RenderViewportWidget to using Qt events instead of AzFramework input events 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 13:49:58 -07:00
nvsickle 6b76eceb1f Add GetDpiScaleFactor to native window API 
-This includes implementations of the API for the Editor and Windows, all other platforms will have a 1.0 scale for now

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-07-07 11:51:08 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693) 
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
 2021-06-30 19:51:55 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Tom Hulton-Harrop dc343e2b65 Small camera updates (#1460, LYN-2315) 
* add interpolation for goto position/orientation

* resize default camera look-at point
 2021-06-22 12:53:20 +01:00