Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
b33b963e
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,体验更适合开发者的 AI 搜索 >>
提交
b33b963e
编写于
8月 14, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Fixed Fog. Closes #9227.
上级
ddde96cb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
46 addition
and
72 deletion
+46
-72
editor/index.html
editor/index.html
+2
-0
editor/js/Editor.js
editor/js/Editor.js
+5
-3
editor/js/Sidebar.Scene.js
editor/js/Sidebar.Scene.js
+15
-20
editor/js/Viewport.js
editor/js/Viewport.js
+24
-49
未找到文件。
editor/index.html
浏览文件 @
b33b963e
...
...
@@ -129,6 +129,7 @@
<script
src=
"js/Toolbar.js"
></script>
<script
src=
"js/Viewport.js"
></script>
<script
src=
"js/Viewport.Info.js"
></script>
<script
src=
"js/Command.js"
></script>
<script
src=
"js/commands/AddObjectCommand.js"
></script>
<script
src=
"js/commands/RemoveObjectCommand.js"
></script>
...
...
@@ -254,6 +255,7 @@
signals
.
objectRemoved
.
add
(
saveState
);
signals
.
materialChanged
.
add
(
saveState
);
signals
.
sceneGraphChanged
.
add
(
saveState
);
signals
.
fogChanged
.
add
(
saveState
);
signals
.
scriptChanged
.
add
(
saveState
);
signals
.
historyChanged
.
add
(
saveState
);
...
...
editor/js/Editor.js
浏览文件 @
b33b963e
...
...
@@ -69,9 +69,8 @@ var Editor = function () {
scriptChanged
:
new
Signal
(),
scriptRemoved
:
new
Signal
(),
fogTypeChanged
:
new
Signal
(),
fogColorChanged
:
new
Signal
(),
fogParametersChanged
:
new
Signal
(),
fogChanged
:
new
Signal
(),
windowResize
:
new
Signal
(),
showGridChanged
:
new
Signal
(),
...
...
@@ -120,6 +119,9 @@ Editor.prototype = {
this
.
scene
.
uuid
=
scene
.
uuid
;
this
.
scene
.
name
=
scene
.
name
;
if
(
scene
.
fog
!==
null
)
this
.
scene
.
fog
=
scene
.
fog
.
clone
();
this
.
scene
.
userData
=
JSON
.
parse
(
JSON
.
stringify
(
scene
.
userData
)
);
// avoid render per object
...
...
editor/js/Sidebar.Scene.js
浏览文件 @
b33b963e
...
...
@@ -97,13 +97,15 @@ Sidebar.Scene = function ( editor ) {
// fog
function
updateFogParameters
()
{
function
onFogChanged
()
{
var
near
=
fogNear
.
getValue
();
var
far
=
fogFar
.
getValue
();
var
density
=
fogDensity
.
getValue
();
signals
.
fogParametersChanged
.
dispatch
(
near
,
far
,
density
);
signals
.
fogChanged
.
dispatch
(
fogType
.
getValue
(),
fogColor
.
getHexValue
(),
fogNear
.
getValue
(),
fogFar
.
getValue
(),
fogDensity
.
getValue
()
);
}
...
...
@@ -117,10 +119,7 @@ Sidebar.Scene = function ( editor ) {
}
).
setWidth
(
'
150px
'
);
fogType
.
onChange
(
function
()
{
var
type
=
fogType
.
getValue
();
signals
.
fogTypeChanged
.
dispatch
(
type
);
onFogChanged
();
refreshFogUI
();
}
);
...
...
@@ -138,31 +137,27 @@ Sidebar.Scene = function ( editor ) {
container
.
add
(
fogPropertiesRow
);
var
fogColor
=
new
UI
.
Color
().
setValue
(
'
#aaaaaa
'
);
fogColor
.
onChange
(
function
()
{
signals
.
fogColorChanged
.
dispatch
(
fogColor
.
getHexValue
()
);
}
);
fogColor
.
onChange
(
onFogChanged
);
fogPropertiesRow
.
add
(
fogColor
);
// fog near
var
fogNear
=
new
UI
.
Number
(
0.1
).
setWidth
(
'
40px
'
).
setRange
(
0
,
Infinity
).
onChange
(
updateFogParameters
);
var
fogNear
=
new
UI
.
Number
(
0.1
).
setWidth
(
'
40px
'
).
setRange
(
0
,
Infinity
).
onChange
(
onFogChanged
);
fogPropertiesRow
.
add
(
fogNear
);
// fog far
var
fogFar
=
new
UI
.
Number
(
100
).
setWidth
(
'
40px
'
).
setRange
(
0
,
Infinity
).
onChange
(
updateFogParameters
);
var
fogFar
=
new
UI
.
Number
(
50
).
setWidth
(
'
40px
'
).
setRange
(
0
,
Infinity
).
onChange
(
onFogChanged
);
fogPropertiesRow
.
add
(
fogFar
);
// fog density
var
fogDensity
=
new
UI
.
Number
(
0.0
0025
).
setWidth
(
'
40px
'
).
setRange
(
0
,
0.1
).
setPrecision
(
5
).
onChange
(
updateFogParameters
);
var
fogDensity
=
new
UI
.
Number
(
0.0
5
).
setWidth
(
'
40px
'
).
setRange
(
0
,
0.1
).
setPrecision
(
3
).
onChange
(
onFogChanged
);
fogPropertiesRow
.
add
(
fogDensity
);
//
var
refreshUI
=
function
()
{
function
refreshUI
()
{
var
camera
=
editor
.
camera
;
var
scene
=
editor
.
scene
;
...
...
@@ -221,7 +216,7 @@ Sidebar.Scene = function ( editor ) {
refreshFogUI
();
}
;
}
function
refreshFogUI
()
{
...
...
editor/js/Viewport.js
浏览文件 @
b33b963e
...
...
@@ -134,14 +134,6 @@ var Viewport = function ( editor ) {
sceneHelpers
.
add
(
transformControls
);
// fog
var
oldFogType
=
"
None
"
;
var
oldFogColor
=
0xaaaaaa
;
var
oldFogNear
=
1
;
var
oldFogFar
=
5000
;
var
oldFogDensity
=
0.00025
;
// object picking
var
raycaster
=
new
THREE
.
Raycaster
();
...
...
@@ -496,53 +488,50 @@ var Viewport = function ( editor ) {
}
);
signals
.
fogTypeChanged
.
add
(
function
(
fogType
)
{
if
(
fogType
!==
oldFogType
)
{
if
(
fogType
===
"
None
"
)
{
// fog
scene
.
fog
=
null
;
var
currentFogType
=
null
;
}
else
if
(
fogType
===
"
Fog
"
)
{
signals
.
fogChanged
.
add
(
function
(
fogType
,
fogColor
,
fogNear
,
fogFar
,
fogDensity
)
{
scene
.
fog
=
new
THREE
.
Fog
(
oldFogColor
,
oldFogNear
,
oldFogFar
);
if
(
currentFogType
!==
fogType
)
{
}
else
if
(
fogType
===
"
FogExp2
"
)
{
switch
(
fogType
)
{
scene
.
fog
=
new
THREE
.
FogExp2
(
oldFogColor
,
oldFogDensity
);
case
'
None
'
:
scene
.
fog
=
null
;
break
;
case
'
Fog
'
:
scene
.
fog
=
new
THREE
.
Fog
();
break
;
case
'
FogExp2
'
:
scene
.
fog
=
new
THREE
.
FogExp2
();
break
;
}
old
FogType
=
fogType
;
current
FogType
=
fogType
;
}
render
();
if
(
scene
.
fog
instanceof
THREE
.
Fog
)
{
}
);
scene
.
fog
.
color
.
setHex
(
fogColor
);
scene
.
fog
.
near
=
fogNear
;
scene
.
fog
.
far
=
fogFar
;
signals
.
fogColorChanged
.
add
(
function
(
fogColor
)
{
}
else
if
(
scene
.
fog
instanceof
THREE
.
FogExp2
)
{
oldFogColor
=
fogColor
;
scene
.
fog
.
color
.
setHex
(
fogColor
);
scene
.
fog
.
density
=
fogDensity
;
updateFog
(
scene
);
}
render
();
}
);
signals
.
fogParametersChanged
.
add
(
function
(
near
,
far
,
density
)
{
oldFogNear
=
near
;
oldFogFar
=
far
;
oldFogDensity
=
density
;
updateFog
(
scene
);
render
();
}
);
//
signals
.
windowResize
.
add
(
function
()
{
...
...
@@ -569,20 +558,6 @@ var Viewport = function ( editor ) {
//
function
updateFog
(
root
)
{
if
(
root
.
fog
)
{
root
.
fog
.
color
.
setHex
(
oldFogColor
);
if
(
root
.
fog
.
near
!==
undefined
)
root
.
fog
.
near
=
oldFogNear
;
if
(
root
.
fog
.
far
!==
undefined
)
root
.
fog
.
far
=
oldFogFar
;
if
(
root
.
fog
.
density
!==
undefined
)
root
.
fog
.
density
=
oldFogDensity
;
}
}
function
animate
()
{
requestAnimationFrame
(
animate
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录