From 4055d44a332a31fe8ab8803536b7949e44f943af Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Fri, 27 May 2016 15:14:18 -0400
Subject: [PATCH] only two electrical connections per voxel

---
 js/materials/DMAMaterial.js | 69 +++++++++++++++++++++++++++++++++++++
 js/plists/MaterialsPlist.js | 31 +++++++++++++++--
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/js/materials/DMAMaterial.js b/js/materials/DMAMaterial.js
index 3faa27c..35d4ace 100644
--- a/js/materials/DMAMaterial.js
+++ b/js/materials/DMAMaterial.js
@@ -100,12 +100,79 @@ define(['underscore', 'appState', 'three'], function(_, appState, THREE){
         new THREE.Face3(5, 8, 7)
     ];
 
+    var wireStraight = new THREE.Geometry();
+    //    //box vertices
+    wireStraight.vertices = [
+        new THREE.Vector3(0.3, 0.3, 0.5),
+        new THREE.Vector3(0.3, 0.3, -0.5),
+        new THREE.Vector3(0.3, -0.3, 0.5),
+        new THREE.Vector3(0.3, -0.3, -0.5),
+        new THREE.Vector3(-0.3, 0.3, 0.5),
+        new THREE.Vector3(-0.3, 0.3, -0.5),
+        new THREE.Vector3(-0.3, -0.3, 0.5),
+        new THREE.Vector3(-0.3, -0.3, -0.5)
+
+    ];
+        //box
+    wireStraight.faces  = [
+        new THREE.Face3(1, 0, 2),
+        new THREE.Face3(1, 2, 3),
+        new THREE.Face3(4, 5, 6),
+        new THREE.Face3(6, 5, 7),
+        new THREE.Face3(3, 2, 6),
+        new THREE.Face3(3, 6, 7),
+        new THREE.Face3(0, 1, 4),
+        new THREE.Face3(4, 1, 5),
+        new THREE.Face3(2, 0, 4),
+        new THREE.Face3(2, 4, 6),
+        new THREE.Face3(1, 3, 5),
+        new THREE.Face3(5, 3, 7)
+    ];
+
+    var wireBent = new THREE.Geometry();
+    //    //box vertices
+    wireBent.vertices = [
+        new THREE.Vector3(0.5, 0.3, -0.3),
+        new THREE.Vector3(0.3, 0.3, -0.5),
+        new THREE.Vector3(0.5, -0.3, -0.3),
+        new THREE.Vector3(0.3, -0.3, -0.5),
+        new THREE.Vector3(-0.3, 0.3, 0.3),
+        new THREE.Vector3(-0.3, 0.3, -0.5),
+        new THREE.Vector3(-0.3, -0.3, 0.3),
+        new THREE.Vector3(-0.3, -0.3, -0.5),
+        new THREE.Vector3(0.5, 0.3, 0.3),
+        new THREE.Vector3(0.5, -0.3, 0.3)
+    ];
+        //box
+    wireBent.faces  = [
+        new THREE.Face3(1, 0, 2),
+        new THREE.Face3(1, 2, 3),
+        new THREE.Face3(4, 5, 6),
+        new THREE.Face3(6, 5, 7),
+        new THREE.Face3(3, 2, 6),
+        new THREE.Face3(3, 6, 7),
+        new THREE.Face3(0, 1, 4),
+        new THREE.Face3(4, 1, 5),
+        new THREE.Face3(2, 0, 8),
+        new THREE.Face3(2, 8, 9),
+        new THREE.Face3(1, 3, 5),
+        new THREE.Face3(5, 3, 7),
+        new THREE.Face3(9, 8, 4),
+        new THREE.Face3(9, 4, 6),
+        new THREE.Face3(2, 9, 6),
+        new THREE.Face3(0, 4, 8)
+    ];
+
     torsion1dof.computeFaceNormals();
     bending1dof.computeFaceNormals();
     bending2dof.computeFaceNormals();
+    wireStraight.computeFaceNormals();
+    wireBent.computeFaceNormals();
     assignUVs(torsion1dof);
     assignUVs(bending1dof);
     assignUVs(bending2dof);
+    assignUVs(wireStraight);
+    assignUVs(wireBent);
 
     function assignUVs( geometry ){
         geometry.computeBoundingBox();
@@ -147,6 +214,8 @@ define(['underscore', 'appState', 'three'], function(_, appState, THREE){
             if (json.mesh == "torsion1dof") this.mesh = torsion1dof;
             else if (json.mesh == "bending1dof") this.mesh = bending1dof;
             else if (json.mesh == "bending2dof") this.mesh = bending2dof;
+            else if (json.mesh == "wireStraight") this.mesh = wireStraight;
+            else if (json.mesh == "wireBent") this.mesh = wireBent;
             else console.warn("no mesh for type " + json.mesh);
         }
     }
diff --git a/js/plists/MaterialsPlist.js b/js/plists/MaterialsPlist.js
index 6cadd55..56df307 100644
--- a/js/plists/MaterialsPlist.js
+++ b/js/plists/MaterialsPlist.js
@@ -87,9 +87,22 @@ define([], function(){
                     }
                 },
                 conductive:{
-                    name: "Structural Electronic Routing",
+                    name: "Electronic Routing (Straight)",
                     color: "#b5a642",
                     altColor: "#857B64",
+                    mesh: "wireStraight",
+                    properties:{
+                        conductive: true,
+                        density: 8500,//kg/m^3
+                        elasMod: 1000,//Gpascals (kg/(s^2*m)/10000000000)
+                        k: 500
+                    }
+                },
+                conductiveBend:{
+                    name: "Electronic Routing (Bend)",
+                    color: "#b5a642",
+                    altColor: "#857B64",
+                    mesh: "wireBent",
                     properties:{
                         conductive: true,
                         density: 8500,//kg/m^3
@@ -98,10 +111,24 @@ define([], function(){
                     }
                 },
                 flexureCond: {
-                    name: "Iso-Flexible Electronic Routing",
+                    name: "Iso-Flex Electronic Routing (Straight)",
+                    color: "#b4ac9c",
+                    altColor: "#b4ac9c",
+                    texture: "stripes",
+                    mesh: "wireStraight",
+                    properties:{
+                        conductive: true,
+                        density: 3500,//kg/m^3
+                        elasMod: 0.01,
+                        k: 30
+                    }
+                },
+                flexureCondBend: {
+                    name: "Iso-Flex Electronic Routing (Bend)",
                     color: "#b4ac9c",
                     altColor: "#b4ac9c",
                     texture: "stripes",
+                    mesh: "wireBent",
                     properties:{
                         conductive: true,
                         density: 3500,//kg/m^3
-- 
GitLab