mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

raycaster: correct centering

Browse Source
This commit is contained in:
Zeno Rogue 2020-02-07 19:13:18 +01:00
parent 2a01728d19
commit 759fed36f9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
raycaster.cpp
View File

@ -93,6 +93,7 @@ struct raycaster : glhr::GLprogram {
GLint uBinaryWidth, uPLevel, uLP, uStraighten, uReflectX, uReflectY; GLint uBinaryWidth, uPLevel, uLP, uStraighten, uReflectX, uReflectY;
GLint uLinearSightRange, uExpStart, uExpDecay; GLint uLinearSightRange, uExpStart, uExpDecay;
GLint uBLevel; GLint uBLevel;
GLint uPosX, uPosY;
raycaster(string vsh, string fsh) : GLprogram(vsh, fsh) { raycaster(string vsh, string fsh) : GLprogram(vsh, fsh) {
println(hlog, "assigning"); println(hlog, "assigning");
@ -127,6 +128,9 @@ struct raycaster : glhr::GLprogram {
tConnections = glGetUniformLocation(_program, "tConnections"); tConnections = glGetUniformLocation(_program, "tConnections");
tWallcolor = glGetUniformLocation(_program, "tWallcolor"); tWallcolor = glGetUniformLocation(_program, "tWallcolor");
tTextureMap = glGetUniformLocation(_program, "tTextureMap"); tTextureMap = glGetUniformLocation(_program, "tTextureMap");
uPosX = glGetUniformLocation(_program, "uPosX");
uPosY = glGetUniformLocation(_program, "uPosY");
} }
}; };
@ -171,10 +175,11 @@ void enable_raycaster() {
string vsh = string vsh =
"attribute mediump vec4 aPosition;\n" "attribute mediump vec4 aPosition;\n"
"uniform mediump float uFovX, uFovY, uShift;\n" "uniform mediump float uFovX, uFovY, uPosX, uPosY, uShift;\n"
"varying mediump vec4 at;\n" "varying mediump vec4 at;\n"
"void main() { \n" "void main() { \n"
" gl_Position = aPosition; at = aPosition; at.x += uShift;\n" " gl_Position = aPosition; at = aPosition; at.x += uShift;\n"
" at[0] += uPosX; at[1] += uPosY;\n"
#if IN_ODS #if IN_ODS
" at[0] *= PI; at[1] *= PI; \n" " at[0] *= PI; at[1] *= PI; \n"
#else #else
@ -927,6 +932,9 @@ EX void cast() {
GLERR("uniform mediump startid"); GLERR("uniform mediump startid");
glUniform1f(o->uIPD, vid.ipd); glUniform1f(o->uIPD, vid.ipd);
GLERR("uniform mediump IPD"); GLERR("uniform mediump IPD");
glUniform1f(o->uPosX, -((cd->xcenter-cd->xtop)*2./cd->xsize - 1));
glUniform1f(o->uPosY, -((cd->ycenter-cd->ytop)*2./cd->ysize - 1));
vector<transmatrix> ms; vector<transmatrix> ms;
for(int j=0; j<S7; j++) ms.push_back(currentmap->iadj(cwt.at, j)); for(int j=0; j<S7; j++) ms.push_back(currentmap->iadj(cwt.at, j));