浏览代码

Rename render_zoom_level -> tile_zoom

Johannes Hofmann 8 年前
父节点
当前提交
a91637ade6
共有 3 个文件被更改,包括 15 次插入15 次删除
  1. 2
    2
      src/main.rs
  2. 9
    9
      src/map_view.rs
  3. 4
    4
      src/map_view_gl.rs

+ 2
- 2
src/main.rs 查看文件

154
                 },
154
                 },
155
                 VirtualKeyCode::Add => {
155
                 VirtualKeyCode::Add => {
156
                     if input_state.ctrl_pressed() {
156
                     if input_state.ctrl_pressed() {
157
-                        map.change_zoom_level_offset(1.0);
157
+                        map.change_tile_zoom_offset(1.0);
158
                     } else {
158
                     } else {
159
                         map.step_zoom(1, 0.5);
159
                         map.step_zoom(1, 0.5);
160
                     }
160
                     }
162
                 },
162
                 },
163
                 VirtualKeyCode::Subtract => {
163
                 VirtualKeyCode::Subtract => {
164
                     if input_state.ctrl_pressed() {
164
                     if input_state.ctrl_pressed() {
165
-                        map.change_zoom_level_offset(-1.0);
165
+                        map.change_tile_zoom_offset(-1.0);
166
                     } else {
166
                     } else {
167
                         map.step_zoom(-1, 0.5);
167
                         map.step_zoom(-1, 0.5);
168
                     }
168
                     }

+ 9
- 9
src/map_view.rs 查看文件

8
     pub tile_size: u32,
8
     pub tile_size: u32,
9
     pub center: MapCoord,
9
     pub center: MapCoord,
10
     pub zoom2: f64,
10
     pub zoom2: f64,
11
-    pub render_zoom_level_offset: f64,
11
+    pub tile_zoom_offset: f64,
12
 }
12
 }
13
 
13
 
14
 #[derive(Clone, Debug)]
14
 #[derive(Clone, Debug)]
25
             tile_size: tile_size,
25
             tile_size: tile_size,
26
             center: MapCoord::new(0.5, 0.5),
26
             center: MapCoord::new(0.5, 0.5),
27
             zoom2: 0.0,
27
             zoom2: 0.0,
28
-            render_zoom_level_offset: 0.0,
28
+            tile_zoom_offset: 0.0,
29
         }
29
         }
30
     }
30
     }
31
 
31
 
55
     }
55
     }
56
 
56
 
57
     pub fn visible_tiles(&self, snap_to_pixel: bool) -> Vec<VisibleTile> {
57
     pub fn visible_tiles(&self, snap_to_pixel: bool) -> Vec<VisibleTile> {
58
-        let uzoom = self.render_zoom_level();
58
+        let uzoom = self.tile_zoom();
59
         let top_left_tile = self.top_left_coord().on_tile_at_zoom(uzoom);
59
         let top_left_tile = self.top_left_coord().on_tile_at_zoom(uzoom);
60
         let mut top_left_tile_screen_coord = self.tile_screen_position(&top_left_tile);
60
         let mut top_left_tile_screen_coord = self.tile_screen_position(&top_left_tile);
61
         let tile_screen_size = f64::powf(2.0, self.zoom2 - f64::from(uzoom)) * f64::from(self.tile_size);
61
         let tile_screen_size = f64::powf(2.0, self.zoom2 - f64::from(uzoom)) * f64::from(self.tile_size);
93
         visible_tiles
93
         visible_tiles
94
     }
94
     }
95
 
95
 
96
-    pub fn render_zoom_level(&self) -> u32 {
97
-        (self.zoom2 + self.render_zoom_level_offset).floor().max(0.0) as u32
96
+    pub fn tile_zoom(&self) -> u32 {
97
+        (self.zoom2 + self.tile_zoom_offset).floor().max(0.0) as u32
98
     }
98
     }
99
 
99
 
100
-    pub fn render_zoom_level_offset(&self) -> f64 {
101
-        self.render_zoom_level_offset
100
+    pub fn tile_zoom_offset(&self) -> f64 {
101
+        self.tile_zoom_offset
102
     }
102
     }
103
 
103
 
104
-    pub fn set_render_zoom_level_offset(&mut self, offset: f64) {
105
-        self.render_zoom_level_offset = offset;
104
+    pub fn set_tile_zoom_offset(&mut self, offset: f64) {
105
+        self.tile_zoom_offset = offset;
106
     }
106
     }
107
 
107
 
108
     pub fn set_size(&mut self, width: f64, height: f64) {
108
     pub fn set_size(&mut self, width: f64, height: f64) {

+ 4
- 4
src/map_view_gl.rs 查看文件

92
     pub fn draw(&mut self, source: &TileSource) {
92
     pub fn draw(&mut self, source: &TileSource) {
93
         self.tile_cache.set_view_location(View {
93
         self.tile_cache.set_view_location(View {
94
             source_id: source.id(),
94
             source_id: source.id(),
95
-            zoom: self.map_view.render_zoom_level(),
95
+            zoom: self.map_view.tile_zoom(),
96
             center: self.map_view.center,
96
             center: self.map_view.center,
97
         });
97
         });
98
 
98
 
193
         self.map_view.center.normalize_xy();
193
         self.map_view.center.normalize_xy();
194
     }
194
     }
195
 
195
 
196
-    pub fn change_zoom_level_offset(&mut self, delta_offset: f64) {
197
-        let offset = self.map_view.render_zoom_level_offset();
198
-        self.map_view.set_render_zoom_level_offset(offset + delta_offset);
196
+    pub fn change_tile_zoom_offset(&mut self, delta_offset: f64) {
197
+        let offset = self.map_view.tile_zoom_offset();
198
+        self.map_view.set_tile_zoom_offset(offset + delta_offset);
199
     }
199
     }
200
 
200
 
201
     pub fn move_pixel(&mut self, delta_x: f64, delta_y: f64) {
201
     pub fn move_pixel(&mut self, delta_x: f64, delta_y: f64) {