Loading real chunks from server

Author: michaljaz

coffee/client/index.coffee

@@ -17,7 +17,10 @@ init = ()->
 	chunkWorker=new Worker "./module/ChunkWorker.js", {type:'module'}
 
 	chunkWorker.onmessage=(data)->
-		# console.log "Recieved chunk column", data.data
+		result=data.data.result
+		for i in result
+			if i isnt null
+				terrain.setCell(i.x,i.y,i.z,i.data)
 
 	#canvas,renderer,camera,lights
 	canvas=document.querySelector '#c'
@@ -26,11 +29,16 @@ init = ()->
 		PixelRatio:window.devicePixelRatio
 	}
 	scene=new THREE.Scene
-	scene.background=new THREE.Color "lightblue"
-	camera = new THREE.PerspectiveCamera 90, 2, 0.1, 64*5
+	camera = new THREE.PerspectiveCamera 90, 2, 0.1, 1000
 	camera.rotation.order = "YXZ"
 	camera.position.set 26, 26, 26
-
+	#skybox
+	loader = new THREE.TextureLoader();
+	skybox = loader.load "assets/images/skybox.jpg", () ->
+		rt = new THREE.WebGLCubeRenderTarget skybox.image.height
+		rt.fromEquirectangularTexture renderer, skybox
+		scene.background = rt
+		return
 	#Lights
 	ambientLight=new THREE.AmbientLight 0xcccccc
 	scene.add ambientLight
@@ -44,7 +52,7 @@ init = ()->
 	clouds.scale.x=0.1
 	clouds.scale.y=0.1
 	clouds.scale.z=0.1
-	clouds.position.y=100
+	clouds.position.y=170
 	scene.add clouds
 
 	#Animated Material
@@ -80,7 +88,6 @@ init = ()->
 		terrain.setBlock block...
 		return
 	socket.on "mapChunk", (sections,x,z)->
-		# console.log("Recieved mapChunk "+x+" "+z)
 		chunkWorker.postMessage {
 			type:"computeSections"
 			data:{

coffee/client/module/CellTerrain.coffee

@@ -38,7 +38,8 @@ class CellTerrain
 		voff=@computeVoxelOffset voxelX,voxelY,voxelZ
 		return cell[voff]
 	getBuffer:(x,y,z)->
-		console.log(@cells[@vec3(x,y,z)])
-		return
+		return @cells[@vec3(x,y,z)]
+	setBuffer:(x,y,z,buffer)->
+		@cells[@vec3(x,y,z)]=buffer
 
 export {CellTerrain}

coffee/client/module/ChunkWorker.coffee

@@ -45,6 +45,11 @@ class ChunkDecoder
     #NOTHING
   getBlockIndex: (pos)->
     return (pos.y << 8) | (pos.z << 4) | pos.x
+  cvo: (voxelX,voxelY,voxelZ) ->
+    x=voxelX %% 16|0
+    y=voxelY %% 16|0
+    z=voxelZ %% 16|0
+    return y*16*16+z*16+x
   computeSections: (packet)->
     sections=packet.sections
     num=0
@@ -60,16 +65,18 @@ class ChunkDecoder
           y:0
           z:0
         }
-        base=[]
+        cell=new Uint8Array 16*16*16
         for x in [0..15]
           for y in [0..15]
             for z in [0..15]
-              base.push(palette[data.get(@getBlockIndex({x,y,z}))])
+              # ct.setVoxel packet.x+x,num+y,packet.z+z
+              cell[@cvo(x,y,z)]=palette[data.get(@getBlockIndex({x,y,z}))]
+              # base.push(palette[data.get(@getBlockIndex({x,y,z}))])
         result.push {
           x:packet.x
           y:num
           z:packet.z,
-          data:base
+          data:cell
         }
       else
         result.push(null)

coffee/client/module/Terrain.coffee

@@ -34,7 +34,13 @@ class Terrain
 				cellSize: @cellSize
 			}
 		}
-		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
+	setCell: (cellX,cellY,cellZ,buffer)->
+		@_setCell cellX,cellY,cellZ,buffer
+		@cellTerrain.cells[@cellTerrain.vec3(cellX,cellY,cellZ)]=buffer
+		@cellNeedsUpdate[@cellTerrain.vec3(cellX,cellY,cellZ)]=true
+		for nei in @neighbours
+			neiCellId=@cellTerrain.vec3(cellX+nei[0],cellY+nei[1],cellZ+nei[2])
+			@cellNeedsUpdate[neiCellId]=true
 	setBlock: (voxelX,voxelY,voxelZ,value) ->
 		voxelX=parseInt voxelX
 		voxelY=parseInt voxelY
@@ -159,6 +165,11 @@ class Terrain
 			return {posPlace,posBreak}
 		else
 			return false
