WebXR Input Sources: retrieve most relevant transforms of the parent (playcanvas#2395)

Maksims · web-flow · commit 525fc08b3146 · 2020-08-31T23:42:30.000+01:00
* retrieve most relevant transforms of the parent

* fix
diff --git a/src/xr/xr-input-source.js b/src/xr/xr-input-source.js
@@ -188,18 +188,14 @@ XrInputSource.prototype.update = function (frame) {
 };
 
 XrInputSource.prototype._updateTransforms = function () {
-    var dirty;
-
     if (this._dirtyLocal) {
-        dirty = true;
         this._dirtyLocal = false;
         this._localTransform.setTRS(this._localPosition, this._localRotation, Vec3.ONE);
     }
 
     var parent = this._manager.camera.parent;
     if (parent) {
-        dirty = dirty || parent._dirtyLocal || parent._dirtyWorld;
-        if (dirty) this._worldTransform.mul2(parent.getWorldTransform(), this._localTransform);
+        this._worldTransform.mul2(parent.getWorldTransform(), this._localTransform);
     } else {
         this._worldTransform.copy(this._localTransform);
     }
@@ -211,18 +207,14 @@ XrInputSource.prototype._updateRayTransforms = function () {
 
     var parent = this._manager.camera.parent;
     if (parent) {
-        dirty = dirty || parent._dirtyLocal || parent._dirtyWorld;
-
-        if (dirty) {
-            var parentTransform = this._manager.camera.parent.getWorldTransform();
+        var parentTransform = this._manager.camera.parent.getWorldTransform();
 
-            parentTransform.getTranslation(this._position);
-            this._rotation.setFromMat4(parentTransform);
+        parentTransform.getTranslation(this._position);
+        this._rotation.setFromMat4(parentTransform);
 
-            this._rotation.transformVector(this._rayLocal.origin, this._ray.origin);
-            this._ray.origin.add(this._position);
-            this._rotation.transformVector(this._rayLocal.direction, this._ray.direction);
-        }
+        this._rotation.transformVector(this._rayLocal.origin, this._ray.origin);
+        this._ray.origin.add(this._position);
+        this._rotation.transformVector(this._rayLocal.direction, this._ray.direction);
     } else if (dirty) {
         this._ray.origin.copy(this._rayLocal.origin);
         this._ray.direction.copy(this._rayLocal.direction);
diff --git a/src/xr/xr-joint.js b/src/xr/xr-joint.js
@@ -74,10 +74,7 @@ XrJoint.prototype.update = function (pose) {
 };
 
 XrJoint.prototype._updateTransforms = function () {
-    var dirty;
-
     if (this._dirtyLocal) {
-        dirty = true;
         this._dirtyLocal = false;
         this._localTransform.setTRS(this._localPosition, this._localRotation, Vec3.ONE);
     }
@@ -86,8 +83,7 @@ XrJoint.prototype._updateTransforms = function () {
     var parent = manager.camera.parent;
 
     if (parent) {
-        dirty = dirty || parent._dirtyLocal || parent._dirtyWorld;
-        if (dirty) this._worldTransform.mul2(parent.getWorldTransform(), this._localTransform);
+        this._worldTransform.mul2(parent.getWorldTransform(), this._localTransform);
     } else {
         this._worldTransform.copy(this._localTransform);
     }
