|
@@ -179,7 +179,7 @@ Object.assign( EventDispatcher.prototype, {
|
|
|
|
|
|
} );
|
|
|
|
|
|
-var REVISION = '92dev';
|
|
|
+var REVISION = '92';
|
|
|
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
|
|
|
var CullFaceNone = 0;
|
|
|
var CullFaceBack = 1;
|
|
@@ -3664,6 +3664,12 @@ Texture.prototype = Object.assign( Object.create( EventDispatcher.prototype ), {
|
|
|
|
|
|
isTexture: true,
|
|
|
|
|
|
+ updateMatrix: function () {
|
|
|
+
|
|
|
+ this.matrix.setUvTransform( this.offset.x, this.offset.y, this.repeat.x, this.repeat.y, this.rotation, this.center.x, this.center.y );
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
clone: function () {
|
|
|
|
|
|
return new this.constructor().copy( this );
|
|
@@ -20927,6 +20933,7 @@ function WebVRManager( renderer ) {
|
|
|
if ( typeof window !== 'undefined' && 'VRFrameData' in window ) {
|
|
|
|
|
|
frameData = new window.VRFrameData();
|
|
|
+ window.addEventListener( 'vrdisplaypresentchange', onVRDisplayPresentChange, false );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -20948,11 +20955,17 @@ function WebVRManager( renderer ) {
|
|
|
|
|
|
//
|
|
|
|
|
|
+ function isPresenting() {
|
|
|
+
|
|
|
+ return device !== null && device.isPresenting === true;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
var currentSize, currentPixelRatio;
|
|
|
|
|
|
function onVRDisplayPresentChange() {
|
|
|
|
|
|
- if ( device !== null && device.isPresenting ) {
|
|
|
+ if ( isPresenting() ) {
|
|
|
|
|
|
var eyeParameters = device.getEyeParameters( 'left' );
|
|
|
var renderWidth = eyeParameters.renderWidth;
|
|
@@ -20971,12 +20984,6 @@ function WebVRManager( renderer ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ( typeof window !== 'undefined' ) {
|
|
|
-
|
|
|
- window.addEventListener( 'vrdisplaypresentchange', onVRDisplayPresentChange, false );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
//
|
|
|
|
|
|
this.enabled = false;
|
|
@@ -21130,7 +21137,7 @@ function WebVRManager( renderer ) {
|
|
|
|
|
|
this.submitFrame = function () {
|
|
|
|
|
|
- if ( device && device.isPresenting ) device.submitFrame();
|
|
|
+ if ( isPresenting() ) device.submitFrame();
|
|
|
|
|
|
};
|
|
|
|
|
@@ -23154,12 +23161,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
if ( uvScaleMap.matrixAutoUpdate === true ) {
|
|
|
|
|
|
- var offset = uvScaleMap.offset;
|
|
|
- var repeat = uvScaleMap.repeat;
|
|
|
- var rotation = uvScaleMap.rotation;
|
|
|
- var center = uvScaleMap.center;
|
|
|
-
|
|
|
- uvScaleMap.matrix.setUvTransform( offset.x, offset.y, repeat.x, repeat.y, rotation, center.x, center.y );
|
|
|
+ uvScaleMap.updateMatrix();
|
|
|
|
|
|
}
|
|
|
|
|
@@ -23197,12 +23199,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
if ( material.map.matrixAutoUpdate === true ) {
|
|
|
|
|
|
- var offset = material.map.offset;
|
|
|
- var repeat = material.map.repeat;
|
|
|
- var rotation = material.map.rotation;
|
|
|
- var center = material.map.center;
|
|
|
-
|
|
|
- material.map.matrix.setUvTransform( offset.x, offset.y, repeat.x, repeat.y, rotation, center.x, center.y );
|
|
|
+ material.map.updateMatrix();
|
|
|
|
|
|
}
|
|
|
|
|
@@ -32027,7 +32024,7 @@ CatmullRomCurve3.prototype.getPoint = function ( t, optionalTarget ) {
|
|
|
|
|
|
if ( this.closed ) {
|
|
|
|
|
|
- intPoint += intPoint > 0 ? 0 : ( Math.floor( Math.abs( intPoint ) / points.length ) + 1 ) * points.length;
|
|
|
+ intPoint += intPoint > 0 ? 0 : ( Math.floor( Math.abs( intPoint ) / l ) + 1 ) * l;
|
|
|
|
|
|
} else if ( weight === 0 && intPoint === l - 1 ) {
|
|
|
|