Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
029515a3
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,发现更多精彩内容 >>
提交
029515a3
编写于
10月 28, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Added roughnessMap/metalnessMap support.
上级
fef4f0f3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
104 addition
and
0 deletion
+104
-0
editor/js/Sidebar.Material.js
editor/js/Sidebar.Material.js
+104
-0
未找到文件。
editor/js/Sidebar.Material.js
浏览文件 @
029515a3
...
...
@@ -258,6 +258,30 @@ Sidebar.Material = function ( editor ) {
container
.
add
(
materialDisplacementMapRow
);
// roughness map
var
materialRoughnessMapRow
=
new
UI
.
Panel
();
var
materialRoughnessMapEnabled
=
new
UI
.
Checkbox
(
false
).
onChange
(
update
);
var
materialRoughnessMap
=
new
UI
.
Texture
().
onChange
(
update
);
materialRoughnessMapRow
.
add
(
new
UI
.
Text
(
'
Rough. Map
'
).
setWidth
(
'
90px
'
)
);
materialRoughnessMapRow
.
add
(
materialRoughnessMapEnabled
);
materialRoughnessMapRow
.
add
(
materialRoughnessMap
);
container
.
add
(
materialRoughnessMapRow
);
// metalness map
var
materialMetalnessMapRow
=
new
UI
.
Panel
();
var
materialMetalnessMapEnabled
=
new
UI
.
Checkbox
(
false
).
onChange
(
update
);
var
materialMetalnessMap
=
new
UI
.
Texture
().
onChange
(
update
);
materialMetalnessMapRow
.
add
(
new
UI
.
Text
(
'
Metal. Map
'
).
setWidth
(
'
90px
'
)
);
materialMetalnessMapRow
.
add
(
materialMetalnessMapEnabled
);
materialMetalnessMapRow
.
add
(
materialMetalnessMap
);
container
.
add
(
materialMetalnessMapRow
);
// specular map
var
materialSpecularMapRow
=
new
UI
.
Panel
();
...
...
@@ -611,6 +635,60 @@ Sidebar.Material = function ( editor ) {
}
if
(
material
.
roughnessMap
!==
undefined
)
{
var
roughnessMapEnabled
=
materialRoughnessMapEnabled
.
getValue
()
===
true
;
if
(
objectHasUvs
)
{
var
roughnessMap
=
roughnessMapEnabled
?
materialRoughnessMap
.
getValue
()
:
null
;
if
(
material
.
roughnessMap
!==
roughnessMap
)
{
editor
.
execute
(
new
SetMaterialMapCommand
(
currentObject
,
'
roughnessMap
'
,
roughnessMap
)
);
}
if
(
material
.
displacementScale
!==
materialDisplacementScale
.
getValue
()
)
{
editor
.
execute
(
new
SetMaterialValueCommand
(
currentObject
,
'
displacementScale
'
,
materialDisplacementScale
.
getValue
()
)
);
}
}
else
{
if
(
roughnessMapEnabled
)
textureWarning
=
true
;
}
}
if
(
material
.
metalnessMap
!==
undefined
)
{
var
metalnessMapEnabled
=
materialMetalnessMapEnabled
.
getValue
()
===
true
;
if
(
objectHasUvs
)
{
var
metalnessMap
=
metalnessMapEnabled
?
materialMetalnessMap
.
getValue
()
:
null
;
if
(
material
.
metalnessMap
!==
metalnessMap
)
{
editor
.
execute
(
new
SetMaterialMapCommand
(
currentObject
,
'
metalnessMap
'
,
metalnessMap
)
);
}
if
(
material
.
displacementScale
!==
materialDisplacementScale
.
getValue
()
)
{
editor
.
execute
(
new
SetMaterialValueCommand
(
currentObject
,
'
displacementScale
'
,
materialDisplacementScale
.
getValue
()
)
);
}
}
else
{
if
(
metalnessMapEnabled
)
textureWarning
=
true
;
}
}
if
(
material
.
specularMap
!==
undefined
)
{
var
specularMapEnabled
=
materialSpecularMapEnabled
.
getValue
()
===
true
;
...
...
@@ -798,6 +876,8 @@ Sidebar.Material = function ( editor ) {
'
bumpMap
'
:
materialBumpMapRow
,
'
normalMap
'
:
materialNormalMapRow
,
'
displacementMap
'
:
materialDisplacementMapRow
,
'
roughnessMap
'
:
materialRoughnessMapRow
,
'
metalnessMap
'
:
materialMetalnessMapRow
,
'
specularMap
'
:
materialSpecularMapRow
,
'
envMap
'
:
materialEnvMapRow
,
'
lightMap
'
:
materialLightMapRow
,
...
...
@@ -954,6 +1034,30 @@ Sidebar.Material = function ( editor ) {
}
if
(
material
.
roughnessMap
!==
undefined
)
{
materialRoughnessMapEnabled
.
setValue
(
material
.
roughnessMap
!==
null
);
if
(
material
.
roughnessMap
!==
null
||
resetTextureSelectors
)
{
materialRoughnessMap
.
setValue
(
material
.
roughnessMap
);
}
}
if
(
material
.
metalnessMap
!==
undefined
)
{
materialMetalnessMapEnabled
.
setValue
(
material
.
metalnessMap
!==
null
);
if
(
material
.
metalnessMap
!==
null
||
resetTextureSelectors
)
{
materialMetalnessMap
.
setValue
(
material
.
metalnessMap
);
}
}
if
(
material
.
specularMap
!==
undefined
)
{
materialSpecularMapEnabled
.
setValue
(
material
.
specularMap
!==
null
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录