|
|
@@ -1713,6 +1713,18 @@ function getTypedArray( type, buffer ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * Returns `true` if the given object is a typed array.
|
|
|
+ *
|
|
|
+ * @param {any} array - The object to check.
|
|
|
+ * @return {boolean} Whether the given object is a typed array.
|
|
|
+ */
|
|
|
+function isTypedArray( array ) {
|
|
|
+
|
|
|
+ return ArrayBuffer.isView( array ) && ! ( array instanceof DataView );
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
function createElementNS( name ) {
|
|
|
|
|
|
return document.createElementNS( 'http://www.w3.org/1999/xhtml', name );
|
|
|
@@ -17144,6 +17156,7 @@ class Material extends EventDispatcher {
|
|
|
if ( this.alphaToCoverage === true ) data.alphaToCoverage = true;
|
|
|
if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = true;
|
|
|
if ( this.forceSinglePass === true ) data.forceSinglePass = true;
|
|
|
+ if ( this.allowOverride === false ) data.allowOverride = false;
|
|
|
|
|
|
if ( this.wireframe === true ) data.wireframe = true;
|
|
|
if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth;
|
|
|
@@ -17279,6 +17292,7 @@ class Material extends EventDispatcher {
|
|
|
this.alphaToCoverage = source.alphaToCoverage;
|
|
|
this.premultipliedAlpha = source.premultipliedAlpha;
|
|
|
this.forceSinglePass = source.forceSinglePass;
|
|
|
+ this.allowOverride = source.allowOverride;
|
|
|
|
|
|
this.visible = source.visible;
|
|
|
|
|
|
@@ -40948,18 +40962,6 @@ function convertArray( array, type ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * Returns `true` if the given object is a typed array.
|
|
|
- *
|
|
|
- * @param {any} object - The object to check.
|
|
|
- * @return {boolean} Whether the given object is a typed array.
|
|
|
- */
|
|
|
-function isTypedArray( object ) {
|
|
|
-
|
|
|
- return ArrayBuffer.isView( object ) && ! ( object instanceof DataView );
|
|
|
-
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* Returns an array by which times and values can be sorted.
|
|
|
*
|
|
|
@@ -47214,6 +47216,7 @@ class MaterialLoader extends Loader {
|
|
|
if ( json.alphaToCoverage !== undefined ) material.alphaToCoverage = json.alphaToCoverage;
|
|
|
if ( json.premultipliedAlpha !== undefined ) material.premultipliedAlpha = json.premultipliedAlpha;
|
|
|
if ( json.forceSinglePass !== undefined ) material.forceSinglePass = json.forceSinglePass;
|
|
|
+ if ( json.allowOverride !== undefined ) material.allowOverride = json.allowOverride;
|
|
|
|
|
|
if ( json.visible !== undefined ) material.visible = json.visible;
|
|
|
|
|
|
@@ -55001,7 +55004,7 @@ class Raycaster {
|
|
|
* @property {Object3D} object - The 3D object that has been intersected.
|
|
|
* @property {Vector2} uv - U,V coordinates at point of intersection.
|
|
|
* @property {Vector2} uv1 - Second set of U,V coordinates at point of intersection.
|
|
|
- * @property {Vector3} uv1 - Interpolated normal vector at point of intersection.
|
|
|
+ * @property {Vector3} normal - Interpolated normal vector at point of intersection.
|
|
|
* @property {number} instanceId - The index number of the instance where the ray
|
|
|
* intersects the {@link InstancedMesh}.
|
|
|
*/
|
|
|
@@ -61686,7 +61689,7 @@ class PMREMGenerator {
|
|
|
* @param {number} [far=100] - The far plane distance.
|
|
|
* @param {Object} [options={}] - The configuration options.
|
|
|
* @param {number} [options.size=256] - The texture size of the PMREM.
|
|
|
- * @param {Vector3} [options.renderTarget=origin] - The position of the internal cube camera that renders the scene.
|
|
|
+ * @param {Vector3} [options.position=origin] - The position of the internal cube camera that renders the scene.
|
|
|
* @return {WebGLRenderTarget} The resulting PMREM.
|
|
|
*/
|
|
|
fromScene( scene, sigma = 0, near = 0.1, far = 100, options = {} ) {
|