Merge into dev for testing

.babelrc

@@ -39,4 +39,4 @@
     "@babel/plugin-transform-async-to-generator",
     "@babel/plugin-proposal-optional-chaining"
   ]
-}
+}

.storybook/main.js

@@ -60,6 +60,12 @@ module.exports = {
       ]
     });
 
+    config.module.rules.push({
+      test: /\.(glb|gltf)$/,
+      use: ["file-loader"],
+      include: path.resolve(__dirname, "../")
+    });
+
     return config;
   }
 };

admin/src/react-components/featured-scene-listings.js

@@ -12,11 +12,19 @@ import {
   NumberInput,
   Datagrid,
   TextField,
-  ReferenceField
+  ReferenceField,
+  Filter
 } from "react-admin";
 
+const SceneFilter = props => (
+  <Filter {...props}>
+    <TextInput label="Search Name" source="name" alwaysOn />
+    <TextInput label="Search SID" source="scene_sid" alwaysOn />
+  </Filter>
+);
+
 export const FeaturedSceneListingList = props => (
-  <List {...props} sort={{ field: "order", order: "ASC" }}>
+  <List {...props} filters={<SceneFilter />} sort={{ field: "order", order: "ASC" }}>
     <Datagrid>
       <OwnedFileImage source="screenshot_owned_file_id" />
       <OwnedFileSizeField label="Model size" source="model_owned_file_id" />

admin/src/react-components/fields.js

@@ -2,7 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { withStyles } from "@material-ui/core/styles";
 import LaunchIcon from "@material-ui/icons/Launch";
-import { getReticulumFetchUrl } from "hubs/src/utils/phoenix-utils";
+import { getReticulumFetchUrl, getAssetFetchUrl } from "hubs/src/utils/phoenix-utils";
 import { ReferenceField } from "react-admin";
 
 const styles = {
@@ -39,11 +39,15 @@ ConditionalReferenceField.propTypes = {
 };
 
 const OwnedFileImageInternal = withStyles(styles)(({ record = {}, aspect = "wide", classes }) => {
-  const src = getReticulumFetchUrl(`/files/${record.owned_file_uuid}`);
+  const src = getAssetFetchUrl(`/files/${record.owned_file_uuid}`);
   return <img src={src} className={classes[`ownedFileImageAspect_${aspect}`]} />;
 });
 
 export const OwnedFileImage = withStyles(styles)(({ basePath, record, source, aspect, classes, defaultImage }) => {
+  console.log(basePath);
+  console.log(source);
+  console.log(defaultImage);
+
   return (
     <ConditionalReferenceField
       basePath={basePath}

admin/src/react-components/pending-scenes.js

@@ -3,10 +3,17 @@ import { SceneLink, OwnedFileImage, OwnedFileSizeField, ConditionalReferenceFiel
 import { ApproveSceneButton } from "./approve-buttons";
 import { DenySceneButton } from "./deny-buttons";
 
-import { List, Datagrid, TextField, DateField } from "react-admin";
+import { List, TextInput, Datagrid, TextField, DateField, Filter } from "react-admin";
+
+const SceneFilter = props => (
+  <Filter {...props}>
+    <TextInput label="Search Name" source="name" alwaysOn />
+    <TextInput label="Search SID" source="scene_sid" alwaysOn />
+  </Filter>
+);
 
 export const PendingSceneList = props => (
-  <List {...props}>
+  <List {...props} filters={<SceneFilter />}>
     <Datagrid>
       <OwnedFileImage source="screenshot_owned_file_id" />
       <OwnedFileSizeField label="Model size" source="model_owned_file_id" />

admin/src/react-components/system-editor.js

@@ -63,25 +63,6 @@ class SystemEditorComponent extends Component {
 
     return (
       <>
-        <Card className={this.props.classes.container} style={{ border: "5px solid #ffcc00" }}>
-          <CardContent className={this.props.classes.info}>
-            <Typography variant="title" gutterBottom>
-              ⚠️ A future update will impact your Hubs Cloud deployment ⚠️
-            </Typography>
-            <Typography variant="body1" gutterBottom>
-              We will release an updated client interface for Hubs Cloud after March 25, 2021. This update significantly
-              changes the way Hubs looks, but all functionality will remain the same. For more information visit{" "}
-              <a
-                href="https://hubs.mozilla.com/docs/hubs-cloud-customizing-look-and-feel.html"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                Hubs Docs: Hubs Cloud Customizing Look and Feel
-              </a>
-              .
-            </Typography>
-          </CardContent>
-        </Card>
         <Card className={this.props.classes.container}>
           <Title title="Hubs Cloud" />
           <CardContent className={this.props.classes.info}>

admin/webpack.config.js

@@ -224,7 +224,8 @@ module.exports = (env, argv) => {
           ITA_SERVER: process.env.ITA_SERVER,
           RETICULUM_SERVER: process.env.RETICULUM_SERVER,
           CORS_PROXY_SERVER: process.env.CORS_PROXY_SERVER,
-          POSTGREST_SERVER: process.env.POSTGREST_SERVER
+          POSTGREST_SERVER: process.env.POSTGREST_SERVER,
+          BASE_ASSETS_PATH: process.env.BASE_ASSETS_PATH
         })
       })
     ]

package.json

@@ -78,11 +78,11 @@
     "@popperjs/core": "^2.4.4",
     "aframe": "github:mozillareality/aframe#hubs/master",
     "aframe-rounded": "^1.0.3",
-    "aframe-slice9-component": "^1.0.0",
+    "aframe-slice9-component": "github:takahirox/aframe-slice9-component#AlphaTest",
     "ammo-debug-drawer": "github:infinitelee/ammo-debug-drawer",
     "ammo.js": "github:mozillareality/ammo.js#hubs/master",
     "animejs": "github:mozillareality/anime#hubs/master",
-    "buffered-interpolation": "^0.2.5",
+    "buffered-interpolation": "github:Infinitelee/buffered-interpolation",
     "classnames": "^2.2.5",
     "color": "^3.1.2",
     "copy-to-clipboard": "^3.0.8",
@@ -135,15 +135,16 @@
     "screenfull": "^4.0.1",
     "sdp-transform": "^2.14.1",
     "semver": "^7.3.2",
-    "three": "github:mozillareality/three.js#hubs/master",
-    "three-ammo": "^1.0.12",
+    "three": "^0.128.0",
+    "three-ammo": "github:infinitelee/three-ammo",
     "three-bmfont-text": "github:mozillareality/three-bmfont-text#hubs/master",
-    "three-mesh-bvh": "^0.1.2",
-    "three-pathfinding": "github:MozillaReality/three-pathfinding#hubs/master2",
+    "three-mesh-bvh": "^0.3.7",
+    "three-pathfinding": "^0.14.1",
     "three-to-ammo": "github:infinitelee/three-to-ammo",
     "use-clipboard-copy": "^0.1.2",
     "uuid": "^3.2.1",
     "webrtc-adapter": "^7.7.0",
+    "webxr-polyfill": "^2.0.3",
     "zip-loader": "^1.1.0"
   },
   "devDependencies": {

src/avatar.js

@@ -1,4 +1,3 @@
-import "./webxr-bypass-hacks";
 // We should technically be able to just include three here, but our dependancies are tangled such that not having aframe is a bit difficult
 import "./utils/theme";
 console.log(`Hubs version: ${process.env.BUILD_VERSION || "?"}`);