Finish fixing non-raft system

Cargo.toml

@@ -22,6 +22,7 @@ bytes = "1"
 lazy_static = "*"
 tonic = "0.3"
 prost = "0.6"
+rayon = "1.5"
 
 [build-dependencies]
 tonic-build = "0.3.0"

bin/collect.rs

@@ -1,7 +1,10 @@
 use bytes::Bytes;
 use dstore::Local;
 use raex::rtrc::{IMAGE_HEIGHT, IMAGE_WIDTH};
-use std::env;
+use std::{
+ env,
+ io::{stderr, Write},
+};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -11,8 +14,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
  let local = Local::new(global_addr, local_addr).await?;
 
  println!("P3\n{} {}\n255", IMAGE_WIDTH, IMAGE_HEIGHT);
- for i in (0..IMAGE_WIDTH).into_iter().rev() {
- for j in 0..IMAGE_HEIGHT {
+ for j in (0..IMAGE_HEIGHT).into_iter().rev() {
+ eprint!("\rScanlines remaining: {} ", j);
+ stderr().flush().unwrap();
+ for i in 0..IMAGE_WIDTH {
  let (_, pixel) = local
  .lock()
  .await
@@ -22,5 +27,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
  }
  }
 
+ eprint!("\rImage Generated!");
+ stderr().flush().unwrap();
+
  Ok(())
 }

bin/node.rs

@@ -1,13 +1,17 @@
 use bytes::Bytes;
 use dstore::{Local, Queue};
 use raex::rtrc::RayTracer;
-use std::{env, sync::Arc};
+use std::{
+ env,
+ io::{stderr, Write},
+ sync::Arc,
+};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
  let args: Vec<String> = env::args().collect();
  let (global_addr, local_addr) = (&args[1], &args[2]);
- 
+
  let (tracer, local) = (
  Arc::new(RayTracer::default()),
  Local::new(global_addr, local_addr).await?,
@@ -22,7 +26,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
  tokio::spawn(async move {
  let popped = popped.to_vec();
  let (i, j) = ((popped[0] as u16) << 8 | popped[1] as u16, popped[2] as u16);
- eprintln!("[{}, {}]", i, j);
+ eprint!("\r[{}, {}]", i, j);
+ stderr().flush().unwrap();
  let pixel = tracer_ref.render(i, j);
  let _ = local_ref
  .lock()
@@ -31,7 +36,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
  .await;
  });
  } else {
- eprintln!("There is no more things to get from the queue");
+ eprintln!("\rThere is no more tasks to get from the queue");
+ stderr().flush().unwrap();
  break;
  }
  }

bin/unroll.rs

@@ -1,15 +1,20 @@
 use bytes::Bytes;
 use dstore::Queue;
 use raex::rtrc::{IMAGE_HEIGHT, IMAGE_WIDTH};
-use std::env;
+use std::{
+ env,
+ io::{stderr, Write},
+};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
  let args: Vec<String> = env::args().collect();
 
  let mut queue = Queue::connect(&args[1]).await?;
- for i in (0..IMAGE_WIDTH).into_iter().rev() {
- for j in 0..IMAGE_HEIGHT {
+ for j in (0..IMAGE_HEIGHT).into_iter().rev() {
+ eprint!("\rScanlines remaining: {} ", j);
+ stderr().flush().unwrap();
+ for i in 0..IMAGE_WIDTH {
  let _ = queue
  .push_back(
  Bytes::from("tasks"),

src/rtrc.rs

@@ -15,7 +15,7 @@ use rtrcrs::{
 const ASPECT_RATIO: f64 = 16.0 / 9.0;
 pub const IMAGE_WIDTH: i32 = 400;
 pub const IMAGE_HEIGHT: i32 = (IMAGE_WIDTH as f64 / ASPECT_RATIO) as i32;
-const SAMPLES_PER_PIXEL: i32 = 8;
+const SAMPLES_PER_PIXEL: i32 = 100;
 const MAX_DEPTH: i32 = 50;
 
 pub struct RayTracer {
@@ -26,7 +26,7 @@ pub struct RayTracer {
 impl RayTracer {
  pub fn default() -> Self {
  //World
- let mut world = random_scene();
+ let mut world = HittableList::default();
 
  let material_ground = Arc::new(Lambertian::new(Color::new(0.8, 0.8, 0.0)));
  let material_center = Arc::new(Lambertian::new(Color::new(0.1, 0.2, 0.5)));