From c48b54f3fb7bbe9046915eb99eca02fa84dc55c9 Mon Sep 17 00:00:00 2001
From: tcmal <me@aria.rip>
Date: Sun, 25 Aug 2024 17:44:22 +0100
Subject: feat(render): multithreaded texture loading

also a bunch of supporting changes
---
 stockton-levels/src/q3/light_vols.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'stockton-levels/src/q3/light_vols.rs')

diff --git a/stockton-levels/src/q3/light_vols.rs b/stockton-levels/src/q3/light_vols.rs
index 1741569..932219e 100644
--- a/stockton-levels/src/q3/light_vols.rs
+++ b/stockton-levels/src/q3/light_vols.rs
@@ -17,10 +17,10 @@
 
 use std::convert::TryInto;
 
-use super::Q3BSPFile;
+use super::Q3BspFile;
 use crate::coords::CoordSystem;
 use crate::traits::light_vols::*;
-use crate::types::{ParseError, Result, RGB};
+use crate::types::{ParseError, Result, Rgb};
 
 const VOL_LENGTH: usize = (3 * 2) + 2;
 
@@ -34,8 +34,8 @@ pub fn from_data(data: &[u8]) -> Result<Box<[LightVol]>> {
     for n in 0..length {
         let data = &data[n * VOL_LENGTH..(n + 1) * VOL_LENGTH];
         vols.push(LightVol {
-            ambient: RGB::from_slice(&data[0..3]),
-            directional: RGB::from_slice(&data[3..6]),
+            ambient: Rgb::from_slice(&data[0..3]),
+            directional: Rgb::from_slice(&data[3..6]),
             dir: data[6..8].try_into().unwrap(),
         });
     }
@@ -43,7 +43,7 @@ pub fn from_data(data: &[u8]) -> Result<Box<[LightVol]>> {
     Ok(vols.into_boxed_slice())
 }
 
-impl<T: CoordSystem> HasLightVols for Q3BSPFile<T> {
+impl<T: CoordSystem> HasLightVols for Q3BspFile<T> {
     type LightVolsIter<'a> = std::slice::Iter<'a, LightVol>;
 
     fn lightvols_iter(&self) -> Self::LightVolsIter<'_> {
-- 
cgit v1.2.3