Skip to content

Commit 51b50b1

Browse files
author
Jos Dirksen
committed
Small fixes to make everything work with r69
1 parent 1981264 commit 51b50b1

File tree

6 files changed

+9
-28
lines changed

6 files changed

+9
-28
lines changed

chapter-10/04-light-map.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
webGLRenderer.setSize(window.innerWidth, window.innerHeight);
4646
webGLRenderer.shadowMapEnabled = true;
4747

48-
var canvasRenderer = new THREE.CanvasRenderer();
49-
canvasRenderer.setSize(window.innerWidth, window.innerHeight);
5048
renderer = webGLRenderer;
5149

5250
var groundGeom = new THREE.PlaneGeometry(95, 95, 1, 1);

chapter-10/05-env-map-static.html

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,10 @@
9393
light.intensity = 1.2;
9494
scene.add(light);
9595

96-
97-
// var pointColor = "#ff5808";
9896
var pointColor = "#ff5808";
9997
var directionalLight = new THREE.PointLight(pointColor);
10098
directionalLight.intensity = 4.5;
10199

102-
// directionalLight.distance = 0;
103-
// directionalLight.intensity = 0.5;
104-
105-
106100
scene.add(directionalLight);
107101

108102

@@ -112,7 +106,7 @@
112106
var sphereLightMesh = new THREE.Mesh(sphereLight, sphereLightMaterial);
113107
sphereLightMesh.castShadow = true;
114108

115-
sphereLightMesh.position = new THREE.Vector3(3, 3, 3);
109+
sphereLightMesh.position.copy(new THREE.Vector3(3, 3, 3));
116110
scene.add(sphereLightMesh);
117111

118112
// add the output of the renderer to the html element
@@ -270,7 +264,7 @@
270264
sphereLightMesh.position.x = (invert * (sphereLightMesh.position.x - pivot)) + pivot;
271265
}
272266

273-
directionalLight.position = sphereLightMesh.position;
267+
directionalLight.position.copy(sphereLightMesh.position);
274268

275269
camera.position.x = (mouseX * .018);
276270
camera.position.y = 6 + (mouseY * .018);

chapter-10/07-uv-mapping.html

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@
5353
camera.lookAt(new THREE.Vector3(0, 0, 0));
5454

5555

56-
// add spotlight for the shadows
57-
var spotLight = new THREE.SpotLight(0xffffff);
58-
spotLight.position.set(-30, 60, 50);
59-
spotLight.intensity = 1.5;
60-
scene.add(spotLight);
61-
6256
// add the output of the renderer to the html element
6357
$("#WebGL-output").append(webGLRenderer.domElement);
6458

@@ -74,14 +68,11 @@
7468
var loader = new THREE.OBJLoader();
7569
loader.load('../assets/models/UVCube1.obj', function (geometry) {
7670
if (mesh) scene.remove(mesh);
77-
var material = new THREE.MeshLambertMaterial({color: 0xffffff});
71+
var material = new THREE.MeshBasicMaterial({color: 0xffffff});
7872
var texture = THREE.ImageUtils.loadTexture("../assets/textures/ash_uvgrid01.jpg");
7973
material.map = texture;
8074

81-
geometry.children[0].children[0].material = material;
82-
geometry.children[0].children[1].material = material;
83-
84-
75+
geometry.children[0].material = material;
8576
mesh = geometry;
8677

8778
geometry.scale.set(15, 15, 15);
@@ -95,13 +86,11 @@
9586
var loader = new THREE.OBJLoader();
9687
loader.load('../assets/models/UVCube2.obj', function (geometry) {
9788
if (mesh) scene.remove(mesh);
98-
var material = new THREE.MeshLambertMaterial({color: 0xffffff});
89+
var material = new THREE.MeshBasicMaterial({color: 0xffffff});
9990
var texture = THREE.ImageUtils.loadTexture("../assets/textures/ash_uvgrid01.jpg");
10091
material.map = texture;
10192

102-
geometry.children[0].children[0].material = material;
103-
geometry.children[0].children[1].material = material;
104-
93+
geometry.children[0].material = material;
10594

10695
mesh = geometry;
10796
geometry.scale.set(15, 15, 15);

chapter-10/09-canvas-texture.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
webGLRenderer.shadowMapEnabled = true;
8484

8585

86-
var cube = createMesh(new THREE.CubeGeometry(10, 10, 10), "floor-wood.jpg");
86+
var cube = createMesh(new THREE.BoxGeometry(10, 10, 10), "floor-wood.jpg");
8787
cube.position.x = 0;
8888
scene.add(cube);
8989

chapter-10/10-canvas-texture-bumpmap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
webGLRenderer.shadowMapEnabled = true;
8080

8181

82-
var cube = createMesh(new THREE.CubeGeometry(12, 12, 12), "floor-wood.jpg");
82+
var cube = createMesh(new THREE.BoxGeometry(12, 12, 12), "floor-wood.jpg");
8383
cube.position.x = 3;
8484
scene.add(cube);
8585

chapter-10/11-video-texture.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
var cube;
6363

6464

65-
cube = createMesh(new THREE.CubeGeometry(22, 16, 0.2), "floor-wood.jpg");
65+
cube = createMesh(new THREE.BoxGeometry(22, 16, 0.2), "floor-wood.jpg");
6666
cube.position.y = 2;
6767
scene.add(cube);
6868

0 commit comments

Comments
 (0)