Voxels and SDF

Cargo.toml

@@ -16,14 +16,15 @@ name = "dotrix"
 path = "src/lib.rs"
 
 [features]
-default = [ "egui", "overlay", "pbr", "primitives", "sky", "terrain" ]
+default = [ "egui", "overlay", "pbr", "primitives", "sky", "terrain", "voxel" ]
 
 overlay = ["dotrix_overlay"]
 sky = ["dotrix_sky"]
 pbr = ["dotrix_pbr"]
 primitives = ["dotrix_primitives"]
 egui = ["dotrix_egui"]
 terrain = ["dotrix_terrain"]
+voxel = ["dotrix_voxel"]
 
 [workspace]
 members = [
@@ -34,6 +35,7 @@ members = [
   "dotrix_primitives",
   "dotrix_sky",
   "dotrix_terrain",
+  "dotrix_voxel",
 ]
 
 [dependencies.dotrix_core]
@@ -76,6 +78,11 @@ version = "0.5"
 path = "./dotrix_terrain"
 optional = true
 
+[dependencies.dotrix_voxel]
+version = "0.5"
+path = "./dotrix_voxel"
+optional = true
+
 [dev-dependencies.rand]
 version = "0.8"
 
@@ -125,3 +132,8 @@ path = "examples/msaa/main.rs"
 [[example]]
 name = "normal_map"
 path = "examples/normal_map/main.rs"
+
+[[example]]
+name = "voxel_sdf"
+path = "examples/voxel_sdf/main.rs"
+required-features = ["voxel"]

assets/textures/Bricks075B/license.md

@@ -0,0 +1,27 @@
+# Source
+
+https://ambientcg.com/view?id=Bricks075B
+
+# Licensing
+
+All the PBR materials, brushes, photos and 3D models which are offered for download on ambientCG are provided under the Creative Commons CC0 1.0 Universal License.
+
+Creative Commons - CC0 1.0 Universal
+
+# Summary
+
+The Creative Commons CC0 license gives you the freedom to use these assets…
+
+    … in your own creations of any kind for free.
+    … even in situations that require them to be redistributed as individual files (for example as part of an open source video game or tool).
+    … for commercial projects.
+
+There is no requirement to give credit but it would of course be appreciated.
+
+# Giving credit
+
+If you wish to give credit you can do so using this text:
+
+```
+Contains assets from ambientCG.com, licensed under CC0 1.0 Universal.
+```

assets/textures/PaintedPlaster010/license.md

@@ -0,0 +1,27 @@
+# Source
+
+https://ambientcg.com/view?id=PaintedPlaster010
+
+# Licensing
+
+All the PBR materials, brushes, photos and 3D models which are offered for download on ambientCG are provided under the Creative Commons CC0 1.0 Universal License.
+
+Creative Commons - CC0 1.0 Universal
+
+# Summary
+
+The Creative Commons CC0 license gives you the freedom to use these assets…
+
+    … in your own creations of any kind for free.
+    … even in situations that require them to be redistributed as individual files (for example as part of an open source video game or tool).
+    … for commercial projects.
+
+There is no requirement to give credit but it would of course be appreciated.
+
+# Giving credit
+
+If you wish to give credit you can do so using this text:
+
+```
+Contains assets from ambientCG.com, licensed under CC0 1.0 Universal.
+```

assets/textures/PavingStones113/license.md

@@ -0,0 +1,27 @@
+# Source
+
+https://ambientcg.com/view?id=Bricks076C
+
+# Licensing
+
+All the PBR materials, brushes, photos and 3D models which are offered for download on ambientCG are provided under the Creative Commons CC0 1.0 Universal License.
+
+Creative Commons - CC0 1.0 Universal
+
+# Summary
+
+The Creative Commons CC0 license gives you the freedom to use these assets…
+
+    … in your own creations of any kind for free.
+    … even in situations that require them to be redistributed as individual files (for example as part of an open source video game or tool).
+    … for commercial projects.
+
+There is no requirement to give credit but it would of course be appreciated.
+
+# Giving credit
+
+If you wish to give credit you can do so using this text:
+
+```
+Contains assets from ambientCG.com, licensed under CC0 1.0 Universal.
+```

dotrix_core/src/assets/mesh.rs

@@ -354,7 +354,7 @@ mod tests {
             [-width, width, width],
         ];
 
-        width = width / 2.0;
+        width /= 2.0;
 
         let verticies_test_original_2: Vec<[f32; 3]> = vec![
             [-width, -width, -width],
@@ -367,7 +367,7 @@ mod tests {
             [-width, width, width],
         ];
 
-        width = width / 2.0;
+        width /= 2.0;
 
         let verticies_test_original_3: Vec<[u32; 3]> = vec![
             [-width as u32, -width as u32, -width as u32],

dotrix_core/src/assets/shader.rs

@@ -16,6 +16,7 @@ impl Shader {
     /// Loads the shader to GPU
     pub fn load(&mut self, renderer: &Renderer) {
         if !self.module.loaded() {
+            self.module.label = self.name.clone();
             renderer.load_shader(&mut self.module, &self.code);
         }
     }

dotrix_core/src/assets/texture.rs

@@ -45,4 +45,17 @@ impl Texture {
     pub fn unload(&mut self) {
         self.buffer.unload();
     }
+
+    /// Fetch data from the gpu
+    ///
+    /// This is useful textures that are altered on the gpu
+    ///
+    /// This operation is slow and should mostly be
+    /// used for debugging
+    pub fn fetch_from_gpu(
+        &mut self,
+        renderer: &mut Renderer,
+    ) -> impl std::future::Future<Output = Result<Vec<u8>, wgpu::BufferAsyncError>> {
+        renderer.fetch_texture(&self.buffer, [self.width, self.height, self.depth])
+    }
 }

dotrix_core/src/cubemap.rs

@@ -32,7 +32,7 @@ impl Default for CubeMap {
             bottom: Id::default(),
             back: Id::default(),
             front: Id::default(),
-            buffer: TextureBuffer::new("CubeMap Texture Buffer"),
+            buffer: TextureBuffer::new_cube("CubeMap Texture Buffer"),
         }
     }
 }

dotrix_core/src/renderer.rs

@@ -84,7 +84,7 @@ impl Renderer {
         buffer.load(self.context(), attributes, indices, count as u32);
     }*/
 
-    /// Loads the texture buffer to GPU
+    /// Loads the texture buffer to GPU, this will recreate the texture and will need to be rebound
     pub fn load_texture<'a>(
         &self,
         texture: &mut Texture,
@@ -95,11 +95,42 @@ impl Renderer {
         texture.load(self.context(), width, height, layers);
     }
 
+    /// Load data from cpu to a texture buffer on GPU
+    /// This will fail if texture has not been loaded with `load_texture`
+    /// possible unexpected results occur if the dimensions differs from it dimensions at load time
+    pub fn update_texture<'a>(
+        &self,
+        texture: &mut Texture,
+        width: u32,
+        height: u32,
+        layers: &'a [&'a [u8]],
+    ) {
+        texture.update(self.context(), width, height, layers);
+    }
+
+    /// This will `[update_texture]` if texture has been loaded or `[load_texture]` if not
+    /// the same cavets of `[update_texture]` apply in that care must be taken not to change
+    /// the dimensions between `load` and `update`
+    pub fn update_or_load_texture<'a>(
+        &self,
+        texture: &mut Texture,
+        width: u32,
+        height: u32,
+        layers: &'a [&'a [u8]],
+    ) {
+        texture.update_or_load(self.context(), width, height, layers);
+    }
+
     /// Loads the buffer to GPU
     pub fn load_buffer<'a>(&self, buffer: &mut Buffer, data: &'a [u8]) {
         buffer.load(self.context(), data);
     }
 
