Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
22cb5034
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,发现更多精彩内容 >>
提交
22cb5034
编写于
8月 19, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7018 from rfm1201/dev_6571
pull request for #6762
上级
c2ca86c5
1eebaf25
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
7 deletion
+11
-7
src/extras/geometries/CylinderGeometry.js
src/extras/geometries/CylinderGeometry.js
+2
-2
src/extras/geometries/PolyhedronGeometry.js
src/extras/geometries/PolyhedronGeometry.js
+9
-5
未找到文件。
src/extras/geometries/CylinderGeometry.js
浏览文件 @
22cb5034
...
...
@@ -130,7 +130,7 @@ THREE.CylinderGeometry = function ( radiusTop, radiusBottom, height, radialSegme
var
uv2
=
uvs
[
0
][
x
+
1
].
clone
();
var
uv3
=
new
THREE
.
Vector2
(
uv2
.
x
,
0
);
this
.
faces
.
push
(
new
THREE
.
Face3
(
v1
,
v2
,
v3
,
[
n1
,
n2
,
n3
]
)
);
this
.
faces
.
push
(
new
THREE
.
Face3
(
v1
,
v2
,
v3
,
[
n1
,
n2
,
n3
]
,
undefined
,
1
)
);
this
.
faceVertexUvs
[
0
].
push
(
[
uv1
,
uv2
,
uv3
]
);
}
...
...
@@ -157,7 +157,7 @@ THREE.CylinderGeometry = function ( radiusTop, radiusBottom, height, radialSegme
var
uv2
=
uvs
[
heightSegments
][
x
].
clone
();
var
uv3
=
new
THREE
.
Vector2
(
uv2
.
x
,
1
);
this
.
faces
.
push
(
new
THREE
.
Face3
(
v1
,
v2
,
v3
,
[
n1
,
n2
,
n3
]
)
);
this
.
faces
.
push
(
new
THREE
.
Face3
(
v1
,
v2
,
v3
,
[
n1
,
n2
,
n3
]
,
undefined
,
2
)
);
this
.
faceVertexUvs
[
0
].
push
(
[
uv1
,
uv2
,
uv3
]
);
}
...
...
src/extras/geometries/PolyhedronGeometry.js
浏览文件 @
22cb5034
...
...
@@ -38,7 +38,7 @@ THREE.PolyhedronGeometry = function ( vertices, indices, radius, detail ) {
var
v2
=
p
[
indices
[
i
+
1
]
];
var
v3
=
p
[
indices
[
i
+
2
]
];
faces
[
j
]
=
new
THREE
.
Face3
(
v1
.
index
,
v2
.
index
,
v3
.
index
,
[
v1
.
clone
(),
v2
.
clone
(),
v3
.
clone
()
]
);
faces
[
j
]
=
new
THREE
.
Face3
(
v1
.
index
,
v2
.
index
,
v3
.
index
,
[
v1
.
clone
(),
v2
.
clone
(),
v3
.
clone
()
]
,
undefined
,
j
);
}
...
...
@@ -115,9 +115,9 @@ THREE.PolyhedronGeometry = function ( vertices, indices, radius, detail ) {
// Approximate a curved face with recursively sub-divided triangles.
function
make
(
v1
,
v2
,
v3
)
{
function
make
(
v1
,
v2
,
v3
,
materialIndex
)
{
var
face
=
new
THREE
.
Face3
(
v1
.
index
,
v2
.
index
,
v3
.
index
,
[
v1
.
clone
(),
v2
.
clone
(),
v3
.
clone
()
]
);
var
face
=
new
THREE
.
Face3
(
v1
.
index
,
v2
.
index
,
v3
.
index
,
[
v1
.
clone
(),
v2
.
clone
(),
v3
.
clone
()
]
,
undefined
,
materialIndex
);
that
.
faces
.
push
(
face
);
centroid
.
copy
(
v1
).
add
(
v2
).
add
(
v3
).
divideScalar
(
3
);
...
...
@@ -143,6 +143,8 @@ THREE.PolyhedronGeometry = function ( vertices, indices, radius, detail ) {
var
c
=
prepare
(
that
.
vertices
[
face
.
c
]
);
var
v
=
[];
var
materialIndex
=
face
.
materialIndex
;
// Construct all of the vertices for this subdivision.
for
(
var
i
=
0
;
i
<=
cols
;
i
++
)
{
...
...
@@ -182,7 +184,8 @@ THREE.PolyhedronGeometry = function ( vertices, indices, radius, detail ) {
make
(
v
[
i
][
k
+
1
],
v
[
i
+
1
][
k
],
v
[
i
][
k
]
v
[
i
][
k
],
materialIndex
);
}
else
{
...
...
@@ -190,7 +193,8 @@ THREE.PolyhedronGeometry = function ( vertices, indices, radius, detail ) {
make
(
v
[
i
][
k
+
1
],
v
[
i
+
1
][
k
+
1
],
v
[
i
+
1
][
k
]
v
[
i
+
1
][
k
],
materialIndex
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录