Better importing and exporting with game parameter

Author: michaljaz

coffee/client/module/AssetLoader.coffee

@@ -8,7 +8,8 @@ class AssetLoader
 		$.get "assets/assetLoader.json", (assets)->
 			_this.load assets,()->
 				console.log "AssetLoader: done loading!"
-				init _this
+				if init isnt null
+					init _this
 				return
 			return
 		return

coffee/client/module/BlockBreak.coffee

@@ -1,12 +1,10 @@
 import * as THREE from './build/three.module.js'
 
 class BlockBreak
-	constructor:(options)->
-		@scene=options.scene
-		@al=options.al
-		@world=options.world
-		@socket=options.socket
-		@texture=@al.get "blocksAtlasSnap"
+	constructor:(game)->
+		console.log game
+		@game=game
+		@texture=@game.al.get "blocksAtlasSnap"
 		@texture.magFilter=THREE.NearestFilter
 		@cursor=new THREE.Mesh(
 			new THREE.BoxBufferGeometry(1.001, 1.001, 1.001)
@@ -20,7 +18,7 @@ class BlockBreak
 			new THREE.EdgesGeometry( @cursor.geometry )
 			new THREE.LineBasicMaterial( { color: 0x000000 } )
 		)
-		@scene.add @cursor, @cursorOut
+		@game.scene.add @cursor, @cursorOut
 		@uv={}
 		@isDigging=false
 		@done=true
@@ -58,7 +56,7 @@ class BlockBreak
 						@cursor.geometry.attributes.uv.array[i]=1-q*toxY
 			@cursor.geometry.attributes.uv.needsUpdate = true
 	updatePos:(cb)->
-		rayBlock=@world.getRayBlock()
+		rayBlock=@game.world.getRayBlock()
 		if JSON.stringify(@lastPos) != JSON.stringify(rayBlock)
 			@lastPos=rayBlock
 			cb()
@@ -74,11 +72,11 @@ class BlockBreak
 	digRequest:()->
 		console.log "REQUESTING DIGGING..."
 		_this=@
-		pos=@world.getRayBlock().posBreak
+		pos=@game.world.getRayBlock().posBreak
 		if pos isnt undefined
-			block=@world.cellTerrain.getBlock pos...
+			block=@game.world.cellTerrain.getBlock pos...
 			if block.diggable
-				@socket.emit "dig", pos
+				@game.socket.emit "dig", pos
 				@done=false
 		return
 	startDigging:(time)->
@@ -101,7 +99,7 @@ class BlockBreak
 		@done=true
 		@isDigging=false
 		console.log "Digging Stopped!"
-		@socket.emit "stopDigging",(xd)->
+		@game.socket.emit "stopDigging",(xd)->
 			callback(xd)
 		@setState 0
 		clearInterval @int

coffee/client/module/Chat.coffee

@@ -1,29 +1,33 @@
 class Chat
-  constructor:(options)->
-    _this=@
-    @FPC=options.FPC
-    @chatDiv = document.querySelector(".chat")
-    @listen()
-    return
-  listen:()->
-    _this=@
-    window.addEventListener "wheel", (e)->
-      if _this.FPC.gameState isnt "chat"
-        e.preventDefault()
-      return
-    , {passive: false}
-    return @
-  isElementScrolledToBottom:(el)->
-    if el.scrollTop >= (el.scrollHeight - el.offsetHeight)
-      return true
-    return false
-  scrollToBottom:(el)->
-    el.scrollTop = el.scrollHeight
-    return
-  log:(message)->
-    atBottom = @isElementScrolledToBottom(@chatDiv)
-    $(".chat").append(message+"<br>")
-    if atBottom
-      @scrollToBottom(@chatDiv)
-    return
+	constructor:(game)->
+		@game=game
+		@chatDiv = document.querySelector(".chat")
+		@listen()
+		@history=[]
+		return
+	listen:()->
+		_this=@
+		window.addEventListener "wheel", (e)->
+			if _this.game.FPC.gameState isnt "chat"
+				e.preventDefault()
+			return
+		, {passive: false}
+		return @
+	isElementScrolledToBottom:(el)->
+		if el.scrollTop >= (el.scrollHeight - el.offsetHeight)
+			return true
+		return false
+	scrollToBottom:(el)->
+		el.scrollTop = el.scrollHeight
+		return
+	log:(message)->
+		atBottom = @isElementScrolledToBottom(@chatDiv)
+		$(".chat").append(message+"<br>")
+		if atBottom
+			@scrollToBottom(@chatDiv)
+		return
+	command:(com)->
+		if com isnt ""
+			@history.push com
+			@game.socket.emit "command",com
 export {Chat}

