aidan9382/strafe-client
1
Fork 0
forked from StrafesNET/strafe-client
Code Pull Requests Activity

fix usage

Browse Source
This commit is contained in:
Quaternions 2023-10-26 19:54:30 -07:00
parent 01a8efe4d4
commit db5f4e1da3
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/physics.rs
View File

@ -975,7 +975,7 @@ impl PhysicsState {
//collect x //collect x
match collision_data.face { match collision_data.face {
TreyMeshFace::Top|TreyMeshFace::Back|TreyMeshFace::Bottom|TreyMeshFace::Front=>{ TreyMeshFace::Top|TreyMeshFace::Back|TreyMeshFace::Bottom|TreyMeshFace::Front=>{
for t in zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2) { for &t in zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2){
//negative t = back in time //negative t = back in time
//must be moving towards surface to collide //must be moving towards surface to collide
//must beat the current soonest collision time //must beat the current soonest collision time
@ -988,7 +988,7 @@ impl PhysicsState {
break; break;
} }
} }
for t in zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2) { for &t in zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2){
//negative t = back in time //negative t = back in time
//must be moving towards surface to collide //must be moving towards surface to collide
//must beat the current soonest collision time //must beat the current soonest collision time
@ -1020,7 +1020,7 @@ impl PhysicsState {
//collect y //collect y
match collision_data.face { match collision_data.face {
TreyMeshFace::Left|TreyMeshFace::Back|TreyMeshFace::Right|TreyMeshFace::Front=>{ TreyMeshFace::Left|TreyMeshFace::Back|TreyMeshFace::Right|TreyMeshFace::Front=>{
for t in zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2) { for &t in zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2){
//negative t = back in time //negative t = back in time
//must be moving towards surface to collide //must be moving towards surface to collide
//must beat the current soonest collision time //must beat the current soonest collision time
@ -1033,7 +1033,7 @@ impl PhysicsState {
break; break;
} }
} }
for t in zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2) { for &t in zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2){
//negative t = back in time //negative t = back in time
//must be moving towards surface to collide //must be moving towards surface to collide
//must beat the current soonest collision time //must beat the current soonest collision time
@ -1065,7 +1065,7 @@ impl PhysicsState {
//collect z //collect z
match collision_data.face { match collision_data.face {
TreyMeshFace::Left|TreyMeshFace::Bottom|TreyMeshFace::Right|TreyMeshFace::Top=>{ TreyMeshFace::Left|TreyMeshFace::Bottom|TreyMeshFace::Right|TreyMeshFace::Top=>{
for t in zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2) { for &t in zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2){
//negative t = back in time //negative t = back in time
//must be moving towards surface to collide //must be moving towards surface to collide
//must beat the current soonest collision time //must beat the current soonest collision time
@ -1078,7 +1078,7 @@ impl PhysicsState {
break; break;
} }
} }
for t in zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2) { for &t in zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2){
//negative t = back in time //negative t = back in time
//must be moving towards surface to collide //must be moving towards surface to collide
//must beat the current soonest collision time //must beat the current soonest collision time
@ -1124,7 +1124,7 @@ impl PhysicsState {
let mut best_time=time_limit; let mut best_time=time_limit;
let mut best_face:Option<TreyMeshFace>=None; let mut best_face:Option<TreyMeshFace>=None;
//collect x //collect x
for t in zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2) { for &t in zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2){
//must collide now or in the future //must collide now or in the future
//must beat the current soonest collision time //must beat the current soonest collision time
//must be moving towards surface //must be moving towards surface
@ -1140,7 +1140,7 @@ impl PhysicsState {
} }
} }
} }
for t in zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2) { for &t in zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2){
//must collide now or in the future //must collide now or in the future
//must beat the current soonest collision time //must beat the current soonest collision time
//must be moving towards surface //must be moving towards surface
@ -1157,7 +1157,7 @@ impl PhysicsState {
} }
} }
//collect y //collect y
for t in zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2) { for &t in zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2){
//must collide now or in the future //must collide now or in the future
//must beat the current soonest collision time //must beat the current soonest collision time
//must be moving towards surface //must be moving towards surface
@ -1173,7 +1173,7 @@ impl PhysicsState {
} }
} }
} }
for t in zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2) { for &t in zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2){
//must collide now or in the future //must collide now or in the future
//must beat the current soonest collision time //must beat the current soonest collision time
//must be moving towards surface //must be moving towards surface
@ -1190,7 +1190,7 @@ impl PhysicsState {
} }
} }
//collect z //collect z
for t in zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2) { for &t in zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2){
//must collide now or in the future //must collide now or in the future
//must beat the current soonest collision time //must beat the current soonest collision time
//must be moving towards surface //must be moving towards surface
@ -1206,7 +1206,7 @@ impl PhysicsState {
} }
} }
} }
for t in zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2) { for &t in zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2){
//must collide now or in the future //must collide now or in the future
//must beat the current soonest collision time //must beat the current soonest collision time
//must be moving towards surface //must be moving towards surface