From c98498f5b6cb147bc506f0aba27065e98b08a8d8 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Thu, 9 Jan 2025 02:07:03 +0100
Subject: add mesh alpha property and correct usage of transmission

---
 shared/src/resources.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'shared/src/resources.rs')

diff --git a/shared/src/resources.rs b/shared/src/resources.rs
index 8854794..628fa1e 100644
--- a/shared/src/resources.rs
+++ b/shared/src/resources.rs
@@ -49,6 +49,7 @@ pub struct MeshPart {
     pub g_roughness: Option<f32>,
     pub g_albedo: Option<Vec3A>,
     pub g_transmission: Option<f32>,
+    pub g_alpha: Option<f32>,
     pub g_emission: Option<Vec3A>,
     pub va_position: Option<[Resource<AttributeArray>; 3]>,
     pub va_normal: Option<[Resource<AttributeArray>; 3]>,
@@ -57,12 +58,14 @@ pub struct MeshPart {
     pub va_metallic: Option<Resource<AttributeArray>>,
     pub va_albedo: Option<[Resource<AttributeArray>; 3]>,
     pub va_transmission: Option<Resource<AttributeArray>>,
+    pub va_alpha: Option<Resource<AttributeArray>>,
     pub va_emission: Option<[Resource<AttributeArray>; 3]>,
     pub tex_normal: Option<Resource<Image>>,
     pub tex_roughness: Option<Resource<Image>>,
     pub tex_metallic: Option<Resource<Image>>,
     pub tex_albedo: Option<Resource<Image>>,
     pub tex_transmission: Option<Resource<Image>>,
+    pub tex_alpha: Option<Resource<Image>>,
     pub tex_emission: Option<Resource<Image>>,
 }
 
@@ -168,6 +171,7 @@ impl ReadWrite for MeshPart {
         write_kv_opt(w, b"g_roughness", &self.g_roughness)?;
         write_kv_opt(w, b"g_albedo", &self.g_albedo)?;
         write_kv_opt(w, b"g_transmission", &self.g_transmission)?;
+        write_kv_opt(w, b"g_alpha", &self.g_alpha)?;
         write_kv_opt(w, b"g_emission", &self.g_emission)?;
         write_kv_opt(w, b"va_position", &self.va_position)?;
         write_kv_opt(w, b"va_normal", &self.va_normal)?;
@@ -176,12 +180,14 @@ impl ReadWrite for MeshPart {
         write_kv_opt(w, b"va_metallic", &self.va_metallic)?;
         write_kv_opt(w, b"va_albedo", &self.va_albedo)?;
         write_kv_opt(w, b"va_transmission", &self.va_transmission)?;
+        write_kv_opt(w, b"va_alpha", &self.va_transmission)?;
         write_kv_opt(w, b"va_emission", &self.va_emission)?;
         write_kv_opt(w, b"tex_normal", &self.tex_normal)?;
         write_kv_opt(w, b"tex_roughness", &self.tex_roughness)?;
         write_kv_opt(w, b"tex_metallic", &self.tex_metallic)?;
         write_kv_opt(w, b"tex_albedo", &self.tex_albedo)?;
         write_kv_opt(w, b"tex_transmission", &self.tex_transmission)?;
+        write_kv_opt(w, b"tex_alpha", &self.tex_alpha)?;
         write_kv_opt(w, b"tex_emission", &self.tex_emission)?;
         Ok(())
     }
@@ -193,6 +199,7 @@ impl ReadWrite for MeshPart {
             b"g_roughness" => Ok(s.g_roughness = Some(read_slice(v)?)),
             b"g_albedo" => Ok(s.g_albedo = Some(read_slice(v)?)),
             b"g_transmission" => Ok(s.g_transmission = Some(read_slice(v)?)),
+            b"g_alpha" => Ok(s.g_alpha = Some(read_slice(v)?)),
             b"g_emission" => Ok(s.g_emission = Some(read_slice(v)?)),
             b"va_position" => Ok(s.va_position = Some(read_slice(v)?)),
             b"va_normal" => Ok(s.va_normal = Some(read_slice(v)?)),
@@ -201,12 +208,14 @@ impl ReadWrite for MeshPart {
             b"va_metallic" => Ok(s.va_metallic = Some(read_slice(v)?)),
             b"va_albedo" => Ok(s.va_albedo = Some(read_slice(v)?)),
             b"va_transmission" => Ok(s.va_transmission = Some(read_slice(v)?)),
+            b"va_alpha" => Ok(s.va_alpha = Some(read_slice(v)?)),
             b"va_emission" => Ok(s.va_emission = Some(read_slice(v)?)),
             b"tex_normal" => Ok(s.tex_normal = Some(read_slice(v)?)),
             b"tex_roughness" => Ok(s.tex_roughness = Some(read_slice(v)?)),
             b"tex_metallic" => Ok(s.tex_metallic = Some(read_slice(v)?)),
             b"tex_albedo" => Ok(s.tex_albedo = Some(read_slice(v)?)),
             b"tex_transmission" => Ok(s.tex_transmission = Some(read_slice(v)?)),
+            b"tex_alpha" => Ok(s.tex_alpha = Some(read_slice(v)?)),
             b"tex_emission" => Ok(s.tex_emission = Some(read_slice(v)?)),
             x => Ok(warn!(
                 "unknown mesh part key: {:?}",
-- 
cgit v1.2.3-70-g09d2