content: Add random rotations to the GrassBlades blocks.

This lets us get a lot more variation out of the same original voxels.
kpreid · Sep 25, 2024 · 7696f13 · 7696f13
1 parent e29dcca
commit 7696f13
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/all-is-cubes-content/src/city.rs b/all-is-cubes-content/src/city.rs
@@ -4,6 +4,7 @@
 use alloc::{sync::Arc, vec::Vec};
 
 use itertools::Itertools;
+use rand::seq::SliceRandom as _;
 use rand::{Rng, SeedableRng as _};
 
 use all_is_cubes::block::{self, text::Font, BlockAttributes, Resolution::*, AIR};
@@ -238,14 +239,32 @@ impl State {
     }
 
     fn plant_grass(&mut self) -> Result<(), InGenError> {
+        let mut rng = rand_xoshiro::Xoshiro256Plus::seed_from_u64(self.params.seed.unwrap_or(0));
+        let rotations = &[
+            // all transformations that leave Y unaltered
+            GridRotation::RXYZ,
+            GridRotation::RxYZ,
+            GridRotation::RXYz,
+            GridRotation::RxYz,
+            GridRotation::RZYX,
+            GridRotation::RzYX,
+            GridRotation::RZYx,
+            GridRotation::RzYx,
+        ];
         let grass_at = crate::landscape::grass_placement_function(0x21b5cc6b);
         self.space.fill(self.planner.y_range(1, 2), |cube| {
             if cube.x.abs() <= CityPlanner::ROAD_RADIUS || cube.z.abs() <= CityPlanner::ROAD_RADIUS
             {
                 return None;
             }
-            grass_at(cube)
-                .map(|height| &self.landscape_blocks[LandscapeBlocks::GrassBlades { height }])
+            grass_at(cube).map(|height| {
+                // TODO: this is inefficient re-allocation per cube.
+                // Build a way to look up the blocks that already exist and reuse them,
+                // or build a table of (height,rotation)s up before fill()ing.
+                self.landscape_blocks[LandscapeBlocks::GrassBlades { height }]
+                    .clone()
+                    .rotate(*rotations.choose(&mut rng).unwrap())
+            })
         })?;
         Ok(())
     }

diff --git a/all-is-cubes-content/src/landscape.rs b/all-is-cubes-content/src/landscape.rs
@@ -202,7 +202,7 @@ pub async fn install_landscape_blocks(
     BlockProvider::<LandscapeBlocks>::new(progress, |key| {
         let grass_blades = |txn, height: GrassHeight| -> Result<Block, InGenError> {
             let height_index = height as GridCoordinate - 1;
-            // give each grass variant a different height
+            // give each grass variant a different portion of the noise array
             let noise_section = GridVector::new(
                 height_index.rem_euclid(2),
                 height_index.div_euclid(2).rem_euclid(2),
@@ -365,6 +365,7 @@ pub fn wavy_landscape(
                     continue;
                 } else if altitude == 1 {
                     if let Some(height) = grass_at(cube) {
+                        // TODO: add randomized rotation like the city grass has
                         &blocks[GrassBlades { height }]
                     } else {
                         &AIR