Skip to content

Commit

Permalink
Examples: Fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Mugen87 committed Dec 27, 2018
1 parent 4834fc7 commit 5b73e60
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion examples/js/Ocean.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ THREE.Ocean = function ( renderer, camera, scene, options ) {
var initialSpectrumUniforms = THREE.UniformsUtils.clone( initialSpectrumShader.uniforms );
this.materialInitialSpectrum = new THREE.ShaderMaterial( {
uniforms: initialSpectrumUniforms,
vertexShader: fullscreeenVertexShader.vertexShader,
vertexShader: initialSpectrumShader.vertexShader,
fragmentShader: initialSpectrumShader.fragmentShader
} );
this.materialInitialSpectrum.uniforms.u_wind = { value: new THREE.Vector2() };
Expand Down
5 changes: 5 additions & 0 deletions examples/js/shaders/OceanShaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ THREE.ShaderLib[ 'ocean_initial_spectrum' ] = {
"u_resolution": { value: 512.0 },
"u_size": { value: 250.0 }
},
vertexShader: [
'void main (void) {',
'gl_Position = vec4(position, 1.0);',
'}'
].join( '\n' ),
fragmentShader: [
'precision highp float;',
'#include <common>',
Expand Down
1 change: 0 additions & 1 deletion examples/webgl_loader_ctm_materials.html
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
mm.specularMap = m.map;
mm.shininess = 30;
mm.color.setHex( 0x404040 );
mm.metal = true;

materials[ i ] = mm;

Expand Down
1 change: 1 addition & 0 deletions examples/webgl_panorama_dualfisheye.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
//

var texture = new THREE.TextureLoader().load( 'textures/ricoh_theta_s.jpg' );
texture.minFilter = THREE.LinearFilter;
texture.format = THREE.RGBFormat;

var material = new THREE.MeshBasicMaterial( { map: texture } );
Expand Down
1 change: 1 addition & 0 deletions examples/webgl_postprocessing_masking.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
var maskPass2 = new THREE.MaskPass( scene2, camera );

var texture1 = new THREE.TextureLoader().load( 'textures/758px-Canestra_di_frutta_(Caravaggio).jpg' );
texture1.minFilter = THREE.LinearFilter;
var texture2 = new THREE.TextureLoader().load( 'textures/2294472375_24a3b8ef46_o.jpg' );

var texturePass1 = new THREE.TexturePass( texture1 );
Expand Down

0 comments on commit 5b73e60

Please sign in to comment.