Skip to content

Commit 89cfb14

Browse files
author
Jos Dirksen
committed
reformat code
1 parent 046ebc8 commit 89cfb14

11 files changed

+604
-624
lines changed

‎chapter-10/01-basic-texture.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888

8989
render();
9090

91-
function createMesh(geom, texture) {
92-
var texture = THREE.ImageUtils.loadTexture("../assets/textures/general/" + texture)
91+
function createMesh(geom, imageFile) {
92+
var texture = THREE.ImageUtils.loadTexture("../assets/textures/general/" + imageFile)
9393
var mat = new THREE.MeshPhongMaterial();
9494
mat.map = texture;
9595

‎chapter-10/02-bump-map.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113

114114
render();
115115

116-
function createMesh(geom, texture, bump) {
117-
var texture = THREE.ImageUtils.loadTexture("../assets/textures/general/" + texture)
116+
function createMesh(geom, imageFile, bump) {
117+
var texture = THREE.ImageUtils.loadTexture("../assets/textures/general/" + imageFile)
118118
geom.computeVertexNormals();
119119
var mat = new THREE.MeshPhongMaterial();
120120
mat.map = texture;

‎chapter-10/03-normal-map.html

+3-8
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@
134134

135135
render();
136136

137-
function createMesh(geom, texture, normal) {
137+
function createMesh(geom, imageFile, normal) {
138138

139139
if (normal) {
140-
var t = THREE.ImageUtils.loadTexture("../assets/textures/general/" + texture);
140+
var t = THREE.ImageUtils.loadTexture("../assets/textures/general/" + imageFile);
141141
var m = THREE.ImageUtils.loadTexture("../assets/textures/general/" + normal);
142142
var mat2 = new THREE.MeshPhongMaterial({
143143
map: t,
@@ -146,19 +146,14 @@
146146
var mesh = new THREE.Mesh(geom, mat2);
147147
return mesh;
148148
} else {
149-
var t = THREE.ImageUtils.loadTexture("../assets/textures/general/" + texture);
149+
var t = THREE.ImageUtils.loadTexture("../assets/textures/general/" + imageFile);
150150
var mat1 = new THREE.MeshPhongMaterial({
151151
map: t
152152
})
153153
var mesh = new THREE.Mesh(geom, mat1);
154154
return mesh;
155155
}
156156

157-
158-
// create a multimaterial
159-
// geom.computeTangents();
160-
161-
162157
return mesh;
163158
}
164159

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
uniforms: shader.uniforms,
5858
depthWrite: false,
5959
side: THREE.BackSide
60-
}),
61-
cubeMesh = new THREE.Mesh(new THREE.CubeGeometry(100, 100, 100), material);
60+
});
61+
62+
cubeMesh = new THREE.Mesh(new THREE.CubeGeometry(100, 100, 100), material);
6263
sceneCube.add(cubeMesh);
6364

6465
// create the spheres
@@ -200,7 +201,7 @@
200201
];
201202

202203
// var textureCube = THREE.ImageUtils.loadTextureCube( urls );
203-
var textureCube = THREE.ImageUtils.loadTextureCube(urls, new THREE.CubeRefractionMapping());
204+
var textureCube = THREE.ImageUtils.loadTextureCube(urls, new THREE.CubeReflectionMapping());
204205
return textureCube;
205206
}
206207

‎chapter-11/01-basic-effect-composer.html

+24-25
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<script type="text/javascript" src="../libs/postprocessing/RenderPass.js"></script>
2020

2121
<style>
22-
body{
22+
body {
2323
/* set margin to 0 and overflow to hidden, to go fullscreen */
2424
margin: 0;
2525
overflow: hidden;
@@ -54,7 +54,7 @@
5454
webGLRenderer.setSize(window.innerWidth, window.innerHeight);
5555
webGLRenderer.shadowMapEnabled = true;
5656

57-
var sphere = createMesh(new THREE.SphereGeometry(10,40,40));
57+
var sphere = createMesh(new THREE.SphereGeometry(10, 40, 40));
5858
// add the sphere to the scene
5959
scene.add(sphere);
6060

@@ -63,41 +63,41 @@
6363
camera.position.y = 15;
6464
camera.position.z = 25;
6565

66-
camera.lookAt(new THREE.Vector3(0,0,0));
66+
camera.lookAt(new THREE.Vector3(0, 0, 0));
6767

6868
var orbitControls = new THREE.OrbitControls(camera);
69-
orbitControls.autoRotate =false;
69+
orbitControls.autoRotate = false;
7070
var clock = new THREE.Clock();
7171

7272
var ambi = new THREE.AmbientLight(0x181818);
7373
scene.add(ambi);
7474

75-
var spotLight = new THREE.DirectionalLight( 0xffffff );
76-
spotLight.position.set( 550, 100, 550 );
75+
var spotLight = new THREE.DirectionalLight(0xffffff);
76+
spotLight.position.set(550, 100, 550);
7777
spotLight.intensity = 0.6;
7878

79-
scene.add( spotLight );
79+
scene.add(spotLight);
8080

8181
// add the output of the renderer to the html element
8282
$("#WebGL-output").append(webGLRenderer.domElement);
8383

84-
var renderPass = new THREE.RenderPass(scene,camera);
85-
var effectFilm = new THREE.FilmPass(0.8,0.325, 256,false);
86-
effectFilm.renderToScreen=true;
84+
var renderPass = new THREE.RenderPass(scene, camera);
85+
var effectFilm = new THREE.FilmPass(0.8, 0.325, 256, false);
86+
effectFilm.renderToScreen = true;
8787

8888
var composer = new THREE.EffectComposer(webGLRenderer);
8989
composer.addPass(renderPass);
9090
composer.addPass(effectFilm);
9191

9292

9393
// setup the control gui
94-
var controls = new function() {
94+
var controls = new function () {
9595
this.scanlinesCount = 256;
9696
this.grayscale = false;
9797
this.scanlinesIntensity = 0.3;
9898
this.noiseIntensity = 0.8;
9999

100-
this.updateEffectFilm = function() {
100+
this.updateEffectFilm = function () {
101101
effectFilm.uniforms.grayscale.value = controls.grayscale;
102102
effectFilm.uniforms.nIntensity.value = controls.noiseIntensity;
103103
effectFilm.uniforms.sIntensity.value = controls.scanlinesIntensity;
@@ -107,26 +107,26 @@
107107

108108

109109
var gui = new dat.GUI();
110-
gui.add(controls,"scanlinesIntensity",0,1).onChange(controls.updateEffectFilm);
111-
gui.add(controls,"noiseIntensity",0,3).onChange(controls.updateEffectFilm);
112-
gui.add(controls,"grayscale").onChange(controls.updateEffectFilm);
113-
gui.add(controls,"scanlinesCount",0,2048).step(1).onChange(controls.updateEffectFilm);
110+
gui.add(controls, "scanlinesIntensity", 0, 1).onChange(controls.updateEffectFilm);
111+
gui.add(controls, "noiseIntensity", 0, 3).onChange(controls.updateEffectFilm);
112+
gui.add(controls, "grayscale").onChange(controls.updateEffectFilm);
113+
gui.add(controls, "scanlinesCount", 0, 2048).step(1).onChange(controls.updateEffectFilm);
114114

115115
// call the render function
116-
var step=0;
116+
var step = 0;
117117

118118

119119
render();
120120

121121
function createMesh(geom) {
122-
var planetTexture = THREE.ImageUtils.loadTexture( "../assets/textures/planets/Earth.png" );
123-
var specularTexture = THREE.ImageUtils.loadTexture( "../assets/textures/planets/EarthSpec.png" );
124-
var normalTexture = THREE.ImageUtils.loadTexture( "../assets/textures/planets/EarthNormal.png" );
122+
var planetTexture = THREE.ImageUtils.loadTexture("../assets/textures/planets/Earth.png");
123+
var specularTexture = THREE.ImageUtils.loadTexture("../assets/textures/planets/EarthSpec.png");
124+
var normalTexture = THREE.ImageUtils.loadTexture("../assets/textures/planets/EarthNormal.png");
125125

126126

127127
var planetMaterial = new THREE.MeshPhongMaterial();
128128
planetMaterial.specularMap = specularTexture;
129-
planetMaterial.specular = new THREE.Color( 0x4444aa );
129+
planetMaterial.specular = new THREE.Color(0x4444aa);
130130

131131

132132
planetMaterial.normalMap = normalTexture;
@@ -135,7 +135,7 @@
135135

136136

137137
// create a multimaterial
138-
var mesh = THREE.SceneUtils.createMultiMaterialObject(geom,[planetMaterial]);
138+
var mesh = THREE.SceneUtils.createMultiMaterialObject(geom, [planetMaterial]);
139139

140140
return mesh;
141141
}
@@ -147,7 +147,7 @@
147147
var delta = clock.getDelta();
148148
orbitControls.update(delta);
149149

150-
sphere.rotation.y+=0.002;
150+
sphere.rotation.y += 0.002;
151151

152152
// render using requestAnimationFrame
153153
requestAnimationFrame(render);
@@ -165,14 +165,13 @@
165165
stats.domElement.style.left = '0px';
166166
stats.domElement.style.top = '0px';
167167

168-
$("#Stats-output").append( stats.domElement );
168+
$("#Stats-output").append(stats.domElement);
169169

170170
return stats;
171171
}
172172
});
173173

174174

175-
176175
</script>
177176
</body>
178177
</html>

0 commit comments

Comments
 (0)