add common modules
This commit is contained in:
parent
7b263ae30e
commit
434ca29aef
46
src/aabb.rs
Normal file
46
src/aabb.rs
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
use crate::integer::Planar64Vec3;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Aabb{
|
||||||
|
min:Planar64Vec3,
|
||||||
|
max:Planar64Vec3,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Aabb {
|
||||||
|
fn default()->Self {
|
||||||
|
Self{min:Planar64Vec3::MAX,max:Planar64Vec3::MIN}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Aabb{
|
||||||
|
pub fn grow(&mut self,point:Planar64Vec3){
|
||||||
|
self.min=self.min.min(point);
|
||||||
|
self.max=self.max.max(point);
|
||||||
|
}
|
||||||
|
pub fn join(&mut self,aabb:&Aabb){
|
||||||
|
self.min=self.min.min(aabb.min);
|
||||||
|
self.max=self.max.max(aabb.max);
|
||||||
|
}
|
||||||
|
pub fn inflate(&mut self,hs:Planar64Vec3){
|
||||||
|
self.min-=hs;
|
||||||
|
self.max+=hs;
|
||||||
|
}
|
||||||
|
pub fn intersects(&self,aabb:&Aabb)->bool{
|
||||||
|
(self.min.cmplt(aabb.max)&aabb.min.cmplt(self.max)).all()
|
||||||
|
}
|
||||||
|
pub fn size(&self)->Planar64Vec3{
|
||||||
|
self.max-self.min
|
||||||
|
}
|
||||||
|
pub fn center(&self)->Planar64Vec3{
|
||||||
|
self.min.midpoint(self.max)
|
||||||
|
}
|
||||||
|
//probably use floats for area & volume because we don't care about precision
|
||||||
|
// pub fn area_weight(&self)->f32{
|
||||||
|
// let d=self.max-self.min;
|
||||||
|
// d.x*d.y+d.y*d.z+d.z*d.x
|
||||||
|
// }
|
||||||
|
// pub fn volume(&self)->f32{
|
||||||
|
// let d=self.max-self.min;
|
||||||
|
// d.x*d.y*d.z
|
||||||
|
// }
|
||||||
|
}
|
123
src/bvh.rs
Normal file
123
src/bvh.rs
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
use crate::aabb::Aabb;
|
||||||
|
|
||||||
|
//da algaritum
|
||||||
|
//lista boxens
|
||||||
|
//sort by {minx,maxx,miny,maxy,minz,maxz} (6 lists)
|
||||||
|
//find the sets that minimizes the sum of surface areas
|
||||||
|
//splitting is done when the minimum split sum of surface areas is larger than the node's own surface area
|
||||||
|
|
||||||
|
//start with bisection into octrees because a bad bvh is still 1000x better than no bvh
|
||||||
|
//sort the centerpoints on each axis (3 lists)
|
||||||
|
//bv is put into octant based on whether it is upper or lower in each list
|
||||||
|
enum BvhNodeContent{
|
||||||
|
Branch(Vec<BvhNode>),
|
||||||
|
Leaf(usize),
|
||||||
|
}
|
||||||
|
impl Default for BvhNodeContent{
|
||||||
|
fn default()->Self{
|
||||||
|
Self::Branch(Vec::new())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct BvhNode{
|
||||||
|
content:BvhNodeContent,
|
||||||
|
aabb:Aabb,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BvhNode{
|
||||||
|
pub fn the_tester<F:FnMut(usize)>(&self,aabb:&Aabb,f:&mut F){
|
||||||
|
match &self.content{
|
||||||
|
&BvhNodeContent::Leaf(model)=>f(model),
|
||||||
|
BvhNodeContent::Branch(children)=>for child in children{
|
||||||
|
//this test could be moved outside the match statement
|
||||||
|
//but that would test the root node aabb
|
||||||
|
//you're probably not going to spend a lot of time outside the map,
|
||||||
|
//so the test is extra work for nothing
|
||||||
|
if aabb.intersects(&child.aabb){
|
||||||
|
child.the_tester(aabb,f);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn generate_bvh(boxen:Vec<Aabb>)->BvhNode{
|
||||||
|
generate_bvh_node(boxen.into_iter().enumerate().collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn generate_bvh_node(boxen:Vec<(usize,Aabb)>)->BvhNode{
|
||||||
|
let n=boxen.len();
|
||||||
|
if n<20{
|
||||||
|
let mut aabb=Aabb::default();
|
||||||
|
let nodes=boxen.into_iter().map(|b|{
|
||||||
|
aabb.join(&b.1);
|
||||||
|
BvhNode{
|
||||||
|
content:BvhNodeContent::Leaf(b.0),
|
||||||
|
aabb:b.1,
|
||||||
|
}
|
||||||
|
}).collect();
|
||||||
|
BvhNode{
|
||||||
|
content:BvhNodeContent::Branch(nodes),
|
||||||
|
aabb,
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
let mut octant=std::collections::HashMap::with_capacity(n);//this ids which octant the boxen is put in
|
||||||
|
let mut sort_x=Vec::with_capacity(n);
|
||||||
|
let mut sort_y=Vec::with_capacity(n);
|
||||||
|
let mut sort_z=Vec::with_capacity(n);
|
||||||
|
for (i,aabb) in boxen.iter(){
|
||||||
|
let center=aabb.center();
|
||||||
|
octant.insert(*i,0);
|
||||||
|
sort_x.push((*i,center.x()));
|
||||||
|
sort_y.push((*i,center.y()));
|
||||||
|
sort_z.push((*i,center.z()));
|
||||||
|
}
|
||||||
|
sort_x.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
|
||||||
|
sort_y.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
|
||||||
|
sort_z.sort_by(|tup0,tup1|tup0.1.cmp(&tup1.1));
|
||||||
|
let h=n/2;
|
||||||
|
let median_x=sort_x[h].1;
|
||||||
|
let median_y=sort_y[h].1;
|
||||||
|
let median_z=sort_z[h].1;
|
||||||
|
for (i,c) in sort_x{
|
||||||
|
if median_x<c{
|
||||||
|
octant.insert(i,octant[&i]+1<<0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (i,c) in sort_y{
|
||||||
|
if median_y<c{
|
||||||
|
octant.insert(i,octant[&i]+1<<1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (i,c) in sort_z{
|
||||||
|
if median_z<c{
|
||||||
|
octant.insert(i,octant[&i]+1<<2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//generate lists for unique octant values
|
||||||
|
let mut list_list=Vec::with_capacity(8);
|
||||||
|
let mut octant_list=Vec::with_capacity(8);
|
||||||
|
for (i,aabb) in boxen.into_iter(){
|
||||||
|
let octant_id=octant[&i];
|
||||||
|
let list_id=if let Some(list_id)=octant_list.iter().position(|&id|id==octant_id){
|
||||||
|
list_id
|
||||||
|
}else{
|
||||||
|
let list_id=list_list.len();
|
||||||
|
octant_list.push(octant_id);
|
||||||
|
list_list.push(Vec::new());
|
||||||
|
list_id
|
||||||
|
};
|
||||||
|
list_list[list_id].push((i,aabb));
|
||||||
|
}
|
||||||
|
let mut aabb=Aabb::default();
|
||||||
|
let children=list_list.into_iter().map(|b|{
|
||||||
|
let node=generate_bvh_node(b);
|
||||||
|
aabb.join(&node.aabb);
|
||||||
|
node
|
||||||
|
}).collect();
|
||||||
|
BvhNode{
|
||||||
|
content:BvhNodeContent::Branch(children),
|
||||||
|
aabb,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
53
src/instruction.rs
Normal file
53
src/instruction.rs
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
use crate::integer::Time;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct TimedInstruction<I>{
|
||||||
|
pub time:Time,
|
||||||
|
pub instruction:I,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait InstructionEmitter<I>{
|
||||||
|
fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<I>>;
|
||||||
|
}
|
||||||
|
pub trait InstructionConsumer<I>{
|
||||||
|
fn process_instruction(&mut self, instruction:TimedInstruction<I>);
|
||||||
|
}
|
||||||
|
|
||||||
|
//PROPER PRIVATE FIELDS!!!
|
||||||
|
pub struct InstructionCollector<I>{
|
||||||
|
time:Time,
|
||||||
|
instruction:Option<I>,
|
||||||
|
}
|
||||||
|
impl<I> InstructionCollector<I>{
|
||||||
|
pub fn new(time:Time)->Self{
|
||||||
|
Self{
|
||||||
|
time,
|
||||||
|
instruction:None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub fn time(&self)->Time{
|
||||||
|
self.time
|
||||||
|
}
|
||||||
|
pub fn collect(&mut self,instruction:Option<TimedInstruction<I>>){
|
||||||
|
match instruction{
|
||||||
|
Some(unwrap_instruction)=>{
|
||||||
|
if unwrap_instruction.time<self.time {
|
||||||
|
self.time=unwrap_instruction.time;
|
||||||
|
self.instruction=Some(unwrap_instruction.instruction);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None=>(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn instruction(self)->Option<TimedInstruction<I>>{
|
||||||
|
//STEAL INSTRUCTION AND DESTROY INSTRUCTIONCOLLECTOR
|
||||||
|
match self.instruction{
|
||||||
|
Some(instruction)=>Some(TimedInstruction{
|
||||||
|
time:self.time,
|
||||||
|
instruction
|
||||||
|
}),
|
||||||
|
None=>None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1054
src/integer.rs
Normal file
1054
src/integer.rs
Normal file
File diff suppressed because it is too large
Load Diff
19
src/lib.rs
19
src/lib.rs
@ -1,14 +1,5 @@
|
|||||||
pub fn add(left: usize, right: usize) -> usize {
|
pub mod bvh;
|
||||||
left + right
|
pub mod aabb;
|
||||||
}
|
pub mod zeroes;
|
||||||
|
pub mod integer;
|
||||||
#[cfg(test)]
|
pub mod instruction;
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn it_works() {
|
|
||||||
let result = add(2, 2);
|
|
||||||
assert_eq!(result, 4);
|
|
||||||
}
|
|
||||||
}
|
|
40
src/zeroes.rs
Normal file
40
src/zeroes.rs
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
//find roots of polynomials
|
||||||
|
use crate::integer::Planar64;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub fn zeroes2(a0:Planar64,a1:Planar64,a2:Planar64) -> Vec<Planar64>{
|
||||||
|
if a2==Planar64::ZERO{
|
||||||
|
return zeroes1(a0, a1);
|
||||||
|
}
|
||||||
|
let radicand=a1.get() as i128*a1.get() as i128-a2.get() as i128*a0.get() as i128*4;
|
||||||
|
if 0<radicand {
|
||||||
|
//start with f64 sqrt
|
||||||
|
//failure case: 2^63 < sqrt(2^127)
|
||||||
|
let planar_radicand=Planar64::raw(unsafe{(radicand as f64).sqrt().to_int_unchecked()});
|
||||||
|
//TODO: one or two newtons
|
||||||
|
//sort roots ascending and avoid taking the difference of large numbers
|
||||||
|
match (Planar64::ZERO<a2,Planar64::ZERO<a1){
|
||||||
|
(true, true )=>vec![(-a1-planar_radicand)/(a2*2),(a0*2)/(-a1-planar_radicand)],
|
||||||
|
(true, false)=>vec![(a0*2)/(-a1+planar_radicand),(-a1+planar_radicand)/(a2*2)],
|
||||||
|
(false,true )=>vec![(a0*2)/(-a1-planar_radicand),(-a1-planar_radicand)/(a2*2)],
|
||||||
|
(false,false)=>vec![(-a1+planar_radicand)/(a2*2),(a0*2)/(-a1+planar_radicand)],
|
||||||
|
}
|
||||||
|
} else if radicand==0 {
|
||||||
|
return vec![a1/(a2*-2)];
|
||||||
|
} else {
|
||||||
|
return vec![];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[inline]
|
||||||
|
pub fn zeroes1(a0:Planar64,a1:Planar64) -> Vec<Planar64> {
|
||||||
|
if a1==Planar64::ZERO{
|
||||||
|
return vec![];
|
||||||
|
}else{
|
||||||
|
let q=((-a0.get() as i128)<<32)/(a1.get() as i128);
|
||||||
|
if i64::MIN as i128<=q&&q<=i64::MAX as i128{
|
||||||
|
return vec![Planar64::raw(q as i64)];
|
||||||
|
}else{
|
||||||
|
return vec![];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user