diff options
| -rw-r--r-- | client/src/world/map.rs | 3 | ||||
| -rw-r--r-- | renderer/src/main.rs | 2 | ||||
| -rw-r--r-- | renderer/src/map.rs | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/client/src/world/map.rs b/client/src/world/map.rs index c6355f2..c8522b9 100644 --- a/client/src/world/map.rs +++ b/client/src/world/map.rs @@ -64,15 +64,18 @@ impl Map { } for layer_idx in group.layer_indices { + info!("loading {}", pretty::AlmostString::new(&group.name)); let layer = map.layer(layer_idx).unwrap(); let tilemap = if let reader::LayerType::Tilemap(t) = layer.t { t } else { + warn!("non-tilemap layer skipped"); continue; }; let normal = if let Some(n) = tilemap.type_.to_normal() { n } else { + warn!("non-normal layer skipped"); continue; }; let tiles = map.layer_tiles(tilemap.tiles(normal.data)).unwrap(); diff --git a/renderer/src/main.rs b/renderer/src/main.rs index 9716393..af01021 100644 --- a/renderer/src/main.rs +++ b/renderer/src/main.rs @@ -238,7 +238,7 @@ impl Renderer { canvas.save(); canvas.translate((dims.0 / 2.0, dims.1 / 2.0)); canvas.translate((-center.0 as f32, -center.1 as f32)); - + // canvas.scale((0.1, 0.1)); self.map_renderer.draw(&self.world, canvas); self.tee_renderer.draw(&self.world, canvas); diff --git a/renderer/src/map.rs b/renderer/src/map.rs index 5b657d4..db5dd53 100644 --- a/renderer/src/map.rs +++ b/renderer/src/map.rs @@ -59,7 +59,8 @@ impl MapRenderer { } } - pub fn draw(&mut self, world: &World, canvas: &mut Canvas) { + pub fn draw(&self, world: &World, canvas: &mut Canvas) { + let draw_distance = 40; let rot90 = Matrix::rotate_deg(90.0); let mut grid_paint = Paint::new( Color4f { @@ -93,8 +94,8 @@ impl MapRenderer { ); layer_tint.set_style(skia_safe::PaintStyle::Fill); - for layer_y in (center.1 - 15)..(center.1 + 15) { - for layer_x in (center.0 - 15)..(center.0 + 15) { + for layer_y in (center.1 - draw_distance)..(center.1 + draw_distance) { + for layer_x in (center.0 - draw_distance)..(center.0 + draw_distance) { let layer_x = layer_x.try_into().unwrap_or(0); let layer_y = layer_y.try_into().unwrap_or(0); |