Skip to content

Commit 21ca9cd

Browse files
mrdoobmrdoob
committed
Removed custom skybox from examples.
1 parent 32c2993 commit 21ca9cd

19 files changed

+134
-472
lines changed

‎examples/misc_controls_fly.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
var SCREEN_WIDTH = window.innerWidth;
7474

7575
var container, stats;
76-
var camera, controls, scene, sceneCube, renderer;
76+
var camera, controls, scene, renderer;
7777
var geometry, meshPlanet, meshClouds, meshMoon;
7878
var dirLight, pointLight, ambientLight;
7979

@@ -217,8 +217,6 @@
217217
renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
218218
renderer.sortObjects = false;
219219

220-
renderer.autoClear = false;
221-
222220
container.appendChild( renderer.domElement );
223221

224222
stats = new Stats();
@@ -292,7 +290,6 @@
292290
controls.movementSpeed = 0.33 * d;
293291
controls.update( delta );
294292

295-
renderer.clear();
296293
composer.render( delta );
297294

298295
}

‎examples/webgl_effects_anaglyph.html

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
camera.position.z = 3;
7575
camera.focalLength = 3;
7676

77-
scene = new THREE.Scene();
78-
79-
var geometry = new THREE.SphereBufferGeometry( 0.1, 32, 16 );
80-
8177
var path = "textures/cube/pisa/";
8278
var format = '.png';
8379
var urls = [
@@ -87,6 +83,11 @@
8783
];
8884

8985
var textureCube = new THREE.CubeTextureLoader().load( urls );
86+
87+
scene = new THREE.Scene();
88+
scene.background = textureCube;
89+
90+
var geometry = new THREE.SphereBufferGeometry( 0.1, 32, 16 );
9091
var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: textureCube } );
9192

9293
for ( var i = 0; i < 500; i ++ ) {
@@ -105,23 +106,6 @@
105106

106107
}
107108

108-
// Skybox
109-
110-
var shader = THREE.ShaderLib[ "cube" ];
111-
shader.uniforms[ "tCube" ].value = textureCube;
112-
113-
var material = new THREE.ShaderMaterial( {
114-
115-
fragmentShader: shader.fragmentShader,
116-
vertexShader: shader.vertexShader,
117-
uniforms: shader.uniforms,
118-
side: THREE.BackSide
119-
120-
} ),
121-
122-
mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
123-
scene.add( mesh );
124-
125109
//
126110

127111
renderer = new THREE.WebGLRenderer( { antialias: false } );

‎examples/webgl_effects_parallaxbarrier.html

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,12 @@
163163

164164
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 1, 100000 );
165165

166+
var textureCube = new THREE.CubeTextureLoader()
167+
.setPath( 'textures/cube/Bridge2/')
168+
.load( [ 'posx.jpg', 'negx.jpg', 'posy.jpg', 'negy.jpg', 'posz.jpg', 'negz.jpg' ] );
169+
166170
scene = new THREE.Scene();
171+
scene.background = textureCube;
167172

168173
// LIGHTS
169174

@@ -182,23 +187,6 @@
182187
pointLight.position.set( 2000, 1200, 10000 );
183188
scene.add( pointLight );
184189

185-
// Skybox
186-
187-
var shader = THREE.ShaderLib[ "cube" ];
188-
shader.uniforms[ "tCube" ].value = textureCube;
189-
190-
var material = new THREE.ShaderMaterial( {
191-
192-
fragmentShader: shader.fragmentShader,
193-
vertexShader: shader.vertexShader,
194-
uniforms: shader.uniforms,
195-
side: THREE.BackSide
196-
197-
} ),
198-
199-
mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
200-
scene.add( mesh );
201-
202190
//
203191

204192
renderer = new THREE.WebGLRenderer( { antialias: false } );
@@ -221,15 +209,6 @@
221209

222210
document.addEventListener('mousemove', onDocumentMouseMove, false);
223211

