Glow backend

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "three-d"
-version = "0.10.0" # Remember to update example links
+version = "0.11.0" # Remember to update example links
 authors = ["Asger Nyman Christiansen <asgernyman@gmail.com>"]
 edition = "2021"
 description = "2D/3D renderer - makes it simple to draw stuff across platforms (including web)"
@@ -23,9 +23,9 @@ egui-gui = ["egui"] # Additional GUI features
 image-io = ["image"] # Additional image functionality, for example loading an image to a texture
 obj-io = ["wavefront_obj", "image-io"]
 gltf-io = ["gltf", "image-io"]
-debug = [] # Prints OpenGL debug information (only available when NOT building for the wasm32 architecture)
 
 [dependencies]
+glow = "0.11"
 log = "0.4"
 cgmath = "0.18"
 half = {version="1.8", features=["std", "num-traits", "zerocopy", "serde"]}

README.md

@@ -1,4 +1,4 @@
-![Logo](https://asny.github.io/three-d/0.10/logo.png)
+![Logo](https://asny.github.io/three-d/0.11/logo.png)
 
 # `three-d`
 
@@ -39,7 +39,7 @@ The crate consist of three main modules for drawing, `context`, `core` and `rend
 
 ### [Examples](https://github.com/asny/three-d/tree/master/examples)
 
-![PBR example](https://asny.github.io/three-d/0.10/pbr.png)
+![PBR example](https://asny.github.io/three-d/0.11/pbr.png)
 
 Several examples covering most features can be found in the [examples folder](https://github.com/asny/three-d/tree/master/examples). 
 

examples/README.md

@@ -101,6 +101,10 @@ This is the recomended starting point for a gentle introduction to `three-d`.
 
 ![Forest example](https://asny.github.io/three-d/0.11/forest.png)
 
+## Volume [[code](https://github.com/asny/three-d/tree/master/examples/volume/src/main.rs)] [[demo](https://asny.github.io/three-d/0.11/volume.html)]
+
+![Volume example](https://asny.github.io/three-d/0.11/volume.png)
+
 ## Normals [[code](https://github.com/asny/three-d/tree/master/examples/normals/src/main.rs)] [[demo](https://asny.github.io/three-d/0.11/normals.html)]
 
 ![Normals example](https://asny.github.io/three-d/0.11/normals.png)

examples/environment/src/main.rs

@@ -38,7 +38,7 @@ pub async fn run(screenshot: Option<std::path::PathBuf>) {
     .unwrap();
     let skybox = Skybox::new_with_texture(
         &context,
-        TextureCubeMap::<f16>::new_from_equirectangular(
+        TextureCubeMap::new_from_equirectangular::<Vector3<f16>>(
             &context,
             &loaded.hdr_image("chinese_garden_4k").unwrap(),
         )

examples/fireworks/src/main.rs

@@ -136,7 +136,7 @@ pub fn run(screenshot: Option<std::path::PathBuf>) {
                             * explosion_direction,
                     });
                 }
-                particles.update(&data);
+                particles.update(&data).unwrap();
             }
 
             Screen::write(&context, ClearState::color(0.0, 0.0, 0.0, 1.0), || {

examples/headless/src/main.rs

@@ -39,7 +39,7 @@ fn main() {
     .unwrap();
 
     // Create a color texture to render into
-    let mut texture = Texture2D::<u8>::new_empty(
+    let mut texture = Texture2D::new_empty::<[u8; 4]>(
         &context,
         viewport.width,
         viewport.height,
@@ -48,7 +48,6 @@ fn main() {
         None,
         Wrapping::ClampToEdge,
         Wrapping::ClampToEdge,
-        Format::RGBA,
     )
     .unwrap();
 

examples/logo/src/main.rs

@@ -69,9 +69,11 @@ pub async fn run(screenshot: Option<std::path::PathBuf>) {
     )
     .await
     .unwrap();
-    let environment_map =
-        TextureCubeMap::<f32>::new_from_equirectangular(&context, &loaded.hdr_image("").unwrap())
-            .unwrap();
+    let environment_map = TextureCubeMap::new_from_equirectangular::<Vector3<f16>>(
+        &context,
+        &loaded.hdr_image("").unwrap(),
+    )
+    .unwrap();
     let light = AmbientLight {
         environment: Some(Environment::new(&context, &environment_map).unwrap()),
         ..Default::default()

examples/mandelbrot/src/main.rs

@@ -58,18 +58,17 @@ pub fn run(screenshot: Option<std::path::PathBuf>) {
     )
     .unwrap();
 
-    let indices = vec![0u8, 1, 2, 2, 3, 0];
-    let positions = vec![
-        vec3(-2.0, -2.0, 0.0),
-        vec3(2.0, -2.0, 0.0),
-        vec3(2.0, 2.0, 0.0),
-        vec3(-2.0, 2.0, 0.0),
-    ];
     let mut mesh = Model::new_with_material(
         &context,
         &CpuMesh {
-            indices: Some(Indices::U8(indices)),
-            positions: Positions::F32(positions),
+            positions: Positions::F32(vec![
+                vec3(-2.0, -2.0, 0.0),
+                vec3(2.0, -2.0, 0.0),
+                vec3(2.0, 2.0, 0.0),
+                vec3(2.0, 2.0, 0.0),
+                vec3(-2.0, 2.0, 0.0),
+                vec3(-2.0, -2.0, 0.0),
+            ]),
             ..Default::default()
         },
         MandelbrotMaterial {},

src/context.rs

@@ -1,71 +1,7 @@
-#![allow(missing_docs)]
-
 //!
-//! Low-level graphics abstraction layer which maps one-to-one with the OpenGL graphics API on desktop
-//! and WebGL2 bindings provided by the [web-sys](https://rustwasm.github.io/wasm-bindgen/api/web_sys/) crate on web.
+//! Low-level graphics abstraction layer which maps one-to-one with the OpenGL graphics API on native
+//! and WebGL2 graphics API on web. This is just a re-export of the [glow](https://crates.io/crates/glow) crate.
 //! Use this if you want to have complete control of a feature but be aware that there are no safety checks.
 //!
 
-// GL
-#[cfg(not(target_arch = "wasm32"))]
-mod ogl;
-
-#[doc(inline)]
-#[cfg(not(target_arch = "wasm32"))]
-pub use ogl::*;
-
-// WEBGL
-#[cfg(target_arch = "wasm32")]
-mod wgl2;
-
-#[doc(inline)]
-#[cfg(target_arch = "wasm32")]
-pub use wgl2::*;
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum ShaderType {
-    Vertex,
-    Fragment,
-}
-
-#[derive(Copy, Clone, Eq, PartialEq, Hash)]
-pub enum DataType {
-    HalfFloat,
-    Float,
-    Byte,
-    UnsignedByte,
-    Short,
-    UnsignedShort,
-    Int,
-    UnsignedInt,
-}
-
-impl DataType {
-    fn byte_size(&self) -> u32 {
-        match self {
-            DataType::HalfFloat => 2,
-            DataType::Float => std::mem::size_of::<f32>() as u32,
-            DataType::UnsignedByte => std::mem::size_of::<u8>() as u32,
-            DataType::UnsignedShort => std::mem::size_of::<u16>() as u32,
-            DataType::UnsignedInt => std::mem::size_of::<u32>() as u32,
-            DataType::Byte => std::mem::size_of::<i8>() as u32,
-            DataType::Short => std::mem::size_of::<i16>() as u32,
-            DataType::Int => std::mem::size_of::<i32>() as u32,
-        }
-    }
-}
-
-impl DataType {
-    fn to_const(&self) -> u32 {
-        match self {
-            DataType::Float => consts::FLOAT,
-            DataType::HalfFloat => consts::HALF_FLOAT,
-            DataType::Byte => consts::BYTE,
-            DataType::UnsignedByte => consts::UNSIGNED_BYTE,
-            DataType::Short => consts::SHORT,
-            DataType::UnsignedShort => consts::UNSIGNED_SHORT,
-            DataType::Int => consts::INT,
-            DataType::UnsignedInt => consts::UNSIGNED_INT,
-        }
-    }
-}
+pub use glow::*;