2 players works

Author: Yuval-Roth

game_server/src/main/kotlin/com/imsproject/gameserver/business/games/FlourMillGame.kt

@@ -22,15 +22,23 @@ class FlourMillGame(
     private var packetNumber = 0L
 
     // player 1 data
+    @Volatile
     private var player1TouchPoint = -1f to Angle.undefined
+    @Volatile
     private var player1InBounds = false
+    @Volatile
     private var player1LastUpdate = 0L
+    @Volatile
     private var player1LastSequenceNumber = 0L
 
     // player 2 data
+    @Volatile
     private var player2TouchPoint = -1f to Angle.undefined
+    @Volatile
     private var player2InBounds = false
+    @Volatile
     private var player2LastUpdate = 0L
+    @Volatile
     private var player2LastSequenceNumber = 0L
 
     // axle data
@@ -49,6 +57,12 @@ class FlourMillGame(
                     } else {
                         axleAngle = player2TouchPoint.second + Angle(-90f)
                     }
+                } else if (player1TouchPoint.first > 0f) {
+                    axleAngle = player1TouchPoint.second + Angle(90f)
+                } else if (player2TouchPoint.first > 0f) {
+                    axleAngle = player2TouchPoint.second + Angle(-90f)
+                } else {
+                    axleAngle = Angle.undefined
                 }
             } else {
                 if(player1TouchPoint.first > 0f && player2TouchPoint.first > 0f) {
@@ -66,6 +80,8 @@ class FlourMillGame(
                             axleAngle += amountToRotate * player1Direction
                         }
                     }
+                } else if (player1TouchPoint.first < 0f && player2TouchPoint.first < 0f) {
+                    axleAngle = Angle.undefined
                 }
             }
             sendGameAction(GameAction.builder(GameAction.Type.USER_INPUT)
@@ -148,8 +164,8 @@ class FlourMillGame(
     }
 
     override fun endGame(errorMessage: String?) {
-        super.endGame(errorMessage)
         scope.cancel()
+        super.endGame(errorMessage)
     }
 
     companion object {

watch/app/src/main/java/com/imsproject/watch/viewmodel/FlourMillViewModel.kt

@@ -122,17 +122,24 @@ class FlourMillViewModel : GameViewModel(GameType.FLOUR_MILL) {
         }
         FLOUR_MILL_SYNC_TIME_THRESHOLD = syncTolerance
         Log.d(TAG, "syncTolerance: $syncTolerance")
+
+        viewModelScope.launch(Dispatchers.IO) {
+            while(true){
+                delay(16)
+                val timestamp = super.getCurrentGameTime()
+                val (relativeRadius,angle) = _myTouchPoint.value
+                val touchPointInbounds = _myInBounds.value
+                val data = "$relativeRadius,$angle,$touchPointInbounds"
+                // TODO: add event logging of action
+                model.sendUserInput(timestamp, packetTracker.newPacket(),data)
+            }
+        }
     }
 
     fun setTouchPoint(relativeRadius: Float, angle: Angle) {
         _myTouchPoint.value = relativeRadius to angle
         val touchPointInbounds = isTouchPointInbounds()
         _myInBounds.value = touchPointInbounds
-        val data = "$relativeRadius,$angle,$touchPointInbounds"
-        viewModelScope.launch(Dispatchers.IO) {
-            // TODO: add event logging of action
-            model.sendUserInput(super.getCurrentGameTime(), packetTracker.newPacket(),data)
-        }
     }
 
     // ================================================================================ |
@@ -179,7 +186,7 @@ class FlourMillViewModel : GameViewModel(GameType.FLOUR_MILL) {
                         }
                     } else {
                         if(newAxleAngle != Angle.undefined){
-                            axle.angle = newAxleAngle
+                            axle.targetAngle = newAxleAngle
                         } else {
                             _axle.value = null
                         }