Address most comments

base/src/gen/mod.rs

@@ -34,11 +34,6 @@ fn seeded_rng<T: Hash, U: Hash>(world_seed: u64, feat_seed: T, loc_seed: U) -> R
     let rng_seed = fnv.finish();
     let seed0 = (rng_seed >> 32) as u32;
     let seed1 = rng_seed as u32;
-    // Apply our patented cryptoperturbation mask to magically extend the 64-bit
-    // hash to 128 bits used by xorshift:
-    // (To be honest, I just didn't want to pass the same 2 word twice)
-    let seed2 = seed0 ^ 0xdeadbeef;
-    let seed3 = seed1 ^ 0xcafebabe;
 
-    XorShiftRng::from_seed([seed0, seed1, seed2, seed3])
+    XorShiftRng::from_seed([seed0, seed1, seed0, seed1])
 }

base/src/gen/plant/tree.rs

@@ -179,11 +179,11 @@ impl TreeGen {
         let trunk_diameter_top = range_sample(&self.preset.trunk_diameter_top, rng);
         let min_branch_height = range_sample(&self.preset.min_branch_height, rng) * trunk_height;
 
-        info!("trunk diam {} to {}, height {}, branch start at {}",
-              trunk_diameter,
-              trunk_diameter_top,
-              trunk_height,
-              min_branch_height);
+        debug!("trunk diam {} to {}, height {}, branch start at {}",
+               trunk_diameter,
+               trunk_diameter_top,
+               trunk_height,
+               min_branch_height);
 
         let mut points = Vec::new();
 

client/src/render/to_arr.rs

@@ -60,3 +60,19 @@ impl<T: BaseFloat> ToArr for Vector2<T> {
         (*self).into()
     }
 }
+
+impl<T: BaseNum> ToArr for Point2<T> {
+    type Output = [T; 2];
+
+    fn to_arr(&self) -> Self::Output {
+        (*self).into()
+    }
+}
+
+impl<T: BaseNum> ToArr for Point3<T> {
+    type Output = [T; 3];
+
+    fn to_arr(&self) -> Self::Output {
+        (*self).into()
+    }
+}

client/src/world/chunk_view.rs

@@ -1,6 +1,6 @@
 use base::world::{self, Chunk, HexPillar, PillarSection, PropType};
 use base::math::*;
-use glium::{Depth, DrawParameters, IndexBuffer, Program, Surface, VertexBuffer};
+use glium::{self, DrawParameters, IndexBuffer, Program, VertexBuffer};
 use glium::draw_parameters::{BackfaceCullingMode, DepthTest};
 use glium::backend::Facade;
 use glium::index::PrimitiveType;
@@ -86,9 +86,9 @@ impl ChunkView {
         }
     }
 
-    pub fn draw<S: Surface>(&self, surface: &mut S, camera: &Camera) {
+    pub fn draw<S: glium::Surface>(&self, surface: &mut S, camera: &Camera) {
         for pillar in &self.pillars {
-            for section in &pillar.pillars {
+            for section in &pillar.sections {
                 let scale_matrix =
                     Matrix4::from_nonuniform_scale(1.0,
                                                    1.0,
@@ -102,7 +102,7 @@ impl ChunkView {
                     material_color: section.ground.get_color(),
                 };
                 let params = DrawParameters {
-                    depth: Depth {
+                    depth: glium::Depth {
                         write: true,
                         test: DepthTest::IfLess,
                         ..Default::default()
@@ -126,6 +126,9 @@ impl ChunkView {
     }
 }
 
+
+// FIXME `Vertex` really shouldn't be in this module
+
 #[derive(Debug, Copy, Clone)]
 pub struct Vertex {
     pub position: [f32; 3],
@@ -136,15 +139,15 @@ implement_vertex!(Vertex, position, color);
 
 pub struct PillarView {
     pos: Point2f,
-    pillars: Vec<PillarSection>,
+    sections: Vec<PillarSection>,
     plants: Vec<PlantView>,
 }
 
 impl PillarView {
     fn from_pillar<F: Facade>(pos: Point2f, pillar: &HexPillar, facade: &F) -> PillarView {
         PillarView {
             pos: pos,
-            pillars: pillar.sections().to_vec(),
+            sections: pillar.sections().to_vec(),
             plants: pillar.props()
                 .iter()
                 .map(|prop| {

client/src/world/plant_view.rs

@@ -1,5 +1,5 @@
 use glium::backend::Facade;
-use glium::{Depth, DepthTest, DrawParameters, Program, Surface, VertexBuffer};
+use glium::{self, DepthTest, DrawParameters, Program, VertexBuffer};
 use glium::index::{NoIndices, PrimitiveType};
 use Camera;
 use render::ToArr;
@@ -34,8 +34,8 @@ impl PlantView {
                         for cp in branch.points.iter() {
                             verts += 1;
                             vertices.push(Vertex {
-                                position: [cp.point.x, cp.point.y, cp.point.z],
-                                color: [branch.color.x, branch.color.y, branch.color.z],
+                                position: cp.point.to_arr(),
+                                color: branch.color.to_arr(),
                             });
                         }
 
@@ -45,7 +45,7 @@ impl PlantView {
             }
         };
 
-        info!("{} verts -> {:?}", verts, pos);
+        debug!("{} verts -> {:?}", verts, pos);
 
         PlantView {
             branches: branches,
@@ -54,7 +54,7 @@ impl PlantView {
         }
     }
 
-    pub fn draw<S: Surface>(&self, surface: &mut S, camera: &Camera) {
+    pub fn draw<S: glium::Surface>(&self, surface: &mut S, camera: &Camera) {
         let uniforms = uniform! {
             // FIXME HACK why do i have to half the Z coordinate...
             offset: [self.pos.x, self.pos.y, self.pos.z/2.0],
@@ -63,7 +63,7 @@ impl PlantView {
         };
 
         let params = DrawParameters {
-            depth: Depth {
+            depth: glium::Depth {
                 write: true,
                 test: DepthTest::IfLess,
                 ..Default::default()

client/src/world/world_view.rs

@@ -1,7 +1,7 @@
 use base::world::{self, World};
 use base::math::*;
 use glium::backend::Facade;
-use glium::Surface;
+use glium;
 use Camera;
 
 pub use world::chunk_view::ChunkView;
@@ -36,7 +36,7 @@ impl WorldView {
         WorldView { chunks: chunks }
     }
 
-    pub fn draw<S: Surface>(&self, surface: &mut S, camera: &Camera) {
+    pub fn draw<S: glium::Surface>(&self, surface: &mut S, camera: &Camera) {
         for chunkview in &self.chunks {
             chunkview.draw(surface, camera);
         }