From 927eda4c3088a53c41cdcc8234b4e77af8d869dd Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sun, 25 Jan 2015 03:41:11 -0500
Subject: [PATCH] eod
---
js/fea/dmaCell.js | 8 +++++++-
js/models/threeModel.js | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/js/fea/dmaCell.js b/js/fea/dmaCell.js
index 880e185c..2e6a19c9 100644
--- a/js/fea/dmaCell.js
+++ b/js/fea/dmaCell.js
@@ -7,7 +7,13 @@
(function () {
- var cellGeometry = new THREE.OctahedronGeometry(30);
+ var cellGeometry = new THREE.OctahedronGeometry(30/Math.sqrt(2));
+ cellGeometry.applyMatrix(new THREE.Matrix4().makeRotationZ(-3*Math.PI/12));
+ cellGeometry.applyMatrix(new THREE.Matrix4().makeRotationX(Math.asin(2/Math.sqrt(2)/Math.sqrt(3))));
+ cellGeometry.applyMatrix(new THREE.Matrix4().makeTranslation(0,-30/Math.sqrt(3)/2,30/2));
+
+
+
var cellMaterials = [new THREE.MeshNormalMaterial(), new THREE.MeshBasicMaterial({color:0x000000, wireframe:true})];
function Cell() {
diff --git a/js/models/threeModel.js b/js/models/threeModel.js
index 367f72e7..0acd5495 100644
--- a/js/models/threeModel.js
+++ b/js/models/threeModel.js
@@ -19,7 +19,7 @@ function ThreeModel(){
camera.position.z = 165;
camera.up.set(0,0,1);//set z axis as "up"
- scene.fog = new THREE.FogExp2(0xcccccc, 0.002);
+ scene.fog = new THREE.FogExp2(0xcccccc, 0.001);
// lights
var light = new THREE.DirectionalLight(0xffffff);
--
GitLab