mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-04 02:32:51 +00:00
Code Issues Releases Wiki Activity

ray:: uProjection is now always taken as a 4x4 matrix

Browse Source
This commit is contained in:
Zeno Rogue 2022-02-28 17:34:00 +01:00
parent ad6a466837
commit 21bd4d7fe0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
raycaster.cpp
View File

@ -2493,24 +2493,27 @@ EX void cast() {
#if CAP_VR #if CAP_VR
if(o->uEyeShift != -1) { if(o->uEyeShift != -1) {
dynamicval<eGeometry> g(geometry, gCubeTiling);
transmatrix T = vrhr::eyeshift; transmatrix T = vrhr::eyeshift;
if(nonisotropic) if(nonisotropic)
T = inverse(NLP) * T; T = inverse(NLP) * T;
glUniformMatrix4fv(o->uEyeShift, 1, 0, glhr::tmtogl_transpose3(T).as_array()); glUniformMatrix4fv(o->uEyeShift, 1, 0, glhr::tmtogl_transpose(T).as_array());
glUniform1f(o->uAbsUnit, vrhr::absolute_unit_in_meters); glUniform1f(o->uAbsUnit, vrhr::absolute_unit_in_meters);
} }
if(vrhr::rendering_eye()) { if(vrhr::rendering_eye()) {
glUniformMatrix4fv(o->uProjection, 1, 0, glhr::tmtogl_transpose3(vrhr::eyeproj).as_array()); dynamicval<eGeometry> g(geometry, gCubeTiling);
glUniformMatrix4fv(o->uProjection, 1, 0, glhr::tmtogl_transpose(vrhr::eyeproj).as_array());
} }
#else #else
if(0) ; if(0) ;
#endif #endif
else { else {
dynamicval<eGeometry> g(geometry, gCubeTiling);
transmatrix proj = Id; transmatrix proj = Id;
proj = eupush(-global_projection * d, 0) * proj; proj = eupush(-global_projection * d, 0) * proj;
proj = euscale(cd->tanfov / (vid.stereo_mode == sLR ? 2 : 1), cd->tanfov * cd->ysize / cd->xsize) * proj; proj = euscale(cd->tanfov / (vid.stereo_mode == sLR ? 2 : 1), cd->tanfov * cd->ysize / cd->xsize) * proj;
proj = eupush(-((cd->xcenter-cd->xtop)*2./cd->xsize - 1), -((cd->ycenter-cd->ytop)*2./cd->ysize - 1)) * proj; proj = eupush(-((cd->xcenter-cd->xtop)*2./cd->xsize - 1), -((cd->ycenter-cd->ytop)*2./cd->ysize - 1)) * proj;
glUniformMatrix4fv(o->uProjection, 1, 0, glhr::tmtogl_transpose3(proj).as_array()); glUniformMatrix4fv(o->uProjection, 1, 0, glhr::tmtogl_transpose(proj).as_array());
} }
if(!callhandlers(false, hooks_rayset, o)) { if(!callhandlers(false, hooks_rayset, o)) {