DarrickH_Lab7

Multiplayer Lab 02/Assets/Scripts/Multiplayer/Lab02a_PlayerControl.cs

@@ -1,15 +1,105 @@
 using UnityEngine;
+using UnityEngine.Networking;
 using System.Collections;
 
-public class Lab02a_PlayerControl : MonoBehaviour {
+public class Lab02a_PlayerControl : NetworkBehaviour 
+{
+    struct PlayerState
+    {
+        public float posX, posY, posZ;
+        public float rotX, rotY, rotZ;
+    };
+
+    [SyncVar]
+    PlayerState state;
 
 	// Use this for initialization
-	void Start () {
-
+	void Start () 
+    {
+        InitState();
+        SyncState();
 	}
 
 	// Update is called once per frame
-	void Update () {
-
+	void Update ()
+    {
+        if (isLocalPlayer)
+        {
+            KeyCode[] possibleKeys = { KeyCode.A, KeyCode.S, KeyCode.D, KeyCode.W, KeyCode.Q, KeyCode.E };
+            foreach (KeyCode possibleKey in possibleKeys)
+            {
+                if (!Input.GetKey(possibleKey))
+                {
+                    continue;
+                }
+                CmdMoveOnServer(possibleKey);
+            }
+        }
+
+        SyncState();
 	}
+
+    [Server]
+    void InitState()
+    {
+        state = new PlayerState
+        {
+            posX = -119,
+            posY = 165.08f,
+            posZ = -924,
+            rotX = 0,
+            rotY = 0,
+            rotZ = 0
+        };
+    }
+
+    void SyncState()
+    {
+        transform.position = new Vector3(state.posX, state.posY, state.posZ);
+        transform.rotation = Quaternion.Euler(state.rotX, state.rotY, state.rotZ);
+    }
+
+    PlayerState Move(PlayerState previous, KeyCode newKey)
+    {
+        float dx = 0, dy = 0, dz = 0;
+        float dRotY = 0;
+
+        switch (newKey)
+        {
+            case KeyCode.Q:
+                dRotY = -1f;
+                break;
+            case KeyCode.S:
+                dz = -0.5f;
+                break;
+            case KeyCode.E:
+                dRotY = 1f;
+                break;
+            case KeyCode.W:
+                dz = 0.5f;
+                break;
+            case KeyCode.A:
+                dx = -0.5f;
+                break;
+            case KeyCode.D:
+                dx = 0.5f;
+                break;
+        }
+
+        return new PlayerState
+        {
+            posX = previous.posX + dx,
+            posY = previous.posY + dy,
+            posZ = previous.posZ + dz,
+            rotX = previous.rotX,
+            rotY = previous.rotY + dRotY,
+            rotZ = previous.rotZ
+        };
+    }
+
+    [Command]
+    void CmdMoveOnServer(KeyCode pressedKey)
+    {
+        state = Move(state, pressedKey);
+    }
 }

Multiplayer Lab 02/Assets/Scripts/Multiplayer/Lab02b_PlayerControlPrediction.cs

@@ -0,0 +1,190 @@
+using UnityEngine;
+using UnityEngine.Networking;
+using System.Collections;
+using System.Collections.Generic;
+
+public enum CharacterState
+{
+    Idle = 0,
+    WalkingForward = 1,
+    WalkingBackward = 2,
+    Jumping = 4
+}
+
+public class Lab02b_PlayerControlPrediction : NetworkBehaviour 
+{
+    struct PlayerState
+    {
+        public int moveNumber;
+        public float posX, posY, posZ;
+        public float rotX, rotY, rotZ;
+        public CharacterState animationState;
+    };
+
+    [SyncVar(hook= "OnServerStateChanged")]
+    PlayerState serverState;
+
+    PlayerState predictedState;
+
+    Queue<KeyCode> pendingMoves;
+
+    CharacterState characterAnimationState;
+
+    public float moveSpeed = 0.1f;
+
+    public float runSpeed = 0.5f;
+
+    public float rotateSpeed = 1;
+
+    public Animator controller;
+
+	// Use this for initialization
+	void Start () 
+    {
+        InitState();
+        predictedState = serverState;
+        if (isLocalPlayer)
+        {
+            pendingMoves = new Queue<KeyCode>();
+            UpdatePredictedState();
+        }
+        SyncState();
+	}
+
+	// Update is called once per frame
+	void Update () 
+    {
+        if (isLocalPlayer)
+        {
+            KeyCode[] possibleKeys = { KeyCode.A, KeyCode.S, KeyCode.D, KeyCode.W, KeyCode.Q, KeyCode.E };
+            bool pressedButton = false;
+
+            foreach (KeyCode possibleKey in possibleKeys)
+            {
+                if (!Input.GetKey(possibleKey))
+                {
+                    continue;
+                }
+                pressedButton = true;
+                pendingMoves.Enqueue(possibleKey);
+                UpdatePredictedState();
+                CmdMoveOnServer(possibleKey);
+            }
+            if (!pressedButton)
+            {
+                pendingMoves.Enqueue(KeyCode.Alpha0);
+                UpdatePredictedState();
+                CmdMoveOnServer(KeyCode.Alpha0);
+            }
+        }
+
+        SyncState();
+	}
+
+    [Server]
+    void InitState()
+    {
+        serverState = new PlayerState
+        {
+            moveNumber = 0,
+            posX = -119,
+            posY = 165.08f,
+            posZ = -924,
+            rotX = 0,
+            rotY = 0,
+            rotZ = 0
+        };
+    }
+
+    void SyncState()
+    {
+        PlayerState stateToRender = isLocalPlayer ? predictedState : serverState;
+
+        transform.position = new Vector3(stateToRender.posX, stateToRender.posY, stateToRender.posZ);
+        transform.rotation = Quaternion.Euler(stateToRender.rotX, stateToRender.rotY, stateToRender.rotZ);
+        controller.SetInteger("CharacterState", (int)stateToRender.animationState);
+    }
+
+    PlayerState Move(PlayerState previous, KeyCode newKey)
+    {
+        float dx = 0, dy = 0, dz = 0;
+        float dRotY = 0;
+
+        switch (newKey)
+        {
+            case KeyCode.Q:
+                dRotY = -rotateSpeed;
+                break;
+            case KeyCode.S:
+                dz = -moveSpeed;
+                break;
+            case KeyCode.E:
+                dRotY = rotateSpeed;
+                break;
+            case KeyCode.W:
+                dz =moveSpeed;
+                break;
+            case KeyCode.A:
+                dx = -moveSpeed;
+                break;
+            case KeyCode.D:
+                dx = moveSpeed;
+                break;
+        }
+
+        return new PlayerState
+        {
+            moveNumber = 1 + previous.moveNumber,
+            posX = previous.posX + dx,
+            posY = previous.posY + dy,
+            posZ = previous.posZ + dz,
+            rotX = previous.rotX,
+            rotY = previous.rotY + dRotY,
+            rotZ = previous.rotZ,
+            animationState = CalcAnimation(dx,dy,dz,dRotY)
+        };
+    }
+
+    [Command]
+    void CmdMoveOnServer(KeyCode pressedKey)
+    {
+        serverState = Move(serverState, pressedKey);
+    }
+
+    void OnServerStateChanged(PlayerState newState)
+    {
+        serverState = newState;
+        if (pendingMoves != null)
+        {
+            while (pendingMoves.Count < (predictedState.moveNumber - serverState.moveNumber))
+            {
+                pendingMoves.Dequeue();
+            }
+            UpdatePredictedState();
+        }
+    }
+
+    void UpdatePredictedState()
+    {
+        predictedState = serverState;
+        foreach (KeyCode moveKey in pendingMoves)
+        {
+            predictedState = Move(predictedState, moveKey);
+        }
+    }
+
+    CharacterState CalcAnimation(float dx, float dy, float dz, float dRotY)
+    {
+        if (dx == 0 && dy == 0 & dz == 0)
+            return CharacterState.Idle;
+        if (dx != 0 || dz != 0)
+        {
+            if (dx > 0 || dz > 0)
+                return CharacterState.WalkingForward;
+            else
+                return CharacterState.WalkingBackward;
+        }
+
+        return CharacterState.Idle;
+    }
+}

Multiplayer Lab 02/Assets/StaticAssets/AnimatorControllers/UnityGuy.controller

@@ -13,7 +13,7 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -166,7 +166,7 @@ AnimatorStateTransition:
   m_TransitionDuration: .25
   m_TransitionOffset: 0
   m_ExitTime: .944444478
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
@@ -318,7 +318,10 @@ AnimatorStateMachine:
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
-  m_StateMachineTransitions: {}
+  m_StateMachineTransitions:
+    data:
+      first: {fileID: 110753544}
+      second: []
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: 50, y: 20, z: 0}
   m_EntryPosition: {x: 50, y: 120, z: 0}

Multiplayer Lab 02/Assets/StaticAssets/Prefabs/Common/Player V2.prefab

@@ -1446,6 +1446,7 @@ GameObject:
   - 114: {fileID: 11486774}
   - 114: {fileID: 11480636}
   - 114: {fileID: 11411396}
+  - 114: {fileID: 11449980}
   m_Layer: 0
   m_Name: Player V2
   m_TagString: Player
@@ -3403,7 +3404,6 @@ Camera:
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
-  m_TargetEye: 3
   m_HDR: 0
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
@@ -3526,6 +3526,18 @@ MonoBehaviour:
   myCameraObject: {fileID: 160802}
   myCamera: {fileID: 2034042}
   myListener: {fileID: 8142674}
+--- !u!114 &11449980
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 180002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5cbe5623bffbcc9448c6cd206055d804, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  controller: {fileID: 9599568}
 --- !u!114 &11480636
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3808,7 +3820,11 @@ Prefab:
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
-    m_Modifications: []
+    m_Modifications:
+    - target: {fileID: 0}
+      propertyPath: controller
+      value: 
+      objectReference: {fileID: 9599568}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 180002}