224-
var r = "textures/cube/Bridge2/";
225-
var urls = [
226-
r + "posx.jpg", r + "negx.jpg",
227-
r + "posy.jpg", r + "negy.jpg",
228-
r + "posz.jpg", r + "negz.jpg"
229-
];
230-
231-
var textureCube = new THREE.CubeTextureLoader().load( urls );
232-
233212
// common materials
234213

235214
var mlib = {

‎examples/webgl_effects_stereo.html

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,15 @@
7575
camera.position.z = 3200;
7676

7777
scene = new THREE.Scene();
78+
scene.background = new THREE.CubeTextureLoader()
79+
.setPath( 'textures/cube/Park3Med/' )
80+
.load( [ 'px.jpg', 'nx.jpg', 'py.jpg', 'ny.jpg', 'pz.jpg', 'nz.jpg' ] );
7881

7982
var geometry = new THREE.SphereBufferGeometry( 100, 32, 16 );
8083

81-
var path = "textures/cube/skybox/";
82-
var format = '.jpg';
83-
var urls = [
84-
path + 'px' + format, path + 'nx' + format,
85-
path + 'py' + format, path + 'ny' + format,
86-
path + 'pz' + format, path + 'nz' + format
87-
];
88-
89-
var textureCube = new THREE.CubeTextureLoader().load( urls );
84+
var textureCube = new THREE.CubeTextureLoader()
85+
.setPath( 'textures/cube/Park3Med/' )
86+
.load( [ 'px.jpg', 'nx.jpg', 'py.jpg', 'ny.jpg', 'pz.jpg', 'nz.jpg' ] );
9087
textureCube.mapping = THREE.CubeRefractionMapping;
9188

9289
var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: textureCube, refractionRatio: 0.95 } );
@@ -104,23 +101,6 @@
104101

105102
}
106103

107-
// Skybox
108-
109-
var shader = THREE.ShaderLib[ "cube" ];
110-
shader.uniforms[ "tCube" ].value = textureCube;
111-
112-
var material = new THREE.ShaderMaterial( {
113-
114-
fragmentShader: shader.fragmentShader,
115-
vertexShader: shader.vertexShader,
116-
uniforms: shader.uniforms,
117-
side: THREE.BackSide
118-
119-
} ),
120-
121-
mesh = new THREE.Mesh( new THREE.BoxGeometry( 100000, 100000, 100000 ), material );
122-
scene.add( mesh );
123-
124104
//
125105

126106
renderer = new THREE.WebGLRenderer();

‎examples/webgl_geometry_teapot.html

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

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

57-
var camera, scene, sceneCube, renderer;
57+
var camera, scene, renderer;
5858
var cameraControls;
5959
var effectController;
6060
var teapotSize = 400;
@@ -70,7 +70,7 @@
7070
var shading;
7171
var wireMaterial, flatMaterial, gouraudMaterial, phongMaterial, texturedMaterial, reflectiveMaterial;
7272

73-
var teapot;
73+
var teapot, textureCube;
7474

7575
// allocate these just once
7676
var diffuseColor = new THREE.Color();
@@ -127,7 +127,7 @@
127127
path + "pz.jpg", path + "nz.jpg"
128128
];
129129

130-
var textureCube = new THREE.CubeTextureLoader().load( urls );
130+
textureCube = new THREE.CubeTextureLoader().load( urls );
131131

132132
// MATERIALS
133133
var materialColor = new THREE.Color();
@@ -145,26 +145,6 @@
145145

146146
reflectiveMaterial = new THREE.MeshPhongMaterial( { color: materialColor, envMap: textureCube, shading: THREE.SmoothShading, side: THREE.DoubleSide } );
147147

148-
// SKYBOX
149-
var shader = THREE.ShaderLib[ "cube" ];
150-
shader.uniforms[ "tCube" ].value = textureCube;
151-
152-
var skyboxMaterial = new THREE.ShaderMaterial( {
153-
154-
fragmentShader: shader.fragmentShader,
155-
vertexShader: shader.vertexShader,
156-
uniforms: shader.uniforms,
157-
depthWrite: false,
158-
side: THREE.BackSide
159-
160-
} );
161-
162-
skybox = new THREE.Mesh( new THREE.BoxGeometry( 5000, 5000, 5000 ), skyboxMaterial );
163-
164-
// skybox scene - keep camera centered here
165-
sceneCube = new THREE.Scene();
166-
sceneCube.add( skybox );
167-
168148
// scene itself
169149
scene = new THREE.Scene();
170150

