Theaninova/Bampy
1
0
Fork 0
mirror of https://github.com/Theaninova/Bampy.git synced 2025-12-11 03:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: stuff

Browse Source
This commit is contained in:
Thea Schöbl
2024-03-24 16:45:17 +01:00
parent f1f038ccca
commit 61d3b15c73
10 changed files with 260 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bampy/src/lib.rs
View File

@@ -6,7 +6,7 @@ use wasm_bindgen::prelude::wasm_bindgen;
use crate::slicer::{
base_slices::create_slices, mesh::Mesh, split_surface::split_surface,
trace_surface::trace_surface, triangle::Triangle, SlicerOptions,
trace_surface::trace_surface, triangle::Triangle, FloatValue, SlicerOptions,
};
mod slicer;
@@ -57,24 +57,24 @@ pub fn slice(
assert_eq!(positions.len() % 9, 0);
let mut surface_triangles = Vec::<Triangle<f64>>::with_capacity(positions.len() / 9);
let mut slicable_triangles = Vec::<Triangle<f64>>::with_capacity(positions.len() / 9);
let mut surface_triangles = Vec::<Triangle>::with_capacity(positions.len() / 9);
let mut slicable_triangles = Vec::<Triangle>::with_capacity(positions.len() / 9);
for i in (0..positions.len()).step_by(9) {
let triangle = Triangle::new(
vector![
positions[i] as f64,
positions[i + 1] as f64,
positions[i + 2] as f64
positions[i] as FloatValue,
positions[i + 1] as FloatValue,
positions[i + 2] as FloatValue
],
vector![
positions[i + 3] as f64,
positions[i + 4] as f64,
positions[i + 5] as f64
positions[i + 3] as FloatValue,
positions[i + 4] as FloatValue,
positions[i + 5] as FloatValue
],
vector![
positions[i + 6] as f64,
positions[i + 7] as f64,
positions[i + 8] as f64
positions[i + 6] as FloatValue,
positions[i + 7] as FloatValue,
positions[i + 8] as FloatValue
],
);
@@ -96,14 +96,18 @@ pub fn slice(
let slicable = Mesh::from(slicable_triangles);
console_log!("Creating Slices");
let mut slices = create_slices(&slicer_options, &slicable);
console_log!("Done");
console_log!("Tracing Surfaces");
let a = max_angle.tan();
for slice in &mut slices {
for surface in &surfaces {
trace_surface(slice, surface)
if surface.aabb.min.z <= slice.z && surface.aabb.max.z > slice.z {
trace_surface(slice, surface, a);
}
}
}
console_log!("Done");
SliceResult {
slices: slices
.into_iter()

12
bampy/src/slicer/base_slices.rs
View File

@@ -2,25 +2,25 @@ use super::{
line::Line3,
mesh::Mesh,
slice_rings::{find_slice_rings, SliceRing},
SlicerOptions,
FloatValue, SlicerOptions,
};
use bvh::bvh::BvhNode;
#[derive(Debug)]
pub struct BaseSlice {
pub z: f64,
pub lines: Vec<Line3<f64>>,
pub z: FloatValue,
pub lines: Vec<Line3>,
}
/// Creates base slices from the geometry, excluding surfaces.
/// The slicse are not sorted or separated into rings.
pub fn create_slices(options: &SlicerOptions, slicable: &Mesh<f64>) -> Vec<SliceRing> {
let layer_count = f64::floor(slicable.aabb.max.z / options.layer_height) as usize;
pub fn create_slices(options: &SlicerOptions, slicable: &Mesh) -> Vec<SliceRing> {
let layer_count = (slicable.aabb.max.z / options.layer_height).floor() as usize;
let mut rings = vec![];
let mut layer_index = 0;
for i in 0..layer_count {
let layer = i as f64 * options.layer_height;
let layer = i as FloatValue * options.layer_height;
let mut base_slice = BaseSlice {
z: layer,
lines: vec![],

10
bampy/src/slicer/line.rs
View File

@@ -1,11 +1,13 @@
use nalgebra::{Scalar, Vector3};
use nalgebra::Vector3;
use super::FloatValue;
/// Lines are assumed to be with respect to the XY plane.
/// The order of the points is therefore significant,
/// clockwise order with respect to the inside of the shape,
/// meaning the inside is on the right hand side of the line.
#[derive(Debug, PartialEq, Clone, Copy)]
pub struct Line3<T: Scalar> {
pub start: Vector3<T>,
pub end: Vector3<T>,
pub struct Line3 {
pub start: Vector3<FloatValue>,
pub end: Vector3<FloatValue>,
}

20
bampy/src/slicer/mesh.rs
View File

@@ -1,21 +1,15 @@
use super::{triangle::Triangle, FloatValue};
use bvh::{aabb::Aabb, bvh::Bvh};
use nalgebra::{ClosedAdd, ClosedMul, ClosedSub, Scalar, SimdPartialOrd};
use num::{Float, FromPrimitive};
use super::triangle::Triangle;
#[derive(Debug)]
pub struct Mesh<T: SimdPartialOrd + Scalar + Copy> {
pub aabb: Aabb<T, 3>,
pub bvh: Bvh<T, 3>,
pub triangles: Vec<Triangle<T>>,
pub struct Mesh {
pub aabb: Aabb<FloatValue, 3>,
pub bvh: Bvh<FloatValue, 3>,
pub triangles: Vec<Triangle>,
}
impl<T> From<Vec<Triangle<T>>> for Mesh<T>
where
T: SimdPartialOrd + Scalar + Copy + ClosedMul + ClosedAdd + ClosedSub + Float + FromPrimitive,
{
fn from(mut triangles: Vec<Triangle<T>>) -> Self {
impl From<Vec<Triangle>> for Mesh {
fn from(mut triangles: Vec<Triangle>) -> Self {
Self {
aabb: triangles
.get(0)

5
bampy/src/slicer/mod.rs
View File

@@ -7,8 +7,11 @@ pub mod slice_rings;
pub mod split_surface;
pub mod trace_surface;
pub mod triangle;
pub mod z_projection;
pub type FloatValue = f64;
#[derive(Debug)]
pub struct SlicerOptions {
pub layer_height: f64,
pub layer_height: FloatValue,
}

6
bampy/src/slicer/slice_rings.rs
View File

@@ -3,13 +3,13 @@ use nalgebra::Vector3;
use crate::console_log;
use super::base_slices::BaseSlice;
use super::{base_slices::BaseSlice, FloatValue};
#[derive(Debug)]
pub struct SliceRing {
pub z: f64,
pub z: FloatValue,
/// The points of the ring, in clockwise order.
pub points: Vec<Vector3<f64>>,
pub points: Vec<Vector3<FloatValue>>,
}
pub fn find_slice_rings(mut slice: BaseSlice, layer_index: &mut u32) -> Vec<SliceRing> {

2
bampy/src/slicer/split_surface.rs
View File

@@ -2,7 +2,7 @@ use super::{mesh::Mesh, triangle::Triangle};
use bvh::bvh::{Bvh, BvhNode};
/// Splits a surface into connected surfaces.
pub fn split_surface(mut triangles: Vec<Triangle<f64>>) -> Vec<Mesh<f64>> {
pub fn split_surface(mut triangles: Vec<Triangle>) -> Vec<Mesh> {
let mut surfaces = vec![];
while let Some(triangle) = triangles.pop() {
let mut surface = vec![triangle];

77
bampy/src/slicer/trace_surface.rs
View File

@@ -1,48 +1,47 @@
use bvh::bvh::BvhNode;
use super::{mesh::Mesh, slice_rings::SliceRing};
use super::{mesh::Mesh, slice_rings::SliceRing, z_projection::ToolpathIntersects, FloatValue};
pub fn trace_surface(slice: &mut SliceRing, surface: &Mesh<f64>) {
loop {
let mut mutated = false;
slice.points.retain_mut(|triangle| {
let mut stack = Vec::<usize>::new();
stack.push(0);
while let Some(i) = stack.pop() {
match surface.bvh.nodes[i] {
BvhNode::Node {
parent_index: _,
child_l_index,
child_l_aabb,
child_r_index,
child_r_aabb,
} => {
if triangle.has_point_in_aabb(&child_l_aabb) {
stack.push(child_l_index);
}
if triangle.has_point_in_aabb(&child_r_aabb) {
stack.push(child_r_index);
}
pub fn trace_surface(slice: &mut SliceRing, surface: &Mesh, a: FloatValue) {
slice.points.retain_mut(|point| {
let mut stack = Vec::<usize>::new();
stack.push(0);
while let Some(i) = stack.pop() {
match surface.bvh.nodes[i] {
BvhNode::Node {
parent_index: _,
child_l_index,
child_l_aabb,
child_r_index,
child_r_aabb,
} => {
if child_l_aabb.toolpath_intersects(point, a) {
stack.push(child_l_index);
}
BvhNode::Leaf {
parent_index: _,
shape_index,
} => {
if triangle.shares_point_with_triangle(surface[shape_index]) {
mutated = true;
surface.push(*triangle);
let index = surface.len() - 1;
bvh.add_shape(&mut surface, index);
aabb.join_mut(&triangle.aabb);
return false;
}
if child_r_aabb.toolpath_intersects(point, a) {
stack.push(child_r_index);
}
}
BvhNode::Leaf {
parent_index: _,
shape_index,
} => {
let triangle = &surface.triangles[shape_index];
macro_rules! check {
( $var:ident ) => {{
let x = point.x - triangle.$var.x;
let y = point.y - triangle.$var.y;
(point.z > triangle.aabb.min.z
&& FloatValue::sqrt(x * x + y * y)
< (triangle.$var.z - point.z).abs() * a)
}};
}
if check!(a) || check!(b) || check!(c) {
return false;
}
}
}
true
});
if !mutated {
break;
}
}
true
});
}

84
bampy/src/slicer/triangle.rs
View File

@@ -1,28 +1,24 @@
use approx::{relative_eq, AbsDiffEq, RelativeEq};
use approx::relative_eq;
use bvh::{
aabb::{Aabb, Bounded},
bounding_hierarchy::BHShape,
};
use nalgebra::{ClosedAdd, ClosedMul, ClosedSub, Point3, Scalar, SimdPartialOrd, Vector3};
use num::{Float, FromPrimitive};
use nalgebra::{Point3, Vector3};
use super::line::Line3;
use super::{line::Line3, FloatValue};
#[derive(Debug, Clone, Copy)]
pub struct Triangle<T: SimdPartialOrd + Scalar + Copy> {
pub a: Vector3<T>,
pub b: Vector3<T>,
pub c: Vector3<T>,
pub normal: Vector3<T>,
pub struct Triangle {
pub a: Vector3<FloatValue>,
pub b: Vector3<FloatValue>,
pub c: Vector3<FloatValue>,
pub normal: Vector3<FloatValue>,
node_index: usize,
pub aabb: Aabb<T, 3>,
pub aabb: Aabb<FloatValue, 3>,
}
#[inline(always)]
fn vec_inside_aabb<T: SimdPartialOrd + Scalar + Copy + Float + RelativeEq + approx::AbsDiffEq>(
vec: &Vector3<T>,
aabb: &Aabb<T, 3>,
) -> bool {
fn vec_inside_aabb(vec: &Vector3<FloatValue>, aabb: &Aabb<FloatValue, 3>) -> bool {
macro_rules! within {
($axis:ident) => {
((vec.$axis >= aabb.min.$axis && vec.$axis <= aabb.max.$axis)
@@ -33,19 +29,8 @@ fn vec_inside_aabb<T: SimdPartialOrd + Scalar + Copy + Float + RelativeEq + appr
within!(x) && within!(y) && within!(z)
}
impl<T> Triangle<T>
where
T: SimdPartialOrd
+ RelativeEq
+ Scalar
+ Copy
+ ClosedMul
+ ClosedAdd
+ ClosedSub
+ Float
+ FromPrimitive,
{
pub fn new(a: Vector3<T>, b: Vector3<T>, c: Vector3<T>) -> Self {
impl Triangle {
pub fn new(a: Vector3<FloatValue>, b: Vector3<FloatValue>, c: Vector3<FloatValue>) -> Self {
Self {
a,
b,
@@ -54,57 +39,42 @@ where
node_index: 0,
aabb: Aabb::with_bounds(
Point3::new(
T::min(T::min(a.x, b.x), c.x),
T::min(T::min(a.y, b.y), c.y),
T::min(T::min(a.z, b.z), c.z),
FloatValue::min(FloatValue::max(a.x, b.x), c.x),
FloatValue::min(FloatValue::min(a.y, b.y), c.y),
FloatValue::min(FloatValue::min(a.z, b.z), c.z),
),
Point3::new(
T::max(T::max(a.x, b.x), c.x),
T::max(T::max(a.y, b.y), c.y),
T::max(T::max(a.z, b.z), c.z),
FloatValue::max(FloatValue::max(a.x, b.x), c.x),
FloatValue::max(FloatValue::max(a.y, b.y), c.y),
FloatValue::max(FloatValue::max(a.z, b.z), c.z),
),
),
}
}
pub fn has_point_in_aabb(&self, aabb: &Aabb<T, 3>) -> bool {
pub fn has_point_in_aabb(&self, aabb: &Aabb<FloatValue, 3>) -> bool {
vec_inside_aabb(&self.a, aabb)
|| vec_inside_aabb(&self.b, aabb)
|| vec_inside_aabb(&self.c, aabb)
}
pub fn has_vec(&self, vec: Vector3<T>) -> bool
where
T: RelativeEq + Clone,
<T as AbsDiffEq>::Epsilon: Clone,
{
pub fn has_vec(&self, vec: Vector3<FloatValue>) -> bool {
relative_eq!(self.a, vec) || relative_eq!(self.b, vec) || relative_eq!(self.c, vec)
}
pub fn shares_point_with_triangle(&self, other: Triangle<T>) -> bool
where
T: RelativeEq + Clone,
<T as AbsDiffEq>::Epsilon: Clone,
{
pub fn shares_point_with_triangle(&self, other: Triangle) -> bool {
self.has_vec(other.a) || self.has_vec(other.b) || self.has_vec(other.c)
}
pub fn shares_edge_with_triangle(&self, other: Triangle<T>) -> bool
where
T: RelativeEq + Clone,
<T as AbsDiffEq>::Epsilon: Clone,
{
pub fn shares_edge_with_triangle(&self, other: Triangle) -> bool {
let a = self.has_vec(other.a);
let b = self.has_vec(other.b);
let c = self.has_vec(other.c);
a && b || a && c || b && c
}
pub fn intersect_z(&self, z: T) -> Option<Line3<T>>
where
<T as AbsDiffEq>::Epsilon: Clone,
{
let mut intersection = Vec::<Vector3<T>>::with_capacity(3);
pub fn intersect_z(&self, z: FloatValue) -> Option<Line3> {
let mut intersection = Vec::<Vector3<FloatValue>>::with_capacity(3);
let mut last = &self.c;
for point in [self.a, self.b, self.c].iter() {
if relative_eq!(point.z, z) {
@@ -137,13 +107,13 @@ where
}
}
impl<T: SimdPartialOrd + Scalar + Copy> Bounded<T, 3> for Triangle<T> {
fn aabb(&self) -> Aabb<T, 3> {
impl Bounded<FloatValue, 3> for Triangle {
fn aabb(&self) -> Aabb<FloatValue, 3> {
self.aabb
}
}
impl<T: SimdPartialOrd + Scalar + Copy> BHShape<T, 3> for Triangle<T> {
impl BHShape<FloatValue, 3> for Triangle {
fn set_bh_node_index(&mut self, node_index: usize) {
self.node_index = node_index;
}

150
bampy/src/slicer/z_projection.rs Normal file
View File

@@ -0,0 +1,150 @@
use bvh::aabb::Aabb;
use nalgebra::{Point2, Vector2, Vector3};
use super::{triangle::Triangle, FloatValue};
pub trait ProjectToolpath<T> {
/// Projects the hypothetical toolpath of the object onto the z plane
fn project_toolpath_onto_z(&self, z: FloatValue, a: FloatValue) -> Option<T>;
}
pub trait ToolpathIntersects<T>: ProjectToolpath<T> {
/// Checks if a hypothetical toolpath that draws the object could intersect
/// with the given point, given the tangent of the angle of the toolhead
fn toolpath_intersects(&self, point: &Vector3<FloatValue>, a: FloatValue) -> bool;
}
pub trait ToolpathIntersection {
fn toolpath_intersection(&self) {}
}
impl ProjectToolpath<Aabb<FloatValue, 2>> for Aabb<FloatValue, 3> {
fn project_toolpath_onto_z(&self, z: FloatValue, a: FloatValue) -> Option<Aabb<FloatValue, 2>> {
if z < self.min.z {
return None;
}
let delta_target_z = z - self.min.z;
let delta_z = self.max.z - self.min.z;
let delta = a * (delta_target_z / delta_z);
let dx = (self.max.x - self.min.x) * delta;
let dy = (self.max.y - self.min.y) * delta;
Some(Aabb {
min: Point2::new(self.min.x - dx, self.min.y - dy),
max: Point2::new(self.max.x + dx, self.max.y + dy),
})
}
}
impl ToolpathIntersects<Aabb<FloatValue, 2>> for Aabb<FloatValue, 3> {
fn toolpath_intersects(&self, point: &Vector3<FloatValue>, a: FloatValue) -> bool {
if let Some(aabb) = self.project_toolpath_onto_z(point.z, a) {
aabb.approx_contains_eps(&Point2::new(point.x, point.y), FloatValue::EPSILON)
} else {
false
}
}
}
#[derive(Debug)]
pub struct Triangle2D {
pub a: Point2<FloatValue>,
pub b: Point2<FloatValue>,
pub c: Point2<FloatValue>,
}
impl ProjectToolpath<Triangle2D> for Triangle {
fn project_toolpath_onto_z(&self, z: FloatValue, a: FloatValue) -> Option<Triangle2D> {
if z <= self.aabb.min.z {
return None;
}
let cx = (self.a.x + self.b.x + self.c.x) / 3.0;
let cy = (self.a.y + self.b.y + self.c.y) / 3.0;
let expand = z - self.aabb.min.z;
macro_rules! project {
( $val:ident ) => {
let delta = FloatValue::min(z - self.$val.z, 0.0);
let dx = self.$val.x - cx;
let dy = self.$val.y - cy;
let px = self.$val.x + delta * cx;
let py = self.$val.y + delta * cy;
Point2::new(px + expand * dy, py + expand * dx)
};
}
let ap = Point2::new(self.a.x, self.b.y);
macro_rules! values {
( $val:ident ) => {{
let delta = 2.0 * a * (z - self.$val.z);
let dx = self.$val.x - cx;
let dy = self.$val.y - cy;
Point2::new(self.$val.x + dx * delta, self.$val.y + dy * delta)
}};
}
Some(Triangle2D {
a: values!(a),
b: values!(b),
c: values!(c),
})
}
}
#[cfg(test)]
mod tests {
use approx::assert_relative_eq;
use bvh::aabb::Aabb;
use nalgebra::{Point3, Vector2, Vector3};
use crate::slicer::{triangle::Triangle, z_projection::ProjectToolpath, FloatValue};
#[test]
fn test_project_aabb_toolpath() {
let aabb = Aabb {
min: Point3::new(0.0, 0.0, 0.0),
max: Point3::new(1.0, 1.0, 1.0),
};
let a = FloatValue::to_radians(45.0).tan();
let projected = aabb.project_toolpath_onto_z(0.5, a).unwrap();
assert_relative_eq!(projected.min.x, -0.5);
assert_relative_eq!(projected.min.y, -0.5);
assert_relative_eq!(projected.max.x, 1.5);
assert_relative_eq!(projected.max.y, 1.5);
let projected_b = aabb.project_toolpath_onto_z(0.0, a).unwrap();
assert_relative_eq!(projected_b.min.x, 0.0);
assert_relative_eq!(projected_b.min.y, 0.0);
assert_relative_eq!(projected_b.max.x, 1.0);
assert_relative_eq!(projected_b.max.y, 1.0);
}
#[test]
fn test_project_triangle_toolpath() {
let triangle = Triangle::new(
Vector3::new(0.0, 0.0, 0.0),
Vector3::new(0.0, 1.5, 1.0),
Vector3::new(-0.6, -1.4, 0.2),
);
let a = FloatValue::to_radians(30.0).tan();
let projected = triangle.project_toolpath_onto_z(0.7, a).unwrap();
println!("{:?}", projected);
assert_relative_eq!(projected.a.x, -0.86, epsilon = 0.01);
assert_relative_eq!(projected.a.y, -0.86, epsilon = 0.01);
assert_relative_eq!(projected.b.x, -0.54, epsilon = 0.01);
assert_relative_eq!(projected.b.y, 2.59, epsilon = 0.01);
assert_relative_eq!(projected.c.x, 2.59, epsilon = 0.01);
assert_relative_eq!(projected.c.y, 1.94, epsilon = 0.01);
}
}