Skip to content

Commit 3390f52

Browse files
committed
Updated builds.
1 parent 282062a commit 3390f52

File tree

3 files changed

+560
-506
lines changed

3 files changed

+560
-506
lines changed

build/three.js

+28-1
Original file line numberDiff line numberDiff line change
@@ -3724,6 +3724,10 @@
37243724

37253725
this.texture = new Texture( undefined, undefined, options.wrapS, options.wrapT, options.magFilter, options.minFilter, options.format, options.type, options.anisotropy, options.encoding );
37263726

3727+
this.texture.image = {};
3728+
this.texture.image.width = width;
3729+
this.texture.image.height = height;
3730+
37273731
this.texture.generateMipmaps = options.generateMipmaps !== undefined ? options.generateMipmaps : false;
37283732
this.texture.minFilter = options.minFilter !== undefined ? options.minFilter : LinearFilter;
37293733

@@ -3746,6 +3750,9 @@
37463750
this.width = width;
37473751
this.height = height;
37483752

3753+
this.texture.image.width = width;
3754+
this.texture.image.height = height;
3755+
37493756
this.dispose();
37503757

37513758
}
@@ -20623,7 +20630,7 @@
2062320630

2062420631
_gl.pixelStorei( 37440, texture.flipY );
2062520632

20626-
var isCompressed = ( texture && texture.isCompressedTexture );
20633+
var isCompressed = ( texture.image[ 0 ] && texture.image[ 0 ].isCompressedTexture );
2062720634
var isDataTexture = ( texture.image[ 0 ] && texture.image[ 0 ].isDataTexture );
2062820635

2062920636
var cubeImage = [];
@@ -22080,6 +22087,8 @@
2208022087

2208122088
animation.start();
2208222089

22090+
scope.dispatchEvent( { type: 'sessionstart' } );
22091+
2208322092
} else {
2208422093

2208522094
if ( scope.enabled ) {
@@ -22090,6 +22099,8 @@
2209022099

2209122100
animation.stop();
2209222101

22102+
scope.dispatchEvent( { type: 'sessionend' } );
22103+
2209322104
}
2209422105

2209522106
}
@@ -22414,12 +22425,16 @@
2241422425

2241522426
}
2241622427

22428+
Object.assign( WebVRManager.prototype, EventDispatcher.prototype );
22429+
2241722430
/**
2241822431
* @author mrdoob / http://mrdoob.com/
2241922432
*/
2242022433

2242122434
function WebXRManager( renderer ) {
2242222435

22436+
var scope = this;
22437+
2242322438
var gl = renderer.context;
2242422439

2242522440
var session = null;
@@ -22496,6 +22511,8 @@
2249622511
renderer.setRenderTarget( renderer.getRenderTarget() ); // Hack #15830
2249722512
animation.stop();
2249822513

22514+
scope.dispatchEvent( { type: 'sessionend' } );
22515+
2249922516
}
2250022517

2250122518
function onRequestReferenceSpace( value ) {
@@ -22505,6 +22522,8 @@
2250522522
animation.setContext( session );
2250622523
animation.start();
2250722524

22525+
scope.dispatchEvent( { type: 'sessionstart' } );
22526+
2250822527
}
2250922528

2251022529
this.setFramebufferScaleFactor = function ( value ) {
@@ -22517,6 +22536,12 @@
2251722536

2251822537
};
2251922538

22539+
this.getSession = function () {
22540+
22541+
return session;
22542+
22543+
};
22544+
2252022545
this.setSession = function ( value ) {
2252122546

2252222547
session = value;
@@ -22719,6 +22744,8 @@
2271922744

2272022745
}
2272122746

22747+
Object.assign( WebXRManager.prototype, EventDispatcher.prototype );
22748+
2272222749
/**
2272322750
* @author supereggbert / http://www.paulbrunt.co.uk/
2272422751
* @author mrdoob / http://mrdoob.com/

0 commit comments

Comments
 (0)