未验证 提交 257f66c9 编写于 作者: M Michael Herzog 提交者: GitHub

Merge pull request #17326 from Mugen87/dev29

BufferGeometryLoader: Inherit from Loader.
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" /> <link type="text/css" rel="stylesheet" href="page.css" />
</head> </head>
<body> <body>
[page:Loader] &rarr;
<h1>[name]</h1> <h1>[name]</h1>
<p class="desc"> <p class="desc">
...@@ -57,15 +59,11 @@ ...@@ -57,15 +59,11 @@
Creates a new [name]. Creates a new [name].
</p> </p>
<h2>Properties</h2> <h2>Properties</h2>
<p>See the base [page:Loader] class for common properties.</p>
<h3>[property:LoadingManager manager]</h3>
<p>
The [page:LoadingManager loadingManager] the loader is using. Default is [page:DefaultLoadingManager].
</p>
<h2>Methods</h2> <h2>Methods</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> <h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p> <p>
...@@ -85,14 +83,6 @@ ...@@ -85,14 +83,6 @@
Parse a <em>JSON</em> structure and return a [page:BufferGeometry]. Parse a <em>JSON</em> structure and return a [page:BufferGeometry].
</p> </p>
<h3>[method:BufferGeometryLoader 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 geometries from the same directory.
</p>
<h2>Source</h2> <h2>Source</h2>
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js] [link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<link type="text/css" rel="stylesheet" href="page.css" /> <link type="text/css" rel="stylesheet" href="page.css" />
</head> </head>
<body> <body>
[page:Loader] &rarr;
<h1>[name]</h1> <h1>[name]</h1>
<p class="desc"> <p class="desc">
...@@ -57,15 +59,11 @@ ...@@ -57,15 +59,11 @@
创建一个新的[name]. 创建一个新的[name].
</p> </p>
<h2>属性</h2> <h2>属性</h2>
<p>See the base [page:Loader] class for common properties.</p>
<h3>[property:LoadingManager manager]</h3>
<p>
正在使用的[page:LoadingManager loadingManager]。默认为[page:DefaultLoadingManager].
</p>
<h2>方法</h2> <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> <h3>[method:null load]( [param:String url], [param:Function onLoad], [param:Function onProgress], [param:Function onError] )</h3>
<p> <p>
......
...@@ -14,6 +14,8 @@ function AnimationLoader( manager ) { ...@@ -14,6 +14,8 @@ function AnimationLoader( manager ) {
AnimationLoader.prototype = Object.assign( Object.create( Loader.prototype ), { AnimationLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
constructor: AnimationLoader,
load: function ( url, onLoad, onProgress, onError ) { load: function ( url, onLoad, onProgress, onError ) {
var scope = this; var scope = this;
......
import { Loader } from './Loader';
import { LoadingManager } from './LoadingManager'; import { LoadingManager } from './LoadingManager';
import { BufferGeometry } from './../core/BufferGeometry'; import { BufferGeometry } from './../core/BufferGeometry';
export class BufferGeometryLoader { export class BufferGeometryLoader extends Loader {
constructor( manager?: LoadingManager ); constructor( manager?: LoadingManager );
manager: LoadingManager;
load( load(
url: string, url: string,
onLoad: ( bufferGeometry: BufferGeometry ) => void, onLoad: ( bufferGeometry: BufferGeometry ) => void,
......
...@@ -3,7 +3,7 @@ import { Vector3 } from '../math/Vector3.js'; ...@@ -3,7 +3,7 @@ import { Vector3 } from '../math/Vector3.js';
import { BufferAttribute } from '../core/BufferAttribute.js'; import { BufferAttribute } from '../core/BufferAttribute.js';
import { BufferGeometry } from '../core/BufferGeometry.js'; import { BufferGeometry } from '../core/BufferGeometry.js';
import { FileLoader } from './FileLoader.js'; import { FileLoader } from './FileLoader.js';
import { DefaultLoadingManager } from './LoadingManager.js'; import { Loader } from './Loader.js';
import { InstancedBufferGeometry } from '../core/InstancedBufferGeometry.js'; import { InstancedBufferGeometry } from '../core/InstancedBufferGeometry.js';
import { InstancedBufferAttribute } from '../core/InstancedBufferAttribute.js'; import { InstancedBufferAttribute } from '../core/InstancedBufferAttribute.js';
...@@ -13,11 +13,13 @@ import { InstancedBufferAttribute } from '../core/InstancedBufferAttribute.js'; ...@@ -13,11 +13,13 @@ import { InstancedBufferAttribute } from '../core/InstancedBufferAttribute.js';
function BufferGeometryLoader( manager ) { function BufferGeometryLoader( manager ) {
this.manager = ( manager !== undefined ) ? manager : DefaultLoadingManager; Loader.call( this, manager );
} }
Object.assign( BufferGeometryLoader.prototype, { BufferGeometryLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
constructor: BufferGeometryLoader,
load: function ( url, onLoad, onProgress, onError ) { load: function ( url, onLoad, onProgress, onError ) {
...@@ -121,13 +123,6 @@ Object.assign( BufferGeometryLoader.prototype, { ...@@ -121,13 +123,6 @@ Object.assign( BufferGeometryLoader.prototype, {
return geometry; return geometry;
},
setPath: function ( value ) {
this.path = value;
return this;
} }
} ); } );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册