Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
bc75eba7
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,发现更多精彩内容 >>
提交
bc75eba7
编写于
8月 20, 2014
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Saving panels collapsed state to localStorage.
上级
8dc709f2
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
78 addition
and
20 deletion
+78
-20
editor/js/Config.js
editor/js/Config.js
+16
-6
editor/js/Sidebar.Animation.js
editor/js/Sidebar.Animation.js
+6
-1
editor/js/Sidebar.Geometry.js
editor/js/Sidebar.Geometry.js
+6
-1
editor/js/Sidebar.Material.js
editor/js/Sidebar.Material.js
+6
-1
editor/js/Sidebar.Object3D.js
editor/js/Sidebar.Object3D.js
+6
-0
editor/js/Sidebar.Renderer.js
editor/js/Sidebar.Renderer.js
+6
-1
editor/js/Sidebar.Scene.js
editor/js/Sidebar.Scene.js
+6
-0
editor/js/Sidebar.Script.js
editor/js/Sidebar.Script.js
+6
-1
editor/js/Viewport.js
editor/js/Viewport.js
+3
-3
editor/js/libs/ui.js
editor/js/libs/ui.js
+17
-5
src/math/Quaternion.js
src/math/Quaternion.js
+0
-1
未找到文件。
editor/js/Config.js
浏览文件 @
bc75eba7
...
@@ -3,14 +3,24 @@ var Config = function () {
...
@@ -3,14 +3,24 @@ var Config = function () {
var
name
=
'
threejs-editor
'
;
var
name
=
'
threejs-editor
'
;
var
storage
=
{
var
storage
=
{
theme
:
'
css/light.css
'
,
'
theme
'
:
'
css/light.css
'
,
camera
:
{
'
camera/position
'
:
[
500
,
250
,
500
],
position
:
[
500
,
250
,
500
],
'
camera/target
'
:
[
0
,
0
,
0
],
target
:
[
0
,
0
,
0
]
}
'
ui/sidebar/animation/collapsed
'
:
true
,
'
ui/sidebar/geometry/collapsed
'
:
true
,
'
ui/sidebar/material/collapsed
'
:
true
,
'
ui/sidebar/object3d/collapsed
'
:
false
,
'
ui/sidebar/renderer/collapsed
'
:
true
,
'
ui/sidebar/scene/collapsed
'
:
false
,
'
ui/sidebar/script/collapsed
'
:
true
};
};
if
(
window
.
localStorage
[
name
]
!==
undefined
)
{
if
(
window
.
localStorage
[
name
]
===
undefined
)
{
window
.
localStorage
[
name
]
=
JSON
.
stringify
(
storage
);
}
else
{
var
data
=
JSON
.
parse
(
window
.
localStorage
[
name
]
);
var
data
=
JSON
.
parse
(
window
.
localStorage
[
name
]
);
...
...
editor/js/Sidebar.Animation.js
浏览文件 @
bc75eba7
...
@@ -6,7 +6,12 @@ Sidebar.Animation = function ( editor ) {
...
@@ -6,7 +6,12 @@ Sidebar.Animation = function ( editor ) {
var
possibleAnimations
=
{};
var
possibleAnimations
=
{};
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
true
);
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/animation/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/animation/collapsed
'
,
boolean
);
}
);
container
.
setDisplay
(
'
none
'
);
container
.
setDisplay
(
'
none
'
);
container
.
addStatic
(
new
UI
.
Text
(
'
Animation
'
).
setTextTransform
(
'
uppercase
'
)
);
container
.
addStatic
(
new
UI
.
Text
(
'
Animation
'
).
setTextTransform
(
'
uppercase
'
)
);
...
...
editor/js/Sidebar.Geometry.js
浏览文件 @
bc75eba7
...
@@ -3,7 +3,12 @@ Sidebar.Geometry = function ( editor ) {
...
@@ -3,7 +3,12 @@ Sidebar.Geometry = function ( editor ) {
var
signals
=
editor
.
signals
;
var
signals
=
editor
.
signals
;
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
true
);
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/geometry/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/geometry/collapsed
'
,
boolean
);
}
);
container
.
setDisplay
(
'
none
'
);
container
.
setDisplay
(
'
none
'
);
var
geometryType
=
new
UI
.
Text
().
setTextTransform
(
'
uppercase
'
);
var
geometryType
=
new
UI
.
Text
().
setTextTransform
(
'
uppercase
'
);
...
...
editor/js/Sidebar.Material.js
浏览文件 @
bc75eba7
...
@@ -21,7 +21,12 @@ Sidebar.Material = function ( editor ) {
...
@@ -21,7 +21,12 @@ Sidebar.Material = function ( editor ) {
};
};
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
true
);
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/material/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/material/collapsed
'
,
boolean
);
}
);
container
.
setDisplay
(
'
none
'
);
container
.
setDisplay
(
'
none
'
);
container
.
dom
.
classList
.
add
(
'
Material
'
);
container
.
dom
.
classList
.
add
(
'
Material
'
);
...
...
editor/js/Sidebar.Object3D.js
浏览文件 @
bc75eba7
...
@@ -3,6 +3,12 @@ Sidebar.Object3D = function ( editor ) {
...
@@ -3,6 +3,12 @@ Sidebar.Object3D = function ( editor ) {
var
signals
=
editor
.
signals
;
var
signals
=
editor
.
signals
;
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/object3d/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/object3d/collapsed
'
,
boolean
);
}
);
container
.
setDisplay
(
'
none
'
);
container
.
setDisplay
(
'
none
'
);
var
objectType
=
new
UI
.
Text
().
setTextTransform
(
'
uppercase
'
);
var
objectType
=
new
UI
.
Text
().
setTextTransform
(
'
uppercase
'
);
...
...
editor/js/Sidebar.Renderer.js
浏览文件 @
bc75eba7
...
@@ -14,7 +14,12 @@ Sidebar.Renderer = function ( editor ) {
...
@@ -14,7 +14,12 @@ Sidebar.Renderer = function ( editor ) {
};
};
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
true
);
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/renderer/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/renderer/collapsed
'
,
boolean
);
}
);
container
.
addStatic
(
new
UI
.
Text
(
'
RENDERER
'
)
);
container
.
addStatic
(
new
UI
.
Text
(
'
RENDERER
'
)
);
container
.
add
(
new
UI
.
Break
()
);
container
.
add
(
new
UI
.
Break
()
);
...
...
editor/js/Sidebar.Scene.js
浏览文件 @
bc75eba7
...
@@ -3,6 +3,12 @@ Sidebar.Scene = function ( editor ) {
...
@@ -3,6 +3,12 @@ Sidebar.Scene = function ( editor ) {
var
signals
=
editor
.
signals
;
var
signals
=
editor
.
signals
;
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/scene/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/scene/collapsed
'
,
boolean
);
}
);
container
.
addStatic
(
new
UI
.
Text
(
'
SCENE
'
)
);
container
.
addStatic
(
new
UI
.
Text
(
'
SCENE
'
)
);
container
.
add
(
new
UI
.
Break
()
);
container
.
add
(
new
UI
.
Break
()
);
...
...
editor/js/Sidebar.Script.js
浏览文件 @
bc75eba7
...
@@ -3,7 +3,12 @@ Sidebar.Script = function ( editor ) {
...
@@ -3,7 +3,12 @@ Sidebar.Script = function ( editor ) {
var
signals
=
editor
.
signals
;
var
signals
=
editor
.
signals
;
var
container
=
new
UI
.
CollapsiblePanel
();
var
container
=
new
UI
.
CollapsiblePanel
();
container
.
setCollapsed
(
true
);
container
.
setCollapsed
(
editor
.
config
.
getKey
(
'
ui/sidebar/script/collapsed
'
)
);
container
.
onCollapsedChange
(
function
(
boolean
)
{
editor
.
config
.
setKey
(
'
ui/sidebar/script/collapsed
'
,
boolean
);
}
);
container
.
setDisplay
(
'
none
'
);
container
.
setDisplay
(
'
none
'
);
container
.
addStatic
(
new
UI
.
Text
(
'
Script
'
).
setTextTransform
(
'
uppercase
'
)
);
container
.
addStatic
(
new
UI
.
Text
(
'
Script
'
).
setTextTransform
(
'
uppercase
'
)
);
...
...
editor/js/Viewport.js
浏览文件 @
bc75eba7
...
@@ -27,8 +27,8 @@ var Viewport = function ( editor ) {
...
@@ -27,8 +27,8 @@ var Viewport = function ( editor ) {
//
//
var
camera
=
new
THREE
.
PerspectiveCamera
(
50
,
1
,
1
,
5000
);
var
camera
=
new
THREE
.
PerspectiveCamera
(
50
,
1
,
1
,
5000
);
camera
.
position
.
fromArray
(
editor
.
config
.
getKey
(
'
camera
'
).
position
);
camera
.
position
.
fromArray
(
editor
.
config
.
getKey
(
'
camera
/position
'
)
);
camera
.
lookAt
(
new
THREE
.
Vector3
().
fromArray
(
editor
.
config
.
getKey
(
'
camera
'
).
target
)
);
camera
.
lookAt
(
new
THREE
.
Vector3
().
fromArray
(
editor
.
config
.
getKey
(
'
camera
/target
'
)
)
);
//
//
...
@@ -171,7 +171,7 @@ var Viewport = function ( editor ) {
...
@@ -171,7 +171,7 @@ var Viewport = function ( editor ) {
// otherwise controls.enabled doesn't work.
// otherwise controls.enabled doesn't work.
var
controls
=
new
THREE
.
EditorControls
(
camera
,
container
.
dom
);
var
controls
=
new
THREE
.
EditorControls
(
camera
,
container
.
dom
);
controls
.
center
.
fromArray
(
editor
.
config
.
getKey
(
'
camera
'
).
target
)
controls
.
center
.
fromArray
(
editor
.
config
.
getKey
(
'
camera
/target
'
)
)
controls
.
addEventListener
(
'
change
'
,
function
()
{
controls
.
addEventListener
(
'
change
'
,
function
()
{
transformControls
.
update
();
transformControls
.
update
();
...
...
editor/js/libs/ui.js
浏览文件 @
bc75eba7
...
@@ -269,19 +269,31 @@ UI.CollapsiblePanel.prototype.expand = function() {
...
@@ -269,19 +269,31 @@ UI.CollapsiblePanel.prototype.expand = function() {
};
};
UI
.
CollapsiblePanel
.
prototype
.
setCollapsed
=
function
(
setCollapsed
)
{
UI
.
CollapsiblePanel
.
prototype
.
setCollapsed
=
function
(
boolean
)
{
if
(
setCollapsed
)
{
if
(
boolean
)
{
this
.
dom
.
classList
.
add
(
'
collapsed
'
);
this
.
dom
.
classList
.
add
(
'
collapsed
'
);
}
else
{
}
else
{
this
.
dom
.
classList
.
remove
(
'
collapsed
'
);
this
.
dom
.
classList
.
remove
(
'
collapsed
'
);
}
}
this
.
isCollapsed
=
setCollapsed
;
this
.
isCollapsed
=
boolean
;
if
(
this
.
onCollapsedChangeCallback
!==
undefined
)
{
this
.
onCollapsedChangeCallback
(
boolean
);
}
};
UI
.
CollapsiblePanel
.
prototype
.
onCollapsedChange
=
function
(
callback
)
{
this
.
onCollapsedChangeCallback
=
callback
;
};
};
...
...
src/math/Quaternion.js
浏览文件 @
bc75eba7
...
@@ -400,7 +400,6 @@ THREE.Quaternion.prototype = {
...
@@ -400,7 +400,6 @@ THREE.Quaternion.prototype = {
slerp
:
function
(
qb
,
t
)
{
slerp
:
function
(
qb
,
t
)
{
if
(
t
===
0
)
return
this
;
if
(
t
===
0
)
return
this
;
if
(
t
===
1
)
return
this
.
copy
(
qb
);
if
(
t
===
1
)
return
this
.
copy
(
qb
);
var
x
=
this
.
_x
,
y
=
this
.
_y
,
z
=
this
.
_z
,
w
=
this
.
_w
;
var
x
=
this
.
_x
,
y
=
this
.
_y
,
z
=
this
.
_z
,
w
=
this
.
_w
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录