Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
0cd4f997
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,发现更多精彩内容 >>
提交
0cd4f997
编写于
8月 21, 2019
作者:
F
Fernando Serrano
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move multiview.isAvailable() to renderer.capabilities.multiview
上级
5b395083
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
16 deletion
+9
-16
examples/webvr_multiview.html
examples/webvr_multiview.html
+2
-2
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+4
-4
src/renderers/webgl/WebGLCapabilities.js
src/renderers/webgl/WebGLCapabilities.js
+1
-1
src/renderers/webgl/WebGLMultiview.js
src/renderers/webgl/WebGLMultiview.js
+2
-9
未找到文件。
examples/webvr_multiview.html
浏览文件 @
0cd4f997
...
...
@@ -74,7 +74,7 @@
info
.
style
.
width
=
'
100%
'
;
info
.
style
.
textAlign
=
'
center
'
;
info
.
innerHTML
=
'
<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> webvr - multiview<br/>
'
;
info
.
innerHTML
+=
renderer
.
multiview
.
isAvailable
()
?
`<span style="color: #33ff33"><b>OVR_multiview2</b> is supported in your browser</span>`
:
info
.
innerHTML
+=
renderer
.
capabilities
.
multiview
?
`<span style="color: #33ff33"><b>OVR_multiview2</b> is supported in your browser</span>`
:
`<span style="color: #ff3333"><b>OVR_multiview2</b> is not supported or enabled in your browser</span>`
;
container
.
appendChild
(
info
);
...
...
@@ -86,7 +86,7 @@
room
=
new
THREE
.
LineSegments
(
new
BoxLineGeometry
(
6
,
6
,
6
,
10
,
10
,
10
),
new
THREE
.
LineBasicMaterial
(
{
color
:
renderer
.
multiview
.
isAvailable
()
?
0x99ff99
:
0xff3333
}
)
new
THREE
.
LineBasicMaterial
(
{
color
:
renderer
.
capabilities
.
multiview
?
0x99ff99
:
0xff3333
}
)
);
room
.
geometry
.
translate
(
0
,
3
,
0
);
scene
.
add
(
room
);
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
0cd4f997
...
...
@@ -317,7 +317,7 @@ function WebGLRenderer( parameters ) {
// Multiview
var
multiview
=
new
WebGLMultiview
(
_this
,
_gl
,
_gl
.
getContextAttributes
()
);
var
multiview
=
new
WebGLMultiview
(
_this
,
_gl
);
this
.
multiview
=
multiview
;
...
...
@@ -1184,7 +1184,7 @@ function WebGLRenderer( parameters ) {
}
if
(
multiview
.
isAvailable
()
)
{
if
(
capabilities
.
multiview
)
{
multiview
.
attachRenderTarget
(
camera
);
...
...
@@ -1244,7 +1244,7 @@ function WebGLRenderer( parameters ) {
state
.
setPolygonOffset
(
false
);
if
(
multiview
.
isAvailable
()
)
{
if
(
capabilities
.
multiview
)
{
multiview
.
detachRenderTarget
(
camera
);
...
...
@@ -1392,7 +1392,7 @@ function WebGLRenderer( parameters ) {
var
material
=
overrideMaterial
===
undefined
?
renderItem
.
material
:
overrideMaterial
;
var
group
=
renderItem
.
group
;
if
(
multiview
.
isAvailable
()
)
{
if
(
capabilities
.
multiview
)
{
_currentArrayCamera
=
camera
;
...
...
src/renderers/webgl/WebGLCapabilities.js
浏览文件 @
0cd4f997
...
...
@@ -87,7 +87,7 @@ function WebGLCapabilities( gl, extensions, parameters ) {
var
maxSamples
=
isWebGL2
?
gl
.
getParameter
(
gl
.
MAX_SAMPLES
)
:
0
;
var
multiviewExt
=
extensions
.
get
(
'
OVR_multiview2
'
);
var
multiview
=
isWebGL2
&&
(
!!
multiviewExt
);
var
multiview
=
isWebGL2
&&
(
!!
multiviewExt
)
&&
!
gl
.
getContextAttributes
().
antialias
;
var
maxMultiviewViews
=
multiview
?
gl
.
getParameter
(
multiviewExt
.
MAX_VIEWS_OVR
)
:
0
;
return
{
...
...
src/renderers/webgl/WebGLMultiview.js
浏览文件 @
0cd4f997
...
...
@@ -8,7 +8,7 @@ import { Matrix3 } from '../../math/Matrix3.js';
import
{
Matrix4
}
from
'
../../math/Matrix4.js
'
;
import
{
Vector2
}
from
'
../../math/Vector2.js
'
;
function
WebGLMultiview
(
renderer
,
gl
,
contextAttributes
)
{
function
WebGLMultiview
(
renderer
,
gl
)
{
var
DEFAULT_NUMVIEWS
=
2
;
...
...
@@ -50,12 +50,6 @@ function WebGLMultiview( renderer, gl, contextAttributes ) {
//
function
isAvailable
()
{
return
capabilities
.
multiview
&&
!
contextAttributes
.
antialias
;
}
function
updateCameraProjectionMatricesUniform
(
camera
,
uniforms
)
{
var
cameras
=
getCameraArray
(
camera
);
...
...
@@ -203,7 +197,7 @@ function WebGLMultiview( renderer, gl, contextAttributes ) {
}
if
(
isAvailable
()
)
{
if
(
renderer
.
capabilities
.
multiview
)
{
renderTarget
=
new
WebGLMultiviewRenderTarget
(
0
,
0
,
DEFAULT_NUMVIEWS
);
...
...
@@ -224,7 +218,6 @@ function WebGLMultiview( renderer, gl, contextAttributes ) {
this
.
attachRenderTarget
=
attachRenderTarget
;
this
.
detachRenderTarget
=
detachRenderTarget
;
this
.
isAvailable
=
isAvailable
;
this
.
getNumViews
=
getNumViews
;
this
.
updateCameraProjectionMatricesUniform
=
updateCameraProjectionMatricesUniform
;
this
.
updateCameraViewMatricesUniform
=
updateCameraViewMatricesUniform
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录