mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-18 23:10:26 +00:00
Code Issues Releases Wiki Activity

textured_vertex now has the Z coordinate so that the rug works correctly in web

Browse Source
This commit is contained in:
Zeno Rogue 2020-12-23 23:41:22 +01:00
parent 6392f97bfc
commit 47c54e8660
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glhr.cpp
View File

@ -132,7 +132,8 @@ struct glmatrix {
struct textured_vertex { struct textured_vertex {
glvertex coords; glvertex coords;
glvec2 texture; /* texture uses the 'z' for shading with POLY_SHADE_TEXTURE
glvec3 texture;
}; };
struct ct_vertex { struct ct_vertex {
@ -761,7 +762,8 @@ EX void vertices_texture(const vector<glvertex>& v, const vector<glvertex>& t, i
for(int i=0; i<q; i++) for(int i=0; i<q; i++)
tv[i].coords = v[vshift+i], tv[i].coords = v[vshift+i],
tv[i].texture[0] = t[tshift+i][0], tv[i].texture[0] = t[tshift+i][0],
tv[i].texture[1] = t[tshift+i][1]; tv[i].texture[1] = t[tshift+i][1],
tv[i].texture[2] = t[tshift+i][2];
prepare(tv); prepare(tv);
#else #else
vertices(v, vshift); vertices(v, vshift);
@ -820,7 +822,7 @@ EX void prepare(vector<textured_vertex>& v) {
#if CAP_VERTEXBUFFER #if CAP_VERTEXBUFFER
bindbuffer(v); bindbuffer(v);
PTR(aPosition, SHDIM, coords); PTR(aPosition, SHDIM, coords);
PTR(aTexture, 2, texture); PTR(aTexture, 3, texture);
#else #else
if(current_vertices == &v[0]) return; if(current_vertices == &v[0]) return;
current_vertices = &v[0]; current_vertices = &v[0];
@ -829,7 +831,7 @@ EX void prepare(vector<textured_vertex>& v) {
glVertexAttribPointer(aTexture, SHDIM, GL_FLOAT, GL_FALSE, sizeof(textured_vertex), &v[0].texture); glVertexAttribPointer(aTexture, SHDIM, GL_FLOAT, GL_FALSE, sizeof(textured_vertex), &v[0].texture);
}, { }, {
glVertexPointer(SHDIM, GL_FLOAT, sizeof(textured_vertex), &v[0].coords); glVertexPointer(SHDIM, GL_FLOAT, sizeof(textured_vertex), &v[0].coords);
glTexCoordPointer(2, GL_FLOAT, sizeof(textured_vertex), &v[0].texture); glTexCoordPointer(3, GL_FLOAT, sizeof(textured_vertex), &v[0].texture);
}) })
#endif #endif
// color2(col); // color2(col);