mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

Panini/stereo projection now works in the 'single' VR screen (didn't work correctly) but not on the eyes (did work)

Browse Source
This commit is contained in:
Zeno Rogue 2021-05-29 00:13:22 +02:00
parent c7d3cc87c5
commit c49bf13bbc
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
shaders.cpp
View File

@ -410,13 +410,13 @@ shared_ptr<glhr::GLprogram> write_shader(flagtype shader_flags) {
if(shader_flags & GF_LEVELS) vmain += "vPos = t;\n"; if(shader_flags & GF_LEVELS) vmain += "vPos = t;\n";
if(treset) vmain += "t[3] = 1.0;\n"; if(treset) vmain += "t[3] = 1.0;\n";
if((shader_flags & SF_PERS3) && panini_alpha) { if((shader_flags & SF_PERS3) && panini_alpha && !vrhr::rendering_eye()) {
vmain += "t = uPP * t;", vsh += "uniform mediump mat4 uPP;"; vmain += "t = uPP * t;", vsh += "uniform mediump mat4 uPP;";
/* panini */ /* panini */
vmain += panini_shader(); vmain += panini_shader();
shader_flags |= SF_ORIENT; shader_flags |= SF_ORIENT;
} }
else if((shader_flags & SF_PERS3) && stereo_alpha) { else if((shader_flags & SF_PERS3) && stereo_alpha && !vrhr::rendering_eye()) {
vmain += "t = uPP * t;", vsh += "uniform mediump mat4 uPP;"; vmain += "t = uPP * t;", vsh += "uniform mediump mat4 uPP;";
vmain += stereo_shader(); vmain += stereo_shader();
} }
@ -585,7 +585,9 @@ void display_data::set_projection(int ed, ld shift) {
bool u_alpha = false; bool u_alpha = false;
auto use_mv = [] { glhr::glmatrix pp0 = glhr::id;
auto use_mv = [&] {
#if CAP_VR #if CAP_VR
auto cd = current_display; auto cd = current_display;
if(vrhr::rendering_eye()) { if(vrhr::rendering_eye()) {
@ -594,7 +596,14 @@ void display_data::set_projection(int ed, ld shift) {
} }
else { else {
glhr::projection_multiply(glhr::frustum(cd->tanfov, cd->tanfov * cd->ysize / cd->xsize)); glhr::projection_multiply(glhr::frustum(cd->tanfov, cd->tanfov * cd->ysize / cd->xsize));
glhr::projection_multiply(glhr::tmtogl_transpose(vrhr::hmd_mv)); if(selected->uPP != -1) {
transmatrix swapz = Id;
swapz[2][2] = -1;
pp0 = glhr::tmtogl_transpose(swapz * vrhr::hmd_mv);
glhr::projection_multiply(glhr::tmtogl(swapz));
}
else
glhr::projection_multiply(glhr::tmtogl_transpose(vrhr::hmd_mv));
} }
#endif #endif
}; };
@ -653,10 +662,13 @@ void display_data::set_projection(int ed, ld shift) {
} }
if(selected->uPP != -1) { if(selected->uPP != -1) {
glhr::glmatrix pp = glhr::id; glhr::glmatrix pp = glhr::id;
if(get_shader_flags() & SF_USE_ALPHA) if(get_shader_flags() & SF_USE_ALPHA)
pp[3][2] = GLfloat(pconf.alpha); pp[3][2] = GLfloat(pconf.alpha);
pp = pp * pp0;
if(nisot::local_perspective_used()) if(nisot::local_perspective_used())
pp = glhr::tmtogl_transpose(NLP) * pp; pp = glhr::tmtogl_transpose(NLP) * pp;