From 1cf26bbb776f1f7509a7a743035e80af54e1cb28 Mon Sep 17 00:00:00 2001 From: Quaternions <krakow20@gmail.com> Date: Tue, 13 Feb 2024 18:49:58 -0800 Subject: [PATCH] switch to read-convert style --- src/bsp.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bsp.rs b/src/bsp.rs index 5450768..181572b 100644 --- a/src/bsp.rs +++ b/src/bsp.rs @@ -1,10 +1,10 @@ -use strafesnet_common::{model,integer,gameplay_attributes}; +use strafesnet_common::{map,model,integer,gameplay_attributes}; const VALVE_SCALE:f32=1.0/16.0; fn valve_transform(v:[f32;3])->integer::Planar64Vec3{ integer::Planar64Vec3::try_from([v[0]*VALVE_SCALE,v[2]*VALVE_SCALE,-v[1]*VALVE_SCALE]).unwrap() } -pub fn convert<F:FnMut(&str)->Option<model::TextureId>>(bsp:vbsp::Bsp,mut acquire_id:F)->model::CompleteMap{ +pub fn convert<F:FnMut(&str)->Option<model::TextureId>>(bsp:vbsp::Bsp,mut acquire_id:F)->map::CompleteMap{ let mut spawn_point=integer::Planar64Vec3::ZERO; let vertices: Vec<_> = bsp