beginning of gltf on the slab

schell · Nov 29, 2023 · 64fab88 · 64fab88
1 parent 40c8775
commit 64fab88
Show file tree

Hide file tree

Showing 31 changed files with 699 additions and 644 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,6 @@ members = [
     "crates/renderling-shader",
     "crates/renderling-gpui",
     "crates/renderling-derive",
-    "crates/sandbox",
 ]
 
 exclude = ["./shaders"]

diff --git a/crates/renderling-shader/src/skybox.rs b/crates/renderling-shader/src/skybox.rs
@@ -9,7 +9,13 @@ use spirv_std::{
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Float;
 
-use crate::{math, stage::GpuConstants, IsVector};
+use crate::{
+    id::Id,
+    math,
+    slab::Slab,
+    stage::{Camera, GpuConstants},
+    IsVector,
+};
 
 const INV_ATAN: Vec2 = Vec2::new(0.1591, core::f32::consts::FRAC_1_PI);
 
@@ -37,6 +43,36 @@ pub fn vertex(
     *gl_pos = clip_pos.xyww();
 }
 
+#[spirv(vertex)]
+pub fn slabbed_vertex(
+    #[spirv(instance_index)] camera_index: u32,
+    #[spirv(vertex_index)] vertex_index: u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] slab: &[u32],
+    local_pos: &mut Vec3,
+    #[spirv(position)] clip_pos: &mut Vec4,
+) {
+    let camera_id = Id::<Camera>::from(camera_index);
+    let camera = slab.read(camera_id);
+    let point = math::CUBE[vertex_index as usize];
+    *local_pos = point;
+    let camera_view_without_translation = Mat3::from_mat4(camera.view);
+    let rot_view = Mat4::from_mat3(camera_view_without_translation);
+    let position = camera.projection * rot_view * point.extend(1.0);
+    *clip_pos = position.xyww();
+}
+
+/// Colors a skybox using a cubemap texture.
+#[spirv(fragment)]
+pub fn stage_skybox_cubemap(
+    #[spirv(descriptor_set = 1, binding = 8)] texture: &Cubemap,
+    #[spirv(descriptor_set = 1, binding = 9)] sampler: &Sampler,
+    local_pos: Vec3,
+    out_color: &mut Vec4,
+) {
+    let env_color: Vec3 = texture.sample(*sampler, local_pos.alt_norm_or_zero()).xyz();
+    *out_color = env_color.extend(1.0);
+}
+
 /// Colors a skybox using a cubemap texture.
 #[spirv(fragment)]
 pub fn fragment_cubemap(

diff --git a/crates/renderling-shader/src/slab.rs b/crates/renderling-shader/src/slab.rs
@@ -138,9 +138,6 @@ impl Slabbed for glam::Mat4 {
     }
 
     fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
-        if slab.len() < index + 16 {
-            return index;
-        }
         let Self {
             x_axis,
             y_axis,
@@ -160,9 +157,6 @@ impl Slabbed for glam::Vec2 {
     }
 
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 2 {
-            return index;
-        }
         let index = self.x.read_slab(index, slab);
         let index = self.y.read_slab(index, slab);
         index
@@ -184,9 +178,6 @@ impl Slabbed for glam::Vec3 {
     }
 
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 3 {
-            return index;
-        }
         let Self { x, y, z } = self;
         let index = x.read_slab(index, slab);
         let index = y.read_slab(index, slab);
@@ -195,9 +186,6 @@ impl Slabbed for glam::Vec3 {
     }
 
     fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
-        if slab.len() < index + 3 {
-            return index;
-        }
         let Self { x, y, z } = self;
         let index = x.write_slab(index, slab);
         let index = y.write_slab(index, slab);
@@ -212,19 +200,13 @@ impl Slabbed for glam::Vec4 {
     }
 
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 4 {
-            return index;
-        }
         let index = self.x.read_slab(index, slab);
         let index = self.y.read_slab(index, slab);
         let index = self.z.read_slab(index, slab);
         self.w.read_slab(index, slab)
     }
 
     fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
-        if slab.len() < index + 4 {
-            return index;
-        }
         let Self { x, y, z, w } = self;
         let index = x.write_slab(index, slab);
         let index = y.write_slab(index, slab);
@@ -237,10 +219,8 @@ impl Slabbed for glam::Quat {
     fn slab_size() -> usize {
         16
     }
+
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 4 {
-            return index;
-        }
         let Self { x, y, z, w } = self;
         let index = x.read_slab(index, slab);
         let index = y.read_slab(index, slab);
@@ -249,9 +229,6 @@ impl Slabbed for glam::Quat {
     }
 
     fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
-        if slab.len() < index + 4 {
-            return index;
-        }
         let Self { x, y, z, w } = self;
         let index = x.write_slab(index, slab);
         let index = y.write_slab(index, slab);
@@ -266,18 +243,12 @@ impl Slabbed for glam::UVec2 {
     }
 
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 2 {
-            return index;
-        }
         let index = self.x.read_slab(index, slab);
         let index = self.y.read_slab(index, slab);
         index
     }
 
     fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
-        if slab.len() < index + 2 {
-            return index;
-        }
         let index = self.x.write_slab(index, slab);
         let index = self.y.write_slab(index, slab);
         index
@@ -290,19 +261,13 @@ impl Slabbed for glam::UVec3 {
     }
 
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 3 {
-            return index;
-        }
         let index = self.x.read_slab(index, slab);
         let index = self.y.read_slab(index, slab);
         let index = self.z.read_slab(index, slab);
         index
     }
 
     fn write_slab(&self, index: usize, slab: &mut [u32]) -> usize {
-        if slab.len() < index + 3 {
-            return index;
-        }
         let index = self.x.write_slab(index, slab);
         let index = self.y.write_slab(index, slab);
         let index = self.z.write_slab(index, slab);
@@ -316,9 +281,6 @@ impl Slabbed for glam::UVec4 {
     }
 
     fn read_slab(&mut self, index: usize, slab: &[u32]) -> usize {
-        if slab.len() < index + 4 {
-            return index;
-        }
         let index = self.x.read_slab(index, slab);
         let index = self.y.read_slab(index, slab);
         let index = self.z.read_slab(index, slab);

diff --git a/crates/renderling-shader/src/stage/texture.rs b/crates/renderling-shader/src/stage/texture.rs
@@ -1,8 +1,13 @@
 //! GPU textures.
+//!
+// TODO: move this (stage/texture.rs) to lib/texture.rs
 use glam::{UVec2, Vec2};
 use renderling_derive::Slabbed;
 
-use crate::{self as renderling_shader, bits::{bits, extract, insert}};
+use crate::{
+    self as renderling_shader,
+    bits::{bits, extract, insert},
+};
 
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::*;