mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup to neon disabling textures

This commit is contained in:
Zeno Rogue 2020-04-06 11:24:57 +02:00
parent 5c414af31b
commit 4e30c79c37
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
celldrawer.cpp
View File

@ -1618,9 +1618,9 @@ void celldrawer::draw_features_and_walls_3d() {
poly.tinf = &texture::config.tinf3;
poly.offset_texture = 0;
}
else if(!floor_texture_vertices.empty())
else
#endif
{
if(!floor_texture_vertices.empty() && neon_mode == eNeon::none) {
poly.tinf = &floor_texture_vertices[qfi.fshape->id];
ensure_vertex_number(*poly.tinf, poly.cnt);
poly.offset_texture = 0;

4
drawing.cpp
View File

@ -2200,8 +2200,6 @@ EX dqi_poly& queuepolyat(const transmatrix& V, const hpcshape& h, color_t col, P
part(col,1) = b; */
part(col,2) = part(col,3) = (part(col,2) * 2 + part(col,3) + 1)/3;
}
if(neon_mode != eNeon::none && (h.flags & POLY_TRIANGLES))
ptd.tinf = nullptr;
if(neon_mode == eNeon::none) {
ptd.color = (darkened(col >> 8) << 8) + (col & 0xFF);
ptd.outline = poly_outline;
@ -2242,6 +2240,8 @@ EX dqi_poly& queuepolyat(const transmatrix& V, const hpcshape& h, color_t col, P
ptd.linewidth = vid.linewidth;
ptd.flags = h.flags;
ptd.tinf = h.tinf;
if(neon_mode != eNeon::none && (h.flags & POLY_TRIANGLES))
ptd.tinf = nullptr;
ptd.offset_texture = h.texture_offset;
ptd.intester = h.intester;
return ptd;