Finalizing images

luoxiaozhu · Jun 12, 2012 · ac6ecee · ac6ecee
1 parent c0c946b
commit ac6ecee
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 5 deletions.
diff --git a/Chapter 4/keyframe-texture.js b/Chapter 4/keyframe-texture.js
@@ -50,7 +50,12 @@ Waterfall.prototype = new Sim.Object();
 Waterfall.prototype.init = function()
 {
 	var group = new THREE.Object3D;
-	var map = THREE.ImageUtils.loadTexture("../images/water0hk.jpg");
+
+	// Great water texture by Patrick Hoesly
+	// http://www.flickr.com/photos/zooboing/
+	// http://www.flickr.com/photos/zooboing/4441454031/sizes/o/in/photostream/
+	// Attribution 2.0 Generic (CC BY 2.0) 
+	var map = THREE.ImageUtils.loadTexture("../images/4441454031_7772f8351e_o.jpg");
     map.wrapS = map.wrapT = true;
     var material = new THREE.MeshBasicMaterial( 
     		{ color: 0x80aaaa, opacity: .6, transparent: true, map : map } );

diff --git a/Chapter 5/interaction-camera-navigation.js b/Chapter 5/interaction-camera-navigation.js
@@ -87,7 +87,9 @@ Scene.prototype.init = function(param)
 Scene.prototype.createWalls = function()
 {
 	var geometry = new THREE.CubeGeometry(.1, 20, 66);
-	var map = THREE.ImageUtils.loadTexture('../images/Brick_Texture_by_Hero_wante-TP.jpg');
+	// Brick texture adapted from http://wdc3d.com/wp-content/uploads/2010/05/red-brick-seamless-1000-x-1000.jpg
+	// From set http://wdc3d.com/2d-textures/6-seamless-tileable-brick-textures/
+	var map = THREE.ImageUtils.loadTexture('../images/red-brick-seamless-512-x-512.jpg');
     map.wrapS = map.wrapT = THREE.RepeatWrapping;
     map.repeat.set(3,3);
 	var material = new THREE.MeshLambertMaterial({ map : map});

diff --git a/Chapter 6/integration-div.css b/Chapter 6/integration-div.css
@@ -12,7 +12,7 @@ h1 {
 }
 
 #container {
-	background-image:url('../images/07.jpg');
+	background-image:url('../images/field_of_stars_full.jpg');
 	width:98%;
 	height:90%;
 	position:absolute;

diff --git a/Chapter 6/integration-object.css b/Chapter 6/integration-object.css
@@ -1,11 +1,11 @@
 @CHARSET "UTF-8";
 
 /*
-Gradient from http://www.astrosurf.com/~buil/iris/tutorial4/doc14_us.htm
+Page background from http://www.spacetelescope.org/images/heic1105a/
 */
 
 body {
-	background-image:url('../images/gradient1.jpg');
+	background-image:url('../images/heic1105a.jpg');
 	background-color:#ffffff;
 	color:#212121;
 	margin:20px;
@@ -19,6 +19,8 @@ body {
 .main-photo {
 	left:40px;
 	top:130px;
+	width:300;
+	height:240;
 	margin:0 auto;
 	width:33%;
 	padding:0px;

diff --git a/images/4441454031_7772f8351e_o.jpg b/images/4441454031_7772f8351e_o.jpg
diff --git a/images/field_of_stars_full.jpg b/images/field_of_stars_full.jpg
diff --git a/images/heic1105a.jpg b/images/heic1105a.jpg
diff --git a/images/red-brick-seamless-512-x-512.jpg b/images/red-brick-seamless-512-x-512.jpg
diff --git a/images/red-brick-wall-texture.jpg b/images/red-brick-wall-texture.jpg