Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
d3be2dd3
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,发现更多精彩内容 >>
未验证
提交
d3be2dd3
编写于
9月 19, 2018
作者:
M
Mr.doob
提交者:
GitHub
9月 19, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14931 from Mugen87/dev19
Examples: Remove linewidth where it has no effect
上级
0e67eaad
064722bc
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
14 addition
and
31 deletion
+14
-31
examples/webgl_animation_skinning_morph.html
examples/webgl_animation_skinning_morph.html
+0
-1
examples/webgl_decals.html
examples/webgl_decals.html
+1
-1
examples/webgl_geometry_nurbs.html
examples/webgl_geometry_nurbs.html
+2
-2
examples/webgl_geometry_shapes.html
examples/webgl_geometry_shapes.html
+2
-2
examples/webgl_geometry_spline_editor.html
examples/webgl_geometry_spline_editor.html
+3
-6
examples/webgl_interactive_buffergeometry.html
examples/webgl_interactive_buffergeometry.html
+1
-1
examples/webgl_interactive_lines.html
examples/webgl_interactive_lines.html
+0
-13
examples/webgl_lines_dashed.html
examples/webgl_lines_dashed.html
+1
-1
examples/webgl_lines_sphere.html
examples/webgl_lines_sphere.html
+3
-3
examples/webvr_ballshooter.html
examples/webvr_ballshooter.html
+1
-1
未找到文件。
examples/webgl_animation_skinning_morph.html
浏览文件 @
d3be2dd3
...
...
@@ -218,7 +218,6 @@
scene
.
add
(
mesh2
);
helper
=
new
THREE
.
SkeletonHelper
(
mesh
);
helper
.
material
.
linewidth
=
3
;
helper
.
visible
=
false
;
scene
.
add
(
helper
);
...
...
examples/webgl_decals.html
浏览文件 @
d3be2dd3
...
...
@@ -128,7 +128,7 @@
var
geometry
=
new
THREE
.
BufferGeometry
();
geometry
.
setFromPoints
(
[
new
THREE
.
Vector3
(),
new
THREE
.
Vector3
()
]
);
line
=
new
THREE
.
Line
(
geometry
,
new
THREE
.
LineBasicMaterial
(
{
linewidth
:
4
}
)
);
line
=
new
THREE
.
Line
(
geometry
,
new
THREE
.
LineBasicMaterial
()
);
scene
.
add
(
line
);
loadLeePerrySmith
();
...
...
examples/webgl_geometry_nurbs.html
浏览文件 @
d3be2dd3
...
...
@@ -112,7 +112,7 @@
var
nurbsGeometry
=
new
THREE
.
BufferGeometry
();
nurbsGeometry
.
setFromPoints
(
nurbsCurve
.
getPoints
(
200
)
);
var
nurbsMaterial
=
new
THREE
.
LineBasicMaterial
(
{
linewidth
:
10
,
color
:
0x333333
}
);
var
nurbsMaterial
=
new
THREE
.
LineBasicMaterial
(
{
color
:
0x333333
}
);
var
nurbsLine
=
new
THREE
.
Line
(
nurbsGeometry
,
nurbsMaterial
);
nurbsLine
.
position
.
set
(
200
,
-
100
,
0
);
...
...
@@ -121,7 +121,7 @@
var
nurbsControlPointsGeometry
=
new
THREE
.
BufferGeometry
();
nurbsControlPointsGeometry
.
setFromPoints
(
nurbsCurve
.
controlPoints
);
var
nurbsControlPointsMaterial
=
new
THREE
.
LineBasicMaterial
(
{
linewidth
:
2
,
color
:
0x333333
,
opacity
:
0.25
,
transparent
:
true
}
);
var
nurbsControlPointsMaterial
=
new
THREE
.
LineBasicMaterial
(
{
color
:
0x333333
,
opacity
:
0.25
,
transparent
:
true
}
);
var
nurbsControlPointsLine
=
new
THREE
.
Line
(
nurbsControlPointsGeometry
,
nurbsControlPointsMaterial
);
nurbsControlPointsLine
.
position
.
copy
(
nurbsLine
.
position
);
...
...
examples/webgl_geometry_shapes.html
浏览文件 @
d3be2dd3
...
...
@@ -123,7 +123,7 @@
// solid line
var
line
=
new
THREE
.
Line
(
geometryPoints
,
new
THREE
.
LineBasicMaterial
(
{
color
:
color
,
linewidth
:
3
}
)
);
var
line
=
new
THREE
.
Line
(
geometryPoints
,
new
THREE
.
LineBasicMaterial
(
{
color
:
color
}
)
);
line
.
position
.
set
(
x
,
y
,
z
-
25
);
line
.
rotation
.
set
(
rx
,
ry
,
rz
);
line
.
scale
.
set
(
s
,
s
,
s
);
...
...
@@ -131,7 +131,7 @@
// line from equidistance sampled points
var
line
=
new
THREE
.
Line
(
geometrySpacedPoints
,
new
THREE
.
LineBasicMaterial
(
{
color
:
color
,
linewidth
:
3
}
)
);
var
line
=
new
THREE
.
Line
(
geometrySpacedPoints
,
new
THREE
.
LineBasicMaterial
(
{
color
:
color
}
)
);
line
.
position
.
set
(
x
,
y
,
z
+
25
);
line
.
rotation
.
set
(
rx
,
ry
,
rz
);
line
.
scale
.
set
(
s
,
s
,
s
);
...
...
examples/webgl_geometry_spline_editor.html
浏览文件 @
d3be2dd3
...
...
@@ -258,8 +258,7 @@
curve
.
curveType
=
'
catmullrom
'
;
curve
.
mesh
=
new
THREE
.
Line
(
geometry
.
clone
(),
new
THREE
.
LineBasicMaterial
(
{
color
:
0xff0000
,
opacity
:
0.35
,
linewidth
:
2
opacity
:
0.35
}
)
);
curve
.
mesh
.
castShadow
=
true
;
splines
.
uniform
=
curve
;
...
...
@@ -268,8 +267,7 @@
curve
.
curveType
=
'
centripetal
'
;
curve
.
mesh
=
new
THREE
.
Line
(
geometry
.
clone
(),
new
THREE
.
LineBasicMaterial
(
{
color
:
0x00ff00
,
opacity
:
0.35
,
linewidth
:
2
opacity
:
0.35
}
)
);
curve
.
mesh
.
castShadow
=
true
;
splines
.
centripetal
=
curve
;
...
...
@@ -278,8 +276,7 @@
curve
.
curveType
=
'
chordal
'
;
curve
.
mesh
=
new
THREE
.
Line
(
geometry
.
clone
(),
new
THREE
.
LineBasicMaterial
(
{
color
:
0x0000ff
,
opacity
:
0.35
,
linewidth
:
2
opacity
:
0.35
}
)
);
curve
.
mesh
.
castShadow
=
true
;
splines
.
chordal
=
curve
;
...
...
examples/webgl_interactive_buffergeometry.html
浏览文件 @
d3be2dd3
...
...
@@ -206,7 +206,7 @@
var
geometry
=
new
THREE
.
BufferGeometry
();
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
BufferAttribute
(
new
Float32Array
(
4
*
3
),
3
)
);
var
material
=
new
THREE
.
LineBasicMaterial
(
{
color
:
0xffffff
,
linewidth
:
2
,
transparent
:
true
}
);
var
material
=
new
THREE
.
LineBasicMaterial
(
{
color
:
0xffffff
,
transparent
:
true
}
);
line
=
new
THREE
.
Line
(
geometry
,
material
);
scene
.
add
(
line
);
...
...
examples/webgl_interactive_lines.html
浏览文件 @
d3be2dd3
...
...
@@ -189,26 +189,13 @@
if
(
intersects
.
length
>
0
)
{
if
(
currentIntersected
!==
undefined
)
{
currentIntersected
.
material
.
linewidth
=
1
;
}
currentIntersected
=
intersects
[
0
].
object
;
currentIntersected
.
material
.
linewidth
=
5
;
sphereInter
.
visible
=
true
;
sphereInter
.
position
.
copy
(
intersects
[
0
].
point
);
}
else
{
if
(
currentIntersected
!==
undefined
)
{
currentIntersected
.
material
.
linewidth
=
1
;
}
currentIntersected
=
undefined
;
sphereInter
.
visible
=
false
;
...
...
examples/webgl_lines_dashed.html
浏览文件 @
d3be2dd3
...
...
@@ -76,7 +76,7 @@
var
geometryCube
=
cube
(
50
);
var
lineSegments
=
new
THREE
.
LineSegments
(
geometryCube
,
new
THREE
.
LineDashedMaterial
(
{
color
:
0xffaa00
,
dashSize
:
3
,
gapSize
:
1
,
linewidth
:
2
}
)
);
var
lineSegments
=
new
THREE
.
LineSegments
(
geometryCube
,
new
THREE
.
LineDashedMaterial
(
{
color
:
0xffaa00
,
dashSize
:
3
,
gapSize
:
1
}
)
);
lineSegments
.
computeLineDistances
();
objects
.
push
(
lineSegments
);
...
...
examples/webgl_lines_sphere.html
浏览文件 @
d3be2dd3
...
...
@@ -75,8 +75,8 @@
scene
=
new
THREE
.
Scene
();
var
i
,
line
,
material
,
p
,
parameters
=
[
[
0.25
,
0xff7700
,
1
,
2
],
[
0.5
,
0xff9900
,
1
,
1
],
[
0.75
,
0xffaa00
,
0.75
,
1
],
[
1
,
0xffaa00
,
0.5
,
1
],
[
1.25
,
0x000833
,
0.8
,
1
],
[
3.0
,
0xaaaaaa
,
0.75
,
2
],
[
3.5
,
0xffffff
,
0.5
,
1
],
[
4.5
,
0xffffff
,
0.25
,
1
],
[
5.5
,
0xffffff
,
0.125
,
1
]
];
parameters
=
[
[
0.25
,
0xff7700
,
1
],
[
0.5
,
0xff9900
,
1
],
[
0.75
,
0xffaa00
,
0.75
],
[
1
,
0xffaa00
,
0.5
],
[
1.25
,
0x000833
,
0.8
],
[
3.0
,
0xaaaaaa
,
0.75
],
[
3.5
,
0xffffff
,
0.5
],
[
4.5
,
0xffffff
,
0.25
],
[
5.5
,
0xffffff
,
0.125
]
];
var
geometry
=
createGeometry
();
...
...
@@ -84,7 +84,7 @@
p
=
parameters
[
i
];
material
=
new
THREE
.
LineBasicMaterial
(
{
color
:
p
[
1
],
opacity
:
p
[
2
]
,
linewidth
:
p
[
3
]
}
);
material
=
new
THREE
.
LineBasicMaterial
(
{
color
:
p
[
1
],
opacity
:
p
[
2
]
}
);
line
=
new
THREE
.
LineSegments
(
geometry
,
material
);
line
.
scale
.
x
=
line
.
scale
.
y
=
line
.
scale
.
z
=
p
[
0
];
...
...
examples/webvr_ballshooter.html
浏览文件 @
d3be2dd3
...
...
@@ -136,7 +136,7 @@
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
[
0
,
0
,
0
,
0
,
0
,
-
1
],
3
)
);
geometry
.
addAttribute
(
'
color
'
,
new
THREE
.
Float32BufferAttribute
(
[
0.5
,
0.5
,
0.5
,
0
,
0
,
0
],
3
)
);
var
material
=
new
THREE
.
LineBasicMaterial
(
{
vertexColors
:
true
,
linewidth
:
2
,
blending
:
THREE
.
AdditiveBlending
}
);
var
material
=
new
THREE
.
LineBasicMaterial
(
{
vertexColors
:
true
,
blending
:
THREE
.
AdditiveBlending
}
);
controller1
.
add
(
new
THREE
.
Line
(
geometry
,
material
)
);
controller2
.
add
(
new
THREE
.
Line
(
geometry
,
material
)
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录