diff --git a/docs/api/renderers/WebGLRenderer.html b/docs/api/renderers/WebGLRenderer.html
index 41ed44d254ed9075a35cd780d81caafdd6055451..661e0e5a74d2a250a279857807c4dde49e1de419 100644
--- a/docs/api/renderers/WebGLRenderer.html
+++ b/docs/api/renderers/WebGLRenderer.html
@@ -184,8 +184,8 @@
// Creates a renderer with red background
var renderer = new THREE.WebGLRenderer();
- renderer.setSize(200, 100);
- renderer.setClearColor(0xff0000, 1);
+ renderer.setSize( 200, 100 );
+ renderer.setClearColor( 0xff0000 );
[method:Color getClearColor]()
diff --git a/docs/scenes/js/material.js b/docs/scenes/js/material.js
index f63476477fd2e5ab4ad5a3052bce8de7c0f5e771..98ffbcc16c02d695cffe02f6332b5a8a936cacbb 100644
--- a/docs/scenes/js/material.js
+++ b/docs/scenes/js/material.js
@@ -3,60 +3,60 @@
*/
var constants = {
-
+
combine: {
-
+
"THREE.MultiplyOperation" : THREE.MultiplyOperation,
"THREE.MixOperation" : THREE.MixOperation,
"THREE.AddOperation" : THREE.AddOperation
-
+
},
-
+
side : {
-
+
"THREE.FrontSide" : THREE.FrontSide,
"THREE.BackSide" : THREE.BackSide,
"THREE.DoubleSide" : THREE.DoubleSide
-
+
},
-
+
shading : {
-
+
"THREE.NoShading" : THREE.NoShading,
"THREE.FlatShading" : THREE.FlatShading,
"THREE.SmoothShading" : THREE.SmoothShading
-
+
},
colors : {
-
+
"THREE.NoColors" : THREE.NoColors,
"THREE.FaceColors" : THREE.FaceColors,
"THREE.VertexColors" : THREE.VertexColors
-
+
},
-
+
blendingMode : {
-
+
"THREE.NoBlending" : THREE.NoBlending,
"THREE.NormalBlending" : THREE.NormalBlending,
"THREE.AdditiveBlending" : THREE.AdditiveBlending,
"THREE.SubtractiveBlending" : THREE.SubtractiveBlending,
"THREE.MultiplyBlending" : THREE.MultiplyBlending,
"THREE.CustomBlending" : THREE.CustomBlending
-
+
},
-
+
equations : {
-
+
"THREE.AddEquation" : THREE.AddEquation,
"THREE.SubtractEquation" : THREE.SubtractEquation,
"THREE.ReverseSubtractEquation" : THREE.ReverseSubtractEquation
-
+
},
-
+
destinationFactors : {
-
+
"THREE.ZeroFactor" : THREE.ZeroFactor,
"THREE.OneFactor" : THREE.OneFactor,
"THREE.SrcColorFactor" : THREE.SrcColorFactor,
@@ -65,38 +65,38 @@ var constants = {
"THREE.OneMinusSrcAlphaFactor" : THREE.OneMinusSrcAlphaFactor,
"THREE.DstAlphaFactor" : THREE.DstAlphaFactor,
"THREE.OneMinusDstAlphaFactor" : THREE.OneMinusDstAlphaFactor
-
+
},
-
+
sourceFactors : {
-
+
"THREE.DstColorFactor" : THREE.DstColorFactor,
"THREE.OneMinusDstColorFactor" : THREE.OneMinusDstColorFactor,
"THREE.SrcAlphaSaturateFactor" : THREE.SrcAlphaSaturateFactor
-
+
}
-
+
}
function getObjectsKeys( obj ) {
-
+
var keys = [];
-
+
for ( var key in obj ) {
-
+
if ( obj.hasOwnProperty( key ) ) {
-
+
keys.push( key );
-
+
}
-
+
}
-
+
return keys;
}
var envMaps = (function () {
-
+
var path = "../../examples/textures/cube/SwedishRoyalCastle/";
var format = '.jpg';
var urls = [
@@ -111,32 +111,32 @@ var envMaps = (function () {
var refractionCube = new THREE.Texture( reflectionCube.image, THREE.CubeRefractionMapping );
reflectionCube.format = THREE.RGBFormat;
-
+
return {
none : null,
reflection : reflectionCube,
refraction : refractionCube
};
-
+
})();
var envMapKeys = getObjectsKeys( envMaps );
var textureMaps = (function () {
-
+
return {
none : null,
grass : THREE.ImageUtils.loadTexture( "../../examples/textures/terrain/grasslight-thin.jpg" )
};
-
+
})();
var textureMapKeys = getObjectsKeys( textureMaps );
function generateVertexColors ( geometry ) {
-
+
for ( var i=0, il = geometry.faces.length; i < il; i++ ) {
-
+
geometry.faces[i].vertexColors.push( new THREE.Color().setHSL(
i / il * Math.random(),
0.5,
@@ -152,15 +152,15 @@ function generateVertexColors ( geometry ) {
0.5,
0.5
) );
-
+
geometry.faces[i].color = new THREE.Color().setHSL(
i / il * Math.random(),
0.5,
0.5
);
-
+
}
-
+
}
function generateMorphTargets ( mesh, geometry ) {
@@ -172,7 +172,7 @@ function generateMorphTargets ( mesh, geometry ) {
vertices.push( geometry.vertices[ i ].clone() );
scale = 1 + Math.random() * 0.3;
-
+
vertices[ vertices.length - 1 ].x *= scale;
vertices[ vertices.length - 1 ].y *= scale;
vertices[ vertices.length - 1 ].z *= scale;
@@ -180,31 +180,31 @@ function generateMorphTargets ( mesh, geometry ) {
}
geometry.morphTargets.push( { name: "target1", vertices: vertices } );
-
+
geometry.update
}
function handleColorChange ( color ) {
-
+
return function ( value ){
-
+
if (typeof value === "string") {
-
+
value = value.replace('#', '0x');
-
+
}
-
+
color.setHex( value );
-
+
};
-
+
}
function needsUpdate ( material, geometry ) {
-
+
return function () {
-
+
material.shading = +material.shading; //Ensure number
material.vertexColors = +material.vertexColors; //Ensure number
material.side = +material.side; //Ensure number
@@ -212,63 +212,63 @@ function needsUpdate ( material, geometry ) {
geometry.verticesNeedUpdate = true;
geometry.normalsNeedUpdate = true;
geometry.colorsNeedUpdate = true;
-
+
};
-
+
};
function updateMorphs ( torus, material ) {
return function () {
-
+
torus.updateMorphTargets();
material.needsUpdate = true;
-
+
};
-
+
}
function updateTexture ( material, materialKey, textures ) {
return function ( key ) {
-
+
material[materialKey] = textures[key];
material.needsUpdate = true;
-
+
};
-
+
}
function guiScene ( gui, scene ) {
-
+
var folder = gui.addFolder('Scene');
-
+
var data = {
background : "#000000",
"ambient light" : ambientLight.color.getHex()
}
-
+
var color = new THREE.Color();
var colorConvert = handleColorChange( color );
-
+
folder.addColor( data, "background" ).onChange( function ( value ) {
-
+
colorConvert( value );
-
- renderer.setClearColor(color.getHex(), 1);
-
+
+ renderer.setClearColor( color.getHex() );
+
} );
-
+
folder.addColor( data, "ambient light" ).onChange( handleColorChange( ambientLight.color ) )
-
+
guiSceneFog( folder, scene );
-
+
}
function guiSceneFog ( folder, scene ) {
-
+
var fogFolder = folder.addFolder('scene.fog');
-
+
var fog = new THREE.Fog( 0x3f7b9d, 0, 60 );
var data = {
@@ -277,29 +277,29 @@ function guiSceneFog ( folder, scene ) {
"scene.fog.color" : fog.color.getHex()
}
};
-
+
fogFolder.add( data.fog, 'THREE.Fog()' ).onChange( function ( useFog ) {
-
+
if ( useFog ) {
-
+
scene.fog = fog;
-
+
} else {
-
+
scene.fog = null;
-
+
}
-
+
} );
-
+
fogFolder.addColor( data.fog, 'scene.fog.color').onChange( handleColorChange( fog.color ) );
-
+
}
function guiMaterial ( gui, mesh, material, geometry ) {
-
+
var folder = gui.addFolder('THREE.Material');
-
+
folder.add( material, 'transparent' );
folder.add( material, 'opacity', 0, 1 );
// folder.add( material, 'blending', constants.blendingMode );
@@ -315,11 +315,11 @@ function guiMaterial ( gui, mesh, material, geometry ) {
// folder.add( material, 'overdraw', 0, 5 );
folder.add( material, 'visible' );
folder.add( material, 'side', constants.side ).onChange( needsUpdate( material, geometry ) );
-
+
}
function guiMeshBasicMaterial ( gui, mesh, material, geometry ) {
-
+
var data = {
color : material.color.getHex(),
envMaps : envMapKeys,
@@ -328,7 +328,7 @@ function guiMeshBasicMaterial ( gui, mesh, material, geometry ) {
specularMap : textureMapKeys,
alphaMap : textureMapKeys
};
-
+
var folder = gui.addFolder('THREE.MeshBasicMaterial');
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
@@ -337,7 +337,7 @@ function guiMeshBasicMaterial ( gui, mesh, material, geometry ) {
folder.add( material, 'shading', constants.shading);
folder.add( material, 'vertexColors', constants.colors).onChange( needsUpdate( material, geometry ) );
folder.add( material, 'fog' );
-
+
folder.add( data, 'envMaps', envMapKeys ).onChange( updateTexture( material, 'envMap', envMaps ) );
folder.add( data, 'map', textureMapKeys ).onChange( updateTexture( material, 'map', textureMaps ) );
folder.add( data, 'lightMap', textureMapKeys ).onChange( updateTexture( material, 'lightMap', textureMaps ) );
@@ -348,36 +348,36 @@ function guiMeshBasicMaterial ( gui, mesh, material, geometry ) {
folder.add( material, 'reflectivity', 0, 1 );
folder.add( material, 'refractionRatio', 0, 1 );
//folder.add( material, 'skinning' );
-
+
}
function guiMeshDepthMaterial ( gui, mesh, material, geometry ) {
-
+
var folder = gui.addFolder('THREE.MeshDepthMaterial');
-
+
folder.add( material, 'wireframe' );
folder.add( material, 'wireframeLinewidth', 0, 10 );
folder.add( material, 'morphTargets' ).onChange( updateMorphs( mesh, material ) );
-
+
}
function guiMeshNormalMaterial ( gui, mesh, material, geometry ) {
-
+
var folder = gui.addFolder('THREE.MeshNormalMaterial');
-
+
folder.add( material, 'shading', constants.shading).onChange( needsUpdate( material, geometry ) );
folder.add( material, 'wireframe' );
folder.add( material, 'wireframeLinewidth', 0, 10 );
folder.add( material, 'morphTargets' ).onChange( updateMorphs( mesh, material ) );
-
+
}
function guiLineBasicMaterial ( gui, mesh, material, geometry ) {
-
+
var data = {
color : material.color.getHex()
};
-
+
var folder = gui.addFolder('THREE.LineBasicMaterial');
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
@@ -386,11 +386,11 @@ function guiLineBasicMaterial ( gui, mesh, material, geometry ) {
folder.add( material, 'linejoin', ["round", "bevel", "miter"] );
folder.add( material, 'vertexColors', constants.colors).onChange( needsUpdate( material, geometry ) );
folder.add( material, 'fog' );
-
+
}
function guiMeshLambertMaterial ( gui, mesh, material, geometry ) {
-
+
var data = {
color : material.color.getHex(),
ambient : material.ambient.getHex(),
@@ -401,15 +401,15 @@ function guiMeshLambertMaterial ( gui, mesh, material, geometry ) {
specularMap : textureMapKeys,
alphaMap : textureMapKeys
};
-
+
var envObj = {};
-
+
var folder = gui.addFolder('THREE.MeshLambertMaterial');
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
folder.addColor( data, 'ambient' ).onChange( handleColorChange( material.ambient ) );
folder.addColor( data, 'emissive' ).onChange( handleColorChange( material.emissive ) );
-
+
folder.add( material, 'shading', constants.shading ).onChange( needsUpdate( material, geometry ) );
folder.add( material, 'wireframe' );
folder.add( material, 'wireframeLinewidth', 0, 10 );
@@ -426,11 +426,11 @@ function guiMeshLambertMaterial ( gui, mesh, material, geometry ) {
folder.add( material, 'reflectivity', 0, 1 );
folder.add( material, 'refractionRatio', 0, 1 );
//folder.add( material, 'skinning' );
-
+
}
function guiMeshPhongMaterial ( gui, mesh, material, geometry ) {
-
+
var data = {
color : material.color.getHex(),
ambient : material.ambient.getHex(),
@@ -442,7 +442,7 @@ function guiMeshPhongMaterial ( gui, mesh, material, geometry ) {
specularMap : textureMapKeys,
alphaMap : textureMapKeys
};
-
+
var folder = gui.addFolder('THREE.MeshPhongMaterial');
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
@@ -461,16 +461,16 @@ function guiMeshPhongMaterial ( gui, mesh, material, geometry ) {
folder.add( data, 'lightMap', textureMapKeys ).onChange( updateTexture( material, 'lightMap', textureMaps ) );
folder.add( data, 'specularMap', textureMapKeys ).onChange( updateTexture( material, 'specularMap', textureMaps ) );
folder.add( data, 'alphaMap', textureMapKeys ).onChange( updateTexture( material, 'alphaMap', textureMaps ) );
-
+
}
function chooseFromHash ( gui, mesh, geometry ) {
var selectedMaterial = window.location.hash.substring(1) || "MeshBasicMaterial";
var material;
-
+
switch (selectedMaterial) {
-
+
case "MeshBasicMaterial" :
material = new THREE.MeshBasicMaterial({color: 0x2194CE});
@@ -480,7 +480,7 @@ function chooseFromHash ( gui, mesh, geometry ) {
return material;
break;
-
+
case "MeshLambertMaterial" :
material = new THREE.MeshLambertMaterial({color: 0x2194CE});
@@ -490,7 +490,7 @@ function chooseFromHash ( gui, mesh, geometry ) {
return material;
break;
-
+
case "MeshPhongMaterial" :
material = new THREE.MeshPhongMaterial({color: 0x2194CE});
@@ -500,27 +500,27 @@ function chooseFromHash ( gui, mesh, geometry ) {
return material;
break;
-
+
case "MeshDepthMaterial" :
-
+
material = new THREE.MeshDepthMaterial({color: 0x2194CE});
guiMaterial( gui, mesh, material, geometry );
guiMeshDepthMaterial( gui, mesh, material, geometry );
return material;
-
+
break;
-
+
case "MeshNormalMaterial" :
-
+
material = new THREE.MeshNormalMaterial();
guiMaterial( gui, mesh, material, geometry );
guiMeshNormalMaterial( gui, mesh, material, geometry );
return material;
-
+
break;
-
+
case "LineBasicMaterial" :
material = new THREE.LineBasicMaterial({color: 0x2194CE});
@@ -531,5 +531,5 @@ function chooseFromHash ( gui, mesh, geometry ) {
break;
}
-
+
}
diff --git a/examples/canvas_lines_colors_2d.html b/examples/canvas_lines_colors_2d.html
index 2ff31e7518d9480be9dc4f129691c7b694029bea..aee9ac31ad66b857986efbfef9faa2d3c02c7a08 100644
--- a/examples/canvas_lines_colors_2d.html
+++ b/examples/canvas_lines_colors_2d.html
@@ -80,8 +80,7 @@
scene = new THREE.Scene();
- renderer = new THREE.CanvasRenderer( { antialias: false } );
- renderer.setClearColor( 0x000000, 1 );
+ renderer = new THREE.CanvasRenderer();
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
container.appendChild( renderer.domElement );
diff --git a/examples/canvas_lines_dashed.html b/examples/canvas_lines_dashed.html
index 9dc2952700eb226dc69a9d908730dc1756dcf685..7c0431996dd7231bce7f2df2f5d28a3f98eecf05 100644
--- a/examples/canvas_lines_dashed.html
+++ b/examples/canvas_lines_dashed.html
@@ -99,7 +99,7 @@
scene.add( object );
renderer = new THREE.CanvasRenderer();
- renderer.setClearColor( 0x111111, 1 );
+ renderer.setClearColor( 0x111111 );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( WIDTH, HEIGHT );
diff --git a/examples/js/crossfade/scenes.js b/examples/js/crossfade/scenes.js
index c532ac00e339ba16b5455737ec6b0f75127e04bb..f3d2628f05fc37adf5356b18d6c241d11c0ee18f 100644
--- a/examples/js/crossfade/scenes.js
+++ b/examples/js/crossfade/scenes.js
@@ -1,7 +1,7 @@
function generateGeometry(objectType, numObjects) {
var geometry = new THREE.Geometry();
-
+
function applyVertexColors( g, c ) {
g.faces.forEach( function( f ) {
@@ -19,7 +19,7 @@ function generateGeometry(objectType, numObjects) {
}
for ( var i = 0; i < numObjects; i ++ ) {
-
+
var position = new THREE.Vector3();
position.x = Math.random() * 10000 - 5000;
@@ -51,7 +51,7 @@ function generateGeometry(objectType, numObjects) {
scale.y = scale.z = scale.x;
color.setRGB( Math.random()+0.1, 0, 0 );
}
-
+
// give the geom's vertices a random color, to be displayed
applyVertexColors( geom, color );
@@ -70,12 +70,12 @@ function generateGeometry(objectType, numObjects) {
}
function Scene ( type, numObjects, cameraZ, fov, rotationSpeed, clearColor ) {
-
+
this.clearColor = clearColor;
-
+
this.camera = new THREE.PerspectiveCamera( fov, window.innerWidth / window.innerHeight, 1, 10000 );
this.camera.position.z = cameraZ;
-
+
// Setup scene
this.scene = new THREE.Scene();
this.scene.add( new THREE.AmbientLight( 0x555555 ) );
@@ -91,19 +91,19 @@ function Scene ( type, numObjects, cameraZ, fov, rotationSpeed, clearColor ) {
renderTargetParameters = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat, stencilBuffer: false };
this.fbo = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, renderTargetParameters );
-
+
this.render = function( delta, rtt ) {
-
+
this.mesh.rotation.x += delta*this.rotationSpeed.x;
this.mesh.rotation.y += delta*this.rotationSpeed.y;
this.mesh.rotation.z += delta*this.rotationSpeed.z;
-
- renderer.setClearColor( this.clearColor, 1 );
-
+
+ renderer.setClearColor( this.clearColor );
+
if (rtt)
renderer.render( this.scene, this.camera, this.fbo, true );
else
renderer.render( this.scene, this.camera );
-
+
};
}
diff --git a/examples/misc_animation_keys.html b/examples/misc_animation_keys.html
index 52a3c7ce3950fab962bbb71a981f1ed0e2898cc8..69cfd7799f4b30cbc9d116eff79c3a4d4efe4501 100644
--- a/examples/misc_animation_keys.html
+++ b/examples/misc_animation_keys.html
@@ -59,7 +59,7 @@
camera.lookAt(new THREE.Vector3( 0, 0, 0 ));
renderer = new THREE.WebGLRenderer();
- renderer.setClearColor( 0x555555, 1 );
+ renderer.setClearColor( 0x555555 );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
container.appendChild( renderer.domElement );
diff --git a/examples/misc_controls_orbit.html b/examples/misc_controls_orbit.html
index 5a894d005b5dd0d114468b76824fd4f4c9e94a0f..df08449ee68f0d84c5cf1d1eba9ab6306bd921af 100644
--- a/examples/misc_controls_orbit.html
+++ b/examples/misc_controls_orbit.html
@@ -109,7 +109,7 @@
// renderer
renderer = new THREE.WebGLRenderer( { antialias: false } );
- renderer.setClearColor( scene.fog.color, 1 );
+ renderer.setClearColor( scene.fog.color );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
diff --git a/examples/misc_controls_trackball.html b/examples/misc_controls_trackball.html
index 6f5a631879a0f96559e2b5a5c22898eb20499000..0a3c64fa91182ccf38ac61e28cc894d98842cbdc 100644
--- a/examples/misc_controls_trackball.html
+++ b/examples/misc_controls_trackball.html
@@ -117,7 +117,7 @@
// renderer
renderer = new THREE.WebGLRenderer( { antialias: false } );
- renderer.setClearColor( scene.fog.color, 1 );
+ renderer.setClearColor( scene.fog.color );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
diff --git a/examples/webgl_animation_skinning_blending.html b/examples/webgl_animation_skinning_blending.html
index 2b532e00386fa066428b7f0f0b254393d266399a..8b7cc2dc1fb87309a9c2f65346a1c03dd8ca4845 100644
--- a/examples/webgl_animation_skinning_blending.html
+++ b/examples/webgl_animation_skinning_blending.html
@@ -68,7 +68,7 @@
scene.add( light );
renderer = new THREE.WebGLRenderer( { antialias: true, alpha: false } );
- renderer.setClearColor( '#777777', 1 );
+ renderer.setClearColor( 0x777777 );
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.autoClear = true;
@@ -263,4 +263,3 @@