提交 102497da 编写于 作者: M Mr.doob

Docs/Examples: Renamed XHRLoader to FileLoader.

上级 1a414581
......@@ -10,7 +10,7 @@
<body>
<h1>[name]</h1>
<div class="desc">A simple caching classe, used internaly by [page:XHRLoader].</div>
<div class="desc">A simple caching classe, used internaly by [page:FileLoader].</div>
<h2>Constructor</h2>
......
......@@ -96,6 +96,7 @@ var list = {
[ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ],
[ "Cache", "api/loaders/Cache" ],
[ "ColladaLoader", "api/loaders/ColladaLoader" ],
[ "FileLoader", "api/loaders/FileLoader" ],
[ "GLTFLoader", "api/loaders/GLTFLoader" ],
[ "ImageLoader", "api/loaders/ImageLoader" ],
[ "JSONLoader", "api/loaders/JSONLoader" ],
......@@ -108,8 +109,7 @@ var list = {
[ "PDBLoader", "api/loaders/PDBLoader" ],
[ "SVGLoader", "api/loaders/SVGLoader" ],
[ "TextureLoader", "api/loaders/TextureLoader" ],
[ "TGALoader", "api/loaders/TGALoader" ],
[ "XHRLoader", "api/loaders/XHRLoader" ]
[ "TGALoader", "api/loaders/TGALoader" ]
],
"Materials": [
......
......@@ -365,7 +365,7 @@
if ( confirm( 'Any unsaved data will be lost. Are you sure?' ) ) {
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
loader.crossOrigin = '';
loader.load( file, function ( text ) {
......
......@@ -25,7 +25,7 @@ Menubar.Examples = function ( editor ) {
{ title: 'Pong', file: 'pong.app.json' }
];
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
for ( var i = 0; i < items.length; i ++ ) {
......
......@@ -233,7 +233,7 @@ Menubar.File = function ( editor ) {
} );
var loader = new THREE.XHRLoader( manager );
var loader = new THREE.FileLoader( manager );
loader.load( 'js/libs/app/index.html', function ( content ) {
var includes = [];
......
......@@ -33,7 +33,7 @@
<!-- includes -->
<script>
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
loader.load( 'app.json', function ( text ) {
var json = JSON.parse( text );
......
......@@ -2207,7 +2207,7 @@
"!doc": "Remove all values from the cache."
}
},
"!doc": "A simple caching classe, used internaly by [page:XHRLoader].",
"!doc": "A simple caching classe, used internaly by [page:FileLoader].",
"!type": "fn()"
},
"ColladaLoader": {
......@@ -2513,8 +2513,8 @@
"!doc": "Class for loading a [page:Texture texture].",
"!type": "fn(manager: +THREE.LoadingManager)"
},
"XHRLoader": {
"!url": "http://threejs.org/docs/#Reference/loaders/XHRLoader",
"FileLoader": {
"!url": "http://threejs.org/docs/#Reference/loaders/FileLoader",
"prototype": {
"cache": {
"!type": "+THREE.Cache",
......
......@@ -12,7 +12,7 @@ THREE.ThreeMFLoader.prototype = {
load: function ( url, onLoad, onProgress, onError ) {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function( text ) {
......
......@@ -33,7 +33,7 @@ THREE.AMFLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function( text ) {
......
......@@ -109,7 +109,7 @@
this._url = url;
this._baseDir = url.substr( 0, url.lastIndexOf( '/' ) + 1 );
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( text ) {
......
......@@ -27,7 +27,7 @@ THREE.AssimpJSONLoader.prototype = {
this.texturePath = this.texturePath && ( typeof this.texturePath === "string" ) ? this.texturePath : this.extractUrlBase( url );
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.load( url, function ( text ) {
var json = JSON.parse( text ), scene, metadata;
......
......@@ -24,7 +24,7 @@ THREE.BVHLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function( buffer ) {
......
......@@ -16,7 +16,7 @@ THREE.BabylonLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function ( text ) {
onLoad( scope.parse( JSON.parse( text ) ) );
......
......@@ -37,14 +37,14 @@ THREE.BinaryLoader.prototype = {
var scope = this;
var jsonloader = new THREE.XHRLoader( this.manager );
var jsonloader = new THREE.FileLoader( this.manager );
jsonloader.load( url, function ( data ) {
var json = JSON.parse( data );
var bufferUrl = binaryPath + json.buffers;
var bufferLoader = new THREE.XHRLoader( scope.manager );
var bufferLoader = new THREE.FileLoader( scope.manager );
bufferLoader.setResponseType( 'arraybuffer' );
bufferLoader.load( bufferUrl, function ( bufData ) {
......
......@@ -24,7 +24,7 @@ THREE.ColladaLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function ( text ) {
onLoad( scope.parse( text, getBaseUrl( url ) ) );
......
......@@ -33,7 +33,7 @@
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
// loader.setCrossOrigin( this.crossOrigin );
loader.load( url, function ( text ) {
......@@ -528,7 +528,7 @@
THREE.FBXLoader.prototype.loadFile = function ( url, onLoad, onProgress, onError, responseType ) {
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( responseType );
......
......@@ -24,7 +24,7 @@ THREE.GLTFLoader.prototype = {
var path = this.path && ( typeof this.path === "string" ) ? this.path : THREE.Loader.prototype.extractUrlBase( url );
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function( text ) {
scope.parse( JSON.parse( text ), onLoad, path );
......@@ -822,7 +822,7 @@ GLTFParser.prototype.loadShaders = function() {
return new Promise( function( resolve ) {
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
loader.responseType = 'text';
loader.load( resolveURL( shader.uri, this.options.path ), function( shaderText ) {
......@@ -844,7 +844,7 @@ GLTFParser.prototype.loadBuffers = function() {
return new Promise( function( resolve ) {
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
loader.responseType = 'arraybuffer';
loader.load( resolveURL( buffer.uri, this.options.path ), function( buffer ) {
......
......@@ -27,7 +27,7 @@ THREE.HDRCubeTextureLoader.prototype.load = function(type, urls, onLoad, onProgr
var loaded = 0;
function loadHDRData(i, onLoad, onProgress, onError) {
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( urls[i], function ( buffer ) {
......
......@@ -16,7 +16,7 @@ THREE.KMZLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( text ) {
......
......@@ -16,7 +16,7 @@ THREE.MD2Loader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( buffer ) {
......
......@@ -310,7 +310,7 @@ THREE.MMDLoader.prototype.extractExtension = function ( url ) {
THREE.MMDLoader.prototype.loadFile = function ( url, onLoad, onProgress, onError, responseType ) {
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( responseType );
......@@ -344,7 +344,7 @@ THREE.MMDLoader.prototype.loadFileAsShiftJISText = function ( url, onLoad, onPro
* TODO: some browsers seem not support overrideMimeType
* so some workarounds for them may be necessary.
* Note: to set property of request after calling request.send(null)
* (it's called in THREE.XHRLoader.load()) could be a bad manner.
* (it's called in THREE.FileLoader.load()) could be a bad manner.
*/
request.overrideMimeType( 'text/plain; charset=shift_jis' );
......
......@@ -29,7 +29,7 @@ Object.assign( THREE.MTLLoader.prototype, THREE.EventDispatcher.prototype, {
var scope = this;
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.load( url, function ( text ) {
......
......@@ -11,7 +11,7 @@ Object.assign( THREE.NRRDLoader.prototype, THREE.EventDispatcher.prototype, {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function( data ) {
......
......@@ -43,7 +43,7 @@ THREE.OBJLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setPath( this.path );
loader.load( url, function ( text ) {
......
......@@ -21,7 +21,7 @@ Object.assign( THREE.PCDLoader.prototype, THREE.EventDispatcher.prototype, {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function( data ) {
......
......@@ -16,7 +16,7 @@ THREE.PDBLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function ( text ) {
var json = scope.parsePDB( text );
......
......@@ -43,7 +43,7 @@ THREE.PLYLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( text ) {
......
......@@ -16,7 +16,7 @@ THREE.PlayCanvasLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function ( text ) {
onLoad( scope.parse( JSON.parse( text ) ) );
......
......@@ -41,7 +41,7 @@ THREE.STLLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( text ) {
......
......@@ -19,7 +19,7 @@ THREE.SVGLoader.prototype = {
var parser = new DOMParser();
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function ( svgString ) {
var doc = parser.parseFromString( svgString, 'image/svg+xml' ); // application/xml
......
......@@ -16,7 +16,7 @@ THREE.TGALoader.prototype.load = function ( url, onLoad, onProgress, onError ) {
var texture = new THREE.Texture();
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( buffer ) {
......
......@@ -19,7 +19,7 @@ THREE.TTFLoader.prototype.load = function ( url, onLoad, onProgress, onError ) {
var scope = this;
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function ( buffer ) {
......
......@@ -727,7 +727,7 @@ THREE.UTF8Loader.prototype.downloadModelJson = function ( jsonUrl, callback, opt
function getHttpRequest( url, onload, opt_onprogress ) {
var req = new THREE.XHRLoader();
var req = new THREE.FileLoader();
req.load( url, onload, opt_onprogress );
}
......
......@@ -30,7 +30,7 @@ THREE.VRMLLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( this.manager );
var loader = new THREE.FileLoader( this.manager );
loader.load( url, function ( text ) {
onLoad( scope.parse( text ) );
......
......@@ -15,7 +15,7 @@ Object.assign( THREE.VTKLoader.prototype, THREE.EventDispatcher.prototype, {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.setResponseType( 'arraybuffer' );
loader.load( url, function( text ) {
......
......@@ -28,7 +28,7 @@ THREE.SceneLoader.prototype = {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
var loader = new THREE.FileLoader( scope.manager );
loader.load( url, function ( text ) {
scope.parse( JSON.parse( text ), onLoad, url );
......
......@@ -96,7 +96,7 @@ https://github.com/creationix/msgpack-js-browser
function loadMSGPack() {
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
loader.setResponseType( 'arraybuffer' );
loader.load( 'scenes/robo_pigeon.pack', function ( data ) {
......
......@@ -118,7 +118,7 @@
};
var loader = new THREE.XHRLoader();
var loader = new THREE.FileLoader();
loader.load( 'models/skinned/UCS_config.json', function ( text ) {
var config = JSON.parse( text );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册