Game Piece Asset Support [AARD-1902]

fission/src/mirabuf/IntakeSensorSceneObject.ts

@@ -2,6 +2,7 @@ import SceneObject from "@/systems/scene/SceneObject"
 import MirabufSceneObject, { RigidNodeAssociate } from "./MirabufSceneObject"
 import Jolt from "@azaleacolburn/jolt-physics"
 import * as THREE from "three"
+import { LAYER_GENERAL_DYNAMIC } from "@/systems/physics/PhysicsSystem"
 import World from "@/systems/World"
 import JOLT from "@/util/loading/JoltSyncLoader"
 import {
@@ -130,7 +131,8 @@ class IntakeSensorSceneObject extends SceneObject {
 
     private intakeCollision(gpID: Jolt.BodyID) {
         const associate = <RigidNodeAssociate>World.physicsSystem.getBodyAssociation(gpID)
-        if (associate?.isGamePiece) {
+        const inGPLayer = World.physicsSystem.getBody(gpID).GetObjectLayer() === LAYER_GENERAL_DYNAMIC
+        if (associate?.isGamePiece || inGPLayer) {
             associate.robotLastInContactWith = this._parentAssembly
             this._parentAssembly.setEjectable(gpID)
         }

fission/src/mirabuf/MirabufInstance.ts

@@ -227,9 +227,8 @@ class MirabufInstance {
             batchedMesh.castShadow = true
             batchedMesh.receiveShadow = true
 
-            materialBodyMap.forEach(instances => {
-                const body = instances[0]
-                instances[1].forEach(instance => {
+            materialBodyMap.forEach(([body, instances]) => {
+                instances.forEach(instance => {
                     const mat = this._mirabufParser.globalTransforms.get(instance.info!.GUID!)!
 
                     const geometry = new THREE.BufferGeometry()

fission/src/mirabuf/MirabufLoader.ts

@@ -27,12 +27,15 @@ type MapCache = { [id: MirabufCacheID]: MirabufCacheInfo }
 
 const robotsDirName = "Robots"
 const fieldsDirName = "Fields"
+const piecesDirName = "Pieces"
 const root = await navigator.storage.getDirectory()
 const robotFolderHandle = await root.getDirectoryHandle(robotsDirName, { create: true })
 const fieldFolderHandle = await root.getDirectoryHandle(fieldsDirName, { create: true })
+const pieceFolderHandle = await root.getDirectoryHandle(piecesDirName, { create: true })
 
 export let backUpRobots: MapCache = {}
 export let backUpFields: MapCache = {}
+export let backUpPieces: MapCache = {}
 
 export const canOPFS = await (async () => {
     try {
@@ -65,9 +68,11 @@ export const canOPFS = await (async () => {
 
         window.localStorage.setItem(robotsDirName, "{}")
         window.localStorage.setItem(fieldsDirName, "{}")
+        window.localStorage.setItem(piecesDirName, "{}")
 
         backUpRobots = {}
         backUpFields = {}
+        backUpPieces = {}
 
         return false
     }
@@ -99,7 +104,8 @@ class MirabufCachingService {
             return {}
         }
 
-        const key = miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName
+        const key =
+            miraType == MiraType.ROBOT ? robotsDirName : miraType == MiraType.FIELD ? fieldsDirName : piecesDirName
         const map = window.localStorage.getItem(key)
 
         if (map) {
@@ -132,7 +138,7 @@ class MirabufCachingService {
             const miraBuff = await resp.arrayBuffer()
 
             World.analyticsSystem?.event("Remote Download", {
-                type: miraType === MiraType.ROBOT ? "robot" : "field",
+                type: miraType === MiraType.ROBOT ? "robot" : miraType === MiraType.FIELD ? "field" : "piece",
                 fileSize: miraBuff.byteLength,
             })
 
@@ -145,6 +151,7 @@ class MirabufCachingService {
             // fallback: return raw buffer wrapped in MirabufCacheInfo
             return {
                 id: Date.now().toString(),
+                // There isn't a way to know set this to game piece correctly, since you must parse the assembly to know
                 miraType: miraType ?? (this.assemblyFromBuffer(miraBuff).dynamic ? MiraType.ROBOT : MiraType.FIELD),
                 cacheKey: fetchLocation,
                 buffer: miraBuff,
@@ -175,7 +182,7 @@ class MirabufCachingService {
         }
 
         World.analyticsSystem?.event("APS Download", {
-            type: miraType == MiraType.ROBOT ? "robot" : "field",
+            type: miraType == MiraType.ROBOT ? "robot" : miraType == MiraType.FIELD ? "field" : "piece",
             fileSize: miraBuff.byteLength,
         })
 
@@ -220,9 +227,15 @@ class MirabufCachingService {
         try {
             const map: MapCache = this.getCacheMap(miraType)
             const id = map[key].id
-            const buffer = miraType == MiraType.ROBOT ? backUpRobots[id].buffer : backUpFields[id].buffer
+            const buffer =
+                miraType == MiraType.ROBOT
+                    ? backUpRobots[id].buffer
+                    : miraType == MiraType.FIELD
+                      ? backUpFields[id].buffer
+                      : backUpPieces[id].buffer
             const defaultName = map[key].name
             const defaultStorageID = map[key].thumbnailStorageID
+
             const info: MirabufCacheInfo = {
                 id: id,
                 cacheKey: key,
@@ -232,8 +245,15 @@ class MirabufCachingService {
                 thumbnailStorageID: thumbnailStorageID ?? defaultStorageID,
             }
             map[key] = info
-            miraType == MiraType.ROBOT ? (backUpRobots[id] = info) : (backUpFields[id] = info)
-            window.localStorage.setItem(miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName, JSON.stringify(map))
+            miraType == MiraType.ROBOT
+                ? (backUpRobots[id] = info)
+                : miraType == MiraType.FIELD
+                  ? (backUpFields[id] = info)
+                  : (backUpPieces[id] = info)
+            window.localStorage.setItem(
+                miraType == MiraType.ROBOT ? robotsDirName : miraType == MiraType.FIELD ? fieldsDirName : piecesDirName,
+                JSON.stringify(map)
+            )
             return true
         } catch (e) {
             console.error(`Failed to cache info\n${e}`)
@@ -326,33 +346,40 @@ class MirabufCachingService {
      * @returns {Promise<mirabufAssembly | undefined>} Promise with the result of the promise. Assembly of the mirabuf file if successful, undefined if not.
      */
     public static async get(id: MirabufCacheID, miraType: MiraType): Promise<mirabuf.Assembly | undefined> {
+        const cache =
+            miraType == MiraType.ROBOT ? backUpRobots : miraType == MiraType.FIELD ? backUpFields : backUpPieces
+
         try {
             // Get buffer from hashMap. If not in hashMap, check OPFS. Otherwise, buff is undefined
-            const cache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
-            const buff =
-                cache[id]?.buffer ??
-                (await (async () => {
-                    const fileHandle = canOPFS
-                        ? await (miraType == MiraType.ROBOT ? robotFolderHandle : fieldFolderHandle).getFileHandle(id, {
-                              create: false,
-                          })
-                        : undefined
-                    return fileHandle ? await fileHandle.getFile().then(x => x.arrayBuffer()) : undefined
-                })())
-
-            // If we have buffer, get assembly
-            if (buff) {
-                const assembly = this.assemblyFromBuffer(buff)
-                World.analyticsSystem?.event("Cache Get", {
-                    key: id,
-                    type: miraType == MiraType.ROBOT ? "robot" : "field",
-                    assemblyName: assembly.info!.name!,
-                    fileSize: buff.byteLength,
+            const getOPFSBuffer = async () => {
+                const dirHandle =
+                    miraType == MiraType.ROBOT
+                        ? robotFolderHandle
+                        : miraType == MiraType.FIELD
+                          ? fieldFolderHandle
+                          : pieceFolderHandle
+                if (!canOPFS) return
+
+                const fileHandle = await dirHandle.getFileHandle(id, {
+                    create: false,
                 })
-                return assembly
-            } else {
+                return await fileHandle.getFile().then(x => x.arrayBuffer())
+            }
+
+            const buff = cache[id]?.buffer ?? (await getOPFSBuffer())
+            if (!buff) {
                 console.error(`Failed to find arrayBuffer for id: ${id}`)
+                return undefined
             }
+
+            const assembly = this.assemblyFromBuffer(buff)
+            World.analyticsSystem?.event("Cache Get", {
+                key: id,
+                type: miraType == MiraType.ROBOT ? "robot" : miraType == MiraType.FIELD ? "field" : "piece",
+                assemblyName: assembly.info!.name!,
+                fileSize: buff.byteLength,
+            })
+            return assembly
         } catch (e) {
             console.error(`Failed to find file\n${e}`)
             return undefined
@@ -374,24 +401,34 @@ class MirabufCachingService {
             if (map) {
                 delete map[key]
                 window.localStorage.setItem(
-                    miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName,
+                    miraType == MiraType.ROBOT
+                        ? robotsDirName
+                        : miraType == MiraType.FIELD
+                          ? fieldsDirName
+                          : piecesDirName,
                     JSON.stringify(map)
                 )
             }
 
             if (canOPFS) {
-                const dir = miraType == MiraType.ROBOT ? robotFolderHandle : fieldFolderHandle
+                const dir =
+                    miraType == MiraType.ROBOT
+                        ? robotFolderHandle
+                        : miraType == MiraType.FIELD
+                          ? fieldFolderHandle
+                          : pieceFolderHandle
                 await dir.removeEntry(id)
             }
 
-            const backUpCache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
+            const backUpCache =
+                miraType == MiraType.ROBOT ? backUpRobots : miraType == MiraType.FIELD ? backUpFields : backUpPieces
             if (backUpCache) {
                 delete backUpCache[id]
             }
 
             World.analyticsSystem?.event("Cache Remove", {
                 key: key,
-                type: miraType == MiraType.ROBOT ? "robot" : "field",
+                type: miraType == MiraType.ROBOT ? "robot" : miraType == MiraType.FIELD ? "field" : "piece",
             })
             return true
         } catch (e) {
@@ -419,6 +456,7 @@ class MirabufCachingService {
 
         backUpRobots = {}
         backUpFields = {}
+        backUpPieces = {}
     }
 
     /**
@@ -475,12 +513,14 @@ class MirabufCachingService {
         key: string,
         miraBuff: ArrayBuffer,
         miraType?: MiraType,
+        // Optional name for when assembly is being decoded anyway like in CacheAndGetLocal()
         name?: string
     ): Promise<MirabufCacheInfo | undefined> {
         try {
             const backupID = Date.now().toString()
             if (!miraType) {
                 console.debug("Double loading")
+                // Piece can't be known without parsing
                 miraType = this.assemblyFromBuffer(miraBuff).dynamic ? MiraType.ROBOT : MiraType.FIELD
             }
 
@@ -493,28 +533,36 @@ class MirabufCachingService {
                 name: name,
             }
             map[key] = info
-            window.localStorage.setItem(miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName, JSON.stringify(map))
+            window.localStorage.setItem(
+                miraType == MiraType.ROBOT ? robotsDirName : miraType == MiraType.FIELD ? fieldsDirName : piecesDirName,
+                JSON.stringify(map)
+            )
 
             World.analyticsSystem?.event("Cache Store", {
                 name: name ?? "-",
                 key: key,
-                type: miraType == MiraType.ROBOT ? "robot" : "field",
+                type: miraType == MiraType.ROBOT ? "robot" : miraType == MiraType.FIELD ? "field" : "piece",
                 fileSize: miraBuff.byteLength,
             })
 
             // Store buffer
             if (canOPFS) {
                 // Store in OPFS
                 const fileHandle = await (
-                    miraType == MiraType.ROBOT ? robotFolderHandle : fieldFolderHandle
+                    miraType == MiraType.ROBOT
+                        ? robotFolderHandle
+                        : miraType == MiraType.FIELD
+                          ? fieldFolderHandle
+                          : pieceFolderHandle
                 ).getFileHandle(backupID, { create: true })
                 const writable = await fileHandle.createWritable()
                 await writable.write(miraBuff)
                 await writable.close()
             }
 
             // Store in hash
-            const cache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
+            const cache =
+                miraType == MiraType.ROBOT ? backUpRobots : miraType == MiraType.FIELD ? backUpFields : backUpPieces
             const mapInfo: MirabufCacheInfo = {
                 id: backupID,
                 miraType: miraType,
@@ -534,8 +582,7 @@ class MirabufCachingService {
 
     private static async hashBuffer(buffer: ArrayBuffer): Promise<string> {
         const hashBuffer = await crypto.subtle.digest("SHA-256", buffer)
-        let hash = ""
-        new Uint8Array(hashBuffer).forEach(x => (hash = hash + String.fromCharCode(x)))
+        const hash: string = String.fromCharCode(...new Uint8Array(hashBuffer))
         return btoa(hash).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
     }
 
@@ -547,6 +594,7 @@ class MirabufCachingService {
 export enum MiraType {
     ROBOT = 1,
     FIELD,
+    PIECE,
 }
 
 export default MirabufCachingService