interpreterK/strafe-project
1
Fork 0
forked from StrafesNET/strafe-project
Code Pull Requests Activity

update deps including Decal.TextureContent

Browse Source
This commit is contained in:
Rhys Lloyd
2025-04-23 18:05:09 -07:00
parent ca88eb1cad
commit 67cafd8cbb
5 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bsp_loader/Cargo.toml
View File

@@ -13,7 +13,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
glam = "0.30.0"
strafesnet_common = { version = "0.6.0", path = "../common", registry = "strafesnet" }
strafesnet_deferred_loader = { version = "0.5.0", path = "../deferred_loader", registry = "strafesnet" }
vbsp = "0.8.0"
vbsp = "0.9.1"
vbsp-entities-css = "0.6.0"
vmdl = "0.2.0"
vpk = "0.3.0"

9
lib/rbx_loader/src/rbx.rs
View File

@@ -417,12 +417,12 @@ fn get_texture_description<'a>(
continue;
};
let (
Some(rbx_dom_weak::types::Variant::ContentId(content)),
Some(rbx_dom_weak::types::Variant::Content(content)),
Some(rbx_dom_weak::types::Variant::Enum(normalid)),
Some(rbx_dom_weak::types::Variant::Color3(decal_color3)),
Some(rbx_dom_weak::types::Variant::Float32(decal_transparency)),
)=(
decal.properties.get(&static_ustr("Texture")),
decal.properties.get(&static_ustr("TextureContent")),
decal.properties.get(&static_ustr("Face")),
decal.properties.get(&static_ustr("Color3")),
decal.properties.get(&static_ustr("Transparency")),
@@ -430,7 +430,10 @@ fn get_texture_description<'a>(
println!("Decal is missing a required property");
continue;
};
let texture_id=Some(content.as_str());
let texture_id=match content.value(){
rbx_dom_weak::types::ContentType::Uri(uri)=>Some(uri.as_str()),
_=>None,
};
let render_id=render_config_deferred_loader.acquire_render_config_id(texture_id);
let Ok(cube_face)=normalid.to_u32().try_into()else{
println!("NormalId is invalid");