font cache shit, readme update, fix few bugs, add mission skip in pmg

README.md

@@ -1,6 +1,7 @@
 # MBHaxe
 A Haxe port of Marble Blast Gold, name subject to change.
 Its currently a WIP at the time of writing. The marble physics code was taken from [OpenMBU](https://github.com/MBU-Team/OpenMBU) along with my own collision detection code, game logic was partially from scratch and taken with permission from [Marble Blast Web Port](https://github.com/Vanilagy/MarbleBlast).
+The browser version of this port is hosted [here](https://mbhaxe.netlify.app/)
 
 # Build
 Requires Haxe 4.2.2  

data/tmp/cache.dat

@@ -0,0 +1 @@
+by17:font%2FExpo50.fntaoy3:veri1y4:timei1625241820y4:hashy40:f2bb3df897a1cbe1bc70650168d9ecf7de1195f1y3:outy24:tmp%2Ffont%2FExpo50.bfntghy17:font%2FExpo32.fntaoR1i1R2i1625241820R3y40:d3397b6efedac7bfa90be848901a0167dfd32e7eR5y24:tmp%2Ffont%2FExpo32.bfntghy24:font%2FDomCasual32px.fntaoR1i1R2i1625241820R3y40:f9ae7ff4e7b94f78bd6a050e51a9f92fbfdbb40cR5y31:tmp%2Ffont%2FDomCasual32px.bfntghy24:font%2FDomCasual24px.fntaoR1i1R2i1625241820R3y40:f5f86d351ba84a7e1a5f1a459463a4eaf66ca893R5y31:tmp%2Ffont%2FDomCasual24px.bfntghy24:font%2FArialBold14px.fntaoR1i1R2i1625241820R3y40:4f58a547a119d447806129c12b660d267212a382R5y31:tmp%2Ffont%2FArialBold14px.bfntghy18:font%2FArial14.fntaoR1i1R2i1625241820R3y40:5433840b11f487315b7372dd95a79eda5986d558R5y25:tmp%2Ffont%2FArial14.bfntghh

src/fs/ManifestBuilder.hx

@@ -107,21 +107,18 @@ class ManifestBuilder {
 	static function scan(t:hxd.res.FileTree, options:EmbedOptions, out:Array<ManifestFileInfo>) {
 		if (options == null)
 			options = {};
-		// var setTmp = options.tmpDir == null;
 		// if( options.compressAsMp3 == null ) options.compressAsMp3 = options.compressSounds && !(haxe.macro.Context.defined("stb_ogg_sound") || hxd.res.Config.platform == HL);
 		ManifestBuilder.options = options;
 
 		var tree = @:privateAccess t.scan();
 
 		for (path in @:privateAccess t.paths) {
-			// if( setTmp ) options.tmpDir = path + "/.tmp/";
-
 			var fs = new hxd.fs.LocalFileSystem(path, options.configuration);
 			// if( options.compressAsMp3 )
 			//   fs.addConvert(new hxd.fs.Convert.ConvertWAV2MP3());
 			// else if( options.compressSounds )
 			//   fs.addConvert(new hxd.fs.Convert.ConvertWAV2MP3());
-			// fs.tmpDir = options.tmpDir;
+			@:privateAccess fs.convert.tmpDir = "tmp/";
 			fs.convert.onConvert = function(f) Sys.println("Converting " + f.srcPath);
 			convertRec(tree, path, fs, out);
 		}

src/fs/ManifestLoader.hx

@@ -24,7 +24,7 @@ class ManifestLoader extends hxd.res.Loader {
 	/**
 		Amount of concurrent file loadings. Defaults to 4 on JS and to 1 native (since there's no threaded loading implemented for native)
 	**/
-	public static var concurrentFiles:Int = #if js 4 #else 1 #end;
+	public static var concurrentFiles:Int = #if js 32 #else 1 #end;
 
 	public var mfs:ManifestFileSystem;
 

src/gui/PlayGui.hx

@@ -110,6 +110,7 @@ class PlayGui {
 		resizeEv = () -> {
 			var wnd = Window.getInstance();
 			playGuiCtrl.render(MarbleGame.canvas.scene2d);
+			powerupImageSceneTargetBitmap.x = wnd.width - 88;
 		};
 
 		Window.getInstance().addResizeEvent(resizeEv);

src/gui/PlayMissionGui.hx

@@ -187,6 +187,27 @@ class PlayMissionGui extends GuiImage {
 		};
 		pmBox.addChild(pmBack);
 
+		var transparentbmp = new hxd.BitmapData(1, 1);
+		transparentbmp.setPixel(0, 0, 0);
+		var transparentTile = Tile.fromBitmap(transparentbmp);
+
+		var skipButton = new GuiButton([transparentTile, transparentTile, transparentTile]);
+		skipButton.horizSizing = Left;
+		skipButton.vertSizing = Top;
+		skipButton.position = new Vector(625, 465);
+		skipButton.extent = new Vector(18, 19);
+		skipButton.pressedAction = (sender) -> {
+			var currentDifficulty = ["beginner", "intermediate", "advanced"].indexOf(currentCategory);
+			if (currentDifficulty == -1)
+				return;
+			var currentProgression = Settings.progression[currentDifficulty];
+			if (currentProgression + 1 == currentSelection) {
+				Settings.progression[currentDifficulty]++;
+			}
+			setSelectedFunc(currentSelection);
+		};
+		this.addChild(skipButton);
+
 		function mlFontLoader(text:String) {
 			switch (text) {
 				case "DomCasual24":