|
@@ -181,7 +181,7 @@
|
|
|
|
|
|
} );
|
|
|
|
|
|
- var REVISION = '83';
|
|
|
+ var REVISION = '84dev';
|
|
|
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
|
|
|
var CullFaceNone = 0;
|
|
|
var CullFaceBack = 1;
|
|
@@ -206,14 +206,6 @@
|
|
|
var SubtractiveBlending = 3;
|
|
|
var MultiplyBlending = 4;
|
|
|
var CustomBlending = 5;
|
|
|
- var BlendingMode = {
|
|
|
- NoBlending: NoBlending,
|
|
|
- NormalBlending: NormalBlending,
|
|
|
- AdditiveBlending: AdditiveBlending,
|
|
|
- SubtractiveBlending: SubtractiveBlending,
|
|
|
- MultiplyBlending: MultiplyBlending,
|
|
|
- CustomBlending: CustomBlending
|
|
|
- };
|
|
|
var AddEquation = 100;
|
|
|
var SubtractEquation = 101;
|
|
|
var ReverseSubtractEquation = 102;
|
|
@@ -254,38 +246,15 @@
|
|
|
var SphericalReflectionMapping = 305;
|
|
|
var CubeUVReflectionMapping = 306;
|
|
|
var CubeUVRefractionMapping = 307;
|
|
|
- var TextureMapping = {
|
|
|
- UVMapping: UVMapping,
|
|
|
- CubeReflectionMapping: CubeReflectionMapping,
|
|
|
- CubeRefractionMapping: CubeRefractionMapping,
|
|
|
- EquirectangularReflectionMapping: EquirectangularReflectionMapping,
|
|
|
- EquirectangularRefractionMapping: EquirectangularRefractionMapping,
|
|
|
- SphericalReflectionMapping: SphericalReflectionMapping,
|
|
|
- CubeUVReflectionMapping: CubeUVReflectionMapping,
|
|
|
- CubeUVRefractionMapping: CubeUVRefractionMapping
|
|
|
- };
|
|
|
var RepeatWrapping = 1000;
|
|
|
var ClampToEdgeWrapping = 1001;
|
|
|
var MirroredRepeatWrapping = 1002;
|
|
|
- var TextureWrapping = {
|
|
|
- RepeatWrapping: RepeatWrapping,
|
|
|
- ClampToEdgeWrapping: ClampToEdgeWrapping,
|
|
|
- MirroredRepeatWrapping: MirroredRepeatWrapping
|
|
|
- };
|
|
|
var NearestFilter = 1003;
|
|
|
var NearestMipMapNearestFilter = 1004;
|
|
|
var NearestMipMapLinearFilter = 1005;
|
|
|
var LinearFilter = 1006;
|
|
|
var LinearMipMapNearestFilter = 1007;
|
|
|
var LinearMipMapLinearFilter = 1008;
|
|
|
- var TextureFilter = {
|
|
|
- NearestFilter: NearestFilter,
|
|
|
- NearestMipMapNearestFilter: NearestMipMapNearestFilter,
|
|
|
- NearestMipMapLinearFilter: NearestMipMapLinearFilter,
|
|
|
- LinearFilter: LinearFilter,
|
|
|
- LinearMipMapNearestFilter: LinearMipMapNearestFilter,
|
|
|
- LinearMipMapLinearFilter: LinearMipMapLinearFilter
|
|
|
- };
|
|
|
var UnsignedByteType = 1009;
|
|
|
var ByteType = 1010;
|
|
|
var ShortType = 1011;
|
|
@@ -3819,30 +3788,6 @@
|
|
|
|
|
|
},
|
|
|
|
|
|
- applyToVector3Array: function () {
|
|
|
-
|
|
|
- var v1;
|
|
|
-
|
|
|
- return function applyToVector3Array( array, offset, length ) {
|
|
|
-
|
|
|
- if ( v1 === undefined ) v1 = new Vector3();
|
|
|
- if ( offset === undefined ) offset = 0;
|
|
|
- if ( length === undefined ) length = array.length;
|
|
|
-
|
|
|
- for ( var i = 0, j = offset; i < length; i += 3, j += 3 ) {
|
|
|
-
|
|
|
- v1.fromArray( array, j );
|
|
|
- v1.applyMatrix4( this );
|
|
|
- v1.toArray( array, j );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- return array;
|
|
|
-
|
|
|
- };
|
|
|
-
|
|
|
- }(),
|
|
|
-
|
|
|
applyToBufferAttribute: function () {
|
|
|
|
|
|
var v1;
|
|
@@ -8501,30 +8446,6 @@
|
|
|
|
|
|
},
|
|
|
|
|
|
- applyToVector3Array: function () {
|
|
|
-
|
|
|
- var v1;
|
|
|
-
|
|
|
- return function applyToVector3Array( array, offset, length ) {
|
|
|
-
|
|
|
- if ( v1 === undefined ) v1 = new Vector3();
|
|
|
- if ( offset === undefined ) offset = 0;
|
|
|
- if ( length === undefined ) length = array.length;
|
|
|
-
|
|
|
- for ( var i = 0, j = offset; i < length; i += 3, j += 3 ) {
|
|
|
-
|
|
|
- v1.fromArray( array, j );
|
|
|
- v1.applyMatrix3( this );
|
|
|
- v1.toArray( array, j );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- return array;
|
|
|
-
|
|
|
- };
|
|
|
-
|
|
|
- }(),
|
|
|
-
|
|
|
applyToBufferAttribute: function () {
|
|
|
|
|
|
var v1;
|
|
@@ -13844,7 +13765,7 @@
|
|
|
|
|
|
if ( position !== undefined ) {
|
|
|
|
|
|
- matrix.applyToVector3Array( position.array );
|
|
|
+ matrix.applyToBufferAttribute( position );
|
|
|
position.needsUpdate = true;
|
|
|
|
|
|
}
|
|
@@ -13855,7 +13776,7 @@
|
|
|
|
|
|
var normalMatrix = new Matrix3().getNormalMatrix( matrix );
|
|
|
|
|
|
- normalMatrix.applyToVector3Array( normal.array );
|
|
|
+ normalMatrix.applyToBufferAttribute( normal );
|
|
|
normal.needsUpdate = true;
|
|
|
|
|
|
}
|
|
@@ -32174,6 +32095,15 @@
|
|
|
|
|
|
createMaterial: ( function () {
|
|
|
|
|
|
+ var BlendingMode = {
|
|
|
+ NoBlending: NoBlending,
|
|
|
+ NormalBlending: NormalBlending,
|
|
|
+ AdditiveBlending: AdditiveBlending,
|
|
|
+ SubtractiveBlending: SubtractiveBlending,
|
|
|
+ MultiplyBlending: MultiplyBlending,
|
|
|
+ CustomBlending: CustomBlending
|
|
|
+ };
|
|
|
+
|
|
|
var color, textureLoader, materialLoader;
|
|
|
|
|
|
return function createMaterial( m, texturePath, crossOrigin ) {
|
|
@@ -32255,6 +32185,7 @@
|
|
|
var value = m[ name ];
|
|
|
|
|
|
switch ( name ) {
|
|
|
+
|
|
|
case 'DbgColor':
|
|
|
case 'DbgIndex':
|
|
|
case 'opticalDensity':
|
|
@@ -32400,6 +32331,7 @@
|
|
|
default:
|
|
|
console.error( 'THREE.Loader.createMaterial: Unsupported', name, value );
|
|
|
break;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -32436,7 +32368,7 @@
|
|
|
for ( var i = 0, l = handlers.length; i < l; i += 2 ) {
|
|
|
|
|
|
var regex = handlers[ i ];
|
|
|
- var loader = handlers[ i + 1 ];
|
|
|
+ var loader = handlers[ i + 1 ];
|
|
|
|
|
|
if ( regex.test( file ) ) {
|
|
|
|
|
@@ -33371,6 +33303,32 @@
|
|
|
|
|
|
parseTextures: function ( json, images ) {
|
|
|
|
|
|
+ var TextureMapping = {
|
|
|
+ UVMapping: UVMapping,
|
|
|
+ CubeReflectionMapping: CubeReflectionMapping,
|
|
|
+ CubeRefractionMapping: CubeRefractionMapping,
|
|
|
+ EquirectangularReflectionMapping: EquirectangularReflectionMapping,
|
|
|
+ EquirectangularRefractionMapping: EquirectangularRefractionMapping,
|
|
|
+ SphericalReflectionMapping: SphericalReflectionMapping,
|
|
|
+ CubeUVReflectionMapping: CubeUVReflectionMapping,
|
|
|
+ CubeUVRefractionMapping: CubeUVRefractionMapping
|
|
|
+ };
|
|
|
+
|
|
|
+ var TextureWrapping = {
|
|
|
+ RepeatWrapping: RepeatWrapping,
|
|
|
+ ClampToEdgeWrapping: ClampToEdgeWrapping,
|
|
|
+ MirroredRepeatWrapping: MirroredRepeatWrapping
|
|
|
+ };
|
|
|
+
|
|
|
+ var TextureFilter = {
|
|
|
+ NearestFilter: NearestFilter,
|
|
|
+ NearestMipMapNearestFilter: NearestMipMapNearestFilter,
|
|
|
+ NearestMipMapLinearFilter: NearestMipMapLinearFilter,
|
|
|
+ LinearFilter: LinearFilter,
|
|
|
+ LinearMipMapNearestFilter: LinearMipMapNearestFilter,
|
|
|
+ LinearMipMapLinearFilter: LinearMipMapLinearFilter
|
|
|
+ };
|
|
|
+
|
|
|
function parseConstant( value, type ) {
|
|
|
|
|
|
if ( typeof( value ) === 'number' ) return value;
|
|
@@ -41964,6 +41922,11 @@
|
|
|
console.warn( 'THREE.Matrix3: .applyToBuffer() has been removed. Use matrix.applyToBufferAttribute( attribute ) instead.' );
|
|
|
return this.applyToBufferAttribute( buffer );
|
|
|
|
|
|
+ },
|
|
|
+ applyToVector3Array: function( array, offset, length ) {
|
|
|
+
|
|
|
+ console.error( 'THREE.Matrix3: .applyToVector3Array() has been removed.' );
|
|
|
+
|
|
|
}
|
|
|
|
|
|
} );
|
|
@@ -42061,6 +42024,11 @@
|
|
|
console.warn( 'THREE.Matrix4: .applyToBuffer() has been removed. Use matrix.applyToBufferAttribute( attribute ) instead.' );
|
|
|
return this.applyToBufferAttribute( buffer );
|
|
|
|
|
|
+ },
|
|
|
+ applyToVector3Array: function( array, offset, length ) {
|
|
|
+
|
|
|
+ console.error( 'THREE.Matrix4: .applyToVector3Array() has been removed.' );
|
|
|
+
|
|
|
}
|
|
|
|
|
|
} );
|
|
@@ -43203,7 +43171,6 @@
|
|
|
exports.SubtractiveBlending = SubtractiveBlending;
|
|
|
exports.MultiplyBlending = MultiplyBlending;
|
|
|
exports.CustomBlending = CustomBlending;
|
|
|
- exports.BlendingMode = BlendingMode;
|
|
|
exports.AddEquation = AddEquation;
|
|
|
exports.SubtractEquation = SubtractEquation;
|
|
|
exports.ReverseSubtractEquation = ReverseSubtractEquation;
|
|
@@ -43244,18 +43211,15 @@
|
|
|
exports.SphericalReflectionMapping = SphericalReflectionMapping;
|
|
|
exports.CubeUVReflectionMapping = CubeUVReflectionMapping;
|
|
|
exports.CubeUVRefractionMapping = CubeUVRefractionMapping;
|
|
|
- exports.TextureMapping = TextureMapping;
|
|
|
exports.RepeatWrapping = RepeatWrapping;
|
|
|
exports.ClampToEdgeWrapping = ClampToEdgeWrapping;
|
|
|
exports.MirroredRepeatWrapping = MirroredRepeatWrapping;
|
|
|
- exports.TextureWrapping = TextureWrapping;
|
|
|
exports.NearestFilter = NearestFilter;
|
|
|
exports.NearestMipMapNearestFilter = NearestMipMapNearestFilter;
|
|
|
exports.NearestMipMapLinearFilter = NearestMipMapLinearFilter;
|
|
|
exports.LinearFilter = LinearFilter;
|
|
|
exports.LinearMipMapNearestFilter = LinearMipMapNearestFilter;
|
|
|
exports.LinearMipMapLinearFilter = LinearMipMapLinearFilter;
|
|
|
- exports.TextureFilter = TextureFilter;
|
|
|
exports.UnsignedByteType = UnsignedByteType;
|
|
|
exports.ByteType = ByteType;
|
|
|
exports.ShortType = ShortType;
|