Merge branch 'master' into gh-pages

Author: JannisX11

js/animations/animation.js

@@ -133,8 +133,8 @@ class Animation extends AnimationItem {
 			copy.animators = {}
 			for (var uuid in this.animators) {
 				let ba = this.animators[uuid]
-				var kfs = ba.keyframes
-				if ((kfs && kfs.length) || ba.rotation_global) {
+				let kfs = ba.keyframes
+				if ((kfs && kfs.length) || ba.rotation_global || !save) {
 					let ba_copy = copy.animators[uuid] = {
 						name: ba.name,
 						type: ba.type,
@@ -160,10 +160,10 @@ class Animation extends AnimationItem {
 
 		if (this.length) ani_tag.animation_length = Math.roundTo(this.length, 4);
 		if (this.override) ani_tag.override_previous_animation = true;
-		if (this.anim_time_update) ani_tag.anim_time_update = this.anim_time_update.replace(/\n/g, '');
-		if (this.blend_weight) ani_tag.blend_weight = this.blend_weight.replace(/\n/g, '');
-		if (this.start_delay) ani_tag.start_delay = this.start_delay.replace(/\n/g, '');
-		if (this.loop_delay && ani_tag.loop) ani_tag.loop_delay = this.loop_delay.replace(/\n/g, '');
+		if (this.anim_time_update) ani_tag.anim_time_update = exportMolang(this.anim_time_update);
+		if (this.blend_weight) ani_tag.blend_weight = exportMolang(this.blend_weight);
+		if (this.start_delay) ani_tag.start_delay = exportMolang(this.start_delay);
+		if (this.loop_delay && ani_tag.loop) ani_tag.loop_delay = exportMolang(this.loop_delay);
 		ani_tag.bones = {};
 
 		for (var uuid in this.animators) {
@@ -1769,12 +1769,17 @@ BARS.defineActions(function() {
 					temp_animators[target_uuid] = new animator.constructor(target_uuid, animation);
 					copyAnimator(temp_animators[target_uuid], target_animator);
 				}
+
+				let tempsave_current_animator = !temp_animators[animator.uuid];
+				if (tempsave_current_animator) {
+					temp_animators[animator.uuid] = new animator.constructor(animator.uuid, animation);
+					copyAnimator(temp_animators[animator.uuid], animator);
+				}
+
 				copyAnimator(target_animator, temp_animators[animator.uuid] ?? animator);
 
 				// Reset animator
-				if (!temp_animators[animator.uuid]) {
-					temp_animators[animator.uuid] = new animator.constructor(animator.uuid, animation);
-					copyAnimator(temp_animators[animator.uuid], animator);
+				if (tempsave_current_animator) {
 					resetAnimator(animator)
 				}
 			}

js/animations/keyframe.js

@@ -94,11 +94,8 @@ class Keyframe {
 		data_point = this.data_points[data_point];
 		if (!data_point || !data_point[axis]) {
 			return this.transform ? 0 : '';
-		} else if (!isNaN(data_point[axis])) {
-			let num = parseFloat(data_point[axis]);
-			return isNaN(num) ? 0 : num;
 		} else {
-			return data_point[axis]
+			return exportMolang(data_point[axis])
 		}
 	}
 	calc(axis, data_point = 0) {
@@ -113,6 +110,7 @@ class Keyframe {
 	}
 	set(axis, value, data_point = 0) {
 		if (data_point) data_point = Math.clamp(data_point, 0, this.data_points.length-1);
+		if (typeof value == 'number') value = Math.roundTo(value, 10).toString();
 		if (this.data_points[data_point]) {
 			if (this.uniform) {
 				this.data_points[data_point].x = value;

js/interface/start_screen.js

@@ -573,23 +573,39 @@ ModelLoader.loaders = {};
 	});
 	documentReady.then(() => {
 
-		//Twitter
-		let twitter_ad;
-		if (!settings.classroom_mode.value && Blockbench.startup_count < 20 && Blockbench.startup_count % 5 === 4) {
-			twitter_ad = true;
-			addStartScreenSection('twitter_link', {
-				color: '#1da1f2',
+		//Bluesky
+		let bsky_ad;
+		Blockbench.onUpdateTo('4.12.2', () => {
+			//Bluesky
+			if (!settings.classroom_mode.value) {
+				bsky_ad = true;
+				addStartScreenSection('bluesky_link', {
+					color: 'rgb(32, 139, 254);',
+					text_color: '#ffffff',
+					graphic: {type: 'icon', icon: 'fab.fa-bluesky'},
+					text: [
+						{type: 'h3', text: 'Blockbench on Bluesky'},
+						{text: 'Follow Blockbench on Bluesky for the latest news & cool models from the community! [@blockbench.net](https://bsky.app/profile/blockbench.net)'}
+					],
+					last: true
+				})
+			}
+		})
+		if (!settings.classroom_mode.value && !bsky_ad && Blockbench.startup_count < 20 && Blockbench.startup_count % 5 === 4) {
+			bsky_ad = true;
+			addStartScreenSection('bluesky_link', {
+				color: 'rgb(32, 139, 254);',
 				text_color: '#ffffff',
-				graphic: {type: 'icon', icon: 'fab.fa-twitter'},
+				graphic: {type: 'icon', icon: 'fab.fa-bluesky'},
 				text: [
-					{type: 'h2', text: 'Blockbench on Twitter'},
-					{text: 'Follow Blockbench on Twitter for the latest news as well as cool models from the community! [twitter.com/blockbench](https://twitter.com/blockbench/)'}
+					{type: 'h3', text: 'Blockbench on Bluesky'},
+					{text: 'Follow Blockbench on Bluesky for the latest news & cool models from the community! [@blockbench.net](https://bsky.app/profile/blockbench.net)'}
 				],
 				last: true
 			})
 		}
 		//Discord
-		if (!settings.classroom_mode.value && Blockbench.startup_count < 6 && !twitter_ad) {
+		if (!settings.classroom_mode.value && Blockbench.startup_count < 6 && !bsky_ad) {
 			addStartScreenSection('discord_link', {
 				color: '#5865F2',
 				text_color: '#ffffff',

js/modeling/mesh_editing.js

@@ -2453,7 +2453,6 @@ BARS.defineActions(function() {
 				}},
 				even_extend: {type: 'checkbox', value: false, label: 'edit.extrude_mesh_selection.even_extend'},
 			}, form => {
-				console.log(form)
 				runEdit(true, form.extend, form.direction_mode, form.even_extend);
 			})
 		}

js/modeling/mirror_modeling.js

@@ -284,7 +284,9 @@ const MirrorModeling = {
 					} else {
 						// change
 						let original_vkey = pre_part_connections.vertices[vkey];
-						new_face.uv[new_vkey] = original_face.uv[original_vkey].slice();
+						if (original_face.uv[original_vkey]) {
+							new_face.uv[new_vkey] = original_face.uv[original_vkey].slice();
+						}
 					}
 				})
 				new_face.invert();

js/modeling/transform_gizmo.js

@@ -1152,7 +1152,7 @@
 							} 
 						})
 					}
-					_has_groups = Format.bone_rig && Group.first_selected && Group.first_selected.matchesSelection() && Toolbox.selected.transformerMode == 'translate';
+					_has_groups = Format.bone_rig && Group.first_selected && Toolbox.selected.transformerMode == 'translate';
 					var rotate_group = Format.bone_rig && Group.first_selected && (Toolbox.selected.transformerMode == 'rotate');
 
 					if (Toolbox.selected.id == 'move_tool') {

js/outliner/group.js

@@ -399,6 +399,7 @@ class Group extends OutlinerNode {
 			obj.locked = this.locked;
 			obj.visibility = this.visibility;
 			obj.autouv = this.autouv;
+			obj.selected = Group.multi_selected.includes(this);
 		}
 
 		if (this.rotation.allEqual(0)) {

js/outliner/outliner.js

@@ -800,7 +800,8 @@ function parseGroups(array, import_reference, startIndex) {
 					OutlinerNode.uuids[array[i].uuid].removeFromParent();
 					delete OutlinerNode.uuids[array[i].uuid];
 				}
-				var obj = new Group(array[i], array[i].uuid)
+				// todo: Update old groups instead of rebuilding all
+				let obj = new Group(array[i], array[i].uuid)
 				obj.parent = addGroup
 				obj.isOpen = !!array[i].isOpen
 				if (array[i].uuid) {
@@ -814,6 +815,9 @@ function parseGroups(array, import_reference, startIndex) {
 				if (array[i].content && array[i].content.length > 0) {
 					iterate(array[i].content, obj.children, obj)
 				}
+				if (array[i].selected) {
+					obj.multiSelect();
+				}
 			}
 			i++;
 		}
@@ -1129,14 +1133,15 @@ SharedActions.add('select_all', {
 		Undo.initSelection();
 		let selectable_elements = Outliner.elements.filter(element => !element.locked);
 		if (Outliner.selected.length < selectable_elements.length) {
-			if (Outliner.root.length == 1 && !Outliner.root[0].locked) {
-				Outliner.root[0].select();
-			} else {
-				selectable_elements.forEach(obj => {
-					obj.selectLow()
-				})
-				TickUpdates.selection = true;
+			for (let node of Outliner.root) {
+				if (node instanceof Group) {
+					node.multiSelect();
+				}
 			}
+			selectable_elements.forEach(obj => {
+				obj.selectLow()
+			})
+			TickUpdates.selection = true;
 			Undo.finishSelection('Select all elements');
 		} else {
 			unselectAllElements()

js/preview/preview.js

@@ -1153,11 +1153,11 @@ class Preview {
 
 			let z_offset = world_normal.clone().multiplyScalar(z_fight_offset);
 			let matrix_offset = new THREE.Matrix4().makeTranslation(z_offset.x, z_offset.y, z_offset.z);
-			if (!Format.centered_grid) {
-				matrix_offset.makeTranslation(-Canvas.scene.position.x, -Canvas.scene.position.y, -Canvas.scene.position.z);
-			}
 			brush_matrix.multiplyMatrices(matrix_offset, brush_matrix);
 
+			// Since we're setting the brush matrix, we need to multiply in its parents matrix as well in case there are any.
+			if (Canvas.brush_outline.parent)
+				brush_matrix.multiplyMatrices(Canvas.brush_outline.parent.matrixWorld.clone().invert(), brush_matrix);
 			Canvas.brush_outline.matrix = brush_matrix;
 		}
 

js/undo.js

@@ -15,12 +15,16 @@ class UndoSystem {
 		}
 	}
 	initEdit(aspects, amended = false) {
+		// todo: selecting all groups, moving, then undoing, unselects all multi-selected groups
 		if (aspects && aspects.cubes) {
 			console.warn('Aspect "cubes" is deprecated. Please use "elements" instead.');
 			aspects.elements = aspects.cubes;
 		}
 		this.startChange(amended);
-		this.current_save = new UndoSystem.save(aspects)
+		this.current_save = new UndoSystem.save(aspects);
+		if (aspects.selection) {
+			this.current_selection_save = new UndoSystem.selectionSave(typeof aspects.selection == 'object' ? typeof aspects.selection : 0);
+		}
 		Blockbench.dispatchEvent('init_edit', {aspects, amended, save: this.current_save})
 		return this.current_save;
 	}
@@ -40,7 +44,18 @@ class UndoSystem {
 			type: 'edit',
 			time: Date.now()
 		}
-		this.current_save = entry.post
+
+		if (aspects.selection && this.current_selection_save) {
+			let selection_aspects = typeof aspects.selection == 'object' ? aspects.selection : this.current_selection_save.aspects;
+			let selection_before = this.current_selection_save;
+			let selection_post = new UndoSystem.selectionSave(selection_aspects);
+			if (!selection_before.matches(selection_post)) {
+				entry.selection_before = selection_before;
+				entry.selection_post = selection_post;
+			}
+		}
+
+
 		if (this.history.length > this.index) {
 			this.history.length = this.index;
 		}
@@ -89,7 +104,6 @@ class UndoSystem {
 			type: 'selection',
 			time: Date.now()
 		}
-		this.current_selection_save = entry.selection_post
 		if (this.history.length > this.index) {
 			this.history.length = this.index;
 		}
@@ -239,7 +253,7 @@ UndoSystem.save = class {
 
 		this.mode = Modes.selected.id;
 
-		if (aspects.selection) {
+		/*if (aspects.selection) {
 			this.selection = [];
 			this.mesh_selection = {};
 			selected.forEach(obj => {
@@ -251,8 +265,7 @@ UndoSystem.save = class {
 			if (Group.multi_selected.length) {
 				this.selected_groups = Group.multi_selected.map(g => g.uuid);
 			}
-
-		}
+		}*/
 
 		if (aspects.elements) {
 			this.elements = {}
@@ -440,7 +453,7 @@ UndoSystem.save = class {
 			}
 		}
 
-		if (this.selection && !is_session) {
+		/*if (this.selection && !is_session) {
 			selected.length = 0;
 			Outliner.elements.forEach((obj) => {
 				if (this.selection.includes(obj.uuid)) {
@@ -450,7 +463,7 @@ UndoSystem.save = class {
 					}
 				}
 			})
-		}
+		}*/
 
 		if (this.groups) {
 			for (let saved_group of this.groups) {
@@ -619,7 +632,7 @@ UndoSystem.save = class {
 		if (this.animations) {
 			for (var uuid in this.animations) {
 
-				var animation = (reference.animations && reference.animations[uuid]) ? this.getItemByUUID(Animator.animations, uuid) : null;
+				var animation = (reference.animations && reference.animations[uuid]) ? Undo.getItemByUUID(Animator.animations, uuid) : null;
 				if (!animation) {
 					animation = new Animation()
 					animation.uuid = uuid
@@ -631,7 +644,7 @@ UndoSystem.save = class {
 			}
 			for (var uuid in reference.animations) {
 				if (!this.animations[uuid]) {
-					var animation = this.getItemByUUID(Animator.animations, uuid)
+					var animation = Undo.getItemByUUID(Animator.animations, uuid)
 					if (animation) {
 						animation.remove(false)
 					}
@@ -641,7 +654,7 @@ UndoSystem.save = class {
 		if (this.animation_controllers) {
 			for (var uuid in this.animation_controllers) {
 
-				var controller = (reference.animation_controllers && reference.animation_controllers[uuid]) ? this.getItemByUUID(AnimationController.all, uuid) : null;
+				var controller = (reference.animation_controllers && reference.animation_controllers[uuid]) ? Undo.getItemByUUID(AnimationController.all, uuid) : null;
 				if (!controller) {
 					controller = new AnimationController();
 					controller.uuid = uuid;
@@ -653,7 +666,7 @@ UndoSystem.save = class {
 			}
 			for (var uuid in reference.animation_controllers) {
 				if (!this.animation_controllers[uuid]) {
-					var controller = this.getItemByUUID(AnimationController.all, uuid);
+					var controller = Undo.getItemByUUID(AnimationController.all, uuid);
 					if (controller) {
 						controller.remove(false);
 					}