spoint 0.1.61 → 0.1.63

package/client/{ARControls.js → XRControls.js}

@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 
-export class ARControls {
+export class XRControls {
   constructor(options = {}) {
     this.enabled = false
     this.options = {
@@ -57,13 +57,13 @@ export class ARControls {
 
   async init(renderer) {
     if (!navigator.xr) {
-      console.warn('[AR] WebXR not supported')
+      console.warn('[XR] WebXR not supported')
       return false
     }
 
     const isSupported = await navigator.xr.isSessionSupported('immersive-ar')
     if (!isSupported) {
-      console.warn('[AR] immersive-ar not supported')
+      console.warn('[XR] immersive-ar not supported')
       return false
     }
 
@@ -96,10 +96,10 @@ export class ARControls {
       this.session.addEventListener('planesdetected', (e) => this.onPlanesDetected(e))
 
       this.enabled = true
-      console.log('[AR] Session started')
+      console.log('[XR] Session started')
       return true
     } catch (err) {
-      console.error('[AR] Failed to start session:', err)
+      console.error('[XR] Failed to start session:', err)
       return false
     }
   }
@@ -116,7 +116,7 @@ export class ARControls {
     this.hitTestSource = null
     this.planeDetected = false
     this.anchorPlaced = false
-    console.log('[AR] Session ended')
+    console.log('[XR] Session ended')
   }
 
   onPlanesDetected(event) {
@@ -180,7 +180,7 @@ export class ARControls {
     this.anchorRotation.copy(this.reticle.quaternion)
     this.anchorPlaced = true
     this.hideReticle()
-    console.log('[AR] Anchor placed at:', this.anchorPosition)
+    console.log('[XR] Anchor placed at:', this.anchorPosition)
     return true
   }
 
@@ -200,7 +200,7 @@ export class ARControls {
     this.anchorRotation.copy(this.cameraQuaternion)
     this.anchorPlaced = true
     this.hideReticle()
-    console.log('[AR] Anchor placed at camera:', this.anchorPosition)
+    console.log('[XR] Anchor placed at camera:', this.anchorPosition)
     return true
   }
 
@@ -233,7 +233,7 @@ export class ARControls {
     this.anchorRotation.copy(yawQuat)
     this.anchorPlaced = true
     this.hideReticle()
-    console.log('[AR] Set initial FPS position:', this.anchorPosition)
+    console.log('[XR] Set initial FPS position:', this.anchorPosition)
     return true
   }
 
@@ -258,7 +258,7 @@ export class ARControls {
   }
 }
 
-export async function createARButton(renderer, onStart, onEnd) {
+export async function createXRButton(renderer, onStart, onEnd) {
   if (!navigator.xr) return null
 
   const isSupported = await navigator.xr.isSessionSupported('immersive-ar')
@@ -288,7 +288,7 @@ export async function createARButton(renderer, onStart, onEnd) {
     if (onStart) {
       const started = await onStart()
       if (started) {
-        button.textContent = 'Exit AR'
+        button.textContent = 'Exit XR'
         button.style.background = 'rgba(150, 0, 0, 0.8)'
         if (onEnd) {
           button.onclick = onEnd

package/client/app.js

@@ -18,7 +18,7 @@ import { LoadingManager } from './LoadingManager.js'
 import { fetchCached } from './ModelCache.js'
 import { createLoadingScreen } from './createLoadingScreen.js'
 import { MobileControls, detectDevice } from './MobileControls.js'
-import { ARControls, createARButton } from './ARControls.js'
+import { XRControls, createXRButton } from './XRControls.js'
 
 const loadingMgr = new LoadingManager()
 const loadingScreen = createLoadingScreen(loadingMgr)
@@ -89,7 +89,7 @@ let vignetteOpacity = 0
 let vignetteTargetOpacity = 0
 
 let mobileControls = null
-let arControls = null
+let xrControls = null
 let arButton = null
 let arEnabled = false
 const deviceInfo = detectDevice()
@@ -104,8 +104,8 @@ if (deviceInfo.isMobile) {
   console.log('[Mobile] Touch controls initialized:', deviceInfo)
 }
 
-arControls = new ARControls({ placementMode: true, planeDetection: true })
-const arReticle = arControls.createReticle()
+xrControls = new XRControls({ placementMode: true, planeDetection: true })
+const arReticle = xrControls.createReticle()
 scene.add(arReticle)
 
 function createLaserPointer() {
@@ -1199,10 +1199,10 @@ function initInputHandler() {
 }
 
 async function initAR() {
-  const supported = await arControls.init(renderer)
+  const supported = await xrControls.init(renderer)
   if (supported) {
-    arButton = await createARButton(renderer, async () => {
-      const started = await arControls.start()
+    arButton = await createXRButton(renderer, async () => {
+      const started = await xrControls.start()
       if (started) {
         arEnabled = true
         scene.background = null
@@ -1213,7 +1213,7 @@ async function initAR() {
       }
       return false
     }, async () => {
-      await arControls.end()
+      await xrControls.end()
       arEnabled = false
       scene.background = new THREE.Color(0x87ceeb)
       ground.visible = true
@@ -1566,10 +1566,10 @@ function animate(timestamp) {
   if (arEnabled) {
     const xrFrame = renderer.xr.getFrame()
     if (xrFrame) {
-      arControls.update(xrFrame, camera, scene)
+      xrControls.update(xrFrame, camera, scene)
       const arLocal = playerStates.get(client.playerId)
-      if (arLocal?.position && !arControls.anchorPlaced) {
-        arControls.setInitialFPSPosition(arLocal.position, cam.yaw)
+      if (arLocal?.position && !xrControls.anchorPlaced) {
+        xrControls.setInitialFPSPosition(arLocal.position, cam.yaw)
       }
     }
   }
@@ -1583,11 +1583,11 @@ setupControllers()
 setupHands()
 window.__VR_DEBUG__ = false
 window.debug = {
-  scene, camera, renderer, client, playerMeshes, entityMeshes, appModules, inputHandler, playerVrms, playerAnimators, loadingMgr, loadingScreen, controllerModels, controllerGrips, handModels, mobileControls, arControls,
+  scene, camera, renderer, client, playerMeshes, entityMeshes, appModules, inputHandler, playerVrms, playerAnimators, loadingMgr, loadingScreen, controllerModels, controllerGrips, handModels, mobileControls, xrControls,
   enableVRDebug: () => { window.__VR_DEBUG__ = true; console.log('[VR] Debug enabled - button/axis logging active') },
   disableVRDebug: () => { window.__VR_DEBUG__ = false; console.log('[VR] Debug disabled') },
   vrInput: () => inputHandler?.getInput() || null,
   vrSettings: () => vrSettings,
   deviceInfo: () => deviceInfo,
-  placeARAnchor: () => arControls?.placeAnchor() || arControls?.placeAtCamera()
+  placeARAnchor: () => xrControls?.placeAnchor() || xrControls?.placeAtCamera()
 }

package/client/camera.js

@@ -37,6 +37,7 @@ export function createCameraController(camera, scene) {
   let editCamSpeed = 8
   const envMeshes = []
   let fpsRayTimer = 0, tpsRayTimer = 0, cachedClipDist = 10, cachedAimPoint = null
+  let fpsPushX = 0, fpsPushY = 0, fpsPushZ = 0
   let cameraBone = null
   let headBone = null
   let headBoneHidden = false
@@ -150,12 +151,16 @@ export function createCameraController(camera, scene) {
       } else {
         camera.position.copy(camTarget)
       }
+      camera.position.x += fpsPushX
+      camera.position.y += fpsPushY
+      camera.position.z += fpsPushZ
       if (headBone && !headBoneHidden) { headBone.scale.set(0, 0, 0); headBoneHidden = true }
       const wallDist = 0.35
       const fwdWallDist = 0.25
       fpsRayTimer += frameDt
       if (fpsRayTimer >= 0.05 && envMeshes.length) {
         fpsRayTimer = 0
+        fpsPushX = 0; fpsPushY = 0; fpsPushZ = 0
         _fpsRayOrigin.copy(camera.position)
         _fpsRayDir.set(-fwdX, -fwdY, -fwdZ)
         camRaycaster.set(_fpsRayOrigin, _fpsRayDir)
@@ -166,6 +171,9 @@ export function createCameraController(camera, scene) {
           if (localMesh && isDescendant(hit.object, localMesh)) continue
           const push = wallDist - hit.distance
           if (push > 0) {
+            fpsPushX += fwdX * push
+            fpsPushY += fwdY * push
+            fpsPushZ += fwdZ * push
             camera.position.x += fwdX * push
             camera.position.y += fwdY * push
             camera.position.z += fwdZ * push
@@ -181,6 +189,9 @@ export function createCameraController(camera, scene) {
           if (localMesh && isDescendant(hit.object, localMesh)) continue
           const push = fwdWallDist - hit.distance
           if (push > 0) {
+            fpsPushX -= fwdX * push
+            fpsPushY -= fwdY * push
+            fpsPushZ -= fwdZ * push
             camera.position.x -= fwdX * push
             camera.position.y -= fwdY * push
             camera.position.z -= fwdZ * push

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spoint",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "description": "Physics and netcode SDK for multiplayer game servers",
   "type": "module",
   "main": "src/index.js",

package/src/client/InputHandler.js

@@ -248,17 +248,19 @@ export class InputHandler {
       const primaryY = axes[1] ?? 0
       const secondaryX = axes.length > 2 ? (axes[2] ?? 0) : 0
       const secondaryY = axes.length > 3 ? (axes[3] ?? 0) : 0
+      const moveX = axes.length > 2 ? secondaryX : primaryX
+      const moveY = axes.length > 3 ? secondaryY : primaryY
 
       if (source.handedness === 'left') {
-        if (Math.abs(primaryX) > DEAD) {
-          analogRight = primaryX
-          if (primaryX > THRESH) right = true
-          if (primaryX < -THRESH) left = true
+        if (Math.abs(moveX) > DEAD) {
+          analogRight = moveX
+          if (moveX > THRESH) right = true
+          if (moveX < -THRESH) left = true
         }
-        if (Math.abs(primaryY) > DEAD) {
-          analogForward = -primaryY
-          if (primaryY < -THRESH) forward = true
-          if (primaryY > THRESH) backward = true
+        if (Math.abs(moveY) > DEAD) {
+          analogForward = -moveY
+          if (moveY < -THRESH) forward = true
+          if (moveY > THRESH) backward = true
         }
 
         if (btns[0]?.pressed) jump = true

package/src/client/MessageHandler.js

@@ -56,15 +56,14 @@ export class MessageHandler {
     const oldPlayerId = this._playerId
     this._playerId = payload.playerId
     this._currentTick = payload.tick
-    if (oldPlayerId && oldPlayerId !== this._playerId) {
-      snapProc?.removePlayer(oldPlayerId)
-      if (this._smoothInterp) this._smoothInterp.removePlayer(oldPlayerId)
-      this._callbacks.onPlayerLeft?.(oldPlayerId)
-    }
-    if (!this._predEngine) {
-      this._predEngine = new PredictionEngine(this._config.tickRate || 128)
-      this._predEngine.init(this._playerId)
+    snapProc?.clear()
+    if (this._smoothInterp) {
+      this._smoothInterp.reset()
+      this._smoothInterp.setLocalPlayer(this._playerId)
     }
+    if (oldPlayerId) this._callbacks.onPlayerLeft?.(oldPlayerId)
+    this._predEngine = new PredictionEngine(this._config.tickRate || 128)
+    this._predEngine.init(this._playerId)
     if (this._config.smoothInterpolation !== false && !this._smoothInterp) {
       this._smoothInterp = new SmoothInterpolation({ predictionEnabled: this._config.predictionEnabled !== false })
       this._smoothInterp.setLocalPlayer(this._playerId)