Cleaned up what we expose via bindgen.

Author: weegeekps

wasm-splats/src/lib.rs

@@ -1,38 +1,33 @@
+pub mod models;
 pub mod radix;
 pub mod texture_gen;
 
-use js_sys::{Float32Array, Object, Uint32Array, Uint8Array};
+use js_sys::{Float32Array, Uint32Array, Uint8Array};
 use wasm_bindgen::prelude::*;
+use crate::models::TextureData;
 
 /// Generate a splat texture from the given attributes.
 ///
 /// Wraps the [`texture_gen::generate_texture_from_attrs`] function for access from JavaScript.
 #[wasm_bindgen]
-pub fn generate_splat_texture_from_attrs(
+pub fn generate_splat_texture(
     positions: &Float32Array,
     scales: &Float32Array,
     rotations: &Float32Array,
     colors: &Uint8Array,
     count: usize,
-) -> Result<Object, JsValue> {
-    let texture_data =
-        texture_gen::generate_texture_from_attrs(positions, scales, rotations, colors, count)?;
-
-    let js_data = Uint32Array::new_with_length(texture_data.width() * texture_data.height() * 4);
-    js_data.copy_from(&texture_data.data());
-
-    let result = Object::new();
-    js_sys::Reflect::set(&result, &"data".into(), &js_data)?;
-    js_sys::Reflect::set(
-        &result,
-        &"width".into(),
-        &(texture_data.width() as f64).into(),
-    )?;
-    js_sys::Reflect::set(
-        &result,
-        &"height".into(),
-        &(texture_data.height() as f64).into(),
-    )?;
+) -> Result<TextureData, JsValue> {
+    texture_gen::generate_texture_from_attrs(positions, scales, rotations, colors, count)
+}
 
-    Ok(result)
+/// Sorts the Gaussian Splats by depth using a radix sort.
+/// 
+/// Wraps the [`radix::radix_sort_gaussians_indexes`] function for access from JavaScript.
+#[wasm_bindgen]
+pub fn radix_sort_gaussians_indexes(
+    positions: &Float32Array,
+    model_view: &Float32Array,
+    count: usize,
+) -> Result<Uint32Array, JsValue> {
+    radix::radix_sort_gaussians_indexes(positions, model_view, count)
 }

wasm-splats/src/models.rs

@@ -0,0 +1,44 @@
+//! Module encapsulating the data models exposed through WebAssembly.
+
+use wasm_bindgen::prelude::wasm_bindgen;
+
+/// A structure representing texture data. This is used to pass the texture data from generation in [`texture_gen`] to the JavaScript side.
+#[wasm_bindgen]
+pub struct TextureData {
+    /// The texture data.
+    data: Vec<u32>,
+    /// Width of the texture in pixels.
+    width: u32,
+    /// Height of the texture in pixels.
+    height: u32,
+}
+
+#[wasm_bindgen]
+impl TextureData {
+    /// Getter for the underlying texture data. Always returns a copy.
+    #[wasm_bindgen(getter)]
+    pub fn data(&self) -> Vec<u32> {
+        self.data.clone()
+    }
+
+    /// Getter for the width of the texture in pixels.
+    #[wasm_bindgen(getter)]
+    pub fn width(&self) -> u32 {
+        self.width
+    }
+
+    /// Getter for the height of the texture in pixels.
+    #[wasm_bindgen(getter)]
+    pub fn height(&self) -> u32 {
+        self.height
+    }
+
+    /// Creates a new texture data object with the underlying data, width, and height.
+    pub fn new(data: Vec<u32>, width: u32, height: u32) -> Self {
+        TextureData {
+            data,
+            width,
+            height,
+        }
+    }
+}

wasm-splats/src/radix.rs

@@ -2,11 +2,9 @@ use js_sys::{Float32Array, Uint32Array};
 use wasm_bindgen::prelude::*;
 
 /// Sorts the Gaussian Splats by depth using a radix sort.
-#[wasm_bindgen]
 pub fn radix_sort_gaussians_indexes(
     positions: &Float32Array,
     model_view: &Float32Array,
-    _texture_width: u32, // TODO: FIGURE OUT IF THIS IS NEEDED.
     count: usize,
 ) -> Result<Uint32Array, JsValue> {
     if positions.length() as usize != count * 3 {

wasm-splats/src/texture_gen.rs

@@ -1,46 +1,6 @@
 use js_sys::{Float32Array, Uint8Array};
 use wasm_bindgen::prelude::*;
-
-/// Represents a texture data object.
-#[wasm_bindgen]
-pub struct TextureData {
-    /// The texture data.
-    data: Vec<u32>,
-    /// Width of the texture in pixels.
-    width: u32,
-    /// Height of the texture in pixels.
-    height: u32,
-}
-
-#[wasm_bindgen]
-impl TextureData {
-    /// Getter for the underlying texture data. Always returns a copy.
-    #[wasm_bindgen(getter)]
-    pub fn data(&self) -> Vec<u32> {
-        self.data.clone()
-    }
-
-    /// Getter for the width of the texture in pixels.
-    #[wasm_bindgen(getter)]
-    pub fn width(&self) -> u32 {
-        self.width
-    }
-
-    /// Getter for the height of the texture in pixels.
-    #[wasm_bindgen(getter)]
-    pub fn height(&self) -> u32 {
-        self.height
-    }
-
-    /// Creates a new texture data object with the underlying data, width, and height.
-    pub fn new(data: Vec<u32>, width: u32, height: u32) -> Self {
-        TextureData {
-            data,
-            width,
-            height,
-        }
-    }
-}
+use crate::models::TextureData;
 
 /// Converts a 32-bit float to a 16-bit integer.
 fn float_to_half(f: f32) -> i16 {
@@ -88,7 +48,6 @@ fn float_to_half(f: f32) -> i16 {
 }
 
 /// Generates a texture from the given attributes.
-#[wasm_bindgen]
 pub fn generate_texture_from_attrs(
     positions: &Float32Array,
     scales: &Float32Array,
@@ -172,9 +131,5 @@ pub fn generate_texture_from_attrs(
             | ((float_to_half(4.0 * sigma[5]) as u32 & 0xFFFF) << 16);
     }
 
-    Ok(TextureData {
-        data: tex_data,
-        width: tex_width,
-        height: tex_height,
-    })
+    Ok(TextureData::new(tex_data, tex_width, tex_height))
 }