Skip to content

DataTextureLoader: Inherit from Loader. #17337

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 1 commit into from
Aug 24, 2019
Merged

DataTextureLoader: Inherit from Loader. #17337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 4 additions & 15 deletions docs/api/en/loaders/DataTextureLoader.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
[page:Loader] &rarr;

<h1>[name]</h1>

<p class="desc">
Expand All @@ -33,16 +35,11 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
Creates a new [name].
</p>


<h2>Properties</h2>

<h3>[property:LoadingManager manager]</h3>
<p>
The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
</p>

<p>See the base [page:Loader] class for common properties.</p>

<h2>Methods</h2>
<p>See the base [page:Loader] class for common methods.</p>

<h3>[method:DataTexture load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p>
Expand All @@ -56,14 +53,6 @@ <h3>[method:DataTexture load]( [param:String url], [param:Function onLoad], [par
Begin loading from url and pass the loaded texture to onLoad.
</p>

<h3>[method:DataTextureLoader setPath]( [param:String path] )</h3>
<p>
[page:String path] — Base path of the file to load.<br /><br />

Sets the base path or URL from which to load files. This can be useful if
you are loading many data textures from the same directory.
</p>

<h2>Source</h2>

[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
Expand Down
11 changes: 4 additions & 7 deletions docs/api/zh/loaders/DataTextureLoader.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
[page:Loader] &rarr;

<h1>[name]</h1>

<p class="desc">
Expand All @@ -33,16 +35,11 @@ <h3>[name]( [param:LoadingManager manager] )</h3>
创建一个新的[name].
</p>


<h2>属性</h2>

<h3>[property:LoadingManager manager]</h3>
<p>
加载器正在使用的[page:LoadingManager loadingManager]。默认为[page:DefaultLoadingManager].
</p>

<p>See the base [page:Loader] class for common properties.</p>

<h2>方法</h2>
<p>See the base [page:Loader] class for common methods.</p>

<h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p>
Expand Down
5 changes: 2 additions & 3 deletions src/loaders/DataTextureLoader.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Loader } from './Loader';
import { LoadingManager } from './LoadingManager';
import { DataTexture } from './../textures/DataTexture';

export class DataTextureLoader {
export class DataTextureLoader extends Loader {

constructor( manager?: LoadingManager );

manager: LoadingManager;

load(
url: string,
onLoad: ( dataTexture: DataTexture ) => void,
Expand Down
15 changes: 5 additions & 10 deletions src/loaders/DataTextureLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { LinearFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping } from '../constants.js';
import { FileLoader } from './FileLoader.js';
import { DataTexture } from '../textures/DataTexture.js';
import { DefaultLoadingManager } from './LoadingManager.js';
import { Loader } from './Loader.js';

/**
* @author Nikos M. / https://github.com/foo123/
Expand All @@ -11,14 +11,16 @@ import { DefaultLoadingManager } from './LoadingManager.js';

function DataTextureLoader( manager ) {

this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager;
Loader.call( this, manager );

// override in sub classes
this._parser = null;

}

Object.assign( DataTextureLoader.prototype, {
DataTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ), {

constructor: DataTextureLoader,

load: function ( url, onLoad, onProgress, onError ) {

Expand Down Expand Up @@ -87,13 +89,6 @@ Object.assign( DataTextureLoader.prototype, {

return texture;

},

setPath: function ( value ) {

this.path = value;
return this;

}

} );
Expand Down