Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
b29e7541
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,发现更多精彩内容 >>
未验证
提交
b29e7541
编写于
9月 23, 2019
作者:
M
Mr.doob
提交者:
GitHub
9月 23, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17556 from sdinesh86/editor-material-browser
Editor : Basic Material browser implementation
上级
960e9273
212dfb14
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
83 addition
and
7 deletion
+83
-7
editor/css/dark.css
editor/css/dark.css
+0
-1
editor/css/light.css
editor/css/light.css
+0
-1
editor/js/Editor.js
editor/js/Editor.js
+28
-0
editor/js/Sidebar.Project.js
editor/js/Sidebar.Project.js
+54
-5
editor/js/Strings.js
editor/js/Strings.js
+1
-0
未找到文件。
editor/css/dark.css
浏览文件 @
b29e7541
...
...
@@ -273,7 +273,6 @@ select {
.Panel
{
color
:
#888
;
border-top
:
1px
solid
#222
;
}
/* */
...
...
editor/css/light.css
浏览文件 @
b29e7541
...
...
@@ -267,7 +267,6 @@ select {
.Panel
{
color
:
#888
;
border-top
:
1px
solid
#ccc
;
}
/* */
...
...
editor/js/Editor.js
浏览文件 @
b29e7541
...
...
@@ -57,7 +57,9 @@ var Editor = function () {
helperAdded
:
new
Signal
(),
helperRemoved
:
new
Signal
(),
materialAdded
:
new
Signal
(),
materialChanged
:
new
Signal
(),
materialRemoved
:
new
Signal
(),
scriptAdded
:
new
Signal
(),
scriptChanged
:
new
Signal
(),
...
...
@@ -234,6 +236,32 @@ Editor.prototype = {
addMaterial
:
function
(
material
)
{
this
.
materials
[
material
.
uuid
]
=
material
;
this
.
signals
.
materialAdded
.
dispatch
();
},
removeMaterial
:
function
(
material
)
{
delete
this
.
materials
[
material
.
uuid
];
this
.
signals
.
materialRemoved
.
dispatch
();
},
getMaterialById
(
id
)
{
var
material
;
var
materials
=
Object
.
values
(
this
.
materials
);
for
(
var
i
=
0
;
i
<
materials
.
length
;
i
++
)
{
if
(
materials
[
i
].
id
===
id
)
{
material
=
materials
[
i
];
break
;
}
}
return
material
;
},
...
...
editor/js/Sidebar.Project.js
浏览文件 @
b29e7541
...
...
@@ -19,8 +19,14 @@ Sidebar.Project = function ( editor ) {
var
container
=
new
UI
.
Panel
();
container
.
setBorderTop
(
'
0
'
);
container
.
setPadding
(
'
0
'
);
container
.
setPaddingTop
(
'
20px
'
);
var
projectsettings
=
new
UI
.
Panel
();
projectsettings
.
setBorderTop
(
'
0
'
);
container
.
add
(
projectsettings
);
// Title
var
titleRow
=
new
UI
.
Row
();
...
...
@@ -33,7 +39,7 @@ Sidebar.Project = function ( editor ) {
titleRow
.
add
(
new
UI
.
Text
(
strings
.
getKey
(
'
sidebar/project/title
'
)
).
setWidth
(
'
90px
'
)
);
titleRow
.
add
(
title
);
container
.
add
(
titleRow
);
projectsettings
.
add
(
titleRow
);
// Editable
...
...
@@ -47,7 +53,7 @@ Sidebar.Project = function ( editor ) {
editableRow
.
add
(
new
UI
.
Text
(
strings
.
getKey
(
'
sidebar/project/editable
'
)
).
setWidth
(
'
90px
'
)
);
editableRow
.
add
(
editable
);
container
.
add
(
editableRow
);
projectsettings
.
add
(
editableRow
);
// VR
...
...
@@ -61,7 +67,7 @@ Sidebar.Project = function ( editor ) {
vrRow
.
add
(
new
UI
.
Text
(
strings
.
getKey
(
'
sidebar/project/vr
'
)
).
setWidth
(
'
90px
'
)
);
vrRow
.
add
(
vr
);
container
.
add
(
vrRow
);
projectsettings
.
add
(
vrRow
);
// Renderer
...
...
@@ -89,7 +95,7 @@ Sidebar.Project = function ( editor ) {
rendererTypeRow
.
add
(
new
UI
.
Text
(
strings
.
getKey
(
'
sidebar/project/renderer
'
)
).
setWidth
(
'
90px
'
)
);
rendererTypeRow
.
add
(
rendererType
);
container
.
add
(
rendererTypeRow
);
projectsettings
.
add
(
rendererTypeRow
);
if
(
config
.
getKey
(
'
project/renderer
'
)
!==
undefined
)
{
...
...
@@ -119,7 +125,7 @@ Sidebar.Project = function ( editor ) {
}
);
rendererPropertiesRow
.
add
(
rendererShadows
);
container
.
add
(
rendererPropertiesRow
);
projectsettings
.
add
(
rendererPropertiesRow
);
//
...
...
@@ -165,6 +171,49 @@ Sidebar.Project = function ( editor ) {
createRenderer
(
config
.
getKey
(
'
project/renderer
'
),
config
.
getKey
(
'
project/renderer/antialias
'
),
config
.
getKey
(
'
project/renderer/shadows
'
)
);
var
materialbrowserpanel
=
new
UI
.
Panel
();
var
headerRow
=
new
UI
.
Row
();
headerRow
.
add
(
new
UI
.
Text
(
strings
.
getKey
(
'
sidebar/project/materialbrowser
'
)
)
);
materialbrowserpanel
.
add
(
headerRow
);
var
listbox
=
new
UI
.
Listbox
(
);
signals
.
materialAdded
.
add
(
function
()
{
var
materials
=
Object
.
values
(
editor
.
materials
);
listbox
.
setItems
(
materials
);
}
);
materialbrowserpanel
.
add
(
listbox
);
var
buttonsRow
=
new
UI
.
Row
(
);
buttonsRow
.
setPadding
(
'
10px 0px
'
);
materialbrowserpanel
.
add
(
buttonsRow
);
var
addButton
=
new
UI
.
Button
(
).
setLabel
(
'
Add
'
).
setMarginRight
(
'
5px
'
);
addButton
.
onClick
(
function
(
)
{
editor
.
addMaterial
(
new
THREE
.
MeshStandardMaterial
({
color
:
0xffffff
})
);
}
);
buttonsRow
.
add
(
addButton
);
var
assignMaterial
=
new
UI
.
Button
(
).
setLabel
(
'
Assign
'
).
setMargin
(
'
0px 5px
'
);
assignMaterial
.
onClick
(
function
(
)
{
if
(
typeof
editor
.
selected
!==
'
undefined
'
)
{
var
material
=
editor
.
getMaterialById
(
parseInt
(
listbox
.
getValue
(
)
)
);
if
(
typeof
material
!==
'
undefined
'
)
{
editor
.
execute
(
new
SetMaterialCommand
(
editor
,
editor
.
selected
,
material
)
);
}
}
}
);
buttonsRow
.
add
(
assignMaterial
);
container
.
add
(
materialbrowserpanel
);
return
container
;
};
editor/js/Strings.js
浏览文件 @
b29e7541
...
...
@@ -274,6 +274,7 @@ var Strings = function ( config ) {
'
sidebar/script/remove
'
:
'
Remove
'
,
'
sidebar/project
'
:
'
Project
'
,
'
sidebar/project/materialbrowser
'
:
'
MATERIAL BROWSER
'
,
'
sidebar/project/title
'
:
'
Title
'
,
'
sidebar/project/editable
'
:
'
Editable
'
,
'
sidebar/project/vr
'
:
'
VR
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录