Progress on scopes

Author: JannisX11

build.js

@@ -81,14 +81,16 @@ const config = {
     minify,
     outfile: './dist/bundle.js',
     mainFields: ['module', 'main'],
+    logLevel: 'info',
     logOverride: {
         'commonjs-variable-in-esm': 'silent'
     },
     external: [
         'electron',
     ],
     loader: {
-        '.bbtheme': 'text'
+        '.bbtheme': 'text',
+        '.png': 'dataurl'
     },
     plugins: [
         conditionalImportPlugin(2, {

js/animations/animation.js

@@ -275,7 +275,6 @@ export class Animation extends AnimationItem {
 		}
 	}
 	createUniqueName(arr) {
-		var scope = this;
 		var others = Animator.animations.slice();
 		if (arr && arr.length) {
 			arr.forEach(g => {
@@ -284,9 +283,9 @@ export class Animation extends AnimationItem {
 		}
 		others = others.filter(a => a.path == this.path);
 		var name = this.name.replace(/\d+$/, '');
-		function check(n) {
+		const check = (n) => {
 			for (var i = 0; i < others.length; i++) {
-				if (others[i] !== scope && others[i].name == n) return false;
+				if (others[i] !== this && others[i].name == n) return false;
 			}
 			return true;
 		}
@@ -295,19 +294,18 @@ export class Animation extends AnimationItem {
 		}
 		for (var num = 2; num < 8e2; num++) {
 			if (check(name+num)) {
-				scope.name = name+num;
-				return scope.name;
+				this.name = name+num;
+				return this.name;
 			}
 		}
 		return false;
 	}
 	rename() {
-		var scope = this;
-		Blockbench.textPrompt('generic.rename', this.name, function(name) {
-			if (name && name !== scope.name) {
-				Undo.initEdit({animations: [scope]});
-				scope.name = name;
-				scope.createUniqueName();
+		Blockbench.textPrompt('generic.rename', this.name, (name) => {
+			if (name && name !== this.name) {
+				Undo.initEdit({animations: [this]});
+				this.name = name;
+				this.createUniqueName();
 				Undo.finishEdit('Rename animation');
 			}
 		})

js/formats/bbmodel.js

@@ -680,7 +680,7 @@ var codec = new Codec('project', {
 				new TextureGroup(tex_group, tex_group.uuid).add(false);
 			})
 		}
-		if (model.textures && (!Format.single_texture || Texture.all.length == 0)) {
+		if (model.textures) {
 			new_textures.replace(model.textures.map(loadTexture))
 		}
 

js/formats/bedrock/bedrock.js

@@ -6,6 +6,7 @@ import { ModelLoader } from "./../../io/model_loader";
 import {animation_codec} from "./bedrock_animation"
 import "./animation_controller_codec"
 import { loadBedrockCollisionFromJSON } from "./bedrock_voxel_shape";
+import PlayerTexture from './../../../assets/player_skin.png'
 
 if (isApp) {
 window.BedrockEntityManager = class BedrockEntityManager {
@@ -1792,25 +1793,47 @@ BARS.defineActions(function() {
 		show_on_start_screen: false,
 		icon: 'icon-player',
 		target: 'Minecraft: Bedrock Edition',
-		onStart(import_as_attachable) {
-			let import_bbmodel = import_as_attachable ? Codecs.project.compile() : null;
+		onStart: async function() {
+			
+			let form_config = await new Promise((resolve, reject) => {
+				new Dialog({
+					title: 'Bedrock Player Model',
+					form: {
+						import_as_attachable: {label: 'Import current model as attachable', value: true, type: 'checkbox'},
+					},
+					onConfirm(result) {
+						resolve(result)
+					},
+					onCancel() {
+						reject();
+					}
+				}).show();
+			});
+
+			let import_bbmodel = form_config.import_as_attachable ? Codecs.project.compile() : null;
 
 			setupProject(entity_format);
 			parseGeometry({object: player_geo}, {});
 
+
+
+			new Texture({name: 'player.png'}).fromDataURL(PlayerTexture).add(true, true);
+
 			let elements_before = Outliner.elements.slice();
 			let groups_before = Group.all.slice();
+			let textures_before = Texture.all.slice();
+			let animations_before = Animation.all.slice();
 			Outliner.nodes.forEach(node => {
 				node.scope = 1;
 			})
 
-			if (import_as_attachable) {
+			if (form_config.import_as_attachable) {
 				Codecs.project.merge(JSON.parse(import_bbmodel));
 				Outliner.nodes.forEach(node => {
 					if (!elements_before.includes(node) && !groups_before.includes(node)) {
 						node.scope = 2;
 					}
-				})
+				});
 			}
 		}
 	})

js/scopes.ts

@@ -0,0 +1,7 @@
+class ScopeRuleset {
+
+
+	static rulesets: Record<string, ScopeRuleset> = {};
+}
+
+