@needle-tools/engine 3.7.6-beta → 3.8.0-alpha

package/src/engine/engine_lightdata.ts

@@ -1,7 +1,6 @@
 import { LightmapType } from "./extensions/NEEDLE_lightmaps";
-import { Texture } from "three";
+import { Texture, ShaderChunk, UniformsLib, Vector4 } from "three";
 import { Context } from "./engine_setup";
-import * as THREE from "three";
 import { getParam } from "./engine_utils";
 import { SourceIdentifier } from "./engine_types";
 
@@ -78,9 +77,8 @@ export class LightDataRegistry implements ILightDataRegistry {
 // all the chunks we can patch
 // console.log(THREE.ShaderChunk);
 // Unity: ambientOrLightmapUV.xy = v.uv1.xy * unity_LightmapST.xy + unity_LightmapST.zw; ambientOrLightmapUV.zw = 0;
-THREE.ShaderChunk.lights_fragment_maps = THREE.ShaderChunk.lights_fragment_maps.replace("vec4 lightMapTexel = texture2D( lightMap, vUv2 );", `
-
-    vec2 lUv = vUv2.xy * lightmapScaleOffset.xy + vec2(lightmapScaleOffset.z, (1. - (lightmapScaleOffset.y + lightmapScaleOffset.w)));
+ShaderChunk.lights_fragment_maps = ShaderChunk.lights_fragment_maps.replace("vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );", `
+    vec2 lUv = vLightMapUv.xy * lightmapScaleOffset.xy + vec2(lightmapScaleOffset.z, (1. - (lightmapScaleOffset.y + lightmapScaleOffset.w)));
     vec4 lightMapTexel = texture2D( lightMap, lUv);
     // The range of RGBM lightmaps goes from 0 to 34.49 (5^2.2) in linear space, and from 0 to 5 in gamma space.
     lightMapTexel.rgb *= lightMapTexel.a * 8.; // no idea where that "8" comes from... heuristically derived
@@ -88,7 +86,7 @@ THREE.ShaderChunk.lights_fragment_maps = THREE.ShaderChunk.lights_fragment_maps.
     lightMapTexel = conv_sRGBToLinear(lightMapTexel);
     `);
 
-THREE.ShaderChunk.lightmap_pars_fragment = `
+ShaderChunk.lightmap_pars_fragment = `
     #ifdef USE_LIGHTMAP
         uniform sampler2D lightMap;
         uniform float lightMapIntensity;
@@ -105,7 +103,7 @@ THREE.ShaderChunk.lightmap_pars_fragment = `
 // so they shouldn't receive light probe lighting.
 // TODO: this gets difficult if there are additional real-time lightprobes added; we would need to exclude
 // exactly those that were active when lighting was baked... that's complicated!
-THREE.ShaderChunk.lights_fragment_begin = THREE.ShaderChunk.lights_fragment_begin.replace(
+ShaderChunk.lights_fragment_begin = ShaderChunk.lights_fragment_begin.replace(
     "irradiance += getLightProbeIrradiance( lightProbe, geometry.normal );", `
 #if defined(USE_LIGHTMAP)
 irradiance += 0.;
@@ -113,4 +111,4 @@ irradiance += 0.;
 irradiance += getLightProbeIrradiance( lightProbe, geometry.normal );
 #endif`);
 
-THREE.UniformsLib.lightmap["lightmapScaleOffset"] = { value: new THREE.Vector4(1, 1, 0, 0) };
+UniformsLib.lightmap["lightmapScaleOffset"] = { value: new Vector4(1, 1, 0, 0) };

package/src/engine/engine_networking_utils.ts

@@ -7,7 +7,7 @@
 const localNetworkResults = new Map<string, boolean>();
 
 export function isLocalNetwork(hostname = window.location.hostname) {
-    if(localNetworkResults.has(hostname)) return localNetworkResults.get(hostname);
+    if(localNetworkResults.has(hostname)) return localNetworkResults.get(hostname)!;
     const isLocalNetwork = new RegExp("[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|localhost", "gm").test(hostname);
     localNetworkResults.set(hostname, isLocalNetwork);
     if (isLocalNetwork === true) return true;

package/src/engine/engine_scenelighting.ts

@@ -1,4 +1,4 @@
-import { Vector4, EquirectangularReflectionMapping, sRGBEncoding, WebGLCubeRenderTarget, Texture, LightProbe, Color, SphericalHarmonics3 } from "three";
+import { Vector4, EquirectangularReflectionMapping, sRGBEncoding, WebGLCubeRenderTarget, Texture, LightProbe, Color, SphericalHarmonics3, SRGBColorSpace } from "three";
 import { LightProbeGenerator } from "three/examples/jsm/lights/LightProbeGenerator.js"
 import { Context } from "./engine_setup";
 import { SceneLightSettings } from "./extensions/NEEDLE_lighting_settings";
@@ -164,7 +164,7 @@ export class RendererData {
                     if (debug) console.log("Setting environment reflection", existing);
                     const scene = this.context.scene;
                     const tex = existing.Source;
-                    tex.encoding = sRGBEncoding;
+                    tex.colorSpace = SRGBColorSpace;
                     tex.mapping = EquirectangularReflectionMapping;
                     scene.environment = tex;
                     return;
@@ -179,7 +179,7 @@ export class RendererData {
                     if (settings.ambientTrilight) {
                         const colors = settings.ambientTrilight;
                         const tex = createTrilightTexture(colors[0], colors[1], colors[2], 64, 64);
-                        tex.encoding = sRGBEncoding;
+                        tex.colorSpace = SRGBColorSpace;
                         tex.mapping = EquirectangularReflectionMapping;
                         this.context.scene.environment = tex;
                     }
@@ -188,7 +188,7 @@ export class RendererData {
                 case AmbientMode.Flat:
                     if (settings.ambientLight) {
                         const tex = createFlatTexture(settings.ambientLight, 64);
-                        tex.encoding = sRGBEncoding;
+                        tex.colorSpace = SRGBColorSpace;
                         tex.mapping = EquirectangularReflectionMapping;
                         this.context.scene.environment = tex;
                     }
@@ -259,7 +259,7 @@ export class LightData {
         this._source = tex;
         this._ambientScale = ambientScale;
         tex.mapping = EquirectangularReflectionMapping;
-        tex.encoding = sRGBEncoding;
+        tex.colorSpace = SRGBColorSpace;
     }
 
     getSphericalHarmonicsArray(intensityFactor: number = 1): SphericalHarmonicsData | null {

package/src/engine/extensions/NEEDLE_lightmaps.ts

@@ -1,5 +1,5 @@
 import { ILightDataRegistry } from "../engine_lightdata";
-import { FloatType, HalfFloatType, LinearEncoding, sRGBEncoding, Texture } from "three";
+import { FloatType, HalfFloatType, LinearEncoding, LinearSRGBColorSpace, SRGBColorSpace, sRGBEncoding, Texture } from "three";
 import { GLTF, GLTFLoaderPlugin, GLTFParser } from "three/examples/jsm/loaders/GLTFLoader";
 import { SourceIdentifier } from "../engine_types";
 import { resolveReferences } from "./extension_utils";
@@ -70,9 +70,9 @@ export class NEEDLE_lightmaps implements GLTFLoaderPlugin {
                                     else {
                                         // TODO this is most likely wrong for floating point textures
                                         if (entry.type !== LightmapType.Lightmap)
-                                            tex.encoding = sRGBEncoding;
+                                            tex.colorSpace = SRGBColorSpace;
                                         else
-                                            tex.encoding = LinearEncoding;
+                                            tex.colorSpace = LinearSRGBColorSpace;
 
 
                                         // Dont flip skybox textures anymore - previously we exported them flipped when baking in Unity but now we allow to pass through export without re-baking exisitng skybox textures if they use default values. So we expect textures to be NOT flipped anymore

package/src/engine/extensions/NEEDLE_render_objects.ts

@@ -22,6 +22,8 @@ import {
     IncrementWrapStencilOp,
     DecrementWrapStencilOp,
     InvertStencilOp,
+    StencilFunc,
+    StencilOp as ThreeStencilOp,
 } from "three";
 import { getParam, isDebugMode } from "../engine_utils";
 import { showBalloonWarning } from "../debug";
@@ -81,10 +83,10 @@ export class NEEDLE_render_objects implements GLTFLoaderPlugin {
                         mat.stencilWriteMask = 255;
                         mat.stencilFuncMask = 255;
                         mat.stencilRef = stencil.value;
-                        mat.stencilFunc = stencil.compareFunc;
-                        mat.stencilZPass = stencil.passOp;
-                        mat.stencilFail = stencil.failOp;
-                        mat.stencilZFail = stencil.zFailOp;
+                        mat.stencilFunc = stencil.compareFunc as StencilFunc;
+                        mat.stencilZPass = stencil.passOp as ThreeStencilOp;
+                        mat.stencilFail = stencil.failOp as ThreeStencilOp;
+                        mat.stencilZFail = stencil.zFailOp as ThreeStencilOp;
                         obj.sharedMaterials[i] = mat;
                     }
                 }
@@ -116,7 +118,7 @@ export class NEEDLE_render_objects implements GLTFLoaderPlugin {
                 if (stencils && Array.isArray(stencils)) {
                     for (const stencil of stencils) {
                         const obj: StencilSettingsModel = { ...stencil };
-                        obj.compareFunc = ToThreeCompareFunction(obj.compareFunc);
+                        obj.compareFunc = ToThreeCompareFunction(obj.compareFunc as number);
                         obj.passOp = ToThreeStencilOp(obj.passOp);
                         obj.failOp = ToThreeStencilOp(obj.failOp);
                         obj.zFailOp = ToThreeStencilOp(obj.zFailOp);
@@ -161,7 +163,7 @@ enum CompareFunction {
     Always,
 }
 
-function ToThreeStencilOp(op: StencilOp): number {
+function ToThreeStencilOp(op: StencilOp): ThreeStencilOp {
     switch (op) {
         case StencilOp.Keep:
             return KeepStencilOp;
@@ -183,7 +185,7 @@ function ToThreeStencilOp(op: StencilOp): number {
     return 0;
 }
 
-function ToThreeCompareFunction(func: CompareFunction): number {
+function ToThreeCompareFunction(func: CompareFunction): StencilFunc {
     switch (func) {
         case CompareFunction.Never:
             return NeverStencilFunc;
@@ -202,7 +204,7 @@ function ToThreeCompareFunction(func: CompareFunction): number {
         case CompareFunction.Always:
             return AlwaysStencilFunc;
     }
-    return 0;
+    return NeverStencilFunc;
 }
 
 

package/src/engine/extensions/NEEDLE_techniques_webgl.ts

@@ -1,6 +1,6 @@
 import { GLTFLoaderPlugin, GLTFParser } from "three/examples/jsm/loaders/GLTFLoader";
 import { FindShaderTechniques, whiteDefaultTexture, ToUnityMatrixArray, SetUnitySphericalHarmonics } from '../engine_shaders';
-import { AlwaysDepth, BackSide, Camera, DoubleSide, EqualDepth, FrontSide, GreaterDepth, GreaterEqualDepth, IUniform, LessDepth, LessEqualDepth, LinearEncoding, Material, Matrix4, NotEqualDepth, Object3D, RawShaderMaterial, Vector3, Vector4 } from 'three';
+import { AlwaysDepth, BackSide, Camera, DoubleSide, EqualDepth, FrontSide, GLSL3, GreaterDepth, GreaterEqualDepth, IUniform, LessDepth, LessEqualDepth, LinearEncoding, Material, Matrix4, NotEqualDepth, Object3D, RawShaderMaterial, Vector3, Vector4 } from 'three';
 import { Context } from '../engine_setup';
 import { getParam } from "../engine_utils";
 import * as SHADERDATA from "../shaders/shaderData"
@@ -455,6 +455,10 @@ export class NEEDLE_techniques_webgl implements GLTFLoaderPlugin {
                     //     "USE_SHADOWMAP" : true
                     // },
                 });
+            material.glslVersion = GLSL3;
+            material.vertexShader = material.vertexShader.replace("#version 300 es", "");
+            material.fragmentShader = material.fragmentShader.replace("#version 300 es", "");
+
 
             const culling = uniforms["_Cull"]?.value;
             switch (culling) {

package/src/engine/extensions/extensions.ts

@@ -16,6 +16,16 @@ import { NEEDLE_progressive } from "./NEEDLE_progressive";
 import { InternalUsageTrackerPlugin } from "./usage_tracker";
 import { isUsageTrackingEnabled } from "../engine_assetdatabase";
 import { GLTFLoaderPlugin } from "three/examples/jsm/loaders/GLTFLoader";
+// import { GLTFAnimationPointerExtension } from "three/examples/jsm/loaders/GLTFLoaderAnimationPointer";
+
+// lazily import the GLTFAnimationPointerExtension in case it doesnt exist (e.g. using vanilla three)
+let GLTFAnimationPointerExtension : any;
+import("three/examples/jsm/loaders/GLTFLoaderAnimationPointer").then(mod => {
+    GLTFAnimationPointerExtension = mod.GLTFAnimationPointerExtension;
+    return GLTFAnimationPointerExtension;
+}).catch(e => {
+    console.warn("Failed to import GLTFLoaderAnimationPointer. Please use @needle-tools/three for full KHR_animation support", e);
+});
 
 const _addedCustomExtension = new Array<ConstructorConcrete<GLTFLoaderPlugin>>();
 
@@ -70,8 +80,13 @@ export function registerExtensions(loader: GLTFLoader, context: Context, sourceI
     for (const ext of _addedCustomExtension)
         loader.register(p => new ext(p));
 
-    const setPointerResolverFunction = loader["setAnimationPointerResolver"];
-    if (typeof setPointerResolverFunction === "function")
-        setPointerResolverFunction.bind(loader)(new PointerResolver());
+    loader.register(p => {
+        if (GLTFAnimationPointerExtension) {
+            const ext = new GLTFAnimationPointerExtension(p);
+            const setPointerResolverFunction = ext.setAnimationPointerResolver;
+            setPointerResolverFunction.bind(ext)(new PointerResolver());
+            return ext;
+        }
+    });
 
 }

package/src/engine-components/Camera.ts

@@ -8,7 +8,7 @@ import { showBalloonMessage } from "../engine/debug/debug";
 import { getWorldPosition, Graphics } from "../engine/engine_three_utils";
 import { Gizmos } from "../engine/engine_gizmos";
 
-import { EquirectangularReflectionMapping, OrthographicCamera, PerspectiveCamera, Ray, sRGBEncoding, Vector3 } from "three";
+import { EquirectangularReflectionMapping, OrthographicCamera, PerspectiveCamera, Ray, SRGBColorSpace, sRGBEncoding, Vector3 } from "three";
 import { OrbitControls } from "./OrbitControls";
 import { RenderTexture } from "../engine/engine_texture";
 
@@ -261,7 +261,7 @@ export class Camera extends Behaviour implements ICamera {
         else
             cam = this.gameObject.children[0] as THREE.PerspectiveCamera | THREE.OrthographicCamera | null;
         if (cam && cam.isCamera) {
-            if (cam.type === "PerspectiveCamera") {
+            if (cam instanceof PerspectiveCamera) {
                 if (this._fov)
                     cam.fov = this._fov;
                 cam.near = this._nearClipPlane;
@@ -391,7 +391,7 @@ class CameraSkybox {
         else if (this.context.scene.background !== this._skybox) {
             if (debug)
                 console.log("Set skybox", this._camera, this._skybox);
-            this._skybox.encoding = sRGBEncoding;
+            this._skybox.colorSpace = SRGBColorSpace;
             this._skybox.mapping = EquirectangularReflectionMapping;
             this.context.scene.background = this._skybox;
         }

package/src/engine-components/DragControls.ts

@@ -108,8 +108,9 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
         DragControls._active += 1;
         this._dragDelta.set(0, 0);
         this._didDrag = false;
-        this._waitingForDragStart = args;
-        args.StopPropagation();
+        // Clone to not modify the original event (and this event is used in the actual onDragStart method)
+        this._waitingForDragStart = args.clone();
+        args.stopPropagation();
         // disabling pointer controls here already, otherwise we get a few frames of movement event in orbit controls and this will rotate the camera sligthly AFTER drag controls dragging ends.
         if (this.orbit) this.orbit.enabled = false;
     }
@@ -117,11 +118,11 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
     onPointerUp(args: PointerEventData) {
         this._waitingForDragStart = null;
         if (!this.allowEdit(this.gameObject)) return;
-        if(DragControls._active > 0)
+        if (DragControls._active > 0)
             DragControls._active -= 1;
         if (WebXR.IsInWebXR) return;
         this.onDragEnd(args);
-        args.StopPropagation();
+        args.stopPropagation();
         if (this.orbit) this.orbit.enabled = true;
     }
 
@@ -131,7 +132,6 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
 
         // drag start only after having dragged for some pixels
         if (this._waitingForDragStart) {
-
             if (!this._didDrag) {
                 // this is so we can e.g. process clicks without having a drag change the position
                 // e.g. a click to rotate the object
@@ -142,7 +142,6 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
                     this._didDrag = true;
                 else return;
             }
-
             const args = this._waitingForDragStart;
             this._waitingForDragStart = null;
             this.onDragStart(args);
@@ -247,7 +246,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
         if (!this || !this._isDragging) return;
         this._isDragging = false;
         if (!this._dragHelper) return;
-        for(const rb of this._draggingRigidbodies){
+        for (const rb of this._draggingRigidbodies) {
             rb.setVelocity(rb.smoothedVelocity);
         }
         this._draggingRigidbodies.length = 0;
@@ -336,7 +335,7 @@ class DragHelper {
             for (const rb of this._rbs) {
                 rb.wakeUp();
                 // if (!rb.smoothedVelocity) continue;
-                rb.setVelocity(0,0,0);
+                rb.setVelocity(0, 0, 0);
             }
         }
 

package/src/engine-components/GroundProjection.ts

@@ -1,5 +1,5 @@
 import { Behaviour, GameObject } from "./Component";
-import { GroundProjectedEnv as GroundProjection } from 'three/examples/jsm/objects/GroundProjectedEnv.js';
+import { GroundProjectedSkybox as GroundProjection } from 'three/examples/jsm/objects/GroundProjectedSkybox.js';
 import { serializable } from "../engine/engine_serialization_decorator";
 import { Watch as Watch } from "../engine/engine_utils";
 import { Texture } from "three";

package/src/engine-components/Light.ts

@@ -173,6 +173,7 @@ export class Light extends Behaviour implements ILight {
             }
             this.light.intensity = val * factor;
         }
+        if (debug) console.log("Set light intensity to " + this._intensity, val, this)
     }
     get intensity(): number { return this._intensity; }
     private _intensity: number = -1;
@@ -180,7 +181,7 @@ export class Light extends Behaviour implements ILight {
     @serializable()
     get shadowDistance(): number {
         const light = this.light;
-        if (light) {
+        if (light?.shadow) {
             const cam = light.shadow.camera as OrthographicCamera;
             return cam.far;
         }
@@ -189,7 +190,7 @@ export class Light extends Behaviour implements ILight {
     set shadowDistance(val: number) {
         this._shadowDistance = val;
         const light = this.light;
-        if (light) {
+        if (light?.shadow) {
             const cam = light.shadow.camera as OrthographicCamera;
             cam.far = val;
             cam.updateProjectionMatrix();
@@ -203,7 +204,7 @@ export class Light extends Behaviour implements ILight {
     @serializable()
     get shadowResolution(): number {
         const light = this.light;
-        if (light) {
+        if (light?.shadow) {
             return light.shadow.mapSize.x;
         }
         return -1;
@@ -212,7 +213,7 @@ export class Light extends Behaviour implements ILight {
         if (val === this._shadowResolution) return;
         this._shadowResolution = val;
         const light = this.light;
-        if (light) {
+        if (light?.shadow) {
             light.shadow.mapSize.set(val, val);
             light.shadow.needsUpdate = true;
         }
@@ -256,12 +257,13 @@ export class Light extends Behaviour implements ILight {
     }
 
     onEnable(): void {
-        if(debug) console.log("ENABLE LIGHT", this.name);
+        if (debug) console.log("ENABLE LIGHT", this.name);
         this.createLight();
         if (this.isBaked) return;
         else if (this.light) {
             this.light.visible = true;
             this.light.intensity = this._intensity;
+            if (debug) console.log("Set light intensity to " + this.light.intensity, this.name)
             if (this.selfIsLight) {
                 // nothing to do
             }
@@ -275,7 +277,7 @@ export class Light extends Behaviour implements ILight {
     }
 
     onDisable() {
-        if(debug) console.log("DISABLE LIGHT", this.name);
+        if (debug) console.log("DISABLE LIGHT", this.name);
         if (this.light) {
             if (this.selfIsLight)
                 this.light.intensity = 0;
@@ -376,61 +378,63 @@ export class Light extends Behaviour implements ILight {
             }
             else this.light.castShadow = false;
 
-            // shadow intensity is currently not a thing: https://github.com/mrdoob/three.js/pull/14087
-            if (this._shadowResolution !== undefined && this._shadowResolution > 4) {
-                this.light.shadow.mapSize.width = this._shadowResolution;
-                this.light.shadow.mapSize.height = this._shadowResolution;
-            }
-            else {
-                this.light.shadow.mapSize.width = 2048;
-                this.light.shadow.mapSize.height = 2048;
-            }
-            // this.light.shadow.needsUpdate = true;
-            // console.log(this.light.shadow.mapSize);
-            // return;
-
-            if (debug)
-                console.log("Override shadow bias?", this._overrideShadowBiasSettings, this.shadowBias, this.shadowNormalBias);
-
-            this.light.shadow.bias = this.shadowBias;
-            this.light.shadow.normalBias = this.shadowNormalBias;
-
-            this.updateShadowSoftHard();
+            if (this.light.shadow) {
+                // shadow intensity is currently not a thing: https://github.com/mrdoob/three.js/pull/14087
+                if (this._shadowResolution !== undefined && this._shadowResolution > 4) {
+                    this.light.shadow.mapSize.width = this._shadowResolution;
+                    this.light.shadow.mapSize.height = this._shadowResolution;
+                }
+                else {
+                    this.light.shadow.mapSize.width = 2048;
+                    this.light.shadow.mapSize.height = 2048;
+                }
+                // this.light.shadow.needsUpdate = true;
+                // console.log(this.light.shadow.mapSize);
+                // return;
+
+                if (debug)
+                    console.log("Override shadow bias?", this._overrideShadowBiasSettings, this.shadowBias, this.shadowNormalBias);
+
+                this.light.shadow.bias = this.shadowBias;
+                this.light.shadow.normalBias = this.shadowNormalBias;
+
+                this.updateShadowSoftHard();
+
+                const cam = this.light.shadow.camera as THREE.OrthographicCamera;
+                cam.near = this.shadowNearPlane;
+                // use shadow distance that was set explictly (if any)
+                if (this._shadowDistance !== undefined && typeof this._shadowDistance === "number")
+                    cam.far = this._shadowDistance;
+                else // otherwise fallback to object scale and max distance
+                    cam.far = shadowMaxDistance * Math.abs(this.gameObject.scale.z);
+
+                // width and height
+                this.gameObject.scale.set(1, 1, 1);
+                if (this.shadowWidth !== undefined) {
+                    cam.left = -this.shadowWidth / 2;
+                    cam.right = this.shadowWidth / 2;
+                }
+                else {
+                    const sx = this.gameObject.scale.x;
+                    cam.left *= sx;
+                    cam.right *= sx;
+                }
+                if (this.shadowHeight !== undefined) {
+                    cam.top = this.shadowHeight / 2;
+                    cam.bottom = -this.shadowHeight / 2;
+                }
+                else {
+                    const sy = this.gameObject.scale.y;
+                    cam.top *= sy;
+                    cam.bottom *= sy;
+                }
+                this.light.shadow.needsUpdate = true;
 
-            const cam = this.light.shadow.camera as THREE.OrthographicCamera;
-            cam.near = this.shadowNearPlane;
-            // use shadow distance that was set explictly (if any)
-            if (this._shadowDistance !== undefined && typeof this._shadowDistance === "number")
-                cam.far = this._shadowDistance;
-            else // otherwise fallback to object scale and max distance
-                cam.far = shadowMaxDistance * Math.abs(this.gameObject.scale.z);
-
-            // width and height
-            this.gameObject.scale.set(1, 1, 1);
-            if (this.shadowWidth !== undefined) {
-                cam.left = -this.shadowWidth / 2;
-                cam.right = this.shadowWidth / 2;
-            }
-            else {
-                const sx = this.gameObject.scale.x;
-                cam.left *= sx;
-                cam.right *= sx;
-            }
-            if (this.shadowHeight !== undefined) {
-                cam.top = this.shadowHeight / 2;
-                cam.bottom = -this.shadowHeight / 2;
-            }
-            else {
-                const sy = this.gameObject.scale.y;
-                cam.top *= sy;
-                cam.bottom *= sy;
+                if (debug)
+                    this.context.scene.add(new THREE.CameraHelper(cam));
             }
 
 
-            this.light.shadow.needsUpdate = true;
-            if (debug)
-                this.context.scene.add(new THREE.CameraHelper(cam));
-
 
             if (this.isBaked) {
                 this.light.removeFromParent();
@@ -457,6 +461,7 @@ export class Light extends Behaviour implements ILight {
 
     private updateShadowSoftHard() {
         if (!this.light) return;
+        if (!this.light.shadow) return;
         if (this.shadows === LightShadows.Soft) {
             // const radius = this.light.shadow.mapSize.width / 1024 * 5;
             // const samples = Mathf.clamp(Math.round(radius), 2, 10);

package/src/engine-components/OrbitControls.ts

@@ -272,10 +272,10 @@ export class OrbitControls extends Behaviour implements ICameraController {
         if (!freeCam && this.lookAtConstraint?.locked) this.setFromTargetPosition(0, this.lookAtConstraint01);
 
 
-        if (this._controls && !this.context.isInXR) {
+        if (this._controls) {
             if (this.debugLog)
                 this._controls.domElement = this.context.renderer.domElement;
-            this._controls.enabled = !this._shouldDisable && this._camera === this.context.mainCameraComponent;
+            this._controls.enabled = !this._shouldDisable && this._camera === this.context.mainCameraComponent && !this.context.isInXR;
             this._controls.enableDamping = this.enableDamping;
             this._controls.keys = this.enableKeys ? defaultKeys : disabledKeys;
             this._controls.autoRotate = this.autoRotate;
@@ -283,7 +283,8 @@ export class OrbitControls extends Behaviour implements ICameraController {
             this._controls.enableZoom = this.enableZoom;
             this._controls.dampingFactor = this.dampingFactor;
             this._controls.enablePan = this.enablePan;
-            this._controls.update();
+            if (!this.context.isInXR)
+                this._controls.update();
         }
     }
 

package/src/engine-components/ParticleSystem.ts

@@ -69,7 +69,21 @@ export class ParticleSystemRenderer extends Behaviour {
         return res;
     }
 
+    private static _havePatchedQuarkShaders = false;
+
     getMaterial(trailEnabled: boolean = false) {
+
+        if (!ParticleSystemRenderer._havePatchedQuarkShaders) {
+            ParticleSystemRenderer._havePatchedQuarkShaders = true;
+            
+            // HACK patch three.quarks fo three152+, see https://github.com/Alchemist0823/three.quarks/issues/56#issuecomment-1560825038
+            const _rebuild = TrailBatch.prototype.rebuildMaterial;
+            TrailBatch.prototype.rebuildMaterial = function () {
+                _rebuild.call(this);
+                this.material.defines.MAP_UV = "uv";
+            }
+        }
+
         const material = (trailEnabled === true && this.trailMaterial) ? this.trailMaterial : this.particleMaterial;
 
         // progressive load on start

package/src/engine-components/ReflectionProbe.ts

@@ -1,5 +1,5 @@
 import { Behaviour } from "./Component";
-import { Box3, Color, EquirectangularReflectionMapping, LinearEncoding, LineBasicMaterial, Material, MeshStandardMaterial, Object3D, SrcAlphaFactor, sRGBEncoding, Texture, Vector3, WebGLCubeRenderTarget, WebGLRenderTarget } from "three";
+import { Box3, Color, EquirectangularReflectionMapping, LinearEncoding, LineBasicMaterial, Material, MeshStandardMaterial, Object3D, SrcAlphaFactor, SRGBColorSpace, sRGBEncoding, Texture, Vector3, WebGLCubeRenderTarget, WebGLRenderTarget } from "three";
 import { serializable } from "../engine/engine_serialization";
 import { Context } from "../engine/engine_setup";
 import { getWorldPosition, getWorldScale } from "../engine/engine_three_utils";
@@ -54,7 +54,7 @@ export class ReflectionProbe extends Behaviour {
         this._texture = tex;
         if (tex) {
             tex.mapping = EquirectangularReflectionMapping;
-            tex.encoding = sRGBEncoding;
+            tex.colorSpace = SRGBColorSpace;
             tex.needsUpdate = true;
         }
     }
@@ -89,7 +89,7 @@ export class ReflectionProbe extends Behaviour {
 
         if (this.texture) {
             this.texture.mapping = EquirectangularReflectionMapping;
-            this.texture.encoding = sRGBEncoding;
+            this.texture.colorSpace = SRGBColorSpace;
             this.texture.needsUpdate = true;
         }
     }