diff --git a/assets/textures/cubeTextureShear.png b/assets/textures/cubeTextureShear.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf0fef467e4138f3960dac4d1872d8762c324ce Binary files /dev/null and b/assets/textures/cubeTextureShear.png differ diff --git a/assets/textures/cubeTextureShearFlex.png b/assets/textures/cubeTextureShearFlex.png new file mode 100644 index 0000000000000000000000000000000000000000..97e92fa8d9d25b6a9479b97803b1d34fb86ce6cd Binary files /dev/null and b/assets/textures/cubeTextureShearFlex.png differ diff --git a/assets/textures/cubeTextureShearFlexThumb.png b/assets/textures/cubeTextureShearFlexThumb.png new file mode 100644 index 0000000000000000000000000000000000000000..992c1e144d6e8235cbb3c972e15916ae0a99897f Binary files /dev/null and b/assets/textures/cubeTextureShearFlexThumb.png differ diff --git a/assets/textures/cubeTextureShearThumb.png b/assets/textures/cubeTextureShearThumb.png new file mode 100644 index 0000000000000000000000000000000000000000..982e16fa2d774cd6b71bf51c199fc6f723f3cb79 Binary files /dev/null and b/assets/textures/cubeTextureShearThumb.png differ diff --git a/assets/textures/cubeTextureThumb.png b/assets/textures/cubeTextureThumb.png index 041caa42d3b2026d661e0a02c552450335dbdad5..c8691cf59cab7a8921c5fad8d0df308b32101fa4 100644 Binary files a/assets/textures/cubeTextureThumb.png and b/assets/textures/cubeTextureThumb.png differ diff --git a/js/plists/MaterialsPlist.js b/js/plists/MaterialsPlist.js index bf87cba13e402f1660057dc0500bb03c2a5e8014..2651c2cd05d6324d82858e342fecf46fe41b9b87 100644 --- a/js/plists/MaterialsPlist.js +++ b/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 diff --git a/js/three/ThreeModel.js b/js/three/ThreeModel.js index ef6ba28f6d5e0c4d502b9d9d3c49d1cc1c678ce6..1eeed13c78981f9f070faa28a060c3411def0935 100644 --- a/js/three/ThreeModel.js +++ b/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();