Biome info

Author: michaljaz

coffee/client/module/World/CellTerrain.coffee

@@ -3,6 +3,8 @@ class CellTerrain
 	constructor: (options)->
 		@cellSize=options.cellSize
 		@cells={}
+		@biomes={}
+		@loadedBlocks={}
 	vec3: (x,y,z)->
 		x=parseInt x
 		y=parseInt y
@@ -41,11 +43,20 @@ class CellTerrain
 			return 0
 		voff=@computeVoxelOffset voxelX,voxelY,voxelZ
 		return cell[voff]
-	getBuffer:(x,y,z)->
+	getCell:(cellX,cellY,cellZ)->
 		return @cells[@vec3(x,y,z)]
-	setBuffer:(x,y,z,buffer)->
-		@cells[@vec3(x,y,z)]=buffer
+	setCell:(cellX,cellY,cellZ,buffer)->
+		@cells[@vec3(cellX,cellY,cellZ)]=buffer
 	getBlock:(blockX,blockY,blockZ)->
-		return new Block.fromStateId @getVoxel(blockX,blockY,blockZ)
-
+		if @loadedBlocks[@getVoxel(blockX,blockY,blockZ)] is undefined
+			@loadedBlocks[@getVoxel(blockX,blockY,blockZ)]=new Block.fromStateId @getVoxel(blockX,blockY,blockZ), @getBlockBiome(blockX,blockY,blockZ)
+		return @loadedBlocks[@getVoxel(blockX,blockY,blockZ)]
+	setBiome:(cellX,cellY,cellZ,biome)->
+		@biomes[@vec3(cellX,cellY,cellZ)]=biome
+	getBlockBiome:(blockX,blockY,blockZ)->
+		biome=@getCellForVoxel blockX,blockY,blockZ
+		if not biome
+			return null
+		voff=@computeVoxelOffset blockX,blockY,blockZ
+		return biome[voff]
 export {CellTerrain}

coffee/client/module/World/ChunkWorker.coffee

@@ -74,10 +74,10 @@ class TerrainManager
 					uv:[uv[0]...,uv[2]...,uv[1]...,uv[1]...,uv[2]...,uv[3]...]
 				}
 	genCellGeo: (cellX,cellY,cellZ)->
+		_this=@
 		positions=[]
 		normals=[]
 		uvs=[]
-		_this=@
 		addFace=(type,pos)->
 			faceVertex=_this.genBlockFace type,_this.cellTerrain.getBlock(pos...),pos
 			positions.push faceVertex.pos...
@@ -123,19 +123,11 @@ class TerrainManager
 							addFace "pz",pos
 						if (@cellTerrain.getBlock(pos[0],pos[1],pos[2]-1).name is "air")
 							addFace "nz",pos
-						# else
-						# 	geo=@models[@blocks[voxel].model]
-						# 	addGeo geo,pos
 		return {
 			positions
 			normals
 			uvs
 		}
-	setVoxel: (voxelX,voxelY,voxelZ,value)->
-		@cellTerrain.setVoxel voxelX,voxelY,voxelZ,value
-		return
-	getVoxel: (voxelX,voxelY,voxelZ)->
-		return @cellTerrain.getVoxel voxelX,voxelY,voxelZ
 
 addEventListener "message", (e)->
 	fn = handlers[e.data.type]
@@ -161,7 +153,7 @@ handlers={
 		}
 		return
 	setVoxel:(data)->
-		terrain.setVoxel data...
+		terrain.cellTerrain.setVoxel data...
 	genCellGeo: (data)->
 		if ((terrain.cellTerrain.vec3 data...) of terrain.cellTerrain.cells) is true
 			geo=terrain.genCellGeo data...
@@ -170,5 +162,6 @@ handlers={
 				info:data
 			}
 	setCell: (data)->
-		terrain.cellTerrain.cells["#{data[0]}:#{data[1]}:#{data[2]}"]=data[3]
+		terrain.cellTerrain.setCell data[0],data[1],data[2],data[3]
+		terrain.cellTerrain.setBiome data[0],data[1],data[2],data[4]
 }

coffee/client/module/World/SectionsWorker.coffee

@@ -69,17 +69,20 @@ class ChunkDecoder
           z:0
         }
         cell=new Uint8Array 16*16*16
+        biome=new Uint8Array 16*16*16
         for x in [0..15]
           for y in [0..15]
             for z in [0..15]
               # 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}))])
+              biome[@cvo(x,y,z)]=packet.biomes[(((num+y) >> 2) & 63) << 4 | (((packet.z+z) >> 2) & 3) << 2 | (((packet.x+x) >> 2) & 3)]
         result.push {
           x:packet.x
           y:num
-          z:packet.z,
-          data:cell
+          z:packet.z
+          cell
+          biome
         }
       else
         result.push(null)

coffee/client/module/World/World.coffee

@@ -16,6 +16,7 @@ class World
 		@cellTerrain=new CellTerrain {cellSize:@cellSize}
 		@ATA=new AnimatedTextureAtlas {al:@al}
 		@material=@ATA.material
