StrafesNET/strafe-project
6
Fork 4
Code Issues5 Pull Requests2 Packages Projects Releases2 Wiki Activity

update rbx_mesh

Browse Source
This commit is contained in:
Quaternions
2025-01-31 10:01:20 -08:00
parent 99bcf6d661
commit b4f1b017f7
3 changed files with 7 additions and 7 deletions

4
Cargo.lock generated

@ -1955,9 +1955,9 @@ dependencies = [
[[package]] [[package]]
name = "rbx_mesh" name = "rbx_mesh"
version = "0.2.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1205fdae1f9a8bfd5d8fbe6036066673d530ee392f7840d6f8a24e763559c7fd" checksum = "36372fd7feb6d3c5780d2ada39d1397be9e196ddfbb23ba1d84e7a75cf790adb"
dependencies = [ dependencies = [
"binrw", "binrw",
"lazy-regex", "lazy-regex",

2
lib/rbx_loader/Cargo.toml

@ -15,7 +15,7 @@ glam = "0.29.0"
lazy-regex = "3.1.0" lazy-regex = "3.1.0"
rbx_binary = { version = "0.7.4", registry = "strafesnet" } rbx_binary = { version = "0.7.4", registry = "strafesnet" }
rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" } rbx_dom_weak = { version = "2.7.0", registry = "strafesnet" }
rbx_mesh = "0.2.0" rbx_mesh = "0.3.1"
rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" } rbx_reflection_database = { version = "0.2.10", registry = "strafesnet" }
rbx_xml = { version = "0.13.3", registry = "strafesnet" } rbx_xml = { version = "0.13.3", registry = "strafesnet" }
rbxassetid = { version = "0.1.0", path = "../rbxassetid" } rbxassetid = { version = "0.1.0", path = "../rbxassetid" }

8
lib/rbx_loader/src/union.rs

@ -75,9 +75,9 @@ pub fn convert(
std::io::Cursor::new(roblox_mesh_data) std::io::Cursor::new(roblox_mesh_data)
).map_err(Error::RobloxMeshData)?; ).map_err(Error::RobloxMeshData)?;
let graphics_mesh=match mesh_data{ let graphics_mesh=match mesh_data{
rbx_mesh::mesh_data::CSGPHS::CSGK(_)=>return Err(Error::Block), rbx_mesh::mesh_data::MeshData::CSGK(_)=>return Err(Error::Block),
rbx_mesh::mesh_data::CSGPHS::CSGPHS2(mesh_data2)=>mesh_data2.mesh, rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::CSGMDL2(mesh_data2))=>mesh_data2.mesh,
rbx_mesh::mesh_data::CSGPHS::CSGPHS4(mesh_data4)=>mesh_data4.mesh, rbx_mesh::mesh_data::MeshData::CSGMDL(rbx_mesh::mesh_data::CSGMDL::CSGMDL4(mesh_data4))=>mesh_data4.mesh,
}; };
for [vertex_id0,vertex_id1,vertex_id2] in graphics_mesh.faces{ for [vertex_id0,vertex_id1,vertex_id2] in graphics_mesh.faces{
let face=[ let face=[
@ -126,7 +126,7 @@ pub fn convert(
//physics //physics
let physics_convex_meshes=if !roblox_physics_data.is_empty(){ let physics_convex_meshes=if !roblox_physics_data.is_empty(){
let physics_data=rbx_mesh::read_physics_data( let physics_data=rbx_mesh::read_physics_data_versioned(
std::io::Cursor::new(roblox_physics_data) std::io::Cursor::new(roblox_physics_data)
).map_err(Error::RobloxPhysicsData)?; ).map_err(Error::RobloxPhysicsData)?;
let physics_convex_meshes=match physics_data{ let physics_convex_meshes=match physics_data{