Block Parsing prototype

Author: michaljaz

coffee/client/module/InventoryBar.coffee

@@ -38,7 +38,11 @@ class InventoryBar
 			$(".food").eq(10-i).addClass(lista[10-i])
 		return
 	setXp: (level,progress)->
-		$(".player_xp").text level
+		if level is 0
+			$(".player_xp").hide()
+		else
+			$(".player_xp").show()
+			$(".player_xp").text level
 		$(".xp_bar").css "width","#{500*progress}px"
 	setFocus:(num)->
 		$(".inv_cursor").css("left","calc(50vw - 253px + 55*#{num}px)")

coffee/client/module/World/World.coffee

@@ -30,6 +30,7 @@ class World
 				blocksMapping: @al.get "blocksMapping"
 				toxelSize: @toxelSize
 				cellSize: @cellSize
+				blocksTex: @al.get "blocksTex"
 			}
 		}
 

coffee/client/module/World/chunk.worker.coffee

@@ -11,16 +11,59 @@ class TerrainManager
 		@toxelSize=options.toxelSize
 		@q=1/@toxelSize
 		@blocksMapping=options.blocksMapping
+		@blocksTex=options.blocksTex
+		console.log @blocksTex
 	genBlockFace: (type,block,pos)->
-		if block.name is "water"
+		if @blocksTex[block.name] isnt undefined
+			if @blocksTex[block.name]["all"] isnt undefined
+				toxX=@blocksMapping[@blocksTex[block.name].all]["x"]
+				toxY=@blocksMapping[@blocksTex[block.name].all]["y"]
+			else if @blocksTex[block.name]["side"] isnt undefined
+				mapka={
+					"py":"top"
+					"ny":"bottom"
+				}
+				if mapka[type] isnt undefined
+					toxX=@blocksMapping[@blocksTex[block.name][mapka[type]]]["x"]
+					toxY=@blocksMapping[@blocksTex[block.name][mapka[type]]]["y"]
+				else
+					toxX=@blocksMapping[@blocksTex[block.name]["side"]]["x"]
+					toxY=@blocksMapping[@blocksTex[block.name]["side"]]["y"]
+			else
+				toxX=@blocksMapping[@blocksTex[block.name][type]]["x"]
+				toxY=@blocksMapping[@blocksTex[block.name][type]]["y"]
+		else if @blocksTex[String(block.stateId)] isnt undefined
+			xd=@blocksTex[String(block.stateId)]
+			if xd["all"] isnt undefined
+				console.log "1"
+				toxX=@blocksMapping[xd.all]["x"]
+				toxY=@blocksMapping[xd.all]["y"]
+			else if xd["side"] isnt undefined
+				mapka={
+					"py":"top"
+					"ny":"bottom"
+				}
+				if mapka[type] isnt undefined
+					console.log "2"
+					toxX=@blocksMapping[xd[mapka[type]]]["x"]
+					toxY=@blocksMapping[xd[mapka[type]]]["y"]
+				else
+					console.log xd["side"]
+					toxX=@blocksMapping[xd["side"]]["x"]
+					toxY=@blocksMapping[xd["side"]]["y"]
+			else
+				console.log xd[type]
+				toxX=@blocksMapping[xd[type]]["x"]
+				toxY=@blocksMapping[xd[type]]["y"]
+		else if block.name is "water"
 			toxX=@blocksMapping["water_flow"]["x"]
 			toxY=@blocksMapping["water_flow"]["y"]
 		else if @blocksMapping[block.name]
 			toxX=@blocksMapping[block.name]["x"]
 			toxY=@blocksMapping[block.name]["y"]
 		else
 			toxX=@blocksMapping["debug"]["x"]
-			toxY=28-@blocksMapping["debug"]["y"]
+			toxY=@blocksMapping["debug"]["y"]
 		li = [255,255,255]
 		sh = [0,0,0]
 		toxX-=1
