upgraded aframe to v1.6.0 + added check for duplicate movement-controls & touch-controls

dist/xrfragment.aframe.js

@@ -1,3 +1,43 @@
+/*
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:39:00 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:50 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:27 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:37:05 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:36:14 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:35:39 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 03:32:13 PM UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 /*
  * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
  * https://xrfragment.org
@@ -3064,10 +3104,6 @@ xrf.frag.pos = function(v, opts){
   if( pos.x == undefined ){
     let obj = scene.getObjectByName(v.string)
     if( !obj ) return console.warn("#pos="+v.string+" not found")
-    //let worldPos = new THREE.Vector3()
-    //obj.getWorldPosition(worldPos)
-    //camera.position.copy(worldPos)
-    //obj.attach(camera) // instead of add() [keeps camera animations intact]
     obj.add(camera)
     camera.position.set(0,0,0)
     let c = camera.rotation
@@ -4834,6 +4870,8 @@ window.AFRAME.registerComponent('xrf', {
   },
   init: async function () {
 
+    this.data = Object.values(this.attrValue)[0]
+
     // override this.data when URL has passed (`://....com/?https://foo.com/index.glb` e.g.)
     if( typeof this.data == "string" ){
       let searchIsUri = document.location.search && 
@@ -5048,7 +5086,9 @@ const MAX_DELTA = 0.2; // ms
 const EPS = 10e-6;
 const MOVED = 'moved';
 
-AFRAME.registerComponent('movement-controls', {
+if( !AFRAME.components['movement-controls'] ){
+
+  AFRAME.registerComponent('movement-controls', {
 
     /*******************************************************************
      * Schema
@@ -5257,7 +5297,8 @@ AFRAME.registerComponent('movement-controls', {
       };
 
     }())
-});
+  });
+}
 AFRAME.components['hand-tracking-controls'].Component.prototype.onModelLoaded = function(onModelLoaded){
   return function(e){
     onModelLoaded.apply(this);
@@ -5325,7 +5366,10 @@ AFRAME.components['look-controls'].Component.prototype.updateOrientation = funct
 /**
  * Touch-to-move-forward controls for mobile.
  */
-AFRAME.registerComponent('touch-controls', {
+
+if( !AFRAME.components['touch-controls'] ){
+
+  AFRAME.registerComponent('touch-controls', {
     schema: {
       enabled: { default: true },
       reverseEnabled: { default: true }
@@ -5412,7 +5456,8 @@ AFRAME.registerComponent('touch-controls', {
       //xrSession.addEventListener('selectstart', this.onTouchStart);
       //xrSession.addEventListener('selectend', this.onTouchEnd);
     }
-})
+  })
+}
 window.AFRAME.registerComponent('xrf-button', {
     schema: {
         label: {

dist/xrfragment.js

@@ -1,3 +1,43 @@
+/*
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:39:00 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:50 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:27 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:37:05 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:36:14 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:35:39 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 03:32:13 PM UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 /*
  * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
  * https://xrfragment.org

dist/xrfragment.plugin.editor.js

@@ -1,5 +1,5 @@
 /*
- * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
  * https://xrfragment.org
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */

dist/xrfragment.plugin.frontend.css.js

@@ -1,5 +1,5 @@
 /*
- * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
  * https://xrfragment.org
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */

dist/xrfragment.plugin.frontend.js

@@ -1,5 +1,5 @@
 /*
- * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
  * https://xrfragment.org
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */

dist/xrfragment.plugin.matrix.js

@@ -1,5 +1,5 @@
 /*
- * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
  * https://xrfragment.org
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */

dist/xrfragment.plugin.network.js

@@ -1,5 +1,5 @@
 /*
- * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
  * https://xrfragment.org
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */

dist/xrfragment.plugin.p2p.js

@@ -1,5 +1,5 @@
 /*
- * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
  * https://xrfragment.org
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */

dist/xrfragment.three.js

@@ -1,3 +1,43 @@
+/*
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:39:00 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:50 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:27 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:37:05 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:36:14 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:35:39 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 03:32:13 PM UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 /*
  * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
  * https://xrfragment.org
@@ -3064,10 +3104,6 @@ xrf.frag.pos = function(v, opts){
   if( pos.x == undefined ){
     let obj = scene.getObjectByName(v.string)
     if( !obj ) return console.warn("#pos="+v.string+" not found")
-    //let worldPos = new THREE.Vector3()
-    //obj.getWorldPosition(worldPos)
-    //camera.position.copy(worldPos)
-    //obj.attach(camera) // instead of add() [keeps camera animations intact]
     obj.add(camera)
     camera.position.set(0,0,0)
     let c = camera.rotation

dist/xrfragment.three.module.js

@@ -1,3 +1,43 @@
+/*
+ * v0.5.1 generated at Mon Dec  9 15:41:10 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:39:00 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:50 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:38:27 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:37:05 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:36:14 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 15:35:39 UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+/*
+ * v0.5.1 generated at Mon Dec  9 03:32:13 PM UTC 2024
+ * https://xrfragment.org
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 /*
  * v0.5.1 generated at Mon Oct 14 11:39:48 AM CEST 2024
  * https://xrfragment.org
@@ -3064,10 +3104,6 @@ xrf.frag.pos = function(v, opts){
   if( pos.x == undefined ){
     let obj = scene.getObjectByName(v.string)
     if( !obj ) return console.warn("#pos="+v.string+" not found")
-    //let worldPos = new THREE.Vector3()
-    //obj.getWorldPosition(worldPos)
-    //camera.position.copy(worldPos)
-    //obj.attach(camera) // instead of add() [keeps camera animations intact]
     obj.add(camera)
     camera.position.set(0,0,0)
     let c = camera.rotation

src/3rd/js/aframe/index.js

@@ -5,6 +5,8 @@ window.AFRAME.registerComponent('xrf', {
   },
   init: async function () {
 
+    this.data = Object.values(this.attrValue)[0]
+
     // override this.data when URL has passed (`://....com/?https://foo.com/index.glb` e.g.)
     if( typeof this.data == "string" ){
       let searchIsUri = document.location.search && 

src/3rd/js/aframe/movement-controls.js

@@ -9,7 +9,9 @@ const MAX_DELTA = 0.2; // ms
 const EPS = 10e-6;
 const MOVED = 'moved';
 
-AFRAME.registerComponent('movement-controls', {
+if( !AFRAME.components['movement-controls'] ){
+
+  AFRAME.registerComponent('movement-controls', {
 
     /*******************************************************************
      * Schema
@@ -218,4 +220,5 @@ AFRAME.registerComponent('movement-controls', {
       };
 
     }())
-});
+  });
+}

src/3rd/js/aframe/touch-controls.js

@@ -1,7 +1,10 @@
 /**
  * Touch-to-move-forward controls for mobile.
  */
-AFRAME.registerComponent('touch-controls', {
+
+if( !AFRAME.components['touch-controls'] ){
+
+  AFRAME.registerComponent('touch-controls', {
     schema: {
       enabled: { default: true },
       reverseEnabled: { default: true }
@@ -88,4 +91,5 @@ AFRAME.registerComponent('touch-controls', {
       //xrSession.addEventListener('selectstart', this.onTouchStart);
       //xrSession.addEventListener('selectend', this.onTouchEnd);
     }
-})
+  })
+}