Merge branch 'master' into gh-pages

Author: JannisX11

.github/ISSUE_TEMPLATE/issue.yaml

@@ -53,6 +53,7 @@ body:
   id: os
   attributes:
     label: Operating System
+    description: Your system, such as Windows or MacOS. When using Linux, please also specify the distro and installation method.
   validations:
     required: true
 - type: input

.travis.yml

@@ -12,9 +12,8 @@ jobs:
     - name: "Linux"
       os: linux
       script:
-        - npm run build-electron
         - sudo apt-get install rpm
-        - electron-builder --publish=onTagOrDraft
+        - npm run publish-linux
 
 install:
   - npm install

build.js

@@ -24,7 +24,11 @@ function conditionalImportPlugin(name, config) {
          */
         setup(build) {
             build.onResolve({ filter: config.filter }, args => {
-                return { path: path.join(args.resolveDir, path.dirname(args.path), config.file) };
+                if (config.library) {
+                    return { path: path.join( import.meta.dirname, 'node_modules', path.dirname(args.path), config.file) };
+                } else {
+                    return { path: path.join(args.resolveDir, path.dirname(args.path), config.file) };
+                }
             });
         }
     };
@@ -62,7 +66,7 @@ const dev_mode = options.watch || options.serve;
 const minify = !dev_mode;
 
 /**
- * @typedef {esbuild.BuildOptions} BuildOptions
+ * @type {esbuild.BuildOptions} BuildOptions
  */
 const config = {
     entryPoints: ['./js/main.js'],
@@ -88,6 +92,11 @@ const config = {
             filter: /native_apis/,
             file: isApp ? 'native_apis.ts' : 'native_apis_web.ts'
         }),
