6b96be82ea
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Legacy/CrySystem/Log.cpp
# Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.hxx
# Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
# Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
# Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
4 years ago
e091450e80
Merge pull request #3394 from aws-lumberyard-dev/Budgets
...
Add budget registration/tracking system and prepare driller redcode
4 years ago
7fbfda0371
Fix mouse capture behavior for Editor Viewport ( #3417 )
...
* first pass of fixes for cursor capture and context menu
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* restore previous behavior of HandleMouseMoveEvent
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* tidy-up from previous cursor/input changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add missing casts
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small updates to support tests
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* additional tests and some tidy-up
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small updates before publishing PR (comment/naming updates)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add missing parameter to MouseInteractionEvent constructor
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
07a14bdce1
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
...
NOTE: The memory driller is still intact for now to avoid needing to
modify allocators, but the frame/cpu portions of driller and the
standalone executable are now gone.
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
9245a31196
more fixes for Code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
62a0041245
enable warning 4296: 'operator': expression is always false
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
...
Profiler spring cleaning
4 years ago
80e08dd947
Fix issue with mouse input for viewport camera ( #3210 )
...
* fix for drift accumulating in the viewport camera
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* fix typo and update how events are stored
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* respond to PR feedback and fix linux and windows build issues
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* fix failing unit tests in camera input
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
2963739288
Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
1f5dddcca6
Code compiles
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
5f7b534afd
More fixes for Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
e9b4f48f71
more fixes, will merge fixes for w4245 and w4389
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
11d5009f46
Fixed creating entities in the viewport logic to use hit test detection.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
d273298840
Merge pull request #3064 from aws-lumberyard-dev/michabr/editor_input
...
Fix for input not being reenabled after game mode
4 years ago
83e56b6ab5
Remove new camera flag functions and legacy code paths ( #3071 )
...
Signed-off-by: aaguilea <aaguilea@amazon.com>
4 years ago
6f4951234d
Fix for input not being reenabled after game mode
...
Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
48aa93a837
Merge branch 'development' into legacy_camera_removing
4 years ago
97d0456e5f
uber nit
...
Signed-off-by: aaguilea <aaguilea@amazon.com>
4 years ago
d124044498
First step removing legacy code from the camera
...
Signed-off-by: aaguilea <aaguilea@amazon.com>
4 years ago
fd616fdcfb
Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
3ad3dfd662
Address PR feedback
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
ba33dd4433
Fix strange commit which was automatically created by Githubs 'Suggested Change' feature.
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
a85b97d9ac
Remove unused code
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
62214567c1
Handle non-default viewport context
...
Co-authored-by: Nicholas Van Sickle <NVShacker@gmail.com>
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
590de17343
Delete code which was only commented out
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
9d9ce7cc33
Fixup merge errors
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
2079b274c3
Fixup merge errors
...
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
73fee0c57e
Camera Component, Editor Viewport Widget refactoring.
...
- Handle changing of active camera entirely inside CameraComponentController
- Remove a LOT of legacy Cry things related to cameras
- Add a CameraSystemComponent to handle ActiveCameraRequestBus and CameraSystemRequestBus
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
4 years ago
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>
4 years ago
74498089c3
Ensure Editor FOV corrects on resize
...
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
7f84a4318c
Add an Orthogonal Projection option to the Camera Gem ( #2414 )
...
* Add an Orthogonal Projection option to the Camera Gem
This adds a check-box to opt into an ortho projection along with a half-width parameter to adjust the size of the visible area. Includes some light tweaks to ensure debug rendering looks OK and that we generate a correct camera state for these non-perspective views.
Known issue: while in "Be this camera" mode in the Editor using an ortho projection manipulators aren't working correctly. This appears to be a downstream issue with CameraState consumers not actually checking the ortho flag.
Signed-off-by: nvsickle <nvsickle@amazon.com>
* Fix some typos
Signed-off-by: nvsickle <nvsickle@amazon.com>
* Account for reversed depth buffer
Signed-off-by: nvsickle <nvsickle@amazon.com>
* Clarify depth reversal for MakeOrthographicMatrixRH
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
b198d653c1
Fix FOV getting reset upon entering game mode ( #2216 )
...
* Fix FOV getting reset upon entering game mode
Signed-off-by: nvsickle <nvsickle@amazon.com>
* Ensure scenes load with the correct FOV
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
d086e45d22
Fix getting stuck in game mode with some UI Assets ( #2207 )
...
- LyShine assets with "consume all input" could accidentally eat the escape event that exited game mode
- The main window has a shortcut for exiting game mode, but this wasn't being triggered in this context, so we go ahead and catch the Escape key event ASAP in EditorViewportWidget to ensure the game mode exit fires
Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
080d10ede9
continue to show cursor while using RMB until context menu pop-up is fixed
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
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>
4 years ago
8f4ded8c64
Use the proper undo sequence so that viewport camera changes are saved properly.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
f278bbcd65
Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712
...
Merged stabilization/2106 to development
5 years ago
e924ed0b86
Merged stabilization/2106 to development; Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
13879665df
Change from PR feedback.
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
a573d859c7
One minor change.
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
c7d1117ebf
Text changed and default behaviour changed
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
8eb8088a36
Remove Cry -> Atom camera sync. ( #2047 )
...
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
4babf69361
Address a few more review things
...
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
51733f3809
Fix for rotation matching and resetting also scaling the entity transform ( #1856 )
...
* fix issue with rotation matching (ditto)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* fix for context menu appearing
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* minor tidy-up in EditorContextMenu
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add option to disable cursor during free-look
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small fixes after PR comments
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
45b83e49da
Move camera properties from CVars to the Settings Registry ( #1766 )
...
* updates to camera inputs
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* update test names to include types
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* move all camera input controls to the settings registry
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small fixes before PR
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
04a00e6a54
Resolved latest merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Esteban Papp
Jeremy Ong
hultonha
Jeremy Ong
Chris Galvan
AMZN-Alexandre Corcia Aguilera
abrmich
aaguilea
Yuriy Toporovskyy
yuriy0
nvsickle
hultonha
Steve Pham
John Jones-Steele