mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

fixed the rendering of textured spheres

Browse Source
This commit is contained in:
Zeno Rogue 2017-12-21 14:59:16 +01:00
parent f7b5a1b44f
commit 4287355c11
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
polygons.cpp
View File

@ -317,13 +317,15 @@ void glapplymatrix(const transmatrix& V) {
glMultMatrixf(mat); glMultMatrixf(mat);
} }
int tinfshift;
void gldraw(int useV, const transmatrix& V, int ps, int pq, int col, int outline, int flags, textureinfo *tinf) { void gldraw(int useV, const transmatrix& V, int ps, int pq, int col, int outline, int flags, textureinfo *tinf) {
if(tinf) { if(tinf) {
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, tinf->texture_id); glBindTexture(GL_TEXTURE_2D, tinf->texture_id);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glTexCoordPointer(3, GL_FLOAT, 0, &tinf->tvertices[0]); glTexCoordPointer(3, GL_FLOAT, 0, &tinf->tvertices[tinfshift]);
} }
for(int ed = vid.goteyes ? -1 : 0; ed<2; ed+=2) { for(int ed = vid.goteyes ? -1 : 0; ed<2; ed+=2) {
@ -519,7 +521,21 @@ unsigned char& part(int& col, int i) {
} }
void drawpolyline(polytodraw& p) { void drawpolyline(polytodraw& p) {
auto pp = p.u.poly; auto& pp = p.u.poly;
if(sphere && pp.tinf && pp.cnt > 3) {
int i = pp.cnt;
pp.cnt = 3;
for(int j=0; j<i; j+=3) {
drawpolyline(p);
pp.tab += 9;
tinfshift += 9;
}
pp.tab -= 3*i;
tinfshift = 0;
pp.cnt = i;
return;
}
if(spherespecial && p.prio == PPR_MOBILE_ARROW) { if(spherespecial && p.prio == PPR_MOBILE_ARROW) {
if(spherephase == 0) return; if(spherephase == 0) return;
@ -571,6 +587,7 @@ void drawpolyline(polytodraw& p) {
double rarea = 0; double rarea = 0;
for(int i=0; i<qglcoords-1; i++) for(int i=0; i<qglcoords-1; i++)
rarea += glcoords[i][0] * glcoords[i+1][1] - glcoords[i][1] * glcoords[i+1][0]; rarea += glcoords[i][0] * glcoords[i+1][1] - glcoords[i][1] * glcoords[i+1][0];
rarea += glcoords[qglcoords-1][0] * glcoords[0][1] - glcoords[qglcoords-1][1] * glcoords[0][0];
if(d < 0) poly_flags ^= POLY_INVERSE; if(d < 0) poly_flags ^= POLY_INVERSE;
@ -592,6 +609,7 @@ void drawpolyline(polytodraw& p) {
for(int l=mercator_loop_min; l <= mercator_loop_max; l++) { for(int l=mercator_loop_min; l <= mercator_loop_max; l++) {
if(l || lastl) { if(l || lastl) {
if(pp.tinf) return;
for(int i=0; i<qglcoords; i++) for(int i=0; i<qglcoords; i++)
glcoords[i][mercator_coord] += vid.radius * 4 * (l - lastl); glcoords[i][mercator_coord] += vid.radius * 4 * (l - lastl);
lastl = l; lastl = l;
@ -612,6 +630,9 @@ void drawpolyline(polytodraw& p) {
#if CAP_GL #if CAP_GL
if(vid.usingGL) { if(vid.usingGL) {
// if(pmodel == 0) for(int i=0; i<qglcoords; i++) glcoords[i][2] = vid.scrdist; // if(pmodel == 0) for(int i=0; i<qglcoords; i++) glcoords[i][2] = vid.scrdist;
if(pp.tinf && (poly_flags & POLY_INVERSE)) {
return;
}
activateGlcoords(); activateGlcoords();
gldraw(3, Id, 0, qglcoords, p.col, pp.outline, poly_flags, pp.tinf); gldraw(3, Id, 0, qglcoords, p.col, pp.outline, poly_flags, pp.tinf);
continue; continue;
@ -639,7 +660,7 @@ void drawpolyline(polytodraw& p) {
#if CAP_TEXTURE #if CAP_TEXTURE
if(!(poly_flags & POLY_INVERSE)) if(!(poly_flags & POLY_INVERSE))
for(int i=0; i<polyi; i += 3) for(int i=0; i<polyi; i += 3)
drawTexturedTriangle(s, polyx+i, polyy+i, &pp.tinf->tvertices[i*3], p.col); drawTexturedTriangle(s, polyx+i, polyy+i, &pp.tinf->tvertices[tinfshift + i*3], p.col);
#endif #endif
} }
else if(poly_flags & POLY_INVERSE) { else if(poly_flags & POLY_INVERSE) {

10
textures.cpp
View File

@ -227,9 +227,9 @@ void mapTextureTriangle(textureinfo &mi, array<hyperpoint, 3> v, int splits = gs
if(splits) { if(splits) {
array<hyperpoint, 3> v2 = { mid(v[1], v[2]), mid(v[2], v[0]), mid(v[0], v[1]) }; array<hyperpoint, 3> v2 = { mid(v[1], v[2]), mid(v[2], v[0]), mid(v[0], v[1]) };
mapTextureTriangle(mi, {v[0], v2[1], v2[2]}, splits-1); mapTextureTriangle(mi, {v[0], v2[2], v2[1]}, splits-1);
mapTextureTriangle(mi, {v[1], v2[2], v2[0]}, splits-1); mapTextureTriangle(mi, {v[1], v2[0], v2[2]}, splits-1);
mapTextureTriangle(mi, {v[2], v2[0], v2[1]}, splits-1); mapTextureTriangle(mi, {v[2], v2[1], v2[0]}, splits-1);
mapTextureTriangle(mi, {v2[0], v2[1], v2[2]}, splits-1); mapTextureTriangle(mi, {v2[0], v2[1], v2[2]}, splits-1);
return; return;
} }
@ -269,8 +269,8 @@ void mapTexture(cell *c, textureinfo& mi, patterns::patterninfo &si, const trans
for(int i=0; i<c->type; i++) { for(int i=0; i<c->type; i++) {
int i2 = i+shift; int i2 = i+shift;
hyperpoint h1 = spin(M_PI + M_PI * (2*i2 +1) / c->type) * xpush(z) * C0; hyperpoint h1 = spin(M_PI + M_PI * (2*i2 -1) / c->type) * xpush(z) * C0;
hyperpoint h2 = spin(M_PI + M_PI * (2*i2 -1) / c->type) * xpush(z) * C0; hyperpoint h2 = spin(M_PI + M_PI * (2*i2 +1) / c->type) * xpush(z) * C0;
mapTextureTriangle(mi, {C0, h1, h2}); mapTextureTriangle(mi, {C0, h1, h2});
} }
} }