From e47a7638fd888047c700a04a1496197b508ad5c6 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sat, 17 Jan 2015 17:01:59 -0500
Subject: [PATCH] fea folder
---
js/{models => fea}/dmaBeam.js | 0
js/{models => fea}/dmaCell.js | 0
js/{models => fea}/dmaNode.js | 0
js/{models => fea}/dmaPart.js | 0
js/main.js | 12 +++---------
5 files changed, 3 insertions(+), 9 deletions(-)
rename js/{models => fea}/dmaBeam.js (100%)
rename js/{models => fea}/dmaCell.js (100%)
rename js/{models => fea}/dmaNode.js (100%)
rename js/{models => fea}/dmaPart.js (100%)
diff --git a/js/models/dmaBeam.js b/js/fea/dmaBeam.js
similarity index 100%
rename from js/models/dmaBeam.js
rename to js/fea/dmaBeam.js
diff --git a/js/models/dmaCell.js b/js/fea/dmaCell.js
similarity index 100%
rename from js/models/dmaCell.js
rename to js/fea/dmaCell.js
diff --git a/js/models/dmaNode.js b/js/fea/dmaNode.js
similarity index 100%
rename from js/models/dmaNode.js
rename to js/fea/dmaNode.js
diff --git a/js/models/dmaPart.js b/js/fea/dmaPart.js
similarity index 100%
rename from js/models/dmaPart.js
rename to js/fea/dmaPart.js
diff --git a/js/main.js b/js/main.js
index d11e8da7..c171dfe8 100644
--- a/js/main.js
+++ b/js/main.js
@@ -12,18 +12,12 @@ $(function(){
//init models and views
var fillGeometry = new FillGeometry();//singleton, mesh to fill with lattice
- three.setFillGeometry(fillGeometry);
new ImportView({model: fillGeometry});
-
- lattice = new Lattice();
-
-
-
-
-
- setupNavBar(three);
+ three.setFillGeometry(fillGeometry);
+ lattice = new Lattice();
+ setupNavBar(threeModel);
});
--
GitLab