diff options
Diffstat (limited to 'renderer')
| -rw-r--r-- | renderer/src/main.rs | 4 | ||||
| -rw-r--r-- | renderer/src/map.rs | 31 |
2 files changed, 18 insertions, 17 deletions
diff --git a/renderer/src/main.rs b/renderer/src/main.rs index d763336..bab0bd4 100644 --- a/renderer/src/main.rs +++ b/renderer/src/main.rs @@ -205,9 +205,9 @@ impl Renderer { let tee_paint = Paint::new( Color4f { a: 1.0, - r: 1.0, + r: 0.2, g: 0.0, - b: 1.0, + b: 0.2, }, &ColorSpace::new_srgb(), ); diff --git a/renderer/src/map.rs b/renderer/src/map.rs index 0ea3a6b..8517ee0 100644 --- a/renderer/src/map.rs +++ b/renderer/src/map.rs @@ -85,16 +85,25 @@ impl MapRenderer { if tileset.dim() == (1, 1) { continue; } - - for layer_y in (center.1 - 30)..(center.1 + 30) { - for layer_x in (center.0 - 30)..(center.0 + 30) { + // println!("{:?} {:?}", center, l.tiles.dim()); + for layer_y in (center.1 - 15)..(center.1 + 15) { + for layer_x in (center.0 - 15)..(center.0 + 15) { let layer_x = layer_x.try_into().unwrap_or(0); let layer_y = layer_y.try_into().unwrap_or(0); - if layer_x >= l.tiles.dim().1 || layer_y >= l.tiles.dim().0 { - continue; - } - let tile = l.tiles[(layer_y, layer_x)]; + let tile_rect = Rect { + top: layer_y as f32 * 16.0, + left: layer_x as f32 * 16.0, + bottom: layer_y as f32 * 16.0 + 16.0, + right: layer_x as f32 * 16.0 + 16.0, + }; + canvas.draw_rect(tile_rect, &grid_paint); + + let tile = match l.tiles.get((layer_y, layer_x)) { + Some(t) => t, + None => continue, + }; + println!("{:?}", tile); let _rotate = tile.flags & format::TILEFLAG_ROTATE != 0; let _vflip = tile.flags & format::TILEFLAG_VFLIP != 0; @@ -106,14 +115,6 @@ impl MapRenderer { continue; } - let tile_rect = Rect { - top: layer_y as f32 * 16.0, - left: layer_x as f32 * 16.0, - bottom: layer_y as f32 * 16.0 + 16.0, - right: layer_x as f32 * 16.0 + 16.0, - }; - canvas.draw_rect(tile_rect, &grid_paint); - const TL: u32 = 16; canvas.draw_image_rect( self.tileset.get(&l.image).unwrap(), |