@@ -339,20 +319,13 @@
339319
light.color.setHSL( effectController.lhue, effectController.lsaturation, effectController.llightness );
340320

341321
// skybox is rendered separately, so that it is always behind the teapot.
342-
if ( shading === "reflective" )
343-
{
322+
if ( shading === "reflective" ) {
344323

345-
// clear to skybox
346-
renderer.autoClear = false;
347-
skybox.position.copy( camera.position );
348-
renderer.render( sceneCube, camera );
324+
scene.background = textureCube;
349325

350-
}
351-
else
352-
{
326+
} else {
353327

354-
// clear to regular background color
355-
renderer.autoClear = true;
328+
scene.background = null;
356329

357330
}
358331

‎examples/webgl_loader_ctm_materials.html

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<body>
3535
<div id="info">
36-
<a href="http://threejs.org" target="_blank">three.js</a> webgl - baked + real-time illumination -
36+
<a href="http://threejs.org" target="_blank">three.js</a> webgl -
3737
using <a href="http://code.google.com/p/js-openctm/">js-openctm</a> -
3838
camaro by <a href="http://www.turbosquid.com/3d-models/blender-camaro/411348" target="_blank">dskfnwn</a> -
3939
skybox by <a href="http://ict.debevec.org/~debevec/" target="_blank">Paul Debevec</a>
@@ -66,7 +66,6 @@
6666
var mesh;
6767

6868
var textureCube;
69-
var cameraCube, sceneCube;
7069

7170
var loader;
7271

@@ -95,14 +94,6 @@
9594

9695
// SCENE
9796

98-
scene = new THREE.Scene();
99-
100-
// SKYBOX
101-
102-
sceneCube = new THREE.Scene();
103-
cameraCube = new THREE.PerspectiveCamera( 25, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
104-
sceneCube.add( cameraCube );
105-
10697
var r = "textures/cube/pisa/";
10798
var urls = [
10899
r + "px.png", r + "nx.png",
@@ -112,21 +103,8 @@
112103

113104
textureCube = new THREE.CubeTextureLoader().load( urls );
114105

115-
var shader = THREE.ShaderLib[ "cube" ];
116-
shader.uniforms[ "tCube" ].value = textureCube;
117-
118-
var material = new THREE.ShaderMaterial( {
119-
120-
fragmentShader: shader.fragmentShader,
121-
vertexShader: shader.vertexShader,
122-
uniforms: shader.uniforms,
123-
depthWrite: false,
124-
side: THREE.BackSide
125-
126-
} ),
127-
128-
mesh = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
129-
sceneCube.add( mesh );
106+
scene = new THREE.Scene();
107+
scene.background = textureCube;
130108

131109
// LIGHTS
132110

@@ -149,8 +127,6 @@
149127
renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
150128
renderer.domElement.style.position = "relative";
151129

152-
renderer.autoClear = false;
153-
154130
container.appendChild( renderer.domElement );
155131

156132
//
@@ -294,9 +270,6 @@
294270
camera.aspect = SCREEN_WIDTH / SCREEN_HEIGHT;
295271
camera.updateProjectionMatrix();
296272

297-
cameraCube.aspect = SCREEN_WIDTH / SCREEN_HEIGHT;
298-
cameraCube.updateProjectionMatrix();
299-
300273
}
301274

302275

@@ -322,10 +295,6 @@
322295

323296
controls.update();
324297

325-
cameraCube.rotation.copy( camera.rotation );
326-
327-
renderer.clear();
328-
renderer.render( sceneCube, cameraCube );
329298
renderer.render( scene, camera );
330299

331300
}

0 commit comments

Comments
 (0)