Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
d4bb9b04
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,发现更多精彩内容 >>
提交
d4bb9b04
编写于
8月 09, 2017
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Material/Object3D serialisation clean up.
上级
d4af29e8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
10 deletion
+18
-10
src/core/Object3D.js
src/core/Object3D.js
+2
-2
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+5
-0
src/materials/Material.js
src/materials/Material.js
+11
-8
未找到文件。
src/core/Object3D.js
浏览文件 @
d4bb9b04
...
...
@@ -373,7 +373,7 @@ Object.assign( Object3D.prototype, EventDispatcher.prototype, {
}
return
this
;
},
getObjectById
:
function
(
id
)
{
...
...
@@ -613,10 +613,10 @@ Object.assign( Object3D.prototype, EventDispatcher.prototype, {
object
.
type
=
this
.
type
;
if
(
this
.
name
!==
''
)
object
.
name
=
this
.
name
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
object
.
userData
=
this
.
userData
;
if
(
this
.
castShadow
===
true
)
object
.
castShadow
=
true
;
if
(
this
.
receiveShadow
===
true
)
object
.
receiveShadow
=
true
;
if
(
this
.
visible
===
false
)
object
.
visible
=
false
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
object
.
userData
=
this
.
userData
;
object
.
matrix
=
this
.
matrix
.
toArray
();
...
...
src/loaders/MaterialLoader.js
浏览文件 @
d4bb9b04
...
...
@@ -81,8 +81,13 @@ Object.assign( MaterialLoader.prototype, {
if
(
json
.
wireframeLinewidth
!==
undefined
)
material
.
wireframeLinewidth
=
json
.
wireframeLinewidth
;
if
(
json
.
wireframeLinecap
!==
undefined
)
material
.
wireframeLinecap
=
json
.
wireframeLinecap
;
if
(
json
.
wireframeLinejoin
!==
undefined
)
material
.
wireframeLinejoin
=
json
.
wireframeLinejoin
;
if
(
json
.
skinning
!==
undefined
)
material
.
skinning
=
json
.
skinning
;
if
(
json
.
morphTargets
!==
undefined
)
material
.
morphTargets
=
json
.
morphTargets
;
if
(
json
.
dithering
!==
undefined
)
material
.
dithering
=
json
.
dithering
;
if
(
json
.
visible
!==
undefined
)
material
.
visible
=
json
.
visible
;
if
(
json
.
userData
!==
undefined
)
material
.
userData
=
json
.
userData
;
// Deprecated
...
...
src/materials/Material.js
浏览文件 @
d4bb9b04
...
...
@@ -61,10 +61,10 @@ function Material() {
this
.
visible
=
true
;
this
.
needsUpdate
=
true
;
this
.
userData
=
{};
this
.
needsUpdate
=
true
;
}
Object
.
assign
(
Material
.
prototype
,
EventDispatcher
.
prototype
,
{
...
...
@@ -155,7 +155,6 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
data
.
type
=
this
.
type
;
if
(
this
.
name
!==
''
)
data
.
name
=
this
.
name
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
data
.
userData
=
this
.
userData
;
if
(
this
.
color
&&
this
.
color
.
isColor
)
data
.
color
=
this
.
color
.
getHex
();
...
...
@@ -224,17 +223,21 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
data
.
depthTest
=
this
.
depthTest
;
data
.
depthWrite
=
this
.
depthWrite
;
if
(
this
.
dithering
===
true
)
data
.
dithering
=
true
;
if
(
this
.
alphaTest
>
0
)
data
.
alphaTest
=
this
.
alphaTest
;
if
(
this
.
premultipliedAlpha
===
true
)
data
.
premultipliedAlpha
=
this
.
premultipliedAlpha
;
if
(
this
.
wireframe
===
true
)
data
.
wireframe
=
this
.
wireframe
;
if
(
this
.
wireframeLinewidth
>
1
)
data
.
wireframeLinewidth
=
this
.
wireframeLinewidth
;
if
(
this
.
wireframeLinecap
!==
'
round
'
)
data
.
wireframeLinecap
=
this
.
wireframeLinecap
;
if
(
this
.
wireframeLinejoin
!==
'
round
'
)
data
.
wireframeLinejoin
=
this
.
wireframeLinejoin
;
data
.
skinning
=
this
.
skinning
;
data
.
morphTargets
=
this
.
morphTargets
;
if
(
this
.
morphTargets
===
true
)
data
.
morphTargets
=
true
;
if
(
this
.
skinning
===
true
)
data
.
skinning
=
true
;
data
.
dithering
=
this
.
dithering
;
if
(
this
.
visible
===
false
)
data
.
visible
=
false
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
data
.
userData
=
this
.
userData
;
// TODO: Copied from Object3D.toJSON
...
...
@@ -311,12 +314,13 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
this
.
dithering
=
source
.
dithering
;
this
.
alphaTest
=
source
.
alphaTest
;
this
.
premultipliedAlpha
=
source
.
premultipliedAlpha
;
this
.
overdraw
=
source
.
overdraw
;
this
.
visible
=
source
.
visible
;
this
.
userData
=
JSON
.
parse
(
JSON
.
stringify
(
source
.
userData
)
);
this
.
clipShadows
=
source
.
clipShadows
;
this
.
clipIntersection
=
source
.
clipIntersection
;
...
...
@@ -334,7 +338,6 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
}
this
.
clippingPlanes
=
dstPlanes
;
this
.
userData
=
JSON
.
parse
(
JSON
.
stringify
(
source
.
userData
)
);
return
this
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录