faster chunk parsing

Author: michaljaz

coffee/client/index.coffee

@@ -16,6 +16,9 @@ init = ()->
 
 	chunkWorker=new Worker "./module/ChunkWorker.js", {type:'module'}
 
+	chunkWorker.onmessage=(data)->
+		# console.log "Recieved chunk column", data.data
+
 	#canvas,renderer,camera,lights
 	canvas=document.querySelector '#c'
 	renderer=new THREE.WebGLRenderer {
@@ -74,7 +77,7 @@ init = ()->
 		}
 		return
 	socket.on "blockUpdate",(block)->
-		terrain.setVoxel block...
+		terrain.setBlock block...
 		return
 	socket.on "mapChunk", (sections,x,z)->
 		# console.log("Recieved mapChunk "+x+" "+z)
@@ -89,9 +92,8 @@ init = ()->
 		players.update data
 		return
 	socket.on "firstLoad",(v)->
-		console.log "Otrzymano pakiet świata!"
+		console.log "First Load packet recieved!"
 		terrain.replaceWorld v
-		terrain._genCellGeo(0,0,0)
 		$(".initLoading").css "display","none"
 		stats = new Stats();
 		stats.showPanel(0);

coffee/client/module/CellTerrain.coffee

@@ -2,7 +2,6 @@ class CellTerrain
 	constructor: (options)->
 		@cellSize=options.cellSize
 		@cells={}
-		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
 	vec3: (x,y,z)->
 		return "#{x}:#{y}:#{z}"
 	computeVoxelOffset: (voxelX,voxelY,voxelZ) ->
@@ -27,19 +26,19 @@ class CellTerrain
 		return @cells[cellId]
 	setVoxel:(voxelX,voxelY,voxelZ,value)->
 		cell=@getCellForVoxel voxelX,voxelY,voxelZ
-		if not cell 
+		if not cell
 			cell=@addCellForVoxel voxelX,voxelY,voxelZ
 		voff=@computeVoxelOffset voxelX,voxelY,voxelZ
 		cell[voff]=value
 		return
 	getVoxel:(voxelX,voxelY,voxelZ)->
 		cell=@getCellForVoxel voxelX,voxelY,voxelZ
-		if not cell 
+		if not cell
 			return 0
 		voff=@computeVoxelOffset voxelX,voxelY,voxelZ
 		return cell[voff]
 	getBuffer:(x,y,z)->
 		console.log(@cells[@vec3(x,y,z)])
 		return
-		
-export {CellTerrain}
+
+export {CellTerrain}

coffee/client/module/ChunkWorker.coffee

@@ -48,6 +48,7 @@ class ChunkDecoder
   computeSections: (packet)->
     sections=packet.sections
     num=0
+    result=[]
     for i in sections
       num+=1
       if i isnt null
@@ -63,8 +64,16 @@ class ChunkDecoder
         for x in [0..15]
           for y in [0..15]
             for z in [0..15]
-              base.push(data.get(@getBlockIndex({x,y,z})))
-        console.log "Computed chunk section "+packet.x+" "+packet.z+" "+num, base
+              base.push(palette[data.get(@getBlockIndex({x,y,z}))])
+        result.push {
+          x:packet.x
+          y:num
+          z:packet.z,
+          data:base
+        }
+      else
+        result.push(null)
+    return result
 
 
 addEventListener "message", (e)->
@@ -78,5 +87,7 @@ cd=new ChunkDecoder
 
 handlers={
   computeSections:(data)->
-    cd.computeSections data
+    postMessage {
+      result:cd.computeSections data
+    }
 }

coffee/client/module/FirstPersonControls.coffee

@@ -56,7 +56,6 @@ class FirstPersonControls
 			_this.keys[z.keyCode] = true
 			#If click escape
 			if z.keyCode is 27
-				console.log _this.gameState
 				if _this.gameState is "menu"
 					_this.canvas.requestPointerLock()
 				else
@@ -67,18 +66,15 @@ class FirstPersonControls
 			delete _this.keys[z.keyCode]
 			return
 		$(".gameOn").click ->
-			console.log "clicked!"
 			_this.canvas.requestPointerLock()
 			return
 		lockChangeAlert=()->
 			if document.pointerLockElement is _this.canvas or document.mozPointerLockElement is _this.canvas
 				_this.gameState="game"
 				$(".gameMenu").css "display", "none"
