Skip to content

Commit d06aa42

Browse files
mrdoobmrdoob
committed
Removed unneded scene.add( camera ) from the examples.
Sorry that you had to add it @alteredq.
1 parent 7a9a43a commit d06aa42

File tree

156 files changed

+345
-626
lines changed

Some content is hidden

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

156 files changed

+345
-626
lines changed

‎examples/canvas_ascii_effect.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,14 @@
4949
info.innerHTML = 'Drag to change the view';
5050
container.appendChild( info );
5151

52-
scene = new THREE.Scene();
53-
5452
camera = new THREE.PerspectiveCamera( 70, width / height, 1, 1000 );
5553
camera.position.y = 150;
5654
camera.position.z = 500;
57-
scene.add( camera );
5855

5956
controls = new THREE.TrackballControls( camera );
6057

58+
scene = new THREE.Scene();
59+
6160
var light = new THREE.PointLight( 0xffffff );
6261
light.position.set( 500, 500, 500 );
6362
scene.add( light );

‎examples/canvas_camera_orthographic.html

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848

4949
scene = new THREE.Scene();
5050

51-
scene.add( camera );
52-
5351
// Grid
5452

5553
var geometry = new THREE.Geometry();

‎examples/canvas_camera_orthographic2.html

-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@
114114

115115
scene = new THREE.Scene();
116116

117-
scene.add( camera );
118-
119117
// Grid
120118

121119
var geometry = new THREE.Geometry();

‎examples/canvas_geometry_birds.html

-2
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,6 @@
342342

343343
scene = new THREE.Scene();
344344

345-
scene.add( camera );
346-
347345
birds = [];
348346
boids = [];
349347

‎examples/canvas_geometry_cube.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,11 @@
5252
info.innerHTML = 'Drag to spin the cube';
5353
container.appendChild( info );
5454

55-
scene = new THREE.Scene();
56-
5755
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 1000 );
5856
camera.position.y = 150;
5957
camera.position.z = 500;
60-
scene.add( camera );
58+
59+
scene = new THREE.Scene();
6160

6261
// Cube
6362

‎examples/canvas_geometry_earth.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@
5454

5555
container = document.getElementById( 'container' );
5656

57-
scene = new THREE.Scene();
58-
5957
camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 1, 10000 );
6058
camera.position.z = 500;
61-
scene.add( camera );
59+
60+
scene = new THREE.Scene();
6261

6362
group = new THREE.Object3D();
6463
scene.add( group );

‎examples/canvas_geometry_hierarchy.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,10 @@
4343
container = document.createElement( 'div' );
4444
document.body.appendChild( container );
4545

46-
scene = new THREE.Scene();
47-
4846
camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 1, 10000 );
4947
camera.position.z = 500;
50-
camera.target = new THREE.Vector3();
51-
scene.add( camera );
48+
49+
scene = new THREE.Scene();
5250

5351
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
5452
var material = new THREE.MeshNormalMaterial();

‎examples/canvas_geometry_panorama.html

-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@
5858

5959
scene = new THREE.Scene();
6060

61-
scene.add( camera );
62-
6361
texture_placeholder = document.createElement( 'canvas' );
6462
texture_placeholder.width = 128;
6563
texture_placeholder.height = 128;

‎examples/canvas_geometry_panorama_fisheye.html

-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@
5858

5959
scene = new THREE.Scene();
6060

61-
scene.add( camera );
62-
6361
texture_placeholder = document.createElement( 'canvas' );
6462
texture_placeholder.width = 128;
6563
texture_placeholder.height = 128;

‎examples/canvas_geometry_terrain.html

-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464

6565
scene = new THREE.Scene();
6666

67-
scene.add( camera );
68-
6967
var data = generateHeight( 1024, 1024 );
7068
var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( generateTexture( data, 1024, 1024 ) ), overdraw: true } );
7169

‎examples/canvas_geometry_text.html

-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363

6464
scene = new THREE.Scene();
6565

66-
scene.add( camera );
67-
6866
// Get text from hash
6967

7068
var theText = "Hello three.js! :)";

‎examples/canvas_interactive_cubes.html

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848

4949
scene = new THREE.Scene();
5050

51-
scene.add( camera );
52-
5351
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
5452

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

‎examples/canvas_interactive_cubes_tween.html

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747

4848
scene = new THREE.Scene();
4949

50-
scene.add( camera );
51-
5250
var geometry = new THREE.CubeGeometry( 100, 100, 100 );
5351

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

‎examples/canvas_interactive_particles.html

-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@
6868

6969
scene = new THREE.Scene();
7070

