Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
e865ad72
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,发现更多精彩内容 >>
提交
e865ad72
编写于
3月 03, 2018
作者:
W
WestLangley
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set .quaternion instead of .rotation
上级
4eb5068b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
8 addition
and
10 deletion
+8
-10
examples/js/loaders/ColladaLoader.js
examples/js/loaders/ColladaLoader.js
+1
-1
examples/js/loaders/FBXLoader.js
examples/js/loaders/FBXLoader.js
+2
-4
examples/js/loaders/GCodeLoader.js
examples/js/loaders/GCodeLoader.js
+1
-1
examples/js/loaders/PlayCanvasLoader.js
examples/js/loaders/PlayCanvasLoader.js
+1
-1
examples/js/loaders/sea3d/SEA3DLoader.js
examples/js/loaders/sea3d/SEA3DLoader.js
+1
-1
examples/js/loaders/sea3d/physics/SEA3DAmmoLoader.js
examples/js/loaders/sea3d/physics/SEA3DAmmoLoader.js
+2
-2
未找到文件。
examples/js/loaders/ColladaLoader.js
浏览文件 @
e865ad72
...
...
@@ -3607,7 +3607,7 @@ THREE.ColladaLoader.prototype = {
if
(
asset
.
upAxis
===
'
Z_UP
'
)
{
scene
.
rotation
.
x
=
-
Math
.
PI
/
2
;
scene
.
quaternion
.
setFromEuler
(
new
THREE
.
Euler
(
-
Math
.
PI
/
2
,
0
,
0
)
)
;
}
...
...
examples/js/loaders/FBXLoader.js
浏览文件 @
e865ad72
...
...
@@ -1989,7 +1989,7 @@
var
rotation
=
modelNode
.
Lcl_Rotation
.
value
.
map
(
THREE
.
Math
.
degToRad
);
rotation
.
push
(
'
ZYX
'
);
model
.
rotation
.
fromArray
(
rotation
);
model
.
quaternion
.
setFromEuler
(
new
THREE
.
Euler
().
fromArray
(
rotation
)
);
}
...
...
@@ -2007,9 +2007,7 @@
var
preRotations
=
new
THREE
.
Euler
().
fromArray
(
array
);
preRotations
=
new
THREE
.
Quaternion
().
setFromEuler
(
preRotations
);
var
currentRotation
=
new
THREE
.
Quaternion
().
setFromEuler
(
model
.
rotation
);
preRotations
.
multiply
(
currentRotation
);
model
.
rotation
.
setFromQuaternion
(
preRotations
,
'
ZYX
'
);
model
.
quaternion
.
premultiply
(
preRotations
);
}
...
...
examples/js/loaders/GCodeLoader.js
浏览文件 @
e865ad72
...
...
@@ -210,7 +210,7 @@ THREE.GCodeLoader.prototype.parse = function ( data ) {
}
object
.
rotation
.
set
(
-
Math
.
PI
/
2
,
0
,
0
);
object
.
quaternion
.
setFromEuler
(
new
THREE
.
Euler
(
-
Math
.
PI
/
2
,
0
,
0
)
);
return
object
;
...
...
examples/js/loaders/PlayCanvasLoader.js
浏览文件 @
e865ad72
...
...
@@ -140,7 +140,7 @@ THREE.PlayCanvasLoader.prototype = {
object
.
name
=
data
.
name
;
object
.
position
.
fromArray
(
data
.
position
);
object
.
rotation
.
fromArray
(
data
.
rotation
);
object
.
quaternion
.
setFromEuler
(
new
THREE
.
Euler
().
fromArray
(
data
.
rotation
)
);
object
.
scale
.
fromArray
(
data
.
scale
);
data
.
_object
=
object
;
...
...
examples/js/loaders/sea3d/SEA3DLoader.js
浏览文件 @
e865ad72
...
...
@@ -1695,7 +1695,7 @@ THREE.SEA3D.prototype.updateTransform = function ( obj3d, sea ) {
// ignore rotation scale
obj3d
.
rotat
ion
.
setFromRotationMatrix
(
THREE
.
SEA3D
.
identityMatrixScale
(
mtx
)
);
obj3d
.
quatern
ion
.
setFromRotationMatrix
(
THREE
.
SEA3D
.
identityMatrixScale
(
mtx
)
);
// optimize if is static
...
...
examples/js/loaders/sea3d/physics/SEA3DAmmoLoader.js
浏览文件 @
e865ad72
...
...
@@ -441,7 +441,7 @@ THREE.SEA3D.Domain.prototype.applyContainerTransform = function () {
var
matrix
=
this
.
container
.
matrix
.
clone
();
this
.
container
.
position
.
set
(
0
,
0
,
0
);
this
.
container
.
rotation
.
set
(
0
,
0
,
0
);
this
.
container
.
quaternion
.
set
(
0
,
0
,
0
,
1
);
this
.
container
.
scale
.
set
(
1
,
1
,
1
);
this
.
applyTransform
(
matrix
);
...
...
@@ -491,7 +491,7 @@ THREE.SEA3D.Domain.prototype.applyTransform = function ( matrix ) {
// ignore rotation scale
mtx
.
scale
(
vec
.
set
(
1
/
obj3d
.
scale
.
x
,
1
/
obj3d
.
scale
.
y
,
1
/
obj3d
.
scale
.
z
)
);
obj3d
.
rotat
ion
.
setFromRotationMatrix
(
mtx
);
obj3d
.
quatern
ion
.
setFromRotationMatrix
(
mtx
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录