Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
8582c743
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,发现更多精彩内容 >>
提交
8582c743
编写于
2月 29, 2020
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "GLTFLoader: Simplified alphaMode handling."
This reverts commit
15947a3a
.
上级
4361a31b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
12 deletion
+31
-12
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+15
-3
examples/jsm/loaders/GLTFLoader.js
examples/jsm/loaders/GLTFLoader.js
+15
-3
examples/webgl_loader_gltf_extensions.html
examples/webgl_loader_gltf_extensions.html
+1
-6
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
8582c743
...
...
@@ -2092,7 +2092,7 @@ THREE.GLTFLoader = ( function () {
}
var
alphaMode
=
materialDef
.
alphaMode
;
var
alphaMode
=
materialDef
.
alphaMode
||
ALPHA_MODES
.
OPAQUE
;
if
(
alphaMode
===
ALPHA_MODES
.
BLEND
)
{
...
...
@@ -2101,9 +2101,21 @@ THREE.GLTFLoader = ( function () {
// See: https://github.com/mrdoob/three.js/issues/17706
materialParams
.
depthWrite
=
false
;
}
else
if
(
alphaMode
===
ALPHA_MODES
.
MASK
)
{
}
else
{
materialParams
.
transparent
=
false
;
if
(
alphaMode
===
ALPHA_MODES
.
MASK
)
{
materialParams
.
alphaTest
=
materialDef
.
alphaCutoff
!==
undefined
?
materialDef
.
alphaCutoff
:
0.5
;
materialParams
.
alphaTest
=
materialDef
.
alphaCutoff
!==
undefined
?
materialDef
.
alphaCutoff
:
0.5
;
}
else
{
// for ALPHA_MODES.OPAQUE, we use a negative alphaTest value to enable alphaTesting,
// causing the test to always be passed, but also replacing any alpha value with 1.0.
materialParams
.
alphaTest
=
-
0.5
;
}
}
...
...
examples/jsm/loaders/GLTFLoader.js
浏览文件 @
8582c743
...
...
@@ -2155,7 +2155,7 @@ var GLTFLoader = ( function () {
}
var
alphaMode
=
materialDef
.
alphaMode
;
var
alphaMode
=
materialDef
.
alphaMode
||
ALPHA_MODES
.
OPAQUE
;
if
(
alphaMode
===
ALPHA_MODES
.
BLEND
)
{
...
...
@@ -2164,9 +2164,21 @@ var GLTFLoader = ( function () {
// See: https://github.com/mrdoob/three.js/issues/17706
materialParams
.
depthWrite
=
false
;
}
else
if
(
alphaMode
===
ALPHA_MODES
.
MASK
)
{
}
else
{
materialParams
.
transparent
=
false
;
if
(
alphaMode
===
ALPHA_MODES
.
MASK
)
{
materialParams
.
alphaTest
=
materialDef
.
alphaCutoff
!==
undefined
?
materialDef
.
alphaCutoff
:
0.5
;
materialParams
.
alphaTest
=
materialDef
.
alphaCutoff
!==
undefined
?
materialDef
.
alphaCutoff
:
0.5
;
}
else
{
// for ALPHA_MODES.OPAQUE, we use a negative alphaTest value to enable alphaTesting,
// causing the test to always be passed, but also replacing any alpha value with 1.0.
materialParams
.
alphaTest
=
-
0.5
;
}
}
...
...
examples/webgl_loader_gltf_extensions.html
浏览文件 @
8582c743
...
...
@@ -5,11 +5,6 @@
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"main.css"
>
<style>
body
{
background-color
:
white
;
}
</style>
</head>
<body>
...
...
@@ -19,7 +14,7 @@
<div
id=
"description"
></div>
</div>
<div
id=
"container"
></div>
<div
id=
"container"
style=
"background-color: white;"
></div>
<script
type=
"module"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录