71-
scene.add( camera );
72-
7371
for ( var i = 0; i < 100; i ++ ) {
7472

7573
var particle = new THREE.Particle( new THREE.ParticleCanvasMaterial( { color: Math.random() * 0x808080 + 0x808080, program: programStroke } ) );

‎examples/canvas_interactive_voxelpainter.html

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050

5151
scene = new THREE.Scene();
5252

53-
scene.add( camera );
54-
5553
// Grid
5654

5755
var geometry = new THREE.Geometry();

‎examples/canvas_lights_pointlights.html

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060

6161
scene = new THREE.Scene();
6262

63-
scene.add( camera );
64-
6563
scene.add( new THREE.AmbientLight( 0x00020 ) );
6664

6765
light1 = new THREE.PointLight( 0xff0040, 1, 50 );

‎examples/canvas_lights_pointlights_smooth.html

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@
6060

6161
scene = new THREE.Scene();
6262

63-
scene.add( camera );
64-
6563
scene.add( new THREE.AmbientLight( 0x00020 ) );
6664

6765
light1 = new THREE.PointLight( 0xff0040, 1, 50 );

‎examples/canvas_lines.html

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949

5050
scene = new THREE.Scene();
5151

52-
scene.add( camera );
53-
5452
renderer = new THREE.CanvasRenderer();
5553
renderer.setSize( window.innerWidth, window.innerHeight );
5654
container.appendChild( renderer.domElement );

‎examples/canvas_lines_sphere.html

-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252

5353
scene = new THREE.Scene();
5454

55-
scene.add( camera );
56-
5755
renderer = new THREE.CanvasRenderer();
5856
renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
5957
container.appendChild( renderer.domElement );

‎examples/canvas_materials.html

-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939

4040
scene = new THREE.Scene();
4141

42-
scene.add( camera );
43-
4442
// Grid
4543

4644
var geometry = new THREE.Geometry();

‎examples/canvas_materials_depth.html

-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959

6060
scene = new THREE.Scene();
6161

62-
scene.add( camera );
63-
6462
// Plane
6563

6664
var material = new THREE.MeshDepthMaterial( { overdraw: true } );

‎examples/canvas_materials_normal.html

-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@
5858

5959
scene = new THREE.Scene();
6060

61-
scene.add( camera );
62-
6361
loader = new THREE.JSONLoader();
6462
loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
6563

‎examples/canvas_materials_reflection.html

-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959

6060
scene = new THREE.Scene();
6161

62-
scene.add( camera );
63-
6462
loader = new THREE.JSONLoader();
6563
loader.load( 'obj/WaltHeadLo.js', function ( geometry ) {
6664

‎examples/canvas_materials_video.html

-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@
6565

6666
scene = new THREE.Scene();
6767

68-
scene.add( camera );
69-
7068
video = document.getElementById( 'video' );
7169

7270
//

‎examples/canvas_particles_floor.html

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848

4949
scene = new THREE.Scene();
5050

51-
scene.add( camera );
52-
5351
var PI2 = Math.PI * 2;
5452
var material = new THREE.ParticleBasicMaterial( { color: 0xffffff } );
5553

‎examples/canvas_particles_random.html

-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444

4545
scene = new THREE.Scene();
4646

47-
scene.add( camera );
48-
4947
var PI2 = Math.PI * 2;
5048
var program = function ( context ) {
5149

‎examples/canvas_particles_shapes.html

-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@
6969

7070
scene = new THREE.Scene();
7171

72-
scene.add( camera );
73-
7472
// Get text from hash
7573

7674
var string = "THREE.JS";

‎examples/canvas_particles_sprites.html

-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545

4646
scene = new THREE.Scene();
4747

48-
scene.add( camera );
49-
5048
var material = new THREE.ParticleBasicMaterial( { map: new THREE.Texture( generateSprite() ), blending: THREE.AdditiveBlending } );
5149

5250
for ( var i = 0; i < 1000; i++ ) {

‎examples/canvas_particles_waves.html

-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848

4949
scene = new THREE.Scene();
5050

51-
scene.add( camera );
52-
5351
particles = new Array();
5452

5553
var PI2 = Math.PI * 2;

‎examples/canvas_performance.html

-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040

4141
scene = new THREE.Scene();
4242

43-
scene.add( camera );
44-
4543
// Grid
4644

4745
var geometry = new THREE.Geometry();

‎examples/canvas_sandbox.html

-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363

6464
scene = new THREE.Scene();
6565

66-
scene.add( camera );
67-
6866

6967
// Grid
7068

‎examples/misc_camera_fly.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,11 @@
8686
container = document.createElement( 'div' );
8787
document.body.appendChild( container );
8888

89-
scene = new THREE.Scene();
90-
scene.fog = new THREE.FogExp2( 0x000000, 0.00000025 );
91-
9289
camera = new THREE.PerspectiveCamera( 25, SCREEN_WIDTH / SCREEN_HEIGHT, 50, 1e7 );
9390
camera.position.z = radius * 5;
9491

95-
scene.add( camera );
92+
scene = new THREE.Scene();
93+
scene.fog = new THREE.FogExp2( 0x000000, 0.00000025 );
9694

9795
controls = new THREE.FlyControls( camera );
9896

‎examples/misc_camera_orbit.html

+3-7
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,15 @@
5757

5858
function init() {
5959

60-
// scene and camera
61-
62-
scene = new THREE.Scene();
63-
scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
64-
6560
camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 1, 1000 );
6661
camera.position.z = 500;
6762

68-
scene.add( camera );
69-
7063
controls = new THREE.OrbitControls( camera );
7164
controls.addEventListener( 'change', render );
7265

66+
scene = new THREE.Scene();
67+
scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
68+
7369
// world
7470

7571
var geometry = new THREE.CylinderGeometry( 0, 10, 30, 4, 1 );

‎examples/misc_camera_path.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@
6060

6161
function init() {
6262

63-
scene = new THREE.Scene();
64-
scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
65-
6663
camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 1000 );
6764

6865
controls = new THREE.PathControls( camera );
@@ -81,10 +78,13 @@
8178

8279
controls.init();
8380

84-
scene.add( controls.animationParent );
85-
8681
// world
8782

83+
scene = new THREE.Scene();
84+
scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
85+
86+
scene.add( controls.animationParent );
87+
8888
var geometry = new THREE.CylinderGeometry( 0, 10, 30, 4, 1 );
8989
var material = new THREE.MeshLambertMaterial( { color:0xffffff, shading: THREE.FlatShading } );
9090

0 commit comments

Comments
 (0)