Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switched from in-tree float4 lib to glam.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,33 +9,33 @@ use crate::{ | |
| math::{Point, Vector}, | ||
| }; | ||
|
|
||
| use glam::{Vec4, Vec4Mask}; | ||
|
|
||
| const BBOX_MAXT_ADJUST: f32 = 1.00000024; | ||
|
|
||
| /// A SIMD set of 4 3D axis-aligned bounding boxes. | ||
| #[derive(Debug, Copy, Clone)] | ||
| pub struct BBox4 { | ||
| pub x: (Vec4, Vec4), // (min, max) | ||
| pub y: (Vec4, Vec4), // (min, max) | ||
| pub z: (Vec4, Vec4), // (min, max) | ||
| } | ||
|
|
||
| impl BBox4 { | ||
| /// Creates a degenerate BBox with +infinity min and -infinity max. | ||
| pub fn new() -> BBox4 { | ||
| BBox4 { | ||
| x: ( | ||
| Vec4::splat(std::f32::INFINITY), | ||
| Vec4::splat(std::f32::NEG_INFINITY), | ||
| ), | ||
| y: ( | ||
| Vec4::splat(std::f32::INFINITY), | ||
| Vec4::splat(std::f32::NEG_INFINITY), | ||
| ), | ||
| z: ( | ||
| Vec4::splat(std::f32::INFINITY), | ||
| Vec4::splat(std::f32::NEG_INFINITY), | ||
| ), | ||
| } | ||
| } | ||
|
|
@@ -45,30 +45,30 @@ impl BBox4 { | |
| pub fn from_bboxes(b1: BBox, b2: BBox, b3: BBox, b4: BBox) -> BBox4 { | ||
| BBox4 { | ||
| x: ( | ||
| Vec4::new(b1.min.x(), b2.min.x(), b3.min.x(), b4.min.x()), | ||
| Vec4::new(b1.max.x(), b2.max.x(), b3.max.x(), b4.max.x()), | ||
| ), | ||
| y: ( | ||
| Vec4::new(b1.min.y(), b2.min.y(), b3.min.y(), b4.min.y()), | ||
| Vec4::new(b1.max.y(), b2.max.y(), b3.max.y(), b4.max.y()), | ||
| ), | ||
| z: ( | ||
| Vec4::new(b1.min.z(), b2.min.z(), b3.min.z(), b4.min.z()), | ||
| Vec4::new(b1.max.z(), b2.max.z(), b3.max.z(), b4.max.z()), | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| // Returns whether the given ray intersects with the bboxes. | ||
| pub fn intersect_ray(&self, orig: Point, dir_inv: Vector, max_t: f32) -> Vec4Mask { | ||
| // Get the ray data into SIMD format. | ||
| let ro_x = Vec4::splat(orig.co.x()); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
cessen
Author
Owner
|
||
| let ro_y = Vec4::splat(orig.co.y()); | ||
| let ro_z = Vec4::splat(orig.co.z()); | ||
| let rdi_x = Vec4::splat(dir_inv.co.x()); | ||
| let rdi_y = Vec4::splat(dir_inv.co.y()); | ||
| let rdi_z = Vec4::splat(dir_inv.co.z()); | ||
| let max_t = Vec4::splat(max_t); | ||
|
|
||
| // Slab tests | ||
| let t1_x = (self.x.0 - ro_x) * rdi_x; | ||
|
|
@@ -79,24 +79,21 @@ impl BBox4 { | |
| let t2_z = (self.z.1 - ro_z) * rdi_z; | ||
|
|
||
| // Get the far and near t hits for each axis. | ||
| let t_far_x = t1_x.max(t2_x); | ||
| let t_far_y = t1_y.max(t2_y); | ||
| let t_far_z = t1_z.max(t2_z); | ||
| let t_near_x = t1_x.min(t2_x); | ||
| let t_near_y = t1_y.min(t2_y); | ||
| let t_near_z = t1_z.min(t2_z); | ||
|
|
||
| // Calculate over-all far t hit. | ||
| let far_t = (t_far_x.min(t_far_y.min(t_far_z)) * Vec4::splat(BBOX_MAXT_ADJUST)).min(max_t); | ||
|
|
||
| // Calculate over-all near t hit. | ||
| let near_t = t_near_x.max(t_near_y).max(t_near_z.max(Vec4::splat(0.0))); | ||
|
|
||
| // Hit results | ||
| near_t.cmplt(far_t) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -106,9 +103,9 @@ impl BitOr for BBox4 { | |
|
|
||
| fn bitor(self, rhs: BBox4) -> BBox4 { | ||
| BBox4 { | ||
| x: (self.x.0.min(rhs.x.0), self.x.1.max(rhs.x.1)), | ||
| y: (self.y.0.min(rhs.y.0), self.y.1.max(rhs.y.1)), | ||
| z: (self.z.0.min(rhs.z.0), self.z.1.max(rhs.z.1)), | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
I hope you don't mind me commenting, you're one of the first people to use glam so I'm interested in how you are using it. I do have
dup_xetc methods for doing what yourall_0method did but I haven't made them public because while glam uses them internally I wasn't sure how useful they would be to other users. Anyway, it looks like they would be useful so I'm make them public. I was also wanting to write a shuffle macro which could also do this, but that would be more verbose and this operation seems common enough that it warrants it's own method. I made an issue so I don't forget here bitshifter/glam-rs#14.