diff --git a/armorforge/project.js b/armorforge/project.js index ccc1a651..db00fc5a 100644 --- a/armorforge/project.js +++ b/armorforge/project.js @@ -10,11 +10,11 @@ project.addDefine("is_paint"); await project.addProject("../base"); project.addSources("../armorpaint/Sources"); //// -project.addShaders("../armorpaint/Shaders/*.glsl", { embed: flags.snapshot }); //// +project.addShaders("../armorpaint/Shaders/*.glsl", { embed: flags.embed }); //// project.addSources("Sources"); project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.snapshot }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.snapshot }); +project.addShaders("Shaders/*.glsl", { embed: flags.embed }); +project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); diff --git a/armorlab/project.js b/armorlab/project.js index a194c95e..77c043c1 100644 --- a/armorlab/project.js +++ b/armorlab/project.js @@ -10,8 +10,8 @@ await project.addProject("../base"); project.addSources("Sources"); project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.snapshot }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.snapshot }); +project.addShaders("Shaders/*.glsl", { embed: flags.embed }); +project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" }); project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); diff --git a/armorpaint/project.js b/armorpaint/project.js index 04f31078..7ea32099 100644 --- a/armorpaint/project.js +++ b/armorpaint/project.js @@ -9,8 +9,8 @@ await project.addProject("../base"); project.addSources("Sources"); project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.snapshot }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.snapshot }); +project.addShaders("Shaders/*.glsl", { embed: flags.embed }); +project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" }); project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); diff --git a/armorsculpt/project.js b/armorsculpt/project.js index a68a4096..05064710 100644 --- a/armorsculpt/project.js +++ b/armorsculpt/project.js @@ -10,8 +10,8 @@ await project.addProject("../base"); project.addSources("../armorpaint/Sources"); //// project.addSources("Sources"); project.addSources("Sources/nodes"); -project.addShaders("Shaders/*.glsl", { embed: flags.snapshot }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.snapshot }); +project.addShaders("Shaders/*.glsl", { embed: flags.embed }); +project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); diff --git a/base/Sources/main.ts b/base/Sources/main.ts index fdd3b9e3..84b686e3 100644 --- a/base/Sources/main.ts +++ b/base/Sources/main.ts @@ -1,36 +1,24 @@ function main() { - ///if arm_snapshot - ///if (is_paint || is_sculpt) - main_embed(["default_material.arm"]); - ///end - ///if is_lab - main_embed(["placeholder.k"]); - ///end + // ///if (is_paint || is_sculpt) + // main_embed(["default_material.arm"]); + // ///end + // ///if is_lab + // main_embed(["placeholder.k"]); + // ///end - ///if (krom_direct3d12 || krom_vulkan || krom_metal) - main_embed_raytrace(); - ///if is_paint - main_embed_raytrace_bake(); - ///end - ///end + // ///if (krom_direct3d12 || krom_vulkan || krom_metal) + // main_embed_raytrace(); + // ///if is_paint + // main_embed_raytrace_bake(); + // ///end - ///else - - // kickstart(); + // Used to locate external application data folder krom_set_app_name(manifest_title); config_load(main_start); - - ///end } -// function kickstart() { -// // Used to locate external application data folder -// krom_set_app_name(manifest_title); -// config_load(main_start); -// } - function main_start() { app_on_resize = base_on_resize; app_on_w = base_w; @@ -63,7 +51,7 @@ function main_start() { base_init(); } -///if arm_snapshot +///if arm_embed function main_embed(additional: string[]) { let global: any = globalThis; diff --git a/base/Sources/resource.ts b/base/Sources/resource.ts index 86e6e55b..3c79267f 100644 --- a/base/Sources/resource.ts +++ b/base/Sources/resource.ts @@ -31,7 +31,7 @@ function resource_tile18(img: image_t, x: i32, y: i32): rect_t { return r; } -///if arm_snapshot +///if arm_embed function resource_embed_raw(handle: string, name: string, file: buffer_t) { map_set(data_cached_blobs, name, file); data_get_scene_raw(handle); diff --git a/base/project.js b/base/project.js index fc823c5b..bdf61b30 100644 --- a/base/project.js +++ b/base/project.js @@ -6,7 +6,7 @@ flags.d3d12 = process.argv.indexOf("direct3d12") >= 0; flags.vulkan = process.argv.indexOf("vulkan") >= 0; flags.metal = process.argv.indexOf("metal") >= 0; flags.raytrace = flags.d3d12 || flags.vulkan || flags.metal; -flags.snapshot = process.argv.indexOf("--snapshot") >= 0; +flags.embed = process.argv.indexOf("--embed") >= 0; flags.physics = true; flags.voxels = !flags.raytrace && !flags.android && !flags.ios; @@ -60,16 +60,16 @@ flags.on_c_project_created = async function(c_project, platform, graphics) { let project = new Project("Base"); project.addSources("Sources"); project.addSources("Sources/nodes"); -project.addShaders("../armorcore/Shaders/*.glsl", { embed: flags.snapshot }); -project.addShaders("Shaders/*.glsl", { embed: flags.snapshot }); -project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.snapshot }); +project.addShaders("../armorcore/Shaders/*.glsl", { embed: flags.embed }); +project.addShaders("Shaders/*.glsl", { embed: flags.embed }); +project.addAssets("Assets/*", { destination: "data/{name}", embed: flags.embed }); project.addAssets("Assets/locale/*", { destination: "data/locale/{name}" }); project.addAssets("Assets/licenses/**", { destination: "data/licenses/{name}" }); project.addAssets("Assets/plugins/*", { destination: "data/plugins/{name}" }); project.addAssets("Assets/themes/*.json", { destination: "data/themes/{name}" }); -if (flags.snapshot) { - project.addDefine("arm_snapshot"); +if (flags.embed) { + project.addDefine("arm_embed"); project.addDefine("arm_image_embed"); project.addDefine("arm_shader_embed"); } @@ -87,16 +87,16 @@ if (flags.android) { } if (flags.raytrace) { - project.addAssets("Assets/raytrace/*", { destination: "data/{name}", embed: flags.snapshot }); + project.addAssets("Assets/raytrace/*", { destination: "data/{name}", embed: flags.embed }); if (flags.d3d12) { - project.addAssets("Shaders/raytrace/*.cso", { destination: "data/{name}", embed: flags.snapshot }); + project.addAssets("Shaders/raytrace/*.cso", { destination: "data/{name}", embed: flags.embed }); } else if (flags.vulkan) { - project.addAssets("Shaders/raytrace/*.spirv", { destination: "data/{name}", embed: flags.snapshot }); + project.addAssets("Shaders/raytrace/*.spirv", { destination: "data/{name}", embed: flags.embed }); } else if (flags.metal) { - project.addAssets("Shaders/raytrace/*.metal", { destination: "data/{name}", embed: flags.snapshot }); + project.addAssets("Shaders/raytrace/*.metal", { destination: "data/{name}", embed: flags.embed }); } } @@ -104,10 +104,10 @@ if (flags.voxels) { project.addDefine("arm_voxels"); if (process.platform === "win32") { - project.addShaders("Shaders/voxel_hlsl/*.glsl", { embed: flags.snapshot, noprocessing: true }); + project.addShaders("Shaders/voxel_hlsl/*.glsl", { embed: flags.embed, noprocessing: true }); } else { - project.addShaders("Shaders/voxel_glsl/*.glsl", { embed: flags.snapshot }); + project.addShaders("Shaders/voxel_glsl/*.glsl", { embed: flags.embed }); } } @@ -121,7 +121,7 @@ if (export_version_info) { fs.ensureDirSync(dir); fs.writeFileSync(dir + "/version.json", data); // Adds version.json to embed.txt list - project.addAssets(dir + "/version.json", { destination: "data/{name}", embed: flags.snapshot }); + project.addAssets(dir + "/version.json", { destination: "data/{name}", embed: flags.embed }); } resolve(project);