forked from StrafesNET/strafe-project
fix lints
This commit is contained in:
@@ -94,7 +94,7 @@ impl GraphicsCamera{
|
|||||||
raw
|
raw
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl std::default::Default for GraphicsCamera{
|
impl Default for GraphicsCamera{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self{
|
Self{
|
||||||
screen_size:glam::UVec2::ONE,
|
screen_size:glam::UVec2::ONE,
|
||||||
@@ -167,7 +167,7 @@ impl GraphicsState{
|
|||||||
}
|
}
|
||||||
pub fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,map:&map::CompleteMap){
|
pub fn generate_models(&mut self,device:&wgpu::Device,queue:&wgpu::Queue,map:&map::CompleteMap){
|
||||||
//generate texture view per texture
|
//generate texture view per texture
|
||||||
let texture_views:HashMap<strafesnet_common::model::TextureId,wgpu::TextureView>=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{
|
let texture_views:HashMap<model::TextureId,wgpu::TextureView>=map.textures.iter().enumerate().filter_map(|(texture_id,texture_data)|{
|
||||||
let texture_id=model::TextureId::new(texture_id as u32);
|
let texture_id=model::TextureId::new(texture_id as u32);
|
||||||
let image=match ddsfile::Dds::read(std::io::Cursor::new(texture_data)){
|
let image=match ddsfile::Dds::read(std::io::Cursor::new(texture_data)){
|
||||||
Ok(image)=>image,
|
Ok(image)=>image,
|
||||||
@@ -803,7 +803,7 @@ impl GraphicsState{
|
|||||||
module:&shader,
|
module:&shader,
|
||||||
entry_point:Some("vs_entity_texture"),
|
entry_point:Some("vs_entity_texture"),
|
||||||
buffers:&[wgpu::VertexBufferLayout{
|
buffers:&[wgpu::VertexBufferLayout{
|
||||||
array_stride:std::mem::size_of::<GraphicsVertex>() as wgpu::BufferAddress,
|
array_stride:size_of::<GraphicsVertex>() as wgpu::BufferAddress,
|
||||||
step_mode:wgpu::VertexStepMode::Vertex,
|
step_mode:wgpu::VertexStepMode::Vertex,
|
||||||
attributes:&wgpu::vertex_attr_array![0=>Float32x3,1=>Float32x2,2=>Float32x3,3=>Float32x4],
|
attributes:&wgpu::vertex_attr_array![0=>Float32x3,1=>Float32x2,2=>Float32x3,3=>Float32x4],
|
||||||
}],
|
}],
|
||||||
|
|||||||
@@ -500,7 +500,7 @@ impl TransformedMesh<'_>{
|
|||||||
transform,
|
transform,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn verts<'a>(&'a self)->impl Iterator<Item=vec3::Vector3<Fixed<2,64>>>+'a{
|
pub fn verts<'a>(&'a self)->impl Iterator<Item=Vector3<Fixed<2,64>>>+'a{
|
||||||
self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos))
|
self.view.data.verts.iter().map(|&Vert(pos)|self.transform.vertex.transform_point3(pos))
|
||||||
}
|
}
|
||||||
fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
|
fn farthest_vert(&self,dir:Planar64Vec3)->SubmeshVertId{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ pub enum InternalInstruction{
|
|||||||
pub struct InputState{
|
pub struct InputState{
|
||||||
mouse:MouseState,
|
mouse:MouseState,
|
||||||
next_mouse:MouseState,
|
next_mouse:MouseState,
|
||||||
controls:strafesnet_common::controls_bitflag::Controls,
|
controls:Controls,
|
||||||
}
|
}
|
||||||
impl InputState{
|
impl InputState{
|
||||||
fn set_next_mouse(&mut self,next_mouse:MouseState){
|
fn set_next_mouse(&mut self,next_mouse:MouseState){
|
||||||
@@ -302,7 +302,7 @@ impl PhysicsCamera{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl std::default::Default for PhysicsCamera{
|
impl Default for PhysicsCamera{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self{
|
Self{
|
||||||
sensitivity:Ratio64Vec2::ONE*200_000,
|
sensitivity:Ratio64Vec2::ONE*200_000,
|
||||||
@@ -385,7 +385,7 @@ mod gameplay{
|
|||||||
self.unordered_checkpoints.clear();
|
self.unordered_checkpoints.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl std::default::Default for ModeState{
|
impl Default for ModeState{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self{
|
Self{
|
||||||
mode_id:gameplay_modes::ModeId::MAIN,
|
mode_id:gameplay_modes::ModeId::MAIN,
|
||||||
@@ -1928,7 +1928,7 @@ mod test{
|
|||||||
fn test_collision_rotated(relative_body:Body,expected_collision_time:Option<Time>){
|
fn test_collision_rotated(relative_body:Body,expected_collision_time:Option<Time>){
|
||||||
let h0=HitboxMesh::new(PhysicsMesh::unit_cube(),
|
let h0=HitboxMesh::new(PhysicsMesh::unit_cube(),
|
||||||
integer::Planar64Affine3::new(
|
integer::Planar64Affine3::new(
|
||||||
integer::Planar64Mat3::from_cols([
|
Planar64Mat3::from_cols([
|
||||||
int3(5,0,1)>>1,
|
int3(5,0,1)>>1,
|
||||||
int3(0,1,0)>>1,
|
int3(0,1,0)>>1,
|
||||||
int3(-1,0,5)>>1,
|
int3(-1,0,5)>>1,
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ pub enum SessionInputInstruction{
|
|||||||
Mouse(glam::IVec2),
|
Mouse(glam::IVec2),
|
||||||
SetControl(strafesnet_common::physics::SetControlInstruction),
|
SetControl(strafesnet_common::physics::SetControlInstruction),
|
||||||
Mode(ImplicitModeInstruction),
|
Mode(ImplicitModeInstruction),
|
||||||
Misc(strafesnet_common::physics::MiscInstruction),
|
Misc(MiscInstruction),
|
||||||
}
|
}
|
||||||
/// Implicit mode instruction are fed separately to session.
|
/// Implicit mode instruction are fed separately to session.
|
||||||
/// Session generates the explicit mode instructions interlaced with a SetSensitivity instruction
|
/// Session generates the explicit mode instructions interlaced with a SetSensitivity instruction
|
||||||
@@ -152,10 +152,10 @@ enum ViewState{
|
|||||||
pub struct Session{
|
pub struct Session{
|
||||||
directories:Directories,
|
directories:Directories,
|
||||||
user_settings:UserSettings,
|
user_settings:UserSettings,
|
||||||
mouse_interpolator:crate::mouse_interpolator::MouseInterpolator,
|
mouse_interpolator:MouseInterpolator,
|
||||||
view_state:ViewState,
|
view_state:ViewState,
|
||||||
//gui:GuiState
|
//gui:GuiState
|
||||||
geometry_shared:physics::PhysicsData,
|
geometry_shared:PhysicsData,
|
||||||
simulation:Simulation,
|
simulation:Simulation,
|
||||||
// below fields not included in lite session
|
// below fields not included in lite session
|
||||||
recording:Recording,
|
recording:Recording,
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ fn physics_bug_2()->Result<(),ReplayError>{
|
|||||||
// wait one second to activate the bug
|
// wait one second to activate the bug
|
||||||
// hit=Some(ModelId(2262))
|
// hit=Some(ModelId(2262))
|
||||||
PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
|
PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
|
||||||
time:strafesnet_common::integer::Time::from_millis(500),
|
time:Time::from_millis(500),
|
||||||
instruction:strafesnet_common::physics::Instruction::Idle,
|
instruction:strafesnet_common::physics::Instruction::Idle,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -68,7 +68,7 @@ fn physics_bug_3()->Result<(),ReplayError>{
|
|||||||
let mut physics=PhysicsState::new_with_body(body);
|
let mut physics=PhysicsState::new_with_body(body);
|
||||||
// wait one second to activate the bug
|
// wait one second to activate the bug
|
||||||
PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
|
PhysicsContext::run_input_instruction(&mut physics,&physics_data,strafesnet_common::instruction::TimedInstruction{
|
||||||
time:strafesnet_common::integer::Time::from_millis(500),
|
time:Time::from_millis(500),
|
||||||
instruction:strafesnet_common::physics::Instruction::Idle,
|
instruction:strafesnet_common::physics::Instruction::Idle,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use crate::{valve_transform_normal,valve_transform_dist};
|
|||||||
#[derive(Hash,Eq,PartialEq)]
|
#[derive(Hash,Eq,PartialEq)]
|
||||||
struct Face{
|
struct Face{
|
||||||
normal:integer::Planar64Vec3,
|
normal:integer::Planar64Vec3,
|
||||||
dot:integer::Planar64,
|
dot:Planar64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|||||||
@@ -347,7 +347,7 @@ pub struct PartialMap1{
|
|||||||
modes:NormalizedModes,
|
modes:NormalizedModes,
|
||||||
}
|
}
|
||||||
impl PartialMap1{
|
impl PartialMap1{
|
||||||
pub fn add_prop_meshes<'a>(
|
pub fn add_prop_meshes(
|
||||||
self,
|
self,
|
||||||
prop_meshes:Meshes<model::Mesh>,
|
prop_meshes:Meshes<model::Mesh>,
|
||||||
)->PartialMap2{
|
)->PartialMap2{
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ impl Loader for TextureLoader{
|
|||||||
type Error=TextureError;
|
type Error=TextureError;
|
||||||
type Index<'a>=Cow<'a,str>;
|
type Index<'a>=Cow<'a,str>;
|
||||||
type Resource=Texture;
|
type Resource=Texture;
|
||||||
fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
|
fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
|
||||||
let file_name=format!("textures/{}.dds",index);
|
let file_name=format!("textures/{}.dds",index);
|
||||||
let mut file=std::fs::File::open(file_name)?;
|
let mut file=std::fs::File::open(file_name)?;
|
||||||
let mut data=Vec::new();
|
let mut data=Vec::new();
|
||||||
@@ -111,7 +111,7 @@ impl ModelLoader<'_,'_>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<'bsp,'vpk> Loader for ModelLoader<'bsp,'vpk>{
|
impl Loader for ModelLoader<'_,'_>{
|
||||||
type Error=MeshError;
|
type Error=MeshError;
|
||||||
type Index<'a>=&'a str where Self:'a;
|
type Index<'a>=&'a str where Self:'a;
|
||||||
type Resource=vmdl::Model;
|
type Resource=vmdl::Model;
|
||||||
@@ -151,7 +151,7 @@ impl MeshLoader<'_,'_,'_,'_>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<'str,'bsp,'vpk,'load> Loader for MeshLoader<'bsp,'vpk,'load,'str>{
|
impl Loader for MeshLoader<'_,'_,'_,'_>{
|
||||||
type Error=MeshError;
|
type Error=MeshError;
|
||||||
type Index<'a>=&'a str where Self:'a;
|
type Index<'a>=&'a str where Self:'a;
|
||||||
type Resource=Mesh;
|
type Resource=Mesh;
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ pub struct StyleModifiers{
|
|||||||
//unused
|
//unused
|
||||||
pub mass:Planar64,
|
pub mass:Planar64,
|
||||||
}
|
}
|
||||||
impl std::default::Default for StyleModifiers{
|
impl Default for StyleModifiers{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self::roblox_bhop()
|
Self::roblox_bhop()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ impl<T> std::fmt::Display for Time<T>{
|
|||||||
write!(f,"{}s+{:09}ns",self.0/Self::ONE_SECOND.0,self.0%Self::ONE_SECOND.0)
|
write!(f,"{}s+{:09}ns",self.0/Self::ONE_SECOND.0,self.0%Self::ONE_SECOND.0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<T> std::default::Default for Time<T>{
|
impl<T> Default for Time<T>{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self::raw(0)
|
Self::raw(0)
|
||||||
}
|
}
|
||||||
@@ -126,7 +126,7 @@ impl_time_additive_assign_operator!(core::ops::AddAssign,add_assign);
|
|||||||
impl_time_additive_assign_operator!(core::ops::SubAssign,sub_assign);
|
impl_time_additive_assign_operator!(core::ops::SubAssign,sub_assign);
|
||||||
impl_time_additive_assign_operator!(core::ops::RemAssign,rem_assign);
|
impl_time_additive_assign_operator!(core::ops::RemAssign,rem_assign);
|
||||||
impl<T> std::ops::Mul for Time<T>{
|
impl<T> std::ops::Mul for Time<T>{
|
||||||
type Output=Ratio<fixed_wide::fixed::Fixed<2,64>,fixed_wide::fixed::Fixed<2,64>>;
|
type Output=Ratio<Fixed<2,64>,Fixed<2,64>>;
|
||||||
#[inline]
|
#[inline]
|
||||||
fn mul(self,rhs:Self)->Self::Output{
|
fn mul(self,rhs:Self)->Self::Output{
|
||||||
Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
|
Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
|
||||||
@@ -156,7 +156,7 @@ impl<T> core::ops::Mul<Time<T>> for Planar64{
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test_time{
|
mod test_time{
|
||||||
use super::*;
|
use super::*;
|
||||||
type Time=super::AbsoluteTime;
|
type Time=AbsoluteTime;
|
||||||
#[test]
|
#[test]
|
||||||
fn time_from_planar64(){
|
fn time_from_planar64(){
|
||||||
let a:Time=Planar64::from(1).into();
|
let a:Time=Planar64::from(1).into();
|
||||||
@@ -552,7 +552,7 @@ impl TryFrom<[f32;3]> for Unit32Vec3{
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
pub type Planar64TryFromFloatError=fixed_wide::fixed::FixedFromFloatError;
|
pub type Planar64TryFromFloatError=FixedFromFloatError;
|
||||||
pub type Planar64=fixed_wide::types::I32F32;
|
pub type Planar64=fixed_wide::types::I32F32;
|
||||||
pub type Planar64Vec3=linear_ops::types::Vector3<Planar64>;
|
pub type Planar64Vec3=linear_ops::types::Vector3<Planar64>;
|
||||||
pub type Planar64Mat3=linear_ops::types::Matrix3<Planar64>;
|
pub type Planar64Mat3=linear_ops::types::Matrix3<Planar64>;
|
||||||
@@ -562,11 +562,11 @@ pub mod vec3{
|
|||||||
pub const MIN:Planar64Vec3=Planar64Vec3::new([Planar64::MIN;3]);
|
pub const MIN:Planar64Vec3=Planar64Vec3::new([Planar64::MIN;3]);
|
||||||
pub const MAX:Planar64Vec3=Planar64Vec3::new([Planar64::MAX;3]);
|
pub const MAX:Planar64Vec3=Planar64Vec3::new([Planar64::MAX;3]);
|
||||||
pub const ZERO:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO;3]);
|
pub const ZERO:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO;3]);
|
||||||
pub const ZERO_2:linear_ops::types::Vector3<Fixed::<2,64>>=linear_ops::types::Vector3::new([Fixed::<2,64>::ZERO;3]);
|
pub const ZERO_2:Vector3<Fixed::<2,64>>=Vector3::new([Fixed::<2,64>::ZERO;3]);
|
||||||
pub const ZERO_3:linear_ops::types::Vector3<Fixed::<3,96>>=linear_ops::types::Vector3::new([Fixed::<3,96>::ZERO;3]);
|
pub const ZERO_3:Vector3<Fixed::<3,96>>=Vector3::new([Fixed::<3,96>::ZERO;3]);
|
||||||
pub const ZERO_4:linear_ops::types::Vector3<Fixed::<4,128>>=linear_ops::types::Vector3::new([Fixed::<4,128>::ZERO;3]);
|
pub const ZERO_4:Vector3<Fixed::<4,128>>=Vector3::new([Fixed::<4,128>::ZERO;3]);
|
||||||
pub const ZERO_5:linear_ops::types::Vector3<Fixed::<5,160>>=linear_ops::types::Vector3::new([Fixed::<5,160>::ZERO;3]);
|
pub const ZERO_5:Vector3<Fixed::<5,160>>=Vector3::new([Fixed::<5,160>::ZERO;3]);
|
||||||
pub const ZERO_6:linear_ops::types::Vector3<Fixed::<6,192>>=linear_ops::types::Vector3::new([Fixed::<6,192>::ZERO;3]);
|
pub const ZERO_6:Vector3<Fixed::<6,192>>=Vector3::new([Fixed::<6,192>::ZERO;3]);
|
||||||
pub const X:Planar64Vec3=Planar64Vec3::new([Planar64::ONE,Planar64::ZERO,Planar64::ZERO]);
|
pub const X:Planar64Vec3=Planar64Vec3::new([Planar64::ONE,Planar64::ZERO,Planar64::ZERO]);
|
||||||
pub const Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ONE,Planar64::ZERO]);
|
pub const Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ONE,Planar64::ZERO]);
|
||||||
pub const Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::ONE]);
|
pub const Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::ONE]);
|
||||||
|
|||||||
@@ -4,5 +4,5 @@ pub trait Loader{
|
|||||||
type Error:Error;
|
type Error:Error;
|
||||||
type Index<'a> where Self:'a;
|
type Index<'a> where Self:'a;
|
||||||
type Resource;
|
type Resource;
|
||||||
fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>;
|
fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -205,7 +205,8 @@ macro_rules! impl_matrix_named_fields_shape {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn deref(&self)->&Self::Target{
|
fn deref(&self)->&Self::Target{
|
||||||
// This cast is valid because Matrix has #[repr(transparent)]
|
// This cast is valid because Matrix has #[repr(transparent)]
|
||||||
let ptr=&self.array as *const [[T;$size_inner];$size_outer] as *const Self::Target;
|
let ptr:*const [[T;$size_inner];$size_outer]=&self.array;
|
||||||
|
let ptr=ptr as *const Self::Target;
|
||||||
// SAFETY: this pointer is non-null because it comes from a reference
|
// SAFETY: this pointer is non-null because it comes from a reference
|
||||||
unsafe{&*ptr}
|
unsafe{&*ptr}
|
||||||
}
|
}
|
||||||
@@ -214,7 +215,8 @@ macro_rules! impl_matrix_named_fields_shape {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn deref_mut(&mut self)->&mut Self::Target{
|
fn deref_mut(&mut self)->&mut Self::Target{
|
||||||
// This cast is valid because Matrix has #[repr(transparent)]
|
// This cast is valid because Matrix has #[repr(transparent)]
|
||||||
let ptr=&mut self.array as *mut [[T;$size_inner];$size_outer] as *mut Self::Target;
|
let ptr:*mut [[T;$size_inner];$size_outer]=&mut self.array;
|
||||||
|
let ptr=ptr as *mut Self::Target;
|
||||||
// SAFETY: this pointer is non-null because it comes from a reference
|
// SAFETY: this pointer is non-null because it comes from a reference
|
||||||
unsafe{&mut*ptr}
|
unsafe{&mut*ptr}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -331,7 +331,8 @@ macro_rules! impl_vector_named_fields {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn deref(&self)->&Self::Target{
|
fn deref(&self)->&Self::Target{
|
||||||
// This cast is valid because Vector has #[repr(transparent)]
|
// This cast is valid because Vector has #[repr(transparent)]
|
||||||
let ptr=&self.array as *const [T;$size] as *const Self::Target;
|
let ptr:*const [T;$size]=&self.array;
|
||||||
|
let ptr=ptr as *const Self::Target;
|
||||||
// SAFETY: this pointer is non-null because it comes from a reference
|
// SAFETY: this pointer is non-null because it comes from a reference
|
||||||
unsafe{&*ptr}
|
unsafe{&*ptr}
|
||||||
}
|
}
|
||||||
@@ -340,7 +341,8 @@ macro_rules! impl_vector_named_fields {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn deref_mut(&mut self)->&mut Self::Target{
|
fn deref_mut(&mut self)->&mut Self::Target{
|
||||||
// This cast is valid because Vector has #[repr(transparent)]
|
// This cast is valid because Vector has #[repr(transparent)]
|
||||||
let ptr=&mut self.array as *mut [T;$size] as *mut Self::Target;
|
let ptr:*mut [T;$size]=&mut self.array;
|
||||||
|
let ptr=ptr as *mut Self::Target;
|
||||||
// SAFETY: this pointer is non-null because it comes from a reference
|
// SAFETY: this pointer is non-null because it comes from a reference
|
||||||
unsafe{&mut*ptr}
|
unsafe{&mut*ptr}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ impl Loader for TextureLoader{
|
|||||||
type Error=TextureError;
|
type Error=TextureError;
|
||||||
type Index<'a>=&'a str;
|
type Index<'a>=&'a str;
|
||||||
type Resource=Texture;
|
type Resource=Texture;
|
||||||
fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
|
fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
|
||||||
let RobloxAssetId(asset_id)=index.parse()?;
|
let RobloxAssetId(asset_id)=index.parse()?;
|
||||||
let file_name=format!("textures/{}.dds",asset_id);
|
let file_name=format!("textures/{}.dds",asset_id);
|
||||||
let data=read_entire_file(file_name)?;
|
let data=read_entire_file(file_name)?;
|
||||||
@@ -157,7 +157,7 @@ impl Loader for MeshLoader{
|
|||||||
type Error=MeshError;
|
type Error=MeshError;
|
||||||
type Index<'a>=MeshIndex<'a>;
|
type Index<'a>=MeshIndex<'a>;
|
||||||
type Resource=MeshWithSize;
|
type Resource=MeshWithSize;
|
||||||
fn load<'a>(&mut self,index:Self::Index<'a>)->Result<Self::Resource,Self::Error>{
|
fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
|
||||||
let mesh=match index.mesh_type{
|
let mesh=match index.mesh_type{
|
||||||
MeshType::FileMesh=>{
|
MeshType::FileMesh=>{
|
||||||
let RobloxAssetId(asset_id)=index.content.parse()?;
|
let RobloxAssetId(asset_id)=index.content.parse()?;
|
||||||
|
|||||||
@@ -344,12 +344,12 @@ pub struct RobloxFaceTextureDescription{
|
|||||||
pub color:glam::Vec4,
|
pub color:glam::Vec4,
|
||||||
pub transform:RobloxTextureTransform,
|
pub transform:RobloxTextureTransform,
|
||||||
}
|
}
|
||||||
impl core::cmp::PartialEq for RobloxFaceTextureDescription{
|
impl PartialEq for RobloxFaceTextureDescription{
|
||||||
fn eq(&self,other:&Self)->bool{
|
fn eq(&self,other:&Self)->bool{
|
||||||
self.to_bits().eq(&other.to_bits())
|
self.to_bits().eq(&other.to_bits())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl core::cmp::Eq for RobloxFaceTextureDescription{}
|
impl Eq for RobloxFaceTextureDescription{}
|
||||||
impl core::hash::Hash for RobloxFaceTextureDescription{
|
impl core::hash::Hash for RobloxFaceTextureDescription{
|
||||||
fn hash<H:core::hash::Hasher>(&self,state:&mut H){
|
fn hash<H:core::hash::Hasher>(&self,state:&mut H){
|
||||||
self.to_bits().hash(state);
|
self.to_bits().hash(state);
|
||||||
@@ -775,10 +775,10 @@ struct MeshIdWithSize{
|
|||||||
mesh:model::MeshId,
|
mesh:model::MeshId,
|
||||||
size:Planar64Vec3,
|
size:Planar64Vec3,
|
||||||
}
|
}
|
||||||
fn acquire_mesh_id_from_render_config_id<'a>(
|
fn acquire_mesh_id_from_render_config_id(
|
||||||
primitive_meshes:&mut Vec<model::Mesh>,
|
primitive_meshes:&mut Vec<model::Mesh>,
|
||||||
mesh_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RenderConfigId,model::MeshId>>,
|
mesh_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RenderConfigId,model::MeshId>>,
|
||||||
loaded_meshes:&'a HashMap<model::MeshId,MeshWithSize>,
|
loaded_meshes:&HashMap<model::MeshId,MeshWithSize>,
|
||||||
old_mesh_id:model::MeshId,
|
old_mesh_id:model::MeshId,
|
||||||
render:RenderConfigId,
|
render:RenderConfigId,
|
||||||
)->Option<MeshIdWithSize>{
|
)->Option<MeshIdWithSize>{
|
||||||
@@ -798,10 +798,10 @@ fn acquire_mesh_id_from_render_config_id<'a>(
|
|||||||
size,
|
size,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
fn acquire_union_id_from_render_config_id<'a>(
|
fn acquire_union_id_from_render_config_id(
|
||||||
primitive_meshes:&mut Vec<model::Mesh>,
|
primitive_meshes:&mut Vec<model::Mesh>,
|
||||||
union_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RobloxPartDescription,model::MeshId>>,
|
union_id_from_render_config_id:&mut HashMap<model::MeshId,HashMap<RobloxPartDescription,model::MeshId>>,
|
||||||
loaded_meshes:&'a HashMap<model::MeshId,MeshWithSize>,
|
loaded_meshes:&HashMap<model::MeshId,MeshWithSize>,
|
||||||
old_union_id:model::MeshId,
|
old_union_id:model::MeshId,
|
||||||
part_texture_description:RobloxPartDescription,
|
part_texture_description:RobloxPartDescription,
|
||||||
)->Option<MeshIdWithSize>{
|
)->Option<MeshIdWithSize>{
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ impl<'a> EnumItem<'a>{
|
|||||||
Self{name:Some(name.as_ref()),value}
|
Self{name:Some(name.as_ref()),value}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<'a> From<rbx_types::Enum> for EnumItem<'a>{
|
impl From<rbx_types::Enum> for EnumItem<'_>{
|
||||||
fn from(e:rbx_types::Enum)->Self{
|
fn from(e:rbx_types::Enum)->Self{
|
||||||
EnumItem{
|
EnumItem{
|
||||||
name:None,
|
name:None,
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ use rbx_types::Ref;
|
|||||||
use rbx_dom_weak::{Ustr,InstanceBuilder,WeakDom};
|
use rbx_dom_weak::{Ustr,InstanceBuilder,WeakDom};
|
||||||
|
|
||||||
use crate::util::static_ustr;
|
use crate::util::static_ustr;
|
||||||
use crate::runner::vector3::Vector3;
|
|
||||||
use crate::runner::number::Number;
|
use crate::runner::number::Number;
|
||||||
|
|
||||||
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
@@ -44,7 +43,7 @@ pub fn class_is_a(class:&str,superclass:&str)->bool{
|
|||||||
};
|
};
|
||||||
db.has_superclass(class,superclass)
|
db.has_superclass(class,superclass)
|
||||||
}
|
}
|
||||||
fn get_full_name(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->String{
|
fn get_full_name(dom:&WeakDom,instance:&rbx_dom_weak::Instance)->String{
|
||||||
let mut full_name=instance.name.clone();
|
let mut full_name=instance.name.clone();
|
||||||
let mut pref=instance.parent();
|
let mut pref=instance.parent();
|
||||||
while let Some(parent)=dom.get_by_ref(pref){
|
while let Some(parent)=dom.get_by_ref(pref){
|
||||||
@@ -66,28 +65,28 @@ pub fn get_name_source(lua:&mlua::Lua,script:Instance)->Result<(String,String),m
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_first_child<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_child<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.name==name)
|
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.name==name)
|
||||||
}
|
}
|
||||||
pub fn find_first_descendant<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_descendant<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
dom.descendants_of(instance.referent()).find(|&inst|inst.name==name)
|
dom.descendants_of(instance.referent()).find(|&inst|inst.name==name)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_first_child_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_child_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.class==class)
|
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.class==class)
|
||||||
}
|
}
|
||||||
pub fn find_first_descendant_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_descendant_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
dom.descendants_of(instance.referent()).find(|&inst|inst.class==class)
|
dom.descendants_of(instance.referent()).find(|&inst|inst.class==class)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_first_child_which_is_a<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_child_which_is_a<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get();
|
||||||
let superclass_descriptor=db.classes.get(superclass)?;
|
let superclass_descriptor=db.classes.get(superclass)?;
|
||||||
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|{
|
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|{
|
||||||
db.classes.get(inst.class.as_str()).is_some_and(|descriptor|db.has_superclass(descriptor,superclass_descriptor))
|
db.classes.get(inst.class.as_str()).is_some_and(|descriptor|db.has_superclass(descriptor,superclass_descriptor))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
pub fn find_first_descendant_which_is_a<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_descendant_which_is_a<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get();
|
||||||
let superclass_descriptor=db.classes.get(superclass)?;
|
let superclass_descriptor=db.classes.get(superclass)?;
|
||||||
dom.descendants_of(instance.referent()).find(|inst|{
|
dom.descendants_of(instance.referent()).find(|inst|{
|
||||||
@@ -488,8 +487,8 @@ static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
|
|||||||
"GetService"=>GET_SERVICE,
|
"GetService"=>GET_SERVICE,
|
||||||
},
|
},
|
||||||
"Terrain"=>phf::phf_map!{
|
"Terrain"=>phf::phf_map!{
|
||||||
"FillBall"=>cf!(|_lua,_,_:(Vector3,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
"FillBall"=>cf!(|_lua,_,_:(crate::runner::vector3::Vector3,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
||||||
"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Vector3,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,crate::runner::vector3::Vector3,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
||||||
"FillCylinder"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Number,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
"FillCylinder"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Number,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
||||||
"SetMaterialColor"=>cf!(|_lua,_,_:(crate::runner::r#enum::CoerceEnum,crate::runner::color3::Color3)|mlua::Result::Ok(())),
|
"SetMaterialColor"=>cf!(|_lua,_,_:(crate::runner::r#enum::CoerceEnum,crate::runner::color3::Color3)|mlua::Result::Ok(())),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -48,6 +48,11 @@ fn init(lua:&mlua::Lua)->mlua::Result<()>{
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsafe fn extend_lifetime_mut<'a,T>(src:&mut T)->&'a mut T{
|
||||||
|
let ptr:*mut T=src;
|
||||||
|
unsafe{&mut*ptr}
|
||||||
|
}
|
||||||
|
|
||||||
impl Runner{
|
impl Runner{
|
||||||
pub fn new()->Result<Self,Error>{
|
pub fn new()->Result<Self,Error>{
|
||||||
let runner=Self{
|
let runner=Self{
|
||||||
@@ -65,8 +70,7 @@ impl Runner{
|
|||||||
// SAFETY: This is not a &'static mut WeakDom,
|
// SAFETY: This is not a &'static mut WeakDom,
|
||||||
// but as long as Runnable<'a> holds the lifetime of &'a mut Context
|
// but as long as Runnable<'a> holds the lifetime of &'a mut Context
|
||||||
// it is a valid unique reference.
|
// it is a valid unique reference.
|
||||||
let ptr=&mut context.dom as *mut rbx_dom_weak::WeakDom;
|
self.lua.set_app_data::<crate::context::LuaAppData>(unsafe{extend_lifetime_mut(&mut context.dom)});
|
||||||
self.lua.set_app_data::<crate::context::LuaAppData>(unsafe{&mut*ptr});
|
|
||||||
#[cfg(feature="run-service")]
|
#[cfg(feature="run-service")]
|
||||||
self.lua.set_app_data::<crate::scheduler::Scheduler>(crate::scheduler::Scheduler::default());
|
self.lua.set_app_data::<crate::scheduler::Scheduler>(crate::scheduler::Scheduler::default());
|
||||||
Ok(Runnable{
|
Ok(Runnable{
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ impl mlua::FromLua for ScriptSignal{
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl mlua::UserData for ScriptConnection{
|
impl mlua::UserData for ScriptConnection{
|
||||||
fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
|
fn add_fields<F:UserDataFields<Self>>(fields:&mut F){
|
||||||
fields.add_field_method_get("Connected",|_,this|{
|
fields.add_field_method_get("Connected",|_,this|{
|
||||||
Ok(this.position().is_some())
|
Ok(this.position().is_some())
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ impl Scheduler{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut crate::scheduler::Scheduler)->mlua::Result<T>)->mlua::Result<T>{
|
pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut Scheduler)->mlua::Result<T>)->mlua::Result<T>{
|
||||||
let mut scheduler=lua.app_data_mut::<crate::scheduler::Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
|
let mut scheduler=lua.app_data_mut::<Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
|
||||||
f(&mut *scheduler)
|
f(&mut *scheduler)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use strafesnet_common::physics::Time;
|
|||||||
|
|
||||||
const VERSION:u32=0;
|
const VERSION:u32=0;
|
||||||
|
|
||||||
type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,strafesnet_common::physics::Time>;
|
type TimedPhysicsInstruction=strafesnet_common::instruction::TimedInstruction<strafesnet_common::physics::Instruction,Time>;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum Error{
|
pub enum Error{
|
||||||
@@ -274,7 +274,7 @@ pub fn write_bot<W:BinWriterExt>(mut writer:W,physics_version:u32,instructions:i
|
|||||||
|
|
||||||
//probe header length
|
//probe header length
|
||||||
let mut bot_header_data=Vec::new();
|
let mut bot_header_data=Vec::new();
|
||||||
binrw::BinWrite::write_le(&header,&mut std::io::Cursor::new(&mut bot_header_data)).map_err(Error::InvalidData)?;
|
header.write_le(&mut std::io::Cursor::new(&mut bot_header_data)).map_err(Error::InvalidData)?;
|
||||||
|
|
||||||
// the first block location is the map header
|
// the first block location is the map header
|
||||||
block_location.push(offset);
|
block_location.push(offset);
|
||||||
|
|||||||
@@ -97,8 +97,8 @@ enum ResourceType{
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct ResourceMap<T>{
|
struct ResourceMap<T>{
|
||||||
meshes:HashMap<strafesnet_common::model::MeshId,T>,
|
meshes:HashMap<model::MeshId,T>,
|
||||||
textures:HashMap<strafesnet_common::model::TextureId,T>,
|
textures:HashMap<model::TextureId,T>,
|
||||||
}
|
}
|
||||||
impl<T> Default for ResourceMap<T>{
|
impl<T> Default for ResourceMap<T>{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
@@ -185,7 +185,7 @@ pub struct StreamableMap<R:BinReaderExt>{
|
|||||||
//this is every possible attribute... need some sort of streaming system
|
//this is every possible attribute... need some sort of streaming system
|
||||||
attributes:Vec<strafesnet_common::gameplay_attributes::CollisionAttributes>,
|
attributes:Vec<strafesnet_common::gameplay_attributes::CollisionAttributes>,
|
||||||
//this is every possible render configuration... shaders and such... need streaming
|
//this is every possible render configuration... shaders and such... need streaming
|
||||||
render_configs:Vec<strafesnet_common::model::RenderConfig>,
|
render_configs:Vec<model::RenderConfig>,
|
||||||
//this makes sense to keep in memory for streaming, a map of which blocks occupy what space
|
//this makes sense to keep in memory for streaming, a map of which blocks occupy what space
|
||||||
bvh:BvhNode<BlockId>,
|
bvh:BvhNode<BlockId>,
|
||||||
//something something resources hashmaps
|
//something something resources hashmaps
|
||||||
@@ -223,7 +223,7 @@ impl<R:BinReaderExt> StreamableMap<R>{
|
|||||||
}
|
}
|
||||||
Ok(Self{
|
Ok(Self{
|
||||||
file,
|
file,
|
||||||
modes:strafesnet_common::gameplay_modes::NormalizedModes::new(modes),
|
modes:gameplay_modes::NormalizedModes::new(modes),
|
||||||
attributes,
|
attributes,
|
||||||
render_configs,
|
render_configs,
|
||||||
bvh:strafesnet_common::bvh::generate_bvh(bvh),
|
bvh:strafesnet_common::bvh::generate_bvh(bvh),
|
||||||
@@ -366,12 +366,12 @@ fn collect_spacial_blocks(
|
|||||||
block_location.push(sequential_block_data.position());
|
block_location.push(sequential_block_data.position());
|
||||||
}else{
|
}else{
|
||||||
match bvh_node.into_content(){
|
match bvh_node.into_content(){
|
||||||
strafesnet_common::bvh::RecursiveContent::Branch(bvh_node_list)=>{
|
RecursiveContent::Branch(bvh_node_list)=>{
|
||||||
for bvh_node in bvh_node_list{
|
for bvh_node in bvh_node_list{
|
||||||
collect_spacial_blocks(block_location,block_headers,sequential_block_data,bvh_node)?;
|
collect_spacial_blocks(block_location,block_headers,sequential_block_data,bvh_node)?;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
strafesnet_common::bvh::RecursiveContent::Leaf(_)=>panic!(),//bvh branches are 20 leaves minimum
|
RecursiveContent::Leaf(_)=>panic!(),//bvh branches are 20 leaves minimum
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -384,13 +384,13 @@ pub fn write_map<W:BinWriterExt>(mut writer:W,map:strafesnet_common::map::Comple
|
|||||||
let boxen=map.models.into_iter().enumerate().map(|(model_id,model)|{
|
let boxen=map.models.into_iter().enumerate().map(|(model_id,model)|{
|
||||||
//grow your own aabb
|
//grow your own aabb
|
||||||
let mesh=map.meshes.get(model.mesh.get() as usize).ok_or(Error::InvalidMeshId(model.mesh))?;
|
let mesh=map.meshes.get(model.mesh.get() as usize).ok_or(Error::InvalidMeshId(model.mesh))?;
|
||||||
let mut aabb=strafesnet_common::aabb::Aabb::default();
|
let mut aabb=Aabb::default();
|
||||||
for &pos in &mesh.unique_pos{
|
for &pos in &mesh.unique_pos{
|
||||||
aabb.grow(model.transform.transform_point3(pos).narrow_1().unwrap());
|
aabb.grow(model.transform.transform_point3(pos).narrow_1().unwrap());
|
||||||
}
|
}
|
||||||
Ok(((model::ModelId::new(model_id as u32),model.into()),aabb))
|
Ok(((model::ModelId::new(model_id as u32),model.into()),aabb))
|
||||||
}).collect::<Result<Vec<_>,_>>()?;
|
}).collect::<Result<Vec<_>,_>>()?;
|
||||||
let bvh=weigh_contents(strafesnet_common::bvh::generate_bvh(boxen),&|_|std::mem::size_of::<newtypes::model::Model>());
|
let bvh=weigh_contents(strafesnet_common::bvh::generate_bvh(boxen),&|_|size_of::<newtypes::model::Model>());
|
||||||
//build blocks
|
//build blocks
|
||||||
//block location is initialized with two values
|
//block location is initialized with two values
|
||||||
//the first value represents the location of the first byte after the file header
|
//the first value represents the location of the first byte after the file header
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ impl TryInto<TimedPhysicsInstruction> for TimedInstruction{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl TryFrom<TimedPhysicsInstruction> for TimedInstruction{
|
impl TryFrom<TimedPhysicsInstruction> for TimedInstruction{
|
||||||
type Error=super::physics::InstructionConvert;
|
type Error=InstructionConvert;
|
||||||
fn try_from(value:TimedPhysicsInstruction)->Result<Self,Self::Error>{
|
fn try_from(value:TimedPhysicsInstruction)->Result<Self,Self::Error>{
|
||||||
Ok(Self{
|
Ok(Self{
|
||||||
time:value.time.get(),
|
time:value.time.get(),
|
||||||
|
|||||||
@@ -465,7 +465,7 @@ fn convert_to_snf(path:&Path,output_folder:PathBuf)->Result<Errors,ConvertError>
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn roblox_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf)->AResult<()>{
|
async fn roblox_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf)->AResult<()>{
|
||||||
let start=std::time::Instant::now();
|
let start=std::time::Instant::now();
|
||||||
|
|
||||||
let thread_limit=std::thread::available_parallelism()?.get();
|
let thread_limit=std::thread::available_parallelism()?.get();
|
||||||
|
|||||||
@@ -484,7 +484,7 @@ async fn convert_to_snf(path:&Path,vpk_list:&[strafesnet_bsp_loader::Vpk],output
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
async fn source_to_snf(paths:Vec<std::path::PathBuf>,output_folder:PathBuf,vpk_paths:Vec<PathBuf>)->AResult<()>{
|
async fn source_to_snf(paths:Vec<PathBuf>,output_folder:PathBuf,vpk_paths:Vec<PathBuf>)->AResult<()>{
|
||||||
let start=std::time::Instant::now();
|
let start=std::time::Instant::now();
|
||||||
|
|
||||||
let thread_limit=std::thread::available_parallelism()?.get();
|
let thread_limit=std::thread::available_parallelism()?.get();
|
||||||
|
|||||||
Reference in New Issue
Block a user