Merge branch 'sheen' of https://github.com/DanielSturk/three.js into HEAD

build/three.js

@@ -185,8 +185,9 @@
 
 	} );
 
-	var REVISION = '106';
-	var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
+	var REVISION = '107dev';
+	var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2, ROTATE: 0, DOLLY: 1, PAN: 2 };
+	var TOUCH = { ROTATE: 0, PAN: 1, DOLLY_PAN: 2, DOLLY_ROTATE: 3 };
 	var CullFaceNone = 0;
 	var CullFaceBack = 1;
 	var CullFaceFront = 2;
@@ -256,10 +257,14 @@
 	var ClampToEdgeWrapping = 1001;
 	var MirroredRepeatWrapping = 1002;
 	var NearestFilter = 1003;
+	var NearestMipmapNearestFilter = 1004;
 	var NearestMipMapNearestFilter = 1004;
+	var NearestMipmapLinearFilter = 1005;
 	var NearestMipMapLinearFilter = 1005;
 	var LinearFilter = 1006;
+	var LinearMipmapNearestFilter = 1007;
 	var LinearMipMapNearestFilter = 1007;
+	var LinearMipmapLinearFilter = 1008;
 	var LinearMipMapLinearFilter = 1008;
 	var UnsignedByteType = 1009;
 	var ByteType = 1010;
@@ -330,6 +335,24 @@
 	var TangentSpaceNormalMap = 0;
 	var ObjectSpaceNormalMap = 1;
 
+	var ZeroStencilOp = 0;
+	var KeepStencilOp = 7680;
+	var ReplaceStencilOp = 7681;
+	var IncrementStencilOp = 7682;
+	var DecrementStencilOp = 7683;
+	var IncrementWrapStencilOp = 34055;
+	var DecrementWrapStencilOp = 34056;
+	var InvertStencilOp = 5386;
+
+	var NeverStencilFunc = 512;
+	var LessStencilFunc = 513;
+	var EqualStencilFunc = 514;
+	var LessEqualStencilFunc = 515;
+	var GreaterStencilFunc = 516;
+	var NotEqualStencilFunc = 517;
+	var GreaterEqualStencilFunc = 518;
+	var AlwaysStencilFunc = 519;
+
 	/**
 	 * @author alteredq / http://alteredqualia.com/
 	 * @author mrdoob / http://mrdoob.com/
@@ -2787,7 +2810,7 @@
 		this.wrapT = wrapT !== undefined ? wrapT : ClampToEdgeWrapping;
 
 		this.magFilter = magFilter !== undefined ? magFilter : LinearFilter;
-		this.minFilter = minFilter !== undefined ? minFilter : LinearMipMapLinearFilter;
+		this.minFilter = minFilter !== undefined ? minFilter : LinearMipmapLinearFilter;
 
 		this.anisotropy = anisotropy !== undefined ? anisotropy : 1;
 
@@ -8562,6 +8585,14 @@
 		this.depthTest = true;
 		this.depthWrite = true;
 
+		this.stencilFunc = AlwaysStencilFunc;
+		this.stencilRef = 0;
+		this.stencilMask = 0xff;
+		this.stencilFail = KeepStencilOp;
+		this.stencilZFail = KeepStencilOp;
+		this.stencilZPass = KeepStencilOp;
+		this.stencilWrite = false;
+
 		this.clippingPlanes = null;
 		this.clipIntersection = false;
 		this.clipShadows = false;
@@ -8761,6 +8792,14 @@
 			data.depthTest = this.depthTest;
 			data.depthWrite = this.depthWrite;
 
+			data.stencilWrite = this.stencilWrite;
+			data.stencilFunc = this.stencilFunc;
+			data.stencilRef = this.stencilRef;
+			data.stencilMask = this.stencilMask;
+			data.stencilFail = this.stencilFail;
+			data.stencilZFail = this.stencilZFail;
+			data.stencilZPass = this.stencilZPass;
+
 			// rotation (SpriteMaterial)
 			if ( this.rotation && this.rotation !== 0 ) data.rotation = this.rotation;
 
@@ -8854,6 +8893,14 @@
 			this.depthTest = source.depthTest;
 			this.depthWrite = source.depthWrite;
 
+			this.stencilWrite = source.stencilWrite;
+			this.stencilFunc = source.stencilFunc;
+			this.stencilRef = source.stencilRef;
+			this.stencilMask = source.stencilMask;
+			this.stencilFail = source.stencilFail;
+			this.stencilZFail = source.stencilZFail;
+			this.stencilZPass = source.stencilZPass;
+
 			this.colorWrite = source.colorWrite;
 
 			this.precision = source.precision;
@@ -12124,8 +12171,6 @@
 				vertices2 = geometry.vertices,
 				faces1 = this.faces,
 				faces2 = geometry.faces,
-				uvs1 = this.faceVertexUvs[ 0 ],
-				uvs2 = geometry.faceVertexUvs[ 0 ],
 				colors1 = this.colors,
 				colors2 = geometry.colors;
 
@@ -12207,23 +12252,25 @@
 
 			// uvs
 
-			for ( i = 0, il = uvs2.length; i < il; i ++ ) {
+			for ( var i = 0, il = geometry.faceVertexUvs.length; i < il; i ++ ) {
 
-				var uv = uvs2[ i ], uvCopy = [];
+				var faceVertexUvs2 = geometry.faceVertexUvs[ i ];
 
-				if ( uv === undefined ) {
+				if ( this.faceVertexUvs[ i ] === undefined ) this.faceVertexUvs[ i ] = [];
 
-					continue;
+				for ( var j = 0, jl = faceVertexUvs2.length; j < jl; j ++ ) {
 
-				}
+					var uvs2 = faceVertexUvs2[ j ], uvsCopy = [];
 
-				for ( var j = 0, jl = uv.length; j < jl; j ++ ) {
+					for ( var k = 0, kl = uvs2.length; k < kl; k ++ ) {
 
-					uvCopy.push( uv[ j ].clone() );
+						uvsCopy.push( uvs2[ k ].clone() );
 
-				}
+					}
 
-				uvs1.push( uvCopy );
+					this.faceVertexUvs[ i ].push( uvsCopy );
+
+				}
 
 			}
 
@@ -16187,22 +16234,18 @@
 
 		}
 
-		function getWireframeAttribute( geometry ) {
-
-			var attribute = wireframeAttributes[ geometry.id ];
-
-			if ( attribute ) return attribute;
+		function updateWireframeAttribute( geometry ) {
 
 			var indices = [];
 
 			var geometryIndex = geometry.index;
-			var geometryAttributes = geometry.attributes;
-
-			// console.time( 'wireframe' );
+			var geometryPosition = geometry.attributes.position;
+			var version = 0;
 
 			if ( geometryIndex !== null ) {
 
 				var array = geometryIndex.array;
+				version = geometryIndex.version;
 
 				for ( var i = 0, l = array.length; i < l; i += 3 ) {
 
@@ -16216,7 +16259,8 @@
 
 			} else {
 
-				var array = geometryAttributes.position.array;
+				var array = geometryPosition.array;
+				version = geometryPosition.version;
 
 				for ( var i = 0, l = ( array.length / 3 ) - 1; i < l; i += 3 ) {
 
@@ -16230,15 +16274,50 @@
 
 			}
 
-			// console.timeEnd( 'wireframe' );
-
-			attribute = new ( arrayMax( indices ) > 65535 ? Uint32BufferAttribute : Uint16BufferAttribute )( indices, 1 );
+			var attribute = new ( arrayMax( indices ) > 65535 ? Uint32BufferAttribute : Uint16BufferAttribute )( indices, 1 );
+			attribute.version = version;
 
 			attributes.update( attribute, 34963 );
 
+			//
+
+			var previousAttribute = wireframeAttributes[ geometry.id ];
+
+			if ( previousAttribute ) attributes.remove( previousAttribute );
+
+			//
+
 			wireframeAttributes[ geometry.id ] = attribute;
 
-			return attribute;
+		}
+
+		function getWireframeAttribute( geometry ) {
+
+			var currentAttribute = wireframeAttributes[ geometry.id ];
+
+			if ( currentAttribute ) {
+
+				var geometryIndex = geometry.index;
+
+				if ( geometryIndex !== null ) {
+
+					// if the attribute is obsolete, create a new one
+
+					if ( currentAttribute.version < geometryIndex.version ) {
+
+						updateWireframeAttribute( geometry );
+
+					}
+
+				}
+
+			} else {
+
+				updateWireframeAttribute( geometry );
+
+			}
+
+			return wireframeAttributes[ geometry.id ];
 
 		}
 
@@ -17745,7 +17824,7 @@
 
 	function WebGLProgram( renderer, extensions, code, material, shader, parameters, capabilities ) {
 
-		var gl = renderer.context;
+		var gl = renderer.getContext();
 
 		var defines = material.defines;
 
@@ -19552,7 +19631,7 @@
 
 			var currentRenderTarget = _renderer.getRenderTarget();
 			var activeCubeFace = _renderer.getActiveCubeFace();
-			var activeMipMapLevel = _renderer.getActiveMipMapLevel();
+			var activeMipmapLevel = _renderer.getActiveMipmapLevel();
 
 			var _state = _renderer.state;
 
@@ -19710,7 +19789,7 @@
 
 			scope.needsUpdate = false;
 
-			_renderer.setRenderTarget( currentRenderTarget, activeCubeFace, activeMipMapLevel );
+			_renderer.setRenderTarget( currentRenderTarget, activeCubeFace, activeMipmapLevel );
 
 		};
 
@@ -20556,6 +20635,15 @@
 			depthBuffer.setMask( material.depthWrite );
 			colorBuffer.setMask( material.colorWrite );
 
+			var stencilWrite = material.stencilWrite;
+			stencilBuffer.setTest( stencilWrite );
+			if ( stencilWrite ) {
+
+				stencilBuffer.setFunc( material.stencilFunc, material.stencilRef, material.stencilMask );
+				stencilBuffer.setOp( material.stencilFail, material.stencilZFail, material.stencilZPass );
+
+			}
+
 			setPolygonOffset( material.polygonOffset, material.polygonOffsetFactor, material.polygonOffsetUnits );
 
 		}
@@ -21019,7 +21107,7 @@
 
 		function filterFallback( f ) {
 
-			if ( f === NearestFilter || f === NearestMipMapNearestFilter || f === NearestMipMapLinearFilter ) {
+			if ( f === NearestFilter || f === NearestMipmapNearestFilter || f === NearestMipmapLinearFilter ) {
 
 				return 9728;
 
@@ -22045,12 +22133,12 @@
 			if ( p === MirroredRepeatWrapping ) return 33648;
 
 			if ( p === NearestFilter ) return 9728;
-			if ( p === NearestMipMapNearestFilter ) return 9984;
-			if ( p === NearestMipMapLinearFilter ) return 9986;
+			if ( p === NearestMipmapNearestFilter ) return 9984;
+			if ( p === NearestMipmapLinearFilter ) return 9986;
 
 			if ( p === LinearFilter ) return 9729;
-			if ( p === LinearMipMapNearestFilter ) return 9985;
-			if ( p === LinearMipMapLinearFilter ) return 9987;
+			if ( p === LinearMipmapNearestFilter ) return 9985;
+			if ( p === LinearMipmapLinearFilter ) return 9987;
 
 			if ( p === UnsignedByteType ) return 5121;
 			if ( p === UnsignedShort4444Type ) return 32819;
@@ -22715,12 +22803,10 @@
 	 * @author mrdoob / http://mrdoob.com/
 	 */
 
