Merge pull request #65 from spacesvr/dev

v1.8.3

Author: spacesvr

README.md

@@ -10,7 +10,7 @@
      Sleek, powerful front-end framework for quickly creating cross-platform VR Websites.
 </h5>
 <p align="center">
-    <a href="https://muse.place/muse">muse.place/muse</a> · <a href="https://discord.gg/nFHrmUbaz5">discord</a>
+    <a href="https://muse.place?utm_source=npmjs">muse.place</a> · <a href="https://discord.gg/nFHrmUbaz5">discord</a>
 <p>
 <br/>
 <br/>
@@ -338,30 +338,6 @@ Makes its children react to onclick and on hover methods
 </Interactable>
 ```
 
-#### Overlay
-
-Allows for raw html to be placed inside an `Environment` component for access to
-environment state, player state, and renderer state.
-
-```jsx
-function Stuff() {
-  const { size } = useThree();
-  const { position } = usePlayer();
-
-  return (
-    <div>
-      <h1>Current player position is {position.velocity.get()}</h1>
-    </div>
-  );
-}
-
-<StandardEnvironment>
-  <Overlay>
-    <Stuff />
-  </Overlay>
-</StandardEnvironment>;
-```
-
 #### Spinning
 
 Makes its children spin

examples/package.json

@@ -2,22 +2,6 @@
   "name": "spacesvr-examples",
   "version": "0.1.0",
   "private": true,
-  "dependencies": {
-    "@react-three/drei": "^4.3.3",
-    "@react-three/fiber": "^6.0.14",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/three": "^0.127.1",
-    "customize-cra": "^1.0.0",
-    "peer": "^0.6.1",
-    "react": "0.0.0-experimental-10cc40018",
-    "react-dom": "0.0.0-experimental-10cc40018",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.0",
-    "three": "^0.127.0",
-    "web-vitals": "^0.2.4"
-  },
   "scripts": {
     "start": "react-app-rewired start",
     "start-ssl": "HTTPS=true SSL_CRT_FILE=cert.crt SSL_KEY_FILE=cert.key react-app-rewired start",
@@ -43,8 +27,24 @@
       "last 1 safari version"
     ]
   },
+  "peerDependencies": {
+    "spacesvr": ">0"
+  },
+  "dependencies": {
+    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "^12.1.10",
+    "@types/three": "^0.127.1",
+    "customize-cra": "^1.0.0",
+    "peer": "^0.6.1",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
+    "react-router-dom": "^5.2.0",
+    "react-scripts": "4.0.0",
+    "three": "^0.127.0",
+    "web-vitals": "^0.2.4"
+  },
   "devDependencies": {
-    "react-app-rewired": "^2.1.6",
-    "spacesvr": "^1.6.5"
+    "react-app-rewired": "^2.1.6"
   }
 }

examples/src/App.jsx

@@ -1,21 +1,17 @@
 import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
 import Starter from "./scenes/Starter";
-import Keyframes from "./scenes/Keyframes";
 import Multiplayer from "./scenes/Multiplayer";
 import Styled from "./scenes/Styled";
 import ManyModels from "./scenes/ManyModels";
-import Shop from "./scenes/Shop";
 
 export default () => {
   return (
     <Router>
       <Switch>
         <Route exact path="/" component={Starter} />
-        <Route exact path="/keyframes" component={Keyframes} />
         <Route exact path="/multiplayer" component={Multiplayer} />
         <Route exact path="/styled" component={Styled} />
         <Route exact path="/models" component={ManyModels} />
-        <Route exact path="/shop" component={Shop} />
       </Switch>
     </Router>
   );

examples/src/models/MichaelModel.jsx

@@ -7,6 +7,8 @@ const MichaelModel = (props) => {
     DRACO_URL
   );
 
+  gltf.scene.traverse((child) => (child.frustumCulled = false));
+
   return (
     <group {...props}>
       <primitive object={gltf.scene} />

examples/src/models/ShoppingCart.jsx

@@ -1,12 +1,15 @@
 import { DRACO_URL } from "../../../src/utils";
 import { useGLTF } from "@react-three/drei";
+import { useTrimeshCollision } from "../../../src/utils/";
 
 const Building = () => {
   const gltf = useGLTF(
     "https://d27rt3a60hh1lx.cloudfront.net/models/ShoppingCart-1613286474/cart2.glb",
     DRACO_URL
   );
 
+  useTrimeshCollision(gltf.nodes.Metal.geometry.clone());
+
   return <primitive object={gltf.scene} />;
 };
 

examples/src/scenes/Keyframes.jsx

@@ -39,7 +39,7 @@ export default () => {
   }, []);
 
   return (
-    <StandardEnvironment signup="https://bit.ly/3wgMNGO">
+    <StandardEnvironment playerProps={{ pos: [0, 2, 0] }}>
       <Background color={0xffffff} />
       <Interactable
         onClick={handleClick}