Skip to content

Commit

Permalink
Examples: Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mugen87
Mugen87 committed Apr 16, 2018
1 parent bc3aa48 commit 8f194ec
Show file tree
Hide file tree
Showing 27 changed files with 142 additions and 138 deletions.
4 changes: 2 additions & 2 deletions examples/css3d_sandbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
object.scale.y = Math.random() + 0.5;
scene2.add( object );

var geometry = new THREE.PlaneGeometry( 100, 100 );
var geometry = new THREE.PlaneBufferGeometry( 100, 100 );
var mesh = new THREE.Mesh( geometry, material );
mesh.position.copy( object.position );
mesh.rotation.copy( object.rotation );
Expand All @@ -93,7 +93,7 @@

//

renderer = new THREE.WebGLRenderer();
renderer = new THREE.WebGLRenderer( { antialias: true } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
document.body.appendChild( renderer.domElement );
Expand Down
1 change: 1 addition & 0 deletions examples/files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ var files = {
"webgl_postprocessing_ssaa_unbiased",
"webgl_postprocessing_nodes",
"webgl_postprocessing_outline",
"webgl_postprocessing_pixel",
"webgl_postprocessing_procedural",
"webgl_postprocessing_sao",
"webgl_postprocessing_smaa",
Expand Down
2 changes: 1 addition & 1 deletion examples/js/postprocessing/SAOPass.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ THREE.SAOPass = function ( scene, camera, depthTexture, useNormals, resolution )

this.quadCamera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
this.quadScene = new THREE.Scene();
this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
this.quadScene.add( this.quad );

};
Expand Down
2 changes: 1 addition & 1 deletion examples/js/postprocessing/SSAARenderPass.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ THREE.SSAARenderPass = function ( scene, camera, clearColor, clearAlpha ) {

this.camera2 = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
this.scene2 = new THREE.Scene();
this.quad2 = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), this.copyMaterial );
this.quad2 = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), this.copyMaterial );
this.quad2.frustumCulled = false; // Avoid getting clipped
this.scene2.add( this.quad2 );

Expand Down
98 changes: 55 additions & 43 deletions examples/webaudio_sandbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,16 @@
navigate with WASD / arrows / mouse
</div>


<div id="container"></div>

<script src="../build/three.js"></script>

<script src="js/controls/FirstPersonControls.js"></script>

<script src="js/Detector.js"></script>

<script src="js/libs/dat.gui.min.js"></script>

<script>

if ( ! Detector.webgl ) Detector.addGetWebGLMessage();

var container;
var camera, controls, scene, renderer;
var light, pointLight;

Expand All @@ -69,8 +63,6 @@

function init() {

container = document.getElementById( 'container' );

camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 1, 10000 );
camera.position.set( 0, 25, 0 );

Expand All @@ -84,7 +76,7 @@
light.position.set( 0, 0.5, 1 ).normalize();
scene.add( light );

var sphere = new THREE.SphereGeometry( 20, 32, 16 );
var sphere = new THREE.SphereBufferGeometry( 20, 32, 16 );

material1 = new THREE.MeshPhongMaterial( { color: 0xffaa00, flatShading: true, shininess: 0 } );
material2 = new THREE.MeshPhongMaterial( { color: 0xff2200, flatShading: true, shininess: 0 } );
Expand Down Expand Up @@ -122,7 +114,6 @@

//


var mesh3 = new THREE.Mesh( sphere, material3 );
mesh3.position.set( 0, 30, -250 );
scene.add( mesh3 );
Expand All @@ -131,11 +122,11 @@
var oscillator = listener.context.createOscillator();
oscillator.type = 'sine';
oscillator.frequency.setValueAtTime( 144, sound3.context.currentTime );
oscillator.start(0);
sound3.setNodeSource(oscillator);
oscillator.start( 0 );
sound3.setNodeSource( oscillator );
sound3.setRefDistance( 20 );
sound3.setVolume(0.5);
mesh3.add(sound3);
sound3.setVolume( 0.5 );
mesh3.add( sound3 );

// analysers

Expand All @@ -160,66 +151,87 @@
scene.add( helper );

