|
|
@@ -3021,13 +3021,7 @@ Object.assign( Vector3.prototype, {
|
|
|
|
|
|
}
|
|
|
|
|
|
- var x = this.x, y = this.y, z = this.z;
|
|
|
-
|
|
|
- this.x = y * v.z - z * v.y;
|
|
|
- this.y = z * v.x - x * v.z;
|
|
|
- this.z = x * v.y - y * v.x;
|
|
|
-
|
|
|
- return this;
|
|
|
+ return this.crossVectors( this, v );
|
|
|
|
|
|
},
|
|
|
|
|
|
@@ -6229,7 +6223,7 @@ var specularmap_pars_fragment = "#ifdef USE_SPECULARMAP\n\tuniform sampler2D spe
|
|
|
|
|
|
var tonemapping_fragment = "#if defined( TONE_MAPPING )\n gl_FragColor.rgb = toneMapping( gl_FragColor.rgb );\n#endif\n";
|
|
|
|
|
|
-var tonemapping_pars_fragment = "#define saturate(a) clamp( a, 0.0, 1.0 )\nuniform float toneMappingExposure;\nuniform float toneMappingWhitePoint;\nvec3 LinearToneMapping( vec3 color ) {\n\treturn toneMappingExposure * color;\n}\nvec3 ReinhardToneMapping( vec3 color ) {\n\tcolor *= toneMappingExposure;\n\treturn saturate( color / ( vec3( 1.0 ) + color ) );\n}\n#define Uncharted2Helper( x ) max( ( ( x * ( 0.15 * x + 0.10 * 0.50 ) + 0.20 * 0.02 ) / ( x * ( 0.15 * x + 0.50 ) + 0.20 * 0.30 ) ) - 0.02 / 0.30, vec3( 0.0 ) )\nvec3 Uncharted2ToneMapping( vec3 color ) {\n\tcolor *= toneMappingExposure;\n\treturn saturate( Uncharted2Helper( color ) / Uncharted2Helper( vec3( toneMappingWhitePoint ) ) );\n}\nvec3 OptimizedCineonToneMapping( vec3 color ) {\n\tcolor *= toneMappingExposure;\n\tcolor = max( vec3( 0.0 ), color - 0.004 );\n\treturn pow( ( color * ( 6.2 * color + 0.5 ) ) / ( color * ( 6.2 * color + 1.7 ) + 0.06 ), vec3( 2.2 ) );\n}\n";
|
|
|
+var tonemapping_pars_fragment = "uniform float toneMappingExposure;\nuniform float toneMappingWhitePoint;\nvec3 LinearToneMapping( vec3 color ) {\n\treturn toneMappingExposure * color;\n}\nvec3 ReinhardToneMapping( vec3 color ) {\n\tcolor *= toneMappingExposure;\n\treturn saturate( color / ( vec3( 1.0 ) + color ) );\n}\n#define Uncharted2Helper( x ) max( ( ( x * ( 0.15 * x + 0.10 * 0.50 ) + 0.20 * 0.02 ) / ( x * ( 0.15 * x + 0.50 ) + 0.20 * 0.30 ) ) - 0.02 / 0.30, vec3( 0.0 ) )\nvec3 Uncharted2ToneMapping( vec3 color ) {\n\tcolor *= toneMappingExposure;\n\treturn saturate( Uncharted2Helper( color ) / Uncharted2Helper( vec3( toneMappingWhitePoint ) ) );\n}\nvec3 OptimizedCineonToneMapping( vec3 color ) {\n\tcolor *= toneMappingExposure;\n\tcolor = max( vec3( 0.0 ), color - 0.004 );\n\treturn pow( ( color * ( 6.2 * color + 0.5 ) ) / ( color * ( 6.2 * color + 1.7 ) + 0.06 ), vec3( 2.2 ) );\n}\n";
|
|
|
|
|
|
var uv_pars_fragment = "#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )\n\tvarying vec2 vUv;\n#endif";
|
|
|
|
|
|
@@ -25040,6 +25034,8 @@ function VideoTexture( video, mapping, wrapS, wrapT, magFilter, minFilter, forma
|
|
|
|
|
|
function update() {
|
|
|
|
|
|
+ var video = scope.image;
|
|
|
+
|
|
|
if ( video.readyState >= video.HAVE_CURRENT_DATA ) {
|
|
|
|
|
|
scope.needsUpdate = true;
|
|
|
@@ -35235,6 +35231,8 @@ function CubicBezier( t, p0, p1, p2, p3 ) {
|
|
|
|
|
|
function Curve() {
|
|
|
|
|
|
+ this.type = 'Curve';
|
|
|
+
|
|
|
this.arcLengthDivisions = 200;
|
|
|
|
|
|
}
|
|
|
@@ -35580,6 +35578,8 @@ function LineCurve( v1, v2 ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'LineCurve';
|
|
|
+
|
|
|
this.v1 = v1;
|
|
|
this.v2 = v2;
|
|
|
|
|
|
@@ -35639,8 +35639,9 @@ function CurvePath() {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
- this.curves = [];
|
|
|
+ this.type = 'CurvePath';
|
|
|
|
|
|
+ this.curves = [];
|
|
|
this.autoClose = false; // Automatically closes the path
|
|
|
|
|
|
}
|
|
|
@@ -35828,6 +35829,8 @@ function EllipseCurve( aX, aY, xRadius, yRadius, aStartAngle, aEndAngle, aClockw
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'EllipseCurve';
|
|
|
+
|
|
|
this.aX = aX;
|
|
|
this.aY = aY;
|
|
|
|
|
|
@@ -35914,6 +35917,8 @@ function SplineCurve( points /* array of Vector2 */ ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'SplineCurve';
|
|
|
+
|
|
|
this.points = ( points === undefined ) ? [] : points;
|
|
|
|
|
|
}
|
|
|
@@ -35951,6 +35956,8 @@ function CubicBezierCurve( v0, v1, v2, v3 ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'CubicBezierCurve';
|
|
|
+
|
|
|
this.v0 = v0;
|
|
|
this.v1 = v1;
|
|
|
this.v2 = v2;
|
|
|
@@ -35982,6 +35989,8 @@ function QuadraticBezierCurve( v0, v1, v2 ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'QuadraticBezierCurve';
|
|
|
+
|
|
|
this.v0 = v0;
|
|
|
this.v1 = v1;
|
|
|
this.v2 = v2;
|
|
|
@@ -36136,6 +36145,9 @@ var PathPrototype = Object.assign( Object.create( CurvePath.prototype ), {
|
|
|
function Path( points ) {
|
|
|
|
|
|
CurvePath.call( this );
|
|
|
+
|
|
|
+ this.type = 'Path';
|
|
|
+
|
|
|
this.currentPoint = new Vector2();
|
|
|
|
|
|
if ( points ) {
|
|
|
@@ -36164,6 +36176,8 @@ function Shape() {
|
|
|
|
|
|
Path.apply( this, arguments );
|
|
|
|
|
|
+ this.type = 'Shape';
|
|
|
+
|
|
|
this.holes = [];
|
|
|
|
|
|
}
|
|
|
@@ -36214,6 +36228,8 @@ Shape.prototype = Object.assign( Object.create( PathPrototype ), {
|
|
|
|
|
|
function ShapePath() {
|
|
|
|
|
|
+ this.type = 'ShapePath';
|
|
|
+
|
|
|
this.subPaths = [];
|
|
|
this.currentPath = null;
|
|
|
|
|
|
@@ -36489,6 +36505,8 @@ Object.assign( ShapePath.prototype, {
|
|
|
|
|
|
function Font( data ) {
|
|
|
|
|
|
+ this.type = 'Font';
|
|
|
+
|
|
|
this.data = data;
|
|
|
|
|
|
}
|
|
|
@@ -42527,10 +42545,13 @@ function CatmullRomCurve3( points ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'CatmullRomCurve3';
|
|
|
+
|
|
|
if ( points.length < 2 ) console.warn( 'THREE.CatmullRomCurve3: Points array needs at least two entries.' );
|
|
|
|
|
|
this.points = points || [];
|
|
|
this.closed = false;
|
|
|
+ this.curveType = 'centripetal';
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -42590,10 +42611,10 @@ CatmullRomCurve3.prototype.getPoint = function ( t, optionalTarget ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ( this.type === undefined || this.type === 'centripetal' || this.type === 'chordal' ) {
|
|
|
+ if ( this.curveType === 'centripetal' || this.curveType === 'chordal' ) {
|
|
|
|
|
|
// init Centripetal / Chordal Catmull-Rom
|
|
|
- var pow = this.type === 'chordal' ? 0.5 : 0.25;
|
|
|
+ var pow = this.curveType === 'chordal' ? 0.5 : 0.25;
|
|
|
var dt0 = Math.pow( p0.distanceToSquared( p1 ), pow );
|
|
|
var dt1 = Math.pow( p1.distanceToSquared( p2 ), pow );
|
|
|
var dt2 = Math.pow( p2.distanceToSquared( p3 ), pow );
|
|
|
@@ -42607,7 +42628,7 @@ CatmullRomCurve3.prototype.getPoint = function ( t, optionalTarget ) {
|
|
|
py.initNonuniformCatmullRom( p0.y, p1.y, p2.y, p3.y, dt0, dt1, dt2 );
|
|
|
pz.initNonuniformCatmullRom( p0.z, p1.z, p2.z, p3.z, dt0, dt1, dt2 );
|
|
|
|
|
|
- } else if ( this.type === 'catmullrom' ) {
|
|
|
+ } else if ( this.curveType === 'catmullrom' ) {
|
|
|
|
|
|
var tension = this.tension !== undefined ? this.tension : 0.5;
|
|
|
px.initCatmullRom( p0.x, p1.x, p2.x, p3.x, tension );
|
|
|
@@ -42630,6 +42651,8 @@ function CubicBezierCurve3( v0, v1, v2, v3 ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'CubicBezierCurve3';
|
|
|
+
|
|
|
this.v0 = v0;
|
|
|
this.v1 = v1;
|
|
|
this.v2 = v2;
|
|
|
@@ -42662,6 +42685,8 @@ function QuadraticBezierCurve3( v0, v1, v2 ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'QuadraticBezierCurve3';
|
|
|
+
|
|
|
this.v0 = v0;
|
|
|
this.v1 = v1;
|
|
|
this.v2 = v2;
|
|
|
@@ -42693,6 +42718,8 @@ function LineCurve3( v1, v2 ) {
|
|
|
|
|
|
Curve.call( this );
|
|
|
|
|
|
+ this.type = 'LineCurve3';
|
|
|
+
|
|
|
this.v1 = v1;
|
|
|
this.v2 = v2;
|
|
|
|
|
|
@@ -42734,6 +42761,8 @@ function ArcCurve( aX, aY, aRadius, aStartAngle, aEndAngle, aClockwise ) {
|
|
|
|
|
|
EllipseCurve.call( this, aX, aY, aRadius, aRadius, aStartAngle, aEndAngle, aClockwise );
|
|
|
|
|
|
+ this.type = 'ArcCurve';
|
|
|
+
|
|
|
}
|
|
|
|
|
|
ArcCurve.prototype = Object.create( EllipseCurve.prototype );
|
Mr.doob