Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
66dfe96f
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,发现更多精彩内容 >>
未验证
提交
66dfe96f
编写于
6月 17, 2021
作者:
M
Mr.doob
提交者:
GitHub
6月 17, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Added equirect option to environment (#22010)
上级
2f6358dd
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
54 addition
and
32 deletion
+54
-32
editor/js/Sidebar.Scene.js
editor/js/Sidebar.Scene.js
+35
-15
editor/js/Viewport.js
editor/js/Viewport.js
+19
-17
未找到文件。
editor/js/Sidebar.Scene.js
浏览文件 @
66dfe96f
...
...
@@ -150,18 +150,6 @@ function SidebarScene( editor ) {
// background
function
onBackgroundChanged
()
{
signals
.
sceneBackgroundChanged
.
dispatch
(
backgroundType
.
getValue
(),
backgroundColor
.
getHexValue
(),
backgroundTexture
.
getValue
(),
backgroundEquirectangularTexture
.
getValue
(),
environmentType
.
getValue
()
);
}
var
backgroundRow
=
new
UIRow
();
var
backgroundType
=
new
UISelect
().
setOptions
(
{
...
...
@@ -196,7 +184,16 @@ function SidebarScene( editor ) {
container
.
add
(
backgroundRow
);
//
function
onBackgroundChanged
()
{
signals
.
sceneBackgroundChanged
.
dispatch
(
backgroundType
.
getValue
(),
backgroundColor
.
getHexValue
(),
backgroundTexture
.
getValue
(),
backgroundEquirectangularTexture
.
getValue
()
);
}
function
refreshBackgroundUI
()
{
...
...
@@ -216,22 +213,45 @@ function SidebarScene( editor ) {
var
environmentType
=
new
UISelect
().
setOptions
(
{
'
None
'
:
''
,
'
Background
'
:
'
Background
'
,
'
Equirectangular
'
:
'
Equirect
'
,
'
ModelViewer
'
:
'
ModelViewer
'
}
).
setWidth
(
'
150px
'
);
environmentType
.
setValue
(
'
None
'
);
environmentType
.
onChange
(
function
()
{
signals
.
sceneEnvironmentChanged
.
dispatch
(
environmentType
.
getValue
()
);
onEnvironmentChanged
();
refreshEnvironmentUI
();
}
);
environmentRow
.
add
(
new
UIText
(
strings
.
getKey
(
'
sidebar/scene/environment
'
)
).
setWidth
(
'
90px
'
)
);
environmentRow
.
add
(
environmentType
);
var
environmentEquirectangularTexture
=
new
UITexture
().
setMarginLeft
(
'
8px
'
).
onChange
(
onEnvironmentChanged
);
environmentEquirectangularTexture
.
setDisplay
(
'
none
'
);
environmentRow
.
add
(
environmentEquirectangularTexture
);
container
.
add
(
environmentRow
);
function
onEnvironmentChanged
()
{
signals
.
sceneEnvironmentChanged
.
dispatch
(
environmentType
.
getValue
(),
environmentEquirectangularTexture
.
getValue
()
);
}
function
refreshEnvironmentUI
()
{
var
type
=
environmentType
.
getValue
();
environmentType
.
setWidth
(
type
!==
'
Equirectangular
'
?
'
150px
'
:
'
110px
'
);
environmentEquirectangularTexture
.
setDisplay
(
type
===
'
Equirectangular
'
?
''
:
'
none
'
);
}
// fog
function
onFogChanged
()
{
...
...
editor/js/Viewport.js
浏览文件 @
66dfe96f
...
...
@@ -32,7 +32,6 @@ function Viewport( editor ) {
var
renderer
=
null
;
var
pmremGenerator
=
null
;
var
pmremTexture
=
null
;
var
camera
=
editor
.
camera
;
var
scene
=
editor
.
scene
;
...
...
@@ -354,7 +353,6 @@ function Viewport( editor ) {
renderer
.
setAnimationLoop
(
null
);
renderer
.
dispose
();
pmremGenerator
.
dispose
();
pmremTexture
=
null
;
container
.
dom
.
removeChild
(
renderer
.
domElement
);
...
...
@@ -537,9 +535,7 @@ function Viewport( editor ) {
// background
signals
.
sceneBackgroundChanged
.
add
(
function
(
backgroundType
,
backgroundColor
,
backgroundTexture
,
backgroundEquirectangularTexture
,
environmentType
)
{
pmremTexture
=
null
;
signals
.
sceneBackgroundChanged
.
add
(
function
(
backgroundType
,
backgroundColor
,
backgroundTexture
,
backgroundEquirectangularTexture
)
{
switch
(
backgroundType
)
{
...
...
@@ -569,9 +565,7 @@ function Viewport( editor ) {
if
(
backgroundEquirectangularTexture
)
{
pmremTexture
=
pmremGenerator
.
fromEquirectangular
(
backgroundEquirectangularTexture
).
texture
;
var
renderTarget
=
new
THREE
.
WebGLCubeRenderTarget
(
512
);
var
renderTarget
=
new
THREE
.
WebGLCubeRenderTarget
(
backgroundEquirectangularTexture
.
image
.
width
);
renderTarget
.
fromEquirectangularTexture
(
renderer
,
backgroundEquirectangularTexture
);
renderTarget
.
toJSON
=
function
()
{
return
null
};
// TODO Remove hack
...
...
@@ -583,30 +577,38 @@ function Viewport( editor ) {
}
if
(
environmentType
===
'
Background
'
)
{
scene
.
environment
=
pmremTexture
;
}
render
();
}
);
// environment
signals
.
sceneEnvironmentChanged
.
add
(
function
(
environmentType
)
{
signals
.
sceneEnvironmentChanged
.
add
(
function
(
environmentType
,
environmentEquirectangularTexture
)
{
switch
(
environmentType
)
{
case
'
None
'
:
scene
.
environment
=
null
;
break
;
case
'
Background
'
:
scene
.
environment
=
pmremTexture
;
case
'
Equirectangular
'
:
scene
.
environment
=
null
;
if
(
environmentEquirectangularTexture
)
{
scene
.
environment
=
pmremGenerator
.
fromEquirectangular
(
environmentEquirectangularTexture
).
texture
;
}
break
;
case
'
ModelViewer
'
:
scene
.
environment
=
pmremGenerator
.
fromScene
(
new
RoomEnvironment
(),
0.04
).
texture
;
break
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录