Skip to content

Commit 3aff540

Browse files
mrdoobmrdoob
authored
Merge pull request #13913 from Mugen87/dev11
Examples: Clean up
2 parents 4e16438 + 827c00a commit 3aff540

10 files changed

+144
-171
lines changed

‎examples/js/pmrem/PMREMGenerator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ THREE.PMREMGenerator = function ( sourceTexture, samplesPerLevel, resolution ) {
5353

5454
this.shader = this.getShader();
5555
this.shader.defines[ 'SAMPLES_PER_LEVEL' ] = this.samplesPerLevel;
56-
this.planeMesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2, 0 ), this.shader );
56+
this.planeMesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2, 0 ), this.shader );
5757
this.planeMesh.material.side = THREE.DoubleSide;
5858
this.scene = new THREE.Scene();
5959
this.scene.add( this.planeMesh );

‎examples/webgl_loader_texture_ktx.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
scene = new THREE.Scene();
8484

85-
var geometry = new THREE.BoxGeometry( 200, 200, 200 );
85+
var geometry = new THREE.BoxBufferGeometry( 200, 200, 200 );
8686
var material1, material2;
8787

8888
// TODO: add cubemap support

‎examples/webgl_materials_parallaxmap.html‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<script src="js/shaders/ParallaxShader.js"></script>
5757

5858
<script>
59+
5960
if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
6061

61-
var stats;
62-
var camera, scene, material, renderer;
62+
var camera, scene, material, renderer, stats;
6363

6464
var effectController = {
6565
'mode': 'relief',
@@ -81,7 +81,35 @@
8181
camera.position.z = 2;
8282
scene = new THREE.Scene();
8383

84-
initScene();
84+
//
85+
86+
var shader = THREE.ParallaxShader;
87+
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
88+
var parameters = {
89+
fragmentShader: shader.fragmentShader,
90+
vertexShader: shader.vertexShader,
91+
uniforms: uniforms
92+
};
93+
94+
//
95+
96+
var textureLoader = new THREE.TextureLoader();
97+
98+
material = new THREE.ShaderMaterial( parameters );
99+
material.map = textureLoader.load( 'textures/brick_diffuse.jpg' );
100+
material.bumpMap = textureLoader.load( 'textures/brick_bump.jpg' );
101+
material.map.anisotropy = 4;
102+
material.bumpMap.anisotropy = 4;
103+
uniforms[ 'map' ].value = material.map;
104+
uniforms[ 'bumpMap' ].value = material.bumpMap;
105+
106+
//
107+
108+
var geometry = new THREE.BoxBufferGeometry( 1.0, 1.0, 1.0 );
109+
var mesh = new THREE.Mesh( geometry, material );
110+
scene.add( mesh );
111+
112+
//
85113

86114
renderer = new THREE.WebGLRenderer( { antialias: true } );
87115
renderer.setPixelRatio( window.devicePixelRatio );
@@ -91,11 +119,17 @@
91119
renderer.gammaInput = true;
92120
renderer.gammaOutput = true;
93121

122+
//
123+
94124
var controls = new THREE.OrbitControls( camera, renderer.domElement );
95125

126+
//
127+
96128
stats = new Stats();
97129
container.appendChild( stats.dom );
98130

131+
//
132+
99133
window.addEventListener( 'resize', onWindowResize, false );
100134

101135
}
@@ -124,6 +158,7 @@
124158
gui.add( effectController, 'maxLayers', 1.0, 30, 1 ).onChange( guiChanged );
125159

126160
guiChanged();
161+
127162
}
128163

129164
function onWindowResize() {
@@ -135,32 +170,6 @@
135170

136171
}
137172

138-
function initScene() {
139-
140-
var shader = THREE.ParallaxShader;
141-
var uniforms = THREE.UniformsUtils.clone( shader.uniforms );
142-
var parameters = {
143-
fragmentShader: shader.fragmentShader,
144-
vertexShader: shader.vertexShader,
145-
uniforms: uniforms
146-
};
147-
148-
var textureLoader = new THREE.TextureLoader();
149-
150-
material = new THREE.ShaderMaterial( parameters );
151-
material.map = textureLoader.load( 'textures/brick_diffuse.jpg' );
152-
material.bumpMap = textureLoader.load( 'textures/brick_bump.jpg' );
153-
material.map.anisotropy = 4;
154-
material.bumpMap.anisotropy = 4;
155-
uniforms[ 'map' ].value = material.map;
156-
uniforms[ 'bumpMap' ].value = material.bumpMap;
157-
158-
var geometry = new THREE.BoxGeometry( 1.0, 1.0, 1.0 );
159-
var mesh = new THREE.Mesh( geometry, material );
160-
scene.add( mesh );
161-
162-
}
163-
164173
function animate() {
165174

166175
requestAnimationFrame( animate );
@@ -175,6 +184,7 @@
175184
renderer.render( scene, camera );
176185

177186
}
187+
178188
</script>
179189