-				console.log("GAME")
 			else
 				_this.gameState="menu"
 				$(".gameMenu").css "display", "block"
-				console.log("MENU")
 			return
 		document.addEventListener 'pointerlockchange', lockChangeAlert, false
 		document.addEventListener 'mozpointerlockchange', lockChangeAlert, false

coffee/client/module/Terrain.coffee

@@ -3,8 +3,9 @@ import {CellTerrain} from './CellTerrain.js'
 
 class Terrain
 	constructor: (options) ->
-		@cellsData={}
-		@cells={}
+		_this=@
+		@cellMesh={}
+		@cellNeedsUpdate={}
 		@models={}
 		@cellSize=options.cellSize
 		@material=options.material
@@ -16,9 +17,7 @@ class Terrain
 			cellSize:@cellSize
 		}
 		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
-		_this=@
 		@worker=new Worker "./module/TerrainWorker.js", {type:'module'}
-		console.log @worker
 		@worker.onmessage=(message)->
 			_this.updateCell message.data
 		@worker.postMessage {
@@ -35,75 +34,42 @@ class Terrain
 				cellSize: @cellSize
 			}
 		}
-	computeVoxelOffset: (voxelX,voxelY,voxelZ) ->
-		x=voxelX %% @cellSize|0
-		y=voxelY %% @cellSize|0
-		z=voxelZ %% @cellSize|0
-		return [x,y,z]
-	computeCellForVoxel: (voxelX,voxelY,voxelZ) ->
-		cellX = Math.floor voxelX / @cellSize
-		cellY = Math.floor voxelY / @cellSize
-		cellZ = Math.floor voxelZ / @cellSize
-		return [cellX,cellY,cellZ]
-	vec3: (x,y,z) ->
-		x=parseInt x
-		y=parseInt y
-		z=parseInt z
-		return "#{x}:#{y}:#{z}"
-	setVoxel: (voxelX,voxelY,voxelZ,value) ->
-		@_setVoxel voxelX,voxelY,voxelZ,value
-		voff=@computeVoxelOffset(voxelX,voxelY,voxelZ)
-		cell=@computeCellForVoxel(voxelX,voxelY,voxelZ)
-		cellId=@vec3(cell...)
-		if @cellsData[cellId] is undefined
-			@cellsData[cellId]={
-				[@vec3 voff...]:value
-			}
-		else
-			prevVox=@cellsData[cellId][@vec3(voff...)]
-			if prevVox isnt value
-				@cellsData[cellId][@vec3(voff...)]=value
-				@cellsData[cellId].needsUpdate=true
-				for nei in @neighbours
-					neiCellId=@vec3 @computeCellForVoxel(voxelX+nei[0],voxelY+nei[1],voxelZ+nei[2])...
-					try
-						@cellsData[neiCellId].needsUpdate=true
-		@cellsData[cellId].needsUpdate=true
+		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
+	setBlock: (voxelX,voxelY,voxelZ,value) ->
+		voxelX=parseInt voxelX
+		voxelY=parseInt voxelY
+		voxelZ=parseInt voxelZ
+		if (@cellTerrain.getVoxel voxelX,voxelY,voxelZ) isnt value
+			@_setVoxel voxelX,voxelY,voxelZ,value
+			@cellTerrain.setVoxel voxelX,voxelY,voxelZ,value
+			cellId=@cellTerrain.vec3 @cellTerrain.computeCellForVoxel(voxelX,voxelY,voxelZ)...
+			@cellNeedsUpdate[cellId]=true
+			for nei in @neighbours
+				neiCellId=@cellTerrain.vec3 @cellTerrain.computeCellForVoxel(voxelX+nei[0],voxelY+nei[1],voxelZ+nei[2])...
+				@cellNeedsUpdate[neiCellId]=true
 		return
-	getVoxel: (voxelX,voxelY,voxelZ) ->
-		cell=@computeCellForVoxel(voxelX,voxelY,voxelZ)
-		cellId=@vec3(cell...)
-		voff=@computeVoxelOffset(voxelX,voxelY,voxelZ)
-		voxId=@vec3(voff...)
-		if @cellsData[cellId] isnt undefined
-			voxel=@cellsData[cellId][voxId]
-			if voxel isnt undefined
-				return voxel
-		return 0;
+	getBlock: (voxelX,voxelY,voxelZ) ->
+		return @cellTerrain.getVoxel voxelX,voxelY,voxelZ
 	updateCells: ->
 		_this=@
