StrafesNET/strafe-project
6
Fork 4
Code Issues5 Pull Requests2 Packages Projects Releases2 Wiki Activity

wip: fix intersect_aabb

Browse Source
This commit is contained in:
Quaternions 2025-02-07 14:48:55 -08:00
parent f770f5ac7b
commit 74eefcb78f
1 changed files with 12 additions and 1 deletions

13
lib/common/src/bvh.rs

@ -1,6 +1,9 @@
use std::cmp::Ordering;
use std::collections::BTreeMap;
use fixed_wide::fixed::Fixed;
use linear_ops::types::Vector3;
use crate::aabb::Aabb;
use crate::integer::{Ratio,Planar64,Planar64Vec3};
use crate::instruction::{InstructionCollector,TimedInstruction};
@ -20,6 +23,10 @@ pub struct Ray{
pub direction:Planar64Vec3,
}
impl Ray{
pub fn extrapolate(&self,t:Ratio<Planar64,Planar64>)->Ratio<Vector3<Fixed<2,64>>,Planar64>{
// o+d*t
(self.origin*t.den+self.direction*t.num)/t.den
}
pub fn intersect_aabb(&self,aabb:&Aabb)->Option<Ratio<Planar64,Planar64>>{
// n.(o+d*t)==n.p
// n.o + n.d * t == n.p
@ -35,7 +42,11 @@ impl Ray{
match self.direction.z.cmp(&Planar64::ZERO){
Ordering::Less=>{
let t=(aabb.max().z-self.origin.z)/self.direction.z;
hit=Some(hit.map_or(t,|best_t|best_t.min(t)));
let p=self.extrapolate(t);
if aabb.min().x<p.x&&p.x<aabb.max().x
&&aabb.min().y<p.y&&p.y<aabb.max().y{
hit=Some(hit.map_or(t,|best_t|best_t.min(t)));
}
},
Ordering::Equal=>(),
Ordering::Greater=>{