Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
270de916
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,体验更适合开发者的 AI 搜索 >>
提交
270de916
编写于
12月 24, 2019
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
WebXRManager: Dispatch connected/disconnected events and pass inputSource.
上级
a4d719b2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
58 addition
and
38 deletion
+58
-38
examples/jsm/webxr/ARButton.js
examples/jsm/webxr/ARButton.js
+0
-1
examples/jsm/webxr/VRButton.js
examples/jsm/webxr/VRButton.js
+0
-1
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+3
-3
src/renderers/webxr/WebXRManager.js
src/renderers/webxr/WebXRManager.js
+55
-33
未找到文件。
examples/jsm/webxr/ARButton.js
浏览文件 @
270de916
...
...
@@ -33,7 +33,6 @@ var ARButton = {
currentSession
.
removeEventListener
(
'
end
'
,
onSessionEnded
);
renderer
.
xr
.
setSession
(
null
);
button
.
textContent
=
'
START AR
'
;
currentSession
=
null
;
...
...
examples/jsm/webxr/VRButton.js
浏览文件 @
270de916
...
...
@@ -32,7 +32,6 @@ var VRButton = {
currentSession
.
removeEventListener
(
'
end
'
,
onSessionEnded
);
renderer
.
xr
.
setSession
(
null
);
button
.
textContent
=
'
ENTER VR
'
;
currentSession
=
null
;
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
270de916
...
...
@@ -382,7 +382,7 @@ function WebGLRenderer( parameters ) {
this
.
setSize
=
function
(
width
,
height
,
updateStyle
)
{
if
(
xr
.
isPresenting
()
)
{
if
(
xr
.
isPresenting
)
{
console
.
warn
(
'
THREE.WebGLRenderer: Can
\'
t change size while VR device is presenting.
'
);
return
;
...
...
@@ -1087,7 +1087,7 @@ function WebGLRenderer( parameters ) {
function
onAnimationFrame
(
time
)
{
if
(
xr
.
isPresenting
()
)
return
;
if
(
xr
.
isPresenting
)
return
;
if
(
onAnimationFrameCallback
)
onAnimationFrameCallback
(
time
);
}
...
...
@@ -1151,7 +1151,7 @@ function WebGLRenderer( parameters ) {
if
(
camera
.
parent
===
null
)
camera
.
updateMatrixWorld
();
if
(
xr
.
enabled
&&
xr
.
isPresenting
()
)
{
if
(
xr
.
enabled
&&
xr
.
isPresenting
)
{
camera
=
xr
.
getCamera
(
camera
);
...
...
src/renderers/webxr/WebXRManager.js
浏览文件 @
270de916
...
...
@@ -24,13 +24,7 @@ function WebXRManager( renderer, gl ) {
var
pose
=
null
;
var
controllers
=
[];
var
sortedInputSources
=
[];
function
isPresenting
()
{
return
session
!==
null
&&
referenceSpace
!==
null
;
}
var
inputSourcesMap
=
new
Map
();
//
...
...
@@ -50,6 +44,8 @@ function WebXRManager( renderer, gl ) {
this
.
enabled
=
false
;
this
.
isPresenting
=
false
;
this
.
getController
=
function
(
id
)
{
var
controller
=
controllers
[
id
];
...
...
@@ -72,13 +68,11 @@ function WebXRManager( renderer, gl ) {
function
onSessionEvent
(
event
)
{
for
(
var
i
=
0
;
i
<
controllers
.
length
;
i
++
)
{
var
controller
=
inputSourcesMap
.
get
(
event
.
inputSource
);
if
(
sortedInputSources
[
i
]
===
event
.
inputSource
)
{
if
(
controller
)
{
controllers
[
i
].
dispatchEvent
(
{
type
:
event
.
type
}
);
}
controller
.
dispatchEvent
(
{
type
:
event
.
type
}
);
}
...
...
@@ -86,12 +80,24 @@ function WebXRManager( renderer, gl ) {
function
onSessionEnd
()
{
inputSourcesMap
.
forEach
(
function
(
controller
,
inputSource
)
{
controller
.
dispatchEvent
(
{
type
:
'
disconnected
'
,
data
:
inputSource
}
);
}
);
inputSourcesMap
.
clear
();
//
renderer
.
setFramebuffer
(
null
);
renderer
.
setRenderTarget
(
renderer
.
getRenderTarget
()
);
// Hack #15830
animation
.
stop
();
scope
.
dispatchEvent
(
{
type
:
'
sessionend
'
}
);
scope
.
isPresenting
=
false
;
}
function
onRequestReferenceSpace
(
value
)
{
...
...
@@ -103,6 +109,8 @@ function WebXRManager( renderer, gl ) {
scope
.
dispatchEvent
(
{
type
:
'
sessionstart
'
}
);
scope
.
isPresenting
=
true
;
}
this
.
setFramebufferScaleFactor
=
function
(
/* value */
)
{
...
...
@@ -157,33 +165,52 @@ function WebXRManager( renderer, gl ) {
session
.
addEventListener
(
'
inputsourceschange
'
,
updateInputSources
);
updateInputSources
();
}
};
function
updateInputSources
()
{
function
updateInputSources
(
event
)
{
console
.
log
(
'
inputsourceschange
'
,
event
,
session
.
inputSources
);
var
inputSources
=
session
.
inputSources
;
// Assign inputSources to available controllers
for
(
var
i
=
0
;
i
<
controllers
.
length
;
i
++
)
{
sortedInputSources
[
i
]
=
findInputSource
(
i
);
inputSourcesMap
.
set
(
inputSources
[
i
],
controllers
[
i
]
);
}
}
// Notify disconnected
function
findInputSource
(
id
)
{
for
(
var
i
=
0
;
i
<
event
.
removed
.
length
;
i
++
)
{
var
inputSources
=
session
.
inputSources
;
var
inputSource
=
event
.
removed
[
i
];
var
controller
=
inputSourcesMap
.
get
(
inputSource
);
for
(
var
i
=
0
;
i
<
inputSources
.
length
;
i
++
)
{
if
(
controller
)
{
var
inputSource
=
inputSources
[
i
];
var
handedness
=
inputSource
.
handedness
;
controller
.
dispatchEvent
(
{
type
:
'
disconnected
'
,
data
:
inputSource
}
);
inputSourcesMap
.
delete
(
inputSource
);
}
}
// Notify connected
for
(
var
i
=
0
;
i
<
event
.
added
.
length
;
i
++
)
{
var
inputSource
=
event
.
added
[
i
];
var
controller
=
inputSourcesMap
.
get
(
inputSource
);
if
(
id
===
0
&&
(
handedness
===
'
none
'
||
handedness
===
'
right
'
)
)
return
inputSource
;
if
(
id
===
1
&&
(
handedness
===
'
left
'
)
)
return
inputSource
;
if
(
controller
)
{
controller
.
dispatchEvent
(
{
type
:
'
connected
'
,
data
:
inputSource
}
);
}
}
...
...
@@ -298,8 +325,6 @@ function WebXRManager( renderer, gl ) {
};
this
.
isPresenting
=
isPresenting
;
// Animation Loop
var
onAnimationFrameCallback
=
null
;
...
...
@@ -338,11 +363,13 @@ function WebXRManager( renderer, gl ) {
//
var
inputSources
=
session
.
inputSources
;
for
(
var
i
=
0
;
i
<
controllers
.
length
;
i
++
)
{
var
controller
=
controllers
[
i
];
var
inputSource
=
sortedI
nputSources
[
i
];
var
inputSource
=
i
nputSources
[
i
];
if
(
inputSource
)
{
...
...
@@ -352,12 +379,7 @@ function WebXRManager( renderer, gl ) {
controller
.
matrix
.
fromArray
(
inputPose
.
transform
.
matrix
);
controller
.
matrix
.
decompose
(
controller
.
position
,
controller
.
rotation
,
controller
.
scale
);
if
(
inputSource
.
targetRayMode
===
'
pointing
'
)
{
controller
.
visible
=
true
;
}
controller
.
visible
=
true
;
continue
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录