-		Object.keys(@cellsData).forEach (id)->
-			if _this.cellsData[id].needsUpdate
+		Object.keys(@cellNeedsUpdate).forEach (id)->
+			if _this.cellNeedsUpdate[id]
 				_this._genCellGeo id.split(":")...
-			return
+				delete _this.cellNeedsUpdate[id]
 		return
 	updateCell: (data)->
-		# console.warn "SENDING  cell: #{data.info}"
-		cellId=@vec3 data.info...
+		cellId=@cellTerrain.vec3 data.info...
 		cell=data.cell
-		if @cellsData[cellId]!=undefined
-			if @cellsData[cellId].needsUpdate
-				mesh=@cells[cellId]
-				geometry=new THREE.BufferGeometry;
-				geometry.setAttribute 'position',new THREE.BufferAttribute(new Float32Array(cell.positions), 3)
-				geometry.setAttribute 'normal',new THREE.BufferAttribute(new Float32Array(cell.normals), 3)
-				geometry.setAttribute 'uv',new THREE.BufferAttribute(new Float32Array(cell.uvs), 2)
-				if mesh is undefined
-					@cells[cellId]=new THREE.Mesh geometry,@material
-					@scene.add @cells[cellId]
-				else
-					@cells[cellId].geometry=geometry
-				@cellsData[cellId].needsUpdate=false
+		mesh=@cellMesh[cellId]
+		geometry=new THREE.BufferGeometry;
+		geometry.setAttribute 'position',new THREE.BufferAttribute(new Float32Array(cell.positions), 3)
+		geometry.setAttribute 'normal',new THREE.BufferAttribute(new Float32Array(cell.normals), 3)
+		geometry.setAttribute 'uv',new THREE.BufferAttribute(new Float32Array(cell.uvs), 2)
+		if mesh is undefined
+			@cellMesh[cellId]=new THREE.Mesh geometry,@material
+			@scene.add @cellMesh[cellId]
+		else
+			@cellMesh[cellId].geometry=geometry
 		return
 	intersectsRay: (start,end) ->
 		start.x+=0.5
@@ -138,7 +104,7 @@ class Terrain
 		tzMax = if tzDelta < Infinity then tzDelta * zDist else Infinity
 		steppedIndex = -1
 		while t <= len
-			voxel = @getVoxel ix, iy, iz
+			voxel = @getBlock ix, iy, iz
 			if voxel
 				return {
 					position: [
@@ -179,8 +145,8 @@ class Terrain
 	replaceWorld: (voxels)->
 		_this=@
 		Object.keys(voxels).forEach (id)->
-			if voxels[id] isnt _this.getVoxel id.split(":")...
-				_this.setVoxel id.split(":")...,voxels[id]
+			if voxels[id] isnt _this.getBlock id.split(":")...
+				_this.setBlock id.split(":")...,voxels[id]
 	getRayBlock: ->
 		start = new THREE.Vector3().setFromMatrixPosition(@camera.matrixWorld)
 		end = new THREE.Vector3().set(0,0, 1).unproject(@camera)

coffee/client/module/TerrainWorker.coffee

@@ -168,7 +168,6 @@ terrain=null
 handlers={
 	init:(data)->
 		State.init=data
-		console.log(State)
 		terrain=new TerrainManager {
 			models:data.models
 			blocks:data.blocks

coffee/server.coffee

@@ -41,7 +41,7 @@ module.exports=(config)->
 
 		#Trying to run special functions
 		socket.on "initClient",(data)->
-			console.log "NEW: "+socket.id
+			console.log "[+] "+socket.id
 			#init socketInfo
 			socketInfo[socket.id]=data
 
@@ -79,7 +79,7 @@ module.exports=(config)->
 			io.sockets.emit "blockUpdate",block
 			saveWorld()
 		socket.on "disconnect", ->
-			console.log "DIS: "+socket.id
+			console.log "[-] "+socket.id
 
 			#end bot session
 			socketInfo[socket.id].bot.end()