summaryrefslogtreecommitdiff
path: root/shared/src/resources.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-01-07 15:33:42 +0100
committermetamuffin <metamuffin@disroot.org>2025-01-07 15:33:42 +0100
commit9af9fc6e9981fbb582fad9f69ad6bb0d96856b5e (patch)
tree7321528247a9f56776faff9de4c9c8fd97a1e531 /shared/src/resources.rs
parent4065dbe5b73839d4d3ed45a30bcc466ea414f3b5 (diff)
downloadweareserver-9af9fc6e9981fbb582fad9f69ad6bb0d96856b5e.tar
weareserver-9af9fc6e9981fbb582fad9f69ad6bb0d96856b5e.tar.bz2
weareserver-9af9fc6e9981fbb582fad9f69ad6bb0d96856b5e.tar.zst
remove pbr prefix
Diffstat (limited to 'shared/src/resources.rs')
-rw-r--r--shared/src/resources.rs52
1 files changed, 26 insertions, 26 deletions
diff --git a/shared/src/resources.rs b/shared/src/resources.rs
index 4c6321f..512e161 100644
--- a/shared/src/resources.rs
+++ b/shared/src/resources.rs
@@ -19,15 +19,15 @@ pub struct Part {
pub va_position: Option<[Resource; 3]>,
pub va_normal: Option<[Resource; 3]>,
pub va_texcoord: Option<[Resource; 2]>,
- pub va_pbr_roughness: Option<Resource>,
- pub va_pbr_metallic: Option<Resource>,
- pub va_pbr_albedo: Option<[Resource; 3]>,
- pub va_pbr_transmission: Option<Resource>,
+ pub va_roughness: Option<Resource>,
+ pub va_metallic: Option<Resource>,
+ pub va_albedo: Option<[Resource; 3]>,
+ pub va_transmission: Option<Resource>,
pub tex_normal: Option<Resource>,
- pub tex_pbr_roughness: Option<Resource>,
- pub tex_pbr_metallic: Option<Resource>,
- pub tex_pbr_albedo: Option<Resource>,
- pub tex_pbr_transmission: Option<Resource>,
+ pub tex_roughness: Option<Resource>,
+ pub tex_metallic: Option<Resource>,
+ pub tex_albedo: Option<Resource>,
+ pub tex_transmission: Option<Resource>,
}
#[derive(Debug, Default, Clone)]
@@ -98,15 +98,15 @@ impl ReadWrite for Part {
write_kv_opt(w, b"va_position", &self.va_position)?;
write_kv_opt(w, b"va_normal", &self.va_normal)?;
write_kv_opt(w, b"va_texcoord", &self.va_texcoord)?;
- write_kv_opt(w, b"va_pbr_roughness", &self.va_pbr_roughness)?;
- write_kv_opt(w, b"va_pbr_metallic", &self.va_pbr_metallic)?;
- write_kv_opt(w, b"va_pbr_albedo", &self.va_pbr_albedo)?;
- write_kv_opt(w, b"va_pbr_transmission", &self.va_pbr_transmission)?;
+ write_kv_opt(w, b"va_roughness", &self.va_roughness)?;
+ 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"tex_normal", &self.tex_normal)?;
- write_kv_opt(w, b"tex_pbr_roughness", &self.tex_pbr_roughness)?;
- write_kv_opt(w, b"tex_pbr_metallic", &self.tex_pbr_metallic)?;
- write_kv_opt(w, b"tex_pbr_albedo", &self.tex_pbr_albedo)?;
- write_kv_opt(w, b"tex_pbr_transmission", &self.tex_pbr_transmission)?;
+ 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)?;
Ok(())
}
@@ -127,18 +127,18 @@ impl ReadWrite for Part {
b"va_position" => s.va_position = Some(<_ as ReadWrite>::read(&mut v)?),
b"va_normal" => s.va_normal = Some(<_ as ReadWrite>::read(&mut v)?),
b"va_texcoord" => s.va_texcoord = Some(<_ as ReadWrite>::read(&mut v)?),
- b"va_pbr_roughness" => s.va_pbr_roughness = Some(<_ as ReadWrite>::read(&mut v)?),
- b"va_pbr_metallic" => s.va_pbr_metallic = Some(<_ as ReadWrite>::read(&mut v)?),
- b"va_pbr_albedo" => s.va_pbr_albedo = Some(<_ as ReadWrite>::read(&mut v)?),
- b"va_pbr_transmission" => {
- s.va_pbr_transmission = Some(<_ as ReadWrite>::read(&mut v)?)
+ b"va_roughness" => s.va_roughness = Some(<_ as ReadWrite>::read(&mut v)?),
+ b"va_metallic" => s.va_metallic = Some(<_ as ReadWrite>::read(&mut v)?),
+ b"va_albedo" => s.va_albedo = Some(<_ as ReadWrite>::read(&mut v)?),
+ b"va_transmission" => {
+ s.va_transmission = Some(<_ as ReadWrite>::read(&mut v)?)
}
b"tex_normal" => s.tex_normal = Some(<_ as ReadWrite>::read(&mut v)?),
- b"tex_pbr_roughness" => s.tex_pbr_roughness = Some(<_ as ReadWrite>::read(&mut v)?),
- b"tex_pbr_metallic" => s.tex_pbr_metallic = Some(<_ as ReadWrite>::read(&mut v)?),
- b"tex_pbr_albedo" => s.tex_pbr_albedo = Some(<_ as ReadWrite>::read(&mut v)?),
- b"tex_pbr_transmission" => {
- s.tex_pbr_transmission = Some(<_ as ReadWrite>::read(&mut v)?)
+ b"tex_roughness" => s.tex_roughness = Some(<_ as ReadWrite>::read(&mut v)?),
+ b"tex_metallic" => s.tex_metallic = Some(<_ as ReadWrite>::read(&mut v)?),
+ b"tex_albedo" => s.tex_albedo = Some(<_ as ReadWrite>::read(&mut v)?),
+ b"tex_transmission" => {
+ s.tex_transmission = Some(<_ as ReadWrite>::read(&mut v)?)
}
x => warn!("unknown part key: {:?}", String::from_utf8_lossy(x)),
}