From 9bd2ba246626a80b92f6228b72d9fc69124ce7c1 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sat, 22 Feb 2020 18:25:13 +0100 Subject: [PATCH] Assets cleanup --- Assets/{defaults => common}/default_brush.json | 0 .../{defaults => common}/default_material.json | 0 Assets/creator/font_mono.ttf | Bin 19792 -> 0 bytes Sources/arm/data/BrushSlot.hx | 2 +- Sources/arm/data/MaterialSlot.hx | 2 +- khafile.js | 2 -- 6 files changed, 2 insertions(+), 4 deletions(-) rename Assets/{defaults => common}/default_brush.json (100%) rename Assets/{defaults => common}/default_material.json (100%) delete mode 100644 Assets/creator/font_mono.ttf diff --git a/Assets/defaults/default_brush.json b/Assets/common/default_brush.json similarity index 100% rename from Assets/defaults/default_brush.json rename to Assets/common/default_brush.json diff --git a/Assets/defaults/default_material.json b/Assets/common/default_material.json similarity index 100% rename from Assets/defaults/default_material.json rename to Assets/common/default_material.json diff --git a/Assets/creator/font_mono.ttf b/Assets/creator/font_mono.ttf deleted file mode 100644 index 1c3576f087728ca345e3818b0a0ccdc0ddf88545..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19792 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 YV!^IP;1OkyfBwYj57>3-{}=ZE0EVHf$^ZZW diff --git a/Sources/arm/data/BrushSlot.hx b/Sources/arm/data/BrushSlot.hx index 8905da39..4fb6f3cc 100644 --- a/Sources/arm/data/BrushSlot.hx +++ b/Sources/arm/data/BrushSlot.hx @@ -20,7 +20,7 @@ class BrushSlot { if (c == null) { if (defaultCanvas == null) { // Synchronous - Data.getBlob("defaults/default_brush.json", function(b: Blob) { + Data.getBlob("default_brush.json", function(b: Blob) { defaultCanvas = b.toString(); }); } diff --git a/Sources/arm/data/MaterialSlot.hx b/Sources/arm/data/MaterialSlot.hx index 6a22622e..9a11d8dd 100644 --- a/Sources/arm/data/MaterialSlot.hx +++ b/Sources/arm/data/MaterialSlot.hx @@ -39,7 +39,7 @@ class MaterialSlot { if (c == null) { if (defaultCanvas == null) { // Synchronous - Data.getBlob("defaults/default_material.json", function(b: Blob) { + Data.getBlob("default_material.json", function(b: Blob) { defaultCanvas = b.toString(); }); } diff --git a/khafile.js b/khafile.js index 378aa914..54d2ae26 100644 --- a/khafile.js +++ b/khafile.js @@ -6,7 +6,6 @@ project.addLibrary("iron"); project.addLibrary("zui"); project.addShaders("Shaders/common/*.glsl", { noembed: false}); project.addAssets("Assets/common/*", { notinlist: true, destination: "data/{name}" }); -project.addAssets("Assets/defaults/*", { notinlist: true, destination: "data/defaults/{name}" }); project.addAssets("Assets/licenses/*", { notinlist: true, destination: "data/licenses/{name}" }); project.addAssets("Assets/plugins/*", { notinlist: true, destination: "data/plugins/{name}" }); project.addAssets("Assets/themes/*", { notinlist: true, destination: "data/themes/{name}" }); @@ -14,7 +13,6 @@ project.addAssets("Assets/themes/*", { notinlist: true, destination: "data/theme project.addDefine('arm_taa'); project.addDefine('arm_veloc'); project.addDefine('arm_particles'); -// project.addDefine('arm_noembed'); if (!android) { project.addDefine('arm_data_dir'); }