From 91a98def2fee0bd61b7a6a472049ff79ba5bf10a Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Fri, 7 Aug 2020 20:33:51 +1000
Subject: [PATCH] Moved set intervals in timer and pointer to animation frames
 as they were being blocked on windows

---
 src/network/NetworkedMapPointer.js | 35 ++++++++++++++++++++--------
 src/network/NetworkedParty.js      | 37 +++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/network/NetworkedMapPointer.js b/src/network/NetworkedMapPointer.js
index c010605..0770a30 100644
--- a/src/network/NetworkedMapPointer.js
+++ b/src/network/NetworkedMapPointer.js
@@ -7,8 +7,8 @@ import MapPointer from "../components/map/MapPointer";
 import { isEmpty } from "../helpers/shared";
 import { lerp } from "../helpers/vector2";
 
-// Send pointer updates every 50ms
-const sendTickRate = 50;
+// Send pointer updates every 33ms
+const sendTickRate = 33;
 
 function NetworkedMapPointer({ session, active, gridSize }) {
   const { userId } = useContext(AuthContext);
@@ -21,21 +21,38 @@ function NetworkedMapPointer({ session, active, gridSize }) {
     }
   }, [userId, pointerState]);
 
+  const sessionRef = useRef(session);
+  useEffect(() => {
+    sessionRef.current = session;
+  }, [session]);
+
   // Send pointer updates every sendTickRate to peers to save on bandwidth
+  // We use requestAnimationFrame as setInterval was being blocked during
+  // re-renders on chrome with windows
   const ownPointerUpdateRef = useRef();
   useEffect(() => {
-    function sendOwnPointerUpdates() {
-      if (ownPointerUpdateRef.current) {
-        session.send("pointer", ownPointerUpdateRef.current);
-        ownPointerUpdateRef.current = null;
+    let prevTime = performance.now();
+    let request = requestAnimationFrame(update);
+    let counter = 0;
+    function update(time) {
+      request = requestAnimationFrame(update);
+      const deltaTime = time - prevTime;
+      counter += deltaTime;
+      prevTime = time;
+
+      if (counter > sendTickRate) {
+        counter -= sendTickRate;
+        if (ownPointerUpdateRef.current && sessionRef.current) {
+          sessionRef.current.send("pointer", ownPointerUpdateRef.current);
+          ownPointerUpdateRef.current = null;
+        }
       }
     }
-    const sendInterval = setInterval(sendOwnPointerUpdates, sendTickRate);
 
     return () => {
-      clearInterval(sendInterval);
+      cancelAnimationFrame(request);
     };
-  }, [session]);
+  }, []);
 
   function updateOwnPointerState(position, visible) {
     setPointerState((prev) => ({
diff --git a/src/network/NetworkedParty.js b/src/network/NetworkedParty.js
index 3326b78..3e03326 100644
--- a/src/network/NetworkedParty.js
+++ b/src/network/NetworkedParty.js
@@ -77,24 +77,35 @@ function NetworkedParty({ gameId, session }) {
   }
 
   useEffect(() => {
-    function decreaseTimer(previousTimer) {
-      return { ...previousTimer, current: previousTimer.current - 1000 };
-    }
-    function updateTimers() {
+    let prevTime = performance.now();
+    let request = requestAnimationFrame(update);
+    let counter = 0;
+    function update(time) {
+      request = requestAnimationFrame(update);
+      const deltaTime = time - prevTime;
+      prevTime = time;
+
       if (timer) {
-        const newTimer = decreaseTimer(timer);
-        if (newTimer.current < 0) {
-          setTimer(null);
-          session.send("timer", { [session.id]: null });
-        } else {
-          setTimer(newTimer);
-          session.send("timer", { [session.id]: newTimer });
+        counter += deltaTime;
+        // Update timer every second
+        if (counter > 1000) {
+          const newTimer = {
+            ...timer,
+            current: timer.current - counter,
+          };
+          if (newTimer.current < 0) {
+            setTimer(null);
+            session.send("timer", { [session.id]: null });
+          } else {
+            setTimer(newTimer);
+            session.send("timer", { [session.id]: newTimer });
+          }
+          counter = 0;
         }
       }
     }
-    const interval = setInterval(updateTimers, 1000);
     return () => {
-      clearInterval(interval);
+      cancelAnimationFrame(request);
     };
   }, [timer, session]);