From de6c12285d8ecb30d1b2f3081ba7046a05e43ac7 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 19 Nov 2019 22:13:55 +0100 Subject: [PATCH] Organize assets --- {Bundled => Assets}/bin/cmft-linux64 | Bin {Bundled => Assets}/bin/cmft-osx | Bin {Bundled => Assets}/bin/cmft.exe | Bin {Bundled => Assets}/common/brdf.png | Bin {Bundled => Assets}/common/color_wheel.png | Bin {Bundled => Assets}/common/cursor.png | Bin {Bundled => Assets}/common/font13.bin | Bin {Bundled => Assets}/common/font_default.ttf | Bin {Bundled => Assets}/common/icons.png | Bin {Bundled => Assets}/common/icons2x.png | Bin {Bundled => Assets}/common/noise256.png | Bin {Bundled => Assets}/common/shader_datas.arm | Bin {Bundled => Assets}/common/smaa_area.png | Bin {Bundled => Assets}/common/smaa_search.png | Bin {Bundled => Assets}/creator/Scene.arm | Bin .../creator/World_irradiance.arm | Bin .../creator/World_radiance.hdr | Bin .../creator/World_radiance_0.hdr | 0 .../creator/World_radiance_1.hdr | 0 .../creator/World_radiance_2.hdr | 0 .../creator/World_radiance_3.hdr | Bin .../creator/World_radiance_4.hdr | Bin .../creator/World_radiance_5.hdr | 0 .../creator/World_radiance_6.hdr | 0 .../creator/World_radiance_7.hdr | 0 {Bundled => Assets}/creator/ammo.wasm.js | 0 {Bundled => Assets}/creator/ammo.wasm.wasm | Bin {Bundled => Assets}/creator/clouds_base.raw | 0 {Bundled => Assets}/creator/clouds_detail.raw | 0 {Bundled => Assets}/creator/clouds_map.png | Bin .../creator/deferred_light.arm | Bin {Bundled => Assets}/creator/font_mono.ttf | Bin {Bundled => Assets}/creator/player.bin | 0 .../creator/plugins/packager.js | 0 {Bundled => Assets}/creator/water_base.png | Bin {Bundled => Assets}/creator/water_detail.png | Bin {Bundled => Assets}/creator/water_foam.png | Bin {Bundled => Assets}/creator/water_pass.arm | Bin {Bundled => Assets}/creator/world_pass.arm | Bin .../defaults/default_brush.json | 0 .../defaults/default_material.json | 0 {Bundled => Assets}/licenses/authors.md | 0 {Bundled => Assets}/licenses/license.md | 0 {Bundled => Assets}/licenses/license_cmft.md | 0 .../licenses/license_cycles-nodes.md | 0 .../licenses/license_heapsfbx.md | 0 .../licenses/license_hxformat.md | 0 .../licenses/license_hxpako.md | 0 .../licenses/license_import_tiff.md | 0 {Bundled => Assets}/licenses/license_kha.md | 0 {Bundled => Assets}/licenses/license_kinc.md | 0 {Bundled => Assets}/licenses/license_krom.md | 0 .../licenses/license_lz4-wasm.md | 0 .../licenses/license_material_icons.txt | 0 {Bundled => Assets}/licenses/license_nfd.md | 0 .../licenses/license_roboto.md | 0 .../licenses/license_xatlas.md | 0 {Bundled => Assets}/painter/Scene.arm | Bin {Bundled => Assets}/painter/World.hdr | Bin .../painter/World_irradiance.arm | Bin .../painter/World_radiance.hdr | Bin .../painter/World_radiance_0.hdr | 0 .../painter/World_radiance_1.hdr | 0 .../painter/World_radiance_2.hdr | 0 .../painter/World_radiance_3.hdr | 0 .../painter/World_radiance_4.hdr | 0 .../painter/World_radiance_5.hdr | 0 .../painter/World_radiance_6.hdr | 0 .../painter/World_radiance_7.hdr | 0 .../painter/World_radiance_8.hdr | 0 .../painter/World_radiance_9.hdr | 0 .../painter/deferred_light.arm | Bin .../export_presets/preset_generic.json | 0 {Bundled => Assets}/painter/ltc_mag.arm | Bin {Bundled => Assets}/painter/ltc_mat.arm | Bin {Bundled => Assets}/painter/world_pass.arm | Bin {Bundled => Assets}/plugins/autosave.js | 0 {Bundled => Assets}/plugins/console.js | 0 {Bundled => Assets}/plugins/converter.js | 0 {Bundled => Assets}/plugins/hello_node.js | 0 {Bundled => Assets}/plugins/hello_world.js | 0 {Bundled => Assets}/plugins/import_tiff.js | 0 {Bundled => Assets}/plugins/profiler.js | 0 {Bundled => Assets}/plugins/xatlas.js | 0 {Bundled => Assets}/plugins/xatlas.wasm | Bin Assets/{ => raw}/icon/icon.ico | Bin Assets/{ => raw}/icon/icon.png | Bin Assets/{ => raw}/icon/icon_raw.png | Bin {Bundled => Assets}/raytrace/bnoise_rank.png | Bin .../raytrace/bnoise_scramble.png | Bin {Bundled => Assets}/raytrace/bnoise_sobol.png | Bin {Bundled => Assets}/readme/readme.txt | 0 {Bundled => Assets}/readme/readme_dxr.txt | 0 {Bundled => Assets}/readme/readme_macos.txt | 0 {Bundled => Assets}/themes/theme_light.arm | 0 khafile.js | 32 +++++++++--------- 96 files changed, 16 insertions(+), 16 deletions(-) rename {Bundled => Assets}/bin/cmft-linux64 (100%) mode change 100755 => 100644 rename {Bundled => Assets}/bin/cmft-osx (100%) mode change 100755 => 100644 rename {Bundled => Assets}/bin/cmft.exe (100%) rename {Bundled => Assets}/common/brdf.png (100%) rename {Bundled => Assets}/common/color_wheel.png (100%) rename {Bundled => Assets}/common/cursor.png (100%) rename {Bundled => Assets}/common/font13.bin (100%) rename {Bundled => Assets}/common/font_default.ttf (100%) rename {Bundled => Assets}/common/icons.png (100%) rename {Bundled => Assets}/common/icons2x.png (100%) rename {Bundled => Assets}/common/noise256.png (100%) rename {Bundled => Assets}/common/shader_datas.arm (100%) rename {Bundled => Assets}/common/smaa_area.png (100%) rename {Bundled => Assets}/common/smaa_search.png (100%) rename {Bundled => Assets}/creator/Scene.arm (100%) rename {Bundled => Assets}/creator/World_irradiance.arm (100%) rename {Bundled => Assets}/creator/World_radiance.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_0.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_1.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_2.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_3.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_4.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_5.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_6.hdr (100%) rename {Bundled => Assets}/creator/World_radiance_7.hdr (100%) rename {Bundled => Assets}/creator/ammo.wasm.js (100%) rename {Bundled => Assets}/creator/ammo.wasm.wasm (100%) rename {Bundled => Assets}/creator/clouds_base.raw (100%) rename {Bundled => Assets}/creator/clouds_detail.raw (100%) rename {Bundled => Assets}/creator/clouds_map.png (100%) rename {Bundled => Assets}/creator/deferred_light.arm (100%) rename {Bundled => Assets}/creator/font_mono.ttf (100%) rename {Bundled => Assets}/creator/player.bin (100%) rename {Bundled => Assets}/creator/plugins/packager.js (100%) rename {Bundled => Assets}/creator/water_base.png (100%) rename {Bundled => Assets}/creator/water_detail.png (100%) rename {Bundled => Assets}/creator/water_foam.png (100%) rename {Bundled => Assets}/creator/water_pass.arm (100%) rename {Bundled => Assets}/creator/world_pass.arm (100%) rename {Bundled => Assets}/defaults/default_brush.json (100%) rename {Bundled => Assets}/defaults/default_material.json (100%) rename {Bundled => Assets}/licenses/authors.md (100%) rename {Bundled => Assets}/licenses/license.md (100%) rename {Bundled => Assets}/licenses/license_cmft.md (100%) rename {Bundled => Assets}/licenses/license_cycles-nodes.md (100%) rename {Bundled => Assets}/licenses/license_heapsfbx.md (100%) rename {Bundled => Assets}/licenses/license_hxformat.md (100%) rename {Bundled => Assets}/licenses/license_hxpako.md (100%) rename {Bundled => Assets}/licenses/license_import_tiff.md (100%) rename {Bundled => Assets}/licenses/license_kha.md (100%) rename {Bundled => Assets}/licenses/license_kinc.md (100%) rename {Bundled => Assets}/licenses/license_krom.md (100%) rename {Bundled => Assets}/licenses/license_lz4-wasm.md (100%) rename {Bundled => Assets}/licenses/license_material_icons.txt (100%) rename {Bundled => Assets}/licenses/license_nfd.md (100%) rename {Bundled => Assets}/licenses/license_roboto.md (100%) rename {Bundled => Assets}/licenses/license_xatlas.md (100%) rename {Bundled => Assets}/painter/Scene.arm (100%) rename {Bundled => Assets}/painter/World.hdr (100%) rename {Bundled => Assets}/painter/World_irradiance.arm (100%) rename {Bundled => Assets}/painter/World_radiance.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_0.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_1.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_2.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_3.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_4.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_5.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_6.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_7.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_8.hdr (100%) rename {Bundled => Assets}/painter/World_radiance_9.hdr (100%) rename {Bundled => Assets}/painter/deferred_light.arm (100%) rename {Bundled => Assets}/painter/export_presets/preset_generic.json (100%) rename {Bundled => Assets}/painter/ltc_mag.arm (100%) rename {Bundled => Assets}/painter/ltc_mat.arm (100%) rename {Bundled => Assets}/painter/world_pass.arm (100%) rename {Bundled => Assets}/plugins/autosave.js (100%) rename {Bundled => Assets}/plugins/console.js (100%) rename {Bundled => Assets}/plugins/converter.js (100%) rename {Bundled => Assets}/plugins/hello_node.js (100%) rename {Bundled => Assets}/plugins/hello_world.js (100%) rename {Bundled => Assets}/plugins/import_tiff.js (100%) rename {Bundled => Assets}/plugins/profiler.js (100%) rename {Bundled => Assets}/plugins/xatlas.js (100%) rename {Bundled => Assets}/plugins/xatlas.wasm (100%) rename Assets/{ => raw}/icon/icon.ico (100%) rename Assets/{ => raw}/icon/icon.png (100%) rename Assets/{ => raw}/icon/icon_raw.png (100%) rename {Bundled => Assets}/raytrace/bnoise_rank.png (100%) rename {Bundled => Assets}/raytrace/bnoise_scramble.png (100%) rename {Bundled => Assets}/raytrace/bnoise_sobol.png (100%) rename {Bundled => Assets}/readme/readme.txt (100%) rename {Bundled => Assets}/readme/readme_dxr.txt (100%) rename {Bundled => Assets}/readme/readme_macos.txt (100%) rename {Bundled => Assets}/themes/theme_light.arm (100%) diff --git a/Bundled/bin/cmft-linux64 b/Assets/bin/cmft-linux64 old mode 100755 new mode 100644 similarity index 100% rename from Bundled/bin/cmft-linux64 rename to Assets/bin/cmft-linux64 diff --git a/Bundled/bin/cmft-osx b/Assets/bin/cmft-osx old mode 100755 new mode 100644 similarity index 100% rename from Bundled/bin/cmft-osx rename to Assets/bin/cmft-osx diff --git a/Bundled/bin/cmft.exe b/Assets/bin/cmft.exe similarity index 100% rename from Bundled/bin/cmft.exe rename to Assets/bin/cmft.exe diff --git a/Bundled/common/brdf.png b/Assets/common/brdf.png similarity index 100% rename from Bundled/common/brdf.png rename to Assets/common/brdf.png diff --git a/Bundled/common/color_wheel.png b/Assets/common/color_wheel.png similarity index 100% rename from Bundled/common/color_wheel.png rename to Assets/common/color_wheel.png diff --git a/Bundled/common/cursor.png b/Assets/common/cursor.png similarity index 100% rename from Bundled/common/cursor.png rename to Assets/common/cursor.png diff --git a/Bundled/common/font13.bin b/Assets/common/font13.bin similarity index 100% rename from Bundled/common/font13.bin rename to Assets/common/font13.bin diff --git a/Bundled/common/font_default.ttf b/Assets/common/font_default.ttf similarity index 100% rename from Bundled/common/font_default.ttf rename to Assets/common/font_default.ttf diff --git a/Bundled/common/icons.png b/Assets/common/icons.png similarity index 100% rename from Bundled/common/icons.png rename to Assets/common/icons.png diff --git a/Bundled/common/icons2x.png b/Assets/common/icons2x.png similarity index 100% rename from Bundled/common/icons2x.png rename to Assets/common/icons2x.png diff --git a/Bundled/common/noise256.png b/Assets/common/noise256.png similarity index 100% rename from Bundled/common/noise256.png rename to Assets/common/noise256.png diff --git a/Bundled/common/shader_datas.arm b/Assets/common/shader_datas.arm similarity index 100% rename from Bundled/common/shader_datas.arm rename to Assets/common/shader_datas.arm diff --git a/Bundled/common/smaa_area.png b/Assets/common/smaa_area.png similarity index 100% rename from Bundled/common/smaa_area.png rename to Assets/common/smaa_area.png diff --git a/Bundled/common/smaa_search.png b/Assets/common/smaa_search.png similarity index 100% rename from Bundled/common/smaa_search.png rename to Assets/common/smaa_search.png diff --git a/Bundled/creator/Scene.arm b/Assets/creator/Scene.arm similarity index 100% rename from Bundled/creator/Scene.arm rename to Assets/creator/Scene.arm diff --git a/Bundled/creator/World_irradiance.arm b/Assets/creator/World_irradiance.arm similarity index 100% rename from Bundled/creator/World_irradiance.arm rename to Assets/creator/World_irradiance.arm diff --git a/Bundled/creator/World_radiance.hdr b/Assets/creator/World_radiance.hdr similarity index 100% rename from Bundled/creator/World_radiance.hdr rename to Assets/creator/World_radiance.hdr diff --git a/Bundled/creator/World_radiance_0.hdr b/Assets/creator/World_radiance_0.hdr similarity index 100% rename from Bundled/creator/World_radiance_0.hdr rename to Assets/creator/World_radiance_0.hdr diff --git a/Bundled/creator/World_radiance_1.hdr b/Assets/creator/World_radiance_1.hdr similarity index 100% rename from Bundled/creator/World_radiance_1.hdr rename to Assets/creator/World_radiance_1.hdr diff --git a/Bundled/creator/World_radiance_2.hdr b/Assets/creator/World_radiance_2.hdr similarity index 100% rename from Bundled/creator/World_radiance_2.hdr rename to Assets/creator/World_radiance_2.hdr diff --git a/Bundled/creator/World_radiance_3.hdr b/Assets/creator/World_radiance_3.hdr similarity index 100% rename from Bundled/creator/World_radiance_3.hdr rename to Assets/creator/World_radiance_3.hdr diff --git a/Bundled/creator/World_radiance_4.hdr b/Assets/creator/World_radiance_4.hdr similarity index 100% rename from Bundled/creator/World_radiance_4.hdr rename to Assets/creator/World_radiance_4.hdr diff --git a/Bundled/creator/World_radiance_5.hdr b/Assets/creator/World_radiance_5.hdr similarity index 100% rename from Bundled/creator/World_radiance_5.hdr rename to Assets/creator/World_radiance_5.hdr diff --git a/Bundled/creator/World_radiance_6.hdr b/Assets/creator/World_radiance_6.hdr similarity index 100% rename from Bundled/creator/World_radiance_6.hdr rename to Assets/creator/World_radiance_6.hdr diff --git a/Bundled/creator/World_radiance_7.hdr b/Assets/creator/World_radiance_7.hdr similarity index 100% rename from Bundled/creator/World_radiance_7.hdr rename to Assets/creator/World_radiance_7.hdr diff --git a/Bundled/creator/ammo.wasm.js b/Assets/creator/ammo.wasm.js similarity index 100% rename from Bundled/creator/ammo.wasm.js rename to Assets/creator/ammo.wasm.js diff --git a/Bundled/creator/ammo.wasm.wasm b/Assets/creator/ammo.wasm.wasm similarity index 100% rename from Bundled/creator/ammo.wasm.wasm rename to Assets/creator/ammo.wasm.wasm diff --git a/Bundled/creator/clouds_base.raw b/Assets/creator/clouds_base.raw similarity index 100% rename from Bundled/creator/clouds_base.raw rename to Assets/creator/clouds_base.raw diff --git a/Bundled/creator/clouds_detail.raw b/Assets/creator/clouds_detail.raw similarity index 100% rename from Bundled/creator/clouds_detail.raw rename to Assets/creator/clouds_detail.raw diff --git a/Bundled/creator/clouds_map.png b/Assets/creator/clouds_map.png similarity index 100% rename from Bundled/creator/clouds_map.png rename to Assets/creator/clouds_map.png diff --git a/Bundled/creator/deferred_light.arm b/Assets/creator/deferred_light.arm similarity index 100% rename from Bundled/creator/deferred_light.arm rename to Assets/creator/deferred_light.arm diff --git a/Bundled/creator/font_mono.ttf b/Assets/creator/font_mono.ttf similarity index 100% rename from Bundled/creator/font_mono.ttf rename to Assets/creator/font_mono.ttf diff --git a/Bundled/creator/player.bin b/Assets/creator/player.bin similarity index 100% rename from Bundled/creator/player.bin rename to Assets/creator/player.bin diff --git a/Bundled/creator/plugins/packager.js b/Assets/creator/plugins/packager.js similarity index 100% rename from Bundled/creator/plugins/packager.js rename to Assets/creator/plugins/packager.js diff --git a/Bundled/creator/water_base.png b/Assets/creator/water_base.png similarity index 100% rename from Bundled/creator/water_base.png rename to Assets/creator/water_base.png diff --git a/Bundled/creator/water_detail.png b/Assets/creator/water_detail.png similarity index 100% rename from Bundled/creator/water_detail.png rename to Assets/creator/water_detail.png diff --git a/Bundled/creator/water_foam.png b/Assets/creator/water_foam.png similarity index 100% rename from Bundled/creator/water_foam.png rename to Assets/creator/water_foam.png diff --git a/Bundled/creator/water_pass.arm b/Assets/creator/water_pass.arm similarity index 100% rename from Bundled/creator/water_pass.arm rename to Assets/creator/water_pass.arm diff --git a/Bundled/creator/world_pass.arm b/Assets/creator/world_pass.arm similarity index 100% rename from Bundled/creator/world_pass.arm rename to Assets/creator/world_pass.arm diff --git a/Bundled/defaults/default_brush.json b/Assets/defaults/default_brush.json similarity index 100% rename from Bundled/defaults/default_brush.json rename to Assets/defaults/default_brush.json diff --git a/Bundled/defaults/default_material.json b/Assets/defaults/default_material.json similarity index 100% rename from Bundled/defaults/default_material.json rename to Assets/defaults/default_material.json diff --git a/Bundled/licenses/authors.md b/Assets/licenses/authors.md similarity index 100% rename from Bundled/licenses/authors.md rename to Assets/licenses/authors.md diff --git a/Bundled/licenses/license.md b/Assets/licenses/license.md similarity index 100% rename from Bundled/licenses/license.md rename to Assets/licenses/license.md diff --git a/Bundled/licenses/license_cmft.md b/Assets/licenses/license_cmft.md similarity index 100% rename from Bundled/licenses/license_cmft.md rename to Assets/licenses/license_cmft.md diff --git a/Bundled/licenses/license_cycles-nodes.md b/Assets/licenses/license_cycles-nodes.md similarity index 100% rename from Bundled/licenses/license_cycles-nodes.md rename to Assets/licenses/license_cycles-nodes.md diff --git a/Bundled/licenses/license_heapsfbx.md b/Assets/licenses/license_heapsfbx.md similarity index 100% rename from Bundled/licenses/license_heapsfbx.md rename to Assets/licenses/license_heapsfbx.md diff --git a/Bundled/licenses/license_hxformat.md b/Assets/licenses/license_hxformat.md similarity index 100% rename from Bundled/licenses/license_hxformat.md rename to Assets/licenses/license_hxformat.md diff --git a/Bundled/licenses/license_hxpako.md b/Assets/licenses/license_hxpako.md similarity index 100% rename from Bundled/licenses/license_hxpako.md rename to Assets/licenses/license_hxpako.md diff --git a/Bundled/licenses/license_import_tiff.md b/Assets/licenses/license_import_tiff.md similarity index 100% rename from Bundled/licenses/license_import_tiff.md rename to Assets/licenses/license_import_tiff.md diff --git a/Bundled/licenses/license_kha.md b/Assets/licenses/license_kha.md similarity index 100% rename from Bundled/licenses/license_kha.md rename to Assets/licenses/license_kha.md diff --git a/Bundled/licenses/license_kinc.md b/Assets/licenses/license_kinc.md similarity index 100% rename from Bundled/licenses/license_kinc.md rename to Assets/licenses/license_kinc.md diff --git a/Bundled/licenses/license_krom.md b/Assets/licenses/license_krom.md similarity index 100% rename from Bundled/licenses/license_krom.md rename to Assets/licenses/license_krom.md diff --git a/Bundled/licenses/license_lz4-wasm.md b/Assets/licenses/license_lz4-wasm.md similarity index 100% rename from Bundled/licenses/license_lz4-wasm.md rename to Assets/licenses/license_lz4-wasm.md diff --git a/Bundled/licenses/license_material_icons.txt b/Assets/licenses/license_material_icons.txt similarity index 100% rename from Bundled/licenses/license_material_icons.txt rename to Assets/licenses/license_material_icons.txt diff --git a/Bundled/licenses/license_nfd.md b/Assets/licenses/license_nfd.md similarity index 100% rename from Bundled/licenses/license_nfd.md rename to Assets/licenses/license_nfd.md diff --git a/Bundled/licenses/license_roboto.md b/Assets/licenses/license_roboto.md similarity index 100% rename from Bundled/licenses/license_roboto.md rename to Assets/licenses/license_roboto.md diff --git a/Bundled/licenses/license_xatlas.md b/Assets/licenses/license_xatlas.md similarity index 100% rename from Bundled/licenses/license_xatlas.md rename to Assets/licenses/license_xatlas.md diff --git a/Bundled/painter/Scene.arm b/Assets/painter/Scene.arm similarity index 100% rename from Bundled/painter/Scene.arm rename to Assets/painter/Scene.arm diff --git a/Bundled/painter/World.hdr b/Assets/painter/World.hdr similarity index 100% rename from Bundled/painter/World.hdr rename to Assets/painter/World.hdr diff --git a/Bundled/painter/World_irradiance.arm b/Assets/painter/World_irradiance.arm similarity index 100% rename from Bundled/painter/World_irradiance.arm rename to Assets/painter/World_irradiance.arm diff --git a/Bundled/painter/World_radiance.hdr b/Assets/painter/World_radiance.hdr similarity index 100% rename from Bundled/painter/World_radiance.hdr rename to Assets/painter/World_radiance.hdr diff --git a/Bundled/painter/World_radiance_0.hdr b/Assets/painter/World_radiance_0.hdr similarity index 100% rename from Bundled/painter/World_radiance_0.hdr rename to Assets/painter/World_radiance_0.hdr diff --git a/Bundled/painter/World_radiance_1.hdr b/Assets/painter/World_radiance_1.hdr similarity index 100% rename from Bundled/painter/World_radiance_1.hdr rename to Assets/painter/World_radiance_1.hdr diff --git a/Bundled/painter/World_radiance_2.hdr b/Assets/painter/World_radiance_2.hdr similarity index 100% rename from Bundled/painter/World_radiance_2.hdr rename to Assets/painter/World_radiance_2.hdr diff --git a/Bundled/painter/World_radiance_3.hdr b/Assets/painter/World_radiance_3.hdr similarity index 100% rename from Bundled/painter/World_radiance_3.hdr rename to Assets/painter/World_radiance_3.hdr diff --git a/Bundled/painter/World_radiance_4.hdr b/Assets/painter/World_radiance_4.hdr similarity index 100% rename from Bundled/painter/World_radiance_4.hdr rename to Assets/painter/World_radiance_4.hdr diff --git a/Bundled/painter/World_radiance_5.hdr b/Assets/painter/World_radiance_5.hdr similarity index 100% rename from Bundled/painter/World_radiance_5.hdr rename to Assets/painter/World_radiance_5.hdr diff --git a/Bundled/painter/World_radiance_6.hdr b/Assets/painter/World_radiance_6.hdr similarity index 100% rename from Bundled/painter/World_radiance_6.hdr rename to Assets/painter/World_radiance_6.hdr diff --git a/Bundled/painter/World_radiance_7.hdr b/Assets/painter/World_radiance_7.hdr similarity index 100% rename from Bundled/painter/World_radiance_7.hdr rename to Assets/painter/World_radiance_7.hdr diff --git a/Bundled/painter/World_radiance_8.hdr b/Assets/painter/World_radiance_8.hdr similarity index 100% rename from Bundled/painter/World_radiance_8.hdr rename to Assets/painter/World_radiance_8.hdr diff --git a/Bundled/painter/World_radiance_9.hdr b/Assets/painter/World_radiance_9.hdr similarity index 100% rename from Bundled/painter/World_radiance_9.hdr rename to Assets/painter/World_radiance_9.hdr diff --git a/Bundled/painter/deferred_light.arm b/Assets/painter/deferred_light.arm similarity index 100% rename from Bundled/painter/deferred_light.arm rename to Assets/painter/deferred_light.arm diff --git a/Bundled/painter/export_presets/preset_generic.json b/Assets/painter/export_presets/preset_generic.json similarity index 100% rename from Bundled/painter/export_presets/preset_generic.json rename to Assets/painter/export_presets/preset_generic.json diff --git a/Bundled/painter/ltc_mag.arm b/Assets/painter/ltc_mag.arm similarity index 100% rename from Bundled/painter/ltc_mag.arm rename to Assets/painter/ltc_mag.arm diff --git a/Bundled/painter/ltc_mat.arm b/Assets/painter/ltc_mat.arm similarity index 100% rename from Bundled/painter/ltc_mat.arm rename to Assets/painter/ltc_mat.arm diff --git a/Bundled/painter/world_pass.arm b/Assets/painter/world_pass.arm similarity index 100% rename from Bundled/painter/world_pass.arm rename to Assets/painter/world_pass.arm diff --git a/Bundled/plugins/autosave.js b/Assets/plugins/autosave.js similarity index 100% rename from Bundled/plugins/autosave.js rename to Assets/plugins/autosave.js diff --git a/Bundled/plugins/console.js b/Assets/plugins/console.js similarity index 100% rename from Bundled/plugins/console.js rename to Assets/plugins/console.js diff --git a/Bundled/plugins/converter.js b/Assets/plugins/converter.js similarity index 100% rename from Bundled/plugins/converter.js rename to Assets/plugins/converter.js diff --git a/Bundled/plugins/hello_node.js b/Assets/plugins/hello_node.js similarity index 100% rename from Bundled/plugins/hello_node.js rename to Assets/plugins/hello_node.js diff --git a/Bundled/plugins/hello_world.js b/Assets/plugins/hello_world.js similarity index 100% rename from Bundled/plugins/hello_world.js rename to Assets/plugins/hello_world.js diff --git a/Bundled/plugins/import_tiff.js b/Assets/plugins/import_tiff.js similarity index 100% rename from Bundled/plugins/import_tiff.js rename to Assets/plugins/import_tiff.js diff --git a/Bundled/plugins/profiler.js b/Assets/plugins/profiler.js similarity index 100% rename from Bundled/plugins/profiler.js rename to Assets/plugins/profiler.js diff --git a/Bundled/plugins/xatlas.js b/Assets/plugins/xatlas.js similarity index 100% rename from Bundled/plugins/xatlas.js rename to Assets/plugins/xatlas.js diff --git a/Bundled/plugins/xatlas.wasm b/Assets/plugins/xatlas.wasm similarity index 100% rename from Bundled/plugins/xatlas.wasm rename to Assets/plugins/xatlas.wasm diff --git a/Assets/icon/icon.ico b/Assets/raw/icon/icon.ico similarity index 100% rename from Assets/icon/icon.ico rename to Assets/raw/icon/icon.ico diff --git a/Assets/icon/icon.png b/Assets/raw/icon/icon.png similarity index 100% rename from Assets/icon/icon.png rename to Assets/raw/icon/icon.png diff --git a/Assets/icon/icon_raw.png b/Assets/raw/icon/icon_raw.png similarity index 100% rename from Assets/icon/icon_raw.png rename to Assets/raw/icon/icon_raw.png diff --git a/Bundled/raytrace/bnoise_rank.png b/Assets/raytrace/bnoise_rank.png similarity index 100% rename from Bundled/raytrace/bnoise_rank.png rename to Assets/raytrace/bnoise_rank.png diff --git a/Bundled/raytrace/bnoise_scramble.png b/Assets/raytrace/bnoise_scramble.png similarity index 100% rename from Bundled/raytrace/bnoise_scramble.png rename to Assets/raytrace/bnoise_scramble.png diff --git a/Bundled/raytrace/bnoise_sobol.png b/Assets/raytrace/bnoise_sobol.png similarity index 100% rename from Bundled/raytrace/bnoise_sobol.png rename to Assets/raytrace/bnoise_sobol.png diff --git a/Bundled/readme/readme.txt b/Assets/readme/readme.txt similarity index 100% rename from Bundled/readme/readme.txt rename to Assets/readme/readme.txt diff --git a/Bundled/readme/readme_dxr.txt b/Assets/readme/readme_dxr.txt similarity index 100% rename from Bundled/readme/readme_dxr.txt rename to Assets/readme/readme_dxr.txt diff --git a/Bundled/readme/readme_macos.txt b/Assets/readme/readme_macos.txt similarity index 100% rename from Bundled/readme/readme_macos.txt rename to Assets/readme/readme_macos.txt diff --git a/Bundled/themes/theme_light.arm b/Assets/themes/theme_light.arm similarity index 100% rename from Bundled/themes/theme_light.arm rename to Assets/themes/theme_light.arm diff --git a/khafile.js b/khafile.js index c29c69d6..225d2536 100644 --- a/khafile.js +++ b/khafile.js @@ -4,11 +4,11 @@ project.addSources('Sources'); project.addLibrary("iron"); project.addLibrary("zui"); project.addShaders("Shaders/common/*.glsl", { noembed: false}); -project.addAssets("Bundled/common/*", { notinlist: true, destination: "data/{name}" }); -project.addAssets("Bundled/defaults/*", { notinlist: true, destination: "data/defaults/{name}" }); -project.addAssets("Bundled/licenses/*", { notinlist: true, destination: "data/licenses/{name}" }); -project.addAssets("Bundled/plugins/*", { notinlist: true, destination: "data/plugins/{name}" }); -project.addAssets("Bundled/themes/*", { notinlist: true, destination: "data/themes/{name}" }); +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}" }); project.addDefine('rp_voxelao'); project.addDefine('arm_voxelgi_revox'); @@ -44,16 +44,16 @@ else { } if (raytrace) { - project.addAssets("Bundled/raytrace/*", { notinlist: true, destination: "data/{name}" }); + project.addAssets("Assets/raytrace/*", { notinlist: true, destination: "data/{name}" }); project.addAssets("Shaders/raytrace/*.cso", { notinlist: true, destination: "data/{name}" }); - project.addAssets("Bundled/readme/readme_dxr.txt", { notinlist: true, destination: "{name}" }); + project.addAssets("Assets/readme/readme_dxr.txt", { notinlist: true, destination: "{name}" }); } else { - project.addAssets("Bundled/readme/readme.txt", { notinlist: true, destination: "{name}" }); + project.addAssets("Assets/readme/readme.txt", { notinlist: true, destination: "{name}" }); } if (process.platform === 'darwin') { - project.addAssets("Bundled/readme/readme_macos.txt", { notinlist: true, destination: "INSTRUCTIONS.txt" }); + project.addAssets("Assets/readme/readme_macos.txt", { notinlist: true, destination: "INSTRUCTIONS.txt" }); } if (process.platform === 'win32') { @@ -74,13 +74,13 @@ else { // painter, creator project.addDefine('arm_resizable'); if (process.platform === 'win32') { - project.addAssets("Bundled/bin/cmft.exe", { notinlist: true, destination: "data/{name}" }); + project.addAssets("Assets/bin/cmft.exe", { notinlist: true, destination: "data/{name}" }); } else if (process.platform === 'linux') { - project.addAssets("Bundled/bin/cmft-linux64", { notinlist: true, destination: "data/{name}" }); + project.addAssets("Assets/bin/cmft-linux64", { notinlist: true, destination: "data/{name}" }); } else if (process.platform === 'darwin') { - project.addAssets("Bundled/bin/cmft-osx", { notinlist: true, destination: "data/{name}" }); + project.addAssets("Assets/bin/cmft-osx", { notinlist: true, destination: "data/{name}" }); } if (build === 'creator') { @@ -89,8 +89,8 @@ else { // painter, creator } if (build === 'painter') { - project.addAssets("Bundled/painter/*", { notinlist: true, destination: "data/{name}" }); - project.addAssets("Bundled/painter/export_presets/*", { notinlist: true, destination: "data/export_presets/{name}" }); + project.addAssets("Assets/painter/*", { notinlist: true, destination: "data/{name}" }); + project.addAssets("Assets/painter/export_presets/*", { notinlist: true, destination: "data/export_presets/{name}" }); project.addShaders("Shaders/painter/*.glsl", { noembed: false}); if (process.platform === 'win32') { project.addShaders("Shaders/painter/hlsl/*.glsl", { noprocessing: true, noembed: false }); @@ -101,8 +101,8 @@ if (build === 'painter') { project.addDefine('kha_no_ogg'); } else { - project.addAssets("Bundled/creator/*", { notinlist: true, destination: "data/{name}" }); - project.addAssets("Bundled/creator/plugins/*", { notinlist: true, destination: "data/plugins/{name}" }); + project.addAssets("Assets/creator/*", { notinlist: true, destination: "data/{name}" }); + project.addAssets("Assets/creator/plugins/*", { notinlist: true, destination: "data/plugins/{name}" }); project.addShaders("Shaders/creator/*.glsl", { noembed: false}); project.addDefine('arm_audio'); project.addDefine('arm_soundcompress');