Skip to content

Commit 0c97ded

Browse files
committed
fix warnings
1 parent 2c4c87a commit 0c97ded

4 files changed

Lines changed: 11 additions & 18 deletions

File tree

src/bin/drawing/painter.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ impl Painter {
379379
let canvas_size_len = 4 * 4;
380380
let canvas_size_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
381381
label: Some("map canvas size data"),
382-
contents: as_byte_slice(&[screen.width as f32, screen.height as f32, 0.0, 0.0]),
382+
contents: as_byte_slice(&[screen.width, screen.height, 0.0, 0.0]),
383383
usage: BufferUsages::UNIFORM | BufferUsages::COPY_SRC,
384384
});
385385

@@ -735,10 +735,8 @@ impl Painter {
735735
});
736736
render_pass.set_bind_group(0, &self.bind_group, &[]);
737737
let vec = vec4(0.0, 0.0, 0.0, 1.0);
738-
let screen_dimensions = vec2(
739-
app_state.screen.width as f32,
740-
app_state.screen.height as f32,
741-
) / 2.0;
738+
let screen_dimensions =
739+
vec2(app_state.screen.width, app_state.screen.height) / 2.0;
742740

743741
for (i, tile_id) in app_state.visible_tiles().iter().enumerate() {
744742
let matrix = app_state.screen.tile_to_screen(app_state.zoom, tile_id);

src/bin/drawing/ui/views/panel_left.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
use super::{inspector::view_inspector, layer_toggle::view_layer_toggle};
77

88
pub struct PanelLeft {
9-
open: bool,
9+
_open: bool,
1010
tree: egui_tiles::Tree<Pane>,
1111
}
1212

@@ -33,7 +33,7 @@ impl PanelLeft {
3333

3434
let tree = egui_tiles::Tree::new("my_tree", root, tiles);
3535

36-
Self { open: true, tree }
36+
Self { _open: true, tree }
3737
}
3838

3939
pub fn ui(&mut self, ctx: &egui::Context, app_state: &mut AppState) {

src/bin/main.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ use std::sync::Arc;
77

88
use crate::config::CONFIG;
99
use clap::Parser;
10-
use lyon::{
11-
geom::euclid::{self, point2},
12-
math::vector,
13-
};
14-
use nalgebra_glm::{vec2, vec3, vec4, Mat4};
10+
use lyon::geom::euclid::{self};
11+
use nalgebra_glm::vec4;
1512
use osm::math::{deg2num, tile_to_world_space, TileId};
1613
use winit::{
1714
application::ApplicationHandler,

src/lib/math/screen.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ impl Screen {
2525

2626
pub fn get_tile_boundaries_for_zoom_level(&self, z: f32, scale: u32) -> TileField {
2727
let z = z.min(14.0);
28-
let px_to_world =
29-
self.width as f32 / self.tile_size() / 2.0 / 2f32.powi(z as i32) / scale as f32;
30-
let py_to_world =
31-
self.height as f32 / self.tile_size() / 2.0 / 2f32.powi(z as i32) / scale as f32;
28+
let px_to_world = self.width / self.tile_size() / 2.0 / 2f32.powi(z as i32) / scale as f32;
29+
let py_to_world = self.height / self.tile_size() / 2.0 / 2f32.powi(z as i32) / scale as f32;
3230

3331
let top_left: TileId =
3432
world_to_tile_space(&(self.center - vector(px_to_world, py_to_world)), z as u32).into();
@@ -45,8 +43,8 @@ impl Screen {
4543
}
4644

4745
pub fn global_to_screen(&self, z: f32) -> glm::TMat4<f32> {
48-
let zoom_x = 2.0f32.powf(z) / (self.width as f32 / 2.0) * self.tile_size();
49-
let zoom_y = 2.0f32.powf(z) / (self.height as f32 / 2.0) * self.tile_size();
46+
let zoom_x = 2.0f32.powf(z) / (self.width / 2.0) * self.tile_size();
47+
let zoom_y = 2.0f32.powf(z) / (self.height / 2.0) * self.tile_size();
5048
let zoom = glm::scaling(&glm::vec3(zoom_x, zoom_y, 1.0));
5149
let position = glm::translation(&glm::vec3(-self.center.x, -self.center.y, 0.0));
5250
zoom * position

0 commit comments

Comments
 (0)