Commit e580ad27 authored by amandaghassaei's avatar amandaghassaei

nex textures

parent 4a86c0f5
assets/textures/cubeTextureThumb.png

3.13 KB | W: | H:

assets/textures/cubeTextureThumb.png

2.88 KB | W: | H:

assets/textures/cubeTextureThumb.png
assets/textures/cubeTextureThumb.png
assets/textures/cubeTextureThumb.png
assets/textures/cubeTextureThumb.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -86,7 +86,7 @@ define([], function(){ ...@@ -86,7 +86,7 @@ define([], function(){
name: "Shear Flexure", name: "Shear Flexure",
color: "#cda4f3", color: "#cda4f3",
altColor: "#cda4f3", altColor: "#cda4f3",
texture: "stripes", texture: "cubeTextureShearFlex",
properties:{ properties:{
conductive: false, conductive: false,
density: 3500,//kg/m^3 density: 3500,//kg/m^3
...@@ -214,6 +214,7 @@ define([], function(){ ...@@ -214,6 +214,7 @@ define([], function(){
name: "Shear Actuator", name: "Shear Actuator",
color: "#FFCC00", color: "#FFCC00",
altColor: "#FFCC00", altColor: "#FFCC00",
texture: "cubeTextureShear",
properties:{ properties:{
conductive: false, conductive: false,
density: 6500,//kg/m^3 density: 6500,//kg/m^3
......
...@@ -7,7 +7,7 @@ define(['underscore', 'three', 'combinedCamera'], function(_, THREE){ ...@@ -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.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); 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 scene = new THREE.Scene();
var simScene = new THREE.Scene(); var simScene = new THREE.Scene();
var secondPassScene = new THREE.Scene(); var secondPassScene = new THREE.Scene();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment