Allow for number keys to select type of block to be placed

client/src/graphics/window.rs

@@ -261,7 +261,15 @@ impl Window {
                             self.window.set_cursor_visible(true);
                             mouse_captured = false;
                         }
-                        _ => {}
+                        _ => {
+                            if let Some(material_idx) = number_key_to_index(key) {
+                                if state == ElementState::Pressed {
+                                    if let Some(sim) = self.sim.as_mut() {
+                                        sim.select_material(material_idx);
+                                    }
+                                }
+                            }
+                        }
                     },
                     WindowEvent::Focused(focused) => {
                         if !focused {
@@ -356,6 +364,22 @@ impl Window {
     }
 }
 
+fn number_key_to_index(key: VirtualKeyCode) -> Option<usize> {
+    match key {
+        VirtualKeyCode::Key1 => Some(0),
+        VirtualKeyCode::Key2 => Some(1),
+        VirtualKeyCode::Key3 => Some(2),
+        VirtualKeyCode::Key4 => Some(3),
+        VirtualKeyCode::Key5 => Some(4),
+        VirtualKeyCode::Key6 => Some(5),
+        VirtualKeyCode::Key7 => Some(6),
+        VirtualKeyCode::Key8 => Some(7),
+        VirtualKeyCode::Key9 => Some(8),
+        VirtualKeyCode::Key0 => Some(9),
+        _ => None,
+    }
+}
+
 impl Drop for Window {
     fn drop(&mut self) {
         self.draw.take();

client/src/sim.rs

@@ -21,6 +21,19 @@ use common::{
     EntityId, GraphEntities, SimConfig, Step,
 };
 
+const MATERIAL_PALETTE: [Material; 10] = [
+    Material::WoodPlanks,
+    Material::Grass,
+    Material::Dirt,
+    Material::Sand,
+    Material::Snow,
+    Material::WhiteBrick,
+    Material::GreyBrick,
+    Material::Basalt,
+    Material::Water,
+    Material::Lava,
+];
+
 /// Game state
 pub struct Sim {
     // World state
@@ -58,6 +71,9 @@ pub struct Sim {
     place_block_pressed: bool,
     /// Whether the break-block button has been pressed since the last step
     break_block_pressed: bool,
+
+    selected_material: Material,
+
     prediction: PredictedMotion,
     local_character_controller: LocalCharacterController,
 }
@@ -87,6 +103,7 @@ impl Sim {
             jump_held: false,
             place_block_pressed: false,
             break_block_pressed: false,
+            selected_material: Material::WoodPlanks,
             prediction: PredictedMotion::new(proto::Position {
                 node: NodeId::ROOT,
                 local: na::one(),
@@ -138,6 +155,10 @@ impl Sim {
         self.place_block_pressed = true;
     }
 
+    pub fn select_material(&mut self, idx: usize) {
+        self.selected_material = *MATERIAL_PALETTE.get(idx).unwrap_or(&MATERIAL_PALETTE[0]);
+    }
+
     pub fn set_break_block_pressed_true(&mut self) {
         self.break_block_pressed = true;
     }
@@ -476,7 +497,7 @@ impl Sim {
         };
 
         let material = if placing {
-            Material::WoodPlanks
+            self.selected_material
         } else {
             Material::Void
         };