coffee/client/module/Entities.coffee

@@ -1,15 +1,13 @@
 import * as THREE from './build/three.module.js'
 class Entities
-	constructor:(options)->
-		@scene=options.scene
-		@nick=options.nick
-		@TWEEN=options.TWEEN
+	constructor:(game)->
+		@game=game
 		@mobMaterial = new THREE.MeshBasicMaterial {color: new THREE.Color "red" }
 		@mobGeometry = new THREE.BoxGeometry 1, 1, 1
 		@mobMaxCount=200
 		@mobMesh=new THREE.InstancedMesh @mobGeometry,@mobMaterial,@mobMaxCount
 		@mobMesh.instanceMatrix.setUsage THREE.DynamicDrawUsage
-		@scene.add @mobMesh
+		@game.scene.add @mobMesh
 		@dummy = new THREE.Object3D()
 		return
 	update:(entities)->

coffee/client/module/FirstPersonControls.coffee

@@ -1,7 +1,8 @@
 import * as THREE from './build/three.module.js'
 
 class FirstPersonControls
-	constructor: (options)->
+	constructor: (game)->
+		@game=game
 		@kc={
 			87:"forward"
 			65:"right"
@@ -11,25 +12,19 @@ class FirstPersonControls
 			16:"sneak"
 			82:"sprint"
 		}
-		@pii=options.pii
-		@fov=options.fov
 		@keys={}
-		@canvas=options.canvas
-		@camera=options.camera
-		@socket=options.socket
-		@TWEEN=options.TWEEN
 		@setState "menu"
 		@listen()
 	updatePosition: (e)->
 		#Updatowanie kursora
 		if @gameState is "gameLock"
-			@camera.rotation.x -= THREE.MathUtils.degToRad e.movementY / 10
-			@camera.rotation.y -= THREE.MathUtils.degToRad e.movementX / 10
-			if THREE.MathUtils.radToDeg( @camera.rotation.x ) < -90
-				@camera.rotation.x = THREE.MathUtils.degToRad -90
-			if THREE.MathUtils.radToDeg( @camera.rotation.x ) > 90
-				@camera.rotation.x = THREE.MathUtils.degToRad 90
-			@socket.emit "rotate", [@camera.rotation.y,@camera.rotation.x]
+			@game.camera.rotation.x -= THREE.MathUtils.degToRad e.movementY / 10
+			@game.camera.rotation.y -= THREE.MathUtils.degToRad e.movementX / 10
+			if THREE.MathUtils.radToDeg( @game.camera.rotation.x ) < -90
+				@game.camera.rotation.x = THREE.MathUtils.degToRad -90
+			if THREE.MathUtils.radToDeg( @game.camera.rotation.x ) > 90
+				@game.camera.rotation.x = THREE.MathUtils.degToRad 90
+			@game.socket.emit "rotate", [@game.camera.rotation.y,@game.camera.rotation.x]
 		return
 	listen: ->
 		_this=@
@@ -43,7 +38,7 @@ class FirstPersonControls
 
 			#Klawisz Enter
 			if z.keyCode is 13 and _this.gameState is "chat"
-				_this.socket.emit "command",$(".com_i").val()
+				_this.game.chat.command $(".com_i").val()
 				$(".com_i").val("")
 
 			#Klawisz E
@@ -69,14 +64,14 @@ class FirstPersonControls
 
 			#Wysyłanie state'u do serwera
 			if _this.kc[z.keyCode] isnt undefined and _this.gameState is "gameLock"
-				_this.socket.emit "move",_this.kc[z.keyCode],true
+				_this.game.socket.emit "move",_this.kc[z.keyCode],true
 				if _this.kc[z.keyCode] is "sprint"
-					to={fov:_this.fov+10}
-					new _this.TWEEN.Tween _this.camera
+					to={fov:_this.game.fov+10}
+					new _this.game.TWEEN.Tween _this.game.camera
 						.to to, 200
-						.easing _this.TWEEN.Easing.Quadratic.Out
+						.easing _this.game.TWEEN.Easing.Quadratic.Out
 						.onUpdate ()->
-							_this.camera.updateProjectionMatrix()
+							_this.game.camera.updateProjectionMatrix()
 						.start()
 			return
 		$(document).keyup (z) ->
@@ -85,22 +80,22 @@ class FirstPersonControls
 
 			#Wysyłanie state'u do serwera
 			if _this.kc[z.keyCode] isnt undefined
-				_this.socket.emit "move",_this.kc[z.keyCode],false
+				_this.game.socket.emit "move",_this.kc[z.keyCode],false
 				if _this.kc[z.keyCode] is "sprint"
-					to={fov:_this.fov}
-					new _this.TWEEN.Tween _this.camera
+					to={fov:_this.game.fov}
+					new _this.game.TWEEN.Tween _this.game.camera
 						.to to, 200
-						.easing _this.TWEEN.Easing.Quadratic.Out
+						.easing _this.game.TWEEN.Easing.Quadratic.Out
 						.onUpdate ()->
-							_this.camera.updateProjectionMatrix()
+							_this.game.camera.updateProjectionMatrix()
 						.start()
 
 			return
 		$(".gameOn").click ->
 			_this.setState "game"
 			return
 		lockChangeAlert=()->
-			if document.pointerLockElement is _this.canvas or document.mozPointerLockElement is _this.canvas
+			if document.pointerLockElement is _this.game.canvas or document.mozPointerLockElement is _this.game.canvas
 				#Lock
 				if _this.gameState is "game"
 					_this.setState "gameLock"
@@ -116,16 +111,16 @@ class FirstPersonControls
 		, false
 		return @
 	reqLock:()->
-		@canvas.requestPointerLock()
+		@game.canvas.requestPointerLock()
 	unLock:()->
 		document.exitPointerLock = document.exitPointerLock or document.mozExitPointerLock
 		document.exitPointerLock()
 	state:(state)->
 		@gameState=state
 		if state is "inventory"
-			@pii.show()
+			@game.pii.show()
 		else
-			@pii.hide() 
+			@game.pii.hide()
 		# console.log "Game state: "+state
 	resetState:()->
 		$(".chat").removeClass("focus")

coffee/client/module/PlayerInInventory.coffee

@@ -1,19 +1,18 @@
 import * as THREE from './build/three.module.js'
 class PlayerInInventory
-	constructor:(options)->
-		@canvas=options.canvas
-		@al=options.al
+	constructor:(game)->
+		@game=game
 		@renderer=new THREE.WebGLRenderer {
-			canvas:@canvas
+			canvas:@game.pcanvas
 			PixelRatio:window.devicePixelRatio
 		}
 		@scene=new THREE.Scene
 		@scene.background = new THREE.Color "black"
 		light = new THREE.AmbientLight( 0xffffff )
 		@scene.add( light );
 
-		player=@al.get "player"
-		playerTex=@al.get "playerTex"
+		player=@game.al.get "player"
+		playerTex=@game.al.get "playerTex"
 
 		playerTex.magFilter=THREE.NearestFilter;
 		player.children[0].material.map=playerTex;
@@ -42,7 +41,7 @@ class PlayerInInventory
 	render:()->
 		@renderer.render @scene, @camera
 	show:()->
