|
|
@@ -179,7 +179,7 @@ Object.assign( EventDispatcher.prototype, {
|
|
|
|
|
|
} );
|
|
|
|
|
|
-var REVISION = '93dev';
|
|
|
+var REVISION = '93';
|
|
|
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
|
|
|
var CullFaceNone = 0;
|
|
|
var CullFaceBack = 1;
|
|
|
@@ -1086,6 +1086,8 @@ Object.assign( Matrix4.prototype, {
|
|
|
|
|
|
return function extractRotation( m ) {
|
|
|
|
|
|
+ // this method does not support reflection matrices
|
|
|
+
|
|
|
var te = this.elements;
|
|
|
var me = m.elements;
|
|
|
|
|
|
@@ -1096,14 +1098,22 @@ Object.assign( Matrix4.prototype, {
|
|
|
te[ 0 ] = me[ 0 ] * scaleX;
|
|
|
te[ 1 ] = me[ 1 ] * scaleX;
|
|
|
te[ 2 ] = me[ 2 ] * scaleX;
|
|
|
+ te[ 3 ] = 0;
|
|
|
|
|
|
te[ 4 ] = me[ 4 ] * scaleY;
|
|
|
te[ 5 ] = me[ 5 ] * scaleY;
|
|
|
te[ 6 ] = me[ 6 ] * scaleY;
|
|
|
+ te[ 7 ] = 0;
|
|
|
|
|
|
te[ 8 ] = me[ 8 ] * scaleZ;
|
|
|
te[ 9 ] = me[ 9 ] * scaleZ;
|
|
|
te[ 10 ] = me[ 10 ] * scaleZ;
|
|
|
+ te[ 11 ] = 0;
|
|
|
+
|
|
|
+ te[ 12 ] = 0;
|
|
|
+ te[ 13 ] = 0;
|
|
|
+ te[ 14 ] = 0;
|
|
|
+ te[ 15 ] = 1;
|
|
|
|
|
|
return this;
|
|
|
|
|
|
@@ -28105,6 +28115,17 @@ function ExtrudeGeometry( shapes, options ) {
|
|
|
ExtrudeGeometry.prototype = Object.create( Geometry.prototype );
|
|
|
ExtrudeGeometry.prototype.constructor = ExtrudeGeometry;
|
|
|
|
|
|
+ExtrudeGeometry.prototype.toJSON = function () {
|
|
|
+
|
|
|
+ var data = Geometry.prototype.toJSON.call( this );
|
|
|
+
|
|
|
+ var shapes = this.parameters.shapes;
|
|
|
+ var options = this.parameters.options;
|
|
|
+
|
|
|
+ return toJSON( shapes, options, data );
|
|
|
+
|
|
|
+};
|
|
|
+
|
|
|
// ExtrudeBufferGeometry
|
|
|
|
|
|
function ExtrudeBufferGeometry( shapes, options ) {
|
|
|
@@ -28773,6 +28794,19 @@ function ExtrudeBufferGeometry( shapes, options ) {
|
|
|
ExtrudeBufferGeometry.prototype = Object.create( BufferGeometry.prototype );
|
|
|
ExtrudeBufferGeometry.prototype.constructor = ExtrudeBufferGeometry;
|
|
|
|
|
|
+ExtrudeBufferGeometry.prototype.toJSON = function () {
|
|
|
+
|
|
|
+ var data = BufferGeometry.prototype.toJSON.call( this );
|
|
|
+
|
|
|
+ var shapes = this.parameters.shapes;
|
|
|
+ var options = this.parameters.options;
|
|
|
+
|
|
|
+ return toJSON( shapes, options, data );
|
|
|
+
|
|
|
+};
|
|
|
+
|
|
|
+//
|
|
|
+
|
|
|
var WorldUVGenerator = {
|
|
|
|
|
|
generateTopUV: function ( geometry, vertices, indexA, indexB, indexC ) {
|
|
|
@@ -28830,6 +28864,36 @@ var WorldUVGenerator = {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+function toJSON( shapes, options, data ) {
|
|
|
+
|
|
|
+ //
|
|
|
+
|
|
|
+ data.shapes = [];
|
|
|
+
|
|
|
+ if ( Array.isArray( shapes ) ) {
|
|
|
+
|
|
|
+ for ( var i = 0, l = shapes.length; i < l; i ++ ) {
|
|
|
+
|
|
|
+ var shape = shapes[ i ];
|
|
|
+
|
|
|
+ data.shapes.push( shape.uuid );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+
|
|
|
+ data.shapes.push( shapes.uuid );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ //
|
|
|
+
|
|
|
+ if ( options.extrudePath !== undefined ) data.options.extrudePath = options.extrudePath.toJSON();
|
|
|
+
|
|
|
+ return data;
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
/**
|
|
|
* @author zz85 / http://www.lab4games.net/zz85/blog
|
|
|
* @author alteredq / http://alteredqualia.com/
|
|
|
@@ -29413,7 +29477,7 @@ ShapeGeometry.prototype.toJSON = function () {
|
|
|
|
|
|
var shapes = this.parameters.shapes;
|
|
|
|
|
|
- return toJSON( shapes, data );
|
|
|
+ return toJSON$1( shapes, data );
|
|
|
|
|
|
};
|
|
|
|
|
|
@@ -29558,13 +29622,13 @@ ShapeBufferGeometry.prototype.toJSON = function () {
|
|
|
|
|
|
var shapes = this.parameters.shapes;
|
|
|
|
|
|
- return toJSON( shapes, data );
|
|
|
+ return toJSON$1( shapes, data );
|
|
|
|
|
|
};
|
|
|
|
|
|
//
|
|
|
|
|
|
-function toJSON( shapes, data ) {
|
|
|
+function toJSON$1( shapes, data ) {
|
|
|
|
|
|
data.shapes = [];
|
|
|
|
|
|
@@ -30167,7 +30231,7 @@ CircleBufferGeometry.prototype.constructor = CircleBufferGeometry;
|
|
|
|
|
|
|
|
|
|
|
|
-var Geometries = Object.freeze({
|
|
|
+var Geometries = /*#__PURE__*/Object.freeze({
|
|
|
WireframeGeometry: WireframeGeometry,
|
|
|
ParametricGeometry: ParametricGeometry,
|
|
|
ParametricBufferGeometry: ParametricBufferGeometry,
|
|
|
@@ -30937,7 +31001,7 @@ LineDashedMaterial.prototype.copy = function ( source ) {
|
|
|
|
|
|
|
|
|
|
|
|
-var Materials = Object.freeze({
|
|
|
+var Materials = /*#__PURE__*/Object.freeze({
|
|
|
ShadowMaterial: ShadowMaterial,
|
|
|
SpriteMaterial: SpriteMaterial,
|
|
|
RawShaderMaterial: RawShaderMaterial,
|
|
|
@@ -31616,6 +31680,7 @@ Object.assign( DataTextureLoader.prototype, {
|
|
|
* @author mrdoob / http://mrdoob.com/
|
|
|
*/
|
|
|
|
|
|
+
|
|
|
function ImageLoader( manager ) {
|
|
|
|
|
|
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
|
|
|
@@ -31718,6 +31783,7 @@ Object.assign( ImageLoader.prototype, {
|
|
|
* @author mrdoob / http://mrdoob.com/
|
|
|
*/
|
|
|
|
|
|
+
|
|
|
function CubeTextureLoader( manager ) {
|
|
|
|
|
|
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
|
|
|
@@ -31788,6 +31854,7 @@ Object.assign( CubeTextureLoader.prototype, {
|
|
|
* @author mrdoob / http://mrdoob.com/
|
|
|
*/
|
|
|
|
|
|
+
|
|
|
function TextureLoader( manager ) {
|
|
|
|
|
|
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
|
|
|
@@ -32508,9 +32575,7 @@ function CubicPoly() {
|
|
|
//
|
|
|
|
|
|
var tmp = new Vector3();
|
|
|
-var px = new CubicPoly();
|
|
|
-var py = new CubicPoly();
|
|
|
-var pz = new CubicPoly();
|
|
|
+var px = new CubicPoly(), py = new CubicPoly(), pz = new CubicPoly();
|
|
|
|
|
|
function CatmullRomCurve3( points, closed, curveType, tension ) {
|
|
|
|
|
|
@@ -33295,7 +33360,7 @@ SplineCurve.prototype.fromJSON = function ( json ) {
|
|
|
|
|
|
|
|
|
|
|
|
-var Curves = Object.freeze({
|
|
|
+var Curves = /*#__PURE__*/Object.freeze({
|
|
|
ArcCurve: ArcCurve,
|
|
|
CatmullRomCurve3: CatmullRomCurve3,
|
|
|
CubicBezierCurve: CubicBezierCurve,
|
|
|
@@ -37518,6 +37583,35 @@ Object.assign( ObjectLoader.prototype, {
|
|
|
|
|
|
break;
|
|
|
|
|
|
+
|
|
|
+ case 'ExtrudeGeometry':
|
|
|
+ case 'ExtrudeBufferGeometry':
|
|
|
+
|
|
|
+ var geometryShapes = [];
|
|
|
+
|
|
|
+ for ( var j = 0, jl = data.shapes.length; j < jl; j ++ ) {
|
|
|
+
|
|
|
+ var shape = shapes[ data.shapes[ j ] ];
|
|
|
+
|
|
|
+ geometryShapes.push( shape );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ var extrudePath = data.options.extrudePath;
|
|
|
+
|
|
|
+ if ( extrudePath !== undefined ) {
|
|
|
+
|
|
|
+ data.options.extrudePath = new Curves[ extrudePath.type ]().fromJSON( extrudePath );
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ geometry = new Geometries[ data.type ](
|
|
|
+ geometryShapes,
|
|
|
+ data.options
|
|
|
+ );
|
|
|
+
|
|
|
+ break;
|
|
|
+
|
|
|
case 'BufferGeometry':
|
|
|
|
|
|
geometry = bufferGeometryLoader.parse( data );
|
|
|
@@ -38044,6 +38138,7 @@ var TEXTURE_FILTER = {
|
|
|
* @author thespite / http://clicktorelease.com/
|
|
|
*/
|
|
|
|
|
|
+
|
|
|
function ImageBitmapLoader( manager ) {
|
|
|
|
|
|
if ( typeof createImageBitmap === 'undefined' ) {
|
|
|
@@ -38429,6 +38524,7 @@ Object.assign( ShapePath.prototype, {
|
|
|
* @author mrdoob / http://mrdoob.com/
|
|
|
*/
|
|
|
|
|
|
+
|
|
|
function Font( data ) {
|
|
|
|
|
|
this.type = 'Font';
|
|
|
@@ -44470,8 +44566,7 @@ PlaneHelper.prototype.updateMatrixWorld = function ( force ) {
|
|
|
* headWidth - Number
|
|
|
*/
|
|
|
|
|
|
-var lineGeometry;
|
|
|
-var coneGeometry;
|
|
|
+var lineGeometry, coneGeometry;
|
|
|
|
|
|
function ArrowHelper( dir, origin, length, color, headLength, headWidth ) {
|
|
|
|
Mr.doob