Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
01ef2a2e
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,发现更多精彩内容 >>
未验证
提交
01ef2a2e
编写于
8月 21, 2019
作者:
M
Mr.doob
提交者:
GitHub
8月 21, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17307 from WestLangley/dev_material_tonemapped
Material: Added .toneMapped property
上级
84f9c514
3634115e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
2 deletion
+18
-2
docs/api/en/materials/Material.html
docs/api/en/materials/Material.html
+5
-0
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+3
-0
src/materials/Material.js
src/materials/Material.js
+8
-0
src/renderers/webgl/WebGLPrograms.js
src/renderers/webgl/WebGLPrograms.js
+2
-2
未找到文件。
docs/api/en/materials/Material.html
浏览文件 @
01ef2a2e
...
...
@@ -267,6 +267,11 @@
Other options are [page:Materials THREE.BackSide] and [page:Materials THREE.DoubleSide].
</p>
<h3>
[property:Boolean toneMapped]
</h3>
<p>
Defines whether this material is tone mapped according to the renderer's [page:WebGLRenderer.toneMapping toneMapping] setting. Default is *true*.
</p>
<h3>
[property:Boolean transparent]
</h3>
<p>
Defines whether this material is transparent. This has an effect on rendering
...
...
src/loaders/MaterialLoader.js
浏览文件 @
01ef2a2e
...
...
@@ -97,6 +97,9 @@ Object.assign( MaterialLoader.prototype, {
if
(
json
.
dithering
!==
undefined
)
material
.
dithering
=
json
.
dithering
;
if
(
json
.
visible
!==
undefined
)
material
.
visible
=
json
.
visible
;
if
(
json
.
toneMapped
!==
undefined
)
material
.
toneMapped
=
json
.
toneMapped
;
if
(
json
.
userData
!==
undefined
)
material
.
userData
=
json
.
userData
;
// Shader Material
...
...
src/materials/Material.js
浏览文件 @
01ef2a2e
...
...
@@ -70,6 +70,8 @@ function Material() {
this
.
visible
=
true
;
this
.
toneMapped
=
true
;
this
.
userData
=
{};
this
.
needsUpdate
=
true
;
...
...
@@ -290,6 +292,9 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
if
(
this
.
skinning
===
true
)
data
.
skinning
=
true
;
if
(
this
.
visible
===
false
)
data
.
visible
=
false
;
if
(
this
.
toneMapped
===
false
)
data
.
toneMapped
=
false
;
if
(
JSON
.
stringify
(
this
.
userData
)
!==
'
{}
'
)
data
.
userData
=
this
.
userData
;
// TODO: Copied from Object3D.toJSON
...
...
@@ -378,6 +383,9 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
this
.
premultipliedAlpha
=
source
.
premultipliedAlpha
;
this
.
visible
=
source
.
visible
;
this
.
toneMapped
=
source
.
toneMapped
;
this
.
userData
=
JSON
.
parse
(
JSON
.
stringify
(
source
.
userData
)
);
this
.
clipShadows
=
source
.
clipShadows
;
...
...
src/renderers/webgl/WebGLPrograms.js
浏览文件 @
01ef2a2e
...
...
@@ -2,7 +2,7 @@
* @author mrdoob / http://mrdoob.com/
*/
import
{
BackSide
,
DoubleSide
,
CubeUVRefractionMapping
,
CubeUVReflectionMapping
,
GammaEncoding
,
LinearEncoding
,
ObjectSpaceNormalMap
,
TangentSpaceNormalMap
}
from
'
../../constants.js
'
;
import
{
BackSide
,
DoubleSide
,
CubeUVRefractionMapping
,
CubeUVReflectionMapping
,
GammaEncoding
,
LinearEncoding
,
ObjectSpaceNormalMap
,
TangentSpaceNormalMap
,
NoToneMapping
}
from
'
../../constants.js
'
;
import
{
WebGLProgram
}
from
'
./WebGLProgram.js
'
;
function
WebGLPrograms
(
renderer
,
extensions
,
capabilities
)
{
...
...
@@ -208,7 +208,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
shadowMapEnabled
:
renderer
.
shadowMap
.
enabled
&&
object
.
receiveShadow
&&
shadows
.
length
>
0
,
shadowMapType
:
renderer
.
shadowMap
.
type
,
toneMapping
:
renderer
.
t
oneMapping
,
toneMapping
:
material
.
toneMapped
?
renderer
.
toneMapping
:
NoT
oneMapping
,
physicallyCorrectLights
:
renderer
.
physicallyCorrectLights
,
premultipliedAlpha
:
material
.
premultipliedAlpha
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录