From 59de7d60d43001378639a7207e3c7fcdd7fc0eb4 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Tue, 19 Jan 2016 19:14:29 +0100 Subject: [PATCH] refactor materials in examples --- examples/canvas_ascii_effect.html | 2 +- examples/canvas_camera_orthographic.html | 2 +- examples/canvas_camera_orthographic2.html | 2 +- examples/canvas_lights_pointlights.html | 2 +- examples/canvas_performance.html | 2 +- examples/misc_lights_test.html | 15 +++++++-------- examples/misc_sound.html | 6 +++--- examples/webgl_geometry_colors.html | 2 +- examples/webgl_interactive_cubes_gpu.html | 2 +- examples/webgl_lights_pointlights2.html | 2 +- examples/webgl_marchingcubes.html | 2 +- examples/webgl_modifier_subdivision.html | 2 +- examples/webgl_multiple_canvases_circle.html | 2 +- examples/webgl_multiple_canvases_complex.html | 2 +- examples/webgl_multiple_canvases_grid.html | 2 +- examples/webgl_multiple_renderers.html | 2 +- examples/webgl_multiple_views.html | 2 +- examples/webgl_shadowmesh.html | 2 +- 18 files changed, 26 insertions(+), 27 deletions(-) diff --git a/examples/canvas_ascii_effect.html b/examples/canvas_ascii_effect.html index f550257d95..424b26073e 100644 --- a/examples/canvas_ascii_effect.html +++ b/examples/canvas_ascii_effect.html @@ -71,7 +71,7 @@ light.position.set( - 500, - 500, - 500 ); scene.add( light ); - sphere = new THREE.Mesh( new THREE.SphereGeometry( 200, 20, 10 ), new THREE.MeshLambertMaterial( { shading: THREE.FlatShading } ) ); + sphere = new THREE.Mesh( new THREE.SphereGeometry( 200, 20, 10 ), new THREE.MeshLambertMaterial() ); scene.add( sphere ); // Plane diff --git a/examples/canvas_camera_orthographic.html b/examples/canvas_camera_orthographic.html index 6ff42a7e01..2ab9cb546c 100644 --- a/examples/canvas_camera_orthographic.html +++ b/examples/canvas_camera_orthographic.html @@ -74,7 +74,7 @@ // Cubes var geometry = new THREE.BoxGeometry( 50, 50, 50 ); - var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } ); + var material = new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ); for ( var i = 0; i < 100; i ++ ) { diff --git a/examples/canvas_camera_orthographic2.html b/examples/canvas_camera_orthographic2.html index ff9dfb49f8..8a3629f106 100644 --- a/examples/canvas_camera_orthographic2.html +++ b/examples/canvas_camera_orthographic2.html @@ -143,7 +143,7 @@ // Cubes var geometry = new THREE.BoxGeometry( 50, 50, 50 ); - var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } ); + var material = new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ); for ( var i = 0; i < 100; i ++ ) { diff --git a/examples/canvas_lights_pointlights.html b/examples/canvas_lights_pointlights.html index af5180b109..1951aa4dfc 100644 --- a/examples/canvas_lights_pointlights.html +++ b/examples/canvas_lights_pointlights.html @@ -94,7 +94,7 @@ loader = new THREE.JSONLoader(); loader.load( 'obj/WaltHeadLo.js', function ( geometry ) { - mesh = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } ) ); + mesh = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ) ); scene.add( mesh ); } ); diff --git a/examples/canvas_performance.html b/examples/canvas_performance.html index 5164da4bc8..26079d9fb6 100644 --- a/examples/canvas_performance.html +++ b/examples/canvas_performance.html @@ -69,7 +69,7 @@ // Spheres geometry = new THREE.SphereGeometry( 100, 26, 18 ); - material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } ); + material = new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ); for ( var i = 0; i < 20; i ++ ) { diff --git a/examples/misc_lights_test.html b/examples/misc_lights_test.html index d5d854a1c0..63ac3aa7fa 100644 --- a/examples/misc_lights_test.html +++ b/examples/misc_lights_test.html @@ -42,7 +42,7 @@ var camera, scene, canvasRenderer, webglRenderer; - var mesh, zmesh, geometry; + var mesh, zmesh, geometry, material; var directionalLight, pointLight; @@ -70,8 +70,8 @@ // Spheres - var geometry = new THREE.SphereGeometry( 100, 16, 8 ); - var material = new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5 } ); + geometry = new THREE.SphereGeometry( 100, 16, 8 ); + material = new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, overdraw: 0.5, shininess: 0 } ); for ( var i = 0; i < 30; i ++ ) { @@ -86,8 +86,7 @@ // Torus - var geometry = new THREE.TorusGeometry( 100, 25, 15, 30 ); - var material = new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } ); + geometry = new THREE.TorusGeometry( 100, 25, 15, 30 ); mesh = new THREE.Mesh( geometry, material ); scene.add( mesh ); @@ -108,9 +107,9 @@ pointLight = new THREE.PointLight( 0xffaa00 ); scene.add( pointLight ); - var geometry = new THREE.SphereGeometry( 100, 8, 4 ); - var material = new THREE.MeshBasicMaterial( { color: 0xffaa00 } ); - var mesh = new THREE.Mesh( geometry, material ); + geometry = new THREE.SphereGeometry( 100, 8, 4 ); + material = new THREE.MeshBasicMaterial( { color: 0xffaa00 } ); + mesh = new THREE.Mesh( geometry, material ); mesh.scale.set( 0.05, 0.05, 0.05 ); pointLight.add( mesh ); diff --git a/examples/misc_sound.html b/examples/misc_sound.html index 9aba5951c1..2d09b80052 100644 --- a/examples/misc_sound.html +++ b/examples/misc_sound.html @@ -88,9 +88,9 @@ var sphere = new THREE.SphereGeometry( 20, 32, 16 ); - material_sphere1 = new THREE.MeshLambertMaterial( { color: 0xffaa00, shading: THREE.FlatShading } ); - material_sphere2 = new THREE.MeshLambertMaterial( { color: 0xff2200, shading: THREE.FlatShading } ); - material_sphere3 = new THREE.MeshLambertMaterial( { color: 0x6622aa, shading: THREE.FlatShading } ); + material_sphere1 = new THREE.MeshPhongMaterial( { color: 0xffaa00, shading: THREE.FlatShading, shininess: 0 } ); + material_sphere2 = new THREE.MeshPhongMaterial( { color: 0xff2200, shading: THREE.FlatShading, shininess: 0 } ); + material_sphere3 = new THREE.MeshPhongMaterial( { color: 0x6622aa, shading: THREE.FlatShading, shininess: 0 } ); // sound spheres diff --git a/examples/webgl_geometry_colors.html b/examples/webgl_geometry_colors.html index 5dde2b5976..f26f2dc83a 100644 --- a/examples/webgl_geometry_colors.html +++ b/examples/webgl_geometry_colors.html @@ -151,7 +151,7 @@ var materials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_interactive_cubes_gpu.html b/examples/webgl_interactive_cubes_gpu.html index 370e58805e..be4caf80cc 100644 --- a/examples/webgl_interactive_cubes_gpu.html +++ b/examples/webgl_interactive_cubes_gpu.html @@ -86,7 +86,7 @@ var geometry = new THREE.Geometry(), pickingGeometry = new THREE.Geometry(), pickingMaterial = new THREE.MeshBasicMaterial( { vertexColors: THREE.VertexColors } ), - defaultMaterial = new THREE.MeshLambertMaterial({ color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ); + defaultMaterial = new THREE.MeshPhongMaterial({ color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ); function applyVertexColors( g, c ) { diff --git a/examples/webgl_lights_pointlights2.html b/examples/webgl_lights_pointlights2.html index ea779a0d09..5539cb11d2 100644 --- a/examples/webgl_lights_pointlights2.html +++ b/examples/webgl_lights_pointlights2.html @@ -130,7 +130,7 @@ // MATERIALS var groundMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, map: texture } ); - var objectMaterial = new THREE.MeshPhongMaterial( { color: 0x000000, specular: 0xffffff, map: texture2 } ); + var objectMaterial = new THREE.MeshStandardMaterial( { color: 0x000000, map: texture2, roughness: 0.2, metalness: 1.0 } ); // GROUND diff --git a/examples/webgl_marchingcubes.html b/examples/webgl_marchingcubes.html index 325eedd1fd..f36f8be955 100644 --- a/examples/webgl_marchingcubes.html +++ b/examples/webgl_marchingcubes.html @@ -307,7 +307,7 @@ "shiny" : { - m: new THREE.MeshPhongMaterial( { color: 0x550000, specular: 0x440000, envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.3, metal: true } ), + m: new THREE.MeshStandardMaterial( { color: 0x550000, envMap: reflectionCube, roughness: 0.1, metalness: 1.0 } ), h: 0, s: 0.8, l: 0.2 }, diff --git a/examples/webgl_modifier_subdivision.html b/examples/webgl_modifier_subdivision.html index 030deea9f0..5d2e4b749d 100644 --- a/examples/webgl_modifier_subdivision.html +++ b/examples/webgl_modifier_subdivision.html @@ -249,7 +249,7 @@ group.add( mesh ); var meshmaterials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x405040, wireframe: true, opacity: 0.8, transparent: true } ) ]; diff --git a/examples/webgl_multiple_canvases_circle.html b/examples/webgl_multiple_canvases_circle.html index 7de30a67b5..ee2a3b4255 100644 --- a/examples/webgl_multiple_canvases_circle.html +++ b/examples/webgl_multiple_canvases_circle.html @@ -283,7 +283,7 @@ var materials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true } ) ]; diff --git a/examples/webgl_multiple_canvases_complex.html b/examples/webgl_multiple_canvases_complex.html index 6802c6544e..8895d3f0bb 100644 --- a/examples/webgl_multiple_canvases_complex.html +++ b/examples/webgl_multiple_canvases_complex.html @@ -210,7 +210,7 @@ var materials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_canvases_grid.html b/examples/webgl_multiple_canvases_grid.html index c34d0c8e8a..2d07deb7e0 100644 --- a/examples/webgl_multiple_canvases_grid.html +++ b/examples/webgl_multiple_canvases_grid.html @@ -226,7 +226,7 @@ var materials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_renderers.html b/examples/webgl_multiple_renderers.html index db33d71bbb..3b5d584880 100644 --- a/examples/webgl_multiple_renderers.html +++ b/examples/webgl_multiple_renderers.html @@ -140,7 +140,7 @@ var materials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_multiple_views.html b/examples/webgl_multiple_views.html index 0ef66e6788..c563f62884 100644 --- a/examples/webgl_multiple_views.html +++ b/examples/webgl_multiple_views.html @@ -207,7 +207,7 @@ var materials = [ - new THREE.MeshLambertMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors } ), + new THREE.MeshPhongMaterial( { color: 0xffffff, shading: THREE.FlatShading, vertexColors: THREE.VertexColors, shininess: 0 } ), new THREE.MeshBasicMaterial( { color: 0x000000, shading: THREE.FlatShading, wireframe: true, transparent: true } ) ]; diff --git a/examples/webgl_shadowmesh.html b/examples/webgl_shadowmesh.html index 9a207f88dd..527687fa08 100644 --- a/examples/webgl_shadowmesh.html +++ b/examples/webgl_shadowmesh.html @@ -163,7 +163,7 @@ // YELLOW PYRAMID and PYRAMID'S SHADOW var pyramidGeometry = new THREE.CylinderGeometry( 0, 0.5, 2, 4 ); - var pyramidMaterial = new THREE.MeshLambertMaterial( { color: 'rgb(255,255,0)', emissive: 0x440000, shading: THREE.FlatShading } ); + var pyramidMaterial = new THREE.MeshPhongMaterial( { color: 'rgb(255,255,0)', emissive: 0x440000, shading: THREE.FlatShading, shininess: 0 } ); pyramid = new THREE.Mesh( pyramidGeometry, pyramidMaterial ); pyramid.position.set( - 4, 1, 2 ); scene.add( pyramid ); -- GitLab