Merge pull request #88 from spacesvr/dev

v2.0.1

Author: spacesvr

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacesvr",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": true,
   "description": "A standardized reality for future of the 3D Web",
   "keywords": [
@@ -61,8 +61,7 @@
   "peerDependencies": {
     "react": ">=18.1",
     "react-dom": ">=18.1",
-    "three": ">=0.139.2",
-    "three-stdlib": ">=2.0"
+    "three": ">=0.139.2"
   },
   "devDependencies": {
     "@babel/core": "^7.18.2",

src/layers/Environment/index.tsx

@@ -9,7 +9,6 @@ import { Props as ContainerProps } from "@react-three/fiber/dist/declarations/sr
 import { VRCanvas } from "@react-three/xr";
 import { defaultCanvasProps } from "./logic/canvas";
 import { EnvironmentContext, useEnvironmentState } from "./logic/environment";
-import KillEnterVRButton from "./ui/KillEnterVRButton";
 export * from "./logic/environment";
 
 export type EnvironmentProps = {
@@ -46,7 +45,6 @@ export function Environment(props: EnvironmentLayerProps) {
           <Crosshair />
         </EnvironmentContext.Provider>
         <VRCanvas {...defaultCanvasProps} {...canvasProps}>
-          <KillEnterVRButton />
           <EnvironmentContext.Provider value={state}>
             <RegisterMenuItems />
             {children}

src/layers/Environment/logic/environment.ts

@@ -6,9 +6,10 @@ import {
   useRef,
   useState,
 } from "react";
-import { MenuItem } from "./menu";
 import { Device, DeviceState, useDevice } from "./device";
 
+export type MenuItem = { text: string; action: () => void };
+
 export type PauseEvent = (p: boolean) => void;
 export type EnvironmentState = {
   paused: boolean;

src/layers/Environment/logic/menu.tsx

@@ -1,11 +1,9 @@
-import { useEnvironment } from "../logic/environment";
+import { MenuItem, useEnvironment } from "../logic/environment";
 import { useThree } from "@react-three/fiber";
 import { XRSession } from "three";
 import { useEffect, useRef, useState } from "react";
 import { isMobile } from "react-device-detect";
 
-export type MenuItem = { text: string; action: () => void };
-
 /**
  * Component to register menu items to the environment.
  * Needs to be a component because it needs access to the three context to run
@@ -17,8 +15,6 @@ export function RegisterMenuItems() {
   const vrMenu = useVRMenuItem();
   const fsMenu = useFsMenuItem();
 
-  //TODO: too many re-renders
-
   useEffect(() => {
     const arr: MenuItem[] = [];
 

src/layers/Environment/ui/GlobalStyles.tsx

@@ -28,6 +28,13 @@ const globalStyles = css`
       font-size: 24px;
     }
   }
+
+  // used to remove the "enter vr" button from react-xr
+  body > button,
+  body > a {
+    display: none;
+    pointer-events: none;
+  }
 `;
 
 export default function GlobalStyles() {

src/layers/Environment/ui/KillEnterVRButton.tsx

@@ -10,9 +10,8 @@ import {
   Title,
   Window,
 } from "./components/components";
-import { MenuItem } from "../../logic/menu";
-import { useKeyboardLayout } from "./logic/keyboard";
-import { useEnvironment } from "../../logic/environment";
+import { useKeyboardLayout } from "../../../../logic/keyboard";
+import { MenuItem, useEnvironment } from "../../logic/environment";
 import { Idea } from "../../../basis";
 
 type PauseItem = Omit<MenuItem, "action"> & {
@@ -49,7 +48,7 @@ export default function PauseMenu(props: PauseMenuProps) {
   const PAUSE_ITEMS: PauseItem[] = [
     ...pauseMenuItems,
     {
-      text: "v2.0.0",
+      text: "v2.0.1",
       link: "https://www.npmjs.com/package/spacesvr",
     },
     ...menuItems,

src/layers/Environment/ui/PauseMenu/index.tsx

@@ -1,2 +1,5 @@
 export * from "./collision";
+export * from "./dom";
+export * from "./keyboard";
+export * from "./keys";
 export * from "./limiter";