Initialize WebGLRendererSystem before XRUISystem

This fixes
EtherealEngine · Jan 31, 2022 · 6f85cce · 6f85cce
1 parent 1705cc5
commit 6f85cce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/engine/src/initializeEngine.ts b/packages/engine/src/initializeEngine.ts
@@ -188,14 +188,14 @@ export const initializeCoreSystems = async (systems: SystemModuleType<any>[] = [
 
   if (isClient) {
     systemsToLoad.push(
-      {
-        type: SystemUpdateType.PRE_RENDER,
-        systemModulePromise: import('./xrui/systems/XRUISystem')
-      },
       {
         type: SystemUpdateType.POST_RENDER,
         systemModulePromise: import('./renderer/WebGLRendererSystem')
       },
+      {
+        type: SystemUpdateType.PRE_RENDER,
+        systemModulePromise: import('./xrui/systems/XRUISystem')
+      },
       {
         type: SystemUpdateType.UPDATE,
         systemModulePromise: import('./xr/systems/XRSystem')

diff --git a/packages/engine/src/xrui/systems/XRUISystem.ts b/packages/engine/src/xrui/systems/XRUISystem.ts
@@ -14,6 +14,9 @@ import { dispatchLocal } from '../../networking/functions/dispatchFrom'
 import { EngineActions } from '../../ecs/classes/EngineService'
 
 export default async function XRUISystem(world: World) {
+  const renderer = Engine.renderer
+  if (!renderer) throw new Error('Engine.renderer must exist before initializing XRUISystem')
+
   const hitColor = new Color(0x00e6e6)
   const normalColor = new Color(0xffffff)
   const xruiQuery = defineQuery([XRUIComponent])
@@ -26,7 +29,8 @@ export default async function XRUISystem(world: World) {
   let idCounter = 0
 
   const xrui = (XRUIManager.instance = new XRUIManager(await import('@etherealjs/web-layer/three')))
-  xrui.WebLayerModule.WebLayerManager.initialize(Engine.renderer)
+  xrui.WebLayerModule.WebLayerManager.initialize(renderer)
+  xrui.WebLayerModule.WebLayerManager.instance.ktx2Encoder.pool.setWorkerLimit(1)
   // xrui.WebLayerModule.WebLayerManager.instance.textureLoader.workerConfig = {
   //   astcSupported: false,
   //   etc1Supported: renderer.extensions.has( 'WEBGL_compressed_texture_etc1' ),