From 5ebaec4d6c5c1b612dfd5f79b0975e9e37fc3fab Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Tue, 10 Mar 2015 19:40:30 -0400
Subject: [PATCH] trunc octa done
---
js/fea/DmaCellOther.js | 42 +++++++++++++++++++++++++++++++++++++--
js/models/LatticeOther.js | 2 +-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/js/fea/DmaCellOther.js b/js/fea/DmaCellOther.js
index e4bc76bc..3feacaa4 100644
--- a/js/fea/DmaCellOther.js
+++ b/js/fea/DmaCellOther.js
@@ -128,7 +128,7 @@ var cellMaterial = [new THREE.MeshNormalMaterial()];
(function(){
- var truncOctaRad = Math.sqrt(3)/2;
+ var truncOctaRad = Math.sqrt(2);
var pyrRad = 1/Math.sqrt(2);
var unitCellGeo = new THREE.Geometry();
unitCellGeo.vertices = [
@@ -178,7 +178,45 @@ var cellMaterial = [new THREE.MeshNormalMaterial()];
new THREE.Face3(20,21,23),
new THREE.Face3(23,21,22),
-
+ new THREE.Face3(0, 8, 1),
+ new THREE.Face3(16, 8, 9),
+ new THREE.Face3(16, 17, 1),
+ new THREE.Face3(1, 8, 16),
+
+ new THREE.Face3(1, 12, 2),
+ new THREE.Face3(18, 13, 12),
+ new THREE.Face3(17, 18, 1),
+ new THREE.Face3(1, 18, 12),
+
+ new THREE.Face3(3, 8, 0),
+ new THREE.Face3(20, 11, 8),
+ new THREE.Face3(20, 3, 21),
+ new THREE.Face3(20, 8, 3),
+
+ new THREE.Face3(3, 2, 12),
+ new THREE.Face3(12, 15, 22),
+ new THREE.Face3(22, 21, 3),
+ new THREE.Face3(22, 3, 12),
+
+ new THREE.Face3(4, 5, 10),
+ new THREE.Face3(16, 9, 10),
+ new THREE.Face3(16, 5, 19),
+ new THREE.Face3(5, 16, 10),
+
+ new THREE.Face3(5, 6, 14),
+ new THREE.Face3(18, 14, 13),
+ new THREE.Face3(19, 5, 18),
+ new THREE.Face3(18, 5, 14),
+
+ new THREE.Face3(7, 4, 10),
+ new THREE.Face3(20, 10, 11),
+ new THREE.Face3(20, 23, 7),
+ new THREE.Face3(20, 7, 10),
+
+ new THREE.Face3(7, 14, 6),
+ new THREE.Face3(14, 22, 15),
+ new THREE.Face3(22, 7, 23),
+ new THREE.Face3(22, 14, 7),
];
unitCellGeo.computeFaceNormals();
diff --git a/js/models/LatticeOther.js b/js/models/LatticeOther.js
index 14754232..4f1c6195 100644
--- a/js/models/LatticeOther.js
+++ b/js/models/LatticeOther.js
@@ -125,7 +125,7 @@ OtherLatticeSubclasses = {
xScale: function(scale){
if (!scale) scale = this.get("scale");
- return scale*(3+Math.sqrt(3));
+ return scale*2*Math.sqrt(2);
},
yScale: function(scale){
--
GitLab