Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
aa6c39de
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,发现更多精彩内容 >>
提交
aa6c39de
编写于
1月 08, 2017
作者:
T
Takahiro
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into UpdateGLTFLoader
上级
d22e4720
87a8f52f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
84 addition
and
80 deletion
+84
-80
docs/api/extras/core/ShapePath.html
docs/api/extras/core/ShapePath.html
+1
-1
editor/js/Script.js
editor/js/Script.js
+3
-2
editor/js/commands/SetScriptValueCommand.js
editor/js/commands/SetScriptValueCommand.js
+8
-3
examples/js/CurveExtras.js
examples/js/CurveExtras.js
+10
-10
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+18
-41
examples/webgl_geometry_text_earcut.html
examples/webgl_geometry_text_earcut.html
+44
-23
未找到文件。
docs/api/extras/core/ShapePath.html
浏览文件 @
aa6c39de
...
...
@@ -86,6 +86,6 @@
<h2>
Source
</h2>
[link:https://github.com/mrdoob/three.js/blob/master/src/
[path].js src/[path]
.js]
[link:https://github.com/mrdoob/three.js/blob/master/src/
extras/core/Path.js src/extras/core/Path
.js]
</body>
</html>
editor/js/Script.js
浏览文件 @
aa6c39de
...
...
@@ -84,7 +84,7 @@ var Script = function ( editor ) {
if
(
value
!==
currentScript
.
source
)
{
editor
.
execute
(
new
SetScriptValueCommand
(
currentObject
,
currentScript
,
'
source
'
,
value
,
codemirror
.
getCursor
()
)
);
editor
.
execute
(
new
SetScriptValueCommand
(
currentObject
,
currentScript
,
'
source
'
,
value
,
codemirror
.
getCursor
()
,
codemirror
.
getScrollInfo
()
)
);
}
return
;
...
...
@@ -422,7 +422,7 @@ var Script = function ( editor ) {
}
);
signals
.
refreshScriptEditor
.
add
(
function
(
object
,
script
,
cursorPosition
)
{
signals
.
refreshScriptEditor
.
add
(
function
(
object
,
script
,
cursorPosition
,
scrollInfo
)
{
if
(
currentScript
!==
script
)
return
;
...
...
@@ -435,6 +435,7 @@ var Script = function ( editor ) {
if
(
cursorPosition
!==
undefined
)
{
codemirror
.
setCursor
(
cursorPosition
);
codemirror
.
scrollTo
(
scrollInfo
.
left
,
scrollInfo
.
top
);
}
codemirror
.
setHistory
(
history
);
// setting the history to previous state
...
...
editor/js/commands/SetScriptValueCommand.js
浏览文件 @
aa6c39de
...
...
@@ -9,10 +9,11 @@
* @param attributeName string
* @param newValue string, object
* @param cursorPosition javascript object with format {line: 2, ch: 3}
* @param scrollInfo javascript object with values {left, top, width, height, clientWidth, clientHeight}
* @constructor
*/
var
SetScriptValueCommand
=
function
(
object
,
script
,
attributeName
,
newValue
,
cursorPosition
)
{
var
SetScriptValueCommand
=
function
(
object
,
script
,
attributeName
,
newValue
,
cursorPosition
,
scrollInfo
)
{
Command
.
call
(
this
);
...
...
@@ -27,6 +28,7 @@ var SetScriptValueCommand = function ( object, script, attributeName, newValue,
this
.
oldValue
=
(
script
!==
undefined
)
?
script
[
this
.
attributeName
]
:
undefined
;
this
.
newValue
=
newValue
;
this
.
cursorPosition
=
cursorPosition
;
this
.
scrollInfo
=
scrollInfo
;
};
...
...
@@ -37,7 +39,7 @@ SetScriptValueCommand.prototype = {
this
.
script
[
this
.
attributeName
]
=
this
.
newValue
;
this
.
editor
.
signals
.
scriptChanged
.
dispatch
();
this
.
editor
.
signals
.
refreshScriptEditor
.
dispatch
(
this
.
object
,
this
.
script
,
this
.
cursorPosition
);
this
.
editor
.
signals
.
refreshScriptEditor
.
dispatch
(
this
.
object
,
this
.
script
,
this
.
cursorPosition
,
this
.
scrollInfo
);
},
...
...
@@ -46,13 +48,14 @@ SetScriptValueCommand.prototype = {
this
.
script
[
this
.
attributeName
]
=
this
.
oldValue
;
this
.
editor
.
signals
.
scriptChanged
.
dispatch
();
this
.
editor
.
signals
.
refreshScriptEditor
.
dispatch
(
this
.
object
,
this
.
script
,
this
.
cursorPosition
);
this
.
editor
.
signals
.
refreshScriptEditor
.
dispatch
(
this
.
object
,
this
.
script
,
this
.
cursorPosition
,
this
.
scrollInfo
);
},
update
:
function
(
cmd
)
{
this
.
cursorPosition
=
cmd
.
cursorPosition
;
this
.
scrollInfo
=
cmd
.
scrollInfo
;
this
.
newValue
=
cmd
.
newValue
;
},
...
...
@@ -67,6 +70,7 @@ SetScriptValueCommand.prototype = {
output
.
oldValue
=
this
.
oldValue
;
output
.
newValue
=
this
.
newValue
;
output
.
cursorPosition
=
this
.
cursorPosition
;
output
.
scrollInfo
=
this
.
scrollInfo
;
return
output
;
...
...
@@ -82,6 +86,7 @@ SetScriptValueCommand.prototype = {
this
.
object
=
this
.
editor
.
objectByUuid
(
json
.
objectUuid
);
this
.
script
=
this
.
editor
.
scripts
[
json
.
objectUuid
][
json
.
index
];
this
.
cursorPosition
=
json
.
cursorPosition
;
this
.
scrollInfo
=
json
.
scrollInfo
;
}
...
...
examples/js/CurveExtras.js
浏览文件 @
aa6c39de
...
...
@@ -53,7 +53,7 @@
return
new
THREE
.
Vector3
(
x
,
y
,
z
).
multiplyScalar
(
this
.
scale
);
}
}
;
// Viviani's Curve
...
...
@@ -129,7 +129,7 @@
this
.
scale
=
(
s
===
undefined
)
?
10
:
s
;
}
;
}
TrefoilKnot
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
TrefoilKnot
.
prototype
.
constructor
=
TrefoilKnot
;
...
...
@@ -152,7 +152,7 @@
this
.
scale
=
(
s
===
undefined
)
?
10
:
s
;
}
;
}
TorusKnot
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
TorusKnot
.
prototype
.
constructor
=
TorusKnot
;
...
...
@@ -178,7 +178,7 @@
this
.
scale
=
(
s
===
undefined
)
?
10
:
s
;
}
;
}
CinquefoilKnot
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
CinquefoilKnot
.
prototype
.
constructor
=
CinquefoilKnot
;
...
...
@@ -204,7 +204,7 @@
this
.
scale
=
(
s
===
undefined
)
?
10
:
s
;
}
;
}
TrefoilPolynomialKnot
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
TrefoilPolynomialKnot
.
prototype
.
constructor
=
TrefoilPolynomialKnot
;
...
...
@@ -234,7 +234,7 @@
this
.
scale
=
(
s
===
undefined
)
?
1
:
s
;
}
;
}
FigureEightPolynomialKnot
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
FigureEightPolynomialKnot
.
prototype
.
constructor
=
FigureEightPolynomialKnot
;
...
...
@@ -257,7 +257,7 @@
this
.
scale
=
(
s
===
undefined
)
?
40
:
s
;
}
;
}
DecoratedTorusKnot4a
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
DecoratedTorusKnot4a
.
prototype
.
constructor
=
DecoratedTorusKnot4a
;
...
...
@@ -280,7 +280,7 @@
this
.
scale
=
(
s
===
undefined
)
?
40
:
s
;
}
;
}
DecoratedTorusKnot4b
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
DecoratedTorusKnot4b
.
prototype
.
constructor
=
DecoratedTorusKnot4b
;
...
...
@@ -303,7 +303,7 @@
this
.
scale
=
(
s
===
undefined
)
?
40
:
s
;
}
;
}
DecoratedTorusKnot5a
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
DecoratedTorusKnot5a
.
prototype
.
constructor
=
DecoratedTorusKnot5a
;
...
...
@@ -326,7 +326,7 @@
this
.
scale
=
(
s
===
undefined
)
?
40
:
s
;
}
;
}
DecoratedTorusKnot5c
.
prototype
=
Object
.
create
(
THREE
.
Curve
.
prototype
);
DecoratedTorusKnot5c
.
prototype
.
constructor
=
DecoratedTorusKnot5c
;
...
...
examples/js/loaders/GLTFLoader.js
浏览文件 @
aa6c39de
...
...
@@ -255,36 +255,6 @@ THREE.GLTFLoader = ( function () {
};
function
createAnimation
(
name
,
interps
)
{
var
tracks
=
[];
for
(
var
i
=
0
,
len
=
interps
.
length
;
i
<
len
;
i
++
)
{
var
interp
=
interps
[
i
];
// KeyframeTrack.optimize() will modify given 'times' and 'values'
// buffers before creating a truncated copy to keep. Because buffers may
// be reused by other tracks, make copies here.
interp
.
times
=
THREE
.
AnimationUtils
.
arraySlice
(
interp
.
times
,
0
);
interp
.
values
=
THREE
.
AnimationUtils
.
arraySlice
(
interp
.
values
,
0
);
interp
.
target
.
updateMatrix
();
interp
.
target
.
matrixAutoUpdate
=
true
;
tracks
.
push
(
new
THREE
.
KeyframeTrack
(
interp
.
name
,
interp
.
times
,
interp
.
values
,
interp
.
type
)
);
}
return
new
THREE
.
AnimationClip
(
name
,
undefined
,
tracks
);
}
/*********************************/
/********** INTERNALS ************/
/*********************************/
...
...
@@ -1551,7 +1521,7 @@ THREE.GLTFLoader = ( function () {
return
_each
(
json
.
animations
,
function
(
animation
,
animationId
)
{
var
interp
s
=
[];
var
track
s
=
[];
for
(
var
channelId
in
animation
.
channels
)
{
...
...
@@ -1572,17 +1542,24 @@ THREE.GLTFLoader = ( function () {
if
(
node
)
{
var
targetName
=
node
.
name
?
node
.
name
:
node
.
uuid
;
node
.
updateMatrix
();
node
.
matrixAutoUpdate
=
true
;
var
TypedKeyframeTrack
=
PATH_PROPERTIES
[
target
.
path
]
===
PATH_PROPERTIES
.
rotation
?
THREE
.
QuaternionKeyframeTrack
:
THREE
.
VectorKeyframeTrack
;
var
interp
=
{
times
:
inputAccessor
.
array
,
values
:
outputAccessor
.
array
,
target
:
node
,
type
:
INTERPOLATION
[
sampler
.
interpolation
],
name
:
targetName
+
'
.
'
+
PATH_PROPERTIES
[
target
.
path
]
};
var
targetName
=
node
.
name
?
node
.
name
:
node
.
uuid
;
interps
.
push
(
interp
);
// KeyframeTrack.optimize() will modify given 'times' and 'values'
// buffers before creating a truncated copy to keep. Because buffers may
// be reused by other tracks, make copies here.
tracks
.
push
(
new
TypedKeyframeTrack
(
targetName
+
'
.
'
+
PATH_PROPERTIES
[
target
.
path
],
THREE
.
AnimationUtils
.
arraySlice
(
inputAccessor
.
array
,
0
),
THREE
.
AnimationUtils
.
arraySlice
(
outputAccessor
.
array
,
0
),
INTERPOLATION
[
sampler
.
interpolation
]
)
);
}
...
...
@@ -1590,7 +1567,7 @@ THREE.GLTFLoader = ( function () {
}
return
createAnimation
(
"
animation_
"
+
animationId
,
interp
s
);
return
new
THREE
.
AnimationClip
(
"
animation_
"
+
animationId
,
undefined
,
track
s
);
}
);
...
...
examples/webgl_geometry_text_earcut.html
浏览文件 @
aa6c39de
...
...
@@ -47,38 +47,59 @@
<!-- replace built-in triangulation with Earcut -->
<script
src=
"js/libs/earcut.js"
></script>
<script>
function
addContour
(
vertices
,
contour
)
{
for
(
var
i
=
0
;
i
<
contour
.
length
;
i
++
)
{
vertices
.
push
(
contour
[
i
].
x
);
vertices
.
push
(
contour
[
i
].
y
);
}
}
THREE
.
ShapeUtils
.
triangulateShape
=
function
(
contour
,
holes
)
{
var
vertices
=
[];
addContour
(
vertices
,
contour
);
function
removeDupEndPts
(
points
)
{
var
l
=
points
.
length
;
if
(
l
>
2
&&
points
[
l
-
1
].
equals
(
points
[
0
]
)
)
{
points
.
pop
();
}
}
function
addContour
(
vertices
,
contour
)
{
var
holeIndices
=
[];
var
holeIndex
=
contour
.
length
;
for
(
var
i
=
0
;
i
<
contour
.
length
;
i
++
)
{
for
(
i
=
0
;
i
<
holes
.
length
;
i
++
)
{
holeIndices
.
push
(
holeIndex
);
holeIndex
+=
holes
[
i
].
length
;
addContour
(
vertices
,
holes
[
i
]
);
}
vertices
.
push
(
contour
[
i
].
x
);
vertices
.
push
(
contour
[
i
].
y
);
var
result
=
earcut
(
vertices
,
holeIndices
,
2
);
}
}
removeDupEndPts
(
contour
);
holes
.
forEach
(
removeDupEndPts
);
var
vertices
=
[];
addContour
(
vertices
,
contour
);
var
holeIndices
=
[];
var
holeIndex
=
contour
.
length
;
for
(
i
=
0
;
i
<
holes
.
length
;
i
++
)
{
holeIndices
.
push
(
holeIndex
);
holeIndex
+=
holes
[
i
].
length
;
addContour
(
vertices
,
holes
[
i
]
);
}
var
result
=
earcut
(
vertices
,
holeIndices
,
2
);
var
grouped
=
[];
for
(
var
i
=
0
;
i
<
result
.
length
;
i
+=
3
)
{
grouped
.
push
(
result
.
slice
(
i
,
i
+
3
)
);
}
return
grouped
;
var
grouped
=
[];
for
(
var
i
=
0
;
i
<
result
.
length
;
i
+=
3
)
{
grouped
.
push
(
result
.
slice
(
i
,
i
+
3
)
);
}
return
grouped
;
};
</script>
<script>
if
(
!
Detector
.
webgl
)
Detector
.
addGetWebGLMessage
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录