//
var SoundControls = function() {

var SoundControls = function() {

this.master = listener.getMasterVolume();
this.firstSphere = sound1.getVolume();
this.secondSphere = sound2.getVolume();
this.thirdSphere = sound3.getVolume();
this.Ambient = sound4.getVolume();

};

var GeneratorControls = function() {

this.frequency = oscillator.frequency.value;
this.wavetype = oscillator.type;

};
var gui = new dat.GUI();

var gui = new dat.GUI();
var soundControls = new SoundControls();
var generatorControls = new GeneratorControls();
var volumeFolder = gui.addFolder('sound volume');
var generatorFolder = gui.addFolder('sound generator');
volumeFolder.add(soundControls, 'master').min(0.0).max(1.0).step(0.01).onChange(function() {
listener.setMasterVolume(soundControls.master);
});
volumeFolder.add(soundControls, 'firstSphere').min(0.0).max(1.0).step(0.01).onChange(function() {
sound1.setVolume(soundControls.firstSphere);
});
volumeFolder.add(soundControls, 'secondSphere').min(0.0).max(1.0).step(0.01).onChange(function() {
sound2.setVolume(soundControls.secondSphere);
});
var volumeFolder = gui.addFolder( 'sound volume' );
var generatorFolder = gui.addFolder( 'sound generator' );

volumeFolder.add(soundControls, 'thirdSphere').min(0.0).max(1.0).step(0.01).onChange(function() {
sound3.setVolume(soundControls.thirdSphere);
});
volumeFolder.add(soundControls, 'Ambient').min(0.0).max(1.0).step(0.01).onChange(function() {
sound4.setVolume(soundControls.Ambient);
});
volumeFolder.add( soundControls, 'master' ).min( 0.0 ).max( 1.0 ).step( 0.01 ).onChange( function () {

listener.setMasterVolume( soundControls.master );

} );
volumeFolder.add( soundControls, 'firstSphere' ).min( 0.0 ).max( 1.0 ).step( 0.01 ).onChange( function () {

sound1.setVolume( soundControls.firstSphere );

} );
volumeFolder.add( soundControls, 'secondSphere' ).min( 0.0 ).max( 1.0 ).step( 0.01 ).onChange( function () {

sound2.setVolume( soundControls.secondSphere );

} );

volumeFolder.add( soundControls, 'thirdSphere' ).min( 0.0 ).max( 1.0 ).step( 0.01 ).onChange( function () {

sound3.setVolume( soundControls.thirdSphere );

} );
volumeFolder.add( soundControls, 'Ambient' ).min( 0.0 ).max( 1.0 ).step( 0.01 ).onChange( function () {

sound4.setVolume( soundControls.Ambient );

} );
volumeFolder.open();
generatorFolder.add(generatorControls, 'frequency').min(50.0).max(5000.0).step(1.0).onChange(function() {
oscillator.frequency.value = generatorControls.frequency;
});
generatorFolder.add(generatorControls, 'wavetype', ['sine', 'square', 'sawtooth', 'triangle']).onChange(function() {
generatorFolder.add( generatorControls, 'frequency' ).min( 50.0 ).max( 5000.0 ).step( 1.0 ).onChange( function () {

oscillator.frequency.setValueAtTime( generatorControls.frequency, listener.context.currentTime );

} );
generatorFolder.add( generatorControls, 'wavetype', [ 'sine', 'square', 'sawtooth', 'triangle' ] ).onChange( function () {

oscillator.type = generatorControls.wavetype;
});
generatorFolder.open();

} );

generatorFolder.open();

//

renderer = new THREE.WebGLRenderer( { antialias: true } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );

container.innerHTML = "";
container.appendChild( renderer.domElement );
document.body.appendChild( renderer.domElement );

//

controls = new THREE.FirstPersonControls( camera, renderer.domElement );

controls.movementSpeed = 70;
controls.lookSpeed = 0.05;
controls.noFly = true;
controls.lookVertical = false;


//

window.addEventListener( 'resize', onWindowResize, false );

Expand Down
32 changes: 14 additions & 18 deletions examples/webgl_geometries.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
</head>
<body>

<div id="container"></div>
<div id="info"><a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> webgl - geometries</div>

<script src="../build/three.js"></script>
Expand All @@ -49,8 +48,6 @@

function init() {

var container = document.getElementById( 'container' );

camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
camera.position.y = 400;

Expand All @@ -73,43 +70,43 @@

//

object = new THREE.Mesh( new THREE.SphereGeometry( 75, 20, 10 ), material );
object = new THREE.Mesh( new THREE.SphereBufferGeometry( 75, 20, 10 ), material );
object.position.set( - 300, 0, 200 );
scene.add( object );

object = new THREE.Mesh( new THREE.IcosahedronGeometry( 75, 1 ), material );
object = new THREE.Mesh( new THREE.IcosahedronBufferGeometry( 75, 1 ), material );
object.position.set( - 100, 0, 200 );
scene.add( object );

object = new THREE.Mesh( new THREE.OctahedronGeometry( 75, 2 ), material );
object = new THREE.Mesh( new THREE.OctahedronBufferGeometry( 75, 2 ), material );
object.position.set( 100, 0, 200 );
scene.add( object );

object = new THREE.Mesh( new THREE.TetrahedronGeometry( 75, 0 ), material );
object = new THREE.Mesh( new THREE.TetrahedronBufferGeometry( 75, 0 ), material );
object.position.set( 300, 0, 200 );
scene.add( object );

//

object = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100, 4, 4 ), material );
object = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100, 4, 4 ), material );
object.position.set( - 300, 0, 0 );
scene.add( object );

object = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 ), material );
object = new THREE.Mesh( new THREE.BoxBufferGeometry( 100, 100, 100, 4, 4, 4 ), material );
object.position.set( - 100, 0, 0 );
scene.add( object );

object = new THREE.Mesh( new THREE.CircleGeometry( 50, 20, 0, Math.PI * 2 ), material );
object = new THREE.Mesh( new THREE.CircleBufferGeometry( 50, 20, 0, Math.PI * 2 ), material );
object.position.set( 100, 0, 0 );
scene.add( object );

object = new THREE.Mesh( new THREE.RingGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
object = new THREE.Mesh( new THREE.RingBufferGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
object.position.set( 300, 0, 0 );
scene.add( object );

//

object = new THREE.Mesh( new THREE.CylinderGeometry( 25, 75, 100, 40, 5 ), material );
object = new THREE.Mesh( new THREE.CylinderBufferGeometry( 25, 75, 100, 40, 5 ), material );
object.position.set( - 300, 0, - 200 );
scene.add( object );

Expand All @@ -121,15 +118,15 @@

}

object = new THREE.Mesh( new THREE.LatheGeometry( points, 20 ), material );
object = new THREE.Mesh( new THREE.LatheBufferGeometry( points, 20 ), material );
object.position.set( - 100, 0, - 200 );
scene.add( object );

object = new THREE.Mesh( new THREE.TorusGeometry( 50, 20, 20, 20 ), material );
object = new THREE.Mesh( new THREE.TorusBufferGeometry( 50, 20, 20, 20 ), material );
object.position.set( 100, 0, - 200 );
scene.add( object );

object = new THREE.Mesh( new THREE.TorusKnotGeometry( 50, 10, 50, 20 ), material );
object = new THREE.Mesh( new THREE.TorusKnotBufferGeometry( 50, 10, 50, 20 ), material );
object.position.set( 300, 0, - 200 );
scene.add( object );

Expand All @@ -138,11 +135,10 @@
renderer = new THREE.WebGLRenderer( { antialias: true } );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );

container.appendChild( renderer.domElement );
document.body.appendChild( renderer.domElement );

stats = new Stats();
container.appendChild( stats.dom );
document.body.appendChild( stats.dom );

//

Expand Down
2 changes: 1 addition & 1 deletion examples/webgl_geometry_extrude_splines.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@

// debug camera

cameraEye = new THREE.Mesh( new THREE.SphereGeometry( 5 ), new THREE.MeshBasicMaterial( { color: 0xdddddd } ) );
cameraEye = new THREE.Mesh( new THREE.SphereBufferGeometry( 5 ), new THREE.MeshBasicMaterial( { color: 0xdddddd } ) );
parent.add( cameraEye );

cameraHelper.visible = params.cameraHelper;
Expand Down
Loading

0 comments on commit 8f194ec

Please sign in to comment.