Permalink
Browse files

fix drop mesh + (un)select all meshes on plat dblclick

  • Loading branch information...
1 parent bd497e2 commit 353c66100a2a6d1bf21c0213679cc9b113986791 @lautr3k committed Feb 6, 2016
Showing with 23 additions and 2 deletions.
  1. +23 −2 src/app/viewer3d/scripts/viewer3d.js
@@ -511,7 +511,11 @@ var Viewer3d = JSClass(
// double click on floor to unselect all object
var self = this;
this.events.addEventListener(floor, 'dblclick', function(event) {
- self.unselectAllMeshes();
+ if (Object.keys(self.selectedMeshes).length > 0) {
+ self.unselectAllMeshes();
+ } else {
+ self.selectAllMeshes();
+ }
self.render();
});
@@ -1072,7 +1076,12 @@ var Viewer3d = JSClass(
* @method dropMesh
*/
dropMesh: function(uuid) {
- this.getElement(uuid).position.z = 0;
+ var mesh = this.getElement(uuid);
+ var move = mesh.geometry.center();
+ mesh.geometry.translate(0, 0, mesh.geometry.boundingBox.max.z);
+ mesh.position.x -= move.x;
+ mesh.position.y -= move.y;
+ mesh.position.z = 0;
},
/**
@@ -1163,6 +1172,18 @@ var Viewer3d = JSClass(
}
},
+ /**
+ * Unselect all object.
+ *
+ * @method unselectAllMeshes
+ */
+ selectAllMeshes: function() {
+ for (var id in this.elements) {
+ var mesh = this.elements[id];
+ mesh.name.length && this.setMeshSelected(mesh, true);
+ }
+ },
+
/**
* Execute an transformation on selected meshes.
*

0 comments on commit 353c661

Please sign in to comment.