nex textures

js/plists/MaterialsPlist.js

@@ -86,7 +86,7 @@ define([], function(){
                     name: "Shear Flexure",
                     color: "#cda4f3",
                     altColor: "#cda4f3",
-                    texture: "stripes",
+                    texture: "cubeTextureShearFlex",
                     properties:{
                         conductive: false,
                         density: 3500,//kg/m^3
@@ -214,6 +214,7 @@ define([], function(){
                     name: "Shear Actuator",
                     color: "#FFCC00",
                     altColor: "#FFCC00",
+                    texture: "cubeTextureShear",
                     properties:{
                         conductive: false,
                         density: 6500,//kg/m^3

js/three/ThreeModel.js

@@ -7,7 +7,7 @@ define(['underscore', 'three', 'combinedCamera'], function(_, THREE){
 
     //var camera = new THREE.CombinedCamera( window.innerWidth / 2, window.innerHeight / 2, 60, 0.01, 1000, - 500, 1000 );
     var camera = new THREE.PerspectiveCamera(60, window.innerWidth/window.innerHeight, 0.01, 1000);
-//    camera.setLens(50);
+    //camera.setLens(50);
     var scene = new THREE.Scene();
     var simScene = new THREE.Scene();
     var secondPassScene = new THREE.Scene();