remove vec3

Author: michaljaz

package-lock.json

@@ -47,7 +47,6 @@
         "rimraf": "^3.0.2",
         "sweetalert": "^2.1.2",
         "three": "^0.125.0",
-        "vec3": "^0.1.7",
         "webpack-dev-server": "^3.11.1",
         "webpack-merge": "^5.7.3",
         "worker-loader": "^3.0.7"

package.json

@@ -69,8 +69,8 @@ class Game {
       $('.initLoading').css('display', 'block')
       $('.loadingText').html('Loading terrain...')
     })
-    this.socket.on('mapChunk', (sections, x, z) => {
-      this.world.computeSections(sections, x, z)
+    this.socket.on('mapChunk', (sections, biomes, x, z) => {
+      this.world.computeSections(sections, biomes, x, z)
     })
     this.socket.on('game', (gameData) => {
       this.inv_bar.updateGamemode(gameData.gameMode)

src/scripts/index.js

@@ -1,5 +1,5 @@
 /* eslint-env worker */
-import vec3 from 'vec3'
+import { Vector3 } from 'three'
 import Convert from 'ansi-to-html'
 const convert = new Convert()
 
@@ -26,9 +26,11 @@ addEventListener('message', function (e) {
       })
       bot.heldItem = null
       bot.on('chunkColumnLoad', (p) => {
+        const chunk = bot.world.getColumn(p.x / 16, p.z / 16)
         emit(
           'mapChunk',
-          bot.world.getColumn(p.x / 16, p.z / 16).sections,
+          chunk.sections,
+          chunk.biomes,
           p.x / 16,
           p.z / 16
         )
@@ -152,7 +154,7 @@ addEventListener('message', function (e) {
       }
       break
     case 'dig':
-      block = bot.blockAt(vec3(data[0][0], data[0][1] - 16, data[0][2]))
+      block = bot.blockAt(new Vector3(data[0][0], data[0][1] - 16, data[0][2]))
       if (block !== null) {
         const digTime = bot.digTime(block)
         if (bot.targetDigBlock !== null) {
@@ -188,10 +190,10 @@ addEventListener('message', function (e) {
       }
       break
     case 'blockPlace':
-      block = bot.blockAt(vec3(...data[0]))
+      block = bot.blockAt(new Vector3(...data[0]))
       if (bot.heldItem !== undefined && bot.heldItem !== null) {
         // console.log(heldItem);
-        bot.placeBlock(block, vec3(...data[1]))
+        bot.placeBlock(block, new Vector3(...data[1]))
       }
       break
   }

src/scripts/proxy/Proxy.worker.js

@@ -1,15 +1,12 @@
-import { BufferGeometry, BufferAttribute, Mesh } from 'three'
+import { BufferGeometry, BufferAttribute, Mesh, Vector3 } from 'three'
 
 class ChunkManager {
   constructor (game) {
     this.game = game
-    this.chunks = new Map()
     this.cellMesh = new Map()
   }
 
   addChunk (cellId, vert) {
-    this.chunks.set(cellId, vert)
-
     const geometry = new BufferGeometry()
     geometry.setAttribute('position', new BufferAttribute(new Float32Array(vert.positions), 3))
     geometry.setAttribute('normal', new BufferAttribute(new Float32Array(vert.normals), 3))
@@ -29,23 +26,29 @@ class ChunkManager {
       this.cellMesh.set(cellId, newMesh)
       this.game.scene.add(newMesh)
       if (this.game.world.lastPlayerChunk !== null) {
-        this.game.world.updateRenderOrder(JSON.parse(this.game.world.lastPlayerChunk))
+        this.updateRenderOrder(JSON.parse(this.game.world.lastPlayerChunk))
       }
     } else {
       this.cellMesh.get(cellId).geometry = geometry
     }
   }
 
   removeChunk (cellId) {
-    if (this.chunks.get(cellId) !== undefined) {
-      this.chunks.delete(cellId)
+    if (this.cellMesh.get(cellId) !== undefined) {
       this.cellMesh.get(cellId).geometry.dispose()
       this.game.scene.remove(this.cellMesh.get(cellId))
       this.cellMesh.delete(cellId)
       this.game.renderer.renderLists.dispose()
     }
   }
 
+  updateRenderOrder (cell) {
+    for (const [k, v] of this.cellMesh) {
+      const x = new Vector3(this.game.world.chunkTerrain.strToVec(k))
+      v.renderOrder = -new Vector3(...cell).distanceTo(x)
+    }
+  }
+
   reset () {
     for (const i of this.cellMesh) {
       if (i[1].geometry !== undefined) {
@@ -54,7 +57,6 @@ class ChunkManager {
       }
     }
     this.cellMesh.clear()
-    this.chunks.clear()
   }
 }
 export { ChunkManager }

src/scripts/world/ChunkManager.js

@@ -76,10 +76,7 @@ const ChunkDecoder = class ChunkDecoder {
         for (let x = 0; x < 16; x++) {
           for (let y = 0; y < 16; y++) {
             for (let z = 0; z < 16; z++) {
-              cell[this.cvo(x, y, z)] =
-                                palette[
-                                  data.get(this.getBlockIndex({ x, y, z }))
-                                ]
+              cell[this.cvo(x, y, z)] = palette[data.get(this.getBlockIndex({ x, y, z }))]
             }
           }
         }

src/scripts/world/SectionComputer.js

@@ -2,22 +2,19 @@ import { Vector3 } from 'three'
 import { ChunkTerrain } from './ChunkTerrain.js'
 import { AnimatedTextureAtlas } from './AnimatedTextureAtlas.js'
 import { SectionComputer } from './SectionComputer.js'
-import vec3 from 'vec3'
-import ChunkWorker from './chunk.worker.js'
 import { ChunkManager } from './ChunkManager.js'
+import ChunkWorker from './chunk.worker.js'
 
-const World = class World {
+class World {
   constructor (game) {
     this.game = game
     this.blocksDef = this.game.al.get('blocksDef')
-    this.models = {}
     this.chunkTerrain = new ChunkTerrain({
       blocksDef: this.blocksDef
     })
     this.ATA = new AnimatedTextureAtlas(this.game)
     this.material = this.ATA.material
     this.cellUpdateTime = null
-    this.renderTime = 100
     this.lastPlayerChunk = null
     this.blocksUpdate = false
 
@@ -44,13 +41,6 @@ const World = class World {
     })
   }
 
-  updateRenderOrder (cell) {
-    for (const [k, v] of this.chunkManager.cellMesh) {
-      const x = vec3(this.chunkTerrain.strToVec(k))
-      v.renderOrder = -vec3(...cell).distanceTo(x)
-    }
-  }
-
   setChunk (chunkX, chunkY, chunkZ, buffer) {
     this.cellUpdateTime = window.performance.now()
     this.chunkWorker.postMessage({
@@ -84,9 +74,7 @@ const World = class World {
   }
 
   getRayBlock () {
-    const start = new Vector3().setFromMatrixPosition(
-      this.game.camera.matrixWorld
-    )
+    const start = new Vector3().setFromMatrixPosition(this.game.camera.matrixWorld)
     const end = new Vector3().set(0, 0, 1).unproject(this.game.camera)
     const intersection = this.chunkTerrain.intersectsRay(start, end)
     if (intersection) {
@@ -117,10 +105,9 @@ const World = class World {
       })
     } else if (this.lastPlayerChunk !== JSON.stringify(cell)) {
       if (
-        this.cellUpdateTime !== null &&
-                window.performance.now() - this.cellUpdateTime > this.renderTime
+        this.cellUpdateTime !== null && window.performance.now() - this.cellUpdateTime > 100
       ) {
-        this.updateRenderOrder(cell)
+        this.chunkManager.updateRenderOrder(cell)
         this.lastPlayerChunk = JSON.stringify(cell)
         this.chunkWorker.postMessage({
           type: 'updateChunksAroundPlayer',
@@ -130,9 +117,8 @@ const World = class World {
     }
   }
 
-  computeSections (sections, x, z) {
+  computeSections (sections, biomes, x, z) {
     const result = SectionComputer({ sections, x, z })
-    // console.log(result);
     const results = []
     for (const i in result) {
       const j = result[i]

src/scripts/world/World.js

@@ -2,7 +2,7 @@
 import { ChunkTerrain } from './ChunkTerrain.js'
 import { ChunkMesher } from './ChunkMesher.js'
 import raf from 'raf'
-import vec3 from 'vec3'
+import { Vector3 } from 'three'
 
 self.requestAnimationFrame = raf
 let terrain = null
@@ -34,8 +34,8 @@ class TerrainManager {
 
   distance (chunkId) {
     const data = this.chunkTerrain.strToVec(chunkId)
-    const chunk = vec3(...data)
-    const chunkP = vec3(...this.playerChunk)
+    const chunk = new Vector3(...data)
+    const chunkP = new Vector3(...this.playerChunk)
     return chunkP.distanceTo(chunk)
   }