diff --git a/app/components/visualization/rendering/landscape-rendering.js b/app/components/visualization/rendering/landscape-rendering.js index 135e88098..ea16f208c 100644 --- a/app/components/visualization/rendering/landscape-rendering.js +++ b/app/components/visualization/rendering/landscape-rendering.js @@ -115,7 +115,7 @@ export default RenderingCore.extend(AlertifyHandler, { this._super(...arguments); this.debug("cleanup landscape rendering"); - + this.set('imageLoader.logos', {}); this.set('labeler.textLabels', {}); this.set('labeler.textCache', []); diff --git a/app/components/visualization/rendering/rendering-core.js b/app/components/visualization/rendering/rendering-core.js index 79348f3fc..a13a85d0c 100644 --- a/app/components/visualization/rendering/rendering-core.js +++ b/app/components/visualization/rendering/rendering-core.js @@ -156,15 +156,32 @@ export default Component.extend(Evented, THREEPerformance, { //////////////////// // Load font for labels and synchronously proceed with populating the scene - new THREE.FontLoader() - .load('three.js/fonts/roboto_mono_bold_typeface.json', function (font) { + new THREE.FontLoader().load( + // resource URL + '/three.js/fonts/roboto_mono_bold_typeface.json', + + // onLoad callback + function ( font ) { + if (self.isDestroyed) return; self.set('font', font); + self.debug("(THREE.js) font sucessfully loaded."); self.set('initDone', true); self.populateScene(); - }); + }, + + // onProgress callback + // function ( xhr ) { + // self.debug("(THREE.js) font " + (xhr.loaded / xhr.total * 100) + "% loaded."); + // }, + + // onError callback + // function ( error ) { + // self.debug("(THREE.js) Error when loading font!"); + // } + ); }, diff --git a/app/utils/application-rendering/labeler.ts b/app/utils/application-rendering/labeler.ts index 5365356ba..75f21015f 100644 --- a/app/utils/application-rendering/labeler.ts +++ b/app/utils/application-rendering/labeler.ts @@ -9,8 +9,8 @@ export default Object.extend({ textMaterialFoundation: null, textMaterialComponent: null, textMaterialClazz: null, - currentUser: service(), + session: service(), configuration: service(), diff --git a/app/utils/landscape-rendering/interaction.js b/app/utils/landscape-rendering/interaction.js index 494990e15..0959c0c5f 100644 --- a/app/utils/landscape-rendering/interaction.js +++ b/app/utils/landscape-rendering/interaction.js @@ -246,6 +246,7 @@ export default Object.extend(Evented, AlertifyHandler, { emberModel = intersectedViewObj.object.userData.model; const emberModelName = emberModel.constructor.modelName; + this.trigger('doubleClick', emberModel); if(emberModelName === "application"){ @@ -276,8 +277,6 @@ export default Object.extend(Evented, AlertifyHandler, { } - this.trigger('doubleClick', emberModel); - }, handleSingleClick(mouse) { diff --git a/app/utils/three-image-loader.ts b/app/utils/three-image-loader.ts index aa8e6a29a..c6dc50cb5 100644 --- a/app/utils/three-image-loader.ts +++ b/app/utils/three-image-loader.ts @@ -31,7 +31,7 @@ export default Object.extend({ return plane; } else { - new THREE.TextureLoader().load('images/logos/' + textureName + '.png', (texture) => { + new THREE.TextureLoader().load('/images/logos/' + textureName + '.png', (texture) => { let logos: any = this.get('logos'); if (!logos) { return null; diff --git a/package.json b/package.json index 91b142b90..26a1bc1b5 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,8 @@ "typescript": "^3.4.5", "yuidoc-bootstrap-theme": "^1.0.6", "yuidocjs": "^0.10.2" - }, + }, + "engines": { "node": ">= 10.15.0" },