-		@canvas.style.display="block"
+		@game.pcanvas.style.display="block"
 	hide:()->
-		@canvas.style.display="none"
+		@game.pcanvas.style.display="none"
 export {PlayerInInventory}

coffee/client/module/World/World.coffee

@@ -3,23 +3,18 @@ import {CellTerrain} from './CellTerrain.js'
 import {AnimatedTextureAtlas} from './AnimatedTextureAtlas.js'
 
 class World
-	constructor: (options) ->
+	constructor: (game) ->
 		_this=@
+		@game=game
 		@cellBlackList={}
 		@cellMesh={}
 		@cellNeedsUpdate={}
 		@models={}
-		@cellSize=options.cellSize
-		@camera=options.camera
-		@scene=options.scene
-		@toxelSize=options.toxelSize
-		@al=options.al
-		@cellTerrain=new CellTerrain {cellSize:@cellSize}
-		@ATA=new AnimatedTextureAtlas {al:@al}
+		@cellTerrain=new CellTerrain {cellSize:@game.cellSize}
+		@ATA=new AnimatedTextureAtlas {al:@game.al}
 		@material=@ATA.material
 		@cellUpdateTime=null
 		@renderTime=100
-		@renderer=options.renderer
 		@neighbours=[[-1, 0, 0],[1, 0, 0],[0, -1, 0],[0, 1, 0],[0, 0, -1],[0, 0, 1]]
 
 		#Utworzenie Workera do obliczania geometrii chunków
@@ -29,10 +24,10 @@ class World
 		@chunkWorker.postMessage {
 			type:'init'
 			data:{
-				blocksMapping: @al.get "blocksMapping"
-				toxelSize: @toxelSize
-				cellSize: @cellSize
-				blocksTex: @al.get "blocksTex"
+				blocksMapping: @game.al.get "blocksMapping"
+				toxelSize: @game.toxelSize
+				cellSize: @game.cellSize
+				blocksTex: @game.al.get "blocksTex"
 			}
 		}
 
@@ -100,9 +95,9 @@ class World
 				if cellBlackList[i] is true
 					@cellMesh[i].geometry.dispose()
 					# @cellMesh[i].material.dispose()
-					@scene.remove @cellMesh[i]
+					@game.scene.remove @cellMesh[i]
 					@cellMesh[i]="disposed"
-			@renderer.renderLists.dispose()
+			@game.renderer.renderLists.dispose()
 	updateCell: (data)->
 		#Updatowanie komórki z już obliczoną geometrią
 		cellId=@cellTerrain.vec3 data.info...
@@ -113,14 +108,16 @@ class World
 		geometry.setAttribute 'normal',new THREE.BufferAttribute(new Float32Array(cell.normals), 3)
 		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"
 			@cellMesh[cellId]=new THREE.Mesh geometry,@material
+			@cellMesh[cellId].matrixAutoUpdate=false
 			@cellMesh[cellId].frustumCulled = false
 			_this=@
 			@cellMesh[cellId].onAfterRender = ()->
 				_this.cellMesh[cellId].frustumCulled = true
 				_this.cellMesh[cellId].onAfterRender = ->
-			@scene.add @cellMesh[cellId]
+			@game.scene.add @cellMesh[cellId]
 		else if mesh isnt "disposed"
 			@cellMesh[cellId].geometry=geometry
 		return
@@ -200,8 +197,8 @@ class World
 					steppedIndex = 2
 		return null
 	getRayBlock: ->
-		start = new THREE.Vector3().setFromMatrixPosition(@camera.matrixWorld)
-		end = new THREE.Vector3().set(0,0, 1).unproject(@camera)
+		start = new THREE.Vector3().setFromMatrixPosition(@game.camera.matrixWorld)
+		end = new THREE.Vector3().set(0,0, 1).unproject(@game.camera)
 		intersection = @intersectsRay start, end
 		if intersection
 			posPlace = intersection.position.map (v, ndx) ->