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

if triangles are drawn, outlines are disabled

Browse Source
This commit is contained in:
? 2019-02-28 18:59:01 +01:00 committed by Zeno Rogue
parent 53bc4c0251
commit 8d83959229
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graph.cpp
View File

@ -4685,7 +4685,6 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
if(c->move(a) && !isWall3(c->move(a), dummy)) {
if(a < 4 && hyperbolic) {
if(celldistAlt(c) >= celldistAlt(viewctr.at->c7)) continue;
dynamicval<color_t> p (poly_outline, 0);
queuepoly(V, shWall3D[a], darkena(wcol - d * get_darkval(a), 0, 0xFF));
}
else {
@ -5231,7 +5230,6 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
if(!c->move(t)) continue;
if(hyperbolic && !among(t, 5, 6, 8)) continue;
if(!hyperbolic && c->move(t) < c) continue;
dynamicval<color_t> p (poly_outline, gridcolor(c, c->move(t)));
queuepoly(V, shWall3D[t], 0);
}
}
@ -5418,7 +5416,6 @@ void queuecircleat(cell *c, double rad, color_t col) {
if(DIM == 3) {
dynamicval<color_t> p(poly_outline, col);
for(int i=0; i<c->type; i++) {
if(binarytiling && i < 4) continue;
queuepolyat(gmatrix[c], shWall3D[i], 0, PPR::SUPERLINE);
}
return;

2
polygons.cpp
View File

@ -641,7 +641,7 @@ void dqi_poly::gldraw() {
}
}
if(outline) {
if(outline && !(flags & POLY_TRIANGLES)) {
glhr::color2(outline);
glhr::set_depthtest(model_needs_depth() && prio < PPR::SUPERLINE);
glDrawArrays(GL_LINE_STRIP, offset, cnt);