Fixed 8frame 1.5.0 to include additional cherry picks and redo the commits made.

package.json

@@ -6,7 +6,7 @@
   "main": "dist/aframe-master.js",
   "scripts": {
     "dev": "cross-env INSPECTOR_VERSION=dev webpack serve --port 8080",
-    "dist": "node scripts/updateVersionLog.js && npm run dist:min && npm run dist:max",
+    "dist": "node scripts/updateVersionLog.js && node scripts/buildTo.js",
     "dist:max": "webpack --config webpack.config.js",
     "dist:min": "webpack --config webpack.prod.config.js",
     "docs": "markserv --dir docs --port 9001",

scripts/buildTo.js

@@ -0,0 +1,15 @@
+var execSync = require('child_process').execSync;
+var pkg = require('../package.json');
+
+var name = process.argv[2] || '8frame-master';
+
+console.log('Building 8frame as:', name);
+
+const distMin = pkg.scripts['dist:min'] + ` --output-filename ${name}.min.js`;
+const distMax = pkg.scripts['dist:max'] + ` --output-filename ${name}.js`;
+
+console.log('>', distMin);
+execSync(distMin, {stdio: 'inherit'});
+
+console.log('>', distMax);
+execSync(distMax, {stdio: 'inherit'});

scripts/updateVersionLog.js

@@ -10,8 +10,8 @@ const contents = fs.readFileSync('./src/index.js', 'utf-8');
 const timestamp = getBuildTimestamp();
 gitRev.short(hash => {
   const newContents = contents.replace(
-    /console.log\('A-Frame Version:.*\)/,
-    `console.log('A-Frame Version: ${pkg.version} (Date ${timestamp}, Commit #${hash})')`);
+    /console.log\('8-Frame Version:.*\)/,
+    `console.log('8-Frame Version: ${pkg.version} (Date ${timestamp}, Commit #${hash})')`);
   fs.writeFileSync('./src/index.js', newContents);
 });
 

src/components/look-controls.js

@@ -60,13 +60,11 @@ module.exports.Component = registerComponent('look-controls', {
       magicWindowControls = this.magicWindowControls = new THREE.DeviceOrientationControls(this.magicWindowObject);
       if (typeof DeviceOrientationEvent !== 'undefined' && DeviceOrientationEvent.requestPermission) {
         magicWindowControls.enabled = false;
-        if (this.el.sceneEl.components['device-orientation-permission-ui'].permissionGranted) {
+        // we removed 'device-orientation-permission-ui' as a default enabled component.  This is
+        // a VR specific component.
+        this.el.sceneEl.addEventListener('deviceorientationpermissiongranted', function () {
           magicWindowControls.enabled = data.magicWindowTrackingEnabled;
-        } else {
-          this.el.sceneEl.addEventListener('deviceorientationpermissiongranted', function () {
-            magicWindowControls.enabled = data.magicWindowTrackingEnabled;
-          });
-        }
+        });
       }
     }
   },

src/components/material.js

@@ -135,7 +135,7 @@ module.exports.Component = registerComponent('material', {
     material.opacity = data.opacity;
     material.flatShading = data.flatShading;
     material.side = parseSide(data.side);
-    material.transparent = data.transparent !== false || data.opacity < 1.0;
+    material.transparent = data.transparent !== false || data.opacity < 1.0 || data.shader === 'shadow';
     material.vertexColors = data.vertexColorsEnabled;
     material.visible = data.visible;
     material.blending = parseBlending(data.blending);

src/core/component.js

@@ -651,6 +651,11 @@ module.exports.registerComponent = function (name, definition) {
   });
 
   if (components[name]) {
+    if (name === 'xrweb') {
+      warn('xrweb component is being registered multiple times.');
+      return components[name];
+    }
+
     throw new Error('The component `' + name + '` has been already registered. ' +
                     'Check that you are not loading two versions of the same component ' +
                     'or two different components of the same name.');

src/core/scene/a-scene.js

@@ -90,8 +90,6 @@ class AScene extends AEntity {
     this.setAttribute('inspector', '');
     this.setAttribute('keyboard-shortcuts', '');
     this.setAttribute('screenshot', '');
-    this.setAttribute('xr-mode-ui', '');
-    this.setAttribute('device-orientation-permission-ui', '');
     super.connectedCallback();
 
     // Renderer initialization
@@ -149,10 +147,9 @@ class AScene extends AEntity {
   }
 
   attachedCallbackPostCamera () {
-    var resize;
     var self = this;
 
-    window.addEventListener('load', resize);
+    window.addEventListener('load', self.resize);
     window.addEventListener('resize', function () {
       // Workaround for a Webkit bug (https://bugs.webkit.org/show_bug.cgi?id=170595)
       // where the window does not contain the correct viewport size
@@ -165,14 +162,15 @@ class AScene extends AEntity {
         self.resize();
       }
     });
-    const onPlay = () => {
-      this.play();
+
+    function onPlay () {
+      self.play();
 
       // Add to scene index.
-      scenes.push(this);
-    };
+      scenes.push(self);
+    }
 
-    window.XR ? onPlay() : window.addEventListener('xrloaded', onPlay);
+    window.XR8 ? onPlay() : window.addEventListener('xrloaded', onPlay);
   }
 
   /**
@@ -599,7 +597,8 @@ class AScene extends AEntity {
       antialias: !isMobile,
       canvas: this.canvas,
       logarithmicDepthBuffer: false,
-      powerPreference: 'high-performance'
+      powerPreference: 'high-performance',
+      preserveDrawingBuffer: true
     };
 
     this.maxCanvasSize = {height: 1920, width: 1920};
@@ -628,6 +627,10 @@ class AScene extends AEntity {
         rendererConfig.multiviewStereo = rendererAttr.multiviewStereo === 'true';
       }
 
+      if (rendererAttr.preserveDrawingBuffer) {
+        rendererConfig.preserveDrawingBuffer = rendererAttr.preserveDrawingBuffer === 'true';
+      }
+
       this.maxCanvasSize = {
         width: rendererAttr.maxCanvasWidth
           ? parseInt(rendererAttr.maxCanvasWidth)

src/core/scene/loadingScreen.js

@@ -15,7 +15,7 @@ module.exports.setup = function setup (el, getCanvasSize) {
   var loaderAttribute = sceneEl.hasAttribute(ATTR_NAME) ? styleParser.parse(sceneEl.getAttribute(ATTR_NAME)) : undefined;
   var dotsColor = loaderAttribute && loaderAttribute.dotsColor || 'white';
   var backgroundColor = loaderAttribute && loaderAttribute.backgroundColor || '#24CAFF';
-  var loaderEnabled = loaderAttribute === undefined || loaderAttribute.enabled === 'true' || loaderAttribute.enabled === undefined; // true default
+  var loaderEnabled = loaderAttribute && (loaderAttribute.enabled === 'true' || loaderAttribute.enabled === undefined); // Disabled by default
   var loaderScene;
   var sphereGeometry;
   var sphereMaterial;

src/core/scene/metaTags.js

@@ -11,9 +11,7 @@ var MOBILE_HEAD_TAGS = module.exports.MOBILE_HEAD_TAGS = [
 
 var MOBILE_IOS_HEAD_TAGS = [
   // iOS-specific meta tags for fullscreen when pinning to homescreen.
-  Meta({name: 'apple-mobile-web-app-capable', content: 'yes'}),
-  Meta({name: 'apple-mobile-web-app-status-bar-style', content: 'black'}),
-  Link({rel: 'apple-touch-icon', href: 'https://aframe.io/images/aframe-logo-152.png'})
+  Meta({name: 'apple-mobile-web-app-capable', content: 'no'})
 ];
 
 function Meta (attrs) {

src/index.js

@@ -92,7 +92,7 @@ require('./core/a-mixin');
 require('./extras/components/');
 require('./extras/primitives/');
 
-console.log('A-Frame Version: 1.5.0 (Date 2024-08-06, Commit #80e4b39a)');
+console.log('8-Frame Version: 1.5.0 (Date 2024-08-08, Commit #0ed964cd)');
 console.log('THREE Version (https://github.com/supermedium/three.js):',
             pkg.dependencies['super-three']);
 console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);
@@ -123,3 +123,8 @@ module.exports = window.AFRAME = {
   utils: utils,
   version: pkg.version
 };
+
+// If 8frame loads after XR8, manually register the component
+if (window.XR8) {
+  window.AFRAME.registerComponent('xrweb', window.XR8.AFrame.xrwebComponent());
+}

src/utils/device.js

@@ -33,7 +33,9 @@ if (isWebXRAvailable) {
       return;
     }
     if (sceneEl.hasLoaded) {
-      sceneEl.components['xr-mode-ui'].updateEnterInterfaces();
+      if (sceneEl.components['xr-mode-ui']) {
+        sceneEl.components['xr-mode-ui'].updateEnterInterfaces();
+      }
     } else {
       sceneEl.addEventListener('loaded', updateEnterInterfaces);
     }