forked from StrafesNET/strafe-client
Compare commits
34 Commits
point-phys
...
master
Author | SHA1 | Date | |
---|---|---|---|
f07d9f968e | |||
2cef79da1d | |||
3bad427f61 | |||
90cca51e6e | |||
480cd0e3be | |||
515ca20fb5 | |||
6dff6a2c33 | |||
ae9fc15320 | |||
6ae058d834 | |||
517c4914ac | |||
6ce057ac64 | |||
c86824bdc1 | |||
a7f7edef00 | |||
5b8e5c8899 | |||
14000c016e | |||
1c4191cfc9 | |||
b2f067e0b4 | |||
aec82358ee | |||
5da5006027 | |||
97a1b57b65 | |||
a359650ff8 | |||
1790390055 | |||
49e077996d | |||
9bfcf0b083 | |||
82b3201b0a | |||
513414d4bd | |||
5c4bd4c3c7 | |||
92ec137f33 | |||
5cedf91709 | |||
c201a1a626 | |||
fbae4d9f80 | |||
9374e93801 | |||
0585cfe6f1 | |||
3d96517213 |
1025
Cargo.lock
generated
1025
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
11
Cargo.toml
11
Cargo.toml
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "strafe-client"
|
name = "strafe-client"
|
||||||
version = "0.8.0"
|
version = "0.9.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
@ -9,7 +9,7 @@ edition = "2021"
|
|||||||
bytemuck = { version = "1.13.1", features = ["derive"] }
|
bytemuck = { version = "1.13.1", features = ["derive"] }
|
||||||
configparser = "3.0.2"
|
configparser = "3.0.2"
|
||||||
ddsfile = "0.5.1"
|
ddsfile = "0.5.1"
|
||||||
glam = "0.24.1"
|
glam = "0.25.0"
|
||||||
lazy-regex = "3.0.2"
|
lazy-regex = "3.0.2"
|
||||||
obj = "0.10.2"
|
obj = "0.10.2"
|
||||||
parking_lot = "0.12.1"
|
parking_lot = "0.12.1"
|
||||||
@ -18,8 +18,11 @@ rbx_binary = "0.7.1"
|
|||||||
rbx_dom_weak = "2.5.0"
|
rbx_dom_weak = "2.5.0"
|
||||||
rbx_reflection_database = "0.2.7"
|
rbx_reflection_database = "0.2.7"
|
||||||
rbx_xml = "0.13.1"
|
rbx_xml = "0.13.1"
|
||||||
wgpu = "0.18.0"
|
strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "434ca29aef7e3015c9ca1ed45de8fef42e33fdfb" }
|
||||||
winit = { version = "0.29.2", features = ["rwh_05"] }
|
vbsp = "0.5.0"
|
||||||
|
vmdl = "0.1.1"
|
||||||
|
wgpu = "0.19.0"
|
||||||
|
winit = "0.29.2"
|
||||||
|
|
||||||
#[profile.release]
|
#[profile.release]
|
||||||
#lto = true
|
#lto = true
|
||||||
|
2
LICENSE
2
LICENSE
@ -1,5 +1,5 @@
|
|||||||
/*******************************************************
|
/*******************************************************
|
||||||
* Copyright (C) 2023 Rhys Lloyd <krakow20@gmail.com>
|
* Copyright (C) 2023-2024 Rhys Lloyd <krakow20@gmail.com>
|
||||||
*
|
*
|
||||||
* This file is part of the StrafesNET bhop/surf client.
|
* This file is part of the StrafesNET bhop/surf client.
|
||||||
*
|
*
|
||||||
|
43
src/aabb.rs
43
src/aabb.rs
@ -1,43 +0,0 @@
|
|||||||
use crate::integer::Planar64Vec3;
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct Aabb{
|
|
||||||
pub min:Planar64Vec3,
|
|
||||||
pub max:Planar64Vec3,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for Aabb {
|
|
||||||
fn default()->Self {
|
|
||||||
Self{min:Planar64Vec3::MAX,max:Planar64Vec3::MIN}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Aabb{
|
|
||||||
pub fn grow(&mut self,point:Planar64Vec3){
|
|
||||||
self.min=self.min.min(point);
|
|
||||||
self.max=self.max.max(point);
|
|
||||||
}
|
|
||||||
pub fn join(&mut self,aabb:&Aabb){
|
|
||||||
self.min=self.min.min(aabb.min);
|
|
||||||
self.max=self.max.max(aabb.max);
|
|
||||||
}
|
|
||||||
pub fn inflate(&mut self,hs:Planar64Vec3){
|
|
||||||
self.min-=hs;
|
|
||||||
self.max+=hs;
|
|
||||||
}
|
|
||||||
pub fn intersects(&self,aabb:&Aabb)->bool{
|
|
||||||
(self.min.cmplt(aabb.max)&aabb.min.cmplt(self.max)).all()
|
|
||||||
}
|
|
||||||
pub fn center(&self)->Planar64Vec3{
|
|
||||||
return self.min.midpoint(self.max)
|
|
||||||
}
|
|
||||||
//probably use floats for area & volume because we don't care about precision
|
|
||||||
// pub fn area_weight(&self)->f32{
|
|
||||||
// let d=self.max-self.min;
|
|
||||||
// d.x*d.y+d.y*d.z+d.z*d.x
|
|
||||||
// }
|
|
||||||
// pub fn volume(&self)->f32{
|
|
||||||
// let d=self.max-self.min;
|
|
||||||
// d.x*d.y*d.z
|
|
||||||
// }
|
|
||||||
}
|
|
123
src/bvh.rs
123
src/bvh.rs
@ -1,123 +0,0 @@
|
|||||||
use crate::aabb::Aabb;
|
|
||||||
|
|
||||||
//da algaritum
|
|
||||||
//lista boxens
|
|
||||||
//sort by {minx,maxx,miny,maxy,minz,maxz} (6 lists)
|
|
||||||
//find the sets that minimizes the sum of surface areas
|
|
||||||
//splitting is done when the minimum split sum of surface areas is larger than the node's own surface area
|
|
||||||
|
|
||||||
//start with bisection into octrees because a bad bvh is still 1000x better than no bvh
|
|
||||||
//sort the centerpoints on each axis (3 lists)
|
|
||||||
//bv is put into octant based on whether it is upper or lower in each list
|
|
||||||
enum BvhNodeContent{
|
|
||||||
Branch(Vec<BvhNode>),
|
|
||||||
Leaf(usize),
|
|
||||||
}
|
|
||||||
impl Default for BvhNodeContent{
|
|
||||||
fn default()->Self{
|
|
||||||
Self::Branch(Vec::new())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct BvhNode{
|
|
||||||
content:BvhNodeContent,
|
|
||||||
aabb:Aabb,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl BvhNode{
|
|
||||||
pub fn the_tester<F:FnMut(usize)>(&self,aabb:&Aabb,f:&mut F){
|
|
||||||
match &self.content{
|
|
||||||
&BvhNodeContent::Leaf(model)=>f(model),
|
|
||||||
BvhNodeContent::Branch(children)=>for child in children{
|
|
||||||
//this test could be moved outside the match statement
|
|
||||||
//but that would test the root node aabb
|
|
||||||
//you're probably not going to spend a lot of time outside the map,
|
|
||||||
//so the test is extra work for nothing
|
|
||||||
if aabb.intersects(&child.aabb){
|
|
||||||
child.the_tester(aabb,f);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn generate_bvh(boxen:Vec<Aabb>)->BvhNode{
|
|
||||||
generate_bvh_node(boxen.into_iter().enumerate().collect())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn generate_bvh_node(boxen:Vec<(usize,Aabb)>)->BvhNode{
|
|
||||||
let n=boxen.len();
|
|
||||||
if n<20{
|
|
||||||
let mut aabb=Aabb::default();
|
|
||||||
let nodes=boxen.into_iter().map(|b|{
|
|
||||||
aabb.join(&b.1);
|
|
||||||
BvhNode{
|
|
||||||
content:BvhNodeContent::Leaf(b.0),
|
|
||||||
aabb:b.1,
|
|
||||||
}
|
|
||||||
}).collect();
|
|
||||||
BvhNode{
|
|
||||||
content:BvhNodeContent::Branch(nodes),
|
|
||||||
aabb,
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
let mut octant=std::collections::HashMap::with_capacity(n);//this ids which octant the boxen is put in
|
|
||||||
let mut sort_x=Vec::with_capacity(n);
|
|
||||||
let mut sort_y=Vec::with_capacity(n);
|
|
||||||
let mut sort_z=Vec::with_capacity(n);
|
|
||||||
for (i,aabb) in boxen.iter(){
|
|
||||||
let center=aabb.center();
|
|
||||||
octant.insert(*i,0);
|
|
||||||
sort_x.push((*i,center.x()));
|
|
||||||
sort_y.push((*i,center.y()));
|
|
||||||
sort_z.push((*i,center.z()));
|
|
||||||
}
|
|
||||||
sort_x.sort_by(|tup0,tup1|tup0.1.partial_cmp(&tup1.1).unwrap());
|
|
||||||
sort_y.sort_by(|tup0,tup1|tup0.1.partial_cmp(&tup1.1).unwrap());
|
|
||||||
sort_z.sort_by(|tup0,tup1|tup0.1.partial_cmp(&tup1.1).unwrap());
|
|
||||||
let h=n/2;
|
|
||||||
let median_x=sort_x[h].1;
|
|
||||||
let median_y=sort_y[h].1;
|
|
||||||
let median_z=sort_z[h].1;
|
|
||||||
for (i,c) in sort_x{
|
|
||||||
if median_x<c{
|
|
||||||
octant.insert(i,octant[&i]+1<<0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (i,c) in sort_y{
|
|
||||||
if median_y<c{
|
|
||||||
octant.insert(i,octant[&i]+1<<1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (i,c) in sort_z{
|
|
||||||
if median_z<c{
|
|
||||||
octant.insert(i,octant[&i]+1<<2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//generate lists for unique octant values
|
|
||||||
let mut list_list=Vec::with_capacity(8);
|
|
||||||
let mut octant_list=Vec::with_capacity(8);
|
|
||||||
for (i,aabb) in boxen.into_iter(){
|
|
||||||
let octant_id=octant[&i];
|
|
||||||
let list_id=if let Some(list_id)=octant_list.iter().position(|&id|id==octant_id){
|
|
||||||
list_id
|
|
||||||
}else{
|
|
||||||
let list_id=list_list.len();
|
|
||||||
octant_list.push(octant_id);
|
|
||||||
list_list.push(Vec::new());
|
|
||||||
list_id
|
|
||||||
};
|
|
||||||
list_list[list_id].push((i,aabb));
|
|
||||||
}
|
|
||||||
let mut aabb=Aabb::default();
|
|
||||||
let children=list_list.into_iter().map(|b|{
|
|
||||||
let node=generate_bvh_node(b);
|
|
||||||
aabb.join(&node.aabb);
|
|
||||||
node
|
|
||||||
}).collect();
|
|
||||||
BvhNode{
|
|
||||||
content:BvhNodeContent::Branch(children),
|
|
||||||
aabb,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,49 +1,46 @@
|
|||||||
use crate::physics::Body;
|
use crate::physics::Body;
|
||||||
use crate::model_physics::{FEV,MeshQuery};
|
use crate::model_physics::{FEV,MeshQuery,DirectedEdge};
|
||||||
use crate::integer::{Time,Planar64,Planar64Vec3};
|
use strafesnet_common::integer::{Time,Planar64};
|
||||||
use crate::zeroes::zeroes2;
|
use strafesnet_common::zeroes::zeroes2;
|
||||||
|
|
||||||
struct State<FEV>{
|
enum Transition<F,E:DirectedEdge,V>{
|
||||||
fev:FEV,
|
|
||||||
time:Time,
|
|
||||||
}
|
|
||||||
|
|
||||||
enum Transition<F,E,V>{
|
|
||||||
Miss,
|
Miss,
|
||||||
Next(FEV<F,E,V>,Time),
|
Next(FEV<F,E,V>,Time),
|
||||||
Hit(F,Time),
|
Hit(F,Time),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<F:Copy,E:Copy,V:Copy> State<FEV<F,E,V>>{
|
fn next_transition<F:Copy,E:Copy+DirectedEdge,V:Copy>(fev:&FEV<F,E,V>,time:Time,mesh:&impl MeshQuery<F,E,V>,body:&Body,time_limit:Time)->Transition<F,E,V>{
|
||||||
fn next_transition(&self,mesh:&impl MeshQuery<F,E,V>,body:&Body,time_limit:Time)->Transition<F,E,V>{
|
|
||||||
//conflicting derivative means it crosses in the wrong direction.
|
//conflicting derivative means it crosses in the wrong direction.
|
||||||
//if the transition time is equal to an already tested transition, do not replace the current best.
|
//if the transition time is equal to an already tested transition, do not replace the current best.
|
||||||
let mut best_time=time_limit;
|
let mut best_time=time_limit;
|
||||||
let mut best_transtition=Transition::Miss;
|
let mut best_transtition=Transition::Miss;
|
||||||
match &self.fev{
|
match fev{
|
||||||
&FEV::<F,E,V>::Face(face_id)=>{
|
&FEV::<F,E,V>::Face(face_id)=>{
|
||||||
//test own face collision time, ignoring roots with zero or conflicting derivative
|
//test own face collision time, ignoring roots with zero or conflicting derivative
|
||||||
//n=face.normal d=face.dot
|
//n=face.normal d=face.dot
|
||||||
//n.a t^2+n.v t+n.p-d==0
|
//n.a t^2+n.v t+n.p-d==0
|
||||||
let (n,d)=mesh.face_nd(face_id);
|
let (n,d)=mesh.face_nd(face_id);
|
||||||
|
//TODO: use higher precision d value?
|
||||||
|
//use the mesh transform translation instead of baking it into the d value.
|
||||||
for t in zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
for t in zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
||||||
let t=body.time+Time::from(t);
|
let t=body.time+Time::from(t);
|
||||||
if self.time<t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
if time<=t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
||||||
best_time=t;
|
best_time=t;
|
||||||
best_transtition=Transition::Hit(face_id,t);
|
best_transtition=Transition::Hit(face_id,t);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//test each edge collision time, ignoring roots with zero or conflicting derivative
|
//test each edge collision time, ignoring roots with zero or conflicting derivative
|
||||||
for &(edge_id,test_face_id) in mesh.face_edges(face_id).iter(){
|
for &directed_edge_id in mesh.face_edges(face_id).iter(){
|
||||||
let edge_n=mesh.edge_n(edge_id);
|
let edge_n=mesh.directed_edge_n(directed_edge_id);
|
||||||
let n=n.cross(edge_n);
|
let n=n.cross(edge_n);
|
||||||
//picking a vert randomly is terrible
|
let verts=mesh.edge_verts(directed_edge_id.as_undirected());
|
||||||
let d=n.dot(mesh.vert(mesh.edge_verts(edge_id)[0]));
|
//WARNING: d is moved out of the *2 block because of adding two vertices!
|
||||||
for t in zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
for t in zeroes2(n.dot(body.position*2-(mesh.vert(verts[0])+mesh.vert(verts[1]))),n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
||||||
let t=body.time+Time::from(t);
|
let t=body.time+Time::from(t);
|
||||||
if self.time<t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
if time<=t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
||||||
best_time=t;
|
best_time=t;
|
||||||
best_transtition=Transition::Next(FEV::<F,E,V>::Edge(edge_id),t);
|
best_transtition=Transition::Next(FEV::<F,E,V>::Edge(directed_edge_id.as_undirected()),t);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -53,26 +50,29 @@ impl<F:Copy,E:Copy,V:Copy> State<FEV<F,E,V>>{
|
|||||||
&FEV::<F,E,V>::Edge(edge_id)=>{
|
&FEV::<F,E,V>::Edge(edge_id)=>{
|
||||||
//test each face collision time, ignoring roots with zero or conflicting derivative
|
//test each face collision time, ignoring roots with zero or conflicting derivative
|
||||||
let edge_n=mesh.edge_n(edge_id);
|
let edge_n=mesh.edge_n(edge_id);
|
||||||
for &test_face_id in mesh.edge_faces(edge_id).iter(){
|
let edge_verts=mesh.edge_verts(edge_id);
|
||||||
let face_n=mesh.face_nd(test_face_id).0;
|
let delta_pos=body.position*2-(mesh.vert(edge_verts[0])+mesh.vert(edge_verts[1]));
|
||||||
let n=edge_n.cross(face_n);
|
for (i,&edge_face_id) in mesh.edge_faces(edge_id).iter().enumerate(){
|
||||||
let d=n.dot(mesh.vert(mesh.edge_verts(edge_id)[0]));
|
let face_n=mesh.face_nd(edge_face_id).0;
|
||||||
for t in zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
//edge_n gets parity from the order of edge_faces
|
||||||
|
let n=face_n.cross(edge_n)*((i as i64)*2-1);
|
||||||
|
//WARNING yada yada d *2
|
||||||
|
for t in zeroes2(n.dot(delta_pos),n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
||||||
let t=body.time+Time::from(t);
|
let t=body.time+Time::from(t);
|
||||||
if self.time<t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
if time<=t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
||||||
best_time=t;
|
best_time=t;
|
||||||
best_transtition=Transition::Next(FEV::<F,E,V>::Face(test_face_id),t);
|
best_transtition=Transition::Next(FEV::<F,E,V>::Face(edge_face_id),t);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//test each vertex collision time, ignoring roots with zero or conflicting derivative
|
//test each vertex collision time, ignoring roots with zero or conflicting derivative
|
||||||
let n=mesh.edge_n(edge_id);
|
for (i,&vert_id) in edge_verts.iter().enumerate(){
|
||||||
for &vert_id in mesh.edge_verts(edge_id).iter(){
|
//vertex normal gets parity from vert index
|
||||||
let d=n.dot(mesh.vert(vert_id));
|
let n=edge_n*(1-2*(i as i64));
|
||||||
for t in zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
for t in zeroes2((n.dot(body.position-mesh.vert(vert_id)))*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
||||||
let t=body.time+Time::from(t);
|
let t=body.time+Time::from(t);
|
||||||
if self.time<t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
if time<=t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
||||||
best_time=t;
|
best_time=t;
|
||||||
best_transtition=Transition::Next(FEV::<F,E,V>::Vert(vert_id),t);
|
best_transtition=Transition::Next(FEV::<F,E,V>::Vert(vert_id),t);
|
||||||
break;
|
break;
|
||||||
@ -83,14 +83,14 @@ impl<F:Copy,E:Copy,V:Copy> State<FEV<F,E,V>>{
|
|||||||
},
|
},
|
||||||
&FEV::<F,E,V>::Vert(vert_id)=>{
|
&FEV::<F,E,V>::Vert(vert_id)=>{
|
||||||
//test each edge collision time, ignoring roots with zero or conflicting derivative
|
//test each edge collision time, ignoring roots with zero or conflicting derivative
|
||||||
for &edge_id in mesh.vert_edges(vert_id).iter(){
|
for &directed_edge_id in mesh.vert_edges(vert_id).iter(){
|
||||||
let n=mesh.edge_n(edge_id);
|
//edge is directed away from vertex, but we want the dot product to turn out negative
|
||||||
let d=n.dot(mesh.vert(vert_id));
|
let n=-mesh.directed_edge_n(directed_edge_id);
|
||||||
for t in zeroes2((n.dot(body.position)-d)*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
for t in zeroes2((n.dot(body.position-mesh.vert(vert_id)))*2,n.dot(body.velocity)*2,n.dot(body.acceleration)){
|
||||||
let t=body.time+Time::from(t);
|
let t=body.time+Time::from(t);
|
||||||
if self.time<t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
if time<=t&&t<best_time&&n.dot(body.extrapolated_velocity(t))<Planar64::ZERO{
|
||||||
best_time=t;
|
best_time=t;
|
||||||
best_transtition=Transition::Next(FEV::<F,E,V>::Edge(edge_id),t);
|
best_transtition=Transition::Next(FEV::<F,E,V>::Edge(directed_edge_id.as_undirected()),t);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -100,27 +100,20 @@ impl<F:Copy,E:Copy,V:Copy> State<FEV<F,E,V>>{
|
|||||||
}
|
}
|
||||||
best_transtition
|
best_transtition
|
||||||
}
|
}
|
||||||
|
pub enum CrawlResult<F,E:DirectedEdge,V>{
|
||||||
|
Miss(FEV<F,E,V>),
|
||||||
|
Hit(F,Time),
|
||||||
}
|
}
|
||||||
|
pub fn crawl_fev<F:Copy,E:Copy+DirectedEdge,V:Copy>(mut fev:FEV<F,E,V>,mesh:&impl MeshQuery<F,E,V>,relative_body:&Body,start_time:Time,time_limit:Time)->CrawlResult<F,E,V>{
|
||||||
pub fn predict_collision<F:Copy,E:Copy,V:Copy>(mesh:&impl MeshQuery<F,E,V>,relative_body:&Body,time_limit:Time)->Option<(F,Time)>{
|
let mut time=start_time;
|
||||||
let mut state=State{
|
for _ in 0..20{
|
||||||
fev:mesh.closest_fev(relative_body.position),
|
match next_transition(&fev,time,mesh,relative_body,time_limit){
|
||||||
time:relative_body.time,
|
Transition::Miss=>return CrawlResult::Miss(fev),
|
||||||
};
|
Transition::Next(next_fev,next_time)=>(fev,time)=(next_fev,next_time),
|
||||||
//it would be possible to write down the point of closest approach...
|
Transition::Hit(face,time)=>return CrawlResult::Hit(face,time),
|
||||||
loop{
|
|
||||||
match state.next_transition(mesh,relative_body,time_limit){
|
|
||||||
Transition::Miss=>return None,
|
|
||||||
Transition::Next(fev,time)=>(state.fev,state.time)=(fev,time),
|
|
||||||
Transition::Hit(face,time)=>return Some((face,time)),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
//TODO: fix all bugs
|
||||||
|
println!("Too many iterations! Using default behaviour instead of crashing...");
|
||||||
pub fn predict_collision_end<F:Copy,E:Copy,V:Copy>(mesh:&impl MeshQuery<F,E,V>,relative_body:&Body,time_limit:Time,ignore_face_id:F)->Option<(F,Time)>{
|
CrawlResult::Miss(fev)
|
||||||
//imagine the mesh without the collision face
|
|
||||||
//no algorithm needed, there is only one state and three cases (Face,Edge,None)
|
|
||||||
//determine when it passes an edge ("sliding off" case) or if it leaves the surface directly
|
|
||||||
//the state can be constructed from the ContactCollision directly
|
|
||||||
None
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
|
use strafesnet_common::integer;
|
||||||
use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
|
use wgpu::{util::DeviceExt,AstcBlock,AstcChannel};
|
||||||
use crate::model_graphics::{GraphicsVertex,GraphicsModelColor4,GraphicsModelInstance,GraphicsModelSingleTexture,IndexedGraphicsModelSingleTexture,IndexedGroupFixedTexture};
|
use crate::model_graphics::{GraphicsVertex,GraphicsModelColor4,GraphicsModelInstance,GraphicsModelSingleTexture,IndexedGraphicsModelSingleTexture,IndexedGroupFixedTexture};
|
||||||
|
|
||||||
@ -152,11 +153,14 @@ impl GraphicsState{
|
|||||||
let mut texture_loading_threads=Vec::new();
|
let mut texture_loading_threads=Vec::new();
|
||||||
let num_textures=indexed_models.textures.len();
|
let num_textures=indexed_models.textures.len();
|
||||||
for (i,texture_id) in indexed_models.textures.into_iter().enumerate(){
|
for (i,texture_id) in indexed_models.textures.into_iter().enumerate(){
|
||||||
if let Ok(mut file) = std::fs::File::open(std::path::Path::new(&format!("textures/{}.dds",texture_id))){
|
let path=std::path::PathBuf::from(format!("textures/{}.dds",texture_id));
|
||||||
|
if let Ok(mut file) = std::fs::File::open(path.clone()){
|
||||||
double_map.insert(i as u32, texture_loading_threads.len() as u32);
|
double_map.insert(i as u32, texture_loading_threads.len() as u32);
|
||||||
texture_loading_threads.push((texture_id,std::thread::spawn(move ||{
|
texture_loading_threads.push((texture_id,std::thread::spawn(move ||{
|
||||||
ddsfile::Dds::read(&mut file).unwrap()
|
ddsfile::Dds::read(&mut file).unwrap()
|
||||||
})));
|
})));
|
||||||
|
}else{
|
||||||
|
//println!("missing texture path={:?}",path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -200,6 +204,7 @@ impl GraphicsState{
|
|||||||
label: Some(format!("Texture{}",texture_id).as_str()),
|
label: Some(format!("Texture{}",texture_id).as_str()),
|
||||||
view_formats: &[],
|
view_formats: &[],
|
||||||
},
|
},
|
||||||
|
wgpu::util::TextureDataOrder::LayerMajor,
|
||||||
&image.data,
|
&image.data,
|
||||||
);
|
);
|
||||||
texture.create_view(&wgpu::TextureViewDescriptor {
|
texture.create_view(&wgpu::TextureViewDescriptor {
|
||||||
@ -216,7 +221,7 @@ impl GraphicsState{
|
|||||||
for model in indexed_models.models.into_iter(){
|
for model in indexed_models.models.into_iter(){
|
||||||
//convert ModelInstance into GraphicsModelInstance
|
//convert ModelInstance into GraphicsModelInstance
|
||||||
let instances:Vec<GraphicsModelInstance>=model.instances.into_iter().filter_map(|instance|{
|
let instances:Vec<GraphicsModelInstance>=model.instances.into_iter().filter_map(|instance|{
|
||||||
if instance.color.w==0.0{
|
if instance.color.w==0.0&&!model.groups.iter().any(|g|g.texture.is_some()){
|
||||||
None
|
None
|
||||||
}else{
|
}else{
|
||||||
Some(GraphicsModelInstance{
|
Some(GraphicsModelInstance{
|
||||||
@ -697,6 +702,7 @@ impl GraphicsState{
|
|||||||
label: Some("Skybox Texture"),
|
label: Some("Skybox Texture"),
|
||||||
view_formats: &[],
|
view_formats: &[],
|
||||||
},
|
},
|
||||||
|
wgpu::util::TextureDataOrder::LayerMajor,
|
||||||
&skybox_image.data,
|
&skybox_image.data,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -737,6 +743,7 @@ impl GraphicsState{
|
|||||||
label: Some("Squid Texture"),
|
label: Some("Squid Texture"),
|
||||||
view_formats: &[],
|
view_formats: &[],
|
||||||
},
|
},
|
||||||
|
wgpu::util::TextureDataOrder::LayerMajor,
|
||||||
&image.data,
|
&image.data,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -827,7 +834,7 @@ impl GraphicsState{
|
|||||||
});
|
});
|
||||||
|
|
||||||
let camera=GraphicsCamera::default();
|
let camera=GraphicsCamera::default();
|
||||||
let camera_uniforms = camera.to_uniform_data(crate::physics::PhysicsOutputState::default().extrapolate(glam::IVec2::ZERO,crate::integer::Time::ZERO));
|
let camera_uniforms = camera.to_uniform_data(crate::physics::PhysicsOutputState::default().extrapolate(glam::IVec2::ZERO,integer::Time::ZERO));
|
||||||
let camera_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
let camera_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
||||||
label: Some("Camera"),
|
label: Some("Camera"),
|
||||||
contents: bytemuck::cast_slice(&camera_uniforms),
|
contents: bytemuck::cast_slice(&camera_uniforms),
|
||||||
@ -896,7 +903,7 @@ impl GraphicsState{
|
|||||||
device:&wgpu::Device,
|
device:&wgpu::Device,
|
||||||
queue:&wgpu::Queue,
|
queue:&wgpu::Queue,
|
||||||
physics_output:crate::physics::PhysicsOutputState,
|
physics_output:crate::physics::PhysicsOutputState,
|
||||||
predicted_time:crate::integer::Time,
|
predicted_time:integer::Time,
|
||||||
mouse_pos:glam::IVec2,
|
mouse_pos:glam::IVec2,
|
||||||
) {
|
) {
|
||||||
//TODO: use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
|
//TODO: use scheduled frame times to create beautiful smoothing simulation physics extrapolation assuming no input
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
|
use strafesnet_common::integer;
|
||||||
|
|
||||||
pub enum Instruction{
|
pub enum Instruction{
|
||||||
Render(crate::physics::PhysicsOutputState,crate::integer::Time,glam::IVec2),
|
Render(crate::physics::PhysicsOutputState,integer::Time,glam::IVec2),
|
||||||
//UpdateModel(crate::graphics::GraphicsModelUpdate),
|
//UpdateModel(crate::graphics::GraphicsModelUpdate),
|
||||||
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
||||||
GenerateModels(crate::model::IndexedModelInstances),
|
GenerateModels(crate::model::IndexedModelInstances),
|
||||||
@ -18,7 +20,7 @@ WorkerDescription{
|
|||||||
pub fn new<'a>(
|
pub fn new<'a>(
|
||||||
mut graphics:crate::graphics::GraphicsState,
|
mut graphics:crate::graphics::GraphicsState,
|
||||||
mut config:wgpu::SurfaceConfiguration,
|
mut config:wgpu::SurfaceConfiguration,
|
||||||
surface:wgpu::Surface,
|
surface:wgpu::Surface<'a>,
|
||||||
device:wgpu::Device,
|
device:wgpu::Device,
|
||||||
queue:wgpu::Queue,
|
queue:wgpu::Queue,
|
||||||
)->crate::compat_worker::INWorker<'a,Instruction>{
|
)->crate::compat_worker::INWorker<'a,Instruction>{
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
use crate::integer::Time;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct TimedInstruction<I>{
|
|
||||||
pub time:Time,
|
|
||||||
pub instruction:I,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub trait InstructionEmitter<I>{
|
|
||||||
fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<I>>;
|
|
||||||
}
|
|
||||||
pub trait InstructionConsumer<I>{
|
|
||||||
fn process_instruction(&mut self, instruction:TimedInstruction<I>);
|
|
||||||
}
|
|
||||||
|
|
||||||
//PROPER PRIVATE FIELDS!!!
|
|
||||||
pub struct InstructionCollector<I>{
|
|
||||||
time:Time,
|
|
||||||
instruction:Option<I>,
|
|
||||||
}
|
|
||||||
impl<I> InstructionCollector<I>{
|
|
||||||
pub fn new(time:Time)->Self{
|
|
||||||
Self{
|
|
||||||
time,
|
|
||||||
instruction:None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[inline]
|
|
||||||
pub fn time(&self)->Time{
|
|
||||||
self.time
|
|
||||||
}
|
|
||||||
pub fn collect(&mut self,instruction:Option<TimedInstruction<I>>){
|
|
||||||
match instruction{
|
|
||||||
Some(unwrap_instruction)=>{
|
|
||||||
if unwrap_instruction.time<self.time {
|
|
||||||
self.time=unwrap_instruction.time;
|
|
||||||
self.instruction=Some(unwrap_instruction.instruction);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
None=>(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pub fn instruction(self)->Option<TimedInstruction<I>>{
|
|
||||||
//STEAL INSTRUCTION AND DESTROY INSTRUCTIONCOLLECTOR
|
|
||||||
match self.instruction{
|
|
||||||
Some(instruction)=>Some(TimedInstruction{
|
|
||||||
time:self.time,
|
|
||||||
instruction
|
|
||||||
}),
|
|
||||||
None=>None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
1029
src/integer.rs
1029
src/integer.rs
File diff suppressed because it is too large
Load Diff
232
src/load_bsp.rs
Normal file
232
src/load_bsp.rs
Normal file
@ -0,0 +1,232 @@
|
|||||||
|
use strafesnet_common::integer;
|
||||||
|
|
||||||
|
const VALVE_SCALE:f32=1.0/16.0;
|
||||||
|
fn valve_transform(v:[f32;3])->integer::Planar64Vec3{
|
||||||
|
integer::Planar64Vec3::try_from([v[0]*VALVE_SCALE,v[2]*VALVE_SCALE,-v[1]*VALVE_SCALE]).unwrap()
|
||||||
|
}
|
||||||
|
pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Result<crate::model::IndexedModelInstances,vbsp::BspError>{
|
||||||
|
let mut s=Vec::new();
|
||||||
|
|
||||||
|
match input.read_to_end(&mut s){
|
||||||
|
Ok(_)=>(),
|
||||||
|
Err(e)=>println!("load_bsp::generate_indexed_models read_to_end failed: {:?}",e),
|
||||||
|
}
|
||||||
|
|
||||||
|
match vbsp::Bsp::read(s.as_slice()){
|
||||||
|
Ok(bsp)=>{
|
||||||
|
let mut spawn_point=integer::Planar64Vec3::ZERO;
|
||||||
|
|
||||||
|
let mut name_from_texture_id=Vec::new();
|
||||||
|
let mut texture_id_from_name=std::collections::HashMap::new();
|
||||||
|
|
||||||
|
let mut models=bsp.models().map(|world_model|{
|
||||||
|
//non-deduplicated
|
||||||
|
let mut spam_pos=Vec::new();
|
||||||
|
let mut spam_tex=Vec::new();
|
||||||
|
let mut spam_normal=Vec::new();
|
||||||
|
let mut spam_vertices=Vec::new();
|
||||||
|
let groups=world_model.faces()
|
||||||
|
.filter(|face| face.is_visible())//TODO: look at this
|
||||||
|
.map(|face|{
|
||||||
|
let face_texture=face.texture();
|
||||||
|
let face_texture_data=face_texture.texture_data();
|
||||||
|
let (texture_u,texture_v)=(glam::Vec3A::from_slice(&face_texture.texture_transforms_u[0..3]),glam::Vec3A::from_slice(&face_texture.texture_transforms_v[0..3]));
|
||||||
|
let texture_offset=glam::vec2(face_texture.texture_transforms_u[3],face_texture.texture_transforms_v[3]);
|
||||||
|
let texture_size=glam::vec2(face_texture_data.width as f32,face_texture_data.height as f32);
|
||||||
|
|
||||||
|
//texture
|
||||||
|
let texture_id=if let Some(&texture_id)=texture_id_from_name.get(face_texture_data.name()){
|
||||||
|
texture_id
|
||||||
|
}else{
|
||||||
|
let texture_id=name_from_texture_id.len() as u32;
|
||||||
|
texture_id_from_name.insert(face_texture_data.name().to_string(),texture_id);
|
||||||
|
name_from_texture_id.push(face_texture_data.name().to_string());
|
||||||
|
texture_id
|
||||||
|
};
|
||||||
|
|
||||||
|
//normal
|
||||||
|
let normal=face.normal();
|
||||||
|
let normal_idx=spam_normal.len() as u32;
|
||||||
|
spam_normal.push(valve_transform(<[f32;3]>::from(normal)));
|
||||||
|
let mut vertices:Vec<u32>=face.vertex_positions().map(|vertex_pos|{
|
||||||
|
let vertex_xyz=<[f32;3]>::from(vertex_pos);
|
||||||
|
let pos=glam::Vec3A::from_array(vertex_xyz);
|
||||||
|
let pos_idx=spam_pos.len();
|
||||||
|
spam_pos.push(valve_transform(vertex_xyz));
|
||||||
|
|
||||||
|
//calculate texture coordinates
|
||||||
|
let tex=(glam::vec2(pos.dot(texture_u),pos.dot(texture_v))+texture_offset)/texture_size;
|
||||||
|
let tex_idx=spam_tex.len() as u32;
|
||||||
|
spam_tex.push(tex);
|
||||||
|
|
||||||
|
let i=spam_vertices.len() as u32;
|
||||||
|
spam_vertices.push(crate::model::IndexedVertex{
|
||||||
|
pos: pos_idx as u32,
|
||||||
|
tex: tex_idx as u32,
|
||||||
|
normal: normal_idx,
|
||||||
|
color: 0,
|
||||||
|
});
|
||||||
|
i
|
||||||
|
}).collect();
|
||||||
|
vertices.reverse();
|
||||||
|
crate::model::IndexedGroup{
|
||||||
|
texture:Some(texture_id),
|
||||||
|
polys:vec![crate::model::IndexedPolygon{vertices}],
|
||||||
|
}
|
||||||
|
}).collect();
|
||||||
|
crate::model::IndexedModel{
|
||||||
|
unique_pos:spam_pos,
|
||||||
|
unique_tex:spam_tex,
|
||||||
|
unique_normal:spam_normal,
|
||||||
|
unique_color:vec![glam::Vec4::ONE],
|
||||||
|
unique_vertices:spam_vertices,
|
||||||
|
groups,
|
||||||
|
instances:vec![crate::model::ModelInstance{
|
||||||
|
attributes:crate::model::CollisionAttributes::Decoration,
|
||||||
|
transform:integer::Planar64Affine3::new(
|
||||||
|
integer::Planar64Mat3::default(),
|
||||||
|
valve_transform(<[f32;3]>::from(world_model.origin))
|
||||||
|
),
|
||||||
|
..Default::default()
|
||||||
|
}],
|
||||||
|
}
|
||||||
|
}).collect();
|
||||||
|
|
||||||
|
//dedupe prop models
|
||||||
|
let mut model_dedupe=std::collections::HashSet::new();
|
||||||
|
for prop in bsp.static_props(){
|
||||||
|
model_dedupe.insert(prop.model());
|
||||||
|
}
|
||||||
|
|
||||||
|
//generate unique meshes
|
||||||
|
let mut model_map=std::collections::HashMap::with_capacity(model_dedupe.len());
|
||||||
|
let mut prop_models=Vec::new();
|
||||||
|
for model_name in model_dedupe{
|
||||||
|
let model_name_lower=model_name.to_lowercase();
|
||||||
|
//.mdl, .vvd, .dx90.vtx
|
||||||
|
let mut path=std::path::PathBuf::from(model_name_lower.as_str());
|
||||||
|
let file_name=std::path::PathBuf::from(path.file_stem().unwrap());
|
||||||
|
path.pop();
|
||||||
|
path.push(file_name);
|
||||||
|
let mut vvd_path=path.clone();
|
||||||
|
let mut vtx_path=path.clone();
|
||||||
|
vvd_path.set_extension("vvd");
|
||||||
|
vtx_path.set_extension("dx90.vtx");
|
||||||
|
match (bsp.pack.get(model_name_lower.as_str()),bsp.pack.get(vvd_path.as_os_str().to_str().unwrap()),bsp.pack.get(vtx_path.as_os_str().to_str().unwrap())){
|
||||||
|
(Ok(Some(mdl_file)),Ok(Some(vvd_file)),Ok(Some(vtx_file)))=>{
|
||||||
|
match (vmdl::mdl::Mdl::read(mdl_file.as_ref()),vmdl::vvd::Vvd::read(vvd_file.as_ref()),vmdl::vtx::Vtx::read(vtx_file.as_ref())){
|
||||||
|
(Ok(mdl),Ok(vvd),Ok(vtx))=>{
|
||||||
|
let model=vmdl::Model::from_parts(mdl,vtx,vvd);
|
||||||
|
let texture_paths=model.texture_directories();
|
||||||
|
if texture_paths.len()!=1{
|
||||||
|
println!("WARNING: multiple texture paths");
|
||||||
|
}
|
||||||
|
let skin=model.skin_tables().nth(0).unwrap();
|
||||||
|
|
||||||
|
let mut spam_pos=Vec::with_capacity(model.vertices().len());
|
||||||
|
let mut spam_normal=Vec::with_capacity(model.vertices().len());
|
||||||
|
let mut spam_tex=Vec::with_capacity(model.vertices().len());
|
||||||
|
let mut spam_vertices=Vec::with_capacity(model.vertices().len());
|
||||||
|
for (i,vertex) in model.vertices().iter().enumerate(){
|
||||||
|
spam_pos.push(valve_transform(<[f32;3]>::from(vertex.position)));
|
||||||
|
spam_normal.push(valve_transform(<[f32;3]>::from(vertex.normal)));
|
||||||
|
spam_tex.push(glam::Vec2::from_array(vertex.texture_coordinates));
|
||||||
|
spam_vertices.push(crate::model::IndexedVertex{
|
||||||
|
pos:i as u32,
|
||||||
|
tex:i as u32,
|
||||||
|
normal:i as u32,
|
||||||
|
color:0,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let model_id=prop_models.len();
|
||||||
|
model_map.insert(model_name,model_id);
|
||||||
|
prop_models.push(crate::model::IndexedModel{
|
||||||
|
unique_pos:spam_pos,
|
||||||
|
unique_normal:spam_normal,
|
||||||
|
unique_tex:spam_tex,
|
||||||
|
unique_color:vec![glam::Vec4::ONE],
|
||||||
|
unique_vertices:spam_vertices,
|
||||||
|
groups:model.meshes().map(|mesh|{
|
||||||
|
let texture=if let (Some(texture_path),Some(texture_name))=(texture_paths.get(0),skin.texture(mesh.material_index())){
|
||||||
|
let mut path=std::path::PathBuf::from(texture_path.as_str());
|
||||||
|
path.push(texture_name);
|
||||||
|
let texture_location=path.as_os_str().to_str().unwrap();
|
||||||
|
let texture_id=if let Some(&texture_id)=texture_id_from_name.get(texture_location){
|
||||||
|
texture_id
|
||||||
|
}else{
|
||||||
|
println!("texture! {}",texture_location);
|
||||||
|
let texture_id=name_from_texture_id.len() as u32;
|
||||||
|
texture_id_from_name.insert(texture_location.to_string(),texture_id);
|
||||||
|
name_from_texture_id.push(texture_location.to_string());
|
||||||
|
texture_id
|
||||||
|
};
|
||||||
|
Some(texture_id)
|
||||||
|
}else{
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
|
crate::model::IndexedGroup{
|
||||||
|
texture,
|
||||||
|
polys:{
|
||||||
|
//looking at the code, it would seem that the strips are pre-deindexed into triangle lists when calling this function
|
||||||
|
mesh.vertex_strip_indices().map(|strip|{
|
||||||
|
strip.collect::<Vec<usize>>().chunks(3).map(|tri|{
|
||||||
|
crate::model::IndexedPolygon{vertices:vec![tri[0] as u32,tri[1] as u32,tri[2] as u32]}
|
||||||
|
}).collect::<Vec<crate::model::IndexedPolygon>>()
|
||||||
|
}).flatten().collect()
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}).collect(),
|
||||||
|
instances:Vec::new(),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
_=>println!("model_name={} error",model_name),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_=>println!("no model name={}",model_name),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//generate model instances
|
||||||
|
for prop in bsp.static_props(){
|
||||||
|
let placement=prop.as_prop_placement();
|
||||||
|
if let Some(&model_index)=model_map.get(placement.model){
|
||||||
|
prop_models[model_index].instances.push(crate::model::ModelInstance{
|
||||||
|
transform:integer::Planar64Affine3::new(
|
||||||
|
integer::Planar64Mat3::try_from(
|
||||||
|
glam::Mat3A::from_diagonal(glam::Vec3::splat(placement.scale))
|
||||||
|
//TODO: figure this out
|
||||||
|
*glam::Mat3A::from_quat(glam::Quat::from_xyzw(
|
||||||
|
placement.rotation.v.x,//b
|
||||||
|
placement.rotation.v.y,//c
|
||||||
|
placement.rotation.v.z,//d
|
||||||
|
placement.rotation.s,//a
|
||||||
|
))
|
||||||
|
).unwrap(),
|
||||||
|
valve_transform(<[f32;3]>::from(placement.origin)),
|
||||||
|
),
|
||||||
|
attributes:crate::model::CollisionAttributes::Decoration,
|
||||||
|
..Default::default()
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
//println!("model not found {}",placement.model);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//actually add the prop models
|
||||||
|
prop_models.append(&mut models);
|
||||||
|
|
||||||
|
Ok(crate::model::IndexedModelInstances{
|
||||||
|
textures:name_from_texture_id,
|
||||||
|
models:prop_models,
|
||||||
|
spawn_point,
|
||||||
|
modes:Vec::new(),
|
||||||
|
})
|
||||||
|
},
|
||||||
|
Err(e)=>{
|
||||||
|
println!("rotten {:?}",e);
|
||||||
|
Err(e)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
use crate::primitives;
|
use crate::primitives;
|
||||||
use crate::integer::{Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
|
use strafesnet_common::integer::{Planar64,Planar64Vec3,Planar64Mat3,Planar64Affine3};
|
||||||
|
|
||||||
fn class_is_a(class: &str, superclass: &str) -> bool {
|
fn class_is_a(class: &str, superclass: &str) -> bool {
|
||||||
if class==superclass {
|
if class==superclass {
|
||||||
@ -14,12 +14,15 @@ fn class_is_a(class: &str, superclass: &str) -> bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
fn recursive_collect_superclass(objects: &mut std::vec::Vec<rbx_dom_weak::types::Ref>,dom: &rbx_dom_weak::WeakDom, instance: &rbx_dom_weak::Instance, superclass: &str){
|
fn recursive_collect_superclass(objects: &mut std::vec::Vec<rbx_dom_weak::types::Ref>,dom: &rbx_dom_weak::WeakDom, instance: &rbx_dom_weak::Instance, superclass: &str){
|
||||||
for &referent in instance.children() {
|
let mut stack=vec![instance];
|
||||||
if let Some(c) = dom.get_by_ref(referent) {
|
while let Some(item)=stack.pop(){
|
||||||
if class_is_a(c.class.as_str(), superclass) {
|
for &referent in item.children(){
|
||||||
objects.push(c.referent());//copy ref
|
if let Some(c)=dom.get_by_ref(referent){
|
||||||
|
if class_is_a(c.class.as_str(),superclass){
|
||||||
|
objects.push(c.referent());//copy ref
|
||||||
|
}
|
||||||
|
stack.push(c);
|
||||||
}
|
}
|
||||||
recursive_collect_superclass(objects,dom,c,superclass);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -262,6 +265,18 @@ pub fn generate_indexed_models(dom:rbx_dom_weak::WeakDom) -> crate::model::Index
|
|||||||
{
|
{
|
||||||
let model_transform=planar64_affine3_from_roblox(cf,size);
|
let model_transform=planar64_affine3_from_roblox(cf,size);
|
||||||
|
|
||||||
|
if model_transform.matrix3.determinant()==Planar64::ZERO{
|
||||||
|
let mut parent_ref=object.parent();
|
||||||
|
let mut full_path=object.name.clone();
|
||||||
|
while let Some(parent)=dom.get_by_ref(parent_ref){
|
||||||
|
full_path=format!("{}.{}",parent.name,full_path);
|
||||||
|
parent_ref=parent.parent();
|
||||||
|
}
|
||||||
|
println!("Zero determinant CFrame at location {}",full_path);
|
||||||
|
println!("matrix3:{}",model_transform.matrix3);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
//push TempIndexedAttributes
|
//push TempIndexedAttributes
|
||||||
let mut force_intersecting=false;
|
let mut force_intersecting=false;
|
||||||
let mut temp_indexing_attributes=Vec::new();
|
let mut temp_indexing_attributes=Vec::new();
|
||||||
|
13
src/main.rs
13
src/main.rs
@ -1,16 +1,14 @@
|
|||||||
mod bvh;
|
use strafesnet_common::integer;
|
||||||
mod aabb;
|
|
||||||
mod model;
|
mod model;
|
||||||
mod setup;
|
mod setup;
|
||||||
mod window;
|
mod window;
|
||||||
mod worker;
|
mod worker;
|
||||||
mod zeroes;
|
|
||||||
mod integer;
|
|
||||||
mod physics;
|
mod physics;
|
||||||
mod graphics;
|
mod graphics;
|
||||||
mod settings;
|
mod settings;
|
||||||
mod primitives;
|
mod primitives;
|
||||||
mod instruction;
|
mod load_bsp;
|
||||||
mod load_roblox;
|
mod load_roblox;
|
||||||
mod face_crawler;
|
mod face_crawler;
|
||||||
mod compat_worker;
|
mod compat_worker;
|
||||||
@ -46,7 +44,7 @@ fn load_file(path: std::path::PathBuf)->Option<model::IndexedModelInstances>{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//b"VBSP"=>Some(load_bsp::generate_indexed_models(input)),
|
b"VBSP"=>load_bsp::generate_indexed_models(&mut input).ok(),
|
||||||
//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
|
//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
|
||||||
//b"SNFB"=>Some(sniffer::load_bot(input)),
|
//b"SNFB"=>Some(sniffer::load_bot(input)),
|
||||||
other=>{
|
other=>{
|
||||||
@ -116,6 +114,5 @@ pub fn default_models()->model::IndexedModelInstances{
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn main(){
|
fn main(){
|
||||||
let context=setup::setup(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")).as_str());
|
setup::setup_and_start(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")));
|
||||||
context.start();//creates and runs a window context
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use crate::integer::{Time,Planar64,Planar64Vec3,Planar64Affine3};
|
use strafesnet_common::integer::{Time,Planar64,Planar64Vec3,Planar64Affine3};
|
||||||
pub type TextureCoordinate=glam::Vec2;
|
pub type TextureCoordinate=glam::Vec2;
|
||||||
pub type Color4=glam::Vec4;
|
pub type Color4=glam::Vec4;
|
||||||
#[derive(Clone,Hash,PartialEq,Eq)]
|
#[derive(Clone,Hash,PartialEq,Eq)]
|
||||||
@ -259,7 +259,6 @@ impl IntersectingAttributes{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//Spawn(u32) NO! spawns are indexed in the map header instead of marked with attibutes
|
//Spawn(u32) NO! spawns are indexed in the map header instead of marked with attibutes
|
||||||
//TODO: deduplicate attributes
|
|
||||||
pub enum CollisionAttributes{
|
pub enum CollisionAttributes{
|
||||||
Decoration,//visual only
|
Decoration,//visual only
|
||||||
Contact{//track whether you are contacting the object
|
Contact{//track whether you are contacting the object
|
||||||
|
File diff suppressed because it is too large
Load Diff
3461
src/physics.rs
3461
src/physics.rs
File diff suppressed because it is too large
Load Diff
@ -1,133 +1,165 @@
|
|||||||
use crate::integer::Time;
|
use crate::physics::{MouseState,PhysicsInputInstruction};
|
||||||
use crate::physics::{MouseState,PhysicsInputInstruction};
|
use strafesnet_common::integer::Time;
|
||||||
use crate::instruction::{TimedInstruction,InstructionConsumer};
|
use strafesnet_common::instruction::{TimedInstruction,InstructionConsumer};
|
||||||
#[derive(Debug)]
|
use strafesnet_common::integer::{self,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2};
|
||||||
pub enum InputInstruction {
|
|
||||||
MoveMouse(glam::IVec2),
|
#[derive(Debug)]
|
||||||
MoveRight(bool),
|
pub enum InputInstruction {
|
||||||
MoveUp(bool),
|
MoveMouse(glam::IVec2),
|
||||||
MoveBack(bool),
|
MoveRight(bool),
|
||||||
MoveLeft(bool),
|
MoveUp(bool),
|
||||||
MoveDown(bool),
|
MoveBack(bool),
|
||||||
MoveForward(bool),
|
MoveLeft(bool),
|
||||||
Jump(bool),
|
MoveDown(bool),
|
||||||
Zoom(bool),
|
MoveForward(bool),
|
||||||
Reset,
|
Jump(bool),
|
||||||
}
|
Zoom(bool),
|
||||||
pub enum Instruction{
|
Reset,
|
||||||
Input(InputInstruction),
|
}
|
||||||
Render,
|
pub enum Instruction{
|
||||||
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
Input(InputInstruction),
|
||||||
GenerateModels(crate::model::IndexedModelInstances),
|
Render,
|
||||||
ClearModels,
|
Resize(winit::dpi::PhysicalSize<u32>,crate::settings::UserSettings),
|
||||||
//Graphics(crate::graphics_worker::Instruction),
|
GenerateModels(crate::model::IndexedModelInstances),
|
||||||
}
|
ClearModels,
|
||||||
|
//Graphics(crate::graphics_worker::Instruction),
|
||||||
pub fn new(mut physics:crate::physics::PhysicsState,mut graphics_worker:crate::compat_worker::INWorker<crate::graphics_worker::Instruction>)->crate::compat_worker::QNWorker<TimedInstruction<Instruction>>{
|
}
|
||||||
let mut mouse_blocking=true;
|
|
||||||
let mut last_mouse_time=physics.next_mouse.time;
|
pub struct Speed{
|
||||||
let mut timeline=std::collections::VecDeque::new();
|
pub player_vel:Planar64Vec3,
|
||||||
crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{
|
pub time:Time
|
||||||
if if let Some(phys_input)=match &ins.instruction{
|
}
|
||||||
Instruction::Input(input_instruction)=>match input_instruction{
|
|
||||||
&InputInstruction::MoveMouse(m)=>{
|
impl std::ops::Neg for Speed{
|
||||||
if mouse_blocking{
|
type Output=Self;
|
||||||
//tell the game state which is living in the past about its future
|
fn neg(self)->Self::Output{
|
||||||
timeline.push_front(TimedInstruction{
|
Self{
|
||||||
time:last_mouse_time,
|
player_vel:self.player_vel,
|
||||||
instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:m}),
|
time:self.time
|
||||||
});
|
}
|
||||||
}else{
|
}
|
||||||
//mouse has just started moving again after being still for longer than 10ms.
|
}
|
||||||
//replace the entire mouse interpolation state to avoid an intermediate state with identical m0.t m1.t timestamps which will divide by zero
|
|
||||||
timeline.push_front(TimedInstruction{
|
impl Speed{
|
||||||
time:last_mouse_time,
|
pub fn new(player_vel:Planar64Vec3,time:Time)->Self{
|
||||||
instruction:PhysicsInputInstruction::ReplaceMouse(
|
Self{
|
||||||
MouseState{time:last_mouse_time,pos:physics.next_mouse.pos},
|
player_vel,
|
||||||
MouseState{time:ins.time,pos:m}
|
time,
|
||||||
),
|
}
|
||||||
});
|
}
|
||||||
//delay physics execution until we have an interpolation target
|
}
|
||||||
mouse_blocking=true;
|
pub fn new(mut physics:crate::physics::PhysicsState,mut graphics_worker:crate::compat_worker::INWorker<crate::graphics_worker::Instruction>)->crate::compat_worker::QNWorker<TimedInstruction<Instruction>>{
|
||||||
}
|
let mut mouse_blocking=true;
|
||||||
last_mouse_time=ins.time;
|
let mut last_mouse_time=physics.next_mouse.time;
|
||||||
None
|
let mut timeline=std::collections::VecDeque::new();
|
||||||
},
|
let mut next_velocity_print=std::time::Instant::now();
|
||||||
&InputInstruction::MoveForward(s)=>Some(PhysicsInputInstruction::SetMoveForward(s)),
|
let mut player_vel = physics.body.velocity.length();
|
||||||
&InputInstruction::MoveLeft(s)=>Some(PhysicsInputInstruction::SetMoveLeft(s)),
|
crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{
|
||||||
&InputInstruction::MoveBack(s)=>Some(PhysicsInputInstruction::SetMoveBack(s)),
|
if if let Some(phys_input)=match &ins.instruction{
|
||||||
&InputInstruction::MoveRight(s)=>Some(PhysicsInputInstruction::SetMoveRight(s)),
|
Instruction::Input(input_instruction)=>match input_instruction{
|
||||||
&InputInstruction::MoveUp(s)=>Some(PhysicsInputInstruction::SetMoveUp(s)),
|
&InputInstruction::MoveMouse(m)=>{
|
||||||
&InputInstruction::MoveDown(s)=>Some(PhysicsInputInstruction::SetMoveDown(s)),
|
if mouse_blocking{
|
||||||
&InputInstruction::Jump(s)=>Some(PhysicsInputInstruction::SetJump(s)),
|
//tell the game state which is living in the past about its future
|
||||||
&InputInstruction::Zoom(s)=>Some(PhysicsInputInstruction::SetZoom(s)),
|
timeline.push_front(TimedInstruction{
|
||||||
InputInstruction::Reset=>Some(PhysicsInputInstruction::Reset),
|
time:last_mouse_time,
|
||||||
},
|
instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:m}),
|
||||||
Instruction::GenerateModels(_)=>Some(PhysicsInputInstruction::Idle),
|
});
|
||||||
Instruction::ClearModels=>Some(PhysicsInputInstruction::Idle),
|
}else{
|
||||||
Instruction::Resize(_,_)=>Some(PhysicsInputInstruction::Idle),
|
//mouse has just started moving again after being still for longer than 10ms.
|
||||||
Instruction::Render=>Some(PhysicsInputInstruction::Idle),
|
//replace the entire mouse interpolation state to avoid an intermediate state with identical m0.t m1.t timestamps which will divide by zero
|
||||||
}{
|
timeline.push_front(TimedInstruction{
|
||||||
//non-mouse event
|
time:last_mouse_time,
|
||||||
timeline.push_back(TimedInstruction{
|
instruction:PhysicsInputInstruction::ReplaceMouse(
|
||||||
time:ins.time,
|
MouseState{time:last_mouse_time,pos:physics.next_mouse.pos},
|
||||||
instruction:phys_input,
|
MouseState{time:ins.time,pos:m}
|
||||||
});
|
),
|
||||||
|
});
|
||||||
if mouse_blocking{
|
//delay physics execution until we have an interpolation target
|
||||||
//assume the mouse has stopped moving after 10ms.
|
mouse_blocking=true;
|
||||||
//shitty mice are 125Hz which is 8ms so this should cover that.
|
}
|
||||||
//setting this to 100us still doesn't print even though it's 10x lower than the polling rate,
|
last_mouse_time=ins.time;
|
||||||
//so mouse events are probably not handled separately from drawing and fire right before it :(
|
None
|
||||||
if Time::from_millis(10)<ins.time-physics.next_mouse.time{
|
},
|
||||||
//push an event to extrapolate no movement from
|
&InputInstruction::MoveForward(s)=>Some(PhysicsInputInstruction::SetMoveForward(s)),
|
||||||
timeline.push_front(TimedInstruction{
|
&InputInstruction::MoveLeft(s)=>Some(PhysicsInputInstruction::SetMoveLeft(s)),
|
||||||
time:last_mouse_time,
|
&InputInstruction::MoveBack(s)=>Some(PhysicsInputInstruction::SetMoveBack(s)),
|
||||||
instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:physics.next_mouse.pos}),
|
&InputInstruction::MoveRight(s)=>Some(PhysicsInputInstruction::SetMoveRight(s)),
|
||||||
});
|
&InputInstruction::MoveUp(s)=>Some(PhysicsInputInstruction::SetMoveUp(s)),
|
||||||
last_mouse_time=ins.time;
|
&InputInstruction::MoveDown(s)=>Some(PhysicsInputInstruction::SetMoveDown(s)),
|
||||||
//stop blocking. the mouse is not moving so the physics does not need to live in the past and wait for interpolation targets.
|
&InputInstruction::Jump(s)=>Some(PhysicsInputInstruction::SetJump(s)),
|
||||||
mouse_blocking=false;
|
&InputInstruction::Zoom(s)=>Some(PhysicsInputInstruction::SetZoom(s)),
|
||||||
true
|
InputInstruction::Reset=>Some(PhysicsInputInstruction::Reset),
|
||||||
}else{
|
},
|
||||||
false
|
Instruction::GenerateModels(_)=>Some(PhysicsInputInstruction::Idle),
|
||||||
}
|
Instruction::ClearModels=>Some(PhysicsInputInstruction::Idle),
|
||||||
}else{
|
Instruction::Resize(_,_)=>Some(PhysicsInputInstruction::Idle),
|
||||||
//keep this up to date so that it can be used as a known-timestamp
|
Instruction::Render=>Some(PhysicsInputInstruction::Idle),
|
||||||
//that the mouse was not moving when the mouse starts moving again
|
}{
|
||||||
last_mouse_time=ins.time;
|
//non-mouse event
|
||||||
true
|
timeline.push_back(TimedInstruction{
|
||||||
}
|
time:ins.time,
|
||||||
}else{
|
instruction:phys_input,
|
||||||
//mouse event
|
});
|
||||||
true
|
|
||||||
}{
|
if mouse_blocking{
|
||||||
//empty queue
|
//assume the mouse has stopped moving after 10ms.
|
||||||
while let Some(instruction)=timeline.pop_front(){
|
//shitty mice are 125Hz which is 8ms so this should cover that.
|
||||||
physics.run(instruction.time);
|
//setting this to 100us still doesn't print even though it's 10x lower than the polling rate,
|
||||||
physics.process_instruction(TimedInstruction{
|
//so mouse events are probably not handled separately from drawing and fire right before it :(
|
||||||
time:instruction.time,
|
if Time::from_millis(10)<ins.time-physics.next_mouse.time{
|
||||||
instruction:crate::physics::PhysicsInstruction::Input(instruction.instruction),
|
//push an event to extrapolate no movement from
|
||||||
});
|
timeline.push_front(TimedInstruction{
|
||||||
}
|
time:last_mouse_time,
|
||||||
}
|
instruction:PhysicsInputInstruction::SetNextMouse(MouseState{time:ins.time,pos:physics.next_mouse.pos}),
|
||||||
match ins.instruction{
|
});
|
||||||
Instruction::Render=>{
|
last_mouse_time=ins.time;
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::Render(physics.output(),ins.time,physics.next_mouse.pos)).unwrap();
|
//stop blocking. the mouse is not moving so the physics does not need to live in the past and wait for interpolation targets.
|
||||||
},
|
mouse_blocking=false;
|
||||||
Instruction::Resize(size,user_settings)=>{
|
true
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::Resize(size,user_settings)).unwrap();
|
}else{
|
||||||
},
|
false
|
||||||
Instruction::GenerateModels(indexed_model_instances)=>{
|
}
|
||||||
physics.generate_models(&indexed_model_instances);
|
}else{
|
||||||
physics.spawn(indexed_model_instances.spawn_point);
|
//keep this up to date so that it can be used as a known-timestamp
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::GenerateModels(indexed_model_instances)).unwrap();
|
//that the mouse was not moving when the mouse starts moving again
|
||||||
},
|
last_mouse_time=ins.time;
|
||||||
Instruction::ClearModels=>{
|
true
|
||||||
physics.clear();
|
}
|
||||||
graphics_worker.send(crate::graphics_worker::Instruction::ClearModels).unwrap();
|
}else{
|
||||||
},
|
//mouse event
|
||||||
_=>(),
|
true
|
||||||
}
|
}{
|
||||||
})
|
//empty queue
|
||||||
|
while let Some(instruction)=timeline.pop_front(){
|
||||||
|
physics.run(instruction.time);
|
||||||
|
physics.process_instruction(TimedInstruction{
|
||||||
|
time:instruction.time,
|
||||||
|
instruction:crate::physics::PhysicsInstruction::Input(instruction.instruction),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
//some random print stuff
|
||||||
|
if 3.0/5.0<next_velocity_print.elapsed().as_secs_f64(){
|
||||||
|
next_velocity_print=next_velocity_print+std::time::Duration::from_secs_f64(1.0/30.0);
|
||||||
|
println!("velocity: {} u/s", (Planar64Vec3::new(physics.body.velocity.x(), Planar64::int(0), physics.body.velocity.z())).length()*(Planar64::int(130)/9));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match ins.instruction{
|
||||||
|
Instruction::Render=>{
|
||||||
|
graphics_worker.send(crate::graphics_worker::Instruction::Render(physics.output(),ins.time,physics.next_mouse.pos)).unwrap();
|
||||||
|
},
|
||||||
|
Instruction::Resize(size,user_settings)=>{
|
||||||
|
graphics_worker.send(crate::graphics_worker::Instruction::Resize(size,user_settings)).unwrap();
|
||||||
|
},
|
||||||
|
Instruction::GenerateModels(indexed_model_instances)=>{
|
||||||
|
physics.generate_models(&indexed_model_instances);
|
||||||
|
physics.spawn(indexed_model_instances.spawn_point);
|
||||||
|
graphics_worker.send(crate::graphics_worker::Instruction::GenerateModels(indexed_model_instances)).unwrap();
|
||||||
|
},
|
||||||
|
Instruction::ClearModels=>{
|
||||||
|
physics.clear();
|
||||||
|
graphics_worker.send(crate::graphics_worker::Instruction::ClearModels).unwrap();
|
||||||
|
},
|
||||||
|
_=>(),
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
use crate::model::{Color4,TextureCoordinate,IndexedModel,IndexedPolygon,IndexedGroup,IndexedVertex};
|
use crate::model::{Color4,TextureCoordinate,IndexedModel,IndexedPolygon,IndexedGroup,IndexedVertex};
|
||||||
use crate::integer::Planar64Vec3;
|
use strafesnet_common::integer::Planar64Vec3;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum Primitives{
|
pub enum Primitives{
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use crate::integer::{Ratio64,Ratio64Vec2};
|
use strafesnet_common::integer::{Ratio64,Ratio64Vec2};
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct Ratio{
|
struct Ratio{
|
||||||
ratio:f64,
|
ratio:f64,
|
||||||
|
88
src/setup.rs
88
src/setup.rs
@ -1,5 +1,6 @@
|
|||||||
use crate::instruction::TimedInstruction;
|
|
||||||
use crate::window::WindowInstruction;
|
use crate::window::WindowInstruction;
|
||||||
|
use strafesnet_common::instruction::TimedInstruction;
|
||||||
|
use strafesnet_common::integer;
|
||||||
|
|
||||||
fn optional_features()->wgpu::Features{
|
fn optional_features()->wgpu::Features{
|
||||||
wgpu::Features::TEXTURE_COMPRESSION_ASTC
|
wgpu::Features::TEXTURE_COMPRESSION_ASTC
|
||||||
@ -46,21 +47,21 @@ fn create_instance()->SetupContextPartial1{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl SetupContextPartial1{
|
impl SetupContextPartial1{
|
||||||
fn create_surface(self,window:&winit::window::Window)->Result<SetupContextPartial2,wgpu::CreateSurfaceError>{
|
fn create_surface<'a>(self,window:&'a winit::window::Window)->Result<SetupContextPartial2<'a>,wgpu::CreateSurfaceError>{
|
||||||
Ok(SetupContextPartial2{
|
Ok(SetupContextPartial2{
|
||||||
backends:self.backends,
|
backends:self.backends,
|
||||||
surface:unsafe{self.instance.create_surface(window)}?,
|
surface:self.instance.create_surface(window)?,
|
||||||
instance:self.instance,
|
instance:self.instance,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct SetupContextPartial2{
|
struct SetupContextPartial2<'a>{
|
||||||
backends:wgpu::Backends,
|
backends:wgpu::Backends,
|
||||||
instance:wgpu::Instance,
|
instance:wgpu::Instance,
|
||||||
surface:wgpu::Surface,
|
surface:wgpu::Surface<'a>,
|
||||||
}
|
}
|
||||||
impl SetupContextPartial2{
|
impl<'a> SetupContextPartial2<'a>{
|
||||||
fn pick_adapter(self)->SetupContextPartial3{
|
fn pick_adapter(self)->SetupContextPartial3<'a>{
|
||||||
let adapter;
|
let adapter;
|
||||||
|
|
||||||
//TODO: prefer adapter that implements optional features
|
//TODO: prefer adapter that implements optional features
|
||||||
@ -122,13 +123,13 @@ impl SetupContextPartial2{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct SetupContextPartial3{
|
struct SetupContextPartial3<'a>{
|
||||||
instance:wgpu::Instance,
|
instance:wgpu::Instance,
|
||||||
surface:wgpu::Surface,
|
surface:wgpu::Surface<'a>,
|
||||||
adapter:wgpu::Adapter,
|
adapter:wgpu::Adapter,
|
||||||
}
|
}
|
||||||
impl SetupContextPartial3{
|
impl<'a> SetupContextPartial3<'a>{
|
||||||
fn request_device(self)->SetupContextPartial4{
|
fn request_device(self)->SetupContextPartial4<'a>{
|
||||||
let optional_features=optional_features();
|
let optional_features=optional_features();
|
||||||
let required_features=required_features();
|
let required_features=required_features();
|
||||||
|
|
||||||
@ -140,8 +141,8 @@ impl SetupContextPartial3{
|
|||||||
.request_device(
|
.request_device(
|
||||||
&wgpu::DeviceDescriptor {
|
&wgpu::DeviceDescriptor {
|
||||||
label: None,
|
label: None,
|
||||||
features: (optional_features & self.adapter.features()) | required_features,
|
required_features: (optional_features & self.adapter.features()) | required_features,
|
||||||
limits: needed_limits,
|
required_limits: needed_limits,
|
||||||
},
|
},
|
||||||
trace_dir.ok().as_ref().map(std::path::Path::new),
|
trace_dir.ok().as_ref().map(std::path::Path::new),
|
||||||
))
|
))
|
||||||
@ -156,15 +157,15 @@ impl SetupContextPartial3{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct SetupContextPartial4{
|
struct SetupContextPartial4<'a>{
|
||||||
instance:wgpu::Instance,
|
instance:wgpu::Instance,
|
||||||
surface:wgpu::Surface,
|
surface:wgpu::Surface<'a>,
|
||||||
adapter:wgpu::Adapter,
|
adapter:wgpu::Adapter,
|
||||||
device:wgpu::Device,
|
device:wgpu::Device,
|
||||||
queue:wgpu::Queue,
|
queue:wgpu::Queue,
|
||||||
}
|
}
|
||||||
impl SetupContextPartial4{
|
impl<'a> SetupContextPartial4<'a>{
|
||||||
fn configure_surface(self,size:&winit::dpi::PhysicalSize<u32>)->SetupContext{
|
fn configure_surface(self,size:&'a winit::dpi::PhysicalSize<u32>)->SetupContext<'a>{
|
||||||
let mut config=self.surface
|
let mut config=self.surface
|
||||||
.get_default_config(&self.adapter, size.width, size.height)
|
.get_default_config(&self.adapter, size.width, size.height)
|
||||||
.expect("Surface isn't supported by the adapter.");
|
.expect("Surface isn't supported by the adapter.");
|
||||||
@ -182,65 +183,42 @@ impl SetupContextPartial4{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub struct SetupContext{
|
pub struct SetupContext<'a>{
|
||||||
pub instance:wgpu::Instance,
|
pub instance:wgpu::Instance,
|
||||||
pub surface:wgpu::Surface,
|
pub surface:wgpu::Surface<'a>,
|
||||||
pub device:wgpu::Device,
|
pub device:wgpu::Device,
|
||||||
pub queue:wgpu::Queue,
|
pub queue:wgpu::Queue,
|
||||||
pub config:wgpu::SurfaceConfiguration,
|
pub config:wgpu::SurfaceConfiguration,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn setup(title:&str)->SetupContextSetup{
|
pub fn setup_and_start(title:String){
|
||||||
let event_loop=winit::event_loop::EventLoop::new().unwrap();
|
let event_loop=winit::event_loop::EventLoop::new().unwrap();
|
||||||
|
|
||||||
let window=create_window(title,&event_loop).unwrap();
|
|
||||||
|
|
||||||
println!("Initializing the surface...");
|
println!("Initializing the surface...");
|
||||||
|
|
||||||
let partial_1=create_instance();
|
let partial_1=create_instance();
|
||||||
|
|
||||||
|
let window=create_window(title.as_str(),&event_loop).unwrap();
|
||||||
|
|
||||||
let partial_2=partial_1.create_surface(&window).unwrap();
|
let partial_2=partial_1.create_surface(&window).unwrap();
|
||||||
|
|
||||||
let partial_3=partial_2.pick_adapter();
|
let partial_3=partial_2.pick_adapter();
|
||||||
|
|
||||||
let partial_4=partial_3.request_device();
|
let partial_4=partial_3.request_device();
|
||||||
|
|
||||||
SetupContextSetup{
|
let size=window.inner_size();
|
||||||
window,
|
|
||||||
event_loop,
|
|
||||||
partial_context:partial_4,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct SetupContextSetup{
|
let setup_context=partial_4.configure_surface(&size);
|
||||||
window:winit::window::Window,
|
|
||||||
event_loop:winit::event_loop::EventLoop<()>,
|
|
||||||
partial_context:SetupContextPartial4,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SetupContextSetup{
|
//dedicated thread to ping request redraw back and resize the window doesn't seem logical
|
||||||
fn into_split(self)->(winit::window::Window,winit::event_loop::EventLoop<()>,SetupContext){
|
|
||||||
let size=self.window.inner_size();
|
|
||||||
//Steal values and drop self
|
|
||||||
(
|
|
||||||
self.window,
|
|
||||||
self.event_loop,
|
|
||||||
self.partial_context.configure_surface(&size),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
pub fn start(self){
|
|
||||||
let (window,event_loop,setup_context)=self.into_split();
|
|
||||||
|
|
||||||
//dedicated thread to ping request redraw back and resize the window doesn't seem logical
|
let window=crate::window::WindowContextSetup::new(&setup_context,&window);
|
||||||
|
//the thread that spawns the physics thread
|
||||||
|
let window_thread=window.into_worker(setup_context);
|
||||||
|
|
||||||
let window=crate::window::WindowContextSetup::new(&setup_context,window);
|
println!("Entering event loop...");
|
||||||
//the thread that spawns the physics thread
|
let root_time=std::time::Instant::now();
|
||||||
let window_thread=window.into_worker(setup_context);
|
run_event_loop(event_loop,window_thread,root_time).unwrap();
|
||||||
|
|
||||||
println!("Entering event loop...");
|
|
||||||
let root_time=std::time::Instant::now();
|
|
||||||
run_event_loop(event_loop,window_thread,root_time).unwrap();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_event_loop(
|
fn run_event_loop(
|
||||||
@ -249,7 +227,7 @@ fn run_event_loop(
|
|||||||
root_time:std::time::Instant
|
root_time:std::time::Instant
|
||||||
)->Result<(),winit::error::EventLoopError>{
|
)->Result<(),winit::error::EventLoopError>{
|
||||||
event_loop.run(move |event,elwt|{
|
event_loop.run(move |event,elwt|{
|
||||||
let time=crate::integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64);
|
let time=integer::Time::from_nanos(root_time.elapsed().as_nanos() as i64);
|
||||||
// *control_flow=if cfg!(feature="metal-auto-capture"){
|
// *control_flow=if cfg!(feature="metal-auto-capture"){
|
||||||
// winit::event_loop::ControlFlow::Exit
|
// winit::event_loop::ControlFlow::Exit
|
||||||
// }else{
|
// }else{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
use crate::instruction::TimedInstruction;
|
|
||||||
use crate::physics_worker::InputInstruction;
|
use crate::physics_worker::InputInstruction;
|
||||||
|
use strafesnet_common::integer;
|
||||||
|
use strafesnet_common::instruction::TimedInstruction;
|
||||||
|
|
||||||
pub enum WindowInstruction{
|
pub enum WindowInstruction{
|
||||||
Resize(winit::dpi::PhysicalSize<u32>),
|
Resize(winit::dpi::PhysicalSize<u32>),
|
||||||
@ -15,7 +16,7 @@ struct WindowContext<'a>{
|
|||||||
mouse:crate::physics::MouseState,//std::sync::Arc<std::sync::Mutex<>>
|
mouse:crate::physics::MouseState,//std::sync::Arc<std::sync::Mutex<>>
|
||||||
screen_size:glam::UVec2,
|
screen_size:glam::UVec2,
|
||||||
user_settings:crate::settings::UserSettings,
|
user_settings:crate::settings::UserSettings,
|
||||||
window:winit::window::Window,
|
window:&'a winit::window::Window,
|
||||||
physics_thread:crate::compat_worker::QNWorker<'a, TimedInstruction<crate::physics_worker::Instruction>>,
|
physics_thread:crate::compat_worker::QNWorker<'a, TimedInstruction<crate::physics_worker::Instruction>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,7 +24,7 @@ impl WindowContext<'_>{
|
|||||||
fn get_middle_of_screen(&self)->winit::dpi::PhysicalPosition<f32>{
|
fn get_middle_of_screen(&self)->winit::dpi::PhysicalPosition<f32>{
|
||||||
winit::dpi::PhysicalPosition::new(self.screen_size.x as f32/2.0,self.screen_size.y as f32/2.0)
|
winit::dpi::PhysicalPosition::new(self.screen_size.x as f32/2.0,self.screen_size.y as f32/2.0)
|
||||||
}
|
}
|
||||||
fn window_event(&mut self,time:crate::integer::Time,event: winit::event::WindowEvent) {
|
fn window_event(&mut self,time:integer::Time,event: winit::event::WindowEvent) {
|
||||||
match event {
|
match event {
|
||||||
winit::event::WindowEvent::DroppedFile(path)=>{
|
winit::event::WindowEvent::DroppedFile(path)=>{
|
||||||
//blocking because it's simpler...
|
//blocking because it's simpler...
|
||||||
@ -121,7 +122,7 @@ impl WindowContext<'_>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn device_event(&mut self,time:crate::integer::Time,event: winit::event::DeviceEvent) {
|
fn device_event(&mut self,time:integer::Time,event: winit::event::DeviceEvent) {
|
||||||
match event {
|
match event {
|
||||||
winit::event::DeviceEvent::MouseMotion {
|
winit::event::DeviceEvent::MouseMotion {
|
||||||
delta,//these (f64,f64) are integers on my machine
|
delta,//these (f64,f64) are integers on my machine
|
||||||
@ -158,15 +159,15 @@ impl WindowContext<'_>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct WindowContextSetup{
|
pub struct WindowContextSetup<'a>{
|
||||||
user_settings:crate::settings::UserSettings,
|
user_settings:crate::settings::UserSettings,
|
||||||
window:winit::window::Window,
|
window:&'a winit::window::Window,
|
||||||
physics:crate::physics::PhysicsState,
|
physics:crate::physics::PhysicsState,
|
||||||
graphics:crate::graphics::GraphicsState,
|
graphics:crate::graphics::GraphicsState,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WindowContextSetup{
|
impl<'a> WindowContextSetup<'a>{
|
||||||
pub fn new(context:&crate::setup::SetupContext,window:winit::window::Window)->Self{
|
pub fn new(context:&crate::setup::SetupContext,window:&'a winit::window::Window)->Self{
|
||||||
//wee
|
//wee
|
||||||
let user_settings=crate::settings::read_user_settings();
|
let user_settings=crate::settings::read_user_settings();
|
||||||
|
|
||||||
@ -194,7 +195,7 @@ impl WindowContextSetup{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn into_context<'a>(self,setup_context:crate::setup::SetupContext)->WindowContext<'a>{
|
fn into_context(self,setup_context:crate::setup::SetupContext<'a>)->WindowContext<'a>{
|
||||||
let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height);
|
let screen_size=glam::uvec2(setup_context.config.width,setup_context.config.height);
|
||||||
let graphics_thread=crate::graphics_worker::new(self.graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue);
|
let graphics_thread=crate::graphics_worker::new(self.graphics,setup_context.config,setup_context.surface,setup_context.device,setup_context.queue);
|
||||||
WindowContext{
|
WindowContext{
|
||||||
@ -208,7 +209,7 @@ impl WindowContextSetup{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn into_worker<'a>(self,setup_context:crate::setup::SetupContext)->crate::compat_worker::QNWorker<'a,TimedInstruction<WindowInstruction>>{
|
pub fn into_worker(self,setup_context:crate::setup::SetupContext<'a>)->crate::compat_worker::QNWorker<'a,TimedInstruction<WindowInstruction>>{
|
||||||
let mut window_context=self.into_context(setup_context);
|
let mut window_context=self.into_context(setup_context);
|
||||||
crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<WindowInstruction>|{
|
crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<WindowInstruction>|{
|
||||||
match ins.instruction{
|
match ins.instruction{
|
||||||
|
@ -175,16 +175,16 @@ impl<'a,Task:Send+'a> INWorker<'a,Task>{
|
|||||||
|
|
||||||
#[test]//How to run this test with printing: cargo test --release -- --nocapture
|
#[test]//How to run this test with printing: cargo test --release -- --nocapture
|
||||||
fn test_worker() {
|
fn test_worker() {
|
||||||
println!("hiiiii");
|
|
||||||
// Create the worker thread
|
// Create the worker thread
|
||||||
|
let test_body=crate::physics::Body::new(crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Time::ZERO);
|
||||||
let worker=QRWorker::new(crate::physics::Body::default(),
|
let worker=QRWorker::new(crate::physics::Body::default(),
|
||||||
|_|crate::physics::Body::new(crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Time::ZERO)
|
|_|crate::physics::Body::new(crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Planar64Vec3::ONE,crate::integer::Time::ZERO)
|
||||||
);
|
);
|
||||||
|
|
||||||
// Send tasks to the worker
|
// Send tasks to the worker
|
||||||
for _ in 0..5 {
|
for _ in 0..5 {
|
||||||
let task = crate::instruction::TimedInstruction{
|
let task = strafesnet_common::instruction::TimedInstruction{
|
||||||
time:crate::integer::Time::ZERO,
|
time:strafesnet_common::integer::Time::ZERO,
|
||||||
instruction:crate::physics::PhysicsInstruction::StrafeTick,
|
instruction:crate::physics::PhysicsInstruction::StrafeTick,
|
||||||
};
|
};
|
||||||
worker.send(task).unwrap();
|
worker.send(task).unwrap();
|
||||||
@ -197,13 +197,13 @@ fn test_worker() {
|
|||||||
thread::sleep(std::time::Duration::from_millis(10));
|
thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
|
||||||
// Send a new task
|
// Send a new task
|
||||||
let task = crate::instruction::TimedInstruction{
|
let task = strafesnet_common::instruction::TimedInstruction{
|
||||||
time:crate::integer::Time::ZERO,
|
time:strafesnet_common::integer::Time::ZERO,
|
||||||
instruction:crate::physics::PhysicsInstruction::StrafeTick,
|
instruction:crate::physics::PhysicsInstruction::StrafeTick,
|
||||||
};
|
};
|
||||||
worker.send(task).unwrap();
|
worker.send(task).unwrap();
|
||||||
|
|
||||||
println!("value={}",worker.grab_clone());
|
//assert_eq!(test_body,worker.grab_clone());
|
||||||
|
|
||||||
// wait long enough to see print from final task
|
// wait long enough to see print from final task
|
||||||
thread::sleep(std::time::Duration::from_millis(10));
|
thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
//find roots of polynomials
|
|
||||||
use crate::integer::Planar64;
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
pub fn zeroes2(a0:Planar64,a1:Planar64,a2:Planar64) -> Vec<Planar64>{
|
|
||||||
if a2==Planar64::ZERO{
|
|
||||||
return zeroes1(a0, a1);
|
|
||||||
}
|
|
||||||
let radicand=a1.get() as i128*a1.get() as i128-a2.get() as i128*a0.get() as i128*4;
|
|
||||||
if 0<radicand {
|
|
||||||
//start with f64 sqrt
|
|
||||||
let planar_radicand=Planar64::raw(unsafe{(radicand as f64).sqrt().to_int_unchecked()});
|
|
||||||
//TODO: one or two newtons
|
|
||||||
//sort roots ascending and avoid taking the difference of large numbers
|
|
||||||
match (Planar64::ZERO<a2,Planar64::ZERO<a1){
|
|
||||||
(true, true )=>vec![(-a1-planar_radicand)/(a2*2),(a0*2)/(-a1-planar_radicand)],
|
|
||||||
(true, false)=>vec![(a0*2)/(-a1+planar_radicand),(-a1+planar_radicand)/(a2*2)],
|
|
||||||
(false,true )=>vec![(a0*2)/(-a1-planar_radicand),(-a1-planar_radicand)/(a2*2)],
|
|
||||||
(false,false)=>vec![(-a1+planar_radicand)/(a2*2),(a0*2)/(-a1+planar_radicand)],
|
|
||||||
}
|
|
||||||
} else if radicand==0 {
|
|
||||||
return vec![a1/(a2*-2)];
|
|
||||||
} else {
|
|
||||||
return vec![];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[inline]
|
|
||||||
pub fn zeroes1(a0:Planar64,a1:Planar64) -> Vec<Planar64> {
|
|
||||||
if a1==Planar64::ZERO{
|
|
||||||
return vec![];
|
|
||||||
} else {
|
|
||||||
return vec![-a0/a1];
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user