Skip to content

Commit c920cbc

Browse files
committedOct 14, 2020
Examples: More clean up.
1 parent 2b082dc commit c920cbc

File tree

65 files changed

+1778
-1767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1778
-1767
lines changed
 

‎examples/webgl_modifier_subdivision.html

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
import { OrbitControls } from './jsm/controls/OrbitControls.js';
3333
import { SubdivisionModifier } from './jsm/modifiers/SubdivisionModifier.js';
3434

35-
var camera, scene, renderer, stats, smoothMesh, wireframe;
35+
let camera, scene, renderer, stats, smoothMesh, wireframe;
3636

37-
var smoothMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: true } );
38-
var wireframeMaterial = new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, opacity: 0.15, transparent: true } );
37+
const smoothMaterial = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true, vertexColors: true } );
38+
const wireframeMaterial = new THREE.MeshBasicMaterial( { color: 0x000000, wireframe: true, opacity: 0.15, transparent: true } );
3939

40-
var faceIndices = [ 'a', 'b', 'c' ];
40+
const faceIndices = [ 'a', 'b', 'c' ];
4141

42-
var params = {
42+
const params = {
4343
subdivisions: 2
4444
};
4545

@@ -53,23 +53,23 @@
5353
scene = new THREE.Scene();
5454
scene.background = new THREE.Color( 0xf0f0f0 );
5555

56-
var light = new THREE.PointLight( 0xffffff, 1.5 );
56+
const light = new THREE.PointLight( 0xffffff, 1.5 );
5757
light.position.set( 1000, 1000, 2000 );
5858
scene.add( light );
5959

60-
var loader = new THREE.BufferGeometryLoader();
60+
const loader = new THREE.BufferGeometryLoader();
6161
loader.load( 'models/json/WaltHeadLo_buffergeometry.json', function ( bufferGeometry ) {
6262

6363
// converting to legacy THREE.Geometry because SubdivisionModifier only returns THREE.Geometry
6464

65-
var geometry = new THREE.Geometry().fromBufferGeometry( bufferGeometry );
65+
const geometry = new THREE.Geometry().fromBufferGeometry( bufferGeometry );
6666
geometry.mergeVertices();
6767

68-
var material = new THREE.MeshBasicMaterial( { color: 0xcccccc, wireframe: true } );
69-
var mesh = new THREE.Mesh( bufferGeometry, material );
68+
const material = new THREE.MeshBasicMaterial( { color: 0xcccccc, wireframe: true } );
69+
const mesh = new THREE.Mesh( bufferGeometry, material );
7070
scene.add( mesh );
7171

72-
var gui = new GUI();
72+
const gui = new GUI();
7373

7474
gui.add( params, 'subdivisions', 0, 3 ).step( 1 ).onChange( function ( subdivisions ) {
7575

@@ -94,7 +94,7 @@
9494

9595
//
9696

97-
var controls = new OrbitControls( camera, renderer.domElement );
97+
const controls = new OrbitControls( camera, renderer.domElement );
9898
controls.minDistance = 50;
9999
controls.maxDistance = 400;
100100

@@ -110,23 +110,23 @@
110110

111111
function subdivide( geometry, subdivisions ) {
112112

113-
var modifier = new SubdivisionModifier( subdivisions );
113+
const modifier = new SubdivisionModifier( subdivisions );
114114

115-
var smoothGeometry = modifier.modify( geometry );
115+
const smoothGeometry = modifier.modify( geometry );
116116

117117
// colorify faces
118118

119-
for ( var i = 0; i < smoothGeometry.faces.length; i ++ ) {
119+
for ( let i = 0; i < smoothGeometry.faces.length; i ++ ) {
120120

121-
var face = smoothGeometry.faces[ i ];
121+
const face = smoothGeometry.faces[ i ];
122122

123-
for ( var j = 0; j < 3; j ++ ) {
123+
for ( let j = 0; j < 3; j ++ ) {
124124

125-
var vertexIndex = face[ faceIndices[ j ] ];
126-
var vertex = smoothGeometry.vertices[ vertexIndex ];
125+
const vertexIndex = face[ faceIndices[ j ] ];
126+
const vertex = smoothGeometry.vertices[ vertexIndex ];
127127

128-
var hue = ( vertex.y / 200 ) + 0.5;
129-
var color = new THREE.Color().setHSL( hue, 1, 0.5 );
128+
const hue = ( vertex.y / 200 ) + 0.5;
129+
const color = new THREE.Color().setHSL( hue, 1, 0.5 );
130130
face.vertexColors[ j ] = color;
131131

132132
}

‎examples/webgl_modifier_tessellation.html

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,16 @@
6262
import { TrackballControls } from './jsm/controls/TrackballControls.js';
6363
import { TessellateModifier } from './jsm/modifiers/TessellateModifier.js';
6464

65+
let renderer, scene, camera, stats;
6566

66-
var renderer, scene, camera, stats;
67+
let controls;
6768

68-
var controls;
69+
let mesh, uniforms;
6970

70-
var mesh, uniforms;
71+
const WIDTH = window.innerWidth;
72+
const HEIGHT = window.innerHeight;
7173

72-
var WIDTH = window.innerWidth,
73-
HEIGHT = window.innerHeight;
74-
75-
var loader = new THREE.FontLoader();
74+
const loader = new THREE.FontLoader();
7675
loader.load( 'fonts/helvetiker_bold.typeface.json', function ( font ) {
7776

7877
init( font );
@@ -90,7 +89,7 @@
9089

9190
//
9291

93-
var geometry = new THREE.TextGeometry( "THREE.JS", {
92+
let geometry = new THREE.TextGeometry( "THREE.JS", {
9493

9594
font: font,
9695

@@ -106,9 +105,9 @@
106105

107106
geometry.center();
108107

109-
var tessellateModifier = new TessellateModifier( 8 );
108+
const tessellateModifier = new TessellateModifier( 8 );
110109

111-
for ( var i = 0; i < 6; i ++ ) {
110+
for ( let i = 0; i < 6; i ++ ) {
112111

113112
tessellateModifier.modify( geometry );
114113

@@ -118,26 +117,26 @@
118117

119118
geometry = new THREE.BufferGeometry().fromGeometry( geometry );
120119

121-
var numFaces = geometry.attributes.position.count / 3;
120+
const numFaces = geometry.attributes.position.count / 3;
122121

123-
var colors = new Float32Array( numFaces * 3 * 3 );
124-
var displacement = new Float32Array( numFaces * 3 * 3 );
122+
const colors = new Float32Array( numFaces * 3 * 3 );
123+
const displacement = new Float32Array( numFaces * 3 * 3 );
125124

126-
var color = new THREE.Color();
125+
const color = new THREE.Color();
127126

128-
for ( var f = 0; f < numFaces; f ++ ) {
127+
for ( let f = 0; f < numFaces; f ++ ) {
129128

130-
var index = 9 * f;
129+
const index = 9 * f;
131130

132-
var h = 0.2 * Math.random();
133-
var s = 0.5 + 0.5 * Math.random();
134-
var l = 0.5 + 0.5 * Math.random();
131+
const h = 0.2 * Math.random();
132+
const s = 0.5 + 0.5 * Math.random();
133+
const l = 0.5 + 0.5 * Math.random();
135134

136135
color.setHSL( h, s, l );
137136

138-
var d = 10 * ( 0.5 - Math.random() );
137+
const d = 10 * ( 0.5 - Math.random() );
139138

140-
for ( var i = 0; i < 3; i ++ ) {
139+
for ( let i = 0; i < 3; i ++ ) {
141140

142141
colors[ index + ( 3 * i ) ] = color.r;
143142
colors[ index + ( 3 * i ) + 1 ] = color.g;
@@ -162,7 +161,7 @@
162161

163162
};
164163

165-
var shaderMaterial = new THREE.ShaderMaterial( {
164+
const shaderMaterial = new THREE.ShaderMaterial( {
166165

167166
uniforms: uniforms,
168167
vertexShader: document.getElementById( 'vertexshader' ).textContent,
@@ -180,7 +179,7 @@
180179
renderer.setPixelRatio( window.devicePixelRatio );
181180
renderer.setSize( WIDTH, HEIGHT );
182181

183-
var container = document.getElementById( 'container' );
182+
const container = document.getElementById( 'container' );
184183
container.appendChild( renderer.domElement );
185184

186185
controls = new TrackballControls( camera, renderer.domElement );
@@ -215,7 +214,7 @@
215214

216215
function render() {
217216

218-
var time = Date.now() * 0.001;
217+
const time = Date.now() * 0.001;
219218

220219
uniforms.amplitude.value = 1.0 + Math.sin( time * 0.5 );
221220

0 commit comments

Comments
 (0)