diff options
Diffstat (limited to 'ecp5/arch.cc')
| -rw-r--r-- | ecp5/arch.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index bc533f24..818085ad 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -637,26 +637,18 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const int wire_offset = 0; if (tilewire >= TILE_WIRE_D7_SLICE && tilewire <=TILE_WIRE_CLK0_SLICE) { - if (tilewire >= TILE_WIRE_D7_SLICE && tilewire <=TILE_WIRE_CLK3_SLICE) { offset = 3; wire_offset = tilewire - TILE_WIRE_D7_SLICE + 1; } - if (tilewire >= TILE_WIRE_D5_SLICE && tilewire <=TILE_WIRE_CLK2_SLICE) { offset = 2; wire_offset = tilewire - TILE_WIRE_D5_SLICE + 1; } - if (tilewire >= TILE_WIRE_D3_SLICE && tilewire <=TILE_WIRE_CLK1_SLICE) { offset = 1; wire_offset = tilewire - TILE_WIRE_D3_SLICE + 1; } - if (tilewire >= TILE_WIRE_D1_SLICE && tilewire <=TILE_WIRE_CLK0_SLICE) { offset = 0; wire_offset = tilewire - TILE_WIRE_D1_SLICE + 1; } el.x1 = x + slice_x1 - 0.005f; el.x2 = x + slice_x1; - el.y1 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; - el.y2 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; + el.y1 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_D7_SLICE + 1) + 3*slice_pitch; + el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_D7_SLICE + 1) + 3*slice_pitch; ret.push_back(el); } if (tilewire >= TILE_WIRE_DUMMY_100 && tilewire <=TILE_WIRE_F5A_SLICE) { - if (tilewire >= TILE_WIRE_DUMMY_100 && tilewire <=TILE_WIRE_F5D_SLICE) { offset = 3; wire_offset = tilewire - TILE_WIRE_DUMMY_100 + 1; } - if (tilewire >= TILE_WIRE_WDO3C_SLICE && tilewire <=TILE_WIRE_F5C_SLICE) { offset = 2; wire_offset = tilewire - TILE_WIRE_WDO3C_SLICE + 1; } - if (tilewire >= TILE_WIRE_DUMMY_300 && tilewire <=TILE_WIRE_F5B_SLICE) { offset = 1; wire_offset = tilewire - TILE_WIRE_DUMMY_300 + 1; } - if (tilewire >= TILE_WIRE_DUMMY_400 && tilewire <=TILE_WIRE_F5A_SLICE) { offset = 0; wire_offset = tilewire - TILE_WIRE_DUMMY_400 + 1; } el.x1 = x + slice_x2; el.x2 = x + slice_x2 + 0.005f; - el.y1 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; - el.y2 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; + el.y1 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_DUMMY_100 + 1) + 3*slice_pitch; + el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_DUMMY_100 + 1) + 3*slice_pitch; ret.push_back(el); } } |