fix tsc errors

EtherealEngine · Oct 26, 2023 · 742378b · 742378b
1 parent 7f18c2f
commit 742378b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/packages/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension.ts b/packages/engine/src/assets/exporters/gltf/extensions/BufferHandlerExtension.ts
@@ -24,7 +24,7 @@ Ethereal Engine. All Rights Reserved.
 */
 
 import { sha3_256 } from 'js-sha3'
-import { Event, LoaderUtils, MathUtils, Mesh, Object3D } from 'three'
+import { LoaderUtils, MathUtils, Mesh, Object3D } from 'three'
 import matches, { Validator } from 'ts-matches'
 
 import { defineAction, dispatchAction } from '@etherealengine/hyperflux'
@@ -72,7 +72,7 @@ export default class BufferHandlerExtension extends ExporterExtension implements
     this.comparisonCanvas = document.createElement('canvas')
   }
 
-  beforeParse(input: Object3D<Event> | Object3D<Event>[]) {
+  beforeParse(input: Object3D | Object3D[]) {
     const writer = this.writer
     if (writer.options.embedImages) return
     this.projectName = getProjectName(writer.options.path!)

diff --git a/packages/engine/src/assets/exporters/gltf/extensions/ImageProcessingExtension.ts b/packages/engine/src/assets/exporters/gltf/extensions/ImageProcessingExtension.ts
@@ -23,7 +23,7 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import { CompressedTexture, Event, Material, Mesh, Object3D, Texture } from 'three'
+import { CompressedTexture, Material, Mesh, Object3D, Texture } from 'three'
 
 import iterateObject3D from '../../../../scene/util/iterateObject3D'
 import createReadableTexture from '../../../functions/createReadableTexture'
@@ -44,7 +44,7 @@ export default class ImageProcessingExtension extends ExporterExtension implemen
     this.originalImages = []
   }
 
-  beforeParse(input: Object3D<Event> | Object3D<Event>[]) {
+  beforeParse(input: Object3D | Object3D[]) {
     const writer = this.writer
     const inputs = Array.isArray(input) ? input : [input]
     inputs.forEach((input) =>
@@ -72,7 +72,7 @@ export default class ImageProcessingExtension extends ExporterExtension implemen
     )
   }
 
-  afterParse(input: Object3D<Event> | Object3D<Event>[]) {
+  afterParse(input: Object3D | Object3D[]) {
     this.originalImages.forEach(({ material, field, texture }) => {
       URL.revokeObjectURL(material[field].image.src)
       material[field] = texture

diff --git a/packages/engine/src/renderer/WebGLRendererSystem.ts b/packages/engine/src/renderer/WebGLRendererSystem.ts
@@ -141,8 +141,6 @@ export class EngineRenderer {
 
     const renderer = this.supportWebGL2 ? new WebGLRenderer(options) : new WebGL1Renderer(options)
     this.renderer = renderer
-    // @ts-ignore
-    this.renderer.useLegacyLights = false //true
     this.renderer.outputColorSpace = SRGBColorSpace
 
     // DISABLE THIS IF YOU ARE SEEING SHADER MISBEHAVING - UNCHECK THIS WHEN TESTING UPDATING THREEJS

diff --git a/packages/engine/src/scene/components/VolumetricComponent.ts b/packages/engine/src/scene/components/VolumetricComponent.ts
@@ -154,7 +154,7 @@ export function VolumetricReactor() {
 
           volumetric.player.set(
             new VolumetricPlayer({
-              renderer: EngineRenderer.instance.renderer,
+              renderer: EngineRenderer.instance.renderer as any,
               onTrackEnd: () => {
                 volumetric.hasTrackStopped.set(true)
                 volumetric.track.set(
@@ -170,7 +170,7 @@ export function VolumetricReactor() {
               playMode: PlayMode.loop
             })
           )
-          addObjectToGroup(entity, volumetric.player.value.mesh)
+          addObjectToGroup(entity, volumetric.player.value.mesh as any)
 
           const handleAutoplay = () => {
             if (!volumetric.player.value.paused) volumetric.player.value.play()
@@ -198,8 +198,9 @@ export function VolumetricReactor() {
             const transform = getComponent(entity, TransformComponent)
             if (!transform) return
             if (volumetric.loadingEffectActive.value) {
-              volumetric.height.set(calculateHeight(volumetric.player.value.mesh) * transform.scale.y)
-              if (volumetric.loadingEffectTime.value === 0) setupLoadingEffect(entity, volumetric.player.value!.mesh)
+              volumetric.height.set(calculateHeight(volumetric.player.value.mesh as any) * transform.scale.y)
+              if (volumetric.loadingEffectTime.value === 0)
+                setupLoadingEffect(entity, volumetric.player.value!.mesh as any)
             }
           })
 

diff --git a/packages/engine/src/scene/constants/Util.ts b/packages/engine/src/scene/constants/Util.ts
@@ -67,7 +67,7 @@ export const loadCubeMapTexture = (
     (res) => {
       if (onProgress) onProgress(res)
     },
-    (error) => {
+    (error: any) => {
       if (onError) onError(error)
     }
   )
@@ -89,7 +89,7 @@ export const loadDDSTexture = (
     (res) => {
       if (onProgress) onProgress(res)
     },
-    (error) => {
+    (error: any) => {
       if (onError) onError(error)
     }
   )