Revert "fix bot imports"

This reverts commit 055ee58.
EtherealEngine · Jan 29, 2024 · 4dc12ba · 4dc12ba
1 parent 055ee58
commit 4dc12ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/functions/BotHookSystem.ts b/src/functions/BotHookSystem.ts
@@ -1,12 +1,13 @@
 import { useEffect } from 'react'
 import { isDev } from '@etherealengine/common/src/config'
+import { EngineState } from '@etherealengine/engine/src/EngineState'
 import { XRState } from '@etherealengine/engine/src/xr/XRState'
 import { getState } from '@etherealengine/hyperflux'
+
 import { BotHookFunctions } from './botHookFunctions'
-import { sendXRInputData } from './xrBotHookFunctions'
-import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState'
-import { defineSystem } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
-import { SimulationSystemGroup } from '@etherealengine/engine/src/ecs/functions/SystemGroups'
+import { sendXRInputData, simulateXR } from './xrBotHookFunctions'
+import { defineSystem } from '@etherealengine/ecs/src/SystemFunctions'
+import { SimulationSystemGroup } from '@etherealengine/ecs/src/SystemGroups'
 
 const setupBotKey = 'ee.bot.setupBotKey'
 

diff --git a/src/functions/botHookFunctions.ts b/src/functions/botHookFunctions.ts
@@ -1,7 +1,9 @@
 import { MathUtils, Quaternion, Vector3 } from 'three'
 
 import { iterativeMapToObject } from '@etherealengine/common/src/utils/mapToObject'
-
+import { Engine } from '@etherealengine/ecs/src/Engine'
+import { EngineState } from '@etherealengine/engine/src/EngineState'
+import { getComponent } from '@etherealengine/ecs/src/ComponentFunctions'
 import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent'
 import { getState } from '@etherealengine/hyperflux'
 
@@ -21,10 +23,7 @@ import {
 } from './xrBotHookFunctions'
 import { XRState } from '@etherealengine/engine/src/xr/XRState'
 import { NetworkState } from '@etherealengine/engine/src/networking/NetworkState'
-import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState'
-import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
-import { SceneState } from '@etherealengine/engine/src/ecs/classes/Scene'
-import { getComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
+import { SceneState } from '@etherealengine/engine/src/scene/Scene'
 
 export const BotHookFunctions = {
  [BotHooks.IsBot]:isBot,
@@ -62,7 +61,7 @@ export function worldNetworkReady() {
 }
 
 export function sceneLoaded() {
- return getState(SceneState).activeScene != null
+ return getState(SceneState).sceneLoaded
 }
 
 export function getPlayerPosition() {

diff --git a/src/functions/xrBotHookFunctions.ts b/src/functions/xrBotHookFunctions.ts
@@ -2,12 +2,12 @@
 
 import { Quaternion, Vector3 } from 'three'
 
+import { EngineState } from '@etherealengine/engine/src/EngineState'
 import { XRAction, XRState } from '@etherealengine/engine/src/xr/XRState'
 import { dispatchAction, getMutableState } from '@etherealengine/hyperflux'
 import { requestXRSession } from '@etherealengine/engine/src/xr/XRSessionFunctions'
 
 import { WebXREventDispatcher } from '../../webxr-emulator/WebXREventDispatcher'
-import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState'
 
 export async function overrideXR() {
  // inject the webxr polyfill from the webxr emulator source - this is a script added by the bot