+		@material2=@ATA.material2
 		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
 		@chunkWorker=new Worker "/module/World/ChunkWorker.js", {type:'module'}
 		@chunkWorker.onmessage=(message)->
@@ -39,10 +40,11 @@ class World
 			result=data.data.result
 			for i in result
 				if i isnt null
-					_this.setCell i.x,i.y,i.z,i.data
-	setCell: (cellX,cellY,cellZ,buffer)->
-		@_setCell cellX,cellY,cellZ,buffer
-		@cellTerrain.cells[@cellTerrain.vec3(cellX,cellY,cellZ)]=buffer
+					_this.setCell i.x,i.y,i.z,i.cell,i.biome
+	setCell: (cellX,cellY,cellZ,buffer,biome)->
+		@_setCell cellX,cellY,cellZ,buffer,biome
+		@cellTerrain.setCell cellX,cellY,cellZ,buffer
+		@cellTerrain.setBiome cellX,cellY,cellZ,biome
 		@cellNeedsUpdate[@cellTerrain.vec3(cellX,cellY,cellZ)]=true
 		for nei in @neighbours
 			neiCellId=@cellTerrain.vec3(cellX+nei[0],cellY+nei[1],cellZ+nei[2])
@@ -172,10 +174,10 @@ class World
 			return {posPlace,posBreak}
 		else
 			return false
-	_setCell: (cellX,cellY,cellZ,buffer)->
+	_setCell: (cellX,cellY,cellZ,buffer,biome)->
 		@chunkWorker.postMessage {
 			type:"setCell"
-			data:[cellX,cellY,cellZ,buffer]
+			data:[cellX,cellY,cellZ,buffer,biome]
 		}
 	_setVoxel: (voxelX,voxelY,voxelZ,value)->
 		@chunkWorker.postMessage {
@@ -190,11 +192,11 @@ class World
 			type:"genCellGeo"
 			data:[cellX,cellY,cellZ]
 		}
-	_computeSections: (sections,x,z)->
+	_computeSections: (sections,x,z,biomes)->
 		@sectionsWorker.postMessage {
 			type:"computeSections"
 			data:{
-				sections,x,z
+				sections,x,z,biomes
 			}
 		}
 export {World}

coffee/client/module/index.coffee

@@ -39,6 +39,10 @@ init = ()->
 	clouds.position.y=170
 	scene.add clouds
 
+	stats = new Stats()
+	stats.showPanel 0
+	document.body.appendChild stats.dom
+
 	world=new World({
 		toxelSize:27
 		cellSize:16
@@ -59,18 +63,14 @@ init = ()->
 		socket.emit "initClient", {
 			nick:nick
 		}
-		console.log "First Load packet recieved!"
 		# world.replaceWorld v
 		$(".initLoading").css "display","none"
-		stats = new Stats();
-		stats.showPanel(0);
-		document.body.appendChild stats.dom
 		return
 	socket.on "blockUpdate",(block)->
 		world.setBlock block[0],block[1]+16,block[2],block[3]
 		return
-	socket.on "mapChunk", (sections,x,z)->
-		world._computeSections sections,x,z
+	socket.on "mapChunk", (sections,x,z,biomes)->
+		world._computeSections sections,x,z,biomes
 	socket.on "hp",(points)->
 		inv_bar.setHp(points)
 	socket.on "food",(points)->
@@ -120,24 +120,10 @@ init = ()->
 		}
 	)
 	scene.add cursor
-	# $(document).mousedown (e)->
-	# 	if FPC.gameState is "game"
-	# 		rayBlock=world.getRayBlock()
-	# 		if rayBlock
-	# 			if e.which is 1
-	# 				voxelId=0
-	# 				pos=rayBlock.posBreak
-	# 			else
-	# 				voxelId=inv_bar.activeBox
-	# 				pos=rayBlock.posPlace
-	# 			pos[0]=Math.floor pos[0]
-	# 			pos[1]=Math.floor pos[1]
-	# 			pos[2]=Math.floor pos[2]
-	# 			socket.emit "blockUpdate",[pos...,voxelId]
-	# return
+
 	color = new THREE.Color "#adc8ff"
-	near = 32
-	far = 3*16-5
+	near = 3*16-13
+	far = 3*16-3
 	scene.fog = new THREE.Fog color, near, far
 	gui = new GUI()
 	params={

coffee/server.coffee

@@ -44,7 +44,7 @@ module.exports=(config)->
 			socketInfo[socket.id].bot._client.on "map_chunk",(packet)->
 				cell=new Chunk()
 				cell.load packet.chunkData,packet.bitMap,false,true
-				io.to(socket.id).emit "mapChunk", cell.sections,packet.x,packet.z
+				io.to(socket.id).emit "mapChunk", cell.sections,packet.x,packet.z,packet.biomes
 				return
 
 			socketInfo[socket.id].bot.on 'chat',(username, message)->

docs/README.md

@@ -10,7 +10,6 @@
 
 ```bash
 
-#Instalacja repozytorium
 git clone https://github.com/michaljaz/web-minecraft
 cd web-minecraft
 npm i