Browse Source

Force randomization

Kevin Lee 1 year ago
parent
commit
429d2e2b4d
4 changed files with 4 additions and 7 deletions
  1. 0 1
      README.md
  2. 0 1
      config.yml
  3. 2 5
      src/config/object.rs
  4. 2 0
      src/main.rs

+ 0 - 1
README.md

@@ -137,5 +137,4 @@ Ops:
     Spacing: 0.5
     Z: 0.0
     StartingPen: 0
-    RandomOrder: True
 ```

+ 0 - 1
config.yml

@@ -49,4 +49,3 @@ Ops:
     Spacing: 4.0
     Z: 0.0
     StartingPen: 1
-    RandomOrder: True

+ 2 - 5
src/config/object.rs

@@ -131,7 +131,6 @@ pub struct RectangleArray {
     spacing: f64,
     z: f64,
     starting_pen: usize,
-    random_order: bool,
 }
 
 impl RectangleArray {
@@ -171,11 +170,9 @@ impl RectangleArray {
             }
         };
 
-        // Determine order in which to draw objects
+        // Randomize draw order
         let mut seq: Vec<usize> = (0..(self.rows * self.columns)).collect();
-        if self.random_order {
-            seq.shuffle(&mut thread_rng());
-        }
+        seq.shuffle(&mut thread_rng());
 
         // Generate objects and append to layer
         for (pen_incr, obj_idx) in seq.into_iter().enumerate() {

+ 2 - 0
src/main.rs

@@ -9,6 +9,7 @@ use binrw::{BinRead, BinWrite, BinWriterExt};
 use clap::Parser;
 use clap_verbosity_flag::{InfoLevel, Verbosity};
 use diff::Diff;
+use env_logger::Target;
 use ezcad::file::EzCadHeader;
 use log::{info, trace, warn};
 
@@ -45,6 +46,7 @@ fn main() {
         .format_timestamp(None)
         .format_target(false)
         .filter_level(cli.verbose.log_level_filter())
+        .target(Target::Stdout)
         .init();
 
     info!("Reading input file {}", cli.input.to_string_lossy());