Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
18c28b64
T
three.js
项目概览
Ablesons
/
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,发现更多精彩内容 >>
提交
18c28b64
编写于
1月 30, 2012
作者:
A
alteredq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed handling of meshes with multiple materials in SceneLoader.
As per discussion in #1201
上级
24a2c319
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
280 addition
and
285 deletion
+280
-285
build/Three.js
build/Three.js
+219
-219
build/custom/ThreeExtras.js
build/custom/ThreeExtras.js
+51
-51
src/extras/loaders/SceneLoader.js
src/extras/loaders/SceneLoader.js
+10
-15
未找到文件。
build/Three.js
浏览文件 @
18c28b64
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
build/custom/ThreeExtras.js
浏览文件 @
18c28b64
此差异已折叠。
点击以展开。
src/extras/loaders/SceneLoader.js
浏览文件 @
18c28b64
...
...
@@ -74,7 +74,7 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
g
,
o
,
m
,
l
,
d
,
p
,
r
,
q
,
s
,
c
,
t
,
f
,
tt
,
pp
,
u
,
geometry
,
material
,
camera
,
fog
,
texture
,
images
,
materials
,
light
,
light
,
data
,
binLoader
,
jsonLoader
,
counter_models
,
counter_textures
,
total_models
,
total_textures
,
...
...
@@ -183,13 +183,8 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
// not anymore support for multiple materials
// shouldn't really be array
for
(
i
=
0
;
i
<
o
.
materials
.
length
;
i
++
)
{
materials
=
result
.
materials
[
o
.
materials
[
i
]
];
hasNormals
=
materials
instanceof
THREE
.
ShaderMaterial
;
}
material
=
result
.
materials
[
o
.
materials
[
0
]
];
hasNormals
=
material
instanceof
THREE
.
ShaderMaterial
;
if
(
hasNormals
)
{
...
...
@@ -206,22 +201,22 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
q
=
0
;
if
(
materials
.
length
==
0
)
{
if
(
o
.
materials
.
length
==
0
)
{
material
s
=
new
THREE
.
MeshFaceMaterial
();
material
=
new
THREE
.
MeshFaceMaterial
();
}
// dirty hack to handle meshes with multiple materials
// just use face materials defined in model
if
(
materials
.
length
>
1
)
{
if
(
o
.
materials
.
length
>
1
)
{
material
s
=
new
THREE
.
MeshFaceMaterial
();
material
=
new
THREE
.
MeshFaceMaterial
();
}
object
=
new
THREE
.
Mesh
(
geometry
,
material
s
);
object
=
new
THREE
.
Mesh
(
geometry
,
material
);
object
.
name
=
dd
;
object
.
position
.
set
(
p
[
0
],
p
[
1
],
p
[
2
]
);
...
...
@@ -414,7 +409,7 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
camera
=
new
THREE
.
OrthographicCamera
(
c
.
left
,
c
.
right
,
c
.
top
,
c
.
bottom
,
c
.
near
,
c
.
far
);
}
p
=
c
.
position
;
t
=
c
.
target
;
u
=
c
.
up
;
...
...
@@ -422,7 +417,7 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
camera
.
position
.
set
(
p
[
0
],
p
[
1
],
p
[
2
]
);
camera
.
target
=
new
THREE
.
Vector3
(
t
[
0
],
t
[
1
],
t
[
2
]
);
if
(
u
)
camera
.
up
.
set
(
u
[
0
],
u
[
1
],
u
[
2
]
);
result
.
cameras
[
dc
]
=
camera
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录