Compare commits
16 Commits
bb2
...
phys-new-s
| Author | SHA1 | Date | |
|---|---|---|---|
|
d8804c0901
|
|||
|
865d1756b9
|
|||
|
3188f78744
|
|||
|
3e167af521
|
|||
|
8cf69933b1
|
|||
|
caef37dc36
|
|||
|
1832ce07ee
|
|||
|
5ac65ad845
|
|||
|
76696a3162
|
|||
|
128e137829
|
|||
|
1e19f804cc
|
|||
|
f6f35c5f54
|
|||
|
4e7d580918
|
|||
|
8d5a100a2e
|
|||
|
91208db706
|
|||
|
5a320b514e
|
835
Cargo.lock
generated
835
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
|
||||||
|
|||||||
@@ -90,6 +90,16 @@ 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)
|
||||||
}
|
}
|
||||||
|
/// Returns an iterator over the vertices in the direction of the directed edges.
|
||||||
|
/// Intended to be used to find adjacent vertices:
|
||||||
|
/// `self.directed_verts(self.vert_edges(vert_id).as_ref())`
|
||||||
|
/// TODO: rewrite this function as `adjacent_vertices`
|
||||||
|
fn directed_verts(&self,edges:&[Self::Edge])->impl Iterator<Item=Self::Vert>{
|
||||||
|
edges.iter().map(|e|{
|
||||||
|
let edge_verts=self.edge_verts(e.as_undirected());
|
||||||
|
edge_verts.as_ref()[e.parity() as usize]
|
||||||
|
})
|
||||||
|
}
|
||||||
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]>;
|
||||||
@@ -452,6 +462,8 @@ impl MeshQuery for PhysicsMeshView<'_>{
|
|||||||
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;
|
||||||
self.data.verts[vert_idx].0
|
self.data.verts[vert_idx].0
|
||||||
}
|
}
|
||||||
|
/// Directed edges going clockwise when looking in the direction of the face normal.
|
||||||
|
/// (Edit this documentation if this is wrong!)
|
||||||
fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
|
fn face_edges(&self,face_id:SubmeshFaceId)->impl AsRef<[SubmeshDirectedEdgeId]>{
|
||||||
self.topology.face_topology[face_id.get() as usize].edges.as_slice()
|
self.topology.face_topology[face_id.get() as usize].edges.as_slice()
|
||||||
}
|
}
|
||||||
@@ -500,7 +512,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{
|
||||||
@@ -614,17 +626,6 @@ pub struct MinkowskiMesh<'a>{
|
|||||||
mesh1:TransformedMesh<'a>,
|
mesh1:TransformedMesh<'a>,
|
||||||
}
|
}
|
||||||
|
|
||||||
//infinity fev algorithm state transition
|
|
||||||
#[derive(Debug)]
|
|
||||||
enum Transition{
|
|
||||||
Done,//found closest vert, no edges are better
|
|
||||||
Vert(MinkowskiVert),//transition to vert
|
|
||||||
}
|
|
||||||
enum EV{
|
|
||||||
Vert(MinkowskiVert),
|
|
||||||
Edge(MinkowskiEdge),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type GigaTime=Ratio<Fixed<4,128>,Fixed<4,128>>;
|
pub type GigaTime=Ratio<Fixed<4,128>,Fixed<4,128>>;
|
||||||
pub fn into_giga_time(time:Time,relative_to:Time)->GigaTime{
|
pub fn into_giga_time(time:Time,relative_to:Time)->GigaTime{
|
||||||
let r=(time-relative_to).to_ratio();
|
let r=(time-relative_to).to_ratio();
|
||||||
@@ -641,122 +642,195 @@ impl MinkowskiMesh<'_>{
|
|||||||
fn farthest_vert(&self,dir:Planar64Vec3)->MinkowskiVert{
|
fn farthest_vert(&self,dir:Planar64Vec3)->MinkowskiVert{
|
||||||
MinkowskiVert::VertVert(self.mesh0.farthest_vert(dir),self.mesh1.farthest_vert(-dir))
|
MinkowskiVert::VertVert(self.mesh0.farthest_vert(dir),self.mesh1.farthest_vert(-dir))
|
||||||
}
|
}
|
||||||
fn next_transition_vert(&self,vert_id:MinkowskiVert,best_distance_squared:&mut Fixed<2,64>,infinity_dir:Planar64Vec3,point:Planar64Vec3)->Transition{
|
fn closest_fev_not_inside(&self,relative_position:Planar64Vec3)->Option<FEV<MinkowskiMesh<'_>>>{
|
||||||
let mut best_transition=Transition::Done;
|
// Make a fast guess as to what the closest point will be.
|
||||||
for &directed_edge_id in self.vert_edges(vert_id).as_ref(){
|
let MinkowskiVert::VertVert(mut v0,mut v1)=self.farthest_vert(relative_position);
|
||||||
let edge_n=self.directed_edge_n(directed_edge_id);
|
// TODO: alternate naive vertex searches to improve the robustness
|
||||||
//is boundary uncrossable by a crawl from infinity
|
// in the "tall bipyramid" failure case
|
||||||
let edge_verts=self.edge_verts(directed_edge_id.as_undirected());
|
let mut m0v=self.mesh0.vert(v0);
|
||||||
//select opposite vertex
|
let mut m1v=self.mesh1.vert(v1);
|
||||||
let test_vert_id=edge_verts.as_ref()[directed_edge_id.parity() as usize];
|
|
||||||
//test if it's closer
|
|
||||||
let diff=point-self.vert(test_vert_id);
|
|
||||||
if edge_n.dot(infinity_dir).is_zero(){
|
|
||||||
let distance_squared=diff.dot(diff);
|
|
||||||
if distance_squared<*best_distance_squared{
|
|
||||||
best_transition=Transition::Vert(test_vert_id);
|
|
||||||
*best_distance_squared=distance_squared;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
best_transition
|
|
||||||
}
|
|
||||||
fn final_ev(&self,vert_id:MinkowskiVert,best_distance_squared:&mut Fixed<2,64>,infinity_dir:Planar64Vec3,point:Planar64Vec3)->EV{
|
|
||||||
let mut best_transition=EV::Vert(vert_id);
|
|
||||||
let diff=point-self.vert(vert_id);
|
|
||||||
for &directed_edge_id in self.vert_edges(vert_id).as_ref(){
|
|
||||||
let edge_n=self.directed_edge_n(directed_edge_id);
|
|
||||||
//is boundary uncrossable by a crawl from infinity
|
|
||||||
//check if time of collision is outside Time::MIN..Time::MAX
|
|
||||||
if edge_n.dot(infinity_dir).is_zero(){
|
|
||||||
let d=edge_n.dot(diff);
|
|
||||||
//test the edge
|
|
||||||
let edge_nn=edge_n.dot(edge_n);
|
|
||||||
if !d.is_negative()&&d<=edge_nn{
|
|
||||||
let distance_squared={
|
|
||||||
let c=diff.cross(edge_n);
|
|
||||||
//wrap for speed
|
|
||||||
(c.dot(c)/edge_nn).divide().wrap_2()
|
|
||||||
};
|
|
||||||
if distance_squared<=*best_distance_squared{
|
|
||||||
best_transition=EV::Edge(directed_edge_id.as_undirected());
|
|
||||||
*best_distance_squared=distance_squared;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
best_transition
|
|
||||||
}
|
|
||||||
fn crawl_boundaries(&self,mut vert_id:MinkowskiVert,infinity_dir:Planar64Vec3,point:Planar64Vec3)->EV{
|
|
||||||
let mut best_distance_squared={
|
let mut best_distance_squared={
|
||||||
let diff=point-self.vert(vert_id);
|
let diff=relative_position+m1v-m0v;
|
||||||
diff.dot(diff)
|
diff.dot(diff)
|
||||||
};
|
};
|
||||||
|
let mut v0e=self.mesh0.vert_edges(v0);
|
||||||
|
let mut v1e=self.mesh1.vert_edges(v1);
|
||||||
|
let mut v0e_ref=v0e.as_ref();
|
||||||
|
let mut v1e_ref=v1e.as_ref();
|
||||||
|
// repeatedly check adjacent vertex permutations to see if they are closer
|
||||||
loop{
|
loop{
|
||||||
match self.next_transition_vert(vert_id,&mut best_distance_squared,infinity_dir,point){
|
let mut best_v0=None;
|
||||||
Transition::Done=>return self.final_ev(vert_id,&mut best_distance_squared,infinity_dir,point),
|
let mut best_v1=None;
|
||||||
Transition::Vert(new_vert_id)=>vert_id=new_vert_id,
|
|
||||||
|
// check vertices adjacent to v1 against v0
|
||||||
|
for m1_test_vert in self.mesh1.directed_verts(v1e_ref){
|
||||||
|
let m1v_test=self.mesh1.vert(m1_test_vert);
|
||||||
|
let diff=relative_position+m1v_test-m0v;
|
||||||
|
let d=diff.dot(diff);
|
||||||
|
if d<best_distance_squared{
|
||||||
|
best_distance_squared=d;
|
||||||
|
best_v0=None;
|
||||||
|
best_v1=Some(m1_test_vert);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
// check vertices adjacent to v0 against v1
|
||||||
/// This function drops a vertex down to an edge or a face if the path from infinity did not cross any vertex-edge boundaries but the point is supposed to have already crossed a boundary down from a vertex
|
for m0_test_vert in self.mesh0.directed_verts(v0e_ref){
|
||||||
fn infinity_fev(&self,infinity_dir:Planar64Vec3,point:Planar64Vec3)->FEV::<MinkowskiMesh<'_>>{
|
let m0v_test=self.mesh0.vert(m0_test_vert);
|
||||||
//start on any vertex
|
let diff=relative_position+m1v-m0v_test;
|
||||||
//cross uncrossable vertex-edge boundaries until you find the closest vertex or edge
|
let d=diff.dot(diff);
|
||||||
//cross edge-face boundary if it's uncrossable
|
if d<best_distance_squared{
|
||||||
match self.crawl_boundaries(self.farthest_vert(infinity_dir),infinity_dir,point){
|
best_distance_squared=d;
|
||||||
//if a vert is returned, it is the closest point to the infinity point
|
best_v0=Some(m0_test_vert);
|
||||||
EV::Vert(vert_id)=>FEV::Vert(vert_id),
|
best_v1=None;
|
||||||
EV::Edge(edge_id)=>{
|
}
|
||||||
//cross to face if the boundary is not crossable and we are on the wrong side
|
}
|
||||||
let edge_n=self.edge_n(edge_id);
|
|
||||||
// point is multiplied by two because vert_sum sums two vertices.
|
// check permutations of adjacent vertices
|
||||||
let delta_pos=point*2-{
|
for m0_test_vert in self.mesh0.directed_verts(v0e_ref){
|
||||||
let &[v0,v1]=self.edge_verts(edge_id).as_ref();
|
let m0v_test=self.mesh0.vert(m0_test_vert);
|
||||||
self.vert(v0)+self.vert(v1)
|
for m1_test_vert in self.mesh1.directed_verts(v1e_ref){
|
||||||
};
|
let m1v_test=self.mesh1.vert(m1_test_vert);
|
||||||
for (i,&face_id) in self.edge_faces(edge_id).as_ref().iter().enumerate(){
|
let diff=relative_position+m1v_test-m0v_test;
|
||||||
let face_n=self.face_nd(face_id).0;
|
let d=diff.dot(diff);
|
||||||
//edge-face boundary nd, n facing out of the face towards the edge
|
if d<best_distance_squared{
|
||||||
let boundary_n=face_n.cross(edge_n)*(i as i64*2-1);
|
best_distance_squared=d;
|
||||||
let boundary_d=boundary_n.dot(delta_pos);
|
best_v0=Some(m0_test_vert);
|
||||||
//check if time of collision is outside Time::MIN..Time::MAX
|
best_v1=Some(m1_test_vert);
|
||||||
//infinity_dir can always be treated as a velocity
|
|
||||||
if !boundary_d.is_positive()&&boundary_n.dot(infinity_dir).is_zero(){
|
|
||||||
//both faces cannot pass this condition, return early if one does.
|
|
||||||
return FEV::Face(face_id);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FEV::Edge(edge_id)
|
}
|
||||||
},
|
|
||||||
|
// end condition
|
||||||
|
let v0_changed=match best_v0{
|
||||||
|
Some(new_v0)=>{
|
||||||
|
v0=new_v0;
|
||||||
|
m0v=self.mesh0.vert(v0);
|
||||||
|
v0e=self.mesh0.vert_edges(v0);
|
||||||
|
v0e_ref=v0e.as_ref();
|
||||||
|
true
|
||||||
|
},
|
||||||
|
None=>false,
|
||||||
|
};
|
||||||
|
let v1_changed=match best_v1{
|
||||||
|
Some(new_v1)=>{
|
||||||
|
v1=new_v1;
|
||||||
|
m1v=self.mesh1.vert(v1);
|
||||||
|
v1e=self.mesh1.vert_edges(v1);
|
||||||
|
v1e_ref=v1e.as_ref();
|
||||||
|
true
|
||||||
|
},
|
||||||
|
None=>false,
|
||||||
|
};
|
||||||
|
// if neither vertex changes, we found the closest two vertices.
|
||||||
|
if !(v0_changed&&v1_changed){
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
// now you have the two closest vertices
|
||||||
// TODO: fundamentally improve this algorithm.
|
let mut best_fev=FEV::Vert(MinkowskiVert::VertVert(v0,v1));
|
||||||
// All it needs to do is find the closest point on the mesh
|
// ==== FEV::Edge ====
|
||||||
// and return the FEV which the point resides on.
|
// test VertEdges
|
||||||
//
|
for &e1 in v1e_ref{
|
||||||
// What it actually does is use the above functions to trace a ray in from infinity,
|
let edge_verts=self.mesh1.edge_verts(e1.as_undirected());
|
||||||
// crawling the closest point along the mesh surface until the ray reaches
|
let &[ev0_id,ev1_id]=edge_verts.as_ref();
|
||||||
// the starting point to discover the final FEV.
|
let (ev0,ev1)=(self.mesh1.vert(ev0_id),self.mesh1.vert(ev1_id));
|
||||||
//
|
let edge_n=ev1-ev0;
|
||||||
// The actual collision prediction probably does a single test
|
// use relative coordinates to make including relative_position easier
|
||||||
// and then immediately returns with 0 FEV transitions on average,
|
let diff=relative_position+m0v-ev0;
|
||||||
// because of the strict time_limit constraint.
|
let d=diff.dot(edge_n);
|
||||||
//
|
// is test point between edge vertices
|
||||||
// Most of the calculation time is just calculating the starting point
|
let edge_nn=edge_n.dot(edge_n);
|
||||||
// for the "actual" crawling algorithm below (predict_collision_{in|out}).
|
if d.is_positive()&&d<edge_nn{
|
||||||
fn closest_fev_not_inside(&self,mut infinity_body:Body,start_time:Bound<&Time>)->Option<FEV<MinkowskiMesh<'_>>>{
|
let distance_squared={
|
||||||
infinity_body.infinity_dir().and_then(|dir|{
|
let c=diff.cross(edge_n);
|
||||||
let infinity_fev=self.infinity_fev(-dir,infinity_body.position);
|
//wrap for speed
|
||||||
//a line is simpler to solve than a parabola
|
(c.dot(c)/edge_nn).divide().wrap_2()
|
||||||
infinity_body.velocity=dir;
|
};
|
||||||
infinity_body.acceleration=vec3::ZERO;
|
if distance_squared<best_distance_squared{
|
||||||
//crawl in from negative infinity along a tangent line to get the closest fev
|
best_distance_squared=distance_squared;
|
||||||
infinity_fev.crawl(self,&infinity_body,Bound::Unbounded,start_time).miss()
|
best_fev=FEV::Edge(MinkowskiEdge::VertEdge(v0,e1.as_undirected()))
|
||||||
})
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// test EdgeVerts
|
||||||
|
for &e0 in v0e_ref{
|
||||||
|
let edge_verts=self.mesh0.edge_verts(e0.as_undirected());
|
||||||
|
let &[ev0_id,ev1_id]=edge_verts.as_ref();
|
||||||
|
let (ev0,ev1)=(self.mesh0.vert(ev0_id),self.mesh0.vert(ev1_id));
|
||||||
|
let edge_n=ev1-ev0;
|
||||||
|
// use relative coordinates to make including relative_position easier
|
||||||
|
let diff=m1v-relative_position-ev0;
|
||||||
|
let d=diff.dot(edge_n);
|
||||||
|
// is test point between edge vertices
|
||||||
|
let edge_nn=edge_n.dot(edge_n);
|
||||||
|
if d.is_positive()&&d<edge_nn{
|
||||||
|
let distance_squared={
|
||||||
|
let c=diff.cross(edge_n);
|
||||||
|
//wrap for speed
|
||||||
|
(c.dot(c)/edge_nn).divide().wrap_2()
|
||||||
|
};
|
||||||
|
if distance_squared<best_distance_squared{
|
||||||
|
best_distance_squared=distance_squared;
|
||||||
|
best_fev=FEV::Edge(MinkowskiEdge::EdgeVert(e0.as_undirected(),v1))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==== FEV::Face ====
|
||||||
|
// test VertFaces
|
||||||
|
'outer: for &f1 in self.mesh1.vert_faces(v1).as_ref(){
|
||||||
|
let (n,d)=self.mesh1.face_nd(f1);
|
||||||
|
// Test the face's voronoi column
|
||||||
|
for &e1 in self.mesh1.face_edges(f1).as_ref(){
|
||||||
|
let edge_n=self.mesh1.directed_edge_n(e1);
|
||||||
|
let boundary_n=n.cross(edge_n);
|
||||||
|
let &[ev0_id,ev1_id]=self.mesh1.edge_verts(e1.as_undirected()).as_ref();
|
||||||
|
let (ev0,ev1)=(self.mesh1.vert(ev0_id),self.mesh1.vert(ev1_id));
|
||||||
|
let diff=(relative_position+m0v)*2-(ev0+ev1);
|
||||||
|
if boundary_n.dot(diff).is_negative(){
|
||||||
|
// The test point is outside the face's voronoi column.
|
||||||
|
continue 'outer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Calculate distance
|
||||||
|
let d=n.dot(relative_position+m0v)-d;
|
||||||
|
// Wrap for speed
|
||||||
|
let distance_squared=(d*d).wrap_2();
|
||||||
|
if distance_squared<best_distance_squared{
|
||||||
|
best_distance_squared=distance_squared;
|
||||||
|
best_fev=FEV::Face(MinkowskiFace::VertFace(v0,f1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// test FaceVerts
|
||||||
|
'outer: for &f0 in self.mesh0.vert_faces(v0).as_ref(){
|
||||||
|
let (n,d)=self.mesh0.face_nd(f0);
|
||||||
|
// Test the face's voronoi column
|
||||||
|
for &e0 in self.mesh0.face_edges(f0).as_ref(){
|
||||||
|
let edge_n=self.mesh0.directed_edge_n(e0);
|
||||||
|
let boundary_n=n.cross(edge_n);
|
||||||
|
let &[ev0_id,ev1_id]=self.mesh0.edge_verts(e0.as_undirected()).as_ref();
|
||||||
|
let (ev0,ev1)=(self.mesh0.vert(ev0_id),self.mesh0.vert(ev1_id));
|
||||||
|
let diff=(m1v-relative_position)*2-(ev0+ev1);
|
||||||
|
if boundary_n.dot(diff).is_negative(){
|
||||||
|
// The test point is outside the face's voronoi column.
|
||||||
|
continue 'outer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Calculate distance
|
||||||
|
let d=n.dot(relative_position+m0v)-d;
|
||||||
|
// Wrap for speed
|
||||||
|
let distance_squared=(d*d).wrap_2();
|
||||||
|
if distance_squared<best_distance_squared{
|
||||||
|
best_distance_squared=distance_squared;
|
||||||
|
best_fev=FEV::Face(MinkowskiFace::FaceVert(f0,v1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// test EdgeEdges
|
||||||
|
Some(best_fev)
|
||||||
}
|
}
|
||||||
pub fn predict_collision_in(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
|
pub fn predict_collision_in(&self,relative_body:&Body,range:impl RangeBounds<Time>)->Option<(MinkowskiFace,GigaTime)>{
|
||||||
self.closest_fev_not_inside(*relative_body,range.start_bound()).and_then(|fev|{
|
self.closest_fev_not_inside(relative_body.position).and_then(|fev|{
|
||||||
//continue forwards along the body parabola
|
//continue forwards along the body parabola
|
||||||
fev.crawl(self,relative_body,range.start_bound(),range.end_bound()).hit()
|
fev.crawl(self,relative_body,range.start_bound(),range.end_bound()).hit()
|
||||||
})
|
})
|
||||||
@@ -765,10 +839,9 @@ impl MinkowskiMesh<'_>{
|
|||||||
let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
|
let (lower_bound,upper_bound)=(range.start_bound(),range.end_bound());
|
||||||
// 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;
|
self.closest_fev_not_inside(relative_body.position).and_then(|fev|{
|
||||||
self.closest_fev_not_inside(infinity_body,lower_bound.as_ref()).and_then(|fev|{
|
|
||||||
//continue backwards along the body parabola
|
//continue backwards along the body parabola
|
||||||
fev.crawl(self,&infinity_body,lower_bound.as_ref(),upper_bound.as_ref()).hit()
|
fev.crawl(self,&-relative_body,lower_bound.as_ref(),upper_bound.as_ref()).hit()
|
||||||
//no need to test -time<time_limit because of the first step
|
//no need to test -time<time_limit because of the first step
|
||||||
.map(|(face,time)|(face,-time))
|
.map(|(face,time)|(face,-time))
|
||||||
})
|
})
|
||||||
@@ -778,10 +851,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;
|
||||||
@@ -804,20 +874,10 @@ impl MinkowskiMesh<'_>{
|
|||||||
}
|
}
|
||||||
best_edge
|
best_edge
|
||||||
}
|
}
|
||||||
fn infinity_in(&self,infinity_body:Body)->Option<(MinkowskiFace,GigaTime)>{
|
|
||||||
let infinity_fev=self.infinity_fev(-infinity_body.velocity,infinity_body.position);
|
|
||||||
// Bound::Included means that the surface of the mesh is included in the mesh
|
|
||||||
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);
|
// TODO
|
||||||
//movement must escape the mesh forwards and backwards in time,
|
println!("Unimplemented is_point_in_mesh called! {point}");
|
||||||
//otherwise the point is not inside the mesh
|
false
|
||||||
self.infinity_in(infinity_body)
|
|
||||||
.is_some_and(|_|
|
|
||||||
self.infinity_in(-infinity_body)
|
|
||||||
.is_some()
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl MeshQuery for MinkowskiMesh<'_>{
|
impl MeshQuery for MinkowskiMesh<'_>{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ pub enum InternalInstruction{
|
|||||||
pub struct InputState{
|
pub struct InputState{
|
||||||
mouse:MouseState,
|
mouse:MouseState,
|
||||||
next_mouse:MouseState,
|
next_mouse:MouseState,
|
||||||
controls:strafesnet_common::controls_bitflag::Controls,
|
controls:Controls,
|
||||||
}
|
}
|
||||||
impl InputState{
|
impl InputState{
|
||||||
fn set_next_mouse(&mut self,next_mouse:MouseState){
|
fn set_next_mouse(&mut self,next_mouse:MouseState){
|
||||||
@@ -302,7 +302,7 @@ impl PhysicsCamera{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl std::default::Default for PhysicsCamera{
|
impl Default for PhysicsCamera{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self{
|
Self{
|
||||||
sensitivity:Ratio64Vec2::ONE*200_000,
|
sensitivity:Ratio64Vec2::ONE*200_000,
|
||||||
@@ -385,7 +385,7 @@ mod gameplay{
|
|||||||
self.unordered_checkpoints.clear();
|
self.unordered_checkpoints.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl std::default::Default for ModeState{
|
impl Default for ModeState{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self{
|
Self{
|
||||||
mode_id:gameplay_modes::ModeId::MAIN,
|
mode_id:gameplay_modes::ModeId::MAIN,
|
||||||
@@ -1928,7 +1928,7 @@ mod test{
|
|||||||
fn test_collision_rotated(relative_body:Body,expected_collision_time:Option<Time>){
|
fn test_collision_rotated(relative_body:Body,expected_collision_time:Option<Time>){
|
||||||
let h0=HitboxMesh::new(PhysicsMesh::unit_cube(),
|
let h0=HitboxMesh::new(PhysicsMesh::unit_cube(),
|
||||||
integer::Planar64Affine3::new(
|
integer::Planar64Affine3::new(
|
||||||
integer::Planar64Mat3::from_cols([
|
Planar64Mat3::from_cols([
|
||||||
int3(5,0,1)>>1,
|
int3(5,0,1)>>1,
|
||||||
int3(0,1,0)>>1,
|
int3(0,1,0)>>1,
|
||||||
int3(-1,0,5)>>1,
|
int3(-1,0,5)>>1,
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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)]
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ pub struct StyleModifiers{
|
|||||||
//unused
|
//unused
|
||||||
pub mass:Planar64,
|
pub mass:Planar64,
|
||||||
}
|
}
|
||||||
impl std::default::Default for StyleModifiers{
|
impl Default for StyleModifiers{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self::roblox_bhop()
|
Self::roblox_bhop()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ impl<T> std::fmt::Display for Time<T>{
|
|||||||
write!(f,"{}s+{:09}ns",self.0/Self::ONE_SECOND.0,self.0%Self::ONE_SECOND.0)
|
write!(f,"{}s+{:09}ns",self.0/Self::ONE_SECOND.0,self.0%Self::ONE_SECOND.0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<T> std::default::Default for Time<T>{
|
impl<T> Default for Time<T>{
|
||||||
fn default()->Self{
|
fn default()->Self{
|
||||||
Self::raw(0)
|
Self::raw(0)
|
||||||
}
|
}
|
||||||
@@ -126,7 +126,7 @@ impl_time_additive_assign_operator!(core::ops::AddAssign,add_assign);
|
|||||||
impl_time_additive_assign_operator!(core::ops::SubAssign,sub_assign);
|
impl_time_additive_assign_operator!(core::ops::SubAssign,sub_assign);
|
||||||
impl_time_additive_assign_operator!(core::ops::RemAssign,rem_assign);
|
impl_time_additive_assign_operator!(core::ops::RemAssign,rem_assign);
|
||||||
impl<T> std::ops::Mul for Time<T>{
|
impl<T> std::ops::Mul for Time<T>{
|
||||||
type Output=Ratio<fixed_wide::fixed::Fixed<2,64>,fixed_wide::fixed::Fixed<2,64>>;
|
type Output=Ratio<Fixed<2,64>,Fixed<2,64>>;
|
||||||
#[inline]
|
#[inline]
|
||||||
fn mul(self,rhs:Self)->Self::Output{
|
fn mul(self,rhs:Self)->Self::Output{
|
||||||
Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
|
Ratio::new(Fixed::raw(self.0)*Fixed::raw(rhs.0),Fixed::raw_digit(1_000_000_000i64.pow(2)))
|
||||||
@@ -156,7 +156,7 @@ impl<T> core::ops::Mul<Time<T>> for Planar64{
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test_time{
|
mod test_time{
|
||||||
use super::*;
|
use super::*;
|
||||||
type Time=super::AbsoluteTime;
|
type Time=AbsoluteTime;
|
||||||
#[test]
|
#[test]
|
||||||
fn time_from_planar64(){
|
fn time_from_planar64(){
|
||||||
let a:Time=Planar64::from(1).into();
|
let a:Time=Planar64::from(1).into();
|
||||||
@@ -552,7 +552,7 @@ impl TryFrom<[f32;3]> for Unit32Vec3{
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
pub type Planar64TryFromFloatError=fixed_wide::fixed::FixedFromFloatError;
|
pub type Planar64TryFromFloatError=FixedFromFloatError;
|
||||||
pub type Planar64=fixed_wide::types::I32F32;
|
pub type Planar64=fixed_wide::types::I32F32;
|
||||||
pub type Planar64Vec3=linear_ops::types::Vector3<Planar64>;
|
pub type Planar64Vec3=linear_ops::types::Vector3<Planar64>;
|
||||||
pub type Planar64Mat3=linear_ops::types::Matrix3<Planar64>;
|
pub type Planar64Mat3=linear_ops::types::Matrix3<Planar64>;
|
||||||
@@ -562,11 +562,11 @@ pub mod vec3{
|
|||||||
pub const MIN:Planar64Vec3=Planar64Vec3::new([Planar64::MIN;3]);
|
pub const MIN:Planar64Vec3=Planar64Vec3::new([Planar64::MIN;3]);
|
||||||
pub const MAX:Planar64Vec3=Planar64Vec3::new([Planar64::MAX;3]);
|
pub const MAX:Planar64Vec3=Planar64Vec3::new([Planar64::MAX;3]);
|
||||||
pub const ZERO:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO;3]);
|
pub const ZERO:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO;3]);
|
||||||
pub const ZERO_2:linear_ops::types::Vector3<Fixed::<2,64>>=linear_ops::types::Vector3::new([Fixed::<2,64>::ZERO;3]);
|
pub const ZERO_2:Vector3<Fixed::<2,64>>=Vector3::new([Fixed::<2,64>::ZERO;3]);
|
||||||
pub const ZERO_3:linear_ops::types::Vector3<Fixed::<3,96>>=linear_ops::types::Vector3::new([Fixed::<3,96>::ZERO;3]);
|
pub const ZERO_3:Vector3<Fixed::<3,96>>=Vector3::new([Fixed::<3,96>::ZERO;3]);
|
||||||
pub const ZERO_4:linear_ops::types::Vector3<Fixed::<4,128>>=linear_ops::types::Vector3::new([Fixed::<4,128>::ZERO;3]);
|
pub const ZERO_4:Vector3<Fixed::<4,128>>=Vector3::new([Fixed::<4,128>::ZERO;3]);
|
||||||
pub const ZERO_5:linear_ops::types::Vector3<Fixed::<5,160>>=linear_ops::types::Vector3::new([Fixed::<5,160>::ZERO;3]);
|
pub const ZERO_5:Vector3<Fixed::<5,160>>=Vector3::new([Fixed::<5,160>::ZERO;3]);
|
||||||
pub const ZERO_6:linear_ops::types::Vector3<Fixed::<6,192>>=linear_ops::types::Vector3::new([Fixed::<6,192>::ZERO;3]);
|
pub const ZERO_6:Vector3<Fixed::<6,192>>=Vector3::new([Fixed::<6,192>::ZERO;3]);
|
||||||
pub const X:Planar64Vec3=Planar64Vec3::new([Planar64::ONE,Planar64::ZERO,Planar64::ZERO]);
|
pub const X:Planar64Vec3=Planar64Vec3::new([Planar64::ONE,Planar64::ZERO,Planar64::ZERO]);
|
||||||
pub const Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ONE,Planar64::ZERO]);
|
pub const Y:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ONE,Planar64::ZERO]);
|
||||||
pub const Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::ONE]);
|
pub const Z:Planar64Vec3=Planar64Vec3::new([Planar64::ZERO,Planar64::ZERO,Planar64::ONE]);
|
||||||
|
|||||||
@@ -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)
|
||||||
@@ -286,6 +288,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>{
|
||||||
|
|||||||
@@ -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,7 +12,7 @@ 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_binary = { version = "1.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_dom_weak = { version = "3.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"
|
||||||
@@ -23,3 +23,6 @@ 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" }
|
||||||
|
|
||||||
|
[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;
|
||||||
@@ -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);
|
||||||
@@ -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>{
|
||||||
|
|||||||
@@ -9,3 +9,6 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
url = "2.5.4"
|
url = "2.5.4"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -19,3 +19,6 @@ rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
|||||||
rbx_reflection = "5.0.0"
|
rbx_reflection = "5.0.0"
|
||||||
rbx_reflection_database = "1.0.0"
|
rbx_reflection_database = "1.0.0"
|
||||||
rbx_types = "2.0.0"
|
rbx_types = "2.0.0"
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ impl<'a> EnumItem<'a>{
|
|||||||
Self{name:Some(name.as_ref()),value}
|
Self{name:Some(name.as_ref()),value}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl<'a> From<rbx_types::Enum> for EnumItem<'a>{
|
impl From<rbx_types::Enum> for EnumItem<'_>{
|
||||||
fn from(e:rbx_types::Enum)->Self{
|
fn from(e:rbx_types::Enum)->Self{
|
||||||
EnumItem{
|
EnumItem{
|
||||||
name:None,
|
name:None,
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ use rbx_types::Ref;
|
|||||||
use rbx_dom_weak::{Ustr,InstanceBuilder,WeakDom};
|
use rbx_dom_weak::{Ustr,InstanceBuilder,WeakDom};
|
||||||
|
|
||||||
use crate::util::static_ustr;
|
use crate::util::static_ustr;
|
||||||
use crate::runner::vector3::Vector3;
|
|
||||||
use crate::runner::number::Number;
|
use crate::runner::number::Number;
|
||||||
|
|
||||||
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
|
||||||
@@ -44,7 +43,7 @@ pub fn class_is_a(class:&str,superclass:&str)->bool{
|
|||||||
};
|
};
|
||||||
db.has_superclass(class,superclass)
|
db.has_superclass(class,superclass)
|
||||||
}
|
}
|
||||||
fn get_full_name(dom:&rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance)->String{
|
fn get_full_name(dom:&WeakDom,instance:&rbx_dom_weak::Instance)->String{
|
||||||
let mut full_name=instance.name.clone();
|
let mut full_name=instance.name.clone();
|
||||||
let mut pref=instance.parent();
|
let mut pref=instance.parent();
|
||||||
while let Some(parent)=dom.get_by_ref(pref){
|
while let Some(parent)=dom.get_by_ref(pref){
|
||||||
@@ -66,28 +65,28 @@ pub fn get_name_source(lua:&mlua::Lua,script:Instance)->Result<(String,String),m
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_first_child<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_child<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.name==name)
|
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.name==name)
|
||||||
}
|
}
|
||||||
pub fn find_first_descendant<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_descendant<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,name:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
dom.descendants_of(instance.referent()).find(|&inst|inst.name==name)
|
dom.descendants_of(instance.referent()).find(|&inst|inst.name==name)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_first_child_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_child_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.class==class)
|
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|inst.class==class)
|
||||||
}
|
}
|
||||||
pub fn find_first_descendant_of_class<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_descendant_of_class<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,class:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
dom.descendants_of(instance.referent()).find(|&inst|inst.class==class)
|
dom.descendants_of(instance.referent()).find(|&inst|inst.class==class)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_first_child_which_is_a<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_child_which_is_a<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get();
|
||||||
let superclass_descriptor=db.classes.get(superclass)?;
|
let superclass_descriptor=db.classes.get(superclass)?;
|
||||||
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|{
|
instance.children().iter().filter_map(|&r|dom.get_by_ref(r)).find(|inst|{
|
||||||
db.classes.get(inst.class.as_str()).is_some_and(|descriptor|db.has_superclass(descriptor,superclass_descriptor))
|
db.classes.get(inst.class.as_str()).is_some_and(|descriptor|db.has_superclass(descriptor,superclass_descriptor))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
pub fn find_first_descendant_which_is_a<'a>(dom:&'a rbx_dom_weak::WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
pub fn find_first_descendant_which_is_a<'a>(dom:&'a WeakDom,instance:&rbx_dom_weak::Instance,superclass:&str)->Option<&'a rbx_dom_weak::Instance>{
|
||||||
let db=rbx_reflection_database::get();
|
let db=rbx_reflection_database::get();
|
||||||
let superclass_descriptor=db.classes.get(superclass)?;
|
let superclass_descriptor=db.classes.get(superclass)?;
|
||||||
dom.descendants_of(instance.referent()).find(|inst|{
|
dom.descendants_of(instance.referent()).find(|inst|{
|
||||||
@@ -488,8 +487,8 @@ static CLASS_FUNCTION_DATABASE:CFD=phf::phf_map!{
|
|||||||
"GetService"=>GET_SERVICE,
|
"GetService"=>GET_SERVICE,
|
||||||
},
|
},
|
||||||
"Terrain"=>phf::phf_map!{
|
"Terrain"=>phf::phf_map!{
|
||||||
"FillBall"=>cf!(|_lua,_,_:(Vector3,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
"FillBall"=>cf!(|_lua,_,_:(crate::runner::vector3::Vector3,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
||||||
"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Vector3,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
"FillBlock"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,crate::runner::vector3::Vector3,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
||||||
"FillCylinder"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Number,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
"FillCylinder"=>cf!(|_lua,_,_:(crate::runner::cframe::CFrame,Number,Number,crate::runner::r#enum::CoerceEnum)|mlua::Result::Ok(())),
|
||||||
"SetMaterialColor"=>cf!(|_lua,_,_:(crate::runner::r#enum::CoerceEnum,crate::runner::color3::Color3)|mlua::Result::Ok(())),
|
"SetMaterialColor"=>cf!(|_lua,_,_:(crate::runner::r#enum::CoerceEnum,crate::runner::color3::Color3)|mlua::Result::Ok(())),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -48,6 +48,11 @@ fn init(lua:&mlua::Lua)->mlua::Result<()>{
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsafe fn extend_lifetime_mut<'a,T>(src:&mut T)->&'a mut T{
|
||||||
|
let ptr:*mut T=src;
|
||||||
|
unsafe{&mut*ptr}
|
||||||
|
}
|
||||||
|
|
||||||
impl Runner{
|
impl Runner{
|
||||||
pub fn new()->Result<Self,Error>{
|
pub fn new()->Result<Self,Error>{
|
||||||
let runner=Self{
|
let runner=Self{
|
||||||
@@ -65,8 +70,7 @@ impl Runner{
|
|||||||
// SAFETY: This is not a &'static mut WeakDom,
|
// SAFETY: This is not a &'static mut WeakDom,
|
||||||
// but as long as Runnable<'a> holds the lifetime of &'a mut Context
|
// but as long as Runnable<'a> holds the lifetime of &'a mut Context
|
||||||
// it is a valid unique reference.
|
// it is a valid unique reference.
|
||||||
let ptr=&mut context.dom as *mut rbx_dom_weak::WeakDom;
|
self.lua.set_app_data::<crate::context::LuaAppData>(unsafe{extend_lifetime_mut(&mut context.dom)});
|
||||||
self.lua.set_app_data::<crate::context::LuaAppData>(unsafe{&mut*ptr});
|
|
||||||
#[cfg(feature="run-service")]
|
#[cfg(feature="run-service")]
|
||||||
self.lua.set_app_data::<crate::scheduler::Scheduler>(crate::scheduler::Scheduler::default());
|
self.lua.set_app_data::<crate::scheduler::Scheduler>(crate::scheduler::Scheduler::default());
|
||||||
Ok(Runnable{
|
Ok(Runnable{
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ impl mlua::FromLua for ScriptSignal{
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl mlua::UserData for ScriptConnection{
|
impl mlua::UserData for ScriptConnection{
|
||||||
fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
|
fn add_fields<F:UserDataFields<Self>>(fields:&mut F){
|
||||||
fields.add_field_method_get("Connected",|_,this|{
|
fields.add_field_method_get("Connected",|_,this|{
|
||||||
Ok(this.position().is_some())
|
Ok(this.position().is_some())
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ impl Scheduler{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut crate::scheduler::Scheduler)->mlua::Result<T>)->mlua::Result<T>{
|
pub fn scheduler_mut<T>(lua:&mlua::Lua,mut f:impl FnMut(&mut Scheduler)->mlua::Result<T>)->mlua::Result<T>{
|
||||||
let mut scheduler=lua.app_data_mut::<crate::scheduler::Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
|
let mut scheduler=lua.app_data_mut::<Scheduler>().ok_or_else(||mlua::Error::runtime("Scheduler missing"))?;
|
||||||
f(&mut *scheduler)
|
f(&mut *scheduler)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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,7 +12,6 @@ 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 = { version = "1.0.1-sn5", registry = "strafesnet" }
|
||||||
rbx_dom_weak = { version = "3.0.1-sn5", registry = "strafesnet" }
|
rbx_dom_weak = { version = "3.0.1-sn5", 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