diff --git a/data/river.stl b/data/river.stl new file mode 100644 index 0000000000000000000000000000000000000000..5bf5b74bf4596efcf3fd9c784124fef503010930 Binary files /dev/null and b/data/river.stl differ diff --git a/data/terrain.stl b/data/terrain.stl new file mode 100644 index 0000000000000000000000000000000000000000..a2967384f65ac398288f70386b2320852aac64da Binary files /dev/null and b/data/terrain.stl differ diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js index 33cd6fc03ce31061ab216254f6cfe58c7fb1d6a7..b16f42579d8edad0edde308a8f9e26774a557f07 100644 --- a/js/menus/ImportMenuView.js +++ b/js/menus/ImportMenuView.js @@ -34,7 +34,7 @@ ImportMenuView = Backbone.View.extend({ _buildWall: function(e){ e.preventDefault(); - this.lattice.addCellsInRange({min:{x:-50,y:-2,z:0}, max:{x:50,y:2,z:15}}); + this.lattice.addCellsInRange({min:{x:-100,y:-1,z:0}, max:{x:100,y:2,z:18}}); }, _uploadMesh: function(e){//select a mesh to upload @@ -128,7 +128,8 @@ ImportMenuView = Backbone.View.extend({ <ul role="menu" class="dropdown-menu">\ <!--<li><a class="selectMesh fillGeo" data-file="Airbus_A300-600.stl" href="#">Plane</a></li>-->\ <li><a id="selectWall" href="#">Wall</a></li>\ - <li><a class="selectMesh cutTerrain" data-file="Airbus_A300-600.stl" href="#">Landscape</a></li>\ + <li><a class="selectMesh cutTerrain" data-file="river.stl" href="#">Landscape 1</a></li>\ + \<li><a class="selectMesh cutTerrain" data-file="terrain.stl" href="#">Landscape 2</a></li>\ </ul>\ </div><!-- /btn-group -->') diff --git a/js/models/FillGeometry.js b/js/models/FillGeometry.js index 8980a1a3835f3e0cce376ebbf1735e3792bc7cb9..bc7cd763752500620370097ad3648fc8ab5c0f76 100644 --- a/js/models/FillGeometry.js +++ b/js/models/FillGeometry.js @@ -6,7 +6,7 @@ FillGeometry = Backbone.Model.extend({ defaults: { - material: new THREE.MeshBasicMaterial( + material: new THREE.MeshLambertMaterial( {color:0xf25536, shading: THREE.FlatShading, transparent:true, @@ -29,6 +29,12 @@ FillGeometry = Backbone.Model.extend({ buildNewMesh:function(){ this.remove(); + + //center geometry in x and y + var geometry = this.get("geometry"); + geometry.computeBoundingBox(); + geometry.applyMatrix(new THREE.Matrix4().makeTranslation(-geometry.boundingBox.max.x/2,-geometry.boundingBox.max.y/2,0)); + this.set({orientation:this.defaults.orientation, scale:this.defaults.scale}, {silent:true});//restore defaults var mesh = new THREE.Mesh(this.get("geometry"), this.get("material")); this.makeBoundingBoxHelper(mesh);