spoint 0.1.43 → 0.1.45

package/client/LoadingManager.js

@@ -79,6 +79,8 @@ export class LoadingManager extends EventTarget {
       const response = await fetch(url)
       if (!response.ok) throw new Error(`HTTP ${response.status}`)
       const contentLength = parseInt(response.headers.get('content-length') || '0', 10)
+      const isGzip = (response.headers.get('content-encoding') || '').includes('gzip')
+      const useTotal = contentLength > 0 && !isGzip
       const reader = response.body.getReader()
       const chunks = []
       let receivedLength = 0
@@ -88,7 +90,7 @@ export class LoadingManager extends EventTarget {
         if (done) break
         chunks.push(value)
         receivedLength += value.length
-        if (contentLength > 0) {
+        if (useTotal) {
           this.updateProgress(receivedLength, contentLength)
         }
       }

package/client/animation.js

@@ -123,21 +123,23 @@ function normalizeClips(gltf, vrmVersion, vrmHumanoid) {
   return clips
 }
 
-let _animLibCache = null
-let _animLibPromise = null
+let _gltfPromise = null
+let _normalizedCache = null
+
+export function preloadAnimationLibrary() {
+  if (_gltfPromise) return _gltfPromise
+  _gltfPromise = new GLTFLoader().loadAsync('/anim-lib.glb')
+  return _gltfPromise
+}
 
 export async function loadAnimationLibrary(vrmVersion, vrmHumanoid) {
-  if (_animLibCache) return _animLibCache
-  if (_animLibPromise) return _animLibPromise
-  _animLibPromise = (async () => {
-    const loader = new GLTFLoader()
-    const gltf = await loader.loadAsync('/anim-lib.glb')
-    const normalizedClips = normalizeClips(gltf, vrmVersion || '1', vrmHumanoid)
-    console.log(`[anim] Loaded animation library (${normalizedClips.size} clips):`, [...normalizedClips.keys()])
-    _animLibCache = { normalizedClips }
-    return _animLibCache
-  })()
-  return _animLibPromise
+  if (_normalizedCache) return _normalizedCache
+  const gltf = await preloadAnimationLibrary()
+  if (_normalizedCache) return _normalizedCache
+  const normalizedClips = normalizeClips(gltf, vrmVersion || '1', vrmHumanoid)
+  console.log(`[anim] Loaded animation library (${normalizedClips.size} clips):`, [...normalizedClips.keys()])
+  _normalizedCache = { normalizedClips }
+  return _normalizedCache
 }
 
 export function createPlayerAnimator(vrm, allClips, vrmVersion, animConfig = {}) {

package/client/app.js

@@ -9,7 +9,7 @@ import { VRMLoaderPlugin, VRMUtils } from '@pixiv/three-vrm'
 import { PhysicsNetworkClient, InputHandler, MSG } from '/src/index.client.js'
 import { createElement, applyDiff } from 'webjsx'
 import { createCameraController } from './camera.js'
-import { loadAnimationLibrary, createPlayerAnimator } from './animation.js'
+import { loadAnimationLibrary, preloadAnimationLibrary, createPlayerAnimator } from './animation.js'
 import { initFacialSystem } from './facial-animation.js'
 import { VRButton } from 'three/addons/webxr/VRButton.js'
 import { XRControllerModelFactory } from 'three/addons/webxr/XRControllerModelFactory.js'
@@ -713,16 +713,15 @@ function detectVrmVersion(buffer) {
 
 function initAssets(playerModelUrl) {
   loadingMgr.setStage('DOWNLOAD')
-  const animLibPromise = loadAnimationLibrary('1', null)
+  preloadAnimationLibrary()
   assetsReady = loadingMgr.fetchWithProgress(playerModelUrl).then(async b => {
     vrmBuffer = b
     loadingMgr.setStage('PROCESS')
-    animAssets = await animLibPromise
+    animAssets = await loadAnimationLibrary(detectVrmVersion(b), null)
     assetsLoaded = true
     checkAllLoaded()
   }).catch(err => {
     console.warn('[assets] player model unavailable:', err.message)
-    animLibPromise.then(r => { animAssets = r }).catch(() => {})
     assetsLoaded = true
     checkAllLoaded()
   })
@@ -978,8 +977,9 @@ function loadEntityModel(entityId, entityState) {
     fitShadowFrustum()
     pendingLoads.delete(entityId)
     if (!environmentLoaded) { environmentLoaded = true; checkAllLoaded() }
+    if (firstSnapshotEntityPending.has(entityId)) { firstSnapshotEntityPending.delete(entityId); if (firstSnapshotEntityPending.size === 0) checkAllLoaded() }
     if (loadingScreenHidden) renderer.compileAsync(scene, camera).catch(() => renderer.compile(scene, camera))
-  }, (progress) => { if (progress.total > 0) console.log('[gltf]', url, Math.round(progress.loaded / progress.total * 100) + '%') }, (err) => { console.error('[gltf]', url, err); pendingLoads.delete(entityId) })
+  }, (progress) => { if (progress.total > 0) console.log('[gltf]', url, Math.round(Math.min(progress.loaded, progress.total) / progress.total * 100) + '%') }, (err) => { console.error('[gltf]', url, err); pendingLoads.delete(entityId); if (firstSnapshotEntityPending.has(entityId)) { firstSnapshotEntityPending.delete(entityId); if (firstSnapshotEntityPending.size === 0) checkAllLoaded() } })
 }
 
 function renderAppUI(state) {
@@ -1027,7 +1027,13 @@ const client = new PhysicsNetworkClient({
     }
     rebuildEntityHierarchy(smoothState.entities)
     latestState = state
-    if (!firstSnapshotReceived) { firstSnapshotReceived = true; checkAllLoaded() }
+    if (!firstSnapshotReceived) {
+      firstSnapshotReceived = true
+      for (const e of smoothState.entities) {
+        if (e.model && !entityMeshes.has(e.id)) firstSnapshotEntityPending.add(e.id)
+      }
+      checkAllLoaded()
+    }
   },
   onPlayerJoined: (id) => { if (!playerMeshes.has(id)) createPlayerVRM(id) },
   onPlayerLeft: (id) => removePlayerMesh(id),
@@ -1092,6 +1098,7 @@ let inputLoopId = null
 let loadingScreenHidden = false
 let environmentLoaded = false
 let firstSnapshotReceived = false
+const firstSnapshotEntityPending = new Set()
 let lastShootState = false
 let lastHealth = 100
 
@@ -1124,6 +1131,7 @@ function checkAllLoaded() {
   if (!assetsLoaded) return
   if (!environmentLoaded) return
   if (!firstSnapshotReceived) return
+  if (firstSnapshotEntityPending.size > 0) return
   loadingMgr.setStage('INIT')
   loadingMgr.complete()
   loadingScreenHidden = true

package/package.json

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