Merge pull request #3 from EtherealEngine/ecs-refactor

Ecs refactor
EtherealEngine · Jan 26, 2024 · fd65213 · fd65213
2 parents ddf9876 + a6421f1
commit fd65213
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/CustomLocationPage.tsx b/src/CustomLocationPage.tsx
@@ -1,8 +1,6 @@
 import React, { useEffect } from 'react'
 
 import Debug from '@etherealengine/client-core/src/components/Debug'
-import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState'
-import { defineSystem } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
 import '@etherealengine/engine/src/renderer/WebGLRendererSystem'
 import { defineState, getMutableState, getState } from '@etherealengine/hyperflux'
 
@@ -14,12 +12,11 @@ import 'tailwindcss/tailwind.css'
 
 import { BoxGeometry, Mesh, MeshBasicMaterial } from 'three'
 
+import { Entity, createEntity, defineSystem, getComponent, setComponent } from '@etherealengine/ecs'
+import { ECSState } from '@etherealengine/ecs/src/ECSState'
+import { Engine } from '@etherealengine/ecs/src/Engine'
 import { CameraComponent } from '@etherealengine/engine/src/camera/components/CameraComponent'
 import { V_010 } from '@etherealengine/engine/src/common/constants/MathConstants'
-import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
-import { Entity } from '@etherealengine/engine/src/ecs/classes/Entity'
-import { getComponent, setComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
-import { createEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions'
 import { addObjectToGroup } from '@etherealengine/engine/src/scene/components/GroupComponent'
 import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent'
 import { TransformComponent } from '@etherealengine/engine/src/transform/components/TransformComponent'
@@ -37,7 +34,7 @@ const UpdateSystem = defineSystem({
   insert: { before: TransformSystem },
   execute: () => {
     const entity = getState(SceneState).entity
-    const elapsedSeconds = getState(EngineState).elapsedSeconds
+    const elapsedSeconds = getState(ECSState).elapsedSeconds
 
     const transformComponent = getComponent(entity, TransformComponent)
 

diff --git a/src/engine.tsx b/src/engine.tsx
@@ -28,7 +28,7 @@ import React, { Suspense } from 'react'
 /** @todo due to circular dependences, engine must be imported prior to other imports */
 import '@etherealengine/engine/src/ecs/classes/Engine'
 import { LoadingCircle } from '@etherealengine/client-core/src/components/LoadingCircle'
-import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState'
+import { EngineState } from '@etherealengine/engine/src/EngineState'
 import { initializeBrowser } from '@etherealengine/engine/src/initializeBrowser'
 import { createEngine } from '@etherealengine/engine/src/initializeEngine'
 import { getMutableState } from '@etherealengine/hyperflux'