Skip to content

Adapting UTF8Loader to use THREE.XHRLoader #7508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2015
Merged

Adapting UTF8Loader to use THREE.XHRLoader #7508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34cc211
Merge pull request #1 from mrdoob/master
wavesoft Nov 2, 2015
ce12280
Adapting to use THREE.XHRLoader
wavesoft Nov 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions examples/js/loaders/UTF8Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ THREE.UTF8Loader.prototype.downloadMesh = function ( path, name, meshEntry, deco
var loader = this;
var idx = 0;

function onprogress( req, e ) {
function onprogress( data ) {

while ( idx < meshEntry.length ) {

Expand All @@ -557,18 +557,18 @@ THREE.UTF8Loader.prototype.downloadMesh = function ( path, name, meshEntry, deco

var meshEnd = indexRange[ 0 ] + 3 * indexRange[ 1 ];

if ( req.responseText.length < meshEnd ) break;
if ( data.length < meshEnd ) break;

loader.decompressMesh( req.responseText, meshParams, decodeParams, name, idx, callback );
loader.decompressMesh( data, meshParams, decodeParams, name, idx, callback );

} else {

var codeRange = meshParams.codeRange;
var meshEnd = codeRange[ 0 ] + codeRange[ 1 ];

if ( req.responseText.length < meshEnd ) break;
if ( data.length < meshEnd ) break;

loader.decompressMesh2( req.responseText, meshParams, decodeParams, name, idx, callback );
loader.decompressMesh2( data, meshParams, decodeParams, name, idx, callback );
}

++ idx;
Expand All @@ -577,17 +577,13 @@ THREE.UTF8Loader.prototype.downloadMesh = function ( path, name, meshEntry, deco

}

getHttpRequest( path, function( req, e ) {
getHttpRequest( path, function( data ) {

if ( req.status === 200 || req.status === 0 ) {

onprogress( req, e );

}
onprogress( data );

// TODO: handle errors.

}, onprogress );
});

};

Expand Down Expand Up @@ -745,24 +741,15 @@ THREE.UTF8Loader.prototype.downloadModelJson = function ( jsonUrl, callback, opt

function getHttpRequest( url, onload, opt_onprogress ) {

var LISTENERS = {

load: function( e ) { onload( req, e ); },
progress: function( e ) { opt_onprogress( req, e ); }

};

var req = new XMLHttpRequest();
addListeners( req, LISTENERS );
var req = new THREE.XHRLoader();
req.load( url, onload, opt_onprogress );

req.open( 'GET', url, true );
req.send( null );
}

function getJsonRequest( url, onjson ) {

getHttpRequest( url,
function( e ) { onjson( JSON.parse( e.responseText ) ); },
function( e ) { onjson( JSON.parse( e ) ); },
function() {} );

}
Expand Down