StrafesNET/strafe-project
7
Fork 4
Code Issues 8 Pull Requests 1 Packages Projects Releases 2 Wiki Activity

narrow directions more carefully

Browse Source
This commit is contained in:
Rhys Lloyd
2025-12-16 12:24:04 -08:00
parent 73f0a85f81
commit 9b3a9ce437
1 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
engine/physics/src/minimum_difference.rs
View File

@@ -100,6 +100,37 @@ const fn choose_any_direction()->Planar64Vec3{
vec3::X
}
fn narrow_dir2(dir:Vector3<Fixed<2,64>>)->Planar64Vec3{
if dir==vec3::zero(){
return dir.narrow_1().unwrap();
}
let x=dir.x.as_bits().unsigned_abs().bits();
let y=dir.y.as_bits().unsigned_abs().bits();
let z=dir.z.as_bits().unsigned_abs().bits();
let big=x.max(y).max(z);
const MAX_BITS:u32=64+31;
if MAX_BITS<big{
dir>>(big-MAX_BITS)
}else{
dir
}.narrow_1().unwrap()
}
fn narrow_dir3(dir:Vector3<Fixed<3,96>>)->Planar64Vec3{
if dir==vec3::zero(){
return dir.narrow_1().unwrap();
}
let x=dir.x.as_bits().unsigned_abs().bits();
let y=dir.y.as_bits().unsigned_abs().bits();
let z=dir.z.as_bits().unsigned_abs().bits();
let big=x.max(y).max(z);
const MAX_BITS:u32=96+31;
if MAX_BITS<big{
dir>>(big-MAX_BITS)
}else{
dir
}.narrow_1().unwrap()
}
fn reduce1<M:MeshQuery>(
[v0]:Simplex<1,M::Vert>,
mesh:&M,
@@ -165,7 +196,7 @@ fn reduce2<M:MeshQuery>(
// -- modify the direction to take into account a0R and b0R
// return direction, a0, a1, b0, b1
return Reduced{
dir:direction.narrow_1().unwrap(),
dir:narrow_dir3(direction),
simplex:Simplex1_3::Simplex2([v0,v1]),
};
}
@@ -231,7 +262,7 @@ fn reduce3<M:MeshQuery>(
// return direction, a0, a1, b0, b1, c0, c1
return Reduced{
dir:direction.narrow_1().unwrap(),
dir:narrow_dir2(direction),
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
};
}
@@ -265,14 +296,14 @@ fn reduce3<M:MeshQuery>(
if direction==vec3::zero(){
// direction = uv
return Reduced{
dir:uv.narrow_1().unwrap(),
dir:narrow_dir2(uv),
simplex:Simplex1_3::Simplex2([v0,v1]),
};
}
// return direction, a0, a1, b0, b1
return Reduced{
dir:direction.narrow_1().unwrap(),
dir:narrow_dir3(direction),
simplex:Simplex1_3::Simplex2([v0,v1]),
};
}
@@ -283,7 +314,7 @@ fn reduce3<M:MeshQuery>(
if dir==vec3::zero(){
// direction = uv
return Reduced{
dir:uv.narrow_1().unwrap(),
dir:narrow_dir2(uv),
simplex:Simplex1_3::Simplex1([v0]),
};
}
@@ -399,12 +430,12 @@ fn reduce4<M:MeshQuery>(
// return direction, a0, a1, b0, b1, c0, c1
if uv_w.is_negative(){
return Reduce::Reduced(Reduced{
dir:uv.narrow_1().unwrap(),
dir:narrow_dir2(uv),
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
});
}else{
return Reduce::Reduced(Reduced{
dir:-uv.narrow_1().unwrap(),
dir:narrow_dir2(-uv),
simplex:Simplex1_3::Simplex3([v0,v1,v2]),
});
}
@@ -441,12 +472,12 @@ fn reduce4<M:MeshQuery>(
// return direction, a0, a1, b0, b1
if uv_w.is_negative(){
return Reduce::Reduced(Reduced{
dir:uv.narrow_1().unwrap(),
dir:narrow_dir2(uv),
simplex:Simplex1_3::Simplex2([v0,v1]),
});
}else{
return Reduce::Reduced(Reduced{
dir:-uv.narrow_1().unwrap(),
dir:narrow_dir2(-uv),
simplex:Simplex1_3::Simplex2([v0,v1]),
});
}
@@ -454,7 +485,7 @@ fn reduce4<M:MeshQuery>(
// return direction, a0, a1, b0, b1
return Reduce::Reduced(Reduced{
dir:direction.narrow_1().unwrap(),
dir:narrow_dir3(direction),
simplex:Simplex1_3::Simplex2([v0,v1]),
});
}
@@ -466,12 +497,12 @@ fn reduce4<M:MeshQuery>(
// direction = uvw < 0 and uv or -uv
if uv_w.is_negative(){
return Reduce::Reduced(Reduced{
dir:uv.narrow_1().unwrap(),
dir:narrow_dir2(uv),
simplex:Simplex1_3::Simplex1([v0]),
});
}else{
return Reduce::Reduced(Reduced{
dir:-uv.narrow_1().unwrap(),
dir:narrow_dir2(-uv),
simplex:Simplex1_3::Simplex1([v0]),
});
}