madsbuvi
6c9df35725
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-01 15:09:00 +01:00
Petr Mikheev
51d63a4152
Fix minor bug: mSmoothedSpeed is not updating in first person mode, that leads to an incorrect value after switching to first person mode and back.
...
Additional refactoring: move `setSideMovementAngle` from camera.cpp to character.cpp as this logic shouldn't belong to Camera.
2020-12-24 03:39:59 +01:00
Mads Buvik Sandvei
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-11-27 00:36:10 +01:00
Andrei Kortunov
64ba81ecf2
Fix some issues, found by CoverityScan
2020-10-28 18:02:31 +04:00
Mads Buvik Sandvei
4f8f0cc8ac
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr
2020-10-22 20:39:53 +02:00
Mads Buvik Sandvei
4c4fc0c69a
Refactoring. Moved changes to MWRender::Camera into a new subclass MWVR::VRCamera. Moved head tracking code to VRCamera.
2020-10-21 21:34:47 +02:00
psi29a
9d350ec824
Merge branch 'head_bobbing' into 'master'
...
Add head bobbing in first person mode
Closes #5043
See merge request OpenMW/openmw!320
2020-10-17 19:54:34 +00:00
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
2020-10-16 22:18:54 +04:00
Petr Mikheev
be27b51279
Add head bobbing in first person mode
2020-10-08 00:22:01 +02:00
psi29a
f90a049702
Merge branch 'movement_refactoring' into 'master'
...
Refactoring related to "smooth movement"
See merge request OpenMW/openmw!285
(cherry picked from commit 6eaf0a389d5aed3b74ab1a7cf89574612f964bdf)
e847b4c8 Split getSpeed() to getMaxSpeed() and getCurrentSpeed()
a96c46bc Refactor calculation of movement.mSpeedFactor
03ee9090 Use getMaxSpeed instead of getCurrentSpeed where it makes sense.
a178af5c Create helper functions `normalizeAngle` and `rotateVec2f`
2020-08-27 11:54:30 +00:00
Petr Mikheev
0de6650add
Add RayCastingInterface
2020-08-06 22:03:33 +02:00
Petr Mikheev
694e0b5906
Refactoring. Simplification of camera interface.
2020-08-06 00:43:33 +02:00
Petr Mikheev
ed3426cf2f
Move third person camera collision check from World::updatePlayer() to Camera::updatePosition()
2020-08-06 00:43:33 +02:00
Mads Buvik Sandvei
14977f79e2
Merge fixes
2020-07-22 20:01:56 +02:00
Mads Buvik Sandvei
1023ef6e49
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-07-22 18:56:25 +02:00
Mads Buvik Sandvei
c9e761eb88
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-07-21 13:58:52 +02:00
Petr Mikheev
62c8ea373b
Fix not completely correct camera transition when switching from 1st person to 3rd person if armed.
2020-07-19 22:12:17 +02:00
Petr Mikheev
2e6aa155a3
New settings 'preview if stand still' and 'deferred preview rotation'.
2020-07-19 18:21:40 +02:00
Petr Mikheev
9f850b6ffc
Move deferred rotation logic from renderingmanager.cpp to camera.cpp
2020-07-19 18:21:40 +02:00
Petr Mikheev
63cab4052d
Refactoring in mwrender::Camera. enum for normal/preview/vanity mode.
2020-07-19 18:21:40 +02:00
Petr Mikheev
8ac7ffc32b
Remove 'separate preview camera' and make the new behavior the default one.
...
Also minor refactoring in camera.cpp
2020-07-17 22:59:44 +02:00
Petr Mikheev
4d206d2c67
Improved preview mode
2020-07-17 20:35:52 +02:00
elsid
c3b581131d
Merge branch 'third_person_fix' into 'master'
...
Minor fixes for 'view over shoulder'
See merge request OpenMW/openmw!265
2020-07-17 18:11:35 +00:00
Petr Mikheev
8ac143c983
Camera can pull out after clearing obstruction instead of instant snapback.
2020-07-17 10:19:46 +02:00
Petr Mikheev
68148f5ec7
1. Skip smooth camera transition after changing cell; 2. Fix 'zoom out when move' for extremely high speed;
2020-07-16 22:21:50 +02:00
Petr Mikheev
383fa3d3ab
Make 'zoom out when move' configurable.
2020-07-12 21:03:18 +02:00
Petr Mikheev
173c1fdabb
Make transition in 'auto switch shoulder' smoother.
2020-07-12 20:51:38 +02:00
Petr Mikheev
51173ebcf5
Refactoring. Move all code related to 'view over shoulder' to a separate file.
2020-07-12 20:51:38 +02:00
Petr Mikheev
5bdf61a886
Slightly pulls camera away when the character moves
2020-07-12 20:51:38 +02:00
Petr Mikheev
ef03f2c033
Auto switch shoulder
2020-07-12 20:51:38 +02:00
Petr Mikheev
5675d6ce81
Generalize calculation of focal point offset for 3rd person camera.
...
When player swim, the view slowly switches from "over shoulder" to "above head".
New functions to switch shoulder.
2020-07-12 20:51:38 +02:00
Petr Mikheev
280862f58b
New setting "third person camera distance"
2020-07-10 00:38:18 +02:00
Mads Buvik Sandvei
69b4a4741f
Formatting errors
2020-07-05 12:18:54 +02:00
Mads Buvik Sandvei
b6e6be51aa
Merge errors
2020-06-28 12:12:24 +02:00
Mads Buvik Sandvei
58d73e14e6
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/environment.cpp
# apps/openmw/mwbase/environment.hpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwrender/camera.cpp
# apps/openmw/mwrender/camera.hpp
# apps/openmw/mwrender/renderingmanager.cpp
# apps/openmw/mwrender/renderingmanager.hpp
2020-06-28 11:59:07 +02:00
Petr Mikheev
63137a3b5a
Make vertical offset of "view over shoulder" configurable
2020-06-24 20:07:41 +02:00
Petr Mikheev
b4c699348f
Improved strafe movement
2020-06-22 15:22:34 +02:00
Petr Mikheev
d3bd67d747
Advanced third person camera.
2020-06-22 15:22:34 +02:00
Mads Buvik Sandvei
1cf97fd7ad
lots of refactoring and some commenting
2020-06-21 23:40:07 +02:00
Mads Buvik Sandvei
6f9c405afd
Tentatively completed VR GUI
2020-05-12 22:13:01 +02:00
Mads Buvik Sandvei
57e48cfc03
Separate rendering of window menus. It's still awkward. Needs polishing.
2020-05-01 21:37:01 +02:00
Mads Buvik Sandvei
7eaf015b87
Non-vr should never roll camera.
2020-03-31 20:28:43 +02:00
Mads Buvik Sandvei
d658065fe7
Show full player body when knocked out or dead
2020-03-28 16:30:56 +01:00
Mads Buvik Sandvei
68c75f66eb
Improvements on combat
2020-03-23 23:32:47 +01:00
Mads Buvik Sandvei
893b75d767
Realistic combat, first draft
2020-03-15 15:31:38 +01:00
Mads Buvik Sandvei
da03e8bf41
Some refactoring
2020-02-29 23:53:56 +01:00
Mads Buvik Sandvei
f5e01417ba
Fixed jitter bugs with the new player tracking.
2020-02-29 14:13:56 +01:00
Mads Buvik Sandvei
1d47807419
Character movement following VR movement
2020-02-23 12:56:48 +01:00
Mads Buvik Sandvei
bdade49129
In-place turning
2020-02-23 11:02:38 +01:00
Mads Buvik Sandvei
49e0c6f17b
Basic hand tracking.
2020-02-14 22:11:19 +01:00
