summaryrefslogtreecommitdiff
path: root/app/src/main/java/space/jakob/mines/GameActivity.kt
diff options
context:
space:
mode:
authorJakob L. Kreuze <jakob@memeware.net>2018-12-21 13:04:32 -0500
committerJakob L. Kreuze <jakob@memeware.net>2018-12-21 13:04:32 -0500
commit033d47b09b977730745db26ab02f857c6343e042 (patch)
tree4c0bb793da29339df8dd68507716d879cb3a5444 /app/src/main/java/space/jakob/mines/GameActivity.kt
parentca1a389e97e3eaa17632e419891eb4514ea651e0 (diff)
Changed grid drawing algorithm once more, and reimplemented camera movement.
Diffstat (limited to 'app/src/main/java/space/jakob/mines/GameActivity.kt')
-rw-r--r--app/src/main/java/space/jakob/mines/GameActivity.kt15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/src/main/java/space/jakob/mines/GameActivity.kt b/app/src/main/java/space/jakob/mines/GameActivity.kt
index 9240dd9..9e231c6 100644
--- a/app/src/main/java/space/jakob/mines/GameActivity.kt
+++ b/app/src/main/java/space/jakob/mines/GameActivity.kt
@@ -39,14 +39,13 @@ class GameActivity : AppCompatActivity() {
// 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) {
+ moveCamera(dx.toDouble(), dy.toDouble())
+ invalidate()
+ }
+ return false
+ }
}
// Implements the callbacks for scaleGestureDetector.