Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
54aac70a
T
three.js
项目概览
车家大少爷
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
54aac70a
编写于
8月 24, 2019
作者:
M
Michael Herzog
提交者:
GitHub
8月 24, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17331 from Mugen87/dev29
MaterialLoader: Inherit from Loader.
上级
db15431a
e7532f46
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
17 addition
and
35 deletion
+17
-35
docs/api/en/loaders/MaterialLoader.html
docs/api/en/loaders/MaterialLoader.html
+4
-14
docs/api/zh/loaders/MaterialLoader.html
docs/api/zh/loaders/MaterialLoader.html
+4
-7
src/loaders/MaterialLoader.d.ts
src/loaders/MaterialLoader.d.ts
+3
-4
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+6
-10
未找到文件。
docs/api/en/loaders/MaterialLoader.html
浏览文件 @
54aac70a
...
@@ -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]
→
<h1>
[name]
</h1>
<h1>
[name]
</h1>
<p
class=
"desc"
>
<p
class=
"desc"
>
...
@@ -54,17 +56,13 @@
...
@@ -54,17 +56,13 @@
</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>
<h3>
[property:Object textures]
</h3>
<h3>
[property:Object textures]
</h3>
<p>
Object holding any textures used by the material. See [page:.setTextures].
</p>
<p>
Object holding any textures used by the material. See [page:.setTextures].
</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>
...
@@ -84,14 +82,6 @@
...
@@ -84,14 +82,6 @@
Parse a
<em>
JSON
</em>
structure and create a new [page:Material] of the type [page:String json.type] with parameters defined in the json object.
Parse a
<em>
JSON
</em>
structure and create a new [page:Material] of the type [page:String json.type] with parameters defined in the json object.
</p>
</p>
<h3>
[method:MaterialLoader 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 materials from the same directory.
</p>
<h3>
[method:MaterialLoader setTextures]( [param:Object textures] )
</h3>
<h3>
[method:MaterialLoader setTextures]( [param:Object textures] )
</h3>
<p>
<p>
[page:Object textures] — object containing any textures used by the material.
[page:Object textures] — object containing any textures used by the material.
...
...
docs/api/zh/loaders/MaterialLoader.html
浏览文件 @
54aac70a
...
@@ -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]
→
<h1>
[name]
</h1>
<h1>
[name]
</h1>
<p
class=
"desc"
>
<p
class=
"desc"
>
...
@@ -54,17 +56,14 @@
...
@@ -54,17 +56,14 @@
</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>
<h3>
[property:Object textures]
</h3>
<h3>
[property:Object textures]
</h3>
<p>
持有材质的任何纹理的对象,请参考 [page:.setTextures].
</p>
<p>
持有材质的任何纹理的对象,请参考 [page:.setTextures].
</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>
...
@@ -89,8 +88,6 @@
...
@@ -89,8 +88,6 @@
[page:Object textures] — 对象包含任何被材质所使用的纹理。
[page:Object textures] — 对象包含任何被材质所使用的纹理。
</p>
</p>
<h2>
源
</h2>
<h2>
源
</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]
...
...
src/loaders/MaterialLoader.d.ts
浏览文件 @
54aac70a
import
{
Loader
}
from
'
./Loader
'
;
import
{
LoadingManager
}
from
'
./LoadingManager
'
;
import
{
LoadingManager
}
from
'
./LoadingManager
'
;
import
{
Texture
}
from
'
./../textures/Texture
'
;
import
{
Texture
}
from
'
./../textures/Texture
'
;
import
{
Material
}
from
'
./../materials/Material
'
;
import
{
Material
}
from
'
./../materials/Material
'
;
export
class
MaterialLoader
{
export
class
MaterialLoader
extends
Loader
{
constructor
(
manager
?:
LoadingManager
);
constructor
(
manager
?:
LoadingManager
);
manager
:
LoadingManager
;
textures
:
{
[
key
:
string
]:
Texture
};
textures
:
{
[
key
:
string
]:
Texture
};
load
(
load
(
...
@@ -15,8 +15,7 @@ export class MaterialLoader {
...
@@ -15,8 +15,7 @@ export class MaterialLoader {
onProgress
?:
(
event
:
ProgressEvent
)
=>
void
,
onProgress
?:
(
event
:
ProgressEvent
)
=>
void
,
onError
?:
(
event
:
Error
|
ErrorEvent
)
=>
void
onError
?:
(
event
:
Error
|
ErrorEvent
)
=>
void
):
void
;
):
void
;
setTextures
(
textures
:
{
[
key
:
string
]:
Texture
}
):
void
;
setTextures
(
textures
:
{
[
key
:
string
]:
Texture
}
):
this
;
getTexture
(
name
:
string
):
Texture
;
parse
(
json
:
any
):
Material
;
parse
(
json
:
any
):
Material
;
}
}
src/loaders/MaterialLoader.js
浏览文件 @
54aac70a
...
@@ -5,7 +5,7 @@ import { Vector4 } from '../math/Vector4.js';
...
@@ -5,7 +5,7 @@ import { Vector4 } from '../math/Vector4.js';
import
{
Matrix3
}
from
'
../math/Matrix3.js
'
;
import
{
Matrix3
}
from
'
../math/Matrix3.js
'
;
import
{
Matrix4
}
from
'
../math/Matrix4.js
'
;
import
{
Matrix4
}
from
'
../math/Matrix4.js
'
;
import
{
FileLoader
}
from
'
./FileLoader.js
'
;
import
{
FileLoader
}
from
'
./FileLoader.js
'
;
import
{
DefaultLoadingManager
}
from
'
./LoadingManag
er.js
'
;
import
{
Loader
}
from
'
./Load
er.js
'
;
import
*
as
Materials
from
'
../materials/Materials.js
'
;
import
*
as
Materials
from
'
../materials/Materials.js
'
;
/**
/**
...
@@ -14,12 +14,15 @@ import * as Materials from '../materials/Materials.js';
...
@@ -14,12 +14,15 @@ import * as Materials from '../materials/Materials.js';
function
MaterialLoader
(
manager
)
{
function
MaterialLoader
(
manager
)
{
this
.
manager
=
(
manager
!==
undefined
)
?
manager
:
DefaultLoadingManager
;
Loader
.
call
(
this
,
manager
);
this
.
textures
=
{};
this
.
textures
=
{};
}
}
Object
.
assign
(
MaterialLoader
.
prototype
,
{
MaterialLoader
.
prototype
=
Object
.
assign
(
Object
.
create
(
Loader
.
prototype
),
{
constructor
:
MaterialLoader
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
@@ -239,13 +242,6 @@ Object.assign( MaterialLoader.prototype, {
...
@@ -239,13 +242,6 @@ Object.assign( MaterialLoader.prototype, {
},
},
setPath
:
function
(
value
)
{
this
.
path
=
value
;
return
this
;
},
setTextures
:
function
(
value
)
{
setTextures
:
function
(
value
)
{
this
.
textures
=
value
;
this
.
textures
=
value
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录