Cleanup

.github/workflows/linux_vulkan.yml

@@ -21,5 +21,5 @@ jobs:
       run: sudo apt install make clang libvulkan-dev libgtk-3-dev --yes --quiet
     - name: Compile
       run: |
-        cd armorpaint
-        ../base/make --graphics vulkan --compile
+        cd paint
+        ../base/make --compile

.github/workflows/macos_metal.yml

@@ -17,5 +17,5 @@ jobs:
     - uses: actions/checkout@v3
     - name: Compile
       run: |
-        cd armorpaint
-        ../base/make --graphics metal --compile
+        cd paint
+        ../base/make --compile

.github/workflows/windows_direct3d12.yml

@@ -17,5 +17,5 @@ jobs:
     - uses: actions/checkout@v3
     - name: Compile
       run: |
-        cd armorpaint
-        ../base/make --graphics direct3d12 --compile
+        cd paint
+        ../base/make --compile

.gitignore

@@ -2,7 +2,7 @@
 .vscode
 *.DS_Store
 *.blend1
-armorlab/assets/models/*.onnx
-armorlab/assets/models/*.json
-armorlab/assets/models/*.txt
-armorlab/assets/models/*.zip
+lab/assets/models/*.onnx
+lab/assets/models/*.json
+lab/assets/models/*.txt
+lab/assets/models/*.zip

base/project.js

@@ -11,7 +11,7 @@ flags.with_eval = true;
 flags.with_plugins = true;
 
 let project = new Project("Base");
-let dir = flags.name.toLowerCase();
+let dir = flags.name.substr(5).toLowerCase(); // ArmorPaint -> paint
 
 if (!flags.lite) {
 	project.add_define("IDLE_SLEEP");
@@ -107,7 +107,7 @@ if (!flags.lite) {
 
 	let export_version_info = true;
 	if (export_version_info) {
-		let dir = "../" + flags.name.toLowerCase() + "/build";
+		let dir = "../" + flags.name.substr(5).toLowerCase() + "/build";
 		let sha = os_popen(`git log --pretty=format:"%h" -n 1`).stdout.substr(1, 7);
 		let date = new Date().toISOString().split("T")[0];
 		let data = `{ "sha": "${sha}", "date": "${date}" }`;
@@ -119,7 +119,7 @@ if (!flags.lite) {
 
 	let export_data_list = platform === "android"; // .apk contents
 	if (export_data_list) {
-		let root = "../" + flags.name.toLowerCase();
+		let root = "../" + flags.name.substr(5).toLowerCase();
 		let data_list = {
 			"/data/plugins": fs_readdir("../base/assets/plugins").concat(fs_readdir(root + "/assets/plugins")).join(","),
 			"/data/export_presets": fs_readdir(root + "/assets/export_presets").join(","),
@@ -128,7 +128,7 @@ if (!flags.lite) {
 			"/data/meshes": fs_readdir(root + "/assets/meshes").join(","),
 			"/data/themes": fs_readdir("../base/assets/themes").join(","),
 		};
-		let dir = "../" + flags.name.toLowerCase() + "/build";
+		let dir = "../" + flags.name.substr(5).toLowerCase() + "/build";
 		fs_ensuredir(dir);
 		fs_writefile(dir + "/data_list.json", JSON.stringify(data_list));
 		project.add_assets(dir + "/data_list.json", { destination: "data/{name}" });

base/tools/extract_locales.js

@@ -21,9 +21,9 @@ if (fs_exists(locale_path)) {
 
 let source_paths = [
     "base/sources", "base/sources/nodes",
-    "armorpaint/sources", "armorpaint/sources/nodes",
-    "armorlab/sources", "armorlab/sources/nodes",
-    "armorforge/sources", "armorforge/sources/nodes"
+    "paint/sources", "paint/sources/nodes",
+    "lab/sources", "lab/sources/nodes",
+    "forge/sources", "forge/sources/nodes"
 ];
 
 for (let path of source_paths) {

armorforge/project.js → forge/project.js

@@ -9,10 +9,10 @@ project.add_define("is_forge");
 project.add_define("is_paint");
 project.add_project("../base");
 
-project.add_tsfiles("../armorpaint/sources");
-project.add_tsfiles("../armorpaint/sources/nodes");
-project.add_shaders("../armorpaint/shaders/*.kong");
-project.add_project("../armorpaint/plugins");
+project.add_tsfiles("../paint/sources");
+project.add_tsfiles("../paint/sources/nodes");
+project.add_shaders("../paint/shaders/*.kong");
+project.add_project("../paint/plugins");
 
 project.add_tsfiles("sources");
 project.add_tsfiles("sources/nodes");
@@ -21,10 +21,10 @@ 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}" });
 project.add_assets("assets/plugins/*", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/hello_world.js", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/import_fbx.js", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/import_gltf_glb.js", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/uv_unwrap.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/hello_world.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/import_fbx.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/import_gltf_glb.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/uv_unwrap.js", { destination: "data/plugins/{name}" });
 project.add_assets("assets/meshes/*", { destination: "data/meshes/{name}", noembed: true });
 project.add_assets("assets/readme/readme.txt", { destination: "{name}" });
 

armorlab/project.js → lab/project.js

@@ -12,13 +12,13 @@ project.add_tsfiles("sources");
 project.add_tsfiles("sources/nodes");
 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("../paint/assets/export_presets/*", { destination: "data/export_presets/{name}" });
 project.add_assets("assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" });
 project.add_assets("assets/licenses/**", { destination: "data/licenses/{name}" });
 project.add_assets("assets/plugins/*", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/hello_world.js", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/hello_node_brush.js", { destination: "data/plugins/{name}" });
-project.add_assets("../armorpaint/assets/plugins/import_svg.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/hello_world.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/hello_node_brush.js", { destination: "data/plugins/{name}" });
+project.add_assets("../paint/assets/plugins/import_svg.js", { destination: "data/plugins/{name}" });
 project.add_assets("assets/meshes/*", { destination: "data/meshes/{name}", noembed: true });
 project.add_assets("assets/models/*.onnx", { destination: "data/models/{name}" });
 project.add_assets("assets/models/*.json", { destination: "data/models/{name}" });

armorlab/readme.md → lab/readme.md

@@ -11,7 +11,7 @@ armorlab
 
 ```bash
 git clone https://github.com/armory3d/armortools
-cd armortools/armorlab
+cd armortools/lab
 # Unpack `models.zip` from https://github.com/armory3d/armorai/releases into `assets/models` using 7-Zip - Extract Here
 ```