From 7a9989cc5259c947eab4099c3d492e5e0f6e414e Mon Sep 17 00:00:00 2001 From: HexaField Date: Tue, 24 Dec 2024 16:47:55 +1100 Subject: [PATCH 1/2] IR-4678-Fix-cross-imports-from-spatial-to-engine-package --- src/functions/BotHookSystem.ts | 1 - src/functions/botHookFunctions.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/functions/BotHookSystem.ts b/src/functions/BotHookSystem.ts index 416b924..34ed0ee 100644 --- a/src/functions/BotHookSystem.ts +++ b/src/functions/BotHookSystem.ts @@ -1,6 +1,5 @@ import { useEffect } from 'react' import { isDev } from '@ir-engine/common/src/config' -import { EngineState } from '@ir-engine/spatial/src/EngineState' import { XRState } from '@ir-engine/spatial/src/xr/XRState' import { getState } from '@ir-engine/hyperflux' diff --git a/src/functions/botHookFunctions.ts b/src/functions/botHookFunctions.ts index 58ac597..3aebc55 100644 --- a/src/functions/botHookFunctions.ts +++ b/src/functions/botHookFunctions.ts @@ -2,7 +2,7 @@ import { MathUtils, Quaternion, Vector3 } from 'three' import { iterativeMapToObject } from '@ir-engine/common/src/utils/mapToObject' import { Engine } from '@ir-engine/ecs/src/Engine' -import { EngineState } from '@ir-engine/spatial/src/EngineState' +import { EngineState } from '@ir-engine/ecs' import { getComponent } from '@ir-engine/ecs/src/ComponentFunctions' import { TransformComponent } from '@ir-engine/spatial/src/transform/components/TransformComponent' import { getState } from '@ir-engine/hyperflux' From 0c1bddcbab32f11d22499e90e5d26af5c42079ba Mon Sep 17 00:00:00 2001 From: HexaField Date: Sat, 4 Jan 2025 15:31:44 +1100 Subject: [PATCH 2/2] update --- src/functions/botHookFunctions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/botHookFunctions.ts b/src/functions/botHookFunctions.ts index 3aebc55..34f7186 100644 --- a/src/functions/botHookFunctions.ts +++ b/src/functions/botHookFunctions.ts @@ -2,7 +2,6 @@ import { MathUtils, Quaternion, Vector3 } from 'three' import { iterativeMapToObject } from '@ir-engine/common/src/utils/mapToObject' import { Engine } from '@ir-engine/ecs/src/Engine' -import { EngineState } from '@ir-engine/ecs' import { getComponent } from '@ir-engine/ecs/src/ComponentFunctions' import { TransformComponent } from '@ir-engine/spatial/src/transform/components/TransformComponent' import { getState } from '@ir-engine/hyperflux' @@ -25,6 +24,7 @@ import { XRState } from '@ir-engine/spatial/src/xr/XRState' import { NetworkState } from '@ir-engine/network' import { AvatarComponent } from '@ir-engine/engine/src/avatar/components/AvatarComponent' import { BotUserAgent } from '@ir-engine/common/src/constants/BotUserAgent' +import { EngineState } from '@ir-engine/ecs' export const BotHookFunctions = { [BotHooks.IsBot]: isBot,