Skip to content

Trying manual splitting #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

Trying manual splitting #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
13d2fab
good state
Moelf Sep 22, 2022
2f2a458
retain original performance
Moelf Sep 22, 2022
9de89eb
recover original performance
Moelf Sep 22, 2022
05e5a1f
less useless crap
Moelf Sep 22, 2022
4399af8
good case
Moelf Sep 22, 2022
eafe81e
bad case
Moelf Sep 22, 2022
01565e1
recover again
Moelf Sep 22, 2022
82779e4
Merge branch 'master' into trying
Moelf Sep 23, 2022
a90b0a1
Unityper does nothing
Moelf Sep 23, 2022
6cb6ee2
Revert "Unityper does nothing"
Moelf Sep 23, 2022
cc82007
try this
Moelf Sep 23, 2022
772f040
immutable + ref is no-no
Moelf Sep 23, 2022
0a02f13
Revert "immutable + ref is no-no"
Moelf Sep 23, 2022
f43bdf4
Revert "try this"
Moelf Sep 23, 2022
f87c1fb
Revert "Revert "Unityper does nothing""
Moelf Sep 23, 2022
af5f924
Revert "Unityper does nothing"
Moelf Sep 23, 2022
7d19ffc
remove some alias
Moelf Sep 23, 2022
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
Prev Previous commit
Next Next commit
bad case
  • Loading branch information
@Moelf
Moelf committed Sep 22, 2022
commit eafe81e0c735a4c6c7daa0d7a3937e074638613e
2 changes: 2 additions & 0 deletions src/Distance.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ function distanceToIn(shape, point, dir)
distanceToIn_booleansubtraction(shape, point, dir)
elseif shape isa BooleanIntersection
distanceToIn_booleanintersection(shape, point, dir)
elseif shape isa PlacedVolume
distanceToIn_placedvolume(shape, point, dir)
end
end
function distanceToOut(shape, point, dir)
Expand Down
3 changes: 3 additions & 0 deletions src/DistanceIn.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
function distanceToIn_placedvolume(pvol::PlacedVolume{T}, p::Point3{T}, d::Vector3{T})::T where T<:AbstractFloat
distanceToIn(pvol.volume.shape, pvol.transformation * p, pvol.transformation * d)
end
## Boolean
function distanceToIn_booleanunion(shape::BooleanUnion{T, SL, SR}, point::Point3{T}, dir::Vector3{T})::T where {T,SL,SR}
(; left, right, transformation) = shape
Expand Down
3 changes: 0 additions & 3 deletions src/Volume.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ end
function contains(vol::Volume{T}, p::Point3{T})::Bool where T<:AbstractFloat
inside(vol.shape, p) == kInside
end
function distanceToIn(pvol::PlacedVolume{T}, p::Point3{T}, d::Vector3{T})::T where T<:AbstractFloat
distanceToIn(pvol.volume.shape, pvol.transformation * p, pvol.transformation * d)
end


function placeDaughter!(volume::Volume{T}, placement::Transformation3D{T}, subvol::Volume{T}) where T<:AbstractFloat
Expand Down