@@ -195,6 +238,7 @@ handlers={
 			blocksMapping:data.blocksMapping
 			toxelSize:data.toxelSize
 			cellSize:data.cellSize
+			blocksTex:data.blocksTex
 		}
 		return
 	setVoxel:(data)->

src/client/assets/assetLoader.json

@@ -14,5 +14,9 @@
   "skybox":{
     "path":"assets/images/skybox.jpg",
     "type":"texture"
-  }
+  },
+	"blocksTex":{
+		"path":"assets/blocks/blocks.json",
+		"type":"text"
+	}
 }

src/client/assets/blocks/blocks.json

@@ -1,107 +1,25 @@
 {
-  "0":{
-    "name":"air",
-    "isBlock":false
-  },
-  "1": {
-    "name":"grass",
-    "isBlock":true,
-    "faces": {
-      "nx": "grass_block_side",
-      "ny": "grass_block_top",
-      "nz": "grass_block_side",
-      "px": "grass_block_side",
-      "py": "grass_block_top",
-      "pz": "grass_block_side"
-    }
-  },
-  "2": {
-    "name":"stone",
-    "isBlock":true,
-    "faces": {
-      "nx": "stone",
-      "ny": "stone",
-      "nz": "stone",
-      "px": "stone",
-      "py": "stone",
-      "pz": "stone"
-    }
-  },
-  "3": {
-    "name":"oak_planks",
-    "isBlock":true,
-    "faces": {
-      "nx": "oak_planks",
-      "ny": "oak_planks",
-      "nz": "oak_planks",
-      "px": "oak_planks",
-      "py": "oak_planks",
-      "pz": "oak_planks"
-    }
-  },
-  "4": {
-    "name":"smoker",
-    "isBlock":true,
-    "faces": {
-      "nx": "smoker_side",
-      "ny": "smoker_top",
-      "nz": "smoker_side",
-      "px": "smoker_side",
-      "py": "smoker_top",
-      "pz": "smoker_front_on"
-    }
-  },
-  "5": {
-    "name":"anvil",
-    "isBlock":false,
-    "model":"anvil"
-  },
-  "6": {
-    "name":"brick",
-    "isBlock":true,
-    "faces": {
-      "nx": "bricks",
-      "ny": "bricks",
-      "nz": "bricks",
-      "px": "bricks",
-      "py": "bricks",
-      "pz": "bricks"
-    }
-  },
-  "7": {
-    "name":"furnace",
-    "isBlock":true,
-    "faces": {
-      "nx": "furnace_side",
-      "ny": "furnace_top",
-      "nz": "furnace_side",
-      "px": "furnace_side",
-      "py": "furnace_top",
-      "pz": "furnace_front"
-    }
-  },
-  "8": {
-    "name":"library",
-    "isBlock":true,
-    "faces": {
-      "nx": "bookshelf",
-      "ny": "oak_planks",
-      "nz": "bookshelf",
-      "px": "bookshelf",
-      "py": "oak_planks",
-      "pz": "bookshelf"
-    }
-  },
-  "9": {
-    "name":"tnt",
-    "isBlock":true,
-    "faces": {
-      "nx": "tnt_side",
-      "ny": "tnt_bottom",
-      "nz": "tnt_side",
-      "px": "tnt_side",
-      "py": "tnt_top",
-      "pz": "tnt_side"
-    }
-  }
+	"grass_block":{
+		"side":"grass_block_side",
+		"top":"grass_block_top",
+		"bottom":"dirt"
+	},
+	"warped_nylium":{
+		"top":"warped_nylium",
+		"bottom":"netherrack",
+		"side":"warped_nylium_side"
+	},
+	"77":{
+		"top":"spruce_log_top",
+		"side":"spruce_log",
+		"bottom":"spruce_log_top"
+	},
+	"78":{
+		"nx":"spruce_log",
+		"px":"spruce_log",
+		"ny":"spruce_log",
+		"py":"spruce_log",
+		"nz":"spruce_log",
+		"pz":"spruce_log"
+	}
 }