blocksDefinitions optimization & all es6 modules & better webpack build

Author: michaljaz

coffee/client/js/AssetLoader.coffee

@@ -1,5 +1,5 @@
-import * as THREE from './build/three.module.js'
-import {FBXLoader} from './jsm/loaders/FBXLoader.js'
+import * as THREE from "three"
+import {FBXLoader} from "three/examples/jsm/loaders/FBXLoader.js"
 
 class AssetLoader
 	constructor: (init)->

coffee/client/js/BlockBreak.coffee

@@ -1,4 +1,4 @@
-import * as THREE from './build/three.module.js'
+import * as THREE from "three"
 
 class BlockBreak
 	constructor:(game)->
@@ -75,9 +75,8 @@ class BlockBreak
 		pos=@game.world.getRayBlock().posBreak
 		if pos isnt undefined
 			block=@game.world.cellTerrain.getBlock pos...
-			if block.diggable
-				@game.socket.emit "dig", pos
-				@done=false
+			@game.socket.emit "dig", pos
+			@done=false
 		return
 	startDigging:(time)->
 		_this=@

coffee/client/js/Entities.coffee

@@ -1,4 +1,4 @@
-import * as THREE from './build/three.module.js'
+import * as THREE from 'three'
 class Entities
 	constructor:(game)->
 		@game=game

coffee/client/js/FirstPersonControls.coffee

@@ -1,4 +1,4 @@
-import * as THREE from './build/three.module.js'
+import * as THREE from 'three'
 
 class FirstPersonControls
 	constructor: (game)->
@@ -41,7 +41,7 @@ class FirstPersonControls
 				_this.game.chat.chatGoBack()
 			if z.keyCode is 40 and _this.gameState is "chat"
 				_this.game.chat.chatGoForward()
-			
+
 			#Klawisz Enter
 			if z.keyCode is 13 and _this.gameState is "chat"
 				_this.game.chat.command $(".com_i").val()

coffee/client/js/PlayerInInventory.coffee

@@ -1,4 +1,4 @@
-import * as THREE from './build/three.module.js'
+import * as THREE from 'three'
 class PlayerInInventory
 	constructor:(game)->
 		@game=game

coffee/client/js/World/AnimatedTextureAtlas.coffee

@@ -1,4 +1,4 @@
-import * as THREE from './../build/three.module.js'
+import * as THREE from 'three'
 
 class TextureAtlasCreator
 	constructor: (options)->

coffee/client/js/World/CellTerrain.coffee

@@ -1,9 +1,9 @@
-import {Block} from './../build/Block.js'
+
 class CellTerrain
 	constructor: (options)->
 		@cellSize=options.cellSize
 		@cells={}
-		@loadedBlocks={}
+		@blocksDef=options.blocksDef
 	vec3: (x,y,z)->
 		x=parseInt x
 		y=parseInt y
@@ -47,7 +47,18 @@ class CellTerrain
 	setCell:(cellX,cellY,cellZ,buffer)->
 		@cells[@vec3(cellX,cellY,cellZ)]=buffer
 	getBlock:(blockX,blockY,blockZ)->
-		if @loadedBlocks[@getVoxel(blockX,blockY,blockZ)] is undefined
-			@loadedBlocks[@getVoxel(blockX,blockY,blockZ)]=new Block.fromStateId @getVoxel(blockX,blockY,blockZ)
-		return @loadedBlocks[@getVoxel(blockX,blockY,blockZ)]
+		stateId=@getVoxel(blockX,blockY,blockZ)
+		def=@blocksDef[stateId]
+		if def isnt undefined
+			if def[1] is 1
+				boundingBox="block"
+			else
+				boundingBox="empty"
+			return {
+				name:def[0]
+				stateId
+				boundingBox
+			}
+		else
+			return false
 export {CellTerrain}

coffee/client/js/World/World.coffee

@@ -1,4 +1,4 @@
-import * as THREE from './../build/three.module.js'
+import * as THREE from 'three'
 import {CellTerrain} from './CellTerrain.js'
 import {AnimatedTextureAtlas} from './AnimatedTextureAtlas.js'
 
@@ -12,8 +12,9 @@ class World
 		@cellBlackList={}
 		@cellMesh={}
 		@cellNeedsUpdate={}
+		@blocksDef=@game.al.get "blocksDef"
 		@models={}
-		@cellTerrain=new CellTerrain {cellSize:@game.cellSize}
+		@cellTerrain=new CellTerrain {cellSize:@game.cellSize,blocksDef:@blocksDef}
 		@ATA=new AnimatedTextureAtlas {al:@game.al}
 		@material=@ATA.material
 		@cellUpdateTime=null
@@ -31,6 +32,7 @@ class World
 				toxelSize: @game.toxelSize
 				cellSize: @game.cellSize
 				blocksTex: @game.al.get "blocksTex"
+				blocksDef: @blocksDef
 			}
 		}
 

coffee/client/js/World/chunk.worker.coffee

