Merge branch 'webgpu-true' of https://github.com/sa2urami/prismarine-…

…web-client into webgpu-true
zardoy · Dec 4, 2024 · de20a94 · de20a94
2 parents 0b90dc5 + fa1daf6
commit de20a94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/prismarine-viewer/examples/chunksStorage.ts b/prismarine-viewer/examples/chunksStorage.ts
@@ -165,9 +165,10 @@ export class ChunksStorage {
     const chunkIndex = this.chunks.indexOf(chunk)
     this.chunksMap.set(rawPosKey, chunkIndex)
 
-    // newData.forEach(newDatum => {
-    //   newDatum[3].chunk = chunkIndex
-    // })
+    for (const newDatum of newData) {
+      //@ts-expect-error
+      newDatum[3].chunk = chunkIndex
+    }
 
     this.addBlocksData(start, newData)
     this.awaitingUpdateStart = Math.min(this.awaitingUpdateStart ?? Infinity, start)

diff --git a/prismarine-viewer/examples/webgpuRenderer.ts b/prismarine-viewer/examples/webgpuRenderer.ts
@@ -624,18 +624,18 @@ export class WebgpuRenderer {
     const blocksToUpdate = allBlocks.slice(updateOffset, updateOffset + updateSize)
     const actualCount = updateOffset + blocksToUpdate.length
 
-    let chunk = chunksStorage.findBelongingChunk(updateOffset)!
-    let remaining = chunk.chunk.length
+    // let chunk = chunksStorage.findBelongingChunk(updateOffset)!
+    // let remaining = chunk.chunk.length
     // eslint-disable-next-line unicorn/no-for-loop
     for (let i = 0; i < blocksToUpdate.length; i++) {
-      if (remaining-- === 0) {
-        chunk = chunksStorage.findBelongingChunk(updateOffset + i)!
-        remaining = chunk.chunk.length - 1
-      }
+      // if (remaining-- === 0) {
+      //   chunk = chunksStorage.findBelongingChunk(updateOffset + i)!
+      //   remaining = chunk.chunk.length - 1
+      // }
 
       let first = 0
       let second = 0
-      const third = chunk.index
+      let third = 0
       const chunkBlock = blocksToUpdate[i]
       if (chunkBlock) {
         const [x, y, z, block] = chunkBlock
@@ -656,6 +656,8 @@ export class WebgpuRenderer {
           (visibility[4] << 4) |
           (visibility[5] << 5)
         second = ((visibilityCombined << 8 | colors[2]) << 8 | colors[1]) << 8 | colors[0]
+        //@ts-expect-error
+        third = block.chunk
       }
 
       cubeFlatData[i * 3] = first