spoint 0.1.82 → 0.1.83

package/apps/world/index.js

@@ -2,6 +2,7 @@ export default {
   port: 3001,
   tickRate: 128,
   gravity: [0, -9.81, 0],
+  relevanceRadius: 150,
   movement: {
     maxSpeed: 4.0,
     groundAccel: 10.0,
@@ -58,8 +59,19 @@ export default {
     fadeTime: 0.15
   },
   entities: [
-    { id: 'environment', model: './apps/tps-game/schwust.glb', position: [0, 0, 0], app: 'environment' }
+    { id: 'env-schwust',   model: './apps/tps-game/schwust.glb',          position: [0,   0, 0], app: 'environment' },
+    { id: 'env-kosova',    model: './apps/maps/aim_kosova_ak47.glb',       position: [200, 0, 0], app: 'environment' },
+    { id: 'env-sillos',    model: './apps/maps/aim_sillos.glb',            position: [400, 0, 0], app: 'environment' },
+    { id: 'env-dust2',     model: './apps/maps/de_dust2_kosovo.glb',       position: [600, 0, 0], app: 'environment' },
+    { id: 'env-gash',      model: './apps/maps/de_gash.glb',               position: [800, 0, 0], app: 'environment' }
   ],
-  playerModel: './apps/tps-game/cleetus.vrm',
-  spawnPoint: [-30, 7.6, -30]
+  spawnPoints: [
+    [-30,  20, -30],
+    [212,  20,  12],
+    [412,  20,  12],
+    [612,  20,  12],
+    [812,  20,  12]
+  ],
+  spawnPoint: [-30, 20, -30],
+  playerModel: './apps/tps-game/cleetus.vrm'
 }

package/package.json

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

package/src/sdk/BotHarness.js

@@ -2,12 +2,12 @@ import { WebSocket } from 'ws'
 import { pack, unpack } from '../protocol/msgpack.js'
 
 const CONFIG = {
-  botCount: 100,
-  durationMs: 60000,
-  inputHz: 60,
+  botCount: parseInt(process.env.BOT_COUNT || '100'),
+  durationMs: parseInt(process.env.BOT_DURATION || '60000'),
+  inputHz: parseInt(process.env.BOT_HZ || '60'),
   serverUrl: process.env.BOT_URL || 'ws://localhost:3001/ws',
-  batchSize: 10,
-  batchDelayMs: 200
+  batchSize: parseInt(process.env.BOT_BATCH || '20'),
+  batchDelayMs: parseInt(process.env.BOT_DELAY || '100')
 }
 
 const MSG_INPUT = 0x11

package/src/sdk/ServerAPI.js

@@ -33,7 +33,9 @@ export function createServerAPI(ctx) {
 
     async loadWorld(worldDef) {
       ctx.currentWorldDef = worldDef
-      if (worldDef.spawnPoint) ctx.worldSpawnPoint = [...worldDef.spawnPoint]
+      if (worldDef.spawnPoints?.length) ctx.worldSpawnPoints = worldDef.spawnPoints
+      else if (worldDef.spawnPoint) ctx.worldSpawnPoints = [worldDef.spawnPoint]
+      ctx.worldSpawnPoint = ctx.worldSpawnPoints?.[0] || worldDef.spawnPoint || [0, 5, 0]
       await appLoader.loadAll()
       const stage = stageLoader.loadFromDefinition('main', worldDef)
       return { entities: new Map(), apps: new Map(), count: stage.entityCount }

package/src/sdk/ServerHandlers.js

@@ -5,7 +5,8 @@ export function createConnectionHandlers(ctx) {
   const { tickSystem, playerManager, networkState, lagCompensator, physicsIntegration, connections, sessions, appLoader, appRuntime, emitter, inspector } = ctx
 
   function onClientConnect(transport) {
-    const sp = [...ctx.worldSpawnPoint]
+    const spawnPoints = ctx.worldSpawnPoints || [ctx.worldSpawnPoint]
+    const sp = [...spawnPoints[Math.floor(Math.random() * spawnPoints.length)]]
     const playerConfig = ctx.currentWorldDef?.player || {}
     const playerId = playerManager.addPlayer(transport, { position: sp, health: playerConfig.health })
     networkState.addPlayer(playerId, { position: sp })

package/src/sdk/TickHandler.js

@@ -5,13 +5,13 @@ import { isUnreliable } from '../protocol/MessageTypes.js'
 import { applyMovement as _applyMovement, DEFAULT_MOVEMENT as _DEFAULT_MOVEMENT } from '../shared/movement.js'
 
 const KEYFRAME_INTERVAL = 128
-const SNAP_GROUPS = 4
+const MAX_SENDS_PER_TICK = 25
 
 export function createTickHandler(deps) {
   const {
     networkState, playerManager, physicsIntegration,
     lagCompensator, physics, appRuntime, connections,
-    movement: m = {}, stageLoader, eventLog, _movement
+    movement: m = {}, stageLoader, eventLog, _movement, getRelevanceRadius
   } = deps
   const applyMovement = _movement?.applyMovement || _applyMovement
   const DEFAULT_MOVEMENT = _movement?.DEFAULT_MOVEMENT || _DEFAULT_MOVEMENT
@@ -119,12 +119,15 @@ export function createTickHandler(deps) {
       const playerSnap = networkState.getSnapshot()
       snapshotSeq++
       const isKeyframe = snapshotSeq % KEYFRAME_INTERVAL === 0
-      const curGroup = tick % SNAP_GROUPS
+      const snapGroups = Math.max(1, Math.ceil(players.length / MAX_SENDS_PER_TICK))
+      const curGroup = tick % snapGroups
 
-      if (stageLoader && stageLoader.getActiveStage()) {
-        const relevanceRadius = stageLoader.getActiveStage().spatial.relevanceRadius
+      const relevanceRadius = (stageLoader && stageLoader.getActiveStage())
+        ? stageLoader.getActiveStage().spatial.relevanceRadius
+        : (getRelevanceRadius ? getRelevanceRadius() : 0)
+      if (relevanceRadius > 0) {
         for (const player of players) {
-          if (!isKeyframe && player.id % SNAP_GROUPS !== curGroup) continue
+          if (!isKeyframe && player.id % snapGroups !== curGroup) continue
           const entitySnap = appRuntime.getSnapshotForPlayer(player.state.position, relevanceRadius)
           const combined = { tick: playerSnap.tick, timestamp: playerSnap.timestamp, players: playerSnap.players, entities: entitySnap.entities }
           const prevMap = (isKeyframe || !playerEntityMaps.has(player.id)) ? new Map() : playerEntityMaps.get(player.id)
@@ -140,7 +143,7 @@ export function createTickHandler(deps) {
         broadcastEntityMap = entityMap
         const data = pack({ type: MSG.SNAPSHOT, payload: { seq: snapshotSeq, ...encoded } })
         for (const player of players) {
-          if (!isKeyframe && player.id % SNAP_GROUPS !== curGroup) continue
+          if (!isKeyframe && player.id % snapGroups !== curGroup) continue
           connections.sendPacked(player.id, data, snapUnreliable)
         }
       }

package/src/sdk/server.js

@@ -171,7 +171,8 @@ export async function createServer(config = {}) {
     connections,
     movement,
     stageLoader,
-    eventLog
+    eventLog,
+    getRelevanceRadius: () => ctx.currentWorldDef?.relevanceRadius || 0
   }))
 
   const { onClientConnect } = createConnectionHandlers(ctx)