ncannasse 6 سال پیش
والد
کامیت
87b02e4ee2
2فایلهای تغییر یافته به همراه10 افزوده شده و 1 حذف شده
  1. 5 0
      hxsl/CacheFile.hx
  2. 5 1
      hxsl/CacheFileBuilder.hx

+ 5 - 0
hxsl/CacheFile.hx

@@ -109,10 +109,15 @@ class CacheFile extends Cache {
 		}
 		if( wait.length > 0 ) {
 			waitCount += wait.length;
+			#if hlmulti
+			for( r in wait )
+				addNewShader(r);
+			#else
 			haxe.Timer.delay(function() {
 				for( r in wait )
 					addNewShader(r);
 			},1000); // wait until engine correctly initialized
+			#end
 		}
 		isLoading = false;
 	}

+ 5 - 1
hxsl/CacheFileBuilder.hx

@@ -57,6 +57,7 @@ class CacheFileBuilder {
 	public var dxInitDone = false;
 	public var dxShaderVersion = "5_0";
 	var glout : GlslOut;
+	var hasCompiled : Bool;
 
 	public function new() {
 	}
@@ -65,8 +66,10 @@ class CacheFileBuilder {
 		for( p in platforms ) {
 			Sys.println("Generating shaders for " + p);
 			this.platform = p;
+			hasCompiled = false;
 			var cache = new CustomCacheFile(this);
 			@:privateAccess cache.save();
+			if( hasCompiled ) Sys.println("");
 		}
 	}
 
@@ -75,6 +78,7 @@ class CacheFileBuilder {
 	}
 
 	public function compileShader( r : RuntimeShader, rd : RuntimeShader.RuntimeShaderData ) : String {
+		hasCompiled = true;
 		Sys.print(".");
 		switch( platform ) {
 		case DirectX:
@@ -182,7 +186,7 @@ class CacheFileBuilder {
 				throw "Unknown parameter " + f;
 			}
 		}
-		builder.run();
+		builder.run();		
 		Sys.exit(0);
 	}