migrated worldNetwork and mediaNetwork to NetworkState

EtherealEngine · Oct 4, 2023 · 73f82b7 · 73f82b7
1 parent be0f65b
commit 73f82b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/examples/avatarBenchmark.tsx b/examples/avatarBenchmark.tsx
@@ -34,10 +34,10 @@ import { Vector3 } from 'three'
 //         if(eid) entities.push(eid)
 //       }
 //     }
-//     if(Engine.instance.worldNetwork && entities.length) {
-//       const data = dataWriter(world, Engine.instance.worldNetwork, entities)
+//     if(NetworkState.worldNetwork && entities.length) {
+//       const data = dataWriter(world, NetworkState.worldNetwork, entities)
 //       console.log(data)
-//       Engine.instance.worldNetwork.incomingMessageQueueUnreliable.add(data)
+//       NetworkState.worldNetwork.incomingMessageQueueUnreliable.add(data)
 //     }
 //   }
 // }

diff --git a/examples/avatarMocap.tsx b/examples/avatarMocap.tsx
@@ -21,6 +21,7 @@ import { NormalizedLandmarkList } from '@mediapipe/pose'
 import { encode } from 'msgpackr'
 import { loadNetworkAvatar } from './utils/avatar/loadAvatarHelpers'
 import { Template } from './utils/template'
+import { NetworkState } from '@etherealengine/engine/src/networking/NetworkState'
 
 const getMocapTestData = async () => {
   return Object.fromEntries(
@@ -81,7 +82,7 @@ const MocapAvatar = (props: { userID: UserID }) => {
           results: data
         })
         for (const func of dataChannelFunctions)
-          func(Engine.instance.worldNetwork, mocapDataChannelType, Engine.instance.worldNetwork.hostPeerID, message)
+          func(NetworkState.worldNetwork, mocapDataChannelType, NetworkState.worldNetwork.hostPeerID, message)
       }
     }, 500)
 

diff --git a/examples/utils/avatar/loadAvatarHelpers.ts b/examples/utils/avatar/loadAvatarHelpers.ts
@@ -24,6 +24,7 @@ import { UserID } from '@etherealengine/engine/src/schemas/user/user.schema'
 import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent'
 import { dispatchAction, getMutableState } from '@etherealengine/hyperflux'
 import { VRM } from '@pixiv/three-vrm'
+import { NetworkState } from '@etherealengine/engine/src/networking/NetworkState'
 
 export const getAvatarLists = () => {
   const avatarState = getMutableState(AvatarState)
@@ -37,7 +38,7 @@ export const mockNetworkAvatars = (avatarList: AvatarType[]) => {
     const userId = ('user' + i) as UserID & PeerID
     const index = (1000 + i) as NetworkId
     const column = i * 2
-    NetworkPeerFunctions.createPeer(Engine.instance.worldNetwork as Network, userId, index, userId, index, userId)
+    NetworkPeerFunctions.createPeer(NetworkState.worldNetwork as Network, userId, index, userId, index, userId)
     dispatchAction(
       AvatarNetworkAction.spawn({
         position: new Vector3(0, 0, column),
@@ -58,7 +59,7 @@ export const loadNetworkAvatar = (avatar: AvatarType, i: number, u = 'user', x =
   }
   const userId = (u + i) as UserID & PeerID
   const index = (1000 + i) as NetworkId
-  NetworkPeerFunctions.createPeer(Engine.instance.worldNetwork as Network, userId, index, userId, index, userId)
+  NetworkPeerFunctions.createPeer(NetworkState.worldNetwork as Network, userId, index, userId, index, userId)
   dispatchAction(
     AvatarNetworkAction.spawn({
       position: new Vector3(x, 0, i * 2),

diff --git a/tests/avatars/AvatarIntegrationTests.test.ts b/tests/avatars/AvatarIntegrationTests.test.ts
@@ -35,6 +35,7 @@ import { UUIDComponent } from '@etherealengine/engine/src/scene/components/UUIDC
 import { NetworkObjectComponent } from '@etherealengine/engine/src/networking/components/NetworkObjectComponent'
 import { act } from '@testing-library/react'
 import { PhysicsState } from '@etherealengine/engine/src/physics/state/PhysicsState'
+import { NetworkState } from '@etherealengine/engine/src/networking/NetworkState'
 
 overrideFileLoaderLoad()
 
@@ -72,7 +73,7 @@ describe.skip('avatarFunctions Integration', async () => {
   beforeEach(async () => {
     createEngine()
     createMockNetwork()
-    Engine.instance.userID = Engine.instance.worldNetwork.hostId
+    Engine.instance.userID = NetworkState.worldNetwork.hostId
     Engine.instance.peerID = 'peer id' as PeerID
     getMutableState(EngineState).publicPath.set('')
     await Physics.load()