function updateCellsAroundPlayer now only in worker

Author: michaljaz

src/client/scripts/World/World.coffee

@@ -24,7 +24,14 @@ class World
 		#Utworzenie Workera do obliczania geometrii chunków
 		@chunkWorker=new chunkWorker
 		@chunkWorker.onmessage=(message)->
-			_this.updateCell message.data
+			if message.data.type is "cellGeo"
+				_this.updateCell message.data.data
+			else if message.data.type is "removeCell"
+				if _this.cellMesh[message.data.data] isnt undefined
+					_this.cellMesh[message.data.data].geometry.dispose()
+					_this.game.scene.remove _this.cellMesh[message.data.data]
+					delete _this.cellMesh[message.data.data]
+					_this.game.renderer.renderLists.dispose()
 		@chunkWorker.postMessage {
 			type:'init'
 			data:{
@@ -47,62 +54,13 @@ class World
 	setCell: (cellX,cellY,cellZ,buffer)->
 		@_setCell cellX,cellY,cellZ,buffer
 		@cellTerrain.setCell 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
 		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
-	updateCellsAroundPlayer: (pos,radius)->
-		#Updatowanie komórek wokół gracza w danym zasięgu
-		_this=@
-		if @cellUpdateTime isnt null and (performance.now()-@cellUpdateTime>@renderTime)
-			#Ustawianie z defaultu, żeby każdy Mesh był wykasowywany
-			cellBlackList={}
-			for k,v of @cellMesh
-				if v isnt "disposed" and v isnt "disposedX"
-					cellBlackList[k]=true
-			cell=@cellTerrain.computeCellForVoxel (Math.floor pos.x),(Math.floor pos.y),(Math.floor pos.z)
-			up=(x,y,z)->
-				pcell=[cell[0]+x,cell[1]+y,cell[2]+z]
-				cellId=_this.cellTerrain.vec3(pcell...)
-				#Updatowanie mesha, jeśli był disposed lub potrzebuje updatu
-				if _this.cellNeedsUpdate[cellId] or _this.cellMesh[cellId] is "disposed"
-
-					if _this.cellNeedsUpdate[cellId]
-						delete _this.cellNeedsUpdate[cellId]
-					if _this.cellMesh[cellId] is "disposed"
-						_this.cellMesh[cellId]="disposedX"
-					_this._genCellGeo pcell...
-				cellBlackList[cellId]=false
-				return
-			odw={}
-			for i in [0..radius]
-				for x in [-i..i]
-					for y in [-i..i]
-						for z in [-i..i]
-							if not odw["#{x}:#{y}:#{z}"]
-								up(x,y,z)
-								odw["#{x}:#{y}:#{z}"]=true
-			#Kasowanie Meshy, które mają znacznik .todel
-			for i of cellBlackList
-				if cellBlackList[i] is true
-					@cellMesh[i].geometry.dispose()
-					# @cellMesh[i].material.dispose()
-					@game.scene.remove @cellMesh[i]
-					@cellMesh[i]="disposed"
-			@game.renderer.renderLists.dispose()
 	resetWorld: ()->
 		for i of @cellMesh
 			if @cellMesh[i].geometry isnt undefined
@@ -123,7 +81,7 @@ class World
 		geometry.setAttribute 'uv',new THREE.BufferAttribute(new Float32Array(cell.uvs), 2)
 		geometry.setAttribute 'color',new THREE.BufferAttribute(new Float32Array(cell.colors), 3)
 		geometry.matrixAutoUpdate=false
-		if mesh is undefined or mesh is "disposedX"
+		if mesh is undefined
 			@cellMesh[cellId]=new THREE.Mesh geometry,@material
 			@cellMesh[cellId].matrixAutoUpdate=false
 			@cellMesh[cellId].frustumCulled = false
@@ -132,7 +90,7 @@ class World
 				_this.cellMesh[cellId].frustumCulled = true
 				_this.cellMesh[cellId].onAfterRender = ->
 			@game.scene.add @cellMesh[cellId]
-		else if mesh isnt "disposed"
+		else
 			@cellMesh[cellId].geometry=geometry
 		return
 	intersectsRay: (start,end) ->
@@ -254,6 +212,15 @@ class World
 			type:"genCellGeo"
 			data:[cellX,cellY,cellZ]
 		}
+	_updateCellsAroundPlayer: (radius)->
+		if @cellUpdateTime isnt null and (performance.now()-@cellUpdateTime>@renderTime)
+			pos=@game.camera.position
+			cell=@cellTerrain.computeCellForVoxel (Math.floor pos.x),(Math.floor pos.y),(Math.floor pos.z)
+			@chunkWorker.postMessage {
+				type:"updateCellsAroundPlayer"
+				data:[cell,radius]
+			}
+		return
 	_computeSections: (sections,x,z,biomes)->
 		#Wysyłanie do SectionsWorkera Buffora, który ma przekształcić w łatwiejszą postać
 		@sectionsWorker.postMessage {

src/client/scripts/World/chunk.worker.coffee

@@ -1,6 +1,6 @@
 import {CellTerrain} from './CellTerrain.coffee'
 
-console.log "CHUNK WORKER STARTED!"
+terrain=null
 
 class TerrainManager
 	constructor: (options)->
@@ -13,6 +13,8 @@ class TerrainManager
 		@q=1/@toxelSize
 		@blocksMapping=options.blocksMapping
 		@blocksTex=options.blocksTex
+		@cellNeedsUpdate={}
+		@loadedMeshes={}
 	genBlockFace: (type,block,pos)->
 		if @blocksTex[block.name] isnt undefined or @blocksTex[String(block.stateId)] isnt undefined
 			if @blocksTex[String(block.stateId)] isnt undefined
@@ -201,21 +203,9 @@ class TerrainManager
 			uvs
 			colors
 		}
-addEventListener "message", (e)->
-	fn = handlers[e.data.type]
-	if not fn
-		throw new Error('no handler for type: ' + e.data.type)
-	fn(e.data.data)
-	return
-State={
-	init:null
-	world:{}
-}
-terrain=null
-time=0
-handlers={
+
+handlers=
 	init:(data)->
-		State.init=data
 		terrain=new TerrainManager {
 			models:data.models
 			blocks:data.blocks
@@ -228,20 +218,78 @@ handlers={
 		return
 	setVoxel:(data)->
 		terrain.cellTerrain.setVoxel data...
+		#TODO: cellNeedsUpdate update
+		cellId=terrain.cellTerrain.vec3 terrain.cellTerrain.computeCellForVoxel(data[0],data[1],data[2])...
+		terrain.cellNeedsUpdate[cellId]=true
+		neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
+		for i in neighbours
+			neiCellId=terrain.cellTerrain.vec3 terrain.cellTerrain.computeCellForVoxel(data[0]+nei[0],data[1]+nei[1],data[2]+nei[2])...
+			terrain.cellNeedsUpdate[neiCellId]=true
+		return
 	genCellGeo: (data)->
 		if ((terrain.cellTerrain.vec3 data...) of terrain.cellTerrain.cells) is true
 			p1=performance.now()
 			geo=terrain.genCellGeo data...
 			p2=performance.now()
 			postMessage {
-				cell:geo
-				info:data
-				p:performance.now()
+				type:"cellGeo"
+				data:
+					cell:geo
+					info:data
+					p:performance.now()
 			}
+		return
 	setCell: (data)->
+		neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
+		terrain.cellNeedsUpdate[terrain.cellTerrain.vec3 data[0],data[1],data[2]]=true
 		terrain.cellTerrain.setCell data[0],data[1],data[2],data[3]
+		for nei in neighbours
+			neiCellId=terrain.cellTerrain.vec3(data[0]+nei[0],data[1]+nei[1],data[2]+nei[2])
+			terrain.cellNeedsUpdate[neiCellId]=true
+		return
 	resetWorld: (data)->
 		console.log "RESET WORLD!"
 		terrain.cellTerrain.cells={}
 		return
-}
+	updateCellsAroundPlayer:(data)->
+		cell=data[0]
+		radius=data[1]
+		odw={}
+		cellBlackList={}
+		for k,v of terrain.loadedMeshes
+			if v is true 
+				cellBlackList[k]=true
+		for i in [0..radius]
+			for x in [-i..i]
+				for y in [-i..i]
+					for z in [-i..i]
+						if not odw["#{x}:#{y}:#{z}"]
+							odw["#{x}:#{y}:#{z}"]=true
+							pcell=[cell[0]+x,cell[1]+y,cell[2]+z]
+							cellId=terrain.cellTerrain.vec3 pcell...
+							cellBlackList[cellId]=false
+							gen=false
+							if terrain.cellNeedsUpdate[cellId]
+								delete terrain.cellNeedsUpdate[cellId]
+								handlers.genCellGeo pcell
+								gen=true
+							if terrain.loadedMeshes[cellId] is "disposed"
+								if not gen
+									handlers.genCellGeo pcell
+							terrain.loadedMeshes[cellId]=true
+		for k,v of cellBlackList
+			if v is true
+				terrain.loadedMeshes[k]="disposed"
+				postMessage {
+					type:"removeCell"
+					data:k
+				}
+		return
+
+addEventListener "message", (e)->
+	fn = handlers[e.data.type]
+	if not fn
+		throw new Error "no handler for type: #{e.data.type}"
+	fn e.data.data
+	return
+

src/client/scripts/World/sections.worker.coffee

@@ -1,6 +1,4 @@
 
-console.log "SECTIONS WORKER STARTED!"
-
 class BitArray
 	constructor: (options)->
 		if options is null

src/client/scripts/index.coffee

@@ -61,7 +61,7 @@ class Game
 
 		@stats=new Stats
 		@drawcalls=@stats.addPanel new Stats.Panel( "calls", "#ff8", "#221" )
-		@stats.showPanel 3
+		@stats.showPanel 0
 		document.body.appendChild @stats.dom
 
 		@pii=new PlayerInInventory @
@@ -202,7 +202,7 @@ class Game
 				_this.bb.stopDigging()
 			if _this.mouse and _this.bb.done
 				_this.bb.digRequest()
-		@world.updateCellsAroundPlayer @camera.position,@params.chunkdist
+		@world._updateCellsAroundPlayer @params.chunkdist
 		TWEEN.update()
 		@drawcalls.update @renderer.info.render.calls,100
 		if @FPC.gameState is "inventory"

src/client/webpack.common.coffee

@@ -7,7 +7,6 @@ webpack=require "webpack"
 LodashModuleReplacementPlugin = require 'lodash-webpack-plugin'
 
 module.exports=
-	stats:"detailed"
 	performance:
 		hints: false
 	entry: [

src/server.json

@@ -1,5 +1,5 @@
 {
 	"ip":"localhost",
 	"port":25565,
-	"version":"1.16.1"
+	"version":"1.16.5"
 }