diff --git a/assets/stls/parts/GIKEndPart.STL b/assets/stls/parts/GIKEndPart.STL deleted file mode 100755 index 69b0489036035262fcb258938a4ad7e57b4a0407..0000000000000000000000000000000000000000 Binary files a/assets/stls/parts/GIKEndPart.STL and /dev/null differ diff --git a/assets/stls/parts/GIKEndPartLowPoly.STL b/assets/stls/parts/GIKEndPartLowPoly.STL deleted file mode 100755 index 9034310b61f0d79fd989d06125f5b8eb0e2f3cf9..0000000000000000000000000000000000000000 Binary files a/assets/stls/parts/GIKEndPartLowPoly.STL and /dev/null differ diff --git a/assets/stls/parts/GIKPart.STL b/assets/stls/parts/GIKPart.STL deleted file mode 100755 index 1e6cce3510f4ab617d0719349379e559ea6c367f..0000000000000000000000000000000000000000 Binary files a/assets/stls/parts/GIKPart.STL and /dev/null differ diff --git a/assets/stls/parts/GIKPartLowPoly.STL b/assets/stls/parts/GIKPartLowPoly.STL deleted file mode 100755 index caceba0652aade11784be73e9643bc827d839700..0000000000000000000000000000000000000000 Binary files a/assets/stls/parts/GIKPartLowPoly.STL and /dev/null differ diff --git a/js/fea/DMASuperCell.js b/js/fea/DMASuperCell.js index c964f37f7fec2e78e1569e81f30d93f5c391f58a..ddbc76a492f263aa0e70c58e04c5e4ada2a431a5 100644 --- a/js/fea/DMASuperCell.js +++ b/js/fea/DMASuperCell.js @@ -41,6 +41,10 @@ DMASuperCell.prototype.setVisibility = function(visible){ this.mesh.visible = visible; }; +DMASuperCell.prototype.getLength = function(){ + return this.cells.length; +}; + DMASuperCell.prototype.destroy = function(){ if (this.destroyStarted) return;//prevents loop destroy from cells this.destroyStarted = true; diff --git a/js/fea/DmaCell.js b/js/fea/DmaCell.js index 25a6980acc6c73076f4473022e7f8a57f9b951d5..897c0c42f0088375609a41e9c8f42aaed34d828d 100644 --- a/js/fea/DmaCell.js +++ b/js/fea/DmaCell.js @@ -258,7 +258,6 @@ DMACell.prototype.destroy = function(){ this.superCell = null; } this.superCellIndex = null; - this.superCellLength = null; }; DMACell.prototype.toJSON = function(){ diff --git a/js/fea/DmaCellOther.js b/js/fea/DmaCellOther.js index 911863d2848985712e9701700eea76e35bcd3d0d..1b9b274d30ebbc97ddfca8694b07c6f0d5f03de5 100644 --- a/js/fea/DmaCellOther.js +++ b/js/fea/DmaCellOther.js @@ -78,10 +78,9 @@ var cellMaterial = [new THREE.MeshNormalMaterial()]; if (this.superCell) this.superCell.setVisibility(visible); }; - DMAGIKCell.prototype.setSuperCell = function(superCell, index, length){ + DMAGIKCell.prototype.setSuperCell = function(superCell, index){ this.superCell = superCell; this.superCellIndex = index; - this.superCellLength = length; }; DMAGIKCell.prototype._initParts = function(){ diff --git a/js/fea/DmaPart.js b/js/fea/DmaPart.js index aa3b57ba1b493ac8be0cec2e05789b6f50c97b1d..b08fbbd7fad0790d09a9bb77888869026d4192c3 100644 --- a/js/fea/DmaPart.js +++ b/js/fea/DmaPart.js @@ -220,7 +220,7 @@ var partMaterial = new THREE.MeshLambertMaterial({ color:0xffffff, shading: THRE //import part geometry var loader = new THREE.STLLoader(); - loader.load("assets/stls/parts/edgeVoxPartLowPoly.stl", function(geometry){ + loader.load("assets/stls/parts/GIKPart.stl", function(geometry){ unitPartGeo = geometry; // unitPartGeo.applyMatrix(new THREE.Matrix4().makeRotationY(Math.PI));