Compare commits
36 Commits
bb2
...
strafe-sta
| Author | SHA1 | Date | |
|---|---|---|---|
|
eb40c1a0d0
|
|||
|
6ca6d5e484
|
|||
|
0668ac2def
|
|||
|
73e3181d0c
|
|||
|
19ba8f2445
|
|||
|
0495d07e26
|
|||
|
0ea353b27d
|
|||
|
99706079d9
|
|||
|
730c5fb7dd
|
|||
|
d1b61bb997
|
|||
|
0343ad19cf
|
|||
|
43210b1417
|
|||
|
e9d28cf15f
|
|||
|
452bac4049
|
|||
|
48aad78f59
|
|||
|
d45a42f5aa
|
|||
|
c219fec3bc
|
|||
|
2a05d50abb
|
|||
|
fbb047f8d4
|
|||
|
c4d837a552
|
|||
|
a08bd44789
|
|||
|
4ae5359046
|
|||
|
15ecaf602a
|
|||
|
1e0511a7ba
|
|||
|
a9e4705d89
|
|||
| 98069859b5 | |||
|
64d3996fa9
|
|||
|
49c0c16e35
|
|||
|
255bed4803
|
|||
|
128e137829
|
|||
|
1e19f804cc
|
|||
|
f6f35c5f54
|
|||
|
4e7d580918
|
|||
|
8d5a100a2e
|
|||
|
91208db706
|
|||
|
5a320b514e
|
1335
Cargo.lock
generated
1335
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
11
Cargo.toml
11
Cargo.toml
@@ -24,3 +24,14 @@ resolver = "2"
|
|||||||
#lto = true
|
#lto = true
|
||||||
strip = true
|
strip = true
|
||||||
codegen-units = 1
|
codegen-units = 1
|
||||||
|
|
||||||
|
[workspace.lints.rust]
|
||||||
|
# unsafe_code = "forbid"
|
||||||
|
# missing_docs = "warn"
|
||||||
|
# missing_debug_implementations = "warn"
|
||||||
|
single_use_lifetimes = "warn"
|
||||||
|
trivial_casts = "warn"
|
||||||
|
unused_lifetimes = "warn"
|
||||||
|
unused_qualifications = "warn"
|
||||||
|
# variant_size_differences = "warn"
|
||||||
|
unexpected_cfgs = "warn"
|
||||||
|
|||||||
@@ -12,3 +12,6 @@ strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
|||||||
strafesnet_session = { path = "../session", registry = "strafesnet" }
|
strafesnet_session = { path = "../session", registry = "strafesnet" }
|
||||||
strafesnet_settings = { path = "../settings", registry = "strafesnet" }
|
strafesnet_settings = { path = "../settings", registry = "strafesnet" }
|
||||||
wgpu = "27.0.0"
|
wgpu = "27.0.0"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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],
|
||||||
}],
|
}],
|
||||||
|
|||||||
@@ -8,3 +8,6 @@ arrayvec = "0.7.6"
|
|||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
id = { version = "0.1.0", registry = "strafesnet" }
|
id = { version = "0.1.0", registry = "strafesnet" }
|
||||||
strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ impl<T:Copy> std::ops::Neg for &Body<T>{
|
|||||||
impl<T> Body<T>
|
impl<T> Body<T>
|
||||||
where Time<T>:Copy,
|
where Time<T>:Copy,
|
||||||
{
|
{
|
||||||
pub const ZERO:Self=Self::new(vec3::ZERO,vec3::ZERO,vec3::ZERO,Time::ZERO);
|
pub const ZERO:Self=Self::new(vec3::zero(),vec3::zero(),vec3::zero(),Time::ZERO);
|
||||||
pub const fn new(position:Planar64Vec3,velocity:Planar64Vec3,acceleration:Planar64Vec3,time:Time<T>)->Self{
|
pub const fn new(position:Planar64Vec3,velocity:Planar64Vec3,acceleration:Planar64Vec3,time:Time<T>)->Self{
|
||||||
Self{
|
Self{
|
||||||
position,
|
position,
|
||||||
@@ -107,8 +107,8 @@ impl<T> Body<T>
|
|||||||
self.time+=dt.into();
|
self.time+=dt.into();
|
||||||
}
|
}
|
||||||
pub fn infinity_dir(&self)->Option<Planar64Vec3>{
|
pub fn infinity_dir(&self)->Option<Planar64Vec3>{
|
||||||
if self.velocity==vec3::ZERO{
|
if self.velocity==vec3::zero(){
|
||||||
if self.acceleration==vec3::ZERO{
|
if self.acceleration==vec3::zero(){
|
||||||
None
|
None
|
||||||
}else{
|
}else{
|
||||||
Some(self.acceleration)
|
Some(self.acceleration)
|
||||||
|
|||||||
@@ -90,6 +90,9 @@ pub trait MeshQuery{
|
|||||||
let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
|
let &[v0,v1]=self.edge_verts(directed_edge_id.as_undirected()).as_ref();
|
||||||
(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
|
(self.vert(v1)-self.vert(v0))*((directed_edge_id.parity() as i64)*2-1)
|
||||||
}
|
}
|
||||||
|
/// This must return a point inside the mesh.
|
||||||
|
#[expect(dead_code)]
|
||||||
|
fn hint_point(&self)->Planar64Vec3;
|
||||||
fn vert(&self,vert_id:Self::Vert)->Planar64Vec3;
|
fn vert(&self,vert_id:Self::Vert)->Planar64Vec3;
|
||||||
fn face_nd(&self,face_id:Self::Face)->(Self::Normal,Self::Offset);
|
fn face_nd(&self,face_id:Self::Face)->(Self::Normal,Self::Offset);
|
||||||
fn face_edges(&self,face_id:Self::Face)->impl AsRef<[Self::Edge]>;
|
fn face_edges(&self,face_id:Self::Face)->impl AsRef<[Self::Edge]>;
|
||||||
@@ -447,6 +450,10 @@ impl MeshQuery for PhysicsMeshView<'_>{
|
|||||||
let face_idx=self.topology.faces[face_id.get() as usize].get() as usize;
|
let face_idx=self.topology.faces[face_id.get() as usize].get() as usize;
|
||||||
(self.data.faces[face_idx].normal,self.data.faces[face_idx].dot)
|
(self.data.faces[face_idx].normal,self.data.faces[face_idx].dot)
|
||||||
}
|
}
|
||||||
|
fn hint_point(&self)->Planar64Vec3{
|
||||||
|
// invariant: meshes always encompass the origin
|
||||||
|
vec3::zero()
|
||||||
|
}
|
||||||
//ideally I never calculate the vertex position, but I have to for the graphical meshes...
|
//ideally I never calculate the vertex position, but I have to for the graphical meshes...
|
||||||
fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
|
fn vert(&self,vert_id:SubmeshVertId)->Planar64Vec3{
|
||||||
let vert_idx=self.topology.verts[vert_id.get() as usize].get() as usize;
|
let vert_idx=self.topology.verts[vert_id.get() as usize].get() as usize;
|
||||||
@@ -500,7 +507,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{
|
||||||
@@ -532,6 +539,9 @@ impl MeshQuery for TransformedMesh<'_>{
|
|||||||
// wrap for speed
|
// wrap for speed
|
||||||
self.transform.vertex.transform_point3(self.view.vert(vert_id)).wrap_1()
|
self.transform.vertex.transform_point3(self.view.vert(vert_id)).wrap_1()
|
||||||
}
|
}
|
||||||
|
fn hint_point(&self)->Planar64Vec3{
|
||||||
|
self.transform.vertex.translation
|
||||||
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
|
fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
|
||||||
self.view.face_edges(face_id)
|
self.view.face_edges(face_id)
|
||||||
@@ -750,7 +760,7 @@ impl MinkowskiMesh<'_>{
|
|||||||
let infinity_fev=self.infinity_fev(-dir,infinity_body.position);
|
let infinity_fev=self.infinity_fev(-dir,infinity_body.position);
|
||||||
//a line is simpler to solve than a parabola
|
//a line is simpler to solve than a parabola
|
||||||
infinity_body.velocity=dir;
|
infinity_body.velocity=dir;
|
||||||
infinity_body.acceleration=vec3::ZERO;
|
infinity_body.acceleration=vec3::zero();
|
||||||
//crawl in from negative infinity along a tangent line to get the closest fev
|
//crawl in from negative infinity along a tangent line to get the closest fev
|
||||||
infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,start_time).miss()
|
infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,start_time).miss()
|
||||||
})
|
})
|
||||||
@@ -778,10 +788,7 @@ impl MinkowskiMesh<'_>{
|
|||||||
use crate::face_crawler::{low,upp};
|
use crate::face_crawler::{low,upp};
|
||||||
//no algorithm needed, there is only one state and two cases (Edge,None)
|
//no algorithm needed, there is only one state and two cases (Edge,None)
|
||||||
//determine when it passes an edge ("sliding off" case)
|
//determine when it passes an edge ("sliding off" case)
|
||||||
let start_time=range.start_bound().map(|&t|{
|
let start_time=range.start_bound().map(|&t|(t-relative_body.time).to_ratio());
|
||||||
let r=(t-relative_body.time).to_ratio();
|
|
||||||
Ratio::new(r.num,r.den)
|
|
||||||
});
|
|
||||||
let mut best_time=range.end_bound().map(|&t|into_giga_time(t,relative_body.time));
|
let mut best_time=range.end_bound().map(|&t|into_giga_time(t,relative_body.time));
|
||||||
let mut best_edge=None;
|
let mut best_edge=None;
|
||||||
let face_n=self.face_nd(contact_face_id).0;
|
let face_n=self.face_nd(contact_face_id).0;
|
||||||
@@ -810,7 +817,7 @@ impl MinkowskiMesh<'_>{
|
|||||||
infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,Bound::Included(&infinity_body.time)).hit()
|
infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,Bound::Included(&infinity_body.time)).hit()
|
||||||
}
|
}
|
||||||
pub fn is_point_in_mesh(&self,point:Planar64Vec3)->bool{
|
pub fn is_point_in_mesh(&self,point:Planar64Vec3)->bool{
|
||||||
let infinity_body=Body::new(point,vec3::Y,vec3::ZERO,Time::ZERO);
|
let infinity_body=Body::new(point,vec3::Y,vec3::zero(),Time::ZERO);
|
||||||
//movement must escape the mesh forwards and backwards in time,
|
//movement must escape the mesh forwards and backwards in time,
|
||||||
//otherwise the point is not inside the mesh
|
//otherwise the point is not inside the mesh
|
||||||
self.infinity_in(infinity_body)
|
self.infinity_in(infinity_body)
|
||||||
@@ -856,6 +863,10 @@ impl MeshQuery for MinkowskiMesh<'_>{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
fn hint_point(&self)->Planar64Vec3{
|
||||||
|
self.mesh1.transform.vertex.translation-
|
||||||
|
self.mesh0.transform.vertex.translation
|
||||||
|
}
|
||||||
fn face_edges(&self,face_id:MinkowskiFace)->impl AsRef<[MinkowskiDirectedEdge]>{
|
fn face_edges(&self,face_id:MinkowskiFace)->impl AsRef<[MinkowskiDirectedEdge]>{
|
||||||
match face_id{
|
match face_id{
|
||||||
MinkowskiFace::VertFace(v0,f1)=>{
|
MinkowskiFace::VertFace(v0,f1)=>{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -39,20 +39,18 @@ impl Contact{
|
|||||||
|
|
||||||
//note that this is horrible with fixed point arithmetic
|
//note that this is horrible with fixed point arithmetic
|
||||||
fn solve1(c0:&Contact)->Option<Ratio<Vector3<Fixed<3,96>>,Fixed<2,64>>>{
|
fn solve1(c0:&Contact)->Option<Ratio<Vector3<Fixed<3,96>>,Fixed<2,64>>>{
|
||||||
const EPSILON:Fixed<2,64>=Fixed::from_bits(Fixed::<2,64>::ONE.to_bits().shr(10));
|
|
||||||
let det=c0.normal.dot(c0.velocity);
|
let det=c0.normal.dot(c0.velocity);
|
||||||
if det.abs()<EPSILON{
|
if det.abs()==Fixed::ZERO{
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let d0=c0.normal.dot(c0.position);
|
let d0=c0.normal.dot(c0.position);
|
||||||
Some(c0.normal*d0/det)
|
Some(c0.normal*d0/det)
|
||||||
}
|
}
|
||||||
fn solve2(c0:&Contact,c1:&Contact)->Option<Ratio<Vector3<Fixed<5,160>>,Fixed<4,128>>>{
|
fn solve2(c0:&Contact,c1:&Contact)->Option<Ratio<Vector3<Fixed<5,160>>,Fixed<4,128>>>{
|
||||||
const EPSILON:Fixed<4,128>=Fixed::from_bits(Fixed::<4,128>::ONE.to_bits().shr(10));
|
|
||||||
let u0_u1=c0.velocity.cross(c1.velocity);
|
let u0_u1=c0.velocity.cross(c1.velocity);
|
||||||
let n0_n1=c0.normal.cross(c1.normal);
|
let n0_n1=c0.normal.cross(c1.normal);
|
||||||
let det=u0_u1.dot(n0_n1);
|
let det=u0_u1.dot(n0_n1);
|
||||||
if det.abs()<EPSILON{
|
if det.abs()==Fixed::ZERO{
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let d0=c0.normal.dot(c0.position);
|
let d0=c0.normal.dot(c0.position);
|
||||||
@@ -60,10 +58,9 @@ fn solve2(c0:&Contact,c1:&Contact)->Option<Ratio<Vector3<Fixed<5,160>>,Fixed<4,1
|
|||||||
Some((c1.normal.cross(u0_u1)*d0+u0_u1.cross(c0.normal)*d1)/det)
|
Some((c1.normal.cross(u0_u1)*d0+u0_u1.cross(c0.normal)*d1)/det)
|
||||||
}
|
}
|
||||||
fn solve3(c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ratio<Vector3<Fixed<4,128>>,Fixed<3,96>>>{
|
fn solve3(c0:&Contact,c1:&Contact,c2:&Contact)->Option<Ratio<Vector3<Fixed<4,128>>,Fixed<3,96>>>{
|
||||||
const EPSILON:Fixed<3,96>=Fixed::from_bits(Fixed::<3,96>::ONE.to_bits().shr(10));
|
|
||||||
let n0_n1=c0.normal.cross(c1.normal);
|
let n0_n1=c0.normal.cross(c1.normal);
|
||||||
let det=c2.normal.dot(n0_n1);
|
let det=c2.normal.dot(n0_n1);
|
||||||
if det.abs()<EPSILON{
|
if det.abs()==Fixed::ZERO{
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let d0=c0.normal.dot(c0.position);
|
let d0=c0.normal.dot(c0.position);
|
||||||
@@ -149,7 +146,7 @@ fn is_space_enclosed_4(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const fn get_push_ray_0(point:Planar64Vec3)->Ray{
|
const fn get_push_ray_0(point:Planar64Vec3)->Ray{
|
||||||
Ray{origin:point,direction:vec3::ZERO}
|
Ray{origin:point,direction:vec3::zero()}
|
||||||
}
|
}
|
||||||
fn get_push_ray_1(point:Planar64Vec3,c0:&Contact)->Option<Ray>{
|
fn get_push_ray_1(point:Planar64Vec3,c0:&Contact)->Option<Ray>{
|
||||||
//wrap for speed
|
//wrap for speed
|
||||||
@@ -321,13 +318,13 @@ mod tests{
|
|||||||
fn test_push_solve(){
|
fn test_push_solve(){
|
||||||
let contacts=vec![
|
let contacts=vec![
|
||||||
Contact{
|
Contact{
|
||||||
position:vec3::ZERO,
|
position:vec3::zero(),
|
||||||
velocity:vec3::Y,
|
velocity:vec3::Y,
|
||||||
normal:vec3::Y,
|
normal:vec3::Y,
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
vec3::ZERO,
|
vec3::zero(),
|
||||||
push_solve(&contacts,vec3::NEG_Y)
|
push_solve(&contacts,vec3::NEG_Y)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,3 +10,6 @@ strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
|||||||
strafesnet_physics = { path = "../physics", registry = "strafesnet" }
|
strafesnet_physics = { path = "../physics", registry = "strafesnet" }
|
||||||
strafesnet_settings = { path = "../settings", registry = "strafesnet" }
|
strafesnet_settings = { path = "../settings", registry = "strafesnet" }
|
||||||
strafesnet_snf = { path = "../../lib/snf", registry = "strafesnet" }
|
strafesnet_snf = { path = "../../lib/snf", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -8,3 +8,6 @@ configparser = "3.0.2"
|
|||||||
directories = "6.0.0"
|
directories = "6.0.0"
|
||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -10,3 +10,6 @@ strafesnet_physics = { path = "../engine/physics", registry = "strafesnet" }
|
|||||||
strafesnet_snf = { path = "../lib/snf", registry = "strafesnet" }
|
strafesnet_snf = { path = "../lib/snf", registry = "strafesnet" }
|
||||||
# this is just for the primitive constructor
|
# this is just for the primitive constructor
|
||||||
strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet" }
|
strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ fn simultaneous_collision(){
|
|||||||
Time::ZERO,
|
Time::ZERO,
|
||||||
);
|
);
|
||||||
let mut physics=PhysicsState::new_with_body(body);
|
let mut physics=PhysicsState::new_with_body(body);
|
||||||
physics.style_mut().gravity=vec3::ZERO;
|
physics.style_mut().gravity=vec3::zero();
|
||||||
let mut phys_iter=PhysicsContext::iter_internal(&mut physics,&physics_data,Time::from_secs(2))
|
let mut phys_iter=PhysicsContext::iter_internal(&mut physics,&physics_data,Time::from_secs(2))
|
||||||
.filter(|ins|!matches!(ins.instruction,InternalInstruction::StrafeTick));
|
.filter(|ins|!matches!(ins.instruction,InternalInstruction::StrafeTick));
|
||||||
// the order that they hit does matter, but we aren't currently worrying about that.
|
// the order that they hit does matter, but we aren't currently worrying about that.
|
||||||
@@ -101,7 +101,7 @@ fn bug_3(){
|
|||||||
Time::ZERO,
|
Time::ZERO,
|
||||||
);
|
);
|
||||||
let mut physics=PhysicsState::new_with_body(body);
|
let mut physics=PhysicsState::new_with_body(body);
|
||||||
physics.style_mut().gravity=vec3::ZERO;
|
physics.style_mut().gravity=vec3::zero();
|
||||||
let mut phys_iter=PhysicsContext::iter_internal(&mut physics,&physics_data,Time::from_secs(3))
|
let mut phys_iter=PhysicsContext::iter_internal(&mut physics,&physics_data,Time::from_secs(3))
|
||||||
.filter(|ins|!matches!(ins.instruction,InternalInstruction::StrafeTick));
|
.filter(|ins|!matches!(ins.instruction,InternalInstruction::StrafeTick));
|
||||||
// touch side of part at 0,0,0
|
// touch side of part at 0,0,0
|
||||||
|
|||||||
@@ -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,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -17,3 +17,6 @@ vbsp = "0.9.1"
|
|||||||
vbsp-entities-css = "0.6.0"
|
vbsp-entities-css = "0.6.0"
|
||||||
vmdl = "0.2.0"
|
vmdl = "0.2.0"
|
||||||
vpk = "0.3.0"
|
vpk = "0.3.0"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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)]
|
||||||
@@ -210,7 +210,7 @@ pub fn faces_to_mesh(faces:Vec<Vec<integer::Planar64Vec3>>)->model::Mesh{
|
|||||||
let color=mb.acquire_color_id(glam::Vec4::ONE);
|
let color=mb.acquire_color_id(glam::Vec4::ONE);
|
||||||
let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
|
let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
|
||||||
// normals are ignored by physics
|
// normals are ignored by physics
|
||||||
let normal=mb.acquire_normal_id(integer::vec3::ZERO);
|
let normal=mb.acquire_normal_id(integer::vec3::zero());
|
||||||
|
|
||||||
let polygon_list=faces.into_iter().map(|face|{
|
let polygon_list=faces.into_iter().map(|face|{
|
||||||
face.into_iter().map(|pos|{
|
face.into_iter().map(|pos|{
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ pub fn convert<'a>(
|
|||||||
water:Some(attr::IntersectingWater{
|
water:Some(attr::IntersectingWater{
|
||||||
viscosity:integer::Planar64::ONE,
|
viscosity:integer::Planar64::ONE,
|
||||||
density:integer::Planar64::ONE,
|
density:integer::Planar64::ONE,
|
||||||
velocity:integer::vec3::ZERO,
|
velocity:integer::vec3::zero(),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
general:attr::GeneralAttributes::default(),
|
general:attr::GeneralAttributes::default(),
|
||||||
@@ -295,7 +295,7 @@ pub fn convert<'a>(
|
|||||||
attributes,
|
attributes,
|
||||||
transform:integer::Planar64Affine3::new(
|
transform:integer::Planar64Affine3::new(
|
||||||
integer::mat3::identity(),
|
integer::mat3::identity(),
|
||||||
integer::vec3::ZERO,
|
integer::vec3::zero(),
|
||||||
),
|
),
|
||||||
color:glam::Vec4::ONE,
|
color:glam::Vec4::ONE,
|
||||||
});
|
});
|
||||||
@@ -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;
|
||||||
|
|||||||
@@ -17,3 +17,6 @@ linear_ops = { version = "0.1.1", path = "../linear_ops", registry = "strafesnet
|
|||||||
ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet" }
|
ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet" }
|
||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
id = { version = "0.1.0", registry = "strafesnet" }
|
id = { version = "0.1.0", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ const VALVE_SCALE:Planar64=Planar64::raw(1<<28);// 1/16
|
|||||||
|
|
||||||
use crate::integer::{int,vec3::int as int3,AbsoluteTime,Ratio64,Planar64,Planar64Vec3};
|
use crate::integer::{int,vec3::int as int3,AbsoluteTime,Ratio64,Planar64,Planar64Vec3};
|
||||||
use crate::controls_bitflag::Controls;
|
use crate::controls_bitflag::Controls;
|
||||||
use crate::physics::Time as PhysicsTime;
|
|
||||||
|
|
||||||
#[derive(Clone,Debug)]
|
#[derive(Clone,Debug)]
|
||||||
pub struct StyleModifiers{
|
pub struct StyleModifiers{
|
||||||
@@ -34,7 +33,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()
|
||||||
}
|
}
|
||||||
@@ -273,9 +272,6 @@ impl StrafeSettings{
|
|||||||
false=>None,
|
false=>None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn next_tick(&self,time:PhysicsTime)->PhysicsTime{
|
|
||||||
PhysicsTime::from_nanos(self.tick_rate.rhs_div_int(self.tick_rate.mul_int(time.nanos())+1))
|
|
||||||
}
|
|
||||||
pub const fn activates(&self,controls:Controls)->bool{
|
pub const fn activates(&self,controls:Controls)->bool{
|
||||||
self.enable.activates(controls)
|
self.enable.activates(controls)
|
||||||
}
|
}
|
||||||
@@ -319,7 +315,7 @@ impl WalkSettings{
|
|||||||
self.accelerate.accel.min((-gravity.y*friction).clamp_1())
|
self.accelerate.accel.min((-gravity.y*friction).clamp_1())
|
||||||
}
|
}
|
||||||
pub fn get_walk_target_velocity(&self,control_dir:Planar64Vec3,normal:Planar64Vec3)->Planar64Vec3{
|
pub fn get_walk_target_velocity(&self,control_dir:Planar64Vec3,normal:Planar64Vec3)->Planar64Vec3{
|
||||||
if control_dir==crate::integer::vec3::ZERO{
|
if control_dir==crate::integer::vec3::zero(){
|
||||||
return control_dir;
|
return control_dir;
|
||||||
}
|
}
|
||||||
let nn=normal.length_squared();
|
let nn=normal.length_squared();
|
||||||
@@ -329,13 +325,13 @@ impl WalkSettings{
|
|||||||
let dd=d*d;
|
let dd=d*d;
|
||||||
if dd<nnmm{
|
if dd<nnmm{
|
||||||
let cr=normal.cross(control_dir);
|
let cr=normal.cross(control_dir);
|
||||||
if cr==crate::integer::vec3::ZERO_2{
|
if cr==crate::integer::vec3::zero(){
|
||||||
crate::integer::vec3::ZERO
|
crate::integer::vec3::zero()
|
||||||
}else{
|
}else{
|
||||||
(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
|
(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
crate::integer::vec3::ZERO
|
crate::integer::vec3::zero()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn is_slope_walkable(&self,normal:Planar64Vec3,up:Planar64Vec3)->bool{
|
pub fn is_slope_walkable(&self,normal:Planar64Vec3,up:Planar64Vec3)->bool{
|
||||||
@@ -360,7 +356,7 @@ impl LadderSettings{
|
|||||||
self.accelerate.accel
|
self.accelerate.accel
|
||||||
}
|
}
|
||||||
pub fn get_ladder_target_velocity(&self,mut control_dir:Planar64Vec3,normal:Planar64Vec3)->Planar64Vec3{
|
pub fn get_ladder_target_velocity(&self,mut control_dir:Planar64Vec3,normal:Planar64Vec3)->Planar64Vec3{
|
||||||
if control_dir==crate::integer::vec3::ZERO{
|
if control_dir==crate::integer::vec3::zero(){
|
||||||
return control_dir;
|
return control_dir;
|
||||||
}
|
}
|
||||||
let nn=normal.length_squared();
|
let nn=normal.length_squared();
|
||||||
@@ -382,13 +378,13 @@ impl LadderSettings{
|
|||||||
//- fix the underlying issue
|
//- fix the underlying issue
|
||||||
if dd<nnmm{
|
if dd<nnmm{
|
||||||
let cr=normal.cross(control_dir);
|
let cr=normal.cross(control_dir);
|
||||||
if cr==crate::integer::vec3::ZERO_2{
|
if cr==crate::integer::vec3::zero(){
|
||||||
crate::integer::vec3::ZERO
|
crate::integer::vec3::zero()
|
||||||
}else{
|
}else{
|
||||||
(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
|
(cr.cross(normal)*self.accelerate.topspeed/((nn*(nnmm-dd)).sqrt())).divide().clamp_1()
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
crate::integer::vec3::ZERO
|
crate::integer::vec3::zero()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>;
|
||||||
@@ -561,12 +561,6 @@ pub mod vec3{
|
|||||||
pub use linear_ops::types::Vector3;
|
pub use linear_ops::types::Vector3;
|
||||||
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_2:linear_ops::types::Vector3<Fixed::<2,64>>=linear_ops::types::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_4:linear_ops::types::Vector3<Fixed::<4,128>>=linear_ops::types::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_6:linear_ops::types::Vector3<Fixed::<6,192>>=linear_ops::types::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]);
|
||||||
@@ -575,6 +569,10 @@ pub mod vec3{
|
|||||||
pub const NEG_Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::NEG_ONE,Planar64::ZERO]);
|
pub const NEG_Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::NEG_ONE,Planar64::ZERO]);
|
||||||
pub const NEG_Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::NEG_ONE]);
|
pub const NEG_Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::NEG_ONE]);
|
||||||
pub const NEG_ONE:Planar64Vec3=Planar64Vec3::new([Planar64::NEG_ONE,Planar64::NEG_ONE,Planar64::NEG_ONE]);
|
pub const NEG_ONE:Planar64Vec3=Planar64Vec3::new([Planar64::NEG_ONE,Planar64::NEG_ONE,Planar64::NEG_ONE]);
|
||||||
|
// TODO: use #![feature(generic_const_items)] when stabilized https://github.com/rust-lang/rust/issues/113521
|
||||||
|
pub const fn zero<const N:usize,const F:usize>()->Vector3<Fixed<N,F>>{
|
||||||
|
Vector3::new([Fixed::ZERO;3])
|
||||||
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
pub const fn int(x:i32,y:i32,z:i32)->Planar64Vec3{
|
pub const fn int(x:i32,y:i32,z:i32)->Planar64Vec3{
|
||||||
Planar64Vec3::new([Planar64::raw((x as i64)<<32),Planar64::raw((y as i64)<<32),Planar64::raw((z as i64)<<32)])
|
Planar64Vec3::new([Planar64::raw((x as i64)<<32),Planar64::raw((y as i64)<<32),Planar64::raw((z as i64)<<32)])
|
||||||
@@ -663,7 +661,7 @@ pub struct Planar64Affine3{
|
|||||||
pub translation:Planar64Vec3,
|
pub translation:Planar64Vec3,
|
||||||
}
|
}
|
||||||
impl Planar64Affine3{
|
impl Planar64Affine3{
|
||||||
pub const IDENTITY:Self=Self::new(mat3::identity(),vec3::ZERO);
|
pub const IDENTITY:Self=Self::new(mat3::identity(),vec3::zero());
|
||||||
#[inline]
|
#[inline]
|
||||||
pub const fn new(matrix3:Planar64Mat3,translation:Planar64Vec3)->Self{
|
pub const fn new(matrix3:Planar64Mat3,translation:Planar64Vec3)->Self{
|
||||||
Self{matrix3,translation}
|
Self{matrix3,translation}
|
||||||
|
|||||||
@@ -11,3 +11,6 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
|
strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,3 +18,6 @@ bnum = "0.13.0"
|
|||||||
arrayvec = { version = "0.7.6", optional = true }
|
arrayvec = { version = "0.7.6", optional = true }
|
||||||
paste = "1.0.15"
|
paste = "1.0.15"
|
||||||
ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
|
ratio_ops = { version = "0.1.0", path = "../ratio_ops", registry = "strafesnet", optional = true }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
use bnum::{BInt,cast::As};
|
use bnum::{BInt,cast::As};
|
||||||
|
|
||||||
#[derive(Clone,Copy,Debug,Default,Hash,PartialEq,Eq,PartialOrd,Ord)]
|
const BNUM_DIGIT_WIDTH:usize=64;
|
||||||
|
|
||||||
|
#[derive(Clone,Copy,Default,Hash,PartialEq,Eq,PartialOrd,Ord)]
|
||||||
/// A Fixed point number for which multiply operations widen the bits in the output. (when the wide-mul feature is enabled)
|
/// A Fixed point number for which multiply operations widen the bits in the output. (when the wide-mul feature is enabled)
|
||||||
/// N is the number of u64s to use
|
/// N is the number of u64s to use
|
||||||
/// F is the number of fractional bits (always N*32 lol)
|
/// F is the number of fractional bits (always N*32 lol)
|
||||||
@@ -68,6 +70,34 @@ impl<const N:usize,const F:usize> Fixed<N,F>{
|
|||||||
pub const fn midpoint(self,other:Self)->Self{
|
pub const fn midpoint(self,other:Self)->Self{
|
||||||
Self::from_bits(self.bits.midpoint(other.bits))
|
Self::from_bits(self.bits.midpoint(other.bits))
|
||||||
}
|
}
|
||||||
|
#[inline]
|
||||||
|
pub const fn min(self,other:Self)->Self{
|
||||||
|
Self::from_bits(self.bits.min(other.bits))
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub const fn max(self,other:Self)->Self{
|
||||||
|
Self::from_bits(self.bits.max(other.bits))
|
||||||
|
}
|
||||||
|
/// return the result of self*sign(other)
|
||||||
|
#[inline]
|
||||||
|
pub const fn mul_sign<const N1:usize,const F1:usize>(self,other:Fixed<N1,F1>)->Self{
|
||||||
|
if other.is_negative(){
|
||||||
|
Self::from_bits(self.bits.neg())
|
||||||
|
}else if other.is_zero(){
|
||||||
|
Fixed::ZERO
|
||||||
|
}else{
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// return the result of self/sign(other) (divide by zero does not change the sign)
|
||||||
|
#[inline]
|
||||||
|
pub const fn div_sign<const N1:usize,const F1:usize>(self,other:Fixed<N1,F1>)->Self{
|
||||||
|
if other.is_negative(){
|
||||||
|
Self::from_bits(self.bits.neg())
|
||||||
|
}else{
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
impl<const F:usize> Fixed<1,F>{
|
impl<const F:usize> Fixed<1,F>{
|
||||||
/// My old code called this function everywhere so let's provide it
|
/// My old code called this function everywhere so let's provide it
|
||||||
@@ -99,28 +129,6 @@ impl_from!(
|
|||||||
i8,i16,i32,i64,i128,isize
|
i8,i16,i32,i64,i128,isize
|
||||||
);
|
);
|
||||||
|
|
||||||
impl<const N:usize,const F:usize,T> PartialEq<T> for Fixed<N,F>
|
|
||||||
where
|
|
||||||
T:Copy,
|
|
||||||
BInt::<N>:From<T>,
|
|
||||||
{
|
|
||||||
#[inline]
|
|
||||||
fn eq(&self,&other:&T)->bool{
|
|
||||||
self.bits.eq(&other.into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<const N:usize,const F:usize,T> PartialOrd<T> for Fixed<N,F>
|
|
||||||
where
|
|
||||||
T:Copy,
|
|
||||||
BInt::<N>:From<T>,
|
|
||||||
{
|
|
||||||
#[inline]
|
|
||||||
fn partial_cmp(&self,&other:&T)->Option<std::cmp::Ordering>{
|
|
||||||
self.bits.partial_cmp(&other.into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<const N:usize,const F:usize> std::ops::Neg for Fixed<N,F>{
|
impl<const N:usize,const F:usize> std::ops::Neg for Fixed<N,F>{
|
||||||
type Output=Self;
|
type Output=Self;
|
||||||
#[inline]
|
#[inline]
|
||||||
@@ -286,6 +294,23 @@ macro_rules! impl_from_float {
|
|||||||
impl_from_float!(integer_decode_f32,f32,24);
|
impl_from_float!(integer_decode_f32,f32,24);
|
||||||
impl_from_float!(integer_decode_f64,f64,53);
|
impl_from_float!(integer_decode_f64,f64,53);
|
||||||
|
|
||||||
|
impl<const N:usize,const F:usize> core::fmt::Debug for Fixed<N,F>{
|
||||||
|
#[inline]
|
||||||
|
fn fmt(&self,f:&mut core::fmt::Formatter)->Result<(),core::fmt::Error>{
|
||||||
|
let integral=self.as_bits().unsigned_abs()>>F;
|
||||||
|
let fractional=self.as_bits().unsigned_abs()&((bnum::BUint::<N>::ONE<<F)-bnum::BUint::<N>::ONE);
|
||||||
|
let leading_zeroes=(fractional.leading_zeros() as usize).saturating_sub(N*BNUM_DIGIT_WIDTH-F)>>2;
|
||||||
|
if self.is_negative(){
|
||||||
|
core::write!(f,"-")?;
|
||||||
|
}
|
||||||
|
if fractional.is_zero(){
|
||||||
|
core::write!(f,"{integral:x}.{}","0".repeat(leading_zeroes))
|
||||||
|
}else{
|
||||||
|
core::write!(f,"{integral:x}.{}{fractional:x}","0".repeat(leading_zeroes))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<const N:usize,const F:usize> core::fmt::Display for Fixed<N,F>{
|
impl<const N:usize,const F:usize> core::fmt::Display for Fixed<N,F>{
|
||||||
#[inline]
|
#[inline]
|
||||||
fn fmt(&self,f:&mut core::fmt::Formatter)->Result<(),core::fmt::Error>{
|
fn fmt(&self,f:&mut core::fmt::Formatter)->Result<(),core::fmt::Error>{
|
||||||
@@ -309,16 +334,6 @@ macro_rules! impl_additive_operator {
|
|||||||
self.$method(other)
|
self.$method(other)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<const N:usize,const F:usize,U> core::ops::$trait<U> for $struct<N,F>
|
|
||||||
where
|
|
||||||
BInt::<N>:From<U>,
|
|
||||||
{
|
|
||||||
type Output = $output;
|
|
||||||
#[inline]
|
|
||||||
fn $method(self, other: U) -> Self::Output {
|
|
||||||
Self::from_bits(self.bits.$method(BInt::<N>::from(other).shl(F as u32)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
macro_rules! impl_additive_assign_operator {
|
macro_rules! impl_additive_assign_operator {
|
||||||
@@ -329,15 +344,6 @@ macro_rules! impl_additive_assign_operator {
|
|||||||
self.bits.$method(other.bits);
|
self.bits.$method(other.bits);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<const N:usize,const F:usize,U> core::ops::$trait<U> for $struct<N,F>
|
|
||||||
where
|
|
||||||
BInt::<N>:From<U>,
|
|
||||||
{
|
|
||||||
#[inline]
|
|
||||||
fn $method(&mut self, other: U) {
|
|
||||||
self.bits.$method(BInt::<N>::from(other).shl(F as u32));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -360,7 +366,7 @@ impl_additive_operator!( Fixed, BitXor, bitxor, Self );
|
|||||||
// non-wide operators. The result is the same width as the inputs.
|
// non-wide operators. The result is the same width as the inputs.
|
||||||
|
|
||||||
// This macro is not used in the default configuration.
|
// This macro is not used in the default configuration.
|
||||||
#[allow(unused_macros)]
|
#[expect(unused_macros)]
|
||||||
macro_rules! impl_multiplicative_operator_not_const_generic {
|
macro_rules! impl_multiplicative_operator_not_const_generic {
|
||||||
( ($struct: ident, $trait: ident, $method: ident, $output: ty ), $width:expr ) => {
|
( ($struct: ident, $trait: ident, $method: ident, $output: ty ), $width:expr ) => {
|
||||||
impl<const F:usize> core::ops::$trait for $struct<$width,F>{
|
impl<const F:usize> core::ops::$trait for $struct<$width,F>{
|
||||||
@@ -539,7 +545,7 @@ impl_shift_operator!( Fixed, Shr, shr, Self );
|
|||||||
|
|
||||||
// wide operators. The result width is the sum of the input widths, i.e. none of the multiplication
|
// wide operators. The result width is the sum of the input widths, i.e. none of the multiplication
|
||||||
|
|
||||||
#[allow(unused_macros)]
|
#[expect(unused_macros)]
|
||||||
macro_rules! impl_wide_operators{
|
macro_rules! impl_wide_operators{
|
||||||
($lhs:expr,$rhs:expr)=>{
|
($lhs:expr,$rhs:expr)=>{
|
||||||
impl core::ops::Mul<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
|
impl core::ops::Mul<Fixed<$rhs,{$rhs*32}>> for Fixed<$lhs,{$lhs*32}>{
|
||||||
|
|||||||
@@ -229,3 +229,16 @@ fn test_zeroes_deferred_division(){
|
|||||||
])
|
])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_debug(){
|
||||||
|
assert_eq!(format!("{:?}",I32F32::EPSILON),"0.00000001");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::ONE),"1.00000000");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::TWO),"2.00000000");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::MAX),"7fffffff.ffffffff");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::try_from(core::f64::consts::PI).unwrap()),"3.243f6a88");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::NEG_EPSILON),"-0.00000001");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::NEG_ONE),"-1.00000000");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::NEG_TWO),"-2.00000000");
|
||||||
|
assert_eq!(format!("{:?}",I32F32::MIN),"-80000000.00000000");
|
||||||
|
}
|
||||||
|
|||||||
@@ -20,3 +20,6 @@ paste = { version = "1.0.15", optional = true }
|
|||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
fixed_wide = { path = "../fixed_wide", registry = "strafesnet", features = ["wide-mul"] }
|
fixed_wide = { path = "../fixed_wide", registry = "strafesnet", features = ["wide-mul"] }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,3 +8,6 @@ description = "Ratio operations using trait bounds for avoiding division like th
|
|||||||
authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -12,14 +12,17 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
bytemuck = "1.14.3"
|
bytemuck = "1.14.3"
|
||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
lazy-regex = "3.1.0"
|
regex = { version = "1.11.3", default-features = false }
|
||||||
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
|
||||||
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
|
||||||
rbx_mesh = "0.5.0"
|
rbx_mesh = "0.5.0"
|
||||||
rbx_reflection = "5.0.0"
|
|
||||||
rbx_reflection_database = "1.0.0"
|
|
||||||
rbx_xml = { version = "1.0.1-sn5", registry = "strafesnet" }
|
|
||||||
rbxassetid = { version = "0.1.0", path = "../rbxassetid", registry = "strafesnet" }
|
rbxassetid = { version = "0.1.0", path = "../rbxassetid", registry = "strafesnet" }
|
||||||
roblox_emulator = { version = "0.5.1", path = "../roblox_emulator", default-features = false, registry = "strafesnet" }
|
roblox_emulator = { version = "0.5.1", path = "../roblox_emulator", default-features = false, registry = "strafesnet" }
|
||||||
strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
|
strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
|
||||||
strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
|
strafesnet_deferred_loader = { version = "0.5.1", path = "../deferred_loader", registry = "strafesnet" }
|
||||||
|
rbx_binary = "2.0.1"
|
||||||
|
rbx_dom_weak = "4.1.0"
|
||||||
|
rbx_reflection = "6.1.0"
|
||||||
|
rbx_reflection_database = "2.0.2"
|
||||||
|
rbx_xml = "2.0.1"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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()?;
|
||||||
|
|||||||
@@ -18,6 +18,15 @@ fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
|
|||||||
rbx_dom_weak::ustr(s)
|
rbx_dom_weak::ustr(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! lazy_regex{
|
||||||
|
($r:literal)=>{{
|
||||||
|
use regex::Regex;
|
||||||
|
use std::sync::LazyLock;
|
||||||
|
static RE:LazyLock<Regex>=LazyLock::new(||Regex::new($r).unwrap());
|
||||||
|
&RE
|
||||||
|
}};
|
||||||
|
}
|
||||||
|
|
||||||
fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Result<Planar64Affine3,Planar64TryFromFloatError>{
|
fn planar64_affine3_from_roblox(cf:&rbx_dom_weak::types::CFrame,size:&rbx_dom_weak::types::Vector3)->Result<Planar64Affine3,Planar64TryFromFloatError>{
|
||||||
Ok(Planar64Affine3::new(
|
Ok(Planar64Affine3::new(
|
||||||
Planar64Mat3::from_cols([
|
Planar64Mat3::from_cols([
|
||||||
@@ -118,7 +127,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
other=>{
|
other=>{
|
||||||
let regman=lazy_regex::regex!(r"^(BonusStart|WormholeOut)(\d+)$");
|
let regman=lazy_regex!(r"^(BonusStart|WormholeOut)(\d+)$");
|
||||||
if let Some(captures)=regman.captures(other){
|
if let Some(captures)=regman.captures(other){
|
||||||
match &captures[1]{
|
match &captures[1]{
|
||||||
"BonusStart"=>{
|
"BonusStart"=>{
|
||||||
@@ -144,7 +153,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
},
|
},
|
||||||
_=>(),
|
_=>(),
|
||||||
}
|
}
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
|
}else if let Some(captures)=lazy_regex!(r"^(Force)?(Spawn|SpawnAt|Trigger|Teleport|Platform)(\d+)$")
|
||||||
.captures(other){
|
.captures(other){
|
||||||
force_intersecting=true;
|
force_intersecting=true;
|
||||||
let stage_id=StageId::new(ParseIntContext::parse(&captures[3]).map_err(GetAttributesError::StageIdParseInt)?);
|
let stage_id=StageId::new(ParseIntContext::parse(&captures[3]).map_err(GetAttributesError::StageIdParseInt)?);
|
||||||
@@ -185,7 +194,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
stage_element,
|
stage_element,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^(Jump|WormholeIn)(\d+)$")
|
}else if let Some(captures)=lazy_regex!(r"^(Jump|WormholeIn)(\d+)$")
|
||||||
.captures(other){
|
.captures(other){
|
||||||
match &captures[1]{
|
match &captures[1]{
|
||||||
"Jump"=>modes_builder.push_mode_update(
|
"Jump"=>modes_builder.push_mode_update(
|
||||||
@@ -210,7 +219,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
},
|
},
|
||||||
_=>unreachable!("regex2[1] messed up bad"),
|
_=>unreachable!("regex2[1] messed up bad"),
|
||||||
}
|
}
|
||||||
}else if let Some(captures)=lazy_regex::regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
|
}else if let Some(captures)=lazy_regex!(r"^Bonus(Finish|Anticheat)(\d+)$")
|
||||||
.captures(other){
|
.captures(other){
|
||||||
force_can_collide=false;
|
force_can_collide=false;
|
||||||
force_intersecting=true;
|
force_intersecting=true;
|
||||||
@@ -242,7 +251,7 @@ fn get_attributes(name:&str,can_collide:bool,velocity:Planar64Vec3,model_id:mode
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//need some way to skip this
|
//need some way to skip this
|
||||||
if allow_booster&&velocity!=vec3::ZERO{
|
if allow_booster&&velocity!=vec3::zero(){
|
||||||
general.booster=Some(attr::Booster::Velocity(velocity));
|
general.booster=Some(attr::Booster::Velocity(velocity));
|
||||||
}
|
}
|
||||||
Ok(match force_can_collide{
|
Ok(match force_can_collide{
|
||||||
@@ -335,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);
|
||||||
@@ -550,7 +559,7 @@ pub fn convert<'a>(
|
|||||||
//just going to leave it like this for now instead of reworking the data structures for this whole thing
|
//just going to leave it like this for now instead of reworking the data structures for this whole thing
|
||||||
let textureless_render_group=render_config_deferred_loader.acquire_render_config_id(None);
|
let textureless_render_group=render_config_deferred_loader.acquire_render_config_id(None);
|
||||||
|
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get().unwrap();
|
||||||
let basepart=&db.classes["BasePart"];
|
let basepart=&db.classes["BasePart"];
|
||||||
let baseparts=dom.descendants().filter(|&instance|
|
let baseparts=dom.descendants().filter(|&instance|
|
||||||
db.classes.get(instance.class.as_str()).is_some_and(|class|
|
db.classes.get(instance.class.as_str()).is_some_and(|class|
|
||||||
@@ -766,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>{
|
||||||
@@ -789,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>{
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ pub fn convert(
|
|||||||
// generate a unit cube as default physics
|
// generate a unit cube as default physics
|
||||||
let pos_list=CUBE_DEFAULT_VERTICES.map(|pos|mb.acquire_pos_id(pos>>1));
|
let pos_list=CUBE_DEFAULT_VERTICES.map(|pos|mb.acquire_pos_id(pos>>1));
|
||||||
let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
|
let tex=mb.acquire_tex_id(glam::Vec2::ZERO);
|
||||||
let normal=mb.acquire_normal_id(vec3::ZERO);
|
let normal=mb.acquire_normal_id(vec3::zero());
|
||||||
let color=mb.acquire_color_id(glam::Vec4::ONE);
|
let color=mb.acquire_color_id(glam::Vec4::ONE);
|
||||||
let polygon_group=PolygonGroup::PolygonList(PolygonList::new(CUBE_DEFAULT_POLYS.map(|poly|poly.map(|[pos_id,_]|
|
let polygon_group=PolygonGroup::PolygonList(PolygonList::new(CUBE_DEFAULT_POLYS.map(|poly|poly.map(|[pos_id,_]|
|
||||||
mb.acquire_vertex_id(IndexedVertex{pos:pos_list[pos_id as usize],tex,normal,color})
|
mb.acquire_vertex_id(IndexedVertex{pos:pos_list[pos_id as usize],tex,normal,color})
|
||||||
|
|||||||
@@ -9,3 +9,6 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
url = "2.5.4"
|
url = "2.5.4"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "roblox_emulator"
|
name = "roblox_emulator"
|
||||||
version = "0.5.1"
|
version = "0.5.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
repository = "https://git.itzana.me/StrafesNET/strafe-project"
|
repository = "https://git.itzana.me/StrafesNET/strafe-project"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT OR Apache-2.0"
|
||||||
@@ -15,7 +15,10 @@ run-service=[]
|
|||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
mlua = { version = "0.11.3", features = ["luau"] }
|
mlua = { version = "0.11.3", features = ["luau"] }
|
||||||
phf = { version = "0.13.1", features = ["macros"] }
|
phf = { version = "0.13.1", features = ["macros"] }
|
||||||
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
rbx_dom_weak = "4.1.0"
|
||||||
rbx_reflection = "5.0.0"
|
rbx_reflection = "6.1.0"
|
||||||
rbx_reflection_database = "1.0.0"
|
rbx_reflection_database = "2.0.2"
|
||||||
rbx_types = "2.0.0"
|
rbx_types = "3.1.0"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ impl Context{
|
|||||||
}
|
}
|
||||||
/// Creates an iterator over all items of a particular class.
|
/// Creates an iterator over all items of a particular class.
|
||||||
pub fn superclass_iter<'a>(&'a self,superclass:&'a str)->impl Iterator<Item=Ref>+'a{
|
pub fn superclass_iter<'a>(&'a self,superclass:&'a str)->impl Iterator<Item=Ref>+'a{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get().unwrap();
|
||||||
let Some(superclass)=db.classes.get(superclass)else{
|
let Some(superclass)=db.classes.get(superclass)else{
|
||||||
panic!("Invalid class");
|
panic!("Invalid class");
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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,
|
||||||
@@ -37,7 +37,7 @@ impl PartialEq for EnumItem<'_>{
|
|||||||
pub struct Enums;
|
pub struct Enums;
|
||||||
impl Enums{
|
impl Enums{
|
||||||
pub fn get(&self,index:&str)->Option<EnumItems<'static>>{
|
pub fn get(&self,index:&str)->Option<EnumItems<'static>>{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get().unwrap();
|
||||||
db.enums.get(index).map(|ed|EnumItems{ed})
|
db.enums.get(index).map(|ed|EnumItems{ed})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>{
|
||||||
@@ -38,13 +37,13 @@ pub fn dom_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut WeakDom)->mlua::Result<T>
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn class_is_a(class:&str,superclass:&str)->bool{
|
pub fn class_is_a(class:&str,superclass:&str)->bool{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get().unwrap();
|
||||||
let (Some(class),Some(superclass))=(db.classes.get(class),db.classes.get(superclass))else{
|
let (Some(class),Some(superclass))=(db.classes.get(class),db.classes.get(superclass))else{
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
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,29 +65,29 @@ 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().unwrap();
|
||||||
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().unwrap();
|
||||||
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|{
|
||||||
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))
|
||||||
@@ -283,7 +282,7 @@ impl mlua::UserData for Instance{
|
|||||||
dom_mut(lua,|dom|{
|
dom_mut(lua,|dom|{
|
||||||
let instance=this.get(dom)?;
|
let instance=this.get(dom)?;
|
||||||
//println!("__index t={} i={index:?}",instance.name);
|
//println!("__index t={} i={index:?}",instance.name);
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get().unwrap();
|
||||||
let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
|
let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
|
||||||
// Find existing property
|
// Find existing property
|
||||||
// Interestingly, ustr can know ahead of time if
|
// Interestingly, ustr can know ahead of time if
|
||||||
@@ -345,7 +344,7 @@ impl mlua::UserData for Instance{
|
|||||||
let index_str=&*index.to_str()?;
|
let index_str=&*index.to_str()?;
|
||||||
dom_mut(lua,|dom|{
|
dom_mut(lua,|dom|{
|
||||||
let instance=this.get_mut(dom)?;
|
let instance=this.get_mut(dom)?;
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get().unwrap();
|
||||||
let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
|
let class=db.classes.get(instance.class.as_str()).ok_or_else(||mlua::Error::runtime("Class missing"))?;
|
||||||
let property=db.superclasses_iter(class).find_map(|cls|
|
let property=db.superclasses_iter(class).find_map(|cls|
|
||||||
cls.properties.get(index_str)
|
cls.properties.get(index_str)
|
||||||
@@ -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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,3 +9,6 @@ edition = "2024"
|
|||||||
binrw = "0.15.0"
|
binrw = "0.15.0"
|
||||||
id = { version = "0.1.0", registry = "strafesnet" }
|
id = { version = "0.1.0", registry = "strafesnet" }
|
||||||
strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
|
strafesnet_common = { version = "0.7.0", path = "../common", registry = "strafesnet" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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(),
|
||||||
|
|||||||
@@ -12,12 +12,11 @@ flate2 = "1.0.27"
|
|||||||
futures = "0.3.31"
|
futures = "0.3.31"
|
||||||
image = "0.25.2"
|
image = "0.25.2"
|
||||||
image_dds = "0.7.1"
|
image_dds = "0.7.1"
|
||||||
lazy-regex = "3.1.0"
|
|
||||||
rbx_asset = { version = "0.5.0", registry = "strafesnet" }
|
rbx_asset = { version = "0.5.0", registry = "strafesnet" }
|
||||||
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
rbx_binary = "2.0.1"
|
||||||
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
rbx_dom_weak = "4.1.0"
|
||||||
rbx_reflection_database = "1.0.0"
|
rbx_reflection_database = "2.0.2"
|
||||||
rbx_xml = { version = "1.0.1-sn5", registry = "strafesnet" }
|
rbx_xml = "2.0.1"
|
||||||
rbxassetid = { version = "0.1.0", registry = "strafesnet" }
|
rbxassetid = { version = "0.1.0", registry = "strafesnet" }
|
||||||
strafesnet_bsp_loader = { version = "0.3.1", path = "../lib/bsp_loader", registry = "strafesnet" }
|
strafesnet_bsp_loader = { version = "0.3.1", path = "../lib/bsp_loader", registry = "strafesnet" }
|
||||||
strafesnet_deferred_loader = { version = "0.5.1", path = "../lib/deferred_loader", registry = "strafesnet" }
|
strafesnet_deferred_loader = { version = "0.5.1", path = "../lib/deferred_loader", registry = "strafesnet" }
|
||||||
@@ -36,3 +35,6 @@ vtf = "0.3.0"
|
|||||||
#lto = true
|
#lto = true
|
||||||
#strip = true
|
#strip = true
|
||||||
#codegen-units = 1
|
#codegen-units = 1
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -34,3 +34,6 @@ winit = "0.30.7"
|
|||||||
[profile.dev]
|
[profile.dev]
|
||||||
strip = false
|
strip = false
|
||||||
opt-level = 3
|
opt-level = 3
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ impl WindowContext<'_>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn device_event(&mut self,time:SessionTime,event: winit::event::DeviceEvent){
|
fn device_event(&mut self,time:SessionTime,event:winit::event::DeviceEvent){
|
||||||
match event{
|
match event{
|
||||||
winit::event::DeviceEvent::MouseMotion{
|
winit::event::DeviceEvent::MouseMotion{
|
||||||
delta,
|
delta,
|
||||||
|
|||||||
Reference in New Issue
Block a user