Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions iTriangle/src/float/locator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ use i_overlay::i_float::float::compatible::FloatPointCompatible;
use i_overlay::i_float::float::number::FloatNumber;
use i_overlay::{i_float::adapter::FloatPointAdapter, i_shape::float::adapter::PathToInt};

use crate::int::locator::IntPointInTriangulationLocator;
use crate::{
float::triangulation::Triangulation,
int::triangulation::{IndexType, IntTriangulation},
float::triangulation::Triangulation, int::triangulation::IndexType,
location::PointLocationInTriangulation,
};

Expand All @@ -23,12 +23,16 @@ impl<P, I: IndexType> Triangulation<P, I> {
{
let adapter = FloatPointAdapter::with_iter(self.points.iter().chain(points.iter()));

let int_triangulation = IntTriangulation {
points: self.points.to_int(&adapter),
indices: self.indices.clone(),
};
let int_points = points.to_int(&adapter);

int_triangulation.locate_points(&points.to_int(&adapter))
let triangles = self.indices.chunks_exact(3).map(|triangle| {
let a = adapter.float_to_int(&self.points[triangle[0].into_usize()]);
let b = adapter.float_to_int(&self.points[triangle[1].into_usize()]);
let c = adapter.float_to_int(&self.points[triangle[2].into_usize()]);
[a, b, c]
});

triangles.locate_points(&int_points)
}
}

Expand Down
Loading
Loading