Skip to content

Commit

Permalink
Fixed some lgtm.com alerts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrdoob
mrdoob committed May 23, 2017
1 parent 9087458 commit 4ab3305
Show file tree
Hide file tree
Showing 121 changed files with 1,987 additions and 2,253 deletions.
1 change: 1 addition & 0 deletions examples/canvas_ascii_effect.html
View file
Expand Up @@ -30,6 +30,7 @@
var container, stats;

var camera, controls, scene, renderer;
var effect;

var sphere, plane;

Expand Down
31 changes: 14 additions & 17 deletions examples/canvas_geometry_birds.html
View file
Expand Up @@ -209,16 +209,15 @@

this.alignment = function ( boids ) {

var boid, velSum = new THREE.Vector3(),
count = 0;
var count = 0;
var velSum = new THREE.Vector3();

for ( var i = 0, il = boids.length; i < il; i++ ) {

if ( Math.random() > 0.6 ) continue;

boid = boids[ i ];

distance = boid.position.distanceTo( this.position );
var boid = boids[ i ];
var distance = boid.position.distanceTo( this.position );

if ( distance > 0 && distance <= _neighborhoodRadius ) {

Expand Down Expand Up @@ -249,17 +248,16 @@

this.cohesion = function ( boids ) {

var boid, distance,
posSum = new THREE.Vector3(),
steer = new THREE.Vector3(),
count = 0;
var count = 0;
var posSum = new THREE.Vector3();
var steer = new THREE.Vector3();

for ( var i = 0, il = boids.length; i < il; i ++ ) {

if ( Math.random() > 0.6 ) continue;

boid = boids[ i ];
distance = boid.position.distanceTo( this.position );
var boid = boids[ i ];
var distance = boid.position.distanceTo( this.position );

if ( distance > 0 && distance <= _neighborhoodRadius ) {

Expand Down Expand Up @@ -292,16 +290,15 @@

this.separation = function ( boids ) {

var boid, distance,
posSum = new THREE.Vector3(),
repulse = new THREE.Vector3();
var posSum = new THREE.Vector3();
var repulse = new THREE.Vector3();

for ( var i = 0, il = boids.length; i < il; i ++ ) {

if ( Math.random() > 0.6 ) continue;

boid = boids[ i ];
distance = boid.position.distanceTo( this.position );
var boid = boids[ i ];
var distance = boid.position.distanceTo( this.position );

if ( distance > 0 && distance <= _neighborhoodRadius ) {

Expand Down Expand Up @@ -432,7 +429,7 @@
bird = birds[ i ];
bird.position.copy( boids[ i ].position );

color = bird.material.color;
var color = bird.material.color;
color.r = color.g = color.b = ( 500 - bird.position.z ) / 1000;

bird.rotation.y = Math.atan2( - boid.velocity.z, boid.velocity.x );
Expand Down
2 changes: 1 addition & 1 deletion examples/canvas_lines_colors_2d.html
View file
Expand Up @@ -86,7 +86,7 @@
container.appendChild( renderer.domElement );

var geometry3 = new THREE.Geometry(),
points = hilbert2D( new THREE.Vector3( 0,0,0 ), 400.0, 4, 0, 1, 2, 3, 4, 5, 6, 7 ),
points = hilbert2D( new THREE.Vector3( 0,0,0 ), 400.0, 4 ),
colors3 = [];

for ( i = 0; i < points.length; i ++ ) {
Expand Down
13 changes: 0 additions & 13 deletions examples/canvas_materials.html
View file
Expand Up @@ -131,19 +131,6 @@
renderer.setSize( window.innerWidth, window.innerHeight );
container.appendChild( renderer.domElement );

var debugCanvas = document.createElement( 'canvas' );
debugCanvas.width = 512;
debugCanvas.height = 512;
debugCanvas.style.position = 'absolute';
debugCanvas.style.top = '0px';
debugCanvas.style.left = '0px';

container.appendChild( debugCanvas );

debugContext = debugCanvas.getContext( '2d' );
debugContext.setTransform( 1, 0, 0, 1, 256, 256 );
debugContext.strokeStyle = '#000000';

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

Expand Down
12 changes: 6 additions & 6 deletions examples/canvas_materials_video.html
View file
Expand Up @@ -138,12 +138,12 @@

for ( var iy = 0; iy < amounty; iy++ ) {

particle = new THREE.Sprite( material );
particle.position.x = ix * separation - ( ( amountx * separation ) / 2 );
particle.position.y = -153;
particle.position.z = iy * separation - ( ( amounty * separation ) / 2 );
particle.scale.x = particle.scale.y = 2;
scene.add( particle );
var sprite = new THREE.Sprite( material );
sprite.position.x = ix * separation - ( ( amountx * separation ) / 2 );
sprite.position.y = -153;
sprite.position.z = iy * separation - ( ( amounty * separation ) / 2 );
sprite.scale.setScalar( 2 );
scene.add( sprite );

}

Expand Down
4 changes: 2 additions & 2 deletions examples/canvas_performance.html
View file
Expand Up @@ -52,8 +52,8 @@

// Spheres

geometry = new THREE.SphereGeometry( 100, 26, 18 );
material = new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } );
var geometry = new THREE.SphereGeometry( 100, 26, 18 );
var material = new THREE.MeshLambertMaterial( { color: 0xffffff, overdraw: 0.5 } );

for ( var i = 0; i < 20; i ++ ) {

Expand Down
155 changes: 13 additions & 142 deletions examples/canvas_sandbox.html
View file
Expand Up @@ -17,6 +17,7 @@

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

<script src="js/controls/OrbitControls.js"></script>
<script src="js/renderers/Projector.js"></script>
<script src="js/renderers/CanvasRenderer.js"></script>

Expand All @@ -26,31 +27,8 @@

var container, stats;

var camera, scene, renderer, objects;
var pointLight;

var sphere;

var targetRotation = 0;
var targetRotationOnMouseDown = 0;

var mouseX = 0;
var mouseXOnMouseDown = 0;

var windowHalfX = window.innerWidth / 2;
var windowHalfY = window.innerHeight / 2;

var moveForward = false;
var moveBackwards = false;
var moveLeft = false;
var moveRight = false;
var moveUp = false;
var moveDown = false;

var targetMoveLeft = false;
var targetMoveRight = false;

var debugContext;
var camera, scene, renderer;
var controls, group;

init();
animate();
Expand All @@ -62,10 +40,10 @@

camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 10000 );
camera.position.set( 0, 150, 400 );
camera.target = new THREE.Vector3( 0, 150, 0 );

scene = new THREE.Scene();
var controls = new THREE.OrbitControls( camera );

scene = new THREE.Scene();

// Grid

Expand All @@ -74,18 +52,19 @@

// Spheres

objects = [];
group = new THREE.Group();
scene.add( group );

geometry = new THREE.IcosahedronGeometry( 100, 1 );
var geometry = new THREE.IcosahedronGeometry( 100, 1 );

var envMap = new THREE.TextureLoader().load( 'textures/metal.jpg' );
envMap.mapping = THREE.SphericalReflectionMapping;

material = new THREE.MeshBasicMaterial( { envMap: envMap, overdraw: 0.5 } );
var material = new THREE.MeshBasicMaterial( { envMap: envMap, overdraw: 0.5 } );

for ( var i = 0; i < 10; i ++ ) {

sphere = new THREE.Mesh( geometry, material );
var sphere = new THREE.Mesh( geometry, material );

sphere.position.x = Math.random() * 1000 - 500;
sphere.position.y = Math.random() * 1000 - 500;
Expand All @@ -97,52 +76,19 @@

sphere.scale.x = sphere.scale.y = sphere.scale.z = Math.random() + 0.5;

objects.push( sphere );

scene.add( sphere );
group.add( sphere );

}

// Lights

var ambientLight = new THREE.AmbientLight( Math.random() * 0x202020 );
scene.add( ambientLight );

var directionalLight = new THREE.DirectionalLight( Math.random() * 0xffffff );
directionalLight.position.x = Math.random() - 0.5;
directionalLight.position.y = Math.random() - 0.5;
directionalLight.position.z = Math.random() - 0.5;
directionalLight.position.normalize();
scene.add( directionalLight );

pointLight = new THREE.PointLight( 0xff0000, 1 );
scene.add( pointLight );

renderer = new THREE.CanvasRenderer();
renderer.setClearColor( 0xf0f0f0 );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
container.appendChild( renderer.domElement );

var debugCanvas = document.createElement( 'canvas' );
debugCanvas.width = 512;
debugCanvas.height = 512;
debugCanvas.style.position = 'absolute';
debugCanvas.style.top = '0px';
debugCanvas.style.left = '0px';

container.appendChild( debugCanvas );

debugContext = debugCanvas.getContext( '2d' );
debugContext.setTransform( 1, 0, 0, 1, 256, 256 );
debugContext.strokeStyle = '#000000';

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

document.addEventListener( 'keydown', onDocumentKeyDown, false );
document.addEventListener( 'keyup', onDocumentKeyUp, false );

//

window.addEventListener( 'resize', onWindowResize, false );
Expand All @@ -151,50 +97,13 @@

function onWindowResize() {

windowHalfX = window.innerWidth / 2;
windowHalfY = window.innerHeight / 2;

camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();

renderer.setSize( window.innerWidth, window.innerHeight );

}

function onDocumentKeyDown( event ) {

switch ( event.keyCode ) {

case 38: moveForward = true; break; // up
case 40: moveBackwards = true; break; // down
case 37: moveLeft = true; break; // left
case 39: moveRight = true; break; // right
case 87: moveUp = true; break; // w
case 83: moveDown = true; break; // s
case 65: targetMoveLeft = true; break; // a
case 68: targetMoveRight = true; break; // d

}

}

function onDocumentKeyUp( event ) {

switch ( event.keyCode ) {

case 38: moveForward = false; break; // up
case 40: moveBackwards = false; break; // down
case 37: moveLeft = false; break; // left
case 39: moveRight = false; break; // right
case 87: moveUp = false; break; // w
case 83: moveDown = false; break; // s
case 65: targetMoveLeft = false; break; // a
case 68: targetMoveRight = false; break; // d

}

}

//

function animate() {
Expand All @@ -208,54 +117,16 @@

function render() {

if ( moveForward ) camera.position.z -= 10;
if ( moveBackwards ) camera.position.z += 10;

if ( moveLeft ) camera.position.x -= 10;
if ( moveRight ) camera.position.x += 10;

if ( moveUp ) camera.position.y += 10;
if ( moveDown ) camera.position.y -= 10;
for ( var i = 0, l = group.children.length; i < l; i++ ) {

if ( targetMoveLeft ) camera.target.x -= 10;
if ( targetMoveRight ) camera.target.x += 10;

camera.lookAt( camera.target );

debugContext.clearRect( -256, -256, 512, 512 );

debugContext.beginPath();

// center
debugContext.moveTo( -10, 0 );
debugContext.lineTo( 10, 0 );
debugContext.moveTo( 0, -10 );
debugContext.lineTo( 0, 10 );

// camera

debugContext.moveTo( camera.position.x * 0.1, camera.position.z * 0.1 );
debugContext.lineTo( camera.target.x * 0.1, camera.target.z * 0.1 );
debugContext.rect( camera.position.x * 0.1 - 5, camera.position.z * 0.1 - 5, 10, 10 );
debugContext.rect( camera.target.x * 0.1 - 5, camera.target.z * 0.1 - 5, 10, 10 );
debugContext.rect( - 50, - 50, 100, 100 );

for ( var i = 0, l = objects.length; i < l; i++ ) {

var object = objects[ i ];
var object = group.children[ i ];

object.rotation.x += 0.01;
object.rotation.y += 0.005;
object.position.y = Math.sin( object.rotation.x ) * 200;

debugContext.rect( object.position.x * 0.1 - 5, object.position.z * 0.1 - 5, 10, 10 );

}


debugContext.closePath();
debugContext.stroke();

renderer.render( scene, camera );

}
Expand Down
1 change: 1 addition & 0 deletions examples/css3d_youtube.html
View file
Expand Up @@ -30,6 +30,7 @@
<script>

var camera, scene, renderer;
var controls;

var Element = function ( id, x, y, z, ry ) {

Expand Down

0 comments on commit 4ab3305

Please sign in to comment.