@@ -7,12 +7,12 @@ class TerrainManager
 		@cellSize=options.cellSize
 		@cellTerrain=new CellTerrain {
 			cellSize:@cellSize
+			blocksDef:options.blocksDef
 		}
 		@toxelSize=options.toxelSize
 		@q=1/@toxelSize
 		@blocksMapping=options.blocksMapping
 		@blocksTex=options.blocksTex
-		console.log @blocksTex
 	genBlockFace: (type,block,pos)->
 		if @blocksTex[block.name] isnt undefined or @blocksTex[String(block.stateId)] isnt undefined
 			if @blocksTex[String(block.stateId)] isnt undefined
@@ -223,6 +223,7 @@ handlers={
 			toxelSize:data.toxelSize
 			cellSize:data.cellSize
 			blocksTex:data.blocksTex
+			blocksDef:data.blocksDef
 		}
 		return
 	setVoxel:(data)->

coffee/client/js/index.coffee

@@ -1,21 +1,20 @@
 
-import * as THREE from './build/three.module.js'
-import {SkeletonUtils} from './jsm/utils/SkeletonUtils.js'
-import Stats from './jsm/libs/stats.module.js'
-import {World} from './World/World.js'
-import {FirstPersonControls} from './FirstPersonControls.js'
-import {gpuInfo} from './gpuInfo.js'
-import {AssetLoader} from './AssetLoader.js'
-import {InventoryBar} from './InventoryBar.js'
-import {RandomNick} from './RandomNick.js'
-import {GUI} from './jsm/libs/dat.gui.module.js'
-import {Chat} from './Chat.js'
-import {Entities} from './Entities.js'
-import {PlayerInInventory} from './PlayerInInventory.js'
-import {BlockBreak} from './BlockBreak.js'
-import {BlockPlace} from './BlockPlace.js'
-import io from 'socket.io-client'
+import * as THREE from "three"
+import Stats from "stats-js"
+import * as dat from "dat.gui"
+import io from "socket.io-client"
 import TWEEN from "@tweenjs/tween.js"
+import {World} from "./World/World.js"
+import {FirstPersonControls} from "./FirstPersonControls.js"
+import {gpuInfo} from "./gpuInfo.js"
+import {AssetLoader} from "./AssetLoader.js"
+import {InventoryBar} from "./InventoryBar.js"
+import {RandomNick} from "./RandomNick.js"
+import {Chat} from "./Chat.js"
+import {Entities} from "./Entities.js"
+import {PlayerInInventory} from "./PlayerInInventory.js"
+import {BlockBreak} from "./BlockBreak.js"
+import {BlockPlace} from "./BlockPlace.js"
 
 class Game
 	constructor:(options)->
@@ -29,8 +28,8 @@ class Game
 		@fov=70
 		@toxelSize=27
 		@cellSize=16
-		@canvas=document.querySelector '#c'
-		@pcanvas=document.querySelector '#c_player'
+		@canvas=document.querySelector "#c"
+		@pcanvas=document.querySelector "#c_player"
 
 		@socket=io.connect ":8081"
 
@@ -55,7 +54,7 @@ class Game
 			document.location.href="\##{@nick}"
 
 		@stats=new Stats
-		@drawcalls=@stats.addPanel new Stats.Panel( 'calls', '#ff8', '#221' )
+		@drawcalls=@stats.addPanel new Stats.Panel( "calls", "#ff8", "#221" )
 		@stats.showPanel 3
 		document.body.appendChild @stats.dom
 
@@ -71,7 +70,7 @@ class Game
 		eventMap={
 			"connect":()->
 				console.log "Połączono z serverem!"
-				$('.loadingText').text "Za chwilę dołączysz do gry..."
+				$(".loadingText").text "Za chwilę dołączysz do gry..."
 				console.log "User nick: #{_this.nick}"
 				_this.socket.emit "initClient",
 					nick:_this.nick
@@ -135,21 +134,21 @@ class Game
 			@socket.on i,eventMap[i]
 
 
-		gui = new GUI()
+		gui = new dat.GUI
 		@params=
 			fog:false
 			chunkdist:3
 		color = new THREE.Color "#adc8ff"
 		near = 0.5*16
 		far = 2.5*16
 		# scene.fog = new THREE.Fog color, near, far
-		gui.add( @params, 'fog' ).name( 'Enable fog' ).listen().onChange ()->
+		gui.add( @params, "fog" ).name( "Enable fog" ).listen().onChange ()->
 			if _this.params.fog
 				_this.scene.fog = new THREE.Fog color, near, far
 			else
 				_this.scene.fog = null
-		gui.add( @world.material, 'wireframe' ).name( 'Wireframe' ).listen()
-		gui.add( @params, 'chunkdist',0,10,1).name( 'Render distance' ).listen()
+		gui.add( @world.material, "wireframe" ).name( "Wireframe" ).listen()
+		gui.add( @params, "chunkdist",0,10,1).name( "Render distance" ).listen()
 		@mouse=false
 		$(document).mousedown (e)->
 			if e.which is 1