Commit graph

9917 commits

Author SHA1 Message Date
Simon
8e044f9fcd Pass the vr_use_immersive_mode as a Vertex Shader Uniform
This means the same shaders can be used for both immersive and non-immersive as the uniform itself it the toggle in the GLSL rather than generating two different instances of the shader.
Furthermore, only one place where the gl_Position was being modified was actually needed; the other two seem to be able to be removed without it preventing immersive mode from working.
2024-01-30 12:20:12 +00:00
Amanda Watson
a4738cd2b5
Update README.md 2024-01-30 00:40:13 -06:00
Amanda Watson
4ad75a2c29
Update README.md 2024-01-30 00:38:43 -06:00
Amanda Watson
f8efe659a3
Update README.md
Re-order touch input bindings link to be on top of input section -- replace description
2024-01-30 00:24:39 -06:00
Amanda Watson
f3a98ef3b0
Update README.md
added link to Touch Controller Input Bindings
2024-01-30 00:23:38 -06:00
amwatson
e772f1cc53 Revert "Pass the vr_use_immersive_mode as a Vertex Shader Uniform"
This reverts commit 1eb7c159e6.
2024-01-29 21:37:38 -06:00
Amanda Watson
5cab34866c
Merge pull request #32 from amwatson/lubos_immersive_mode
Lubos VR180 immersive mode
2024-01-29 21:23:55 -06:00
Amanda Watson
0719680a45
Merge branch 'master' into lubos_immersive_mode 2024-01-29 21:22:54 -06:00
amwatson
350f964c3a dpad on thumbrest 2024-01-29 21:19:15 -06:00
amwatson
ced5497a7c rename config.ini.vr -> config.ini.vr0 so I can rename it back to config.ini.vr on the merge 2024-01-29 20:46:09 -06:00
amwatson
2dc6c1cdd3 have CitraVR read from config.ini.vr instead of config.ini 2024-01-29 20:39:49 -06:00
amwatson
7a2118f613 set default CPU level to 3 (reduces power draw) 2024-01-28 21:05:08 -06:00
amwatson
6571ca4c26 update Immersive Mode strings and add warning 2024-01-28 19:32:02 -06:00
Amanda Watson
fbabdf7e50
Merge pull request #37 from DrBeef/drbeef_immersive_tweaks
Pass the vr_use_immersive_mode as a Vertex Shader Uniform flag
2024-01-28 18:48:19 -06:00
Simon
1eb7c159e6 Pass the vr_use_immersive_mode as a Vertex Shader Uniform
This means the same shaders can be used for both immersive and non-immersive as the uniform itself it the toggle in the GLSL rather than generating two different instances of the shader.
Furthermore, only one place where the gl_Position was being modified was actually needed; the other two seem to be able to be removed without it preventing immersive mode from working.
2024-01-28 23:07:34 +00:00
amwatson
636f3647f7 [Immersive mode] add a resolution offset to avoid users modifying their default settings 2024-01-26 23:51:05 -06:00
amwatson
6da5e59ce4 [Immersive mode] add a min resolution factor 2024-01-26 23:10:36 -06:00
amwatson
ceacf7b3f6 [Immersive mode] update strings to reflect that resolution can be changed by the user 2024-01-26 23:10:36 -06:00
amwatson
063402d8cb When immersive mode is enabled, override graphics API preference and use OpenGL 2024-01-26 23:10:36 -06:00
amwatson
0e44c7a5ea Added a bit to shader cache keyto differentiate immersive vs non-immersive mode so the wrong shader isn't used on settings switch 2024-01-26 23:10:33 -06:00
Simon
db0a76f672 Implemented additional "Immersive Mode" with higher resolution
Uses a smaller radius screen which fits just within the view bounds and therefore has a higher resolution, but still feels "immersive". I also lowered the lower screen so it doesn't obscure the smaller main panel.
2024-01-26 23:52:21 +00:00
Simon
4e9afd699c Merge branch 'lubos_immersive_mode' of https://github.com/DrBeef/CitraVR into lubos_immersive_mode 2024-01-26 18:30:28 +00:00
Amanda Watson
55f1ad80be
Merge branch 'master' into lubos_immersive_mode 2024-01-25 16:26:19 -06:00
amwatson
5d4bb40139 lower the lower panel in immersive mode 2024-01-25 16:23:08 -06:00
Amanda Watson
92d698a1b5
Merge pull request #25 from gyroninja/remove-mic-nag
Move request for microphone permission to onCreate
2024-01-24 22:00:38 -06:00
gyro
ce640bb1f3 Move request for microphone permission to onCreate
This request can cause issues if the user denies the microphone permission.
Calling requestPermissions causes GrantPermissionsActivity to be launched.
Citra's MainActivity will pause. GrantPermissionsActivity will immediately
finish as the user has already denied the permission. Citra's MainActivity then
gets resumed and then tries to request the permission again forming a loop.
2024-01-24 19:08:24 -08:00
amwatson
b56239953a [vr] Move logging to Citra-android backend 2024-01-24 21:05:04 -06:00
amwatson
acf4e3143d lower the lower panel in immersive mode 2024-01-24 19:57:13 -06:00
amwatson
47186f0d67 updated gamesurfacelayer and settings for immersive mode (not sure yet if 5 is a special constant or based on resolution) 2024-01-24 19:57:13 -06:00
amwatson
1d92111a00 [SettingsFragmentPresenter] select OpenGL as default graphics API 2024-01-24 17:36:53 -06:00
amwatson
64e8c7ca3c Show defaults for resolution, background in settings UI 2024-01-24 17:36:21 -06:00
amwatson
50891ee8c2 Set resolution and default background based on HMD type 2024-01-24 17:13:53 -06:00
amwatson
1044c78069 Revert "move logging to Citra-android backend"
This reverts commit 7597481444.
2024-01-24 16:56:14 -06:00
amwatson
7597481444 move logging to Citra-android backend 2024-01-24 14:00:34 -06:00
amwatson
3dd3e253de reformat c++ code to be my preferred format (since it seems unlikely we'll merge back anytime soon 2024-01-23 21:32:15 -06:00
amwatson
6c2e2613fc [OpenXR] move hmdType from OpenXR to vr_main 2024-01-23 21:32:15 -06:00
amwatson
bde389d0bd sets citra res to auto and scales surface with resolution factor (so user directly controls graphical intensity. Might get worse filtering on smaller textures) 2024-01-23 21:32:15 -06:00
amwatson
0ffa128b1c [GameSurfaceLayer] make default scale factor dependent on HMD type 2024-01-23 21:32:15 -06:00
amwatson
a8482f20a5 add config changes to MainActivity and re-instate notification manager (I think this should fix starting crash while avoiding the resizing bug) 2024-01-23 21:32:15 -06:00
Amanda Watson
92db45eabe
Update README.md
point at new Game Compat spreadsheet
2024-01-23 19:28:49 -06:00
Amanda Watson
9174aaa040
Merge pull request #24 from NyanBlade/readme-typo
Update README.md
2024-01-23 15:41:06 -06:00
NyanBlade
28a7d44a44
Update README.md 2024-01-23 14:45:48 +00:00
amwatson
dd5041fda7 remove default dpad bindings (fixes dpad on some controllers? 2024-01-22 21:39:03 -06:00
Amanda Watson
475832612e
Merge pull request #17 from gyroninja/ignore-link-fail
Ignore failures to load openxr_forwardloader.oculus for v62+
2024-01-22 21:23:34 -06:00
gyro
1412662180 Ignore failures to load openxr_forwardloader.oculus for v62+
In v62 openxr_forwardloader.oculus.so was removed.
To keep backwards compatibility with v60 there is still an attempt to load the
library, but failure to do so is no longer fatal.
2024-01-22 18:08:16 -08:00
amwatson
e1398b60de fix for v62: do not use System.loadLibrary() for openxr loader path 2024-01-22 18:45:20 -06:00
amwatson
30320c771e (temporary fix for v62) added path to openxr fork that contains loader fix 2024-01-22 18:42:09 -06:00
amwatson
11314c295b removed openxr submodule 2024-01-22 18:42:09 -06:00
Amanda Watson
1eea79ef70
Merge pull request #18 from gyroninja/boundaryless
Make app boundaryless
2024-01-22 18:29:19 -06:00
gyro
af8b31b1b9 Make app boundaryless
Since the app is in passthrough there is no need to require a boundary
2024-01-21 23:45:04 -08:00