From d48bdfbb3182cc3e607e5fe0e19f446bf51c850d Mon Sep 17 00:00:00 2001 From: luboslenco Date: Thu, 10 Apr 2025 18:09:06 +0200 Subject: [PATCH] Use kong --- armorforge/project.js | 4 ++-- armorlab/project.js | 2 +- armorpaint/project.js | 1 - armorsculpt/project.js | 4 ++-- base/assets/Scene.arm | Bin 178161 -> 178153 bytes base/assets/shader_datas.arm | Bin 14897 -> 14863 bytes base/project.js | 1 - base/sources/iron_draw.c | 8 -------- base/sources/ts/import_envmap.ts | 1 - base/sources/ts/iron/shader_data.ts | 24 ++++++++---------------- base/sources/ts/line_draw.ts | 2 -- base/sources/ts/pipes.ts | 15 --------------- base/sources/ts/ui_view2d.ts | 1 - base/sources/ts/util_uv.ts | 1 - base/tools/pad/project.js | 2 +- 15 files changed, 14 insertions(+), 52 deletions(-) diff --git a/armorforge/project.js b/armorforge/project.js index 1643e718..ca23bc6b 100644 --- a/armorforge/project.js +++ b/armorforge/project.js @@ -11,12 +11,12 @@ project.add_project("../base"); project.add_tsfiles("../armorpaint/sources"); project.add_tsfiles("../armorpaint/sources/nodes"); -project.add_shaders("../armorpaint/shaders/*.glsl"); +project.add_shaders("../armorpaint/shaders/*.kong"); project.add_project("../armorpaint/plugins"); project.add_tsfiles("sources"); project.add_tsfiles("sources/nodes"); -project.add_shaders("shaders/*.glsl"); +project.add_shaders("shaders/*.kong"); project.add_assets("assets/*", { destination: "data/{name}" }); project.add_assets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); project.add_assets("assets/licenses/**", { destination: "data/licenses/{name}" }); diff --git a/armorlab/project.js b/armorlab/project.js index 970b057d..4c0cf25a 100644 --- a/armorlab/project.js +++ b/armorlab/project.js @@ -10,7 +10,7 @@ project.add_project("../base"); project.add_tsfiles("sources"); project.add_tsfiles("sources/nodes"); -project.add_shaders("shaders/*.glsl"); +project.add_shaders("shaders/*.kong"); project.add_assets("assets/*", { destination: "data/{name}" }); project.add_assets("../armorpaint/assets/export_presets/*", { destination: "data/export_presets/{name}" }); project.add_assets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); diff --git a/armorpaint/project.js b/armorpaint/project.js index 6573d074..dd89200f 100644 --- a/armorpaint/project.js +++ b/armorpaint/project.js @@ -9,7 +9,6 @@ project.add_project("../base"); project.add_tsfiles("sources"); project.add_tsfiles("sources/nodes"); -project.add_shaders("shaders/*.glsl"); project.add_shaders("shaders/*.kong"); project.add_assets("assets/*", { destination: "data/{name}" }); project.add_assets("assets/export_presets/*", { destination: "data/export_presets/{name}" }); diff --git a/armorsculpt/project.js b/armorsculpt/project.js index f68bd50f..37d8da0a 100644 --- a/armorsculpt/project.js +++ b/armorsculpt/project.js @@ -9,10 +9,10 @@ project.add_project("../base"); project.add_tsfiles("../armorpaint/sources"); project.add_tsfiles("../armorpaint/sources/nodes"); -project.add_shaders("../armorpaint/shaders/*.glsl"); +project.add_shaders("../armorpaint/shaders/*.kong"); project.add_tsfiles("sources"); project.add_tsfiles("sources/nodes"); -project.add_shaders("shaders/*.glsl"); +project.add_shaders("shaders/*.kong"); project.add_assets("assets/*", { destination: "data/{name}" }); project.add_assets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); project.add_assets("assets/licenses/**", { destination: "data/licenses/{name}" }); diff --git a/base/assets/Scene.arm b/base/assets/Scene.arm index 2a8d91223406f85d15f2edf554e714902597bdd7..2b81f85d658e33a2cffab5ba583945a3290c2e44 100644 GIT binary patch delta 102 zcmezPp6lg%u7(!IEliVFvIsCRFihv%!lVjjZ8ruAGEEO%!?YA4^M4IYMsqFGc_tQN Xkn+FlnKZzx?OGd{ZZTsqV;?gB1w(6hfW3!t@;w3J&30^t zjFSskSSCN@RA%7=s@yz>-GK>RM4fT70kv(HXDlV!zrgI`H6`|3aDzb zgp59zvDrt4iS@gta-0QG$7r5DQCuNn+yU0A+a&K9B++XLAB$598$Z zQo@_9*bEt2`N8@Ed6Xfn&5T^?jFac{icOv%8$4M~LwvF==S(b$e3-BZsxxk$&zr)? zDhW0-kxzKC6u%ULx7nM2D-$Q!!s6n@e2}XUJfO3b87KRSmux;Jtj)wH0x|-mDn2Qv zv6)dz_QEVSx*~g5VKS}X3vPy&9z$&8;VQsdM;bP_mJ1i+DKR-9Vv|uv7j4H%& zo6F_TFhk6rtgEI0wJB1~igEK=l^RAYGB2381wj_1WacE6q=KCX=5Nl^bY_M)J|nZZ tBtN|