Bug fixes

Author: adamsol

main.js

@@ -102,13 +102,6 @@ app.on('ready', () =>
 					{role: 'quit'},
 				],
 			},
-			{
-				label: 'Edit',
-				submenu: [
-					{role: 'undo'}, {role: 'redo'}, {type: 'separator'},
-					{role: 'cut'}, {role: 'copy'}, {role: 'paste'}, {label: 'Duplicate', accelerator: 'CmdOrCtrl+D'}, {role: 'delete', accelerator: 'Delete'},
-				],
-			},
 			{
 				label: 'View',
 				submenu: view_submenu,

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "three-studio",
   "productName": "ThreeStudio",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "ThreeStudio",
   "license": "GPL-3.0-or-later",
   "author": {

package.json

@@ -39,10 +39,12 @@ let assets = new Asset('folder', 'data');
 let assetsById = {};
 let assetsByClass = {};
 
+let LOADING = 'LOADING';
+
 function addAsset(object, cls, name, parent)
 {
 	parent = parent || assets;
-	if (!parent.children[name]) {
+	if (!parent.children[name] || parent.children[name] === LOADING) {
 		let id = ++Asset.count;
 		let asset = new Asset('file', name, parent, {
 			class: cls,
@@ -112,6 +114,7 @@ function importAssets(dir_path, assets)
 			assets.children[folder] = new Asset('folder', folder, assets);
 		}
 		for (let file of files) {
+			assets.children[file] = LOADING;
 			let abs_path = path.join(dir_path, file);
 			let callback = onAssetLoad.partial(assets, file);
 			// Texture and model files are loaded by a corresponding loader.
@@ -136,13 +139,13 @@ function importAssets(dir_path, assets)
 	});
 }
 
-importAssets('data', assets);
+setTimeout(() => importAssets('data', assets));
 
 async function getAsset()
 {
 	let asset = assets;
 	for (let name of [...arguments].map(path.split).flatten()) {
-		for (let i = 0; i < 20 && asset.children[name] === undefined; ++i) {
+		while (asset.children[name] === LOADING) {
 			await sleep(100);
 		}
 		asset = asset.children[name];

src/assets/asset.js

@@ -88,6 +88,11 @@ Geometry.prototype.getParameters = BufferGeometry.prototype.getParameters = func
 	return this.parameters;
 }
 
+Geometry.prototype.export = BufferGeometry.prototype.export = function()
+{
+	return this.toJSON();
+}
+
 Geometry.import = BufferGeometry.import = async function(json)
 {
 	return new THREE.ObjectLoader().parseGeometries([json])[json.uuid];

src/assets/geometry.js

@@ -22,11 +22,11 @@ async function newScene()
 function loadScene(file_path)
 {
 	if (!file_path) {
-		dialog.showOpenDialog({filters: [{name: 'Scene', extensions: ['scene']}]}, files => {
-			if (!files) {
+		dialog.showOpenDialog({filters: [{name: 'Scene', extensions: ['scene']}]}).then(result => {
+			if (result.canceled) {
 				return;
 			}
-			loadScene(files[0]);
+			loadScene(result.filePaths[0]);
 		});
 	} else {
 		fs.readFile(file_path, (error, content) => {
@@ -52,11 +52,11 @@ function saveScene(file_path)
 		return;
 	}
 	if (!file_path) {
-		dialog.showSaveDialog({filters: [{name: 'Scene', extensions: ['scene']}]}, file => {
-			if (!file) {
+		dialog.showSaveDialog({filters: [{name: 'Scene', extensions: ['scene']}]}).then(result => {
+			if (result.canceled) {
 				return;
 			}
-			saveScene(file);
+			saveScene(result.filePath);
 		});
 	} else {
 		let json = scene.export();

src/editor.js

@@ -92,9 +92,9 @@ CSG.toGeometry = function(csg, matrix4)
 		}
 		index += polygon.vertices.length;
 	}
-	geometry.addAttribute('position', new THREE.Float32BufferAttribute(vertices, 3));
-	geometry.addAttribute('normal', new THREE.Float32BufferAttribute(normals, 3));
-	geometry.addAttribute('uv', new THREE.Float32BufferAttribute(uvs, 2));
+	geometry.setAttribute('position', new THREE.Float32BufferAttribute(vertices, 3));
+	geometry.setAttribute('normal', new THREE.Float32BufferAttribute(normals, 3));
+	geometry.setAttribute('uv', new THREE.Float32BufferAttribute(uvs, 2));
 	geometry.setIndex(indices);
 	return geometry;
 }

src/utils/csg.js

@@ -66,7 +66,7 @@ ActorInspectorView.prototype.initToolbox = function(component_menu)
 		return '<ul class="dropdown-menu">{}</ul>'.format(
 			$.map(components, (item, key) => {
 				if ($.isFunction(item)) {
-					return '<li class="dropdown-item" data-component-name="{0}">{0}</li>'.format(displayTitle(item));
+					return '<li class="dropdown-item" data-component-name="{1}">{0}</li>'.format(displayTitle(item), item.name);
 				} else {
 					return '<li class="dropdown-item dropdown-toggle dropdown-submenu">{0}{1}</li>'.format(key, buildMenu(item));
 				}

src/views/actor-inspector.js

@@ -22,8 +22,14 @@ function SceneHierarchyView(container, state)
 					actor.addComponent(new window[name]());
 				}
 			}
+			// https://github.com/vakata/jstree/issues/1021
+			self.skip_change_event = true;
+			self.hierarchy.on('refresh.jstree', () => {
+				scene.setSelection([actor.id]);
+				self.hierarchy.off('refresh.jstree');
+				self.skip_change_event = false;
+			});
 			self.refresh();
-			scene.setSelection([actor.id]);
 		}
 	});
 
@@ -127,6 +133,9 @@ SceneHierarchyView.prototype.onNodeDelete = function(event, data)
 
 SceneHierarchyView.prototype.onNodeChange = function(event, data)
 {
+	if (this.skip_change_event) {
+		return;
+	}
 	scene.setSelection(this.tree.get_selected());
 }