+    /// Create a buffer on GPU without data
+    pub fn create_buffer(&self, buffer: &mut Buffer, size: u32, mapped: bool) {
+        buffer.create(self.context(), size, mapped);
+    }
+
     /// Loads the sampler to GPU
     pub fn load_sampler(&self, sampler: &mut Sampler) {
         sampler.load(self.context());
@@ -164,6 +195,26 @@ impl Renderer {
             .run_compute_pipeline(pipeline.shader, &pipeline.bindings, args);
     }
 
+    /// Copy a texture to a buffer
+    pub fn copy_texture_to_buffer(
+        &mut self,
+        texture: &Texture,
+        buffer: &Buffer,
+        extent: [u32; 3],
+        bytes_per_pixel: u32,
+    ) {
+        self.context_mut()
+            .run_copy_texture_to_buffer(texture, buffer, extent, bytes_per_pixel);
+    }
+
+    /// Fetch texture from GPU
+    pub fn fetch_texture(
+        &mut self,
+        texture: &Texture,
+        dimensions: [u32; 3],
+    ) -> impl std::future::Future<Output = Result<Vec<u8>, wgpu::BufferAsyncError>> {
+        texture.fetch_from_gpu(dimensions, self.context_mut())
+    }
     /// Returns surface size
     pub fn surface_size(&self) -> Vec2 {
         let ctx = self.context();
@@ -263,6 +314,10 @@ pub fn release(mut renderer: Mut<Renderer>) {
     if renderer.cycle == 0 {
         renderer.cycle = 1;
     }
+    // Check for resource cleanups and mapping callbacks
+    if let Some(context) = renderer.context.as_ref() {
+        context.device.poll(wgpu::Maintain::Poll);
+    }
 }
 
 /// Resize handling system