Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
3d808e4e
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,发现更多精彩内容 >>
提交
3d808e4e
编写于
3月 29, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/mrdoob/three.js
into dev
上级
54ada559
9d77e405
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
13 deletion
+16
-13
examples/js/effects/AnaglyphEffect.js
examples/js/effects/AnaglyphEffect.js
+5
-4
src/math/Matrix3.js
src/math/Matrix3.js
+1
-1
test/unit/math/Matrix3.js
test/unit/math/Matrix3.js
+10
-8
未找到文件。
examples/js/effects/AnaglyphEffect.js
浏览文件 @
3d808e4e
...
...
@@ -10,22 +10,23 @@ THREE.AnaglyphEffect = function ( renderer, width, height ) {
// Matrices generated with angler.js https://github.com/tschw/angler.js/
// (in column-major element order, as accepted by WebGL)
this
.
colorMatrixLeft
=
new
THREE
.
Matrix3
().
set
(
this
.
colorMatrixLeft
=
new
THREE
.
Matrix3
().
fromArray
(
[
1.0671679973602295
,
-
0.0016435992438346148
,
0.0001777536963345483
,
// r out
-
0.028107794001698494
,
-
0.00019593400065787137
,
-
0.0002875397040043026
,
// g out
-
0.04279090091586113
,
0.000015809757314855233
,
-
0.00024287120322696865
// b out
);
]
);
// red green blue in
this
.
colorMatrixRight
=
new
THREE
.
Matrix3
().
set
(
this
.
colorMatrixRight
=
new
THREE
.
Matrix3
().
fromArray
(
[
-
0.0355340838432312
,
-
0.06440307199954987
,
0.018319187685847282
,
// r out
-
0.10269022732973099
,
0.8079727292060852
,
-
0.04835830628871918
,
// g out
0.0001224992738571018
,
-
0.009558862075209618
,
0.567823588848114
// b out
);
]
);
var
_camera
=
new
THREE
.
OrthographicCamera
(
-
1
,
1
,
1
,
-
1
,
0
,
1
);
...
...
src/math/Matrix3.js
浏览文件 @
3d808e4e
...
...
@@ -171,7 +171,7 @@ THREE.Matrix3.prototype = {
if
(
matrix
instanceof
THREE
.
Matrix4
)
{
console
.
warn
(
"
THREE.Matrix3.getInverse no longer takes a Matrix4 argument.
"
);
console
.
error
(
"
THREE.Matrix3.getInverse no longer takes a Matrix4 argument.
"
);
}
...
...
test/unit/math/Matrix3.js
浏览文件 @
3d808e4e
...
...
@@ -142,14 +142,14 @@ test( "determinant", function() {
test
(
"
getInverse
"
,
function
()
{
var
identity
=
new
THREE
.
Matrix4
();
var
a
=
new
THREE
.
Matrix4
();
var
identity
=
new
THREE
.
Matrix3
();
var
identity4
=
new
THREE
.
Matrix4
();
var
a
=
new
THREE
.
Matrix3
();
var
b
=
new
THREE
.
Matrix3
().
set
(
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
);
var
c
=
new
THREE
.
Matrix
4
().
set
(
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
);
var
c
=
new
THREE
.
Matrix
3
().
set
(
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
);
ok
(
!
matrixEquals3
(
a
,
b
),
"
Passed!
"
);
b
.
getInverse
(
a
,
false
);
ok
(
matrixEquals3
(
b
,
new
THREE
.
Matrix3
()
),
"
Passed!
"
);
ok
(
matrixEquals3
(
a
,
identity
),
"
Passed!
"
);
try
{
b
.
getInverse
(
c
,
true
);
...
...
@@ -172,17 +172,19 @@ test( "getInverse", function() {
for
(
var
i
=
0
,
il
=
testMatrices
.
length
;
i
<
il
;
i
++
)
{
var
m
=
testMatrices
[
i
];
var
mInverse3
=
new
THREE
.
Matrix3
().
getInverse
(
m
);
a
.
setFromMatrix4
(
m
);
var
mInverse3
=
b
.
getInverse
(
a
);
var
mInverse
=
toMatrix4
(
mInverse3
);
// the determinant of the inverse should be the reciprocal
ok
(
Math
.
abs
(
m
.
determinant
()
*
mInverse3
.
determinant
()
-
1
)
<
0.0001
,
"
Passed!
"
);
ok
(
Math
.
abs
(
a
.
determinant
()
*
mInverse3
.
determinant
()
-
1
)
<
0.0001
,
"
Passed!
"
);
ok
(
Math
.
abs
(
m
.
determinant
()
*
mInverse
.
determinant
()
-
1
)
<
0.0001
,
"
Passed!
"
);
var
mProduct
=
new
THREE
.
Matrix4
().
multiplyMatrices
(
m
,
mInverse
);
ok
(
Math
.
abs
(
mProduct
.
determinant
()
-
1
)
<
0.0001
,
"
Passed!
"
);
ok
(
matrixEquals3
(
mProduct
,
identity
),
"
Passed!
"
);
ok
(
matrixEquals3
(
mProduct
,
identity
4
),
"
Passed!
"
);
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录