180190
</body>

‎examples/webgl_materials_texture_canvas.html‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
material = new THREE.MeshBasicMaterial();
6969

70-
mesh = new THREE.Mesh( new THREE.BoxGeometry( 200, 200, 200 ), material );
70+
mesh = new THREE.Mesh( new THREE.BoxBufferGeometry( 200, 200, 200 ), material );
7171
scene.add( mesh );
7272

7373
renderer = new THREE.WebGLRenderer( { antialias: true } );
@@ -79,42 +79,53 @@
7979

8080
}
8181

82-
// Sets up the drawing canvas and adds it as the material map.
82+
// Sets up the drawing canvas and adds it as the material map
83+
8384
function setupCanvasDrawing() {
85+
8486
// get canvas and context
87+
8588
var drawingCanvas = document.getElementById( 'drawing-canvas' );
8689
var drawingContext = drawingCanvas.getContext( '2d' );
8790

8891
// draw white background
89-
drawingContext.fillStyle = "#FFFFFF";
92+
93+
drawingContext.fillStyle = '#FFFFFF';
9094
drawingContext.fillRect( 0, 0, 128, 128 );
9195

9296
// set canvas as material.map (this could be done to any map, bump, displacement etc.)
97+
9398
material.map = new THREE.Texture( drawingCanvas );
94-
// need to flag the map as needing updating.
9599
material.map.needsUpdate = true;
96100

97101
// set the variable to keep track of when to draw
102+
98103
var paint = false;
99104

100105
// add canvas event listeners
101106
drawingCanvas.addEventListener( 'mousedown', function( e ) {
107+
102108
paint = true;
103109
drawStartPos.set( e.offsetX, e.offsetY );
110+
104111
} );
105112

106113
drawingCanvas.addEventListener( 'mousemove', function( e ) {
107-
if(paint){
108-
draw( drawingContext, e.offsetX, e.offsetY );
109-
}
114+
115+
if( paint ) draw( drawingContext, e.offsetX, e.offsetY );
116+
110117
} );
111118

112119
drawingCanvas.addEventListener( 'mouseup', function( e ) {
120+
113121
paint = false;
122+
114123
} );
115124

116125
drawingCanvas.addEventListener( 'mouseleave', function( e ) {
126+
117127
paint = false;
128+
118129
} );
119130

120131
}

‎examples/webgl_materials_texture_rotation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
controls.maxDistance = 50;
8383
controls.maxPolarAngle = Math.PI / 2;
8484

85-
var geometry = new THREE.BoxGeometry( 10, 10, 10 );
85+
var geometry = new THREE.BoxBufferGeometry( 10, 10, 10 );
8686

8787
var loader = new THREE.TextureLoader();
8888
var texture = loader.load( 'textures/UV_Grid_Sm.jpg', render );

‎examples/webgl_materials_video.html‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
ox = i;
132132
oy = j;
133133

134-
geometry = new THREE.BoxGeometry( xsize, ysize, xsize );
134+
geometry = new THREE.BoxBufferGeometry( xsize, ysize, xsize );
135135

136136
change_uvs( geometry, ux, uy, ox, oy );
137137

@@ -202,20 +202,12 @@
202202

203203
function change_uvs( geometry, unitx, unity, offsetx, offsety ) {
204204

205-
var faceVertexUvs = geometry.faceVertexUvs[ 0 ];
205+
var uvs = geometry.attributes.uv.array;
206206

207-
for ( var i = 0; i < faceVertexUvs.length; i ++ ) {
207+
for ( var i = 0; i < uvs.length; i += 2 ) {
208208

209-
var uvs = faceVertexUvs[ i ];
210-
211-
for ( var j = 0; j < uvs.length; j ++ ) {
212-
213-
var uv = uvs[ j ];
214-
215-
uv.x = ( uv.x + offsetx ) * unitx;
216-
uv.y = ( uv.y + offsety ) * unity;
217-
218-
}
209+
uvs[ i ] = ( uvs[ i ] + offsetx ) * unitx;
210+
uvs[ i + 1 ] = ( uvs[ i + 1 ] + offsety ) * unity;
219211

220212
}
221213

‎examples/webgl_postprocessing_unreal_bloom.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
metalness: 1.0
106106
} );
107107

108-
var geometry = new THREE.TorusKnotGeometry( 18, 8, 150, 20 );
108+
var geometry = new THREE.TorusKnotBufferGeometry( 18, 8, 150, 20 );
109109
var torusMesh1 = new THREE.Mesh( geometry, standardMaterial );
110110
torusMesh1.position.x = 0.0;
111111
torusMesh1.castShadow = true;

0 commit comments

Comments
 (0)