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

trunc octa done

parent ac33f5cc
No related branches found
No related tags found
No related merge requests found
...@@ -128,7 +128,7 @@ var cellMaterial = [new THREE.MeshNormalMaterial()]; ...@@ -128,7 +128,7 @@ var cellMaterial = [new THREE.MeshNormalMaterial()];
(function(){ (function(){
var truncOctaRad = Math.sqrt(3)/2; var truncOctaRad = Math.sqrt(2);
var pyrRad = 1/Math.sqrt(2); var pyrRad = 1/Math.sqrt(2);
var unitCellGeo = new THREE.Geometry(); var unitCellGeo = new THREE.Geometry();
unitCellGeo.vertices = [ unitCellGeo.vertices = [
...@@ -178,7 +178,45 @@ var cellMaterial = [new THREE.MeshNormalMaterial()]; ...@@ -178,7 +178,45 @@ var cellMaterial = [new THREE.MeshNormalMaterial()];
new THREE.Face3(20,21,23), new THREE.Face3(20,21,23),
new THREE.Face3(23,21,22), 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(); unitCellGeo.computeFaceNormals();
......
...@@ -125,7 +125,7 @@ OtherLatticeSubclasses = { ...@@ -125,7 +125,7 @@ OtherLatticeSubclasses = {
xScale: function(scale){ xScale: function(scale){
if (!scale) scale = this.get("scale"); if (!scale) scale = this.get("scale");
return scale*(3+Math.sqrt(3)); return scale*2*Math.sqrt(2);
}, },
yScale: function(scale){ yScale: function(scale){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment