Compare commits
81 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ddfeca41e9
|
|||
|
8f580ad6ba
|
|||
|
68e81b31ba
|
|||
|
cbd6e1a608
|
|||
|
0e3cdedc05
|
|||
|
97cec0e709
|
|||
|
8e24739721
|
|||
|
5f2d9d34bb
|
|||
|
cd43c5aabe
|
|||
|
cf4aa8ed16
|
|||
|
c71e5e9e20
|
|||
|
261bc5c845
|
|||
|
6f8c2692ca
|
|||
|
3dd897b47f
|
|||
|
fcc2348eb0
|
|||
|
8ca0c94445
|
|||
|
463a70c5f4
|
|||
|
643b4fea37
|
|||
|
1752c51b8f
|
|||
|
348769a270
|
|||
|
7b53d7d595
|
|||
|
18c73b12d8
|
|||
|
4ff62cc991
|
|||
|
a8d9167152
|
|||
|
21f4d13ce0
|
|||
|
84e55c557a
|
|||
|
f96398cc84
|
|||
|
9ff0736d50
|
|||
|
c3d390dda0
|
|||
|
eeb47abde1
|
|||
|
567354cebb
|
|||
|
a787bf2ab2
|
|||
|
623cc8d822
|
|||
|
6da4f3b3fb
|
|||
|
982b837143
|
|||
|
02b52ef748
|
|||
|
e32523e626
|
|||
|
9a0c26cc97
|
|||
|
45c2fdbb3f
|
|||
|
c1d3045a77
|
|||
|
f1ca5a3735
|
|||
|
3fa048434b
|
|||
|
0909a62caf
|
|||
|
97012940cd
|
|||
|
b601667d6a
|
|||
|
6d5c7df14a
|
|||
|
3140c0a552
|
|||
|
f9a92b7a8d
|
|||
|
1fa6d5c031
|
|||
|
05954bc487
|
|||
|
e11d96a9b3
|
|||
|
5ee8a02693
|
|||
|
efba2a8f19
|
|||
|
de44e19909
|
|||
|
c7e29d05d4
|
|||
|
6171ceab6d
|
|||
|
41aeeefb5b
|
|||
|
1473fe8fe1
|
|||
|
ac987a2efd
|
|||
|
1050d824e6
|
|||
|
496f838408
|
|||
|
38a7aaa046
|
|||
|
ce246acb43
|
|||
|
3a7eeaee7f
|
|||
|
9afbd0a91d
|
|||
|
2ffa9cbe6c
|
|||
|
8dee2140e1
|
|||
|
af9f1a218e
|
|||
|
b8442274a5
|
|||
|
72ba5bad63
|
|||
|
d7b779170e
|
|||
|
ff28c0a311
|
|||
|
69f49d3dcf
|
|||
|
a91dfe07ec
|
|||
|
922f80657c
|
|||
|
f05e6b5995
|
|||
|
e2ba15880a
|
|||
|
749ace538d
|
|||
|
6d9fc38ef1
|
|||
|
565b53138c
|
|||
|
b0668136d6
|
902
Cargo.lock
generated
902
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -11,7 +11,7 @@ id = { version = "0.1.0", registry = "strafesnet" }
|
|||||||
strafesnet_common = { path = "../../lib/common", registry = "strafesnet" }
|
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 = "28.0.0"
|
wgpu = "27.0.0"
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|||||||
@@ -616,7 +616,7 @@ impl GraphicsState{
|
|||||||
address_mode_w:wgpu::AddressMode::ClampToEdge,
|
address_mode_w:wgpu::AddressMode::ClampToEdge,
|
||||||
mag_filter:wgpu::FilterMode::Linear,
|
mag_filter:wgpu::FilterMode::Linear,
|
||||||
min_filter:wgpu::FilterMode::Linear,
|
min_filter:wgpu::FilterMode::Linear,
|
||||||
mipmap_filter:wgpu::MipmapFilterMode::Linear,
|
mipmap_filter:wgpu::FilterMode::Linear,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
});
|
});
|
||||||
let repeat_sampler=device.create_sampler(&wgpu::SamplerDescriptor{
|
let repeat_sampler=device.create_sampler(&wgpu::SamplerDescriptor{
|
||||||
@@ -626,7 +626,7 @@ impl GraphicsState{
|
|||||||
address_mode_w:wgpu::AddressMode::Repeat,
|
address_mode_w:wgpu::AddressMode::Repeat,
|
||||||
mag_filter:wgpu::FilterMode::Linear,
|
mag_filter:wgpu::FilterMode::Linear,
|
||||||
min_filter:wgpu::FilterMode::Linear,
|
min_filter:wgpu::FilterMode::Linear,
|
||||||
mipmap_filter:wgpu::MipmapFilterMode::Linear,
|
mipmap_filter:wgpu::FilterMode::Linear,
|
||||||
anisotropy_clamp:16,
|
anisotropy_clamp:16,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
});
|
});
|
||||||
@@ -754,7 +754,7 @@ impl GraphicsState{
|
|||||||
&skybox_texture_bind_group_layout,
|
&skybox_texture_bind_group_layout,
|
||||||
&model_bind_group_layout,
|
&model_bind_group_layout,
|
||||||
],
|
],
|
||||||
immediate_size:0,
|
push_constant_ranges:&[],
|
||||||
});
|
});
|
||||||
let sky_pipeline_layout=device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor{
|
let sky_pipeline_layout=device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor{
|
||||||
label:None,
|
label:None,
|
||||||
@@ -762,7 +762,7 @@ impl GraphicsState{
|
|||||||
&camera_bind_group_layout,
|
&camera_bind_group_layout,
|
||||||
&skybox_texture_bind_group_layout,
|
&skybox_texture_bind_group_layout,
|
||||||
],
|
],
|
||||||
immediate_size:0,
|
push_constant_ranges:&[],
|
||||||
});
|
});
|
||||||
|
|
||||||
// Create the render pipelines
|
// Create the render pipelines
|
||||||
@@ -793,7 +793,7 @@ impl GraphicsState{
|
|||||||
bias:wgpu::DepthBiasState::default(),
|
bias:wgpu::DepthBiasState::default(),
|
||||||
}),
|
}),
|
||||||
multisample:wgpu::MultisampleState::default(),
|
multisample:wgpu::MultisampleState::default(),
|
||||||
multiview_mask:None,
|
multiview:None,
|
||||||
cache:None,
|
cache:None,
|
||||||
});
|
});
|
||||||
let model_pipeline=device.create_render_pipeline(&wgpu::RenderPipelineDescriptor{
|
let model_pipeline=device.create_render_pipeline(&wgpu::RenderPipelineDescriptor{
|
||||||
@@ -828,7 +828,7 @@ impl GraphicsState{
|
|||||||
bias:wgpu::DepthBiasState::default(),
|
bias:wgpu::DepthBiasState::default(),
|
||||||
}),
|
}),
|
||||||
multisample:wgpu::MultisampleState::default(),
|
multisample:wgpu::MultisampleState::default(),
|
||||||
multiview_mask:None,
|
multiview:None,
|
||||||
cache:None,
|
cache:None,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -880,7 +880,7 @@ impl GraphicsState{
|
|||||||
camera_buf,
|
camera_buf,
|
||||||
models:Vec::new(),
|
models:Vec::new(),
|
||||||
depth_view,
|
depth_view,
|
||||||
staging_belt:wgpu::util::StagingBelt::new(device.clone(),0x100),
|
staging_belt:wgpu::util::StagingBelt::new(0x100),
|
||||||
bind_group_layouts:GraphicsBindGroupLayouts{model:model_bind_group_layout},
|
bind_group_layouts:GraphicsBindGroupLayouts{model:model_bind_group_layout},
|
||||||
samplers:GraphicsSamplers{repeat:repeat_sampler},
|
samplers:GraphicsSamplers{repeat:repeat_sampler},
|
||||||
temp_squid_texture_view:squid_texture_view,
|
temp_squid_texture_view:squid_texture_view,
|
||||||
@@ -918,6 +918,7 @@ impl GraphicsState{
|
|||||||
&self.camera_buf,
|
&self.camera_buf,
|
||||||
0,
|
0,
|
||||||
wgpu::BufferSize::new((camera_uniforms.len() * 4) as wgpu::BufferAddress).unwrap(),
|
wgpu::BufferSize::new((camera_uniforms.len() * 4) as wgpu::BufferAddress).unwrap(),
|
||||||
|
device,
|
||||||
)
|
)
|
||||||
.copy_from_slice(bytemuck::cast_slice(&camera_uniforms));
|
.copy_from_slice(bytemuck::cast_slice(&camera_uniforms));
|
||||||
//This code only needs to run when the uniforms change
|
//This code only needs to run when the uniforms change
|
||||||
@@ -964,7 +965,6 @@ impl GraphicsState{
|
|||||||
}),
|
}),
|
||||||
timestamp_writes:Default::default(),
|
timestamp_writes:Default::default(),
|
||||||
occlusion_query_set:Default::default(),
|
occlusion_query_set:Default::default(),
|
||||||
multiview_mask:None,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
rpass.set_bind_group(0,&self.bind_groups.camera,&[]);
|
rpass.set_bind_group(0,&self.bind_groups.camera,&[]);
|
||||||
|
|||||||
@@ -100,37 +100,6 @@ const fn choose_any_direction()->Planar64Vec3{
|
|||||||
vec3::X
|
vec3::X
|
||||||
}
|
}
|
||||||
|
|
||||||
fn narrow_dir2(dir:Vector3<Fixed<2,64>>)->Planar64Vec3{
|
|
||||||
if dir==vec3::zero(){
|
|
||||||
return dir.narrow_1().unwrap();
|
|
||||||
}
|
|
||||||
let x=dir.x.as_bits().unsigned_abs().bits();
|
|
||||||
let y=dir.y.as_bits().unsigned_abs().bits();
|
|
||||||
let z=dir.z.as_bits().unsigned_abs().bits();
|
|
||||||
let big=x.max(y).max(z);
|
|
||||||
const MAX_BITS:u32=64+31;
|
|
||||||
if MAX_BITS<big{
|
|
||||||
dir>>(big-MAX_BITS)
|
|
||||||
}else{
|
|
||||||
dir
|
|
||||||
}.narrow_1().unwrap()
|
|
||||||
}
|
|
||||||
fn narrow_dir3(dir:Vector3<Fixed<3,96>>)->Planar64Vec3{
|
|
||||||
if dir==vec3::zero(){
|
|
||||||
return dir.narrow_1().unwrap();
|
|
||||||
}
|
|
||||||
let x=dir.x.as_bits().unsigned_abs().bits();
|
|
||||||
let y=dir.y.as_bits().unsigned_abs().bits();
|
|
||||||
let z=dir.z.as_bits().unsigned_abs().bits();
|
|
||||||
let big=x.max(y).max(z);
|
|
||||||
const MAX_BITS:u32=96+31;
|
|
||||||
if MAX_BITS<big{
|
|
||||||
dir>>(big-MAX_BITS)
|
|
||||||
}else{
|
|
||||||
dir
|
|
||||||
}.narrow_1().unwrap()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reduce1<M:MeshQuery>(
|
fn reduce1<M:MeshQuery>(
|
||||||
[v0]:Simplex<1,M::Vert>,
|
[v0]:Simplex<1,M::Vert>,
|
||||||
mesh:&M,
|
mesh:&M,
|
||||||
@@ -196,7 +165,7 @@ fn reduce2<M:MeshQuery>(
|
|||||||
// -- modify the direction to take into account a0R and b0R
|
// -- modify the direction to take into account a0R and b0R
|
||||||
// return direction, a0, a1, b0, b1
|
// return direction, a0, a1, b0, b1
|
||||||
return Reduced{
|
return Reduced{
|
||||||
dir:narrow_dir3(direction),
|
dir:direction.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex2([v0,v1]),
|
simplex:Simplex1_3::Simplex2([v0,v1]),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -262,7 +231,7 @@ fn reduce3<M:MeshQuery>(
|
|||||||
|
|
||||||
// return direction, a0, a1, b0, b1, c0, c1
|
// return direction, a0, a1, b0, b1, c0, c1
|
||||||
return Reduced{
|
return Reduced{
|
||||||
dir:narrow_dir2(direction),
|
dir:direction.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
|
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -296,14 +265,14 @@ fn reduce3<M:MeshQuery>(
|
|||||||
if direction==vec3::zero(){
|
if direction==vec3::zero(){
|
||||||
// direction = uv
|
// direction = uv
|
||||||
return Reduced{
|
return Reduced{
|
||||||
dir:narrow_dir2(uv),
|
dir:uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex2([v0,v1]),
|
simplex:Simplex1_3::Simplex2([v0,v1]),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// return direction, a0, a1, b0, b1
|
// return direction, a0, a1, b0, b1
|
||||||
return Reduced{
|
return Reduced{
|
||||||
dir:narrow_dir3(direction),
|
dir:direction.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex2([v0,v1]),
|
simplex:Simplex1_3::Simplex2([v0,v1]),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -314,7 +283,7 @@ fn reduce3<M:MeshQuery>(
|
|||||||
if dir==vec3::zero(){
|
if dir==vec3::zero(){
|
||||||
// direction = uv
|
// direction = uv
|
||||||
return Reduced{
|
return Reduced{
|
||||||
dir:narrow_dir2(uv),
|
dir:uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex1([v0]),
|
simplex:Simplex1_3::Simplex1([v0]),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -430,12 +399,12 @@ fn reduce4<M:MeshQuery>(
|
|||||||
// return direction, a0, a1, b0, b1, c0, c1
|
// return direction, a0, a1, b0, b1, c0, c1
|
||||||
if uv_w.is_negative(){
|
if uv_w.is_negative(){
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir2(uv),
|
dir:uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
|
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir2(-uv),
|
dir:-uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
|
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -472,12 +441,12 @@ fn reduce4<M:MeshQuery>(
|
|||||||
// return direction, a0, a1, b0, b1
|
// return direction, a0, a1, b0, b1
|
||||||
if uv_w.is_negative(){
|
if uv_w.is_negative(){
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir2(uv),
|
dir:uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex2([v0,v1]),
|
simplex:Simplex1_3::Simplex2([v0,v1]),
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir2(-uv),
|
dir:-uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex2([v0,v1]),
|
simplex:Simplex1_3::Simplex2([v0,v1]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -485,7 +454,7 @@ fn reduce4<M:MeshQuery>(
|
|||||||
|
|
||||||
// return direction, a0, a1, b0, b1
|
// return direction, a0, a1, b0, b1
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir3(direction),
|
dir:direction.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex2([v0,v1]),
|
simplex:Simplex1_3::Simplex2([v0,v1]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -497,12 +466,12 @@ fn reduce4<M:MeshQuery>(
|
|||||||
// direction = uvw < 0 and uv or -uv
|
// direction = uvw < 0 and uv or -uv
|
||||||
if uv_w.is_negative(){
|
if uv_w.is_negative(){
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir2(uv),
|
dir:uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex1([v0]),
|
simplex:Simplex1_3::Simplex1([v0]),
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
return Reduce::Reduced(Reduced{
|
return Reduce::Reduced(Reduced{
|
||||||
dir:narrow_dir2(-uv),
|
dir:-uv.narrow_1().unwrap(),
|
||||||
simplex:Simplex1_3::Simplex1([v0]),
|
simplex:Simplex1_3::Simplex1([v0]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -901,13 +870,6 @@ mod test{
|
|||||||
fn test_cube_points(){
|
fn test_cube_points(){
|
||||||
let mesh=PhysicsMesh::unit_cube();
|
let mesh=PhysicsMesh::unit_cube();
|
||||||
let mesh_view=mesh.complete_mesh_view();
|
let mesh_view=mesh.complete_mesh_view();
|
||||||
for x in -2..=2{
|
assert!(mesh_contains_point(mesh_view,vec3::NEG_Z));
|
||||||
for y in -2..=2{
|
|
||||||
for z in -2..=2{
|
|
||||||
let point=vec3::int(x,y,z)>>1;
|
|
||||||
assert!(mesh_contains_point(mesh_view,point),"Mesh did not contain point {point}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,21 +103,17 @@ pub trait MeshQuery{
|
|||||||
}
|
}
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct FaceRefs{
|
struct FaceRefs{
|
||||||
// I didn't write it down, but I assume the edges are directed
|
|
||||||
// clockwise when looking towards the face normal, i.e. right hand rule.
|
|
||||||
edges:Vec<SubmeshDirectedEdgeId>,
|
edges:Vec<SubmeshDirectedEdgeId>,
|
||||||
//verts are redundant, use edge[i].verts[0]
|
|
||||||
//verts:Vec<VertId>,
|
//verts:Vec<VertId>,
|
||||||
}
|
}
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct EdgeRefs{
|
struct EdgeRefs{
|
||||||
faces:[SubmeshFaceId;2],//left, right
|
faces:[SubmeshFaceId;2],//left, right
|
||||||
verts:[SubmeshVertId;2],//start, end
|
verts:[SubmeshVertId;2],//bottom, top
|
||||||
}
|
}
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct VertRefs{
|
struct VertRefs{
|
||||||
faces:Vec<SubmeshFaceId>,
|
faces:Vec<SubmeshFaceId>,
|
||||||
// edges are always directed away from the vert
|
|
||||||
edges:Vec<SubmeshDirectedEdgeId>,
|
edges:Vec<SubmeshDirectedEdgeId>,
|
||||||
}
|
}
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@@ -676,14 +672,8 @@ impl MinkowskiMesh<'_>{
|
|||||||
fev.crawl(self,relative_body,range.start_bound(),range.end_bound()).hit()
|
fev.crawl(self,relative_body,range.start_bound(),range.end_bound()).hit()
|
||||||
}
|
}
|
||||||
pub fn predict_collision_out(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
|
pub fn predict_collision_out(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
|
||||||
|
let fev=crate::minimum_difference::closest_fev_not_inside(self,relative_body.position)?;
|
||||||
let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
|
let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
|
||||||
// TODO: handle unbounded collision using infinity fev
|
|
||||||
let time=match upper_bound{
|
|
||||||
Bound::Included(&time)=>time,
|
|
||||||
Bound::Excluded(&time)=>time,
|
|
||||||
Bound::Unbounded=>unimplemented!("unbounded collision out"),
|
|
||||||
};
|
|
||||||
let fev=crate::minimum_difference::closest_fev_not_inside(self,relative_body.extrapolated_position(time))?;
|
|
||||||
// swap and negate bounds to do a time inversion
|
// swap and negate bounds to do a time inversion
|
||||||
let (lower_bound,upper_bound)=(upper_bound.map(|&t|-t),lower_bound.map(|&t|-t));
|
let (lower_bound,upper_bound)=(upper_bound.map(|&t|-t),lower_bound.map(|&t|-t));
|
||||||
let infinity_body=-relative_body;
|
let infinity_body=-relative_body;
|
||||||
|
|||||||
@@ -366,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.
|
||||||
#[expect(unused_macros)]
|
#[allow(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>{
|
||||||
@@ -545,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
|
||||||
|
|
||||||
#[expect(unused_macros)]
|
#[allow(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}>{
|
||||||
|
|||||||
@@ -13,16 +13,16 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
|||||||
bytemuck = "1.14.3"
|
bytemuck = "1.14.3"
|
||||||
glam = "0.30.0"
|
glam = "0.30.0"
|
||||||
regex = { version = "1.11.3", default-features = false }
|
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]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|||||||
@@ -559,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().unwrap();
|
let db=rbx_reflection_database::get();
|
||||||
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|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "roblox_emulator"
|
name = "roblox_emulator"
|
||||||
version = "0.5.2"
|
version = "0.5.1"
|
||||||
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,10 +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 = "4.1.0"
|
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_reflection = "6.1.0"
|
rbx_reflection = "5.0.0"
|
||||||
rbx_reflection_database = "2.0.2"
|
rbx_reflection_database = "1.0.0"
|
||||||
rbx_types = "3.1.0"
|
rbx_types = "2.0.0"
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
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().unwrap();
|
let db=rbx_reflection_database::get();
|
||||||
let Some(superclass)=db.classes.get(superclass)else{
|
let Some(superclass)=db.classes.get(superclass)else{
|
||||||
panic!("Invalid class");
|
panic!("Invalid class");
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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().unwrap();
|
let db=rbx_reflection_database::get();
|
||||||
db.enums.get(index).map(|ed|EnumItems{ed})
|
db.enums.get(index).map(|ed|EnumItems{ed})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ 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().unwrap();
|
let db=rbx_reflection_database::get();
|
||||||
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;
|
||||||
};
|
};
|
||||||
@@ -80,14 +80,14 @@ pub fn find_first_descendant_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak
|
|||||||
}
|
}
|
||||||
|
|
||||||
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>{
|
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().unwrap();
|
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 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().unwrap();
|
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|{
|
||||||
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))
|
||||||
@@ -282,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().unwrap();
|
let db=rbx_reflection_database::get();
|
||||||
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
|
||||||
@@ -344,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().unwrap();
|
let db=rbx_reflection_database::get();
|
||||||
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)
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ futures = "0.3.31"
|
|||||||
image = "0.25.2"
|
image = "0.25.2"
|
||||||
image_dds = "0.7.1"
|
image_dds = "0.7.1"
|
||||||
rbx_asset = { version = "0.5.0", registry = "strafesnet" }
|
rbx_asset = { version = "0.5.0", registry = "strafesnet" }
|
||||||
rbx_binary = "2.0.1"
|
rbx_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_dom_weak = "4.1.0"
|
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_reflection_database = "2.0.2"
|
rbx_reflection_database = "1.0.0"
|
||||||
rbx_xml = "2.0.1"
|
rbx_xml = { version = "1.0.1-sn5", registry = "strafesnet" }
|
||||||
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" }
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ strafesnet_rbx_loader = { path = "../lib/rbx_loader", registry = "strafesnet", o
|
|||||||
strafesnet_session = { path = "../engine/session", registry = "strafesnet" }
|
strafesnet_session = { path = "../engine/session", registry = "strafesnet" }
|
||||||
strafesnet_settings = { path = "../engine/settings", registry = "strafesnet" }
|
strafesnet_settings = { path = "../engine/settings", registry = "strafesnet" }
|
||||||
strafesnet_snf = { path = "../lib/snf", registry = "strafesnet", optional = true }
|
strafesnet_snf = { path = "../lib/snf", registry = "strafesnet", optional = true }
|
||||||
wgpu = "28.0.0"
|
wgpu = "27.0.0"
|
||||||
winit = "0.30.7"
|
winit = "0.30.7"
|
||||||
|
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ impl<'a> SetupContextPartial2<'a>{
|
|||||||
let required_features=required_features();
|
let required_features=required_features();
|
||||||
|
|
||||||
//no helper function smh gotta write it myself
|
//no helper function smh gotta write it myself
|
||||||
let adapters=pollster::block_on(self.instance.enumerate_adapters(self.backends));
|
let adapters=self.instance.enumerate_adapters(self.backends);
|
||||||
|
|
||||||
let mut chosen_adapter=None;
|
let mut chosen_adapter=None;
|
||||||
let mut chosen_adapter_score=0;
|
let mut chosen_adapter_score=0;
|
||||||
|
|||||||
Reference in New Issue
Block a user