Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
c74fa04f
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,发现更多精彩内容 >>
提交
c74fa04f
编写于
9月 29, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplified Object3D.toJSON()
上级
8c1a2695
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
57 deletion
+29
-57
src/core/Object3D.js
src/core/Object3D.js
+29
-14
src/objects/Line.js
src/objects/Line.js
+0
-11
src/objects/Mesh.js
src/objects/Mesh.js
+0
-11
src/objects/Points.js
src/objects/Points.js
+0
-11
src/objects/Sprite.js
src/objects/Sprite.js
+0
-10
未找到文件。
src/core/Object3D.js
浏览文件 @
c74fa04f
...
...
@@ -595,8 +595,7 @@ THREE.Object3D.prototype = {
var
isRootObject
=
(
meta
===
undefined
);
var
data
=
{};
var
output
=
{
object
:
data
};
var
output
=
{};
// meta is a hash used to collect geometries, materials.
// not providing it implies that this is the root object
...
...
@@ -621,26 +620,40 @@ THREE.Object3D.prototype = {
// standard Object3D serialization
data
.
uuid
=
this
.
uuid
;
data
.
type
=
this
.
type
;
var
object
=
{};
if
(
this
.
name
!==
''
)
data
.
name
=
this
.
name
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
data
.
userData
=
this
.
userData
;
if
(
this
.
visible
!==
true
)
data
.
visible
=
this
.
visible
;
object
.
uuid
=
this
.
uuid
;
object
.
type
=
this
.
type
;
data
.
matrix
=
this
.
matrix
.
toArray
();
if
(
this
.
name
!==
''
)
object
.
name
=
this
.
name
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
object
.
userData
=
this
.
userData
;
if
(
this
.
visible
!==
true
)
object
.
visible
=
this
.
visible
;
object
.
matrix
=
this
.
matrix
.
toArray
();
//
if
(
this
.
geometry
&&
meta
.
geometries
[
this
.
geometry
.
uuid
]
===
undefined
)
{
if
(
this
.
geometry
!==
undefined
)
{
if
(
meta
.
geometries
[
this
.
geometry
.
uuid
]
===
undefined
)
{
meta
.
geometries
[
this
.
geometry
.
uuid
]
=
this
.
geometry
.
toJSON
(
meta
);
}
meta
.
geometries
[
this
.
geometry
.
uuid
]
=
this
.
geometry
.
toJSON
(
meta
)
;
object
.
geometry
=
this
.
geometry
.
uuid
;
}
if
(
this
.
material
&&
meta
.
materials
[
this
.
material
.
uuid
]
=
==
undefined
)
{
if
(
this
.
material
!
==
undefined
)
{
meta
.
materials
[
this
.
material
.
uuid
]
=
this
.
material
.
toJSON
(
meta
);
if
(
meta
.
materials
[
this
.
material
.
uuid
]
===
undefined
)
{
meta
.
materials
[
this
.
material
.
uuid
]
=
this
.
material
.
toJSON
(
meta
);
}
object
.
material
=
this
.
material
.
uuid
;
}
...
...
@@ -648,11 +661,11 @@ THREE.Object3D.prototype = {
if
(
this
.
children
.
length
>
0
)
{
data
.
children
=
[];
object
.
children
=
[];
for
(
var
i
=
0
;
i
<
this
.
children
.
length
;
i
++
)
{
data
.
children
.
push
(
this
.
children
[
i
].
toJSON
(
meta
).
object
);
object
.
children
.
push
(
this
.
children
[
i
].
toJSON
(
meta
).
object
);
}
...
...
@@ -672,6 +685,8 @@ THREE.Object3D.prototype = {
}
output
.
object
=
object
;
return
output
;
// extract data from the cache hash
...
...
src/objects/Line.js
浏览文件 @
c74fa04f
...
...
@@ -181,17 +181,6 @@ THREE.Line.prototype.clone = function () {
};
THREE
.
Line
.
prototype
.
toJSON
=
function
(
meta
)
{
var
data
=
THREE
.
Object3D
.
prototype
.
toJSON
.
call
(
this
,
meta
);
data
.
object
.
geometry
=
this
.
geometry
.
uuid
;
data
.
object
.
material
=
this
.
material
.
uuid
;
return
data
;
};
// DEPRECATED
THREE
.
LineStrip
=
0
;
...
...
src/objects/Mesh.js
浏览文件 @
c74fa04f
...
...
@@ -354,14 +354,3 @@ THREE.Mesh.prototype.clone = function () {
return
new
this
.
constructor
(
this
.
geometry
,
this
.
material
).
copy
(
this
);
};
THREE
.
Mesh
.
prototype
.
toJSON
=
function
(
meta
)
{
var
data
=
THREE
.
Object3D
.
prototype
.
toJSON
.
call
(
this
,
meta
);
data
.
object
.
geometry
=
this
.
geometry
.
uuid
;
data
.
object
.
material
=
this
.
material
.
uuid
;
return
data
;
};
src/objects/Points.js
浏览文件 @
c74fa04f
...
...
@@ -126,17 +126,6 @@ THREE.Points.prototype.clone = function () {
};
THREE
.
Points
.
prototype
.
toJSON
=
function
(
meta
)
{
var
data
=
THREE
.
Object3D
.
prototype
.
toJSON
.
call
(
this
,
meta
);
data
.
object
.
geometry
=
this
.
geometry
.
uuid
;
data
.
object
.
material
=
this
.
material
.
uuid
;
return
data
;
};
// Backwards compatibility
THREE
.
PointCloud
=
function
(
geometry
,
material
)
{
...
...
src/objects/Sprite.js
浏览文件 @
c74fa04f
...
...
@@ -66,16 +66,6 @@ THREE.Sprite.prototype.clone = function () {
};
THREE
.
Sprite
.
prototype
.
toJSON
=
function
(
meta
)
{
var
data
=
THREE
.
Object3D
.
prototype
.
toJSON
.
call
(
this
,
meta
);
data
.
object
.
material
=
this
.
material
.
uuid
;
return
data
;
};
// Backwards compatibility
THREE
.
Particle
=
THREE
.
Sprite
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录