+	_setCell: (cellX,cellY,cellZ,buffer)->
+		@worker.postMessage {
+			type:"setCell"
+			data:[cellX,cellY,cellZ,buffer]
+		}
 	_setVoxel: (voxelX,voxelY,voxelZ,value)->
 		@worker.postMessage {
 			type:"setVoxel"

coffee/client/module/TerrainWorker.coffee

@@ -1,3 +1,5 @@
+import {CellTerrain} from './CellTerrain.js'
+
 class TerrainManager
 	constructor: (options)->
 		@toxelSize=options.toxelSize
@@ -6,7 +8,9 @@ class TerrainManager
 		@blocksMapping=options.blocksMapping
 		@cellSize=options.cellSize
 		@models=options.models
-		@world={}
+		@cellTerrain=new CellTerrain {
+			cellSize:@cellSize
+		}
 		console.log "WORKER: TerrainManager started!"
 	getToxel: (x,y)->
 		x-=1
@@ -30,8 +34,9 @@ class TerrainManager
 			z=parseInt z
 		return "#{x}:#{y}:#{z}"
 	genBlockFace: (type,voxel)->
-		blockName=@blocks[voxel]["faces"][type]
+
 		try
+			blockName=@blocks[voxel]["faces"][type]
 			toxX=@blocksMapping[blockName]["x"]
 			toxY=@blocksMapping[blockName]["y"]
 		catch e
@@ -123,18 +128,18 @@ class TerrainManager
 					pos=[cellX*@cellSize+i,cellY*@cellSize+j,cellZ*@cellSize+k]
 					voxel=@getVoxel pos...
 					if voxel
-						if @blocks[voxel].isBlock
-							if not @blocks[@getVoxel(pos[0]+1,pos[1],pos[2])].isBlock
+						if @blocks[voxel] is undefined or @blocks[voxel].isBlock
+							if not (@blocks[@getVoxel(pos[0]+1,pos[1],pos[2])] is undefined or @blocks[@getVoxel(pos[0]+1,pos[1],pos[2])].isBlock)
 								addFace "nx",pos,voxel
-							if not @blocks[@getVoxel(pos[0]-1,pos[1],pos[2])].isBlock
+							if not (@blocks[@getVoxel(pos[0]-1,pos[1],pos[2])] is undefined or @blocks[@getVoxel(pos[0]-1,pos[1],pos[2])].isBlock)
 								addFace "px",pos,voxel
-							if not @blocks[@getVoxel(pos[0],pos[1]-1,pos[2])].isBlock
+							if not (@blocks[@getVoxel(pos[0],pos[1]-1,pos[2])] is undefined or @blocks[@getVoxel(pos[0],pos[1]-1,pos[2])].isBlock)
 								addFace "ny",pos,voxel
-							if not @blocks[@getVoxel(pos[0],pos[1]+1,pos[2])].isBlock
+							if not (@blocks[@getVoxel(pos[0],pos[1]+1,pos[2])] is undefined or @blocks[@getVoxel(pos[0],pos[1]+1,pos[2])].isBlock)
 								addFace "py",pos,voxel
-							if not @blocks[@getVoxel(pos[0],pos[1],pos[2]+1)].isBlock
+							if not (@blocks[@getVoxel(pos[0],pos[1],pos[2]+1)] is undefined or @blocks[@getVoxel(pos[0],pos[1],pos[2]+1)].isBlock)
 								addFace "pz",pos,voxel
-							if not @blocks[@getVoxel(pos[0],pos[1],pos[2]-1)].isBlock
+							if not (@blocks[@getVoxel(pos[0],pos[1],pos[2]-1)] is undefined or @blocks[@getVoxel(pos[0],pos[1],pos[2]-1)].isBlock)
 								addFace "nz",pos,voxel
 						else
 							geo=@models[@blocks[voxel].model]
@@ -145,14 +150,10 @@ class TerrainManager
 			uvs
 		}
 	setVoxel: (voxelX,voxelY,voxelZ,value)->
-		@world[@vec3(voxelX,voxelY,voxelZ)]=value
+		@cellTerrain.setVoxel voxelX,voxelY,voxelZ,value
 		return
 	getVoxel: (voxelX,voxelY,voxelZ)->
-		voxel=@world[@vec3(voxelX,voxelY,voxelZ)]
-		if voxel is undefined
-			return 0
-		else
-			return voxel
+		return @cellTerrain.getVoxel voxelX,voxelY,voxelZ
 
 addEventListener "message", (e)->
 	fn = handlers[e.data.type]
@@ -183,4 +184,6 @@ handlers={
 			cell:terrain.genCellGeo data...
 			info:data
 		}
+	setCell: (data)->
+		terrain.cellTerrain.cells["#{data[0]}:#{data[1]}:#{data[2]}"]=data[3]
 }

coffee/server.coffee

@@ -23,7 +23,6 @@ module.exports=(config)->
 	players={}
 	socketInfo={}
 
-
 	app.use express.static(__dirname + "/client/")
 	app.use (req, res, next) ->
 		res.set 'Cache-Control', 'no-store'
@@ -41,7 +40,7 @@ module.exports=(config)->
 
 		#Trying to run special functions
 		socket.on "initClient",(data)->
-			console.log "[+] "+socket.id
+			console.log "[+] "+data.nick
 			#init socketInfo
 			socketInfo[socket.id]=data
 
@@ -79,7 +78,7 @@ module.exports=(config)->
 			io.sockets.emit "blockUpdate",block
 			saveWorld()
 		socket.on "disconnect", ->
-			console.log "[-] "+socket.id
+			console.log "[-] "+socketInfo[socket.id].nick
 
 			#end bot session
 			socketInfo[socket.id].bot.end()

src/client/assets/blocks/blocks.json

@@ -104,4 +104,4 @@
       "pz": "tnt_side"
     }
   }
-}
+}