@@ -1713,6 +1713,18 @@ function getTypedArray( type, buffer ) {
17131713
17141714}
17151715
1716+ /**
1717+ * Returns `true` if the given object is a typed array.
1718+ *
1719+ * @param {any} array - The object to check.
1720+ * @return {boolean} Whether the given object is a typed array.
1721+ */
1722+ function isTypedArray( array ) {
1723+
1724+ return ArrayBuffer.isView( array ) && ! ( array instanceof DataView );
1725+
1726+ }
1727+
17161728function createElementNS( name ) {
17171729
17181730 return document.createElementNS( 'http://www.w3.org/1999/xhtml', name );
@@ -17144,6 +17156,7 @@ class Material extends EventDispatcher {
1714417156 if ( this.alphaToCoverage === true ) data.alphaToCoverage = true;
1714517157 if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = true;
1714617158 if ( this.forceSinglePass === true ) data.forceSinglePass = true;
17159+ if ( this.allowOverride === false ) data.allowOverride = false;
1714717160
1714817161 if ( this.wireframe === true ) data.wireframe = true;
1714917162 if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth;
@@ -17279,6 +17292,7 @@ class Material extends EventDispatcher {
1727917292 this.alphaToCoverage = source.alphaToCoverage;
1728017293 this.premultipliedAlpha = source.premultipliedAlpha;
1728117294 this.forceSinglePass = source.forceSinglePass;
17295+ this.allowOverride = source.allowOverride;
1728217296
1728317297 this.visible = source.visible;
1728417298
@@ -40948,18 +40962,6 @@ function convertArray( array, type ) {
4094840962
4094940963}
4095040964
40951- /**
40952- * Returns `true` if the given object is a typed array.
40953- *
40954- * @param {any} object - The object to check.
40955- * @return {boolean} Whether the given object is a typed array.
40956- */
40957- function isTypedArray( object ) {
40958-
40959- return ArrayBuffer.isView( object ) && ! ( object instanceof DataView );
40960-
40961- }
40962-
4096340965/**
4096440966 * Returns an array by which times and values can be sorted.
4096540967 *
@@ -47214,6 +47216,7 @@ class MaterialLoader extends Loader {
4721447216 if ( json.alphaToCoverage !== undefined ) material.alphaToCoverage = json.alphaToCoverage;
4721547217 if ( json.premultipliedAlpha !== undefined ) material.premultipliedAlpha = json.premultipliedAlpha;
4721647218 if ( json.forceSinglePass !== undefined ) material.forceSinglePass = json.forceSinglePass;
47219+ if ( json.allowOverride !== undefined ) material.allowOverride = json.allowOverride;
4721747220
4721847221 if ( json.visible !== undefined ) material.visible = json.visible;
4721947222
@@ -55001,7 +55004,7 @@ class Raycaster {
5500155004 * @property {Object3D} object - The 3D object that has been intersected.
5500255005 * @property {Vector2} uv - U,V coordinates at point of intersection.
5500355006 * @property {Vector2} uv1 - Second set of U,V coordinates at point of intersection.
55004- * @property {Vector3} uv1 - Interpolated normal vector at point of intersection.
55007+ * @property {Vector3} normal - Interpolated normal vector at point of intersection.
5500555008 * @property {number} instanceId - The index number of the instance where the ray
5500655009 * intersects the {@link InstancedMesh}.
5500755010 */
@@ -61686,7 +61689,7 @@ class PMREMGenerator {
6168661689 * @param {number} [far=100] - The far plane distance.
6168761690 * @param {Object} [options={}] - The configuration options.
6168861691 * @param {number} [options.size=256] - The texture size of the PMREM.
61689- * @param {Vector3} [options.renderTarget =origin] - The position of the internal cube camera that renders the scene.
61692+ * @param {Vector3} [options.position =origin] - The position of the internal cube camera that renders the scene.
6169061693 * @return {WebGLRenderTarget} The resulting PMREM.
6169161694 */
6169261695 fromScene( scene, sigma = 0, near = 0.1, far = 100, options = {} ) {
0 commit comments