Browse Source

Merging with alteredq's branch

Mr.doob 14 years ago
parent
commit
ab46cc1462
2 changed files with 2 additions and 2 deletions
  1. 1 1
      examples/materials_cubemap.html
  2. 1 1
      examples/materials_cubemap_escher.html

+ 1 - 1
examples/materials_cubemap.html

@@ -105,7 +105,7 @@
 
 				//var cubeMaterial3 = new THREE.MeshPhongMaterial( { color: 0x000000, specular:0xaa0000, env_map: new THREE.TextureCube( images ), combine: THREE.Mix, reflectivity: 0.25 } );
 				var cubeMaterial3 = new THREE.MeshLambertMaterial( { color: 0xff6600, env_map: new THREE.TextureCube( images ), combine: THREE.Mix, reflectivity: 0.3 } );
-				var cubeMaterial2 = new THREE.MeshLambertMaterial( { color: 0xffee00, env_map: new THREE.TextureCube( images, THREE.RefractionMap ) } );
+				var cubeMaterial2 = new THREE.MeshLambertMaterial( { color: 0xffee00, env_map: new THREE.TextureCube( images ) } );
 				var cubeMaterial1 = new THREE.MeshLambertMaterial( { color: 0xffffff, env_map: new THREE.TextureCube( images ) } )
 
 				createCube( 10000, images );

+ 1 - 1
examples/materials_cubemap_escher.html

@@ -14,8 +14,8 @@
 				text-align:center;
 			}
 			a {	color: #ff0080;	text-decoration: none; }
-			a:hover { color: #0080ff; }
 
+			a:hover { color: #0080ff; }
 			#log { position:absolute; top:50px; text-align:left; display:block; z-index:100; pointer-events:none; }
 			#d { text-align:center; margin:1em auto -9.0em; z-index:1000; position:relative; display:block; 
 				 background:rgba(0,0,0,0.75); padding:0.25em; width:300px; border-radius:10px; -webkit-box-shadow: 0px 0px 10px rgba(0,0,0,0.5) }