TerrainWorker in Terrain

Author: michaljaz

coffee/client/index.coffee

@@ -1,4 +1,4 @@
-#Bundle.js
+
 scene=null;materials=null;parameters=null;canvas=null;renderer=null;camera=null;terrain=null;cursor=null;FPC=null;socket=null;stats=null;worker=null;playerObject=null;inv_bar=null
 import * as THREE from './module/build/three.module.js'
 import {SkeletonUtils} from './module/jsm/utils/SkeletonUtils.js'
@@ -12,45 +12,9 @@ import {AnimatedTextureAtlas} from './module/AnimatedTextureAtlas.js'
 import {Players} from './module/Players.js'
 import {RandomNick} from './module/RandomNick.js'
 
-class TerrainWorker
-	constructor: (options)->
-		@worker=new Worker "module/TerrainWorker.js", {type:'module'}
-		@worker.onmessage=(message)->
-			terrain.updateCell message.data
-		@worker.postMessage {
-			type:'init'
-			data:{
-				models:{
-					anvil:{
-						al.get("anvil").children[0].geometry.attributes...
-					}
-				}
-				blocks: al.get "blocks"
-				blocksMapping: al.get "blocksMapping"
-				toxelSize: 27
-				cellSize: 16
-			}
-		}
-	setVoxel: (voxelX,voxelY,voxelZ,value)->
-		@worker.postMessage {
-			type:"setVoxel"
-			data:[voxelX,voxelY,voxelZ,value]
-		}
-	genCellGeo: (cellX,cellY,cellZ)->
-		cellX=parseInt cellX
-		cellY=parseInt cellY
-		cellZ=parseInt cellZ
-		@worker.postMessage {
-			type:"genCellGeo"
-			data:[cellX,cellY,cellZ]
-		}
-
 init = ()->
 
-	#Terrain worker
-	worker=new TerrainWorker
-
-	chunkWorker=new Worker "module/ChunkWorker.js", {type:'module'}
+	chunkWorker=new Worker "./module/ChunkWorker.js", {type:'module'}
 
 	#canvas,renderer,camera,lights
 	canvas=document.querySelector '#c'
@@ -89,12 +53,10 @@ init = ()->
 	terrain=new Terrain({
 		toxelSize:27
 		cellSize:16
-		blocks:al.get "blocks"
-		blocksMapping:al.get "blocksMapping"
 		material:ATA.material
 		scene
 		camera
-		worker
+		al
 	})
 
 	#Socket.io setup
@@ -129,7 +91,7 @@ init = ()->
 	socket.on "firstLoad",(v)->
 		console.log "Otrzymano pakiet świata!"
 		terrain.replaceWorld v
-		worker.genCellGeo(0,0,0)
+		terrain._genCellGeo(0,0,0)
 		$(".initLoading").css "display","none"
 		stats = new Stats();
 		stats.showPanel(0);

coffee/client/module/ChunkWorker.coffee

@@ -62,9 +62,9 @@ class ChunkDecoder
         base=[]
         for x in [0..15]
           for y in [0..15]
-            for z in [0..255]
+            for z in [0..15]
               base.push(data.get(@getBlockIndex({x,y,z})))
-        console.log "Computed chunk section "+packet.x+" "+packet.z+" "+num
+        console.log "Computed chunk section "+packet.x+" "+packet.z+" "+num, base
 
 
 addEventListener "message", (e)->

coffee/client/module/Terrain.coffee

@@ -3,21 +3,38 @@ import {CellTerrain} from './CellTerrain.js'
 
 class Terrain
 	constructor: (options) ->
-		@cellSize=options.cellSize
-		@cellTerrain=new CellTerrain {
-			cellSize:@cellSize
-		}
 		@cellsData={}
-		@blocks=options.blocks
-		@blocksMapping=options.blocksMapping
-		@material=options.material
 		@cells={}
 		@models={}
+		@cellSize=options.cellSize
+		@material=options.material
 		@camera=options.camera
 		@scene=options.scene
 		@toxelSize=options.toxelSize
+		@al=options.al
+		@cellTerrain=new CellTerrain {
+			cellSize:@cellSize
+		}
 		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
-		@worker=options.worker
+		_this=@
+		@worker=new Worker "./module/TerrainWorker.js", {type:'module'}
+		console.log @worker
+		@worker.onmessage=(message)->
+			_this.updateCell message.data
+		@worker.postMessage {
+			type:'init'
+			data:{
+				models:{
+					anvil:{
+						@al.get("anvil").children[0].geometry.attributes...
+					}
+				}
+				blocks: @al.get "blocks"
+				blocksMapping: @al.get "blocksMapping"
+				toxelSize: @toxelSize
+				cellSize: @cellSize
+			}
+		}
 	computeVoxelOffset: (voxelX,voxelY,voxelZ) ->
 		x=voxelX %% @cellSize|0
 		y=voxelY %% @cellSize|0
@@ -34,7 +51,7 @@ class Terrain
 		z=parseInt z
 		return "#{x}:#{y}:#{z}"
 	setVoxel: (voxelX,voxelY,voxelZ,value) ->
-		@worker.setVoxel voxelX,voxelY,voxelZ,value
+		@_setVoxel voxelX,voxelY,voxelZ,value
 		voff=@computeVoxelOffset(voxelX,voxelY,voxelZ)
 		cell=@computeCellForVoxel(voxelX,voxelY,voxelZ)
 		cellId=@vec3(cell...)
@@ -67,7 +84,7 @@ class Terrain
 		_this=@
 		Object.keys(@cellsData).forEach (id)->
 			if _this.cellsData[id].needsUpdate
-				_this.worker.genCellGeo id.split(":")...
+				_this._genCellGeo id.split(":")...
 			return
 		return
 	updateCell: (data)->
@@ -176,5 +193,17 @@ class Terrain
 			return {posPlace,posBreak}
 		else
 			return false
-
+	_setVoxel: (voxelX,voxelY,voxelZ,value)->
+		@worker.postMessage {
+			type:"setVoxel"
+			data:[voxelX,voxelY,voxelZ,value]
+		}
+	_genCellGeo: (cellX,cellY,cellZ)->
+		cellX=parseInt cellX
+		cellY=parseInt cellY
+		cellZ=parseInt cellZ
+		@worker.postMessage {
+			type:"genCellGeo"
+			data:[cellX,cellY,cellZ]
+		}
 export {Terrain}

coffee/server.coffee

@@ -71,7 +71,7 @@ module.exports=(config)->
 			return
 		socket.on "playerUpdate",(data)->
 			players[socket.id]=data
-			io.sockets.emit "playerUpdate", data
+			io.sockets.emit "playerUpdate", players
 		socket.on "blockUpdate",(block)->
 			world["#{block[0]}:#{block[1]}:#{block[2]}"]=block[3]
 			if block[3] is 0