+        conditionalImportPlugin(3, {
+            filter: /vue.js/,
+            file: dev_mode ? 'vue.js' : 'vue.min.js',
+            library: true,
+        }),
         conditionalImportPlugin(1, {
             filter: /desktop/,
             file: isApp ? 'desktop.js' : 'web.js'

content/front_page_app.png

@@ -242,6 +242,7 @@
 		position: relative;
 		margin: 0;
 		margin-right: auto;
+		padding-top: 2px;
 	}
 	.dialog_bar.form_bar .tool > .tooltip {
 		display: none !important;

css/dialogs.css

@@ -4,7 +4,6 @@ import url from 'url'
 import { createRequire } from 'node:module'
 import { fileURLToPath } from 'node:url'
 import fs from 'node:fs'
-import {getColorHexRGB} from 'electron-color-picker'
 
 const require = createRequire(import.meta.url)
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -246,7 +245,8 @@ ipcMain.on('close-detached-project', async (event, window_id, uuid) => {
 	if (window) window.send('close-detached-project', uuid);
 })
 ipcMain.on('request-color-picker', async (event, arg) => {
-	const color = await getColorHexRGB().catch((error) => {
+	const ColorPicker = await import('electron-color-picker');
+	const color = await ColorPicker.getColorHexRGB().catch((error) => {
 		console.warn('[Error] Failed to pick color', error)
 		return ''
 	})

electron/main.js

@@ -1666,10 +1666,11 @@ BARS.defineActions(function() {
 						if (!animator[channel]?.length) continue;
 						if (!animator.channels[channel].transform) continue;
 						let first = animator[channel][0];
+						let expected = +(channel === "scale");
 						// todo: add data points
 						if (animator[channel].length == 1 && first.data_points.length == 1 && (response.selection != 'selected_keyframes' || first.selected)) {
 							let value = first.getArray();
-							if (!value[0] && !value[1] && !value[2]) {
+							if (value.allAre(v => v === expected)) {
 								first.remove();
 								continue;
 							}
@@ -1733,7 +1734,7 @@ BARS.defineActions(function() {
 									}
 								}
 							} else if (!prev && !next) {
-								if (d_kf.allAre(val => !val)) {
+								if (d_kf.allAre(val => val === expected)) {
 									remove = true;
 								} else {
 									kf.time = 0;

js/animations/animation.js

@@ -148,7 +148,7 @@ export const Animator = {
 		let bone_stack = [];
 		let iterate = g => {
 			bone_stack.push(g);
-			if (g.parent instanceof OutlinerElement && g.parent.constructor.animator) iterate(g.parent);
+			if (g.parent instanceof OutlinerNode && g.parent.constructor.animator) iterate(g.parent);
 		}
 		iterate(target)
 

js/animations/animation_mode.js

@@ -362,8 +362,12 @@ export const Clipbench = {
 			let elements = [];
 			let new_elements_by_old_id = {};
 			for (let save of Clipbench.elements) {
-				if (!OutlinerElement.isTypePermitted(save.type)) return;
-				let copy = OutlinerElement.fromSave(save).addTo(target).markAsSelected();
+				if (!OutlinerElement.isTypePermitted(save.type)) continue;
+				let copy = new OutlinerElement.types[save.type](save);
+				let target_parent = (target instanceof OutlinerNode && target.children) ? target : target.parent;
+				if (!canAddOutlinerNodesTo([copy], target_parent)) continue;
+				copy.init();
+				copy.addTo(target).markAsSelected();
 				copy.createUniqueName();
 				Property.resetUniqueValues(copy.constructor, copy);
 				if (typeof save.isOpen == 'boolean') copy.isOpen = save.isOpen;

js/copy_paste.js

@@ -1,4 +1,4 @@
-import { electron, app, fs, PathModule, currentwindow, shell, ipcRenderer, process, nativeImage } from './native_apis';
+import { electron, app, fs, PathModule, currentwindow, shell, ipcRenderer, process, nativeImage, SystemInfo } from './native_apis';
 
 export const recent_projects = (function() {
 	let array = [];
@@ -304,24 +304,84 @@ currentwindow.on('enter-full-screen', e => updateWindowState(e, 'screen'));
 currentwindow.on('leave-full-screen', e => updateWindowState(e, 'screen'));
 currentwindow.on('ready-to-show', e => updateWindowState(e, 'load'));
 
+const ImageEditorPresets = {
+	aseprite: {
+		name: 'Aseprite',
+		paths: {
+			win32: 'C:\\Program Files\\Aseprite\\Aseprite.exe',
+			darwin: '/Applications/Aseprite.app',
+			linux: '/usr/share/applications//aseprite.desktop',
+		}
+	},
+	pixieditor: {
+		name: 'PixiEditor',
+		paths: {
+			win32: 'C:\\Program Files\\PixiEditor\\PixiEditor.exe',
+			darwin: '/Applications/PixiEditor.app',
+			linux: '/usr/share/applications//pixieditor.desktop',
+		}
+	},
+	ps: {
+		name: 'Photoshop',
+		paths: {
+			win32: 'C:\\Program Files\\Adobe\\Adobe Photoshop 2026\\Photoshop.exe',
+			darwin: '/Applications/Adobe Photoshop 2026/Adobe Photoshop 2026.app',
+			linux: '/usr/share/applications//photoshop.desktop'
+		}
+	},
+	gimp: {
+		name: 'GIMP',
+		paths: {
+			win32: 'C:\\Program Files\\GIMP 3\\bin\\gimp-3.exe',
+			darwin: '/Applications/Gimp-3.app',
+			linux: '/usr/share/applications//gimp.desktop',
+		}
+	},
+	pdn: {
+		name: 'Paint.NET',
+		paths: {
+			win32: 'C:\\Program Files\\paint.net\\PaintDotNet.exe'
+		}
+	},
+	affinity: {
+		name: 'Affinity',
+		paths: {
+			win32: () => PathModule.join(SystemInfo.appdata_directory, '..\\Local\\Microsoft\\WindowsApps\\Affinity.exe'),
+			darwin: '/Applications/Affinity.app'
+		}
+	}
+};
+
 //Image Editor
+export function isImageEditorValid(path) {
+	if (!path) return false;
+	try {
+		fs.accessSync(path);
+		return true;
+	} catch (err) {
+		return false;
+	}
+}
 export function changeImageEditor(texture, not_found) {
 	let app_file_extension = {
 		'win32': ['exe'],
 		'linux': [],
 		'darwin': ['app'],
 	};
+	let options = {};
+	for (let key in ImageEditorPresets) {
+		let entry = ImageEditorPresets[key];
+		if (!entry.paths[SystemInfo.platform]) continue;
+		options[key] = entry.name;
+	}
+	options.other = 'message.image_editor.file';
+
 	new Dialog({
 		title: tl('message.image_editor.title'),
 		id: 'image_editor',
 		form: {
 			not_found_text: {type: 'info', text: 'message.image_editor.not_found', condition: not_found == true},
-			editor: {type: 'select', full_width: true, options: {
-				ps: Blockbench.platform == 'win32' ? 'Photoshop' : undefined,
-				gimp: 'GIMP',
-				pdn: Blockbench.platform == 'win32' ? 'Paint.NET' : undefined,
-				other: 'message.image_editor.file'
-			}},
+			editor: {type: 'select', full_width: true, options},
 			file: {
 				label: 'message.image_editor.file',
 				type: 'file',
@@ -337,27 +397,14 @@ export function changeImageEditor(texture, not_found) {
 			let path;
 			if (id == 'other') {
 				path = result.file;
-
-			} else if (Blockbench.platform == 'darwin') {
-				switch (id) {
-					case 'ps':  path = '/Applications/Adobe Photoshop 2024/Adobe Photoshop 2024.app'; break;
-					case 'gimp':path = '/Applications/Gimp-2.10.app'; break;
-				}
-			} else if (Blockbench.platform == 'linux') {
-				switch (id) {
-					case 'ps':  path = '/usr/share/applications//photoshop.desktop'; break;
-					case 'gimp':path = '/usr/share/applications//gimp.desktop'; break;
-				}
 			} else {
-				switch (id) {
-					case 'ps':  path = 'C:\\Program Files\\Adobe\\Adobe Photoshop 2024\\Photoshop.exe'; break;
-					case 'gimp':path = 'C:\\Program Files\\GIMP 2\\bin\\gimp-2.10.exe'; break;
-					case 'pdn': path = 'C:\\Program Files\\paint.net\\PaintDotNet.exe'; break;
-				}
+				path = ImageEditorPresets[result.editor].paths[SystemInfo.platform];
+				if (typeof path == 'function') path = path();
 			}
-			if (path && fs.existsSync(path)) {
+			if (isImageEditorValid(path)) {
 				settings.image_editor.value = path
 				ipcRenderer.send('edit-launch-setting', {key: 'image_editor', value: path});
+				Settings.save();
 				if (texture) {
 					texture.openEditor()
 				}