Merge pull request #80 from spacesvr/dev

v1.9.1

Author: spacesvr

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacesvr",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "private": true,
   "description": "An Environment for WebXR Spaces",
   "keywords": [

src/ideas/components/Image.tsx

@@ -51,7 +51,6 @@ function UnsuspensedImage(props: ImageProps) {
           thickness={frameWidth}
           material={frameMaterial}
           innerFrameMaterial={innerFrameMaterial}
-          transparent={transparent}
         />
       )}
     </group>

src/ideas/misc/Frame.tsx

@@ -13,7 +13,6 @@ type FrameProps = {
   thickness?: number;
   material?: Material;
   innerFrameMaterial?: Material;
-  transparent?: boolean;
 };
 
 /**
@@ -33,7 +32,6 @@ export default function Frame(props: FrameProps) {
     height,
     thickness = 1,
     material: passedMaterial,
-    transparent = false,
     innerFrameMaterial,
   } = props;
 
@@ -102,11 +100,7 @@ export default function Frame(props: FrameProps) {
       0
     );
 
-    const geos = [topFrame, bottomFrame, leftFrame, rightFrame];
-
-    if (!innerFrameMaterial && !transparent) {
-      geos.unshift(backPanel);
-    }
+    const geos = [backPanel, topFrame, bottomFrame, leftFrame, rightFrame];
 
     const geo = BufferGeometryUtils.mergeBufferGeometries(geos);
 
@@ -117,7 +111,7 @@ export default function Frame(props: FrameProps) {
     rightFrame.dispose();
 
     return geo;
-  }, [innerFrameMaterial, transparent, borderThickness, width, height]);
+  }, [innerFrameMaterial, borderThickness, width, height]);
 
   const backFrameGeometry = useMemo<BufferGeometry | undefined>(() => {
     if (!innerFrameMaterial) return undefined;

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

@@ -53,7 +53,7 @@ export default function PauseMenu(props: PauseMenuProps) {
   const PAUSE_ITEMS: PauseItem[] = [
     ...pauseMenuItems,
     {
-      text: "v1.9.0",
+      text: "v1.9.1",
       link: "https://www.npmjs.com/package/spacesvr",
     },
     ...menuItems,

src/layers/reality/utils/menu.tsx

@@ -34,7 +34,7 @@ export function RegisterMenuItems() {
 
 export const useVRMenuItem = (): MenuItem | undefined => {
   const gl = useThree((state) => state.gl);
-  const { setDevice } = useEnvironment();
+  const { setDevice, setPaused } = useEnvironment();
 
   // @ts-ignore
   const xr = navigator.xr;
@@ -67,13 +67,15 @@ export const useVRMenuItem = (): MenuItem | undefined => {
       await gl.xr.setSession(sesh);
       setText("Exit VR");
       setDevice("xr");
+      setPaused(false);
       session.current = sesh;
     }
 
     function onSessionEnded() {
       session.current?.removeEventListener("end", onSessionEnded);
       setDevice(isMobile ? "mobile" : "desktop");
       setText("Enter VR");
+      setPaused(true);
       session.current = undefined;
     }