@needle-tools/engine 4.1.0-beta.1 → 4.1.0-beta.2

package/src/engine-components/TransformGizmo.ts

@@ -1,4 +1,4 @@
-import { MathUtils,Mesh, MeshBasicMaterial, Object3D } from "three";
+import { MathUtils, Mesh, MeshBasicMaterial, Object3D } from "three";
 import { TransformControls } from "three/examples/jsm/controls/TransformControls.js";
 
 import * as params from "../engine/engine_default_parameters.js";
@@ -26,7 +26,15 @@ export class TransformGizmo extends Behaviour {
     @serializable()
     public scaleSnap: number = .25;
 
-    private control?: TransformControls;
+    /**
+     * Get the underlying three.js TransformControls instance.
+     * @returns The TransformControls instance.
+     */
+    get control() {
+        return this._control;
+    }
+
+    private _control?: TransformControls;
     private orbit?: OrbitControls;
 
     /** @internal */
@@ -35,12 +43,12 @@ export class TransformGizmo extends Behaviour {
 
         if (!this.context.mainCamera) return;
 
-        if (!this.control) {
-            this.control = new TransformControls(this.context.mainCamera, this.context.renderer.domElement);
-            this.control.enabled = true;
-            this.control.getRaycaster().layers.set(2);
-            this.control.size = 1;
-            const obj = ("_root" in this.control ? this.control._root : this.control) as Object3D;
+        if (!this._control) {
+            this._control = new TransformControls(this.context.mainCamera, this.context.renderer.domElement);
+            this._control.enabled = true;
+            this._control.getRaycaster().layers.set(2);
+            this._control.size = 1;
+            const obj = ("_root" in this._control ? this._control._root : this._control) as Object3D;
             obj.traverse(x => {
                 const mesh = x as Mesh;
                 mesh.layers.set(2);
@@ -54,12 +62,12 @@ export class TransformGizmo extends Behaviour {
             this.orbit = GameObject.getComponentInParent(this.context.mainCamera, OrbitControls) ?? undefined;
         }
 
-        if (this.control) {
-            const obj = this.control.getHelper();
+        if (this._control) {
+            const obj = this._control.getHelper();
             this.context.scene.add(obj);
-            this.control.attach(this.gameObject);
+            this._control.attach(this.gameObject);
 
-            this.control?.addEventListener('dragging-changed', this.onControlChangedEvent);
+            this._control?.addEventListener('dragging-changed', this.onControlChangedEvent);
             window.addEventListener('keydown', this.windowKeyDownListener);
             window.addEventListener('keyup', this.windowKeyUpListener);
         }
@@ -67,25 +75,25 @@ export class TransformGizmo extends Behaviour {
 
     /** @internal */
     onDisable() {
-        this.control?.getHelper()?.removeFromParent();
-        this.control?.removeEventListener('dragging-changed', this.onControlChangedEvent);
+        this._control?.getHelper()?.removeFromParent();
+        this._control?.removeEventListener('dragging-changed', this.onControlChangedEvent);
         window.removeEventListener('keydown', this.windowKeyDownListener);
         window.removeEventListener('keyup', this.windowKeyUpListener);
     }
 
     enableSnapping() {
-        if (this.control) {
-            this.control.setTranslationSnap(this.translationSnap);
-            this.control.setRotationSnap(MathUtils.degToRad(this.rotationSnapAngle));
-            this.control.setScaleSnap(this.scaleSnap);
+        if (this._control) {
+            this._control.setTranslationSnap(this.translationSnap);
+            this._control.setRotationSnap(MathUtils.degToRad(this.rotationSnapAngle));
+            this._control.setScaleSnap(this.scaleSnap);
         }
     }
 
     disableSnapping() {
-        if (this.control) {
-            this.control.setTranslationSnap(null);
-            this.control.setRotationSnap(null);
-            this.control.setScaleSnap(null);
+        if (this._control) {
+            this._control.setTranslationSnap(null);
+            this._control.setRotationSnap(null);
+            this._control.setScaleSnap(null);
         }
     }
 
@@ -104,11 +112,11 @@ export class TransformGizmo extends Behaviour {
 
     private windowKeyDownListener = (event) => {
         if (!this.enabled) return;
-        if (!this.control) return;
+        if (!this._control) return;
         switch (event.keyCode) {
 
             case 81: // Q
-                this.control.setSpace(this.control.space === 'local' ? 'world' : 'local');
+                this._control.setSpace(this._control.space === 'local' ? 'world' : 'local');
                 break;
 
             case 16: // Shift
@@ -116,40 +124,40 @@ export class TransformGizmo extends Behaviour {
                 break;
 
             case 87: // W
-                this.control.setMode('translate');
+                this._control.setMode('translate');
                 break;
 
             case 69: // E
-                this.control.setMode('rotate');
+                this._control.setMode('rotate');
                 break;
 
             case 82: // R
-                this.control.setMode('scale');
+                this._control.setMode('scale');
                 break;
             case 187:
             case 107: // +, =, num+
-                this.control.setSize(this.control.size + 0.1);
+                this._control.setSize(this._control.size + 0.1);
                 break;
 
             case 189:
             case 109: // -, _, num-
-                this.control.setSize(Math.max(this.control.size - 0.1, 0.1));
+                this._control.setSize(Math.max(this._control.size - 0.1, 0.1));
                 break;
 
             case 88: // X
-                this.control.showX = !this.control.showX;
+                this._control.showX = !this._control.showX;
                 break;
 
             case 89: // Y
-                this.control.showY = !this.control.showY;
+                this._control.showY = !this._control.showY;
                 break;
 
             case 90: // Z
-                this.control.showZ = !this.control.showZ;
+                this._control.showZ = !this._control.showZ;
                 break;
 
             case 32: // Spacebar
-                this.control.enabled = !this.control.enabled;
+                this._control.enabled = !this._control.enabled;
                 break;
         }
     }

package/src/engine-components/VideoPlayer.ts

@@ -1017,7 +1017,6 @@ class ScreenspaceTexture extends ShaderMaterial {
             else
             {
                 vec4 texcolor = texture2D(map, vUv);
-                texcolor = sRGBTransferOETF(texcolor);
                 gl_FragColor = texcolor;
             }
         }

package/src/engine-components/webxr/WebXRRig.ts

@@ -23,11 +23,21 @@ export class XRRig extends Behaviour implements IXRRig {
 
     get isActive() { return this.activeAndEnabled && this.gameObject.visible; }
 
-    /** Sets this rig to be the active XR rig (needs to be called during an active XR session) */
+    /** 
+     * Sets this rig to be the active XR rig (needs to be called during an active XR session) 
+     * Note that this might modify the priority of this rig to be the highest.
+    */
     setAsActiveXRRig() {
         NeedleXRSession.active?.setRigActive(this);
     }
+    /** 
+     * Sets the priority of the rig.
+     */
+    setPriority(value: number) {
+        this.priority = value;
+    }
 
+    /** @internal */
     awake(): void {
         if (debug) {
             const gizmoObj = new Object3D() as IGameObject;
@@ -51,15 +61,18 @@ export class XRRig extends Behaviour implements IXRRig {
 
     private _startScale?: Vector3;
 
+    /** @internal */
     onEnterXR(args: NeedleXREventArgs): void {
         this._startScale = this.gameObject.scale.clone();
         args.xr.addRig(this);
-        if(debug) console.log("WebXR: add Rig", this.name, this.priority);
+        if (debug) console.log("WebXR: add Rig", this.name, this.priority);
     }
+    /** @internal */
     onLeaveXR(args: NeedleXREventArgs): void {
         args.xr.removeRig(this);
         if (this._startScale && this.gameObject)
             this.gameObject.scale.copy(this._startScale);
     }
 
+
 }