type improvements and integration of sem default synthetic environments

Author: bbohlender

.github/workflows/alpha.yml

@@ -49,9 +49,7 @@ jobs:
         uses: gittools/actions/gitversion/execute@v0
 
       - name: Build
-        run: |
-          pnpm -r copy
-          pnpm -F './packages/**/*' build
+        run: pnpm -F './packages/**/*' build
 
       - name: Copy README
         run: cp ./README.md packages/react/xr

.github/workflows/packages.yml

@@ -49,9 +49,7 @@ jobs:
         uses: gittools/actions/gitversion/execute@v0
 
       - name: Build
-        run: |
-          pnpm -r copy
-          pnpm -F './packages/**/*' build
+        run: pnpm -F './packages/**/*' build
 
       - name: Copy README
         run: cp ./README.md packages/react/xr

.github/workflows/static.yml

@@ -35,9 +35,7 @@ jobs:
 
       # Examples
       - name: Building Examples
-        run: |
-          pnpm -r copy
-          pnpm -r build
+        run: pnpm -r build
 
       - name: Copy Examples
         run: |

packages/xr/package.json

@@ -21,7 +21,6 @@
   "license": "SEE LICENSE IN LICENSE",
   "scripts": {
     "build": "tsc",
-    "copy": "node -e \"require('fs').copyFile(require('path').resolve(__dirname, './node_modules/@iwer/sem/captures/office_small.json'), require('path').resolve(__dirname, './src/default-environment.json'), () => {})\"",
     "check:prettier": "prettier --check src",
     "check:eslint": "eslint 'src/**/*.ts'",
     "fix:prettier": "prettier --write src",
@@ -34,10 +33,10 @@
     "three": "*"
   },
   "dependencies": {
-    "@iwer/devui": "^1.1.0",
-    "@iwer/sem": "~0.2.2",
+    "@iwer/devui": "^1.1.1",
+    "@iwer/sem": "~0.2.4",
     "@pmndrs/pointer-events": "workspace:~",
-    "iwer": "^2.0.0",
+    "iwer": "^2.0.1",
     "meshline": "^3.3.1",
     "zustand": "^4.5.2"
   },

packages/xr/src/controller/gamepad.ts

@@ -11,7 +11,7 @@ export type XRControllerGamepadComponentId =
   | `xr-standard-thumbstick`
   | `xr-standard-trigger`
   | `thumbrest`
-  | string
+  | (string & {})
 
 export type XRControllerGamepadComponentState = {
   state: 'default' | 'touched' | 'pressed'
@@ -24,10 +24,7 @@ export type XRControllerGamepadComponentState = {
 const ButtonTouchThreshold = 0.05
 const AxisTouchThreshold = 0.1
 
-export type XRControllerGamepadState = Record<
-  XRControllerGamepadComponentId,
-  XRControllerGamepadComponentState | undefined
->
+export type XRControllerGamepadState = Record<string, XRControllerGamepadComponentState | undefined>
 
 export function updateXRControllerGamepadState(
   target: XRControllerGamepadState,

packages/xr/src/controller/layout.ts

@@ -18,7 +18,7 @@ export type XRControllerVisualResponse = {
 )
 
 export type XRControllerComponent = {
-  type: 'trigger' | 'squeeze' | 'touchpad' | 'thumbstick' | 'button' | string
+  type: 'trigger' | 'squeeze' | 'touchpad' | 'thumbstick' | 'button' | (string & {})
   gamepadIndices: {
     [Key in 'button' | 'xAxis' | 'yAxis']?: number
   }

packages/xr/src/emulate.ts

@@ -3,7 +3,6 @@ import { DevUI } from '@iwer/devui'
 import type { XRDeviceOptions } from 'iwer/lib/device/XRDevice'
 import { Euler, Quaternion, Vector3, Vector3Tuple, Vector4Tuple } from 'three'
 import { SyntheticEnvironmentModule } from '@iwer/sem'
-import defaultEnvironment from './default-environment.json' assert { type: 'json' }
 
 const configurations = { metaQuest3, metaQuest2, metaQuestPro, oculusQuest1 }
 
@@ -15,6 +14,22 @@ export type EmulatorTransformationOptions = {
   quaternion?: Quaternion | Vector4Tuple
 }
 
+export type DefaultSyntheticEnvironment =
+  | 'meeting_room'
+  | 'living_room'
+  | 'music_room'
+  | 'office_large'
+  | 'office_small'
+
+const defaultSyntheticEnvironments: Array<DefaultSyntheticEnvironment> = [
+  //default default environment:
+  'office_small',
+  'meeting_room',
+  'living_room',
+  'music_room',
+  'office_large',
+]
+
 export type EmulatorOptions =
   | EmulatorType
   | ({
@@ -24,7 +39,7 @@ export type EmulatorOptions =
       inject?: boolean | { hostname: string }
       controller?: Partial<Record<XRHandedness, EmulatorTransformationOptions>>
       hand?: Partial<Record<XRHandedness, EmulatorTransformationOptions>>
-      syntheticEnvironment?: null | boolean | JSON | string
+      syntheticEnvironment?: null | boolean | JSON | (string & {}) | DefaultSyntheticEnvironment
     } & Partial<Pick<XRDeviceOptions, 'ipd' | 'fovy' | 'stereoEnabled' | 'canvasContainer'>>)
 
 const handednessList: Array<XRHandedness> = ['left', 'none', 'right']
@@ -53,9 +68,15 @@ export function emulate(options: EmulatorOptions) {
     return xrdevice
   }
 
+  if (typeof syntheticEnvironment === 'string' && defaultSyntheticEnvironments.includes(syntheticEnvironment as any)) {
+    //load the selected default environment
+    xrdevice.sem?.loadDefaultEnvironment(syntheticEnvironment)
+    return xrdevice
+  }
+
   if (syntheticEnvironment === true || syntheticEnvironment === undefined) {
-    //load the default environment
-    xrdevice.sem?.loadEnvironment(defaultEnvironment)
+    //load the first default environment
+    xrdevice.sem?.loadDefaultEnvironment(defaultSyntheticEnvironments[0])
     return xrdevice
   }
 

packages/xr/src/plane.ts

@@ -1,15 +1,5 @@
 import { Box2, BufferGeometry, Shape, ShapeGeometry, Vector2 } from 'three'
 
-declare global {
-  type XRSemanticLabel = 'desk' | 'couch' | 'floor' | 'ceiling' | 'wall' | 'door' | 'window' | 'other' | string
-  interface XRPlane {
-    semanticLabel?: XRSemanticLabel
-  }
-  interface XRMesh {
-    semanticLabel?: XRSemanticLabel
-  }
-}
-
 export function updateXRPlaneGeometry(
   plane: XRPlane,
   geometry: (BufferGeometry & { createdAt?: number }) | undefined,