Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
5ee6e857
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,发现更多精彩内容 >>
未验证
提交
5ee6e857
编写于
4月 21, 2020
作者:
M
Mr.doob
提交者:
GitHub
4月 21, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19177 from Mugen87/dev49
TransformControls: Fix arguments of intersectObjectWithRay().
上级
d5894a31
06645b2c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
12 deletion
+12
-12
examples/js/controls/TransformControls.js
examples/js/controls/TransformControls.js
+7
-7
examples/jsm/controls/TransformControls.js
examples/jsm/controls/TransformControls.js
+5
-5
未找到文件。
examples/js/controls/TransformControls.js
浏览文件 @
5ee6e857
...
...
@@ -52,15 +52,15 @@ THREE.TransformControls = function ( camera, domElement ) {
var
raycaster
=
new
THREE
.
Raycaster
();
var
intersectObjectWithRay
=
function
(
object
,
raycaster
,
includeInvisible
)
{
var
intersectObjectWithRay
=
function
(
object
,
raycaster
,
includeInvisible
)
{
var
allIntersections
=
raycaster
.
intersectObject
(
object
,
true
);
var
intersection
=
false
;
for
(
var
i
=
allIntersections
.
length
;
i
--
;
)
{
for
(
var
i
=
allIntersections
.
length
;
i
--
;
)
{
if
(
allIntersections
[
i
].
object
.
visible
||
includeInvisible
)
{
if
(
allIntersections
[
i
].
object
.
visible
||
includeInvisible
)
{
intersection
=
allIntersections
[
i
];
...
...
@@ -72,7 +72,7 @@ THREE.TransformControls = function ( camera, domElement ) {
return
intersection
;
}
}
;
var
_tempVector
=
new
THREE
.
Vector3
();
var
_tempVector2
=
new
THREE
.
Vector3
();
...
...
@@ -283,7 +283,7 @@ THREE.TransformControls = function ( camera, domElement ) {
raycaster
.
setFromCamera
(
pointer
,
this
.
camera
);
var
planeIntersect
=
intersectObjectWithRay
(
[
_plane
]
,
raycaster
,
true
);
var
planeIntersect
=
intersectObjectWithRay
(
_plane
,
raycaster
,
true
);
if
(
planeIntersect
)
{
...
...
@@ -351,9 +351,9 @@ THREE.TransformControls = function ( camera, domElement ) {
raycaster
.
setFromCamera
(
pointer
,
this
.
camera
);
var
planeIntersect
=
intersectObjectWithRay
(
[
_plane
]
,
raycaster
,
true
);
var
planeIntersect
=
intersectObjectWithRay
(
_plane
,
raycaster
,
true
);
if
(
!
planeIntersect
)
return
;
if
(
!
planeIntersect
)
return
;
pointEnd
.
copy
(
planeIntersect
.
point
).
sub
(
worldPositionStart
);
...
...
examples/jsm/controls/TransformControls.js
浏览文件 @
5ee6e857
...
...
@@ -75,15 +75,15 @@ var TransformControls = function ( camera, domElement ) {
var
raycaster
=
new
Raycaster
();
var
intersectObjectWithRay
=
function
(
object
,
raycaster
,
includeInvisible
)
{
var
intersectObjectWithRay
=
function
(
object
,
raycaster
,
includeInvisible
)
{
var
allIntersections
=
raycaster
.
intersectObject
(
object
,
true
);
var
intersection
=
false
;
for
(
var
i
=
allIntersections
.
length
;
i
--
;
)
{
for
(
var
i
=
allIntersections
.
length
;
i
--
;
)
{
if
(
allIntersections
[
i
].
object
.
visible
||
includeInvisible
)
{
if
(
allIntersections
[
i
].
object
.
visible
||
includeInvisible
)
{
intersection
=
allIntersections
[
i
];
...
...
@@ -95,7 +95,7 @@ var TransformControls = function ( camera, domElement ) {
return
intersection
;
}
}
;
var
_tempVector
=
new
Vector3
();
var
_tempVector2
=
new
Vector3
();
...
...
@@ -376,7 +376,7 @@ var TransformControls = function ( camera, domElement ) {
var
planeIntersect
=
intersectObjectWithRay
(
_plane
,
raycaster
,
true
);
if
(
!
planeIntersect
)
return
;
if
(
!
planeIntersect
)
return
;
pointEnd
.
copy
(
planeIntersect
.
point
).
sub
(
worldPositionStart
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录