-	function WebXRManager( renderer ) {
+	function WebXRManager( renderer, gl ) {
 
 		var scope = this;
 
-		var gl = renderer.context;
-
 		var session = null;
 
 		var referenceSpace = null;
@@ -23062,7 +23148,6 @@
 		// public properties
 
 		this.domElement = _canvas;
-		this.context = null;
 
 		// Debug configuration container
 		this.debug = {
@@ -23285,7 +23370,6 @@
 
 			info.programs = programCache.programs;
 
-			_this.context = _gl;
 			_this.capabilities = capabilities;
 			_this.extensions = extensions;
 			_this.properties = properties;
@@ -23299,7 +23383,7 @@
 
 		// vr
 
-		var vr = ( typeof navigator !== 'undefined' && 'xr' in navigator && 'supportsSession' in navigator.xr ) ? new WebXRManager( _this ) : new WebVRManager( _this );
+		var vr = ( typeof navigator !== 'undefined' && 'xr' in navigator && 'supportsSession' in navigator.xr ) ? new WebXRManager( _this, _gl ) : new WebVRManager( _this );
 
 		this.vr = vr;
 
@@ -25385,7 +25469,7 @@
 
 		};
 
-		this.getActiveMipMapLevel = function () {
+		this.getActiveMipmapLevel = function () {
 
 			return _currentActiveMipmapLevel;
 
@@ -25397,11 +25481,11 @@
 
 		};
 
-		this.setRenderTarget = function ( renderTarget, activeCubeFace, activeMipMapLevel ) {
+		this.setRenderTarget = function ( renderTarget, activeCubeFace, activeMipmapLevel ) {
 
 			_currentRenderTarget = renderTarget;
 			_currentActiveCubeFace = activeCubeFace;
-			_currentActiveMipmapLevel = activeMipMapLevel;
+			_currentActiveMipmapLevel = activeMipmapLevel;
 
 			if ( renderTarget && properties.get( renderTarget ).__webglFramebuffer === undefined ) {
 
@@ -25457,7 +25541,7 @@
 			if ( isCube ) {
 
 				var textureProperties = properties.get( renderTarget.texture );
-				_gl.framebufferTexture2D( 36160, 36064, 34069 + ( activeCubeFace || 0 ), textureProperties.__webglTexture, activeMipMapLevel || 0 );
+				_gl.framebufferTexture2D( 36160, 36064, 34069 + ( activeCubeFace || 0 ), textureProperties.__webglTexture, activeMipmapLevel || 0 );
 
 			}
 
@@ -27211,29 +27295,43 @@
 			var geometry = this.geometry;
 			var m, ml, name;
 
-			var morphAttributes = geometry.morphAttributes;
-			var keys = Object.keys( morphAttributes );
+			if ( geometry.isBufferGeometry ) {
 
-			if ( keys.length > 0 ) {
+				var morphAttributes = geometry.morphAttributes;
+				var keys = Object.keys( morphAttributes );
 
-				var morphAttribute = morphAttributes[ keys[ 0 ] ];
+				if ( keys.length > 0 ) {
 
-				if ( morphAttribute !== undefined ) {
+					var morphAttribute = morphAttributes[ keys[ 0 ] ];
 
-					this.morphTargetInfluences = [];
-					this.morphTargetDictionary = {};
+					if ( morphAttribute !== undefined ) {
+
+						this.morphTargetInfluences = [];
+						this.morphTargetDictionary = {};
 
-					for ( m = 0, ml = morphAttribute.length; m < ml; m ++ ) {
+						for ( m = 0, ml = morphAttribute.length; m < ml; m ++ ) {
 
-						name = morphAttribute[ m ].name || String( m );
+							name = morphAttribute[ m ].name || String( m );
 
-						this.morphTargetInfluences.push( 0 );
-						this.morphTargetDictionary[ name ] = m;
+							this.morphTargetInfluences.push( 0 );
+							this.morphTargetDictionary[ name ] = m;
+
+						}
 
 					}
 
 				}
 
+			} else {
+
+				var morphTargets = geometry.morphTargets;
+
+				if ( morphTargets !== undefined && morphTargets.length > 0 ) {
+
+					console.error( 'THREE.Points.updateMorphTargets() does not support THREE.Geometry. Use THREE.BufferGeometry instead.' );
+
+				}
+
 			}
 
 		},
@@ -35215,7 +35313,7 @@
 				texture.wrapT = texData.wrapT !== undefined ? texData.wrapT : ClampToEdgeWrapping;
 
 				texture.magFilter = texData.magFilter !== undefined ? texData.magFilter : LinearFilter;
-				texture.minFilter = texData.minFilter !== undefined ? texData.minFilter : LinearMipMapLinearFilter;
+				texture.minFilter = texData.minFilter !== undefined ? texData.minFilter : LinearMipmapLinearFilter;
 
 				texture.anisotropy = texData.anisotropy !== undefined ? texData.anisotropy : 1;
 
@@ -39563,11 +39661,11 @@
 
 	var TEXTURE_FILTER = {
 		NearestFilter: NearestFilter,
-		NearestMipMapNearestFilter: NearestMipMapNearestFilter,
-		NearestMipMapLinearFilter: NearestMipMapLinearFilter,
+		NearestMipmapNearestFilter: NearestMipmapNearestFilter,
+		NearestMipmapLinearFilter: NearestMipmapLinearFilter,
 		LinearFilter: LinearFilter,
-		LinearMipMapNearestFilter: LinearMipMapNearestFilter,
-		LinearMipMapLinearFilter: LinearMipMapLinearFilter
+		LinearMipmapNearestFilter: LinearMipmapNearestFilter,
+		LinearMipmapLinearFilter: LinearMipmapLinearFilter
 	};
 
 	/**
@@ -48415,6 +48513,12 @@
 
 			console.warn( 'THREE.WebGLRenderer: .setTextureCube() has been removed.' );
 
+		},
+		getActiveMipMapLevel: function () {
+
+			console.warn( 'THREE.WebGLRenderer: .getActiveMipMapLevel() is now .getActiveMipmapLevel().' );
+			return this.getActiveMipmapLevel();
+
 		}
 
 	} );
@@ -48458,8 +48562,17 @@
 
 				console.warn( 'THREE.WebGLRenderer: .shadowMapCullFace has been removed. Set Material.shadowSide instead.' );
 
+			}
+		},
+		context: {
+			get: function () {
+
+				console.warn( 'THREE.WebGLRenderer: .context has been removed. Use .getContext() instead.' );
+				return this.getContext();
+
 			}
 		}
+
 	} );
 
 	Object.defineProperties( WebGLShadowMap.prototype, {
@@ -48856,6 +48969,7 @@
 	exports.AdditiveBlending = AdditiveBlending;
 	exports.AlphaFormat = AlphaFormat;
 	exports.AlwaysDepth = AlwaysDepth;
+	exports.AlwaysStencilFunc = AlwaysStencilFunc;
 	exports.AmbientLight = AmbientLight;
 	exports.AmbientLightProbe = AmbientLightProbe;
 	exports.AnimationClip = AnimationClip;
@@ -48933,6 +49047,8 @@
 	exports.DataTexture2DArray = DataTexture2DArray;
 	exports.DataTexture3D = DataTexture3D;
 	exports.DataTextureLoader = DataTextureLoader;
+	exports.DecrementStencilOp = DecrementStencilOp;
+	exports.DecrementWrapStencilOp = DecrementWrapStencilOp;
 	exports.DefaultLoadingManager = DefaultLoadingManager;
 	exports.DepthFormat = DepthFormat;
 	exports.DepthStencilFormat = DepthStencilFormat;
@@ -48951,6 +49067,7 @@
 	exports.EdgesHelper = EdgesHelper;
 	exports.EllipseCurve = EllipseCurve;
 	exports.EqualDepth = EqualDepth;
+	exports.EqualStencilFunc = EqualStencilFunc;
 	exports.EquirectangularReflectionMapping = EquirectangularReflectionMapping;
 	exports.EquirectangularRefractionMapping = EquirectangularRefractionMapping;
 	exports.Euler = Euler;
@@ -48981,6 +49098,8 @@
 	exports.GeometryUtils = GeometryUtils;
 	exports.GreaterDepth = GreaterDepth;
 	exports.GreaterEqualDepth = GreaterEqualDepth;
+	exports.GreaterEqualStencilFunc = GreaterEqualStencilFunc;
+	exports.GreaterStencilFunc = GreaterStencilFunc;
 	exports.GridHelper = GridHelper;
 	exports.Group = Group;
 	exports.HalfFloatType = HalfFloatType;
@@ -48993,6 +49112,8 @@
 	exports.ImageLoader = ImageLoader;
 	exports.ImageUtils = ImageUtils;
 	exports.ImmediateRenderObject = ImmediateRenderObject;
+	exports.IncrementStencilOp = IncrementStencilOp;
+	exports.IncrementWrapStencilOp = IncrementWrapStencilOp;
 	exports.InstancedBufferAttribute = InstancedBufferAttribute;
 	exports.InstancedBufferGeometry = InstancedBufferGeometry;
 	exports.InstancedInterleavedBuffer = InstancedInterleavedBuffer;
@@ -49009,7 +49130,9 @@
 	exports.InterpolateDiscrete = InterpolateDiscrete;
 	exports.InterpolateLinear = InterpolateLinear;
 	exports.InterpolateSmooth = InterpolateSmooth;
+	exports.InvertStencilOp = InvertStencilOp;
 	exports.JSONLoader = JSONLoader;
+	exports.KeepStencilOp = KeepStencilOp;
 	exports.KeyframeTrack = KeyframeTrack;
 	exports.LOD = LOD;
 	exports.LatheBufferGeometry = LatheBufferGeometry;
@@ -49018,6 +49141,8 @@
 	exports.LensFlare = LensFlare;
 	exports.LessDepth = LessDepth;
 	exports.LessEqualDepth = LessEqualDepth;
+	exports.LessEqualStencilFunc = LessEqualStencilFunc;
+	exports.LessStencilFunc = LessStencilFunc;
 	exports.Light = Light;
 	exports.LightProbe = LightProbe;
 	exports.LightProbeHelper = LightProbeHelper;
@@ -49037,6 +49162,8 @@
 	exports.LinearInterpolant = LinearInterpolant;
 	exports.LinearMipMapLinearFilter = LinearMipMapLinearFilter;
 	exports.LinearMipMapNearestFilter = LinearMipMapNearestFilter;
+	exports.LinearMipmapLinearFilter = LinearMipmapLinearFilter;
+	exports.LinearMipmapNearestFilter = LinearMipmapNearestFilter;
 	exports.LinearToneMapping = LinearToneMapping;
 	exports.Loader = Loader;
 	exports.LoaderUtils = LoaderUtils;
@@ -49075,12 +49202,16 @@
 	exports.NearestFilter = NearestFilter;
 	exports.NearestMipMapLinearFilter = NearestMipMapLinearFilter;
 	exports.NearestMipMapNearestFilter = NearestMipMapNearestFilter;
+	exports.NearestMipmapLinearFilter = NearestMipmapLinearFilter;
+	exports.NearestMipmapNearestFilter = NearestMipmapNearestFilter;
 	exports.NeverDepth = NeverDepth;
+	exports.NeverStencilFunc = NeverStencilFunc;
 	exports.NoBlending = NoBlending;
 	exports.NoColors = NoColors;
 	exports.NoToneMapping = NoToneMapping;
 	exports.NormalBlending = NormalBlending;
 	exports.NotEqualDepth = NotEqualDepth;
+	exports.NotEqualStencilFunc = NotEqualStencilFunc;
 	exports.NumberKeyframeTrack = NumberKeyframeTrack;
 	exports.Object3D = Object3D;
 	exports.ObjectLoader = ObjectLoader;
@@ -49165,6 +49296,7 @@
 	exports.RedFormat = RedFormat;
 	exports.ReinhardToneMapping = ReinhardToneMapping;
 	exports.RepeatWrapping = RepeatWrapping;
+	exports.ReplaceStencilOp = ReplaceStencilOp;
 	exports.ReverseSubtractEquation = ReverseSubtractEquation;
 	exports.RingBufferGeometry = RingBufferGeometry;
 	exports.RingGeometry = RingGeometry;
@@ -49205,6 +49337,7 @@
 	exports.StringKeyframeTrack = StringKeyframeTrack;
 	exports.SubtractEquation = SubtractEquation;
 	exports.SubtractiveBlending = SubtractiveBlending;
+	exports.TOUCH = TOUCH;
 	exports.TangentSpaceNormalMap = TangentSpaceNormalMap;
 	exports.TetrahedronBufferGeometry = TetrahedronBufferGeometry;
 	exports.TetrahedronGeometry = TetrahedronGeometry;
@@ -49262,6 +49395,7 @@
 	exports.ZeroCurvatureEnding = ZeroCurvatureEnding;
 	exports.ZeroFactor = ZeroFactor;
 	exports.ZeroSlopeEnding = ZeroSlopeEnding;
+	exports.ZeroStencilOp = ZeroStencilOp;
 	exports.sRGBEncoding = sRGBEncoding;
 
 	Object.defineProperty(exports, '__esModule', { value: true });

docs/api/en/constants/Materials.html

@@ -92,7 +92,52 @@
 		[page:Constant MixOperation] uses reflectivity to blend between the two colors.<br />
 		[page:Constant AddOperation] adds the two colors.
 		</p>
+		
+		<h2>Stencil Functions</h2>
+		<code>
+		THREE.NeverStencilFunc
+		THREE.LessStencilFunc
+		THREE.EqualStencilFunc
+		THREE.LessEqualStencilFunc
+		THREE.GreaterStencilFunc
+		THREE.NotEqualStencilFunc
+		THREE.GreaterEqualStencilFunc
+		THREE.AlwaysStencilFunc
+		</code>
+		<p>
+		Which stencil function the material uses to determine whether or not to perform a stencil operation.<br />
+		[page:Materials NeverStencilFunc] will never return true.<br />
+		[page:Materials LessStencilFunc] will return true if the stencil reference value is less than the current stencil value.<br />
+		[page:Materials EqualStencilFunc] will return true if the stencil reference value is equal to the current stencil value.<br />
+		[page:Materials LessEqualStencilFunc] will return true if the stencil reference value is less than or equal to the current stencil value.<br />
+		[page:Materials GreaterStencilFunc] will return true if the stencil reference value is greater than the current stencil value.<br />
+		[page:Materials NotEqualStencilFunc] will return true if the stencil reference value is not equal to the current stencil value.<br />
+		[page:Materials GreaterEqualStencilFunc] will return true if the stencil reference value is greater than or equal to the current stencil value.<br />
+		[page:Materials AlwaysStencilFunc] will always return true.<br />
+		</p>
 
+		<h2>Stencil Operations</h2>
+		<code>
+		THREE.ZeroStencilOp
+		THREE.KeepStencilOp
+		THREE.ReplaceStencilOp
+		THREE.IncrementStencilOp
+		THREE.DecrementStencilOp
+		THREE.IncrementWrapStencilOp
+		THREE.DecrementWrapStencilOp
+		THREE.InvertStencilOp
+		</code>
+		<p>
+		Which stencil operation the material will perform on the stencil buffer pixel if the provided stencil function passes.<br />
+		[page:Materials ZeroStencilOp] will set the stencil value to 0.<br />
+		[page:Materials KeepStencilOp] will not change the current stencil value.<br />
+		[page:Materials ReplaceStencilOp] will replace the stencil value with the specified stencil reference value.<br />
+		[page:Materials IncrementStencilOp] will increment the current stencil value by 1.<br />
+		[page:Materials DecrementStencilOp] will decrement the current stencil value by 1.<br />
+		[page:Materials IncrementWrapStencilOp] will increment the current stencil value by 1. If the value increments past 255 it will be set to 0.<br />
+		[page:Materials DecrementWrapStencilOp] will increment the current stencil value by 1. If the value decrements below 0 it will be set to 255.<br />
+		[page:Materials InvertStencilOp] will perform a bitwise iversion of the current stencil value.<br />
+		</p>
 
 		<h2>Source</h2>
 

docs/api/en/constants/Textures.html

@@ -87,11 +87,11 @@
 		<h2>Minification Filters</h2>
 		<code>
 		THREE.NearestFilter
-		THREE.NearestMipMapNearestFilter
-		THREE.NearestMipMapLinearFilter
+		THREE.NearestMipmapNearestFilter
+		THREE.NearestMipmapLinearFilter
 		THREE.LinearFilter
-		THREE.LinearMipMapNearestFilter
-		THREE.LinearMipMapLinearFilter
+		THREE.LinearMipmapNearestFilter
+		THREE.LinearMipmapLinearFilter
 		</code>
 
 		<p>
@@ -102,21 +102,21 @@
 		In addition to [page:constant NearestFilter] and [page:constant LinearFilter],
 		the following four functions can be used for minification:<br /><br />
 
-		[page:constant NearestMipMapNearestFilter] chooses the mipmap that most closely
+		[page:constant NearestMipmapNearestFilter] chooses the mipmap that most closely
 		matches the size of the pixel being textured
 		and uses the [page:constant NearestFilter] criterion (the texel nearest to the
 		center of the pixel) to produce a texture value.<br /><br />
 
-		[page:constant NearestMipMapLinearFilter] chooses the two mipmaps that most closely
+		[page:constant NearestMipmapLinearFilter] chooses the two mipmaps that most closely
 		match the size of the pixel being textured and uses the [page:constant NearestFilter] criterion to produce
 		a texture value from each mipmap. The final texture value is a weighted average of those two values.<br /><br />
 
-		[page:constant LinearMipMapNearestFilter] chooses the mipmap that most closely matches
+		[page:constant LinearMipmapNearestFilter] chooses the mipmap that most closely matches
 		the size of the pixel being textured and uses the [page:constant LinearFilter] criterion
 		(a weighted average of the four texels that are closest to the center of the pixel)
 		to produce a texture value.<br /><br />
 
-		[page:constant LinearMipMapLinearFilter] is the default and chooses the two mipmaps
+		[page:constant LinearMipmapLinearFilter] is the default and chooses the two mipmaps
 		that most closely match the size of the pixel being textured and uses the [page:constant LinearFilter] criterion
 		to produce a texture value from each mipmap. The final texture value is a weighted average of those two values.<br /><br />
 

docs/api/en/core/Raycaster.html

@@ -161,7 +161,8 @@
 			[page:Face3 face] – intersected face<br />
 			[page:Integer faceIndex] – index of the intersected face<br />
 			[page:Object3D object] – the intersected object<br />
-			[page:Vector2 uv] - U,V coordinates at point of intersection
+			[page:Vector2 uv] - U,V coordinates at point of intersection<br />
+			[page:Vector2 uv2] - Second set of U,V coordinates at point of intersection
 		</p>
 		<p>
 		*Raycaster* delegates to the [page:Object3D.raycast raycast] method of the passed object, when evaluating whether the ray intersects the object or not. This allows [page:Mesh meshes] to respond differently to ray casting than [page:Line lines] and [page:Points pointclouds].

docs/api/en/geometries/BoxBufferGeometry.html

@@ -53,7 +53,8 @@
 		</p>
 
 		<h2>Properties</h2>
-	
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
+
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
@@ -67,8 +68,9 @@
 		cube.geometry.parameters.widthSegments; // === undefined.
 		</code>
 		</p>
-		
-		<h2>Methods</h2>	
+
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/BoxGeometry.html

@@ -13,7 +13,7 @@
 		<h1>[name]</h1>
 
 		<p class="desc">BoxGeometry is a geometry class for a [link:https://en.wikipedia.org/wiki/Cuboid rectangular cuboid] with a given 'width', 'height', and 'depth'. On creation, the cuboid is centred on the origin, with each edge parallel to one of the axes.</p>
-		
+
 		<iframe id="scene" src="scenes/geometry-browser.html#BoxGeometry"></iframe>
 
 		<script>
@@ -53,6 +53,7 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
@@ -66,7 +67,10 @@
 		cube.geometry.parameters.width; // === 1
 		cube.geometry.parameters.widthSegments; // === undefined.
 		</code>
- 		</p>
+		</p>
+
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/CircleBufferGeometry.html

@@ -52,12 +52,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/CircleGeometry.js src/geometries/CircleGeometry.js]

docs/api/en/geometries/CircleGeometry.html

@@ -53,12 +53,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/ConeBufferGeometry.html

@@ -54,12 +54,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:CylinderBufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:CylinderBufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/ConeGeometry.js src/geometries/ConeGeometry.js]

docs/api/en/geometries/ConeGeometry.html

@@ -54,12 +54,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:CylinderGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:CylinderGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/CylinderBufferGeometry.html

@@ -55,12 +55,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/CylinderGeometry.js src/geometries/CylinderGeometry.js]

docs/api/en/geometries/CylinderGeometry.html

@@ -55,12 +55,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/DodecahedronBufferGeometry.html

@@ -41,12 +41,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/DodecahedronGeometry.js src/geometries/DodecahedronGeometry.js]

docs/api/en/geometries/DodecahedronGeometry.html

@@ -41,12 +41,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/EdgesGeometry.html

@@ -34,12 +34,16 @@ scene.add( line );
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/ExtrudeBufferGeometry.html

@@ -79,7 +79,7 @@
 				<li>bevelSize — float. Distance from the shape outline that the bevel extends. Default is bevelThickness - 2.</li>
 				<li>bevelOffset — float. Distance from the shape outline that the bevel starts. Default is 0.</li>
 				<li>bevelSegments — int. Number of bevel layers. Default is 3.</li>
-				<li>extrudePath — THREE.CurvePath. A 3D spline path along which the shape should be extruded.</li>
+				<li>extrudePath — THREE.Curve. A 3D spline path along which the shape should be extruded.</li>
 				<li>UVGenerator —  Object. object that provides UV generator functions</li>
 			</ul>
 
@@ -95,12 +95,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/ExtrudeGeometry.js src/geometries/ExtrudeGeometry.js]

docs/api/en/geometries/ExtrudeGeometry.html

@@ -79,7 +79,7 @@
 				<li>bevelSize — float. Distance from the shape outline that the bevel extends. Default is bevelThickness - 2.</li>
 				<li>bevelOffset — float. Distance from the shape outline that the bevel starts. Default is 0.</li>
 				<li>bevelSegments — int. Number of bevel layers. Default is 3.</li>
-				<li>extrudePath — THREE.CurvePath. A 3D spline path along which the shape should be extruded.</li>
+				<li>extrudePath — THREE.Curve. A 3D spline path along which the shape should be extruded.</li>
 				<li>UVGenerator —  Object. object that provides UV generator functions</li>
 			</ul>
 
@@ -95,12 +95,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/IcosahedronBufferGeometry.html

@@ -40,12 +40,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/IcosahedronGeometry.js src/geometries/IcosahedronGeometry.js]

docs/api/en/geometries/IcosahedronGeometry.html

@@ -41,12 +41,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/LatheBufferGeometry.html

@@ -59,12 +59,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/LatheGeometry.js src/geometries/LatheGeometry.js]

docs/api/en/geometries/LatheGeometry.html

@@ -59,12 +59,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/OctahedronBufferGeometry.html

@@ -40,12 +40,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/OctahedronGeometry.js src/geometries/OctahedronGeometry.js]

docs/api/en/geometries/OctahedronGeometry.html

@@ -41,12 +41,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/ParametricBufferGeometry.html

@@ -53,12 +53,15 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/ParametricGeometry.html

@@ -54,12 +54,15 @@
 
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/PlaneBufferGeometry.html

@@ -51,12 +51,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/PlaneGeometry.js src/geometries/PlaneGeometry.js]

docs/api/en/geometries/PlaneGeometry.html

@@ -51,12 +51,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/PolyhedronBufferGeometry.html

@@ -50,12 +50,15 @@ var geometry = new THREE.PolyhedronBufferGeometry( verticesOfCube, indicesOfFace
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/PolyhedronGeometry.html

@@ -48,12 +48,15 @@ var geometry = new THREE.PolyhedronGeometry( verticesOfCube, indicesOfFaces, 6,
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/RingBufferGeometry.html

@@ -54,12 +54,15 @@
 
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/RingGeometry.html

@@ -53,12 +53,15 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
-		
+
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/ShapeBufferGeometry.html

@@ -65,12 +65,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/ShapeGeometry.js src/geometries/ShapeGeometry.js]

docs/api/en/geometries/ShapeGeometry.html

@@ -65,12 +65,15 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/SphereBufferGeometry.html

@@ -59,12 +59,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/SphereGeometry.js src/geometries/SphereGeometry.js]

docs/api/en/geometries/SphereGeometry.html

@@ -59,12 +59,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/TetrahedronBufferGeometry.html

@@ -41,13 +41,15 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
-
+		<h2>Methods</h2>
+		<p>See the base [page:PolyhedronBufferGeometry] class for common methods.</p>
 
 		<h2>Source</h2>
 

docs/api/en/geometries/TetrahedronGeometry.html

@@ -41,12 +41,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/TextBufferGeometry.html

@@ -156,12 +156,16 @@
 		</table>
 
 		<h2>Properties</h2>
+		<p>See the base [page:ExtrudeBufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:ExtrudeBufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/TextGeometry.js src/geometries/TextGeometry.js]

docs/api/en/geometries/TextGeometry.html

@@ -156,12 +156,16 @@
 		</table>
 
 		<h2>Properties</h2>
+		<p>See the base [page:ExtrudeGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:ExtrudeGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/TorusBufferGeometry.html

@@ -52,12 +52,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/TorusGeometry.js src/geometries/TorusGeometry.js]

docs/api/en/geometries/TorusGeometry.html

@@ -52,12 +52,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/TorusKnotBufferGeometry.html

@@ -55,12 +55,16 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/TorusKnotGeometry.js src/geometries/TorusKnotGeometry.js]

docs/api/en/geometries/TorusKnotGeometry.html

@@ -55,12 +55,17 @@
 		</p>
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>.parameters</h3>
 		<p>
 		An object with a property for each of the constructor parameters. Any modification after instantiation does not change the geometry.
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/TubeBufferGeometry.html

@@ -77,6 +77,7 @@
 
 
 		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
@@ -98,6 +99,9 @@
 		An array of [page:Vector3] binormals
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/TubeGeometry.js src/geometries/TubeGeometry.js]

docs/api/en/geometries/TubeGeometry.html

@@ -77,6 +77,7 @@
 
 
 		<h2>Properties</h2>
+		<p>See the base [page:Geometry] class for common properties.</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
@@ -98,6 +99,9 @@
 		An array of [page:Vector3] binormals
 		</p>
 
+		<h2>Methods</h2>
+		<p>See the base [page:Geometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/geometries/WireframeGeometry.html

@@ -56,6 +56,12 @@ scene.add( line );
 		geometry — any geometry object.
 		</p>
 
+		<h2>Properties</h2>
+		<p>See the base [page:BufferGeometry] class for common properties.</p>
+
+		<h2>Methods</h2>
+		<p>See the base [page:BufferGeometry] class for common methods.</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/en/materials/Material.html

@@ -123,6 +123,41 @@
 		When drawing 2D overlays it can be useful to disable the depth writing in order to layer several things together without creating z-index artifacts.
 		</p>
 
+		<h3>[property:Boolean stencilWrite]</h3>
+		<p>
+		Whether rendering this material has any effect on the stencil buffer. Default is *false*.
+		</p>
+
+		<h3>[property:Boolean stencilFunc]</h3>
+		<p>
+		The stencil comparison function to use. Default is [page:Materials AlwaysStencilFunc]. See stencil function [page:Materials constants] for all possible values.
+		</p>
+
+		<h3>[property:Integer stencilRef]</h3>
+		<p>
+		The value to use when performing stencil comparisons or stencil operations. Default is *0*.
+		</p>
+
+		<h3>[property:Boolean stencilMask]</h3>
+		<p>
+		The bit mask to use when comparing against or writing to the stencil buffer. Default is *0xFF*.
+		</p>
+
+		<h3>[property:Integer stencilFail]</h3>
+		<p>
+		Which stencil operation to perform when the comparison function returns false. Default is [page:Materials KeepStencilOp]. See the stencil operations [page:Materials constants] for all possible values.
+		</p>
+
+		<h3>[property:Boolean stencilZFail]</h3>
+		<p>
+		Which stencil operation to perform when the comparison function returns true but the depth test fails. Default is [page:Materials KeepStencilOp]. See the stencil operations [page:Materials constants] for all possible values.
+		</p>
+
+		<h3>[property:Boolean stencilZPass]</h3>
+		<p>
+		Which stencil operation to perform when the comparison function returns true and the depth test passes. Default is [page:Materials KeepStencilOp]. See the stencil operations [page:Materials constants] for all possible values.
+		</p>
+
 		<h3>[property:Boolean flatShading]</h3>
 		<p>
 		Define whether the material is rendered with flat shading. Default is false.

docs/api/en/materials/ShaderMaterial.html

@@ -378,13 +378,12 @@ this.extensions = {
 
 		<h3>[property:Boolean morphTargets]</h3>
 		<p>
-		Defines whether the material uses morphTargets; true morphTarget attributes to this shader
+		When set to true, morph target attributes are available in the vertex shader. Default is *false*.
 		</p>
 
 		<h3>[property:boolean morphNormals]</h3>
 		<p>
-			Defines whether the material uses morphNormals. Set as true to pass morphNormal attributes from the [page:Geometry]
-			to the shader. Default is *false*.
+		When set to true, morph normal attributes are available in the vertex shader. Default is *false*.
 		</p>
 
 

docs/api/en/math/Vector2.html

@@ -232,20 +232,20 @@
 		<h3>[method:this lerp]( [param:Vector2 v], [param:Float alpha] )</h3>
 		<p>
 		[page:Vector2 v] - [page:Vector2] to interpolate towards.<br />
-		alpha - interpolation factor in the closed interval [0, 1].<br /><br />
+		[page:Float alpha] - interpolation factor, typically in the closed interval [0, 1].<br /><br />
 
 		Linearly interpolates between this vector and [page:Vector2 v], where alpha is the
-		distance along the line - alpha = 0 will be this vector, and alpha = 1 will be [page:Vector2 v].
+		percent distance along the line - alpha = 0 will be this vector, and alpha = 1 will be [page:Vector2 v].
 		</p>
 
 		<h3>[method:this lerpVectors]( [param:Vector2 v1], [param:Vector2 v2], [param:Float alpha] )</h3>
 		<p>
 		[page:Vector2 v1] - the starting [page:Vector2].<br />
 		[page:Vector2 v2] - [page:Vector2] to interpolate towards.<br />
-		[page:Float alpha] - interpolation factor in the closed interval [0, 1].<br /><br />
+		[page:Float alpha] - interpolation factor, typically in the closed interval [0, 1].<br /><br />
 
 		Sets this vector to be the vector linearly interpolated between [page:Vector2 v1] and
-		[page:Vector2 v2] where alpha is the distance along the line connecting the two vectors
+		[page:Vector2 v2] where alpha is the percent distance along the line connecting the two vectors
 		- alpha = 0 will be [page:Vector2 v1], and alpha = 1 will be [page:Vector2 v2].
 		</p>
 

docs/api/en/math/Vector3.html

@@ -258,20 +258,20 @@ var d = a.distanceTo( b );
 		<h3>[method:this lerp]( [param:Vector3 v], [param:Float alpha] )</h3>
 		<p>
 		[page:Vector3 v] - [page:Vector3] to interpolate towards.<br />
-		alpha - interpolation factor in the closed interval [0, 1].<br /><br />
+		[page:Float alpha] - interpolation factor, typically in the closed interval [0, 1].<br /><br />
 
 		Linearly interpolate between this vector and [page:Vector3 v], where alpha is the
-		distance along the line - alpha = 0 will be this vector, and alpha = 1 will be [page:Vector3 v].
+		percent distance along the line - alpha = 0 will be this vector, and alpha = 1 will be [page:Vector3 v].
 		</p>
 
 		<h3>[method:this lerpVectors]( [param:Vector3 v1], [param:Vector3 v2], [param:Float alpha] )</h3>
 		<p>
 		[page:Vector3 v1] - the starting [page:Vector3].<br />
 		[page:Vector3 v2] - [page:Vector3] to interpolate towards.<br />
-		[page:Float alpha] - interpolation factor in the closed interval [0, 1].<br /><br />
+		[page:Float alpha] - interpolation factor, typically in the closed interval [0, 1].<br /><br />
 
 		Sets this vector to be the vector linearly interpolated between [page:Vector3 v1] and
-		[page:Vector3 v2] where alpha is the distance along the line connecting the two vectors
+		[page:Vector3 v2] where alpha is the percent distance along the line connecting the two vectors
 		- alpha = 0 will be [page:Vector3 v1], and alpha = 1 will be [page:Vector3 v2].
 		</p>
 

docs/api/en/math/Vector4.html

@@ -211,20 +211,20 @@ var d = a.dot( b );
 		<h3>[method:this lerp]( [param:Vector4 v], [param:Float alpha] )</h3>
 		<p>
 		[page:Vector4 v] - [page:Vector4] to interpolate towards.<br />
-		alpha - interpolation factor in the closed interval [0, 1].<br /><br />
+		[page:Float alpha] - interpolation factor, typically in the closed interval [0, 1].<br /><br />
 
 		Linearly interpolates between this vector and [page:Vector4 v], where alpha is the
-		distance along the line - alpha = 0 will be this vector, and alpha = 1 will be [page:Vector4 v].
+		percent distance along the line - alpha = 0 will be this vector, and alpha = 1 will be [page:Vector4 v].
 		</p>
 
 		<h3>[method:this lerpVectors]( [param:Vector4 v1], [param:Vector4 v2], [param:Float alpha] )</h3>
 		<p>
 		[page:Vector4 v1] - the starting [page:Vector4].<br />
 		[page:Vector4 v2] - [page:Vector4] to interpolate towards.<br />
-		[page:Float alpha] - interpolation factor in the closed interval [0, 1].<br /><br />
+		[page:Float alpha] - interpolation factor, typically in the closed interval [0, 1].<br /><br />
 
 		Sets this vector to be the vector linearly interpolated between [page:Vector4 v1] and
-		[page:Vector4 v2] where alpha is the distance along the line connecting the two vectors
+		[page:Vector4 v2] where alpha is the percent distance along the line connecting the two vectors
 		- alpha = 0 will be [page:Vector4 v1], and alpha = 1 will be [page:Vector4 v2].
 		</p>
 

docs/api/en/objects/Sprite.html

@@ -78,8 +78,8 @@ scene.add( sprite );
 
 		<h3>[method:null raycast]( [param:Raycaster raycaster], [param:Array intersects] )</h3>
 		<p>
-		Get intersections between a casted ray and this sprite.
-		[page:Raycaster.intersectObject] will call this method.
+		Get intersections between a casted ray and this sprite. [page:Raycaster.intersectObject]() will call this method.
+		The raycaster must be initialized by calling [page:Raycaster.setFromCamera]() before raycasting against sprites.
 		</p>
 
 

docs/api/en/renderers/WebGLRenderTarget.html

@@ -11,7 +11,7 @@
 		<h1>[name]</h1>
 
 		<p class="desc">
-			A [link:https://msdn.microsoft.com/en-us/library/ff604997.aspx render target] is a buffer
+			A [link:https://webglfundamentals.org/webgl/lessons/webgl-render-to-texture.html render target] is a buffer
 			where the video card draws pixels for a scene that	is being rendered in the background.
 			It is used in different effects, such as applying postprocessing to a rendered image
 			before displaying it on the screen.

docs/api/en/renderers/WebGLRenderer.html

@@ -143,16 +143,6 @@
 		 Default is [].
 		</p>
 
-		<h3>[property:WebGLRenderingContext context]</h3>
-		<p>
-		The renderer obtains a [link:https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext RenderingContext] context
-		  from its [page:WebGLRenderer.domElement domElement] by default, using
-			[link:https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/getContext HTMLCanvasElement.getContext]().<br /><br />
-
-		You can create this manually, however it must correspond to the
-		[page:WebGLRenderer.domElement domElement] in order to render to the screen.
-		</p>
-
 		<h3>[property:DOMElement domElement]</h3>
 		<p>
 		A [link:https://developer.mozilla.org/en-US/docs/Web/HTML/Element/canvas canvas] where the renderer draws its output.<br />

docs/api/en/renderers/webgl/WebGLShader.html

@@ -15,7 +15,7 @@
 		<h2>Example</h2>
 
 		<code>
-		var gl = renderer.context;
+		var gl = renderer.getContext();
 
 		var glVertexShader = new THREE.WebGLShader( gl, gl.VERTEX_SHADER, vertexSourceCode );
 		var glFragmentShader = new THREE.WebGLShader( gl, gl.FRAGMENT_SHADER, fragmentSourceCode );

docs/api/en/textures/CanvasTexture.html

@@ -37,7 +37,7 @@
 		The default is [page:Textures THREE.LinearFilter]. See [page:Textures magnification filter constants] for other choices.<br />
 
 		[page:Constant minFilter] -- How the texture is sampled when a texel covers less than one pixel.
-		 The default is [page:Textures THREE.LinearMipMapLinearFilter]. See [page:Textures minification filter constants] for other choices.<br />
+		 The default is [page:Textures THREE.LinearMipmapLinearFilter]. See [page:Textures minification filter constants] for other choices.<br />
 
     [page:Constant format] -- The format used in the texture.
      See [page:Textures format constants] for other choices.<br />

docs/api/en/textures/CompressedTexture.html

@@ -52,7 +52,7 @@
 		The default is [page:Textures THREE.LinearFilter]. See [page:Textures magnification filter constants] for other choices.<br />
 
 		[page:Constant minFilter] -- How the texture is sampled when a texel covers less than one pixel.
-		 The default is [page:Textures THREE.LinearMipMapLinearFilter]. See [page:Textures minification filter constants] for other choices.<br />
+		 The default is [page:Textures THREE.LinearMipmapLinearFilter]. See [page:Textures minification filter constants] for other choices.<br />
 
 		[page:Number anisotropy] -- The number of samples taken along the axis through the pixel that has the highest density of texels.
 		By default, this value is 1. A higher value gives a less blurry result than a basic mipmap, at the cost of more texture samples being used.

docs/api/en/textures/Texture.html

@@ -105,7 +105,7 @@
 		<h3>[property:number minFilter]</h3>
 		<p>
 		How the texture is sampled when a texel covers less than one pixel. The default is
-		[page:Textures THREE.LinearMipMapLinearFilter], which uses mipmapping and a trilinear filter. <br /><br />
+		[page:Textures THREE.LinearMipmapLinearFilter], which uses mipmapping and a trilinear filter. <br /><br />
 
 		See the [page:Textures texture constants] page for all possible choices.
 		</p>

docs/api/en/textures/VideoTexture.html

@@ -51,7 +51,7 @@ texture.format = THREE.RGBFormat;
 		The default is [page:Textures THREE.LinearFilter]. See [page:Textures magnification filter constants] for other choices.<br />
 
 		[page:Constant minFilter] -- How the texture is sampled when a texel covers less than one pixel.
-		 The default is [page:Textures THREE.LinearMipMapLinearFilter]. See [page:Textures minification filter constants] for other choices.<br />
+		 The default is [page:Textures THREE.LinearMipmapLinearFilter]. See [page:Textures minification filter constants] for other choices.<br />
 
     [page:Constant format] -- The format used in the texture.
      See [page:Textures format constants] for other choices.<br />

docs/api/zh/core/Clock.html

@@ -67,7 +67,7 @@
 
 		<h3>[method:Float getElapsedTime]()</h3>
 		<p>
-			获取自时钟启动后的秒数，摒弃将 [page:Clock.oldTime oldTime] 设置为当前时间。<br />
+			获取自时钟启动后的秒数，同时将 [page:Clock.oldTime oldTime] 设置为当前时间。<br />
 			如果 [page:Clock.autoStart autoStart] 设置为 *true* 且时钟并未运行，则该方法同时启动时钟。
 		</p>
 

docs/api/zh/core/Raycaster.html

@@ -161,7 +161,8 @@
 			[page:Face3 face] —— 相交的面<br />
 			[page:Integer faceIndex] —— 相交的面的索引<br />
 			[page:Object3D object] —— 相交的物体<br />
-			[page:Vector2 uv] —— 相交部分的点的UV坐标。
+			[page:Vector2 uv] —— 相交部分的点的UV坐标。<br />
+			[page:Vector2 uv2] - Second set of U,V coordinates at point of intersection
 		</p>
 		<p>
 			当计算这条射线是否和物体相交的时候，*Raycaster*将传入的对象委托给[page:Object3D.raycast raycast]方法。

docs/api/zh/geometries/BoxBufferGeometry.html

@@ -54,6 +54,7 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
@@ -69,6 +70,9 @@
 			</code>
  		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/BoxGeometry.js src/geometries/BoxGeometry.js]

docs/api/zh/geometries/BoxGeometry.html

@@ -54,6 +54,7 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
@@ -69,6 +70,9 @@
 			</code>
  		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/CircleBufferGeometry.html

@@ -52,11 +52,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-			</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/CircleGeometry.html

@@ -54,11 +54,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-			</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/ConeBufferGeometry.html

@@ -54,11 +54,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:CylinderBufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-			</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:CylinderBufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/ConeGeometry.html

@@ -54,11 +54,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:CylinderGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-			</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>Source</h2>
 

docs/api/zh/geometries/CylinderBufferGeometry.html

@@ -55,12 +55,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/CylinderGeometry.js src/geometries/CylinderGeometry.js]

docs/api/zh/geometries/CylinderGeometry.html

@@ -55,12 +55,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/DodecahedronBufferGeometry.html

@@ -41,12 +41,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:PolyhedronBufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:PolyhedronBufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/DodecahedronGeometry.js src/geometries/DodecahedronGeometry.js]

docs/api/zh/geometries/DodecahedronGeometry.html

@@ -42,11 +42,15 @@
 	</p>
 
 	<h2>属性</h2>
+	<p>常用属性请参见基类[page:Geometry]。</p>
 
 	<h3>[property:Object parameters]</h3>
 	<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-		</p>
+	</p>
+
+	<h2>方法(Methods)</h2>
+	<p>常用方法请参见基类[page:Geometry]。</p>
 
 	<h2>源代码</h2>
 
@@ -54,4 +58,4 @@
 	src/geometries/DodecahedronGeometry.js]
 </body>
 
-</html>
+</html>

docs/api/zh/geometries/EdgesGeometry.html

@@ -34,12 +34,16 @@ scene.add( line );
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/ExtrudeBufferGeometry.html

@@ -77,7 +77,7 @@
 				<li>bevelThickness — float，设置原始形状上斜角的厚度。默认值为6。</li>
 				<li>bevelSize — float。斜角与原始形状轮廓之间的延伸距离，默认值为bevelThickness-2。</li>
 				<li>bevelSegments — int。斜角的分段层数，默认值为3。</li>
-				<li>extrudePath — THREE.CurvePath对象。一条沿着被挤出形状的三维样条线。</li>
+				<li>extrudePath — THREE.Curve对象。一条沿着被挤出形状的三维样条线。</li>
 				<li>UVGenerator —  Object。提供了UV生成器函数的对象。</li>
 			</ul>
 
@@ -92,12 +92,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/ExtrudeGeometry.js src/geometries/ExtrudeGeometry.js]

docs/api/zh/geometries/ExtrudeGeometry.html

@@ -77,7 +77,7 @@
 				<li>bevelThickness — float，设置原始形状上斜角的厚度。默认值为6。</li>
 				<li>bevelSize — float。斜角与原始形状轮廓之间的延伸距离，默认值为bevelThickness-2。</li>
 				<li>bevelSegments — int。斜角的分段层数，默认值为3。</li>
-				<li>extrudePath — THREE.CurvePath对象。一条沿着被挤出形状的三维样条线。</li>
+				<li>extrudePath — THREE.Curve对象。一条沿着被挤出形状的三维样条线。</li>
 				<li>UVGenerator —  Object。提供了UV生成器函数的对象。</li>
 			</ul>
 
@@ -92,11 +92,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/IcosahedronBufferGeometry.html

@@ -40,12 +40,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:PolyhedronBufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:PolyhedronBufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/IcosahedronGeometry.js src/geometries/IcosahedronGeometry.js]

docs/api/zh/geometries/IcosahedronGeometry.html

@@ -41,11 +41,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/LatheBufferGeometry.html

@@ -59,11 +59,15 @@
 			</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/LatheGeometry.html

@@ -59,11 +59,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/OctahedronBufferGeometry.html

@@ -40,11 +40,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:PolyhedronBufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 
-			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。		</p>
+			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:PolyhedronBufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/OctahedronGeometry.html

@@ -43,15 +43,19 @@
 	</p>
 
 	<h2>属性</h2>
+	<p>常用属性请参见基类[page:Geometry]。</p>
 
 	<h3>[property:Object parameters]</h3>
 	<p>
+		一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
+	</p>
 
-		一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。 </p>
+	<h2>方法(Methods)</h2>
+	<p>常用方法请参见基类[page:Geometry]。</p>
 
 	<h2>源代码</h2>
 
 	[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 </body>
 
-</html>
+</html>

docs/api/zh/geometries/ParametricBufferGeometry.html

@@ -53,12 +53,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
 
 		<h2>方法</h2>
 

docs/api/zh/geometries/ParametricGeometry.html

@@ -54,12 +54,15 @@
 
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 		一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/PlaneBufferGeometry.html

@@ -51,12 +51,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>.parameters</h3>
 		<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/PlaneGeometry.js src/geometries/PlaneGeometry.js]

docs/api/zh/geometries/PlaneGeometry.html

@@ -51,12 +51,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>.parameters</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/PolyhedronBufferGeometry.html

@@ -47,14 +47,17 @@ var geometry = new THREE.PolyhedronBufferGeometry( verticesOfCube, indicesOfFace
 		radius — [page:Float] - 最终形状的半径。<br />
 		detail — [page:Integer] - 将对这个几何体细分多少个级别。细节越多，形状就越平滑。
 		</p>
-		
+
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-			</p>
+		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/PolyhedronGeometry.html

@@ -47,12 +47,15 @@ var geometry = new THREE.PolyhedronGeometry( verticesOfCube, indicesOfFaces, 6,
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-			</p>
+		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/RingBufferGeometry.html

@@ -54,12 +54,15 @@
 
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/RingGeometry.html

@@ -53,12 +53,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
-		
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/ShapeBufferGeometry.html

@@ -65,13 +65,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
-
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/ShapeGeometry.js src/geometries/ShapeGeometry.js]

docs/api/zh/geometries/ShapeGeometry.html

@@ -65,13 +65,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
-
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/SphereBufferGeometry.html

@@ -61,12 +61,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>.parameters</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/SphereGeometry.js src/geometries/SphereGeometry.js]

docs/api/zh/geometries/SphereGeometry.html

@@ -61,12 +61,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>.parameters</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/TetrahedronBufferGeometry.html

@@ -41,13 +41,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:PolyhedronBufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
-
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:PolyhedronBufferGeometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/TetrahedronGeometry.html

@@ -41,11 +41,15 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
-					</p>
+		</p>
+
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
 
 		<h2>源代码</h2>
 

docs/api/zh/geometries/TextBufferGeometry.html

@@ -154,12 +154,16 @@
 		</table>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:ExtrudeBufferGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:ExtrudeBufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/TextGeometry.html

@@ -154,12 +154,16 @@
 		</table>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:ExtrudeGeometry]。</p>
 
 		<h3>[property:Object parameters]</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:ExtrudeGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

docs/api/zh/geometries/TorusBufferGeometry.html

@@ -52,12 +52,16 @@
 				</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:BufferGeometry]。</p>
 
 		<h3>.parameters</h3>
 		<p>
 				一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:BufferGeometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/geometries/TorusGeometry.js src/geometries/TorusGeometry.js]

docs/api/zh/geometries/TorusGeometry.html

@@ -52,12 +52,16 @@
 		</p>
 
 		<h2>属性</h2>
+		<p>常用属性请参见基类[page:Geometry]。</p>
 
 		<h3>.parameters</h3>
 		<p>
 			一个包含着构造函数中每个参数的对象。在对象实例化之后，对该属性的任何修改都不会改变这个几何体。
 		</p>
 
+		<h2>方法(Methods)</h2>
+		<p>常用方法请参见基类[page:Geometry]。</p>
+
 		<h2>源代码</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]