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
lumberyard-employee-dm
02922806a5
Updated gem.json for all top-level Gems. ( #1715 ) ( #1917 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com >
2021-07-07 13:29:33 -05:00
Chris Galvan
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
Mike Cronin
e9dd032a75
Updated gem.json for all top-level Gems. ( #1715 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-02 15:23:10 -05: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
Terry Michaels
149863c527
Removed Amazon as Company for QSettings ( #1649 )
...
* Removed Amazon as Company for QSettings
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-06-29 14:00:11 -05:00
Gene Walters
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
Terry Michaels
7a2a2dc0d7
Updated branding for application names ( #1617 )
2021-06-28 11:35:13 -05:00
guthadam
104e24519c
ATOM-15861 fixed material editor screen capture and test scripts
2021-06-25 11:57:29 -05:00
Qing Tao
c29cfaafa4
ATOM-15287 Materials Disappear When Hot Reloading Parent Materials ( #1532 )
...
The issue was because the material wasn't compiled when creating the draw packet
2021-06-23 16:23:40 -07:00
Steve Pham
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
mbalfour
df648db62e
Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
...
# Conflicts:
# Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
# Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05: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
mnaumov
5a276b11b0
Fixing includes
2021-06-21 16:56:06 -07:00
mnaumov
4de1d90994
[ATOM-15292] Camera no longer resets when typing something
2021-06-21 16:52:05 -07:00
nvsickle
e55580af57
Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18
2021-06-18 13:25:53 -07:00
guthadam
7e231c8e36
LYN-4547 prepending O3DE to the material editor application name
2021-06-16 23:37:43 -05:00
Tom Hulton-Harrop
0f09a6d8bf
Move new camera settings to the Settings Registry and connect them to viewport border elements ( #1267 )
...
* ensure the new camera respects changing ui values and move camera settings to the settings registry
* factor out creation of modular camera controller
* small updates before posting PR
* updates following review feedback
* updates following review feedback
2021-06-14 12:32:35 +01:00
guthadam
1339d453fc
Adding PAL implementation for Linux
2021-06-09 13:21:59 -05:00
guthadam
af42705bc9
Fixing linux build
2021-06-09 12:49:35 -05:00
guthadam
6675d06b67
Fixing linux build
2021-06-09 12:32:55 -05:00
guthadam
0fbeec7f17
Enabling linux compilation
2021-06-09 11:57:21 -05:00
guthadam
e85b5a8c48
Fixing material editor startup and critical asset issues
...
Added builder and tool aliases
Added dependency to Atom Bridge
2021-06-09 00:35:31 -05:00
guthadam
d67628d88c
ATOM-15701 changed material inspector highlight color
2021-06-07 18:23:40 -05:00
Esteban Papp
76a6df341b
SPEC-2513 Fixes to enable w4457
2021-06-04 10:51:47 -07:00
Tom Hulton-Harrop
cf08f4dab1
Improve camera orbit behavior ( #1060 )
2021-06-03 15:48:44 +01:00
Tom Hulton-Harrop
3947dcf213
Add some extra cvars to control orbit point appearance and remove unused ones ( #1032 )
2021-06-01 09:36:00 +01:00
Chris Santora
bc687530e8
Merge remote-tracking branch 'upstream/main' into Atom/santorac/MaterialLayoutCleanup-ATOM-14002
2021-05-28 14:37:41 -07:00
Chris Santora
de4e6957e8
Made a bunch of display name and description updates to core material types.
...
- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).
ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
2021-05-28 13:38:56 -07:00
pappeste
8b9f5230f6
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-28 00:16:26 -07:00
guthadam
a11c4e9106
Merge branch 'main' into Atom/guthadam/ATOM-15649
2021-05-27 19:02:29 -05:00
Nicholas Van Sickle
5e87250f67
Fix viewport icon rendering on high DPI devices ( #1006 )
...
* Clarify ViewportWorldToScreen being in widget space and add DeviceScalingFactor
* -Fix viewport icons being draw wrong on high DPI displays
-Fix loading viewport icons from absolute paths, which
* Address review feedback, fix build
2021-05-27 16:31:30 -07:00
guthadam
c2822a4063
ATOM-15649 sorting material types in create material dialog
2021-05-27 13:17:51 -05:00
lumberyard-employee-dm
76fe7f3666
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere
2021-05-25 23:48:55 -05:00
greerdv
ec1d129100
Merge branch 'main' into transform-float-scale
2021-05-25 19:21:32 +01:00
Tom Hulton-Harrop
50f5976e59
Rename and move ModernViewportCameraController ( #866 )
...
* rename ModernViewportCameraController to ModularViewportCameraController and move to AtomToolsFramework
* update names and includes after file moves
2021-05-25 17:28:51 +01:00
greerdv
d8b74110ff
Merge branch 'main' into transform-float-scale
2021-05-25 16:28:28 +01:00
AMZN-mnaumov
5788c379bb
Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538
...
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
2021-05-24 21:51:33 -07:00
mnaumov
78451c5898
PR feedback
2021-05-24 17:34:04 -07:00
greerdv
42c5801c52
Merge branch 'main' into transform-float-scale
2021-05-24 23:01:29 +01:00
AMZN-mnaumov
26a1b96380
Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463
...
[ATOM-15463] Adjusting combo box width
2021-05-24 12:03:37 -07:00
lumberyard-employee-dm
21285809bf
Adding back gem.json files to the Atom and AtomLyIntegration folders
...
which are to be seen as sub gem roots as a workaround for detecting the
location of the "gem" root for the Atom/AtomLyIntegration GEM_MODULE targets
Removed the logic in the SettingsRegistry.cmake for reading a
"gem_module_roots" key from the gem.json file in order to determine the
root of the Atom and Atom LyIntegration sub gem modules
2021-05-24 13:02:23 -05:00
guthadam
a05b131cc8
ATOM-15612 fix material editor crash when group doesn't exist
2021-05-24 10:39:55 -05:00