fix texture transforms

src/data/mod.rs

@@ -172,8 +172,8 @@ impl<const LEN: usize> BinRead for FixedString<LEN> {
 
 #[derive(Debug, Clone, BinRead)]
 pub struct TextureInfo {
-    pub texture_scale: [f32; 4],
+    pub texture_transforms_u: [f32; 4],
-    pub texture_transform: [f32; 4],
+    pub texture_transform_v: [f32; 4],
     pub light_map_scale: [f32; 4],
     pub light_map_transform: [f32; 4],
     pub flags: TextureFlags,

src/handle/game.rs

@@ -1,8 +1,8 @@
 use super::Handle;
 use crate::data::*;
 
-impl Handle<'_, StaticPropLump> {
+impl<'a> Handle<'a, StaticPropLump> {
-    pub fn model(&self) -> &str {
+    pub fn model(&self) -> &'a str {
         self.bsp.static_props.dict.name[self.prop_type as usize].as_str()
     }
 }

src/handle/mod.rs

@@ -64,6 +64,10 @@ impl<'a> Handle<'a, Model> {
             .iter()
             .map(move |face| Handle::new(bsp, face))
     }
+
+    pub fn textures(&self) -> impl Iterator<Item = Handle<'_, TextureInfo>> {
+        self.bsp.textures()
+    }
 }
 
 impl Handle<'_, Node> {
@@ -128,16 +132,18 @@ impl<'a> Handle<'a, TextureInfo> {
     }
 
     pub fn u(&self, pos: Vector) -> f32 {
-        (self.texture_scale[0] * pos.x
+        (self.texture_transforms_u[0] * pos.x
-            + self.texture_scale[1] * pos.y
+            + self.texture_transforms_u[1] * pos.y
-            + self.texture_scale[2] * pos.z)
+            + self.texture_transforms_u[2] * pos.z
+            + self.texture_transforms_u[3])
             / self.texture_data().width as f32
     }
 
     pub fn v(&self, pos: Vector) -> f32 {
-        (self.texture_transform[0] * pos.x
+        (self.texture_transform_v[0] * pos.x
-            + self.texture_transform[1] * pos.y
+            + self.texture_transform_v[1] * pos.y
-            + self.texture_transform[2] * pos.z)
+            + self.texture_transform_v[2] * pos.z
+            + self.texture_transform_v[3])
             / self.texture_data().height as f32
     }