summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Keränen <pasi.keranen@digia.com>2015-04-28 08:00:39 +0300
committerPasi Keränen <pasi.keranen@digia.com>2015-04-28 05:01:22 +0000
commit819567f1f3b270bff55de3fe1164eb0e185b9c65 (patch)
treedd1cdd1f95312bc2741c4879e183fe5ed1cbc4a7
parent54015bb56d52dc3da8adafa501479fa8156c66c1 (diff)
Updated three.js libraryv5.5.0-beta1
Updated three.js library to have the latest build. Change-Id: I3a5042e511c246b2c40463aa17798a1c249935ce Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
-rw-r--r--examples/3rdparty/three.js28
1 files changed, 15 insertions, 13 deletions
diff --git a/examples/3rdparty/three.js b/examples/3rdparty/three.js
index 20fa305..ede9104 100644
--- a/examples/3rdparty/three.js
+++ b/examples/3rdparty/three.js
@@ -18128,16 +18128,16 @@ THREE.XHRLoader.prototype = {
var request = new XMLHttpRequest();
request.onreadystatechange = function() {
if (request.readyState === XMLHttpRequest.DONE) {
-// TODO: Re-enable when issue with 'status' is solved in Qt
-// if (request.status == 200) {
+// TODO: Re-visit when issue with 'status' is solved in Qt
+ if (request.status == 200 || request.status == 0) {
THREE.Cache.add( url, request.response );
if ( onLoad ) onLoad( request.response );
scope.manager.itemEnd( url );
-// } else {
-// if ( onError !== undefined ) {
-// onError();
-// }
-// }
+ } else {
+ if ( onError !== undefined ) {
+ onError();
+ }
+ }
} else if (request.readyState === XMLHttpRequest.HEADERS_RECEIVED) {
if ( onProgress !== undefined ) {
onProgress();
@@ -18874,7 +18874,7 @@ THREE.BufferGeometryLoader.prototype = {
loader.setCrossOrigin( this.crossOrigin );
loader.load( url, function ( text ) {
- onLoad( scope.parse( JSON.parse( text ) ) );
+ onLoad( scope.parse( JSON.parse( text ) ) );
}, onProgress, onError );
@@ -19763,11 +19763,11 @@ THREE.CompressedTextureLoader.prototype = {
loader.load( url, function ( buffer ) {
- var texDatas = scope._parser( buffer, true );
+ var texDatas = scope._parser( buffer, true );
if ( texDatas.isCubemap ) {
- var faces = texDatas.mipmaps.length / texDatas.mipmapCount;
+ var faces = texDatas.mipmaps.length / texDatas.mipmapCount;
for ( var f = 0; f < faces; f ++ ) {
@@ -19785,14 +19785,16 @@ THREE.CompressedTextureLoader.prototype = {
}
} else {
-
- texture.image.width = texDatas.width;
+ console.log("texture: mipmap");
+ console.log("texture: mipmaps "+texDatas.mipmaps.length);
+ texture.image.width = texDatas.width;
texture.image.height = texDatas.height;
texture.mipmaps = texDatas.mipmaps;
}
- if ( texDatas.mipmapCount === 1 ) {
+ console.log("texture: mipmapcount "+texDatas.mipmapCount);
+ if ( texDatas.mipmapCount === 1 ) {
texture.minFilter = THREE.LinearFilter;