Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
ee2d261e
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,发现更多精彩内容 >>
未验证
提交
ee2d261e
编写于
9月 30, 2019
作者:
M
Michael Herzog
提交者:
GitHub
9月 30, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17614 from Mugen87/dev38
Material: Clean up usage of .lights property.
上级
a84f4c46
c2d9cf8b
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
0 addition
and
26 deletion
+0
-26
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+0
-2
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+0
-1
examples/js/loaders/OBJLoader.js
examples/js/loaders/OBJLoader.js
+0
-2
examples/jsm/loaders/GLTFLoader.js
examples/jsm/loaders/GLTFLoader.js
+0
-2
examples/jsm/loaders/MMDLoader.js
examples/jsm/loaders/MMDLoader.js
+0
-1
examples/jsm/loaders/OBJLoader.js
examples/jsm/loaders/OBJLoader.js
+0
-2
examples/webgl_loader_vrm.html
examples/webgl_loader_vrm.html
+0
-2
src/materials/LineBasicMaterial.js
src/materials/LineBasicMaterial.js
+0
-2
src/materials/Material.js
src/materials/Material.js
+0
-2
src/materials/MeshBasicMaterial.js
src/materials/MeshBasicMaterial.js
+0
-2
src/materials/MeshDepthMaterial.js
src/materials/MeshDepthMaterial.js
+0
-1
src/materials/MeshDistanceMaterial.js
src/materials/MeshDistanceMaterial.js
+0
-1
src/materials/MeshMatcapMaterial.js
src/materials/MeshMatcapMaterial.js
+0
-2
src/materials/MeshNormalMaterial.js
src/materials/MeshNormalMaterial.js
+0
-1
src/materials/PointsMaterial.js
src/materials/PointsMaterial.js
+0
-2
src/materials/SpriteMaterial.js
src/materials/SpriteMaterial.js
+0
-1
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
ee2d261e
...
...
@@ -2116,7 +2116,6 @@ THREE.GLTFLoader = ( function () {
THREE
.
Material
.
prototype
.
copy
.
call
(
pointsMaterial
,
material
);
pointsMaterial
.
color
.
copy
(
material
.
color
);
pointsMaterial
.
map
=
material
.
map
;
pointsMaterial
.
lights
=
false
;
// PointsMaterial doesn't support lights yet
pointsMaterial
.
sizeAttenuation
=
false
;
// glTF spec says points should be 1px
this
.
cache
.
add
(
cacheKey
,
pointsMaterial
);
...
...
@@ -2136,7 +2135,6 @@ THREE.GLTFLoader = ( function () {
lineMaterial
=
new
THREE
.
LineBasicMaterial
();
THREE
.
Material
.
prototype
.
copy
.
call
(
lineMaterial
,
material
);
lineMaterial
.
color
.
copy
(
material
.
color
);
lineMaterial
.
lights
=
false
;
// LineBasicMaterial doesn't support lights yet
this
.
cache
.
add
(
cacheKey
,
lineMaterial
);
...
...
examples/js/loaders/MMDLoader.js
浏览文件 @
ee2d261e
...
...
@@ -1032,7 +1032,6 @@ THREE.MMDLoader = ( function () {
params
.
skinning
=
geometry
.
bones
.
length
>
0
?
true
:
false
;
params
.
morphTargets
=
geometry
.
morphTargets
.
length
>
0
?
true
:
false
;
params
.
lights
=
true
;
params
.
fog
=
true
;
// blend
...
...
examples/js/loaders/OBJLoader.js
浏览文件 @
ee2d261e
...
...
@@ -682,7 +682,6 @@ THREE.OBJLoader = ( function () {
var
materialLine
=
new
THREE
.
LineBasicMaterial
();
THREE
.
Material
.
prototype
.
copy
.
call
(
materialLine
,
material
);
materialLine
.
color
.
copy
(
material
.
color
);
materialLine
.
lights
=
false
;
material
=
materialLine
;
}
else
if
(
isPoints
&&
material
&&
!
(
material
instanceof
THREE
.
PointsMaterial
)
)
{
...
...
@@ -691,7 +690,6 @@ THREE.OBJLoader = ( function () {
THREE
.
Material
.
prototype
.
copy
.
call
(
materialPoints
,
material
);
materialPoints
.
color
.
copy
(
material
.
color
);
materialPoints
.
map
=
material
.
map
;
materialPoints
.
lights
=
false
;
material
=
materialPoints
;
}
...
...
examples/jsm/loaders/GLTFLoader.js
浏览文件 @
ee2d261e
...
...
@@ -2180,7 +2180,6 @@ var GLTFLoader = ( function () {
Material
.
prototype
.
copy
.
call
(
pointsMaterial
,
material
);
pointsMaterial
.
color
.
copy
(
material
.
color
);
pointsMaterial
.
map
=
material
.
map
;
pointsMaterial
.
lights
=
false
;
// PointsMaterial doesn't support lights yet
pointsMaterial
.
sizeAttenuation
=
false
;
// glTF spec says points should be 1px
this
.
cache
.
add
(
cacheKey
,
pointsMaterial
);
...
...
@@ -2200,7 +2199,6 @@ var GLTFLoader = ( function () {
lineMaterial
=
new
LineBasicMaterial
();
Material
.
prototype
.
copy
.
call
(
lineMaterial
,
material
);
lineMaterial
.
color
.
copy
(
material
.
color
);
lineMaterial
.
lights
=
false
;
// LineBasicMaterial doesn't support lights yet
this
.
cache
.
add
(
cacheKey
,
lineMaterial
);
...
...
examples/jsm/loaders/MMDLoader.js
浏览文件 @
ee2d261e
...
...
@@ -1068,7 +1068,6 @@ var MMDLoader = ( function () {
params
.
skinning
=
geometry
.
bones
.
length
>
0
?
true
:
false
;
params
.
morphTargets
=
geometry
.
morphTargets
.
length
>
0
?
true
:
false
;
params
.
lights
=
true
;
params
.
fog
=
true
;
// blend
...
...
examples/jsm/loaders/OBJLoader.js
浏览文件 @
ee2d261e
...
...
@@ -699,7 +699,6 @@ var OBJLoader = ( function () {
var
materialLine
=
new
LineBasicMaterial
();
Material
.
prototype
.
copy
.
call
(
materialLine
,
material
);
materialLine
.
color
.
copy
(
material
.
color
);
materialLine
.
lights
=
false
;
material
=
materialLine
;
}
else
if
(
isPoints
&&
material
&&
!
(
material
instanceof
PointsMaterial
)
)
{
...
...
@@ -708,7 +707,6 @@ var OBJLoader = ( function () {
Material
.
prototype
.
copy
.
call
(
materialPoints
,
material
);
materialPoints
.
color
.
copy
(
material
.
color
);
materialPoints
.
map
=
material
.
map
;
materialPoints
.
lights
=
false
;
material
=
materialPoints
;
}
...
...
examples/webgl_loader_vrm.html
浏览文件 @
ee2d261e
...
...
@@ -62,7 +62,6 @@
THREE
.
Material
.
prototype
.
copy
.
call
(
material
,
object
.
material
[
i
]
);
material
.
color
.
copy
(
object
.
material
[
i
].
color
);
material
.
map
=
object
.
material
[
i
].
map
;
material
.
lights
=
false
;
material
.
skinning
=
object
.
material
[
i
].
skinning
;
material
.
morphTargets
=
object
.
material
[
i
].
morphTargets
;
material
.
morphNormals
=
object
.
material
[
i
].
morphNormals
;
...
...
@@ -76,7 +75,6 @@
THREE
.
Material
.
prototype
.
copy
.
call
(
material
,
object
.
material
);
material
.
color
.
copy
(
object
.
material
.
color
);
material
.
map
=
object
.
material
.
map
;
material
.
lights
=
false
;
material
.
skinning
=
object
.
material
.
skinning
;
material
.
morphTargets
=
object
.
material
.
morphTargets
;
material
.
morphNormals
=
object
.
material
.
morphNormals
;
...
...
src/materials/LineBasicMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -27,8 +27,6 @@ function LineBasicMaterial( parameters ) {
this
.
linecap
=
'
round
'
;
this
.
linejoin
=
'
round
'
;
this
.
lights
=
false
;
this
.
setValues
(
parameters
);
}
...
...
src/materials/Material.js
浏览文件 @
ee2d261e
...
...
@@ -19,7 +19,6 @@ function Material() {
this
.
type
=
'
Material
'
;
this
.
fog
=
true
;
this
.
lights
=
true
;
this
.
blending
=
NormalBlending
;
this
.
side
=
FrontSide
;
...
...
@@ -343,7 +342,6 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
this
.
name
=
source
.
name
;
this
.
fog
=
source
.
fog
;
this
.
lights
=
source
.
lights
;
this
.
blending
=
source
.
blending
;
this
.
side
=
source
.
side
;
...
...
src/materials/MeshBasicMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -70,8 +70,6 @@ function MeshBasicMaterial( parameters ) {
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
this
.
lights
=
false
;
this
.
setValues
(
parameters
);
}
...
...
src/materials/MeshDepthMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -47,7 +47,6 @@ function MeshDepthMaterial( parameters ) {
this
.
wireframeLinewidth
=
1
;
this
.
fog
=
false
;
this
.
lights
=
false
;
this
.
setValues
(
parameters
);
...
...
src/materials/MeshDistanceMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -46,7 +46,6 @@ function MeshDistanceMaterial( parameters ) {
this
.
displacementBias
=
0
;
this
.
fog
=
false
;
this
.
lights
=
false
;
this
.
setValues
(
parameters
);
...
...
src/materials/MeshMatcapMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -64,8 +64,6 @@ function MeshMatcapMaterial( parameters ) {
this
.
morphTargets
=
false
;
this
.
morphNormals
=
false
;
this
.
lights
=
false
;
this
.
setValues
(
parameters
);
}
...
...
src/materials/MeshNormalMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -50,7 +50,6 @@ function MeshNormalMaterial( parameters ) {
this
.
wireframeLinewidth
=
1
;
this
.
fog
=
false
;
this
.
lights
=
false
;
this
.
skinning
=
false
;
this
.
morphTargets
=
false
;
...
...
src/materials/PointsMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -32,8 +32,6 @@ function PointsMaterial( parameters ) {
this
.
morphTargets
=
false
;
this
.
lights
=
false
;
this
.
setValues
(
parameters
);
}
...
...
src/materials/SpriteMaterial.js
浏览文件 @
ee2d261e
...
...
@@ -25,7 +25,6 @@ function SpriteMaterial( parameters ) {
this
.
sizeAttenuation
=
true
;
this
.
lights
=
false
;
this
.
transparent
=
true
;
this
.
setValues
(
parameters
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录