Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
9111feba
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,发现更多精彩内容 >>
提交
9111feba
编写于
12月 14, 2016
作者:
M
Mr.doob
提交者:
GitHub
12月 14, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10303 from Mugen87/dev
Box3: Refactored .setFromObject()
上级
64a8a048
87f0b391
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
37 deletion
+28
-37
src/math/Box3.js
src/math/Box3.js
+5
-20
src/math/Vector2.js
src/math/Vector2.js
+7
-5
src/math/Vector3.js
src/math/Vector3.js
+7
-5
src/math/Vector4.js
src/math/Vector4.js
+9
-7
未找到文件。
src/math/Box3.js
浏览文件 @
9111feba
...
...
@@ -138,6 +138,8 @@ Box3.prototype = {
object
.
traverse
(
function
(
node
)
{
var
i
,
l
;
var
geometry
=
node
.
geometry
;
if
(
geometry
!==
undefined
)
{
...
...
@@ -146,7 +148,7 @@ Box3.prototype = {
var
vertices
=
geometry
.
vertices
;
for
(
var
i
=
0
,
il
=
vertices
.
length
;
i
<
i
l
;
i
++
)
{
for
(
i
=
0
,
l
=
vertices
.
length
;
i
<
l
;
i
++
)
{
v1
.
copy
(
vertices
[
i
]
);
v1
.
applyMatrix4
(
node
.
matrixWorld
);
...
...
@@ -161,26 +163,9 @@ Box3.prototype = {
if
(
attribute
!==
undefined
)
{
var
array
,
offset
,
stride
;
if
(
attribute
.
isInterleavedBufferAttribute
)
{
array
=
attribute
.
data
.
array
;
offset
=
attribute
.
offset
;
stride
=
attribute
.
data
.
stride
;
}
else
{
array
=
attribute
.
array
;
offset
=
0
;
stride
=
3
;
}
for
(
var
i
=
offset
,
il
=
array
.
length
;
i
<
il
;
i
+=
stride
)
{
for
(
i
=
0
,
l
=
attribute
.
count
;
i
<
l
;
i
++
)
{
v1
.
fromArray
(
array
,
i
);
v1
.
applyMatrix4
(
node
.
matrixWorld
);
v1
.
fromAttribute
(
attribute
,
i
).
applyMatrix4
(
node
.
matrixWorld
);
scope
.
expandByPoint
(
v1
);
...
...
src/math/Vector2.js
浏览文件 @
9111feba
...
...
@@ -87,7 +87,7 @@ Vector2.prototype = {
default
:
throw
new
Error
(
'
index is out of range:
'
+
index
);
}
return
this
;
},
...
...
@@ -455,12 +455,14 @@ Vector2.prototype = {
fromAttribute
:
function
(
attribute
,
index
,
offset
)
{
if
(
offset
===
undefined
)
offset
=
0
;
if
(
offset
!==
undefined
)
{
index
=
index
*
attribute
.
itemSize
+
offset
;
console
.
warn
(
'
THREE.Vector2: offset has been removed from .fromAttribute().
'
);
}
this
.
x
=
attribute
.
array
[
index
]
;
this
.
y
=
attribute
.
array
[
index
+
1
]
;
this
.
x
=
attribute
.
getX
(
index
)
;
this
.
y
=
attribute
.
getY
(
index
)
;
return
this
;
...
...
src/math/Vector3.js
浏览文件 @
9111feba
...
...
@@ -763,13 +763,15 @@ Vector3.prototype = {
fromAttribute
:
function
(
attribute
,
index
,
offset
)
{
if
(
offset
===
undefined
)
offset
=
0
;
if
(
offset
!==
undefined
)
{
console
.
warn
(
'
THREE.Vector3: offset has been removed from .fromAttribute().
'
);
index
=
index
*
attribute
.
itemSize
+
offset
;
}
this
.
x
=
attribute
.
array
[
index
]
;
this
.
y
=
attribute
.
array
[
index
+
1
]
;
this
.
z
=
attribute
.
array
[
index
+
2
]
;
this
.
x
=
attribute
.
getX
(
index
)
;
this
.
y
=
attribute
.
getY
(
index
)
;
this
.
z
=
attribute
.
getZ
(
index
)
;
return
this
;
...
...
src/math/Vector4.js
浏览文件 @
9111feba
...
...
@@ -86,7 +86,7 @@ Vector4.prototype = {
default
:
throw
new
Error
(
'
index is out of range:
'
+
index
);
}
return
this
;
},
...
...
@@ -613,14 +613,16 @@ Vector4.prototype = {
fromAttribute
:
function
(
attribute
,
index
,
offset
)
{
if
(
offset
===
undefined
)
offset
=
0
;
if
(
offset
!==
undefined
)
{
index
=
index
*
attribute
.
itemSize
+
offset
;
console
.
warn
(
'
THREE.Vector4: offset has been removed from .fromAttribute().
'
);
}
this
.
x
=
attribute
.
array
[
index
]
;
this
.
y
=
attribute
.
array
[
index
+
1
]
;
this
.
z
=
attribute
.
array
[
index
+
2
]
;
this
.
w
=
attribute
.
array
[
index
+
3
]
;
this
.
x
=
attribute
.
getX
(
index
)
;
this
.
y
=
attribute
.
getY
(
index
)
;
this
.
z
=
attribute
.
getZ
(
index
)
;
this
.
w
=
attribute
.
getW
(
index
)
;
return
this
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录