diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index 68e0445807e242..7bae62247d95f7 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -53,7 +53,7 @@ import { Sphere } from './math/Sphere.js'; import { Color } from './math/Color.js'; import { Frustum } from './math/Frustum.js'; import { Line3 } from './math/Line3.js'; -import { MathUtils } from './math/MathUtils.js'; +import * as MathUtils from './math/MathUtils.js'; import { Matrix3 } from './math/Matrix3.js'; import { Matrix4 } from './math/Matrix4.js'; import { Plane } from './math/Plane.js'; @@ -428,29 +428,6 @@ Line3.prototype.center = function ( optionalTarget ) { // -MathUtils.random16 = function () { - - console.warn( 'THREE.Math: .random16() has been deprecated. Use Math.random() instead.' ); - return Math.random(); - -}; - -MathUtils.nearestPowerOfTwo = function ( value ) { - - console.warn( 'THREE.Math: .nearestPowerOfTwo() has been renamed to .floorPowerOfTwo().' ); - return MathUtils.floorPowerOfTwo( value ); - -}; - -MathUtils.nextPowerOfTwo = function ( value ) { - - console.warn( 'THREE.Math: .nextPowerOfTwo() has been renamed to .ceilPowerOfTwo().' ); - return MathUtils.ceilPowerOfTwo( value ); - -}; - -// - Matrix3.prototype.flattenToArrayOffset = function ( array, offset ) { console.warn( 'THREE.Matrix3: .flattenToArrayOffset() has been deprecated. Use .toArray() instead.' ); diff --git a/src/Three.js b/src/Three.js index 7e3bb3e8b29baa..6f1b7459d6c67c 100644 --- a/src/Three.js +++ b/src/Three.js @@ -106,7 +106,7 @@ export { DiscreteInterpolant } from './math/interpolants/DiscreteInterpolant.js' export { CubicInterpolant } from './math/interpolants/CubicInterpolant.js'; export { Interpolant } from './math/Interpolant.js'; export { Triangle } from './math/Triangle.js'; -export { MathUtils } from './math/MathUtils.js'; +export * as MathUtils from './math/MathUtils.js'; export { Spherical } from './math/Spherical.js'; export { Cylindrical } from './math/Cylindrical.js'; export { Plane } from './math/Plane.js'; diff --git a/src/animation/AnimationClip.js b/src/animation/AnimationClip.js index 58a904054fe0e8..d98c56df7c60ab 100644 --- a/src/animation/AnimationClip.js +++ b/src/animation/AnimationClip.js @@ -6,7 +6,7 @@ import { NumberKeyframeTrack } from './tracks/NumberKeyframeTrack.js'; import { QuaternionKeyframeTrack } from './tracks/QuaternionKeyframeTrack.js'; import { StringKeyframeTrack } from './tracks/StringKeyframeTrack.js'; import { VectorKeyframeTrack } from './tracks/VectorKeyframeTrack.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { NormalAnimationBlendMode } from '../constants.js'; class AnimationClip { diff --git a/src/animation/AnimationObjectGroup.js b/src/animation/AnimationObjectGroup.js index 97040d6c82b0ed..4f49d964fa1318 100644 --- a/src/animation/AnimationObjectGroup.js +++ b/src/animation/AnimationObjectGroup.js @@ -1,5 +1,5 @@ import { PropertyBinding } from './PropertyBinding.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; /** * diff --git a/src/cameras/PerspectiveCamera.js b/src/cameras/PerspectiveCamera.js index d357491f3023bf..9c16b8c38bfe7e 100644 --- a/src/cameras/PerspectiveCamera.js +++ b/src/cameras/PerspectiveCamera.js @@ -1,5 +1,5 @@ import { Camera } from './Camera.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; class PerspectiveCamera extends Camera { diff --git a/src/cameras/StereoCamera.js b/src/cameras/StereoCamera.js index 948a3af69a8f4d..2073a09e870b69 100644 --- a/src/cameras/StereoCamera.js +++ b/src/cameras/StereoCamera.js @@ -1,5 +1,5 @@ import { Matrix4 } from '../math/Matrix4.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { PerspectiveCamera } from './PerspectiveCamera.js'; const _eyeRight = /*@__PURE__*/ new Matrix4(); diff --git a/src/core/BufferGeometry.js b/src/core/BufferGeometry.js index 910d1c91041371..61fffe975cc62a 100644 --- a/src/core/BufferGeometry.js +++ b/src/core/BufferGeometry.js @@ -7,7 +7,7 @@ import { Sphere } from '../math/Sphere.js'; import { Object3D } from './Object3D.js'; import { Matrix4 } from '../math/Matrix4.js'; import { Matrix3 } from '../math/Matrix3.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { arrayMax } from '../utils.js'; let _id = 0; diff --git a/src/core/InterleavedBuffer.js b/src/core/InterleavedBuffer.js index f8f91214fae474..c93c4f933f4df9 100644 --- a/src/core/InterleavedBuffer.js +++ b/src/core/InterleavedBuffer.js @@ -1,4 +1,4 @@ -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { StaticDrawUsage } from '../constants.js'; class InterleavedBuffer { diff --git a/src/core/Object3D.js b/src/core/Object3D.js index 523dd2f87757c3..2a756f110879df 100644 --- a/src/core/Object3D.js +++ b/src/core/Object3D.js @@ -5,7 +5,7 @@ import { EventDispatcher } from './EventDispatcher.js'; import { Euler } from '../math/Euler.js'; import { Layers } from './Layers.js'; import { Matrix3 } from '../math/Matrix3.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; let _object3DId = 0; diff --git a/src/extras/core/Curve.js b/src/extras/core/Curve.js index a08ee80613a61e..fd811d6f43d8cc 100644 --- a/src/extras/core/Curve.js +++ b/src/extras/core/Curve.js @@ -1,4 +1,4 @@ -import { MathUtils } from '../../math/MathUtils.js'; +import * as MathUtils from '../../math/MathUtils.js'; import { Vector2 } from '../../math/Vector2.js'; import { Vector3 } from '../../math/Vector3.js'; import { Matrix4 } from '../../math/Matrix4.js'; diff --git a/src/extras/core/Shape.js b/src/extras/core/Shape.js index f2558cef3bce9b..334bb69f44e60e 100644 --- a/src/extras/core/Shape.js +++ b/src/extras/core/Shape.js @@ -1,5 +1,5 @@ import { Path } from './Path.js'; -import { MathUtils } from '../../math/MathUtils.js'; +import * as MathUtils from '../../math/MathUtils.js'; class Shape extends Path { diff --git a/src/geometries/EdgesGeometry.js b/src/geometries/EdgesGeometry.js index f869866a6c74ea..fb717a423eedfe 100644 --- a/src/geometries/EdgesGeometry.js +++ b/src/geometries/EdgesGeometry.js @@ -1,6 +1,6 @@ import { BufferGeometry } from '../core/BufferGeometry.js'; import { Float32BufferAttribute } from '../core/BufferAttribute.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { Triangle } from '../math/Triangle.js'; import { Vector3 } from '../math/Vector3.js'; diff --git a/src/geometries/LatheGeometry.js b/src/geometries/LatheGeometry.js index d04dda2cd228fe..adec329a66e57d 100644 --- a/src/geometries/LatheGeometry.js +++ b/src/geometries/LatheGeometry.js @@ -2,7 +2,7 @@ import { Float32BufferAttribute } from '../core/BufferAttribute.js'; import { BufferGeometry } from '../core/BufferGeometry.js'; import { Vector3 } from '../math/Vector3.js'; import { Vector2 } from '../math/Vector2.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; class LatheGeometry extends BufferGeometry { diff --git a/src/lights/SpotLightShadow.js b/src/lights/SpotLightShadow.js index 40e6ea32ebce7b..8dd8d3e9e03859 100644 --- a/src/lights/SpotLightShadow.js +++ b/src/lights/SpotLightShadow.js @@ -1,5 +1,5 @@ import { LightShadow } from './LightShadow.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { PerspectiveCamera } from '../cameras/PerspectiveCamera.js'; class SpotLightShadow extends LightShadow { diff --git a/src/materials/Material.js b/src/materials/Material.js index f90e64d71ddc60..dcd7632f8af4ad 100644 --- a/src/materials/Material.js +++ b/src/materials/Material.js @@ -1,6 +1,6 @@ import { EventDispatcher } from '../core/EventDispatcher.js'; import { FrontSide, FlatShading, NormalBlending, LessEqualDepth, AddEquation, OneMinusSrcAlphaFactor, SrcAlphaFactor, AlwaysStencilFunc, KeepStencilOp } from '../constants.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; let materialId = 0; diff --git a/src/materials/MeshPhysicalMaterial.js b/src/materials/MeshPhysicalMaterial.js index 66df1a3e0cfa7f..62a620de433ea2 100644 --- a/src/materials/MeshPhysicalMaterial.js +++ b/src/materials/MeshPhysicalMaterial.js @@ -1,7 +1,7 @@ import { Vector2 } from '../math/Vector2.js'; import { MeshStandardMaterial } from './MeshStandardMaterial.js'; import { Color } from '../math/Color.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; /** * parameters = { diff --git a/src/math/Color.js b/src/math/Color.js index e7e5fa95263908..033aa2dbe7722d 100644 --- a/src/math/Color.js +++ b/src/math/Color.js @@ -1,4 +1,4 @@ -import { MathUtils } from './MathUtils.js'; +import * as MathUtils from './MathUtils.js'; const _colorKeywords = { 'aliceblue': 0xF0F8FF, 'antiquewhite': 0xFAEBD7, 'aqua': 0x00FFFF, 'aquamarine': 0x7FFFD4, 'azure': 0xF0FFFF, 'beige': 0xF5F5DC, 'bisque': 0xFFE4C4, 'black': 0x000000, 'blanchedalmond': 0xFFEBCD, 'blue': 0x0000FF, 'blueviolet': 0x8A2BE2, diff --git a/src/math/Euler.js b/src/math/Euler.js index 789374af67f8e8..069d0e63895930 100644 --- a/src/math/Euler.js +++ b/src/math/Euler.js @@ -1,7 +1,7 @@ import { Quaternion } from './Quaternion.js'; import { Vector3 } from './Vector3.js'; import { Matrix4 } from './Matrix4.js'; -import { MathUtils } from './MathUtils.js'; +import * as MathUtils from './MathUtils.js'; const _matrix = /*@__PURE__*/ new Matrix4(); const _quaternion = /*@__PURE__*/ new Quaternion(); diff --git a/src/math/Line3.js b/src/math/Line3.js index d70e78ddd2baa1..c18635bb3ef9ea 100644 --- a/src/math/Line3.js +++ b/src/math/Line3.js @@ -1,5 +1,5 @@ import { Vector3 } from './Vector3.js'; -import { MathUtils } from './MathUtils.js'; +import * as MathUtils from './MathUtils.js'; const _startP = /*@__PURE__*/ new Vector3(); const _startEnd = /*@__PURE__*/ new Vector3(); diff --git a/src/math/MathUtils.js b/src/math/MathUtils.js index 50efa171c219de..f23c97a010d053 100644 --- a/src/math/MathUtils.js +++ b/src/math/MathUtils.js @@ -8,241 +8,251 @@ for ( let i = 0; i < 256; i ++ ) { let _seed = 1234567; -const MathUtils = { - DEG2RAD: Math.PI / 180, - RAD2DEG: 180 / Math.PI, +const DEG2RAD = Math.PI / 180; +const RAD2DEG = 180 / Math.PI; - generateUUID: function () { +// http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript/21963136#21963136 +function generateUUID() { - // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript/21963136#21963136 - - const d0 = Math.random() * 0xffffffff | 0; - const d1 = Math.random() * 0xffffffff | 0; - const d2 = Math.random() * 0xffffffff | 0; - const d3 = Math.random() * 0xffffffff | 0; - const uuid = _lut[ d0 & 0xff ] + _lut[ d0 >> 8 & 0xff ] + _lut[ d0 >> 16 & 0xff ] + _lut[ d0 >> 24 & 0xff ] + '-' + + const d0 = Math.random() * 0xffffffff | 0; + const d1 = Math.random() * 0xffffffff | 0; + const d2 = Math.random() * 0xffffffff | 0; + const d3 = Math.random() * 0xffffffff | 0; + const uuid = _lut[ d0 & 0xff ] + _lut[ d0 >> 8 & 0xff ] + _lut[ d0 >> 16 & 0xff ] + _lut[ d0 >> 24 & 0xff ] + '-' + _lut[ d1 & 0xff ] + _lut[ d1 >> 8 & 0xff ] + '-' + _lut[ d1 >> 16 & 0x0f | 0x40 ] + _lut[ d1 >> 24 & 0xff ] + '-' + _lut[ d2 & 0x3f | 0x80 ] + _lut[ d2 >> 8 & 0xff ] + '-' + _lut[ d2 >> 16 & 0xff ] + _lut[ d2 >> 24 & 0xff ] + _lut[ d3 & 0xff ] + _lut[ d3 >> 8 & 0xff ] + _lut[ d3 >> 16 & 0xff ] + _lut[ d3 >> 24 & 0xff ]; - // .toUpperCase() here flattens concatenated strings to save heap memory space. - return uuid.toUpperCase(); - - }, - - clamp: function ( value, min, max ) { + // .toUpperCase() here flattens concatenated strings to save heap memory space. + return uuid.toUpperCase(); - return Math.max( min, Math.min( max, value ) ); - - }, +} - // compute euclidian modulo of m % n - // https://en.wikipedia.org/wiki/Modulo_operation +function clamp( value, min, max ) { - euclideanModulo: function ( n, m ) { + return Math.max( min, Math.min( max, value ) ); - return ( ( n % m ) + m ) % m; +} - }, +// compute euclidian modulo of m % n +// https://en.wikipedia.org/wiki/Modulo_operation +function euclideanModulo( n, m ) { - // Linear mapping from range to range + return ( ( n % m ) + m ) % m; - mapLinear: function ( x, a1, a2, b1, b2 ) { +} - return b1 + ( x - a1 ) * ( b2 - b1 ) / ( a2 - a1 ); +// Linear mapping from range to range +function mapLinear( x, a1, a2, b1, b2 ) { - }, + return b1 + ( x - a1 ) * ( b2 - b1 ) / ( a2 - a1 ); - // https://www.gamedev.net/tutorials/programming/general-and-gameplay-programming/inverse-lerp-a-super-useful-yet-often-overlooked-function-r5230/ +} - inverseLerp: function ( x, y, value ) { +// https://www.gamedev.net/tutorials/programming/general-and-gameplay-programming/inverse-lerp-a-super-useful-yet-often-overlooked-function-r5230/ +function inverseLerp( x, y, value ) { - if ( x !== y ) { + if ( x !== y ) { - return ( value - x ) / ( y - x ); + return ( value - x ) / ( y - x ); } else { - return 0; + return 0; } - }, - - // https://en.wikipedia.org/wiki/Linear_interpolation - - lerp: function ( x, y, t ) { - - return ( 1 - t ) * x + t * y; - - }, - - // http://www.rorydriscoll.com/2016/03/07/frame-rate-independent-damping-using-lerp/ +} - damp: function ( x, y, lambda, dt ) { +// https://en.wikipedia.org/wiki/Linear_interpolation +function lerp( x, y, t ) { - return MathUtils.lerp( x, y, 1 - Math.exp( - lambda * dt ) ); + return ( 1 - t ) * x + t * y; - }, +} - // https://www.desmos.com/calculator/vcsjnyz7x4 +// http://www.rorydriscoll.com/2016/03/07/frame-rate-independent-damping-using-lerp/ +function damp( x, y, lambda, dt ) { - pingpong: function ( x, length = 1 ) { + return lerp( x, y, 1 - Math.exp( - lambda * dt ) ); - return length - Math.abs( MathUtils.euclideanModulo( x, length * 2 ) - length ); +} - }, +// https://www.desmos.com/calculator/vcsjnyz7x4 +function pingpong( x, length = 1 ) { - // http://en.wikipedia.org/wiki/Smoothstep + return length - Math.abs( euclideanModulo( x, length * 2 ) - length ); - smoothstep: function ( x, min, max ) { +} - if ( x <= min ) return 0; - if ( x >= max ) return 1; +// http://en.wikipedia.org/wiki/Smoothstep +function smoothstep( x, min, max ) { - x = ( x - min ) / ( max - min ); + if ( x <= min ) return 0; + if ( x >= max ) return 1; - return x * x * ( 3 - 2 * x ); + x = ( x - min ) / ( max - min ); - }, + return x * x * ( 3 - 2 * x ); - smootherstep: function ( x, min, max ) { +} - if ( x <= min ) return 0; - if ( x >= max ) return 1; +function smootherstep( x, min, max ) { - x = ( x - min ) / ( max - min ); + if ( x <= min ) return 0; + if ( x >= max ) return 1; - return x * x * x * ( x * ( x * 6 - 15 ) + 10 ); + x = ( x - min ) / ( max - min ); - }, + return x * x * x * ( x * ( x * 6 - 15 ) + 10 ); - // Random integer from interval +} - randInt: function ( low, high ) { +// Random integer from interval +function randInt( low, high ) { - return low + Math.floor( Math.random() * ( high - low + 1 ) ); + return low + Math.floor( Math.random() * ( high - low + 1 ) ); - }, +} - // Random float from interval +// Random float from interval +function randFloat( low, high ) { - randFloat: function ( low, high ) { + return low + Math.random() * ( high - low ); - return low + Math.random() * ( high - low ); +} - }, +// Random float from <-range/2, range/2> interval +function randFloatSpread( range ) { - // Random float from <-range/2, range/2> interval + return range * ( 0.5 - Math.random() ); - randFloatSpread: function ( range ) { +} - return range * ( 0.5 - Math.random() ); +// Deterministic pseudo-random float in the interval [ 0, 1 ] +function seededRandom( s ) { - }, + if ( s !== undefined ) _seed = s % 2147483647; - // Deterministic pseudo-random float in the interval [ 0, 1 ] + // Park-Miller algorithm - seededRandom: function ( s ) { + _seed = _seed * 16807 % 2147483647; - if ( s !== undefined ) _seed = s % 2147483647; + return ( _seed - 1 ) / 2147483646; - // Park-Miller algorithm +} - _seed = _seed * 16807 % 2147483647; +function degToRad( degrees ) { - return ( _seed - 1 ) / 2147483646; + return degrees * DEG2RAD; - }, +} - degToRad: function ( degrees ) { +function radToDeg( radians ) { - return degrees * MathUtils.DEG2RAD; + return radians * RAD2DEG; - }, +} - radToDeg: function ( radians ) { +function isPowerOfTwo( value ) { - return radians * MathUtils.RAD2DEG; + return ( value & ( value - 1 ) ) === 0 && value !== 0; - }, +} - isPowerOfTwo: function ( value ) { +function ceilPowerOfTwo( value ) { - return ( value & ( value - 1 ) ) === 0 && value !== 0; + return Math.pow( 2, Math.ceil( Math.log( value ) / Math.LN2 ) ); - }, +} - ceilPowerOfTwo: function ( value ) { +function floorPowerOfTwo( value ) { - return Math.pow( 2, Math.ceil( Math.log( value ) / Math.LN2 ) ); + return Math.pow( 2, Math.floor( Math.log( value ) / Math.LN2 ) ); - }, +} - floorPowerOfTwo: function ( value ) { +function setQuaternionFromProperEuler( q, a, b, c, order ) { - return Math.pow( 2, Math.floor( Math.log( value ) / Math.LN2 ) ); + // Intrinsic Proper Euler Angles - see https://en.wikipedia.org/wiki/Euler_angles - }, + // rotations are applied to the axes in the order specified by 'order' + // rotation by angle 'a' is applied first, then by angle 'b', then by angle 'c' + // angles are in radians - setQuaternionFromProperEuler: function ( q, a, b, c, order ) { + const cos = Math.cos; + const sin = Math.sin; - // Intrinsic Proper Euler Angles - see https://en.wikipedia.org/wiki/Euler_angles + const c2 = cos( b / 2 ); + const s2 = sin( b / 2 ); - // rotations are applied to the axes in the order specified by 'order' - // rotation by angle 'a' is applied first, then by angle 'b', then by angle 'c' - // angles are in radians + const c13 = cos( ( a + c ) / 2 ); + const s13 = sin( ( a + c ) / 2 ); - const cos = Math.cos; - const sin = Math.sin; + const c1_3 = cos( ( a - c ) / 2 ); + const s1_3 = sin( ( a - c ) / 2 ); - const c2 = cos( b / 2 ); - const s2 = sin( b / 2 ); + const c3_1 = cos( ( c - a ) / 2 ); + const s3_1 = sin( ( c - a ) / 2 ); - const c13 = cos( ( a + c ) / 2 ); - const s13 = sin( ( a + c ) / 2 ); + switch ( order ) { - const c1_3 = cos( ( a - c ) / 2 ); - const s1_3 = sin( ( a - c ) / 2 ); + case 'XYX': + q.set( c2 * s13, s2 * c1_3, s2 * s1_3, c2 * c13 ); + break; - const c3_1 = cos( ( c - a ) / 2 ); - const s3_1 = sin( ( c - a ) / 2 ); + case 'YZY': + q.set( s2 * s1_3, c2 * s13, s2 * c1_3, c2 * c13 ); + break; - switch ( order ) { + case 'ZXZ': + q.set( s2 * c1_3, s2 * s1_3, c2 * s13, c2 * c13 ); + break; - case 'XYX': - q.set( c2 * s13, s2 * c1_3, s2 * s1_3, c2 * c13 ); - break; + case 'XZX': + q.set( c2 * s13, s2 * s3_1, s2 * c3_1, c2 * c13 ); + break; - case 'YZY': - q.set( s2 * s1_3, c2 * s13, s2 * c1_3, c2 * c13 ); - break; + case 'YXY': + q.set( s2 * c3_1, c2 * s13, s2 * s3_1, c2 * c13 ); + break; - case 'ZXZ': - q.set( s2 * c1_3, s2 * s1_3, c2 * s13, c2 * c13 ); - break; + case 'ZYZ': + q.set( s2 * s3_1, s2 * c3_1, c2 * s13, c2 * c13 ); + break; - case 'XZX': - q.set( c2 * s13, s2 * s3_1, s2 * c3_1, c2 * c13 ); - break; + default: + console.warn( 'THREE.MathUtils: .setQuaternionFromProperEuler() encountered an unknown order: ' + order ); - case 'YXY': - q.set( s2 * c3_1, c2 * s13, s2 * s3_1, c2 * c13 ); - break; + } - case 'ZYZ': - q.set( s2 * s3_1, s2 * c3_1, c2 * s13, c2 * c13 ); - break; +} - default: - console.warn( 'THREE.MathUtils: .setQuaternionFromProperEuler() encountered an unknown order: ' + order ); - } - } +export { + DEG2RAD, + RAD2DEG, + generateUUID, + clamp, + euclideanModulo, + mapLinear, + inverseLerp, + lerp, + damp, + pingpong, + smoothstep, + smootherstep, + randInt, + randFloat, + randFloatSpread, + seededRandom, + degToRad, + radToDeg, + isPowerOfTwo, + ceilPowerOfTwo, + floorPowerOfTwo, + setQuaternionFromProperEuler, }; - - -export { MathUtils }; diff --git a/src/math/Quaternion.js b/src/math/Quaternion.js index 6b0b9711c16a81..9078a612eccc53 100644 --- a/src/math/Quaternion.js +++ b/src/math/Quaternion.js @@ -1,4 +1,4 @@ -import { MathUtils } from './MathUtils.js'; +import * as MathUtils from './MathUtils.js'; class Quaternion { diff --git a/src/math/Spherical.js b/src/math/Spherical.js index 1770423a70e915..9b7bb6c629d987 100644 --- a/src/math/Spherical.js +++ b/src/math/Spherical.js @@ -5,7 +5,7 @@ * The azimuthal angle (theta) is measured from the positive z-axis. */ -import { MathUtils } from './MathUtils.js'; +import * as MathUtils from './MathUtils.js'; class Spherical { diff --git a/src/math/Vector3.js b/src/math/Vector3.js index b76de308113d66..ecdd6c1a73cfab 100644 --- a/src/math/Vector3.js +++ b/src/math/Vector3.js @@ -1,4 +1,4 @@ -import { MathUtils } from './MathUtils.js'; +import * as MathUtils from './MathUtils.js'; import { Quaternion } from './Quaternion.js'; class Vector3 { diff --git a/src/objects/Skeleton.js b/src/objects/Skeleton.js index 51e2d28e9d1017..7a30da62377110 100644 --- a/src/objects/Skeleton.js +++ b/src/objects/Skeleton.js @@ -1,6 +1,6 @@ import { Bone } from './Bone.js'; import { Matrix4 } from '../math/Matrix4.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; const _offsetMatrix = /*@__PURE__*/ new Matrix4(); const _identityMatrix = /*@__PURE__*/ new Matrix4(); diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 8444fa67b1df6c..859c4507286ca2 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -6,7 +6,7 @@ import { LinearEncoding, NoToneMapping } from '../constants.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { DataTexture } from '../textures/DataTexture.js'; import { Frustum } from '../math/Frustum.js'; import { Matrix4 } from '../math/Matrix4.js'; diff --git a/src/renderers/webgl/WebGLTextures.js b/src/renderers/webgl/WebGLTextures.js index 16e4d217e2cf54..99e53a45d767bb 100644 --- a/src/renderers/webgl/WebGLTextures.js +++ b/src/renderers/webgl/WebGLTextures.js @@ -1,5 +1,5 @@ import { LinearFilter, LinearMipmapLinearFilter, LinearMipmapNearestFilter, NearestFilter, NearestMipmapLinearFilter, NearestMipmapNearestFilter, RGBFormat, RGBAFormat, DepthFormat, DepthStencilFormat, UnsignedShortType, UnsignedIntType, UnsignedInt248Type, FloatType, HalfFloatType, MirroredRepeatWrapping, ClampToEdgeWrapping, RepeatWrapping } from '../../constants.js'; -import { MathUtils } from '../../math/MathUtils.js'; +import * as MathUtils from '../../math/MathUtils.js'; function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, info ) { diff --git a/src/textures/Texture.js b/src/textures/Texture.js index d8cd8d0e760fac..e6946bf1cedf03 100644 --- a/src/textures/Texture.js +++ b/src/textures/Texture.js @@ -10,7 +10,7 @@ import { LinearFilter, UVMapping } from '../constants.js'; -import { MathUtils } from '../math/MathUtils.js'; +import * as MathUtils from '../math/MathUtils.js'; import { Vector2 } from '../math/Vector2.js'; import { Matrix3 } from '../math/Matrix3.js'; import { ImageUtils } from '../extras/ImageUtils.js'; diff --git a/test/unit/src/math/MathUtils.tests.js b/test/unit/src/math/MathUtils.tests.js index bf8b833be68b71..9be862553dcbe2 100644 --- a/test/unit/src/math/MathUtils.tests.js +++ b/test/unit/src/math/MathUtils.tests.js @@ -1,6 +1,6 @@ /* global QUnit */ -import { MathUtils } from '../../../../src/math/MathUtils'; +import * as MathUtils from '../../../../src/math/MathUtils'; export default QUnit.module( 'Maths', () => { diff --git a/test/unit/src/math/Matrix4.tests.js b/test/unit/src/math/Matrix4.tests.js index f94dd0ea870fe9..d5565f29c66ff4 100644 --- a/test/unit/src/math/Matrix4.tests.js +++ b/test/unit/src/math/Matrix4.tests.js @@ -5,7 +5,7 @@ import { Matrix4 } from '../../../../src/math/Matrix4'; import { Vector3 } from '../../../../src/math/Vector3'; import { Euler } from '../../../../src/math/Euler'; import { Quaternion } from '../../../../src/math/Quaternion'; -import { MathUtils } from '../../../../src/math/MathUtils'; +import * as MathUtils from '../../../../src/math/MathUtils'; import { eps } from './Constants.tests';