diff options
Diffstat (limited to 'app/src/main/java/space/jakob/mines/GameActivity.kt')
| -rw-r--r-- | app/src/main/java/space/jakob/mines/GameActivity.kt | 93 |
1 files changed, 47 insertions, 46 deletions
diff --git a/app/src/main/java/space/jakob/mines/GameActivity.kt b/app/src/main/java/space/jakob/mines/GameActivity.kt index 7e8313c..9240dd9 100644 --- a/app/src/main/java/space/jakob/mines/GameActivity.kt +++ b/app/src/main/java/space/jakob/mines/GameActivity.kt @@ -27,61 +27,62 @@ class GameActivity : AppCompatActivity() { // Implements the callbacks for gestureDetector. val gestureListener = object : GestureDetector.SimpleOnGestureListener() { - override fun onDown(e: MotionEvent): Boolean { - with (gameView) { - grid?.let { - val (x, y) = toGridCoordinates(e.x.toInt(), e.y.toInt()) - it.reveal(x, y) - invalidate() - } - } - return false - } + // TODO: Replace with onUp + // override fun onDown(e: MotionEvent): Boolean { + // with (gameView) { + // grid?.let { + // val (x, y) = toGridCoordinates(e.x.toInt(), e.y.toInt()) + // it.reveal(x, y) + // invalidate() + // } + // } + // return false + // } - override fun onScroll(e1: MotionEvent, e2: MotionEvent, dx: Float, dy: Float): Boolean { - with (gameView) { - cameraX = (cameraX + dx / 100.0).coerceIn(0.0, gameView.maxCameraX) - cameraY = (cameraY + dy / 100.0).coerceIn(0.0, gameView.maxCameraY) - invalidate() - } - return false - } + // override fun onScroll(e1: MotionEvent, e2: MotionEvent, dx: Float, dy: Float): Boolean { + // with (gameView) { + // cameraX = (cameraX + dx / 100.0).coerceIn(0.0, gameView.maxCameraX) + // cameraY = (cameraY + dy / 100.0).coerceIn(0.0, gameView.maxCameraY) + // invalidate() + // } + // return false + // } } // Implements the callbacks for scaleGestureDetector. val scaleListener = object : ScaleGestureDetector.SimpleOnScaleGestureListener() { - override fun onScale(scaleGestureDetector: ScaleGestureDetector) : Boolean { - with (gameView) { - grid?.let { - val factor = scaleGestureDetector.getScaleFactor() + // override fun onScale(scaleGestureDetector: ScaleGestureDetector) : Boolean { + // with (gameView) { + // grid?.let { + // val factor = scaleGestureDetector.getScaleFactor() - var currentDistance = sightX - cameraX - var desiredDistance = currentDistance / factor - var deltaDistance = Math.abs(desiredDistance - currentDistance) / 2 + // var currentDistance = sightX - cameraX + // var desiredDistance = currentDistance / factor + // var deltaDistance = Math.abs(desiredDistance - currentDistance) / 2 - if (factor < 1.0) { - cameraX = (cameraX - deltaDistance).coerceAtLeast(0.0) - sightX = (sightX + deltaDistance).coerceAtMost(it.width.toDouble() - cameraX) - } else { - cameraX = cameraX + deltaDistance - sightX = sightX - deltaDistance - } + // if (factor < 1.0) { + // cameraX = (cameraX - deltaDistance).coerceAtLeast(0.0) + // sightX = (sightX + deltaDistance).coerceAtMost(it.width.toDouble() - cameraX) + // } else { + // cameraX = cameraX + deltaDistance + // sightX = sightX - deltaDistance + // } - currentDistance = sightY - cameraY - desiredDistance = currentDistance / factor - deltaDistance = Math.abs(desiredDistance - currentDistance) / 2 + // currentDistance = sightY - cameraY + // desiredDistance = currentDistance / factor + // deltaDistance = Math.abs(desiredDistance - currentDistance) / 2 - if (factor < 1.0) { - cameraY = (cameraY - deltaDistance).coerceAtLeast(0.0) - sightY = (sightY + deltaDistance).coerceAtMost(it.height.toDouble() - cameraY) - } else { - cameraY = cameraY + deltaDistance - sightY = sightY - deltaDistance - } - } - } - return false - } + // if (factor < 1.0) { + // cameraY = (cameraY - deltaDistance).coerceAtLeast(0.0) + // sightY = (sightY + deltaDistance).coerceAtMost(it.height.toDouble() - cameraY) + // } else { + // cameraY = cameraY + deltaDistance + // sightY = sightY - deltaDistance + // } + // } + // } + // return false + // } } override fun onTouchEvent(event: MotionEvent): Boolean { |