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

algebra wrong

Browse Source
This commit is contained in:
Quaternions 2023-09-18 13:56:48 -07:00
parent 2a13c57553
commit f2461c4f39
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/body.rs
View File

@ -382,7 +382,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&0f32<v.x+a.x*-t{ if 0<=t_time&&t_time<best_time&&0f32<v.x+a.x*-t{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Left); best_face=Some(TreyMeshFace::Left);
@ -398,7 +398,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&v.x+a.x*-t<0f32{ if 0<=t_time&&t_time<best_time&&v.x+a.x*-t<0f32{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Right); best_face=Some(TreyMeshFace::Right);
@ -415,7 +415,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&0f32<v.y+a.y*-t{ if 0<=t_time&&t_time<best_time&&0f32<v.y+a.y*-t{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Top); best_face=Some(TreyMeshFace::Top);
@ -431,7 +431,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&v.y+a.y*-t<0f32{ if 0<=t_time&&t_time<best_time&&v.y+a.y*-t<0f32{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Bottom); best_face=Some(TreyMeshFace::Bottom);
@ -448,7 +448,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&0f32<v.z+a.z*-t{ if 0<=t_time&&t_time<best_time&&0f32<v.z+a.z*-t{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Back); best_face=Some(TreyMeshFace::Back);
@ -464,7 +464,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&v.z+a.z*-t<0f32{ if 0<=t_time&&t_time<best_time&&v.z+a.z*-t<0f32{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Front); best_face=Some(TreyMeshFace::Front);
@ -500,7 +500,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&0f32<v.x+a.x*t{ if 0<=t_time&&t_time<best_time&&0f32<v.x+a.x*t{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Left); best_face=Some(TreyMeshFace::Left);
@ -516,7 +516,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&v.x+a.x*t<0f32{ if 0<=t_time&&t_time<best_time&&v.x+a.x*t<0f32{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Right); best_face=Some(TreyMeshFace::Right);
@ -533,7 +533,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&0f32<v.y+a.y*t{ if 0<=t_time&&t_time<best_time&&0f32<v.y+a.y*t{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Top); best_face=Some(TreyMeshFace::Top);
@ -549,7 +549,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&v.y+a.y*t<0f32{ if 0<=t_time&&t_time<best_time&&v.y+a.y*t<0f32{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x&&mesh0.max.z+dp.z<mesh1.min.z&&mesh0.min.z+dp.z>mesh1.max.z { if mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x&&mesh1.min.z<mesh0.max.z+dp.z&&mesh0.min.z+dp.z<mesh1.max.z {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Bottom); best_face=Some(TreyMeshFace::Bottom);
@ -566,7 +566,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&0f32<v.z+a.z*t{ if 0<=t_time&&t_time<best_time&&0f32<v.z+a.z*t{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Back); best_face=Some(TreyMeshFace::Back);
@ -582,7 +582,7 @@ impl PhysicsState {
if 0<=t_time&&t_time<best_time&&v.z+a.z*t<0f32{ if 0<=t_time&&t_time<best_time&&v.z+a.z*t<0f32{
let dp=self.body.extrapolated_position(t_time)-p; let dp=self.body.extrapolated_position(t_time)-p;
//faces must be overlapping //faces must be overlapping
if mesh0.max.y+dp.y<mesh1.min.y&&mesh0.min.y+dp.y>mesh1.max.y&&mesh0.max.x+dp.x<mesh1.min.x&&mesh0.min.x+dp.x>mesh1.max.x { if mesh1.min.y<mesh0.max.y+dp.y&&mesh0.min.y+dp.y<mesh1.max.y&&mesh1.min.x<mesh0.max.x+dp.x&&mesh0.min.x+dp.x<mesh1.max.x {
//collect valid t //collect valid t
best_time=t_time; best_time=t_time;
best_face=Some(TreyMeshFace::Front); best_face=Some(TreyMeshFace::Front);