StrafesNET/strafe-project
6
Fork 4
Code Issues3 Pull Requests Packages Projects Releases2 Wiki Activity

map-tool: lower case all the things

Browse Source
This commit is contained in:
Quaternions 2025-02-04 13:12:28 -08:00
parent 8e91fbb08e
commit 4805d237e2
1 changed files with 9 additions and 4 deletions

13
map-tool/src/source.rs

@ -139,20 +139,25 @@ fn recursive_vmt_loader<'bsp,'vpk,'a>(finder:BspFinder<'bsp,'vpk>,material:vmt_p
'vpk:'a, 'vpk:'a,
{ {
match get_some_texture(material){ match get_some_texture(material){
VMTContent::VMT(s)=>recursive_vmt_loader(finder,get_vmt(finder,s.as_str())?), VMTContent::VMT(mut s)=>{
s.make_ascii_lowercase();
recursive_vmt_loader(finder,get_vmt(finder,&s)?)
},
VMTContent::VTF(s)=>{ VMTContent::VTF(s)=>{
let mut texture_file_name=PathBuf::from("materials"); let mut texture_file_name=PathBuf::from("materials");
texture_file_name.push(s); texture_file_name.push(s);
texture_file_name.set_extension("vtf"); texture_file_name.set_extension("vtf");
texture_file_name.as_mut_os_str().make_ascii_lowercase();
Ok(finder.find(texture_file_name.to_str().unwrap())?) Ok(finder.find(texture_file_name.to_str().unwrap())?)
}, },
VMTContent::Patch(mat)=>recursive_vmt_loader(finder, VMTContent::Patch(mat)=>recursive_vmt_loader(finder,
mat.resolve(|search_name| mat.resolve(|search_name|{
match finder.find(search_name)?{ let name_lowercase=search_name.to_lowercase();
match finder.find(&name_lowercase)?{
Some(bytes)=>Ok(String::from_utf8(bytes.into_owned())?), Some(bytes)=>Ok(String::from_utf8(bytes.into_owned())?),
None=>Err(LoadVMTError::NotFound), None=>Err(LoadVMTError::NotFound),
} }
)? })?
), ),
VMTContent::Unsupported=>Err(LoadVMTError::Unsupported), VMTContent::Unsupported=>Err(LoadVMTError::Unsupported),
VMTContent::Unresolved=>Err(LoadVMTError::Unresolved), VMTContent::Unresolved=>Err(LoadVMTError::Unresolved),