betterInitLoading

Author: michaljaz

build/coffee/bundle.coffee

@@ -49,8 +49,6 @@ class TerrainWorker
 		}
 
 init = ()->
-	if getNick() is "" or getNick() is "?"
-		document.location.href="?"+prompt("Enter your nick:")
 	#Terrain worker
 	worker=new TerrainWorker
 
@@ -104,6 +102,7 @@ init = ()->
 
 	socket.on "connect",()->
 		console.log "Połączono z serverem!"
+		$('.loadingText').text "Wczytywanie terenu..."
 		socket.emit "initClient", {
 			nick:getNick()
 		}

build/coffee/module/AssetLoader.coffee

@@ -15,9 +15,6 @@ class AssetLoader
 		Object.keys(assets).forEach (p)->
 			type=assets[p].type
 			path=assets[p].path
-			dynamic=assets[p].dynamic;
-			if dynamic
-				path+="?"+THREE.MathUtils.generateUUID()
 			if type is "texture"
 				textureLoader.load path,(texture)->
 					_this.assets[p]=texture

build/coffee/module/FirstPersonControls.coffee

@@ -41,9 +41,6 @@ class FirstPersonControls
 			@camera.position.y += @micromove
 		if @keys[@kc["shift"]]
 			@camera.position.y -= @micromove
-	lockPointer: ->
-		@canvas.requestPointerLock()
-		return
 	updatePosition: (e)->
 		if @gameState is "game"
 			@camera.rotation.x -= THREE.MathUtils.degToRad e.movementY / 10
@@ -72,7 +69,8 @@ class FirstPersonControls
 			delete _this.keys[z.keyCode]
 			return
 		$(".gameOn").click ->
-			_this.lockPointer()
+			console.log "clicked!"
+			_this.canvas.requestPointerLock()
 			return
 		document.addEventListener 'pointerlockchange', ()->
 			_this.lockChangeAlert()

client/assets/assetLoader.json

@@ -17,8 +17,7 @@
   },
   "blocks":{
     "path":"assets/blocks/blocks.json",
-    "type":"text",
-    "dynamic":true
+    "type":"text"
   },
   "blocksAtlasFull":{
     "path":"assets/blocks/blocksAtlas-full.png",

client/assets/images/back.png

@@ -39,18 +39,25 @@ canvas {
   left:0px;
   width:100%;
   height:100%;
-  background:green;
+  background-image: url("../../assets/images/back.png");
+  background-position: center; /* Center the image */
+  background-repeat: no-repeat; /* Do not repeat the image */
+  background-size: cover; /* Resize the background image to cover the entire container */
 }
 
 .loadingBar{
   margin: 0;
   position: absolute;
-  top: 50%;
+  top: 30%;
   left: 50%;
   -ms-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
 }
 
+.loadingText{
+  margin-top:200px;
+}
+
 .inv_box{
   border:1px solid black;
   width:60px;

client/assets/images/background.jpg

@@ -33,7 +33,8 @@
     <!-- LOADING SCREEN -->
     <div class="initLoading">
       <div class="loadingBar text-center">
-        <h1>Web-minecraft</h1>
+        <img src="assets/images/logo.png">
+        <h1 class="loadingText">Ładowanie zasobów...</h1>
         <div class="status"></div>
         <img src="assets/images/loadingx.gif">
       </div>
@@ -51,16 +52,14 @@ <h1>Web-minecraft</h1>
       <div class="gameMenu">
         <div class="row">
           <div class="col-4 pl-5 pt-4">
-            Web-minecraft v.1.0
+            Web-minecraft v.1.0<br>
+            Wykonanie: <a href="https://github.com/michaljaz/">michaljaz</a>
           </div>
           <div class="col-4 text-center p-3">
             <h3>Gra zatrzymana</h3>
             <button class="gameOn btn btn-dark w-100">
               Graj
             </button>
-            <button class="btn btn-dark w-100" onclick="document.location.reload()">
-             Restart
-            </button>
           </div>
           <div class="col-4 p-3">
             Kontrolki