Skip to content
Snippets Groups Projects
Commit e67db15e authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

small changes

parent a20f802c
Branches
No related tags found
No related merge requests found
...@@ -129,7 +129,7 @@ Lattice = Backbone.Model.extend({ ...@@ -129,7 +129,7 @@ Lattice = Backbone.Model.extend({
var allVertexPos = mesh.geometry.attributes.position.array; var allVertexPos = mesh.geometry.attributes.position.array;
var zHeight; var zHeight = 0;
for (var x=0;x<cells.length;x++){ for (var x=0;x<cells.length;x++){
for (var y=0;y<cells[0].length;y++){ for (var y=0;y<cells[0].length;y++){
var firstCell = null; var firstCell = null;
...@@ -142,9 +142,6 @@ Lattice = Backbone.Model.extend({ ...@@ -142,9 +142,6 @@ Lattice = Backbone.Model.extend({
var origin = firstCell._calcPosition(0, this._add({x:x,y:y,z:z}, cellsMin)); var origin = firstCell._calcPosition(0, this._add({x:x,y:y,z:z}, cellsMin));
zHeight = this._findIntersectionsInWindow(scale/2, yscale/2, origin, allVertexPos) || zHeight; zHeight = this._findIntersectionsInWindow(scale/2, yscale/2, origin, allVertexPos) || zHeight;
// if (!zHeight) zHeight = this._findIntersectionsInWindow(scale, yscale, origin, allVertexPos);
// if (!zHeight) zHeight = this._findIntersectionsInWindow(scale, 4*yscale, 4*origin, allVertexPos);
zHeight = Math.floor(zHeight/zScale); zHeight = Math.floor(zHeight/zScale);
for (var z=0;z<zHeight;z++){ for (var z=0;z<zHeight;z++){
var cell = cells[x][y][z]; var cell = cells[x][y][z];
...@@ -154,7 +151,6 @@ Lattice = Backbone.Model.extend({ ...@@ -154,7 +151,6 @@ Lattice = Backbone.Model.extend({
} }
} }
console.log("done");
window.three.render(); window.three.render();
}, },
...@@ -328,10 +324,6 @@ Lattice = Backbone.Model.extend({ ...@@ -328,10 +324,6 @@ Lattice = Backbone.Model.extend({
OctaFaceLattice = Lattice.extend({ OctaFaceLattice = Lattice.extend({
// defaults: {
// columnSeparation: 0.2//% column separation
// },
_initialize: function(){ _initialize: function(){
//bind events //bind events
...@@ -390,6 +382,8 @@ OctaFaceLattice = Lattice.extend({ ...@@ -390,6 +382,8 @@ OctaFaceLattice = Lattice.extend({
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////CUBE LATTICE////////////////////////////////////////////// //////////////////////////////CUBE LATTICE//////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment