diff --git a/js/models/fillGeometry.js b/js/models/fillGeometry.js index 44a198158c99078d05f3a49d63b6b1ab57465b2a..87ba21e90302b92ff2e5059eb228c571d541da1b 100644 --- a/js/models/fillGeometry.js +++ b/js/models/fillGeometry.js @@ -68,15 +68,16 @@ FillGeometry = Backbone.Model.extend({ rotate: function(axis){ var orientation = this.get("orientation"); var mesh = this.get("mesh"); + var piOver2 = Math.Pi/2; if (axis == "x"){ - mesh.rotateX(Math.PI/2); - orientation[0] += Math.PI/2; + mesh.rotateX(piOver2); + orientation[0] += piOver2; } else if (axis == "y"){ - mesh.rotateX(Math.PI/2); - orientation[1] += Math.PI/2; + mesh.rotateX(piOver2); + orientation[1] += piOver2; } else { - mesh.rotateX(Math.PI/2); - orientation[2] += Math.PI/2; + mesh.rotateX(piOver2); + orientation[2] += piOver2; } this.trigger("change:orientation"); } diff --git a/js/views/importView.js b/js/views/importView.js index 80258f50be8fbfe5bf52fba98170060046cca784..e0b2e2126720e2965cb9d196fa2cd1c47f330b8d 100644 --- a/js/views/importView.js +++ b/js/views/importView.js @@ -11,7 +11,7 @@ ImportView = Backbone.View.extend({ "change #uploadMesh": "uploadMesh", "click .selectMesh": "selectMesh", "fileselect .btn-file :file": "readDataURL", - "click .stlRotate": "rotate", + "click .stlRotate": "rotate" }, initialize: function(){ @@ -80,6 +80,8 @@ ImportView = Backbone.View.extend({ this.$el.html(this.template(_.extend(this.model.attributes, {dimensions:this.makeDimensionString()}))); }, + + template: _.template( '<div class="row demo-row">\ <div class="col-xs-3">\