Move main to base

base/Sources/MainBase.hx

@@ -0,0 +1,146 @@
+package;
+
+import kha.Window;
+import kha.System;
+import iron.object.Object;
+import iron.Scene;
+import iron.RenderPath;
+import arm.render.RenderPathBase;
+import arm.render.RenderPathForward;
+import arm.render.RenderPathDeferred;
+import arm.render.Uniforms;
+import arm.sys.BuildMacros;
+import arm.Config;
+import arm.Context;
+import arm.Res;
+
+class MainBase {
+
+	public static var sha = BuildMacros.sha().substr(1, 7);
+	public static var date = BuildMacros.date().split(" ")[0];
+	public static var tasks: Int;
+
+	@:keep
+	public static function kickstart() {
+		#if (!arm_snapshot)
+		iron.data.ShaderData.shaderPath = ""; // Use arm_data_dir
+		#end
+
+		// Used to locate external application data folder
+		Krom.setApplicationName(Main.title);
+
+		tasks = 1;
+		tasks++; Config.load(function() { tasks--; start(); });
+		tasks--; start();
+	}
+
+	public static function start() {
+		if (tasks > 0) return;
+
+		Config.init();
+		System.start(Config.getOptions(), function(window: Window) {
+			if (Config.raw.layout == null) arm.App.initLayout();
+			Krom.setApplicationName(Main.title);
+			iron.App.init(function() {
+				Scene.setActive("Scene", function(o: Object) {
+					Uniforms.init();
+					var path = new RenderPath();
+					RenderPathBase.init(path);
+
+					if (Context.renderMode == RenderForward) {
+						RenderPathDeferred.init(path); // Allocate gbuffer
+						RenderPathForward.init(path);
+						path.commands = RenderPathForward.commands;
+					}
+					else {
+						RenderPathDeferred.init(path);
+						path.commands = RenderPathDeferred.commands;
+					}
+
+					RenderPath.setActive(path);
+					new arm.App();
+				});
+			});
+		});
+	}
+
+	#if arm_snapshot
+
+	public static function embed(additional: Array<String>) {
+		var global = js.Syntax.code("globalThis");
+		global.kickstart = MainBase.kickstart;
+
+		Res.embedRaw("Scene", "Scene.arm", untyped global["data/Scene.arm"]);
+		untyped global["data/Scene.arm"] = null;
+
+		Res.embedRaw("shader_datas", "shader_datas.arm", untyped global["data/shader_datas.arm"]);
+		untyped global["data/shader_datas.arm"] = null;
+
+		Res.embedFont("font.ttf", untyped global["data/font.ttf"]);
+		untyped global["data/font.ttf"] = null;
+
+		Res.embedFont("font_mono.ttf", untyped global["data/font_mono.ttf"]);
+		untyped global["data/font_mono.ttf"] = null;
+
+		var files = [
+			"font13.bin",
+			"ltc_mag.arm",
+			"ltc_mat.arm",
+			"default_brush.arm",
+			"World_irradiance.arm",
+			"World_radiance.k",
+			"World_radiance_0.k",
+			"World_radiance_1.k",
+			"World_radiance_2.k",
+			"World_radiance_3.k",
+			"World_radiance_4.k",
+			"World_radiance_5.k",
+			"World_radiance_6.k",
+			"World_radiance_7.k",
+			"World_radiance_8.k",
+			"brdf.k",
+			"color_wheel.k",
+			"color_wheel_gradient.k",
+			"cursor.k",
+			"icons.k",
+			"icons2x.k",
+			"noise256.k",
+			"smaa_search.k",
+			"smaa_area.k"
+		];
+		for (add in additional) files.push(add);
+		for (file in files) {
+			Res.embedBlob(file, untyped global["data/" + file]);
+			untyped global["data/" + file] = null;
+		}
+	}
+
+	public static function embedRaytrace() {
+		var files = [
+			"bnoise_rank.k",
+			"bnoise_scramble.k",
+			"bnoise_sobol.k",
+			"raytrace_brute_core" + RenderPathRaytrace.ext,
+			"raytrace_brute_full" + RenderPathRaytrace.ext
+		];
+		for (file in files) {
+			Res.embedBlob(file, untyped global["data/" + file]);
+			untyped global["data/" + file] = null;
+		}
+	}
+
+	public static function embedRaytraceBake() {
+		var files = [
+			"raytrace_bake_ao" + RenderPathRaytrace.ext,
+			"raytrace_bake_bent" + RenderPathRaytrace.ext,
+			"raytrace_bake_light" + RenderPathRaytrace.ext,
+			"raytrace_bake_thick" + RenderPathRaytrace.ext
+		];
+		for (file in files) {
+			Res.embedBlob(file, untyped global["data/" + file]);
+			untyped global["data/" + file] = null;
+		}
+	}
+
+	#end
+}

base/Sources/arm/Config.hx

@@ -101,7 +101,7 @@ class Config {
 			raw.rp_ssr = false;
 			raw.rp_supersample = 1.0;
 			raw.version = Main.version;
-			raw.sha = Main.sha;
+			raw.sha = MainBase.sha;
 			App.initConfig();
 		}
 		else {
@@ -110,7 +110,7 @@ class Config {
 			// 	raw.version = Main.version;
 			// 	save();
 			// }
-			if (raw.sha != Main.sha) {
+			if (raw.sha != MainBase.sha) {
 				configLoaded = false;
 				init();
 				return;

base/Sources/arm/render/RenderPathRaytrace.hx

@@ -23,9 +23,9 @@ class RenderPathRaytrace {
 	static var isBake = false;
 
 	#if kha_direct3d12
-	static inline var ext = ".cso";
+	public static inline var ext = ".cso";
 	#else
-	static inline var ext = ".spirv";
+	public static inline var ext = ".spirv";
 	#end
 
 	public static function init(_path: RenderPath) {