leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rendering of crossed wires

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2021-01-22 09:30:12 -07:00
parent 0c774d343e
commit 0b6ea68a7b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/tileset.js
View File

@ -1189,16 +1189,21 @@ export class Tileset {
// Draw the base tile // Draw the base tile
packet.blit(drawspec.base[0], drawspec.base[1]); packet.blit(drawspec.base[0], drawspec.base[1]);
this._draw_fourway_tile_power(tile, tile.wire_directions, packet); let is_crossed = (tile.wire_directions === 0x0f && drawspec.wired_cross);
if (is_crossed && tile.powered_edges && tile.powered_edges !== 0x0f) {
// Then draw the wired tile on top of it all // For crossed wires with different power, order matters; horizontal is on top
if (tile.wire_directions === 0x0f && drawspec.wired_cross) { // TODO note that this enforces the CC2 wire order
// FIXME oopsydaisy, order matters for the cross part let vert = tile.powered_edges & 0x05, horiz = tile.powered_edges & 0x0a;
this.draw_drawspec(drawspec.wired_cross, name, tile, packet); this._draw_fourway_power_underlay(
vert ? this.layout['#powered'] : this.layout['#unpowered'], 0x05, packet);
this._draw_fourway_power_underlay(
horiz ? this.layout['#powered'] : this.layout['#unpowered'], 0x0a, packet);
} }
else { else {
this.draw_drawspec(drawspec.wired, name, tile, packet); this._draw_fourway_tile_power(tile, tile.wire_directions, packet);
} }
// Then draw the wired tile on top of it all
this.draw_drawspec(is_crossed ? drawspec.wired_cross : drawspec.wired, name, tile, packet);
} }
else { else {
// There's no wiring here, so just draw the base and then draw the wired part on top // There's no wiring here, so just draw the base and then draw the wired part on top