Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
c5387612
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,发现更多精彩内容 >>
提交
c5387612
编写于
12月 03, 2012
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'bhouston/test-suite' into dev
上级
7d63a811
7c6a44ad
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
30 addition
and
11 deletion
+30
-11
src/core/Plane.js
src/core/Plane.js
+3
-4
src/core/Vector2.js
src/core/Vector2.js
+9
-0
src/core/Vector4.js
src/core/Vector4.js
+11
-0
test/core/Box2.js
test/core/Box2.js
+3
-3
test/core/Box3.js
test/core/Box3.js
+2
-2
test/core/Sphere.js
test/core/Sphere.js
+2
-2
未找到文件。
src/core/Plane.js
浏览文件 @
c5387612
...
...
@@ -39,8 +39,8 @@ THREE.Plane.prototype = {
setFromCoplanarPoints
:
function
(
a
,
b
,
c
)
{
var
normal
=
THREE
.
Plane
3
.
__v1
.
sub
(
b
,
a
).
cross
(
THREE
.
Plane
3
.
__v2
.
sub
(
c
,
a
)
);
var
normal
=
THREE
.
Plane
.
__v1
.
sub
(
b
,
a
).
cross
(
THREE
.
Plane
.
__v2
.
sub
(
c
,
a
)
);
// Q: should an error be thrown if normal is zero (e.g. degenerate plane)?
this
.
setFromNormalAndCoplanarPoint
(
normal
,
a
);
...
...
@@ -133,8 +133,7 @@ THREE.Plane.prototype = {
clone
:
function
()
{
return
new
THREE
.
Plane3
().
copy
(
this
);
return
new
THREE
.
Plane
().
copy
(
this
);
}
};
...
...
src/core/Vector2.js
浏览文件 @
c5387612
...
...
@@ -50,6 +50,15 @@ THREE.Vector2.prototype = {
},
addScalar
:
function
(
s
)
{
this
.
x
+=
s
;
this
.
y
+=
s
;
return
this
;
},
add
:
function
(
a
,
b
)
{
this
.
x
=
a
.
x
+
b
.
x
;
...
...
src/core/Vector4.js
浏览文件 @
c5387612
...
...
@@ -73,6 +73,17 @@ THREE.Vector4.prototype = {
},
addScalar
:
function
(
s
)
{
this
.
x
+=
s
;
this
.
y
+=
s
;
this
.
z
+=
s
;
this
.
w
+=
s
;
return
this
;
},
add
:
function
(
a
,
b
)
{
this
.
x
=
a
.
x
+
b
.
x
;
...
...
test/core/Box2.js
浏览文件 @
c5387612
/**
/**
* @author bhouston / http://exocortex.com
*/
...
...
@@ -107,7 +107,7 @@ test( "expandByScalar", function() {
ok
(
a
.
size
().
equals
(
zero
),
"
Passed!
"
);
a
.
expandByScalar
(
1
);
ok
(
a
.
size
().
equals
(
one
one
.
clone
().
multiplyScalar
(
2
)
),
"
Passed!
"
);
ok
(
a
.
size
().
equals
(
one
.
clone
().
multiplyScalar
(
2
)
),
"
Passed!
"
);
ok
(
a
.
center
().
equals
(
zero
),
"
Passed!
"
);
});
...
...
@@ -207,7 +207,7 @@ test( "isIntersection", function() {
ok
(
c
.
isIntersection
(
a
),
"
Passed!
"
);
ok
(
b
.
isIntersection
(
c
),
"
Passed!
"
);
b
.
translate
(
one
.
clone
().
translate
(
new
THREE
.
Vector2
(
2
,
2
)
)
);
b
.
translate
(
new
THREE
.
Vector2
(
2
,
2
)
);
ok
(
!
a
.
isIntersection
(
b
),
"
Passed!
"
);
ok
(
!
b
.
isIntersection
(
a
),
"
Passed!
"
);
ok
(
!
c
.
isIntersection
(
a
),
"
Passed!
"
);
...
...
test/core/Box3.js
浏览文件 @
c5387612
...
...
@@ -107,7 +107,7 @@ test( "expandByScalar", function() {
ok
(
a
.
size
().
equals
(
zero
),
"
Passed!
"
);
a
.
expandByScalar
(
1
);
ok
(
a
.
size
().
equals
(
one
one
.
clone
().
multiplyScalar
(
2
)
),
"
Passed!
"
);
ok
(
a
.
size
().
equals
(
one
.
clone
().
multiplyScalar
(
2
)
),
"
Passed!
"
);
ok
(
a
.
center
().
equals
(
zero
),
"
Passed!
"
);
});
...
...
@@ -207,7 +207,7 @@ test( "isIntersection", function() {
ok
(
c
.
isIntersection
(
a
),
"
Passed!
"
);
ok
(
b
.
isIntersection
(
c
),
"
Passed!
"
);
b
.
translate
(
one
.
clone
().
translate
(
new
THREE
.
Vector3
(
2
,
2
,
2
)
)
);
b
.
translate
(
new
THREE
.
Vector3
(
2
,
2
,
2
)
);
ok
(
!
a
.
isIntersection
(
b
),
"
Passed!
"
);
ok
(
!
b
.
isIntersection
(
a
),
"
Passed!
"
);
ok
(
!
c
.
isIntersection
(
a
),
"
Passed!
"
);
...
...
test/core/Sphere.js
浏览文件 @
c5387612
...
...
@@ -33,7 +33,7 @@ test( "set", function() {
ok
(
a
.
center
.
equals
(
zero
),
"
Passed!
"
);
ok
(
a
.
radius
==
0
,
"
Passed!
"
);
a
.
set
(
one
,
radius
)
a
.
set
(
one
,
1
)
ok
(
a
.
center
.
equals
(
one
),
"
Passed!
"
);
ok
(
a
.
radius
==
0
,
"
Passed!
"
);
ok
(
a
.
radius
==
1
,
"
Passed!
"
);
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录