Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
c26e1544
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,发现更多精彩内容 >>
提交
c26e1544
编写于
9月 23, 2019
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Removed new/copy/paste from Sidebar.Material
上级
473315fb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
47 deletion
+4
-47
editor/js/Sidebar.Material.js
editor/js/Sidebar.Material.js
+4
-47
未找到文件。
editor/js/Sidebar.Material.js
浏览文件 @
c26e1544
...
@@ -17,12 +17,6 @@ Sidebar.Material = function ( editor ) {
...
@@ -17,12 +17,6 @@ Sidebar.Material = function ( editor ) {
container
.
setDisplay
(
'
none
'
);
container
.
setDisplay
(
'
none
'
);
container
.
setPaddingTop
(
'
20px
'
);
container
.
setPaddingTop
(
'
20px
'
);
// New / Copy / Paste
var
copiedMaterial
;
var
managerRow
=
new
UI
.
Row
();
// Current material slot
// Current material slot
var
materialSlotRow
=
new
UI
.
Row
();
var
materialSlotRow
=
new
UI
.
Row
();
...
@@ -35,43 +29,6 @@ Sidebar.Material = function ( editor ) {
...
@@ -35,43 +29,6 @@ Sidebar.Material = function ( editor ) {
container
.
add
(
materialSlotRow
);
container
.
add
(
materialSlotRow
);
managerRow
.
add
(
new
UI
.
Text
(
''
).
setWidth
(
'
90px
'
)
);
managerRow
.
add
(
new
UI
.
Button
(
strings
.
getKey
(
'
sidebar/material/new
'
)
).
onClick
(
function
()
{
var
material
=
new
THREE
[
materialClass
.
getValue
()
]();
editor
.
execute
(
new
SetMaterialCommand
(
editor
,
currentObject
,
material
,
currentMaterialSlot
),
'
New Material:
'
+
materialClass
.
getValue
()
);
update
();
}
)
);
managerRow
.
add
(
new
UI
.
Button
(
strings
.
getKey
(
'
sidebar/material/copy
'
)
).
setMarginLeft
(
'
4px
'
).
onClick
(
function
()
{
copiedMaterial
=
currentObject
.
material
;
if
(
Array
.
isArray
(
copiedMaterial
)
)
{
if
(
copiedMaterial
.
length
===
0
)
return
;
copiedMaterial
=
copiedMaterial
[
currentMaterialSlot
];
}
}
)
);
managerRow
.
add
(
new
UI
.
Button
(
strings
.
getKey
(
'
sidebar/material/paste
'
)
).
setMarginLeft
(
'
4px
'
).
onClick
(
function
()
{
if
(
copiedMaterial
===
undefined
)
return
;
editor
.
execute
(
new
SetMaterialCommand
(
editor
,
currentObject
,
copiedMaterial
,
currentMaterialSlot
),
'
Pasted Material:
'
+
materialClass
.
getValue
()
);
refreshUI
();
update
();
}
)
);
container
.
add
(
managerRow
);
// type
// type
var
materialClassRow
=
new
UI
.
Row
();
var
materialClassRow
=
new
UI
.
Row
();
...
@@ -655,9 +612,9 @@ Sidebar.Material = function ( editor ) {
...
@@ -655,9 +612,9 @@ Sidebar.Material = function ( editor ) {
var
sheen
=
sheenEnabled
?
new
THREE
.
Color
(
materialSheen
.
getHexValue
())
:
null
;
var
sheen
=
sheenEnabled
?
new
THREE
.
Color
(
materialSheen
.
getHexValue
())
:
null
;
editor
.
execute
(
new
SetMaterialValueCommand
(
editor
,
currentObject
,
'
sheen
'
,
sheen
,
currentMaterialSlot
)
);
editor
.
execute
(
new
SetMaterialValueCommand
(
editor
,
currentObject
,
'
sheen
'
,
sheen
,
currentMaterialSlot
)
);
}
}
if
(
material
.
sheen
!==
undefined
&&
material
.
sheen
!==
null
&&
material
.
sheen
.
getHex
()
!==
materialSheen
.
getHexValue
()
)
{
if
(
material
.
sheen
!==
undefined
&&
material
.
sheen
!==
null
&&
material
.
sheen
.
getHex
()
!==
materialSheen
.
getHexValue
()
)
{
editor
.
execute
(
new
SetMaterialColorCommand
(
editor
,
currentObject
,
'
sheen
'
,
materialSheen
.
getHexValue
(),
currentMaterialSlot
)
);
editor
.
execute
(
new
SetMaterialColorCommand
(
editor
,
currentObject
,
'
sheen
'
,
materialSheen
.
getHexValue
(),
currentMaterialSlot
)
);
...
@@ -1297,9 +1254,9 @@ Sidebar.Material = function ( editor ) {
...
@@ -1297,9 +1254,9 @@ Sidebar.Material = function ( editor ) {
materialMetalness
.
setValue
(
material
.
metalness
);
materialMetalness
.
setValue
(
material
.
metalness
);
}
}
if
(
material
.
sheen
!==
undefined
&&
material
.
sheen
!==
null
)
{
if
(
material
.
sheen
!==
undefined
&&
material
.
sheen
!==
null
)
{
materialSheenEnabled
.
setValue
(
true
);
materialSheenEnabled
.
setValue
(
true
);
materialSheen
.
setHexValue
(
material
.
sheen
.
getHexString
()
);
materialSheen
.
setHexValue
(
material
.
sheen
.
getHexString
()
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录