equal
deleted
inserted
replaced
104 let params = LandGenerationParameters::new(0u32, u32::max_value(), 5, false, false); |
104 let params = LandGenerationParameters::new(0u32, u32::max_value(), 5, false, false); |
105 let landgen = TemplatedLandGenerator::new(template); |
105 let landgen = TemplatedLandGenerator::new(template); |
106 let land = landgen.generate_land(¶ms, &mut self.random_numbers_gen); |
106 let land = landgen.generate_land(¶ms, &mut self.random_numbers_gen); |
107 |
107 |
108 self.game_state = Some(GameState::new(land, physics)); |
108 self.game_state = Some(GameState::new(land, physics)); |
109 |
|
110 if let Some(ref mut state) = self.game_state { |
|
111 let position = Point::new( |
|
112 (self.random_numbers_gen.next().unwrap() % state.land.width() as u32) as i32, |
|
113 0, |
|
114 ); |
|
115 self.create_gear(position); |
|
116 } |
|
117 } |
109 } |
118 |
110 |
119 pub fn move_camera(&mut self, position_shift: Point, zoom_shift: f32) { |
111 pub fn move_camera(&mut self, position_shift: Point, zoom_shift: f32) { |
120 self.camera.zoom += zoom_shift; |
112 self.camera.zoom += zoom_shift; |
121 self.camera.position += Point::new( |
113 self.camera.position += Point::new( |
154 } |
146 } |
155 |
147 |
156 pub fn step(&mut self) { |
148 pub fn step(&mut self) { |
157 if let Some(ref mut state) = self.game_state { |
149 if let Some(ref mut state) = self.game_state { |
158 let next = self.random_numbers_gen.next().unwrap(); |
150 let next = self.random_numbers_gen.next().unwrap(); |
159 /*if next % 32 == 0 { |
151 if next % 32 == 0 { |
160 let position = Point::new( |
152 let position = Point::new( |
161 (self.random_numbers_gen.next().unwrap() % state.land.width() as u32) as i32, |
153 (self.random_numbers_gen.next().unwrap() % state.land.width() as u32) as i32, |
162 0, |
154 0, |
163 ); |
155 ); |
164 self.create_gear(position); |
156 self.create_gear(position); |
165 }*/ |
157 } |
166 } |
158 } |
167 |
159 |
168 if let Some(ref mut state) = self.game_state { |
160 if let Some(ref mut state) = self.game_state { |
169 state.physics.step(Millis::new(1), &state.land); |
161 state.physics.step(Millis::new(1), &state.land); |
170 } |
162 } |