Skip to content

Feature/orx-force-2d #395

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
edwinRNDR wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Feature/orx-force-2d #395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa0564c
[orx-gui] Suppress unchecked cast warnings
edwinRNDR Jun 22, 2026
754440b
[orx-olive] Fix compilation warnings
edwinRNDR Jun 22, 2026
f827382
[orx-bvh, orx-force-2d] Add orx-bvh and orx-force-2d
edwinRNDR Jun 23, 2026
9063880
[orx-force-2d] Add kdoc strings
edwinRNDR Jun 25, 2026
0d0570d
[orx-force-2d] Add DemoGraphLayout01.kt
edwinRNDR Jun 30, 2026
f599241
[orx-force-2d] Add ManyNodeForce
edwinRNDR Jun 30, 2026
1c88615
[orx-force-2d] Add alpha parameter to solve method
edwinRNDR Jul 1, 2026
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
[orx-force-2d] Add alpha parameter to solve method
  • Loading branch information
@edwinRNDR
edwinRNDR committed Jul 1, 2026
commit 1c88615d5f226072fb2fd0eee4b85344f2bc5283
8 changes: 5 additions & 3 deletions orx-force-2d/src/commonMain/kotlin/ForceSimulation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ class Body(
}
}

suspend fun solve(dt: Double) {
suspend fun solve(dt: Double, alpha: Double) {

for (i in nodes.indices) {
nodes[i].prevPosition = nodes[i].position

if (!static) {
nodes[i].position += nodes[i].velocity * dt
nodes[i].position += nodes[i].velocity * dt * alpha
}
}

Expand Down Expand Up @@ -290,6 +290,8 @@ class ForceSimulation(val bodies: MutableList<Body> = mutableListOf()) {

var context: CoroutineContext = Dispatchers.Default

var alpha = 1.0

private fun partitionPairs(pairs: List<Pair<Int, Int>>): List<List<Pair<Int, Int>>> {
val batches = mutableListOf<MutableList<Pair<Int, Int>>>()
val usedInBatch = mutableListOf<MutableSet<Int>>()
Expand Down Expand Up @@ -354,7 +356,7 @@ class ForceSimulation(val bodies: MutableList<Body> = mutableListOf()) {

bodies.map { body ->
async {
body.solve(sdt)
body.solve(sdt, alpha)
}
}.awaitAll()

Expand Down
4 changes: 4 additions & 0 deletions orx-force-2d/src/commonMain/kotlin/quadtree/QuadTreeNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ internal class QuadTreeNode(
return
}

if (xmax - xmin < 1E-6 || ymax - ymin < 1E-6) {
return
}

if (children == null) {
children = arrayOfNulls(4)
val existingNode = node!!
Expand Down