Skip to content

Commit

Permalink
Fixes crashes when back and front not synced
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jerboa-app
Jerboa-app committed Jul 31, 2024
1 parent 49f4ee3 commit dae71c9
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 29 deletions.
65 changes: 36 additions & 29 deletions app/src/main/java/app/jerboa/spp/ui/view/SPPRenderer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ import app.jerboa.spp.data.*
import app.jerboa.spp.utils.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.newSingleThreadContext
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import java.nio.ByteBuffer
import java.nio.ByteOrder
import java.nio.FloatBuffer
Expand Down Expand Up @@ -95,9 +100,8 @@ class SPPRenderer(
private var last: Long = System.nanoTime()
// id for a frame (will be kep mod 60)
private var frameNumber: Int = 0
// rate-limit touch events
private val touchRateLimit = 10 // frames
private var lastTapped: Int = 0
private val tapMutex = Mutex()
// smoothed framerate states
private val deltas: FloatArray = FloatArray(60){0f}

Expand Down Expand Up @@ -458,37 +462,37 @@ class SPPRenderer(
if (toy != null) {
when (toy.first) {
TOY.ATTRACTOR -> {
if (toy.second in attractors.indices) {
dx = wx - attractors[toy.second].first
dy = wy - attractors[toy.second].second
if (toy.second in attractors.indicesBack) {
dx = wx - attractors.getBack(toy.second).first
dy = wy - attractors.getBack(toy.second).second
attractors[toy.second] = Pair(wx, wy)
}
}
TOY.REPELLOR -> {
if (toy.second in repellors.indices) {
dx = wx - repellors[toy.second].first
dy = wy - repellors[toy.second].second
if (toy.second in repellors.indicesBack) {
dx = wx - repellors.getBack(toy.second).first
dy = wy - repellors.getBack(toy.second).second
repellors[toy.second] = Pair(wx, wy)
}
}
TOY.SPINNER -> {
if (toy.second in spinners.indices) {
dx = wx - spinners[toy.second].first
dy = wy - spinners[toy.second].second
if (toy.second in spinners.indicesBack) {
dx = wx - spinners.getBack(toy.second).first
dy = wy - spinners.getBack(toy.second).second
spinners[toy.second] = Pair(wx, wy)
}
}
TOY.FREEZER -> {
if (toy.second in freezers.indices) {
dx = wx - freezers[toy.second].first
dy = wy - freezers[toy.second].second
if (toy.second in freezers.indicesBack) {
dx = wx - freezers.getBack(toy.second).first
dy = wy - freezers.getBack(toy.second).second
freezers[toy.second] = Pair(wx, wy)
}
}
TOY.ORBITER -> {
if (toy.second in orbiters.indices) {
dx = wx - orbiters[toy.second].first
dy = wy - orbiters[toy.second].second
if (toy.second in orbiters.indicesBack) {
dx = wx - orbiters.getBack(toy.second).first
dy = wy - orbiters.getBack(toy.second).second
orbiters[toy.second] = Pair(wx, wy)
}
}
Expand All @@ -503,14 +507,17 @@ class SPPRenderer(
// propagate a tap event
fun tap(x: Float,y: Float, type: TOY = TOY.ATTRACTOR){
if (DEMO_REAL){return}
val w = screenToWorld(x,resolution.second-y)
val wx = w[0]
val wy = w[1]
if (lastTapped>touchRateLimit) {
force(wx, wy, type, 2.0f*arScale)
lastTapped = 0
runBlocking {
withContext(Dispatchers.Default) {
tapMutex.withLock {
val w = screenToWorld(x, resolution.second - y)
val wx = w[0]
val wy = w[1]
force(wx, wy, type, 2.0f * arScale)
timeSinceLastTap = 0f
}
}
}
timeSinceLastTap = 0f
}

// add an attractor or repeller toy
Expand All @@ -519,7 +526,7 @@ class SPPRenderer(
if (mode == TOY.ATTRACTOR){
var removed = false
for (i in 0 until attractors.sizeBack){
val a = attractors[i]
val a = attractors.getBack(i)
if (norm2(x,y,a.first,a.second) < eps*eps){
attractors.removeAt(i)
removed=true
Expand All @@ -533,7 +540,7 @@ class SPPRenderer(
else if (mode == TOY.REPELLOR){
var removed = false
for (i in 0 until repellors.sizeBack){
val a = repellors[i]
val a = repellors.getBack(i)
if (norm2(x,y,a.first,a.second) < eps*eps){
repellors.removeAt(i)
removed = true
Expand All @@ -547,7 +554,7 @@ class SPPRenderer(
else if (mode == TOY.SPINNER){
var removed = false
for (i in 0 until spinners.sizeBack){
val a = spinners[i]
val a = spinners.getBack(i)
if (norm2(x,y,a.first,a.second) < eps*eps){
spinners.removeAt(i)
removed = true
Expand All @@ -561,7 +568,7 @@ class SPPRenderer(
else if (mode == TOY.FREEZER){
var removed = false
for (i in 0 until freezers.sizeBack){
val a = freezers[i]
val a = freezers.getBack(i)
if (norm2(x,y,a.first,a.second) < eps*eps){
freezers.removeAt(i)
removed = true
Expand All @@ -575,7 +582,7 @@ class SPPRenderer(
else if (mode == TOY.ORBITER){
var removed = false
for (i in 0 until orbiters.sizeBack){
val a = orbiters[i]
val a = orbiters.getBack(i)
if (norm2(x,y,a.first,a.second) < eps*eps){
orbiters.removeAt(i)
removed = true
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/app/jerboa/spp/utils/BufferedList.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package app.jerboa.spp.utils

import android.util.Log

/**
* A double buffered mutable list of T
*
Expand Down Expand Up @@ -27,7 +29,12 @@ class BufferedMutableList<T> {
var indices: IntRange = IntRange(0,-1)
get() = front.indices

var indicesBack: IntRange = IntRange(0,-1)
get() = back.indices

operator fun get(index: Int) = front[index]

fun getBack(index: Int) = back[index]
operator fun set(index: Int, element: T) = back.set(index, element)

fun add(element: T) = back.add(element)
Expand Down

0 comments on commit dae71c9

Please sign in to comment.