Skip to content
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

Fix poissonDiskSampling signature change in demos #225

Merged
merged 1 commit into from
Feb 28, 2022
Merged

Fix poissonDiskSampling signature change in demos #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion orx-jvm/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fun main() {

val circle = Circle(Vector2(400.0), 250.0)

val points = poissonDiskSampling(width * 1.0, height * 1.0, 30.0)
val points = poissonDiskSampling(drawer.bounds, 30.0)
.filter { circle.contains(it) }

val delaunay = Delaunay.from(points + circle.contour.equidistantPositions(40))
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fun main() {

val frame = Rectangle.fromCenter(Vector2(400.0), 600.0, 600.0)

val points = poissonDiskSampling(frame.width, frame.height, 50.0).map { it + frame.corner }
val points = poissonDiskSampling(frame, 50.0).map { it + frame.corner }

val delaunay = Delaunay.from(points)
val halfedges = delaunay.halfedges()
Expand Down
2 changes: 1 addition & 1 deletion orx-jvm/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fun main() {
val circle = Circle(Vector2(400.0), 250.0)
val frame = Rectangle.fromCenter(Vector2(400.0), 600.0, 600.0)

val points = poissonDiskSampling(width * 1.0, height * 1.0, 30.0)
val points = poissonDiskSampling(drawer.bounds, 30.0)
.filter { circle.contains(it) }

val delaunay = Delaunay.from(points + circle.contour.equidistantPositions(40))
Expand Down
3 changes: 2 additions & 1 deletion orx-noise/src/commonMain/kotlin/PoissonDisk.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ internal const val epsilon = 0.0000001
* They can also be generated on a ring like in the original algorithm from Robert Bridson
*
* @param bounds the rectangular bounds of the area to generate points in
* @param r the minimum distance between each point
* @param radius the minimum distance between each point
* @param tries number of candidates per point
* @param randomOnRing generate random points on a ring with an annulus from r to 2r
* @param random a random number generator, default value is [Random.Default]
* @param initialPoints a list of points in sampler space, these points will not be tested against [r]
* @param obstacleHashGrids a list of obstacles to avoid, defined by points and radii
* @param boundsMapper a custom function to check if a point is within bounds

* @return a list of points
Expand Down