cleaning

src/renderer/buffers/nodes.rs

@@ -1,8 +1,3 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::thread::JoinHandle;
-use std::sync::Mutex;
-use std::thread;
 use std::cmp::{min, max};
 use cgmath::Vector3;
 use byteorder::{LittleEndian, ByteOrder};
@@ -13,46 +8,33 @@ pub const NODE_TEX_SIZE_QB: usize = NODE_TEX_SIZE*NODE_TEX_SIZE*NODE_TEX_SIZE;
 
 
 pub struct Nodes {
-    node_buffer_a: Mutex<Box<[u32]>>,
-    node_buffer_b: Mutex<Box<[u32]>>,
-    active_buffer: u8,
-    busy: Arc<AtomicBool>,
+    node_buffer: [Box<[u32]>; 2],
+    active_buffer: usize,
     modified: bool,
 }
 
 impl Nodes {
     pub fn new() -> Self {
         Self {
-            node_buffer_a: Mutex::new(vec![0_u32; NODE_TEX_SIZE_QB].into_boxed_slice()),
-            node_buffer_b: Mutex::new(vec![0_u32; NODE_TEX_SIZE_QB].into_boxed_slice()),
+            node_buffer: [vec![0_u32; NODE_TEX_SIZE_QB].into_boxed_slice(), vec![0_u32; NODE_TEX_SIZE_QB].into_boxed_slice()],
             active_buffer: 0,
-            busy: Arc::new(AtomicBool::new(false)),
             modified: false,
         }
     }
 
     pub fn get_node(&self, index: usize) -> u32 {
-        if self.active_buffer == 0 { self.node_buffer_a.lock().unwrap()[index] }
-        else { self.node_buffer_b.lock().unwrap()[index] }
+        self.node_buffer[self.active_buffer][index]
     }
 
     pub fn set_node(&mut self, index: usize, value: u32) {
-        if self.active_buffer == 0 { self.node_buffer_a.lock().unwrap()[index] = value; }
-        else { self.node_buffer_b.lock().unwrap()[index] = value; }
-        self.modified = true;
+        self.node_buffer[self.active_buffer][index] = value;
     }
 
     pub fn shift(&mut self, offset: &Vector3<i32>) -> bool {
-        // Prevent shifting if busy
-        if self.busy.load(Ordering::Relaxed) {
-            return false;
-        }
 
-        // Perform shift
-        self.busy.store(true, Ordering::Relaxed);
+        let a = if self.active_buffer == 0 { 0 } else { 1 };
+        let b = if self.active_buffer == 0 { 1 } else { 0 };
 
-        let from = if self.active_buffer == 0 { self.node_buffer_a.lock().unwrap() } else { self.node_buffer_b.lock().unwrap() };
-        let mut to = if self.active_buffer == 0 { self.node_buffer_b.lock().unwrap() } else { self.node_buffer_a.lock().unwrap() };
         let (ox, oy, oz) = (offset.x, offset.y, offset.z);
         let size = NODE_TEX_SIZE  as i32;
 
@@ -61,27 +43,20 @@ impl Nodes {
                 for z in max(0, -oz)..min(size-oz, size) {
                     let idx0 = x + size * (y + size * z);
                     let idx1 = (x+ox) + size * ((y+oy) + size * (z+oz));
-                    to[idx1 as usize] = from[idx0 as usize];
+                    self.node_buffer[b][idx1 as usize] = self.node_buffer[a][idx0 as usize];
                 }
              }
         }
 
-        self.active_buffer = !self.active_buffer;
+        self.active_buffer = b;
         self.modified = true;
-        self.busy.store(false, Ordering::Relaxed);
-
         true
     }
 
     pub fn update(&mut self, queue: &wgpu::Queue, texture: &wgpu::Texture) {
-        if self.modified && !self.busy.load(Ordering::Relaxed) {
+        if self.modified {
             self.modified = false;
             
-            // Select target node buffer
-            let node_buffer;
-            if self.active_buffer == 0 { node_buffer = &self.node_buffer_a; }
-            else { node_buffer = &self.node_buffer_b; }
-
             // Write all nodes to gpu
             for z in 0..NODE_TEX_SIZE {
 
@@ -90,7 +65,7 @@ impl Nodes {
                 let node_size = wgpu::Extent3d { width: NODE_TEX_SIZE as u32, height: NODE_TEX_SIZE as u32, depth: 1 };
                 let mut node_bytes = [0_u8; NODE_TEX_SIZE_SQ*4];
                 let offset = NODE_TEX_SIZE_SQ*z;
-                LittleEndian::write_u32_into(&node_buffer.lock().unwrap()[offset..offset+NODE_TEX_SIZE_SQ], &mut node_bytes);
+                LittleEndian::write_u32_into(&self.node_buffer[self.active_buffer][offset..offset+NODE_TEX_SIZE_SQ], &mut node_bytes);
         
                 // Write nodes
                 queue.write_texture(