Commit graph

10353 commits

Author SHA1 Message Date
amwatson
f05f23238b Mass-replace "Citra" with "CitraVR" in strings 2024-01-31 16:30:55 -06:00
GPUCode
480604ec72
glsl_shader_fs_gen: Apply shadow before ambient light (#7404) 2024-01-31 23:29:39 +02:00
merry
63feac6bb3
externals: Update dynarmic to 6.6.1, Update oaknut to 2.0.1 (#7398) 2024-01-30 19:50:39 -08:00
amwatson
713ac1db20 fixed theme int values to conform to array indices (which is what SettingsAdapter expects) 2024-01-30 21:45:29 -06:00
amwatson
05c0b2b51f slightly different design for larger orange/lime 2024-01-30 21:11:23 -06:00
amwatson
a7da0b6598 add green Citra svg 2024-01-30 20:14:56 -06:00
amwatson
a378087f72 [gradle.properties] Increase Java heap size to avoid builds crashing out 2024-01-30 18:27:13 -06:00
amwatson
a8d5894d30 clean up destroy logic to avoid error due to deleting the wrong handle 2024-01-30 18:26:45 -06:00
Simon
e97ca06b3d Got proper 6DoF working..
- also allowed depth slider to go to 200% (for 1st person in MK7)
- added in the "look down to show" for the lower panel
2024-01-30 23:37:05 +00:00
amwatson
d13c6e57bf remove hotkey option 2024-01-30 14:46:53 -06:00
amwatson
18314b3b38 Added new_3ds setting to VR 2024-01-30 14:05:04 -06:00
amwatson
74c0d4315f Merge remote-tracking branch 'upstream/master' into merge_from_upstream 2024-01-30 14:00:39 -06:00
amwatson
26e5488b4e Merge branch 'master' into merge_from_upstream 2024-01-30 14:00:18 -06:00
amwatson
360985f3f9 extract vr-specific versioning logic from main classes: added VrCitraApplication class and VrMainActivityUtils object 2024-01-30 13:01:26 -06:00
amwatson
1a428fd18a change config.ini -> config.ini.vr and delete config.ini.vr0 from prev version on new install 2024-01-30 12:40:37 -06:00
Simon
d4515d120f X/Y Positional Movement
Changes:
- use headset X and Y position to move camera by pushing them to the shader in VS Uniforms
- Hide the lower panel when not looking at it as the positional movement royally screws it up
- Add a slider to allow user to select how much of an impact positional movement makes
- Added back in the original Lubos immersive mode scale
2024-01-30 12:22:15 +00:00
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
Simon
f2650c2ddd Merge remote-tracking branch 'upstream/master' 2024-01-30 12:18:01 +00:00
Simon
7d4593b705 Merge remote-tracking branch 'upstream/master' 2024-01-30 07:46:59 +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
Steveice10
469f76b075
qt: Display OpenGL renderer name and add Mesa override to support Windows OpenGLOn12. (#7395) 2024-01-29 12:24:41 -08:00
amwatson
f38a05daee Merge remote-tracking branch 'upstream/master' into merge_from_upstream 2024-01-28 21:55:28 -06:00
amwatson
ae6d2604b3 Commenting out file delete because apparently it doesn't work yet 2024-01-28 21:50:21 -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
amwatson
56b199f451 Don't throw an exception when settings file is not found 2024-01-28 18:19:31 -06:00
amwatson
792992fcfc moved VrReleaseVersion stuff into its own class and created utils directory for VrUtils 2024-01-28 18:19:10 -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
55078ad93a delete config.ini if version below 0.4.0 -- use release version as visible version name in About section 2024-01-28 16:47:30 -06:00
amwatson
c652bbf25f [EmulationActivity] Input handling: var -> val 2024-01-28 14:40:04 -06:00
amwatson
5aa8a4cae5 add 'is already active?' checks to bumpers to ensure same behavior as sticks. In addition to the existing check for a previous mapping, this check only overwrites the value if the previous mapping had activity 2024-01-28 14:39:22 -06:00
amwatson
569a98382b Input handling: set defaults for triggers (ensuring that defaults don't overwrite user-defined values in loop 2024-01-28 14:28:35 -06:00
amwatson
687edab96c [default_init.h] Add example mappings in comments 2024-01-28 14:27:16 -06:00
SachinVin
7a4854c519
shader_setup.h: Initialise program_code (#7396) 2024-01-28 06:02:40 -08:00
amwatson
9af2ba200f Add default gamepad button values 2024-01-27 19:13:39 -06:00
amwatson
b640de3826 [default_init] remove some fields that don't make sense for VR users (note: they can still be set with a config) 2024-01-27 16:33:55 -06:00
amwatson
fa3cd3e51b move any critical default values out of default_ini, into settings.h 2024-01-27 16:30:29 -06:00
amwatson
f9e6833b90 remove input defaults from the INI 2024-01-27 16:19:31 -06:00
Steveice10
d1e3dddf6a
core: Fix invalid log formatting in ARM interpreter. (#7391) 2024-01-27 00:39:27 -08:00
amwatson
636f3647f7 [Immersive mode] add a resolution offset to avoid users modifying their default settings 2024-01-26 23:51:05 -06:00