diff --git a/assets/stls/stapler/frame.stl b/assets/stls/stapler/frame.stl new file mode 100755 index 0000000000000000000000000000000000000000..134d7a0d1d2fa0cc393a70ca7798c7d82b712256 Binary files /dev/null and b/assets/stls/stapler/frame.stl differ diff --git a/assets/stls/stapler/substrate.stl b/assets/stls/stapler/substrate.stl new file mode 100755 index 0000000000000000000000000000000000000000..5427cd67663a32d98b47a973b6cdebcca9496b87 Binary files /dev/null and b/assets/stls/stapler/substrate.stl differ diff --git a/assets/stls/stapler/xStage.stl b/assets/stls/stapler/xStage.stl new file mode 100755 index 0000000000000000000000000000000000000000..90c3d6bb27bbf3dda91b8d57eafb6a86012eda4e Binary files /dev/null and b/assets/stls/stapler/xStage.stl differ diff --git a/assets/stls/stapler/yStage.stl b/assets/stls/stapler/yStage.stl new file mode 100755 index 0000000000000000000000000000000000000000..9c527293c65098d633b259e9edffccacb6343585 Binary files /dev/null and b/assets/stls/stapler/yStage.stl differ diff --git a/assets/stls/stapler/zStage.stl b/assets/stls/stapler/zStage.stl new file mode 100755 index 0000000000000000000000000000000000000000..e4ca82a6db696d837bbbb850a88519c476bf0391 Binary files /dev/null and b/assets/stls/stapler/zStage.stl differ diff --git a/deploy.sh b/deploy.sh index 6fcdd1e4392f37f67719768eea383073805c2e64..753df6890f787eaa06f7cd19b45eab5bea9b7c55 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,7 @@ #!/bin/sh cp -R ~/Research/WebApps/DMDesign ~/Projects/dma/Web/ +cp -R ~/Research/WebApps/DMDesign ~/Projects/dma/Web/mod cd ~/Projects/dma hg addremove . diff --git a/js/fea/DMACellFreeform.js b/js/fea/DMACellFreeform.js index 4bc11cf2f509884b4fbada82e24574aaba39af3d..828587aa4321de6790b3f447a6846fc91cd75c50 100644 --- a/js/fea/DMACellFreeform.js +++ b/js/fea/DMACellFreeform.js @@ -27,6 +27,7 @@ DMAFreeFormCell.prototype._calcPosition = function(){//todo this might not be ne }; DMAFreeFormCell.prototype.calcHighlighterPosition = function(face){ + //var direction = face.normal.clone().applyEuler(this.cellMesh.rotation); var direction = face.normal.clone(); direction.applyQuaternion(this.cellMesh.quaternion); var position = this.getPosition(); diff --git a/js/fea/DMASuperCell.js b/js/fea/DMASuperCell.js index 69d0183510ec4590c5f4fabd6495882ffbe177ee..d0b5d6305c04c47ed46c56cca25a7649a5ea1680 100644 --- a/js/fea/DMASuperCell.js +++ b/js/fea/DMASuperCell.js @@ -4,7 +4,7 @@ var cellBrassMaterial = new THREE.MeshLambertMaterial({color:"#b5a642"}); -var cellFiberGlassMaterial = new THREE.MeshLambertMaterial({color:"#fef1b5"}); +var cellFiberGlassMaterial = new THREE.MeshLambertMaterial({color:"#fff68f"}); DMASuperCell = function(length, range, cells){ var shouldRotate = range.max.x == range.min.x; diff --git a/todo b/todo index b4480f8690285482dfb37a1200ee1a4a5b94728c..91dea3c526434c31102c9aaf1e9f6929adb4b2ef 100644 --- a/todo +++ b/todo @@ -1,4 +1,4 @@ fix parse int/float/lattice/appstate - put in menu wrapper color swatch menu -gik direction -gik position z scale \ No newline at end of file +gik position z scale +giz end positions \ No newline at end of file